1209 files changed, 103287 insertions, 81371 deletions

diff --git a/Apache.dsw b/Apache.dsw
index 988a9d87..ecb75b99 100644
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -87,12 +87,18 @@ Package=<4>
     Project_Dep_Name ApacheMonitor
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name apr_ldap
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libapriconv_ces_modules
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name libapriconv_ccs_modules
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name apr_ldap
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_actions
     End Project Dependency
     Begin Project Dependency
@@ -396,6 +402,132 @@ Package=<4>
 
 ###############################################################################
 
+Project: "apr_dbd_freetds"=".\srclib\apr-util\dbd\apr_dbd_freetds.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_dbd_mysql"=".\srclib\apr-util\dbd\apr_dbd_mysql.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_dbd_oracle"=".\srclib\apr-util\dbd\apr_dbd_oracle.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_dbd_pgsql"=".\srclib\apr-util\dbd\apr_dbd_pgsql.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_dbd_sqlite2"=".\srclib\apr-util\dbd\apr_dbd_sqlite2.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_dbd_sqlite3"=".\srclib\apr-util\dbd\apr_dbd_sqlite3.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_ldap"=".\srclib\apr-util\ldap\apr_ldap.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "dftables"=.\srclib\pcre\dftables.dsp - Package Owner=<4>
 
 Package=<5>
diff --git a/BuildBin.dsp b/BuildBin.dsp
index 3858024f..16efbe0b 100644
--- a/BuildBin.dsp
+++ b/BuildBin.dsp
@@ -39,7 +39,7 @@ CFG=BuildBin - Win32 Debug
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _tryssl _tryzlib _dummy"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _trydbd _tryssl _tryzlib _dummy"
 # PROP Rebuild_Opt ""
 # PROP Target_File "\Apache2\bin\httpd.exe"
 # PROP Bsc_Name ".\Browse\httpd.bsc"
@@ -58,7 +58,7 @@ CFG=BuildBin - Win32 Debug
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir ""
 # PROP Intermediate_Dir ""
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _tryssl _tryzlib _dummy"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _trydbd _tryssl _tryzlib _dummy"
 # PROP Rebuild_Opt ""
 # PROP Target_File "\Apache2\bin\httpd.exe"
 # PROP Bsc_Name ".\Browse\httpd.bsc"
diff --git a/CHANGES b/CHANGES
index 80367cf7..591a8fb7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,214 @@
                                                          -*- coding: utf-8 -*-
+Changes with Apache 2.2.9
+
+  *) SECURITY: CVE-2008-2364 (cve.mitre.org)
+     mod_proxy_http: Better handling of excessive interim responses
+     from origin server to prevent potential denial of service and high
+     memory usage. Reported by Ryujiro Shibuya. [Ruediger Pluem,
+     Joe Orton, Jim Jagielski]
+
+  *) SECURITY: CVE-2007-6420 (cve.mitre.org)
+     mod_proxy_balancer: Prevent CSRF attacks against the balancer-manager
+     interface.  [Joe Orton]
+
+  *) core: Fix address-in-use startup failure on some platforms caused
+     by creating an IPv4 listener which overlaps with an existing IPv6
+     listener.  [Jeff Trawick]
+
+  *) mod_proxy: Make all proxy modules nocanon aware and do not add the
+     query string again in this case. PR 44803.
+     [Jim Jagielski, Ruediger Pluem]
+
+  *) mod_unique_id: Fix timestamp value in UNIQUE_ID.
+     PR 37064 [Kobayashi <kobayashi firstserver.co.jp>]
+
+  *) htpasswd: Fix salt generation weakness. PR 31440
+     [Andreas Krennmair <ak synflood.at>, Peter Watkins <peterw tux.org>,
+     Paul Querna]
+
+  *) core: Add the filename of the configuration file to the warning message
+     about the useless use of AllowOverride. PR 39992.
+     [Darryl Miles <darryl darrylmiles.org>]
+
+  *) scoreboard: Remove unused proxy load balancer elements from scoreboard
+     image (not scoreboard memory itself).  [Chris Darroch]
+
+  *) mod_proxy: Support environment variable interpolation in reverse
+     proxying directives. [Nick Kew]
+
+  *) suexec: When group is given as a numeric gid, validate it by looking up
+     the actual group name such that the name can be used in log entries.
+     PR 7862 [<y-koga apache.or.jp>, Leif W <warp-9.9 usa.net>]
+
+  *) Fix garbled TRACE response on EBCDIC platforms.
+     [David Jones <oscaremma gmail.com>]
+
+  *) ab: Include <limits.h> earlier if available since we may need
+     INT_MAX (defined there on Windows) for the definition of MAX_REQUESTS.
+     PR 45024 [Ruediger Pluem]
+
+  *) ab: Improve client performance by clearing connection pool instead
+     of destroying it. PR 40054 [Brad Roberts <braddr puremagic.com>]
+
+  *) ab: Don't stop sending a request if EAGAIN is returned, which
+     will only happen if both the write and subsequent wait are
+     returning EAGAIN, and count posted bytes correctly when the initial
+     write of a request is not complete. PR 10038, 38861, 39679
+     [Patrick McManus <mcmanus datapower.com>,
+      Stefan Fleiter <stefan.fleiter web.de>,
+      Davanum Srinivas, Roy T. Fielding]
+
+  *) ab: Overhaul stats collection and reporting to avoid integer
+     truncation and time divisions within the test loop, retain
+     native time resolution until output, remove unused data,
+     consistently round milliseconds, and generally avoid losing
+     accuracy of calculation due to type casts. PR 44878, 44931.
+     [Roy T. Fielding]
+
+  *) ab: Add -r option to continue after socket receive errors.
+     [Filip Hanik <devlist hanik.com>]
+
+  *) core: Do not allow Options ALL if not all options are allowed to be
+     overwritten. PR 44262 [Michał Grzędzicki <lazy iq.pl>]
+
+  *) mod_cache: Handle If-Range correctly if the cached resource was stale.
+     PR 44579 [Ruediger Pluem]
+
+  *) mod_proxy: Do not try a direct connection if the connection via a
+     remote proxy failed before and the request has a request body.
+     [Ruediger Pluem]
+
+  *) mod_proxy_ajp: Do not retry request in the case that we either failed to
+     sent a part of the request body or if the request is not idempotent.
+     PR 44334 [Ruediger Pluem]
+
+  *) mod_rewrite: Initialize hash needed by ap_register_rewrite_mapfunc early
+     enough. PR 44641 [Daniel Lescohier <daniel.lescohier cnet.com>]
+
+  *) mod_dav: Return "method not allowed" if the destination URI of a WebDAV
+     copy / move operation is no DAV resource. PR 44734 [Ruediger Pluem]
+
+  *) http_filters: Don't return 100-continue on redirects. PR 43711
+     [Ruediger Pluem]
+
+  *) mod_ssl: Fix a memory leak with connections that have zlib compression
+     turned on. PR 44975 [Joe Orton, Amund Elstad <Amund.Elstad ist.com>,
+     Dr Stephen Henson <steve openssl.org>]
+
+  *) mod_proxy: Trigger a retry by the client in the case we fail to read the
+     response line from the backend by closing the connection to the client.
+     PR 37770 [Ruediger Pluem]
+
+  *) gen_test_char: add double-quote to the list of T_HTTP_TOKEN_STOP.
+     PR 9727 [Ville Skytt <ville.skytta iki.fi>]
+
+  *) core: reinstate location walk to fix config for subrequests
+     PR 41960 [Jose Kahan <jose w3.org>]
+
+  *) rotatelogs: Log the current file size and error code/description
+     when failing to write to the log file.  [Jeff Trawick]
+
+  *) rotatelogs: Added '-f' option to force rotatelogs to create the
+     logfile as soon as started, and not wait until it reads the
+     first entry. [Jim Jagielski]
+
+  *) rotatelogs: Don't leak memory when reopening the logfile.
+     PR 40183 [Ruediger Pluem, Takashi Sato <serai lans-tv.com>]
+
+  *) rotatelogs: Improve atomicity when using -l and cleaup code.
+     PR 44004 [Rainer Jung]
+
+  *) mod_authn_dbd: Disambiguate and tidy database authentication
+     error messages.  PR 43210.  [Chris Darroch, Phil Endecott
+     <spam_from_apache_bugzilla chezphil.org>]
+
+  *) mod_headers: Add 'merge' option to avoid duplicate values within
+     the same header. [Chris Darroch]
+
+  *) mod_cgid: Explicitly set permissions of the socket (ScriptSock) shared by
+     mod_cgid and request processing threads, for OS'es such as HPUX and AIX
+     that do not use umask for AF_UNIX socket permissions.
+     [Eric Covener, Jeff Trawick]
+
+  *) mod_cgid: Don't try to restart the daemon if it fails to initialize
+     the socket.  [Jeff Trawick]
+
+  *) mod_log_config: Add format options for %p so that the actual local
+     or remote port can be logged.  PR 43415.  [Adam Hasselbalch Hansen
+     <ahh@one.com>, Ruediger Pluem, Jeff Trawick]
+
+  *) Added 'disablereuse' option for ProxyPass which, essentially,
+     disables connection pooling for the backend servers.
+     [Jim Jagielski]
+
+  *) mod_speling: remove regression from 1.3/2.0 behavior and
+     drop dependency between mod_speling and AcceptPathInfo.
+     PR 43562 [Jose Kahan <jose w3.org>]
+
+  *) mod_substitute: The default is now flattening the buckets after
+     each substitution. The newly added 'q' flag allows for the
+     quicker, more efficient bucket-splitting if the user so
+     desires. [Jim Jagielski]
+
+  *) http_filters: Don't spin if get an error when reading the
+     next chunk. PR 44381 [Ruediger Pluem]
+
+  *) ab: Do not try to read non existing response bodies of HEAD requests.
+     PR 34275 [Takashi Sato <serai lans-tv.com>]
+
+  *) ab: Use a 64 bit unsigned int instead of a signed long to count the
+     bytes transferred to avoid integer overflows. PR 44346 [Ruediger Pluem]
+
+  *) ProxyPassReverse is now balancer aware. [Jim Jagielski]
+
+  *) mod_include: Correctly handle SSI directives split over multiple filter
+     passes.  PR 44447 [Harald Niesche <harald brokenerror.de>]
+
+  *) mod_cache: Revalidate cache entities which have Cache-Control: no-cache
+     set in their response headers. PR 44511 [Ruediger Pluem]
+
+  *) mod_rewrite: Check all files used by DBM maps for freshness, mod_rewrite
+     didn't pick up on updated sdbm maps due to this.
+     PR41190 [Niklas Edmundsson]
+
+  *) mod_proxy: Lower memory consumption for short lived connections.
+     PR 44026. [Ruediger Pluem]
+
+  *) mod_proxy: Keep connections to the backend persistent in the HTTPS case.
+     [Ruediger Pluem]
+
+  *) Don't add bogus duplicate Content-Language entries
+     PR 11035 [Davi Arnaut]
+
+  *) Worker / Event MPM: Fix race condition in pool recycling that leads to
+     segmentation faults under load.  PR 44402
+     [Basant Kumar Kukreja <basant.kukreja sun.com>]
+
+  *) mod_proxy_ftp: Fix base for directory listings.
+     PR 27834 [Nick Kew]
+
+  *) mod_logio: Provide optional function to allow modules to adjust the 
+     bytes_in count [Eric Covener]
+
+  *) http_filters: Don't return 100-continue on client error
+     PR 43711 [Chetan Reddy <chetanreddy gmail.com>]
+
+  *) mod_charset_lite: Add TranslateAllMimeTypes sub-option to
+     CharsetOptions, allowing the administrator to skip the
+     mimetype checking that precedes translation.
+     PR 44458 [Eric Covener]
+
+  *) mod_proxy_http: Fix processing of chunked responses if
+     Connection: Transfer-Encoding is set in the response of the proxied
+     system. PR 44311 [Ruediger Pluem]
+
+  *) mod_proxy_http: Return HTTP status codes instead of apr_status_t
+     values for errors encountered while forwarding the request body
+     PR 44165 [Eric Covener]
+
+  *) mod_rewrite: Don't canonicalise URLs with [P,NE]
+     PR 43319 [<rahul sun.com>]
+
 Changes with Apache 2.2.8
 
   *) core: Fix regression in 2.2.7 in chunk filtering with massively
diff --git a/INSTALL b/INSTALL
index dbcaaf5a..827883c5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,7 +5,7 @@
   ------------------
 
   For complete installation documentation, see [ht]docs/manual/install.html or
-  http://httpd.apache.org/docs-2.2/install.html
+  http://httpd.apache.org/docs/2.2/install.html
 
      $ ./configure --prefix=PREFIX
      $ make
@@ -17,17 +17,25 @@
               might use "/usr/local/apache2" for PREFIX (without the
               quotes).
 
-            * If you are building on FreeBSD, be aware that threads will
-              be disabled and the prefork MPM will be used by default,
-              as threads do not work well with Apache on FreeBSD.  If
-              you wish to try a threaded Apache on FreeBSD anyway, use
-              "./configure --enable-threads".
-
-            * If you are building on Mac OS X (Darwin), make sure to
-              use libtool 1.4.2 or newer.
-
-            * If you are a developer building Apache directly from CVS,
-              you will need to run ./buildconf before running configure.
+            * If you want to build a threaded MPM (for instance worker)
+              on  FreeBSD, be aware that threads do not work well with
+              Apache on FreeBSD versions before 5.4-RELEASE. If you wish
+              to try a threaded Apache on an earlier version of FreeBSD,
+              use the --enable-threads parameter to ./configure in
+              addition to the --with-mpm parameter.
+
+            * If you are a developer building Apache directly from
+              Subversion, you will need to run ./buildconf before running
+              configure. This script bootstraps the build environment and
+              requires Python as well as GNU autoconf and libtool. If you
+              build Apache from a release tarball, you don't have to run
+              buildconf.
+
+            * If you are building directly from Subversion on Mac OS X
+              (Darwin), make sure to use GNU Libtool 1.4.2 or newer. All
+              recent versions of the developer tools on this platform
+              include a sufficiently recent version of GNU Libtool (named
+              glibtool, but buildconf knows where to find it).
 
   For a short impression of what possibilities you have, here is a
   typical example which configures Apache for the installation tree
@@ -48,7 +56,7 @@
   ---------------------
 
   For complete documentation, see [ht]docs/manual/platform/windows.html or
-  http://httpd.apache.org/docs-2.2/platform/windows.html.
+  http://httpd.apache.org/docs/2.2/platform/windows.html.
 
   The Apache/Win32 binaries are primarily distributed as a Windows Installer 
   package (.msi), and may be available as a .zip file as well.  These packages 
@@ -67,8 +75,8 @@
   the text "@@" to discover what you must edit.  To install and start the 
   service after you have corrected the httpd.conf file, use the command
 
-    bin\Apache -k install
-    bin\Apache -k start
+    bin\httpd.exe -k install
+    bin\httpd.exe -k start
 
   The .msi package configures the httpd.conf file, and installs and starts 
   the Apache2 service for you.  It also installs plenty of useful shortcuts
diff --git a/LICENSE b/LICENSE
index e7196a88..3007bca2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -454,68 +454,6 @@ For the srclib\apr-util\include\apr_md4.h component:
  */
 
 
-For the srclib\apr-util\test\testdbm.c component:
-
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * This file came from the SDBM package (written by oz@nexus.yorku.ca).
- * That package was under public domain. This file has been ported to
- * APR, updated to ANSI C and other, newer idioms, and added to the Apache
- * codebase under the above copyright and license.
- */
-
-
 For the srclib\apr-util\test\testmd4.c component:
 
  *
diff --git a/Makefile.in b/Makefile.in
index e68c3815..3f09eebf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,12 +47,14 @@ install-conf:
 	    		if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
 	    			sed -e 's#@@ServerRoot@@#$(prefix)#g' \
 	    				-e 's#@@Port@@#$(PORT)#g' \
+	    				-e 's#@@SSLPort@@#$(SSLPORT)#g' \
 	    				-e '/@@LoadModule@@/d' \
 	    				< $$i; \
 	    		else \
 	    			sed -n -e '/@@LoadModule@@/q' \
 	    				-e 's#@@ServerRoot@@#$(prefix)#g' \
 	    				-e 's#@@Port@@#$(PORT)#g' \
+	    				-e 's#@@SSLPort@@#$(SSLPORT)#g' \
 	    				-e 'p' \
 	    				< $$i; \
 	    			for j in $(DSO_MODULES) "^EOL^"; do \
@@ -64,6 +66,7 @@ install-conf:
 	    				-e '/@@LoadModule@@/d' \
 	    				-e 's#@@ServerRoot@@#$(prefix)#g' \
 	    				-e 's#@@Port@@#$(PORT)#g' \
+	    				-e 's#@@SSLPort@@#$(SSLPORT)#g' \
 	    				< $$i; \
 	    		fi \
 	    	) > $(DESTDIR)$(sysconfdir)/original/$$i; \
diff --git a/Makefile.win b/Makefile.win
index 986433d5..a5629d6e 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -22,6 +22,12 @@
 #
 #   ALL         (unset)     Includes additional modules for build testing
 #
+# Provide a DBD_LIST argument after configuring LIB and INCLUDE with
+# the SDK paths of the corresponding client support libraries.
+# Note that at this time, none of these are supported on win32, per say.
+#
+#     DBD_LIST="sqlite3 pgsql oracle mysql freetds"
+#
 # For example;
 #
 #   nmake -f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" installr
@@ -123,6 +129,36 @@ _tryzlib:
 
 !ENDIF
 
+
+!IFDEF DBD_LIST
+
+_trydbd:
+!IF $(USEMAK) == 1
+        cd srclib\apr-util\dbd & \
+	  for %d in ($(DBD_LIST)) do \
+	    $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - $(LONG)" RECURSE=0 $(CTARGET)
+        cd ..
+
+!ELSEIF $(USESLN) == 1
+	for %d in ($(DBD_LIST)) do \
+	  devenv Apache.sln /useenv $(CTARGET) $(LONG) /project apr_dbd_%d
+!ELSE
+	@for %d in ($(DBD_LIST)) do \
+	  msdev Apache.dsw /USEENV /MAKE \
+		"apr_dbd_%d - Win32 $(LONG)" /NORECURSE $(CTARGET)
+!ENDIF
+
+!ELSE
+#     no DBD_LIST
+
+_trydbd:
+	@echo -----
+	@echo apr_dbd drivers will not build unless DBD_LIST is set to the list
+	@echo of all the client modules available in the LIB and INCLUDE path.
+
+!ENDIF
+
+
 !IF "$(INSTDIR)" == ""
 INSTDIR=\Apache22
 !ENDIF
@@ -229,7 +265,9 @@ _build:
 	cd ..\..\..
 	 $(MAKE) $(MAKEOPT) -f aprutil.mak         CFG="aprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f libaprutil.mak      CFG="libaprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-	cd ..\..
+        cd ldap
+	 $(MAKE) $(MAKEOPT) -f apr_ldap.mak    CFG="apr_ldap - $(ARCH)" RECURSE=0 $(CTARGET)
+        cd ..\..\..
 	cd srclib\pcre
 	 $(MAKE) $(MAKEOPT) -f dftables.mak        CFG="dftables - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f pcre.mak            CFG="pcre - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -443,6 +481,12 @@ _copybin:
 	copy srclib\apr\$(LONG)\libapr-1.$(src_dll) 		"$(inst_dll)" <.y
 	copy srclib\apr-iconv\$(LONG)\libapriconv-1.$(src_dll) 	"$(inst_dll)" <.y
 	copy srclib\apr-util\$(LONG)\libaprutil-1.$(src_dll) 	"$(inst_dll)" <.y
+	copy srclib\apr-util\ldap\$(LONG)\apr_ldap-1.$(src_dll) "$(inst_dll)" <.y
+!IFDEF DBD_LIST
+	for %d in ($(DBD_LIST)) do ( \
+	  copy srclib\apr-util\dbd\$(LONG)\apr_dbd_%d-1.$(src_dll) "$(inst_dll)" <.y && \
+	)
+!ENDIF
 !IF EXIST("srclib\zlib\zlib1.$(src_dll)")
 	copy srclib\zlib\zlib1.$(src_dll)		 	"$(inst_dll)" <.y
 !ENDIF
diff --git a/NOTICE b/NOTICE
index 20ac37d3..bbf623b9 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache HTTP Server
-Copyright 2007 The Apache Software Foundation.
+Copyright 2008 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/README.platforms b/README.platforms
index d5cbd3de..36a5bc87 100644
--- a/README.platforms
+++ b/README.platforms
@@ -48,6 +48,14 @@
    this affects you, downgrading to autoconf 2.13 (which is installed
    on Darwin) will help.
 
+   With Leopard (at least up to 10.5.2), when running configure
+   you will likely see errors such as:
+
+      rm: conftest.dSYM: is a directory
+
+   This is a known issue and will be fixed in a later version of the
+   autoconf suite. These errors can be safely ignored.
+
 ==========
   FreeBSD:
    autoconf 2.52 creates scripts that are incompatible with the Posix
diff --git a/acinclude.m4 b/acinclude.m4
index 742711fa..a6fba9b4 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -79,6 +79,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(MODULE_DIRS)
   APACHE_SUBST(MODULE_CLEANDIRS)
   APACHE_SUBST(PORT)
+  APACHE_SUBST(SSLPORT)
   APACHE_SUBST(nonssl_listen_stmt_1)
   APACHE_SUBST(nonssl_listen_stmt_2)
   APACHE_SUBST(CORE_IMPLIB_FILE)
diff --git a/build/apr_common.m4 b/build/apr_common.m4
index caae9bfa..2afb4666 100644
--- a/build/apr_common.m4
+++ b/build/apr_common.m4
@@ -23,7 +23,7 @@ dnl APR_CONFIG_NICE(filename)
 dnl
 dnl Saves a snapshot of the configure command-line for later reuse
 dnl
-AC_DEFUN(APR_CONFIG_NICE,[
+AC_DEFUN([APR_CONFIG_NICE], [
   rm -f $1
   cat >$1<<EOF
 #! /bin/sh
@@ -80,7 +80,7 @@ EOF
 
 dnl APR_MKDIR_P_CHECK(fallback-mkdir-p)
 dnl checks whether mkdir -p works
-AC_DEFUN(APR_MKDIR_P_CHECK,[
+AC_DEFUN([APR_MKDIR_P_CHECK], [
   AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[
     test -d conftestdir && rm -rf conftestdir
     mkdir -p conftestdir/somedir >/dev/null 2>&1
@@ -118,7 +118,7 @@ dnl
 dnl Trying to optimize this is left as an exercise to the reader who wants
 dnl to put up with more autoconf craziness.  I give up.
 dnl
-AC_DEFUN(APR_SUBDIR_CONFIG, [
+AC_DEFUN([APR_SUBDIR_CONFIG], [
   # save our work to this point; this allows the sub-package to use it
   AC_CACHE_SAVE
 
@@ -161,8 +161,8 @@ changequote([, ])dnl
   # autoconf doesn't add --silent to ac_configure_args; explicitly pass it
   test "x$silent" = "xyes" && apr_configure_args="$apr_configure_args --silent"
 
-  dnl The eval makes quoting arguments work - specifically $2 where the
-  dnl quoting mechanisms used is "" rather than [].
+  dnl The eval makes quoting arguments work - specifically the second argument
+  dnl where the quoting mechanisms used is "" rather than [].
   dnl
   dnl We need to execute another shell because some autoconf/shell combinations
   dnl will choke after doing repeated APR_SUBDIR_CONFIG()s.  (Namely Solaris
@@ -186,7 +186,7 @@ dnl APR_SAVE_THE_ENVIRONMENT(variable_name)
 dnl
 dnl Stores the variable (usually a Makefile macro) for later restoration
 dnl
-AC_DEFUN(APR_SAVE_THE_ENVIRONMENT,[
+AC_DEFUN([APR_SAVE_THE_ENVIRONMENT], [
   apr_ste_save_$1="$$1"
 ])dnl
 
@@ -198,7 +198,7 @@ dnl has added to the variable, moving the new bits to prefix_variable_name
 dnl and restoring the original variable contents.  This makes it possible
 dnl for a user to override configure when it does something stupid.
 dnl
-AC_DEFUN(APR_RESTORE_THE_ENVIRONMENT,[
+AC_DEFUN([APR_RESTORE_THE_ENVIRONMENT], [
 if test "x$apr_ste_save_$1" = "x"; then
   $2$1="$$1"
   $1=
@@ -222,7 +222,7 @@ dnl APR_SETIFNULL(variable, value)
 dnl
 dnl  Set variable iff it's currently null
 dnl
-AC_DEFUN(APR_SETIFNULL,[
+AC_DEFUN([APR_SETIFNULL], [
   if test -z "$$1"; then
     test "x$silent" != "xyes" && echo "  setting $1 to \"$2\""
     $1="$2"
@@ -234,7 +234,7 @@ dnl APR_SETVAR(variable, value)
 dnl
 dnl  Set variable no matter what
 dnl
-AC_DEFUN(APR_SETVAR,[
+AC_DEFUN([APR_SETVAR], [
   test "x$silent" != "xyes" && echo "  forcing $1 to \"$2\""
   $1="$2"
 ])dnl
@@ -244,7 +244,7 @@ dnl APR_ADDTO(variable, value)
 dnl
 dnl  Add value to variable
 dnl
-AC_DEFUN(APR_ADDTO,[
+AC_DEFUN([APR_ADDTO], [
   if test "x$$1" = "x"; then
     test "x$silent" != "xyes" && echo "  setting $1 to \"$2\""
     $1="$2"
@@ -271,7 +271,7 @@ dnl APR_REMOVEFROM(variable, value)
 dnl
 dnl Remove a value from a variable
 dnl
-AC_DEFUN(APR_REMOVEFROM,[
+AC_DEFUN([APR_REMOVEFROM], [
   if test "x$$1" = "x$2"; then
     test "x$silent" != "xyes" && echo "  nulling $1"
     $1=""
@@ -295,7 +295,7 @@ AC_DEFUN(APR_REMOVEFROM,[
 dnl
 dnl APR_CHECK_DEFINE_FILES( symbol, header_file [header_file ...] )
 dnl
-AC_DEFUN(APR_CHECK_DEFINE_FILES,[
+AC_DEFUN([APR_CHECK_DEFINE_FILES], [
   AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
     ac_cv_define_$1=no
     for curhdr in $2
@@ -317,7 +317,7 @@ YES_IS_DEFINED
 dnl
 dnl APR_CHECK_DEFINE(symbol, header_file)
 dnl
-AC_DEFUN(APR_CHECK_DEFINE,[
+AC_DEFUN([APR_CHECK_DEFINE], [
   AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
     AC_EGREP_CPP(YES_IS_DEFINED, [
 #include <$2>
@@ -334,7 +334,7 @@ YES_IS_DEFINED
 dnl
 dnl APR_CHECK_APR_DEFINE( symbol )
 dnl
-AC_DEFUN(APR_CHECK_APR_DEFINE,[
+AC_DEFUN([APR_CHECK_APR_DEFINE], [
 apr_old_cppflags=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $INCLUDES"
 AC_EGREP_CPP(YES_IS_DEFINED, [
@@ -450,12 +450,12 @@ dnl
 dnl A variant of AC_CHECK_SIZEOF which allows the checking of
 dnl sizes of non-builtin types
 dnl
-AC_DEFUN(APR_CHECK_SIZEOF_EXTENDED,
-[changequote(<<,>>)dnl
-dnl The name to #define
+AC_DEFUN([APR_CHECK_SIZEOF_EXTENDED],
+[changequote(<<, >>)dnl
+dnl The name to #define.
 define(<<AC_TYPE_NAME>>, translit(sizeof_$2, [a-z *], [A-Z_P]))dnl
-dnl The cache variable
-define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$2, [ *],[<p>]))dnl
+dnl The cache variable name.
+define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$2, [ *], [_p]))dnl
 changequote([, ])dnl
 AC_MSG_CHECKING(size of $2)
 AC_CACHE_VAL(AC_CV_NAME,
@@ -463,7 +463,7 @@ AC_CACHE_VAL(AC_CV_NAME,
 $1
 main()
 {
-  FILE *f=fopen("conftestval","w");
+  FILE *f=fopen("conftestval", "w");
   if (!f) exit(1);
   fprintf(f, "%d\n", sizeof($2));
   exit(0);
@@ -511,7 +511,7 @@ dnl  for failure), or it returns a pointer to the error
 dnl  string.
 dnl
 dnl
-AC_DEFUN(APR_CHECK_STRERROR_R_RC,[
+AC_DEFUN([APR_CHECK_STRERROR_R_RC], [
 AC_MSG_CHECKING(for type of return code from strerror_r)
 AC_TRY_RUN([
 #include <errno.h>
@@ -546,7 +546,7 @@ dnl  Decide if d_fileno or d_ino are available in the dirent
 dnl  structure on this platform.  Single UNIX Spec says d_ino,
 dnl  BSD uses d_fileno.  Undef to find the real beast.
 dnl
-AC_DEFUN(APR_CHECK_DIRENT_INODE, [
+AC_DEFUN([APR_CHECK_DIRENT_INODE], [
 AC_CACHE_CHECK([for inode member of struct dirent], apr_cv_dirent_inode, [
 apr_cv_dirent_inode=no
 AC_TRY_COMPILE([
@@ -584,7 +584,7 @@ dnl  on this platform.  Not part of the Single UNIX Spec.
 dnl  Note that this is worthless without DT_xxx macros, so
 dnl  look for one while we are at it.
 dnl
-AC_DEFUN(APR_CHECK_DIRENT_TYPE,[
+AC_DEFUN([APR_CHECK_DIRENT_TYPE], [
 AC_CACHE_CHECK([for file type member of struct dirent], apr_cv_dirent_type,[
 apr_cv_dirent_type=no
 AC_TRY_COMPILE([
@@ -633,7 +633,7 @@ dnl  by changing all "/" to "_" in the HEADER-FILE and dropping
 dnl  all "." and "-" chars. If the 3rd parameter is "yes" then instead of
 dnl  setting to 1 or 0, we set FLAG-TO-SET to yes or no.
 dnl  
-AC_DEFUN(APR_FLAG_HEADERS,[
+AC_DEFUN([APR_FLAG_HEADERS], [
 AC_CHECK_HEADERS($1)
 for aprt_i in $1
 do
@@ -654,7 +654,7 @@ dnl  we use what's provided as FLAG-TO-SET. If the 3rd parameter
 dnl  is "yes" then instead of setting to 1 or 0, we set FLAG-TO-SET
 dnl  to yes or no.
 dnl
-AC_DEFUN(APR_FLAG_FUNCS,[
+AC_DEFUN([APR_FLAG_FUNCS], [
 AC_CHECK_FUNCS($1)
 for aprt_j in $1
 do
@@ -679,7 +679,7 @@ dnl baz='${bar}/3'
 dnl APR_EXPAND_VAR(fraz, $baz)
 dnl   $fraz is now "1/2/3"
 dnl 
-AC_DEFUN(APR_EXPAND_VAR,[
+AC_DEFUN([APR_EXPAND_VAR], [
 ap_last=
 ap_cur="$2"
 while test "x${ap_cur}" != "x${ap_last}";
@@ -698,7 +698,7 @@ dnl Example:
 dnl orig_path="${prefix}/bar"
 dnl APR_PATH_RELATIVE(final_path, $orig_path, $prefix)
 dnl    $final_path now contains "bar"
-AC_DEFUN(APR_PATH_RELATIVE,[
+AC_DEFUN([APR_PATH_RELATIVE], [
 ap_stripped=`echo $2 | sed -e "s#^$3##"`
 # check if the stripping was successful
 if test "x$2" != "x${ap_stripped}"; then
@@ -716,12 +716,12 @@ dnl AC_HELP_STRING, so let's try to call it if we can.
 dnl Note: this define must be on one line so that it can be properly returned
 dnl as the help string.  When using this macro with a multi-line RHS, ensure
 dnl that you surround the macro invocation with []s
-AC_DEFUN(APR_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[  ][$1] substr([                       ],len($1))[$2])])
+AC_DEFUN([APR_HELP_STRING], [ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[  ][$1] substr([                       ],len($1))[$2])])
 
 dnl
 dnl APR_LAYOUT(configlayout, layoutname [, extravars])
 dnl
-AC_DEFUN(APR_LAYOUT,[
+AC_DEFUN([APR_LAYOUT], [
   if test ! -f $srcdir/config.layout; then
     echo "** Error: Layout file $srcdir/config.layout not found"
     echo "** Error: Cannot use undefined layout '$LAYOUT'"
@@ -784,7 +784,7 @@ AC_DEFUN(APR_LAYOUT,[
 dnl
 dnl APR_ENABLE_LAYOUT(default layout name [, extra vars])
 dnl
-AC_DEFUN(APR_ENABLE_LAYOUT,[
+AC_DEFUN([APR_ENABLE_LAYOUT], [
 AC_ARG_ENABLE(layout,
 [  --enable-layout=LAYOUT],[
   LAYOUT=$enableval
@@ -805,7 +805,7 @@ dnl APR_PARSE_ARGUMENTS
 dnl a reimplementation of autoconf's argument parser,
 dnl used here to allow us to co-exist layouts and argument based
 dnl set ups.
-AC_DEFUN(APR_PARSE_ARGUMENTS,[
+AC_DEFUN([APR_PARSE_ARGUMENTS], [
 ac_prev=
 # Retrieve the command-line arguments.  The eval is needed because
 # the arguments are quoted to preserve accuracy.
@@ -931,7 +931,7 @@ dnl APR_CHECK_DEPEND
 dnl
 dnl Determine what program we can use to generate .deps-style dependencies
 dnl
-AC_DEFUN(APR_CHECK_DEPEND,[
+AC_DEFUN([APR_CHECK_DEPEND], [
 dnl Try to determine what depend program we can use
 dnl All GCC-variants should have -MM.
 dnl If not, then we can check on those, too.
@@ -974,4 +974,3 @@ AC_TRY_COMPILE(AC_INCLUDES_DEFAULT, [
 ], [apr_cvname=yes
 $3], [apr_cvname=no])])
 ])
-
diff --git a/build/config_vars.sh.in b/build/config_vars.sh.in
index 0b0fb1b0..81bbd709 100644
--- a/build/config_vars.sh.in
+++ b/build/config_vars.sh.in
@@ -49,6 +49,7 @@ exec sed "
 /^DSO_MODULES/d
 /^MODULE_/d
 /^PORT/d
+/^SSLPORT/d
 /^nonssl_/d
 /^CORE_IMPLIB/d
 /^rel_/d
diff --git a/build/find_apr.m4 b/build/find_apr.m4
index 048cb7bf..88f64a7e 100644
--- a/build/find_apr.m4
+++ b/build/find_apr.m4
@@ -22,7 +22,8 @@ dnl library. It provides a standardized mechanism for using APR. It supports
 dnl embedding APR into the application source, or locating an installed
 dnl copy of APR.
 dnl
-dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors)
+dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors,
+dnl              detailed-check)
 dnl
 dnl   where srcdir is the location of the bundled APR source directory, or
 dnl   empty if source is not bundled.
@@ -39,6 +40,14 @@ dnl   If multiple versions are specified, and --with-apr=PREFIX or the
 dnl   implicit installed search are used, then the first (leftmost) version
 dnl   in the list that is found will be used.  Currently defaults to [0 1].
 dnl
+dnl   where detailed-check is an M4 macro which sets the apr_acceptable to
+dnl   either "yes" or "no". The macro will be invoked for each installed
+dnl   copy of APR found, with the apr_config variable set appropriately.
+dnl   Only installed copies of APR which are considered acceptable by
+dnl   this macro will be considered found. If no installed copies are
+dnl   considered acceptable by this macro, apr_found will be set to either
+dnl   either "no" or "reconfig".
+dnl
 dnl Sets the following variables on exit:
 dnl
 dnl   apr_found : "yes", "no", "reconfig"
@@ -89,8 +98,8 @@ AC_DEFUN([APR_FIND_APR], [
 
   AC_MSG_CHECKING(for APR)
   AC_ARG_WITH(apr,
-  [  --with-apr=PATH         prefix for installed APR, path to APR build tree,
-                          or the full path to apr-config],
+  [  --with-apr=PATH         prefix for installed APR or the full path to 
+                             apr-config],
   [
     if test "$withval" = "no" || test "$withval" = "yes"; then
       AC_MSG_ERROR([--with-apr requires a directory or file to be provided])
@@ -101,16 +110,28 @@ AC_DEFUN([APR_FIND_APR], [
       for lookdir in "$withval/bin" "$withval"
       do
         if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then
-          apr_found="yes"
           apr_config="$lookdir/$apr_temp_apr_config_file"
+          ifelse([$5], [], [], [
+          apr_acceptable="yes"
+          $5
+          if test "$apr_acceptable" != "yes"; then
+            AC_MSG_WARN([Found APR in $apr_config, but we think it is considered unacceptable])
+            continue
+          fi])
+          apr_found="yes"
           break 2
         fi
       done
     done
 
     if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
-      apr_found="yes"
       apr_config="$withval"
+      ifelse([$5], [], [apr_found="yes"], [
+          apr_acceptable="yes"
+          $5
+          if test "$apr_acceptable" = "yes"; then
+                apr_found="yes"
+          fi])
     fi
 
     dnl if --with-apr is used, it is a fatal error for its argument
@@ -124,15 +145,29 @@ AC_DEFUN([APR_FIND_APR], [
       for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
       do
         if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then
-          apr_found="yes"
           apr_config="$apr_temp_apr_config_file"
+          ifelse([$5], [], [], [
+          apr_acceptable="yes"
+          $5
+          if test "$apr_acceptable" != "yes"; then
+            AC_MSG_WARN([skipped APR at $apr_config, version not acceptable])
+            continue
+          fi])
+          apr_found="yes"
           break
         else
           dnl look in some standard places
           for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
             if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
-              apr_found="yes"
               apr_config="$lookdir/bin/$apr_temp_apr_config_file"
+              ifelse([$5], [], [], [
+              apr_acceptable="yes"
+              $5
+              if test "$apr_acceptable" != "yes"; then
+                AC_MSG_WARN([skipped APR at $apr_config, version not acceptable])
+                continue
+              fi])
+              apr_found="yes"
               break 2
             fi
           done
diff --git a/build/find_apu.m4 b/build/find_apu.m4
index 4ee01e68..dfa4e0e2 100644
--- a/build/find_apu.m4
+++ b/build/find_apu.m4
@@ -22,7 +22,8 @@ dnl library. It provides a standardized mechanism for using APU. It supports
 dnl embedding APU into the application source, or locating an installed
 dnl copy of APU.
 dnl
-dnl APR_FIND_APU(srcdir, builddir, implicit-install-check, acceptable-majors)
+dnl APR_FIND_APU(srcdir, builddir, implicit-install-check, acceptable-majors,
+dnl              detailed-check)
 dnl
 dnl   where srcdir is the location of the bundled APU source directory, or
 dnl   empty if source is not bundled.
@@ -39,6 +40,14 @@ dnl   If multiple versions are specified, and --with-apr-util=PREFIX or the
 dnl   implicit installed search are used, then the first (leftmost) version
 dnl   in the list that is found will be used.  Currently defaults to [0 1].
 dnl
+dnl   where detailed-check is an M4 macro which sets the apu_acceptable to
+dnl   either "yes" or "no". The macro will be invoked for each installed
+dnl   copy of APU found, with the apu_config variable set appropriately.
+dnl   Only installed copies of APU which are considered acceptable by
+dnl   this macro will be considered found. If no installed copies are
+dnl   considered acceptable by this macro, apu_found will be set to either
+dnl   either "no" or "reconfig".
+dnl
 dnl Sets the following variables on exit:
 dnl
 dnl   apu_found : "yes", "no", "reconfig"
@@ -99,8 +108,8 @@ AC_DEFUN([APR_FIND_APU], [
 
   AC_MSG_CHECKING(for APR-util)
   AC_ARG_WITH(apr-util,
-  [  --with-apr-util=PATH    prefix for installed APU, path to APU build tree,
-                          or the full path to apu-config],
+  [  --with-apr-util=PATH    prefix for installed APU or the full path to 
+                             apu-config],
   [
     if test "$withval" = "no" || test "$withval" = "yes"; then
       AC_MSG_ERROR([--with-apr-util requires a directory or file to be provided])
@@ -111,16 +120,28 @@ AC_DEFUN([APR_FIND_APU], [
       for lookdir in "$withval/bin" "$withval"
       do
         if $TEST_X "$lookdir/$apu_temp_apu_config_file"; then
-          apu_found="yes"
           apu_config="$lookdir/$apu_temp_apu_config_file"
+          ifelse([$5], [], [], [
+          apu_acceptable="yes"
+          $5
+          if test "$apu_acceptable" != "yes"; then
+            AC_MSG_WARN([Found APU in $apu_config, but it is considered unacceptable])
+            continue
+          fi])
+          apu_found="yes"
           break 2
         fi
       done
     done
 
     if test "$apu_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
-      apu_found="yes"
       apu_config="$withval"
+      ifelse([$5], [], [apu_found="yes"], [
+          apu_acceptable="yes"
+          $5
+          if test "$apu_acceptable" = "yes"; then
+                apu_found="yes"
+          fi])
     fi
 
     dnl if --with-apr-util is used, it is a fatal error for its argument
@@ -133,15 +154,29 @@ AC_DEFUN([APR_FIND_APU], [
       for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
       do
         if $apu_temp_apu_config_file --help > /dev/null 2>&1 ; then
+          apu_config="$apu_temp_apu_config_file" 
+          ifelse([$5], [], [], [
+          apu_acceptable="yes"
+          $5
+          if test "$apu_acceptable" != "yes"; then
+            AC_MSG_WARN([skipped APR-util at $apu_config, version not acceptable])
+            continue
+          fi])
           apu_found="yes"
-          apu_config="$apu_temp_apu_config_file"
           break
         else
           dnl look in some standard places (apparently not in builtin/default)
           for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
             if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
-              apu_found="yes"
               apu_config="$lookdir/bin/$apu_temp_apu_config_file"
+              ifelse([$5], [], [], [
+              apu_acceptable="yes"
+              $5
+              if test "$apu_acceptable" != "yes"; then
+                AC_MSG_WARN([skipped APR-util at $apu_config, version not acceptable])
+                continue
+              fi])
+              apu_found="yes"
               break 2
             fi
           done
diff --git a/build/installwinconf.awk b/build/installwinconf.awk
index bc2540f5..8ca7554d 100644
--- a/build/installwinconf.awk
+++ b/build/installwinconf.awk
@@ -85,7 +85,7 @@ BEGIN {
 	  print "#" > dstfl;
 	  print "# NOTE: Where filenames are specified, you must use forward slashes" > dstfl;
 	  print "# instead of backslashes (e.g., \"c:/apache\" instead of \"c:\\apache\")." > dstfl;
-	  print "# If a drive letter is omitted, the drive on which Apache.exe is located" > dstfl;
+	  print "# If a drive letter is omitted, the drive on which httpd.exe is located" > dstfl;
 	  print "# will be used by default.  It is recommended that you always supply" > dstfl;
 	  print "# an explicit drive letter in absolute paths to avoid confusion." > dstfl;
 	  bswarning = 0;
diff --git a/build/ltmain.sh b/build/ltmain.sh
index 06823e05..27d498a0 100644
--- a/build/ltmain.sh
+++ b/build/ltmain.sh
@@ -1,8 +1,8 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008  Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This program is free software; you can redistribute it and/or modify
@@ -43,14 +43,22 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+VERSION=1.5.26
+TIMESTAMP=" (1.1220.2.492 2008/01/30 06:40:56)"
+
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
@@ -105,11 +113,19 @@ esac
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
+lt_env=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+	  save_$lt_var=\$$lt_var
+	  lt_env=\"$lt_var=\$$lt_var \$lt_env\"
+	  $lt_var=C
+	  export $lt_var
+	fi"
+done
+
+if test -n "$lt_env"; then
+  lt_env="env $lt_env"
 fi
 
 # Make sure IFS has a sensible default
@@ -136,6 +152,8 @@ duplicate_deps=no
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -196,7 +214,13 @@ func_win32_libid ()
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
       $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
-	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+	$SED -n -e '1,100{
+		/ I /{
+			s,.*,import,
+			p
+			q
+			}
+		}'`
       case $win32_nmres in
       import*)  win32_libid_type="x86 archive import";;
       *)        win32_libid_type="x86 archive static";;
@@ -327,7 +351,17 @@ func_extract_archives ()
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  extracted_serial=`expr $extracted_serial + 1`
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -454,11 +488,12 @@ do
     ;;
 
   --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+    echo "\
+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
+Copyright (C) 2008  Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     exit $?
     ;;
 
@@ -755,9 +790,11 @@ if test -z "$show_help"; then
     *.class) xform=class ;;
     *.cpp) xform=cpp ;;
     *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
+    *.[fF][09]?) xform=[fF][09]. ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
+    *.obj) xform=obj ;;
+    *.sx) xform=sx ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -926,7 +963,7 @@ EOF
       $run $rm "$lobj" "$output_obj"
 
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
 	test -n "$output_obj" && $run $rm $removelist
 	exit $EXIT_FAILURE
@@ -998,7 +1035,7 @@ EOF
       command="$command$suppress_output"
       $run $rm "$obj" "$output_obj"
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
 	$run $rm $removelist
 	exit $EXIT_FAILURE
@@ -1131,6 +1168,7 @@ EOF
     thread_safe=no
     vinfo=
     vinfo_number=no
+    single_module="${wl}-single_module"
 
     func_infer_tag $base_compile
 
@@ -1138,8 +1176,9 @@ EOF
     for arg
     do
       case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1147,12 +1186,20 @@ EOF
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	else
+	  ;;
+	-static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	fi
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1600,13 +1647,18 @@ EOF
 	continue
 	;;
 
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	compiler_flags="$compiler_flags $arg"
 	compile_command="$compile_command $arg"
 	finalize_command="$finalize_command $arg"
 	continue
 	;;
 
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
       -module)
 	module=yes
 	continue
@@ -1620,10 +1672,11 @@ EOF
       # -m* pass through architecture-specific compiler args for GCC
       # -m*, -t[45]*, -txscale* pass through architecture-specific
       # compiler args for GCC
-      # -pg pass through profiling flag for GCC
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
       # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-      -t[45]*|-txscale*|@*)
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
@@ -1651,9 +1704,9 @@ EOF
 
       -no-install)
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
 	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
+	  # and Darwin in order for the loader to find any dlls it needs.
 	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
 	  fast_install=no
@@ -1712,7 +1765,7 @@ EOF
 	continue
 	;;
 
-      -static)
+      -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2094,7 +2147,7 @@ EOF
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -2109,7 +2162,12 @@ EOF
 	    continue
 	  fi
 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
 	    for search_ext in .la $std_shrext .so .a; do
 	      # Search the libtool library
 	      lib="$searchdir/lib${name}${search_ext}"
@@ -2490,7 +2548,9 @@ EOF
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+	     { { test "$prefer_static_libs" = no ||
+		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -2903,12 +2963,18 @@ EOF
 		  # we do not want to link against static libs,
 		  # but need to link against shared
 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		  if test -n "$deplibrary_names" ; then
 		    for tmp in $deplibrary_names ; do
 		      depdepl=$tmp
 		    done
-		    if test -f "$path/$depdepl" ; then
+		    if test -f "$deplibdir/$depdepl" ; then
+		      depdepl="$deplibdir/$depdepl"
+	      	    elif test -f "$path/$depdepl" ; then
 		      depdepl="$path/$depdepl"
+		    else
+		      # Can't find it, oh well...
+		      depdepl=
 		    fi
 		    # do not add paths which are already there
 		    case " $newlib_search_path " in
@@ -3056,9 +3122,10 @@ EOF
 
     case $linkmode in
     oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@@ -3186,7 +3253,7 @@ EOF
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows)
+	  darwin|linux|osf|windows|none)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3197,9 +3264,10 @@ EOF
 	    age="0"
 	    ;;
 	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
+	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_minor"
+	    lt_irix_increment=no
 	    ;;
 	  esac
 	  ;;
@@ -3258,7 +3326,8 @@ EOF
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
 	  minor_current=`expr $current + 1`
-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
 	  ;;
 
 	freebsd-aout)
@@ -3272,8 +3341,11 @@ EOF
 	  ;;
 
 	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    major=`expr $current - $age`
+	  else
+	    major=`expr $current - $age + 1`
+	  fi
 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
@@ -3410,11 +3482,11 @@ EOF
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      done
+      #for path in $notinst_path; do
+      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3515,13 +3587,12 @@ EOF
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
+              if test "$name" != "" && test "$name" != "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3560,9 +3631,7 @@ EOF
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		$LTCC $LTCFLAGS -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3594,7 +3663,7 @@ EOF
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -3880,7 +3949,10 @@ EOF
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
 	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	      case $archive_cmds in
+	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
+	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
+	      esac
 	    else
 	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
 	    fi
@@ -4190,9 +4262,10 @@ EOF
       ;;
 
     obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@@ -4239,12 +4312,14 @@ EOF
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4692,16 +4767,16 @@ static const void *lt_preloaded_setup() {
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
             else
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
             ;;
           esac
 	  ;;
@@ -4716,13 +4791,13 @@ static const void *lt_preloaded_setup() {
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4884,7 @@ static const void *lt_preloaded_setup() {
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4846,7 +4921,7 @@ static const void *lt_preloaded_setup() {
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       fi
 
       # Quote $echo for shipping.
@@ -5253,6 +5328,20 @@ EOF
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5484,7 @@ else
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      \$echo \"\$0: cannot exec \$program \$*\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5581,7 +5670,7 @@ fi\
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5926,9 +6015,9 @@ relink_command=\"$relink_command\""
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
 	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6226,7 @@ relink_command=\"$relink_command\""
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6348,8 +6437,10 @@ relink_command=\"$relink_command\""
 	if test -f "$dir/$objdir/$dlname"; then
 	  dir="$dir/$objdir"
 	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
+	  if test ! -f "$dir/$dlname"; then
+	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
 	fi
 	;;
 
@@ -6413,12 +6504,12 @@ relink_command=\"$relink_command\""
       fi
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+		$lt_var=\$save_$lt_var; export $lt_var
+	      fi"
+      done
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6775,9 +6866,9 @@ The following components of LINK-COMMAND are treated specially:
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6791,9 +6882,11 @@ The following components of LINK-COMMAND are treated specially:
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 
diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk
index 20f3bb46..623a7395 100644
--- a/build/mkconfNW.awk
+++ b/build/mkconfNW.awk
@@ -93,10 +93,6 @@ BEGIN {
     next
 }
 
-match ($0,/443/) {
-    sub(/443/, SSLPORT)
-}
-
 match ($0,/^#SSLSessionCache +"dbm:/) {
     sub(/^#/, "")
 }
diff --git a/configure b/configure
index 6fd7654c..08ca019d 100755
--- a/configure
+++ b/configure
@@ -1,28 +1,32 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60.
+# Generated by GNU Autoconf 2.62.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
 
 
 # PATH needs CR
@@ -33,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -59,8 +91,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -83,7 +113,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -96,17 +126,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -128,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -154,7 +177,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -215,7 +238,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; }
 else
   as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
@@ -233,19 +256,20 @@ IFS=$as_save_IFS
 	 # Try only shells that exist, to save several forks.
 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
 
 :
 _ASEOF
@@ -253,19 +277,20 @@ _ASEOF
   CONFIG_SHELL=$as_shell
 	       as_have_required=yes
 	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
 
 :
 (as_func_return () {
@@ -335,10 +360,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -407,9 +432,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -445,7 +471,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -473,7 +499,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -486,19 +511,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -512,19 +540,28 @@ else
   as_mkdir_p=false
 fi
 
-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -566,36 +603,36 @@ ac_default_prefix=/usr/local/apache2
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
-#if HAVE_STDINT_H
+#ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
@@ -852,6 +889,7 @@ LIBTOOL
 MODULE_DIRS
 MODULE_CLEANDIRS
 PORT
+SSLPORT
 nonssl_listen_stmt_1
 nonssl_listen_stmt_2
 CORE_IMPLIB_FILE
@@ -876,12 +914,135 @@ HTTPD_VERSION
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_layout
+with_included_apr
+with_apr
+with_apr_util
+with_pcre
+with_port
+with_sslport
+enable_v4_mapped
+enable_exception_hook
+enable_maintainer_mode
+enable_pie
+enable_modules
+enable_mods_shared
+enable_authn_file
+enable_authn_dbm
+enable_authn_anon
+enable_authn_dbd
+enable_authn_default
+enable_authn_alias
+enable_authz_host
+enable_authz_groupfile
+enable_authz_user
+enable_authz_dbm
+enable_authz_owner
+enable_authnz_ldap
+enable_authz_default
+enable_auth_basic
+enable_auth_digest
+enable_isapi
+enable_file_cache
+enable_cache
+enable_disk_cache
+enable_mem_cache
+enable_dbd
+enable_bucketeer
+enable_dumpio
+enable_echo
+enable_example
+enable_case_filter
+enable_case_filter_in
+enable_ext_filter
+enable_include
+enable_filter
+enable_substitute
+enable_charset_lite
+enable_deflate
+with_z
+enable_ldap
+enable_log_config
+enable_log_forensic
+enable_logio
+enable_env
+enable_mime_magic
+enable_cern_meta
+enable_expires
+enable_headers
+enable_ident
+enable_usertrack
+enable_unique_id
+enable_setenvif
+enable_version
+enable_proxy
+enable_proxy_connect
+enable_proxy_ftp
+enable_proxy_http
+enable_proxy_ajp
+enable_proxy_balancer
+enable_ssl
+with_sslc
+with_ssl
+enable_distcache
+enable_optional_hook_export
+enable_optional_hook_import
+enable_optional_fn_import
+enable_optional_fn_export
+with_mpm
+enable_static_support
+enable_static_htpasswd
+enable_static_htdigest
+enable_static_rotatelogs
+enable_static_logresolve
+enable_static_htdbm
+enable_static_ab
+enable_static_checkgid
+enable_static_htcacheclean
+enable_static_httxt2dbm
+enable_http
+enable_mime
+with_module
+enable_dav
+enable_status
+enable_autoindex
+enable_asis
+enable_info
+enable_suexec
+enable_cgid
+enable_cgi
+enable_dav_fs
+enable_dav_lock
+enable_vhost_alias
+enable_negotiation
+enable_dir
+enable_imagemap
+enable_actions
+enable_speling
+enable_userdir
+enable_alias
+enable_rewrite
+enable_so
+with_program_name
+with_suexec_bin
+with_suexec_caller
+with_suexec_userdir
+with_suexec_docroot
+with_suexec_uidmin
+with_suexec_gidmin
+with_suexec_logfile
+with_suexec_safepath
+with_suexec_umask
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
 CC
 CFLAGS
 LDFLAGS
+LIBS
 CPPFLAGS
 CPP'
 
@@ -889,6 +1050,8 @@ CPP'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -987,13 +1150,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -1006,13 +1177,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1203,22 +1382,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1238,7 +1433,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1247,16 +1442,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1265,22 +1460,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1295,7 +1506,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1311,10 +1522,10 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1322,12 +1533,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1354,12 +1565,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1408,9 +1619,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1420,25 +1631,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1455,6 +1666,7 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-layout=LAYOUT
@@ -1581,12 +1793,13 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-included-apr     Use bundled copies of APR/APR-Util
-  --with-apr=PATH         prefix for installed APR, path to APR build tree,
-                          or the full path to apr-config
-  --with-apr-util=PATH    prefix for installed APU, path to APU build tree,
-                          or the full path to apu-config
+  --with-apr=PATH         prefix for installed APR or the full path to
+                             apr-config
+  --with-apr-util=PATH    prefix for installed APU or the full path to
+                             apu-config
   --with-pcre=PATH        Use external PCRE library
   --with-port=PORT        Port on which to listen (default is 80)
+  --with-sslport=SSLPORT  Port on which to securelisten (default is 443)
   --with-z=DIR            use a specific zlib library
   --with-sslc=DIR         RSA SSL-C SSL/TLS toolkit
   --with-ssl=DIR          OpenSSL SSL/TLS toolkit
@@ -1611,6 +1824,7 @@ Some influential environment variables:
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
@@ -1625,15 +1839,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1669,7 +1885,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1679,10 +1895,10 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1693,7 +1909,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
 
@@ -1729,7 +1945,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1764,7 +1980,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1816,11 +2032,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1850,9 +2067,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1867,9 +2084,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1885,8 +2102,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1928,21 +2145,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1952,16 +2172,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1975,29 +2195,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -2007,10 +2236,10 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2057,8 +2286,8 @@ for ac_dir in build "$srcdir"/build; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in build \"$srcdir\"/build" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in build \"$srcdir\"/build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in build \"$srcdir\"/build" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in build \"$srcdir\"/build" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2191,7 +2420,6 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-
 # Check whether --enable-layout was given.
 if test "${enable_layout+set}" = set; then
   enableval=$enable_layout;
@@ -2263,10 +2491,10 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for chosen layout" >&5
-echo $ECHO_N "checking for chosen layout... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $layout_name" >&5
-echo "${ECHO_T}$layout_name" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for chosen layout" >&5
+$as_echo_n "checking for chosen layout... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $layout_name" >&5
+$as_echo "$layout_name" >&6; }
 
 
 
@@ -2384,8 +2612,8 @@ do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { { echo "$as_me:$LINENO: error: expected an absolute path for --$ac_var: $ac_val" >&5
-echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2;}
+    *)  { { $as_echo "$as_me:$LINENO: error: expected an absolute path for --$ac_var: $ac_val" >&5
+$as_echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -3070,10 +3298,10 @@ arg="${ap_cur}"
 nl='
 '
 
-  { echo "$as_me:$LINENO: checking for working mkdir -p" >&5
-echo $ECHO_N "checking for working mkdir -p... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for working mkdir -p" >&5
+$as_echo_n "checking for working mkdir -p... " >&6; }
 if test "${ac_cv_mkdir_p+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     test -d conftestdir && rm -rf conftestdir
@@ -3086,8 +3314,8 @@ else
     rm -rf conftestdir
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_mkdir_p" >&5
-echo "${ECHO_T}$ac_cv_mkdir_p" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_mkdir_p" >&5
+$as_echo "$ac_cv_mkdir_p" >&6; }
   if test "$ac_cv_mkdir_p" = "yes"; then
       mkdir_p="mkdir -p"
   else
@@ -3099,34 +3327,34 @@ echo "${ECHO_T}$ac_cv_mkdir_p" >&6; }
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
 if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -3143,27 +3371,27 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
 if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -3180,27 +3408,27 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
 if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$target_alias" = x; then
   ac_cv_target=$ac_cv_host
 else
   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-echo "$as_me: error: invalid value of canonical target" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
+$as_echo "$as_me: error: invalid value of canonical target" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 target=$ac_cv_target
@@ -3267,15 +3495,15 @@ else
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for APR" >&5
-echo $ECHO_N "checking for APR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for APR" >&5
+$as_echo_n "checking for APR... " >&6; }
 
 # Check whether --with-apr was given.
 if test "${with_apr+set}" = set; then
   withval=$with_apr;
     if test "$withval" = "no" || test "$withval" = "yes"; then
-      { { echo "$as_me:$LINENO: error: --with-apr requires a directory or file to be provided" >&5
-echo "$as_me: error: --with-apr requires a directory or file to be provided" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: --with-apr requires a directory or file to be provided" >&5
+$as_echo "$as_me: error: --with-apr requires a directory or file to be provided" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
@@ -3284,21 +3512,22 @@ echo "$as_me: error: --with-apr requires a directory or file to be provided" >&2
       for lookdir in "$withval/bin" "$withval"
       do
         if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then
-          apr_found="yes"
           apr_config="$lookdir/$apr_temp_apr_config_file"
+
+          apr_found="yes"
           break 2
         fi
       done
     done
 
     if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
-      apr_found="yes"
       apr_config="$withval"
+      apr_found="yes"
     fi
 
             if test "$apr_found" != "yes"; then
-      { { echo "$as_me:$LINENO: error: the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." >&5
-echo "$as_me: error: the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." >&2;}
+      { { $as_echo "$as_me:$LINENO: error: the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." >&5
+$as_echo "$as_me: error: the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." >&2;}
    { (exit 1); exit 1; }; }
     fi
 
@@ -3308,14 +3537,16 @@ else
       for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
       do
         if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then
-          apr_found="yes"
           apr_config="$apr_temp_apr_config_file"
+
+          apr_found="yes"
           break
         else
                     for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
             if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
-              apr_found="yes"
               apr_config="$lookdir/bin/$apr_temp_apr_config_file"
+
+              apr_found="yes"
               break 2
             fi
           done
@@ -3328,8 +3559,8 @@ else
       apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \""$srcdir/srclib/apr"/include/apr_version.h\"`"
       case $apr_bundled_major in
         "")
-          { { echo "$as_me:$LINENO: error: failed to find major version of bundled APR" >&5
-echo "$as_me: error: failed to find major version of bundled APR" >&2;}
+          { { $as_echo "$as_me:$LINENO: error: failed to find major version of bundled APR" >&5
+$as_echo "$as_me: error: failed to find major version of bundled APR" >&2;}
    { (exit 1); exit 1; }; }
         ;;
         0)
@@ -3349,14 +3580,14 @@ echo "$as_me: error: failed to find major version of bundled APR" >&2;}
 fi
 
 
-  { echo "$as_me:$LINENO: result: $apr_found" >&5
-echo "${ECHO_T}$apr_found" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $apr_found" >&5
+$as_echo "$apr_found" >&6; }
 
 fi
 
 if test "$apr_found" = "no"; then
-  { { echo "$as_me:$LINENO: error: APR not found.  Please read the documentation." >&5
-echo "$as_me: error: APR not found.  Please read the documentation." >&2;}
+  { { $as_echo "$as_me:$LINENO: error: APR not found.  Please read the documentation." >&5
+$as_echo "$as_me: error: APR not found.  Please read the documentation." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -3390,11 +3621,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -3427,12 +3659,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -3489,16 +3721,16 @@ rm -f confcache
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -3622,15 +3854,15 @@ else
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for APR-util" >&5
-echo $ECHO_N "checking for APR-util... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for APR-util" >&5
+$as_echo_n "checking for APR-util... " >&6; }
 
 # Check whether --with-apr-util was given.
 if test "${with_apr_util+set}" = set; then
   withval=$with_apr_util;
     if test "$withval" = "no" || test "$withval" = "yes"; then
-      { { echo "$as_me:$LINENO: error: --with-apr-util requires a directory or file to be provided" >&5
-echo "$as_me: error: --with-apr-util requires a directory or file to be provided" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: --with-apr-util requires a directory or file to be provided" >&5
+$as_echo "$as_me: error: --with-apr-util requires a directory or file to be provided" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
@@ -3639,21 +3871,22 @@ echo "$as_me: error: --with-apr-util requires a directory or file to be provided
       for lookdir in "$withval/bin" "$withval"
       do
         if $TEST_X "$lookdir/$apu_temp_apu_config_file"; then
-          apu_found="yes"
           apu_config="$lookdir/$apu_temp_apu_config_file"
+
+          apu_found="yes"
           break 2
         fi
       done
     done
 
     if test "$apu_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
-      apu_found="yes"
       apu_config="$withval"
+      apu_found="yes"
     fi
 
             if test "$apu_found" != "yes"; then
-      { { echo "$as_me:$LINENO: error: the --with-apr-util parameter is incorrect. It must specify an install prefix, a build directory, or an apu-config file." >&5
-echo "$as_me: error: the --with-apr-util parameter is incorrect. It must specify an install prefix, a build directory, or an apu-config file." >&2;}
+      { { $as_echo "$as_me:$LINENO: error: the --with-apr-util parameter is incorrect. It must specify an install prefix, a build directory, or an apu-config file." >&5
+$as_echo "$as_me: error: the --with-apr-util parameter is incorrect. It must specify an install prefix, a build directory, or an apu-config file." >&2;}
    { (exit 1); exit 1; }; }
     fi
 
@@ -3663,14 +3896,16 @@ else
       for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
       do
         if $apu_temp_apu_config_file --help > /dev/null 2>&1 ; then
-          apu_found="yes"
           apu_config="$apu_temp_apu_config_file"
+
+          apu_found="yes"
           break
         else
                     for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
             if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
-              apu_found="yes"
               apu_config="$lookdir/bin/$apu_temp_apu_config_file"
+
+              apu_found="yes"
               break 2
             fi
           done
@@ -3683,8 +3918,8 @@ else
       apu_bundled_major="`sed -n '/#define.*APU_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \""$srcdir/srclib/apr-util"/include/apu_version.h\"`"
       case $apu_bundled_major in
         "")
-          { { echo "$as_me:$LINENO: error: failed to find major version of bundled APU" >&5
-echo "$as_me: error: failed to find major version of bundled APU" >&2;}
+          { { $as_echo "$as_me:$LINENO: error: failed to find major version of bundled APU" >&5
+$as_echo "$as_me: error: failed to find major version of bundled APU" >&2;}
    { (exit 1); exit 1; }; }
         ;;
         0)
@@ -3704,27 +3939,27 @@ echo "$as_me: error: failed to find major version of bundled APU" >&2;}
 fi
 
 
-  { echo "$as_me:$LINENO: result: $apu_found" >&5
-echo "${ECHO_T}$apu_found" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $apu_found" >&5
+$as_echo "$apu_found" >&6; }
 
 fi
 
 if test "$apu_found" = "no"; then
-  { { echo "$as_me:$LINENO: error: APR-util not found.  Please read the documentation." >&5
-echo "$as_me: error: APR-util not found.  Please read the documentation." >&2;}
+  { { $as_echo "$as_me:$LINENO: error: APR-util not found.  Please read the documentation." >&5
+$as_echo "$as_me: error: APR-util not found.  Please read the documentation." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 # Catch some misconfigurations:
 case ${apr_found}.${apu_found} in
 reconfig.yes)
-  { { echo "$as_me:$LINENO: error: Cannot use an external APR-util with the bundled APR" >&5
-echo "$as_me: error: Cannot use an external APR-util with the bundled APR" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: Cannot use an external APR-util with the bundled APR" >&5
+$as_echo "$as_me: error: Cannot use an external APR-util with the bundled APR" >&2;}
    { (exit 1); exit 1; }; }
   ;;
 yes.reconfig)
-  { { echo "$as_me:$LINENO: error: Cannot use an external APR with the bundled APR-util" >&5
-echo "$as_me: error: Cannot use an external APR with the bundled APR-util" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: Cannot use an external APR with the bundled APR-util" >&5
+$as_echo "$as_me: error: Cannot use an external APR with the bundled APR-util" >&2;}
    { (exit 1); exit 1; }; }
   ;;
 esac
@@ -3759,11 +3994,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -3796,12 +4032,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -3858,16 +4094,16 @@ rm -f confcache
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -3910,10 +4146,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3924,9 +4160,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3937,11 +4173,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3950,10 +4186,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3964,9 +4200,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3977,11 +4213,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -3989,10 +4225,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -4007,10 +4243,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -4021,9 +4257,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4034,11 +4270,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4047,10 +4283,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -4062,13 +4298,13 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4091,11 +4327,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4106,10 +4342,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -4120,9 +4356,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4133,11 +4369,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4150,10 +4386,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -4164,9 +4400,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4177,11 +4413,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4193,10 +4429,10 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -4208,44 +4444,48 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -4264,27 +4504,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -4295,21 +4530,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
-for ac_file in $ac_files
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -4333,24 +4569,28 @@ done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
 else
-  echo "$as_me: failed program was:" >&5
+  ac_file=''
+fi
+
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -4359,49 +4599,51 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -4410,31 +4652,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4457,40 +4699,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4516,37 +4759,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -4556,15 +4783,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -4591,37 +4822,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -4646,37 +4861,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -4702,37 +4901,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4747,8 +4930,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -4764,10 +4947,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -4838,37 +5021,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4884,15 +5051,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -4907,15 +5074,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -4947,27 +5114,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4991,28 +5152,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -5037,8 +5192,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -5066,27 +5221,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -5110,28 +5259,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -5147,9 +5290,9 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5180,10 +5323,10 @@ fi
 case $with_pcre in
 yes) # Extract the first word of "pcre-config", so it can be a program name with args.
 set dummy pcre-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_PCRE_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $PCRE_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -5196,9 +5339,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PCRE_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5211,11 +5354,11 @@ esac
 fi
 PCRE_CONFIG=$ac_cv_path_PCRE_CONFIG
 if test -n "$PCRE_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $PCRE_CONFIG" >&5
-echo "${ECHO_T}$PCRE_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $PCRE_CONFIG" >&5
+$as_echo "$PCRE_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
  ;;
@@ -5226,8 +5369,8 @@ fi
      fi
 
      if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else
-       { { echo "$as_me:$LINENO: error: Did not find pcre-config script at $PCRE_CONFIG" >&5
-echo "$as_me: error: Did not find pcre-config script at $PCRE_CONFIG" >&2;}
+       { { $as_echo "$as_me:$LINENO: error: Did not find pcre-config script at $PCRE_CONFIG" >&5
+$as_echo "$as_me: error: Did not find pcre-config script at $PCRE_CONFIG" >&2;}
    { (exit 1); exit 1; }; }
      fi
      ;;
@@ -5235,8 +5378,8 @@ echo "$as_me: error: Did not find pcre-config script at $PCRE_CONFIG" >&2;}
 esac
 
 if test "$PCRE_CONFIG" != "false"; then
-  { echo "$as_me:$LINENO: Using external PCRE library from $PCRE_CONFIG" >&5
-echo "$as_me: Using external PCRE library from $PCRE_CONFIG" >&6;}
+  { $as_echo "$as_me:$LINENO: Using external PCRE library from $PCRE_CONFIG" >&5
+$as_echo "$as_me: Using external PCRE library from $PCRE_CONFIG" >&6;}
 
   if test "x$CFLAGS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting CFLAGS to \"`$PCRE_CONFIG --cflags`\""
@@ -5281,8 +5424,8 @@ echo "$as_me: Using external PCRE library from $PCRE_CONFIG" >&6;}
 
 else
   # Build the bundled PCRE
-  { echo "$as_me:$LINENO: Configuring PCRE regular expression library" >&5
-echo "$as_me: Configuring PCRE regular expression library" >&6;}
+  { $as_echo "$as_me:$LINENO: Configuring PCRE regular expression library" >&5
+$as_echo "$as_me: Configuring PCRE regular expression library" >&6;}
 
 
   # save our work to this point; this allows the sub-package to use it
@@ -5313,11 +5456,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -5350,12 +5494,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -5400,16 +5544,16 @@ rm -f confcache
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -5724,10 +5868,10 @@ esac
 
 # Extract the first word of "rm", so it can be a program name with args.
 set dummy rm; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_RM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $RM in
   [\\/]* | ?:[\\/]*)
@@ -5740,9 +5884,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5754,20 +5898,20 @@ esac
 fi
 RM=$ac_cv_path_RM
 if test -n "$RM"; then
-  { echo "$as_me:$LINENO: result: $RM" >&5
-echo "${ECHO_T}$RM" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RM" >&5
+$as_echo "$RM" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_PKGCONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $PKGCONFIG in
   [\\/]* | ?:[\\/]*)
@@ -5780,9 +5924,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5794,20 +5938,20 @@ esac
 fi
 PKGCONFIG=$ac_cv_path_PKGCONFIG
 if test -n "$PKGCONFIG"; then
-  { echo "$as_me:$LINENO: result: $PKGCONFIG" >&5
-echo "${ECHO_T}$PKGCONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $PKGCONFIG" >&5
+$as_echo "$PKGCONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "rsync", so it can be a program name with args.
 set dummy rsync; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_RSYNC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $RSYNC in
   [\\/]* | ?:[\\/]*)
@@ -5820,9 +5964,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_RSYNC="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5834,11 +5978,11 @@ esac
 fi
 RSYNC=$ac_cv_path_RSYNC
 if test -n "$RSYNC"; then
-  { echo "$as_me:$LINENO: result: $RSYNC" >&5
-echo "${ECHO_T}$RSYNC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RSYNC" >&5
+$as_echo "$RSYNC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5846,10 +5990,10 @@ for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -5860,9 +6004,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5873,35 +6017,35 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -5912,9 +6056,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5925,11 +6069,11 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5938,10 +6082,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -5952,9 +6096,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5965,11 +6109,11 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -5977,10 +6121,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -5995,10 +6139,10 @@ for ac_prog in lynx links elinks
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_LYNX_PATH+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$LYNX_PATH"; then
   ac_cv_prog_LYNX_PATH="$LYNX_PATH" # Let the user override the test.
@@ -6009,9 +6153,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LYNX_PATH="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6022,11 +6166,11 @@ fi
 fi
 LYNX_PATH=$ac_cv_prog_LYNX_PATH
 if test -n "$LYNX_PATH"; then
-  { echo "$as_me:$LINENO: result: $LYNX_PATH" >&5
-echo "${ECHO_T}$LYNX_PATH" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LYNX_PATH" >&5
+$as_echo "$LYNX_PATH" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6049,42 +6193,37 @@ INSTALL="\$(LIBTOOL) --mode=install \$(abs_srcdir)/build/install.sh -c"
 
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -6099,74 +6238,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -6181,168 +6306,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-
-{ echo "$as_me:$LINENO: checking for AIX" >&5
-echo $ECHO_N "checking for AIX... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef _AIX
-  yes
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define _ALL_SOURCE 1
-_ACEOF
-
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-rm -f conftest*
-
-
-{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' cposix; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_strerror=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext
-  if test "${ac_cv_search_strerror+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_strerror+set}" = set; then
-  :
-else
-  ac_cv_search_strerror=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
-ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6369,37 +6357,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -6491,37 +6463,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -6543,11 +6518,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6565,37 +6540,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -6603,12 +6562,14 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -6616,18 +6577,19 @@ fi
 done
 
 
+
+  if test "${ac_cv_header_minix_config_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
 if test "${ac_cv_header_minix_config_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for minix/config.h" >&5
-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_minix_config_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking minix/config.h usability" >&5
-echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
+$as_echo_n "checking minix/config.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6643,49 +6605,349 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
+$as_echo_n "checking minix/config.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <minix/config.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_minix_config_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+
+fi
+if test $ac_cv_header_minix_config_h = yes; then
+  MINIX=yes
+else
+  MINIX=
+fi
+
+
+  if test "$MINIX" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_SOURCE 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_1_SOURCE 2
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _MINIX 1
+_ACEOF
+
+  fi
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#	  define __EXTENSIONS__ 1
+	  $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_safe_to_define___extensions__=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_safe_to_define___extensions__=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    cat >>confdefs.h <<\_ACEOF
+#define __EXTENSIONS__ 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _ALL_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _POSIX_PTHREAD_SEMANTICS 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _TANDEM_SOURCE 1
+_ACEOF
+
+
+{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
+$as_echo_n "checking for library containing strerror... " >&6; }
+if test "${ac_cv_search_strerror+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strerror ();
+int
+main ()
+{
+return strerror ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' cposix; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_search_strerror=$ac_res
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_strerror+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_strerror+set}" = set; then
+  :
+else
+  ac_cv_search_strerror=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+$as_echo "$ac_cv_search_strerror" >&6; }
+ac_res=$ac_cv_search_strerror
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+
+  if test "${ac_cv_header_minix_config_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
+$as_echo_n "checking minix/config.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <minix/config.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking minix/config.h presence" >&5
-echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
+$as_echo_n "checking minix/config.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -6699,70 +6961,64 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for minix/config.h" >&5
-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
 if test "${ac_cv_header_minix_config_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_minix_config_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
 
 fi
 if test $ac_cv_header_minix_config_h = yes; then
@@ -6772,7 +7028,7 @@ else
 fi
 
 
-if test "$MINIX" = yes; then
+  if test "$MINIX" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define _POSIX_SOURCE 1
@@ -6788,8 +7044,84 @@ cat >>confdefs.h <<\_ACEOF
 #define _MINIX 1
 _ACEOF
 
+  fi
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#	  define __EXTENSIONS__ 1
+	  $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_safe_to_define___extensions__=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_safe_to_define___extensions__=no
 fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    cat >>confdefs.h <<\_ACEOF
+#define __EXTENSIONS__ 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _ALL_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _POSIX_PTHREAD_SEMANTICS 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _TANDEM_SOURCE 1
+_ACEOF
+
+
 
 # Ensure that satisfactory versions of apr and apr-util are
 # found if external copies are configured.
@@ -6804,10 +7136,10 @@ if test "${apr_found}" = "yes"; then
 ap_ckver_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS `$apr_config --includes`"
 
-{ echo "$as_me:$LINENO: checking for APR version 1.2.0 or later" >&5
-echo $ECHO_N "checking for APR version 1.2.0 or later... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for APR version 1.2.0 or later" >&5
+$as_echo_n "checking for APR version 1.2.0 or later... " >&6; }
 if test "${ap_cv_aprver12+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -6832,14 +7164,14 @@ fi
 rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $ap_cv_aprver12" >&5
-echo "${ECHO_T}$ap_cv_aprver12" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ap_cv_aprver12" >&5
+$as_echo "$ap_cv_aprver12" >&6; }
 
 if test "$ap_cv_aprver12" = "yes"; then
   :
 else
-  { { echo "$as_me:$LINENO: error: APR version 1.2.0 or later is required" >&5
-echo "$as_me: error: APR version 1.2.0 or later is required" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: APR version 1.2.0 or later is required" >&5
+$as_echo "$as_me: error: APR version 1.2.0 or later is required" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -6863,10 +7195,10 @@ if test "${apu_found}" = "yes"; then
 ap_ckver_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS `$apu_config --includes`"
 
-{ echo "$as_me:$LINENO: checking for APR-util version 1.2.0 or later" >&5
-echo $ECHO_N "checking for APR-util version 1.2.0 or later... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for APR-util version 1.2.0 or later" >&5
+$as_echo_n "checking for APR-util version 1.2.0 or later... " >&6; }
 if test "${ap_cv_apuver12+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -6891,14 +7223,14 @@ fi
 rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $ap_cv_apuver12" >&5
-echo "${ECHO_T}$ap_cv_apuver12" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ap_cv_apuver12" >&5
+$as_echo "$ap_cv_apuver12" >&6; }
 
 if test "$ap_cv_apuver12" = "yes"; then
   :
 else
-  { { echo "$as_me:$LINENO: error: APR-util version 1.2.0 or later is required" >&5
-echo "$as_me: error: APR-util version 1.2.0 or later is required" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: APR-util version 1.2.0 or later is required" >&5
+$as_echo "$as_me: error: APR-util version 1.2.0 or later is required" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -6922,16 +7254,16 @@ else
 EOF
   MKDEP="true"
   for i in "$CC -MM" "$CC -M" "$CPP -MM" "$CPP -M" "cpp -M"; do
-    { echo "$as_me:$LINENO: checking if $i can create proper make dependencies" >&5
-echo $ECHO_N "checking if $i can create proper make dependencies... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking if $i can create proper make dependencies" >&5
+$as_echo_n "checking if $i can create proper make dependencies... " >&6; }
     if $i conftest.c 2>/dev/null | grep 'conftest.o: conftest.c' >/dev/null; then
       MKDEP=$i
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
       break;
     fi
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   done
   rm -f conftest.c
 fi
@@ -6943,10 +7275,10 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6973,37 +7305,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -7095,37 +7411,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -7157,20 +7476,21 @@ sys/processor.h \
 sys/sem.h
 
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7186,49 +7506,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7242,86 +7546,82 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
+$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
 if test "${ac_cv_header_sys_wait_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -7354,37 +7654,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_sys_wait_h=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_sys_wait_h=no
@@ -7392,8 +7676,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
+$as_echo "$ac_cv_header_sys_wait_h" >&6; }
 if test $ac_cv_header_sys_wait_h = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -7404,10 +7688,10 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -7423,10 +7707,10 @@ main ()
 #ifndef __cplusplus
   /* Ultrix mips cc rejects this.  */
   typedef int charset[2];
-  const charset x;
+  const charset cs;
   /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *ccp;
-  char **p;
+  char const *const *pcpcc;
+  char **ppc;
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
   static struct point const zero = {0,0};
@@ -7435,11 +7719,11 @@ main ()
      an arm of an if-expression whose if-part is not a constant
      expression */
   const char *g = "string";
-  ccp = &g + (g ? g-g : 0);
+  pcpcc = &g + (g ? g-g : 0);
   /* HPUX 7.0 cc rejects these. */
-  ++ccp;
-  p = (char**) ccp;
-  ccp = (char const *const *) p;
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
   { /* SCO 3.2v4 cc rejects this.  */
     char *t;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
@@ -7466,7 +7750,7 @@ main ()
     const int foo = 10;
     if (!foo) return 0;
   }
-  return !x[0] && !zero.x;
+  return !cs[0] && !zero.x;
 #endif
 
   ;
@@ -7479,37 +7763,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_const=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_const=no
@@ -7517,21 +7785,21 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF
-#define const
+#define const /**/
 _ACEOF
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking for library containing sqrt" >&5
-echo $ECHO_N "checking for library containing sqrt... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing sqrt" >&5
+$as_echo_n "checking for library containing sqrt... " >&6; }
 if test "${ac_cv_search_sqrt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -7569,43 +7837,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_sqrt=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_sqrt+set}" = set; then
   break
@@ -7619,8 +7875,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_sqrt" >&5
-echo "${ECHO_T}$ac_cv_search_sqrt" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_sqrt" >&5
+$as_echo "$ac_cv_search_sqrt" >&6; }
 ac_res=$ac_cv_search_sqrt
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -7646,11 +7902,11 @@ timegm \
 getpgid
 
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -7703,51 +7959,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -7756,10 +8002,10 @@ done
 
 
 
-{ echo "$as_me:$LINENO: checking for void pointer length" >&5
-echo $ECHO_N "checking for void pointer length... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for void pointer length" >&5
+$as_echo_n "checking for void pointer length... " >&6; }
 if test "${ap_void_ptr_lt_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   ap_void_ptr_lt_long=yes
@@ -7782,48 +8028,51 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ap_void_ptr_lt_long=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ap_void_ptr_lt_long=yes
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ap_void_ptr_lt_long" >&5
-echo "${ECHO_T}$ap_void_ptr_lt_long" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ap_void_ptr_lt_long" >&5
+$as_echo "$ap_void_ptr_lt_long" >&6; }
 
 if test "$ap_void_ptr_lt_long" = "yes"; then
-    { { echo "$as_me:$LINENO: error: Size of \"void *\" is less than size of \"long\"" >&5
-echo "$as_me: error: Size of \"void *\" is less than size of \"long\"" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Size of \"void *\" is less than size of \"long\"" >&5
+$as_echo "$as_me: error: Size of \"void *\" is less than size of \"long\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-{ echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
-echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
+$as_echo_n "checking for tm_gmtoff in struct tm... " >&6; }
 if test "${ac_cv_struct_tm_gmtoff+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -7847,37 +8096,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_struct_tm_gmtoff=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_struct_tm_gmtoff=no
@@ -7885,8 +8118,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm_gmtoff" >&5
-echo "${ECHO_T}$ac_cv_struct_tm_gmtoff" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm_gmtoff" >&5
+$as_echo "$ac_cv_struct_tm_gmtoff" >&6; }
 if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -7920,8 +8153,8 @@ esac
 
 # Check whether --with-port was given.
 if test "${with_port+set}" = set; then
-  withval=$with_port; if test "$withval" = "yes"; then { { echo "$as_me:$LINENO: error: 'option --with-port requires a value (the TCP port number)'" >&5
-echo "$as_me: error: 'option --with-port requires a value (the TCP port number)'" >&2;}
+  withval=$with_port; if test "$withval" = "yes"; then { { $as_echo "$as_me:$LINENO: error: 'option --with-port requires a value (the TCP port number)'" >&5
+$as_echo "$as_me: error: 'option --with-port requires a value (the TCP port number)'" >&2;}
    { (exit 1); exit 1; }; }; else PORT="$withval"; fi
 else
   PORT=80
@@ -7929,6 +8162,17 @@ fi
 
 
 
+# Check whether --with-sslport was given.
+if test "${with_sslport+set}" = set; then
+  withval=$with_sslport; if test "$withval" = "yes"; then { { $as_echo "$as_me:$LINENO: error: 'option --with-sslport requires a value (the SSL TCP port number)'" >&5
+$as_echo "$as_me: error: 'option --with-sslport requires a value (the SSL TCP port number)'" >&2;}
+   { (exit 1); exit 1; }; }; else SSLPORT="$withval"; fi
+else
+  SSLPORT=443
+fi
+
+
+
 apr_old_cppflags=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $INCLUDES"
 cat >conftest.$ac_ext <<_ACEOF
@@ -8026,10 +8270,10 @@ if test "${enable_pie+set}" = set; then
 fi
 
 if test "$enable_pie" = "yes"; then
-   { echo "$as_me:$LINENO: checking whether $CC accepts PIE flags" >&5
-echo $ECHO_N "checking whether $CC accepts PIE flags... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking whether $CC accepts PIE flags" >&5
+$as_echo_n "checking whether $CC accepts PIE flags... " >&6; }
 if test "${ap_cv_cc_pie+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
      save_CFLAGS=$CFLAGS
@@ -8053,29 +8297,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ap_cv_cc_pie=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ap_cv_cc_pie=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -8084,14 +8331,14 @@ fi
      LDFLAGS=$save_LDFLAGS
 
 fi
-{ echo "$as_me:$LINENO: result: $ap_cv_cc_pie" >&5
-echo "${ECHO_T}$ap_cv_cc_pie" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ap_cv_cc_pie" >&5
+$as_echo "$ap_cv_cc_pie" >&6; }
    if test "$ap_cv_cc_pie" = "yes"; then
      PICFLAGS="-fPIE"
      PILDFLAGS="-pie"
    else
-     { { echo "$as_me:$LINENO: error: --enable-pie requested but $CC failed using PIE flags" >&5
-echo "$as_me: error: --enable-pie requested but $CC failed using PIE flags" >&2;}
+     { { $as_echo "$as_me:$LINENO: error: --enable-pie requested but $CC failed using PIE flags" >&5
+$as_echo "$as_me: error: --enable-pie requested but $CC failed using PIE flags" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
@@ -8148,8 +8395,8 @@ fi
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_authn_file" >&5
-echo $ECHO_N "checking whether to enable mod_authn_file... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authn_file" >&5
+$as_echo_n "checking whether to enable mod_authn_file... " >&6; }
     # Check whether --enable-authn-file was given.
 if test "${enable_authn_file+set}" = set; then
   enableval=$enable_authn_file;
@@ -8186,8 +8433,8 @@ fi
   if test "$enable_authn_file" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_authn_file$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_authn_file$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_authn_file$_apmod_extra_msg" >&5
+$as_echo "$enable_authn_file$_apmod_extra_msg" >&6; }
   if test "$enable_authn_file" != "no"; then
     case "$enable_authn_file" in
     shared*)
@@ -8241,8 +8488,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_authn_dbm" >&5
-echo $ECHO_N "checking whether to enable mod_authn_dbm... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authn_dbm" >&5
+$as_echo_n "checking whether to enable mod_authn_dbm... " >&6; }
     # Check whether --enable-authn-dbm was given.
 if test "${enable_authn_dbm+set}" = set; then
   enableval=$enable_authn_dbm;
@@ -8279,8 +8526,8 @@ fi
   if test "$enable_authn_dbm" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_authn_dbm$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_authn_dbm$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_authn_dbm$_apmod_extra_msg" >&5
+$as_echo "$enable_authn_dbm$_apmod_extra_msg" >&6; }
   if test "$enable_authn_dbm" != "no"; then
     case "$enable_authn_dbm" in
     shared*)
@@ -8334,8 +8581,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_authn_anon" >&5
-echo $ECHO_N "checking whether to enable mod_authn_anon... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authn_anon" >&5
+$as_echo_n "checking whether to enable mod_authn_anon... " >&6; }
     # Check whether --enable-authn-anon was given.
 if test "${enable_authn_anon+set}" = set; then
   enableval=$enable_authn_anon;
@@ -8372,8 +8619,8 @@ fi
   if test "$enable_authn_anon" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_authn_anon$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_authn_anon$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_authn_anon$_apmod_extra_msg" >&5
+$as_echo "$enable_authn_anon$_apmod_extra_msg" >&6; }
   if test "$enable_authn_anon" != "no"; then
     case "$enable_authn_anon" in
     shared*)
@@ -8427,8 +8674,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_authn_dbd" >&5
-echo $ECHO_N "checking whether to enable mod_authn_dbd... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authn_dbd" >&5
+$as_echo_n "checking whether to enable mod_authn_dbd... " >&6; }
     # Check whether --enable-authn-dbd was given.
 if test "${enable_authn_dbd+set}" = set; then
   enableval=$enable_authn_dbd;
@@ -8465,8 +8712,8 @@ fi
   if test "$enable_authn_dbd" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_authn_dbd$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_authn_dbd$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_authn_dbd$_apmod_extra_msg" >&5
+$as_echo "$enable_authn_dbd$_apmod_extra_msg" >&6; }
   if test "$enable_authn_dbd" != "no"; then
     case "$enable_authn_dbd" in
     shared*)
@@ -8521,8 +8768,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_authn_default" >&5
-echo $ECHO_N "checking whether to enable mod_authn_default... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authn_default" >&5
+$as_echo_n "checking whether to enable mod_authn_default... " >&6; }
     # Check whether --enable-authn-default was given.
 if test "${enable_authn_default+set}" = set; then
   enableval=$enable_authn_default;
@@ -8559,8 +8806,8 @@ fi
   if test "$enable_authn_default" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_authn_default$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_authn_default$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_authn_default$_apmod_extra_msg" >&5
+$as_echo "$enable_authn_default$_apmod_extra_msg" >&6; }
   if test "$enable_authn_default" != "no"; then
     case "$enable_authn_default" in
     shared*)
@@ -8615,8 +8862,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_authn_alias" >&5
-echo $ECHO_N "checking whether to enable mod_authn_alias... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authn_alias" >&5
+$as_echo_n "checking whether to enable mod_authn_alias... " >&6; }
     # Check whether --enable-authn-alias was given.
 if test "${enable_authn_alias+set}" = set; then
   enableval=$enable_authn_alias;
@@ -8653,8 +8900,8 @@ fi
   if test "$enable_authn_alias" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_authn_alias$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_authn_alias$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_authn_alias$_apmod_extra_msg" >&5
+$as_echo "$enable_authn_alias$_apmod_extra_msg" >&6; }
   if test "$enable_authn_alias" != "no"; then
     case "$enable_authn_alias" in
     shared*)
@@ -8709,8 +8956,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_authz_host" >&5
-echo $ECHO_N "checking whether to enable mod_authz_host... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authz_host" >&5
+$as_echo_n "checking whether to enable mod_authz_host... " >&6; }
     # Check whether --enable-authz-host was given.
 if test "${enable_authz_host+set}" = set; then
   enableval=$enable_authz_host;
@@ -8747,8 +8994,8 @@ fi
   if test "$enable_authz_host" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_authz_host$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_authz_host$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_authz_host$_apmod_extra_msg" >&5
+$as_echo "$enable_authz_host$_apmod_extra_msg" >&6; }
   if test "$enable_authz_host" != "no"; then
     case "$enable_authz_host" in
     shared*)
@@ -8802,8 +9049,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_authz_groupfile" >&5
-echo $ECHO_N "checking whether to enable mod_authz_groupfile... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authz_groupfile" >&5
+$as_echo_n "checking whether to enable mod_authz_groupfile... " >&6; }
     # Check whether --enable-authz-groupfile was given.
 if test "${enable_authz_groupfile+set}" = set; then
   enableval=$enable_authz_groupfile;
@@ -8840,8 +9087,8 @@ fi
   if test "$enable_authz_groupfile" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_authz_groupfile$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_authz_groupfile$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_authz_groupfile$_apmod_extra_msg" >&5
+$as_echo "$enable_authz_groupfile$_apmod_extra_msg" >&6; }
   if test "$enable_authz_groupfile" != "no"; then
     case "$enable_authz_groupfile" in
     shared*)
@@ -8895,8 +9142,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_authz_user" >&5
-echo $ECHO_N "checking whether to enable mod_authz_user... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authz_user" >&5
+$as_echo_n "checking whether to enable mod_authz_user... " >&6; }
     # Check whether --enable-authz-user was given.
 if test "${enable_authz_user+set}" = set; then
   enableval=$enable_authz_user;
@@ -8933,8 +9180,8 @@ fi
   if test "$enable_authz_user" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_authz_user$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_authz_user$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_authz_user$_apmod_extra_msg" >&5
+$as_echo "$enable_authz_user$_apmod_extra_msg" >&6; }
   if test "$enable_authz_user" != "no"; then
     case "$enable_authz_user" in
     shared*)
@@ -8988,8 +9235,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_authz_dbm" >&5
-echo $ECHO_N "checking whether to enable mod_authz_dbm... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authz_dbm" >&5
+$as_echo_n "checking whether to enable mod_authz_dbm... " >&6; }
     # Check whether --enable-authz-dbm was given.
 if test "${enable_authz_dbm+set}" = set; then
   enableval=$enable_authz_dbm;
@@ -9026,8 +9273,8 @@ fi
   if test "$enable_authz_dbm" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_authz_dbm$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_authz_dbm$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_authz_dbm$_apmod_extra_msg" >&5
+$as_echo "$enable_authz_dbm$_apmod_extra_msg" >&6; }
   if test "$enable_authz_dbm" != "no"; then
     case "$enable_authz_dbm" in
     shared*)
@@ -9081,8 +9328,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_authz_owner" >&5
-echo $ECHO_N "checking whether to enable mod_authz_owner... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authz_owner" >&5
+$as_echo_n "checking whether to enable mod_authz_owner... " >&6; }
     # Check whether --enable-authz-owner was given.
 if test "${enable_authz_owner+set}" = set; then
   enableval=$enable_authz_owner;
@@ -9119,8 +9366,8 @@ fi
   if test "$enable_authz_owner" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_authz_owner$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_authz_owner$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_authz_owner$_apmod_extra_msg" >&5
+$as_echo "$enable_authz_owner$_apmod_extra_msg" >&6; }
   if test "$enable_authz_owner" != "no"; then
     case "$enable_authz_owner" in
     shared*)
@@ -9175,8 +9422,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_authnz_ldap" >&5
-echo $ECHO_N "checking whether to enable mod_authnz_ldap... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authnz_ldap" >&5
+$as_echo_n "checking whether to enable mod_authnz_ldap... " >&6; }
     # Check whether --enable-authnz-ldap was given.
 if test "${enable_authnz_ldap+set}" = set; then
   enableval=$enable_authnz_ldap;
@@ -9211,10 +9458,26 @@ fi
     fi
   fi
   if test "$enable_authnz_ldap" != "no"; then
-            :
+            { $as_echo "$as_me:$LINENO: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+
+  MOD_AUTHNZ_LDAP_LDADD="`$apu_config --ldap-libs`" || MOD_AUTHNZ_LDAP_LDADD=""
+
+
+                    { $as_echo "$as_me:$LINENO: checking whether to enable mod_authnz_ldap" >&5
+$as_echo_n "checking whether to enable mod_authnz_ldap... " >&6; }
+                    if test "$enable_authnz_ldap" = "no"; then
+                      if test "$_apmod_error_fatal" = "no"; then
+                        _apmod_extra_msg=" (disabled)"
+                      else
+                        { { $as_echo "$as_me:$LINENO: error: mod_authnz_ldap has been requested but can not be built due to prerequisite failures" >&5
+$as_echo "$as_me: error: mod_authnz_ldap has been requested but can not be built due to prerequisite failures" >&2;}
+   { (exit 1); exit 1; }; }
+                      fi
+                    fi
   fi
-  { echo "$as_me:$LINENO: result: $enable_authnz_ldap$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_authnz_ldap$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_authnz_ldap$_apmod_extra_msg" >&5
+$as_echo "$enable_authnz_ldap$_apmod_extra_msg" >&6; }
   if test "$enable_authnz_ldap" != "no"; then
     case "$enable_authnz_ldap" in
     shared*)
@@ -9269,8 +9532,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_authz_default" >&5
-echo $ECHO_N "checking whether to enable mod_authz_default... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_authz_default" >&5
+$as_echo_n "checking whether to enable mod_authz_default... " >&6; }
     # Check whether --enable-authz-default was given.
 if test "${enable_authz_default+set}" = set; then
   enableval=$enable_authz_default;
@@ -9307,8 +9570,8 @@ fi
   if test "$enable_authz_default" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_authz_default$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_authz_default$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_authz_default$_apmod_extra_msg" >&5
+$as_echo "$enable_authz_default$_apmod_extra_msg" >&6; }
   if test "$enable_authz_default" != "no"; then
     case "$enable_authz_default" in
     shared*)
@@ -9364,8 +9627,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_auth_basic" >&5
-echo $ECHO_N "checking whether to enable mod_auth_basic... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_auth_basic" >&5
+$as_echo_n "checking whether to enable mod_auth_basic... " >&6; }
     # Check whether --enable-auth-basic was given.
 if test "${enable_auth_basic+set}" = set; then
   enableval=$enable_auth_basic;
@@ -9402,8 +9665,8 @@ fi
   if test "$enable_auth_basic" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_auth_basic$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_auth_basic$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_auth_basic$_apmod_extra_msg" >&5
+$as_echo "$enable_auth_basic$_apmod_extra_msg" >&6; }
   if test "$enable_auth_basic" != "no"; then
     case "$enable_auth_basic" in
     shared*)
@@ -9457,8 +9720,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_auth_digest" >&5
-echo $ECHO_N "checking whether to enable mod_auth_digest... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_auth_digest" >&5
+$as_echo_n "checking whether to enable mod_auth_digest... " >&6; }
     # Check whether --enable-auth-digest was given.
 if test "${enable_auth_digest+set}" = set; then
   enableval=$enable_auth_digest;
@@ -9493,8 +9756,8 @@ fi
     fi
   fi
   if test "$enable_auth_digest" != "no"; then
-            { echo "$as_me:$LINENO: result: checking dependencies" >&5
-echo "${ECHO_T}checking dependencies" >&6; }
+            { $as_echo "$as_me:$LINENO: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
 
 
 apr_old_cppflags=$CPPFLAGS
@@ -9528,20 +9791,20 @@ CPPFLAGS=$apr_old_cppflags
     enable_auth_digest="no"
   fi
 
-                    { echo "$as_me:$LINENO: checking whether to enable mod_auth_digest" >&5
-echo $ECHO_N "checking whether to enable mod_auth_digest... $ECHO_C" >&6; }
+                    { $as_echo "$as_me:$LINENO: checking whether to enable mod_auth_digest" >&5
+$as_echo_n "checking whether to enable mod_auth_digest... " >&6; }
                     if test "$enable_auth_digest" = "no"; then
                       if test "$_apmod_error_fatal" = "no"; then
                         _apmod_extra_msg=" (disabled)"
                       else
-                        { { echo "$as_me:$LINENO: error: mod_auth_digest has been requested but can not be built due to prerequisite failures" >&5
-echo "$as_me: error: mod_auth_digest has been requested but can not be built due to prerequisite failures" >&2;}
+                        { { $as_echo "$as_me:$LINENO: error: mod_auth_digest has been requested but can not be built due to prerequisite failures" >&5
+$as_echo "$as_me: error: mod_auth_digest has been requested but can not be built due to prerequisite failures" >&2;}
    { (exit 1); exit 1; }; }
                       fi
                     fi
   fi
-  { echo "$as_me:$LINENO: result: $enable_auth_digest$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_auth_digest$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_auth_digest$_apmod_extra_msg" >&5
+$as_echo "$enable_auth_digest$_apmod_extra_msg" >&6; }
   if test "$enable_auth_digest" != "no"; then
     case "$enable_auth_digest" in
     shared*)
@@ -9621,8 +9884,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_isapi" >&5
-echo $ECHO_N "checking whether to enable mod_isapi... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_isapi" >&5
+$as_echo_n "checking whether to enable mod_isapi... " >&6; }
     # Check whether --enable-isapi was given.
 if test "${enable_isapi+set}" = set; then
   enableval=$enable_isapi;
@@ -9659,8 +9922,8 @@ fi
   if test "$enable_isapi" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_isapi$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_isapi$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_isapi$_apmod_extra_msg" >&5
+$as_echo "$enable_isapi$_apmod_extra_msg" >&6; }
   if test "$enable_isapi" != "no"; then
     case "$enable_isapi" in
     shared*)
@@ -9740,8 +10003,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_file_cache" >&5
-echo $ECHO_N "checking whether to enable mod_file_cache... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_file_cache" >&5
+$as_echo_n "checking whether to enable mod_file_cache... " >&6; }
     # Check whether --enable-file-cache was given.
 if test "${enable_file_cache+set}" = set; then
   enableval=$enable_file_cache;
@@ -9778,8 +10041,8 @@ fi
   if test "$enable_file_cache" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_file_cache$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_file_cache$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_file_cache$_apmod_extra_msg" >&5
+$as_echo "$enable_file_cache$_apmod_extra_msg" >&6; }
   if test "$enable_file_cache" != "no"; then
     case "$enable_file_cache" in
     shared*)
@@ -9836,8 +10099,8 @@ EOF
 cache_objs="mod_cache.lo cache_storage.lo cache_util.lo "
 mem_cache_objs="mod_mem_cache.lo cache_cache.lo cache_pqueue.lo cache_hash.lo "
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_cache" >&5
-echo $ECHO_N "checking whether to enable mod_cache... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_cache" >&5
+$as_echo_n "checking whether to enable mod_cache... " >&6; }
     # Check whether --enable-cache was given.
 if test "${enable_cache+set}" = set; then
   enableval=$enable_cache;
@@ -9874,8 +10137,8 @@ fi
   if test "$enable_cache" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_cache$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_cache$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_cache$_apmod_extra_msg" >&5
+$as_echo "$enable_cache$_apmod_extra_msg" >&6; }
   if test "$enable_cache" != "no"; then
     case "$enable_cache" in
     shared*)
@@ -9929,8 +10192,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_disk_cache" >&5
-echo $ECHO_N "checking whether to enable mod_disk_cache... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_disk_cache" >&5
+$as_echo_n "checking whether to enable mod_disk_cache... " >&6; }
     # Check whether --enable-disk-cache was given.
 if test "${enable_disk_cache+set}" = set; then
   enableval=$enable_disk_cache;
@@ -9967,8 +10230,8 @@ fi
   if test "$enable_disk_cache" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_disk_cache$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_disk_cache$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_disk_cache$_apmod_extra_msg" >&5
+$as_echo "$enable_disk_cache$_apmod_extra_msg" >&6; }
   if test "$enable_disk_cache" != "no"; then
     case "$enable_disk_cache" in
     shared*)
@@ -10022,8 +10285,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_mem_cache" >&5
-echo $ECHO_N "checking whether to enable mod_mem_cache... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_mem_cache" >&5
+$as_echo_n "checking whether to enable mod_mem_cache... " >&6; }
     # Check whether --enable-mem-cache was given.
 if test "${enable_mem_cache+set}" = set; then
   enableval=$enable_mem_cache;
@@ -10060,8 +10323,8 @@ fi
   if test "$enable_mem_cache" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_mem_cache$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_mem_cache$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_mem_cache$_apmod_extra_msg" >&5
+$as_echo "$enable_mem_cache$_apmod_extra_msg" >&6; }
   if test "$enable_mem_cache" != "no"; then
     case "$enable_mem_cache" in
     shared*)
@@ -10140,8 +10403,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_dbd" >&5
-echo $ECHO_N "checking whether to enable mod_dbd... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_dbd" >&5
+$as_echo_n "checking whether to enable mod_dbd... " >&6; }
     # Check whether --enable-dbd was given.
 if test "${enable_dbd+set}" = set; then
   enableval=$enable_dbd;
@@ -10178,8 +10441,8 @@ fi
   if test "$enable_dbd" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_dbd$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_dbd$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_dbd$_apmod_extra_msg" >&5
+$as_echo "$enable_dbd$_apmod_extra_msg" >&6; }
   if test "$enable_dbd" != "no"; then
     case "$enable_dbd" in
     shared*)
@@ -10258,8 +10521,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_bucketeer" >&5
-echo $ECHO_N "checking whether to enable mod_bucketeer... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_bucketeer" >&5
+$as_echo_n "checking whether to enable mod_bucketeer... " >&6; }
     # Check whether --enable-bucketeer was given.
 if test "${enable_bucketeer+set}" = set; then
   enableval=$enable_bucketeer;
@@ -10296,8 +10559,8 @@ fi
   if test "$enable_bucketeer" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_bucketeer$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_bucketeer$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_bucketeer$_apmod_extra_msg" >&5
+$as_echo "$enable_bucketeer$_apmod_extra_msg" >&6; }
   if test "$enable_bucketeer" != "no"; then
     case "$enable_bucketeer" in
     shared*)
@@ -10351,8 +10614,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_dumpio" >&5
-echo $ECHO_N "checking whether to enable mod_dumpio... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_dumpio" >&5
+$as_echo_n "checking whether to enable mod_dumpio... " >&6; }
     # Check whether --enable-dumpio was given.
 if test "${enable_dumpio+set}" = set; then
   enableval=$enable_dumpio;
@@ -10389,8 +10652,8 @@ fi
   if test "$enable_dumpio" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_dumpio$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_dumpio$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_dumpio$_apmod_extra_msg" >&5
+$as_echo "$enable_dumpio$_apmod_extra_msg" >&6; }
   if test "$enable_dumpio" != "no"; then
     case "$enable_dumpio" in
     shared*)
@@ -10470,8 +10733,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_echo" >&5
-echo $ECHO_N "checking whether to enable mod_echo... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_echo" >&5
+$as_echo_n "checking whether to enable mod_echo... " >&6; }
     # Check whether --enable-echo was given.
 if test "${enable_echo+set}" = set; then
   enableval=$enable_echo;
@@ -10508,8 +10771,8 @@ fi
   if test "$enable_echo" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_echo$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_echo$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_echo$_apmod_extra_msg" >&5
+$as_echo "$enable_echo$_apmod_extra_msg" >&6; }
   if test "$enable_echo" != "no"; then
     case "$enable_echo" in
     shared*)
@@ -10588,8 +10851,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_example" >&5
-echo $ECHO_N "checking whether to enable mod_example... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_example" >&5
+$as_echo_n "checking whether to enable mod_example... " >&6; }
     # Check whether --enable-example was given.
 if test "${enable_example+set}" = set; then
   enableval=$enable_example;
@@ -10626,8 +10889,8 @@ fi
   if test "$enable_example" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_example$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_example$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_example$_apmod_extra_msg" >&5
+$as_echo "$enable_example$_apmod_extra_msg" >&6; }
   if test "$enable_example" != "no"; then
     case "$enable_example" in
     shared*)
@@ -10681,8 +10944,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_case_filter" >&5
-echo $ECHO_N "checking whether to enable mod_case_filter... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_case_filter" >&5
+$as_echo_n "checking whether to enable mod_case_filter... " >&6; }
     # Check whether --enable-case-filter was given.
 if test "${enable_case_filter+set}" = set; then
   enableval=$enable_case_filter;
@@ -10719,8 +10982,8 @@ fi
   if test "$enable_case_filter" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_case_filter$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_case_filter$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_case_filter$_apmod_extra_msg" >&5
+$as_echo "$enable_case_filter$_apmod_extra_msg" >&6; }
   if test "$enable_case_filter" != "no"; then
     case "$enable_case_filter" in
     shared*)
@@ -10774,8 +11037,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_case_filter_in" >&5
-echo $ECHO_N "checking whether to enable mod_case_filter_in... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_case_filter_in" >&5
+$as_echo_n "checking whether to enable mod_case_filter_in... " >&6; }
     # Check whether --enable-case-filter-in was given.
 if test "${enable_case_filter_in+set}" = set; then
   enableval=$enable_case_filter_in;
@@ -10812,8 +11075,8 @@ fi
   if test "$enable_case_filter_in" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_case_filter_in$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_case_filter_in$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_case_filter_in$_apmod_extra_msg" >&5
+$as_echo "$enable_case_filter_in$_apmod_extra_msg" >&6; }
   if test "$enable_case_filter_in" != "no"; then
     case "$enable_case_filter_in" in
     shared*)
@@ -10893,8 +11156,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_ext_filter" >&5
-echo $ECHO_N "checking whether to enable mod_ext_filter... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_ext_filter" >&5
+$as_echo_n "checking whether to enable mod_ext_filter... " >&6; }
     # Check whether --enable-ext-filter was given.
 if test "${enable_ext_filter+set}" = set; then
   enableval=$enable_ext_filter;
@@ -10931,8 +11194,8 @@ fi
   if test "$enable_ext_filter" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_ext_filter$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_ext_filter$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_ext_filter$_apmod_extra_msg" >&5
+$as_echo "$enable_ext_filter$_apmod_extra_msg" >&6; }
   if test "$enable_ext_filter" != "no"; then
     case "$enable_ext_filter" in
     shared*)
@@ -10986,8 +11249,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_include" >&5
-echo $ECHO_N "checking whether to enable mod_include... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_include" >&5
+$as_echo_n "checking whether to enable mod_include... " >&6; }
     # Check whether --enable-include was given.
 if test "${enable_include+set}" = set; then
   enableval=$enable_include;
@@ -11024,8 +11287,8 @@ fi
   if test "$enable_include" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_include$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_include$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_include$_apmod_extra_msg" >&5
+$as_echo "$enable_include$_apmod_extra_msg" >&6; }
   if test "$enable_include" != "no"; then
     case "$enable_include" in
     shared*)
@@ -11079,8 +11342,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_filter" >&5
-echo $ECHO_N "checking whether to enable mod_filter... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_filter" >&5
+$as_echo_n "checking whether to enable mod_filter... " >&6; }
     # Check whether --enable-filter was given.
 if test "${enable_filter+set}" = set; then
   enableval=$enable_filter;
@@ -11117,8 +11380,8 @@ fi
   if test "$enable_filter" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_filter$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_filter$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_filter$_apmod_extra_msg" >&5
+$as_echo "$enable_filter$_apmod_extra_msg" >&6; }
   if test "$enable_filter" != "no"; then
     case "$enable_filter" in
     shared*)
@@ -11172,8 +11435,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_substitute" >&5
-echo $ECHO_N "checking whether to enable mod_substitute... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_substitute" >&5
+$as_echo_n "checking whether to enable mod_substitute... " >&6; }
     # Check whether --enable-substitute was given.
 if test "${enable_substitute+set}" = set; then
   enableval=$enable_substitute;
@@ -11210,8 +11473,8 @@ fi
   if test "$enable_substitute" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_substitute$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_substitute$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_substitute$_apmod_extra_msg" >&5
+$as_echo "$enable_substitute$_apmod_extra_msg" >&6; }
   if test "$enable_substitute" != "no"; then
     case "$enable_substitute" in
     shared*)
@@ -11269,8 +11532,8 @@ if test "$ac_cv_ebcdic" = "yes"; then
 # mod_charset_lite can be very useful on an ebcdic system,
 #   so include it by default
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_charset_lite" >&5
-echo $ECHO_N "checking whether to enable mod_charset_lite... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_charset_lite" >&5
+$as_echo_n "checking whether to enable mod_charset_lite... " >&6; }
     # Check whether --enable-charset-lite was given.
 if test "${enable_charset_lite+set}" = set; then
   enableval=$enable_charset_lite;
@@ -11307,8 +11570,8 @@ fi
   if test "$enable_charset_lite" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_charset_lite$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_charset_lite$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_charset_lite$_apmod_extra_msg" >&5
+$as_echo "$enable_charset_lite$_apmod_extra_msg" >&6; }
   if test "$enable_charset_lite" != "no"; then
     case "$enable_charset_lite" in
     shared*)
@@ -11363,8 +11626,8 @@ EOF
 
 else
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_charset_lite" >&5
-echo $ECHO_N "checking whether to enable mod_charset_lite... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_charset_lite" >&5
+$as_echo_n "checking whether to enable mod_charset_lite... " >&6; }
     # Check whether --enable-charset-lite was given.
 if test "${enable_charset_lite+set}" = set; then
   enableval=$enable_charset_lite;
@@ -11401,8 +11664,8 @@ fi
   if test "$enable_charset_lite" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_charset_lite$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_charset_lite$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_charset_lite$_apmod_extra_msg" >&5
+$as_echo "$enable_charset_lite$_apmod_extra_msg" >&6; }
   if test "$enable_charset_lite" != "no"; then
     case "$enable_charset_lite" in
     shared*)
@@ -11459,8 +11722,8 @@ fi
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_deflate" >&5
-echo $ECHO_N "checking whether to enable mod_deflate... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_deflate" >&5
+$as_echo_n "checking whether to enable mod_deflate... " >&6; }
     # Check whether --enable-deflate was given.
 if test "${enable_deflate+set}" = set; then
   enableval=$enable_deflate;
@@ -11495,8 +11758,8 @@ fi
     fi
   fi
   if test "$enable_deflate" != "no"; then
-            { echo "$as_me:$LINENO: result: checking dependencies" >&5
-echo "${ECHO_T}checking dependencies" >&6; }
+            { $as_echo "$as_me:$LINENO: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
 
 
 # Check whether --with-z was given.
@@ -11509,10 +11772,10 @@ if test "${with_z+set}" = set; then
 fi
 
   if test "x$ap_zlib_base" = "x"; then
-    { echo "$as_me:$LINENO: checking for zlib location" >&5
-echo $ECHO_N "checking for zlib location... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for zlib location" >&5
+$as_echo_n "checking for zlib location... " >&6; }
     if test "${ap_cv_zlib+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
       for dir in /usr/local /usr ; do
@@ -11527,11 +11790,11 @@ fi
     ap_zlib_base=$ap_cv_zlib
     if test "x$ap_zlib_base" = "x"; then
       enable_deflate=no
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
     else
-      { echo "$as_me:$LINENO: result: $ap_zlib_base" >&5
-echo "${ECHO_T}$ap_zlib_base" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $ap_zlib_base" >&5
+$as_echo "$ap_zlib_base" >&6; }
     fi
   fi
   if test "$enable_deflate" != "no"; then
@@ -11627,8 +11890,8 @@ echo "${ECHO_T}$ap_zlib_base" >&6; }
     done
   fi
 
-    { echo "$as_me:$LINENO: checking for zlib library" >&5
-echo $ECHO_N "checking for zlib library... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for zlib library" >&5
+$as_echo_n "checking for zlib library... " >&6; }
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -11650,52 +11913,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  { echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6; }
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  { $as_echo "$as_me:$LINENO: result: found" >&5
+$as_echo "found" >&6; }
 
   test "x$silent" != "xyes" && echo "  forcing MOD_DEFLATE_LDADD to \"-lz\""
   MOD_DEFLATE_LDADD="-lz"
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	{ echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
      enable_deflate=no
      INCLUDES=$ap_save_includes
      LDFLAGS=$ap_save_ldflags
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
   if test "x$LIBS" = "x-lz"; then
@@ -11720,20 +11971,20 @@ rm -f core conftest.err conftest.$ac_objext \
     CPPFLAGS=$ap_save_cppflags
   fi
 
-                    { echo "$as_me:$LINENO: checking whether to enable mod_deflate" >&5
-echo $ECHO_N "checking whether to enable mod_deflate... $ECHO_C" >&6; }
+                    { $as_echo "$as_me:$LINENO: checking whether to enable mod_deflate" >&5
+$as_echo_n "checking whether to enable mod_deflate... " >&6; }
                     if test "$enable_deflate" = "no"; then
                       if test "$_apmod_error_fatal" = "no"; then
                         _apmod_extra_msg=" (disabled)"
                       else
-                        { { echo "$as_me:$LINENO: error: mod_deflate has been requested but can not be built due to prerequisite failures" >&5
-echo "$as_me: error: mod_deflate has been requested but can not be built due to prerequisite failures" >&2;}
+                        { { $as_echo "$as_me:$LINENO: error: mod_deflate has been requested but can not be built due to prerequisite failures" >&5
+$as_echo "$as_me: error: mod_deflate has been requested but can not be built due to prerequisite failures" >&2;}
    { (exit 1); exit 1; }; }
                       fi
                     fi
   fi
-  { echo "$as_me:$LINENO: result: $enable_deflate$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_deflate$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_deflate$_apmod_extra_msg" >&5
+$as_echo "$enable_deflate$_apmod_extra_msg" >&6; }
   if test "$enable_deflate" != "no"; then
     case "$enable_deflate" in
     shared*)
@@ -11814,8 +12065,8 @@ EOF
 
 ldap_objects="util_ldap.lo util_ldap_cache.lo util_ldap_cache_mgr.lo"
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_ldap" >&5
-echo $ECHO_N "checking whether to enable mod_ldap... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_ldap" >&5
+$as_echo_n "checking whether to enable mod_ldap... " >&6; }
     # Check whether --enable-ldap was given.
 if test "${enable_ldap+set}" = set; then
   enableval=$enable_ldap;
@@ -11850,10 +12101,26 @@ fi
     fi
   fi
   if test "$enable_ldap" != "no"; then
-            :
+            { $as_echo "$as_me:$LINENO: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
+
+  MOD_LDAP_LDADD="`$apu_config --ldap-libs`" || MOD_LDAP_LDADD=""
+
+
+                    { $as_echo "$as_me:$LINENO: checking whether to enable mod_ldap" >&5
+$as_echo_n "checking whether to enable mod_ldap... " >&6; }
+                    if test "$enable_ldap" = "no"; then
+                      if test "$_apmod_error_fatal" = "no"; then
+                        _apmod_extra_msg=" (disabled)"
+                      else
+                        { { $as_echo "$as_me:$LINENO: error: mod_ldap has been requested but can not be built due to prerequisite failures" >&5
+$as_echo "$as_me: error: mod_ldap has been requested but can not be built due to prerequisite failures" >&2;}
+   { (exit 1); exit 1; }; }
+                      fi
+                    fi
   fi
-  { echo "$as_me:$LINENO: result: $enable_ldap$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_ldap$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_ldap$_apmod_extra_msg" >&5
+$as_echo "$enable_ldap$_apmod_extra_msg" >&6; }
   if test "$enable_ldap" != "no"; then
     case "$enable_ldap" in
     shared*)
@@ -11933,8 +12200,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_log_config" >&5
-echo $ECHO_N "checking whether to enable mod_log_config... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_log_config" >&5
+$as_echo_n "checking whether to enable mod_log_config... " >&6; }
     # Check whether --enable-log-config was given.
 if test "${enable_log_config+set}" = set; then
   enableval=$enable_log_config;
@@ -11971,8 +12238,8 @@ fi
   if test "$enable_log_config" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_log_config$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_log_config$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_log_config$_apmod_extra_msg" >&5
+$as_echo "$enable_log_config$_apmod_extra_msg" >&6; }
   if test "$enable_log_config" != "no"; then
     case "$enable_log_config" in
     shared*)
@@ -12026,8 +12293,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_log_forensic" >&5
-echo $ECHO_N "checking whether to enable mod_log_forensic... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_log_forensic" >&5
+$as_echo_n "checking whether to enable mod_log_forensic... " >&6; }
     # Check whether --enable-log-forensic was given.
 if test "${enable_log_forensic+set}" = set; then
   enableval=$enable_log_forensic;
@@ -12064,8 +12331,8 @@ fi
   if test "$enable_log_forensic" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_log_forensic$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_log_forensic$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_log_forensic$_apmod_extra_msg" >&5
+$as_echo "$enable_log_forensic$_apmod_extra_msg" >&6; }
   if test "$enable_log_forensic" != "no"; then
     case "$enable_log_forensic" in
     shared*)
@@ -12145,8 +12412,8 @@ if test "x$enable_log_forensic" != "xno"; then
 fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_logio" >&5
-echo $ECHO_N "checking whether to enable mod_logio... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_logio" >&5
+$as_echo_n "checking whether to enable mod_logio... " >&6; }
     # Check whether --enable-logio was given.
 if test "${enable_logio+set}" = set; then
   enableval=$enable_logio;
@@ -12183,8 +12450,8 @@ fi
   if test "$enable_logio" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_logio$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_logio$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_logio$_apmod_extra_msg" >&5
+$as_echo "$enable_logio$_apmod_extra_msg" >&6; }
   if test "$enable_logio" != "no"; then
     case "$enable_logio" in
     shared*)
@@ -12264,8 +12531,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_env" >&5
-echo $ECHO_N "checking whether to enable mod_env... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_env" >&5
+$as_echo_n "checking whether to enable mod_env... " >&6; }
     # Check whether --enable-env was given.
 if test "${enable_env+set}" = set; then
   enableval=$enable_env;
@@ -12302,8 +12569,8 @@ fi
   if test "$enable_env" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_env$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_env$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_env$_apmod_extra_msg" >&5
+$as_echo "$enable_env$_apmod_extra_msg" >&6; }
   if test "$enable_env" != "no"; then
     case "$enable_env" in
     shared*)
@@ -12357,8 +12624,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_mime_magic" >&5
-echo $ECHO_N "checking whether to enable mod_mime_magic... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_mime_magic" >&5
+$as_echo_n "checking whether to enable mod_mime_magic... " >&6; }
     # Check whether --enable-mime-magic was given.
 if test "${enable_mime_magic+set}" = set; then
   enableval=$enable_mime_magic;
@@ -12395,8 +12662,8 @@ fi
   if test "$enable_mime_magic" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_mime_magic$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_mime_magic$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_mime_magic$_apmod_extra_msg" >&5
+$as_echo "$enable_mime_magic$_apmod_extra_msg" >&6; }
   if test "$enable_mime_magic" != "no"; then
     case "$enable_mime_magic" in
     shared*)
@@ -12450,8 +12717,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_cern_meta" >&5
-echo $ECHO_N "checking whether to enable mod_cern_meta... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_cern_meta" >&5
+$as_echo_n "checking whether to enable mod_cern_meta... " >&6; }
     # Check whether --enable-cern-meta was given.
 if test "${enable_cern_meta+set}" = set; then
   enableval=$enable_cern_meta;
@@ -12488,8 +12755,8 @@ fi
   if test "$enable_cern_meta" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_cern_meta$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_cern_meta$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_cern_meta$_apmod_extra_msg" >&5
+$as_echo "$enable_cern_meta$_apmod_extra_msg" >&6; }
   if test "$enable_cern_meta" != "no"; then
     case "$enable_cern_meta" in
     shared*)
@@ -12543,8 +12810,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_expires" >&5
-echo $ECHO_N "checking whether to enable mod_expires... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_expires" >&5
+$as_echo_n "checking whether to enable mod_expires... " >&6; }
     # Check whether --enable-expires was given.
 if test "${enable_expires+set}" = set; then
   enableval=$enable_expires;
@@ -12581,8 +12848,8 @@ fi
   if test "$enable_expires" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_expires$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_expires$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_expires$_apmod_extra_msg" >&5
+$as_echo "$enable_expires$_apmod_extra_msg" >&6; }
   if test "$enable_expires" != "no"; then
     case "$enable_expires" in
     shared*)
@@ -12636,8 +12903,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_headers" >&5
-echo $ECHO_N "checking whether to enable mod_headers... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_headers" >&5
+$as_echo_n "checking whether to enable mod_headers... " >&6; }
     # Check whether --enable-headers was given.
 if test "${enable_headers+set}" = set; then
   enableval=$enable_headers;
@@ -12674,8 +12941,8 @@ fi
   if test "$enable_headers" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_headers$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_headers$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_headers$_apmod_extra_msg" >&5
+$as_echo "$enable_headers$_apmod_extra_msg" >&6; }
   if test "$enable_headers" != "no"; then
     case "$enable_headers" in
     shared*)
@@ -12729,8 +12996,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_ident" >&5
-echo $ECHO_N "checking whether to enable mod_ident... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_ident" >&5
+$as_echo_n "checking whether to enable mod_ident... " >&6; }
     # Check whether --enable-ident was given.
 if test "${enable_ident+set}" = set; then
   enableval=$enable_ident;
@@ -12767,8 +13034,8 @@ fi
   if test "$enable_ident" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_ident$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_ident$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_ident$_apmod_extra_msg" >&5
+$as_echo "$enable_ident$_apmod_extra_msg" >&6; }
   if test "$enable_ident" != "no"; then
     case "$enable_ident" in
     shared*)
@@ -12823,8 +13090,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_usertrack" >&5
-echo $ECHO_N "checking whether to enable mod_usertrack... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_usertrack" >&5
+$as_echo_n "checking whether to enable mod_usertrack... " >&6; }
     # Check whether --enable-usertrack was given.
 if test "${enable_usertrack+set}" = set; then
   enableval=$enable_usertrack;
@@ -12859,26 +13126,27 @@ fi
     fi
   fi
   if test "$enable_usertrack" != "no"; then
-            { echo "$as_me:$LINENO: result: checking dependencies" >&5
-echo "${ECHO_T}checking dependencies" >&6; }
+            { $as_echo "$as_me:$LINENO: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
 
 
 for ac_header in sys/times.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12894,49 +13162,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12950,76 +13202,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -13029,11 +13277,11 @@ done
 
 for ac_func in times
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -13086,71 +13334,61 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
-                    { echo "$as_me:$LINENO: checking whether to enable mod_usertrack" >&5
-echo $ECHO_N "checking whether to enable mod_usertrack... $ECHO_C" >&6; }
+                    { $as_echo "$as_me:$LINENO: checking whether to enable mod_usertrack" >&5
+$as_echo_n "checking whether to enable mod_usertrack... " >&6; }
                     if test "$enable_usertrack" = "no"; then
                       if test "$_apmod_error_fatal" = "no"; then
                         _apmod_extra_msg=" (disabled)"
                       else
-                        { { echo "$as_me:$LINENO: error: mod_usertrack has been requested but can not be built due to prerequisite failures" >&5
-echo "$as_me: error: mod_usertrack has been requested but can not be built due to prerequisite failures" >&2;}
+                        { { $as_echo "$as_me:$LINENO: error: mod_usertrack has been requested but can not be built due to prerequisite failures" >&5
+$as_echo "$as_me: error: mod_usertrack has been requested but can not be built due to prerequisite failures" >&2;}
    { (exit 1); exit 1; }; }
                       fi
                     fi
   fi
-  { echo "$as_me:$LINENO: result: $enable_usertrack$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_usertrack$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_usertrack$_apmod_extra_msg" >&5
+$as_echo "$enable_usertrack$_apmod_extra_msg" >&6; }
   if test "$enable_usertrack" != "no"; then
     case "$enable_usertrack" in
     shared*)
@@ -13205,8 +13443,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_unique_id" >&5
-echo $ECHO_N "checking whether to enable mod_unique_id... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_unique_id" >&5
+$as_echo_n "checking whether to enable mod_unique_id... " >&6; }
     # Check whether --enable-unique-id was given.
 if test "${enable_unique_id+set}" = set; then
   enableval=$enable_unique_id;
@@ -13243,8 +13481,8 @@ fi
   if test "$enable_unique_id" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_unique_id$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_unique_id$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_unique_id$_apmod_extra_msg" >&5
+$as_echo "$enable_unique_id$_apmod_extra_msg" >&6; }
   if test "$enable_unique_id" != "no"; then
     case "$enable_unique_id" in
     shared*)
@@ -13298,8 +13536,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_setenvif" >&5
-echo $ECHO_N "checking whether to enable mod_setenvif... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_setenvif" >&5
+$as_echo_n "checking whether to enable mod_setenvif... " >&6; }
     # Check whether --enable-setenvif was given.
 if test "${enable_setenvif+set}" = set; then
   enableval=$enable_setenvif;
@@ -13336,8 +13574,8 @@ fi
   if test "$enable_setenvif" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_setenvif$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_setenvif$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_setenvif$_apmod_extra_msg" >&5
+$as_echo "$enable_setenvif$_apmod_extra_msg" >&6; }
   if test "$enable_setenvif" != "no"; then
     case "$enable_setenvif" in
     shared*)
@@ -13391,8 +13629,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_version" >&5
-echo $ECHO_N "checking whether to enable mod_version... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_version" >&5
+$as_echo_n "checking whether to enable mod_version... " >&6; }
     # Check whether --enable-version was given.
 if test "${enable_version+set}" = set; then
   enableval=$enable_version;
@@ -13429,8 +13667,8 @@ fi
   if test "$enable_version" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_version$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_version$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_version$_apmod_extra_msg" >&5
+$as_echo "$enable_version$_apmod_extra_msg" >&6; }
   if test "$enable_version" != "no"; then
     case "$enable_version" in
     shared*)
@@ -13518,8 +13756,8 @@ fi
 
 proxy_objs="mod_proxy.lo proxy_util.lo"
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_proxy" >&5
-echo $ECHO_N "checking whether to enable mod_proxy... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_proxy" >&5
+$as_echo_n "checking whether to enable mod_proxy... " >&6; }
     # Check whether --enable-proxy was given.
 if test "${enable_proxy+set}" = set; then
   enableval=$enable_proxy;
@@ -13556,8 +13794,8 @@ fi
   if test "$enable_proxy" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_proxy$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_proxy$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_proxy$_apmod_extra_msg" >&5
+$as_echo "$enable_proxy$_apmod_extra_msg" >&6; }
   if test "$enable_proxy" != "no"; then
     case "$enable_proxy" in
     shared*)
@@ -13630,8 +13868,8 @@ case "$host" in
 esac
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_proxy_connect" >&5
-echo $ECHO_N "checking whether to enable mod_proxy_connect... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_proxy_connect" >&5
+$as_echo_n "checking whether to enable mod_proxy_connect... " >&6; }
     # Check whether --enable-proxy-connect was given.
 if test "${enable_proxy_connect+set}" = set; then
   enableval=$enable_proxy_connect;
@@ -13668,8 +13906,8 @@ fi
   if test "$enable_proxy_connect" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_proxy_connect$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_proxy_connect$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_proxy_connect$_apmod_extra_msg" >&5
+$as_echo "$enable_proxy_connect$_apmod_extra_msg" >&6; }
   if test "$enable_proxy_connect" != "no"; then
     case "$enable_proxy_connect" in
     shared*)
@@ -13723,8 +13961,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_proxy_ftp" >&5
-echo $ECHO_N "checking whether to enable mod_proxy_ftp... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_proxy_ftp" >&5
+$as_echo_n "checking whether to enable mod_proxy_ftp... " >&6; }
     # Check whether --enable-proxy-ftp was given.
 if test "${enable_proxy_ftp+set}" = set; then
   enableval=$enable_proxy_ftp;
@@ -13761,8 +13999,8 @@ fi
   if test "$enable_proxy_ftp" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_proxy_ftp$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_proxy_ftp$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_proxy_ftp$_apmod_extra_msg" >&5
+$as_echo "$enable_proxy_ftp$_apmod_extra_msg" >&6; }
   if test "$enable_proxy_ftp" != "no"; then
     case "$enable_proxy_ftp" in
     shared*)
@@ -13816,8 +14054,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_proxy_http" >&5
-echo $ECHO_N "checking whether to enable mod_proxy_http... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_proxy_http" >&5
+$as_echo_n "checking whether to enable mod_proxy_http... " >&6; }
     # Check whether --enable-proxy-http was given.
 if test "${enable_proxy_http+set}" = set; then
   enableval=$enable_proxy_http;
@@ -13854,8 +14092,8 @@ fi
   if test "$enable_proxy_http" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_proxy_http$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_proxy_http$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_proxy_http$_apmod_extra_msg" >&5
+$as_echo "$enable_proxy_http$_apmod_extra_msg" >&6; }
   if test "$enable_proxy_http" != "no"; then
     case "$enable_proxy_http" in
     shared*)
@@ -13909,8 +14147,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_proxy_ajp" >&5
-echo $ECHO_N "checking whether to enable mod_proxy_ajp... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_proxy_ajp" >&5
+$as_echo_n "checking whether to enable mod_proxy_ajp... " >&6; }
     # Check whether --enable-proxy-ajp was given.
 if test "${enable_proxy_ajp+set}" = set; then
   enableval=$enable_proxy_ajp;
@@ -13947,8 +14185,8 @@ fi
   if test "$enable_proxy_ajp" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_proxy_ajp$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_proxy_ajp$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_proxy_ajp$_apmod_extra_msg" >&5
+$as_echo "$enable_proxy_ajp$_apmod_extra_msg" >&6; }
   if test "$enable_proxy_ajp" != "no"; then
     case "$enable_proxy_ajp" in
     shared*)
@@ -14002,8 +14240,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_proxy_balancer" >&5
-echo $ECHO_N "checking whether to enable mod_proxy_balancer... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_proxy_balancer" >&5
+$as_echo_n "checking whether to enable mod_proxy_balancer... " >&6; }
     # Check whether --enable-proxy-balancer was given.
 if test "${enable_proxy_balancer+set}" = set; then
   enableval=$enable_proxy_balancer;
@@ -14040,8 +14278,8 @@ fi
   if test "$enable_proxy_balancer" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_proxy_balancer$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_proxy_balancer$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_proxy_balancer$_apmod_extra_msg" >&5
+$as_echo "$enable_proxy_balancer$_apmod_extra_msg" >&6; }
   if test "$enable_proxy_balancer" != "no"; then
     case "$enable_proxy_balancer" in
     shared*)
@@ -14145,8 +14383,8 @@ EOF
 
 ssl_objs="mod_ssl.lo ssl_engine_config.lo ssl_engine_dh.lo ssl_engine_init.lo ssl_engine_io.lo ssl_engine_kernel.lo ssl_engine_log.lo ssl_engine_mutex.lo ssl_engine_pphrase.lo ssl_engine_rand.lo ssl_engine_vars.lo ssl_expr.lo ssl_expr_eval.lo ssl_expr_parse.lo ssl_expr_scan.lo ssl_scache.lo ssl_scache_dbm.lo ssl_scache_shmcb.lo ssl_scache_dc.lo ssl_util.lo ssl_util_ssl.lo "
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_ssl" >&5
-echo $ECHO_N "checking whether to enable mod_ssl... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_ssl" >&5
+$as_echo_n "checking whether to enable mod_ssl... " >&6; }
     # Check whether --enable-ssl was given.
 if test "${enable_ssl+set}" = set; then
   enableval=$enable_ssl;
@@ -14181,8 +14419,8 @@ fi
     fi
   fi
   if test "$enable_ssl" != "no"; then
-            { echo "$as_me:$LINENO: result: checking dependencies" >&5
-echo "${ECHO_T}checking dependencies" >&6; }
+            { $as_echo "$as_me:$LINENO: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
 
 
 if test "x$ap_ssltk_configured" = "x"; then
@@ -14191,8 +14429,8 @@ if test "x$ap_ssltk_configured" = "x"; then
   ap_ssltk_lib=""
   ap_ssltk_type=""
 
-    { echo "$as_me:$LINENO: checking for SSL/TLS toolkit base" >&5
-echo $ECHO_N "checking for SSL/TLS toolkit base... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for SSL/TLS toolkit base" >&5
+$as_echo_n "checking for SSL/TLS toolkit base... " >&6; }
 
 # Check whether --with-sslc was given.
 if test "${with_sslc+set}" = set; then
@@ -14215,11 +14453,11 @@ if test "${with_ssl+set}" = set; then
 fi
 
   if test "x$ap_ssltk_base" = "x"; then
-    { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
+    { $as_echo "$as_me:$LINENO: result: none" >&5
+$as_echo "none" >&6; }
   else
-    { echo "$as_me:$LINENO: result: $ap_ssltk_base" >&5
-echo "${ECHO_T}$ap_ssltk_base" >&6; }
+    { $as_echo "$as_me:$LINENO: result: $ap_ssltk_base" >&5
+$as_echo "$ap_ssltk_base" >&6; }
   fi
 
     saved_CPPFLAGS=$CPPFLAGS
@@ -14228,26 +14466,27 @@ echo "${ECHO_T}$ap_ssltk_base" >&6; }
     CPPFLAGS="$CPPFLAGS $ap_ssltk_inc"
   fi
   if test "x$ap_ssltk_type" = "x"; then
-    { echo "$as_me:$LINENO: checking for OpenSSL version" >&5
-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for OpenSSL version" >&5
+$as_echo_n "checking for OpenSSL version... " >&6; }
 
 
 for ac_header in openssl/opensslv.h openssl/ssl.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14263,49 +14502,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14319,76 +14542,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  ap_ssltk_type="openssl"
 fi
@@ -14424,42 +14643,26 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  { echo "$as_me:$LINENO: result: OK" >&5
-echo "${ECHO_T}OK" >&6; }
-else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  { $as_echo "$as_me:$LINENO: result: OK" >&5
+$as_echo "OK" >&6; }
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	       { echo "$as_me:$LINENO: result: not encouraging" >&5
-echo "${ECHO_T}not encouraging" >&6; }
+	       { $as_echo "$as_me:$LINENO: result: not encouraging" >&5
+$as_echo "not encouraging" >&6; }
        echo "WARNING: OpenSSL version may contain security vulnerabilities!"
        echo "         Ensure the latest security patches have been applied!"
 
@@ -14469,20 +14672,21 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 for ac_header in openssl/engine.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14498,49 +14702,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14554,76 +14742,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -14638,30 +14822,31 @@ done
         fi
       fi
     else
-      { echo "$as_me:$LINENO: result: no OpenSSL headers found" >&5
-echo "${ECHO_T}no OpenSSL headers found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: no OpenSSL headers found" >&5
+$as_echo "no OpenSSL headers found" >&6; }
     fi
   fi
   if test "$ap_ssltk_type" != "openssl"; then
-        { echo "$as_me:$LINENO: checking for SSL-C version" >&5
-echo $ECHO_N "checking for SSL-C version... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for SSL-C version" >&5
+$as_echo_n "checking for SSL-C version... " >&6; }
 
 for ac_header in sslc.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14677,49 +14862,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14733,76 +14902,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  ap_ssltk_type="sslc"
 else
@@ -14812,8 +14977,8 @@ fi
 done
 
     if test "$ap_ssltk_type" = "sslc"; then
-      { echo "$as_me:$LINENO: checking for SSL-C version" >&5
-echo $ECHO_N "checking for SSL-C version... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for SSL-C version" >&5
+$as_echo_n "checking for SSL-C version... " >&6; }
       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14842,42 +15007,26 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  { echo "$as_me:$LINENO: result: OK" >&5
-echo "${ECHO_T}OK" >&6; }
-else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  { $as_echo "$as_me:$LINENO: result: OK" >&5
+$as_echo "OK" >&6; }
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	       { echo "$as_me:$LINENO: result: not encouraging" >&5
-echo "${ECHO_T}not encouraging" >&6; }
+	       { $as_echo "$as_me:$LINENO: result: not encouraging" >&5
+$as_echo "not encouraging" >&6; }
        echo "WARNING: SSL-C version may contain security vulnerabilities!"
        echo "         Ensure the latest security patches have been applied!"
 
@@ -14885,14 +15034,14 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     else
-      { echo "$as_me:$LINENO: result: no SSL-C headers found" >&5
-echo "${ECHO_T}no SSL-C headers found" >&6; }
+      { $as_echo "$as_me:$LINENO: result: no SSL-C headers found" >&5
+$as_echo "no SSL-C headers found" >&6; }
     fi
   fi
     CPPFLAGS=$saved_CPPFLAGS
   if test "x$ap_ssltk_type" = "x"; then
-    { { echo "$as_me:$LINENO: error: ...No recognized SSL/TLS toolkit detected" >&5
-echo "$as_me: error: ...No recognized SSL/TLS toolkit detected" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: ...No recognized SSL/TLS toolkit detected" >&5
+$as_echo "$as_me: error: ...No recognized SSL/TLS toolkit detected" >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -14910,10 +15059,10 @@ echo "$as_me: error: ...No recognized SSL/TLS toolkit detected" >&2;}
   liberrors=""
   if test "$ap_ssltk_type" = "openssl"; then
 
-{ echo "$as_me:$LINENO: checking for SSLeay_version in -lcrypto" >&5
-echo $ECHO_N "checking for SSLeay_version in -lcrypto... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for SSLeay_version in -lcrypto" >&5
+$as_echo_n "checking for SSLeay_version in -lcrypto... " >&6; }
 if test "${ac_cv_lib_crypto_SSLeay_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
@@ -14945,48 +15094,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_crypto_SSLeay_version=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_crypto_SSLeay_version=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay_version" >&5
-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay_version" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay_version" >&5
+$as_echo "$ac_cv_lib_crypto_SSLeay_version" >&6; }
 if test $ac_cv_lib_crypto_SSLeay_version = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBCRYPTO 1
@@ -14999,10 +15136,10 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking for SSL_CTX_new in -lssl" >&5
-echo $ECHO_N "checking for SSL_CTX_new in -lssl... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for SSL_CTX_new in -lssl" >&5
+$as_echo_n "checking for SSL_CTX_new in -lssl... " >&6; }
 if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lssl  $LIBS"
@@ -15034,48 +15171,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ssl_SSL_CTX_new=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ssl_SSL_CTX_new=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_new" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
+$as_echo "$ac_cv_lib_ssl_SSL_CTX_new" >&6; }
 if test $ac_cv_lib_ssl_SSL_CTX_new = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSSL 1
@@ -15090,11 +15215,11 @@ fi
 
 for ac_func in ENGINE_init
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -15147,51 +15272,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -15200,11 +15315,11 @@ done
 
 for ac_func in ENGINE_load_builtin_engines
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -15257,51 +15372,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -15309,10 +15414,10 @@ done
 
   else
 
-{ echo "$as_me:$LINENO: checking for SSLC_library_version in -lsslc" >&5
-echo $ECHO_N "checking for SSLC_library_version in -lsslc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for SSLC_library_version in -lsslc" >&5
+$as_echo_n "checking for SSLC_library_version in -lsslc... " >&6; }
 if test "${ac_cv_lib_sslc_SSLC_library_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsslc  $LIBS"
@@ -15344,48 +15449,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_sslc_SSLC_library_version=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_sslc_SSLC_library_version=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sslc_SSLC_library_version" >&5
-echo "${ECHO_T}$ac_cv_lib_sslc_SSLC_library_version" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sslc_SSLC_library_version" >&5
+$as_echo "$ac_cv_lib_sslc_SSLC_library_version" >&6; }
 if test $ac_cv_lib_sslc_SSLC_library_version = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSSLC 1
@@ -15398,10 +15491,10 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking for SSL_CTX_new in -lsslc" >&5
-echo $ECHO_N "checking for SSL_CTX_new in -lsslc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for SSL_CTX_new in -lsslc" >&5
+$as_echo_n "checking for SSL_CTX_new in -lsslc... " >&6; }
 if test "${ac_cv_lib_sslc_SSL_CTX_new+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsslc  $LIBS"
@@ -15433,48 +15526,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_sslc_SSL_CTX_new=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_sslc_SSL_CTX_new=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sslc_SSL_CTX_new" >&5
-echo "${ECHO_T}$ac_cv_lib_sslc_SSL_CTX_new" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sslc_SSL_CTX_new" >&5
+$as_echo "$ac_cv_lib_sslc_SSL_CTX_new" >&6; }
 if test $ac_cv_lib_sslc_SSL_CTX_new = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSSLC 1
@@ -15489,11 +15570,11 @@ fi
 
 for ac_func in SSL_set_state
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -15546,51 +15627,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -15600,11 +15671,11 @@ done
 
 for ac_func in SSL_set_cert_store
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -15657,51 +15728,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -15710,8 +15771,8 @@ done
     LDFLAGS=$saved_LDFLAGS
   LIBS=$saved_LIBS
   if test "x$liberrors" != "x"; then
-    { { echo "$as_me:$LINENO: error: ... Error, SSL/TLS libraries were missing or unusable" >&5
-echo "$as_me: error: ... Error, SSL/TLS libraries were missing or unusable" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: ... Error, SSL/TLS libraries were missing or unusable" >&5
+$as_echo "$as_me: error: ... Error, SSL/TLS libraries were missing or unusable" >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -15847,8 +15908,8 @@ fi
   MOD_SSL_LDADD="\$(SSL_LIBS)"
 
 
-  { echo "$as_me:$LINENO: checking whether Distcache is required" >&5
-echo $ECHO_N "checking whether Distcache is required... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether Distcache is required" >&5
+$as_echo_n "checking whether Distcache is required... " >&6; }
   ap_ssltk_dc="no"
   tmp_nomessage=""
   tmp_forced="no"
@@ -15868,30 +15929,30 @@ if test "${enable_distcache+set}" = set; then
 fi
 
   if test "$tmp_forced" = "no"; then
-    { echo "$as_me:$LINENO: result: $ap_ssltk_dc (default)" >&5
-echo "${ECHO_T}$ap_ssltk_dc (default)" >&6; }
+    { $as_echo "$as_me:$LINENO: result: $ap_ssltk_dc (default)" >&5
+$as_echo "$ap_ssltk_dc (default)" >&6; }
   else
-    { echo "$as_me:$LINENO: result: $ap_ssltk_dc (specified)" >&5
-echo "${ECHO_T}$ap_ssltk_dc (specified)" >&6; }
+    { $as_echo "$as_me:$LINENO: result: $ap_ssltk_dc (specified)" >&5
+$as_echo "$ap_ssltk_dc (specified)" >&6; }
   fi
   if test "$tmp_forced" = "yes" -a "x$ap_ssltk_dc" = "xno" -a "x$tmp_nomessage" != "x"; then
-    { { echo "$as_me:$LINENO: error: distcache support failed: $tmp_nomessage" >&5
-echo "$as_me: error: distcache support failed: $tmp_nomessage" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: distcache support failed: $tmp_nomessage" >&5
+$as_echo "$as_me: error: distcache support failed: $tmp_nomessage" >&2;}
    { (exit 1); exit 1; }; }
   fi
   if test "$ap_ssltk_dc" = "yes"; then
     if test "${ac_cv_header_distcache_dc_client_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for distcache/dc_client.h" >&5
-echo $ECHO_N "checking for distcache/dc_client.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for distcache/dc_client.h" >&5
+$as_echo_n "checking for distcache/dc_client.h... " >&6; }
 if test "${ac_cv_header_distcache_dc_client_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_distcache_dc_client_h" >&5
-echo "${ECHO_T}$ac_cv_header_distcache_dc_client_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_distcache_dc_client_h" >&5
+$as_echo "$ac_cv_header_distcache_dc_client_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking distcache/dc_client.h usability" >&5
-echo $ECHO_N "checking distcache/dc_client.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking distcache/dc_client.h usability" >&5
+$as_echo_n "checking distcache/dc_client.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -15907,49 +15968,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking distcache/dc_client.h presence" >&5
-echo $ECHO_N "checking distcache/dc_client.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking distcache/dc_client.h presence" >&5
+$as_echo_n "checking distcache/dc_client.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -15963,70 +16008,64 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: distcache/dc_client.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: distcache/dc_client.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: distcache/dc_client.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: distcache/dc_client.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: distcache/dc_client.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: distcache/dc_client.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: distcache/dc_client.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: distcache/dc_client.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: distcache/dc_client.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: distcache/dc_client.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: distcache/dc_client.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: distcache/dc_client.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: distcache/dc_client.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: distcache/dc_client.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: distcache/dc_client.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: distcache/dc_client.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: distcache/dc_client.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: distcache/dc_client.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: distcache/dc_client.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: distcache/dc_client.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: distcache/dc_client.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: distcache/dc_client.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: distcache/dc_client.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: distcache/dc_client.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: distcache/dc_client.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: distcache/dc_client.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: distcache/dc_client.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: distcache/dc_client.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: distcache/dc_client.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: distcache/dc_client.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: distcache/dc_client.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: distcache/dc_client.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for distcache/dc_client.h" >&5
-echo $ECHO_N "checking for distcache/dc_client.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for distcache/dc_client.h" >&5
+$as_echo_n "checking for distcache/dc_client.h... " >&6; }
 if test "${ac_cv_header_distcache_dc_client_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_distcache_dc_client_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_distcache_dc_client_h" >&5
-echo "${ECHO_T}$ac_cv_header_distcache_dc_client_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_distcache_dc_client_h" >&5
+$as_echo "$ac_cv_header_distcache_dc_client_h" >&6; }
 
 fi
 if test $ac_cv_header_distcache_dc_client_h = yes; then
@@ -16038,14 +16077,14 @@ fi
 
 
     if test "$tmp_forced" = "yes" -a "x$ap_ssltk_dc" = "xno"; then
-      { { echo "$as_me:$LINENO: error: distcache support failed: $tmp_nomessage" >&5
-echo "$as_me: error: distcache support failed: $tmp_nomessage" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: distcache support failed: $tmp_nomessage" >&5
+$as_echo "$as_me: error: distcache support failed: $tmp_nomessage" >&2;}
    { (exit 1); exit 1; }; }
     fi
   fi
   if test "$ap_ssltk_dc" = "yes"; then
-    { echo "$as_me:$LINENO: checking for Distcache version" >&5
-echo $ECHO_N "checking for Distcache version... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Distcache version" >&5
+$as_echo_n "checking for Distcache version... " >&6; }
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16069,37 +16108,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	tmp_nomessage="distcache has an unsupported API version"
@@ -16107,17 +16130,17 @@ ap_ssltk_dc="no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    { echo "$as_me:$LINENO: result: $ap_ssltk_dc" >&5
-echo "${ECHO_T}$ap_ssltk_dc" >&6; }
+    { $as_echo "$as_me:$LINENO: result: $ap_ssltk_dc" >&5
+$as_echo "$ap_ssltk_dc" >&6; }
     if test "$tmp_forced" = "yes" -a "x$ap_ssltk_dc" = "xno"; then
-      { { echo "$as_me:$LINENO: error: distcache support failed: $tmp_nomessage" >&5
-echo "$as_me: error: distcache support failed: $tmp_nomessage" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: distcache support failed: $tmp_nomessage" >&5
+$as_echo "$as_me: error: distcache support failed: $tmp_nomessage" >&2;}
    { (exit 1); exit 1; }; }
     fi
   fi
   if test "$ap_ssltk_dc" = "yes"; then
-    { echo "$as_me:$LINENO: checking for Distcache libraries" >&5
-echo $ECHO_N "checking for Distcache libraries... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Distcache libraries" >&5
+$as_echo_n "checking for Distcache libraries... " >&6; }
     save_libs=$LIBS
     LIBS="$LIBS -ldistcache -lnal"
     cat >conftest.$ac_ext <<_ACEOF
@@ -16141,51 +16164,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	tmp_no_message="failed to link with distcache libraries"
       ap_ssltk_dc="no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     LIBS=$save_libs
-    { echo "$as_me:$LINENO: result: $ap_ssltk_dc" >&5
-echo "${ECHO_T}$ap_ssltk_dc" >&6; }
+    { $as_echo "$as_me:$LINENO: result: $ap_ssltk_dc" >&5
+$as_echo "$ap_ssltk_dc" >&6; }
     if test "$tmp_forced" = "yes" -a "x$ap_ssltk_dc" = "xno"; then
-      { { echo "$as_me:$LINENO: error: distcache support failed: $tmp_nomessage" >&5
-echo "$as_me: error: distcache support failed: $tmp_nomessage" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: distcache support failed: $tmp_nomessage" >&5
+$as_echo "$as_me: error: distcache support failed: $tmp_nomessage" >&2;}
    { (exit 1); exit 1; }; }
     else
 
@@ -16243,20 +16254,20 @@ _ACEOF
 
     fi
 
-                    { echo "$as_me:$LINENO: checking whether to enable mod_ssl" >&5
-echo $ECHO_N "checking whether to enable mod_ssl... $ECHO_C" >&6; }
+                    { $as_echo "$as_me:$LINENO: checking whether to enable mod_ssl" >&5
+$as_echo_n "checking whether to enable mod_ssl... " >&6; }
                     if test "$enable_ssl" = "no"; then
                       if test "$_apmod_error_fatal" = "no"; then
                         _apmod_extra_msg=" (disabled)"
                       else
-                        { { echo "$as_me:$LINENO: error: mod_ssl has been requested but can not be built due to prerequisite failures" >&5
-echo "$as_me: error: mod_ssl has been requested but can not be built due to prerequisite failures" >&2;}
+                        { { $as_echo "$as_me:$LINENO: error: mod_ssl has been requested but can not be built due to prerequisite failures" >&5
+$as_echo "$as_me: error: mod_ssl has been requested but can not be built due to prerequisite failures" >&2;}
    { (exit 1); exit 1; }; }
                       fi
                     fi
   fi
-  { echo "$as_me:$LINENO: result: $enable_ssl$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_ssl$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_ssl$_apmod_extra_msg" >&5
+$as_echo "$enable_ssl$_apmod_extra_msg" >&6; }
   if test "$enable_ssl" != "no"; then
     case "$enable_ssl" in
     shared*)
@@ -16359,8 +16370,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_optional_hook_export" >&5
-echo $ECHO_N "checking whether to enable mod_optional_hook_export... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_optional_hook_export" >&5
+$as_echo_n "checking whether to enable mod_optional_hook_export... " >&6; }
     # Check whether --enable-optional-hook-export was given.
 if test "${enable_optional_hook_export+set}" = set; then
   enableval=$enable_optional_hook_export;
@@ -16397,8 +16408,8 @@ fi
   if test "$enable_optional_hook_export" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_optional_hook_export$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_optional_hook_export$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_optional_hook_export$_apmod_extra_msg" >&5
+$as_echo "$enable_optional_hook_export$_apmod_extra_msg" >&6; }
   if test "$enable_optional_hook_export" != "no"; then
     case "$enable_optional_hook_export" in
     shared*)
@@ -16452,8 +16463,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_optional_hook_import" >&5
-echo $ECHO_N "checking whether to enable mod_optional_hook_import... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_optional_hook_import" >&5
+$as_echo_n "checking whether to enable mod_optional_hook_import... " >&6; }
     # Check whether --enable-optional-hook-import was given.
 if test "${enable_optional_hook_import+set}" = set; then
   enableval=$enable_optional_hook_import;
@@ -16490,8 +16501,8 @@ fi
   if test "$enable_optional_hook_import" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_optional_hook_import$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_optional_hook_import$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_optional_hook_import$_apmod_extra_msg" >&5
+$as_echo "$enable_optional_hook_import$_apmod_extra_msg" >&6; }
   if test "$enable_optional_hook_import" != "no"; then
     case "$enable_optional_hook_import" in
     shared*)
@@ -16545,8 +16556,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_optional_fn_import" >&5
-echo $ECHO_N "checking whether to enable mod_optional_fn_import... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_optional_fn_import" >&5
+$as_echo_n "checking whether to enable mod_optional_fn_import... " >&6; }
     # Check whether --enable-optional-fn-import was given.
 if test "${enable_optional_fn_import+set}" = set; then
   enableval=$enable_optional_fn_import;
@@ -16583,8 +16594,8 @@ fi
   if test "$enable_optional_fn_import" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_optional_fn_import$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_optional_fn_import$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_optional_fn_import$_apmod_extra_msg" >&5
+$as_echo "$enable_optional_fn_import$_apmod_extra_msg" >&6; }
   if test "$enable_optional_fn_import" != "no"; then
     case "$enable_optional_fn_import" in
     shared*)
@@ -16638,8 +16649,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_optional_fn_export" >&5
-echo $ECHO_N "checking whether to enable mod_optional_fn_export... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_optional_fn_export" >&5
+$as_echo_n "checking whether to enable mod_optional_fn_export... " >&6; }
     # Check whether --enable-optional-fn-export was given.
 if test "${enable_optional_fn_export+set}" = set; then
   enableval=$enable_optional_fn_export;
@@ -16676,8 +16687,8 @@ fi
   if test "$enable_optional_fn_export" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_optional_fn_export$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_optional_fn_export$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_optional_fn_export$_apmod_extra_msg" >&5
+$as_echo "$enable_optional_fn_export$_apmod_extra_msg" >&6; }
   if test "$enable_optional_fn_export" != "no"; then
     case "$enable_optional_fn_export" in
     shared*)
@@ -16769,8 +16780,8 @@ if test "$OS" = "beos" ; then
 
 fi
 
-{ echo "$as_me:$LINENO: checking for target platform" >&5
-echo $ECHO_N "checking for target platform... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for target platform" >&5
+$as_echo_n "checking for target platform... " >&6; }
 
 case $host in
 *beos*)
@@ -16794,8 +16805,8 @@ bs2000*)
   OS_DIR=$OS;;
 esac
 
-{ echo "$as_me:$LINENO: result: $OS" >&5
-echo "${ECHO_T}$OS" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $OS" >&5
+$as_echo "$OS" >&6; }
 
   APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES os/${OS_DIR}/Makefile"
 
@@ -16826,10 +16837,10 @@ fi
 
 if test "$OS" = "unix" ; then
 
-  { echo "$as_me:$LINENO: checking for rlim_t" >&5
-echo $ECHO_N "checking for rlim_t... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for rlim_t" >&5
+$as_echo_n "checking for rlim_t... " >&6; }
 if test "${ac_cv_type_rlim_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
@@ -16857,39 +16868,23 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
       ac_cv_type_rlim_t=yes
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_type_rlim_t=no
@@ -16899,8 +16894,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_rlim_t" >&5
-echo "${ECHO_T}$ac_cv_type_rlim_t" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_rlim_t" >&5
+$as_echo "$ac_cv_type_rlim_t" >&6; }
   if test "$ac_cv_type_rlim_t" = "no" ; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -16916,20 +16911,21 @@ _ACEOF
 
 for ac_header in sys/time.h sys/resource.h sys/sem.h sys/ipc.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16945,49 +16941,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -17001,76 +16981,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -17082,11 +17058,11 @@ done
 
 for ac_func in setsid killpg
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -17139,51 +17115,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -17197,20 +17163,21 @@ fi
 
 for ac_header in bstring.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -17226,49 +17193,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -17282,76 +17233,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -17364,11 +17311,11 @@ done
 
 for ac_func in syslog
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -17421,51 +17368,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -17475,20 +17412,21 @@ done
 
 for ac_header in sys/times.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -17504,49 +17442,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -17560,76 +17482,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -17639,11 +17557,11 @@ done
 
 for ac_func in times
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -17696,59 +17614,49 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
-{ echo "$as_me:$LINENO: checking which MPM to use" >&5
-echo $ECHO_N "checking which MPM to use... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking which MPM to use" >&5
+$as_echo_n "checking which MPM to use... " >&6; }
 
 # Check whether --with-mpm was given.
 if test "${with_mpm+set}" = set; then
@@ -17763,8 +17671,8 @@ else
 
 fi
 
-{ echo "$as_me:$LINENO: result: $APACHE_MPM" >&5
-echo "${ECHO_T}$APACHE_MPM" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $APACHE_MPM" >&5
+$as_echo "$APACHE_MPM" >&6; }
 
 apache_cv_mpm=$APACHE_MPM
 
@@ -17815,12 +17723,12 @@ CPPFLAGS=$apr_old_cppflags
 
 
   if test "x$ac_cv_define_APR_HAS_THREADS" = "xno"; then
-    { echo "$as_me:$LINENO: result: The currently selected MPM requires threads which your system seems to lack" >&5
-echo "${ECHO_T}The currently selected MPM requires threads which your system seems to lack" >&6; }
-    { echo "$as_me:$LINENO: checking checking for replacement" >&5
-echo $ECHO_N "checking checking for replacement... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: prefork selected" >&5
-echo "${ECHO_T}prefork selected" >&6; }
+    { $as_echo "$as_me:$LINENO: result: The currently selected MPM requires threads which your system seems to lack" >&5
+$as_echo "The currently selected MPM requires threads which your system seems to lack" >&6; }
+    { $as_echo "$as_me:$LINENO: checking checking for replacement" >&5
+$as_echo_n "checking checking for replacement... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: prefork selected" >&5
+$as_echo "prefork selected" >&6; }
     apache_cv_mpm=prefork
   else
     case $host in
@@ -17828,10 +17736,10 @@ echo "${ECHO_T}prefork selected" >&6; }
         case `uname -r` in
           2.0* )
                                                 echo "Threaded MPM's are not supported on this platform"
-            { echo "$as_me:$LINENO: checking checking for replacement" >&5
-echo $ECHO_N "checking checking for replacement... $ECHO_C" >&6; }
-            { echo "$as_me:$LINENO: result: prefork selected" >&5
-echo "${ECHO_T}prefork selected" >&6; }
+            { $as_echo "$as_me:$LINENO: checking checking for replacement" >&5
+$as_echo_n "checking checking for replacement... " >&6; }
+            { $as_echo "$as_me:$LINENO: result: prefork selected" >&5
+$as_echo "prefork selected" >&6; }
             apache_cv_mpm=prefork
           ;;
         esac
@@ -17846,8 +17754,8 @@ fi
 
 MPM_NAME=$apache_cv_mpm
 if ap_mpm_is_experimental; then
-  { echo "$as_me:$LINENO: WARNING: You have selected an EXPERIMENTAL MPM.  Be warned!" >&5
-echo "$as_me: WARNING: You have selected an EXPERIMENTAL MPM.  Be warned!" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: You have selected an EXPERIMENTAL MPM.  Be warned!" >&5
+$as_echo "$as_me: WARNING: You have selected an EXPERIMENTAL MPM.  Be warned!" >&2;}
   MPM_SUBDIR_NAME=experimental/$MPM_NAME
 else
   MPM_SUBDIR_NAME=$MPM_NAME
@@ -17856,8 +17764,8 @@ MPM_DIR=server/mpm/$MPM_SUBDIR_NAME
 MPM_LIB=$MPM_DIR/lib${MPM_NAME}.la
 
 if test ! -f "$abs_srcdir/$MPM_DIR/mpm.h"; then
-    { { echo "$as_me:$LINENO: error: the selected mpm -- $apache_cv_mpm -- is not supported" >&5
-echo "$as_me: error: the selected mpm -- $apache_cv_mpm -- is not supported" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: the selected mpm -- $apache_cv_mpm -- is not supported" >&5
+$as_echo "$as_me: error: the selected mpm -- $apache_cv_mpm -- is not supported" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -18621,14 +18529,14 @@ http_objects="http_core.lo http_protocol.lo http_request.lo http_filters.lo chun
 if test "$enable_http" = "yes"; then
     enable_http="static"
 elif test "$enable_http" = "shared"; then
-    { { echo "$as_me:$LINENO: error: mod_http can not be built as a shared DSO" >&5
-echo "$as_me: error: mod_http can not be built as a shared DSO" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: mod_http can not be built as a shared DSO" >&5
+$as_echo "$as_me: error: mod_http can not be built as a shared DSO" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_http" >&5
-echo $ECHO_N "checking whether to enable mod_http... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_http" >&5
+$as_echo_n "checking whether to enable mod_http... " >&6; }
     # Check whether --enable-http was given.
 if test "${enable_http+set}" = set; then
   enableval=$enable_http;
@@ -18665,8 +18573,8 @@ fi
   if test "$enable_http" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_http$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_http$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_http$_apmod_extra_msg" >&5
+$as_echo "$enable_http$_apmod_extra_msg" >&6; }
   if test "$enable_http" != "no"; then
     case "$enable_http" in
     shared*)
@@ -18720,8 +18628,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_mime" >&5
-echo $ECHO_N "checking whether to enable mod_mime... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_mime" >&5
+$as_echo_n "checking whether to enable mod_mime... " >&6; }
     # Check whether --enable-mime was given.
 if test "${enable_mime+set}" = set; then
   enableval=$enable_mime;
@@ -18758,8 +18666,8 @@ fi
   if test "$enable_mime" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_mime$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_mime$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_mime$_apmod_extra_msg" >&5
+$as_echo "$enable_mime$_apmod_extra_msg" >&6; }
   if test "$enable_mime" != "no"; then
     case "$enable_mime" in
     shared*)
@@ -18827,8 +18735,8 @@ EOF
 
 
 
-{ echo "$as_me:$LINENO: checking for extra modules" >&5
-echo $ECHO_N "checking for extra modules... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for extra modules" >&5
+$as_echo_n "checking for extra modules... " >&6; }
 
 # Check whether --with-module was given.
 if test "${with_module+set}" = set; then
@@ -18881,14 +18789,14 @@ EOF
 
     done
     if test ! -z "$EXTRA_MODLIST"; then
-      { echo "$as_me:$LINENO: result: added:$EXTRA_MODLIST" >&5
-echo "${ECHO_T}added:$EXTRA_MODLIST" >&6; }
+      { $as_echo "$as_me:$LINENO: result: added:$EXTRA_MODLIST" >&5
+$as_echo "added:$EXTRA_MODLIST" >&6; }
     fi
     IFS="$as_save_IFS"
 
 else
-   { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
+   { $as_echo "$as_me:$LINENO: result: none" >&5
+$as_echo "none" >&6; }
 
 fi
 
@@ -18912,8 +18820,8 @@ else
 fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_dav" >&5
-echo $ECHO_N "checking whether to enable mod_dav... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_dav" >&5
+$as_echo_n "checking whether to enable mod_dav... " >&6; }
     # Check whether --enable-dav was given.
 if test "${enable_dav+set}" = set; then
   enableval=$enable_dav;
@@ -18950,8 +18858,8 @@ fi
   if test "$enable_dav" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_dav$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_dav$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_dav$_apmod_extra_msg" >&5
+$as_echo "$enable_dav$_apmod_extra_msg" >&6; }
   if test "$enable_dav" != "no"; then
     case "$enable_dav" in
     shared*)
@@ -19058,8 +18966,8 @@ fi
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_status" >&5
-echo $ECHO_N "checking whether to enable mod_status... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_status" >&5
+$as_echo_n "checking whether to enable mod_status... " >&6; }
     # Check whether --enable-status was given.
 if test "${enable_status+set}" = set; then
   enableval=$enable_status;
@@ -19096,8 +19004,8 @@ fi
   if test "$enable_status" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_status$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_status$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_status$_apmod_extra_msg" >&5
+$as_echo "$enable_status$_apmod_extra_msg" >&6; }
   if test "$enable_status" != "no"; then
     case "$enable_status" in
     shared*)
@@ -19151,8 +19059,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_autoindex" >&5
-echo $ECHO_N "checking whether to enable mod_autoindex... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_autoindex" >&5
+$as_echo_n "checking whether to enable mod_autoindex... " >&6; }
     # Check whether --enable-autoindex was given.
 if test "${enable_autoindex+set}" = set; then
   enableval=$enable_autoindex;
@@ -19189,8 +19097,8 @@ fi
   if test "$enable_autoindex" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_autoindex$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_autoindex$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_autoindex$_apmod_extra_msg" >&5
+$as_echo "$enable_autoindex$_apmod_extra_msg" >&6; }
   if test "$enable_autoindex" != "no"; then
     case "$enable_autoindex" in
     shared*)
@@ -19244,8 +19152,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_asis" >&5
-echo $ECHO_N "checking whether to enable mod_asis... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_asis" >&5
+$as_echo_n "checking whether to enable mod_asis... " >&6; }
     # Check whether --enable-asis was given.
 if test "${enable_asis+set}" = set; then
   enableval=$enable_asis;
@@ -19282,8 +19190,8 @@ fi
   if test "$enable_asis" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_asis$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_asis$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_asis$_apmod_extra_msg" >&5
+$as_echo "$enable_asis$_apmod_extra_msg" >&6; }
   if test "$enable_asis" != "no"; then
     case "$enable_asis" in
     shared*)
@@ -19337,8 +19245,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_info" >&5
-echo $ECHO_N "checking whether to enable mod_info... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_info" >&5
+$as_echo_n "checking whether to enable mod_info... " >&6; }
     # Check whether --enable-info was given.
 if test "${enable_info+set}" = set; then
   enableval=$enable_info;
@@ -19375,8 +19283,8 @@ fi
   if test "$enable_info" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_info$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_info$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_info$_apmod_extra_msg" >&5
+$as_echo "$enable_info$_apmod_extra_msg" >&6; }
   if test "$enable_info" != "no"; then
     case "$enable_info" in
     shared*)
@@ -19430,8 +19338,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_suexec" >&5
-echo $ECHO_N "checking whether to enable mod_suexec... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_suexec" >&5
+$as_echo_n "checking whether to enable mod_suexec... " >&6; }
     # Check whether --enable-suexec was given.
 if test "${enable_suexec+set}" = set; then
   enableval=$enable_suexec;
@@ -19466,24 +19374,24 @@ fi
     fi
   fi
   if test "$enable_suexec" != "no"; then
-            { echo "$as_me:$LINENO: result: checking dependencies" >&5
-echo "${ECHO_T}checking dependencies" >&6; }
+            { $as_echo "$as_me:$LINENO: result: checking dependencies" >&5
+$as_echo "checking dependencies" >&6; }
 
               other_targets=suexec
-                    { echo "$as_me:$LINENO: checking whether to enable mod_suexec" >&5
-echo $ECHO_N "checking whether to enable mod_suexec... $ECHO_C" >&6; }
+                    { $as_echo "$as_me:$LINENO: checking whether to enable mod_suexec" >&5
+$as_echo_n "checking whether to enable mod_suexec... " >&6; }
                     if test "$enable_suexec" = "no"; then
                       if test "$_apmod_error_fatal" = "no"; then
                         _apmod_extra_msg=" (disabled)"
                       else
-                        { { echo "$as_me:$LINENO: error: mod_suexec has been requested but can not be built due to prerequisite failures" >&5
-echo "$as_me: error: mod_suexec has been requested but can not be built due to prerequisite failures" >&2;}
+                        { { $as_echo "$as_me:$LINENO: error: mod_suexec has been requested but can not be built due to prerequisite failures" >&5
+$as_echo "$as_me: error: mod_suexec has been requested but can not be built due to prerequisite failures" >&2;}
    { (exit 1); exit 1; }; }
                       fi
                     fi
   fi
-  { echo "$as_me:$LINENO: result: $enable_suexec$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_suexec$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_suexec$_apmod_extra_msg" >&5
+$as_echo "$enable_suexec$_apmod_extra_msg" >&6; }
   if test "$enable_suexec" != "no"; then
     case "$enable_suexec" in
     shared*)
@@ -19541,8 +19449,8 @@ if ap_mpm_is_threaded; then
 # if we are using a threaded MPM, we will get better performance with
 # mod_cgid, so make it the default.
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_cgid" >&5
-echo $ECHO_N "checking whether to enable mod_cgid... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_cgid" >&5
+$as_echo_n "checking whether to enable mod_cgid... " >&6; }
     # Check whether --enable-cgid was given.
 if test "${enable_cgid+set}" = set; then
   enableval=$enable_cgid;
@@ -19579,8 +19487,8 @@ fi
   if test "$enable_cgid" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_cgid$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_cgid$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_cgid$_apmod_extra_msg" >&5
+$as_echo "$enable_cgid$_apmod_extra_msg" >&6; }
   if test "$enable_cgid" != "no"; then
     case "$enable_cgid" in
     shared*)
@@ -19634,8 +19542,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_cgi" >&5
-echo $ECHO_N "checking whether to enable mod_cgi... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_cgi" >&5
+$as_echo_n "checking whether to enable mod_cgi... " >&6; }
     # Check whether --enable-cgi was given.
 if test "${enable_cgi+set}" = set; then
   enableval=$enable_cgi;
@@ -19672,8 +19580,8 @@ fi
   if test "$enable_cgi" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_cgi$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_cgi$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_cgi$_apmod_extra_msg" >&5
+$as_echo "$enable_cgi$_apmod_extra_msg" >&6; }
   if test "$enable_cgi" != "no"; then
     case "$enable_cgi" in
     shared*)
@@ -19731,8 +19639,8 @@ else
 # mod_cgid, and it just opens up holes we don't need.  Make mod_cgi the
 # default
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_cgi" >&5
-echo $ECHO_N "checking whether to enable mod_cgi... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_cgi" >&5
+$as_echo_n "checking whether to enable mod_cgi... " >&6; }
     # Check whether --enable-cgi was given.
 if test "${enable_cgi+set}" = set; then
   enableval=$enable_cgi;
@@ -19769,8 +19677,8 @@ fi
   if test "$enable_cgi" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_cgi$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_cgi$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_cgi$_apmod_extra_msg" >&5
+$as_echo "$enable_cgi$_apmod_extra_msg" >&6; }
   if test "$enable_cgi" != "no"; then
     case "$enable_cgi" in
     shared*)
@@ -19824,8 +19732,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_cgid" >&5
-echo $ECHO_N "checking whether to enable mod_cgid... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_cgid" >&5
+$as_echo_n "checking whether to enable mod_cgid... " >&6; }
     # Check whether --enable-cgid was given.
 if test "${enable_cgid+set}" = set; then
   enableval=$enable_cgid;
@@ -19862,8 +19770,8 @@ fi
   if test "$enable_cgid" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_cgid$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_cgid$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_cgid$_apmod_extra_msg" >&5
+$as_echo "$enable_cgid$_apmod_extra_msg" >&6; }
   if test "$enable_cgid" != "no"; then
     case "$enable_cgid" in
     shared*)
@@ -19946,11 +19854,11 @@ if test "$MPM_NAME" = "event" ; then
 
 for ac_func in pthread_kill
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -20003,51 +19911,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -20086,11 +19984,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -20123,12 +20022,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -20163,11 +20062,11 @@ if test "$MPM_NAME" = "worker" ; then
 
 for ac_func in pthread_kill
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -20220,51 +20119,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -20302,8 +20191,8 @@ case "$host" in
 esac
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_dav_fs" >&5
-echo $ECHO_N "checking whether to enable mod_dav_fs... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_dav_fs" >&5
+$as_echo_n "checking whether to enable mod_dav_fs... " >&6; }
     # Check whether --enable-dav-fs was given.
 if test "${enable_dav_fs+set}" = set; then
   enableval=$enable_dav_fs;
@@ -20340,8 +20229,8 @@ fi
   if test "$enable_dav_fs" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_dav_fs$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_dav_fs$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_dav_fs$_apmod_extra_msg" >&5
+$as_echo "$enable_dav_fs$_apmod_extra_msg" >&6; }
   if test "$enable_dav_fs" != "no"; then
     case "$enable_dav_fs" in
     shared*)
@@ -20430,8 +20319,8 @@ case "$host" in
 esac
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_dav_lock" >&5
-echo $ECHO_N "checking whether to enable mod_dav_lock... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_dav_lock" >&5
+$as_echo_n "checking whether to enable mod_dav_lock... " >&6; }
     # Check whether --enable-dav-lock was given.
 if test "${enable_dav_lock+set}" = set; then
   enableval=$enable_dav_lock;
@@ -20468,8 +20357,8 @@ fi
   if test "$enable_dav_lock" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_dav_lock$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_dav_lock$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_dav_lock$_apmod_extra_msg" >&5
+$as_echo "$enable_dav_lock$_apmod_extra_msg" >&6; }
   if test "$enable_dav_lock" != "no"; then
     case "$enable_dav_lock" in
     shared*)
@@ -20549,8 +20438,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_vhost_alias" >&5
-echo $ECHO_N "checking whether to enable mod_vhost_alias... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_vhost_alias" >&5
+$as_echo_n "checking whether to enable mod_vhost_alias... " >&6; }
     # Check whether --enable-vhost-alias was given.
 if test "${enable_vhost_alias+set}" = set; then
   enableval=$enable_vhost_alias;
@@ -20587,8 +20476,8 @@ fi
   if test "$enable_vhost_alias" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_vhost_alias$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_vhost_alias$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_vhost_alias$_apmod_extra_msg" >&5
+$as_echo "$enable_vhost_alias$_apmod_extra_msg" >&6; }
   if test "$enable_vhost_alias" != "no"; then
     case "$enable_vhost_alias" in
     shared*)
@@ -20642,8 +20531,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_negotiation" >&5
-echo $ECHO_N "checking whether to enable mod_negotiation... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_negotiation" >&5
+$as_echo_n "checking whether to enable mod_negotiation... " >&6; }
     # Check whether --enable-negotiation was given.
 if test "${enable_negotiation+set}" = set; then
   enableval=$enable_negotiation;
@@ -20680,8 +20569,8 @@ fi
   if test "$enable_negotiation" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_negotiation$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_negotiation$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_negotiation$_apmod_extra_msg" >&5
+$as_echo "$enable_negotiation$_apmod_extra_msg" >&6; }
   if test "$enable_negotiation" != "no"; then
     case "$enable_negotiation" in
     shared*)
@@ -20735,8 +20624,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_dir" >&5
-echo $ECHO_N "checking whether to enable mod_dir... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_dir" >&5
+$as_echo_n "checking whether to enable mod_dir... " >&6; }
     # Check whether --enable-dir was given.
 if test "${enable_dir+set}" = set; then
   enableval=$enable_dir;
@@ -20773,8 +20662,8 @@ fi
   if test "$enable_dir" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_dir$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_dir$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_dir$_apmod_extra_msg" >&5
+$as_echo "$enable_dir$_apmod_extra_msg" >&6; }
   if test "$enable_dir" != "no"; then
     case "$enable_dir" in
     shared*)
@@ -20828,8 +20717,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_imagemap" >&5
-echo $ECHO_N "checking whether to enable mod_imagemap... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_imagemap" >&5
+$as_echo_n "checking whether to enable mod_imagemap... " >&6; }
     # Check whether --enable-imagemap was given.
 if test "${enable_imagemap+set}" = set; then
   enableval=$enable_imagemap;
@@ -20866,8 +20755,8 @@ fi
   if test "$enable_imagemap" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_imagemap$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_imagemap$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_imagemap$_apmod_extra_msg" >&5
+$as_echo "$enable_imagemap$_apmod_extra_msg" >&6; }
   if test "$enable_imagemap" != "no"; then
     case "$enable_imagemap" in
     shared*)
@@ -20921,8 +20810,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_actions" >&5
-echo $ECHO_N "checking whether to enable mod_actions... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_actions" >&5
+$as_echo_n "checking whether to enable mod_actions... " >&6; }
     # Check whether --enable-actions was given.
 if test "${enable_actions+set}" = set; then
   enableval=$enable_actions;
@@ -20959,8 +20848,8 @@ fi
   if test "$enable_actions" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_actions$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_actions$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_actions$_apmod_extra_msg" >&5
+$as_echo "$enable_actions$_apmod_extra_msg" >&6; }
   if test "$enable_actions" != "no"; then
     case "$enable_actions" in
     shared*)
@@ -21014,8 +20903,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_speling" >&5
-echo $ECHO_N "checking whether to enable mod_speling... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_speling" >&5
+$as_echo_n "checking whether to enable mod_speling... " >&6; }
     # Check whether --enable-speling was given.
 if test "${enable_speling+set}" = set; then
   enableval=$enable_speling;
@@ -21052,8 +20941,8 @@ fi
   if test "$enable_speling" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_speling$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_speling$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_speling$_apmod_extra_msg" >&5
+$as_echo "$enable_speling$_apmod_extra_msg" >&6; }
   if test "$enable_speling" != "no"; then
     case "$enable_speling" in
     shared*)
@@ -21107,8 +20996,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_userdir" >&5
-echo $ECHO_N "checking whether to enable mod_userdir... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_userdir" >&5
+$as_echo_n "checking whether to enable mod_userdir... " >&6; }
     # Check whether --enable-userdir was given.
 if test "${enable_userdir+set}" = set; then
   enableval=$enable_userdir;
@@ -21145,8 +21034,8 @@ fi
   if test "$enable_userdir" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_userdir$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_userdir$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_userdir$_apmod_extra_msg" >&5
+$as_echo "$enable_userdir$_apmod_extra_msg" >&6; }
   if test "$enable_userdir" != "no"; then
     case "$enable_userdir" in
     shared*)
@@ -21200,8 +21089,8 @@ EOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_alias" >&5
-echo $ECHO_N "checking whether to enable mod_alias... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_alias" >&5
+$as_echo_n "checking whether to enable mod_alias... " >&6; }
     # Check whether --enable-alias was given.
 if test "${enable_alias+set}" = set; then
   enableval=$enable_alias;
@@ -21238,8 +21127,8 @@ fi
   if test "$enable_alias" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_alias$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_alias$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_alias$_apmod_extra_msg" >&5
+$as_echo "$enable_alias$_apmod_extra_msg" >&6; }
   if test "$enable_alias" != "no"; then
     case "$enable_alias" in
     shared*)
@@ -21294,8 +21183,8 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_rewrite" >&5
-echo $ECHO_N "checking whether to enable mod_rewrite... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_rewrite" >&5
+$as_echo_n "checking whether to enable mod_rewrite... " >&6; }
     # Check whether --enable-rewrite was given.
 if test "${enable_rewrite+set}" = set; then
   enableval=$enable_rewrite;
@@ -21332,8 +21221,8 @@ fi
   if test "$enable_rewrite" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_rewrite$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_rewrite$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_rewrite$_apmod_extra_msg" >&5
+$as_echo "$enable_rewrite$_apmod_extra_msg" >&6; }
   if test "$enable_rewrite" != "no"; then
     case "$enable_rewrite" in
     shared*)
@@ -21418,14 +21307,14 @@ CPPFLAGS=$apr_old_cppflags
 case "x$enable_so" in
     "xyes")
         if test $ac_cv_define_APR_HAS_DSO = "no"; then
-            { { echo "$as_me:$LINENO: error: mod_so has been requested but cannot be built on your system" >&5
-echo "$as_me: error: mod_so has been requested but cannot be built on your system" >&2;}
+            { { $as_echo "$as_me:$LINENO: error: mod_so has been requested but cannot be built on your system" >&5
+$as_echo "$as_me: error: mod_so has been requested but cannot be built on your system" >&2;}
    { (exit 1); exit 1; }; }
         fi
         ;;
     "xshared")
-        { { echo "$as_me:$LINENO: error: mod_so can not be built as a shared DSO" >&5
-echo "$as_me: error: mod_so can not be built as a shared DSO" >&2;}
+        { { $as_echo "$as_me:$LINENO: error: mod_so can not be built as a shared DSO" >&5
+$as_echo "$as_me: error: mod_so can not be built as a shared DSO" >&2;}
    { (exit 1); exit 1; }; }
         ;;
     "xno")
@@ -21472,19 +21361,19 @@ fi
 
 if test "$sharedobjs" = "yes"; then
     if test $ac_cv_define_APR_HAS_DSO = "no"; then
-        { { echo "$as_me:$LINENO: error: shared objects have been requested but cannot be built since mod_so cannot be built" >&5
-echo "$as_me: error: shared objects have been requested but cannot be built since mod_so cannot be built" >&2;}
+        { { $as_echo "$as_me:$LINENO: error: shared objects have been requested but cannot be built since mod_so cannot be built" >&5
+$as_echo "$as_me: error: shared objects have been requested but cannot be built since mod_so cannot be built" >&2;}
    { (exit 1); exit 1; }; }
     elif test $enable_so = "no"; then
-        { { echo "$as_me:$LINENO: error: shared objects have been requested but cannot be built since mod_so was disabled" >&5
-echo "$as_me: error: shared objects have been requested but cannot be built since mod_so was disabled" >&2;}
+        { { $as_echo "$as_me:$LINENO: error: shared objects have been requested but cannot be built since mod_so was disabled" >&5
+$as_echo "$as_me: error: shared objects have been requested but cannot be built since mod_so was disabled" >&2;}
    { (exit 1); exit 1; }; }
     fi
 fi
 
 
-  { echo "$as_me:$LINENO: checking whether to enable mod_so" >&5
-echo $ECHO_N "checking whether to enable mod_so... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to enable mod_so" >&5
+$as_echo_n "checking whether to enable mod_so... " >&6; }
     # Check whether --enable-so was given.
 if test "${enable_so+set}" = set; then
   enableval=$enable_so;
@@ -21521,8 +21410,8 @@ fi
   if test "$enable_so" != "no"; then
             :
   fi
-  { echo "$as_me:$LINENO: result: $enable_so$_apmod_extra_msg" >&5
-echo "${ECHO_T}$enable_so$_apmod_extra_msg" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_so$_apmod_extra_msg" >&5
+$as_echo "$enable_so$_apmod_extra_msg" >&6; }
   if test "$enable_so" != "no"; then
     case "$enable_so" in
     shared*)
@@ -21603,11 +21492,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -21640,12 +21530,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -21859,7 +21749,9 @@ _ACEOF
 fi
 
 
-AP_LIBS="$AP_LIBS `$apu_config --link-libtool --libs` `$apr_config --link-libtool --libs`"
+apulinklibs="`$apu_config --avoid-ldap --link-libtool --libs`" \
+ || apulinklibs="`$apu_config --link-libtool --libs`"
+AP_LIBS="$AP_LIBS $apulinklibs `$apr_config --link-libtool --libs`"
 
   APACHE_VAR_SUBST="$APACHE_VAR_SUBST AP_LIBS"
 
@@ -22250,6 +22142,10 @@ echo $ac_n "${nl}Construct makefiles and header files...${nl}"
 
 
 
+  APACHE_VAR_SUBST="$APACHE_VAR_SUBST SSLPORT"
+
+
+
   APACHE_VAR_SUBST="$APACHE_VAR_SUBST nonssl_listen_stmt_1"
 
 
@@ -22427,11 +22323,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -22464,12 +22361,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -22485,7 +22382,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -22498,11 +22395,12 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -22515,24 +22413,28 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
 
 
 # PATH needs CR
@@ -22543,17 +22445,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -22569,8 +22499,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -22593,7 +22521,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -22606,17 +22534,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -22638,7 +22559,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -22689,7 +22610,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -22717,7 +22638,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -22730,19 +22650,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -22756,19 +22679,28 @@ else
   as_mkdir_p=false
 fi
 
-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -22784,7 +22716,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -22797,7 +22729,7 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -22805,7 +22737,7 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -22813,14 +22745,14 @@ current configuration.
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
+  -V, --version    print version number and configuration settings, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+                   instantiate the configuration file FILE
   --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -22834,23 +22766,24 @@ $config_commands
 Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.60,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.62,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -22872,30 +22805,36 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
+    { $as_echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -22914,27 +22853,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -22946,7 +22887,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -22980,8 +22921,8 @@ do
     "build/config_vars.sh") CONFIG_FILES="$CONFIG_FILES build/config_vars.sh" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -23022,423 +22963,143 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-exp_exec_prefix!$exp_exec_prefix$ac_delim
-rel_exec_prefix!$rel_exec_prefix$ac_delim
-exp_bindir!$exp_bindir$ac_delim
-rel_bindir!$rel_bindir$ac_delim
-exp_sbindir!$exp_sbindir$ac_delim
-rel_sbindir!$rel_sbindir$ac_delim
-exp_libdir!$exp_libdir$ac_delim
-rel_libdir!$rel_libdir$ac_delim
-exp_libexecdir!$exp_libexecdir$ac_delim
-rel_libexecdir!$rel_libexecdir$ac_delim
-exp_mandir!$exp_mandir$ac_delim
-rel_mandir!$rel_mandir$ac_delim
-exp_sysconfdir!$exp_sysconfdir$ac_delim
-rel_sysconfdir!$rel_sysconfdir$ac_delim
-exp_datadir!$exp_datadir$ac_delim
-rel_datadir!$rel_datadir$ac_delim
-exp_installbuilddir!$exp_installbuilddir$ac_delim
-rel_installbuilddir!$rel_installbuilddir$ac_delim
-exp_errordir!$exp_errordir$ac_delim
-rel_errordir!$rel_errordir$ac_delim
-exp_iconsdir!$exp_iconsdir$ac_delim
-rel_iconsdir!$rel_iconsdir$ac_delim
-exp_htdocsdir!$exp_htdocsdir$ac_delim
-rel_htdocsdir!$rel_htdocsdir$ac_delim
-exp_manualdir!$exp_manualdir$ac_delim
-rel_manualdir!$rel_manualdir$ac_delim
-exp_cgidir!$exp_cgidir$ac_delim
-rel_cgidir!$rel_cgidir$ac_delim
-exp_includedir!$exp_includedir$ac_delim
-rel_includedir!$rel_includedir$ac_delim
-exp_localstatedir!$exp_localstatedir$ac_delim
-rel_localstatedir!$rel_localstatedir$ac_delim
-exp_runtimedir!$exp_runtimedir$ac_delim
-rel_runtimedir!$rel_runtimedir$ac_delim
-exp_logfiledir!$exp_logfiledir$ac_delim
-rel_logfiledir!$rel_logfiledir$ac_delim
-exp_proxycachedir!$exp_proxycachedir$ac_delim
-rel_proxycachedir!$rel_proxycachedir$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-target!$target$ac_delim
-target_cpu!$target_cpu$ac_delim
-target_vendor!$target_vendor$ac_delim
-target_os!$target_os$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-CPP!$CPP$ac_delim
-PCRE_CONFIG!$PCRE_CONFIG$ac_delim
-SHLTCFLAGS!$SHLTCFLAGS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
 fi
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-LTCFLAGS!$LTCFLAGS$ac_delim
-RM!$RM$ac_delim
-PKGCONFIG!$PKGCONFIG$ac_delim
-RSYNC!$RSYNC$ac_delim
-AWK!$AWK$ac_delim
-LN_S!$LN_S$ac_delim
-RANLIB!$RANLIB$ac_delim
-LYNX_PATH!$LYNX_PATH$ac_delim
-MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
-INSTALL!$INSTALL$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-MKDEP!$MKDEP$ac_delim
-PICFLAGS!$PICFLAGS$ac_delim
-PILDFLAGS!$PILDFLAGS$ac_delim
-MOD_AUTHN_FILE_LDADD!$MOD_AUTHN_FILE_LDADD$ac_delim
-MOD_AUTHN_DBM_LDADD!$MOD_AUTHN_DBM_LDADD$ac_delim
-MOD_AUTHN_ANON_LDADD!$MOD_AUTHN_ANON_LDADD$ac_delim
-MOD_AUTHN_DBD_LDADD!$MOD_AUTHN_DBD_LDADD$ac_delim
-MOD_AUTHN_DEFAULT_LDADD!$MOD_AUTHN_DEFAULT_LDADD$ac_delim
-MOD_AUTHN_ALIAS_LDADD!$MOD_AUTHN_ALIAS_LDADD$ac_delim
-MOD_AUTHZ_HOST_LDADD!$MOD_AUTHZ_HOST_LDADD$ac_delim
-MOD_AUTHZ_GROUPFILE_LDADD!$MOD_AUTHZ_GROUPFILE_LDADD$ac_delim
-MOD_AUTHZ_USER_LDADD!$MOD_AUTHZ_USER_LDADD$ac_delim
-MOD_AUTHZ_DBM_LDADD!$MOD_AUTHZ_DBM_LDADD$ac_delim
-MOD_AUTHZ_OWNER_LDADD!$MOD_AUTHZ_OWNER_LDADD$ac_delim
-MOD_AUTHNZ_LDAP_LDADD!$MOD_AUTHNZ_LDAP_LDADD$ac_delim
-MOD_AUTHZ_DEFAULT_LDADD!$MOD_AUTHZ_DEFAULT_LDADD$ac_delim
-MOD_AUTH_BASIC_LDADD!$MOD_AUTH_BASIC_LDADD$ac_delim
-MOD_AUTH_DIGEST_LDADD!$MOD_AUTH_DIGEST_LDADD$ac_delim
-MOD_ISAPI_LDADD!$MOD_ISAPI_LDADD$ac_delim
-MOD_FILE_CACHE_LDADD!$MOD_FILE_CACHE_LDADD$ac_delim
-MOD_CACHE_LDADD!$MOD_CACHE_LDADD$ac_delim
-MOD_DISK_CACHE_LDADD!$MOD_DISK_CACHE_LDADD$ac_delim
-MOD_MEM_CACHE_LDADD!$MOD_MEM_CACHE_LDADD$ac_delim
-MOD_DBD_LDADD!$MOD_DBD_LDADD$ac_delim
-MOD_BUCKETEER_LDADD!$MOD_BUCKETEER_LDADD$ac_delim
-MOD_DUMPIO_LDADD!$MOD_DUMPIO_LDADD$ac_delim
-MOD_ECHO_LDADD!$MOD_ECHO_LDADD$ac_delim
-MOD_EXAMPLE_LDADD!$MOD_EXAMPLE_LDADD$ac_delim
-MOD_CASE_FILTER_LDADD!$MOD_CASE_FILTER_LDADD$ac_delim
-MOD_CASE_FILTER_IN_LDADD!$MOD_CASE_FILTER_IN_LDADD$ac_delim
-MOD_EXT_FILTER_LDADD!$MOD_EXT_FILTER_LDADD$ac_delim
-MOD_INCLUDE_LDADD!$MOD_INCLUDE_LDADD$ac_delim
-MOD_FILTER_LDADD!$MOD_FILTER_LDADD$ac_delim
-MOD_SUBSTITUTE_LDADD!$MOD_SUBSTITUTE_LDADD$ac_delim
-MOD_CHARSET_LITE_LDADD!$MOD_CHARSET_LITE_LDADD$ac_delim
-MOD_DEFLATE_LDADD!$MOD_DEFLATE_LDADD$ac_delim
-MOD_LDAP_LDADD!$MOD_LDAP_LDADD$ac_delim
-MOD_LOG_CONFIG_LDADD!$MOD_LOG_CONFIG_LDADD$ac_delim
-MOD_LOG_FORENSIC_LDADD!$MOD_LOG_FORENSIC_LDADD$ac_delim
-MOD_LOGIO_LDADD!$MOD_LOGIO_LDADD$ac_delim
-MOD_ENV_LDADD!$MOD_ENV_LDADD$ac_delim
-MOD_MIME_MAGIC_LDADD!$MOD_MIME_MAGIC_LDADD$ac_delim
-MOD_CERN_META_LDADD!$MOD_CERN_META_LDADD$ac_delim
-MOD_EXPIRES_LDADD!$MOD_EXPIRES_LDADD$ac_delim
-MOD_HEADERS_LDADD!$MOD_HEADERS_LDADD$ac_delim
-MOD_IDENT_LDADD!$MOD_IDENT_LDADD$ac_delim
-MOD_USERTRACK_LDADD!$MOD_USERTRACK_LDADD$ac_delim
-MOD_UNIQUE_ID_LDADD!$MOD_UNIQUE_ID_LDADD$ac_delim
-MOD_SETENVIF_LDADD!$MOD_SETENVIF_LDADD$ac_delim
-MOD_VERSION_LDADD!$MOD_VERSION_LDADD$ac_delim
-MOD_PROXY_LDADD!$MOD_PROXY_LDADD$ac_delim
-MOD_PROXY_CONNECT_LDADD!$MOD_PROXY_CONNECT_LDADD$ac_delim
-MOD_PROXY_FTP_LDADD!$MOD_PROXY_FTP_LDADD$ac_delim
-MOD_PROXY_HTTP_LDADD!$MOD_PROXY_HTTP_LDADD$ac_delim
-MOD_PROXY_AJP_LDADD!$MOD_PROXY_AJP_LDADD$ac_delim
-MOD_PROXY_BALANCER_LDADD!$MOD_PROXY_BALANCER_LDADD$ac_delim
-SSL_LIBS!$SSL_LIBS$ac_delim
-MOD_SSL_LDADD!$MOD_SSL_LDADD$ac_delim
-MOD_OPTIONAL_HOOK_EXPORT_LDADD!$MOD_OPTIONAL_HOOK_EXPORT_LDADD$ac_delim
-MOD_OPTIONAL_HOOK_IMPORT_LDADD!$MOD_OPTIONAL_HOOK_IMPORT_LDADD$ac_delim
-MOD_OPTIONAL_FN_IMPORT_LDADD!$MOD_OPTIONAL_FN_IMPORT_LDADD$ac_delim
-MOD_OPTIONAL_FN_EXPORT_LDADD!$MOD_OPTIONAL_FN_EXPORT_LDADD$ac_delim
-MPM_NAME!$MPM_NAME$ac_delim
-MPM_SUBDIR_NAME!$MPM_SUBDIR_NAME$ac_delim
-htpasswd_LTFLAGS!$htpasswd_LTFLAGS$ac_delim
-htdigest_LTFLAGS!$htdigest_LTFLAGS$ac_delim
-rotatelogs_LTFLAGS!$rotatelogs_LTFLAGS$ac_delim
-logresolve_LTFLAGS!$logresolve_LTFLAGS$ac_delim
-htdbm_LTFLAGS!$htdbm_LTFLAGS$ac_delim
-ab_LTFLAGS!$ab_LTFLAGS$ac_delim
-checkgid_LTFLAGS!$checkgid_LTFLAGS$ac_delim
-htcacheclean_LTFLAGS!$htcacheclean_LTFLAGS$ac_delim
-httxt2dbm_LTFLAGS!$httxt2dbm_LTFLAGS$ac_delim
-APACHECTL_ULIMIT!$APACHECTL_ULIMIT$ac_delim
-MOD_HTTP_LDADD!$MOD_HTTP_LDADD$ac_delim
-MOD_MIME_LDADD!$MOD_MIME_LDADD$ac_delim
-MOD_DAV_LDADD!$MOD_DAV_LDADD$ac_delim
-MOD_STATUS_LDADD!$MOD_STATUS_LDADD$ac_delim
-MOD_AUTOINDEX_LDADD!$MOD_AUTOINDEX_LDADD$ac_delim
-MOD_ASIS_LDADD!$MOD_ASIS_LDADD$ac_delim
-MOD_INFO_LDADD!$MOD_INFO_LDADD$ac_delim
-MOD_SUEXEC_LDADD!$MOD_SUEXEC_LDADD$ac_delim
-MOD_CGID_LDADD!$MOD_CGID_LDADD$ac_delim
-MOD_CGI_LDADD!$MOD_CGI_LDADD$ac_delim
-MOD_DAV_FS_LDADD!$MOD_DAV_FS_LDADD$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
-
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-MOD_DAV_LOCK_LDADD!$MOD_DAV_LOCK_LDADD$ac_delim
-MOD_VHOST_ALIAS_LDADD!$MOD_VHOST_ALIAS_LDADD$ac_delim
-MOD_NEGOTIATION_LDADD!$MOD_NEGOTIATION_LDADD$ac_delim
-MOD_DIR_LDADD!$MOD_DIR_LDADD$ac_delim
-MOD_IMAGEMAP_LDADD!$MOD_IMAGEMAP_LDADD$ac_delim
-MOD_ACTIONS_LDADD!$MOD_ACTIONS_LDADD$ac_delim
-MOD_SPELING_LDADD!$MOD_SPELING_LDADD$ac_delim
-MOD_USERDIR_LDADD!$MOD_USERDIR_LDADD$ac_delim
-MOD_ALIAS_LDADD!$MOD_ALIAS_LDADD$ac_delim
-MOD_REWRITE_LDADD!$MOD_REWRITE_LDADD$ac_delim
-INSTALL_DSO!$INSTALL_DSO$ac_delim
-MOD_SO_LDADD!$MOD_SO_LDADD$ac_delim
-progname!$progname$ac_delim
-MPM_LIB!$MPM_LIB$ac_delim
-OS!$OS$ac_delim
-OS_DIR!$OS_DIR$ac_delim
-BUILTIN_LIBS!$BUILTIN_LIBS$ac_delim
-SHLIBPATH_VAR!$SHLIBPATH_VAR$ac_delim
-OS_SPECIFIC_VARS!$OS_SPECIFIC_VARS$ac_delim
-PRE_SHARED_CMDS!$PRE_SHARED_CMDS$ac_delim
-POST_SHARED_CMDS!$POST_SHARED_CMDS$ac_delim
-shared_build!$shared_build$ac_delim
-AP_LIBS!$AP_LIBS$ac_delim
-AP_BUILD_SRCLIB_DIRS!$AP_BUILD_SRCLIB_DIRS$ac_delim
-AP_CLEAN_SRCLIB_DIRS!$AP_CLEAN_SRCLIB_DIRS$ac_delim
-EXTRA_CPPFLAGS!$EXTRA_CPPFLAGS$ac_delim
-EXTRA_CFLAGS!$EXTRA_CFLAGS$ac_delim
-EXTRA_CXXFLAGS!$EXTRA_CXXFLAGS$ac_delim
-EXTRA_LDFLAGS!$EXTRA_LDFLAGS$ac_delim
-EXTRA_LIBS!$EXTRA_LIBS$ac_delim
-EXTRA_INCLUDES!$EXTRA_INCLUDES$ac_delim
-abs_srcdir!$abs_srcdir$ac_delim
-cgidir!$cgidir$ac_delim
-logfiledir!$logfiledir$ac_delim
-htdocsdir!$htdocsdir$ac_delim
-manualdir!$manualdir$ac_delim
-errordir!$errordir$ac_delim
-iconsdir!$iconsdir$ac_delim
-installbuilddir!$installbuilddir$ac_delim
-runtimedir!$runtimedir$ac_delim
-proxycachedir!$proxycachedir$ac_delim
-other_targets!$other_targets$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-LTFLAGS!$LTFLAGS$ac_delim
-LT_LDFLAGS!$LT_LDFLAGS$ac_delim
-SH_LDFLAGS!$SH_LDFLAGS$ac_delim
-HTTPD_LDFLAGS!$HTTPD_LDFLAGS$ac_delim
-UTIL_LDFLAGS!$UTIL_LDFLAGS$ac_delim
-INCLUDES!$INCLUDES$ac_delim
-NOTEST_CPPFLAGS!$NOTEST_CPPFLAGS$ac_delim
-NOTEST_CFLAGS!$NOTEST_CFLAGS$ac_delim
-NOTEST_CXXFLAGS!$NOTEST_CXXFLAGS$ac_delim
-NOTEST_LDFLAGS!$NOTEST_LDFLAGS$ac_delim
-NOTEST_LIBS!$NOTEST_LIBS$ac_delim
-LIBTOOL!$LIBTOOL$ac_delim
-MODULE_DIRS!$MODULE_DIRS$ac_delim
-MODULE_CLEANDIRS!$MODULE_CLEANDIRS$ac_delim
-PORT!$PORT$ac_delim
-nonssl_listen_stmt_1!$nonssl_listen_stmt_1$ac_delim
-nonssl_listen_stmt_2!$nonssl_listen_stmt_2$ac_delim
-CORE_IMPLIB_FILE!$CORE_IMPLIB_FILE$ac_delim
-CORE_IMPLIB!$CORE_IMPLIB$ac_delim
-SH_LIBS!$SH_LIBS$ac_delim
-SH_LIBTOOL!$SH_LIBTOOL$ac_delim
-MK_IMPLIB!$MK_IMPLIB$ac_delim
-INSTALL_PROG_FLAGS!$INSTALL_PROG_FLAGS$ac_delim
-DSO_MODULES!$DSO_MODULES$ac_delim
-APR_BINDIR!$APR_BINDIR$ac_delim
-APR_INCLUDEDIR!$APR_INCLUDEDIR$ac_delim
-APR_VERSION!$APR_VERSION$ac_delim
-APR_CONFIG!$APR_CONFIG$ac_delim
-APU_BINDIR!$APU_BINDIR$ac_delim
-APU_INCLUDEDIR!$APU_INCLUDEDIR$ac_delim
-APU_VERSION!$APU_VERSION$ac_delim
-APU_CONFIG!$APU_CONFIG$ac_delim
-perlbin!$perlbin$ac_delim
-ap_make_include!$ap_make_include$ac_delim
-ap_make_delimiter!$ap_make_delimiter$ac_delim
-HTTPD_VERSION!$HTTPD_VERSION$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+  print line
+}
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -23454,19 +23115,133 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    prefix = substr(line, 1, index(line, defundef) - 1)
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", line, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -23495,26 +23270,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    fi
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -23524,7 +23311,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -23550,7 +23337,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -23559,7 +23346,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -23580,17 +23367,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -23626,12 +23413,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -23640,13 +23428,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -23660,15 +23449,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -23677,123 +23467,62 @@ s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
  ;;
 
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -23810,6 +23539,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -23831,6 +23565,10 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
 
 case $MPM_SUBDIR_NAME in
diff --git a/configure.in b/configure.in
index 5ab7133c..434a43ec 100644
--- a/configure.in
+++ b/configure.in
@@ -434,6 +434,10 @@ AC_ARG_WITH(port,APACHE_HELP_STRING(--with-port=PORT,Port on which to listen (de
         [if test "$withval" = "yes"; then AC_MSG_ERROR('option --with-port requires a value (the TCP port number)'); else PORT="$withval"; fi],
 	[PORT=80])
 
+AC_ARG_WITH(sslport,APACHE_HELP_STRING(--with-sslport=SSLPORT,Port on which to securelisten (default is 443)),
+        [if test "$withval" = "yes"; then AC_MSG_ERROR('option --with-sslport requires a value (the SSL TCP port number)'); else SSLPORT="$withval"; fi],
+	[SSLPORT=443])
+
 APR_CHECK_APR_DEFINE(APR_HAVE_IPV6)
 
 AC_ARG_ENABLE(v4-mapped,APACHE_HELP_STRING(--enable-v4-mapped,Allow IPv6 sockets to handle IPv4 connections),
@@ -584,7 +588,9 @@ APACHE_HELP_STRING(--with-suexec-umask,umask for suexec'd process),[
   AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] )
 
 dnl APR should go after the other libs, so the right symbols can be picked up
-AP_LIBS="$AP_LIBS `$apu_config --link-libtool --libs` `$apr_config --link-libtool --libs`"
+apulinklibs="`$apu_config --avoid-ldap --link-libtool --libs`" \
+ || apulinklibs="`$apu_config --link-libtool --libs`"
+AP_LIBS="$AP_LIBS $apulinklibs `$apr_config --link-libtool --libs`" 
 APACHE_SUBST(AP_LIBS)
 APACHE_SUBST(AP_BUILD_SRCLIB_DIRS)
 APACHE_SUBST(AP_CLEAN_SRCLIB_DIRS)
diff --git a/docs/conf/extra/httpd-dav.conf.in b/docs/conf/extra/httpd-dav.conf.in
index efa8f83c..c8d56b49 100644
--- a/docs/conf/extra/httpd-dav.conf.in
+++ b/docs/conf/extra/httpd-dav.conf.in
@@ -24,9 +24,11 @@ Alias /uploads "@@ServerRoot@@/uploads"
 
     AuthType Digest
     AuthName DAV-upload
+
     # You can use the htdigest program to create the password database:
     #   htdigest -c "@@ServerRoot@@/user.passwd" DAV-upload admin
     AuthUserFile "@@ServerRoot@@/user.passwd"
+    AuthDigestProvider file
 
     # Allow universal read-access, but writes are restricted
     # to the admin user.
diff --git a/docs/conf/extra/httpd-languages.conf.in b/docs/conf/extra/httpd-languages.conf.in
index e7452bfd..7f664614 100644
--- a/docs/conf/extra/httpd-languages.conf.in
+++ b/docs/conf/extra/httpd-languages.conf.in
@@ -38,7 +38,8 @@
 # Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn)
 # Norwegian (no) - Polish (pl) - Portugese (pt)
 # Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv)
-# Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW)
+# Turkish (tr) - Simplified Chinese (zh-CN) - Spanish (es)
+# Traditional Chinese (zh-TW)
 #
 AddLanguage ca .ca
 AddLanguage cs .cz .cs
@@ -64,6 +65,7 @@ AddLanguage pt .pt
 AddLanguage pt-BR .pt-br
 AddLanguage ru .ru
 AddLanguage sv .sv
+AddLanguage tr .tr
 AddLanguage zh-CN .zh-cn
 AddLanguage zh-TW .zh-tw
 
@@ -73,7 +75,7 @@ AddLanguage zh-TW .zh-tw
 # Just list the languages in decreasing order of preference. We have
 # more or less alphabetized them here. You probably want to change this.
 #
-LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
+LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv tr zh-CN zh-TW
 
 #
 # ForceLanguagePriority allows you to serve a result page rather than
@@ -136,4 +138,4 @@ AddCharset EUC-TW  .euc-tw
 AddCharset gb2312  .gb2312 .gb
 AddCharset iso-10646-ucs-2 .ucs-2 .iso-10646-ucs-2
 AddCharset iso-10646-ucs-4 .ucs-4 .iso-10646-ucs-4
-AddCharset shift_jis   .shift_jis .sjis
\ No newline at end of file
+AddCharset shift_jis   .shift_jis .sjis
diff --git a/docs/conf/extra/httpd-manual.conf.in b/docs/conf/extra/httpd-manual.conf.in
index e210c964..34115ff5 100644
--- a/docs/conf/extra/httpd-manual.conf.in
+++ b/docs/conf/extra/httpd-manual.conf.in
@@ -7,7 +7,7 @@
 # Required modules: mod_alias, mod_setenvif, mod_negotiation
 #
 
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ "@exp_manualdir@$1"
+AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru|tr))?(/.*)?$ "@exp_manualdir@$1"
 
 <Directory "@exp_manualdir@">
     Options Indexes
@@ -18,10 +18,14 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ "@exp_manualdir@$
     <Files *.html>
         SetHandler type-map
     </Files>
+    # .tr is text/troff in mime.types!
+    <Files *.html.tr.utf8>
+        ForceType text/html
+    </Files>
 
-    SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br|ru)/ prefer-language=$1
-    RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br|ru)){2,}(/.*)?$ /manual/$1$2
+    SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br|ru|tr)/ prefer-language=$1
+    RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br|ru|tr)){2,}(/.*)?$ /manual/$1$2
 
-    LanguagePriority en de es fr ja ko pt-br ru 
+    LanguagePriority en de es fr ja ko pt-br ru tr
     ForceLanguagePriority Prefer Fallback
 </Directory>
diff --git a/docs/conf/extra/httpd-ssl.conf.in b/docs/conf/extra/httpd-ssl.conf.in
index 1527ff20..b9f12834 100644
--- a/docs/conf/extra/httpd-ssl.conf.in
+++ b/docs/conf/extra/httpd-ssl.conf.in
@@ -32,9 +32,9 @@
 # standard HTTP port (see above) and to the HTTPS port
 #
 # Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
-#       Listen directives: "Listen [::]:443" and "Listen 0.0.0.0:443"
+#       Listen directives: "Listen [::]:@@SSLPort@@" and "Listen 0.0.0.0:@@SSLPort@@"
 #
-Listen 443
+Listen @@SSLPort@@
 
 ##
 ##  SSL Global Context
@@ -71,11 +71,11 @@ SSLMutex  "file:@exp_runtimedir@/ssl_mutex"
 ## SSL Virtual Host Context
 ##
 
-<VirtualHost _default_:443>
+<VirtualHost _default_:@@SSLPort@@>
 
 #   General setup for the virtual host
 DocumentRoot "@exp_htdocsdir@"
-ServerName www.example.com:443
+ServerName www.example.com:@@SSLPort@@
 ServerAdmin you@example.com
 ErrorLog "@exp_logfiledir@/error_log"
 TransferLog "@exp_logfiledir@/access_log"
diff --git a/docs/man/htcacheclean.8 b/docs/man/htcacheclean.8
index 746a7bab..633c6452 100644
--- a/docs/man/htcacheclean.8
+++ b/docs/man/htcacheclean.8
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "HTCACHECLEAN" 8 "2005-08-08" "Apache HTTP Server" "htcacheclean"
+.TH "HTCACHECLEAN" 8 "2008-05-06" "Apache HTTP Server" "htcacheclean"
 
 .SH NAME
 htcacheclean \- Clean up the disk cache
@@ -30,7 +30,7 @@ htcacheclean \- Clean up the disk cache
 \fBhtcacheclean\fR [ -\fBD\fR ] [ -\fBv\fR ] [ -\fBt\fR ] [ -\fBr\fR ] [ -\fBn\fR ] -\fBp\fR\fIpath\fR -\fBl\fR\fIlimit\fR
  
 .PP
-\fBhtcacheclean\fR -\fBb\fR [ -\fBn\fR ] [ -\fBt\fR ] [ -\fBi\fR ] -\fBd\fR\fIinterval\fR -\fBp\fR\fIpath\fR -\fBl\fR\fIlimit\fR
+\fBhtcacheclean\fR [ -\fBn\fR ] [ -\fBt\fR ] [ -\fBi\fR ] -\fBd\fR\fIinterval\fR -\fBp\fR\fIpath\fR -\fBl\fR\fIlimit\fR
  
 
 .SH "SUMMARY"
diff --git a/docs/man/rotatelogs.8 b/docs/man/rotatelogs.8
index 5b95a1fa..88228104 100644
--- a/docs/man/rotatelogs.8
+++ b/docs/man/rotatelogs.8
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "ROTATELOGS" 8 "2007-12-09" "Apache HTTP Server" "rotatelogs"
+.TH "ROTATELOGS" 8 "2008-05-10" "Apache HTTP Server" "rotatelogs"
 
 .SH NAME
 rotatelogs \- Piped logging program to rotate Apache logs
@@ -27,7 +27,7 @@ rotatelogs \- Piped logging program to rotate Apache logs
 .SH "SYNOPSIS"
  
 .PP
-\fBrotatelogs\fR [ -\fBl\fR ] \fIlogfile\fR \fIrotationtime\fR|\fIfilesize\fRM [ \fIoffset\fR ]
+\fBrotatelogs\fR [ -\fBl\fR ] [ -\fBf\fR ] \fIlogfile\fR \fIrotationtime\fR|\fIfilesize\fRM [ \fIoffset\fR ]
  
 
 .SH "SUMMARY"
@@ -43,6 +43,9 @@ rotatelogs is a simple program for use in conjunction with Apache's piped logfil
 -l
 Causes the use of local time rather than GMT as the base for the interval or for strftime(3) formatting with size-based rotation\&. Note that using -l in an environment which changes the GMT offset (such as for BST or DST) can lead to unpredictable results!  
 .TP
+-f
+Causes the logfile to be opened immediately, as soon as rotatelogs starts, instead of waiting for the first logfile entry to be read (for non-busy sites, there may be a substantial delay between when the server is started and when the first request is handled, meaning that the associated logfile does not "exist" until then, which causes problems from some automated logging tools)\&. \fIAvailable in version 2\&.2\&.9 and later\&.\fR  
+.TP
 \fIlogfile\fR
 The path plus basename of the logfile\&. If \fIlogfile\fR includes any '%' characters, it is treated as a format string for strftime(3)\&. Otherwise, the suffix \fI\&.nnnnnnnnnn\fR is automatically added and is the time in seconds\&. Both formats compute the start time from the beginning of the current period\&. For example, if a rotation time of 86400 is specified, the hour, minute, and second fields created from the strftime(3) format will all be zero, referring to the beginning of the current 24-hour period (midnight)\&.  
 .TP
diff --git a/docs/manual/bind.html b/docs/manual/bind.html
index c2af6387..ac21629f 100644
--- a/docs/manual/bind.html
+++ b/docs/manual/bind.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: bind.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -10,10 +12,14 @@ URI: bind.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: bind.html.ja.euc-jp
+URI: bind.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: bind.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: bind.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/bind.html.de b/docs/manual/bind.html.de
index f9184348..6c10e21c 100644
--- a/docs/manual/bind.html.de
+++ b/docs/manual/bind.html.de
@@ -22,8 +22,12 @@
 <a href="./en/bind.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/bind.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/bind.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/bind.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Diese Übersetzung ist möglicherweise
+            nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
+            die neuesten Änderungen.</div>
 
     <p>Konfiguration der vom Apache verwendeten Adressen und Ports.</p>
   </div>
@@ -71,8 +75,8 @@
       Netzwerkinterfaces und Ports zu akzeptieren zu lassen, geben Sie an:</p>
       
     <div class="example"><p><code>
-      Listen 192.170.2.1:80<br />
-      Listen 192.170.2.5:8000
+      Listen 192.0.2.1:80<br />
+      Listen 192.0.2.5:8000
     </code></p></div>
 
     <p>IPv6-Adressen müssen wie im folgenden Beispiel in eckigen
@@ -123,7 +127,7 @@
 
     <div class="example"><p><code>
       Listen 0.0.0.0:80<br />
-      Listen 192.170.2.1:80
+      Listen 192.0.2.1:80
     </code></p></div>
 
     <p>Wenn Sie möchten, dass der Apache IPv4- und IPv6-Verbindungen an
@@ -158,8 +162,9 @@
 <a href="./en/bind.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/bind.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/bind.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/bind.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/bind.html.en b/docs/manual/bind.html.en
index be8cb6c5..399510ca 100644
--- a/docs/manual/bind.html.en
+++ b/docs/manual/bind.html.en
@@ -22,7 +22,8 @@
 <a href="./en/bind.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/bind.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/bind.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/bind.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>Configuring Apache to listen on specific addresses and ports.</p>
@@ -41,15 +42,15 @@
 
     <p>When Apache starts, it binds to some port and address on
     the local machine and waits for incoming requests. By default,
-    it listens to all addresses on the machine.  However, it needs to
-    be told to listen on specific ports, or to listen on only selected 
-    addresses, or a combination. This is often combined with the 
-    Virtual Host feature which determines how Apache responds to 
+    it listens to all addresses on the machine.  However, it may need to
+    be told to listen on specific ports, or only on selected 
+    addresses, or a combination of both. This is often combined with the 
+    Virtual Host feature, which determines how Apache responds to 
     different IP addresses, hostnames and ports.</p>
 
     <p>The <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
     directive tells the server to accept
-    incoming requests only on the specified port or
+    incoming requests only on the specified ports or
     address-and-port combinations. If only a port number is
     specified in the <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
     directive, the server
@@ -61,22 +62,22 @@
     addresses and ports.</p>
 
     <p>For example, to make the server accept connections on both
-    port 80 and port 8000, use:</p>
+    port 80 and port 8000, on all interfaces, use:</p>
 
     <div class="example"><p><code>
       Listen 80<br />
       Listen 8000
     </code></p></div>
 
-    <p>To make the server accept connections on two specified
-    interfaces and port numbers, use</p>
+    <p>To make the server accept connections on port 80 for one interface,
+       and port 8000 on another, use</p>
 
     <div class="example"><p><code>
-      Listen 192.170.2.1:80<br />
-      Listen 192.170.2.5:8000
+      Listen 192.0.2.1:80<br />
+      Listen 192.0.2.5:8000
     </code></p></div>
 
-    <p>IPv6 addresses must be surrounded in square brackets, as in the
+    <p>IPv6 addresses must be enclosed in square brackets, as in the
     following example:</p>
 
     <div class="example"><p><code>
@@ -89,26 +90,26 @@
 
     <p>A growing number of platforms implement IPv6, and
     <a class="glossarylink" href="./glossary.html#apr" title="see glossary">APR</a> supports IPv6 on most of these platforms,
-    allowing Apache to allocate IPv6 sockets and handle requests which
-    were sent over IPv6.</p>
+    allowing Apache to allocate IPv6 sockets, and to handle requests sent 
+    over IPv6.</p>
 
     <p>One complicating factor for Apache administrators is whether or
     not an IPv6 socket can handle both IPv4 connections and IPv6 
     connections.  Handling IPv4 connections with an IPv6 socket uses 
     IPv4-mapped IPv6 addresses, which are allowed by default on most 
-    platforms but are disallowed by default on FreeBSD, NetBSD, and 
-    OpenBSD in order to match the system-wide policy on those
-    platforms.  But even on systems where it is disallowed by default, a 
+    platforms, but are disallowed by default on FreeBSD, NetBSD, and 
+    OpenBSD, in order to match the system-wide policy on those
+    platforms. On systems where it is disallowed by default, a 
     special <code class="program"><a href="./programs/configure.html">configure</a></code> parameter can change this behavior
     for Apache.</p>
 
-    <p>On the other hand, on some platforms such as Linux and Tru64 the 
+    <p>On the other hand, on some platforms, such as Linux and Tru64, the 
     <strong>only</strong> way to handle both IPv6 and IPv4 is to use 
     mapped addresses. If you want Apache to handle IPv4 and IPv6 connections 
     with a minimum of sockets, which requires using IPv4-mapped IPv6 
     addresses, specify the <code>--enable-v4-mapped</code> <code class="program"><a href="./programs/configure.html">configure</a></code> option.</p>
 
-    <p><code>--enable-v4-mapped</code> is the default on all platforms but 
+    <p><code>--enable-v4-mapped</code> is the default on all platforms except 
     FreeBSD, NetBSD, and OpenBSD, so this is probably how your Apache was 
     built.</p>
 
@@ -119,11 +120,11 @@
 
     <div class="example"><p><code>
       Listen 0.0.0.0:80<br />
-      Listen 192.170.2.1:80
+      Listen 192.0.2.1:80
     </code></p></div>
 
     <p>If your platform supports it and you want Apache to handle IPv4 and 
-    IPv6  connections on separate sockets (i.e., to disable IPv4-mapped 
+    IPv6 connections on separate sockets (i.e., to disable IPv4-mapped 
     addresses), specify the <code>--disable-v4-mapped</code> <code class="program"><a href="./programs/configure.html">configure</a></code> option. <code>--disable-v4-mapped</code> is the
     default on FreeBSD, NetBSD, and OpenBSD.</p>
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
@@ -131,19 +132,19 @@
 <h2><a name="virtualhost" id="virtualhost">How This Works With Virtual Hosts</a></h2>
     
 
-    <p> <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> does not implement 
-    Virtual Hosts. It only tells the
-    main server what addresses and ports to listen to. If no
+    <p> The <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> directive does not implement 
+    Virtual Hosts - it only tells the
+    main server what addresses and ports to listen on. If no
     <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
     directives are used, the server will behave
-    the same for all accepted requests. However,
+    in the same way for all accepted requests. However,
     <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
     can be used to specify a different behavior
-    for one or more of the addresses and ports. To implement a
+    for one or more of the addresses or ports. To implement a
     VirtualHost, the server must first be told to listen to the
     address and port to be used. Then a
     <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> section
-    should be created for a specified address and port to set the
+    should be created for the specified address and port to set the
     behavior of this virtual host. Note that if the
     <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
     is set for an address and port that the
@@ -154,8 +155,9 @@
 <a href="./en/bind.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/bind.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/bind.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/bind.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/bind.html.fr b/docs/manual/bind.html.fr
index 054b2eab..489b9318 100644
--- a/docs/manual/bind.html.fr
+++ b/docs/manual/bind.html.fr
@@ -22,15 +22,16 @@
 <a href="./en/bind.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/bind.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/bind.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/bind.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>Configuration d'Apache pour l'écoute sur un port et une adresse IP spécifiques.</p>
   </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#overview">Vue d'ensemble</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#ipv6">Remarques spécifiques à IPv6</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#virtualhost">Comment tout ceci fonctionne-t-il avec les hôtes virtuels</a></li>
-</ul><h3>Voir aussi</h3><ul class="seealso"><li><a href="vhosts/">Hôtes virtuels</a></li><li><a href="dns-caveats.html">Problèmes liés à DNS</a></li></ul></div>
+<li><img alt="" src="./images/down.gif" /> <a href="#virtualhost">Comment tout ceci fonctionne-t-il avec les hôtes virtuels</a></li>
+</ul><h3>Voir aussi</h3><ul class="seealso"><li><a href="vhosts/">Hôtes virtuels</a></li><li><a href="dns-caveats.html">Problèmes liés à DNS</a></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="overview" id="overview">Vue d'ensemble</a></h2>
@@ -40,17 +41,17 @@
 
 
     <p>Au démarrage d'Apache, un port et une adresse lui sont associés sur
-    l'hôte local et le serveur se met en attente de l'arrivée d'une requête.
-    Par défaut, le serveur écoute toutes les adresses de l'hôte local.
-    Cependant, il faut lui préciser des ports spécifiques à écouter,
-    ou lui dire de n'écouter que certaines adresses,
+    l'hôte local et le serveur se met en attente de l'arrivée d'une requête.
+    Par défaut, le serveur écoute toutes les adresses de l'hôte local.
+    Cependant, on peut lui préciser des ports spécifiques à écouter,
+    ou lui dire de n'écouter que sur certaines adresses,
     ou une combinaison des deux.
-    Tout ceci est souvent associé avec la fonctionnalité des hôtes virtuels
+    Tout ceci est souvent associé avec la fonctionnalité des hôtes virtuels
     qui détermine la manière dont Apache répond aux différents ports,
-    noms d'hôtes et adresses IP.</p>
+    noms d'hôtes et adresses IP.</p>
 
     <p>La directive <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
-    enjoint le serveur de n'accepter des requêtes que sur le port spécifié ou
+    enjoint le serveur de n'accepter des requêtes que sur les ports spécifiés ou
     une combinaison adresse/port. Si seul un numéro de port est spécifié
     dans la directive <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>,
     le serveur écoute ce port sur toutes les interfaces réseau.
@@ -62,22 +63,23 @@
     aux requêtes sur ces ports et adresses spécifiés.</p>
 
     <p>Par exemple, pour faire en sorte que le serveur accepte des connexions
-    sur les ports 80 et 8000, utilisez :</p>
+    sur les ports 80 et 8000 sur toutes ses interfaces, utilisez :</p>
 
     <div class="example"><p><code>
       Listen 80<br />
       Listen 8000
     </code></p></div>
 
-    <p>Pour faire en sorte que le serveur accepte des connexions en provenance
-    de deux couples d'interfaces et ports, utilisez :</p>
+    <p>Pour faire en sorte que le serveur accepte des connexions
+    sur le port 80 sur une interface, et sur le port 8000 sur une
+    autre interface :</p>
 
     <div class="example"><p><code>
-      Listen 192.170.2.1:80<br />
-      Listen 192.170.2.5:8000
+      Listen 192.0.2.1:80<br />
+      Listen 192.0.2.5:8000
     </code></p></div>
 
-    <p>Les adresses IPv6 doivent être entre crochets, comme dans
+    <p>Les adresses IPv6 doivent être entourêes de crochets, comme dans
     l'exemple suivant :</p>
 
     <div class="example"><p><code>
@@ -91,16 +93,16 @@
     <p>Un nombre croissant de plateformes implémentent IPv6, et
     <a class="glossarylink" href="./glossary.html#apr" title="see glossary">APR</a> supporte IPv6 sur la plupart d'entre elles,
     ce qui permet à Apache d'allouer des points de connexion (sockets) IPv6
-    et de traiter des requêtes qui ont été envoyées sur IPv6.</p>
+    et de traiter des requêtes envoyées sur IPv6.</p>
 
     <p>Les administrateurs d'Apache doivent se préoccuper de la possibilité
     pour un point de connexion IPv6 de traiter à la fois des connexions IPv4
     et des connexions IPv6.
     Le traitement de connexions IPv4 avec un point de connexion IPv6 utilise
     des adresses IPv6 traduites en IPv4, qui sont autorisées par défaut sur la
-    plupart des plateformes mais sont interdites par défaut sous FreeBSD, NetBSD,
-    et OpenBSD afin de respecter la politique de sécurité du système sur ces plateformes.
-    Mais même sur ces systèmes où ces adresses sont interdites par défaut, un
+    plupart des plateformes, mais sont interdites par défaut sous FreeBSD, NetBSD,
+    et OpenBSD, afin de respecter la politique de sécurité du système sur ces plateformes.
+    Mais même sur les systèmes où ces adresses sont interdites par défaut, un
     paramètre spécial du script <code class="program"><a href="./programs/configure.html">configure</a></code> permet de modifier
     ce comportement pour Apache.</p>
 
@@ -123,7 +125,7 @@
 
     <div class="example"><p><code>
       Listen 0.0.0.0:80<br />
-      Listen 192.170.2.1:80
+      Listen 192.0.2.1:80
     </code></p></div>
 
     <p>Si votre plateforme le supporte et si vous souhaitez qu'Apache gère
@@ -134,10 +136,10 @@
     utilisé par défaut sur FreeBSD, NetBSD, et OpenBSD.</p>
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="virtualhost" id="virtualhost">Comment tout ceci fonctionne-t-il avec les hôtes virtuels</a></h2>
+<h2><a name="virtualhost" id="virtualhost">Comment tout ceci fonctionne-t-il avec les hôtes virtuels</a></h2>
     
 
-    <p> La directive <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> n'implémente pas les hôtes virtuels.
+    <p> La directive <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> n'implémente pas les hôtes virtuels.
     Elle indique simplement au serveur principal sur quels adresses et ports
     il doit écouter. Si aucune directive
     <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
@@ -145,23 +147,24 @@
     les requêtes acceptées. En revanche, la directive
     <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
     peut être utilisée pour provoquer une réaction différente du serveur
-    pour un ou plusieurs adresses/ports. Pour implémenter un hôte virtuel,
+    pour un ou plusieurs adresses/ports. Pour implémenter un hôte virtuel,
     on doit d'abord indiquer au serveur sur quels adresses et ports il doit écouter.
     Ensuite, une section
     <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
     doit être créée pour chaque couple adresse+port spécifié afin de définir le
-    comportement de cet hôte virtuel. Notez que si la directive
+    comportement de cet hôte virtuel. Notez que si la directive
     <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
     est définie pour une adresse et un port sur lesquels le serveur n'est pas censé
-    écouter, cet hôte virtuel ne sera pas accessible.</p>
+    écouter, cet hôte virtuel ne sera pas accessible.</p>
   </div></div>
 <div class="bottomlang">
 <p><span>Langues Disponibles: </span><a href="./de/bind.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/bind.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/bind.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/bind.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/bind.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossaire</a> | <a href="./sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/bind.html.ja.euc-jp b/docs/manual/bind.html.ja.euc-jp
deleted file mode 100644
index 3899ef63..00000000
--- a/docs/manual/bind.html.ja.euc-jp
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>¥Ð¥¤¥ó¥É - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>¥Ð¥¤¥ó¥É</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./de/bind.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/bind.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/bind.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/bind.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-
-    <p>Apache ¤¬»ÈÍѤ¹¤ë¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤ÎÀßÄê¤ò¤·¤Þ¤¹¡£</p>
-  </div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#overview">³µÍ×</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#ipv6">IPv6 ¤ÎÆõ­»ö¹à</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#virtualhost">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ËÂФ·¤Æ¤É¤¦Æ¯¤¯¤Î¤«</a></li>
-</ul><h3>»²¾È</h3><ul class="seealso"><li><a href="vhosts/">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></li><li><a href="dns-caveats.html">DNS ¤ÎÌäÂê</a></li></ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="overview" id="overview">³µÍ×</a></h2>
-    
-
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="./mod/core.html">core</a></code></li><li><code class="module"><a href="./mod/mpm_common.html">mpm_common</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code></li></ul></td></tr></table>
-
-
-    <p>Apache ¤Ïµ¯Æ°»þ¤Ë¡¢¥í¡¼¥«¥ë¥Þ¥·¥ó¤Î¤¢¤ë¥Ý¡¼¥È¤ª¤è¤Ó¥¢¥É¥ì¥¹
-    ¤ËÂФ·¤ÆÀܳ¤·¡¢¥ê¥¯¥¨¥¹¥È¤¬Íè¤ë¤Î¤òÂÔ¤Á¤Þ¤¹¡£
-    ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥Þ¥·¥ó¤Î¤¹¤Ù¤Æ¤Î¥¢¥É¥ì¥¹¤ËÂФ·¤Æ listen ¤·¤Þ¤¹¡£
-    ¤·¤«¤·¤Ê¤¬¤é¡¢ÆÃÄê¤Î¥Ý¡¼¥È¤«¡¢ÆÃÄê¤Î¥¢¥É¥ì¥¹¤Î¤ß¤«¡¢
-    ¤Þ¤¿¤Ï¤½¤ì¤é¤ÎÁȤ߹ç¤ï¤»¤Î¤¤¤º¤ì¤«¤ò listen ¤¹¤ë¤è¤¦¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤ì¤Ï¡¢°Û¤Ê¤ë IP ¥¢¥É¥ì¥¹¡¢¥Û¥¹¥È̾¡¢¥Ý¡¼¥È¤ËÂФ¹¤ë Apache
-    ¤Î±þÅúÊýË¡¤ò·èÄꤹ¤ë¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥Èµ¡Ç½¤ÈÁȤ߹ç¤ï¤»¤Æ»È¤ï¤ì¤Þ¤¹¡£</p>
-
-    <p><code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¡¢ÆÃÄê¤Î¥Ý¡¼¥È¤ä¥¢¥É¥ì¥¹¡¦¥Ý¡¼¥È¤ÎÁȤ«¤é¤Î¤ßÆþ¤Ã¤Æ¤¯¤ë
-    ¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±ÉÕ¤±¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£
-    ¤â¤·¥Ý¡¼¥ÈÈÖ¹æ¤Î¤ß¤¬ <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤵ¤ì¤¿¾ì¹ç¤Ï¡¢
-    ¤¹¤Ù¤Æ¤Î¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤ÎÍ¿¤¨¤é¤ì¤¿¥Ý¡¼¥ÈÈÖ¹æ¤ò
-    listen ¤·¤Þ¤¹¡£ IP ¥¢¥É¥ì¥¹¤¬¥Ý¡¼¥ÈÈÖ¹æ¤ÈƱ»þ¤ËÍ¿¤¨¤é¤ì¤¿¾ì¹ç¤Ï¡¢
-    ¥µ¡¼¥Ð¤ÏÍ¿¤¨¤é¤ì¤¿¥Ý¡¼¥È¤È¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤ò listen ¤·¤Þ¤¹¡£
-    Ê£¿ô¤Î <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÍѤ¤¤Æ
-    ¤¤¤¯¤Ä¤«¤Î listen ¤¹¤ë¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
-    ¥µ¡¼¥Ð¤Ï¥ê¥¹¥È¤µ¤ì¤¿¥¢¥É¥ì¥¹¤ä¥Ý¡¼¥È¤«¤é¤Î¤¹¤Ù¤Æ¤Î¥ê¥¯¥¨¥¹¥È¤Ë
-    ÂФ·¤Æ±þÅú¤·¤Þ¤¹¡£</p>
-
-    <p>¤¿¤È¤¨¤Ð¡¢¥Ý¡¼¥È 80 ¤È 8000 ¤ÎξÊý¤ËÂФ·¤Æ¤ÎÀܳ¤ò¼õ¤±ÉÕ¤±¤ë¤Ë¤Ï</p>
-
-    <div class="example"><p><code>
-      Listen 80<br />
-      Listen 8000
-    </code></p></div>
-
-    <p>¤È¤·¤Þ¤¹¡£
-    Æó¤Ä¤Î»ØÄꤵ¤ì¤¿¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤È¥Ý¡¼¥ÈÈÖ¹æ¤ËÂФ·¤Æ¤ÎÀܳ¤ò¼õ¤±ÉÕ¤±¤ë¤Ë¤Ï¡¢
-    </p>
-
-    <div class="example"><p><code>
-      Listen 192.170.2.1:80<br />
-      Listen 192.170.2.5:8000
-    </code></p></div>
-
-    <p>¤È¤·¤Þ¤¹¡£
-    IPv6 ¥¢¥É¥ì¥¹¤Ï¡¢³Ñ³ç¸Ì¤Ç¼¡¤ÎÎã¤Î¤è¤¦¤Ë°Ï¤Þ¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó¡£</p>
-
-    <div class="example"><p><code>
-      Listen [2001:db8::a00:20ff:fea7:ccea]:80
-    </code></p></div>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="ipv6" id="ipv6">IPv6 ¤ÎÆõ­»ö¹à</a></h2>
-    
-
-    <p>¿¤¯¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤Ç IPv6 ¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤­¤Æ¤¤¤Æ¡¢
-    <a class="glossarylink" href="./glossary.html#apr" title="ÍѸ콸¤ò»²¾È">APR</a> ¤Ï¤³¤ì¤é¤Î¤Û¤È¤ó¤É¤Ç IPv6 ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤Î¤Ç¡¢
-    Apache ¤Ï IPv6 ¥½¥±¥Ã¥È¤ò³ä¤êÅö¤Æ¤Æ IPv6
-    ·Ðͳ¤ÇÁ÷¤é¤ì¤Æ¤­¤¿¥ê¥¯¥¨¥¹¥È¤ò°·¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>IPv6 ¥½¥±¥Ã¥È¤¬ IPv4 ¤È IPv6 ¥³¥Í¥¯¥·¥ç¥ó¤ÎξÊý¤ò°·¤¦¤³¤È¤¬¤Ç¤­¤ë¤«
-    ¤É¤¦¤«¤Ï¡¢Apache ´ÉÍý¼Ô¤Ë¤È¤Ã¤ÆÌñ²ð¤ÊÌäÂê¤Ç¤¹¡£
-    IPv4 ¥³¥Í¥¯¥·¥ç¥ó¤ò IPv6 ¥½¥±¥Ã¥È¤Ç°·¤¦¾ì¹ç¤Ï¡¢
-    IPv4 ¥Þ¥Ã¥×¤µ¤ì¤¿ IPv6 ¥¢¥É¥ì¥¹¤ò»ÈÍѤ·¤Æ¤¤¤Æ¡¢
-    ¤Û¤È¤ó¤É¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤Ç¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç»ÈÍѲÄǽ¤Ç¤¹¤¬¡¢
-    FreeBSD, NetBSD, OpenBSD ¤Ç¤Ï¡¢¥·¥¹¥Æ¥àÁ´ÂΤȤ·¤Æ¤Î¥Ý¥ê¥·¡¼¤È¤ÎÀ°¹çÀ­¤«¤é¡¢
-    ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï»ÈÍÑÉԲĤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¤³¤ì¤é¤Î¥Ç¥Õ¥©¥ë¥È¤Ç»ÈÍÑÉԲĤΥץé¥Ã¥È¥Û¡¼¥à¤Ç¤¢¤Ã¤Æ¤â¡¢
-    ÆÃÊÌ¤Ê <code class="program"><a href="./programs/configure.html">configure</a></code> ¤Î
-    ÀßÄê¥Ñ¥é¥á¡¼¥¿¤Ç Apache ¤ÎµóÆ°¤òÊѲ½¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>°ìÊý¤Ç¡¢Linux ¤ä Tru64 ¤È¤¤¤Ã¤¿¥×¥é¥Ã¥È¥Û¡¼¥à¤Ç IPv4 ¤È IPv6
-    ¤ÎξÊý¤ò°·¤¦¤Ë¤Ï¡¢¥Þ¥Ã¥×¥È¥¢¥É¥ì¥¹¤ò»ÈÍѤ¹¤ë<strong>°Ê³°¤ÎÊýË¡¤Ï¤¢¤ê¤Þ¤»¤ó</strong>¡£
-    IPv4 ¤È IPv6 ¤Î¥³¥Í¥¯¥·¥ç¥ó¤òºÇ¾®¸Â¤Î¥½¥±¥Ã¥È¤Ç°·¤¤¤¿¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
-    IPv4 ¥Þ¥Ã¥×¤Î IPv6 ¥¢¥É¥ì¥¹¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¡¢
-    <code>--enable-v4-mapped</code> <code class="program"><a href="./programs/configure.html">configure</a></code>
-    ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹¡£</p>
-
-    <p><code>--enable-v4-mapped</code> ¤Ï¡¢
-    FreeBSD, NetBSD, OpenBSD °Ê³°¤ÎÁ´¤Æ¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤Ç¤Î¥Ç¥Õ¥©¥ë¥È¤Ç¤¹¡£
-    ¤Ç¤¹¤«¤é¡¢¤ª¤½¤é¤¯¤ª¼ê¸µ¤Î Apache ¤Ï¤³¤ÎÀßÄê¤Ç¥Ó¥ë¥É¤µ¤ì¤Æ¤¤¤ë¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤ä APR ¤¬²¿¤ò¥µ¥Ý¡¼¥È¤¹¤ë¤«¤Ë´Ø¤ï¤é¤º¡¢
-    IPv4 ¥³¥Í¥¯¥·¥ç¥ó¤Î¤ß¤ò°·¤¦¤è¤¦¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢
-    ¼¡¤ÎÎã¤Î¤è¤¦¤ËÁ´¤Æ¤Î
-    <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç
-    IPv4 ¥¢¥É¥ì¥¹¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <div class="example"><p><code>
-      Listen 0.0.0.0:80<br />
-      Listen 192.170.2.1:80
-    </code></p></div>
-
-    <p>¾ò·ï¤òËþ¤¿¤¹¥×¥é¥Ã¥È¥Û¡¼¥à¤Ç¡¢Apache ¤¬
-    IPv4 ¤È IPv6 ¤Î¥³¥Í¥¯¥·¥ç¥ó¤ò¸ÄÊ̤Υ½¥±¥Ã¥È¤Ç°·¤¦¤è¤¦¤Ë¤·¤¿¤¤¾ì¹ç
-    (¤Ä¤Þ¤ê IPv4 ¥Þ¥Ã¥×¤Î¥¢¥É¥ì¥¹¤ò̵¸ú¤Ë¤·¤¿¤¤¾ì¹ç)
-    ¤Ï¡¢<code>--disable-v4-mapped</code>
-    <code class="program"><a href="./programs/configure.html">configure</a></code>
-    ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Æ¡¢¼¡¤Î¤è¤¦¤Ë¸ÄÊÌ»ØÄê¤Î
-    <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
-    <code>--disable-v4-mapped</code> ¤Ï¡¢
-    FreeBSD, NetBSD, OpenBSD ¥×¥é¥Ã¥È¥Û¡¼¥à¤Ç¤Î¥Ç¥Õ¥©¥ë¥È¤Ç¤¹¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="virtualhost" id="virtualhost">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ËÂФ·¤Æ¤É¤¦Æ¯¤¯¤Î¤«</a></h2>
-    
-
-    <p><code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
-    ¤Ç¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤¬¼ÂÁõ¤µ¤ì¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-    Listen ¤Ïñ¤Ë¥á¥¤¥ó¥µ¡¼¥Ð¤Ë¤É¤Î¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤ò listen ¤¹¤Ù¤­¤«¤ò
-    ¶µ¤¨¤ë¤À¤±¤Ç¤¹¡£
-    <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬»È¤ï¤ì¤Ê¤¤¾ì¹ç¤Ï¡¢
-    ¼õ¤±Æþ¤ì¤¿¥ê¥¯¥¨¥¹¥È¤¹¤Ù¤Æ¤ËÂФ·¤ÆÁ´¤¯Æ±¤¸µóÆ°¤ò¤·¤Þ¤¹¡£
-    ¤·¤«¤·¤Ê¤¬¤é
-    <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-    ¤ò»È¤Ã¤Æ¡¢
-    °ì¤Ä°Ê¾å¤Î¥¢¥É¥ì¥¹¤ä¥Ý¡¼¥È¤ËÂФ·¤Æ°Û¤Ê¤ëµóÆ°¤ò¤¹¤ë¤è¤¦¤Ë
-    »ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    VirtualHost ¤ò¼ÂÁõ¤¹¤ë¤Ë¤Ï¡¢»ÈÍѤ¹¤ë¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤ò
-    ¤Þ¤º½é¤á¤Ë¥µ¡¼¥Ð¤ËÄÌÃΤ·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-    ¤½¤·¤Æ¡¢¤½¤Î»ØÄꤷ¤¿¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤Ç¤Î
-    ¤³¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎµóÆ°¤òÀßÄꤹ¤ë¤¿¤á¤Ë¡¢
-    <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-    ¥»¥¯¥·¥ç¥ó¤òºî¤ê¤Þ¤¹¡£¤â¤·
-    <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-    ¤¬ listen ¤·¤Æ¤¤¤Ê¤¤¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤ËÂФ·¤Æ
-    ÀßÄꤵ¤ì¤Æ¤·¤Þ¤¦¤È¡¢
-    ¤½¤ì¤Ë¤Ï¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¤È¤¤¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-  </div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./de/bind.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/bind.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/bind.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/bind.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/bind.html.ja.utf8 b/docs/manual/bind.html.ja.utf8
new file mode 100644
index 00000000..67ccb9dc
--- /dev/null
+++ b/docs/manual/bind.html.ja.utf8
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>�インド - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>�インド</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./de/bind.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/bind.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./fr/bind.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/bind.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/bind.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+
+    <p>Apache �使用�るアドレス��ート�設定を���。</p>
+  </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#overview">概�</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#ipv6">IPv6 �特記事項</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#virtualhost">�ー�ャルホスト�対��������</a></li>
+</ul><h3>�照</h3><ul class="seealso"><li><a href="vhosts/">�ー�ャルホスト</a></li><li><a href="dns-caveats.html">DNS ��題</a></li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="overview" id="overview">概�</a></h2>
+    
+
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="./mod/core.html">core</a></code></li><li><code class="module"><a href="./mod/mpm_common.html">mpm_common</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code></li></ul></td></tr></table>
+
+
+    <p>Apache �起動時��ローカルマシン��る�ート�よ�アドレス
+    �対��接続��リクエスト��る�を待���。
+    デフォルト��マシン�����アドレス�対�� listen ���。
+    �����ら�特定��ート��特定�アドレス����
+    ����れら�組�������れ�を listen �るよ���る必���り��。
+    �れ��異�る IP アドレス�ホスト���ート�対�る Apache
+    �応答方法を決定�る�ー�ャルホスト機能�組�����使�れ��。</p>
+
+    <p><code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
+    ディレクティブ��特定��ートやアドレス・�ート�組�ら��入���る
+    リクエストを��付�るよ������。
+    も��ート番���� <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
+    ディレクティブ�指定�れ�場���
+    ����インターフェース�与�られ��ート番�を
+    listen ���。 IP アドレス��ート番���時�与�られ�場���
+    サー��与�られ��ート�インターフェースを listen ���。
+    複数� <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> ディレクティブを用��
+    ����� listen �るアドレス��ートを指定����。
+    サー��リスト�れ�アドレスや�ート�ら�����リクエスト�
+    対��応答���。</p>
+
+    <p>������ート 80 � 8000 �両方�対���接続を��付�る��</p>
+
+    <div class="example"><p><code>
+      Listen 80<br />
+      Listen 8000
+    </code></p></div>
+
+    <p>����。
+    二��指定�れ�インタフェース��ート番��対���接続を��付�る���
+    </p>
+
+    <div class="example"><p><code>
+      Listen 192.0.2.1:80<br />
+      Listen 192.0.2.5:8000
+    </code></p></div>
+
+    <p>����。
+    IPv6 アドレス��角括弧�次�例�よ��囲���れ�����ん。</p>
+
+    <div class="example"><p><code>
+      Listen [2001:db8::a00:20ff:fea7:ccea]:80
+    </code></p></div>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ipv6" id="ipv6">IPv6 �特記事項</a></h2>
+    
+
+    <p>多��プラットホーム� IPv6 �サ�ート�れ������
+    <a class="glossarylink" href="./glossary.html#apr" title="用語集を�照">APR</a> ��れら���ん�� IPv6 をサ�ート���る���
+    Apache � IPv6 ソケットを割り当�� IPv6
+    経由��られ���リクエストを扱��������。</p>
+
+    <p>IPv6 ソケット� IPv4 � IPv6 コ�クション�両方を扱������る�
+    �����Apache 管�者����厄介��題��。
+    IPv4 コ�クションを IPv6 ソケット�扱�場���
+    IPv4 マップ�れ� IPv6 アドレスを使用�����
+    ��ん��プラットホーム��デフォルト�使用�能����
+    FreeBSD, NetBSD, OpenBSD ���システム全体�����リシー��整�性�ら�
+    デフォルト��使用���設定�れ����。
+    �れら�デフォルト�使用���プラットホーム����も�
+    特別� <code class="program"><a href="./programs/configure.html">configure</a></code> �
+    設定パラメータ� Apache �挙動を変化��る�������。</p>
+
+    <p>一方��Linux や Tru64 ����プラットホーム� IPv4 � IPv6
+    �両方を扱����マップトアドレスを使用�る<strong>以外�方法��り��ん</strong>。
+    IPv4 � IPv6 �コ�クションを最���ソケット�扱������れ��
+    IPv4 マップ� IPv6 アドレスを使用�る必���り�
+    <code>--enable-v4-mapped</code> <code class="program"><a href="./programs/configure.html">configure</a></code>
+    オプションを指定���。</p>
+
+    <p><code>--enable-v4-mapped</code> ��
+    FreeBSD, NetBSD, OpenBSD 以外�全��プラットホーム��デフォルト��。
+    ���ら���ら��手元� Apache ���設定�ビルド�れ��る��ょ�。</p>
+
+    <p>プラットフォームや APR �何をサ�ート�る��関�ら��
+    IPv4 コ�クション��を扱�よ�����場���
+    次�例�よ��全��
+    <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> ディレクティブ�
+    IPv4 アドレスを指定������。</p>
+
+    <div class="example"><p><code>
+      Listen 0.0.0.0:80<br />
+      Listen 192.0.2.1:80
+    </code></p></div>
+
+    <p>�件を満��プラットホーム��Apache �
+    IPv4 � IPv6 �コ�クションを個別�ソケット�扱�よ�����場�
+    (��り IPv4 マップ�アドレスを無効����場�)
+    ��<code>--disable-v4-mapped</code>
+    <code class="program"><a href="./programs/configure.html">configure</a></code>
+    オプションを指定���次�よ��個別指定�
+    <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
+    ディレクティブを使用������。
+    <code>--disable-v4-mapped</code> ��
+    FreeBSD, NetBSD, OpenBSD プラットホーム��デフォルト��。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="virtualhost" id="virtualhost">�ー�ャルホスト�対��������</a></h2>
+    
+
+    <p><code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
+    ��ー�ャルホスト�実装�れる�����り��ん。
+    Listen ���メインサー����アドレス��ートを listen ����を
+    教�る����。
+    <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+    ディレクティブ�使�れ��場���
+    ��入れ�リクエスト����対��全���挙動を���。
+    �����ら
+    <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+    を使���
+    一�以上�アドレスや�ート�対��異�る挙動を�るよ��
+    指定�る�������。
+    VirtualHost を実装�る���使用�るアドレス��ートを
+    �����サー��通知���れ��り��ん。
+    ������指定��アドレス��ート��
+    ���ー�ャルホスト�挙動を設定�る����
+    <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+    セクションを作り��。も�
+    <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+    � listen �����アドレス��ート�対��
+    設定�れ������
+    �れ��アクセス����������注�������。</p>
+  </div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./de/bind.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/bind.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./fr/bind.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/bind.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/bind.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/bind.html.ko.euc-kr b/docs/manual/bind.html.ko.euc-kr
index a4906648..cca244e8 100644
--- a/docs/manual/bind.html.ko.euc-kr
+++ b/docs/manual/bind.html.ko.euc-kr
@@ -22,7 +22,8 @@
 <a href="./en/bind.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/bind.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/bind.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/bind.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/bind.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/bind.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
             ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
@@ -68,8 +69,8 @@
     ÇÏ·Á¸é,</p>
 
     <div class="example"><p><code>
-      Listen 192.170.2.1:80<br />
-      Listen 192.170.2.5:8000
+      Listen 192.0.2.1:80<br />
+      Listen 192.0.2.5:8000
     </code></p></div>
 
     <p>IPv6 ÁÖ¼Ò´Â ´ÙÀ½°ú °°ÀÌ ´ë°ýÈ£·Î ¹­¾î¾ß ÇÑ´Ù:</p>
@@ -111,7 +112,7 @@
 
     <div class="example"><p><code>
       Listen 0.0.0.0:80<br />
-      Listen 192.170.2.1:80
+      Listen 192.0.2.1:80
     </code></p></div>
 
     <p>Ç÷¡Æû¿¡¼­ Áö¿øÇÏ¸ç ¾ÆÆÄÄ¡°¡ ¼­·Î ´Ù¸¥ ¼ÒÄÏÀ¸·Î IPv4
@@ -144,8 +145,9 @@
 <a href="./en/bind.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/bind.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/bind.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/bind.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/bind.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/bind.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/bind.html.tr.utf8 b/docs/manual/bind.html.tr.utf8
new file mode 100644
index 00000000..6740b659
--- /dev/null
+++ b/docs/manual/bind.html.tr.utf8
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Dinleme - Apache HTTP Sunucusu</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="./">Sürüm 2.2</a></div><div id="page-content"><div id="preamble"><h1>Dinleme</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="./de/bind.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/bind.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./fr/bind.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/bind.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/bind.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+<div class="outofdate">Bu çeviri güncel olmayabilir. Son değişiklikler için İngilizce sürüm geçerlidir.</div>
+
+    <p>Apache’nin belli adresleri ve portları dinlemek üzere
+    yapılandırılması.</p>
+  </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#overview">Genel Bakış</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#ipv6">IPv6 Adreslerin Durumu</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#virtualhost">Sanal Konaklarla Nasıl Çalışır?</a></li>
+</ul><h3>Ayrıca bakınız:</h3><ul class="seealso"><li><a href="vhosts/">Sanal Konaklar</a></li><li><a href="dns-caveats.html">DNS Konuları</a></li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="overview" id="overview">Genel Bakış</a></h2>
+    
+
+    <table class="related"><tr><th>İlgili Modüller</th><th>İlgili Yönergeler</th></tr><tr><td><ul><li><code class="module"><a href="./mod/core.html">core</a></code></li><li><code class="module"><a href="./mod/mpm_common.html">mpm_common</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code></li></ul></td></tr></table>
+
+
+    <p>Apache başlatıldığında yerel makinedeki bazı adres ve portları kendine
+      bağlar ve gelecek istekleri bekler. Öntanımlı olarak makine üzerindeki
+      tüm adresleri dinler. Bununla birlikte, belli portları veya sadece
+      seçilmiş bazı adresleri ya da her ikisini de dinlemesi için bunun
+      belirtilmesi gerekebilir. Bu çoğunlukla, Apache’nin farklı IP
+      adreslerine, konak isimlerine ve portlarına nasıl yanıt vereceğinin
+      belirlendiği sanal konak özelliği ile birlikte yürür.</p>
+
+    <p><code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> yönergesi sunucuya
+      gelen istekleri sadece belli portlardan veya belli adres ve port
+      birleşimlerinden kabul etmesini söyler. <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> yönergesinde sadece port
+      numarası belirtilmişse sunucu tüm arabirimlerin belirtilen portunu
+      dinleyecektir. Portla birlikte bir IP adresi de belirtilmiÅŸse sunucu
+      belirtilen portu ve arabirimi dinleyecektir. Çok sayıda adres ve portu
+      dinlemek için çok sayıda <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> yönergesi kullanılabilir. Sunucu
+      böyle bir durumda belirtilen bütün adres ve portlardan gelen isteklere
+      yanıt verecektir.</p>
+
+    <p>Örneğin, sunucunun hem 80 portundan hem de 8000 portundan gelen
+      bağlantıları kabul etmesini sağlamak için,</p>
+
+    <div class="example"><p><code>
+      Listen 80<br />
+      Listen 8000
+    </code></p></div>
+
+    <p>yapılandırmasını kullanabilirsiniz. Sunucunun 80 portuna gelen
+      bağlantıları bir arabirimden 8000 portuna gelenleri ise başka bir
+      arabirimden kabul etmesini sağlamak için ise,</p>
+
+    <div class="example"><p><code>
+      Listen 192.0.2.1:80<br />
+      Listen 192.0.2.5:8000
+    </code></p></div>
+
+    <p>yapılandırmasını kullanabilirsiniz. IPv6 adresleri aşağıdaki örnekteki
+      gibi köşeli ayraçlar içine alınarak belirtilmelidir:</p>
+
+    <div class="example"><p><code>
+      Listen [2001:db8::a00:20ff:fea7:ccea]:80
+    </code></p></div>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ipv6" id="ipv6">IPv6 Adreslerin Durumu</a></h2>
+    
+
+    <p>IPv6’yı gerçekleyen platformların sayısı giderek artmaktadır. Bu
+      platformların çoğunda <a class="glossarylink" href="./glossary.html#apr" title="sözlüğe bakınız">APR</a>, Apache’nin IPv6
+      soketleri ayırmasını mümkün kılarak IPv6’yı desteklemekte ve IPv6
+      üzerinden gönderilmiş istekleri elde etmektedir.</p>
+
+    <p>Apache yöneticilerinin kafasını karıştırıran tek şey IPv6 soketlerin
+      hem IPv4 hem de IPv6 bağlantılarını kabul edip etmeyeceğidir. IPv4
+      bağlantılarını kabul eden IPv6 soketleri IPv4 eşlemli IPv6 adresleri
+      kullanırlar. Bu çoğu sistemde öntanımlı olarak böyleyken, FreeBSD,
+      NetBSD ve OpenBSD’de sistem geneline uygulanan kurallar gereğince
+      öntanımlı olarak buna izin verilmez; bu sistemlerde özel bir
+      <code class="program"><a href="./programs/configure.html">configure</a></code> parametresi ile Apache’nin davranışı
+      deÄŸiÅŸtirilebilir.</p>
+
+    <p>Diğer taraftan, Linux ve Tru64 gibi bazı platformlarda hem IPv4 hem de
+      IPv6 adresleri kabul etmenin <strong>tek yolu</strong> eÅŸlemli adresler
+      kullanmaktır. Apache’nin IPv4 ve IPv6 adresleri, IPv4 eşlemli IPv6
+      adreslerin kullanımını gerektiren en az sayıda soketle kabul etmesini
+      istiyorsanız, <code class="program"><a href="./programs/configure.html">configure</a></code> betiğine
+      <code>--enable-v4-mapped</code> seçeneğini belirtiniz.</p>
+
+    <p><code>--enable-v4-mapped</code> seçeneği, FreeBSD, NetBSD ve OpenBSD
+      hariç tüm platformlarda öntanımlıdır. Muhtemelen siz de Apache’nin
+      böyle derlenmesini isterdiniz.</p>
+
+    <p>Platformunuzun ve APR’nin neyi desteklediğine bakmaksızın Apache’nin
+      sadece IPv4 adresleri kabul etmesini istiyorsanız, tüm <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> yönergelerinde örnekteki gibi
+      IPv4 adresleri belirtiniz:</p>
+
+    <div class="example"><p><code>
+      Listen 0.0.0.0:80<br />
+      Listen 192.0.2.1:80
+    </code></p></div>
+
+    <p>Platformunuz IPv4 ve IPv6 adresleri ayrı soketlerden kabul ediyorsa ve
+      Apache’nin de buna uygun davranmasını (yani IPv4 eşlemli IPv6
+      adreslerin iptalini)  istiyorsanız <code class="program"><a href="./programs/configure.html">configure</a></code>
+      betiğine <code>--disable-v4-mapped</code> seçeneğini belirtiniz. Bu
+      seçenek FreeBSD, NetBSD ve OpenBSD’de öntanımlıdır.</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="virtualhost" id="virtualhost">Sanal Konaklarla Nasıl Çalışır?</a></h2>
+    
+
+    <p><code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> yönergesi sanal
+      konaklar için gerçeklenmemiştir; sadece ana sunucuya hangi adresleri ve
+      portları dinleyeceğini söyler. Hiç <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> yönergesi kullanılmamışsa sunucu
+      kabul edilen tüm isteklere aynı şekilde davranacaktır. Eğer bir veya
+      daha fazla adres ve port için farklı bir davranış belirtmek
+      istiyorsanız <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> kullanabilirsiniz. Bir sanal
+      konağı gerçeklemek için önce sunucunun sanal konak için kullanacağı
+      adres ve portu dinleyeceÄŸini belirtmek gerekir. Bundan sonra bu sanal
+      konağın davranışını ayarlamak üzere belirtilen adres ve port için bir
+      <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> bölümü
+      oluşturulmalıdır. Yalnız dikkat edin, eğer <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> için belirtilen adres ve port
+      sunucu tarafından dinlenmiyorsa ona erişemezsiniz.</p>
+  </div></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="./de/bind.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/bind.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./fr/bind.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/bind.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/bind.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/bind.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/caching.html b/docs/manual/caching.html
index 8dd58d1b..a707635a 100644
--- a/docs/manual/caching.html
+++ b/docs/manual/caching.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: caching.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/caching.html.en b/docs/manual/caching.html.en
index d4078027..978f91f6 100644
--- a/docs/manual/caching.html.en
+++ b/docs/manual/caching.html.en
@@ -652,6 +652,6 @@ CacheDirLength 1</pre></div>
 <p><span>Available Languages: </span><a href="./en/caching.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/caching.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/caching.html.fr b/docs/manual/caching.html.fr
index ae22f42c..adbe1364 100644
--- a/docs/manual/caching.html.fr
+++ b/docs/manual/caching.html.fr
@@ -65,7 +65,7 @@
 
     <p>Le module <code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code> quant à lui, constitue une
     forme de mise en cache plus basique, mais quelques fois intéressante.
-    Plutôt que de gérer la complexité de s'assurer de manière active de la
+    Plutôt que de gérer la complexité de s'assurer de manière active de la
     possibilité de mise en cache d'URLs,
     <code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code> fournit des méthodes pour la gestion
     et l'édition de fichiers en mémoire afin de maintenir un cache de fichiers
@@ -133,19 +133,19 @@
       positionnement de la directive
       <code class="directive"><a href="./mod/core.html#usecanonicalname">UseCanonicalName</a></code> à
       <code>On</code> peut améliorer de manière spectaculaire le taux de
-      présence dans le cache. Ceci est du au fait que le nom d'hôte de l'hôte
+      présence dans le cache. Ceci est du au fait que le nom d'hôte de l'hôte
       virtuel qui sert le contenu constitue une partie de la clé de cache.
       Avec <code class="directive"><a href="./mod/core.html#usecanonicalname">UseCanonicalName</a></code> positionnée
       à <code>On</code>,
-      les hôtes virtuels possédant plusieurs noms de serveur ou alias ne
+      les hôtes virtuels possédant plusieurs noms de serveur ou alias ne
       généreront pas d'entités de cache différentes, et le contenu sera mis en
-      cache en faisant référence au nom d'hôte canonique.</p>
+      cache en faisant référence au nom d'hôte canonique.</p>
 
       <p>Les documents mis en cache ne seront servis qu'en réponse à des
       requêtes de type URL, car la mise en cache est effectuée lors de la phase
       de traduction de l'URL en nom de fichier.
       En général, cela n'a que peu d'effet, à moins que vous n'utilisiez les
-      <a href="howto/ssi.html">Inclusions Côté Serveur (SSI)</a>;</p>
+      <a href="howto/ssi.html">Inclusions Côté Serveur (SSI)</a>;</p>
 
       <div class="example"><pre>
 &lt;!-- L'inclusion suivante peut être mise en cache --&gt;
@@ -177,7 +177,7 @@
       <p>La période d'expiration des contenus locaux peut être ajustée finement
       en utilisant le module <code class="module"><a href="./mod/mod_expires.html">mod_expires</a></code>.</p>
 
-      <p>On peut aussi contrôler la période d'expiration maximale en utilisant
+      <p>On peut aussi contrôler la période d'expiration maximale en utilisant
       la directive <code class="directive"><a href="./mod/mod_cache.html#cachemaxexpire">CacheMaxExpire</a></code>.</p>
 
     
@@ -186,7 +186,7 @@
       
 
       <p>Lorsqu'un contenu est arrivé à expiration dans le cache et fait
-      l'objet d'une nouvelle demande d'accès, plutôt que traiter directement
+      l'objet d'une nouvelle demande d'accès, plutôt que traiter directement
       la requête originale, Apache préfère utiliser une
       requête conditionnelle.</p>
 
@@ -330,7 +330,7 @@ Vary: negotiate,accept-language,accept-charset
 <h2><a name="security" id="security">Considérations sur la sécurité</a></h2>
     
 
-    <h3>Autorisation et contrôle d'accès</h3>
+    <h3>Autorisation et contrôle d'accès</h3>
       
 
       <p>Utiliser <code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> revient sensiblement à la même
@@ -403,17 +403,17 @@ Vary: negotiate,accept-language,accept-charset
 
       <p>Par exemple, si les serveur DNS qu'utilise votre système où tourne
       Apache sont vulnérables à l'empoisonnement du cache des DNS, un attaquant
-      pourra contrôler vers où Apache se connecte lorsqu'il demande un contenu
+      pourra contrôler vers où Apache se connecte lorsqu'il demande un contenu
       depuis le serveur d'origine.
       Un autre exemple est constitué par les attaques ainsi nommées
       "Dissimulation de requêtes HTTP" (HTTP request-smuggling).</p>
 
       <p>Ce document n'est pas le bon endroit pour une discussion approfondie
-      à propos de la Dissimulation de requêtes HTTP (utilisez plutôt votre
+      à propos de la Dissimulation de requêtes HTTP (utilisez plutôt votre
       moteur de recherche favori); il est cependant important de savoir qu'il
       est possible d'élaborer une série de requêtes, et d'exploiter une
       vulnérabilité d'un serveur web d'origine de telle façon que l'attaquant
-      puisse contrôler entièrement le contenu renvoyé par le mandataire.</p>
+      puisse contrôler entièrement le contenu renvoyé par le mandataire.</p>
     
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
@@ -435,7 +435,7 @@ Vary: negotiate,accept-language,accept-charset
 
       <p>La forme la plus élémentaire de mise en cache que propose Apache est
       fournie par le module <code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code>.
-      Plutôt que de mettre en cache le contenu des fichiers, ce cache maintient
+      Plutôt que de mettre en cache le contenu des fichiers, ce cache maintient
       une table des descripteurs de fichiers ouverts. Les fichiers à mettre en
       cache de cette manière sont spécifiés dans le fichier de configuration
       en utilisant la directive
@@ -495,8 +495,8 @@ Vary: negotiate,accept-language,accept-charset
 
     <p>Servir un contenu directement depuis la mémoire système est
     universellement reconnu comme la méthode la plus rapide. Lire des fichiers
-    depuis un contrôleur de disque ou pire, depuis un réseau distant est plus
-    lent de plusieurs ordres de grandeur. Les contrôleurs de disque réalisent
+    depuis un contrôleur de disque ou pire, depuis un réseau distant est plus
+    lent de plusieurs ordres de grandeur. Les contrôleurs de disque réalisent
     en général des opérations mécaniques, et l'accès au réseau est limité par la
     bande passante dont vous disposez. Par contre, les temps d'accès à la
     mémoire sont de l'ordre de la nano-seconde.</p>
@@ -642,7 +642,7 @@ CacheDirLength 1</pre></div>
       <p>Pour stocker des entités dans le cache,
       le module <code class="module"><a href="./mod/mod_disk_cache.html">mod_disk_cache</a></code> crée une empreinte (hash) de 22
       caractères de l'URL qui a fait l'objet d'une requête. Cette empreinte
-      comprend le nom d'hôte, le protocole, le port, le chemin et tout argument
+      comprend le nom d'hôte, le protocole, le port, le chemin et tout argument
       de type CGI associé à l'URL, afin d'être sur que plusieurs URLs
       n'interfèrent pas entre elles.</p>
 
@@ -736,6 +736,6 @@ CacheDirLength 1</pre></div>
 <p><span>Langues Disponibles: </span><a href="./en/caching.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/caching.html" title="Français">&nbsp;fr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossaire</a> | <a href="./sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/configuring.html b/docs/manual/configuring.html
index 34ebcac1..3a97c489 100644
--- a/docs/manual/configuring.html
+++ b/docs/manual/configuring.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: configuring.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -10,10 +12,14 @@ URI: configuring.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: configuring.html.ja.euc-jp
+URI: configuring.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: configuring.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: configuring.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/configuring.html.de b/docs/manual/configuring.html.de
index a279fd19..b13fc35f 100644
--- a/docs/manual/configuring.html.de
+++ b/docs/manual/configuring.html.de
@@ -22,7 +22,8 @@
 <a href="./en/configuring.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/configuring.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/configuring.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/configuring.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>Dieses Dokument beschreibt die Dateien, die zur Konfiguration des Apache
@@ -178,8 +179,9 @@
 <a href="./en/configuring.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/configuring.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/configuring.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/configuring.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/configuring.html.en b/docs/manual/configuring.html.en
index 61ace844..5cd37da2 100644
--- a/docs/manual/configuring.html.en
+++ b/docs/manual/configuring.html.en
@@ -22,7 +22,8 @@
 <a href="./en/configuring.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/configuring.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/configuring.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/configuring.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
 <p>This document describes the files used to configure the Apache
@@ -162,8 +163,9 @@ HTTP server.</p>
 <a href="./en/configuring.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/configuring.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/configuring.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/configuring.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/configuring.html.fr b/docs/manual/configuring.html.fr
index ae5400c7..048e0992 100644
--- a/docs/manual/configuring.html.fr
+++ b/docs/manual/configuring.html.fr
@@ -22,7 +22,8 @@
 <a href="./en/configuring.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/configuring.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/configuring.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/configuring.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
 <p>Ce document décrit les fichiers utilisés pour configurer
@@ -125,7 +126,7 @@ le Serveur HTTP Apache.</p>
     une configuration très fine.</p>
 
     <p>Apache peut servir simultanément de nombreux sites web au travers des
-    <a href="vhosts/">Hôtes Virtuels</a>. La portée des directives peut ainsi
+    <a href="vhosts/">Hôtes Virtuels</a>. La portée des directives peut ainsi
     être limitée en les plaçant dans des sections
     <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>,
     afin qu'elles ne s'appliquent qu'aux requêtes
@@ -134,7 +135,7 @@ le Serveur HTTP Apache.</p>
     <p>Bien que la plupart des directives puissent être placées dans
     chacune de ces sections, certaines d'entre elles n'ont aucun sens
     dans certains contextes.
-    Par exemple, les directives qui contrôlent la création des processus
+    Par exemple, les directives qui contrôlent la création des processus
     n'ont de sens que dans le contexte du serveur principal. Pour déterminer
     quelles directives peuvent être placées dans quelles sections, consultez
     le <a href="mod/directive-dict.html#Context">Contexte</a> de la
@@ -164,7 +165,7 @@ le Serveur HTTP Apache.</p>
     <p>Pour déterminer quelles directives peuvent être placées
     dans les fichiers <code>.htaccess</code>, consultez le
     <a href="mod/directive-dict.html#Context">Contexte</a> de la
-    directive. L'administrateur du serveur peut contrôler quelles
+    directive. L'administrateur du serveur peut contrôler quelles
     directives peuvent être placées dans les fichiers
     <code>.htaccess</code> en définissant la directive
     <code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code>
@@ -178,8 +179,9 @@ le Serveur HTTP Apache.</p>
 <a href="./en/configuring.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/configuring.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/configuring.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/configuring.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossaire</a> | <a href="./sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/configuring.html.ja.euc-jp b/docs/manual/configuring.html.ja.euc-jp
deleted file mode 100644
index fe11d1bd..00000000
--- a/docs/manual/configuring.html.ja.euc-jp
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>ÀßÄê¥Õ¥¡¥¤¥ë - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>ÀßÄê¥Õ¥¡¥¤¥ë</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./de/configuring.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/configuring.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/configuring.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/configuring.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-
-<p>¤³¤Îʸ½ñ¤Ç¤Ï¡¢Apache HTTP ¥µ¡¼¥Ð¤òÀßÄꤹ¤ë¤Î¤Ë»ÈÍѤ¹¤ë¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ
-µ­½Ò¤·¤Æ¤¤¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#main">¥á¥¤¥ó¤ÎÀßÄê¥Õ¥¡¥¤¥ë</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#syntax">ÀßÄê¥Õ¥¡¥¤¥ë¤Î¹½Ê¸</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#modules">¥â¥¸¥å¡¼¥ë</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#scope">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎŬÍÑÈÏ°Ï</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#htaccess">.htaccess ¥Õ¥¡¥¤¥ë</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="main" id="main">¥á¥¤¥ó¤ÎÀßÄê¥Õ¥¡¥¤¥ë</a></h2>
-    
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#include">Include</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#typesconfig">TypesConfig</a></code></li></ul></td></tr></table>
-
-    <p>Apache ¤Ï <a href="mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> ¤òÀßÄê¥Õ¥¡¥¤¥ë¤Ëʿʸ¤Ç½ñ¤¯¤³¤È¤Ë¤è¤êÀßÄꤷ¤Þ¤¹¡£
-    ¥á¥¤¥ó¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ÏÉáÄÌ¤Ï <code>httpd.conf</code> ¤È¤¤¤¦Ì¾Á°¤Ç¤¹¡£
-    ¤³¤Î¥Õ¥¡¥¤¥ë¤Î°ÌÃ֤ϥ³¥ó¥Ñ¥¤¥ë»þ¤ËÀßÄꤵ¤ì¤Þ¤¹¤¬¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤Î
-    <code>-f</code> ¥Õ¥é¥°¤Ë¤è¤ê¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£
-    ¤Þ¤¿¡¢Â¾¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò <code class="directive"><a href="./mod/core.html#include">Include</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤Ã¤ÆÄɲäǤ­¡¢¥ï¥¤¥ë¥É¥«¡¼¥É¤ò»ÈÍѤ·¤Æ¿¿ô¤Î
-    ÀßÄê¥Õ¥¡¥¤¥ë¤òÄɲ乤뤳¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤É¤ó¤Ê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤â¡¢¤³¤ì¤é¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤É¤ì¤Ë¤Ç¤âÆþ¤ì¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    Apache ¤Ïµ¯Æ°»þ¤«ºÆµ¯Æ°»þ¤Î¤ß¥á¥¤¥óÀßÄê¥Õ¥¡¥¤¥ë¤ÎÊѹ¹¤òǧ¼±¤·¤Þ¤¹¡£</p>
-
-    <p>¥µ¡¼¥Ð¤Ï MIME
-    ¥É¥­¥å¥á¥ó¥È¥¿¥¤¥×¤ò´Þ¤ó¤Ç¤¤¤ë¥Õ¥¡¥¤¥ë¤âÆɤ߹þ¤ß¤Þ¤¹¡£¥Õ¥¡¥¤¥ë̾¤Ï
-    <code class="directive"><a href="./mod/mod_mime.html#typesconfig">TypesConfig</a></code>
-    ¤ÇÀßÄꤵ¤ì¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï <code>mime.types</code>
-    ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="syntax" id="syntax">ÀßÄê¥Õ¥¡¥¤¥ë¤Î¹½Ê¸</a></h2>
-    
-
-    <p>Apache ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤Ï 1 ¹Ô¤Ë 1 ¤Ä¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤«¤é¤Ê¤ê¤Þ¤¹¡£
-    ¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å "\" ¤Ï¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬¼¡¤Î¹Ô¤Ë·Ñ³¤·¤Æ¤¤¤ë¤³¤È¤ò
-    ¼¨¤¹¤¿¤á¤Ë¹Ô¤ÎºÇ¸å¤Îʸ»ú¤È¤·¤Æ»È¤ï¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-    ¹Ô¤ÎºÇ¸å¤È¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤Î´Ö¤Ë¾¤Îʸ»ú¤ä¶õÇò¤¬¤¢¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£
-    </p>
-
-    <p>ÀßÄê¥Õ¥¡¥¤¥ë¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Þ¤»¤ó¤¬¡¢
-    °ú¿ô¤Ë¤Ï¤·¤Ð¤·¤Ð¶èÊ̤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£¥Ï¥Ã¥·¥åʸ»ú "#"
-    ¤Ç»Ï¤Þ¤ë¹Ô¤Ï¥³¥á¥ó¥È¤È¸«¤Ê¤µ¤ì¤Æ̵»ë¤µ¤ì¤Þ¤¹¡£
-    ÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¸å¤Î¹Ô¤Ç¤Ï¥³¥á¥ó¥È¤¬´Þ¤Þ¤ì¤Æ¤¤¤Æ¤Ï<strong>¤¤¤±¤Þ¤»¤ó</strong>¡£¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÁ°¤Î¶õ¹Ô¤È¶õÇò¤Ï̵»ë¤µ¤ì¤Þ¤¹¤Î¤Ç¡¢
-    ¤ï¤«¤ê¤ä¤¹¤¯¤¹¤ë¤¿¤á¤Ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¥¤¥ó¥Ç¥ó¥È¤·¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£
-    </p>
-
-    <p>ÀßÄê¥Õ¥¡¥¤¥ë¤Î¹½Ê¸¥¨¥é¡¼¤Ï¡¢
-    <code>apachectl configtest</code>
-    ¤«¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó
-    <code>-t</code> ¤ò»È¤Ã¤ÆÄ´¤Ù¤é¤ì¤Þ¤¹¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="modules" id="modules">¥â¥¸¥å¡¼¥ë</a></h2>
-    
-
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_so.html">mod_so</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code></li><li><code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code></li></ul></td></tr></table>
-
-    <p>Apache ¤Ï¥â¥¸¥å¡¼¥ë²½¤µ¤ì¤¿¥µ¡¼¥Ð¤Ç¤¹¡£
-    ¥³¥¢¥µ¡¼¥Ð¤Ë¤ÏºÇ¤â´ðËÜŪ¤Êµ¡Ç½¤À¤±¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£³ÈÄ¥µ¡Ç½¤Ï
-    Apache ¤Ë¥í¡¼¥É¤µ¤ì¤ë<a href="mod/">¥â¥¸¥å¡¼¥ë</a>¤È¤·¤ÆÍøÍѲÄǽ¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥³¥ó¥Ñ¥¤¥ë»þ¤Ë¥â¥¸¥å¡¼¥ë¤Î
-    <a href="mod/module-dict.html#Status">Base</a> ¥»¥Ã¥È (´ðËÜ¥»¥Ã¥È) ¤¬
-    ¥µ¡¼¥Ð¤Ë´Þ¤Þ¤ì¤Þ¤¹¡£¥µ¡¼¥Ð¤¬<a href="dso.html">ưŪ¥í¡¼¥É</a>¥â¥¸¥å¡¼¥ë¤ò»È¤¦¤è¤¦¤Ë¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-    ¥â¥¸¥å¡¼¥ë¤òÊ̤˥³¥ó¥Ñ¥¤¥ë¤·¤Æ¡¢¤¤¤Ä¤Ç¤â
-    <code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤ÆÄɲäǤ­¤Þ¤¹¡£
-    ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢¥â¥¸¥å¡¼¥ë¤ÎÄɲääºï½ü¤ò¤¹¤ë¤¿¤á¤Ë¤Ï Apache
-    ¤òºÆ¥³¥ó¥Ñ¥¤¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code>
-    ¥Ö¥í¥Ã¥¯¤ËÆþ¤ì¤ë¤³¤È¤ÇÆÃÄê¤Î¥â¥¸¥å¡¼¥ë¤¬Â¸ºß¤¹¤ë¤È¤­¤À¤±
-    ÀßÄê¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤ë¤è¤¦¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó <code>-l</code> ¤ò»È¤Ã¤Æ¸½»þÅÀ¤Ç
-    ¤É¤Î¥â¥¸¥å¡¼¥ë¤¬¥µ¡¼¥Ð¤Ë¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤ë¤«¤òÃΤ뤳¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="scope" id="scope">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎŬÍÑÈÏ°Ï</a></h2>
-    
-
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li></ul></td></tr></table>
-
-    <p>¥á¥¤¥óÀßÄê¥Õ¥¡¥¤¥ë¤Ë¤¢¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥µ¡¼¥ÐÁ´ÂΤËŬÍѤµ¤ì¤Þ¤¹¡£
-    ¥µ¡¼¥Ð¤Î°ìÉôʬ¤ÎÀßÄê¤À¤±¤òÊѹ¹¤·¤¿¤¤¾ì¹ç¤Ï <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code>, <code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code>, <code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code>, <code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>, <code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>
-    ¥»¥¯¥·¥ç¥ó¤ÎÃæ¤ËÃÖ¤¯¤³¤È¤ÇŬÍÑÈϰϤò·è¤á¤é¤ì¤Þ¤¹¡£
-    ¤³¤ì¤é¤Î¥»¥¯¥·¥ç¥ó¤Ï¤½¤ÎÃæ¤Ë¤¢¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎŬÍÑÈϰϤò
-    ÆÃÄê¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î°ÌÃÖ¤ä URL ¤Ë¸ÂÄꤷ¤Þ¤¹¡£
-    Èó¾ï¤ËºÙγÅÙ¤ÎÀßÄê¤ò²Äǽ¤Ë¤¹¤ë¤¿¤á¤Ë¡¢
-    ¥»¥¯¥·¥ç¥ó¤òÆþ¤ì»Ò¤Ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>Apache ¤ÏƱ»þ¤Ë¿¤¯¤Î°ã¤¦¥¦¥§¥Ö¥µ¥¤¥È¤ò°·¤¦Ç½ÎϤ¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤ì¤Ï <a href="vhosts/">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a> ¤È¸Æ¤Ð¤ì¤Æ¤¤¤Þ¤¹¡£
-    ÆÃÄê¤Î¥¦¥§¥Ö¥µ¥¤¥È¤Ë¤Î¤ßŬÍѤµ¤ì¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë¡¢
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-    ¥»¥¯¥·¥ç¥ó¤ÎÃæ¤ËÃÖ¤¯¤³¤È¤Ç¤âŬÍÑÈϰϤòÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¤Û¤È¤ó¤É¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤É¤Î¥»¥¯¥·¥ç¥ó¤Ë¤Ç¤â½ñ¤±¤Þ¤¹¤¬¡¢
-    Ãæ¤Ë¤Ï¥³¥ó¥Æ¥­¥¹¥È¤Ë¤è¤Ã¤Æ¤Ï°ÕÌ£¤ò¤Ê¤µ¤Ê¤¤¤â¤Î¤â¤¢¤ê¤Þ¤¹¡£
-    Î㤨¤Ð¡¢¥×¥í¥»¥¹¤ÎºîÀ®¤òÀ©¸æ¤·¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥á¥¤¥ó¥µ¡¼¥Ð¤Î
-    ¥³¥ó¥Æ¥­¥¹¥È¤Ë¤Î¤ß½ñ¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤É¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¤É¤Î¥»¥¯¥·¥ç¥ó¤Ë½ñ¤¯¤³¤È¤¬¤Ç¤­¤ë¤«¤òÃΤ뤿¤á¤Ë¤Ï
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î <a href="mod/directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È</a> ¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£¾Ü¤·¤¤¾ðÊó¤Ï¡¢
-    <a href="sections.html">Directory, Location, Files
-    ¥»¥¯¥·¥ç¥ó¤ÎÆ°ºîË¡</a>¤Ë¤¢¤ê¤Þ¤¹¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="htaccess" id="htaccess">.htaccess ¥Õ¥¡¥¤¥ë</a></h2>
-    
-
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#accessfilename">AccessFileName</a></code></li><li><code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code></li></ul></td></tr></table>
-
-    <p>Apache ¤Ç¤Ï¥¦¥§¥Ö¥Ä¥ê¡¼¤ÎÃæ¤ËÃÖ¤«¤ì¤¿ÆÃÊ̤ʥե¡¥¤¥ë¤ò»È¤Ã¤Æ
-    ÈóÃæ±û½¸¸¢Åª¤ÊÀßÄê´ÉÍý¤ò¤Ç¤­¤Þ¤¹¡£¤½¤ÎÆÃÊ̤ʥե¡¥¤¥ë¤ÏÉáÄ̤Ï
-    <code>.htaccess</code> ¤È¤¤¤¦Ì¾Á°¤Ç¡¢
-    <code class="directive"><a href="./mod/core.html#accessfilename">AccessFileName</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤É¤ó¤Ê̾Á°¤Ë¤Ç¤â»ØÄê¤Ç¤­¤Þ¤¹¡£
-    <code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ë¤Ë½ñ¤«¤ì¤¿¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥Õ¥¡¥¤¥ë¤òÃÖ¤¤¤¿
-    ¥Ç¥£¥ì¥¯¥È¥ê¤È¤½¤ÎÁ´¤Æ¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ËŬÍѤµ¤ì¤Þ¤¹¡£
-    <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ï¡¢¥á¥¤¥ó¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ÈƱ¤¸
-    ¹½Ê¸¤ò»È¤¤¤Þ¤¹¡£
-    <code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ë¤Ï¤¹¤Ù¤Æ¤Î¥ê¥¯¥¨¥¹¥È¤ÇÆɤ߹þ¤Þ¤ì¤ë¤¿¤á¡¢
-    Êѹ¹¤Ï¤¹¤°¤ËÈ¿±Ç¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>¤É¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬ <code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ë¤Ë½ñ¤±¤ë¤«¤òÄ´¤Ù¤ë¤Ë¤Ï¡¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î<a href="mod/directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È</a>
-    ¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£¥µ¡¼¥Ð´ÉÍý¼Ô¤Ï¤µ¤é¤Ë¥á¥¤¥óÀßÄê¥Õ¥¡¥¤¥ë¤Î
-    <code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code>
-    ¤òÀßÄꤹ¤ë¤³¤È¤Ç¤É¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò <code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ë¤Ë½ñ¤±¤ë¤è¤¦¤Ë¤¹¤ë¤«¤òÀ©¸æ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p><code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ë´Ø¤¹¤ë¾Ü¤·¤¤¾ðÊó¤Ï
-    <a href="howto/htaccess.html">.htaccess ¥Á¥å¡¼¥È¥ê¥¢¥ë</a>
-    ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-  </div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./de/configuring.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/configuring.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/configuring.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/configuring.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/configuring.html.ja.utf8 b/docs/manual/configuring.html.ja.utf8
new file mode 100644
index 00000000..1c04c4ec
--- /dev/null
+++ b/docs/manual/configuring.html.ja.utf8
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>設定ファイル - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>設定ファイル</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./de/configuring.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/configuring.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./fr/configuring.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/configuring.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/configuring.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+<p>��文書���Apache HTTP サー�を設定�る��使用�るファイル����
+記述�����。</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#main">メイン�設定ファイル</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#syntax">設定ファイル�構文</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#modules">モジュール</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#scope">ディレクティブ��用範囲</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#htaccess">.htaccess ファイル</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="main" id="main">メイン�設定ファイル</a></h2>
+    
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#include">Include</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#typesconfig">TypesConfig</a></code></li></ul></td></tr></table>
+
+    <p>Apache � <a href="mod/directives.html">ディレクティブ</a> を設定ファイル�平文�書����より設定���。
+    メイン�設定ファイル�普通� <code>httpd.conf</code> �������。
+    ��ファイル��置�コンパイル時�設定�れ����コマンドライン�
+    <code>-f</code> フラグ�より上書�����。
+    ���他�設定ファイルを <code class="directive"><a href="./mod/core.html#include">Include</a></code>
+    ディレクティブ�よ��追加���ワイルドカードを使用��多数�
+    設定ファイルを追加�る�������。
+    �ん�ディレクティブも��れら�設定ファイル�れ��も入れる�������。
+    Apache �起動時��起動時��メイン設定ファイル�変更を�識���。</p>
+
+    <p>サー�� MIME
+    ドキュメントタイプを�ん��るファイルも読�込���。ファイル��
+    <code class="directive"><a href="./mod/mod_mime.html#typesconfig">TypesConfig</a></code>
+    �設定�れ�デフォルト�� <code>mime.types</code>
+    �������。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="syntax" id="syntax">設定ファイル�構文</a></h2>
+    
+
+    <p>Apache �設定ファイル� 1 行� 1 ��ディレクティブ�ら�り��。
+    �ックスラッシュ "\" �ディレクティブ�次�行�継続���る��を
+    示����行�最後�文字���使�れ��る�も�れ��ん。
+    行�最後��ックスラッシュ�間�他�文字や空白���������ん。
+    </p>
+
+    <p>設定ファイル�ディレクティブ�大文字�文字を区別���ん��
+    引数������区別�るも���り��。�ッシュ文字 "#"
+    �始�る行�コメント�見��れ�無視�れ��。
+    設定ディレクティブ�後�行��コメント���れ����<strong>����ん</strong>。ディレクティブ���空行�空白�無視�れ�����
+    ��りや���る���ディレクティブをインデント��も構���ん。
+    </p>
+
+    <p>設定ファイル�構文エラー��
+    <code>apachectl configtest</code>
+    �コマンドラインオプション
+    <code>-t</code> を使��調�られ��。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="modules" id="modules">モジュール</a></h2>
+    
+
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_so.html">mod_so</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code></li><li><code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code></li></ul></td></tr></table>
+
+    <p>Apache �モジュール化�れ�サー���。
+    コアサー���最も基本的�機能�����れ����。拡張機能�
+    Apache �ロード�れる<a href="mod/">モジュール</a>���利用�能��。デフォルト���コンパイル時�モジュール�
+    <a href="mod/module-dict.html#Status">Base</a> セット (基本セット) �
+    サー����れ��。サー��<a href="dso.html">動的ロード</a>モジュールを使�よ��コンパイル�れ��る場���
+    モジュールを別�コンパイル������も
+    <code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code>
+    ディレクティブを使��追加����。
+    �����場���モジュール�追加や削除を�る���� Apache
+    を�コンパイル�る必���り��。設定ディレクティブ� <code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code>
+    ブロック�入れる���特定�モジュール�存在�る����
+    設定ファイル���れるよ���る�������。</p>
+
+    <p>コマンドラインオプション <code>-l</code> を使���時点�
+    ��モジュール�サー��コンパイル�れ��る�を知る�������。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="scope" id="scope">ディレクティブ��用範囲</a></h2>
+    
+
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li></ul></td></tr></table>
+
+    <p>メイン設定ファイル��るディレクティブ�サー�全体��用�れ��。
+    サー��一部分�設定��を変更���場�� <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code>, <code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code>, <code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code>, <code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>, <code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>
+    セクション�中�置�����用範囲を決�られ��。
+    �れら�セクション���中��るディレクティブ��用範囲を
+    特定�ファイルシステム��置や URL ��定���。
+    �常�細粒度�設定を�能��る����
+    セクションを入れ���る��も����。</p>
+
+    <p>Apache ��時�多����ウェブサイトを扱�能力��り��。
+    �れ� <a href="vhosts/">�ー�ャルホスト</a> �呼�れ����。
+    特定�ウェブサイト����用�れるよ���る����
+    ディレクティブ�
+    <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+    セクション�中�置����も�用範囲を変�る�������。</p>
+
+    <p>��ん��ディレクティブ���セクション��も書�����
+    中��コンテキスト�よ����味を����も�も�り��。
+    例���プロセス�作�を制御���るディレクティブ�メインサー��
+    コンテキスト���書��������。
+    ��ディレクティブを��セクション�書������る�を知る����
+    ディレクティブ� <a href="mod/directive-dict.html#Context">コンテキスト</a> を調������。詳��情報��
+    <a href="sections.html">Directory, Location, Files
+    セクション�動作法</a>��り��。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="htaccess" id="htaccess">.htaccess ファイル</a></h2>
+    
+
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#accessfilename">AccessFileName</a></code></li><li><code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code></li></ul></td></tr></table>
+
+    <p>Apache ��ウェブツリー�中�置�れ�特別�ファイルを使��
+    �中央集権的�設定管�を����。��特別�ファイル�普通�
+    <code>.htaccess</code> �������
+    <code class="directive"><a href="./mod/core.html#accessfilename">AccessFileName</a></code>
+    ディレクティブ��ん�����も指定����。
+    <code>.htaccess</code>
+    ファイル�書�れ�ディレクティブ�ファイルを置��
+    ディレクトリ���全��サブディレクトリ��用�れ��。
+    <code>.htaccess</code> ファイル��メイン�設定ファイル���
+    構文を使���。
+    <code>.htaccess</code>
+    ファイル�����リクエスト�読�込�れる���
+    変更�����映�れ��。</p>
+
+    <p>��ディレクティブ� <code>.htaccess</code>
+    ファイル�書�る�を調�る���ディレクティブ�<a href="mod/directive-dict.html#Context">コンテキスト</a>
+    を調������。サー�管�者��ら�メイン設定ファイル�
+    <code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code>
+    を設定�る�����ディレクティブを <code>.htaccess</code>
+    ファイル�書�るよ���る�を制御�る�������。</p>
+
+    <p><code>.htaccess</code> ファイル�関�る詳��情報�
+    <a href="howto/htaccess.html">.htaccess �ュートリアル</a>
+    を�照������。</p>
+  </div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./de/configuring.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/configuring.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./fr/configuring.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/configuring.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/configuring.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/configuring.html.ko.euc-kr b/docs/manual/configuring.html.ko.euc-kr
index 8ce7d91c..3a83de7c 100644
--- a/docs/manual/configuring.html.ko.euc-kr
+++ b/docs/manual/configuring.html.ko.euc-kr
@@ -22,7 +22,8 @@
 <a href="./en/configuring.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/configuring.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/configuring.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/configuring.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/configuring.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/configuring.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 
 <p>ÀÌ ¹®¼­´Â ¾ÆÆÄÄ¡ À¥¼­¹ö¸¦ ¼³Á¤ÇÏ´Â ÆÄÀϵéÀ» ¼³¸íÇÑ´Ù.</p>
@@ -145,8 +146,9 @@
 <a href="./en/configuring.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/configuring.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/configuring.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/configuring.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/configuring.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/configuring.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/configuring.html.tr.utf8 b/docs/manual/configuring.html.tr.utf8
new file mode 100644
index 00000000..91f1e255
--- /dev/null
+++ b/docs/manual/configuring.html.tr.utf8
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Yapılandırma Dosyaları - Apache HTTP Sunucusu</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="./">Sürüm 2.2</a></div><div id="page-content"><div id="preamble"><h1>Yapılandırma Dosyaları</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="./de/configuring.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/configuring.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./fr/configuring.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/configuring.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/configuring.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+<p>Bu belgede Apache HTTP sunucusunu yapılandırmakta kullanılan dosyalar açıklanmıştır.</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#main">Ana Yapılandırma Dosyaları</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#syntax">Yapılandırma Dosyalarının Sözdizimi</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#modules">Modüller</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#scope">Yönergelerin Etki Alanı</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#htaccess">.htaccess Dosyaları</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="main" id="main">Ana Yapılandırma Dosyaları</a></h2>
+    
+    <table class="related"><tr><th>İlgili Modüller</th><th>İlgili Yönergeler</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#include">Include</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#typesconfig">TypesConfig</a></code></li></ul></td></tr></table>
+
+    <p>Apache düz metin yapılandırma dosyalarına <a href="mod/directives.html">yönergeler</a> yerleştirilerek yapılandırılır. Ana yapılandırma dosyasının ismi normalde <code>httpd.conf</code>’tur. Bu dosyanın yeri derleme sırasında belirlenir, ancak çalıştırma sırasında <code>-f</code> komut satırı seçeneği ile başka bir yer belirtilebilir. Ayrıca, <code class="directive"><a href="./mod/core.html#include">Include</a></code> yönergesi kullanılarak başka yapılandırma dosyaları da eklenebilir ve bu dosyaların isimleri belirtilirken dosya ismi şablonları kullanılabilir. Bu dosyaların içine de ana yapılandırma dosyasında olduğu gibi her türlü yönerge yerleştirilebilir. Ana yapılandırma dosyalarındaki değişiklikler Apache tarafından sadece başlatma veya yeniden başlatma sırasında etkin kılınır.</p>
+
+    <p>Sunucu ayrıca MIME belge türlerini içeren bir dosya daha okur; dosya ismi öntanımlı olarak <code>mime.types</code> olup <code class="directive"><a href="./mod/mod_mime.html#typesconfig">TypesConfig</a></code> yönergesi ile başka bir dosya belirtilebilir.</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="syntax" id="syntax">Yapılandırma Dosyalarının Sözdizimi</a></h2>
+    
+
+    <p>Apache yapılandırma dosyalarının her satırında sadece bir yönerge bulunur ve bir yönergenin birden fazla satıra yayılması daha iyi olacaksa satır katlanabilir; devamı bir alt satırda olan her satırın son karakteri “\� (tersbölü) olmalı, satırsonu karakteri ile bu tersbölü karakteri arasında başka karakter bulunmamalıdır.</p>
+
+    <p>Yapılandırma dosyalarındaki yönergelerin isimleri harf büyüklüğüne duyarlı olduğu halde argümanları genellikle harf büyüklüğüne duyarlı değildir. Diyez (“#�) karakteri ile başlayan satırlar açıklama olarak ele alınır ve yok sayılırlar. Yapılandırma yönergesi içeren satırların ardına  açıklama yerleştirilemez. Yönerge isminden önce yer alan boşluklar ve boş satırlar yok sayılır; bu özellik, okunabilirliği sağlamak için yönergelerin girintilenebilmesi olanağını verir.</p>
+
+    <p>Sunucuyu başlatmadan önce <code>apachectl configtest</code> ile veya <code>-t</code> komut satırı seçeneği ile yapılandırma dosyalarınızı sözdizimi hatalarına karşı sınayabilirsiniz.</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="modules" id="modules">Modüller</a></h2>
+    
+
+    <table class="related"><tr><th>İlgili Modüller</th><th>İlgili Yönergeler</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_so.html">mod_so</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code></li><li><code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code></li></ul></td></tr></table>
+
+    <p>Apache modüler yapıda bir sunucudur. Bu, çekirdek sunucunun sadece en temel işlevselliği içermesi demektir. Ek özellikler, Apache’ye <a href="mod/">modüller</a> halinde yüklenebilir. Öntanımlı olarak, derleme sırasında sunucunun <a href="mod/module-dict.html#Status">temel</a> bir modül kümesi içermesi sağlanır. Eğer sunucu  <a href="dso.html">devingen yüklenen</a> modülleri kullanmak üzere yapılandırılarak derlenirse modüller ayrı olarak derlenip gerektiği zaman <code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code> yönergesi kullanılarak yüklenebilir. Aksi takdirde, ek modülleri yükleyebilmek veya kaldırabilmek için Apache’nin yeniden derlenmesi gerekir. Yapılandırma yönergeleri belli bir modülün varlığına dayalı olarak bir <code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> bloku içine alınmak suretiyle sunucuya koşullu olarak eklenebilir.</p>
+
+    <p>Sunucunun içinde derlenmiş modüllerin listesini görmek için <code>-l</code> komut satırı seçeneğini kullanabilirsiniz.</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="scope" id="scope">Yönergelerin Etki Alanı</a></h2>
+    
+
+    <table class="related"><tr><th>İlgili Modüller</th><th>İlgili Yönergeler</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li></ul></td></tr></table>
+
+    <p>Ana yapılandırma dosyasına yerleştirilen yönergeler sunucunun tamamına uygulanır. Yapılandırmanızı sunucunun belli bir parçası için değiştirmek isterseniz yönergelerinizi <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code>, <code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code>, <code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code>, <code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code> ve <code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code> bölümleri içine yerleştirerek etki alanlarını değiştirebilirsiniz. Bu bölümler yönergelerin etkilediği alanları dosya sistemininin belli yerleri veya belli URL’lerle sınırlar. Yerine göre daha hassas ayarlamalar yapmak için bu bölgeler iç içe de kullanılabilir.</p>
+
+    <p>Apache, çok sayıda farklı siteyi aynı anda sunabilecek yetenektedir. Buna <a href="vhosts/">Sanal Konaklık</a> adı verilir. Yönergelerin etki alanları ayrıca <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> bölümleri içine konarak da değiştirilebilir. Böylece belli bir siteden gelen isteklere farklı bir uygulama yapılabilir.</p>
+
+    <p>Yönergelerin çoğu bu bölümlere yerleştirilebilirse de bazı yönergelerin bazı bağlamlarda bir etkisi olmaz. Örneğin, süreç oluşturmayı denetleyen yönergeler sadece ana sunucu bağlamına yerleştirilebilir. Hangi yönergenin hangi bağlama yerleştirilebileceğini bulmak için yönergenin <a href="mod/directive-dict.html#Context">bağlamına</a> bakınız. Bu konuda daha ayrıntılı bilgi edinmek için: <a href="sections.html">Directory, Location ve Files Bölümleri Nasıl Çalışır</a>.</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="htaccess" id="htaccess">.htaccess Dosyaları</a></h2>
+    
+
+    <table class="related"><tr><th>İlgili Modüller</th><th>İlgili Yönergeler</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#accessfilename">AccessFileName</a></code></li><li><code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code></li></ul></td></tr></table>
+
+    <p>Apache yapılandırma sorumluluğunu dağıtmak için site ağaçları içine özel dosyalar yerleştirilmesine izin verir. Bu özel dosyalar normalde <code>.htaccess</code> dosyaları olmakla birlikte <code class="directive"><a href="./mod/core.html#accessfilename">AccessFileName</a></code> yönergesi kullanılarak rasgele bir isim belirtilebilir. <code>.htaccess</code> dosyalarına yerleştirilen yönergeler sadece dosyanın bulunduğu dizine ve alt dizinlerine uygulanır. <code>.htaccess</code> dosyalarında da ana yapılandırma dosyalarında geçerli sözdizimi kullanılır. <code>.htaccess</code> dosyaları her istek gelişinde yeniden okunduğundan bu dosyalarda yapılan değişiklikler hemen etkisini gösterir.</p>
+
+    <p><code>.htaccess</code> dosyalarına hangi yönergelerin yerleştirilebileceğini bulmak için yönerge <a href="mod/directive-dict.html#Context">bağlamına</a> bakınız. Sunucunun yöneticisi <code>.htaccess</code> dosyalarına hangi yönergelerin yerleştirilebileceğini ana yapılandırma dosyalarında <code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code> yönergesini kullanarak belirleyebilir.</p>
+
+    <p><code>.htaccess</code> dosyaları hakkında daha ayrıntılı bilgi edinmek için <a href="howto/htaccess.html">.htaccess öğreticisi</a>ne bakabilirsiniz.</p>
+  </div></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="./de/configuring.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/configuring.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./fr/configuring.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/configuring.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/configuring.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/configuring.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/content-negotiation.html b/docs/manual/content-negotiation.html
index 02319b8d..c10ace6c 100644
--- a/docs/manual/content-negotiation.html
+++ b/docs/manual/content-negotiation.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: content-negotiation.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
@@ -6,9 +8,9 @@ URI: content-negotiation.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: content-negotiation.html.ja.euc-jp
+URI: content-negotiation.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: content-negotiation.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/content-negotiation.html.en b/docs/manual/content-negotiation.html.en
index bad0730b..90412aa4 100644
--- a/docs/manual/content-negotiation.html.en
+++ b/docs/manual/content-negotiation.html.en
@@ -504,7 +504,7 @@ Negotiation</a></li>
     the normal negotiation process applies.</p>
 
     <div class="example"><h3>Example</h3><p><code>
-      SetEnvIf Cookie "language=(.+)" prefer-language=$1
+      SetEnvIf Cookie "language=(.+)" prefer-language=$1<br />
       Header append Vary cookie
     </code></p></div>
 
@@ -676,6 +676,6 @@ factors to 5 decimal places before choosing the best variant.</p>
 <a href="./ja/content-negotiation.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/content-negotiation.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/content-negotiation.html.fr b/docs/manual/content-negotiation.html.fr
index 802bc966..06675796 100644
--- a/docs/manual/content-negotiation.html.fr
+++ b/docs/manual/content-negotiation.html.fr
@@ -270,7 +270,7 @@ conventions de nommage</a></li>
       <li><strong>La négociation de contenu transparente</strong> est utilisée
       quand le navigateur le demande explicitement selon le mécanisme défini
       dans la RFC 2295. Cette méthode de négociation donne au navigateur le
-      contrôle total du choix de la meilleure variante; le résultat dépend
+      contrôle total du choix de la meilleure variante; le résultat dépend
       cependant de la spécificité des algorithmes utilisés par le navigateur.
       Au cours du processus de négociation transparente, le navigateur peut
       demander à Apache d'exécuter l'"algorithme de sélection de variante à
@@ -672,7 +672,7 @@ conventions de nommage</a></h2>
     (un navigateur ou un cache), la directive <code class="directive"><a href="./mod/mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></code> peut être utilisée
     pour permettre la mise en cache des réponses qui ont fait l'objet d'une
     négociation. Cette directive peut intervenir dans la configuration au
-    niveau du serveur ou de l'hôte virtuel, et n'accepte aucun argument. Elle
+    niveau du serveur ou de l'hôte virtuel, et n'accepte aucun argument. Elle
     n'a aucun effet sur les requêtes en provenance de clients HTTP/1.1.</p>
 
     <p>Pour les clients HTTP/1.1, Apache envoie un en-tête de réponse HTTP
@@ -700,6 +700,6 @@ conventions de nommage</a></h2>
 <a href="./ja/content-negotiation.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/content-negotiation.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossaire</a> | <a href="./sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/content-negotiation.html.ja.euc-jp b/docs/manual/content-negotiation.html.ja.euc-jp
deleted file mode 100644
index 99155d01..00000000
--- a/docs/manual/content-negotiation.html.ja.euc-jp
+++ /dev/null
@@ -1,731 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./en/content-negotiation.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/content-negotiation.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/content-negotiation.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/content-negotiation.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-
-    <p>Apache ¤Ï HTTP/1.1 ¤Îµ¬³Ê¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤ë¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤ò
-    ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
-    ¥Ö¥é¥¦¥¶¤Ë¤è¤êÄ󶡤µ¤ì¤¿¥á¥Ç¥£¥¢¥¿¥¤¥×¡¢
-    ¸À¸ì¡¢Ê¸»ú¥»¥Ã¥È¡¢¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ÎÍ¥Àè·¹¸þ¤Ë´ð¤Å¤¤¤Æ¡¢
-    ºÇŬ¤Ê¥ê¥½¡¼¥¹¤Îɽ¸½¤òÁªÂò¤Ç¤­¤Þ¤¹¡£
-    ¤Þ¤¿¡¢ÉÔ´°Á´¤Ê¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¾ðÊó¤òÁ÷¤Ã¤Æ¤¯¤ë¥Ö¥é¥¦¥¶¤«¤é¤Î¥ê¥¯¥¨¥¹¥È¤ò
-    ¤â¤Ã¤È¸­¤¯¼è¤ê°·¤¨¤ë¤è¤¦¡¢¤¤¤¯¤Ä¤«µ¡Ç½¤â¼ÂÁõ¤·¤Æ¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤Ï
-    <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code>
-    ¥â¥¸¥å¡¼¥ë¤Ë¤è¤Ã¤ÆÄ󶡤µ¤ì¤Æ¤¤¤Æ¡¢¥Ç¥Õ¥©¥ë¥È¤ÇÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#about">¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#negotiation">Apache ¤Ë¤ª¤±¤ë¥Í¥´¥·¥¨¡¼¥·¥ç¥ó</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#methods">¥Í¥´¥·¥¨¡¼¥·¥ç¥óÊýË¡</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#better">ÉʼÁ¤ÎÃͤòÊѤ¨¤ë</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#extensions">Transparent Content Negotiation
-¤Î³ÈÄ¥</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#naming">¥ê¥ó¥¯¤È̾Á°¤ÎÊÑ´¹¤Ë´Ø¤¹¤ëÃí°ÕÅÀ</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#caching">¥­¥ã¥Ã¥·¥å¤Ë´Ø¤¹¤ëÃí°Õ»ö¹à</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#more">ÄɲþðÊó</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="about" id="about">¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ</a></h2>
-
-    <p>¥ê¥½¡¼¥¹¤Ï¡¢´ö¤Ä¤«°Û¤Ê¤Ã¤¿É½¸½¤ÇÍøÍѤǤ­¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£
-    Î㤨¤Ð¡¢°Û¤Ê¤ë¸À¸ì¤ä°Û¤Ê¤ë¥á¥Ç¥£¥¢¥¿¥¤¥×¡¢
-    ¤Þ¤¿¤Ï¤½¤ì¤é¤ÎÁȤ߹ç¤ï¤»¤ÇÍøÍѤǤ­¤ë¤«¤âÃΤì¤Þ¤»¤ó¡£
-    ¤â¤Ã¤È¤âŬ¤·¤¿ÁªÂò¤ò¤¹¤ëÊýË¡¤Î°ì¤Ä¤Ë¤Ï¡¢¥¤¥ó¥Ç¥Ã¥¯¥¹¥Ú¡¼¥¸¤ò
-    ¥æ¡¼¥¶¤Ë¸«¤»¤Æ¡¢¥æ¡¼¥¶¤ËÁª¤ó¤Ç¤â¤é¤¦ÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£
-    ¤·¤«¤·¡¢¥µ¡¼¥Ð¤¬¼«Æ°Åª¤ËÁª¤Ö¤³¤È¤¬¤Ç¤­¤ë¾ì¹ç¤¬Â¿¤¯¤¢¤ê¤Þ¤¹¡£
-    ¤³¤ì¤Ï¡¢¥Ö¥é¥¦¥¶¤¬¥ê¥¯¥¨¥¹¥ÈËè¤Ë¡¢
-    ¤É¤Îɽ¸½¤òÓϹ¥¤¹¤ë¤«¤È¤¤¤¦¾ðÊó¤òÁ÷¤ë¤³¤È¤ÇÆ°ºî¤·¤Æ¤¤¤Þ¤¹¡£
-    Î㤨¤Ð¥Ö¥é¥¦¥¶¤Ï¡¢²Äǽ¤Ê¤é¥Õ¥é¥ó¥¹¸ì¤Ç¾ðÊó¤ò¸«¤¿¤¤¡¢
-    ÉÔ²Äǽ¤Ê¤é¤½¤ÎÂå¤ï¤ê¤Ë±Ñ¸ì¤Ç¤â¤è¤¤¤È¡¢
-    ¼«Ê¬¤ÎÓϹ¥¤òÃΤ餻¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¥Ö¥é¥¦¥¶¤Ï¥ê¥¯¥¨¥¹¥È¤Î¥Ø¥Ã¥À¤Ç¼«Ê¬¤ÎÍ¥Àè·¹¸þ¤òÃΤ餻¤Þ¤¹¡£
-    ¥Õ¥é¥ó¥¹¸ì¤Î¤ß¤Îɽ¸½¤òÍ׵᤹¤ë¾ì¹ç¤Ï¡¢¥Ö¥é¥¦¥¶¤Ï¼¡¤òÁ÷¤ê¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>Accept-Language: fr</code></p></div>
-
-    <p>¤³¤ÎÍ¥Àè·¹¸þ¤Ï¡¢ÁªÂò²Äǽ¤Êɽ¸½¤¬Â¸ºß¤·¤Æ¡¢
-    ¸À¸ì¤Ë¤è¤Ã¤ÆÍÍ¡¹¤Êɽ¸½¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ßŬÍѤµ¤ì¤ë
-    ¤È¤¤¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>¤â¤Ã¤ÈÊ£»¨¤Ê¥ê¥¯¥¨¥¹¥È¤ÎÎã¤òµó¤²¤Þ¤·¤ç¤¦¡£
-    ¤³¤Î¥Ö¥é¥¦¥¶¤Ï¥Õ¥é¥ó¥¹¸ì¤È±Ñ¸ì¤ò¼õ¤±ÉÕ¤±¤ë¡¢¤·¤«¤·¥Õ¥é¥ó¥¹¸ì¤ò¹¥¤à¡¢
-    ¤½¤·¤ÆÍÍ¡¹¤Ê¥á¥Ç¥£¥¢¥¿¥¤¥×¤ò¼õ¤±ÉÕ¤±¤ë¤¬¡¢
-    ¥×¥ì¥¤¥ó¥Æ¥­¥¹¥È¤ä¾¤Î¥¿¥¤¥×¤è¤ê¤Ï HTML ¤ò¹¥¤à¡¢
-    ¾¤Î¥á¥Ç¥£¥¢¥¿¥¤¥×¤è¤ê¤Ï GIF ¤ä JPEG ¤ò¹¥¤à¡¢¤·¤«¤·ºÇ½ª¼êÃʤȤ·¤Æ
-    ¾¤Î¥á¥Ç¥£¥¢¥¿¥¤¥×¤â¼õ¤±ÉÕ¤±¤ë¡¢¤ÈÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>
-  Accept-Language: fr; q=1.0, en; q=0.5<br />
-  Accept: text/html; q=1.0, text/*; q=0.8, image/gif; q=0.6, image/jpeg; q=0.6, image/*; q=0.5, */*; q=0.1
-</code></p></div>
-
-    <p>Apache ¤Ï HTTP/1.1 µ¬³Ê¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë 'server
-    driven' ¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
-    <code>Accept</code>, <code>Accept-Language</code>, 
-    <code>Accept-Charset</code>, <code>Accept-Encoding</code>
-    ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤ò´°Á´¤Ë¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£Apache ¤Ï
-    'transparent' ¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤â¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¤¬¡¢
-    ¤³¤ì¤Ï RFC 2295 ¤È RFC 2296 ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë»î¸³Åª¤Ê
-    ¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¥×¥í¥È¥³¥ë¤Ç¤¹¡£
-    ¤³¤ì¤é¤Î RFC¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë 'feature negotiation'
-    ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£</p>
-
-    <p><strong>¥ê¥½¡¼¥¹</strong>¤È¤Ï URI
-    ¤ÇÆÃÄꤵ¤ì¤ë³µÇ°¾å¤Î¤â¤Î¤Î¤³¤È¤Ç¤¹ (RFC 2396)¡£ Apache
-    ¤Î¤è¤¦¤Ê HTTP ¥µ¡¼¥Ð¤Ï¡¢¤½¤Î̾Á°¶õ´Ö¤ÎÃæ¤Ç¤Î
-    ¥ê¥½¡¼¥¹¤Î<strong>ɽ¸½</strong>¤Ø¤Î¥¢¥¯¥»¥¹¤òÄ󶡤·¤Þ¤¹¡£
-    ¤½¤ì¤¾¤ì¤Îɽ¸½¤Ï
-    ÄêµÁ¤µ¤ì¤¿¥á¥Ç¥£¥¢¥¿¥¤¥×¡¢Ê¸»ú¥»¥Ã¥È¡¢¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°Åù¤Î
-    ÉÕ°¤·¤¿¡¢¥Ð¥¤¥ÈÎó¤Î·Á¼°¤Ç¤¹¡£
-    ¤½¤ì¤¾¤ì¤Î¥ê¥½¡¼¥¹¤Ï¤¢¤ë»þÅÀ¤Ç 0 ¸Ä¡¢1 ¸Ä¡¢¤½¤ì°Ê¾å¤Îɽ¸½¤È
-    ´ØÏ¢ÉÕ¤±¤é¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£Ê£¿ô¤Îɽ¸½¤¬ÍøÍѤǤ­¤ë¾ì¹ç¤Ï¡¢
-    ¥ê¥½¡¼¥¹¤Ï<strong>¥Í¥´¥·¥¨¡¼¥·¥ç¥ó²Äǽ¤Ç¤¢¤ë</strong>¤È¤µ¤ì¡¢
-    ¸Ä¡¹¤Îɽ¸½¤Ï <strong>variant</strong> ¤È¸Æ¤Ð¤ì¤Þ¤¹¡£
-    ¥Í¥´¥·¥¨¡¼¥·¥ç¥ó²Äǽ¤Ê¥ê¥½¡¼¥¹¤Î variant ¤¬°Û¤Ê¤ë¡¢
-    ¤½¤Î¾õÂÖ¤ò»Ø¤·¤Æ¡¢
-    ¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤Î<strong>¼¡¸µ</strong>¤È¸Æ¤Ó¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="negotiation" id="negotiation">Apache ¤Ë¤ª¤±¤ë¥Í¥´¥·¥¨¡¼¥·¥ç¥ó</a></h2>
-
-    <p>¥ê¥½¡¼¥¹¤ò¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤¹¤ë¤¿¤á¤Ë¤Ï¡¢
-    ¥µ¡¼¥Ð¤Ï variant ¤½¤ì¤¾¤ì¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤òÃΤäƤª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤ì¤Ï°Ê²¼¤ÎÆó¤Ä¤ÎÊýË¡¤Î¤É¤Á¤é¤«¤Ç¹Ô¤ï¤ì¤Þ¤¹¡£</p>
-
-    <ul>
-      <li>¥¿¥¤¥×¥Þ¥Ã¥×
-      (<em>¤¹¤Ê¤ï¤Á</em> <code>*.var</code> ¥Õ¥¡¥¤¥ë)
-      ¤ò»È¤¦ÊýË¡¡£ ¤³¤ì¤Ï variant
-      ¤òÌÀ¼¨Åª¤Ëµó¤²¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£</li>
-
-      <li>'Multiviews'
-      ¤ò»È¤Ã¤Æ¡¢¥µ¡¼¥Ð¤¬°ÅÌÛ¤ÎÆâ¤Ë¥Õ¥¡¥¤¥ë̾¤Ë¥Ñ¥¿¡¼¥ó¾È¹ç¤ò
-      ¹Ô¤Ê¤Ã¤Æ¤½¤Î·ë²Ì¤«¤éÁªÂò¤¹¤ëÊýË¡¡£</li>
-    </ul>
-
-   <h3><a name="type-map" id="type-map">type-map ¥Õ¥¡¥¤¥ë¤ò»È¤¦</a></h3>
-
-    <p>¥¿¥¤¥×¥Þ¥Ã¥×¤Ï <code>type-map</code> ¥Ï¥ó¥É¥é
-    (¤â¤·¤¯¤Ï¡¢¸Å¤¤ Apache
-    ¤ÎÀßÄê¤È²¼°Ì¸ß´¹¤Ç¤¢¤ë <a class="glossarylink" href="./glossary.html#mime-type" title="ÍѸ콸¤ò»²¾È">MIME ¥¿¥¤¥×</a>
-    <code>application/x-type-map</code>)
-    ¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¥É¥­¥å¥á¥ó¥È¤Ç¤¹¡£
-    ¤³¤Îµ¡Ç½¤ò»È¤¦¤¿¤á¤Ë¤Ï¡¢¤¢¤ë¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤ò
-    <code>type-map</code>
-    ¤È¤·¤ÆÄêµÁ¤¹¤ë¤è¤¦¤Ê¥Ï¥ó¥É¥é¤ò¡¢
-    ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤ËÃÖ¤¯É¬Íפ¬¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ¤³¤ì¤Ï</p>
-
-<div class="example"><p><code>AddHandler type-map .var</code></p></div>
-
-    <p>¤ò¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Ë½ñ¤¯¤³¤È¤¬°ìÈÖÎɤ¤ÊýË¡¤Ç¤¹¡£</p>
-
-    <p>¥¿¥¤¥×¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤Ïµ­½Ò¤¹¤ë¥ê¥½¡¼¥¹¤ÈƱ¤¸Ì¾Á°¤ò»ý¤Ã¤Æ¤¤¤Æ¡¢
-    ÍøÍѲÄǽ¤Ê variant ¤½¤ì¤¾¤ì¤Î¥¨¥ó¥È¥ê¤ò»ý¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤½¤·¤Æ¡¢¤³¤Î¥¨¥ó¥È¥ê¤ÏϢ³¤·¤¿ HTTP ¤Î¥Ø¥Ã¥À¹Ô¤Ç¹½À®¤µ¤ì¤Þ¤¹¡£
-    °Û¤Ê¤ë variant ¤Î¤¿¤á¤Î¥¨¥ó¥È¥ê¤Ï¶õ¹Ô¤Ç¶èÀÚ¤é¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¥¨¥ó¥È¥êÃæ¤Ë¶õ¹Ô¤¬Ê£¿ô¤¢¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£
-    ½¬´·Åª¤Ë¤Ï¡¢¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤ÏÁ´ÂΤò·ë¹ç¤·¤¿¤â¤Î¤Î¥¨¥ó¥È¥ê¤«¤é»Ï¤Þ¤ê¤Þ¤¹
-    (¤·¤«¤·¤³¤ì¤Ïɬ¿Ü¤Ç¤Ï¤Ê¤¯¡¢¤¢¤Ã¤¿¤È¤·¤Æ¤â̵»ë¤µ¤ì¤ë¤â¤Î¤Ç¤¹)¡£
-    ¼¡¤ËÎã¤ò¼¨¤·¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¥ê¥½¡¼¥¹ <code>foo</code> 
-    ¤òµ­½Ò¤·¤Æ¤¤¤ë¤Î¤Ç¡¢<code>foo.var</code> ¤È¤¤¤¦Ì¾Á°¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>
-  URI: foo<br />
-<br />
-  URI: foo.en.html<br />
-  Content-type: text/html<br />
-  Content-language: en<br />
-<br />
-  URI: foo.fr.de.html<br />
-  Content-type: text/html;charset=iso-8859-2<br />
-  Content-language: fr, de<br />
-</code></p></div>
-    <p>¤¿¤È¤¨ MultiViews ¤ò»ÈÍѤ¹¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤¿¤È¤·¤Æ¤â¡¢
-    ¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤è¤ê¥¿¥¤¥×¥Þ¥Ã¥×¤ÎÊý¤¬Í¥À踢¤ò»ý¤Ä¤È¤¤¤¦¤³¤È¤Ë¤â
-    Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    variant ¤ÎÉʼÁ¤¬°ã¤¦¤È¤­¤Ï¡¢¤³¤Î²èÁü¤Î¤è¤¦¤Ë (JPEG, GIF, ASCII
-    ¥¢¡¼¥È¤¬¤¢¤ê¤Þ¤¹) ¥á¥Ç¥£¥¢¥¿¥¤¥×¤Î "qs"
-    ¥Ñ¥é¥á¡¼¥¿¤Ç»ØÄꤵ¤ì¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>
-  URI: foo<br />
-<br />
-  URI: foo.jpeg<br />
-  Content-type: image/jpeg; qs=0.8<br />
-<br />
-  URI: foo.gif<br />
-  Content-type: image/gif; qs=0.5<br />
-<br />
-  URI: foo.txt<br />
-  Content-type: text/plain; qs=0.01<br />
-</code></p></div>
-
-    <p>qs ÃͤÎÈÏ°Ï¤Ï 0.000 ¤«¤é 1.000 ¤Ç¤¹¡£qs Ãͤ¬
-    0.000 ¤Î variant ¤Ï·è¤·¤Æ
-    ÁªÂò¤µ¤ì¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£'qs' ÃͤΤʤ¤ variant
-    ¤Ï qs ÃÍ 1.0 ¤ò Í¿¤¨¤é¤ì¤Þ¤¹¡£qs
-    ¥Ñ¥é¥á¡¼¥¿¤Ï¥¯¥é¥¤¥¢¥ó¥È¤ÎǽÎϤ˴ط¸Ìµ¤¯¡¢Â¾¤Î variant ¤È
-    Èæ³Ó¤·¤¿¤È¤­¤Î variant
-    ¤ÎÁêÂÐŪ¤Ê¡ÖÉʼÁ¡×¤ò¼¨¤·¤Þ¤¹¡£
-    Î㤨¤Ð¡¢¼Ì¿¿¤òɽ¸½¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤È¤­¤Ï JPEG
-    ¥Õ¥¡¥¤¥ë¤ÎÊý¤¬ÉáÄÌ¤Ï ASCII
-    ¥Õ¥¡¥¤¥ë¤è¤ê¤â¹â¤¤ÉʼÁ¤Ë¤Ê¤ê¤Þ¤¹¡£¤·¤«¤·¡¢¥ê¥½¡¼¥¹¤¬¸µ¡¹
-    ASCII ¥¢¡¼¥È¤Çɽ¸½¤µ¤ì¤Æ¤¤¤ë¤È¤­¤Ï¡¢ASCII ¥Õ¥¡¥¤¥ë¤Î
-    Êý¤¬ JPEG ¥Õ¥¡¥¤¥ë¤è¤ê¤â¹â¤¤ÉʼÁ¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤Î¤è¤¦¤Ë¡¢qs
-    ¤Ï ɽ¸½¤µ¤ì¤ë¥ê¥½¡¼¥¹¤ÎÀ­¼Á¤Ë¤è¤Ã¤Æ variant
-    Ëè¤ËÆÃÍ­¤ÎÃͤò¼è¤ê¤Þ¤¹¡£</p>
-
-    <p>ǧ¼±¤µ¤ì¤ë¥Ø¥Ã¥À¤Î°ìÍ÷¤Ï
-    <a href="mod/mod_negotiation.html#typemaps">mod_negotiation</a>
-    ¥É¥­¥å¥á¥ó¥È¤Ë¤¢¤ê¤Þ¤¹¡£</p>
-
-
-<h3><a name="multiviews" id="multiviews">Multiviews</a></h3>
-
-    <p><code>MultiViews</code> ¤Ï¥Ç¥£¥ì¥¯¥È¥êËè¤Î¥ª¥×¥·¥ç¥ó¤Ç¡¢
-    <code>httpd.conf</code>¥Õ¥¡¥¤¥ë¤Î
-    <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>, 
-    <code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>, 
-    <code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code>
-    ¥»¥¯¥·¥ç¥óÃæ¤ä¡¢(<code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code>
-    ¤¬Å¬ÀÚ¤ÊÃÍ¤Ë ÀßÄꤵ¤ì¤Æ¤¤¤ë¤È) <code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ë¤Ç <code class="directive"><a href="./mod/core.html#options">Options</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤Ã¤ÆÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    <code>Options All</code> ¤Ï
-    <code>MultiViews</code>
-    ¤ò¥»¥Ã¥È¤·¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ÌÀ¼¨Åª¤Ë
-    ¤½¤Î̾Á°¤ò½ñ¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p><code>MultiViews</code> ¤Î¸ú²Ì¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹:
-    ¥µ¡¼¥Ð¤¬ <code>/some/dir/foo</code>
-    ¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¼è¤ê¡¢<code>/some/dir</code> ¤Ç
-    <code>MultiViews</code> ¤¬Í­¸ú¤Ç¤¢¤Ã¤Æ¡¢
-    <code>/some/dir/foo</code> ¤¬Â¸ºß<em>¤·¤Ê¤¤</em>¾ì¹ç¡¢
-    ¥µ¡¼¥Ð¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤òÆɤó¤Ç <code>foo.*</code>
-    ¤Ë¤¢¤Æ¤Ï¤Þ¤ëÁ´¤Æ¤Î¥Õ¥¡¥¤¥ë¤òõ¤·¡¢
-    »ö¼Â¾å¤½¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤¹¤ë¥¿¥¤¥×¥Þ¥Ã¥×¤òºî¤ê¤Þ¤¹¡£
-    ¤½¤Î¤È¤­¡¢¥á¥Ç¥£¥¢¥¿¥¤¥×¤È¥³¥ó¥Æ¥ó¥È¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ï¡¢¤½¤Î¥Õ¥¡¥¤¥ë̾¤ò
-    ľÀÜ»ØÄꤷ¤¿¤È¤­¤ÈƱ¤¸¤â¤Î¤¬³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹¡£
-    ¤½¤ì¤«¤é¥¯¥é¥¤¥¢¥ó¥È¤ÎÍ×µá¤Ë°ìÈֹ礦¤â¤Î¤òÁª¤Ó¤Þ¤¹¡£</p>
-
-    <p>¥µ¡¼¥Ð¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Îº÷°ú¤òºî¤í¤¦¤È¤·¤Æ¤¤¤ë¾ì¹ç¡¢
-    <code>MultiViews</code>
-    ¤Ï <code class="directive"><a href="./mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤òõ¤¹²áÄø¤Ë¤â
-    ŬÍѤµ¤ì¤Þ¤¹¡£ÀßÄê¥Õ¥¡¥¤¥ë¤Ë</p>
-<div class="example"><p><code>DirectoryIndex index</code></p></div>
-    <p>¤¬½ñ¤«¤ì¤Æ¤¤¤Æ¡¢<code>index.html</code> ¤È
-    <code>index.html3</code> ¤¬
-    ξÊý¸ºß¤·¤Æ¤¤¤ë¤È¡¢¥µ¡¼¥Ð¤Ï¤½¤ÎÃ椫¤é¤É¤Á¤é¤«¤òŬÅö¤ËÁª¤Ó¤Þ¤¹¡£
-    ¤â¤·¤½¤ÎξÊý¤¬Â¸ºß¤»¤º¤Ë <code>index.cgi</code>
-    ¤¬Â¸ºß¤·¤Æ¤¤¤ë¤È¡¢ ¥µ¡¼¥Ð¤Ï¤½¤ì¤ò¼Â¹Ô¤·¤Þ¤¹¡£</p>
-
-    <p>¤â¤·¥Ç¥£¥ì¥¯¥È¥ê¤òÆɤó¤Ç¤¤¤ëºÝ¤Ë¡¢
-    ʸ»ú¥»¥Ã¥È¡¢¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¡¢¸À¸ì¡¢¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò
-    »ØÄꤹ¤ë¤¿¤á¤Î <code>mod_mime</code> 
-    ¤Çǧ¼±¤Ç¤­¤ë³ÈÄ¥»Ò¤ò»ý¤¿¤Ê¤¤¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ë¤È¡¢·ë²Ì¤Ï
-    <code class="directive"><a href="./mod/mod_mime.html#multiviewsmatch">MultiViewsMatch</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÀßÄê¤Ë°Í¸¤·¤Þ¤¹¡£¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¥Ï¥ó¥É¥é¡¢¥Õ¥£¥ë¥¿¡¢Â¾¤Î¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¥¿¥¤¥×¤Î¤É¤ì¤¬
-    MultiViews ¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤Ç»ÈÍѤǤ­¤ë¤«¤ò·èÄꤷ¤Þ¤¹¡£</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="methods" id="methods">¥Í¥´¥·¥¨¡¼¥·¥ç¥óÊýË¡</a></h2>
-
-    <p>Apache ¤Ï¥ê¥½¡¼¥¹¤Î variant ¤Î°ìÍ÷¤ò¡¢¥¿¥¤¥×¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤«
-    ¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¥Õ¥¡¥¤¥ë̾¤«¤é¤«¤Ç¼èÆÀ¤·¤¿¸å¡¢
-    ¡ÖºÇŬ¤Ê¡× variant ¤ò·èÄꤹ¤ë¤¿¤á¤ËÆó¤Ä¤ÎÊýË¡¤Î
-    ¤É¤Á¤é¤«¤òµ¯Æ°¤·¤Þ¤¹¡£
-    Apache ¤Î¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤Îµ¡Ç½¤ò»È¤¦¤¿¤á¤Ë¡¢
-    ¤É¤Î¤è¤¦¤Ë¤·¤Æ¤³¤ÎÄ´Ä䤬¹Ô¤ï¤ì¤ë¤«¾ÜºÙ¤òÃΤëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
-    ¤·¤«¤·¤Ê¤¬¤é¡¢¤³¤Îʸ½ñ¤Î»Ä¤ê¤Ç¤Ï´Ø¿´¤Î¤¢¤ë¿Í¤Î¤¿¤á¤Ë¡¢
-    »ÈÍѤµ¤ì¤Æ¤¤¤ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p>¥Í¥´¥·¥¨¡¼¥·¥ç¥óÊýË¡¤ÏÆó¤Ä¤¢¤ê¤Þ¤¹¡£</p>
-
-    <ol>
-      <li>Ä̾ï¤Ï <strong>Apache ¤Î¥¢¥ë¥´¥ê¥º¥à¤òÍѤ¤¤¿ Server
-      driven negotiation</strong> ¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£Apache
-      ¤Î¥¢¥ë¥´¥ê¥º¥à¤Ï¸å¤Ë¾ÜºÙ¤ËÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-      ¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤¬»ÈÍѤµ¤ì¤¿¾ì¹ç¡¢Apache
-      ¤Ï¤è¤êÎɤ¤·ë²Ì¤Ë¤Ê¤ë¤è¤¦¤Ë¡¢ÆÃÄê¤Î¼¡¸µ¤Ë¤ª¤¤¤ÆÉʼÁ¤ÎÃͤò
-      ¡ÖÊѤ¨¤ë¡×¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Apache
-      ¤¬ÉʼÁ¤ÎÃͤòÊѤ¨¤ëÊýË¡¤Ï¸å¤Ç¾ÜºÙ¤ËÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</li>
-
-      <li>RFC 2295
-      ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ëµ¡¹½¤òÍѤ¤¤Æ¥Ö¥é¥¦¥¶¤¬Æä˻ØÄꤷ¤¿¾ì¹ç¡¢
-      <strong>transparent content negotiation</strong>
-      ¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£¤³¤Î¥Í¥´¥·¥¨¡¼¥·¥ç¥óÊýË¡¤Ç¤Ï¡¢¡ÖºÇŬ¤Ê¡×
-      variant ¤Î·èÄê¤ò¥Ö¥é¥¦¥¶¤¬´°Á´¤ËÀ©¸æ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¤Ç¤¹¤«¤é¡¢·ë²Ì¤Ï¥Ö¥é¥¦¥¶¤¬»ÈÍѤ·¤Æ¤¤¤ë¥¢¥ë¥´¥ê¥º¥à¤Ë°Í¸¤·¤Þ¤¹¡£
-      Transparent negotiation ¤Î½èÍý¤Î²áÄø¤Ç¡¢¥Ö¥é¥¦¥¶¤Ï RFC 2296
-      ¤Ç ÄêµÁ¤µ¤ì¤Æ¤¤¤ë 'remote variant selection algorithm'
-      ¤ò¼Â¹Ô¤¹¤ë¤è¤¦¤ËÍê¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</li>
-    </ol>
-
-<h3><a name="dimensions" id="dimensions">¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤Î¼¡¸µ</a></h3>
-
-    <table>
-      
-      <tr valign="top">
-        <th>¼¡¸µ</th>
-
-        <th>ÀâÌÀ</th>
-      </tr>
-
-      <tr valign="top">
-        <td>¥á¥Ç¥£¥¢¥¿¥¤¥×</td>
-
-        <td>¥Ö¥é¥¦¥¶¤Ï <code>Accept</code>
-	¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¤ÇÍ¥Àè·¹¸þ¤ò»ØÄꤷ¤Þ¤¹¡£
-	¥¢¥¤¥Æ¥à¤½¤ì¤¾¤ì¤Ï¡¢´ØÏ¢¤·¤¿ÉʼÁ¿ôÃͤò»ý¤Ä¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	variant ¤ÎÀâÌÀ¤âÉʼÁ¿ôÃͤò»ý¤Ä¤³¤È¤¬¤Ç¤­¤Þ¤¹
-	("qs" ¥Ñ¥é¥á¡¼¥¿¤ò¤´Í÷²¼¤µ¤¤)¡£</td>
-      </tr>
-
-      <tr valign="top">
-        <td>¸À¸ì</td>
-
-	<td>¥Ö¥é¥¦¥¶¤Ï <code>Accept-Language</code>
-	¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¤ÇÍ¥Àè·¹¸þ¤ò»ØÄꤷ¤Þ¤¹¡£
-	Í×ÁǤ½¤ì¤¾¤ì¤ËÉʼÁ¿ôÃͤò»ý¤¿¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	variants ¤Ï 0 ¤« 1 ¤Ä¤«¤½¤ì°Ê¾å¤Î¸À¸ì¤È
-	´ØÏ¢¤Å¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</td>
-      </tr>
-
-      <tr valign="top">
-        <td>¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°</td>
-
-	<td>¥Ö¥é¥¦¥¶¤Ï <code>Accept-Encoding</code>
-	¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¤ÇÍ¥Àè·¹¸þ¤ò»ØÄꤷ¤Þ¤¹¡£
-	Í×ÁǤ½¤ì¤¾¤ì¤ËÉʼÁ¿ôÃͤò»ý¤¿¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</td>
-      </tr>
-
-      <tr valign="top">
-        <td>ʸ»ú¥»¥Ã¥È</td>
-
-	<td>¥Ö¥é¥¦¥¶¤Ï <code>Accept-Charset</code>
-	¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¤ÇÍ¥Àè·¹¸þ¤ò»ØÄꤷ¤Þ¤¹¡£
-	Í×ÁǤ½¤ì¤¾¤ì¤ËÉʼÁ¿ôÃͤò»ý¤¿¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	variant ¤Ï¥á¥Ç¥£¥¢¥¿¥¤¥×¤Î¥Ñ¥é¥á¡¼¥¿¤È¤·¤Æʸ»ú¥»¥Ã¥È¤ò
-	»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</td>
-      </tr>
-    </table>
-
-
-<h3><a name="algorithm" id="algorithm">Apache ¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¥¢¥ë¥´¥ê¥º¥à</a></h3>
-
-    <p>¥Ö¥é¥¦¥¶¤ËÊÖ¤¹¡ÖºÇŬ¤Ê¡×variant ¤ò (¤â¤·¤¢¤ì¤Ð) ÁªÂò¤¹¤ë¤è¤¦¤Ë
-    Apache ¤Ï¼¡¤Î¥¢¥ë¥´¥ê¥º¥à¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤òÀßÄê¤Ë¤è¤êÊѹ¹¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
-    ¼¡¤Î¤è¤¦¤ËÆ°ºî¤·¤Þ¤¹:</p>
-
-    <ol>
-      <li>¤Þ¤º¤Ï¤¸¤á¤Ë¡¢¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤Î¼¡¸µ¤½¤ì¤¾¤ì¤Ë¤Ä¤¤¤ÆŬÀÚ¤Ê
-      <em>Accept*</em> ¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¤òÄ´¤Ù¡¢
-      variant ¤½¤ì¤¾¤ì¤ËÉʼÁ¤ò³ä¤êÅö¤Æ¤Þ¤¹¡£
-      ¤â¤·¤¢¤ë¼¡¸µ¤Î <em>Accept*</em> ¥Ø¥Ã¥À¤Ç¤½¤Î variant
-      ¤¬µöÍƤǤ­¤Ê¤¤¤³¤È¤¬¼¨¤µ¤ì¤Æ¤¤¤ì¤Ð¡¢¤½¤ì¤òºï½ü¤·¤Þ¤¹¡£
-      variant ¤¬°ì¤Ä¤â»Ä¤Ã¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢¥¹¥Æ¥Ã¥× 4 ¤Ë¹Ô¤­¤Þ¤¹¡£</li>
-
-      <li>
-	¾ÃµîË¡¤Ç¡ÖºÇŬ¤Ê¡× variant ¤òÁª¤Ó¤Þ¤¹¡£
-	¼¡¤Î¥Æ¥¹¥È¤¬½çÈÖ¤ËŬÍѤµ¤ì¤Þ¤¹¡£
-	¥Æ¥¹¥È¤ÇÁªÂò¤µ¤ì¤Ê¤«¤Ã¤¿ variant ¤Ïºï½ü¤µ¤ì¤Æ¤¤¤­¤Þ¤¹¡£
-	¥Æ¥¹¥È¸å variant ¤¬°ì¤Ä¤À¤±»Ä¤Ã¤Æ¤¤¤ì¤Ð¡¢¤½¤ì¤òºÇŬ¤Ê¤â¤Î¤È¤·¤Æ
-	¥¹¥Æ¥Ã¥× 3 ¤Ë¿Ê¤ß¤Þ¤¹¡£
-	Ê£¿ô variant ¤¬»Ä¤Ã¤Æ¤¤¤ì¤Ð¡¢¼¡¤Î¥Æ¥¹¥È¤Ë¿Ê¤ß¤Þ¤¹¡£
-
-        <ol>
-	  <li>variant ¤Î¥á¥Ç¥£¥¢¥¿¥¤¥×¤ÎÉʼÁ¿ôÃÍ¤È <code>Accept</code>
-	  ¥Ø¥Ã¥À¤ÎÉʼÁ¿ôÃͤȤÎÀѤò·×»»¤·¤Æ¡¢ºÇ¹âÃͤΠvariant
-	  ¤òÁª¤Ó¤Þ¤¹¡£</li>
-
-	  <li>¸À¸ìÉʼÁ¿ôÃͤ¬ºÇ¹â¤Î variant ¤òÁª¤Ó¤Þ¤¹¡£</li>
-
-	  <li>(¤â¤·¤¢¤ì¤Ð) <code>Accept-Language</code> ¥Ø¥Ã¥À¤Î¸À¸ì½ç¤«¡¢
-	  (¤â¤·¤¢¤ì¤Ð)
-	  <code class="directive"><a href="./mod/mod_negotiation.html#languagepriority">LanguagePriority</a></code> 
-	  ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¸À¸ì½ç¤ÇºÇŬ¤Ê¸À¸ì¤Î variant ¤òÁª¤Ó¤Þ¤¹¡£</li>
-
-	  <li>ºÇ¹â¡Ö¥ì¥Ù¥ë¡×¤Î¥á¥Ç¥£¥¢¥Ñ¥é¥á¡¼¥¿
-	  (text/html ¥á¥Ç¥£¥¢¥¿¥¤¥×¤Î¥Ð¡¼¥¸¥ç¥ó¤òÍ¿¤¨¤ë¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹)
-	  ¤ò»ý¤Ä variant ¤òÁª¤Ó¤Þ¤¹¡£</li>
-
-	  <li><code>Accept-Charset</code> ¥Ø¥Ã¥À¹Ô¤ÇÍ¿¤¨¤é¤ì¤Æ¤¤¤ëºÇ¹â¤Îʸ»ú¥»¥Ã¥È
-	  ¥á¥Ç¥£¥¢¥Ñ¥é¥á¡¼¥¿¤ò»ý¤Ä variant ¤òÁª¤Ó¤Þ¤¹¡£
-	  ÌÀ¼¨Åª¤Ë½ü³°¤µ¤ì¤Æ¤¤¤Ê¤¤¸Â¤ê¡¢ISO-8859-1
-	  ¤¬µöÍƤµ¤ì¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-	  <code>text/*</code> ¥á¥Ç¥£¥¢¥¿¥¤¥×¤Ç¤¢¤ë¤±¤ì¤É¤â
-	  ÆÃÄê¤Îʸ»ú¥»¥Ã¥È¤ËÌÀ¼¨Åª¤Ë´ØÏ¢¤Å¤±¤é¤ì¤Æ¤¤¤ë¤ï¤±¤Ç¤Ï¤Ê¤¤
-	  variant ¤Ï ISO-8859-1 ¤Ç¤¢¤ë¤È²¾Äꤵ¤ì¤Þ¤¹¡£</li>
-
-	  <li>ISO-8859-1 <em>¤Ç¤Ï¤Ê¤¤</em>ʸ»ú¥»¥Ã¥È¥á¥Ç¥£¥¢¥Ñ¥é¥á¡¼¥¿¤È
-	  ´ØÏ¢¤Å¤±¤é¤ì¤Æ¤¤¤ë variant ¤òÁª¤Ó¤Þ¤¹¡£
-	  ¤½¤Î¤è¤¦¤Ê variant ¤¬¤Ê¤¤¾ì¹ç¤Ï¡¢Âå¤ï¤ê¤ËÁ´¤Æ¤Î
-	  variant ¤òÁª¤Ó¤Þ¤¹¡£</li>
-
-	  <li>ºÇŬ¤Ê¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î variant ¤òÁª¤Ó¤Þ¤¹¡£
-	  ¤â¤· user-agent ¤¬µöÍƤ¹¤ë¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤¬¤¢¤ì¤Ð¡¢
-	  ¤½¤Î variant ¤Î¤ß¤òÁª¤Ó¤Þ¤¹¡£
-	  ¤½¤¦¤Ç¤Ï¤Ê¤¯¡¢¤â¤·¥¨¥ó¥³¡¼¥É¤µ¤ì¤¿¤â¤Î¤È¤½¤¦¤Ç¤Ê¤¤
-	  variant ¤¬º®¤¶¤Ã¤Æ¸ºß¤·¤Æ¤¤¤¿¤é¥¨¥ó¥³¡¼¥É¤µ¤ì¤Æ¤¤¤Ê¤¤
-	  variant ¤Î¤ß¤òÁª¤Ó¤Þ¤¹¡£
-	  variant ¤¬Á´Éô¥¨¥ó¥³¡¼¥É¤µ¤ì¤Æ¤¤¤ë¤«
-	  variant ¤¬Á´Éô¥¨¥ó¥³¡¼¥É¤µ¤ì¤Æ¤¤¤Ê¤¤¤È¤¤¤¦¾ì¹ç¤Ï¡¢
-	  Á´¤Æ¤Î variant ¤òÁª¤Ó¤Þ¤¹¡£</li>
-
-	  <li>ÆâÍƤκǤâû¤¤ variant ¤òÁª¤Ó¤Þ¤¹¡£</li>
-
-	  <li>»Ä¤Ã¤Æ¤¤¤ë variant ¤ÎºÇ½é¤Î¤â¤Î¤òÁª¤Ó¤Þ¤¹¡£
-	  ¥¿¥¤¥×¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤ÎºÇ½é¤Ë¥ê¥¹¥È¤µ¤ì¤Æ¤¤¤ë¤«¡¢
-	  variant ¤¬¥Ç¥£¥ì¥¯¥È¥ê¤«¤éºÇ½é¤ËÆɤ߹þ¤Þ¤ì¤ë»þ¤Ë
-	  ASCII½ç¤Ç¥½¡¼¥È¤·¤Æ¥Õ¥¡¥¤¥ë̾¤¬ÀèƬ¤Ë¤Ê¤Ã¤¿¤«¡¢¤Î¤É¤Á¤é¤«¤Ç¤¹¡£</li>
-        </ol>
-      </li>
-
-      <li>¥¢¥ë¥´¥ê¥º¥à¤ò»È¤Ã¤Æ°ì¤Ä¤Î¡ÖºÇŬ¤Ê¡×variant ¤òÁª¤Ó¤Þ¤·¤¿¤Î¤Ç¡¢
-      ¤½¤ì¤ò±þÅú¤È¤·¤ÆÊÖ¤·¤Þ¤¹¡£¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤Î¼¡¸µ¤ò»ØÄꤹ¤ë¤¿¤á¤Ë
-      HTTP ¥ì¥¹¥Ý¥ó¥¹¥Ø¥Ã¥À <code>Vary</code> ¤¬ÀßÄꤵ¤ì¤Þ¤¹
-      (¥ê¥½¡¼¥¹¤Î¥­¥ã¥Ã¥·¥å¤ò¤¹¤ë»þ¤Ë¡¢
-      ¥Ö¥é¥¦¥¶¤ä¥­¥ã¥Ã¥·¥å¤Ï¤³¤Î¾ðÊó¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹)¡£
-      °Ê¾å¤Ç½ª¤ï¤ê¡£</li>
-
-      <li>¤³¤³¤ËÍ褿¤È¤¤¤¦¤³¤È¤Ï¡¢variant ¤¬°ì¤Ä¤âÁªÂò¤µ¤ì¤Ê¤«¤Ã¤¿
-      (¥Ö¥é¥¦¥¶¤¬µöÍƤ¹¤ë¤â¤Î¤¬¤Ê¤«¤Ã¤¿¤¿¤á) ¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
-      406 ¥¹¥Æ¡¼¥¿¥¹ ("No Acceptable representation" ¤ò°ÕÌ£¤¹¤ë)
-      ¤¬¡¢ÍøÍѲÄǽ¤Ê variant ¤Î¥ê¥¹¥È¤Î¤Ä¤¤¤¿ HTML 
-      ¥É¥­¥å¥á¥ó¥È¤È¤È¤â¤ËÊÖ¤µ¤ì¤Þ¤¹¡£
-      Áê°ã¤Î¼¡¸µ¤ò¼¨¤¹ HTTP <code>Vary</code> ¥Ø¥Ã¥À¤âÀßÄꤵ¤ì¤Þ¤¹¡£</li>
-    </ol>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="better" id="better">ÉʼÁ¤ÎÃͤòÊѤ¨¤ë</a></h2>
-
-    <p>¾åµ­¤Î Apache ¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¥¢¥ë¥´¥ê¥º¥à¤Î¸·³Ê¤Ê²ò¼á¤Ç
-    ÆÀ¤é¤ì¤ë¤Ç¤¢¤í¤¦Ãͤ«¤é¡¢Apache ¤ÏÉʼÁ¿ôÃͤò»þ¡¹ÊѤ¨¤Þ¤¹¡£
-    ¤³¤ì¤Ï¡¢¤³¤Î¥¢¥ë¥´¥ê¥º¥à¤Ç´°Á´¤Ç¤Ï¤Ê¤¤¡¢¤¢¤ë¤¤¤ÏÀµ³Î¤Ç¤Ê¤¤¾ðÊó¤òÁ÷¤ë
-    ¥Ö¥é¥¦¥¶¸þ¤±¤Ë¤è¤ê¤è¤¤·ë²Ì¤òÆÀ¤ë¤¿¤á¤Ë¹Ô¤ï¤ì¤Þ¤¹¡£
-    ¤«¤Ê¤ê¥Ý¥Ô¥å¥é¡¼¤Ê¥Ö¥é¥¦¥¶¤Ç¡¢¤â¤·¤Ê¤¤¤È´Ö°ã¤Ã¤¿ variant
-    ¤òÁªÂò¤¹¤ë·ë²Ì¤Ë¤Ê¤Ã¤Æ¤·¤Þ¤¦¤è¤¦¤Ê <code>Accept</code>
-    ¥Ø¥Ã¥À¾ðÊó¤òÁ÷¤ë¤â¤Î¤â¤¢¤ê¤Þ¤¹¡£
-    ¥Ö¥é¥¦¥¶¤¬´°Á´¤ÇÀµ¤·¤¤¾ðÊó¤òÁ÷¤Ã¤Æ¤¤¤ì¤Ð¡¢
-    ¤³¤Î¿ôÃÍÊѲ½¤ÏŬÍѤµ¤ì¤Þ¤»¤ó¡£</p>
-
-<h3><a name="wildcards" id="wildcards">¥á¥Ç¥£¥¢¥¿¥¤¥×¤È¥ï¥¤¥ë¥É¥«¡¼¥É</a></h3>
-
-    <p><code>Accept:</code> ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤Ï¥á¥Ç¥£¥¢¥¿¥¤¥×¤ÎÍ¥Àè·¹¸þ¤ò»ØÄꤷ¤Þ¤¹¡£
-    ¤³¤ì¤Ï¤Þ¤¿¡¢"image/*" ¤ä "*/*"
-    ¤È¤¤¤Ã¤¿¡Ö¥ï¥¤¥ë¥É¥«¡¼¥É¡×¥á¥Ç¥£¥¢¥¿¥¤¥×¤ò´Þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤³¤³¤Ç * ¤ÏǤ°Õ¤Îʸ»úÎó¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
-    ¤Ç¤¹¤«¤é¡¢¼¡¤Î:</p>
-
-<div class="example"><p><code>Accept: image/*, */*</code></p></div>
-
-    <p>¤ò´Þ¤à¥ê¥¯¥¨¥¹¥È¤Ï¡¢"image/" ¤Ç¤Ï¤¸¤Þ¤ë¥¿¥¤¥×Á´¤Æ¤¬µöÍƤǤ­¤ë¡¢
-    ¤½¤·¤Æ¾¤Î¤É¤ó¤Ê¥¿¥¤¥×¤âµöÍƤǤ­¤ë
-    (¤³¤Î¾ì¹ç¤Ï¤¸¤á¤Î "image/*" ¤Ï¾éĹ¤Ë¤Ê¤ê¤Þ¤¹)
-    ¤³¤È¤ò¼¨¤·¤Þ¤¹¡£
-    °·¤¦¤³¤È¤Î¤Ç¤­¤ëÌÀ¼¨Åª¤Ê¥¿¥¤¥×¤Ë²Ã¤¨¤Æ¡¢µ¡³£Åª¤Ë
-    ¥ï¥¤¥ë¥É¥«¡¼¥É¤òÁ÷¤ë¥Ö¥é¥¦¥¶¤â¤¢¤ê¤Þ¤¹¡£Î㤨¤Ð:</p>
-
-<div class="example"><p><code>
-  Accept: text/html, text/plain, image/gif, image/jpeg, */*
-</code></p></div>
-    <p>¤³¤¦¤¹¤ë¤³¤È¤ÎÁÀ¤¤¤Ï¡¢ÌÀ¼¨Åª¤Ë¥ê¥¹¥È¤·¤Æ¤¤¤ë¥¿¥¤¥×¤¬Í¥À褵¤ì¤ë¤±¤ì¤É¤â¡¢
-    °Û¤Ê¤ëɽ¸½¤¬ÍøÍѲÄǽ¤Ç¤¢¤ì¤Ð¤½¤ì¤Ç¤âÎɤ¤¡¢¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
-    ¤·¤«¤·¤Ê¤¬¤é¡¢¾å¤Î´ðËÜŪ¤Ê¥¢¥ë¥´¥ê¥º¥à¤Ç¤Ï¡¢
-    */* ¥ï¥¤¥ë¥É¥«¡¼¥É¤Ï¾¤ÎÁ´¤Æ¤Î¥¿¥¤¥×¤ÈÁ´¤¯Æ±Åù¤Ê¤Î¤ÇÍ¥À褵¤ì¤Þ¤»¤ó¡£
-    ¥Ö¥é¥¦¥¶¤Ï */* ¤Ë¤â¤Ã¤ÈÄ㤤ÉʼÁ (Í¥Àè) 
-    ÃͤòÉÕ¤±¤Æ¥ê¥¯¥¨¥¹¥È¤òÁ÷¤ë¤Ù¤­¤Ê¤Î¤Ç¤¹¡£Î㤨¤Ð:</p>
-<div class="example"><p><code>
-  Accept: text/html, text/plain, image/gif, image/jpeg, */*; q=0.01
-</code></p></div>
-    <p>ÌÀ¼¨Åª¤Ê¥¿¥¤¥×¤Ë¤ÏÉʼÁ¿ôÃͤ¬ÉÕ¤±¤é¤ì¤Æ¤¤¤Þ¤»¤ó¤Î¤Ç¡¢
-    ¥Ç¥Õ¥©¥ë¥È¤Î 1.0 (ºÇ¹âÃÍ) ¤ÎÍ¥Àè¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¥ï¥¤¥ë¥É¥«¡¼¥É */* ¤ÏÄ㤤ͥÀèÅÙ 0.01 ¤òÍ¿¤¨¤é¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢
-    ÌÀ¼¨Åª¤Ë¥ê¥¹¥È¤µ¤ì¤Æ¤¤¤ë¥¿¥¤¥×¤Ë¹çÃפ¹¤ë variant ¤¬¤Ê¤¤¾ì¹ç¤Ë¤Î¤ß¡¢
-    ¾¤Î¥¿¥¤¥×¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>¤â¤· <code>Accept:</code> ¥Ø¥Ã¥À¤¬ q ÃͤòÁ´¤¯´Þ¤ó¤Ç<em>¤¤¤Ê¤±¤ì¤Ð</em>¡¢
-    ˾¤ß¤ÎµóÆ°¤ò¤¹¤ë¤¿¤á¤Ë¡¢
-    Apache ¤Ï "*/*" ¤¬¤¢¤ì¤Ð 0.01 ¤Î q ÃͤòÀßÄꤷ¤Þ¤¹¡£
-    ¤Þ¤¿¡¢"type/*" ¤Î·Á¤Î¥ï¥¤¥ë¥É¥«¡¼¥É¤Ë¤Ï 0.02 ¤Î q ÃͤòÀßÄꤷ¤Þ¤¹
-    (¤Ç¤¹¤«¤é¤³¤ì¤é¤Ï "*/*" ¤Î¥Þ¥Ã¥Á¤è¤ê¤âÍ¥À褵¤ì¤Þ¤¹)¡£
-    ¤â¤· <code>Accept:</code> ¥Ø¥Ã¥ÀÃæ¤Î¥á¥Ç¥£¥¢¥¿¥¤¥×¤Î¤É¤ì¤«¤¬ q
-    Ãͤò´Þ¤ó¤Ç¤¤¤ì¤Ð¡¢¤³¤ì¤é¤ÎÆüì¤ÊÃͤÏŬ±þ<em>¤µ¤ì¤º</em>¡¢
-    Àµ¤·¤¤¾ðÊó¤òÁ÷¤ë¥Ö¥é¥¦¥¶¤«¤é¤Î¥ê¥¯¥¨¥¹¥È¤Ï´üÂÔÄ̤ê¤Ë
-    Æ°ºî¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-
-<h3><a name="exceptions" id="exceptions">¸À¸ì¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤ÎÎã³°½èÍý</a></h3>
-
-    <p>Apache 2.0 ¤Ç¤Ï¿·¤¿¤Ë¡¢¸À¸ì¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤¬Å¬¹ç¤¹¤ë¤â¤Î¤ò
-    ¸«¤Ä¤±¤ë¤Î¤Ë¼ºÇÔ¤·¤¿»þ¤Ë¡¢Í¥²í¤Ë¥Õ¥©¡¼¥ë¥Ð¥Ã¥¯¤Ç¤­¤ë¤è¤¦¤Ê
-    ¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¥¢¥ë¥´¥ê¥º¥à¤¬´ö¤Ä¤«Äɲ䵤ì¤Þ¤·¤¿¡£</p>
-
-    <p>¥µ¡¼¥Ð¤Î¥Ú¡¼¥¸¤ò¥¯¥é¥¤¥¢¥ó¥È¤¬¥ê¥¯¥¨¥¹¥È¤·¤¿¤±¤ì¤É¤â¡¢
-    ¥Ö¥é¥¦¥¶¤ÎÁ÷¤Ã¤Æ¤­¤¿ <code>Accept-Language</code> ¤Ë¹çÃפ¹¤ë¥Ú¡¼¥¸¤¬°ì¤Ä¤â
-    ¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¾ì¹ç¤Ë¡¢¥µ¡¼¥Ð¤Ï "No Acceptable Variant"
-    ¤« "Multiple Choices" ¥ì¥¹¥Ý¥ó¥¹¤ò¥¯¥é¥¤¥¢¥ó¥È¤ËÊÖ¤·¤Þ¤¹¡£
-    ¤³¤ì¤é¤Î¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤òÊÖ¤µ¤Ê¤¤¤è¤¦¤Ë¡¢
-    ¤³¤Î¤è¤¦¤Ê¾ì¹ç¤Ë¤Ï Apache ¤¬ <code>Accept-Language</code> ¤ò̵»ë¤·¤Æ¡¢
-    ¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¥¯¥¨¥¹¥È¤ËÌÀ¼¨Åª¤Ë¤Ï¹çÃפ·¤Ê¤¤¥É¥­¥å¥á¥ó¥È¤ò
-    Ä󶡤¹¤ë¤è¤¦¤ËÀßÄê¤Ç¤­¤Þ¤¹¡£
-    <code class="directive"><a href="./mod/mod_negotiation.html#forcelanguagepriority">ForceLanguagePriority</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¤³¤ì¤é¤Î¥¨¥é¡¼¤Î°ì¤Ä¤«Î¾Êý¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤¹¤ë¤¿¤á¤Ë
-    »ÈÍѤǤ­¤Æ¡¢
-    <code class="directive"><a href="./mod/mod_negotiation.html#languagepriority">LanguagePriority</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÆâÍƤò»È¤Ã¤Æ¥µ¡¼¥Ð¤ÎȽÃǤòÂå¹Ô¤¹¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¥µ¡¼¥Ð¤Ï¾¤ËŬ¹ç¤¹¤ë¤â¤Î¤¬¸«¤Ä¤«¤é¤Ê¤±¤ì¤Ð¡¢
-    ¸À¸ì¥µ¥Ö¥»¥Ã¥È¤ÇŬ¹ç¤¹¤ë¤â¤Î¤ò»î¤½¤¦¤È¤â¤·¤Þ¤¹¡£
-    Î㤨¤Ð¥¯¥é¥¤¥¢¥ó¥È¤¬±Ñ¹ñ±Ñ¸ì¤Ç¤¢¤ë <code>en-GB</code> ¸À¸ì¤Ç
-    ¥É¥­¥å¥á¥ó¥È¤ò¥ê¥¯¥¨¥¹¥È¤·¤¿¾ì¹ç¡¢¥µ¡¼¥Ð¤Ï HTTP/1.1
-    µ¬³Ê¤Ç¤Ï¡¢Ã±¤Ë <code>en</code> ¤È¥Þ¡¼¥¯¤µ¤ì¤Æ¤¤¤ë¥É¥­¥å¥á¥ó¥È¤ò
-    ¥Þ¥Ã¥Á¤¹¤ë¤â¤Î¤È¤¹¤ë¤³¤È¤ÏÄ̾ï¤Ïµö¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
-    (±Ñ¹ñ±Ñ¸ì¤ÏÍý²ò¤Ç¤­¤ë¤±¤É°ìÈÌŪ¤Ê±Ñ¸ì¤ÏÍý²ò¤Ç¤­¤Ê¤¤¤È¤¤¤¦Æɤ߼ê¤Ï
-    ¹Í¤¨¤é¤ì¤Ê¤¤¤Î¤Ç¡¢Accept-Language ¥Ø¥Ã¥À¤Ç <code>en-GB</code> 
-    ¤ò´Þ¤ó¤Ç <code>en</code> ¤ò´Þ¤Þ¤Ê¤¤¤Î¤Ï¤Û¤Ü³Î¼Â¤ËÀßÄê¤Î´Ö°ã¤¤¤Ç¤¢¤ë¡¢
-    ¤È¤¤¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ¤Ç¤¹¤¬ÉÔ¹¬¤Ê¤³¤È¤Ë¡¢Â¿¤¯¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ç¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç
-    ¤³¤Î¤è¤¦¤ÊÀßÄê¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£)
-    ¤·¤«¤·¤Ê¤¬¤é¡¢Â¾¤Î¸À¸ì¤Ë¤Ï¥Þ¥Ã¥Á¤»¤º¡¢"No Acceptable Variants"
-    ¥¨¥é¡¼¤òÊÖ¤·¤¿¤ê¡¢
-    <code class="directive"><a href="./mod/mod_negotiation.html#languagepriority">LanguagePriority</a></code>
-    ¤Ë¥Õ¥©¡¼¥ë¥Ð¥Ã¥¯¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤È¤­¤Ï¡¢
-    ¥µ¥Ö¥»¥Ã¥È»ØÄê¤ò̵»ë¤·¤Æ¡¢<code>en-GB</code> ¤ò <code>en</code>
-    ¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
-    Apache ¤Ï¥¯¥é¥¤¥¢¥ó¥È¤ÎµöÍƸÀ¸ì¥ê¥¹¥È¤Ë°ÅÌÛ¤Ë
-    Èó¾ï¤ËÄ㤤ÉʼÁÃͤοƸÀ¸ì¤ò²Ã¤¨¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¤·¤«¤·¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬ "en-GB; q=0.9, fr; q=0.8" ¤È¥ê¥¯¥¨¥¹¥È¤·¤Æ¡¢
-    ¥µ¡¼¥Ð¤¬ "en" ¤È "fr" ¤ÈÀ߷פµ¤ì¤¿¥É¥­¥å¥á¥ó¥È¤ò»ý¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-    "fr" ¥É¥­¥å¥á¥ó¥È¤¬ÊÖ¤µ¤ì¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ¤³¤Î¤è¤¦¤Ê½èÍý¤Ï¡¢HTTP 1.1 µ¬³Ê¤È¤ÎÀ°¹çÀ­¤ò°Ý»ý¤·¤Æ¡¢
-    ŬÀÚ¤ËÀßÄꤵ¤ì¤¿¥¯¥é¥¤¥¢¥ó¥È¤È¤â¤­¤Á¤ó¤ÈÆ°ºî¤¹¤ë¤¿¤á¤Ë
-    ɬÍפǤ¹¡£</p>
-
-    <p>¤è¤ê¹âÅ٤ʥƥ¯¥Ë¥Ã¥¯ (Cookie ¤äÆüì¤Ê URL ¥Ñ¥¹Åù)
-    ¤Ë¤ª¤¤¤Æ¤â¥æ¡¼¥¶¤Î¸À¸ìÁªÂò¤ò¥µ¥Ý¡¼¥È¤¹¤ë¤¿¤á¡¢
-    Apache 2.0.47 ¤«¤é¤Ï¡¢<code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code>
-    ¤¬<a href="env.html">´Ä¶­ÊÑ¿ô</a> <code>prefer-language</code>
-    ¤òǧ¼±¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
-    ¤³¤ÎÊÑ¿ô¤¬Â¸ºß¤·¤Æ¡¢Å¬ÀڤʸÀ¸ì¥¿¥°¤¬ÂåÆþ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
-    <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code> ¤Ï¹çÃפ¹¤ë variant
-    ¤òÁªÂò¤·¤è¤¦¤È¤·¤Þ¤¹¡£¹çÃפ¹¤ë¤â¤Î¤¬Ìµ¤±¤ì¤Ð¡¢
-    Ä̾ï¤Î¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¼ê½ç¤¬Å¬ÍѤµ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Example</h3><p><code>
-      SetEnvIf Cookie "language=(.+)" prefer-language=$1
-    </code></p></div>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="extensions" id="extensions">Transparent Content Negotiation
-¤Î³ÈÄ¥</a></h2> 
-
-<p>Apache ¤Ï transparent content negotiation ¥×¥í¥È¥³¥ë
-(RFC 2295) ¤ò¼¡¤Î¤è¤¦¤Ë³ÈÄ¥¤·¤Æ¤¤¤Þ¤¹¡£
-ÆÃÄê¤Î¥³¥ó¥Æ¥ó¥È¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î¤ß¤¬ÍøÍѲÄǽ¤Ç¤¢¤ë variant 
-¤Ë°õ¤òÉÕ¤±¤ë¤¿¤á¤Ë¡¢¿·¤¿¤Ë <code>{encoding ..}</code> 
-Í×ÁǤò variant ¥ê¥¹¥ÈÃæ¤Ë»È¤Ã¤Æ¤¤¤Þ¤¹¡£
-¥ê¥¹¥ÈÃæ¤Î¥¨¥ó¥³¡¼¥É¤µ¤ì¤¿ variant ¤òǧ¼±¤·¡¢
-<code>Accept-Encoding</code> ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤Ë½¾¤Ã¤ÆµöÍƤµ¤ì¤ë
-¥¨¥ó¥³¡¼¥É¤ò¤â¤Ã¤¿ variant ¤Ï¡¢¤É¤ì¤Ç¤â¸õÊä variant
-¤È¤·¤Æ»ÈÍѤ¹¤ë¤è¤¦¤Ë¡¢
-RVSA/1.0 ¥¢¥ë¥´¥ê¥º¥à (RFC 2296) ¤Î¼ÂÁõ¤¬³ÈÄ¥¤µ¤ì¤Þ¤·¤¿¡£
-RVSA/1.0 ¤Î¼ÂÁõ¤Ç¤Ï¡¢ºÇŬ¤Ê variant ¤¬¸«¤Ä¤«¤ë¤Þ¤Ç¡¢
-·×»»¤·¤¿ÉʼÁ¿ôÃͤϾ®¿ôÅÀ°Ê²¼ 5 ·å¤Þ¤Ç´Ý¤á¤Þ¤»¤ó¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="naming" id="naming">¥ê¥ó¥¯¤È̾Á°¤ÎÊÑ´¹¤Ë´Ø¤¹¤ëÃí°ÕÅÀ</a></h2>
-
-    <p>¸À¸ì¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-    ¥Õ¥¡¥¤¥ë¤¬°ì¤Ä°Ê¾å¤Î³ÈÄ¥»Ò¤ò»ý¤Æ¤Æ¡¢
-    ³ÈÄ¥»Ò¤Î½çÈÖ¤ÏÄ̾ï¤Ï¹Í褵¤ì¤Ê¤¤
-    (¾ÜºÙ¤Ï <a href="mod/mod_mime.html#multipleext">mod_mime</a> 
-    ¤ò»²¾È) ¤Î¤Ç¡¢
-    ´ö¤Ä¤«¤Î°Û¤Ê¤ë̾Á°¤ÎÊÑ´¹¤òÁª¤Ù¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p>ŵ·¿Åª¤Ê¥Õ¥¡¥¤¥ë¤Ç¤Ï¡¢MIME ¥¿¥¤¥×³ÈÄ¥»Ò (<em>Î㤨¤Ð</em>
-    <code>html</code>) ¤ò»ý¤Ã¤Æ¤¤¤Æ¡¢¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°³ÈÄ¥»Ò
-    (<em>Î㤨¤Ð</em> <code>gz</code>) ¤ò»ý¤Ã¤Æ¤¤¤ë¤«¤â¤·¤ì¤Ê¤¯¤Æ¡¢
-    ¤³¤Î¥Õ¥¡¥¤¥ë¤Ë°Û¤Ê¤ë¸À¸ì variant ¤òÍÑ°Õ¤·¤Æ¤¤¤ì¤Ð¡¢
-    ¤â¤Á¤í¤ó¸À¸ì³ÈÄ¥»Ò (<em>Î㤨¤Ð</em> <code>en</code>)
-    ¤ò»ý¤Ã¤Æ¤¤¤ë¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>Îã:</p>
-
-    <ul>
-      <li>foo.en.html</li>
-
-      <li>foo.html.en</li>
-
-      <li>foo.en.html.gz</li>
-    </ul>
-
-    <p>¥Õ¥¡¥¤¥ë̾¤È¡¢¤½¤ì¤ËÂФ·¤Æ»È¤¨¤ë¥ê¥ó¥¯¤È»È¤¨¤Ê¤¤¥ê¥ó¥¯¤ÎÎã¤Ç¤¹:</p>
-
-    <table class="bordered">
-      
-      <tr>
-        <th>¥Õ¥¡¥¤¥ë̾</th>
-
-        <th>»È¤¨¤ë¥ê¥ó¥¯</th>
-
-        <th>»È¤¨¤Ê¤¤¥ê¥ó¥¯</th>
-      </tr>
-
-      <tr>
-        <td><em>foo.html.en</em></td>
-
-        <td>foo<br />
-         foo.html</td>
-
-        <td>-</td>
-      </tr>
-
-      <tr>
-        <td><em>foo.en.html</em></td>
-
-        <td>foo</td>
-
-        <td>foo.html</td>
-      </tr>
-
-      <tr>
-        <td><em>foo.html.en.gz</em></td>
-
-        <td>foo<br />
-         foo.html</td>
-
-        <td>foo.gz<br />
-         foo.html.gz</td>
-      </tr>
-
-      <tr>
-        <td><em>foo.en.html.gz</em></td>
-
-        <td>foo</td>
-
-        <td>foo.html<br />
-         foo.html.gz<br />
-         foo.gz</td>
-      </tr>
-
-      <tr>
-        <td><em>foo.gz.html.en</em></td>
-
-        <td>foo<br />
-         foo.gz<br />
-         foo.gz.html</td>
-
-        <td>foo.html</td>
-      </tr>
-
-      <tr>
-        <td><em>foo.html.gz.en</em></td>
-
-        <td>foo<br />
-         foo.html<br />
-         foo.html.gz</td>
-
-        <td>foo.gz</td>
-      </tr>
-    </table>
-
-    <p>¾å¤Îɽ¤ò¸«¤Æ¡¢³ÈÄ¥»Ò¤Ê¤·¤Î¥ê¥ó¥¯ (<em>Î㤨¤Ð</em> <code>foo</code>) 
-    ¤¬¤¤¤Ä¤Ç¤â»È¤¨¤ë¤³¤È¤Ëµ¤¤¬ÉÕ¤¯¤Ç¤·¤ç¤¦¡£
-    ¤³¤ÎÍøÅÀ¤Ï¡¢¥É¥­¥å¥á¥ó¥È¤È¤·¤Æ±þÅú¤¹¤ë¥Õ¥¡¥¤¥ë¤Î
-    ¼ÂºÝ¤Î¥Õ¥¡¥¤¥ë¥¿¥¤¥×¤ò±£Ê䷤ơ¢¥ê¥ó¥¯¤Î»²¾È¤òÊѹ¹¤¹¤ë¤³¤È¤Ê¤¯
-    ¸å¤«¤é¥Õ¥¡¥¤¥ë¤òÊѹ¹¤Ç¤­¤ë¡¢
-    <em>Î㤨¤Ð</em> <code>html</code> ¤«¤é <code>shtml</code>
-    ¤Ë¡¢¤¢¤ë¤¤¤Ï <code>cgi</code> ¤ËÊѹ¹¤Ç¤­¤ëÅÀ¤Ç¤¹¡£</p>
-
-    <p>¥ê¥ó¥¯¤Ë MIME ¥¿¥¤¥×¤ò»È¤¤Â³¤±¤¿¤¤ (<em>Î㤨¤Ð</em>
-    <code>foo.html</code>)»þ¤Ï¡¢¸À¸ì³ÈÄ¥»Ò¤Ï
-    (¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°³ÈÄ¥»Ò¤â¤¢¤ì¤Ð¤½¤ì¤â´Þ¤á¤Æ)
-    MIME ¥¿¥¤¥×³ÈÄ¥»Ò¤Î±¦Â¦¤Ë¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó
-    (<em>Î㤨¤Ð</em> <code>foo.html.en</code>)¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="caching" id="caching">¥­¥ã¥Ã¥·¥å¤Ë´Ø¤¹¤ëÃí°Õ»ö¹à</a></h2>
-
-    <p>¥­¥ã¥Ã¥·¥å¤¬°ì¤Ä¤Îɽ¸½¤òÊݸ¤·¤Æ¤¤¤ë¤È¤­¤Ï¡¢
-    ¥ê¥¯¥¨¥¹¥È URL ¤È´ØÏ¢¤Å¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¼¡¤Ë¤½¤Î URL ¤¬¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿»þ¤Ë¡¢¥­¥ã¥Ã¥·¥å¤Ï
-    Êݸ¤µ¤ì¤Æ¤¤¤ëɽ¸½¤ò»ÈÍѤǤ­¤Þ¤¹¡£¤·¤«¤·¡¢
-    ¥ê¥½¡¼¥¹¤¬¥µ¡¼¥Ð¤Ç¥Í¥´¥·¥¨¡¼¥·¥ç¥ó²Äǽ¤Ç¤¢¤ì¤Ð¡¢
-    ºÇ½é¤Î¥ê¥¯¥¨¥¹¥È¤Ç¥­¥ã¥Ã¥·¥å¤µ¤ì¤Æ³¤¯¥­¥ã¥Ã¥·¥å¥Ò¥Ã¥È¤Ç¤Ï
-    ´Ö°ã¤Ã¤¿±þÅú¤òÊÖ¤·¤Æ¤·¤Þ¤¦¤È¤¤¤¦¤³¤È¤Ë¤Ê¤ê¤«¤Í¤Þ¤»¤ó¡£
-    ¤³¤ì¤òËɤ°¤¿¤á¤Ë¡¢Apache ¤Ï¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤Î
-    ¸å¤ËÊÖ¤µ¤ì¤¿±þÅúÁ´¤Æ¤Ë¡¢HTTP/1.0 ¥¯¥é¥¤¥¢¥ó¥È¤Ç¤Ï
-    ¥­¥ã¥Ã¥·¥åÉÔ²Äǽ¤Î°õ¤ò¤Ä¤±¤Þ¤¹¡£
-    ¤Þ¤¿¡¢¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤µ¤ì¤¿±þÅú¤Î¥­¥ã¥Ã¥·¥å¤ò²Äǽ¤Ë¤¹¤ë
-    HTTP/1.1 ¥×¥í¥È¥³¥ë¤Îµ¡Ç½¤â Apache ¤Ï¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£</p>
-
-    <p>HTTP/1.0 ½àµò¤Î¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ¤Ï¡¢
-    (¥Ö¥é¥¦¥¶¤Ç¤¢¤í¤¦¤È¥­¥ã¥Ã¥·¥å¤Ç¤¢¤í¤¦¤È)
-    ¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤ò¼õ¤±¤¿±þÅú¤Î¥­¥ã¥Ã¥·¥å¤òµö¤¹¤¿¤á¤Ë¡¢
-    <code class="directive"><a href="./mod/mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤǤ­¤Þ¤¹¡£
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë¤ä¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë½ñ¤¯¤³¤È¤¬¤Ç¤­¡¢
-    °ú¿ô¤ò¤È¤ê¤Þ¤»¤ó¡£
-    HTTP/1.1 ¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î¥ê¥¯¥¨¥¹¥È¤Ë¤Ï¸úÎϤò»ý¤Á¤Þ¤»¤ó¡£</p>
-
-    <p>HTTP/1.1 ¥¯¥é¥¤¥¢¥ó¥È¤ËÂФ·¤Æ¤Ï¡¢¥ì¥¹¥Ý¥ó¥¹¤Î¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¼¡¸µ
-    ¤ò¼¨¤¹¤¿¤á¤Ë <code>Vary</code> HTTP ¥ì¥¹¥Ý¥ó¥¹¥Ø¥Ã¥À¤òÁ÷¤ê¤Þ¤¹¡£
-    ¥­¥ã¥Ã¥·¥å¤Ï¡¢¤³¤ì¤ò»È¤Ã¤Æ¸å³¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ¥í¡¼¥«¥ë¥³¥Ô¡¼¤Ç±þÅú¤Ç¤­¤ë¤«
-    ¤É¤¦¤«¤ò·èÄê¤Ç¤­¤Þ¤¹¡£
-    ¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¼¡¸µ¤È¤Ï´Ø·¸¤Ê¤·¤Ë¥í¡¼¥«¥ë¥³¥Ô¡¼¤Î»ÈÍѤòÍ¥À褹¤ë¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï¡¢
-    <code>force-no-vary</code> <a href="env.html#special">´Ä¶­ÊÑ¿ô</a>¤ò
-    ÀßÄꤷ¤Þ¤¹¡£</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="more" id="more">ÄɲþðÊó</a></h2>
-
-    <p>¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤Ë´Ø¤¹¤ëÄɲþðÊó¤Ï¡¢
-    Alan J. Flavell ¤µ¤ó¤Î<a href="http://ppewww.ph.gla.ac.uk/~flavell/www/lang-neg.html">Language
-    Negotiation Notes</a> ¤ò¤´Í÷²¼¤µ¤¤¡£¤Ç¤¹¤¬¡¢
-    Apache 2.0 ¤Ç¤ÎÊѹ¹ÅÀ¤ò´Þ¤à¤¿¤á¤Ë¤Ï¹¹¿·¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¤â¤·¤ì¤Ê¤¤
-    ¤È¤¤¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./en/content-negotiation.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/content-negotiation.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/content-negotiation.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/content-negotiation.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/content-negotiation.html.ja.utf8 b/docs/manual/content-negotiation.html.ja.utf8
new file mode 100644
index 00000000..7ab870a9
--- /dev/null
+++ b/docs/manual/content-negotiation.html.ja.utf8
@@ -0,0 +1,731 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>コンテント�ゴシエーション - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>コンテント�ゴシエーション</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./en/content-negotiation.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./fr/content-negotiation.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/content-negotiation.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/content-negotiation.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+
+
+    <p>Apache � HTTP/1.1 ��格�記述�れ��るコンテント�ゴシエーションを
+    サ�ート�����。
+    ブラウザ�より�供�れ�メディアタイプ�
+    言語�文字セット�エンコーディング�優先傾��基����
+    最��リソース�表�を�択����。
+    ����完全��ゴシエーション情報を����るブラウザ�ら�リクエストを
+    も��賢��り扱�るよ������機能も実装���り��。</p>
+
+    <p>コンテント�ゴシエーション�
+    <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code>
+    モジュール�よ���供�れ����デフォルト�組�込�れ����。</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#about">コンテント�ゴシエーション����</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#negotiation">Apache ���る�ゴシエーション</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#methods">�ゴシエーション方法</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#better">�質�値を変�る</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#extensions">Transparent Content Negotiation
+�拡張</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#naming">リンク����変��関�る注�点</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#caching">キャッシュ�関�る注�事項</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#more">追加情報</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="about" id="about">コンテント�ゴシエーション����</a></h2>
+
+    <p>リソース��幾��異���表��利用��る場���り��。
+    例���異�る言語や異�るメディアタイプ�
+    ����れら�組�����利用��る�も知れ��ん。
+    も��も����択を�る方法�一����インデックスページを
+    ユーザ�見���ユーザ��ん�もら�方法��り��。
+    ����サー��自動的��������る場��多��り��。
+    �れ��ブラウザ�リクエスト毎��
+    ��表�を嗜好�る����情報を�る���動作�����。
+    例��ブラウザ���能�らフランス語�情報を見���
+    ��能�ら��代�り�英語�もよ���
+    自分�嗜好を知ら�る�������。
+    ブラウザ�リクエスト�ヘッダ�自分�優先傾�を知ら���。
+    フランス語���表�を�求�る場���ブラウザ�次を�り��。</p>
+
+<div class="example"><p><code>Accept-Language: fr</code></p></div>
+
+    <p>��優先傾����択�能�表��存在���
+    言語�よ��様々�表���る場�����用�れる
+    ������注�������。</p>
+
+    <p>も��複雑�リクエスト�例を挙���ょ�。
+    ��ブラウザ�フランス語�英語を��付�る����フランス語を好む�
+    ���様々�メディアタイプを��付�る��
+    プレインテキストや他�タイプより� HTML を好む�
+    他�メディアタイプより� GIF や JPEG を好む����最終手段���
+    他�メディアタイプも��付�る��設定�れ����。</p>
+
+<div class="example"><p><code>
+  Accept-Language: fr; q=1.0, en; q=0.5<br />
+  Accept: text/html; q=1.0, text/*; q=0.8, image/gif; q=0.6, image/jpeg; q=0.6, image/*; q=0.5, */*; q=0.1
+</code></p></div>
+
+    <p>Apache � HTTP/1.1 �格�定義�れ��る 'server
+    driven' コンテント�ゴシエーションをサ�ート�����。
+    <code>Accept</code>, <code>Accept-Language</code>, 
+    <code>Accept-Charset</code>, <code>Accept-Encoding</code>
+    リクエストヘッダを完全�サ�ート�����。Apache �
+    'transparent' コンテント�ゴシエーションもサ�ート�������
+    �れ� RFC 2295 � RFC 2296 �定義�れ��る試験的�
+    �ゴシエーションプロトコル��。
+    �れら� RFC�定義�れ��る 'feature negotiation'
+    �サ�ート�����ん。</p>
+
+    <p><strong>リソース</strong>�� URI
+    �特定�れる概念上�も������ (RFC 2396)。 Apache
+    �よ�� HTTP サー�������空間�中��
+    リソース�<strong>表�</strong>��アクセスを�供���。
+    �れ�れ�表��
+    定義�れ�メディアタイプ�文字セット�エンコーディング等�
+    付属����イト列�形���。
+    �れ�れ�リソース��る時点� 0 個�1 個��れ以上�表��
+    関連付�られる�能性��り��。複数�表��利用��る場���
+    リソース�<strong>�ゴシエーション�能��る</strong>��れ�
+    個々�表�� <strong>variant</strong> �呼�れ��。
+    �ゴシエーション�能�リソース� variant �異�る�
+    ��状態を指���
+    �ゴシエーション�<strong>次元</strong>�呼���。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="negotiation" id="negotiation">Apache ���る�ゴシエーション</a></h2>
+
+    <p>リソースを�ゴシエーション�る�����
+    サー�� variant �れ�れ�����情報を知����必���り��。
+    �れ�以下�二��方法���ら��行�れ��。</p>
+
+    <ul>
+      <li>タイプマップ
+      (<em>����</em> <code>*.var</code> ファイル)
+      を使�方法。 �れ� variant
+      を明示的�挙���るファイルを指定���。</li>
+
+      <li>'Multiviews'
+      を使���サー��暗黙�内�ファイル��パターン照�を
+      行������果�ら�択�る方法。</li>
+    </ul>
+
+   <h3><a name="type-map" id="type-map">type-map ファイルを使�</a></h3>
+
+    <p>タイプマップ� <code>type-map</code> �ンドラ
+    (も������ Apache
+    �設定�下�互���る <a class="glossarylink" href="./glossary.html#mime-type" title="用語集を�照">MIME タイプ</a>
+    <code>application/x-type-map</code>)
+    �関連付�られ�ドキュメント��。
+    ��機能を使�������るファイル�拡張�を
+    <code>type-map</code>
+    ���定義�るよ���ンドラを�
+    設定ファイル中�置�必���る���注�������。
+    �れ�</p>
+
+<div class="example"><p><code>AddHandler type-map .var</code></p></div>
+
+    <p>をサー�設定ファイル中�書����一番良�方法��。</p>
+
+    <p>タイプマップファイル�記述�るリソース�����を������
+    利用�能� variant �れ�れ�エントリを����る必���り��。
+    ������エントリ�連続�� HTTP �ヘッダ行�構��れ��。
+    異�る variant ����エントリ�空行�区切られ����。
+    エントリ中�空行�複数��������ん。
+    習慣的���マップファイル�全体を����も��エントリ�ら始�り��
+    (����れ�必須�����������も無視�れるも���)。
+    次�例を示���。��ファイル�リソース <code>foo</code> 
+    を記述���る���<code>foo.var</code> �������り��。</p>
+
+<div class="example"><p><code>
+  URI: foo<br />
+<br />
+  URI: foo.en.html<br />
+  Content-type: text/html<br />
+  Content-language: en<br />
+<br />
+  URI: foo.fr.de.html<br />
+  Content-type: text/html;charset=iso-8859-2<br />
+  Content-language: fr, de<br />
+</code></p></div>
+    <p>��� MultiViews を使用�るよ����������も�
+    ファイル��拡張�よりタイプマップ�方�優先権を��������も
+    注�������。
+    variant ��質���������画��よ�� (JPEG, GIF, ASCII
+    アート��り��) メディアタイプ� "qs"
+    パラメータ�指定�れ��。</p>
+
+<div class="example"><p><code>
+  URI: foo<br />
+<br />
+  URI: foo.jpeg<br />
+  Content-type: image/jpeg; qs=0.8<br />
+<br />
+  URI: foo.gif<br />
+  Content-type: image/gif; qs=0.5<br />
+<br />
+  URI: foo.txt<br />
+  Content-type: text/plain; qs=0.01<br />
+</code></p></div>
+
+    <p>qs 値�範囲� 0.000 �ら 1.000 ��。qs 値�
+    0.000 � variant �決��
+    �択�れ�����注�������。'qs' 値��� variant
+    � qs 値 1.0 を 与�られ��。qs
+    パラメータ�クライアント�能力�関係無��他� variant �
+    比較����� variant
+    �相対的�「�質�を示���。
+    例���写真を表��よ�����る��� JPEG
+    ファイル�方�普通� ASCII
+    ファイルよりも高��質��り��。����リソース�元々
+    ASCII アート�表��れ��る����ASCII ファイル�
+    方� JPEG ファイルよりも高��質��り��。��よ���qs
+    � 表��れるリソース�性質�よ�� variant
+    毎�特有�値を�り��。</p>
+
+    <p>�識�れるヘッダ�一覧�
+    <a href="mod/mod_negotiation.html#typemaps">mod_negotiation</a>
+    ドキュメント��り��。</p>
+
+
+<h3><a name="multiviews" id="multiviews">Multiviews</a></h3>
+
+    <p><code>MultiViews</code> �ディレクトリ毎�オプション��
+    <code>httpd.conf</code>ファイル�
+    <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>, 
+    <code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>, 
+    <code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code>
+    セクション中や�(<code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code>
+    ��切�値� 設定�れ��る�) <code>.htaccess</code>
+    ファイル� <code class="directive"><a href="./mod/core.html#options">Options</a></code>
+    ディレクティブ�よ��設定�る�������。
+    <code>Options All</code> �
+    <code>MultiViews</code>
+    をセット������注�������。明示的�
+    ����を書�必���り��。</p>
+
+    <p><code>MultiViews</code> �効果�以下�よ���り��:
+    サー�� <code>/some/dir/foo</code>
+    ��リクエストを���り�<code>/some/dir</code> �
+    <code>MultiViews</code> �有効�����
+    <code>/some/dir/foo</code> �存在<em>���</em>場��
+    サー��ディレクトリを読ん� <code>foo.*</code>
+    �����る全��ファイルを探��
+    事実上�れら�ファイルをマップ�るタイプマップを作り��。
+    �����メディアタイプ�コンテントエンコーディング����ファイル�を
+    直接指定�������も��割り当�られ��。
+    �れ�らクライアント��求�一番��も�を����。</p>
+
+    <p>サー��ディレクトリ�索引を作������る場��
+    <code>MultiViews</code>
+    � <code class="directive"><a href="./mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>
+    ディレクティブ�指定�れ�ファイルを探��程�も
+    �用�れ��。設定ファイル�</p>
+<div class="example"><p><code>DirectoryIndex index</code></p></div>
+    <p>�書�れ����<code>index.html</code> �
+    <code>index.html3</code> �
+    両方存在���る��サー����中�ら��ら�を�当�����。
+    も���両方�存在��� <code>index.cgi</code>
+    �存在���る�� サー���れを実行���。</p>
+
+    <p>も�ディレクトリを読ん��る際��
+    文字セット�コンテントタイプ�言語�エンコーディングを
+    指定�る��� <code>mod_mime</code> 
+    ��識��る拡張�を����ファイル�見��る���果�
+    <code class="directive"><a href="./mod/mod_mime.html#multiviewsmatch">MultiViewsMatch</a></code>
+    ディレクティブ�設定��存���。��ディレクティブ�
+    �ンドラ�フィルタ�他�ファイル拡張�タイプ��れ�
+    MultiViews �ゴシエーション�使用��る�を決定���。</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="methods" id="methods">�ゴシエーション方法</a></h2>
+
+    <p>Apache �リソース� variant �一覧を�タイプマップファイル�
+    ディレクトリ内�ファイル��ら���得��後�
+    「最��� variant を決定�る���二��方法�
+    ��ら�を起動���。
+    Apache �コンテント�ゴシエーション�機能を使�����
+    ��よ������調��行�れる�詳細を知る必���り��ん。
+    �����ら���文書�残り��関心��る人�����
+    使用�れ��る方法����説明�����。</p>
+
+    <p>�ゴシエーション方法�二��り��。</p>
+
+    <ol>
+      <li>通常� <strong>Apache �アルゴリズムを用�� Server
+      driven negotiation</strong> �使用�れ��。Apache
+      �アルゴリズム�後�詳細�説明�れ����。
+      ��アルゴリズム�使用�れ�場��Apache
+      �より良��果��るよ���特定�次元�����質�値を
+      「変�る��������。Apache
+      ��質�値を変�る方法�後�詳細�説明�れ����。</li>
+
+      <li>RFC 2295
+      �定義�れ��る機構を用��ブラウザ�特�指定��場��
+      <strong>transparent content negotiation</strong>
+      �使用�れ��。���ゴシエーション方法���「最���
+      variant �決定をブラウザ�完全�制御�る�������。
+      ���ら��果�ブラウザ�使用���るアルゴリズム��存���。
+      Transparent negotiation �処���程��ブラウザ� RFC 2296
+      � 定義�れ��る 'remote variant selection algorithm'
+      を実行�るよ��頼む�������。</li>
+    </ol>
+
+<h3><a name="dimensions" id="dimensions">�ゴシエーション�次元</a></h3>
+
+    <table>
+      
+      <tr valign="top">
+        <th>次元</th>
+
+        <th>説明</th>
+      </tr>
+
+      <tr valign="top">
+        <td>メディアタイプ</td>
+
+        <td>ブラウザ� <code>Accept</code>
+	ヘッダフィールド�優先傾�を指定���。
+	アイテム�れ�れ��関連���質数値を���������。
+	variant �説明も�質数値を���������
+	("qs" パラメータを�覧下��)。</td>
+      </tr>
+
+      <tr valign="top">
+        <td>言語</td>
+
+	<td>ブラウザ� <code>Accept-Language</code>
+	ヘッダフィールド�優先傾�を指定���。
+	�素�れ�れ��質数値を���る�������。
+	variants � 0 � 1 ���れ以上�言語�
+	関連��る�������。</td>
+      </tr>
+
+      <tr valign="top">
+        <td>エンコーディング</td>
+
+	<td>ブラウザ� <code>Accept-Encoding</code>
+	ヘッダフィールド�優先傾�を指定���。
+	�素�れ�れ��質数値を���る�������。</td>
+      </tr>
+
+      <tr valign="top">
+        <td>文字セット</td>
+
+	<td>ブラウザ� <code>Accept-Charset</code>
+	ヘッダフィールド�優先傾�を指定���。
+	�素�れ�れ��質数値を���る�������。
+	variant �メディアタイプ�パラメータ���文字セットを
+	指定�る��も����。</td>
+      </tr>
+    </table>
+
+
+<h3><a name="algorithm" id="algorithm">Apache �ゴシエーションアルゴリズム</a></h3>
+
+    <p>ブラウザ�返�「最���variant を (も��れ�) �択�るよ��
+    Apache �次�アルゴリズムを使��������。
+    ��アルゴリズムを設定�より変更�る�������ん。
+    次�よ��動作���:</p>
+
+    <ol>
+      <li>��������ゴシエーション�次元�れ�れ�����切�
+      <em>Accept*</em> ヘッダフィールドを調��
+      variant �れ�れ��質を割り当���。
+      も��る次元� <em>Accept*</em> ヘッダ��� variant
+      �許容�������示�れ��れ���れを削除���。
+      variant �一�も残�����れ��ステップ 4 �行���。</li>
+
+      <li>
+	消去法�「最��� variant を����。
+	次�テスト�順番��用�れ��。
+	テスト��択�れ���� variant �削除�れ�����。
+	テスト後 variant �一���残���れ���れを最��も����
+	ステップ 3 �進���。
+	複数 variant �残���れ��次�テスト�進���。
+
+        <ol>
+	  <li>variant �メディアタイプ��質数値� <code>Accept</code>
+	  ヘッダ��質数値���を計算���最高値� variant
+	  を����。</li>
+
+	  <li>言語�質数値�最高� variant を����。</li>
+
+	  <li>(も��れ�) <code>Accept-Language</code> ヘッダ�言語順��
+	  (も��れ�)
+	  <code class="directive"><a href="./mod/mod_negotiation.html#languagepriority">LanguagePriority</a></code> 
+	  ディレクティブ�言語順�最��言語� variant を����。</li>
+
+	  <li>最高「レベル��メディアパラメータ
+	  (text/html メディアタイプ��ージョンを与�る���使�れ��)
+	  を�� variant を����。</li>
+
+	  <li><code>Accept-Charset</code> ヘッダ行�与�られ��る最高�文字セット
+	  メディアパラメータを�� variant を����。
+	  明示的�除外�れ�����り�ISO-8859-1
+	  �許容�れるよ��������。
+	  <code>text/*</code> メディアタイプ��る�れ�も
+	  特定�文字セット�明示的�関連��られ��る������
+	  variant � ISO-8859-1 ��る�仮定�れ��。</li>
+
+	  <li>ISO-8859-1 <em>����</em>文字セットメディアパラメータ�
+	  関連��られ��る variant を����。
+	  ��よ�� variant ���場���代�り�全��
+	  variant を����。</li>
+
+	  <li>最��エンコーディング� variant を����。
+	  も� user-agent �許容�るエンコーディング��れ��
+	  �� variant ��を����。
+	  �������も�エンコード�れ�も�������
+	  variant �混���存在����らエンコード�れ����
+	  variant ��を����。
+	  variant �全部エンコード�れ��る�
+	  variant �全部エンコード�れ�������場���
+	  全�� variant を����。</li>
+
+	  <li>内容�最も短� variant を����。</li>
+
+	  <li>残���る variant �最��も�を����。
+	  タイプマップファイル�最��リスト�れ��る��
+	  variant �ディレクトリ�ら最��読�込�れる時�
+	  ASCII順�ソート��ファイル��先頭���������ら���。</li>
+        </ol>
+      </li>
+
+      <li>アルゴリズムを使��一��「最���variant を��������
+      �れを応答���返���。�ゴシエーション�次元を指定�る���
+      HTTP レス�ンスヘッダ <code>Vary</code> �設定�れ��
+      (リソース�キャッシュを�る時��
+      ブラウザやキャッシュ���情報を使��������)。
+      以上�終�り。</li>
+
+      <li>������������variant �一�も�択�れ����
+      (ブラウザ�許容�るも��������) �������。
+      406 ステータス ("No Acceptable representation" を�味�る)
+      ��利用�能� variant �リスト���� HTML 
+      ドキュメント��も�返�れ��。
+      相��次元を示� HTTP <code>Vary</code> ヘッダも設定�れ��。</li>
+    </ol>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="better" id="better">�質�値を変�る</a></h2>
+
+    <p>上記� Apache �ゴシエーションアルゴリズム�厳格�解釈�
+    得られる����値�ら�Apache ��質数値を時々変���。
+    �れ����アルゴリズム�完全������る��正確���情報を�る
+    ブラウザ���よりよ��果を得る���行�れ��。
+    ��り�ピュラー�ブラウザ��も����間��� variant
+    を�択�る�果�������よ�� <code>Accept</code>
+    ヘッダ情報を�るも�も�り��。
+    ブラウザ�完全�正��情報を����れ��
+    ��数値変化��用�れ��ん。</p>
+
+<h3><a name="wildcards" id="wildcards">メディアタイプ�ワイルドカード</a></h3>
+
+    <p><code>Accept:</code> リクエストヘッダ�メディアタイプ�優先傾�を指定���。
+    �れ����"image/*" や "*/*"
+    ����「ワイルドカード�メディアタイプを�む�������。
+    ��� * �任��文字列�マッ����。
+    ���ら�次�:</p>
+
+<div class="example"><p><code>Accept: image/*, */*</code></p></div>
+
+    <p>を�むリクエスト��"image/" ����るタイプ全��許容��る�
+    ���他��ん�タイプも許容��る
+    (��場����� "image/*" �冗長��り��)
+    ��を示���。
+    扱������る明示的�タイプ�加���機械的�
+    ワイルドカードを�るブラウザも�り��。例��:</p>
+
+<div class="example"><p><code>
+  Accept: text/html, text/plain, image/gif, image/jpeg, */*
+</code></p></div>
+    <p>���る���狙���明示的�リスト���るタイプ�優先�れる�れ�も�
+    異�る表��利用�能��れ��れ�も良���������。
+    �����ら�上�基本的�アルゴリズム���
+    */* ワイルドカード�他�全��タイプ�全��等���優先�れ��ん。
+    ブラウザ� */* �も��低��質 (優先) 
+    値を付��リクエストを�る������。例��:</p>
+<div class="example"><p><code>
+  Accept: text/html, text/plain, image/gif, image/jpeg, */*; q=0.01
+</code></p></div>
+    <p>明示的�タイプ���質数値�付�られ����ん���
+    デフォルト� 1.0 (最高値) �優先��り��。
+    ワイルドカード */* �低�優先度 0.01 を与�られ��る���
+    明示的�リスト�れ��るタイプ��致�る variant ���場�����
+    他�タイプ�返�れ��。</p>
+
+    <p>も� <code>Accept:</code> ヘッダ� q 値を全��ん�<em>���れ�</em>�
+    望��挙動を�る����
+    Apache � "*/*" ��れ� 0.01 � q 値を設定���。
+    ���"type/*" �形�ワイルドカード�� 0.02 � q 値を設定���
+    (���ら�れら� "*/*" �マッ�よりも優先�れ��)。
+    も� <code>Accept:</code> ヘッダ中�メディアタイプ��れ�� q
+    値を�ん��れ���れら�特殊�値��応<em>�れ�</em>�
+    正��情報を�るブラウザ�ら�リクエスト�期待通り�
+    動作�るよ���り��。</p>
+
+
+<h3><a name="exceptions" id="exceptions">言語�ゴシエーション�例外処�</a></h3>
+
+    <p>Apache 2.0 ��新���言語�ゴシエーション����るも�を
+    見��る��失敗��時��優雅�フォール�ック��るよ��
+    �ゴシエーションアルゴリズム�幾��追加�れ���。</p>
+
+    <p>サー��ページをクライアント�リクエスト���れ�も�
+    ブラウザ������ <code>Accept-Language</code> ��致�るページ�一�も
+    見��ら����場���サー�� "No Acceptable Variant"
+    � "Multiple Choices" レス�ンスをクライアント�返���。
+    �れら�エラーメッセージを返���よ���
+    ��よ��場��� Apache � <code>Accept-Language</code> を無視���
+    クライアント�リクエスト�明示的���致���ドキュメントを
+    �供�るよ��設定����。
+    <code class="directive"><a href="./mod/mod_negotiation.html#forcelanguagepriority">ForceLanguagePriority</a></code>
+    ディレクティブ���れら�エラー�一��両方をオー�ーライド�る���
+    使用����
+    <code class="directive"><a href="./mod/mod_negotiation.html#languagepriority">LanguagePriority</a></code>
+    ディレクティブ�内容を使��サー��判断を代行�るよ������。</p>
+
+    <p>サー��他����るも��見��ら��れ��
+    言語サブセット����るも�を試���も���。
+    例��クライアント�英国英語��る <code>en-GB</code> 言語�
+    ドキュメントをリクエスト��場��サー�� HTTP/1.1
+    �格����� <code>en</code> �マーク�れ��るドキュメントを
+    マッ��るも���る���通常�許�れ����ん。
+    (英国英語��解��る��一般的�英語��解�������読�手�
+    考�られ�����Accept-Language ヘッダ� <code>en-GB</code> 
+    を�ん� <code>en</code> を��������確実�設定�間����る�
+    ������注�������。
+    ����幸�����多��クライアント��デフォルト�
+    ��よ��設定�������。)
+    �����ら�他�言語��マッ����"No Acceptable Variants"
+    エラーを返��り�
+    <code class="directive"><a href="./mod/mod_negotiation.html#languagepriority">LanguagePriority</a></code>
+    �フォール�ック�よ�����る����
+    サブセット指定を無視���<code>en-GB</code> を <code>en</code>
+    �マッ����。
+    Apache �クライアント�許容言語リスト�暗黙�
+    �常�低��質値�親言語を加�る����り��。
+    ����クライアント� "en-GB; q=0.9, fr; q=0.8" �リクエスト���
+    サー�� "en" � "fr" �設計�れ�ドキュメントを����る場���
+    "fr" ドキュメント�返�れる���注�������。
+    ��よ��処���HTTP 1.1 �格��整�性を維����
+    �切�設定�れ�クライアント�も��ん�動作�る���
+    必���。</p>
+
+    <p>より高度�テクニック (Cookie や特殊� URL パス等)
+    ����もユーザ�言語�択をサ�ート�る���
+    Apache 2.0.47 �ら��<code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code>
+    �<a href="env.html">環境変数</a> <code>prefer-language</code>
+    を�識�るよ���り���。
+    ��変数�存在����切�言語タグ�代入�れ��る���れ��
+    <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code> ��致�る variant
+    を�択�よ�����。�致�るも��無�れ��
+    通常��ゴシエーション手順��用�れ��。</p>
+
+    <div class="example"><h3>Example</h3><p><code>
+      SetEnvIf Cookie "language=(.+)" prefer-language=$1
+    </code></p></div>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="extensions" id="extensions">Transparent Content Negotiation
+�拡張</a></h2> 
+
+<p>Apache � transparent content negotiation プロトコル
+(RFC 2295) を次�よ��拡張�����。
+特定�コンテントエンコーディング���利用�能��る variant 
+��を付�る����新�� <code>{encoding ..}</code> 
+�素を variant リスト中�使�����。
+リスト中�エンコード�れ� variant を�識��
+<code>Accept-Encoding</code> リクエストヘッダ�従��許容�れる
+エンコードをも�� variant ���れ�も候補 variant
+���使用�るよ���
+RVSA/1.0 アルゴリズム (RFC 2296) �実装�拡張�れ���。
+RVSA/1.0 �実装���最�� variant �見��る���
+計算���質数値��数点以下 5 ���丸���ん。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="naming" id="naming">リンク����変��関�る注�点</a></h2>
+
+    <p>言語�ゴシエーションを使���る場���
+    ファイル�一�以上�拡張�を����
+    拡張��順番�通常�考慮�れ��
+    (詳細� <a href="mod/mod_mime.html#multipleext">mod_mime</a> 
+    を�照) ���
+    幾���異�る���変�を��る����り��。</p>
+
+    <p>典型的�ファイル���MIME タイプ拡張� (<em>例��</em>
+    <code>html</code>) を������エンコーディング拡張�
+    (<em>例��</em> <code>gz</code>) を����る�も�れ����
+    ��ファイル�異�る言語 variant を用����れ��
+    も��ん言語拡張� (<em>例��</em> <code>en</code>)
+    を����る��ょ�。</p>
+
+    <p>例:</p>
+
+    <ul>
+      <li>foo.en.html</li>
+
+      <li>foo.html.en</li>
+
+      <li>foo.en.html.gz</li>
+    </ul>
+
+    <p>ファイル����れ�対��使�るリンク�使���リンク�例��:</p>
+
+    <table class="bordered">
+      
+      <tr>
+        <th>ファイル�</th>
+
+        <th>使�るリンク</th>
+
+        <th>使���リンク</th>
+      </tr>
+
+      <tr>
+        <td><em>foo.html.en</em></td>
+
+        <td>foo<br />
+         foo.html</td>
+
+        <td>-</td>
+      </tr>
+
+      <tr>
+        <td><em>foo.en.html</em></td>
+
+        <td>foo</td>
+
+        <td>foo.html</td>
+      </tr>
+
+      <tr>
+        <td><em>foo.html.en.gz</em></td>
+
+        <td>foo<br />
+         foo.html</td>
+
+        <td>foo.gz<br />
+         foo.html.gz</td>
+      </tr>
+
+      <tr>
+        <td><em>foo.en.html.gz</em></td>
+
+        <td>foo</td>
+
+        <td>foo.html<br />
+         foo.html.gz<br />
+         foo.gz</td>
+      </tr>
+
+      <tr>
+        <td><em>foo.gz.html.en</em></td>
+
+        <td>foo<br />
+         foo.gz<br />
+         foo.gz.html</td>
+
+        <td>foo.html</td>
+      </tr>
+
+      <tr>
+        <td><em>foo.html.gz.en</em></td>
+
+        <td>foo<br />
+         foo.html<br />
+         foo.html.gz</td>
+
+        <td>foo.gz</td>
+      </tr>
+    </table>
+
+    <p>上�表を見��拡張����リンク (<em>例��</em> <code>foo</code>) 
+    ����も使�る���気�付���ょ�。
+    ��利点��ドキュメント���応答�るファイル�
+    実際�ファイルタイプを隠蔽���リンク��照を変更�る����
+    後�らファイルを変更��る�
+    <em>例��</em> <code>html</code> �ら <code>shtml</code>
+    ���る�� <code>cgi</code> �変更��る点��。</p>
+
+    <p>リンク� MIME タイプを使�続��� (<em>例��</em>
+    <code>foo.html</code>)時��言語拡張��
+    (エンコーディング拡張�も�れ��れも���)
+    MIME タイプ拡張�������れ��り��ん
+    (<em>例��</em> <code>foo.html.en</code>)。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="caching" id="caching">キャッシュ�関�る注�事項</a></h2>
+
+    <p>キャッシュ�一��表�を�存���る����
+    リクエスト URL �関連��られ����。
+    次��� URL �リクエスト�れ�時��キャッシュ�
+    �存�れ��る表�を使用����。����
+    リソース�サー���ゴシエーション�能��れ��
+    最��リクエスト�キャッシュ�れ�続�キャッシュヒット��
+    間���応答を返������������り����ん。
+    �れを防�����Apache �コンテント�ゴシエーション�
+    後�返�れ�応答全���HTTP/1.0 クライアント��
+    キャッシュ��能��を����。
+    ����ゴシエーション�れ�応答�キャッシュを�能��る
+    HTTP/1.1 プロトコル�機能も Apache �サ�ート���。</p>
+
+    <p>HTTP/1.0 準拠�クライアント�ら�リクエスト�対����
+    (ブラウザ�����キャッシュ�����)
+    �ゴシエーションを���応答�キャッシュを許�����
+    <code class="directive"><a href="./mod/mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></code>
+    ディレクティブを使用����。
+    ��ディレクティブ��サー�設定ファイルや�ー�ャルホスト�書�������
+    引数を�り��ん。
+    HTTP/1.1 クライアント�ら�リクエスト��効力を����ん。</p>
+
+    <p>HTTP/1.1 クライアント�対����レス�ンス��ゴシエーション次元
+    を示���� <code>Vary</code> HTTP レス�ンスヘッダを�り��。
+    キャッシュ���れを使��後続�リクエスト�対��ローカルコピー�応答��る�
+    ���を決定����。
+    �ゴシエーション次元��関係���ローカルコピー�使用を優先�るよ���る���
+    <code>force-no-vary</code> <a href="env.html#special">環境変数</a>を
+    設定���。</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="more" id="more">追加情報</a></h2>
+
+    <p>コンテント�ゴシエーション�関�る追加情報��
+    Alan J. Flavell �ん�<a href="http://ppewww.ph.gla.ac.uk/~flavell/www/lang-neg.html">Language
+    Negotiation Notes</a> を�覧下��。����
+    Apache 2.0 ��変更点を�む����更新�れ�����も�れ��
+    ������注�������。</p>
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./en/content-negotiation.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./fr/content-negotiation.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/content-negotiation.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/content-negotiation.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/content-negotiation.html.ko.euc-kr b/docs/manual/content-negotiation.html.ko.euc-kr
index aaab68c8..b4ccba24 100644
--- a/docs/manual/content-negotiation.html.ko.euc-kr
+++ b/docs/manual/content-negotiation.html.ko.euc-kr
@@ -607,6 +607,6 @@ content-encodingÀ» °¡Áø º¯Çü¸¸À» ÁöĪÇÑ´Ù. RVSA/1.0 ¾Ë°í¸®ÁòÀº
 <a href="./ja/content-negotiation.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/content-negotiation.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map
index 6728f527..577c6d6d 100644
--- a/docs/manual/convenience.map
+++ b/docs/manual/convenience.map
@@ -259,10 +259,12 @@ proxybadheader	mod/mod_proxy.html#proxybadheader
 proxyblock	mod/mod_proxy.html#proxyblock
 proxydomain	mod/mod_proxy.html#proxydomain
 proxyerroroverride	mod/mod_proxy.html#proxyerroroverride
+proxyftpdircharset	mod/mod_proxy.html#proxyftpdircharset
 proxyiobuffersize	mod/mod_proxy.html#proxyiobuffersize
 proxymatch	mod/mod_proxy.html#proxymatch
 proxymaxforwards	mod/mod_proxy.html#proxymaxforwards
 proxypass	mod/mod_proxy.html#proxypass
+proxypassinterpolateenv	mod/mod_proxy.html#proxypassinterpolateenv
 proxypassmatch	mod/mod_proxy.html#proxypassmatch
 proxypassreverse	mod/mod_proxy.html#proxypassreverse
 proxypassreversecookiedomain	mod/mod_proxy.html#proxypassreversecookiedomain
diff --git a/docs/manual/custom-error.html b/docs/manual/custom-error.html
index 3ee08771..dd9dddbe 100644
--- a/docs/manual/custom-error.html
+++ b/docs/manual/custom-error.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: custom-error.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
@@ -6,9 +8,9 @@ URI: custom-error.html.es
 Content-Language: es
 Content-type: text/html; charset=ISO-8859-1
 
-URI: custom-error.html.ja.euc-jp
+URI: custom-error.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: custom-error.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/custom-error.html.en b/docs/manual/custom-error.html.en
index adb1397e..a9c0924a 100644
--- a/docs/manual/custom-error.html.en
+++ b/docs/manual/custom-error.html.en
@@ -197,6 +197,6 @@
 <a href="./ja/custom-error.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/custom-error.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/custom-error.html.es b/docs/manual/custom-error.html.es
index 3f5a2efb..18401cb5 100644
--- a/docs/manual/custom-error.html.es
+++ b/docs/manual/custom-error.html.es
@@ -218,6 +218,6 @@
 <a href="./ja/custom-error.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/custom-error.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Módulos</a> | <a href="./mod/directives.html">Directivas</a> | <a href="./faq/">Preguntas Frecuentes</a> | <a href="./glossary.html">Glosario</a> | <a href="./sitemap.html">Mapa de este sitio web</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/custom-error.html.ja.euc-jp b/docs/manual/custom-error.html.ja.euc-jp
deleted file mode 100644
index a9c41ba8..00000000
--- a/docs/manual/custom-error.html.ja.euc-jp
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>¥«¥¹¥¿¥à¥¨¥é¡¼¥ì¥¹¥Ý¥ó¥¹ - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>¥«¥¹¥¿¥à¥¨¥é¡¼¥ì¥¹¥Ý¥ó¥¹</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./en/custom-error.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/custom-error.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./ja/custom-error.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/custom-error.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-    <p>¥¦¥§¥Ö¥Þ¥¹¥¿¡¼¤¬²¿¤é¤«¤Î¥¨¥é¡¼¤äÌäÂê¤ËÂФ¹¤ë
-    Apache ¤ÎÈ¿±þ¤òÀßÄê¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ëÄɲõ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£</p>
-
-    <p>¥µ¡¼¥Ð¤¬¥¨¥é¡¼¤äÌäÂê¤òȯ¸«¤·¤¿¾ì¹ç¤ÎÈ¿±þ¤ò¡¢
-    ¥«¥¹¥¿¥Þ¥¤¥º¤·¤ÆÄêµÁ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤¬¼ºÇÔ¤·¤Æ "500 Server Error"
-    ¤òȯÀ¸¤µ¤»¤¿¤È¤·¤Þ¤¹¡£¤³¤Î¾ì¹ç¤ÎÈ¿±þ¤ò¡¢¤è¤ê¹¥¤Þ¤·¤¤¥Æ¥­¥¹¥È¤ä¡¢Ê̤Î
-    URL (ÆâÉôµÚ¤Ó³°Éô) ¤Ø¤Î¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó¤ËÃÖ¤­´¹¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    </p>
-  </div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#behavior">Æ°ºî</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#configuration">ÀßÄê</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#custom">¥«¥¹¥¿¥à¥¨¥é¡¼¥ì¥¹¥Ý¥ó¥¹¤È¥ê¥À¥¤¥ì¥¯¥È</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="behavior" id="behavior">Æ°ºî</a></h2>
-    
-
-    <h3>¸Å¤¤Æ°ºî</h3>
-      
-
-      <p>NCSA httpd 1.3 ¤Ï¡¢¸Å¤¯¤ÆÂà¶þ¤Ê¥¨¥é¡¼/ÌäÂê¥á¥Ã¥»¡¼¥¸¤ò
-      ÊÖ¤·¤Æ¤¤¤Þ¤·¤¿¡£¤½¤ì¤Ï¤·¤Ð¤·¤Ð¥æ¡¼¥¶¤Ë¤Ï̵°ÕÌ£¤Ç¤¢¤ê¡¢
-      ¤Þ¤¿¤½¤ì¤òȯÀ¸¤µ¤»¤¿¸¶°ø¤òµ­Ï¿¤¹¤ëÊýË¡¤âÄ󶡤·¤Æ¤¤¤Þ¤»¤ó¤Ç¤·¤¿¡£</p>
-    
-
-    <h3>¿·¤·¤¤Æ°ºî</h3>
-      
-
-        <ol>
-          <li>NCSA ¤Î¥Ï¡¼¥É¥³¡¼¥É¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ÎÂå¤ï¤ê¤Ë
-          ¾¤Î¥Æ¥­¥¹¥È¤òɽ¼¨</li>
-
-          <li>¥í¡¼¥«¥ë¤Î URL ¤Ë¥ê¥À¥¤¥ì¥¯¥È</li>
-
-          <li>³°Éô¤Î URL ¤Ë¥ê¥À¥¤¥ì¥¯¥È</li>
-        </ol>
-
-        <p>¤¹¤ë¤è¤¦¤Ë¥µ¡¼¥Ð¤òÀßÄê¤Ç¤­¤Þ¤¹¡£</p>
-
-        <p>Ê̤ΠURL ¤Ë¥ê¥À¥¤¥ì¥¯¥È¤¹¤ë¤³¤È¤ÏÌò¤ËΩ¤Á¤Þ¤¹¤¬¡¢
-        ¤½¤ì¤ÏÀâÌÀ¤ò¤·¤¿¤ê¡¢¤è¤êÌÀ³Î¤Ë¸í¤ê/ÌäÂê¤òµ­Ï¿¤·¤¿¤ê¤¹¤ë¤¿¤á¤Ë
-        ²¿¤«¾ðÊó¤òÅÁ¤¨¤é¤ì¤ë¤È¤­¤Ë¸Â¤ê¤Þ¤¹¡£</p>
-
-        <p>¤³¤ì¤ò¼Â¸½¤¹¤ë¤¿¤á¤Ë¡¢ Apache ¤Ï¿·¤·¤¯ CGI ¤Î¤è¤¦¤Ê´Ä¶­ÊÑ¿ô¤ò
-        ÄêµÁ¤·¤Þ¤¹:</p>
-
-        <div class="example"><p><code>
-          REDIRECT_HTTP_ACCEPT=*/*, image/gif,
-          image/x-xbitmap, image/jpeg<br />
-           REDIRECT_HTTP_USER_AGENT=Mozilla/1.1b2 (X11; I; HP-UX
-          A.09.05 9000/712)<br />
-           REDIRECT_PATH=.:/bin:/usr/local/bin:/etc<br />
-           REDIRECT_QUERY_STRING=<br />
-           REDIRECT_REMOTE_ADDR=121.345.78.123<br />
-           REDIRECT_REMOTE_HOST=ooh.ahhh.com<br />
-           REDIRECT_SERVER_NAME=crash.bang.edu<br />
-           REDIRECT_SERVER_PORT=80<br />
-           REDIRECT_SERVER_SOFTWARE=Apache/0.8.15<br />
-           REDIRECT_URL=/cgi-bin/buggy.pl
-        </code></p></div>
-
-        <p>Ƭ¤ËÉÕ¤¯ <code>REDIRECT_</code> ¤ËÃíÌܤ·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-        <p>¾¯¤Ê¤¯¤È¤â <code>REDIRECT_URL</code> ¤È
-        <code>REDIRECT_QUERY_STRING</code> ¤Ï¿·¤·¤¤ URL (CGI ¥¹¥¯¥ê¥×¥È¤«
-        CGI ¥¤¥ó¥¯¥ë¡¼¥É¤Ç¤¢¤ë¤È²¾Äꤵ¤ì¤Þ¤¹) ¤ËÅϤµ¤ì¤Þ¤¹¡£
-        ¾¤ÎÊÑ¿ô¤Ï¡¢¥¨¥é¡¼¤äÌäÂ꤬µ¯¤­¤ëÁ°¤Ë¸ºß¤·¤¿¾ì¹ç¤Ë¤À¤±Â¸ºß¤·¤Þ¤¹¡£
-        ¤â¤·¤¢¤Ê¤¿¤ÎÀßÄꤷ¤¿ <code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code> ¤¬ <em>³°Éô</em>¥ê¥À¥¤¥ì¥¯¥È
-        (<em>¤¹¤Ê¤ï¤Á</em>¡¢<code>http:</code> 
-        ¤Î¤è¤¦¤ÊÂηÏ̾¤«¤é»Ï¤Þ¤ë¤¹¤Ù¤Æ¤Î¤â¤Î¡£¤¿¤È¤¨Æ±¤¸¥Û¥¹¥È¤ò»Ø¤·¤Æ¤¤¤Æ¤â)
-        ¤Ê¤é¤Ð¡¢¤³¤ì¤é¤Ï<strong>¤Þ¤Ã¤¿¤¯</strong>ÀßÄꤵ¤ì¤Þ¤»¤ó¡£</p>
-    
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="configuration" id="configuration">ÀßÄê</a></h2>
-    
-
-    <p><code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code> ¤¬Å¬ÀÚ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢
-    .htaccess ¥Õ¥¡¥¤¥ë¤Ç <code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code>
-    ¤ò»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-        <p>¤³¤³¤Ë¡¢¤¤¤¯¤Ä¤«¤ÎÎã¤òµó¤²¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      ErrorDocument 500 /cgi-bin/crash-recover <br />
-      ErrorDocument 500 "Sorry, our script crashed. Oh dear" <br />
-      ErrorDocument 500 http://xxx/ <br />
-      ErrorDocument 404 /Lame_excuses/not_found.html <br />
-      ErrorDocument 401 /Subscription/how_to_subscribe.html
-    </code></p></div>
-
-    <p>¹½Ê¸</p>
-
-    <div class="example"><p><code>
-      ErrorDocument &lt;3-digit-code&gt; &lt;action&gt;
-    </code></p></div>
-
-        <p>action (Æ°ºî) ¤Ï¡¢</p>
-
-        <ol>
-          <li>ɽ¼¨¤µ¤ì¤ë¤Ù¤­¥Æ¥­¥¹¥È¡£¥Æ¥­¥¹¥È¤Ë¤Ï°úÍÑÉä (") ¤ò¤Ä¤±¤Þ¤¹¡£
-          °úÍÑÉä¤Î¸å¤Ë³¤¯¤â¤Î¤¬²¿¤Ç¤âɽ¼¨¤µ¤ì¤Þ¤¹¡£
-          <em>Ãí°Õ : (") ¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó</em></li>
-
-          <li>¥ê¥À¥¤¥ì¥¯¥ÈÀè¤Î³°Éô URL </li>
-
-          <li>¥ê¥À¥¤¥ì¥¯¥ÈÀè¤Î¥í¡¼¥«¥ë URL </li>
-        </ol>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="custom" id="custom">¥«¥¹¥¿¥à¥¨¥é¡¼¥ì¥¹¥Ý¥ó¥¹¤È¥ê¥À¥¤¥ì¥¯¥È</a></h2>
-    
-
-      <p>¥¹¥¯¥ê¥×¥È/SSI ¤ËÄɲäδĶ­ÊÑ¿ô¤¬ÍøÍѲÄǽ¤Ë¤Ê¤ë¤è¤¦¤Ë¡¢
-      ¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤¿ URL ¤ËÂФ¹¤ë Apache ¤ÎÆ°ºî¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿¡£</p>
-
-    <h3>¸Å¤¤Æ°ºî</h3>
-      
-
-      <p>¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤¿¥¹¥¯¥ê¥×¥È¤Ïɸ½à¤Î CGI
-      ´Ä¶­ÊÑ¿ô¤òÍøÍѲÄǽ¤Ç¤·¤¿¡£¤·¤«¤·¡¢¤É¤³¤«¤é¥ê¥À¥¤¥ì¥¯¥È
-      ¤µ¤ì¤¿¤«¤Î¾ðÊó¤ÏÄ󶡤µ¤ì¤Æ¤¤¤Þ¤»¤ó¤Ç¤·¤¿¡£</p>
-    
-
-    <h3>¿·¤·¤¤Æ°ºî</h3>
-      
-
-      <p>¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤¿Àè¤Î¥¹¥¯¥ê¥×¥È¤¬»ÈÍѲÄǽ¤Ê¤è¤¦¤Ë¡¢
-      ¿·¤·¤¤¤¿¤¯¤µ¤ó¤Î´Ä¶­ÊÑ¿ô¤¬½é´ü²½¤µ¤ì¤Þ¤¹¡£¿·¤·¤¤ÊÑ¿ô¤Ï¡¢¤½¤ì¤¾¤ì
-      <code>REDIRECT_</code> ¤Ç»Ï¤Þ¤ê¤Þ¤¹¡£
-      <code>REDIRECT_</code> ¤Ç»Ï¤Þ¤ë´Ä¶­ÊÑ¿ô¤Ï¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤ëÁ°¤Ë¸ºß¤·¤Æ¤¤¤¿
-      CGI ´Ä¶­ÊÑ¿ô¤ÎƬ¤Ë <code>REDIRECT_</code> ¤òÉÕ¤±¤ÆºîÀ®¤µ¤ì¤Þ¤¹¡£
-      <em>¤¹¤Ê¤ï¤Á</em>¡¢<code>HTTP_USER_AGENT</code> ¤Ï 
-      <code>REDIRECT_HTTP_USER_AGENT</code> ¤Ë¤Ê¤ê¤Þ¤¹¡£
-      ¤³¤ì¤é¤Î¿·¤·¤¤ÊÑ¿ô¤Ë²Ã¤¨¤Æ¡¢Apache ¤Ï¡¢
-      ¥¹¥¯¥ê¥×¥È¤¬¥ê¥À¥¤¥ì¥¯¥È¸µ¤Î¥È¥ì¡¼¥¹¤ò½õ¤±¤ë¤¿¤á¤Ë
-      <code>REDIRECT_URL</code> ¤È <code>REDIRECT_STATUS</code>
-      ¤òÄêµÁ¤·¤Þ¤¹¡£¥¢¥¯¥»¥¹¥í¥°¤Ë¤Ï¸µ¤Î URL ¤È¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤¿ URL
-      ¤ÎξÊý¤¬µ­Ï¿¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>ErrorDocument ¤¬ CGI ¥¹¥¯¥ê¥×¥È¤Ø¤Î¥í¡¼¥«¥ë¥ê¥À¥¤¥ì¥¯¥È¤ò
-    »ØÄꤷ¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤½¤ì¤òµ¯Æ°¤¹¤ë¤³¤È¤Ë¤Ê¤Ã¤¿¥¨¥é¡¼¤Î¾õÂÖ¤ò
-    ¥¯¥é¥¤¥¢¥ó¥È¤Þ¤Ç³Î¼Â¤ËÅÁ¤¨¤ë¤¿¤á¤Ë <code>"Status:" </code>
-    ¥Ø¥Ã¥À¤ò´Þ¤à¤Ù¤­¤Ç¤¹¡£Î㤨¤Ð¡¢ErrorDocument ÍѤΠPerl
-    ¥¹¥¯¥ê¥×¥È¤Ï°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤ò´Þ¤à¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-    </p>
-
-      <div class="example"><p><code>
-        ... <br />
-        print  "Content-type: text/html\n"; <br />
-        printf "Status: %s Condition Intercepted\n", $ENV{"REDIRECT_STATUS"}; <br />
-        ...
-      </code></p></div>
-
-    <p>¥¹¥¯¥ê¥×¥È¤¬ <code>404 Not Found</code> ¤Î¤è¤¦¤Ê
-    ÆÃÄê¤Î¥¨¥é¡¼¥³¥ó¥Ç¥£¥·¥ç¥ó¤ò°·¤¦¤¿¤á¤À¤±¤Ë»È¤ï¤ì¤ë¾ì¹ç¤Ï¡¢
-    Âå¤ï¤ê¤ËÆÃÄê¤Î¥³¡¼¥É¤È¥¨¥é¡¼¥Æ¥­¥¹¥È¤ò»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-    
-  </div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./en/custom-error.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/custom-error.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./ja/custom-error.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/custom-error.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/custom-error.html.ja.utf8 b/docs/manual/custom-error.html.ja.utf8
new file mode 100644
index 00000000..e8e5f92d
--- /dev/null
+++ b/docs/manual/custom-error.html.ja.utf8
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>カスタムエラーレス�ンス - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>カスタムエラーレス�ンス</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./en/custom-error.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/custom-error.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./ja/custom-error.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/custom-error.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+
+    <p>ウェブマスター�何ら��エラーや�題�対�る
+    Apache ��応を設定��るよ���る追加機能を�供���。</p>
+
+    <p>サー��エラーや�題を発見��場���応を�
+    カスタマイズ��定義�る�������。</p>
+
+    <p>スクリプト�実行�失敗�� "500 Server Error"
+    を発生�������。��場���応を�より好���テキストや�別�
+    URL (内部��外部) ��リダイレクション�置���る�������。
+    </p>
+  </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#behavior">動作</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#configuration">設定</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#custom">カスタムエラーレス�ンス�リダイレクト</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="behavior" id="behavior">動作</a></h2>
+    
+
+    <h3>��動作</h3>
+      
+
+      <p>NCSA httpd 1.3 �����退屈�エラー/�題メッセージを
+      返������。�れ�����ユーザ��無�味��り�
+      ���れを発生���原因を記録�る方法も�供�����ん���。</p>
+    
+
+    <h3>新��動作</h3>
+      
+
+        <ol>
+          <li>NCSA ��ードコード�れ�メッセージ�代�り�
+          他�テキストを表示</li>
+
+          <li>ローカル� URL �リダイレクト</li>
+
+          <li>外部� URL �リダイレクト</li>
+        </ol>
+
+        <p>�るよ��サー�を設定����。</p>
+
+        <p>別� URL �リダイレクト�る���役�立�����
+        �れ�説明を��り�より明確�誤り/�題を記録��り�る���
+        何�情報を��られる����り��。</p>
+
+        <p>�れを実��る���� Apache �新�� CGI �よ��環境変数を
+        定義���:</p>
+
+        <div class="example"><p><code>
+          REDIRECT_HTTP_ACCEPT=*/*, image/gif,
+          image/x-xbitmap, image/jpeg<br />
+           REDIRECT_HTTP_USER_AGENT=Mozilla/1.1b2 (X11; I; HP-UX
+          A.09.05 9000/712)<br />
+           REDIRECT_PATH=.:/bin:/usr/local/bin:/etc<br />
+           REDIRECT_QUERY_STRING=<br />
+           REDIRECT_REMOTE_ADDR=121.345.78.123<br />
+           REDIRECT_REMOTE_HOST=ooh.ahhh.com<br />
+           REDIRECT_SERVER_NAME=crash.bang.edu<br />
+           REDIRECT_SERVER_PORT=80<br />
+           REDIRECT_SERVER_SOFTWARE=Apache/0.8.15<br />
+           REDIRECT_URL=/cgi-bin/buggy.pl
+        </code></p></div>
+
+        <p>頭�付� <code>REDIRECT_</code> �注目������。</p>
+
+        <p>少���も <code>REDIRECT_URL</code> �
+        <code>REDIRECT_QUERY_STRING</code> �新�� URL (CGI スクリプト�
+        CGI インクルード��る�仮定�れ��) �渡�れ��。
+        他�変数��エラーや�題�起�る��存在��場����存在���。
+        も�����設定�� <code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code> � <em>外部</em>リダイレクト
+        (<em>����</em>�<code>http:</code> 
+        �よ��体系��ら始�る����も�。�����ホストを指����も)
+        �ら���れら�<strong>����</strong>設定�れ��ん。</p>
+    
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="configuration" id="configuration">設定</a></h2>
+    
+
+    <p><code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code> ��切�設定�れ��れ��
+    .htaccess ファイル� <code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code>
+    を使用�る�������。</p>
+
+        <p>���������例を挙���。</p>
+
+    <div class="example"><p><code>
+      ErrorDocument 500 /cgi-bin/crash-recover <br />
+      ErrorDocument 500 "Sorry, our script crashed. Oh dear" <br />
+      ErrorDocument 500 http://xxx/ <br />
+      ErrorDocument 404 /Lame_excuses/not_found.html <br />
+      ErrorDocument 401 /Subscription/how_to_subscribe.html
+    </code></p></div>
+
+    <p>構文</p>
+
+    <div class="example"><p><code>
+      ErrorDocument &lt;3-digit-code&gt; &lt;action&gt;
+    </code></p></div>
+
+        <p>action (動作) ��</p>
+
+        <ol>
+          <li>表示�れる��テキスト。テキスト��引用符 (") を����。
+          引用符�後�続�も��何�も表示�れ��。
+          <em>注� : (") �表示�れ��ん</em></li>
+
+          <li>リダイレクト先�外部 URL </li>
+
+          <li>リダイレクト先�ローカル URL </li>
+        </ol>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="custom" id="custom">カスタムエラーレス�ンス�リダイレクト</a></h2>
+    
+
+      <p>スクリプト/SSI �追加�環境変数�利用�能��るよ���
+      リダイレクト�れ� URL �対�る Apache �動作�変更�れ���。</p>
+
+    <h3>��動作</h3>
+      
+
+      <p>リダイレクト�れ�スクリプト�標準� CGI
+      環境変数を利用�能���。�������らリダイレクト
+      �れ���情報��供�れ����ん���。</p>
+    
+
+    <h3>新��動作</h3>
+      
+
+      <p>リダイレクト�れ�先�スクリプト�使用�能�よ���
+      新�����ん�環境変数��期化�れ��。新��変数���れ�れ
+      <code>REDIRECT_</code> �始�り��。
+      <code>REDIRECT_</code> �始�る環境変数�リダイレクト�れる��存在����
+      CGI 環境変数�頭� <code>REDIRECT_</code> を付��作��れ��。
+      <em>����</em>�<code>HTTP_USER_AGENT</code> � 
+      <code>REDIRECT_HTTP_USER_AGENT</code> ��り��。
+      �れら�新��変数�加���Apache ��
+      スクリプト�リダイレクト元�トレースを助�る���
+      <code>REDIRECT_URL</code> � <code>REDIRECT_STATUS</code>
+      を定義���。アクセスログ��元� URL �リダイレクト�れ� URL
+      �両方�記録�れ��。</p>
+
+    <p>ErrorDocument � CGI スクリプト��ローカルリダイレクトを
+    指定���る場����れを起動�る������エラー�状態を
+    クライアント��確実���る��� <code>"Status:" </code>
+    ヘッダを�む����。例���ErrorDocument 用� Perl
+    スクリプト�以下�よ��も�を�む�も�れ��ん。
+    </p>
+
+      <div class="example"><p><code>
+        ... <br />
+        print  "Content-type: text/html\n"; <br />
+        printf "Status: %s Condition Intercepted\n", $ENV{"REDIRECT_STATUS"}; <br />
+        ...
+      </code></p></div>
+
+    <p>スクリプト� <code>404 Not Found</code> �よ��
+    特定�エラーコンディションを扱������使�れる場���
+    代�り�特定�コード�エラーテキストを使用�る�������。</p>
+    
+  </div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./en/custom-error.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/custom-error.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./ja/custom-error.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/custom-error.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/custom-error.html.ko.euc-kr b/docs/manual/custom-error.html.ko.euc-kr
index 4ceb6144..241e446b 100644
--- a/docs/manual/custom-error.html.ko.euc-kr
+++ b/docs/manual/custom-error.html.ko.euc-kr
@@ -195,6 +195,6 @@
 <a href="./ja/custom-error.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/custom-error.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/developer/API.html b/docs/manual/developer/API.html
index a8a3c492..b8ea3a1c 100644
--- a/docs/manual/developer/API.html
+++ b/docs/manual/developer/API.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: API.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/developer/API.html.en b/docs/manual/developer/API.html.en
index 180d436f..c0b13149 100644
--- a/docs/manual/developer/API.html.en
+++ b/docs/manual/developer/API.html.en
@@ -1217,6 +1217,6 @@ void *request_config;   /* Notes on *this* request */</pre><p><code>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/developer/API.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/developer/debugging.html b/docs/manual/developer/debugging.html
index f7977f5e..6d94fa27 100644
--- a/docs/manual/developer/debugging.html
+++ b/docs/manual/developer/debugging.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: debugging.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/developer/debugging.html.en b/docs/manual/developer/debugging.html.en
index 129d82a7..ea85b18b 100644
--- a/docs/manual/developer/debugging.html.en
+++ b/docs/manual/developer/debugging.html.en
@@ -192,6 +192,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/developer/debugging.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/developer/documenting.html b/docs/manual/developer/documenting.html
index 0731e2d3..db57cef3 100644
--- a/docs/manual/developer/documenting.html
+++ b/docs/manual/developer/documenting.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: documenting.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/developer/documenting.html.en b/docs/manual/developer/documenting.html.en
index a06fd818..08a64150 100644
--- a/docs/manual/developer/documenting.html.en
+++ b/docs/manual/developer/documenting.html.en
@@ -79,6 +79,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/developer/documenting.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/developer/filters.html b/docs/manual/developer/filters.html
index c65dc946..6caade35 100644
--- a/docs/manual/developer/filters.html
+++ b/docs/manual/developer/filters.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: filters.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/developer/filters.html.en b/docs/manual/developer/filters.html.en
index f25646d1..37dce1a1 100644
--- a/docs/manual/developer/filters.html.en
+++ b/docs/manual/developer/filters.html.en
@@ -205,6 +205,6 @@ Default_handler --&gt; sub_request_core
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/developer/filters.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/developer/hooks.html b/docs/manual/developer/hooks.html
index 49fe68e8..a4077c72 100644
--- a/docs/manual/developer/hooks.html
+++ b/docs/manual/developer/hooks.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: hooks.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/developer/hooks.html.en b/docs/manual/developer/hooks.html.en
index b04d8bae..8db070cc 100644
--- a/docs/manual/developer/hooks.html.en
+++ b/docs/manual/developer/hooks.html.en
@@ -234,6 +234,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/developer/hooks.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/developer/index.html b/docs/manual/developer/index.html
index 5f97bff8..e4d079c3 100644
--- a/docs/manual/developer/index.html
+++ b/docs/manual/developer/index.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: index.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/developer/index.html.en b/docs/manual/developer/index.html.en
index ac2ceb97..95feb0de 100644
--- a/docs/manual/developer/index.html.en
+++ b/docs/manual/developer/index.html.en
@@ -77,6 +77,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/developer/" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/developer/modules.html b/docs/manual/developer/modules.html
index cb7b1dbf..33cfd0f4 100644
--- a/docs/manual/developer/modules.html
+++ b/docs/manual/developer/modules.html
@@ -1,7 +1,9 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: modules.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: modules.html.ja.euc-jp
+URI: modules.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/developer/modules.html.en b/docs/manual/developer/modules.html.en
index ca4fbf00..609de345 100644
--- a/docs/manual/developer/modules.html.en
+++ b/docs/manual/developer/modules.html.en
@@ -268,6 +268,6 @@ module MODULE_VAR_EXPORT <var>module_name</var>_module =
 <p><span>Available Languages: </span><a href="../en/developer/modules.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/developer/modules.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/developer/modules.html.ja.euc-jp b/docs/manual/developer/modules.html.ja.euc-jp
deleted file mode 100644
index 3a4ddd5b..00000000
--- a/docs/manual/developer/modules.html.ja.euc-jp
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>¥â¥¸¥å¡¼¥ë¤Î Apache 1.3 ¤«¤é Apache 2.0 ¤Ø¤Î°Ü¿¢ - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">Developer Documentation</a></div><div id="page-content"><div id="preamble"><h1>¥â¥¸¥å¡¼¥ë¤Î Apache 1.3 ¤«¤é Apache 2.0 ¤Ø¤Î°Ü¿¢</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/developer/modules.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/developer/modules.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div>
-
-    <p>¤³¤Îʸ½ñ¤Ï <code>mod_mmap_static</code> ¥â¥¸¥å¡¼¥ë¤ò Apache 2.0 ÍѤ˰ܿ¢¤·¤¿»þ¤Ë
-    ³Ø¤ó¤À·Ð¸³¤ò¤â¤È¤Ë½ñ¤¤¤¿¡¢ºÇ½é¤Î¼ê°ú¤­½ñ¤Ç¤¹¡£¤Þ¤À¤Þ¤À´°Á´¤¸¤ã¤Ê¤¤¤·¡¢
-    ¤Ò¤ç¤Ã¤È¤¹¤ë¤È´Ö°ã¤Ã¤Æ¤¤¤ëÉôʬ¤â¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¤¬¡¢
-    ¼è¤Ã³Ý¤ê¤Ë¤Ï¤Ê¤ë¤Ç¤·¤ç¤¦¡£</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#easy">´Êñ¤ÊÊѹ¹ÅÀ</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#messy">¤â¤Ã¤ÈÌñ²ð¤ÊÊѹ¹ÅÀ¡Ä</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="easy" id="easy">´Êñ¤ÊÊѹ¹ÅÀ</a></h2>
-
-    <h3><a name="cleanup" id="cleanup">¥¯¥ê¡¼¥ó¥Ê¥Ã¥× ¥ë¡¼¥Á¥ó</a></h3>
-      <p>¥¯¥ê¡¼¥ó¥Ê¥Ã¥×¥ë¡¼¥Á¥ó¤Ï <code>apr_status_t</code> ·¿¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-      ¤½¤·¤Æ¡¢apr_status_t ·¿¤ÎÃͤòÊÖ¤µ¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£
-      ¥¯¥ê¡¼¥ó¥Ê¥Ã¥×Ãæ¤Î¥¨¥é¡¼¤òÄÌÃΤ¹¤ëɬÍפ¬¤Ê¤±¤ì¤Ð¡¢ÊÖ¤êÃͤÏÉáÄÌ¡¢
-      <code>ARP_SUCCESS</code> ¤Ç¤¹¡£¤¿¤È¤¨¥¨¥é¡¼¤òÄÌÃΤ·¤¿¤È¤·¤Æ¤â¡¢
-      ¤¹¤Ù¤Æ¤Î¥³¡¼¥É¤¬¤½¤ÎÄÌÃΤò¥Á¥§¥Ã¥¯¤·¤¿¤ê¡¢
-      ¥¨¥é¡¼¤Ë±þ¤¸¤¿Æ°ºî¤ò¤¹¤ë¤ï¤±¤Ç¤Ï¤Ê¤¤¤³¤È¤Ëµ¤¤ò¤Ä¤±¤Æ¤¯¤À¤µ¤¤¡£</p>
-    
-
-
-    <h3><a name="init" id="init">½é´ü²½¥ë¡¼¥Á¥ó</a></h3>
-
-    <p>½é´ü²½¥ë¡¼¥Á¥ó¤Ï½èÍýÁ´ÂΤ«¤é¸«¤Æ¤·¤Ã¤¯¤ê¤¯¤ë¤è¤¦¤Ê°ÕÌ£¤òɽ¤¹¤è¤¦¤Ë¡¢
-    ̾Á°¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿¡£¤Ç¤¹¤«¤é¡¢<code>mmap_init</code> ¤«¤é <code>mmap_post_config</code>
-    ¤Î¤è¤¦¤Ë¤Á¤ç¤Ã¤ÈÊѹ¹¤µ¤ì¤Þ¤·¤¿¡£
-    ÅϤµ¤ì¤ë°ú¿ô¤ÏÂçÉý¤ËÊѹ¹¤µ¤ì¡¢¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£</p>
-
-      <ul>
-        <li><code>apr_pool_t *p</code></li>
-        <li><code>apr_pool_t *plog</code></li>
-        <li><code>apr_pool_t *ptemp</code></li>
-        <li><code>server_rec *s</code></li>
-      </ul>
-    
-
-    <h3><a name="datatypes" id="datatypes">¥Ç¡¼¥¿·¿</a></h3>
-      <p>¥Ç¡¼¥¿·¿¤Î¤Û¤È¤ó¤É¤Ï <a href="http://apr.apache.org/">APR</a> ¤Ë°Ü¤µ¤ì¤Þ¤·¤¿¡£¤Ä¤Þ¤ê¡¢
-      ¤¤¤¯¤Ä¤«¤Î̾Á°¤¬Á°½Ò¤Î¤è¤¦¤ËÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-      »Ü¤¹¤Ù¤­Êѹ¹ÅÀ¤Î´Êñ¤Ê°ìÍ÷¤ò°Ê²¼¤Ë¼¨¤·¤Þ¤¹¡£</p>
-
-      <ul>
-        <li><code>pool</code> becomes <code>apr_pool_t</code></li>
-        <li><code>table</code> becomes <code>apr_table_t</code></li>
-      </ul>
-    
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="messy" id="messy">¤â¤Ã¤ÈÌñ²ð¤ÊÊѹ¹ÅÀ¡Ä</a></h2>
-
-    <h3><a name="register-hooks" id="register-hooks">¥Õ¥Ã¥¯¤ÎÅÐÏ¿</a></h3>
-      <p>¿·¤·¤¤¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¤ÏºîÀ®¤·¤¿´Ø¿ô¤ò¸Æ¤Ó½Ð¤¹¤Î¤Ë
-      °ìÏ¢¤Î¥Õ¥Ã¥¯¤ò»ÈÍѤ·¤Þ¤¹¡£¤³¤Î¥Õ¥Ã¥¯¤Ï¡¢¿·¤·¤¤´Ø¿ô
-      <code>static void register_hooks(void)</code> ¤ò»È¤Ã¤ÆÅÐÏ¿¤¹¤ë¤è¤¦¡¢
-      ¥â¥¸¥å¡¼¥ë¤Ë½ñ¤­Â­¤µ¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£
-      ¤³¤Î´Ø¿ô¤Ï¡¢¤Ê¤Ë¤ò¤¹¤Ù¤­¤«°ìöÍý²ò¤·¤Æ¤·¤Þ¤¨¤Ð¡¢
-      ½½Ê¬¤Ë¤ï¤«¤ê¤ä¤¹¤¤¤â¤Î¤Ç¤¹¡£
-      ¥ê¥¯¥¨¥¹¥È¤Î½èÍý¤Î¤¢¤ë¥¹¥Æ¡¼¥¸¤Ç¸Æ¤Ó½Ð¤µ¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤
-      ´Ø¿ô¤ÏÅÐÏ¿¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥Ï¥ó¥É¥é¤ÏÅÐÏ¿¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
-      ´Ø¿ô¤òÅÐÏ¿¤Ç¤­¤ë¥Õ¥§¡¼¥º¤Ï¤¿¤¯¤µ¤ó¤¢¤ê¤Þ¤¹¡£
-      ¤½¤ì¤¾¤ì¤Î¥Õ¥§¡¼¥º¤Ç¡¢´Ø¿ô¤ò¸Æ¤Ó½Ð¤¹ÁêÂÐŪ¤Ê½çÈ֤ϡ¢
-      ¤«¤Ê¤ê¤ÎÄøÅÙÀ©¸æ¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>°Ê²¼¤Ï¡¢<code>mod_mmap_static</code> ¤ËÄɲä·¤¿¥³¡¼¥É¤Ç¤¹:</p>
-
-      <div class="example"><pre>
-static void register_hooks(void)
-{
-    static const char * const aszPre[]={ "http_core.c",NULL };
-    ap_hook_post_config(mmap_post_config,NULL,NULL,HOOK_MIDDLE);
-    ap_hook_translate_name(mmap_static_xlat,aszPre,NULL,HOOK_LAST);
-};</pre></div>
-
-    <p>¤³¤³¤Ç¤Ï¸Æ¤Ó¤À¤¹¤Ù¤­Æó¤Ä¤Î´Ø¿ô¤òÅÐÏ¿¤·¤Æ¤¤¤Þ¤¹¡£°ì¤Ä¤Ï
-    <code>post_config</code> ¥¹¥Æ¡¼¥¸ÍÑ (¤Û¤È¤ó¤É¤¹¤Ù¤Æ¤Î¥â¥¸¥å¡¼¥ë
-    ¤Ï¤³¤ì¤¬É¬ÍפǤ¹) ¤Ç¡¢¤â¤¦°ì¤Ä¤Ï <code>translate_name</code> ¥Õ¥§¡¼¥ºÍѤǤ¹¡£
-    ¤½¤ì¤¾¤ì¤Î´Ø¿ô¤Ï̾Á°¤Ï°ã¤¦¤±¤ì¤É¤â·Á¼°¤ÏƱ¤¸¤Ç¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ¤½¤ì¤Ç¤Ï¡¢·Á¼°¤Ï¤É¤Î¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤Ç¤·¤ç¤¦¤«?</p>
-
-      <div class="example"><p><code>
-        ap_hook_<var>phase_name</var>(<var>function_name</var>,
-        <var>predecessors</var>, <var>successors</var>, <var>position</var>);
-      </code></p></div>
-
-    <p>»°¤Ä¤Î°ÌÃÖ¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡Ä</p>
-
-      <ul>
-        <li><code>HOOK_FIRST</code></li>
-        <li><code>HOOK_MIDDLE</code></li>
-        <li><code>HOOK_LAST</code></li>
-      </ul>
-
-    <p>°ÌÃÖ¤òÄêµÁ¤¹¤ë¤Ë¤Ï¡¢¾åµ­¤Î¡Ö°ÌÃ֡פò»ØÄꤷ¡¢
-    ½¤¾þ»Ò¤Ç¤¢¤ë¡ÖÀè¹Ô¡×¤È¡Ö¸å¹Ô¡×¤Ç¼ê¤ò²Ã¤¨¤Þ¤¹¡£
-   ¡ÖÀè¹Ô¡×¡Ö¸å¹Ô¡×¤Ï¡¢¸Æ¤Ð¤ì¤ë¤Ù¤­´Ø¿ô¤Î¥ê¥¹¥È¤Ç¤¹¡£
-   ¡ÖÀè¹Ô¡×¤Ï´Ø¿ô¤Î¼Â¹ÔÁ°¤Ë¸Æ¤Ð¤ì¤ë¤â¤Î¤Ç¡¢
-   ¡Ö¸å¹Ô¡×¤Ï¼Â¹Ô¸å¤Ë¸Æ¤Ð¤ì¤ë¤â¤Î¤Ç¤¹¡£</p>
-
-    <p><code>mod_mmap_static</code> ¤Î¾ì¹ç¡¢<code>post_config</code>
-    ¥¹¥Æ¡¼¥¸¤Ç¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¤¬¡¢
-    <code>mmap_static_xlat</code> ¤¬ core ¥â¥¸¥å¡¼¥ë¤¬Ì¾Á°¤ÎÊÑ´¹¤ò¼Â¹Ô¤·¤¿¸å¤Ë
-    <strong>¸Æ¤Ð¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó</strong>¡£
-    ¤½¤³¤Ç aszPre ¤ò»È¤Ã¤Æ <code>HOOK_LAST</code> ¤Î½¤¾þ»Ò¤òÄêµÁ¤·¤Æ¤¤¤Þ¤¹¡£</p>
-  
-
-    <h3><a name="moddef" id="moddef">¥â¥¸¥å¡¼¥ë¤ÎÄêµÁ</a></h3>
-      <p>¥â¥¸¥å¡¼¥ë¤ÎÄêµÁ¤òºîÀ®¤¹¤ëºÝ¤ËÃí°Õ¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤
-      ¥¹¥Æ¡¼¥¸¤Î¿ô¤Ï·ã¸º¤·¤Æ¤¤¤Þ¤¹¡£¸Å¤¤ÄêµÁ¤Ï¼¡¤Î¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤·¤¿¡£</p>
-
-      <div class="example"><pre>
-module MODULE_VAR_EXPORT <var>module_name</var>_module =
-{
-    STANDARD_MODULE_STUFF,
-    /* initializer */
-    /* dir config creater */
-    /* dir merger --- default is to override */
-    /* server config */
-    /* merge server config */
-    /* command handlers */
-    /* handlers */
-    /* filename translation */
-    /* check_user_id */
-    /* check auth */
-    /* check access */
-    /* type_checker */
-    /* fixups */
-    /* logger */
-    /* header parser */
-    /* child_init */
-    /* child_exit */
-    /* post read-request */
-};</pre></div>
-
-    <p>¿·¤·¤¤¹½Â¤ÂΤϤȤäƤ⥷¥ó¥×¥ë¤Ç¤¹¡Ä</p>
-      <div class="example"><pre>
-module MODULE_VAR_EXPORT <var>module_name</var>_module =
-{
-    STANDARD20_MODULE_STUFF,
-    /* create per-directory config structures */
-    /* merge per-directory config structures  */
-    /* create per-server config structures    */
-    /* merge per-server config structures     */
-    /* command handlers */
-    /* handlers */
-    /* register hooks */
-};</pre></div>
-
-    <p>¤³¤Î¤¦¤Á¤Î¤¤¤¯¤Ä¤«¤Ï¸Å¤¤¤â¤Î¤«¤é¿·¤·¤¤¤â¤Î¤ËľÀÜÆɤßÂؤ¨¤é¤ì¤ë¤â¤Î¤Ç¡¢
-    ¤¤¤¯¤Ä¤«¤Ï¤½¤¦¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤É¤¦¤¹¤ì¤Ð¤¤¤¤¤Î¤«¤òÍ×Ì󤷤Ƥߤޤ¹¡£</p>
-
-    <p>ľÀÜÆɤßÂؤ¨¤é¤ì¤ë¥¹¥Æ¡¼¥¸:</p>
-
-    <dl>
-      <dt><code>/* ¥Ç¥£¥ì¥¯¥È¥êÀßÄêºîÀ®´Ø¿ô */</code></dt>
-      <dd><code>/* ¥Ç¥£¥ì¥¯¥È¥êËèÀßÄ깽¤ÂκîÀ® */</code></dd>
-
-      <dt><code>/* ¥µ¡¼¥ÐÀßÄêºîÀ®´Ø¿ô */</code></dt>
-      <dd><code>/* ¥µ¡¼¥ÐËèÀßÄ깽¤ÂκîÀ® */</code></dd>
-
-      <dt><code>/* ¥Ç¥£¥ì¥¯¥È¥êÀßÄê¥Þ¡¼¥¸´Ø¿ô */</code></dt>
-      <dd><code>/* ¥Ç¥£¥ì¥¯¥È¥êËèÀßÄ깽¤ÂÎ¥Þ¡¼¥¸ */</code></dd>
-
-      <dt><code>/* ¥µ¡¼¥ÐÀßÄê¥Þ¡¼¥¸´Ø¿ô */</code></dt>
-      <dd><code>/* ¥µ¡¼¥ÐËèÀßÄ깽¤ÂκîÀ®¥Þ¡¼¥¸ */</code></dd>
-
-      <dt><code>/* ¥³¥Þ¥ó¥É¡¦¥Æ¡¼¥Ö¥ë */</code></dt>
-      <dd><code>/* ¥³¥Þ¥ó¥É apr_table_t */</code></dd>
-
-      <dt><code>/* ¥Ï¥ó¥É¥é */</code></dt>
-      <dd><code>/* ¥Ï¥ó¥É¥é */</code></dd>
-    </dl>
-
-    <p>¸Å¤¤´Ø¿ô¤Î»Ä¤ê¤Î¤â¤Î¤Ï¥Õ¥Ã¥¯¤È¤·¤ÆÅÐÏ¿¤µ¤ì¤ë¤Ù¤­¤Ç¤¹¡£
-    ¸½»þÅÀ¤Ç¼¡¤Î¤è¤¦¤Ê¥Õ¥Ã¥¯¡¦¥¹¥Æ¡¼¥¸¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡Ä</p>
-
-    <dl>
-      <dt><code>ap_hook_post_config</code></dt>
-      <dd>(°ÊÁ°¤Î <code>_init</code> ¥ë¡¼¥Á¥ó¤¬ÅÐÏ¿¤µ¤ì¤ë¤Ù¤­¾ì½ê¤Ç¤¹)</dd>
-
-      <dt><code>ap_hook_http_method</code></dt>
-      <dd>(¥ê¥¯¥¨¥¹¥È¤«¤é HTTP ¥á¥½¥Ã¥É¤ò¼èÆÀ¤·¤Þ¤¹ (¸ß´¹ÍÑ))</dd>
-
-      <dt><code>ap_hook_open_logs</code></dt>
-      <dd>(ÆÃÄê¤Î¥í¥°¤Î¥ª¡¼¥×¥ó)</dd>
-
-      <dt><code>ap_hook_auth_checker</code></dt>
-      <dd>(¥ê¥½¡¼¥¹¤¬¸¢¸Â¤òɬÍפȤ¹¤ë¤«¤É¤¦¤«¤Î³Îǧ)</dd>
-
-      <dt><code>ap_hook_access_checker</code></dt>
-      <dd>(¥â¥¸¥å¡¼¥ë¸ÇÍ­¤ÎÀ©Ìó¤Î³Îǧ)</dd>
-
-      <dt><code>ap_hook_check_user_id</code></dt>
-      <dd>(¥æ¡¼¥¶ ID ¤È¥Ñ¥¹¥ï¡¼¥É¤Î³Îǧ)</dd>
-
-      <dt><code>ap_hook_default_port</code></dt>
-      <dd>(¥µ¡¼¥Ð¤Î¥Ç¥Õ¥©¥ë¥È¡¦¥Ý¡¼¥È¤Î¼èÆÀ)</dd>
-
-      <dt><code>ap_hook_pre_connection</code></dt>
-      <dd>(½èÍý¤ÎľÁ°¤ËɬÍפʤ³¤È¤ò¼Â¹Ô¡£¤¿¤À¤· accept ľ¸å¤Ë¸Æ¤Ð¤ì¤ë)</dd>
-
-      <dt><code>ap_hook_process_connection</code></dt>
-      <dd>(¥×¥í¥È¥³¥ë¤Î½èÍý)</dd>
-
-      <dt><code>ap_hook_child_init</code></dt>
-      <dd>(»Ò¥×¥í¥»¥¹µ¯Æ°Ä¾¸å)</dd>
-
-      <dt><code>ap_hook_create_request</code></dt>
-      <dd>(??)</dd>
-
-      <dt><code>ap_hook_fixups</code></dt>
-      <dd>(±þÅúÆâÍƤÎÀ¸À®¤òÊѹ¹¤¹¤ë¥é¥¹¥È¡¦¥Á¥ã¥ó¥¹)</dd>
-
-      <dt><code>ap_hook_handler</code></dt>
-      <dd>(±þÅúÆâÍƤÎÀ¸À®)</dd>
-
-      <dt><code>ap_hook_header_parser</code></dt>
-      <dd>(¥â¥¸¥å¡¼¥ë¤Ë¥Ø¥Ã¥À¤Î¾È²ñ¤ò¤µ¤»¤ë¡£¤Û¤È¤ó¤É¤Î¥â¥¸¥å¡¼¥ë¤Ç¤Ï»È¤ï¤ì¤Þ¤»¤ó¡£post_read_request ¤ò»È¤¤¤Þ¤¹)</dd>
-
-      <dt><code>ap_hook_insert_filter</code></dt>
-      <dd>(¥Õ¥£¥ë¥¿¡¦¥Á¥§¥¤¥ó¤Ë¥Õ¥£¥ë¥¿¤òÁÞÆþ)</dd>
-
-      <dt><code>ap_hook_log_transaction</code></dt>
-      <dd>(¥ê¥¯¥¨¥¹¥È¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤òµ­Ï¿¤¹¤ë)</dd>
-
-      <dt><code>ap_hook_optional_fn_retrieve</code></dt>
-      <dd>(¥ª¥×¥·¥ç¥ó¤È¤·¤ÆÅÐÏ¿¤µ¤ì¤¿´Ø¿ô¤Î¼èÆÀ)</dd>
-
-      <dt><code>ap_hook_post_read_request</code></dt>
-      <dd>(¥ê¥¯¥¨¥¹¥È¤òÆɤߤ³¤ó¤À¸å¡¢Â¾¤Î¥Õ¥§¡¼¥º¤ÎÁ°¤Ë¸Æ¤Ð¤ì¤ë)</dd>
-
-      <dt><code>ap_hook_quick_handler</code></dt>
-      <dd>¥ê¥¯¥¨¥¹¥È¤Î½èÍý¤¬»Ï¤Þ¤ëÁ°¤Ë¸Æ¤Ð¤ì¤ë¡£¥­¥ã¥Ã¥·¥å¥â¥¸¥å¡¼¥ë¤¬
-      »ÈÍѤ·¤Æ¤¤¤ë</dd>
-
-      <dt><code>ap_hook_translate_name</code></dt>
-      <dd>(URI ¤ò¥Õ¥¡¥¤¥ë̾¤ËÊÑ´¹¤¹¤ë)</dd>
-
-      <dt><code>ap_hook_type_checker</code></dt>
-      <dd>(ʸ½ñ·¿¤Î·èÄê¤ÈÀßÄê¡£¤¢¤ë¤¤¤Ï¤½¤ÎÊÒÊý)</dd>
-    </dl>
-  
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/developer/modules.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/developer/modules.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/developer/modules.html.ja.utf8 b/docs/manual/developer/modules.html.ja.utf8
new file mode 100644
index 00000000..cf3fafc4
--- /dev/null
+++ b/docs/manual/developer/modules.html.ja.utf8
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>モジュール� Apache 1.3 �ら Apache 2.0 ��移� - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">Developer Documentation</a></div><div id="page-content"><div id="preamble"><h1>モジュール� Apache 1.3 �ら Apache 2.0 ��移�</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/developer/modules.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/developer/modules.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div>
+
+    <p>��文書� <code>mod_mmap_static</code> モジュールを Apache 2.0 用�移���時�
+    学ん�経験をも��書���最��手引�書��。����完全�ゃ����
+    �ょ���る�間����る部分も�る�も�れ��ん��
+    ��掛り���る��ょ�。</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#easy">簡��変更点</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#messy">も��厄介�変更点…</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="easy" id="easy">簡��変更点</a></h2>
+
+    <h3><a name="cleanup" id="cleanup">クリーンナップ ルー�ン</a></h3>
+      <p>クリーンナップルー�ン� <code>apr_status_t</code> 型��る必���り��。
+      ����apr_status_t 型�値を返������り��ん。
+      クリーンナップ中�エラーを通知�る必����れ��返り値�普通�
+      <code>ARP_SUCCESS</code> ��。���エラーを通知�����も�
+      ����コード���通知を�ェック��り�
+      エラー�応��動作を�る���������気を�������。</p>
+    
+
+
+    <h3><a name="init" id="init">�期化ルー�ン</a></h3>
+
+    <p>�期化ルー�ン�処�全体�ら見����り�るよ���味を表�よ���
+    ���変更�れ���。���ら�<code>mmap_init</code> �ら <code>mmap_post_config</code>
+    �よ���ょ��変更�れ���。
+    渡�れる引数�大幅�変更�れ�次�よ���り���。</p>
+
+      <ul>
+        <li><code>apr_pool_t *p</code></li>
+        <li><code>apr_pool_t *plog</code></li>
+        <li><code>apr_pool_t *ptemp</code></li>
+        <li><code>server_rec *s</code></li>
+      </ul>
+    
+
+    <h3><a name="datatypes" id="datatypes">データ型</a></h3>
+      <p>データ型���ん�� <a href="http://apr.apache.org/">APR</a> �移�れ���。��り�
+      ���������述�よ��変更�れ����。
+      施���変更点�簡��一覧を以下�示���。</p>
+
+      <ul>
+        <li><code>pool</code> becomes <code>apr_pool_t</code></li>
+        <li><code>table</code> becomes <code>apr_table_t</code></li>
+      </ul>
+    
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="messy" id="messy">も��厄介�変更点…</a></h2>
+
+    <h3><a name="register-hooks" id="register-hooks">フック�登録</a></h3>
+      <p>新��アーキテク�ャ��作���関数を呼�出���
+      一連�フックを使用���。��フック��新��関数
+      <code>static void register_hooks(void)</code> を使��登録�るよ��
+      モジュール�書�足������り��ん。
+      ��関数����を����一旦�解�������
+      �分���りや��も���。
+      リクエスト�処���るステージ�呼�出������ら��
+      関数�登録�る必���り��。�ンドラ�登録�る必���り��ん。
+      関数を登録��るフェーズ����ん�り��。
+      �れ�れ�フェーズ��関数を呼�出�相対的�順番��
+      ��り�程度制御����。</p>
+
+    <p>以下��<code>mod_mmap_static</code> �追加��コード��:</p>
+
+      <div class="example"><pre>
+static void register_hooks(void)
+{
+    static const char * const aszPre[]={ "http_core.c",NULL };
+    ap_hook_post_config(mmap_post_config,NULL,NULL,HOOK_MIDDLE);
+    ap_hook_translate_name(mmap_static_xlat,aszPre,NULL,HOOK_LAST);
+};</pre></div>
+
+    <p>����呼�����二��関数を登録�����。一��
+    <code>post_config</code> ステージ用 (��ん�����モジュール
+    ��れ�必���) ��も�一�� <code>translate_name</code> フェーズ用��。
+    �れ�れ�関数�������れ�も形������る���注�������。
+    �れ���形����よ������る��ょ��?</p>
+
+      <div class="example"><p><code>
+        ap_hook_<var>phase_name</var>(<var>function_name</var>,
+        <var>predecessors</var>, <var>successors</var>, <var>position</var>);
+      </code></p></div>
+
+    <p>三���置�定義�れ����…</p>
+
+      <ul>
+        <li><code>HOOK_FIRST</code></li>
+        <li><code>HOOK_MIDDLE</code></li>
+        <li><code>HOOK_LAST</code></li>
+      </ul>
+
+    <p>�置を定義�る���上記�「�置�を指定��
+    修飾���る「先行��「後行��手を加���。
+   「先行�「後行���呼�れる��関数�リスト��。
+   「先行��関数�実行��呼�れるも���
+   「後行��実行後�呼�れるも���。</p>
+
+    <p><code>mod_mmap_static</code> �場��<code>post_config</code>
+    ステージ��必��り��ん��
+    <code>mmap_static_xlat</code> � core モジュール����変�を実行��後�
+    <strong>呼�れ��れ��り��ん</strong>。
+    ��� aszPre を使�� <code>HOOK_LAST</code> �修飾�を定義�����。</p>
+  
+
+    <h3><a name="moddef" id="moddef">モジュール�定義</a></h3>
+      <p>モジュール�定義を作��る際�注����れ��ら��
+      ステージ�数�激減�����。��定義�次�よ���������。</p>
+
+      <div class="example"><pre>
+module MODULE_VAR_EXPORT <var>module_name</var>_module =
+{
+    STANDARD_MODULE_STUFF,
+    /* initializer */
+    /* dir config creater */
+    /* dir merger --- default is to override */
+    /* server config */
+    /* merge server config */
+    /* command handlers */
+    /* handlers */
+    /* filename translation */
+    /* check_user_id */
+    /* check auth */
+    /* check access */
+    /* type_checker */
+    /* fixups */
+    /* logger */
+    /* header parser */
+    /* child_init */
+    /* child_exit */
+    /* post read-request */
+};</pre></div>
+
+    <p>新��構造体����もシンプル��…</p>
+      <div class="example"><pre>
+module MODULE_VAR_EXPORT <var>module_name</var>_module =
+{
+    STANDARD20_MODULE_STUFF,
+    /* create per-directory config structures */
+    /* merge per-directory config structures  */
+    /* create per-server config structures    */
+    /* merge per-server config structures     */
+    /* command handlers */
+    /* handlers */
+    /* register hooks */
+};</pre></div>
+
+    <p>������������も��ら新��も��直接読�替�られるも���
+    ����������り��ん。���れ�����を�約�����。</p>
+
+    <p>直接読�替�られるステージ:</p>
+
+    <dl>
+      <dt><code>/* ディレクトリ設定作�関数 */</code></dt>
+      <dd><code>/* ディレクトリ毎設定構造体作� */</code></dd>
+
+      <dt><code>/* サー�設定作�関数 */</code></dt>
+      <dd><code>/* サー�毎設定構造体作� */</code></dd>
+
+      <dt><code>/* ディレクトリ設定マージ関数 */</code></dt>
+      <dd><code>/* ディレクトリ毎設定構造体マージ */</code></dd>
+
+      <dt><code>/* サー�設定マージ関数 */</code></dt>
+      <dd><code>/* サー�毎設定構造体作�マージ */</code></dd>
+
+      <dt><code>/* コマンド・テーブル */</code></dt>
+      <dd><code>/* コマンド apr_table_t */</code></dd>
+
+      <dt><code>/* �ンドラ */</code></dt>
+      <dd><code>/* �ンドラ */</code></dd>
+    </dl>
+
+    <p>��関数�残り�も��フック���登録�れる����。
+    �時点�次�よ��フック・ステージ�定義�れ����…</p>
+
+    <dl>
+      <dt><code>ap_hook_post_config</code></dt>
+      <dd>(以�� <code>_init</code> ルー�ン�登録�れる��場所��)</dd>
+
+      <dt><code>ap_hook_http_method</code></dt>
+      <dd>(リクエスト�ら HTTP メソッドを�得��� (互�用))</dd>
+
+      <dt><code>ap_hook_open_logs</code></dt>
+      <dd>(特定�ログ�オープン)</dd>
+
+      <dt><code>ap_hook_auth_checker</code></dt>
+      <dd>(リソース�権�を必���る�����確�)</dd>
+
+      <dt><code>ap_hook_access_checker</code></dt>
+      <dd>(モジュール固有�制約�確�)</dd>
+
+      <dt><code>ap_hook_check_user_id</code></dt>
+      <dd>(ユーザ ID �パスワード�確�)</dd>
+
+      <dt><code>ap_hook_default_port</code></dt>
+      <dd>(サー��デフォルト・�ート��得)</dd>
+
+      <dt><code>ap_hook_pre_connection</code></dt>
+      <dd>(処��直��必����を実行。��� accept 直後�呼�れる)</dd>
+
+      <dt><code>ap_hook_process_connection</code></dt>
+      <dd>(プロトコル�処�)</dd>
+
+      <dt><code>ap_hook_child_init</code></dt>
+      <dd>(�プロセス起動直後)</dd>
+
+      <dt><code>ap_hook_create_request</code></dt>
+      <dd>(??)</dd>
+
+      <dt><code>ap_hook_fixups</code></dt>
+      <dd>(応答内容�生�を変更�るラスト・�ャンス)</dd>
+
+      <dt><code>ap_hook_handler</code></dt>
+      <dd>(応答内容�生�)</dd>
+
+      <dt><code>ap_hook_header_parser</code></dt>
+      <dd>(モジュール�ヘッダ�照会を��る。��ん��モジュール��使�れ��ん。post_read_request を使���)</dd>
+
+      <dt><code>ap_hook_insert_filter</code></dt>
+      <dd>(フィルタ・�ェイン�フィルタを挿入)</dd>
+
+      <dt><code>ap_hook_log_transaction</code></dt>
+      <dd>(リクエスト�����情報を記録�る)</dd>
+
+      <dt><code>ap_hook_optional_fn_retrieve</code></dt>
+      <dd>(オプション���登録�れ�関数��得)</dd>
+
+      <dt><code>ap_hook_post_read_request</code></dt>
+      <dd>(リクエストを読��ん�後�他�フェーズ���呼�れる)</dd>
+
+      <dt><code>ap_hook_quick_handler</code></dt>
+      <dd>リクエスト�処��始�る��呼�れる。キャッシュモジュール�
+      使用���る</dd>
+
+      <dt><code>ap_hook_translate_name</code></dt>
+      <dd>(URI をファイル��変��る)</dd>
+
+      <dt><code>ap_hook_type_checker</code></dt>
+      <dd>(文書型�決定�設定。�る����片方)</dd>
+    </dl>
+  
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/developer/modules.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/developer/modules.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/developer/request.html b/docs/manual/developer/request.html
index 54770724..ed3694f6 100644
--- a/docs/manual/developer/request.html
+++ b/docs/manual/developer/request.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: request.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/developer/request.html.en b/docs/manual/developer/request.html.en
index 697967ed..c2aeb25d 100644
--- a/docs/manual/developer/request.html.en
+++ b/docs/manual/developer/request.html.en
@@ -255,6 +255,6 @@ case SATISFY_ANY:
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/developer/request.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/developer/thread_safety.html b/docs/manual/developer/thread_safety.html
index 02f067e7..50f07bf3 100644
--- a/docs/manual/developer/thread_safety.html
+++ b/docs/manual/developer/thread_safety.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: thread_safety.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/developer/thread_safety.html.en b/docs/manual/developer/thread_safety.html.en
index db3b2931..43ec4bcf 100644
--- a/docs/manual/developer/thread_safety.html.en
+++ b/docs/manual/developer/thread_safety.html.en
@@ -280,6 +280,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/developer/thread_safety.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/dns-caveats.html b/docs/manual/dns-caveats.html
index 9996161f..bf518b31 100644
--- a/docs/manual/dns-caveats.html
+++ b/docs/manual/dns-caveats.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: dns-caveats.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: dns-caveats.html.ja.euc-jp
+URI: dns-caveats.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: dns-caveats.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/dns-caveats.html.en b/docs/manual/dns-caveats.html.en
index 8f36b75b..a0f2dee3 100644
--- a/docs/manual/dns-caveats.html.en
+++ b/docs/manual/dns-caveats.html.en
@@ -61,11 +61,11 @@
     to this virtual host (prior to Apache version 1.2 the server
     would not even boot).</p>
 
-    <p>Suppose that <code>www.abc.dom</code> has address 10.0.0.1.
+    <p>Suppose that <code>www.abc.dom</code> has address 192.0.2.1.
     Then consider this configuration snippet:</p>
 
     <div class="example"><p><code>
-      &lt;VirtualHost 10.0.0.1&gt; <br />
+      &lt;VirtualHost 192.0.2.1&gt; <br />
       ServerAdmin webgirl@abc.dom <br />
       DocumentRoot /www/abc <br />
       &lt;/VirtualHost&gt;
@@ -84,7 +84,7 @@
     <p>Here is a snippet that avoids both of these problems:</p>
 
     <div class="example"><p><code>
-      &lt;VirtualHost 10.0.0.1&gt; <br />
+      &lt;VirtualHost 192.0.2.1&gt; <br />
       ServerName www.abc.dom <br />
       ServerAdmin webgirl@abc.dom <br />
       DocumentRoot /www/abc <br />
@@ -120,18 +120,18 @@
       &lt;/VirtualHost&gt;
     </code></p></div>
 
-    <p>Suppose that you've assigned 10.0.0.1 to
-    <code>www.abc.dom</code> and 10.0.0.2 to
+    <p>Suppose that you've assigned 192.0.2.1 to
+    <code>www.abc.dom</code> and 192.0.2.2 to
     <code>www.def.dom</code>. Furthermore, suppose that
     <code>def.dom</code> has control of their own DNS. With this
     config you have put <code>def.dom</code> into a position where
     they can steal all traffic destined to <code>abc.dom</code>. To
     do so, all they have to do is set <code>www.def.dom</code> to
-    10.0.0.1. Since they control their own DNS you can't stop them
+    192.0.2.1. Since they control their own DNS you can't stop them
     from pointing the <code>www.def.dom</code> record wherever they
     wish.</p>
 
-    <p>Requests coming in to 10.0.0.1 (including all those where
+    <p>Requests coming in to 192.0.2.1 (including all those where
     users typed in URLs of the form
     <code>http://www.abc.dom/whatever</code>) will all be served by
     the <code>def.dom</code> virtual host. To better understand why
@@ -234,6 +234,6 @@
 <a href="./ja/dns-caveats.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/dns-caveats.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/dns-caveats.html.ja.euc-jp b/docs/manual/dns-caveats.html.ja.euc-jp
deleted file mode 100644
index c6128dbe..00000000
--- a/docs/manual/dns-caveats.html.ja.euc-jp
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>DNS ¤È Apache ¤Ë¤Þ¤Ä¤ï¤ëÃí°Õ»ö¹à - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>DNS ¤È Apache ¤Ë¤Þ¤Ä¤ï¤ëÃí°Õ»ö¹à</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./en/dns-caveats.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./ja/dns-caveats.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/dns-caveats.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-
-    <p>ËÜʸ½ñ¤ÎÆâÍƤϼ¡¤Î°ì¸À¤Ë¿Ô¤­¤Þ¤¹¡£¡ÖApache ¤¬ÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à¤È¤­¤Ë
-    DNS ¤ò»ÈÍѤ¹¤ëɬÍפ¬¤Ê¤¤¤è¤¦¤Ë¤·¤Æ²¼¤µ¤¤¡×¡£Apache ¤¬ÀßÄê¥Õ¥¡¥¤¥ë¤ò
-    Æɤ߹þ¤à¤È¤­¤Ë DNS ¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¡¢¿®ÍêÀ­¤ÎÌäÂê
-    (µ¯Æ°¤·¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó) ¤ä¥µ¡¼¥Ó¥¹µñÈݤäÅðÍÑ¥¢¥¿¥Ã¥¯
-    (¾¤Î¥æ¡¼¥¶¤«¤é¥Ò¥Ã¥È¤òÅð¤à¤³¤È¤ò´Þ¤ß¤Þ¤¹)
-    ¤ÎÌäÂê¤ËľÌ̤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>
-  </div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#example">´Êñ¤ÊÎã</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#denial">¥µ¡¼¥Ó¥¹µñÈÝ</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#main">¡Ö¼ç¥µ¡¼¥Ð¡×¥¢¥É¥ì¥¹</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#tips">°Ê¾å¤ÎÌäÂê¤ò²ò·è¤¹¤ëÊýË¡</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#appendix">ÉÕÏ¿: ¾­ÍèŪ¤ÊÊý¸þÀ­</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="example" id="example">´Êñ¤ÊÎã</a></h2>
-    
-
-    <div class="example"><p><code>
-      &lt;VirtualHost www.abc.dom&gt; <br />
-      ServerAdmin webgirl@abc.dom <br />
-      DocumentRoot /www/abc <br />
-      &lt;/VirtualHost&gt;
-    </code></p></div>
-
-    <p>Apache ¤¬Àµ¾ï¤Ëµ¡Ç½¤¹¤ë¤Ë¤Ï¡¢¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥ÈËè¤Ëɬ¤ºÆó¤Ä¤Î
-    ¾ðÊó¤¬É¬Íפˤʤê¤Þ¤¹¡£¤½¤ì¤Ï¡¢
-    <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code>
-    ¤È¡¢¤½¤Î¥µ¡¼¥Ð¤¬±þÅú¤¹¤ë¤¿¤á¤Î IP (ºÇÄã°ì¤Ä) ¤Ç¤¹¡£
-    ¾åµ­Îã¤Ç¤Ï IP ¥¢¥É¥ì¥¹¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó¤Î¤Ç¡¢Apache ¤Ï DNS
-    ¤ò»ÈÍѤ·¤Æ <code>www.abc.dom</code> ¤ò¸«¤Ä¤±¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-    ²¿¤é¤«¤ÎÍýͳ¤ÇÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ó¤Ç¤¤¤ë¤È¤­¤Ë DNS 
-    ¤¬ÍøÍѤǤ­¤Ê¤«¤Ã¤¿¾ì¹ç¡¢
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ï<strong>ÀßÄꤵ¤ì¤Þ¤»¤ó</strong>¡£
-    ¤½¤·¤Æ¡¢¤½¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ËÂФ¹¤ë¥Ò¥Ã¥È¤Ë¤Ï±þÅú¤¬¤Ê¤µ¤ì¤Þ¤»¤ó
-    (Apache 1.2 °ÊÁ°¤Ç¤Ïµ¯Æ°¤¹¤é¤·¤Þ¤»¤ó)¡£</p>
-
-    <p><code>www.abc.dom</code> ¤Î¥¢¥É¥ì¥¹¤¬ 10.0.0.1
-    ¤À¤È¤·¤Þ¤¹¡£¤Ç¤Ï¡¢¼¡¤ÎÀßÄê¤Ë¤Ä¤¤¤Æ¹Í¤¨¤Æ¤ß¤Þ¤·¤ç¤¦¡£</p>
-
-    <div class="example"><p><code>
-      &lt;VirtualHost 10.0.0.1&gt; <br />
-      ServerAdmin webgirl@abc.dom <br />
-      DocumentRoot /www/abc <br />
-      &lt;/VirtualHost&gt;
-    </code></p></div>
-
-    <p>¸½ºß¤Î¥ê¥ê¡¼¥¹¤Ç¤Ï Apache ¤Ï DNS µÕ°ú¤­¤ò»ÈÍѤ·¤Æ
-    ¤³¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code>
-    ¤ò¸«¤Ä¤±¤Þ¤¹¡£
-    ¤½¤ÎµÕ°ú¤­¤¬¼ºÇÔ¤·¤¿¾ì¹ç¤ÏÉôʬŪ¤Ë¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò̵¸ú¤Ë¤·¤Þ¤¹
-    (Apache 1.2 ¤è¤êÁ°¤Ç¤Ïµ¯Æ°¤¹¤é¤·¤Þ¤»¤ó)¡£
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤¬Ì¾Á°¥Ù¡¼¥¹¤Ç¤¢¤ì¤Ð´°Á´¤Ë̵¸ú¤Ë¤Ê¤ê¤Þ¤¹¤¬¡¢
-    IP ¥Ù¡¼¥¹¤Ç¤¢¤ì¤Ð³µ¤ÍÆ°ºî¤·¤Þ¤¹¡£¤·¤«¤·¤Ê¤¬¤é¡¢¥µ¡¼¥Ð̾¤ò
-    ´Þ¤à´°Á´¤Ê URL ¤òÀ¸À®¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¾ì¹ç¤Ï¡¢Àµ¤·¤¤ URL
-    ¤ÎÀ¸À®¤¬¤Ç¤­¤Þ¤»¤ó¡£</p>
-
-    <p>¼¡¤ÎÎã¤Ï¾åµ­¤ÎÌäÂê¤ò²ò·è¤·¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      &lt;VirtualHost 10.0.0.1&gt; <br />
-      ServerName www.abc.dom <br />
-      ServerAdmin webgirl@abc.dom <br />
-      DocumentRoot /www/abc <br />
-      &lt;/VirtualHost&gt;
-    </code></p></div>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="denial" id="denial">¥µ¡¼¥Ó¥¹µñÈÝ</a></h2>
-    
-
-    <p>¥µ¡¼¥Ó¥¹µñÈݤ¬µ¯¤³¤ë¾ì¹ç¡¢(¾¯¤Ê¤¯¤È¤â) Æó¤Ä¤Î¥±¡¼¥¹¤¬¤¢¤ê¤Þ¤¹¡£
-    Apache 1.2 ¤è¤êÁ°¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¾ì¹ç¡¢¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¤¿¤á¤Î
-    ¾åµ­¤ÎÆó¤Ä¤Î DNS ¸¡º÷¤Î¤¦¤Á°ì¤Ä¼ºÇÔ¤¹¤ì¤Ðµ¯Æ°¤¹¤é¤·¤Þ¤»¤ó¡£
-    ¤½¤·¤Æ¤³¤Î DNS ¸¡º÷¤¬¼«Ê¬¤ÎÀ©¸æ²¼¤Ë¤¹¤é¤Ê¤¤¾ì¹ç¤â¤¢¤ê¤¨¤Þ¤¹¡£
-    Î㤨¤Ð¡¢<code>abc.dom</code> ¤¬¸ÜµÒ¤Î¥µ¡¼¥Ð¤Î°ì¤Ä¤Ç¡¢
-    DNS ¤Ï¸ÜµÒ¼«¿È¤Ç´ÉÍý¤·¤Æ¤¤¤ë¾ì¹ç¡¢Ã±¤Ë
-    <code>www.abc.dom</code> ¥ì¥³¡¼¥É¤òºï½ü¤¹¤ë¤À¤±¤Ç¡¢
-    (1.2 ¤è¤êÁ°¤Î) ¥µ¡¼¥Ð¤òµ¯Æ°ÉÔǽ¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¤â¤¦°ì¤Ä¤Î¥±¡¼¥¹¤Ï¡¢¤è¤êµ¤ÉÕ¤­¤Ë¤¯¤¤¤â¤Î¤Ç¤¹¡£
-    ¼¡¤ÎÀßÄê¤Ë¤Ä¤¤¤Æ¹Í¤¨¤Æ¤ß¤Þ¤·¤ç¤¦¡£</p>
-
-    <div class="example"><p><code>
-      &lt;VirtualHost www.abc.dom&gt; <br />
-      &nbsp;&nbsp;ServerAdmin webgirl@abc.dom <br />
-      &nbsp;&nbsp;DocumentRoot /www/abc <br />
-      &lt;/VirtualHost&gt; <br />
-      <br />
-      &lt;VirtualHost www.def.dom&gt; <br />
-      &nbsp;&nbsp;ServerAdmin webguy@def.dom <br />
-      &nbsp;&nbsp;DocumentRoot /www/def <br />
-      &lt;/VirtualHost&gt;
-    </code></p></div>
-
-    <p>10.0.0.1 ¤ò <code>www.abc.dom</code> ¤Ë¡¢
-    10.0.0.2 ¤ò <code>www.def.dom</code> ¤Ë³ä¤êÅö¤Æ¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£
-    ¤Þ¤¿¡¢<code>def.dom</code> ¤Ï¸ÜµÒ¼«¿È¤Î DNS
-    ¤ÎÀ©¸æ²¼¤Ë¤¢¤ë¤È¤·¤Þ¤¹¡£¤³¤ÎÀßÄê¤Ç¡¢<code>abc.dom</code>
-    ¤Ë¸þ¤±¤é¤ì¤¿¥È¥é¥Õ¥£¥Ã¥¯Á´¤Æ¤òÃ¥¤¦¤³¤È¤¬¤Ç¤­¤ë°ÌÃÖ¤Ë
-    <code>def.dom</code> ¤òÀßÃ֤Ǥ­¤Æ¤¤¤Þ¤¹¡£¸å¤Ïñ¤Ë 
-    <code>www.def.dom</code> ¤¬ 10.0.0.1 ¤ò»²¾È¤¹¤ë¤è¤¦¤Ë
-    ÀßÄꤹ¤ë¤À¤±¤Ç¤¹¡£DNS ¤Ï¸ÜµÒ¦¤Î DNS ¤Ç¥³¥ó¥È¥í¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢
-    <code>www.def.dom</code> ¥ì¥³¡¼¥É¤¬¹¥¤­¤Ê¾ì½ê¤ò»Ø¤¹¤è¤¦¤Ë
-    ÀßÄê¤Ç¤­¤Æ¤·¤Þ¤¦¤Î¤ò»ß¤á¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£</p>
-
-    <p>10.0.0.1 ¤ËÂФ¹¤ë¥ê¥¯¥¨¥¹¥È
-    (<code>http://www.abc.dom/whatever</code> ·Á¼°¤Î URL 
-    ¤òÆþÎϤ·¤¿¥æ¡¼¥¶¤«¤é¤Î¤â¤ÎÁ´¤Æ¤ò´Þ¤ß¤Þ¤¹) 
-    ¤Ï¡¢<code>def.dom</code> ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ç±þÅú¤µ¤ì¤Þ¤¹¡£
-    ¤³¤Î¤è¤¦¤Ê¤³¤È¤¬²¿¸Îµ¯¤³¤ë¤«¤â¤Ã¤ÈÎɤ¯ÃΤ뤿¤á¤Ë¤Ï¡¢
-    ±þÅú¤ÎɬÍפʥС¼¥Á¥ã¥ë¥Û¥¹¥È¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ¡¢
-    Apache ¤¬¤É¤Î¤è¤¦¤ËÀ°¹çÀ­¤ò³ÎÊݤ¹¤ë¤«¤Ë¤Ä¤¤¤Æ¡¢
-    ¿¼¤¤µÄÏÀ¤¬É¬Íפˤʤê¤Þ¤¹¡£¤ª¤ª¤¶¤Ã¤Ñ¤ÊÀâÌÀ¤Ï<a href="vhosts/details.html">¤³¤Á¤é</a>¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="main" id="main">¡Ö¼ç¥µ¡¼¥Ð¡×¥¢¥É¥ì¥¹</a></h2>
-    
-
-    <p>Apache 1.1 ¤Ç¤Î <a href="vhost/name-based.html">̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¥µ¥Ý¡¼¥È</a> Äɲäκݤˡ¢
-    Apache ¤Ï <code class="program"><a href="./programs/httpd.html">httpd</a></code> ¤Î¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¥Û¥¹¥È¤Î IP
-    ¥¢¥É¥ì¥¹¤òÃΤëɬÍפ¬½Ð¤Æ¤­¤Þ¤·¤¿¡£¤³¤Î¥¢¥É¥ì¥¹¤òÆÀ¤ë¤¿¤á¤Ë¡¢
-    (¤â¤·¤¢¤ì¤Ð) ¥°¥í¡¼¥Ð¥ë¤Ê
-    <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code> ¤ò»ÈÍѤ¹¤ë¤«¡¢
-    C ¸À¸ì¤Î´Ø¿ô <code>gethostname</code> (¥³¥Þ¥ó¥É¥×¥í¥ó¥×¥È¤Ç
-    <code>hostname</code> ¤È¥¿¥¤¥×¤·¤¿¤È¤­¤ÈƱ¤¸¤â¤Î¤òÊÖ¤·¤Þ¤¹)
-    ¤ò¸Æ¤Ó½Ð¤¹¤«¤ò¤·¤Þ¤¹¡£
-    ¤½¤Î¸å¡¢ÆÀ¤é¤ì¤¿¥¢¥É¥ì¥¹¤Ç DNS ¸¡º÷¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£
-    ¸½ºß¤Î¤È¤³¤í¡¢¤³¤Î DNS ¸¡º÷¤ò²óÈò¤¹¤ëÊýË¡¤Ï¤¢¤ê¤Þ¤»¤ó¡£</p>
-
-    <p>DNS ¥µ¡¼¥Ð¤¬¥À¥¦¥ó¤·¤Æ¡¢¤³¤Î¸¡º÷¤¬¤Ç¤­¤Ê¤¤»öÂÖ¤¬µ¯¤³¤ë¤³¤È¤ò
-    ¶²¤ì¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢<code>/etc/hosts</code>
-    ¤Ë¥Û¥¹¥È̾¤òµ­½Ò¤·¤Æ¤ª¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹
-    (¥Þ¥·¥ó¤¬Àµ¾ï¤Ëµ¯Æ°¤¹¤ë¤è¤¦¤Ë´û¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó)¡£
-    ¤½¤Î¾ì¹ç¡¢DNS »²¾È¤¬¼ºÇÔ¤·¤¿¾ì¹ç¤Ë¥Þ¥·¥ó¤¬ <code>/etc/hosts</code>
-    ¤ò»ÈÍѤ¹¤ë¤è¤¦¤ËÀßÄꤷ¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ¤½¤ÎÊýË¡¤Ï¡¢¤É¤Î OS ¤ò»ÈÍѤ·¤Æ¤¤¤ë¤«¤Ë°Í¸¤·¤Þ¤¹¤¬¡¢
-    <code>/etc/resolv.conf</code> ¤« <code>/etc/nsswitch.conf</code>
-    ¤òÊÔ½¸¤¹¤ë¤³¤È¤ÇÀßÄê¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¤â¤·Â¾¤ÎÍýͳ¤Ç DNS ¤òÍøÍѤ¹¤ëɬÍפ¬¤Ê¤¤¾ì¹ç¤Ï¡¢
-    <code>HOSTRESORDER</code> ´Ä¶­ÊÑ¿ô¤ò¡Ö <code>local</code>
-    ¡×¤ËÀßÄꤹ¤ë¤³¤È¤Ç¤½¤Î¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£°Ê¾å¤³¤ì¤é¤Î»öÊÁ¤Ï¡¢¤É¤ó¤Ê
-    OS ¡¢¥ì¥¾¥ë¥Ð¥é¥¤¥Ö¥é¥ê¤ò»ÈÍѤ·¤Æ¤¤¤ë¤«¤Ë°Í¸¤·¤Þ¤¹¡£¤Þ¤¿¡¢
-    <code class="module"><a href="./mod/mod_env.html">mod_env</a></code> ¤ò»ÈÍѤ·¤Æ´Ä¶­ÊÑ¿ô¤òÀ©¸æ¤·¤Ê¤¤¸Â¤ê¡¢
-    CGI ¤Ë¤â±Æ¶Á¤òÍ¿¤¨¤Þ¤¹¡£man ¥Ú¡¼¥¸¤ä»ÈÍѤ·¤Æ¤¤¤ë OS
-    ¤Î FAQ ¤ÇÄ´¤Ù¤ë¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="tips" id="tips">°Ê¾å¤ÎÌäÂê¤ò²ò·è¤¹¤ëÊýË¡</a></h2>
-    
-
-    <ul>
-      <li>
-        <code class="directive"><a href="./mod/core.html#virtualhost">VirtualHost</a></code>
-	¤Ç IP ¥¢¥É¥ì¥¹¤ò»ÈÍѤ¹¤ë¡£
-      </li>
-
-      <li>
-        <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
-	¤Ç IP ¥¢¥É¥ì¥¹¤ò»ÈÍѤ¹¤ë¡£
-      </li>
-
-      <li>
-	Á´¤Æ¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤¬ÌÀ¼¨Åª¤Ë
-        <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code>
-	¤ò»ý¤Ä¤è¤¦¤Ë¤¹¤ë¡£
-      </li>
-
-      <li>²¿¤â±þÅú¤·¤Ê¤¤
-      <code>&lt;VirtualHost _default_:*&gt;</code>
-      ¥µ¡¼¥Ð¤òºî¤ë¡£</li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="appendix" id="appendix">ÉÕÏ¿: ¾­ÍèŪ¤ÊÊý¸þÀ­</a></h2>
-    
-
-    <p>DNS ¤Ë´Ø¤·¤Æ¡¢¸½¾õ¤ÏÁ´¤¯µ¹¤·¤¯¤¢¤ê¤Þ¤»¤ó¡£Apache 1.2 ¤Ç¡¢
-    DNS ¤Î¥¤¥Ù¥ó¥È¤¬¼ºÇÔ¤·¤Æ¤â¾¯¤Ê¤¯¤È¤âµ¯Æ°¥×¥í¥»¥¹¤¬Â³¤¯¤è¤¦¤Ë¤·¤Þ¤·¤¿¤¬¡¢
-    ¤³¤ì¤¬ºÇ¹â¤Î²ò·èÊýË¡¤Ç¤Ï¤Ê¤¤¤Ç¤·¤ç¤¦¡£¥¢¥É¥ì¥¹¤ÎºÆ³ä¤êÅö¤Æ¤¬É¬Í×ÉÔ²ÄÈò
-    ¤È¤Ê¤Ã¤Æ¤¤¤ëº£Æü¤Î¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Ë¤ª¤¤¤Æ¤Ï¡¢
-    ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÃæ¤ÇÌÀ¼¨Åª¤Ê IP ¥¢¥É¥ì¥¹¤òÍ׵᤹¤ë»ÅÍͤϡ¢
-    Á´¤¯µ¹¤·¤¯¤¢¤ê¤Þ¤»¤ó¡£</p>
-
-    <p>ÅðÍѤΥµ¡¼¥Ó¥¹¥¢¥¿¥Ã¥¯¤Ë´Ø¤·¤Æ¹Ô¤Ê¤¦¤Ù¤­»ö¤Ï¡¢
-    DNS ½ç°ú¤­¤ò¹Ô¤Ê¤Ã¤ÆÆÀ¤é¤ì¤¿¥¢¥É¥ì¥¹¤ËÂФ¹¤ë DNS 
-    µÕ°ú¤­¤ò¹Ô¤Ê¤Ã¤Æ¡¢Æó¤Ä¤Î̾Á°¤òÈæ³Ó¤¹¤ë¤³¤È¤Ç¤¹¡£
-    ¤³¤ÎÆó¤Ä¤¬°ìÃפ·¤Ê¤±¤ì¤Ð¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ï̵¸ú¤Ë¤Ê¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
-    ¤³¤¦¤¹¤ë¤¿¤á¤Ë¤ÏµÕ°ú¤­ DNS ¤¬Å¬ÀÚ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹
-    (FTP ¥µ¡¼¥Ð¤ä TCP ¥é¥Ã¥Ñ¡¼¤Î¤ª¤«¤²¤Ç¡ÖÆó½ÅµÕ°ú¤­¡×DNS ¤Ï°ìÈÌŪ¤Ë
-    ¤Ê¤Ã¤Æ¤¤¤Þ¤¹¤Î¤Ç¡¢´ÉÍý¼Ô¤Ë¤Ï¤ªÆëÀ÷¤ß¤â¤Î¤Ç¤·¤ç¤¦)¡£</p>
-
-    <p>IP ¥¢¥É¥ì¥¹¤¬»ÈÍѤµ¤ì¤Æ¤¤¤Ê¤¯¤Æ DNS ¤¬¼ºÇÔ¤·¤¿¾ì¹ç¤Ï¡¢
-    ¤É¤¦¤·¤Æ¤â¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¥¦¥§¥Ö¥µ¡¼¥Ð¤ò¿®ÍêÀ­¤ò³ÎÊݤ·¤Æ
-    µ¯Æ°¤µ¤»¤ë¤³¤È¤ÏÉÔ²Äǽ¤Î¤è¤¦¤Ç¤¹¡£
-    ÀßÄê¤Î°ìÉô¤ò̵¸ú¤Ë¤¹¤ë¤È¤¤¤¦¤è¤¦¤ÊÉôʬŪ¤Ê²ò·è¤Ç¤Ï¡¢
-    ¥µ¡¼¥Ð¤¬²¿¤ò¤¹¤ë¤è¤¦¤Ë¤¹¤ë¤«¤Ë¤â¤è¤ê¤Þ¤¹¤¬¡¢
-    ¤½¤Î¥µ¡¼¥Ð¤¬µ¯Æ°¤·¤Ê¤¤¤è¤ê³Î¼Â¤Ë°­¤¤¾õ¶·¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>HTTP/1.1 ¤¬³«È¯¤µ¤ì¡¢¥Ö¥é¥¦¥¶¤ä¥×¥í¥­¥·¤¬ <code>Host</code>
-    ¥Ø¥Ã¥À¤òȯ¹Ô¤¹¤ë¤è¤¦¤Ë¤Ê¤Ã¤¿¤Î¤Ç¡¢IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò
-    Á´¤¯»ÈÍѤ·¤Ê¤¯¤Æ¤âºÑ¤à¤è¤¦¤Ë¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-    ¤³¤Î¾ì¹ç¡¢¥¦¥§¥Ö¥µ¡¼¥Ð¤ÏÀßÄêÃæ¤Ë DNS »²¾È¤ò¤·¤Ê¤¯¤Æ¤âºÑ¤ß¤Þ¤¹¡£
-    ¤·¤«¤· 1997 ǯ 3 ·î»þÅÀ¤Î¾õ¶·¤Ç¤Ï¡¢
-    ¾¦ÍÑ¥ì¥Ù¥ë¤Î¥¦¥§¥Ö¥µ¡¼¥Ð¤Ç»ÈÍѤǤ­¤ë¤Û¤É¤Ë¤Ï¡¢
-    ¤³¤ì¤é¤Îµ¡Ç½¤Ï¹­¤¯³«È¯¤¬¿Ê¤ó¤Ç¤¤¤Þ¤»¤ó¡£</p>
-  </div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./en/dns-caveats.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./ja/dns-caveats.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/dns-caveats.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/dns-caveats.html.ja.utf8 b/docs/manual/dns-caveats.html.ja.utf8
new file mode 100644
index 00000000..879087f8
--- /dev/null
+++ b/docs/manual/dns-caveats.html.ja.utf8
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>DNS � Apache ����る注�事項 - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>DNS � Apache ����る注�事項</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./en/dns-caveats.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./ja/dns-caveats.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/dns-caveats.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+
+    <p>本文書�内容�次�一言�尽���。「Apache �設定ファイルを読�込む���
+    DNS を使用�る必����よ����下���。Apache �設定ファイルを
+    読�込む��� DNS を使用�る必���る場��信頼性��題
+    (起動����も�れ��ん) やサービス拒�や盗用アタック
+    (他�ユーザ�らヒットを盗む��を����)
+    ��題�直��る�も�れ��ん。</p>
+  </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#example">簡��例</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#denial">サービス拒�</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#main">「主サー��アドレス</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#tips">以上��題を解決�る方法</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#appendix">付録: 将�的�方�性</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="example" id="example">簡��例</a></h2>
+    
+
+    <div class="example"><p><code>
+      &lt;VirtualHost www.abc.dom&gt; <br />
+      ServerAdmin webgirl@abc.dom <br />
+      DocumentRoot /www/abc <br />
+      &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    <p>Apache �正常�機能�る����ー�ャルホスト毎�必�二��
+    情報�必���り��。�れ��
+    <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code>
+    ����サー��応答�る��� IP (最低一�) ��。
+    上記例�� IP アドレスを�ん����ん���Apache � DNS
+    を使用�� <code>www.abc.dom</code> を見����れ��り��ん。
+    何ら���由�設定ファイルを読�込ん��る��� DNS 
+    �利用������場��
+    �ー�ャルホスト�<strong>設定�れ��ん</strong>。
+    �������ー�ャルホスト�対�るヒット��応答���れ��ん
+    (Apache 1.2 以���起動�ら���ん)。</p>
+
+    <p><code>www.abc.dom</code> �アドレス� 192.0.2.1
+    �����。���次�設定����考�����ょ�。</p>
+
+    <div class="example"><p><code>
+      &lt;VirtualHost 192.0.2.1&gt; <br />
+      ServerAdmin webgirl@abc.dom <br />
+      DocumentRoot /www/abc <br />
+      &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    <p>�在�リリース�� Apache � DNS 逆引�を使用��
+    ���ー�ャルホスト� <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code>
+    を見����。
+    ��逆引��失敗��場��部分的��ー�ャルホストを無効����
+    (Apache 1.2 より���起動�ら���ん)。
+    �ー�ャルホスト���ベース��れ�完全�無効��り����
+    IP ベース��れ�概�動作���。�����ら�サー��を
+    �む完全� URL を生����れ��ら��場���正�� URL
+    �生������ん。</p>
+
+    <p>次�例�上記��題を解決�����。</p>
+
+    <div class="example"><p><code>
+      &lt;VirtualHost 192.0.2.1&gt; <br />
+      ServerName www.abc.dom <br />
+      ServerAdmin webgirl@abc.dom <br />
+      DocumentRoot /www/abc <br />
+      &lt;/VirtualHost&gt;
+    </code></p></div>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="denial" id="denial">サービス拒�</a></h2>
+    
+
+    <p>サービス拒��起�る場��(少���も) 二��ケース��り��。
+    Apache 1.2 より�を実行���る場���ー�ャルホスト����
+    上記�二�� DNS 検索���一�失敗�れ�起動�ら���ん。
+    ����� DNS 検索�自分�制御下��ら��場�も�り���。
+    例���<code>abc.dom</code> �顧客�サー��一���
+    DNS �顧客自身�管����る場����
+    <code>www.abc.dom</code> レコードを削除�る����
+    (1.2 より��) サー�を起動�能��る�������。</p>
+
+    <p>も�一��ケース��より気付����も���。
+    次�設定����考�����ょ�。</p>
+
+    <div class="example"><p><code>
+      &lt;VirtualHost www.abc.dom&gt; <br />
+      &nbsp;&nbsp;ServerAdmin webgirl@abc.dom <br />
+      &nbsp;&nbsp;DocumentRoot /www/abc <br />
+      &lt;/VirtualHost&gt; <br />
+      <br />
+      &lt;VirtualHost www.def.dom&gt; <br />
+      &nbsp;&nbsp;ServerAdmin webguy@def.dom <br />
+      &nbsp;&nbsp;DocumentRoot /www/def <br />
+      &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    <p>192.0.2.1 を <code>www.abc.dom</code> ��
+    192.0.2.2 を <code>www.def.dom</code> �割り当���る����。
+    ���<code>def.dom</code> �顧客自身� DNS
+    �制御下��る����。��設定��<code>abc.dom</code>
+    ���られ�トラフィック全�を奪������る�置�
+    <code>def.dom</code> を設置������。後��� 
+    <code>www.def.dom</code> � 192.0.2.1 を�照�るよ��
+    設定�る����。DNS �顧客�� DNS �コントロール�れ��る���
+    <code>www.def.dom</code> レコード�好��場所を指�よ��
+    設定�������を止���る�������ん。</p>
+
+    <p>192.0.2.1 �対�るリクエスト
+    (<code>http://www.abc.dom/whatever</code> 形�� URL 
+    を入力��ユーザ�ら�も�全�を����) 
+    ��<code>def.dom</code> �ー�ャルホスト�応答�れ��。
+    ��よ�����何故起�る�も��良�知る�����
+    応答�必���ー�ャルホスト��リクエスト�対���
+    Apache ���よ��整�性を確��る������
+    深�議論�必���り��。������説明�<a href="vhosts/details.html">��ら</a>�記述�れ����。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="main" id="main">「主サー��アドレス</a></h2>
+    
+
+    <p>Apache 1.1 �� <a href="vhost/name-based.html">��ベース��ー�ャルホスト�サ�ート</a> 追加�際��
+    Apache � <code class="program"><a href="./programs/httpd.html">httpd</a></code> �実行�れ��るホスト� IP
+    アドレスを知る必��出�����。��アドレスを得る����
+    (も��れ�) グロー�ル�
+    <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code> を使用�る��
+    C 言語�関数 <code>gethostname</code> (コマンドプロンプト�
+    <code>hostname</code> �タイプ�������も�を返���)
+    を呼�出��を���。
+    ��後�得られ�アドレス� DNS 検索を行����。
+    �在������� DNS 検索を回��る方法��り��ん。</p>
+
+    <p>DNS サー��ダウン�����検索�����事態�起�る��を
+    �れ��る���れ��<code>/etc/hosts</code>
+    �ホスト�を記述�����������
+    (マシン�正常�起動�るよ��既�設定�れ��る�も�れ��ん)。
+    ��場��DNS �照�失敗��場��マシン� <code>/etc/hosts</code>
+    を使用�るよ��設定���る��を確�������。
+    ��方法���� OS を使用���る���存�����
+    <code>/etc/resolv.conf</code> � <code>/etc/nsswitch.conf</code>
+    を編集�る���設定����。</p>
+
+    <p>も�他��由� DNS を利用�る必����場���
+    <code>HOSTRESORDER</code> 環境変数を「 <code>local</code>
+    ��設定�る�����よ������。以上�れら�事柄���ん�
+    OS �レゾル�ライブラリを使用���る���存���。���
+    <code class="module"><a href="./mod/mod_env.html">mod_env</a></code> を使用��環境変数を制御����り�
+    CGI �も影響を与���。man ページや使用���る OS
+    � FAQ �調�る�良���ょ�。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="tips" id="tips">以上��題を解決�る方法</a></h2>
+    
+
+    <ul>
+      <li>
+        <code class="directive"><a href="./mod/core.html#virtualhost">VirtualHost</a></code>
+	� IP アドレスを使用�る。
+      </li>
+
+      <li>
+        <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
+	� IP アドレスを使用�る。
+      </li>
+
+      <li>
+	全���ー�ャルホスト�明示的�
+        <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code>
+	を��よ���る。
+      </li>
+
+      <li>何も応答���
+      <code>&lt;VirtualHost _default_:*&gt;</code>
+      サー�を作る。</li>
+    </ul>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="appendix" id="appendix">付録: 将�的�方�性</a></h2>
+    
+
+    <p>DNS �関����状�全�宜���り��ん。Apache 1.2 ��
+    DNS �イベント�失敗��も少���も起動プロセス�続�よ��������
+    �れ�最高�解決方法������ょ�。アドレス��割り当��必����
+    �����る今日�インター�ット������
+    設定ファイル�中�明示的� IP アドレスを�求�る仕様��
+    全�宜���り��ん。</p>
+
+    <p>盗用�サービスアタック�関��行����事��
+    DNS 順引�を行���得られ�アドレス�対�る DNS 
+    逆引�を行����二����を比較�る����。
+    ��二��一致���れ��ー�ャルホスト�無効��るよ�����。
+    ���る����逆引� DNS ��切�設定�れ��る必���り��
+    (FTP サー�や TCP ラッパー�����「二�逆引��DNS �一般的�
+    ���������管�者���馴染�も���ょ�)。</p>
+
+    <p>IP アドレス�使用�れ����� DNS �失敗��場���
+    ����も�ー�ャルホストウェブサー�を信頼性を確���
+    起動��る�����能�よ���。
+    設定�一部を無効��る���よ��部分的�解決���
+    サー��何を�るよ���る��もより����
+    ��サー��起動���より確実�悪�状���る��ょ�。</p>
+
+    <p>HTTP/1.1 �開発�れ�ブラウザやプロキシ� <code>Host</code>
+    ヘッダを発行�るよ��������IP ベース��ー�ャルホストを
+    全�使用����も済むよ���る�も�れ��ん。
+    ��場��ウェブサー��設定中� DNS �照を����も済���。
+    ��� 1997 年 3 月時点�状����
+    商用レベル�ウェブサー��使用��る�����
+    �れら�機能�広�開発�進ん����ん。</p>
+  </div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./en/dns-caveats.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./ja/dns-caveats.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/dns-caveats.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/dns-caveats.html.ko.euc-kr b/docs/manual/dns-caveats.html.ko.euc-kr
index 7ef811f4..a6016a0f 100644
--- a/docs/manual/dns-caveats.html.ko.euc-kr
+++ b/docs/manual/dns-caveats.html.ko.euc-kr
@@ -60,11 +60,11 @@
     ÀÌ °¡»óÈ£½ºÆ®´Â ¿äû¿¡ ÀÀ´äÇÒ ¼ö ¾ø´Ù. (¾ÆÆÄÄ¡ 1.2 ÀÌÀü
     ¹öÀü¿¡¼­´Â ½ÉÁö¾î ¼­¹ö°¡ ºÎÆõµ ¾ÈÇÑ´Ù.)</p>
 
-    <p><code>www.abc.dom</code>ÀÇ ÁÖ¼Ò°¡ 10.0.0.1À̶ó°í °¡Á¤ÇÏÀÚ.
+    <p><code>www.abc.dom</code>ÀÇ ÁÖ¼Ò°¡ 192.0.2.1À̶ó°í °¡Á¤ÇÏÀÚ.
     ±×¸®°í ´ÙÀ½ ¼³Á¤À» º¸¶ó:</p>
 
     <div class="example"><p><code>
-      &lt;VirtualHost 10.0.0.1&gt; <br />
+      &lt;VirtualHost 192.0.2.1&gt; <br />
       ServerAdmin webgirl@abc.dom <br />
       DocumentRoot /www/abc <br />
       &lt;/VirtualHost&gt;
@@ -81,7 +81,7 @@
     <p>¾Æ·¡ °æ¿ì ÀÌ µÎ°¡Áö ¹®Á¦°¡ ¾ø´Ù.</p>
 
     <div class="example"><p><code>
-      &lt;VirtualHost 10.0.0.1&gt; <br />
+      &lt;VirtualHost 192.0.2.1&gt; <br />
       ServerName www.abc.dom <br />
       ServerAdmin webgirl@abc.dom <br />
       DocumentRoot /www/abc <br />
@@ -114,18 +114,18 @@
       &lt;/VirtualHost&gt;
     </code></p></div>
 
-    <p>´ç½ÅÀÌ <code>www.abc.dom</code>¿¡ 10.0.0.1,
-    <code>www.def.dom</code>¿¡ 10.0.0.2¸¦ ÇÒ´çÇß´Ù°í ÇÏÀÚ.
+    <p>´ç½ÅÀÌ <code>www.abc.dom</code>¿¡ 192.0.2.1,
+    <code>www.def.dom</code>¿¡ 192.0.2.2¸¦ ÇÒ´çÇß´Ù°í ÇÏÀÚ.
     ¶Ç, <code>def.dom</code>Àº ÀÚü DNS¸¦ »ç¿ëÇÑ´Ù°í °¡Á¤ÇÏÀÚ.
     ÀÌ ¼³Á¤°ú ÇÔ²² <code>def.dom</code>À» <code>abc.dom</code>À¸·Î
     °¡´Â ¸ðµç Åë½ÅÀ» °¡·Îç ¼ö ÀÖ´Â Àå¼Ò¿¡ µÎ¾ú´Ù. ±×·¸´Ù¸é ±×µéÀº
-    <code>www.def.dom</code>À» 10.0.0.1·Î ¼³Á¤Çϱ⸸ ÇÏ¸é µÈ´Ù.
+    <code>www.def.dom</code>À» 192.0.2.1·Î ¼³Á¤Çϱ⸸ ÇÏ¸é µÈ´Ù.
     ±×µéÀÌ ÀÚü DNS¸¦ »ç¿ëÇϱ⶧¹®¿¡ ´ç½ÅÀº ±×µéÀÌ ¿øÇϴµ¥·Î
     <code>www.def.dom</code> ·¹Äڵ带 ¼³Á¤ÇÏ´Â °ÍÀ» ¸·À» ¼ö
     ¾ø´Ù.</p>
 
     <p>(»ç¿ëÀÚ°¡ <code>http://www.abc.dom/whatever</code> Çü½ÄÀÇ
-    URLÀ» ÀÔ·ÂÇÏ´Â °æ¿ì¸¦ Æ÷ÇÔÇÏ¿©) 10.0.0.1·Î ¿À´Â ¸ðµç ¿äûÀ»
+    URLÀ» ÀÔ·ÂÇÏ´Â °æ¿ì¸¦ Æ÷ÇÔÇÏ¿©) 192.0.2.1·Î ¿À´Â ¸ðµç ¿äûÀ»
     <code>def.dom</code> °¡»óÈ£½ºÆ®°¡ ¼­ºñ½ºÇÏ°Ô µÈ´Ù. ¿Ö ÀÌ·±
     ÀÏÀÌ ÀϾ´ÂÁö ÀÌÇØÇÏ·Á¸é ¾ÆÆÄÄ¡°¡ ¾î¶»°Ô °¡»óÈ£½ºÆ®·Î
     ¿À´Â ¿äûÀ» ó¸®ÇÏ´ÂÁö¿¡ ´ëÇÑ ¼³¸íÀÌ ÇÊ¿äÇÏ´Ù.
@@ -218,6 +218,6 @@
 <a href="./ja/dns-caveats.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/dns-caveats.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/dso.html b/docs/manual/dso.html
index 3d86148e..97df68ae 100644
--- a/docs/manual/dso.html
+++ b/docs/manual/dso.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: dso.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: dso.html.ja.euc-jp
+URI: dso.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: dso.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/dso.html.en b/docs/manual/dso.html.en
index b3ad061b..0c6accce 100644
--- a/docs/manual/dso.html.en
+++ b/docs/manual/dso.html.en
@@ -310,6 +310,6 @@ $ apxs -i -a -n foo mod_foo.la
 <a href="./ja/dso.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/dso.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/dso.html.ja.euc-jp b/docs/manual/dso.html.ja.euc-jp
deleted file mode 100644
index bad2567f..00000000
--- a/docs/manual/dso.html.ja.euc-jp
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>ưŪ¶¦Í­¥ª¥Ö¥¸¥§¥¯¥È (DSO) ¥µ¥Ý¡¼¥È - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>ưŪ¶¦Í­¥ª¥Ö¥¸¥§¥¯¥È (DSO) ¥µ¥Ý¡¼¥È</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./en/dso.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./ja/dso.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/dso.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-    <p>Apache HTTP ¥µ¡¼¥Ð¤Ï¥â¥¸¥å¡¼¥ë²½¤µ¤ì¤¿¥×¥í¥°¥é¥à¤Ç¡¢
-    ´ÉÍý¼Ô¤¬¥â¥¸¥å¡¼¥ë¤òÁªÂò¤¹¤ë¤³¤È¤Ç¥µ¡¼¥Ð¤ËÁȤ߹þ¤àµ¡Ç½¤òÁª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¥â¥¸¥å¡¼¥ë¤Ï¥µ¡¼¥Ð¤¬¥Ó¥ë¥É¤µ¤ì¤ë¤È¤­¤Ë <code class="program"><a href="./programs/httpd.html">httpd</a></code> ¥Ð¥¤¥Ê¥ê¤Ë
-    ÀÅŪ¤ËÁȤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤â¤·¤¯¤Ï¡¢<code class="program"><a href="./programs/httpd.html">httpd</a></code> ¥Ð¥¤¥Ê¥ê¤È¤Ï
-    Ê̤˸ºß¤¹¤ëưŪ¶¦Í­¥ª¥Ö¥¸¥§¥¯¥È (ÌõÃí: Dynamic Shared Object)
-    (DSO) ¤È¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤³¤È¤â
-    ¤Ç¤­¤Þ¤¹¡£DSO ¥â¥¸¥å¡¼¥ë¤Ï¥µ¡¼¥Ð¤¬¥Ó¥ë¥É¤µ¤ì¤ë¤È¤­¤Ë¥³¥ó¥Ñ¥¤¥ë¤·¤¿¤ê¡¢
-    Apache ³ÈÄ¥¥Ä¡¼¥ë (<code class="program"><a href="./programs/apxs.html">apxs</a></code>) ¤ò
-    »È¤Ã¤Æ¸å¤Ç¥³¥ó¥Ñ¥¤¥ë¤·¤ÆÄɲä·¤¿¤ê¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¤³¤Îʸ½ñ¤Ï DSO ¥â¥¸¥å¡¼¥ë¤Î»È¤¤Êý¤È¡¢»ÅÁȤߤˤĤ¤¤Æ
-    ÀâÌÀ¤·¤Þ¤¹¡£</p>
-  </div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#implementation">¼ÂÁõ</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#usage">»ÈÍÑË¡¤Î³µÍ×</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#background">ÇØ·Ê</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#advantages">ÍøÅÀ¤È·çÅÀ</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="implementation" id="implementation">¼ÂÁõ</a></h2>
-
-<table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_so.html">mod_so</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code></li></ul></td></tr></table>
-
-    <p>¸Ä¡¹¤Î Apache ¥â¥¸¥å¡¼¥ë¤ò¥í¡¼¥É¤¹¤ë¤¿¤á¤Î DSO ¥µ¥Ý¡¼¥È¤Ï
-    <code class="module"><a href="./mod/mod_so.c.html">mod_so.c</a></code> ¤È¤¤¤¦¥â¥¸¥å¡¼¥ë¤Îµ¡Ç½¤Ë´ð¤Å¤¤¤Æ¤¤¤Þ¤¹¡£
-    ¤³¤Î¥â¥¸¥å¡¼¥ë ¤Ï Apache ¤Î¥³¥¢¤ËÀÅŪ¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤½¤ì¤Ï <code class="module"><a href="./mod/core.c.html">core.c</a></code> °Ê³°¤Ç¤Ï DSO ¤Ë¤Ç¤­¤Ê¤¤Í£°ì¤Î
-    ¥â¥¸¥å¡¼¥ë¤Ç¤¹¡£»ö¼Â¾å¡¢Â¾¤Î¤¹¤Ù¤Æ¤Î Apache ¤Î¥â¥¸¥å¡¼¥ë¤Ï¡¢
-    <a href="install.html">¥¤¥ó¥¹¥È¡¼¥ë¤Îʸ½ñ</a>¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢
-    <code class="program"><a href="./programs/configure.html">configure</a></code> ¤Î
-    <code>--enable-<em>module</em>=shared</code> ¥ª¥×¥·¥ç¥ó¤Ç¤½¤ì¤¾¤ì¤ò
-    DSO ¥Ó¥ë¥É¤Ë¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢DSO ¥â¥¸¥å¡¼¥ë¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    <code>mod_foo.so</code> ¤Î¤è¤¦¤Ê DSO ¤Ë¥â¥¸¥å¡¼¥ë¤¬¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤ì¤Ð¡¢
-    <code>httpd.conf</code> ¥Õ¥¡¥¤¥ëÃæ¤Ç <code class="module"><a href="./mod/mod_so.html">mod_so</a></code> ¤Î
-    <code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¦¤³¤È¤Ç¥µ¡¼¥Ð¤Îµ¯Æ°¤äºÆµ¯Æ°»þ¤Ë¤³¤Î¥â¥¸¥å¡¼¥ë¤ò
-    ¥í¡¼¥É¤¹¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>Apache ¥â¥¸¥å¡¼¥ëÍѤΠ(Æä˥µ¡¼¥É¥Ñ¡¼¥Æ¥£¥â¥¸¥å¡¼¥ë¤Î) DSO ¥Õ¥¡¥¤¥ë¤Î
-    ºîÀ®¤ò´Êñ¤Ë¤¹¤ë¤¿¤á¤Ë¡¢<code class="program"><a href="./programs/apxs.html">apxs</a></code>
-    (<dfn>APache eXtenSion</dfn>) ¤È¤¤¤¦¿·¤·¤¤¥µ¥Ý¡¼¥È¥×¥í¥°¥é¥à¤¬¤¢¤ê¤Þ¤¹¡£
-    Apache ¤Î¥½¡¼¥¹¥Ä¥ê¡¼¤Î<em>³°¤Ç</em> DSO ¥â¥¸¥å¡¼¥ë¤ò¥Ó¥ë¥É¤¹¤ë¤¿¤á¤Ë
-    »È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£È¯ÁÛ¤Ïñ½ã¤Ç¤¹: Apache ¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Î
-    <code class="program"><a href="./programs/configure.html">configure</a></code>¡¢<code>make install</code> ¤Î¤È¤­¤Ë Apache ¤Î
-    C ¥Ø¥Ã¥À¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¡¢DSO ¥Ó¥ë¥ÉÍѤΥץé¥Ã¥È¥Õ¥©¡¼¥à°Í¸¤Î
-    ¥³¥ó¥Ñ¥¤¥é¤È¥ê¥ó¥«¤Î¥Õ¥é¥°¤ò <code class="program"><a href="./programs/apxs.html">apxs</a></code> ¥×¥í¥°¥é¥à¤ËÄɲä·¤Þ¤¹¡£
-    ¤³¤ì¤Ë¤è¤ê¡¢¥æ¡¼¥¶¤¬ Apache ¤ÎÇÛÉÛ¥½¡¼¥¹¥Ä¥ê¡¼¤Ê¤·¤Ç¡¢¤µ¤é¤Ë
-    DSO ¥µ¥Ý¡¼¥È¤Î¤¿¤á¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à°Í¸¤Î¥³¥ó¥Ñ¥¤¥é¤ä¥ê¥ó¥«¤Î
-    ¥Õ¥é¥°¤ò¤¤¤¸¤ë¤³¤È¤Ê¤¯ Apache ¤Î¥â¥¸¥å¡¼¥ë¤Î¥½¡¼¥¹¤ò¥³¥ó¥Ñ¥¤¥ë
-    ¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="usage" id="usage">»ÈÍÑË¡¤Î³µÍ×</a></h2>
-
-    <p>Apache 2.2 ¤Î DSO µ¡Ç½¤Î³µÎ¬¤òÃΤ뤳¤È¤¬¤Ç¤­¤ë¤¿¤á¤Î¡¢
-    û¤¯´Ê·é¤Ê³µÍפǤ¹:</p>
-
-    <ol>
-      <li>
-        <em>ÇÛÉÛ¤µ¤ì¤Æ¤¤¤ë</em> Apache ¥â¥¸¥å¡¼¥ë¡¢²¾¤Ë <code>mod_foo.c</code>
-        ¤È¤·¤Æ¡¢¤½¤ì¤ò DSO <code>mod_foo.so</code> ¤Ë¥Ó¥ë¥É¡¢¥¤¥ó¥¹¥È¡¼¥ë: 
-
-<div class="example"><p><code>
-$ ./configure --prefix=/path/to/install --enable-foo=shared<br />
-$ make install
-</code></p></div>
-      </li>
-
-      <li>
-        <em>¥µ¡¼¥É¥Ñ¡¼¥Æ¥£</em> Apache ¥â¥¸¥å¡¼¥ë¡¢²¾¤Ë <code>mod_foo.c</code>
-        ¤È¤·¤Æ¡¢¤½¤ì¤ò DSO <code>mod_foo.so</code> ¤Ë¥Ó¥ë¥É¡¢¥¤¥ó¥¹¥È¡¼¥ë:
-
-<div class="example"><p><code>
-$ ./configure --add-module=<var>module_type</var>:/path/to/3rdparty/mod_foo.c \<br />
-<span class="indent">
-  --enable-foo=shared<br />
-</span>
-$ make install
-</code></p></div>
-      </li>
-
-      <li>
-        ¶¦Í­¥â¥¸¥å¡¼¥ë¤Î <em>¸å¡¹¤Î¥¤¥ó¥¹¥È¡¼¥ë</em> ¤Î¤¿¤á¤Ë
-        Apache ¤òÀßÄê:
-
-<div class="example"><p><code>
-$ ./configure --enable-so<br />
-$ make install
-</code></p></div>
-      </li>
-
-      <li>
-        <em>¥µ¡¼¥É¥Ñ¡¼¥Æ¥£</em> Apache ¥â¥¸¥å¡¼¥ë¡¢²¾¤Ë <code>mod_foo.c</code>
-        ¤È¤·¤Æ¡¢¤½¤ì¤ò <code class="program"><a href="./programs/apxs.html">apxs</a></code> ¤ò»È¤Ã¤Æ
-        Apache ¥½¡¼¥¹¥Ä¥ê¡¼¤Î<em>³°¤Ç</em> DSO ¤Ë¥Ó¥ë¥É¡¢¥¤¥ó¥¹¥È¡¼¥ë:
-
-<div class="example"><p><code>
-$ cd /path/to/3rdparty<br />
-$ apxs -c mod_foo.c<br />
-$ apxs -i -a -n foo mod_foo.la
-</code></p></div>
-      </li>
-    </ol>
-
-    <p>¤É¤Î¾ì¹ç¤Ë¤ª¤¤¤Æ¤â¡¢¶¦Í­¥â¥¸¥å¡¼¥ë¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤¿¸å¤Ç¡¢
-    <code>httpd.conf</code> ¤Ç 
-    <code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ Apache ¤¬¥â¥¸¥å¡¼¥ë¤ò»ÈÍѤ¹¤ë¤è¤¦¤Ë
-    ¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="background" id="background">ÇØ·Ê</a></h2>
-
-    <p>ºÇ¶á¤Î Unix ·Ï¤Î OS ¤Ë¤Ï <em>ưŪ¶¦Í­¥ª¥Ö¥¸¥§¥¯¥È</em> (DSO)
-    ¤ÎưŪ¥ê¥ó¥¯/¥í¡¼¥É¤È¤¤¤¦µ¤¤Î¤­¤¤¤¿µ¡¹½¤¬
-    ¸ºß¤·¤Þ¤¹¡£¤³¤ì¤Ï¡¢¼Â¹Ô»þ¤Ë¥×¥í¥°¥é¥à¤Î¥¢¥É¥ì¥¹¶õ´Ö¤Ë
-    ¥í¡¼¥É¤Ç¤­¤ë¤è¤¦¤ÊÆÃÊ̤ʷÁ¼°¤Ç¥×¥í¥°¥é¥à¤ò¥Ó¥ë¥É¤¹¤ë¤³¤È¤ò
-    ²Äǽ¤Ë¤·¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¥í¡¼¥É¤ÏÆó¤Ä¤ÎÊýË¡¤Ç¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹: ¼Â¹Ô¥×¥í¥°¥é¥à¤¬
-    µ¯Æ°¤µ¤ì¤¿¤È¤­¤Ë <code>ld.so</code> ¤È¤¤¤¦¥·¥¹¥Æ¥à¥×¥í¥°¥é¥à
-    ¤Ë¤è¤ê¼«Æ°Åª¤Ë¹Ô¤Ê¤ï¤ì¤ëÊýË¡¤È¡¢¼Â¹Ô¥×¥í¥°¥é¥àÃ椫¤é¡¢¥·¥¹¥Æ¥à¥³¡¼¥ë
-    <code>dlopen()/dlsym()</code> ¤Ë¤è¤ë Unix ¥í¡¼¥À¤Ø¤Î
-    ¥×¥í¥°¥é¥à¥·¥¹¥Æ¥à¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò»È¤Ã¤Æ¼êÆ°¤Ç¹Ô¤Ê¤¦ÊýË¡¤È¤¬
-    ¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>ºÇ½é¤ÎÊýË¡¤Ç¤Ï DSO ¤ÏÉáÄ̤Ï<em>¶¦Í­¥é¥¤¥Ö¥é¥ê</em>¤ä <em>DSO
-    ¥é¥¤¥Ö¥é¥ê</em> ¤È¸Æ¤Ð¤ì¤Æ¤¤¤Æ¡¢DSO ¤Î̾Á°¤Ï
-    <code>libfoo.so</code> ¤ä <code>libfoo.so.1.2</code> ¤Î¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-    ¤³¤ì¤é¤Ï¥·¥¹¥Æ¥à¥Ç¥£¥ì¥¯¥È¥ê (Ä̾ï <code>/usr/lib</code>) ¤Ë¸ºß¤·¡¢
-    ¼Â¹Ô¥×¥í¥°¥é¥à¤Ø¤Î¥ê¥ó¥¯¤Ï¥Ó¥ë¥É»þ¤Ë <code>-lfoo</code> ¤ò¥ê¥ó¥«¤Ë
-    »ØÄꤹ¤ë¤³¤È¤Ç³ÎΩ¤µ¤ì¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¥é¥¤¥Ö¥é¥ê¤Ø¤Î»²¾È¤¬¼Â¹Ô¥×¥í¥°¥é¥à¤Î
-    ¥Õ¥¡¥¤¥ë¤Ë½ñ¤­¹þ¤Þ¤ì¤Æ¡¢µ¯Æ°»þ¤Ë Unix ¤Î¥í¡¼¥À¤¬ <code>/usr/lib</code> ¤ä¡¢
-    ¥ê¥ó¥«¤Î <code>-R</code> ¤Î¤è¤¦¤Ê¥ª¥×¥·¥ç¥ó¤Ë¤è¤ê¥Ï¡¼¥É¥³¡¼¥É¤µ¤ì¤¿¥Ñ¥¹¡¢
-    ´Ä¶­ÊÑ¿ô <code>LD_LIBRARY_PATH</code> ¤Ë¤è¤êÀßÄꤵ¤ì¤¿¥Ñ¥¹¡¢¤ÎÃ椫¤é
-    <code>libfoo.so</code> ¤Î¾ì½ê¤ò¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤½¤ì¤«¤é¡¢
-    ¼Â¹Ô¥×¥í¥°¥é¥àÃæ¤Î (¤Þ¤À̤²ò·è¤Î) ¥·¥ó¥Ü¥ë¤ò DSO ¤Ë¤¢¤ë¥·¥ó¥Ü¥ë¤Ç
-    ²ò·è¤·¤Þ¤¹¡£</p>
-
-    <p>ÉáÄÌ¤Ï¼Â¹Ô¥×¥í¥°¥é¥àÃæ¤Î¥·¥ó¥Ü¥ë¤Ï DSO ¤«¤é¤Ï»²¾È¤µ¤ì¤Þ¤»¤ó
-    (DSO ¤Ï°ìÈÌŪ¤Ê¥³¡¼¥É¤Ë¤è¤ëºÆÍøÍѲÄǽ¤Ê¥é¥¤¥Ö¥é¥ê¤Ç¤¹¤Î¤Ç)¡£
-    ¤Ç¤¹¤«¤é¡¢¤µ¤é¤Ê¤ë¥·¥ó¥Ü¥ë¤Î²ò·è¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£
-    ¥·¥ó¥Ü¥ë¤Ï Unix ¥í¡¼¥À¤Ë¤è¤ê´°Á´¤Ê²ò·è¤¬¹Ô¤Ê¤ï¤ì¤Þ¤¹¤Î¤Ç¡¢¼Â¹Ô¥Õ¥¡¥¤¥ë¼«¿È¤Ï
-    ²¿¤â¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤»¤ó¡£(¼ÂºÝ¤Î¤È¤³¤í¡¢ÀÅŪ¤Ç¤Ê¤¤ÊýË¡¤Ç¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤ë
-    ¤¹¤Ù¤Æ¤Î¼Â¹Ô¥×¥í¥°¥é¥à¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ë³«»ÏÍѤΥ³¡¼¥É¤Î°ìÉô¤Ë
-    <code>ld.so</code> ¤òµ¯Æ°¤¹¤ë¥³¡¼¥É¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹)¡£¤è¤¯»È¤ï¤ì¤ë
-    ¥é¥¤¥Ö¥é¥ê¤ÎưŪ¥í¡¼¥É¤ÎÍøÅÀ¤ÏÌÀ¤é¤«¤Ç¤¹¡£¥é¥¤¥Ö¥é¥ê¤Î¥³¡¼¥É¤Ï
-    ¥·¥¹¥Æ¥à¥é¥¤¥Ö¥é¥ê¤Ë <code>libc.so</code> ¤Î¤è¤¦¤Ë¤·¤Æ°ìÅÙÊݸ¤¹¤ë¤À¤±¤Ç¤è¤¯¡¢
-    ¥×¥í¥°¥é¥à¤Î¤¿¤á¤ËɬÍפʥǥ£¥¹¥¯¤ÎÎΰè¤òÀáÌ󤹤뤳¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>Æó¤Ä¤á¤ÎÊýË¡¤Ç¤Ï DSO ¤ÏÉáÄ̤Ï<em>¶¦Í­¥ª¥Ö¥¸¥§¥¯¥È</em>¤ä
-    <em>DSO ¥Õ¥¡¥¤¥ë</em>¤È¸Æ¤Ð¤ì¤Æ¤¤¤Æ¡¢Ç¤°Õ¤Î³ÈÄ¥»Ò¤òÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹
-    (¤¿¤À¤·¡¢É¸½àŪ¤Ê̾Á°¤Ï <code>foo.so</code> ¤Ç¤¹)¡£
-    ¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ÏÄ̾ï¤Ï¥×¥í¥°¥é¥àÀìÍѤΥǥ£¥ì¥¯¥È¥ê¤ËÃÖ¤«¤ì¡¢
-    ¤³¤ì¤é¤ò»È¤¦¼Â¹Ô¥×¥í¥°¥é¥à¤Ø¤Î¥ê¥ó¥¯¤Ï¼«Æ°Åª¤Ë¤Ï¤µ¤ì¤Þ¤»¤ó¡£
-    ¤Ç¤¹¤Î¤Ç¡¢¼Â¹Ô¥×¥í¥°¥é¥à¤Ï <code>dlopen()</code> ¤ò»È¤Ã¤Æ
-    ¼Â¹Ô»þ¤Ë¼êÆ°¤Ç DSO ¤ò¥×¥í¥°¥é¥à¤Î¥¢¥É¥ì¥¹¶õ´Ö¤Ë¥í¡¼¥É¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤Î»þÅÀ¤Ç¤Ï¼Â¹Ô¥×¥í¥°¥é¥à¤ËÂФ·¤Æ DSO ¤Î¥·¥ó¥Ü¥ë¤Î²ò·è¤Ï¹Ô¤Ê¤ï¤ì¤Þ¤»¤ó¡£
-    ¤·¤«¤·¡¢¤½¤ÎÂå¤ï¤ê¤Ë Unix ¤Î¥í¡¼¥À¤¬ DSO ¤Î (¤Þ¤À̤²ò·è¤Î) ¥·¥ó¥Ü¥ë¤ò
-    ¼Â¹Ô¥×¥í¥°¥é¥à¤Ë¤è¤ê¥¨¥¯¥¹¥Ý¡¼¥È¤µ¤ì¤¿¥·¥ó¥Ü¥ë¤È´û¤Ë¥í¡¼¥É¤µ¤ì¤¿
-    DSO ¥é¥¤¥Ö¥é¥ê¤Ë¤è¤ê¥¨¥¯¥¹¥Ý¡¼¥È¤µ¤ì¤¿¥·¥ó¥Ü¥ë (Æäˡ¢¤É¤³¤Ë¤Ç¤â¤¢¤ë
-    <code>libc.so</code> ¤Î¤¹¤Ù¤Æ¤Î¥·¥ó¥Ü¥ë) ¤Ç¼«Æ°Åª¤Ë²ò·è¤·¤Þ¤¹¡£
-    ¤³¤¦¤¹¤ë¤³¤È¤Ç¡¢DSO ¤ÏºÇ½é¤«¤éÀÅŪ¤Ë¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤¿¤«¤Î¤è¤¦¤Ë¡¢
-    ¼Â¹Ô¥×¥í¥°¥é¥à¤Î¥·¥ó¥Ü¥ë¤òÃΤ뤳¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>ºÇ¸å¤Ë¡¢DSO ¤Î API ¤òÍøÅÀ¤òÀ¸¤«¤¹¤¿¤á¤Ë¡¢¥×¥í¥°¥é¥à¤Ï
-    ¸å¤Ç¥Ç¥£¥¹¥Ñ¥Ã¥Á¥Æ¡¼¥Ö¥ë<em>¤Ê¤É</em>¤Ç¥·¥ó¥Ü¥ë¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¡¢
-    <code>dlsym()</code> ¤ò»È¤Ã¤Æ¤¤¤¯¤Ä¤«¤Î¥·¥ó¥Ü¥ë¤ò²ò·è¤·¤Þ¤¹¡£
-    ¤¹¤Ê¤ï¤Á: ¼Â¹Ô¥×¥í¥°¥é¥à¤ÏɬÍפʤ¹¤Ù¤Æ¤Î¥·¥ó¥Ü¥ë¤ò¼êÆ°¤Ç²ò·è¤·¤Ê¤±¤ì¤Ð
-    ¤Ê¤ê¤Þ¤»¤ó¡£¤³¤Îµ¡¹½¤ÎÍøÅÀ¤Ï¥×¥í¥°¥é¥à¤Î¥ª¥×¥·¥ç¥Ê¥ë¤ÊÉôʬ¤Ï
-    ɬÍפˤʤë¤Þ¤Ç¥í¡¼¥É¤¹¤ëɬÍפ¬¤Ê¤¤ (¤À¤«¤é¥á¥â¥ê¤â¾ÃÈñ¤·¤Ê¤¤)
-    ¤³¤È¤Ç¤¹¡£É¬Íפʤé¤Ð¡¢´ðËÜ¥×¥í¥°¥é¥à¤Îµ¡Ç½¤ò³ÈÄ¥¤¹¤ë¤¿¤á¤Ë
-    ¤³¤ì¤é¤ÎÉôʬ¤òưŪ¤Ë¥í¡¼¥É¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î DSO µ¡¹½¤Ï´Êñ¤Ê¤è¤¦¤Ë¸«¤¨¤Þ¤¹¤¬¡¢¾¯¤Ê¤¯¤È¤â°ì¤ÄÆñ¤·¤¤ÅÀ¤¬
-    ¤¢¤ê¤Þ¤¹: ¥×¥í¥°¥é¥à¤ò³ÈÄ¥¤¹¤ë¤¿¤á¤Ë DSO ¤ò»È¤Ã¤Æ¤¤¤ë¤È¤­¤Ë¡¢
-    DSO ¤¬¼Â¹Ô¥×¥í¥°¥é¥à¤«¤é¥·¥ó¥Ü¥ë¤ò²ò·è¤¹¤ëÅÀ¤Ç¤¹ (ÆóÈÖÌܤÎÊýË¡)¡£
-    ¤³¤ì¤Ï¤Ê¤¼¤Ç¤·¤ç¤¦¤«¡£¤½¤ì¤Ï¡¢DSO ¤Î¥·¥ó¥Ü¥ë¤ò¼Â¹Ô¥×¥í¥°¥é¥à¤Î
-    ¥·¥ó¥Ü¥ë¤«¤é¡ÖµÕ²ò·è¡×¤¹¤ë¤È¤¤¤¦¤Î¤Ï¥é¥¤¥Ö¥é¥ê¤ÎÀß·×
-    (¥é¥¤¥Ö¥é¥ê¤Ï¤½¤ì¤ò»ÈÍѤ¹¤ë¥×¥í¥°¥é¥à¤Î¤³¤È¤Ï²¿¤â
-    ÃΤé¤Ê¤¤) ¤ËÈ¿¤·¤Æ¤¤¤Æ¡¢¤³¤Îµ¡Ç½¤Ï¤¹¤Ù¤Æ¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ë
-    ¤¢¤ë¤ï¤±¤Ç¤Ï¤Ê¤¯¡¢É¸½à²½¤â¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¤é¤Ç¤¹¡£
-    ¼ÂºÝ¤Ë¤Ï¼Â¹Ô¥×¥í¥°¥é¥à¤Î¥°¥í¡¼¥Ð¥ë¤Ê¥·¥ó¥Ü¥ë¤ÏºÆ¥¨¥¯¥¹¥Ý¡¼¥È¤µ¤ì¤ë¤³¤È¤Ï
-    ¤¢¤Þ¤ê¤Ê¤¯¡¢DSO ¤«¤é»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£¥ê¥ó¥«¤Ë¥°¥í¡¼¥Ð¥ë¥·¥ó¥Ü¥ë¤¹¤Ù¤Æ¤ò
-    ¥¨¥¯¥¹¥Ý¡¼¥È¤¹¤ë¤è¤¦¤Ë¤µ¤»¤ëÊýË¡¤ò¸«¤Ä¤±¤ë¤³¤È¤¬¡¢¼Â¹Ô»þ¤Ë¥×¥í¥°¥é¥à¤ò
-    ³ÈÄ¥¤¹¤ë¤¿¤á¤Ë DSO ¤ò»È¤¦¤È¤­¤Î°ìÈÖ¤ÎÌäÂê¤Ç¤¹¡£</p>
-
-    <p>¶¦Í­¥é¥¤¥Ö¥é¥ê¤Î¥¢¥×¥í¡¼¥Á¤¬ÉáÄ̤ÎÊýË¡¤Ç¤¹¡£DSO µ¡¹½¤Ï¤½¤Î¤¿¤á¤Ë
-    À߷פµ¤ì¤¿¤â¤Î¤Ç¤¹¤«¤é¡£¤·¤¿¤¬¤Ã¤Æ¡¢¤½¤ÎÊýË¡¤Ï¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤¬
-    Ä󶡤¹¤ë¤Û¤È¤ó¤É¤¹¤Ù¤Æ¤Î¼ïÎà¤Î¥é¥¤¥Ö¥é¥ê¤Ç»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
-    °ìÊý¡¢¥×¥í¥°¥é¥à¤Î³ÈÄ¥¤Î¤¿¤á¤Ë¶¦Í­¥ª¥Ö¥¸¥§¥¯¥È¤ò»ÈÍѤ¹¤ë¡¢¤È¤¤¤¦Êý¤Ï
-    ¤¢¤Þ¤ê»È¤ï¤ì¤Æ¤¤¤Þ¤»¤ó¡£</p>
-
-    <p>1998 ǯ¤Î»þÅÀ¤Ç¡¢¼Â¹Ô»þ¤Ë¼ÂºÝ¤Ëµ¡Ç½³ÈÄ¥¤Î¤¿¤á¤Ë DSO µ¡¹½¤ò»È¤Ã¤Æ¤¤¤ë
-    ¥½¥Õ¥È¥¦¥§¥¢¥Ñ¥Ã¥±¡¼¥¸¤Ï¾¯¤·¤À¤±¤Ç¤·¤¿: Perl 5 (XS µ¡¹½¤È DnaLoader ¥â¥¸¥å¡¼¥ë
-    ¤Ë¤è¤ë¤â¤Î)¡¢Netscape ¥µ¡¼¥Ð<em>¤Ê¤É</em>¤Ç¤¹¡£Apache ¤Ï¤¹¤Ç¤Ë
-    ¥â¥¸¥å¡¼¥ë¤Î³µÇ°¤ò»È¤Ã¤Æµ¡Ç½³ÈÄ¥¤ò¤·¤Æ¤¤¤Æ¡¢ÆâÉôŪ¤Ë¥Ç¥£¥¹¥Ñ¥Ã¥Á¥ê¥¹¥È¤Ë
-    ´ð¤Å¤¤¤¿³°Éô¥â¥¸¥å¡¼¥ë¤Î Apache ¥³¥¢µ¡Ç½¤Ø¤Î¥ê¥ó¥¯¤ò¹Ô¤Ê¤Ã¤Æ¤¤¤Þ¤·¤¿¤Î¤Ç¡¢
-    ¥Ð¡¼¥¸¥ç¥ó 1.3 ¤«¤é¡¢Apache ¤â DSO µ¡¹½¤ò»È¤¦Ãç´Ö¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
-    Apache ¤Ï¼Â¹Ô»þ¤Ë DSO ¤ò»È¤Ã¤Æ¥â¥¸¥å¡¼¥ë¤ò¥í¡¼¥É¤¹¤ë¤è¤¦¤Ë¤¹¤Ç¤Ë
-    ±¿Ì¿ÉÕ¤±¤é¤ì¤Æ¤¤¤¿¤Î¤Ç¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="advantages" id="advantages">ÍøÅÀ¤È·çÅÀ</a></h2>
-
-    <p>¾åµ­¤Î DSO ¤Ë´ð¤Å¤¤¤¿µ¡Ç½¤Ï°Ê²¼¤ÎÍøÅÀ¤¬¤¢¤ê¤Þ¤¹:</p>
-
-    <ul>
-      <li>¼ÂºÝ¤Î¥µ¡¼¥Ð¥×¥í¥»¥¹¤òÁȤßΩ¤Æ¤ë¤¿¤á¤Ë¡¢
-      ¥Ó¥ë¥É»þ¤Ë <code>configure</code> ¤Î¥ª¥×¥·¥ç¥ó¤ò»È¤¦Âå¤ï¤ê¤Ë
-      ¼Â¹Ô»þ¤Ë <code>httpd.conf</code> ¤ÎÀßÄêÍÑ¥³¥Þ¥ó¥É
-      <code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code>
-      ¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¤Î¤Ç¡¢¥µ¡¼¥Ð¥Ñ¥Ã¥±¡¼¥¸¤Î½ÀÆðÀ­¤¬¹â¤Þ¤ê¤Þ¤·¤¿¡£
-      ¤¿¤È¤¨¤Ð¡¢°ì¤Ä¤Î Apache ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤«¤é
-      °ã¤¦¹½À®¤Î¥µ¡¼¥Ð (ɸ½àÈÇ¤È SSL ÈÇ¡¢ºÇ¾®¹½À®¤È³ÈÄ¥ÈÇ [mod_perl, PHP3]
-      <em>¤Ê¤É</em>) ¤ò¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</li>
-
-      <li>¥¤¥ó¥¹¥È¡¼¥ë¤Î¸å¤Ç¤¢¤Ã¤Æ¤â¡¢¥µ¡¼¥Ð¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¥µ¡¼¥É¥Ñ¡¼¥Æ¥£
-      ¥â¥¸¥å¡¼¥ë¤Ç´Êñ¤Ë³ÈÄ¥¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£¤³¤ì¤Ï¡¢Apache ¥³¥¢
-      ¥Ñ¥Ã¥±¡¼¥¸¤È¡¢PHP3, mod_perl, mod_fastcgi <em>¤Ê¤É</em> ¤ÎÄɲäÎ
-      ¥Ñ¥Ã¥±¡¼¥¸¤òºîÀ®¤Ç¤­¤ë¤Î¤Ç¡¢¾¯¤Ê¤¯¤È¤â¥Ù¥ó¥À¤Î¥Ñ¥Ã¥±¡¼¥¸´ÉÍý¼Ô¤Ë¤È¤Ã¤Æ
-      Â礭¤ÊÍøÅÀ¤¬¤¢¤ê¤Þ¤¹¡£</li>
-
-      <li>Apache ¥â¥¸¥å¡¼¥ë¤Î³«È¯¤¬´Êñ¤Ë¤Ê¤ê¤Þ¤¹¡£
-      ¤³¤ì¤Ï DSO ¤È <code class="program"><a href="./programs/apxs.html">apxs</a></code> ¤ÎÁȤ߹ç¤ï¤»¤Ë¤è¤ê¡¢Apache ¥½¡¼¥¹¥Ä¥ê¡¼¤Î
-      ³°¤Çºî¶È¤Ç¤­¡¢³«È¯Ãæ¤Î¥â¥¸¥å¡¼¥ë¤Î¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤ò
-      ¼Â¹ÔÃæ¤Î Apache ¥µ¡¼¥Ð¤ËÁȤ߹þ¤à¤¿¤á¤Ë <code>apxs -i</code> ¤È
-      <code>apachectl restart</code> ¤ò¹Ô¤Ê¤¦¤À¤±¤ÇÎɤ¯¤Ê¤ë¤«¤é¤Ç¤¹¡£</li>
-    </ul>
-
-    <p>DSO ¤Ë¤Ï°Ê²¼¤Î·çÅÀ¤¬¤¢¤ê¤Þ¤¹:</p>
-
-    <ul>
-      <li>¤¹¤Ù¤Æ¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤¬¥×¥í¥°¥é¥à¤Î¥¢¥É¥ì¥¹¶õ´Ö¤Ë
-      ¥³¡¼¥É¤òưŪ¥í¡¼¥É¤¹¤ë¤³¤È¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤ï¤Ç¤Ï¤Ê¤¤¤Î¤Ç¡¢
-      ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ë¤è¤Ã¤Æ¤Ï DSO µ¡¹½¤Ï»È¤¨¤Þ¤»¤ó¡£</li>
-
-      <li>Unix ¤Î¥í¡¼¥À¤¬¥·¥ó¥Ü¥ë¤Î²ò·è¤ò¤¹¤ëɬÍפ¬¤Ç¤­¤¿¤Î¤Ç¡¢
-      ¤½¤Î¥ª¡¼¥Ð¥Ø¥Ã¥É¤Ë¤è¤ê¥µ¡¼¥Ð¤Îµ¯Æ°»þ´Ö¤¬Ìó 20% ÃÙ¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</li>
-
-      <li>°ÌÃÖÈó°Í¸¥³¡¼¥É (PIC) (ÌõÃí position independent code) ¤Ï
-      ÁêÂÐ¥¢¥É¥ì¥¹¤Î¤¿¤á¤ËÊ£»¨¤Ê¥¢¥»¥ó¥Ö¥é¤Î¥È¥ê¥Ã¥¯¤¬É¬Íפʤ³¤È¤¬¤¢¤ê¡¢
-      ¤½¤ì¤Ïɬ¤º¤·¤âÀäÂÐ¥¢¥É¥ì¥¹¤ÈƱ¤¸¤¯¤é¤¤¤Î®ÅÙ¤¬¤Ç¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤Î¤Ç¡¢
-      ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ë¤è¤Ã¤Æ¤Ï¥µ¡¼¥Ð¤Î¼Â¹Ô®ÅÙ¤¬Ìó 5% ÃÙ¤¯¤Ê¤ê¤Þ¤¹¡£</li>
-
-      <li>DSO ¥â¥¸¥å¡¼¥ë¤Ï¤¹¤Ù¤Æ¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¾¤Î DSO ¤Ë´ð¤Å¤¤¤¿
-      ¥é¥¤¥Ö¥é¥ê¤ËÂФ·¤Æ¥ê¥ó¥¯¤Ç¤­¤ë (<code>ld -lfoo</code>)
-      ¤È¤¤¤¦¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤Î¤Ç (¤¿¤È¤¨¤Ð¡¢a.out ¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Ï
-      ¤³¤Îµ¡Ç½¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢ELF ¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ë¤Ï¤¢¤ê¤Þ¤¹)¡¢
-      ¤¹¤Ù¤Æ¤Î¼ïÎà¤Î¥â¥¸¥å¡¼¥ë¤Ë DSO µ¡¹½¤ò»È¤¨¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-      ¸À¤¤´¹¤¨¤ë¤È¡¢DSO ¥Õ¥¡¥¤¥ë¤È¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤¿¥â¥¸¥å¡¼¥ë¤Î
-      »È¤¨¤ë¥·¥ó¥Ü¥ë¤Ï¡¢
-      Apache ¤Î¥³¥¢¤Î¥·¥ó¥Ü¥ë¡¢C ¥é¥¤¥Ö¥é¥ê (<code>libc</code>) ¤È
-      Apache ¥³¥¢¤¬»È¤Ã¤Æ¤¤¤ë¾¤Î¤¹¤Ù¤Æ¤ÎÀÅŪ¤Ê¥é¥¤¥Ö¥é¥ê¤ÈưŪ¥é¥¤¥Ö¥é¥ê¤Î
-      ¥·¥ó¥Ü¥ë¡¢PIC ¤Ë¤è¤ëÀÅŪ¤Ê¥é¥¤¥Ö¥é¥ê (<code>libfoo.a</code>) ¤Î
-      ¥·¥ó¥Ü¥ë¤Î¤ß¤ËÀ©¸Â¤µ¤ì¤Þ¤¹¡£¤½¤Î¾¤Î¥³¡¼¥É¤ò»È¤¦ÊýË¡¤Ï¡¢
-      Apache ¥³¥¢¼«¿È¤¬¤¹¤Ç¤Ë¤½¤Î¥³¡¼¥É¤Ø¤Î»²¾È¤¬¤¢¤ë¤è¤¦¤Ë¤¹¤ë¤«¡¢
-      <code>dlopen ()</code> ¤ò»È¤Ã¤Æ¥³¡¼¥É¤ò¼«Ê¬¼«¿È¤Ç¥í¡¼¥É¤¹¤ë¤«¤Î
-     ¤É¤Á¤é¤«¤·¤«¤¢¤ê¤Þ¤»¤ó¡£</li>
-    </ul>
-
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./en/dso.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./ja/dso.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/dso.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/dso.html.ja.utf8 b/docs/manual/dso.html.ja.utf8
new file mode 100644
index 00000000..64ab58ab
--- /dev/null
+++ b/docs/manual/dso.html.ja.utf8
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>動的共有オブジェクト (DSO) サ�ート - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>動的共有オブジェクト (DSO) サ�ート</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./en/dso.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./ja/dso.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/dso.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+
+    <p>Apache HTTP サー��モジュール化�れ�プログラム��
+    管�者�モジュールを�択�る���サー��組�込む機能を���������。
+    モジュール�サー��ビルド�れる��� <code class="program"><a href="./programs/httpd.html">httpd</a></code> �イナリ�
+    �的�組�込む�������。も����<code class="program"><a href="./programs/httpd.html">httpd</a></code> �イナリ��
+    別�存在�る動的共有オブジェクト (訳注: Dynamic Shared Object)
+    (DSO) ���コンパイル�る��も
+    ����。DSO モジュール�サー��ビルド�れる���コンパイル��り�
+    Apache 拡張ツール (<code class="program"><a href="./programs/apxs.html">apxs</a></code>) を
+    使��後�コンパイル��追加��り����。</p>
+
+    <p>��文書� DSO モジュール�使�方��仕組�����
+    説明���。</p>
+  </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#implementation">実装</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#usage">使用法�概�</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#background">背景</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#advantages">利点�欠点</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="implementation" id="implementation">実装</a></h2>
+
+<table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_so.html">mod_so</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code></li></ul></td></tr></table>
+
+    <p>個々� Apache モジュールをロード�る��� DSO サ�ート�
+    <code class="module"><a href="./mod/mod_so.c.html">mod_so.c</a></code> ���モジュール�機能�基������。
+    ��モジュール � Apache �コア��的�組�込�れ��る必���り��。
+    �れ� <code class="module"><a href="./mod/core.c.html">core.c</a></code> 以外�� DSO �����唯一�
+    モジュール��。事実上�他����� Apache �モジュール��
+    <a href="install.html">インストール�文書</a>�説明�れ��るよ���
+    <code class="program"><a href="./programs/configure.html">configure</a></code> �
+    <code>--enable-<em>module</em>=shared</code> オプション��れ�れを
+    DSO ビルド��る���より�DSO モジュール��る�������。
+    <code>mod_foo.so</code> �よ�� DSO �モジュール�コンパイル�れれ��
+    <code>httpd.conf</code> ファイル中� <code class="module"><a href="./mod/mod_so.html">mod_so</a></code> �
+    <code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code>
+    ディレクティブを使����サー��起動や�起動時���モジュールを
+    ロード�るよ������。</p>
+
+    <p>Apache モジュール用� (特�サードパーティモジュール�) DSO ファイル�
+    作�を簡���る����<code class="program"><a href="./programs/apxs.html">apxs</a></code>
+    (<dfn>APache eXtenSion</dfn>) ���新��サ�ートプログラム��り��。
+    Apache �ソースツリー�<em>外�</em> DSO モジュールをビルド�る���
+    使��������。発想��純��: Apache �インストール時�
+    <code class="program"><a href="./programs/configure.html">configure</a></code>�<code>make install</code> ���� Apache �
+    C ヘッダをインストール��DSO ビルド用�プラットフォーム�存�
+    コンパイラ�リンカ�フラグを <code class="program"><a href="./programs/apxs.html">apxs</a></code> プログラム�追加���。
+    �れ�より�ユーザ� Apache ��布ソースツリー�����ら�
+    DSO サ�ート����プラットフォーム�存�コンパイラやリンカ�
+    フラグを��る���� Apache �モジュール�ソースをコンパイル
+    ��るよ���り��。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="usage" id="usage">使用法�概�</a></h2>
+
+    <p>Apache 2.2 � DSO 機能�概略を知る�����る����
+    短�簡潔�概���:</p>
+
+    <ol>
+      <li>
+        <em>�布�れ��る</em> Apache モジュール�仮� <code>mod_foo.c</code>
+        �����れを DSO <code>mod_foo.so</code> �ビルド�インストール: 
+
+<div class="example"><p><code>
+$ ./configure --prefix=/path/to/install --enable-foo=shared<br />
+$ make install
+</code></p></div>
+      </li>
+
+      <li>
+        <em>サードパーティ</em> Apache モジュール�仮� <code>mod_foo.c</code>
+        �����れを DSO <code>mod_foo.so</code> �ビルド�インストール:
+
+<div class="example"><p><code>
+$ ./configure --add-module=<var>module_type</var>:/path/to/3rdparty/mod_foo.c \<br />
+<span class="indent">
+  --enable-foo=shared<br />
+</span>
+$ make install
+</code></p></div>
+      </li>
+
+      <li>
+        共有モジュール� <em>後々�インストール</em> ����
+        Apache を設定:
+
+<div class="example"><p><code>
+$ ./configure --enable-so<br />
+$ make install
+</code></p></div>
+      </li>
+
+      <li>
+        <em>サードパーティ</em> Apache モジュール�仮� <code>mod_foo.c</code>
+        �����れを <code class="program"><a href="./programs/apxs.html">apxs</a></code> を使��
+        Apache ソースツリー�<em>外�</em> DSO �ビルド�インストール:
+
+<div class="example"><p><code>
+$ cd /path/to/3rdparty<br />
+$ apxs -c mod_foo.c<br />
+$ apxs -i -a -n foo mod_foo.la
+</code></p></div>
+      </li>
+    </ol>
+
+    <p>��場�����も�共有モジュールをコンパイル��後��
+    <code>httpd.conf</code> � 
+    <code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code>
+    ディレクティブを使�� Apache �モジュールを使用�るよ��
+    ���れ��り��ん。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="background" id="background">背景</a></h2>
+
+    <p>最近� Unix 系� OS �� <em>動的共有オブジェクト</em> (DSO)
+    �動的リンク/ロード���気����機構�
+    存在���。�れ��実行時�プログラム�アドレス空間�
+    ロード��るよ��特別�形��プログラムをビルド�る��を
+    �能����。</p>
+
+    <p>��ロード�二��方法�行���������: 実行プログラム�
+    起動�れ���� <code>ld.so</code> ���システムプログラム
+    �より自動的�行��れる方法��実行プログラム中�ら�システムコール
+    <code>dlopen()/dlsym()</code> �よる Unix ローダ��
+    プログラムシステム�インタフェースを使��手動�行��方法��
+    �り��。</p>
+
+    <p>最��方法�� DSO �普通�<em>共有ライブラリ</em>や <em>DSO
+    ライブラリ</em> �呼�れ����DSO ����
+    <code>libfoo.so</code> や <code>libfoo.so.1.2</code> �よ��������。
+    �れら�システムディレクトリ (通常 <code>/usr/lib</code>) �存在��
+    実行プログラム��リンク�ビルド時� <code>-lfoo</code> をリンカ�
+    指定�る���確立�れ��。�れ�よりライブラリ���照�実行プログラム�
+    ファイル�書�込�れ��起動時� Unix �ローダ� <code>/usr/lib</code> や�
+    リンカ� <code>-R</code> �よ��オプション�より�ードコード�れ�パス�
+    環境変数 <code>LD_LIBRARY_PATH</code> �より設定�れ�パス��中�ら
+    <code>libfoo.so</code> �場所を見��る�������。�れ�ら�
+    実行プログラム中� (��未解決�) シンボルを DSO ��るシンボル�
+    解決���。</p>
+
+    <p>普通�実行プログラム中�シンボル� DSO �ら��照�れ��ん
+    (DSO �一般的�コード�よる�利用�能�ライブラリ����)。
+    ���ら��ら�るシンボル�解決�必��り��ん。
+    シンボル� Unix ローダ�より完全�解決�行��れ�����実行ファイル自身�
+    何も�る必���り��ん。(実際������的���方法�リンク�れ��る
+    ����実行プログラム�組�込�れ��る開始用�コード�一部�
+    <code>ld.so</code> を起動�るコード���れ����)。よ�使�れる
+    ライブラリ�動的ロード�利点�明ら���。ライブラリ�コード�
+    システムライブラリ� <code>libc.so</code> �よ����一度�存�る���よ��
+    プログラム����必��ディスク�領域を節約�る�������。</p>
+
+    <p>二���方法�� DSO �普通�<em>共有オブジェクト</em>や
+    <em>DSO ファイル</em>�呼�れ����任��拡張�を付�る�������
+    (����標準的���� <code>foo.so</code> ��)。
+    �れら�ファイル�通常�プログラム専用�ディレクトリ�置�れ�
+    �れらを使�実行プログラム��リンク�自動的���れ��ん。
+    �����実行プログラム� <code>dlopen()</code> を使��
+    実行時�手動� DSO をプログラム�アドレス空間�ロード�る必���り��。
+    ��時点��実行プログラム�対�� DSO �シンボル�解決�行��れ��ん。
+    ������代�り� Unix �ローダ� DSO � (��未解決�) シンボルを
+    実行プログラム�よりエクス�ート�れ�シンボル�既�ロード�れ�
+    DSO ライブラリ�よりエクス�ート�れ�シンボル (特������も�る
+    <code>libc.so</code> �����シンボル) �自動的�解決���。
+    ���る����DSO �最��ら�的�リンク�れ�����よ���
+    実行プログラム�シンボルを知る�������。</p>
+
+    <p>最後��DSO � API を利点を生������プログラム�
+    後�ディスパッ�テーブル<em>��</em>�シンボルを使������るよ���
+    <code>dlsym()</code> を使�������シンボルを解決���。
+    ����: 実行プログラム�必������シンボルを手動�解決���れ�
+    �り��ん。��機構�利点�プログラム�オプショナル�部分�
+    必���る��ロード�る必���� (��らメモリも消費���)
+    ����。必��ら��基本プログラム�機能を拡張�る���
+    �れら�部分を動的�ロード�る�������。</p>
+
+    <p>�� DSO 機構�簡��よ��見�����少���も一�難��点�
+    �り��: プログラムを拡張�る��� DSO を使���る����
+    DSO �実行プログラム�らシンボルを解決�る点�� (二番目�方法)。
+    �れ�����ょ��。�れ��DSO �シンボルを実行プログラム�
+    シンボル�ら「逆解決��る�����ライブラリ�設計
+    (ライブラリ��れを使用�るプログラム����何も
+    知ら��) ���������機能�����プラットフォーム�
+    �る�������標準化も�れ�����ら��。
+    実際��実行プログラム�グロー�ル�シンボル��エクス�ート�れる���
+    ��り���DSO �ら使��������ん。リンカ�グロー�ルシンボル���を
+    エクス�ート�るよ����る方法を見��る����実行時�プログラムを
+    拡張�る��� DSO を使����一番��題��。</p>
+
+    <p>共有ライブラリ�アプロー��普通�方法��。DSO 機構������
+    設計�れ�も����ら。��������方法�オペレーティングシステム�
+    �供�る��ん�����種類�ライブラリ�使�れ����。
+    一方�プログラム�拡張����共有オブジェクトを使用�る����方�
+    ��り使�れ����ん。</p>
+
+    <p>1998 年�時点��実行時�実際�機能拡張���� DSO 機構を使���る
+    ソフトウェアパッケージ�少������: Perl 5 (XS 機構� DnaLoader モジュール
+    �よるも�)�Netscape サー�<em>��</em>��。Apache ����
+    モジュール�概念を使��機能拡張を�����内部的�ディスパッ�リスト�
+    基���外部モジュール� Apache コア機能��リンクを行����������
+    �ージョン 1.3 �ら�Apache も DSO 機構を使�仲間��り���。
+    Apache �実行時� DSO を使��モジュールをロード�るよ�����
+    �命付�られ������。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="advantages" id="advantages">利点�欠点</a></h2>
+
+    <p>上記� DSO �基���機能�以下�利点��り��:</p>
+
+    <ul>
+      <li>実際�サー�プロセスを組�立�る����
+      ビルド時� <code>configure</code> �オプションを使�代�り�
+      実行時� <code>httpd.conf</code> �設定用コマンド
+      <code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code>
+      を使�����������サー�パッケージ�柔軟性�高�り���。
+      �����一�� Apache �インストール�ら
+      ��構��サー� (標準版� SSL 版�最�構��拡張版 [mod_perl, PHP3]
+      <em>��</em>) を実行�る�������。</li>
+
+      <li>インストール�後����も�サー��パッケージをサードパーティ
+      モジュール�簡��拡張��るよ���り���。�れ��Apache コア
+      パッケージ��PHP3, mod_perl, mod_fastcgi <em>��</em> �追加�
+      パッケージを作���る���少���もベンダ�パッケージ管�者����
+      大��利点��り��。</li>
+
+      <li>Apache モジュール�開発�簡���り��。
+      �れ� DSO � <code class="program"><a href="./programs/apxs.html">apxs</a></code> �組�����より�Apache ソースツリー�
+      外�作業���開発中�モジュール�新���ージョンを
+      実行中� Apache サー��組�込む��� <code>apxs -i</code> �
+      <code>apachectl restart</code> を行�����良��る�ら��。</li>
+    </ul>
+
+    <p>DSO ��以下�欠点��り��:</p>
+
+    <ul>
+      <li>����オペレーティングシステム�プログラム�アドレス空間�
+      コードを動的ロード�る��をサ�ート���る��������
+      プラットフォーム�よ��� DSO 機構�使���ん。</li>
+
+      <li>Unix �ローダ�シンボル�解決を�る必��������
+      ��オー�ヘッド�よりサー��起動時間�約 20% ��������。</li>
+
+      <li>�置��存コード (PIC) (訳注 position independent code) �
+      相対アドレス����複雑�アセンブラ�トリック�必������り�
+      �れ�必��も絶対アドレス����ら��速度��る�����り��ん���
+      プラットフォーム�よ���サー��実行速度�約 5% ���り��。</li>
+
+      <li>DSO モジュール�����プラットフォーム�他� DSO �基���
+      ライブラリ�対��リンク��る (<code>ld -lfoo</code>)
+      ��������り��ん�� (�����a.out �プラットフォーム��
+      ��機能��り��ん��ELF �プラットフォーム���り��)�
+      ����種類�モジュール� DSO 機構を使�る�����り��ん。
+      言���る��DSO ファイル���コンパイル�れ�モジュール�
+      使�るシンボル��
+      Apache �コア�シンボル�C ライブラリ (<code>libc</code>) �
+      Apache コア�使���る他������的�ライブラリ�動的ライブラリ�
+      シンボル�PIC �よる�的�ライブラリ (<code>libfoo.a</code>) �
+      シンボル���制��れ��。��他�コードを使�方法��
+      Apache コア自身������コード���照��るよ���る��
+      <code>dlopen ()</code> を使��コードを自分自身�ロード�る��
+     ��ら����り��ん。</li>
+    </ul>
+
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./en/dso.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./ja/dso.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/dso.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/dso.html.ko.euc-kr b/docs/manual/dso.html.ko.euc-kr
index 4365fb3d..6a08d5c7 100644
--- a/docs/manual/dso.html.ko.euc-kr
+++ b/docs/manual/dso.html.ko.euc-kr
@@ -271,6 +271,6 @@ $ apxs -i -a -n foo mod_foo.la
 <a href="./ja/dso.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/dso.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/env.html b/docs/manual/env.html
index 1bc45338..61d0a3a8 100644
--- a/docs/manual/env.html
+++ b/docs/manual/env.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: env.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: env.html.ja.euc-jp
+URI: env.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: env.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/env.html.en b/docs/manual/env.html.en
index f4e32d36..69455c0b 100644
--- a/docs/manual/env.html.en
+++ b/docs/manual/env.html.en
@@ -115,6 +115,11 @@
           not be a number. Characters which do not match this
           restriction will be replaced by an underscore when passed to
           CGI scripts and SSI pages.</li>
+          
+          <li>The <code class="directive"><a href="./mod/mod_env.html#setenv">SetEnv</a></code> directive runs
+          late during request processing meaning that directives such as
+          <code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code> and <code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code> will not see the
+          variables set with it.</li>
         </ul>
     
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
@@ -324,6 +329,19 @@
     set for the redirection text, and these broken browsers will then correctly
     use that of the destination page.</p>
 
+    <div class="warning">
+      <h3>Security note</h3> 
+
+      <p>Sending error pages without a specified character set may
+      allow a cross-site-scripting attack for existing browsers (MSIE)
+      which do not follow the HTTP/1.1 specification and attempt to
+      "guess" the character set from the content.  Such browsers can
+      be easily fooled into using the UTF-7 character set, and UTF-7
+      content from input data (such as the request-URI) will not be
+      escaped by the usual escaping mechanisms designed to prevent
+      cross-site-scripting attacks.</p>
+    </div>
+
    
 
    <h3><a name="proxy" id="proxy">force-proxy-request-1.0, proxy-nokeepalive, proxy-sendchunked, proxy-sendcl</a></h3>
@@ -390,7 +408,7 @@ CustomLog logs/access_log common env=!image-request</pre></div>
         in limited circumstances. We assume that all your images are in
         a directory called /web/images.</p>
     <div class="example"><pre>
-SetEnvIf Referer "^http://www.example.com/" local_referal
+SetEnvIf Referer "^http://www\.example\.com/" local_referal
 # Allow browsers that do not send Referer info
 SetEnvIf Referer "^$" local_referal
 &lt;Directory /web/images&gt;
@@ -408,6 +426,6 @@ SetEnvIf Referer "^$" local_referal
 <a href="./ja/env.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/env.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/env.html.ja.euc-jp b/docs/manual/env.html.ja.euc-jp
deleted file mode 100644
index 4f473dc4..00000000
--- a/docs/manual/env.html.ja.euc-jp
+++ /dev/null
@@ -1,405 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>Apache ¤Î´Ä¶­ÊÑ¿ô - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache ¤Î´Ä¶­ÊÑ¿ô</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./en/env.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./ja/env.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/env.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-    <p>Apache HTTP ¥µ¡¼¥Ð¤Ï<em>´Ä¶­ÊÑ¿ô</em>¤È¸Æ¤Ð¤ì¤ë¡¢Ì¾Á°¤Î¤Ä¤¤¤¿
-    ÊÑ¿ô¤Ë¾ðÊó¤òµ­²±¤¹¤ë»ÅÁȤߤòÄ󶡤·¤Æ¤¤¤Þ¤¹¡£¤³¤Î¾ðÊó¤Ï¥í¥°¼ý½¸¤ä
-    ¥¢¥¯¥»¥¹À©¸æ¤Ê¤É¤Î¤¤¤í¤¤¤í¤ÊÁàºî¤òÀ©¸æ¤¹¤ë¤¿¤á¤Ë»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤³¤ì¤é¤ÎÊÑ¿ô¤Ï CGI ¥¹¥¯¥ê¥×¥È¤Ê¤É¤Î³°Éô¥×¥í¥°¥é¥à¤ÈÄÌ¿®¤¹¤ë¤¿¤á¤Ë¤â
-    »È¤ï¤ì¤Þ¤¹¡£¤³¤Îʸ½ñ¤Ï¤½¤ì¤é¤ÎÊÑ¿ô¤ÎÁàºîÊýË¡¤È»ÈÍÑÊýË¡¤ò¤¤¤¯¤Ä¤«
-    ¾Ò²ð¤·¤Þ¤¹¡£</p>
-
-    <p>¤³¤ì¤é¤ÎÊÑ¿ô¤Ï<em>´Ä¶­ÊÑ¿ô</em>¤È¸Æ¤Ð¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°
-    ¥·¥¹¥Æ¥à¤Ë¤è¤Ã¤ÆÀ©¸æ¤µ¤ì¤Æ¤¤¤ë´Ä¶­ÊÑ¿ô¤ÈƱ¤¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-    ¼ÂºÝ¤Ï¡¢¤³¤ì¤é¤ÎÊÑ¿ô¤Ï Apache ¤ÎÆâÉô¹½Â¤¤ÎÃæ¤Ëµ­²±¤µ¤ì¡¢Áàºî¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¤½¤ì¤é¤Ï¡¢CGI ¤ä SSI ¥¹¥¯¥ê¥×¥È¤ËÅϤµ¤ì¤¿¤È¤­¤À¤±¡¢¼ÂºÝ¤Î
-    ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î´Ä¶­ÊÑ¿ô¤Ë¤Ê¤ê¤Þ¤¹¡£¥µ¡¼¥Ð¼«¿È¤¬
-    ¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î´Ä¶­¤òÁàºî¤·¤¿¤¤¾ì¹ç¤Ï¡¢
-    ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¥·¥§¥ë¤¬Ä󶡤·¤Æ¤¤¤ëɸ½à¤Î´Ä¶­ÊÑ¿ô¤Î
-    ÁàºîÊýË¡¤ò»È¤ï¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-  </div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#setting">´Ä¶­ÊÑ¿ô¤ÎÀßÄê</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#using">´Ä¶­ÊÑ¿ô¤Î»ÈÍÑ</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#special">ÆÃÊ̤ÊÌÜŪ¤Î´Ä¶­ÊÑ¿ô</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#examples">Îã</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="setting" id="setting">´Ä¶­ÊÑ¿ô¤ÎÀßÄê</a></h2>
-    
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_env.html">mod_env</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li><li><code class="module"><a href="./mod/mod_setenvif.html">mod_setenvif</a></code></li><li><code class="module"><a href="./mod/mod_unique_id.html">mod_unique_id</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></code></li><li><code class="directive"><a href="./mod/mod_env.html#passenv">PassEnv</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code></li><li><code class="directive"><a href="./mod/mod_env.html#setenv">SetEnv</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvifnocase">SetEnvIfNoCase</a></code></li><li><code class="directive"><a href="./mod/mod_env.html#unsetenv">UnsetEnv</a></code></li></ul></td></tr></table>
-
-    <h3><a name="basic-manipulation" id="basic-manipulation">´ðËÜŪ¤Ê´Ä¶­¤ÎÁàºî</a></h3>
-        
-
-        <p>Apache ¤Ë¤ª¤¤¤Æ´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë°ìÈÖ´ðËÜŪ¤ÊÊýË¡¤Ï¡¢
-        ̵¾ò·ï¤Ë´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë <code class="directive"><a href="./mod/mod_env.html#setenv">SetEnv</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¤¹¡£
-	<code class="directive"><a href="./mod/mod_env.html#passenv">PassEnv</a></code> 
-        ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê¡¢Apache ¤¬µ¯Æ°¤µ¤ì¤¿¥·¥§¥ë¤Î
-        ´Ä¶­ÊÑ¿ô¤òÅϤ¹¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-
-    
-    <h3><a name="conditional" id="conditional">¥ê¥¯¥¨¥¹¥ÈËè¤Ë¾ò·ï¤Ë´ð¤Å¤¤¤ÆÀßÄꤹ¤ë</a></h3>
-        
-
-        <p>¤è¤ê½ÀÆðÀ­¤ò¹â¤á¤ë¤¿¤á¤Ë¡¢mod_setenvif
-        ¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢¥ê¥¯¥¨¥¹¥È¤Î
-        ÆÃÀ­¤Ë´ð¤Å¤¤¤Æ´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Î㤨¤Ð¡¢ÆÃÄê¤Î¥Ö¥é¥¦¥¶
-        (User-Agent) ¤Î¥ê¥¯¥¨¥¹¥È¤äÆÃÄê¤Î Referer [°Õ¿ÞŪ¤ÊÄÖ¤ê¤Ç¤¹]
-        (ÌõÃí: Àµ¤·¤¤ÄÖ¤ê¤Ï referrer ¤Ç¤¹¤¬¡¢HTTP ¤Î»ÅÍÍ¤Ç¤Ï Referer
-        ¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹) ¥Ø¥Ã¥À¤¬¸«¤Ä¤«¤Ã¤¿¤È¤­¤Î¤ßÊÑ¿ô¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-        mod_rewrite ¤Î <code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>
-	¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤ª¤¤¤Æ´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë <code>[E=...]</code>
-	¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢
-        ¤è¤ê½ÀÆð¤ÊÀßÄê¤ò¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    
-    <h3><a name="unique-identifiers" id="unique-identifiers">°ì°Õ¤Ê¼±ÊÌ»Ò</a></h3>
-        
-
-        <p>mod_unique_id ¤Ï¡¢Èó¾ï¤Ë¸Â¤é¤ì¤¿¾ò·ï¤Î²¼¤Ç
-        ¡Ö¤¹¤Ù¤Æ¡×¤Î¥ê¥¯¥¨¥¹¥È¤Ë¤Ä¤¤¤Æ¡¢°ì°Õ¤Ç¤¢¤ë¤³¤È¤¬Êݾڤµ¤ì¤Æ¤¤¤ëÃͤò´Ä¶­ÊÑ¿ô
-        <code>UNIQUE_ID</code> ¤ËÀßÄꤷ¤Þ¤¹¡£</p>
-
-    
-    <h3><a name="standard-cgi" id="standard-cgi">ɸ½à CGI ÊÑ¿ô</a></h3>
-        
-
-        <p>Apache ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ÇÀßÄꤵ¤ì¤¿´Ä¶­ÊÑ¿ô¤È¥·¥§¥ë¤«¤éÅϤµ¤ì¤ë
-        ´Ä¶­ÊÑ¿ô¤Ë²Ã¤¨¤Æ¡¢CGI ¥¹¥¯¥ê¥×¥È¤È SSI ¥Ú¡¼¥¸¤Ë¤Ï <a href="http://cgi-spec.golux.com">CGI ¤Î»ÅÍÍ</a>¤ÇÍ׵ᤵ¤ì¤Æ¤¤¤ë¡¢
-        ¥ê¥¯¥¨¥¹¥È¤Î¥á¥¿¾ðÊó¤ò»ý¤Ã¤¿´Ä¶­ÊÑ¿ô¤ÎÁȤ¬Ä󶡤µ¤ì¤Þ¤¹¡£</p>
-
-    
-    <h3><a name="caveats" id="caveats">¤¤¤¯¤Ä¤«¤ÎÃí°Õ</a></h3>
-        
-
-        <ul>
-          <li>´Ä¶­¤òÁàºî¤¹¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æɸ½à CGI
-          ÊÑ¿ô¤ò¾å½ñ¤­¤·¤¿¤êÊѹ¹¤·¤¿¤ê¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£</li>
-
-          <li>CGI ¥¹¥¯¥ê¥×¥È¤òµ¯Æ°¤¹¤ë¤¿¤á¤Ë <code class="program"><a href="./programs/suexec.html">suexec</a></code>
-          ¤¬»ÈÍѤµ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢CGI ¥¹¥¯¥ê¥×¥È¤¬µ¯Æ°¤¹¤ë¤¿¤á¤Ë¡¢´Ä¶­ÊÑ¿ô¤Ï<em>°ÂÁ´</em>¤Ê´Ä¶­ÊÑ¿ô¤ÎÁȤËÀ°Íý¤µ¤ì¤Þ¤¹¡£
-          ¤³¤Î°ÂÁ´¤Ê´Ä¶­ÊÑ¿ô¤Î½¸¹ç¤Ï¡¢¥³¥ó¥Ñ¥¤¥ë»þ¤Ë <code>suexec.c</code>
-          ¤ÇÄêµÁ¤µ¤ì¤Þ¤¹¡£</li>
-
-          <li>°Ü¿¢À­¤Î¤¿¤á¤Ë¡¢´Ä¶­ÊÑ¿ô¤Î̾Á°¤Ï¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¡¢
-          ¿ô»ú¤È¥¢¥ó¥À¡¼¥¹¥³¥¢ (ÌõÃí: '_') ¤À¤±¤«¤éÀ®¤ê¤Þ¤¹¡£
-          ¤µ¤é¤Ë¡¢ºÇ½é¤Îʸ»ú¤Ï¿ô»ú¤Ç¤¢¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£
-          ¤³¤ÎÀ©¸Â¤Ë¹ç¤ï¤Ê¤¤Ê¸»ú¤Ï CGI ¥¹¥¯¥ê¥×¥È¤È SSI
-          ¥Ú¡¼¥¸¤ËÅϤµ¤ì¤ë¤È¤­¤Ë¥¢¥ó¥À¡¼¥¹¥³¥¢¤ËÃÖ´¹¤µ¤ì¤Þ¤¹¡£</li>
-        </ul>
-    
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="using" id="using">´Ä¶­ÊÑ¿ô¤Î»ÈÍÑ</a></h2>
-    
-
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_authz_host.html">mod_authz_host</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_authz_host.html#allow">Allow</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code></li><li><code class="directive"><a href="./mod/mod_authz_host.html#deny">Deny</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code></li></ul></td></tr></table>
-
-    <h3><a name="cgi-scripts" id="cgi-scripts">CGI ¥¹¥¯¥ê¥×¥È</a></h3>
-        
-
-        <p>´Ä¶­ÊÑ¿ô¤Î¼ç¤ÊÍøÍÑË¡¤Î°ì¤Ä¤Ï¡¢CGI ¥¹¥¯¥ê¥×¥È¤Ë¾ðÊó¤òÅÁ¤¨¤ë¤³¤È¤Ç¤¹¡£
-        ¾å¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢CGI ¥¹¥¯¥ê¥×¥È¤ËÅϤµ¤ì¤ë´Ä¶­ÊÑ¿ô¤Ï Apache
-        ¤ÎÀßÄê¤Ë¤è¤êÀßÄꤵ¤ì¤ëÊÑ¿ô¤Ë²Ã¤¨¤Æ¡¢¥ê¥¯¥¨¥¹¥È¤Îɸ½à¤Î¥á¥¿¾ðÊó¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
-        ¾ÜºÙ¤Ï <a href="howto/cgi.html">CGI ¥Á¥å¡¼¥È¥ê¥¢¥ë</a>
-	¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    
-    <h3><a name="ssi-pages" id="ssi-pages">SSI ¥Ú¡¼¥¸</a></h3>
-        
-
-        <p>mod_include ¤Î <code>INCLUDES</code> ¥Õ¥£¥ë¥¿¤Ç½èÍý¤µ¤ì¤ë
-        server-parsed (SSI) ¥É¥­¥å¥á¥ó¥È¤Ç¤Ï¡¢<code>echo</code>
-        Í×ÁǤò»ÈÍѤ¹¤ë¤È´Ä¶­ÊÑ¿ô¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
-        ¤Þ¤¿¡¢¥Ú¡¼¥¸¤Î¤¢¤ëÉôʬ¤¬¥ê¥¯¥¨¥¹¥È¤ÎÀ­¼Á¤Ë±þ¤¸¤ÆÊѹ¹¤µ¤ì¤ë¤è¤¦¤Ë¡¢
-        ´Ä¶­ÊÑ¿ô¤ò¥Õ¥í¡¼À©¸æÍ×ÁǤǻȤ¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¾ÜºÙ¤Ï
-        <a href="howto/ssi.html">SSI ¥Á¥å¡¼¥È¥ê¥¢¥ë</a> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    
-    <h3><a name="access-control" id="access-control">¥¢¥¯¥»¥¹À©¸æ</a></h3>
-        
-
-        <p><code>allow from env=</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È <code>deny from env=</code>
-        ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ·¤Æ¡¢¥µ¡¼¥Ð¤Ø¤Î¥¢¥¯¥»¥¹¤ò´Ä¶­ÊÑ¿ô¤ÎÃͤÇÀ©¸æ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-        <code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code>
-	¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÈÁȤ߹ç¤ï¤»¤ë¤³¤È¤Ç¡¢¥¯¥é¥¤¥¢¥ó¥È¤ÎÆÃÀ­¤Ë´ð¤Å¤¤¤Æ
-        ¥µ¡¼¥Ð¤Ø¤Î¥¢¥¯¥»¥¹À©¸æ¤ò½ÀÆð¤Ë¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-        ¤¿¤È¤¨¤Ð¡¢¤³¤ì¤é¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ·¤Æ¡¢ÆÃÄê¤Î¥Ö¥é¥¦¥¶ (User-Agent)
-        ¤«¤é¤Î¥¢¥¯¥»¥¹¤òµñÈݤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    
-    <h3><a name="logging" id="logging">¾ò·ïÉÕ¤­¥í¥°µ­Ï¿</a></h3>
-        
-
-        <p><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code>
-        ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¥ª¥×¥·¥ç¥ó <code>%e</code>
-        ¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢´Ä¶­ÊÑ¿ô¤ò¥¢¥¯¥»¥¹¥í¥°¤Ëµ­Ï¿¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤µ¤é¤Ë¡¢
-        <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code>
-	¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¾ò·ïʬ´ô¼°¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢
-        ´Ä¶­ÊÑ¿ô¤ÎÃͤˤè¤Ã¤Æ¥ê¥¯¥¨¥¹¥È¤ò¥í¥°¤Ëµ­Ï¿¤¹¤ë¤«¤É¤¦¤«¤ò·è¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-        <code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code>
-	¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÈÁȤ߹ç¤ï¤»¤ë¤³¤È¤Ç¡¢
-        ¤É¤Î¥ê¥¯¥¨¥¹¥È¤ò¥í¥°¤Ëµ­Ï¿¤¹¤ë¤«¤ò½ÀÆð¤ËÀ©¸æ¤¹¤ë¤³¤È¤¬²Äǽ¤Ë¤Ê¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
-        <code>gif</code> ¤Ç½ª¤ï¤ë¥Õ¥¡¥¤¥ë̾¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ï¥í¥°¤Ëµ­Ï¿¤·¤Ê¤¤¡¢
-        °ã¤¦¥µ¥Ö¥Í¥Ã¥È¤Î¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î¥ê¥¯¥¨¥¹¥È¤À¤±¤ò¥í¥°¤Ëµ­Ï¿¤¹¤ë¡¢
-	¤È¤¤¤¦ÁªÂò¤¬²Äǽ¤Ç¤¹¡£</p>
-
-    
-    <h3><a name="response-headers" id="response-headers">¾ò·ïÉÕ¤­±þÅú¥Ø¥Ã¥À</a></h3>
-        
-
-        <p><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code>
-	¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï´Ä¶­ÊÑ¿ô¤Î¸ºß¤äÉԺߤˤè¤Ã¤Æ¥¯¥é¥¤¥¢¥ó¥È¤Ø¤Î±þÅú¤ËÆÃÄê¤Î
-	HTTP ¥Ø¥Ã¥À¤òÉÕ¤±¤ë¤«¤É¤¦¤«¤ò·è¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	¤³¤ì¤Ë¤è¤ê¡¢¤¿¤È¤¨¤Ð¡¢¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î¥ê¥¯¥¨¥¹¥È
-        ¤Ë¤¢¤ë¥Ø¥Ã¥À¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ßÆÃÄê¤Î±þÅú¥Ø¥Ã¥À¤òÁ÷¤ë¡¢¤È¤¤¤¦¤è¤¦¤Ê¤³¤È¤¬
-        ¤Ç¤­¤Þ¤¹¡£</p>
-
-    
-
-    <h3><a name="external-filter" id="external-filter">³°Éô¥Õ¥£¥ë¥¿¤ÎŬÍÑ</a></h3>
-        
-
-        <p><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code>
-        ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ·¤Æ
-        <code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code> ¤ÇÀßÄꤵ¤ì¤ë³°Éô¥Õ¥£¥ë¥¿¤Ï¡¢
-	<code>disableenv=</code> ¤È <code>enableenv=</code>
-	¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¡¢´Ä¶­ÊÑ¿ô¤Ë¤è¤ë¾ò·ïÉÕ¤­Å¬ÍѤ¬¤Ç¤­¤Þ¤¹¡£</p>
-    
-
-    <h3><a name="url-rewriting" id="url-rewriting">URL ¤Î½ñ¤­´¹¤¨</a></h3>
-        
-
-        <p><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code>
-	¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç<em>ɾ²Áʸ»úÎó</em>¤È¤·¤Æ
-        <code>%{ENV:...}</code> ¼°¤ò»ØÄꤹ¤ë¤³¤È¤Ç¡¢mod_rewrite
-        ¤Î½ñ¤­´¹¤¨¥¨¥ó¥¸¥ó¤¬´Ä¶­ÊÑ¿ô¤Ë´ð¤¤¤Æ¾ò·ïʬ´ô¤ò¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-        mod_rewrite ¤¬»ÈÍѲÄǽ¤ÊÊÑ¿ô¤Ç <code>ENV:</code> ¤¬Á°¤Ë¤Ä¤¤¤Æ¤¤¤Ê¤¤ÊÑ¿ô¤Ï¡¢
-        ¼ÂºÝ¤Ï´Ä¶­ÊÑ¿ô¤Ç¤Ï¤Ê¤¤¤È¤¤¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-        ¤½¤ì¤é¤Ï¾¤Î¥â¥¸¥å¡¼¥ë¤«¤é¤Ï»ÈÍѤǤ­¤Ê¤¤ mod_rewrite ÍѤÎÆÃÊ̤ÊÊÑ¿ô¤Ç¤¹¡£
-        </p>
-    
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="special" id="special">ÆÃÊ̤ÊÌÜŪ¤Î´Ä¶­ÊÑ¿ô</a></h2>
-    
-
-        <p>¸ß´¹À­¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤Ë¡¢ÆÃÄê¤Î¥¯¥é¥¤¥¢¥ó¥È¤ÈÄÌ¿®¤·¤Æ¤¤¤ë¤È¤­¤Ï
-        Apache ¤ÎÆ°ºî¤òÊѹ¹¤Ç¤­¤ëµ¡¹½¤¬Æ³Æþ¤µ¤ì¤Þ¤·¤¿¡£¤Ç¤­¤ë¤À¤±½ÀÆð¤Ë¤¹¤ë¤¿¤á¤Ë¡¢
-        ¤³¤ì¤é¤Îµ¡¹½¤Ï´Ä¶­ÊÑ¿ô¤òÄêµÁ¤¹¤ë¤³¤È¤Ç¸Æ¤Ó½Ð¤µ¤ì¤Þ¤¹¡£ÉáÄ̤ϡ¢
-        <code class="directive"><a href="./mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code>
-        ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¤¤Þ¤¹¤¬¡¢¤¿¤È¤¨¤Ð <code class="directive"><a href="./mod/mod_env.html#setenv">SetEnv</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ä <code class="directive"><a href="./mod/mod_env.html#passenv">PassEnv</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤â»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <h3><a name="downgrade" id="downgrade">downgrade-1.0</a></h3>
-        
-
-        <p>¤³¤ì¤ò»ØÄꤹ¤ë¤³¤È¤Ç¡¢¥ê¥¯¥¨¥¹¥È¤¬ HTTP/1.0
-        ¤è¤ê¿·¤·¤¤¥×¥í¥È¥³¥ë¤Î¾ì¹ç¤Ç¤â¡¢HTTP/1.0 ¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£</p>
-
-    
-    <h3><a name="force-gzip" id="force-gzip">force-gzip</a></h3>
-        
-          <p><code>DEFLATE</code> ¥Õ¥£¥ë¥¿¤¬»ÈÍѤ¹¤ë¤è¤¦¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¤È¤­¤Ë¡¢
-          ¤³¤Î´Ä¶­ÊÑ¿ô¤Ï¥Ö¥é¥¦¥¶¤Î accept-encoding ¤ÎÀßÄê¤ò̵»ë¤·¤Æ¾ï¤Ë
-          °µ½Ì¤µ¤ì¤¿½ÐÎϤòÁ÷¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£</p>
-    
-    <h3><a name="force-no-vary" id="force-no-vary">force-no-vary</a></h3>
-        
-
-        <p>±þÅú¥Ø¥Ã¥À¤¬¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤é¤ì¤ëÁ°¤Ë <code>Vary</code>
-        ¥Õ¥£¡¼¥ë¥É¤ò¼è¤ê½ü¤­¤Þ¤¹¡£
-        ¥¯¥é¥¤¥¢¥ó¥È¤ÎÃæ¤Ë¤Ï¤³¤Î¥Õ¥£¡¼¥ë¥É¤òÀµ¤·¤¯²ò¼á¤·¤Ê¤¤¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£
-        ¤³¤ÎÊÑ¿ô¤òÀßÄꤹ¤ë¤³¤È¤Ç¤½¤ÎÌäÂê¤ò²óÈò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-        ¤³¤ÎÊÑ¿ô¤òÀßÄꤹ¤ë¤È¡¢<strong>force-response-1.0</strong>
-        ¤¬ÀßÄꤵ¤ì¤¿¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    
-    <h3><a name="force-response" id="force-response">force-response-1.0</a></h3>
-        
-
-        <p>¤³¤ì¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¤È¡¢HTTP/1.0 ¥ê¥¯¥¨¥¹¥È¤òȯ¹Ô¤¹¤ë¥¯¥é¥¤¥¢¥ó¥È¤ËÂФ·¤Æ¤Ï
-	¾ï¤Ë HTTP/1.0 ¤Ç±þÅú¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤Îµ¡Ç½¤Ï¡¢
-        ¸µ¡¹¤Ï AOL ¤Î¥×¥í¥­¥·¤ÎÌäÂê¤Î¤¿¤á¤Ë¼ÂÁõ¤µ¤ì¤Þ¤·¤¿¡£HTTP/1.0 ¥¯¥é¥¤¥¢¥ó¥È¤ÎÃæ¤Ë¤Ï¡¢
-        HTTP/1.1 ¤Î±þÅú¤òÊÖ¤µ¤ì¤ë¤ÈÀµ¤·¤¯Æ°ºî¤·¤Ê¤¤¤â¤Î¤¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-        ¤³¤Îµ¡Ç½¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢¤½¤Î¤è¤¦¤Ê¥¯¥é¥¤¥¢¥ó¥È¤È¤Î´Ö¤Î¸ß´¹À­ÌäÂê¤ò²ò·è¤Ç¤­¤Þ¤¹¡£</p>
-    
-
-    <h3><a name="gzip-only-text-html" id="gzip-only-text-html">gzip-only-text/html</a></h3>
-        
-
-	<p>¤³¤ì¤¬ 1 ¤ËÀßÄꤵ¤ì¤ë¤È¡¢¤³¤ÎÊÑ¿ô¤Ï <code>text/html</code>
-	°Ê³°¤Î¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤ËÂФ¹¤ë¡¢<code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code>
-	Ä󶡤Π<code>DEFLATE</code> ½ÐÎÏ¥Õ¥£¥ë¥¿¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£
-        ¤Þ¤¿¡¢ÀÅŪ¤Ë¡¢´û¤Ë°µ½Ì¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤¿¤¤¾ì¹ç¡¢
-        (gzip ¤À¤±¤Ç¤Ê¤¯¡¢"identity" ¤È°Û¤Ê¤ëÁ´¤Æ¤Î¥¨¥ó¥³¡¼¥É¤ËÂФ·¤Æ)
-        <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code> ¤âÊÑ¿ô¤òɾ²Á¤·¤Þ¤¹¡£</p>
-    
-
-    <h3><a name="no-gzip" id="no-gzip">no-gzip</a></h3>
-        <p>¥»¥Ã¥È¤µ¤ì¤ë¤È¡¢<code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code> ¤Î
-	<code>DEFLATE</code> ¥Õ¥£¥ë¥¿¤¬¥ª¥Õ¤Ë¤Ê¤ê¤Þ¤¹¡£
-        ¤½¤·¤Æ <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code>
-        ¤Ï¥¨¥ó¥³¡¼¥É¤µ¤ì¤¿¥ê¥½¡¼¥¹¤òÁ÷¤é¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£</p>
-    
-
-    <h3><a name="nokeepalive" id="nokeepalive">nokeepalive</a></h3>
-        
-
-        <p>¤³¤ì¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢<code class="directive"><a href="./mod/core.html#keepalive">KeepAlive</a></code> ¤ò»ÈÍѤ·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£</p>
-
-    <h4><a name="prefer-language" id="prefer-language">prefer-language</a></h4>
-
-        <p><code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code> ¤ÎµóÆ°¤Ë±Æ¶Á¤òÍ¿¤¨¤Þ¤¹¡£
-        (<code>en</code>, <code>ja</code>, <code>x-klingon</code>¤È¤¤¤Ã¤¿)
-        ¸À¸ì¥¿¥°¤¬³ÊǼ¤µ¤ì¤Æ¤¤¤ì¤Ð¡¢¤½¤Î¸À¸ì¤Î variant ¤òÁ÷¿®¤·¤è¤¦¤È¤·¤Þ¤¹¡£
-        ¤½¤Î¤è¤¦¤Ê variant ¤¬¤Ê¤¤¾ì¹ç¤Ï¡¢
-        Ä̾ï¤Î<a href="content-negotiation.html">¥Í¥´¥·¥¨¡¼¥·¥ç¥ó</a>½èÍý¤¬
-        ŬÍѤµ¤ì¤Þ¤¹¡£</p>
-
-    
-
-    
-    <h3><a name="redirect-carefully" id="redirect-carefully">redirect-carefully</a></h3>
-        
-
-        <p>¤³¤ì¤Ï¥¯¥é¥¤¥¢¥ó¥È¤Ø¤Î¥ê¥À¥¤¥ì¥¯¥È¤ÎÁ÷¿®¤ò¥µ¡¼¥Ð¤¬¤è¤êÃí°Õ¿¼¤¯
-        ¹Ô¤Ê¤¦¤è¤¦¤Ë¤·¤Þ¤¹¡£
-        ¤³¤ì¤ÏÄ̾¥ê¥À¥¤¥ì¥¯¥È¤ËºÝ¤·¤Æ¥¯¥é¥¤¥¢¥ó¥È¤Ë
-        ÌäÂ꤬¤¢¤ë¤³¤È¤¬Ê¬¤«¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë»È¤ï¤ì¤Þ¤¹¡£¤³¤Îµ¡Ç½¤Ï¸µ¡¹¤Ï
-        ¥Þ¥¤¥¯¥í¥½¥Õ¥È¤Î¥¦¥§¥Ö¥Õ¥©¥ë¥À¤Î¥½¥Õ¥È¤¬ DAV
-        ¥á¥½¥Ã¥É¤Ë¤è¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥½¡¼¥¹¤Ø¤Î¥ê¥À¥¤¥ì¥¯¥È¤Î°·¤¤¤Ë
-        ÌäÂ꤬¤ê¡¢¤½¤ì¤ò²óÈò¤¹¤ë¤¿¤á¤Ë¼ÂÁõ¤µ¤ì¤Þ¤·¤¿¡£</p>
-
-    
-
-   <h3><a name="suppress-error-charset" id="suppress-error-charset">suppress-error-charset</a></h3>
-       
-
-    <p><em>Apache 2.2 °Ê¹ß¤ÇÍøÍѲÄǽ</em></p>
-
-    <p>¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ¹¤ë±þÅú¤È¤·¤Æ¥ê¥À¥¤¥ì¥¯¥È¤òÁ÷¿®¤¹¤ëºÝ¡¢
-    ¥ì¥¹¥Ý¥ó¥¹¤Ë¤Ï¥ê¥À¥¤¥ì¥¯¥È¤¬¼«Æ°Åª¤Ë¹Ô¤Ê¤¨¤Ê¤¤ (¹Ô¤Ê¤ï¤ì¤Ê¤¤)
-    ¾ì¹ç¤Ëɽ¼¨¤¹¤ë¥Æ¥­¥¹¥È¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
-    Ä̾¤³¤Î¥Æ¥­¥¹¥È¤Ë¹çÃפ·¤¿¥­¥ã¥é¥¯¥¿¥»¥Ã¥È¡¢ISO-8859-1
-    ¤Ç¥é¥Ù¥ëÉÕ¤±¤ò¤·¤Þ¤¹¡£</p>
-    <p>¤·¤«¤·¡¢¥ê¥À¥¤¥ì¥¯¥ÈÀ褬Ê̤Îʸ»ú¥»¥Ã¥È¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¡¢
-    ¤¢¤ëÌäÂê¤Î¤¢¤ë¥Ö¥é¥¦¥¶¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¢
-    ¥ê¥À¥¤¥ì¥¯¥ÈÀè¤Î¼ÂºÝ¤Îʸ»ú¥»¥Ã¥È¤ÎÂå¤ï¤ê¤Ë¡¢
-    ¥ê¥À¥¤¥ì¥¯¥È¸µ¤Îʸ»ú¥»¥Ã¥È¤ò»È¤Ã¤Æ¤·¤Þ¤¦¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-    ¤½¤Î·ë²Ì¡¢Î㤨¤ÐÊѤÊÉÁ²è¤¬¹Ô¤Ê¤ï¤ì¤¿¤ê¤·¤Æ¡¢Æɤá¤Ê¤¯¤Ê¤Ã¤¿¤ê¤·¤Þ¤¹¡£</p>
-    <p>¤³¤Î´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë¤³¤È¤Ç¡¢¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó¥Æ¥­¥¹¥È¤ËÂФ¹¤ë
-    ¥­¥ã¥é¥¯¥¿¥»¥Ã¥È¤Î»ØÄê¤ò½üµî¤·¤Þ¤¹¤Î¤Ç¡¢¤½¤ì¤éÌäÂê¤Î¤¢¤ë¥Ö¥é¥¦¥¶¤Ç¤â
-    ¥ê¥À¥¤¥ì¥¯¥ÈÀè¤Îʸ»ú¥»¥Ã¥È¤òÀµ¤·¤¯»È¤¦¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£</p>
-
-   
-
-   <h3><a name="proxy" id="proxy">force-proxy-request-1.0, proxy-nokeepalive, proxy-sendchunked, proxy-sendcl</a></h3>
-
-   <p>¤³¤ì¤é¤Î»Ø¼¨»Ò¤Ï <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code> ¤ÎµóÆ°¤òÊѹ¹¤·¤Þ¤¹¡£
-   ¾ÜºÙ¤Ï <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code> ¤Î¥É¥­¥å¥á¥ó¥È¤ò¤´»²¾È¤¯¤À¤µ¤¤¡£</p>
-   
-
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Îã</a></h2>
-    
-
-    <h3><a name="misbehaving" id="misbehaving">¤ª¤«¤·¤ÊµóÆ°¤ò¤¹¤ë¥¯¥é¥¤¥¢¥ó¥È¤ËÂФ·¤Æ¥×¥í¥È¥³¥ë¤ÎÆ°ºî¤òÊѹ¹¤¹¤ë</a></h3>
-        
-
-        <p>¥¯¥é¥¤¥¢¥ó¥È¤Ë´Ø¤¹¤ë´ûÃΤÎÌäÂê¤ËÂн褹¤ë¤¿¤á¤Ë¡¢°Ê²¼¤Î¹Ô¤ò
-        httpd.conf ¤ËÆþ¤ì¤ë¤³¤È¤ò¿ä¾©¤·¤Æ¤¤¤Þ¤¹¡£</p>
-        <p>¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î Apache ¤Ç¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤ÎÌäÂê¤ËÂбþ¤¹¤ë¤¿¤á¤Ë
-        httpd.conf ¤Ë¼¡¤Î¹Ô¤ò²Ã¤¨¤ë¤è¤¦¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤·¤¿¤¬¡¢
-        º£¤È¤Ê¤Ã¤Æ¤Ï¡¢ÌäÂê¤È¤·¤Æ¤¤¤¿¥¯¥é¥¤¥¢¥ó¥È¤Ï¼ÂºÝ¤Ë¤Ï¸«¤«¤±¤ë¤³¤È¤Ï
-        ¤Ê¤¯¤Ê¤Ã¤Æ¤­¤¿¤Î¤Ç¡¢¤³¤ÎÀßÄê¤Ï¤â¤Ï¤äɬÍפʤ¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>
-<div class="example"><pre>
-#
-# The following directives modify normal HTTP response behavior.
-# The first directive disables keepalive for Netscape 2.x and browsers that
-# spoof it. There are known problems with these browser implementations.
-# The second directive is for Microsoft Internet Explorer 4.0b2
-# which has a broken HTTP/1.1 implementation and does not properly
-# support keepalive when it is used on 301 or 302 (redirect) responses.
-#
-BrowserMatch "Mozilla/2" nokeepalive
-BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
-
-#
-# The following directive disables HTTP/1.1 responses to browsers which
-# are in violation of the HTTP/1.0 spec by not being able to grok a
-# basic 1.1 response.
-#
-BrowserMatch "RealPlayer 4\.0" force-response-1.0
-BrowserMatch "Java/1\.0" force-response-1.0
-BrowserMatch "JDK/1\.0" force-response-1.0</pre></div>
-
-    
-    <h3><a name="no-img-log" id="no-img-log">²èÁü¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ò¥¢¥¯¥»¥¹¥í¥°¤Ëµ­Ï¿¤·¤Ê¤¤</a></h3>
-        
-
-        <p>¤³¤ÎÎã¤Ç¤Ï¡¢²èÁü¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤¬¥¢¥¯¥»¥¹¥í¥°¤Ë¸½¤ì¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£
-        ¤³¤ì¤òÊѹ¹¤¹¤ë¤³¤È¤Ç¡¢ÆÃÄê¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î¥í¥°¼ý½¸¤ò¤ä¤á¤¿¤ê¡¢
-        ÆÃÄê¤Î¥Û¥¹¥È¤«¤é¤Î¥ê¥¯¥¨¥¹¥È¤Î¥í¥°¼ý½¸¤ò¤ä¤á¤¿¤ê¤¹¤ë¤³¤È¤¬´Êñ¤Ë¤Ç¤­¤Þ¤¹¡£
-        </p>
-    <div class="example"><pre>
-SetEnvIf Request_URI \.gif image-request
-SetEnvIf Request_URI \.jpg image-request
-SetEnvIf Request_URI \.png image-request
-CustomLog logs/access_log common env=!image-request</pre></div>
-
-    
-    <h3><a name="image-theft" id="image-theft">¡Ö²èÁü¤ÎÅðÍѡפòËɤ°</a></h3>
-        
-
-        <p>¤³¤ÎÎã¤Ï¡¢Ê̤Υµ¡¼¥Ð¤Ë¤¤¤ë¿Í¤¬¡¢¤¢¤Ê¤¿¤Î¥µ¡¼¥Ð¤Ë¤¢¤ë²èÁü¤ò
-        inline ²èÁü¤È¤·¤Æ»ÈÍѤ¹¤ë¤³¤È¤òËɤ®¤Þ¤¹¡£
-        ¤³¤ì¤Ï¿ä¾©¤µ¤ì¤Æ¤¤¤ëÀßÄê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢¤¢¤ë¸ÂÄꤵ¤ì¤¿¾õ¶·¤Ç¤ÏÍ­¸ú¤Ç¤¹¡£
-        ¤³¤³¤Ç¤Ï¡¢¤¹¤Ù¤Æ¤Î²èÁü¤Ï <code>/web/images</code>
-	¤È¤¤¤¦¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë¤È²¾Äꤷ¤Þ¤¹¡£</p>
-    <div class="example"><pre>
-SetEnvIf Referer "^http://www.example.com/" local_referal
-# Allow browsers that do not send Referer info
-SetEnvIf Referer "^$" local_referal
-&lt;Directory /web/images&gt;
-   Order Deny,Allow
-   Deny from all
-   Allow from env=local_referal
-&lt;/Directory&gt;</pre></div>
-
-        <p>¤³¤Î¼êË¡¤Ë´Ø¤¹¤ë¾Ü¤·¤¤¾ðÊó¤Ï ApacheToday ¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¡Ö<a href="http://apachetoday.com/news_story.php3?ltsn=2000-06-14-002-01-ps">Keeping Your Images from Adorning Other Sites</a>
-        ¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-    
-  </div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./en/env.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./ja/env.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/env.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/env.html.ja.utf8 b/docs/manual/env.html.ja.utf8
new file mode 100644
index 00000000..9ef314ea
--- /dev/null
+++ b/docs/manual/env.html.ja.utf8
@@ -0,0 +1,405 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Apache �環境変数 - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache �環境変数</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./en/env.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./ja/env.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/env.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+
+    <p>Apache HTTP サー��<em>環境変数</em>�呼�れる�������
+    変数�情報を記憶�る仕組�を�供�����。��情報�ログ�集や
+    アクセス制御���������作を制御�る���使��������。
+    �れら�変数� CGI スクリプト���外部プログラム�通信�る���も
+    使�れ��。��文書��れら�変数��作方法�使用方法を����
+    紹介���。</p>
+
+    <p>�れら�変数�<em>環境変数</em>�呼�れ������オペレーティング
+    システム�よ��制御�れ��る環境変数������り��ん。
+    実際���れら�変数� Apache �内部構造�中�記憶�れ��作�れ����。
+    �れら��CGI や SSI スクリプト�渡�れ������実際�
+    オペレーティングシステム�環境変数��り��。サー�自身�
+    実行�れ��るオペレーティングシステム�環境を�作���場���
+    オペレーティングシステム�シェル��供���る標準�環境変数�
+    �作方法を使���れ��り��ん。</p>
+  </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#setting">環境変数�設定</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#using">環境変数�使用</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#special">特別�目的�環境変数</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#examples">例</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="setting" id="setting">環境変数�設定</a></h2>
+    
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_env.html">mod_env</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li><li><code class="module"><a href="./mod/mod_setenvif.html">mod_setenvif</a></code></li><li><code class="module"><a href="./mod/mod_unique_id.html">mod_unique_id</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></code></li><li><code class="directive"><a href="./mod/mod_env.html#passenv">PassEnv</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code></li><li><code class="directive"><a href="./mod/mod_env.html#setenv">SetEnv</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvifnocase">SetEnvIfNoCase</a></code></li><li><code class="directive"><a href="./mod/mod_env.html#unsetenv">UnsetEnv</a></code></li></ul></td></tr></table>
+
+    <h3><a name="basic-manipulation" id="basic-manipulation">基本的�環境��作</a></h3>
+        
+
+        <p>Apache ����環境変数を設定�る一番基本的�方法��
+        無�件�環境変数を設定�る <code class="directive"><a href="./mod/mod_env.html#setenv">SetEnv</a></code> ディレクティブを使用�る����。
+	<code class="directive"><a href="./mod/mod_env.html#passenv">PassEnv</a></code> 
+        ディレクティブ�より�Apache �起動�れ�シェル�
+        環境変数を渡���も����。</p>
+
+    
+    <h3><a name="conditional" id="conditional">リクエスト毎��件�基���設定�る</a></h3>
+        
+
+        <p>より柔軟性を高�る����mod_setenvif
+        ��供�れ��るディレクティブを使用�る����リクエスト�
+        特性�基���環境変数を設定�る�������。例���特定�ブラウザ
+        (User-Agent) �リクエストや特定� Referer [�図的�綴り��]
+        (訳注: 正��綴り� referrer ����HTTP �仕様�� Referer
+        �������) ヘッダ�見��������変数を設定�る�������。
+        mod_rewrite � <code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>
+	ディレクティブ����環境変数を設定�る <code>[E=...]</code>
+	オプションを使用�る����
+        より柔軟�設定を行���������。</p>
+
+    
+    <h3><a name="unique-identifiers" id="unique-identifiers">一��識別�</a></h3>
+        
+
+        <p>mod_unique_id ���常��られ��件�下�
+        「�����リクエスト�����一���る����証�れ��る値を環境変数
+        <code>UNIQUE_ID</code> �設定���。</p>
+
+    
+    <h3><a name="standard-cgi" id="standard-cgi">標準 CGI 変数</a></h3>
+        
+
+        <p>Apache �設定ファイル�設定�れ�環境変数�シェル�ら渡�れる
+        環境変数�加���CGI スクリプト� SSI ページ�� <a href="http://cgi-spec.golux.com">CGI �仕様</a>��求�れ��る�
+        リクエスト�メタ情報を���環境変数�組��供�れ��。</p>
+
+    
+    <h3><a name="caveats" id="caveats">�����注�</a></h3>
+        
+
+        <ul>
+          <li>環境を�作�るディレクティブを使��標準 CGI
+          変数を上書���り変更��り�る�������ん。</li>
+
+          <li>CGI スクリプトを起動�る��� <code class="program"><a href="./programs/suexec.html">suexec</a></code>
+          �使用�れ��る場��CGI スクリプト�起動�る����環境変数�<em>安全</em>�環境変数�組�整��れ��。
+          ��安全�環境変数�集���コンパイル時� <code>suexec.c</code>
+          �定義�れ��。</li>
+
+          <li>移�性�����環境変数����アルファベット�
+          数字�アンダースコア (訳注: '_') ���ら�り��。
+          �ら��最��文字�数字���������ん。
+          ��制������文字� CGI スクリプト� SSI
+          ページ�渡�れる���アンダースコア�置��れ��。</li>
+        </ul>
+    
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="using" id="using">環境変数�使用</a></h2>
+    
+
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_authz_host.html">mod_authz_host</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_authz_host.html#allow">Allow</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code></li><li><code class="directive"><a href="./mod/mod_authz_host.html#deny">Deny</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code></li></ul></td></tr></table>
+
+    <h3><a name="cgi-scripts" id="cgi-scripts">CGI スクリプト</a></h3>
+        
+
+        <p>環境変数�主�利用法�一���CGI スクリプト�情報を��る����。
+        上�説明�れ��るよ���CGI スクリプト�渡�れる環境変数� Apache
+        �設定�より設定�れる変数�加���リクエスト�標準�メタ情報を�ん����。
+        詳細� <a href="howto/cgi.html">CGI �ュートリアル</a>
+	を�照������。</p>
+
+    
+    <h3><a name="ssi-pages" id="ssi-pages">SSI ページ</a></h3>
+        
+
+        <p>mod_include � <code>INCLUDES</code> フィルタ�処��れる
+        server-parsed (SSI) ドキュメント���<code>echo</code>
+        �素を使用�る�環境変数�出力�れ��。
+        ���ページ��る部分�リクエスト�性質�応��変更�れるよ���
+        環境変数をフロー制御�素�使��������。詳細�
+        <a href="howto/ssi.html">SSI �ュートリアル</a> を�照������。</p>
+
+    
+    <h3><a name="access-control" id="access-control">アクセス制御</a></h3>
+        
+
+        <p><code>allow from env=</code> ディレクティブ� <code>deny from env=</code>
+        ディレクティブを使用���サー���アクセスを環境変数�値�制御�る�������。
+        <code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code>
+	ディレクティブ�組����る����クライアント�特性�基���
+        サー���アクセス制御を柔軟�行�������るよ���り��。
+        ������れら�ディレクティブを使用���特定�ブラウザ (User-Agent)
+        �ら�アクセスを拒��る�������。</p>
+
+    
+    <h3><a name="logging" id="logging">�件付�ログ記録</a></h3>
+        
+
+        <p><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code>
+        ディレクティブ�オプション <code>%e</code>
+        を使用�る����環境変数をアクセスログ�記録�る�������。�ら��
+        <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code>
+	ディレクティブ��件分��を使用�る����
+        環境変数�値�よ��リクエストをログ�記録�る����を決�る�������。
+        <code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code>
+	ディレクティブ�組����る����
+        ��リクエストをログ�記録�る�を柔軟�制御�る����能��り��。�����
+        <code>gif</code> �終�るファイル���リクエスト�ログ�記録����
+        ��サブ�ット�クライアント�ら�リクエスト��をログ�記録�る�
+	����択��能��。</p>
+
+    
+    <h3><a name="response-headers" id="response-headers">�件付�応答ヘッダ</a></h3>
+        
+
+        <p><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code>
+	ディレクティブ�環境変数�存在や�在�よ��クライアント��応答�特定�
+	HTTP ヘッダを付�る����を決�る�������。
+	�れ�より������クライアント�ら�リクエスト
+        ��るヘッダ��る場����特定�応答ヘッダを�る����よ�����
+        ����。</p>
+
+    
+
+    <h3><a name="external-filter" id="external-filter">外部フィルタ��用</a></h3>
+        
+
+        <p><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code>
+        ディレクティブを使用��
+        <code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code> �設定�れる外部フィルタ��
+	<code>disableenv=</code> � <code>enableenv=</code>
+	オプションを使���環境変数�よる�件付��用�����。</p>
+    
+
+    <h3><a name="url-rewriting" id="url-rewriting">URL �書���</a></h3>
+        
+
+        <p><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code>
+	ディレクティブ�<em>評価文字列</em>���
+        <code>%{ENV:...}</code> �を指定�る����mod_rewrite
+        �書���エンジン�環境変数�基���件分�を行���������。
+        mod_rewrite �使用�能�変数� <code>ENV:</code> ���������変数��
+        実際�環境変数����������注�������。
+        �れら�他�モジュール�ら�使用���� mod_rewrite 用�特別�変数��。
+        </p>
+    
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="special" id="special">特別�目的�環境変数</a></h2>
+    
+
+        <p>互�性��題を解決�る����特定�クライアント�通信���る���
+        Apache �動作を変更��る機構�導入�れ���。��る��柔軟��る����
+        �れら�機構�環境変数を定義�る���呼�出�れ��。普通��
+        <code class="directive"><a href="./mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code>
+        ディレクティブを使��������� <code class="directive"><a href="./mod/mod_env.html#setenv">SetEnv</a></code> ディレクティブや <code class="directive"><a href="./mod/mod_env.html#passenv">PassEnv</a></code> ディレクティブも使用�る�������。</p>
+
+    <h3><a name="downgrade" id="downgrade">downgrade-1.0</a></h3>
+        
+
+        <p>�れを指定�る����リクエスト� HTTP/1.0
+        より新��プロトコル�場��も�HTTP/1.0 ���扱�れ��。</p>
+
+    
+    <h3><a name="force-gzip" id="force-gzip">force-gzip</a></h3>
+        
+          <p><code>DEFLATE</code> フィルタ�使用�るよ��設定�れ��る����
+          ��環境変数�ブラウザ� accept-encoding �設定を無視��常�
+          圧縮�れ�出力を�るよ�����。</p>
+    
+    <h3><a name="force-no-vary" id="force-no-vary">force-no-vary</a></h3>
+        
+
+        <p>応答ヘッダ�クライアント��られる�� <code>Vary</code>
+        フィールドを�り除���。
+        クライアント�中����フィールドを正��解釈���も���り��。
+        ��変数を設定�る������題を回��る�������。
+        ��変数を設定�る��<strong>force-response-1.0</strong>
+        �設定�れ�����り��。</p>
+
+    
+    <h3><a name="force-response" id="force-response">force-response-1.0</a></h3>
+        
+
+        <p>�れ�設定�れ��る��HTTP/1.0 リクエストを発行�るクライアント�対���
+	常� HTTP/1.0 �応答�るよ���り��。��機能��
+        元々� AOL �プロキシ��題����実装�れ���。HTTP/1.0 クライアント�中���
+        HTTP/1.1 �応答を返�れる�正��動作���も���る�も�れ��ん。
+        ��機能を使用�る������よ��クライアント��間�互�性�題を解決����。</p>
+    
+
+    <h3><a name="gzip-only-text-html" id="gzip-only-text-html">gzip-only-text/html</a></h3>
+        
+
+	<p>�れ� 1 �設定�れる����変数� <code>text/html</code>
+	以外�コンテントタイプ�対�る�<code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code>
+	�供� <code>DEFLATE</code> 出力フィルタを無効����。
+        ����的��既�圧縮�れ�ファイルを使用���場��
+        (gzip ������"identity" �異�る全��エンコード�対��)
+        <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code> も変数を評価���。</p>
+    
+
+    <h3><a name="no-gzip" id="no-gzip">no-gzip</a></h3>
+        <p>セット�れる��<code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code> �
+	<code>DEFLATE</code> フィルタ�オフ��り��。
+        ��� <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code>
+        �エンコード�れ�リソースを�ら��よ�����。</p>
+    
+
+    <h3><a name="nokeepalive" id="nokeepalive">nokeepalive</a></h3>
+        
+
+        <p>�れ�設定�れ��る場���<code class="directive"><a href="./mod/core.html#keepalive">KeepAlive</a></code> を使用���よ�����。</p>
+
+    <h4><a name="prefer-language" id="prefer-language">prefer-language</a></h4>
+
+        <p><code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code> �挙動�影響を与���。
+        (<code>en</code>, <code>ja</code>, <code>x-klingon</code>����)
+        言語タグ�格��れ��れ����言語� variant を�信�よ�����。
+        ��よ�� variant ���場���
+        通常�<a href="content-negotiation.html">�ゴシエーション</a>処��
+        �用�れ��。</p>
+
+    
+
+    
+    <h3><a name="redirect-carefully" id="redirect-carefully">redirect-carefully</a></h3>
+        
+
+        <p>�れ�クライアント��リダイレクト��信をサー��より注�深�
+        行��よ�����。
+        �れ�通常�リダイレクト�際��クライアント�
+        �題��る���分����る場��使�れ��。��機能�元々�
+        マイクロソフト�ウェブフォルダ�ソフト� DAV
+        メソッド�よるディレクトリ�リソース��リダイレクト�扱��
+        �題�り��れを回��る���実装�れ���。</p>
+
+    
+
+   <h3><a name="suppress-error-charset" id="suppress-error-charset">suppress-error-charset</a></h3>
+       
+
+    <p><em>Apache 2.2 以��利用�能</em></p>
+
+    <p>クライアント�リクエスト�対�る応答���リダイレクトを�信�る際�
+    レス�ンス��リダイレクト�自動的�行���� (行��れ��)
+    場��表示�るテキスト���れ��。
+    通常���テキスト��致��キャラクタセット�ISO-8859-1
+    �ラベル付�を���。</p>
+    <p>����リダイレクト先�別�文字セットを使���る場��
+    �る�題��るブラウザ��ージョン���
+    リダイレクト先�実際�文字セット�代�り��
+    リダイレクト元�文字セットを使���������り��。
+    ���果�例��変��画�行��れ�り���読������り���。</p>
+    <p>��環境変数を設定�る����リダイレクションテキスト�対�る
+    キャラクタセット�指定を除去�������れら�題��るブラウザ�も
+    リダイレクト先�文字セットを正��使�よ������。</p>
+
+   
+
+   <h3><a name="proxy" id="proxy">force-proxy-request-1.0, proxy-nokeepalive, proxy-sendchunked, proxy-sendcl</a></h3>
+
+   <p>�れら�指示�� <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code> �挙動を変更���。
+   詳細� <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code> �ドキュメントを��照����。</p>
+   
+
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">例</a></h2>
+    
+
+    <h3><a name="misbehaving" id="misbehaving">����挙動を�るクライアント�対��プロトコル�動作を変更�る</a></h3>
+        
+
+        <p>クライアント�関�る既知��題�対処�る����以下�行を
+        httpd.conf �入れる��を推奨�����。</p>
+        <p>���ージョン� Apache ���クライアント��題�対応�る���
+        httpd.conf �次�行を加�るよ�推奨�れ�������
+        今�������題�����クライアント�実際��見��る���
+        ������������設定�も�や必����も�れ��ん。</p>
+<div class="example"><pre>
+#
+# The following directives modify normal HTTP response behavior.
+# The first directive disables keepalive for Netscape 2.x and browsers that
+# spoof it. There are known problems with these browser implementations.
+# The second directive is for Microsoft Internet Explorer 4.0b2
+# which has a broken HTTP/1.1 implementation and does not properly
+# support keepalive when it is used on 301 or 302 (redirect) responses.
+#
+BrowserMatch "Mozilla/2" nokeepalive
+BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
+
+#
+# The following directive disables HTTP/1.1 responses to browsers which
+# are in violation of the HTTP/1.0 spec by not being able to grok a
+# basic 1.1 response.
+#
+BrowserMatch "RealPlayer 4\.0" force-response-1.0
+BrowserMatch "Java/1\.0" force-response-1.0
+BrowserMatch "JDK/1\.0" force-response-1.0</pre></div>
+
+    
+    <h3><a name="no-img-log" id="no-img-log">画���リクエストをアクセスログ�記録���</a></h3>
+        
+
+        <p>��例���画���リクエスト�アクセスログ��れ��よ�����。
+        �れを変更�る����特定�ディレクトリ�ログ�集をや��り�
+        特定�ホスト�ら�リクエスト�ログ�集をや��り�る���簡������。
+        </p>
+    <div class="example"><pre>
+SetEnvIf Request_URI \.gif image-request
+SetEnvIf Request_URI \.jpg image-request
+SetEnvIf Request_URI \.png image-request
+CustomLog logs/access_log common env=!image-request</pre></div>
+
+    
+    <h3><a name="image-theft" id="image-theft">「画��盗用�を防�</a></h3>
+        
+
+        <p>��例��別�サー���る人������サー���る画�を
+        inline 画����使用�る��を防���。
+        �れ�推奨�れ��る設定���り��ん���る�定�れ�状���有効��。
+        ���������画�� <code>/web/images</code>
+	���ディレクトリ��る�仮定���。</p>
+    <div class="example"><pre>
+SetEnvIf Referer "^http://www.example.com/" local_referal
+# Allow browsers that do not send Referer info
+SetEnvIf Referer "^$" local_referal
+&lt;Directory /web/images&gt;
+   Order Deny,Allow
+   Deny from all
+   Allow from env=local_referal
+&lt;/Directory&gt;</pre></div>
+
+        <p>��手法�関�る詳��情報� ApacheToday ��ュートリアル「<a href="http://apachetoday.com/news_story.php3?ltsn=2000-06-14-002-01-ps">Keeping Your Images from Adorning Other Sites</a>
+        �を�照������。</p>
+    
+  </div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./en/env.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./ja/env.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/env.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/env.html.ko.euc-kr b/docs/manual/env.html.ko.euc-kr
index 4219e419..b394cd9e 100644
--- a/docs/manual/env.html.ko.euc-kr
+++ b/docs/manual/env.html.ko.euc-kr
@@ -368,6 +368,6 @@ SetEnvIf Referer "^$" local_referal
 <a href="./ja/env.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/env.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/faq/index.html b/docs/manual/faq/index.html
index 5f97bff8..23ec1ec0 100644
--- a/docs/manual/faq/index.html
+++ b/docs/manual/faq/index.html
@@ -1,3 +1,9 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: index.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
+
+URI: index.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/faq/index.html.en b/docs/manual/faq/index.html.en
index 42730ae7..4d39e529 100644
--- a/docs/manual/faq/index.html.en
+++ b/docs/manual/faq/index.html.en
@@ -18,7 +18,8 @@
 <div id="path">
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.2</a></div><div id="page-content"><div id="preamble"><h1>Frequently Asked Questions</h1>
 <div class="toplang">
-<p><span>Available Languages: </span><a href="../en/faq/" title="English">&nbsp;en&nbsp;</a></p>
+<p><span>Available Languages: </span><a href="../en/faq/" title="English">&nbsp;en&nbsp;</a> |
+<a href="../tr/faq/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>This document is not a traditional FAQ, but rather a quick
@@ -43,13 +44,19 @@
 
       <dl>
       <dt>Check the ErrorLog!</dt>
-      <dd>Apache tries to be helpful when it encounters a problem. In many
+      <dd><p>Apache tries to be helpful when it encounters a problem. In many
       cases, it will provide some details by writing one or more messages to the
       server error log. Sometimes this is enough for you to diagnose and fix
       the problem yourself (such as file permissions or the like). The default
       location of the error log is
       <code>/usr/local/apache2/logs/error_log</code>, but see the <code class="directive"><a href="../mod/core.html#errorlog">ErrorLog</a></code> directive in your config files for the
-      location on your server.</dd>
+      location on your server.</p>
+
+      <p>If you end up in any of the support forums this is quite likely to be the
+      first place they will ask you retrieve information from.  Please ensure you
+      know where to find your errorlog.  If you are unsure, the wiki page
+      <a href="http://wiki.apache.org/httpd/DistrosDefaultLayout"> here</a> can
+      give you some ideas where to look.</p></dd>
 
       <dt>Consult the wiki</dt>
       <dd>The <a href="http://wiki.apache.org/httpd/">Apache HTTP
@@ -99,8 +106,9 @@
       a number of companies.</p>
     </div></div>
 <div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/faq/" title="English">&nbsp;en&nbsp;</a></p>
+<p><span>Available Languages: </span><a href="../en/faq/" title="English">&nbsp;en&nbsp;</a> |
+<a href="../tr/faq/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/faq/index.html.tr.utf8 b/docs/manual/faq/index.html.tr.utf8
new file mode 100644
index 00000000..3c8a1045
--- /dev/null
+++ b/docs/manual/faq/index.html.tr.utf8
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Sıkça Sorulan Sorular - Apache HTTP Sunucusu</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="../"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="../">Sürüm 2.2</a></div><div id="page-content"><div id="preamble"><h1>Sıkça Sorulan Sorular</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="../en/faq/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../tr/faq/" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+
+    <p>Bu belge geleneksel bir SSS’ten çok Apache HTTP Sunucusu ile
+    ilgili sorunlarla karşılaştığınızda ne yapacağınızı gösteren bir rehber
+    niteliÄŸindedir.</p>
+
+    <p>Daha geleneksel ama biraz eski tarihli bir SSS belgesi olarak <a href="http://httpd.apache.org/docs/misc/FAQ.html">Apache 1.3
+    SSS</a>’sine bakabilirsiniz.</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#support.what2do">“Neden ... yapamıyorum? Niçin ... çalışmıyor?� gibi
+    sorular için</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#support.support">Destek için kime başvurayım?</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="support.what2do" id="support.what2do">“Neden ... yapamıyorum? Niçin ... çalışmıyor?� gibi
+    sorular için</a></h2>
+    
+
+      <p>Apache sunucu yazılımınızla ilgili sorunlar yaşıyorsanız şu
+      adımları izleyin:</p>
+
+      <dl>
+      <dt>Günlük kayıt dosyalarına bakın!</dt>
+      <dd><p>Apache sorunları saptamaya ve size yardımcı olmaya çalışır. Çoğu
+        durumda, günlük dosyalarına bir kaç ileti yazarak sunucu hataları için
+        size bazı ayrıntıları sağlayacaktır. Bu genellikle sorunun sizin
+        tarafınızdan teşhis edilmesi (dosya izinleri ve benzeri) ve düzeltilmesi
+        için yeterli olur. Hata kayıtlarının tutulduğu günlük dosyalarının
+        öntanımlı yeri <code>/usr/local/apache2/logs/error_log</code> olup
+        sizin sunucunuzdaki yeri için yapılandırma dosyalarınızdaki <code class="directive"><a href="../mod/core.html#errorlog">ErrorLog</a></code> yönergesine bakabilirsiniz.</p>
+
+      <p>Genellikle başvurulan ilk yerlerden biri olarak yolunuz yardımlaşma
+        listelerinden birine düşerse sizden ilk olarak biraz bilgi sağlamanız
+        istenecektir. Bu bakımdan hataların yazıldığı günlük kayıt dosyalarını
+        nerede bulacağınızı bilmelisiniz. Eğer yerlerinden emin değilseniz
+        kullandığınız dağıtıma göre dosyaların yerlerini gösteren <a href="http://wiki.apache.org/httpd/DistrosDefaultLayout">wiki
+        sayfası</a> size fikir verebilir.</p></dd>
+
+      <dt>Wiki’yi inceleyin</dt>
+      <dd><a href="http://wiki.apache.org/httpd/">Httpd Wiki</a>, çoğu sorunun
+        çözümüne yardımcı olacak kılavuzlar içerir.</dd>
+
+      <dt>Apache hata ayıklama veritabanına bakın</dt>
+      <dd>Apache Grubuna bildirilen çoğu sorun <a href="http://httpd.apache.org/bug_report.html">hata ayıklama
+        veritabanına</a> kaydedilir. Açık ya da kapalı, mevcut hata raporlarını
+        incelemeden ve sorununuz hakkında kullanıcı destek listelerine (aşağıya
+        bakınız) danışmadan lütfen yeni bir hata bildirimi
+        <strong>yapmayın</strong>. Zaten raporlanmış bir sorunsa bir “ben de�
+        veya “+1� raporu <em>eklemeyin</em>.</dd>
+
+      <dt><a id="support.what2do.user-support" name="support.what2do.user-support">Bir kullanıcı destek listesine
+        sorun</a></dt>
+      <dd><p>Apache, bilgilerini gönüllü olarak paylaşan etkin bir kullanıcı
+        topluluğuna sahiptir. Bu topluluğa katılarak sorularınıza ve
+        sorunlarınıza genellikle en iyi ve en hızlı yanıtı alırsınız.</p>
+
+      <p><a href="http://httpd.apache.org/userslist.html">Apache kullanıcıları
+        eposta listesi</a></p>
+
+      <p>Kullanıcı desteği ile ilgili olarak <a href="http://freenode.net">Freenode IRC</a> üzerindeki <a href="irc://irc.freenode.net/#apache">#apache</a> kanalı da
+        kullanılabilir.</p>
+      </dd>
+
+      <dt>Lütfen hata bildirimi için hata ayıklama veritabanını kullanın!</dt>
+      <dd><p>Eğer yukarıdaki adımlardan size uygun olanları izlemiş ve
+        bir çare bulamamışsanız lütfen <a href="http://httpd.apache.org/bug_report.html">bir hata ayıklama
+        bildirimi</a>nde bulunarak httpd geliştiricilerini sorun hakkında
+        bilgilendirin.</p>
+
+      <p>Eğer sorununuz sunucunun çökmesine ve bir ‘core’ üretilmesine sebep
+        oluyorsa hatayı bildirirken lütfen (mümkünse) bir <a href="http://httpd.apache.org/dev/debugging.html">geriye doğru hata
+        izleme raporu</a> ekleyin.</p>
+      </dd>
+      </dl>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="support.support" id="support.support">Destek için kime başvurayım?</a></h2>
+      <p>Milyonlarca kullanıcı ve altmıştan az gönüllü geliştirici ile
+        Apache için kişisel destek sağlayamıyoruz. Ücretsiz destek için
+        yardımlaşma listelerine katılmanızı öneriyoruz (yukarı bakınız).</p>
+
+      <p>Profesyonel ve ticari Apache desteği almak için bu tür destekleri
+        sunan ÅŸirketlere baÅŸvurunuz.</p>
+    </div></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="../en/faq/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../tr/faq/" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/filter.html b/docs/manual/filter.html
index 98b9e5c4..96742477 100644
--- a/docs/manual/filter.html
+++ b/docs/manual/filter.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: filter.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
@@ -10,9 +12,9 @@ URI: filter.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: filter.html.ja.euc-jp
+URI: filter.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: filter.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/filter.html.en b/docs/manual/filter.html.en
index 0f01fa38..efd73236 100644
--- a/docs/manual/filter.html.en
+++ b/docs/manual/filter.html.en
@@ -132,6 +132,6 @@ configuration instead.</p>
 <a href="./ja/filter.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/filter.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/filter.html.es b/docs/manual/filter.html.es
index 4172cfc0..c19ea495 100644
--- a/docs/manual/filter.html.es
+++ b/docs/manual/filter.html.es
@@ -76,6 +76,6 @@
 <a href="./ja/filter.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/filter.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Módulos</a> | <a href="./mod/directives.html">Directivas</a> | <a href="./faq/">Preguntas Frecuentes</a> | <a href="./glossary.html">Glosario</a> | <a href="./sitemap.html">Mapa de este sitio web</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/filter.html.fr b/docs/manual/filter.html.fr
index 5f08d54e..3e713998 100644
--- a/docs/manual/filter.html.fr
+++ b/docs/manual/filter.html.fr
@@ -143,6 +143,6 @@ configuration dynamique à la place.</p>
 <a href="./ja/filter.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/filter.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossaire</a> | <a href="./sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/filter.html.ja.euc-jp b/docs/manual/filter.html.ja.euc-jp
deleted file mode 100644
index 3877d71c..00000000
--- a/docs/manual/filter.html.ja.euc-jp
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>¥Õ¥£¥ë¥¿ - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>¥Õ¥£¥ë¥¿</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./en/filter.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/filter.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./fr/filter.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/filter.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/filter.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-
-    <p>Apache ¤Ç¤Î¥Õ¥£¥ë¥¿¤Î»È¤¤Êý¤Ë¤Ä¤¤¤Æµ­½Ò¤·¤Æ¤¤¤Þ¤¹¡£</p>
-  </div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#intro">Apache 2 ¤Î¥Õ¥£¥ë¥¿</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#smart">¥¹¥Þ¡¼¥È¥Õ¥£¥ë¥¿</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#using">¥Õ¥£¥ë¥¿¤Î»È¤¤Êý</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="intro" id="intro">Apache 2 ¤Î¥Õ¥£¥ë¥¿</a></h2>
-    
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_filter.html">mod_filter</a></code></li><li><code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_charset_lite.html">mod_charset_lite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_filter.html#filterchain">FilterChain</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterdeclare">FilterDeclare</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterprotocol">FilterProtocol</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterprovider">FilterProvider</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#addinputfilter">AddInputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#removeinputfilter">RemoveInputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#removeoutputfilter">RemoveOutputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilteroptions">ExtFilterOptions</a></code></li><li><code class="directive"><a href="./mod/core.html#setinputfilter">SetInputFilter</a></code></li><li><code class="directive"><a href="./mod/core.html#setoutputfilter">SetOutputFilter</a></code></li></ul></td></tr></table>
-
-<p>Apache 2.0 °Ê¹ß¤Ç¤Ï¥Õ¥£¥ë¥¿¥Á¥§¥¤¥óµ¡Ç½¤¬»È¤¨¡¢¥Ç¡¼¥¿¤¬
-¤É¤³¤«¤éÍè¤ë¤«¤Ë´Ø¤ï¤é¤º¡¢Èó¾ï¤Ë½ÀÆð¤ÇÄ´À°¤·¤ä¤¹¤¤ÊýË¡¤Ç
-Æþ½ÐÎϥǡ¼¥¿¤ò½èÍý¤Ç¤­¤Þ¤¹¡£
-ÆþÎϥǡ¼¥¿¤ò¥×¥ê¥×¥í¥»¥¹¤·¤¿¤ê½ÐÎϥǡ¼¥¿¤ò¥Ý¥¹¥È¥×¥í¥»¥¹¤·¤¿¤ê¤Ç¤­¤Þ¤¹¡£
-¤³¤Î½èÍý¤Ï¡¢¤³¤ì¤Þ¤Ç¤Î¥ê¥¯¥¨¥¹¥È½èÍý¥Õ¥§¡¼¥º¤È¤Ïº¬ËÜŪ¤ËÆÈΩ¤·¤¿
-½èÍý¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-<p class="figure">
-<img src="images/filter_arch.png" width="569" height="392" alt="Filters can be chained, in a Data Axis orthogonal to request processing" />
-</p>
-<p>Apache ¤Îɸ½àŪ¤Ê¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ç¤Î¥Õ¥£¥ë¥¿Îã¤Ï :</p>
-<ul>
-<li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code> ¤Ç¡¢¥µ¡¼¥Ð¥µ¥¤¥É¥¤¥ó¥¯¥ë¡¼¥É SSI ¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹</li>
-<li><code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code> ¤Ç¡¢SSL °Å¹æ²½ (https) ¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£</li>
-<li><code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code> ¤Ç¡¢on-the-fly ¤Î¥Ç¡¼¥¿°µ½Ì¡¦Å¸³«µ¡Ç½¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£</li>
-<li><code class="module"><a href="./mod/mod_charset_lite.html">mod_charset_lite</a></code> ¤Ç¡¢°Û¤Ê¤ëʸ»ú¥»¥Ã¥È´Ö¤ÎÊÑ´¹¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£</li>
-<li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code> ¤Ç¡¢³°Éô¥×¥í¥°¥é¥à¤ò¥Õ¥£¥ë¥¿¤È¤·¤Æ¼Â¹Ô¤·¤Þ¤¹¡£</li>
-</ul>
-<p>¥Á¥ã¥ó¥­¥ó¥°¤ä¥Ð¥¤¥È¥ì¥ó¥¸½èÍý¤È¤¤¤Ã¤¿½èÍý¤ò¹Ô¤¦¤¿¤á¤Ë
-Apache ¤Ï¡¢ÆâÉôŪ¤Ë¤¤¤¯¤Ä¤«¤Î¥Õ¥£¥ë¥¿¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
-
-<p>ÍÍ¡¹¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¤Î¥Õ¥£¥ë¥¿¥â¥¸¥å¡¼¥ë¤È¤·¤Æ
-¼ÂÁõ¤µ¤ì¤Æ¤¤¤Æ¡¢<a href="http://modules.apache.org/">modules.apache.org</a>
-¤Ê¤É¤«¤é¼èÆÀ¤Ç¤­¤Þ¤¹¡£¤¿¤È¤¨¤Ð :</p>
-
-<ul>
-<li>HTML ¤ä XML ¤Î½èÍý¤È½ñ¤­´¹¤¨</li>
-<li>XSLT ÊÑ´¹¤È XIncludes</li>
-<li>XML ̾Á°¶õ´Ö¤Î¥µ¥Ý¡¼¥È</li>
-<li>¥Õ¥¡¥¤¥ë¥¢¥Ã¥×¥í¡¼¥É½èÍý¤ä HTML ¥Õ¥©¡¼¥à¤Î¥Ç¥³¡¼¥É</li>
-<li>²èÁü½èÍý</li>
-<li>PHP ¥¹¥¯¥ê¥×¥È¤Ê¤É¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ËÂФ¹¤ëÊݸǽ</li>
-<li>¥Æ¥­¥¹¥È¤Î¸¡º÷ÃÖ´¹¡¦ÊÔ½¸µ¡Ç½</li>
-</ul>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="smart" id="smart">¥¹¥Þ¡¼¥È¥Õ¥£¥ë¥¿</a></h2>
-
-<p class="figure">
-<img src="images/mod_filter_new.png" width="423" height="331" alt="Smart filtering applies different filter providers according to the state of request processing" />
-</p>
-<p>Apache 2.1 °Ü¹Ô¤Ë´Þ¤Þ¤ì¤ë <code class="module"><a href="./mod/mod_filter.html">mod_filter</a></code> ¤Ç¤Ï¡¢
-¼Â¹Ô»þ¤ËưŪ¤Ë¥Õ¥£¥ë¥¿¥Á¥§¥¤¥ó¤òÍ­¸ú¤Ë¤Ç¤­¤Þ¤¹¡£
-¤Ç¤¹¤«¤é¤¿¤È¤¨¤Ð¡¢HTML ¤ò HTML ¥Õ¥£¥ë¥¿¤Ç¡¢JPEG ²èÁü¤ò¤½¤ì¤È¤Ï
-Á´¤¯Ê̤Υե£¥ë¥¿¤Ç¡¢½ñ¤­´¹¤¨¤ë¤è¤¦¤Ê¥×¥í¥¯¥·¤òÀßÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-¤½¤Î¾å¡¢¤½¤Î¥×¥í¥¯¥·¤Ï¤É¤Î¥ª¥ê¥¸¥ó¥µ¡¼¥Ð¤¬¥³¥ó¥Æ¥ó¥Ä¤òÁ÷¿®¤¹¤ë¤«
-»öÁ°¾ðÊó̵¤·¤Ç¤¤¤¤¤è¤¦¤Ë¹½À®¤Ç¤­¤Þ¤¹¡£
-¤³¤ì¤Ï¡¢¼Â¹Ô»þ¤Ë¼ÂºÝ¤Î¥³¥ó¥Æ¥ó¥Ä¤Ë±þ¤¸¤ÆÊÌ¡¹¤Î¥Õ¥£¥ë¥¿¥×¥í¥Ð¥¤¥À¤Ë
-¥Ç¥£¥¹¥Ñ¥Ã¥Á¤¹¤ë¥Õ¥£¥ë¥¿¥Ï¡¼¥Í¥¹¤ò»È¤¦¤³¤È¤Ç¼Â¸½¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-¥Á¥§¥¤¥ó¤ÎÃæ¤ËľÀÜÆþ¤ì¤Æ̵¾ò·ï¤ËŬÍѤ·¤¿¤ê¡¢Æ°Åª¤Ë¥×¥í¥Ð¥¤¥À¤È¤·¤Æ
-ŬÍѤ¹¤ë¤è¤¦¤Ë¤·¤¿¤ê¤¹¤ë¤³¤È¤Ï¡¢¤É¤ó¤Ê¥Õ¥£¥ë¥¿¤Ç¤â¤Ç¤­¤Þ¤¹¡£
-¤¿¤È¤¨¤Ð¡¢</p>
-<ul>
-<li>HTML ½èÍý¥Õ¥£¥ë¥¿¤Ï¥³¥ó¥Æ¥ó¥È¤¬ text/html ¤¢¤ë¤¤¤Ï
-application/xhtml+xml ¤Î¾ì¹ç¤Ë¤Î¤ß¼Â¹Ô¤µ¤ì¤Þ¤¹</li>
-<li>°µ½Ì¥Õ¥£¥ë¥¿¤Ï°µ½Ì²Äǽ¤ÊÆþÎϤǡ¢È󰵽̾õÂ֤Τâ¤Î¤Ë
-ÂФ·¤Æ¤Î¤ß¼Â¹Ô¤µ¤ì¤Þ¤¹</li>
-<li>ʸ»ú¥»¥Ã¥ÈÊÑ´¹¥Õ¥£¥ë¥¿¤Ï¥Æ¥­¥¹¥Èʸ½ñ¤¬
-´õ˾¤Îʸ»ú¥»¥Ã¥È¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤¤¾ì¹ç¤ËÁÞÆþ¤µ¤ì¤Þ¤¹</li>
-</ul>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="using" id="using">¥Õ¥£¥ë¥¿¤Î»È¤¤Êý</a></h2>
-
-<p>¥Õ¥£¥ë¥¿¤Î»È¤¤Êý¤Ë¤ÏÆó¤Ä¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹: ¥·¥ó¥×¥ë¤È¥À¥¤¥Ê¥ß¥Ã¥¯¡£
-°ìÈÌŪ¤Ë¤Ï¤É¤Á¤é¤«¤Î¤ß¤ò»È¤Ã¤¿¤Û¤¦¤¬¤è¤¤¤Ç¤·¤ç¤¦¡£
-¤³¤ì¤é¤òÁȤ߹ç¤ï¤»¤Æ»ÈÍѤ¹¤ë¤È¡¢Í½´ü¤·¤Ê¤¤·ë²Ì¤Ë¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-(¤È¤Ï¤¤¤¨¡¢¥·¥ó¥×¥ë¤ÊÆþÎÏ¥Õ¥£¥ë¥¿¤È¥·¥ó¥×¥ë¤¢¤ë¤¤¤Ï¥À¥¤¥Ê¥ß¥Ã¥¯¤Ê
-½ÐÎÏ¥Õ¥£¥ë¥¿¤òÁȤ߹ç¤ï¤»¤ë¤³¤È¤Ï¼«Í³¤Ë½ÐÍè¤Þ¤¹¡£)</p>
-<p>¥·¥ó¥×¥ë¤ÊÊýË¡¤Ï¡¢ÆþÎÏ¥Õ¥£¥ë¥¿¤Î¤ß¤òÀßÄꤷ¡¢É¬Íפ˱þ¤¸¤Æ
-ÀÅŪ¤Ê¥Õ¥£¥ë¥¿¥Á¥§¥¤¥ó¤ò½ÐÎÏ¥Õ¥£¥ë¥¿¤È¤·¤ÆÀßÄꤹ¤ëÊýË¡¤Ç¤¹¡£
-´ØÏ¢¤¹¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    <code class="directive"><a href="./mod/core.html#setinputfilter">SetInputFilter</a></code>,
-    <code class="directive"><a href="./mod/core.html#setoutputfilter">SetOutputFilter</a></code>,
-    <code class="directive"><a href="./mod/core.html#addinputfilter">AddInputFilter</a></code>,
-    <code class="directive"><a href="./mod/core.html#addoutputfilter">AddOutputFilter</a></code>,
-    <code class="directive"><a href="./mod/mod_mime.html#removeinputfilter">RemoveInputFilter</a></code>,
-    <code class="directive"><a href="./mod/mod_mime.html#removeoutputfilter">RemoveOutputFilter</a></code>
-    ¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-<p>¥À¥¤¥Ê¥ß¥Ã¥¯¤ÊÊýË¡¤Ï¡¢ÀÅŪ¤Ê¤â¤Î¤È¥Õ¥ì¥­¥·¥Ö¥ë¤Ê¤â¤Î¤òξÊýÍ­¸ú¤Ë¤¹¤ë
-ÊýË¡¤Ç¡¢<code class="module"><a href="./mod/mod_filter.html">mod_filter</a></code> ¤Î¥Ú¡¼¥¸¤Ç½Ò¤Ù¤é¤ì¤Æ¤¤¤Þ¤¹¡£
-´ØÏ¢¤¹¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    <code class="directive"><a href="./mod/mod_filter.html#filterchain">FilterChain</a></code>,
-    <code class="directive"><a href="./mod/mod_filter.html#filterdeclare">FilterDeclare</a></code>, 
-    <code class="directive"><a href="./mod/mod_filter.html#filterprovider">FilterProvider</a></code>
-    ¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-<p>¥Ç¥£¥ì¥¯¥Æ¥£¥Ö <code class="directive"><a href="./mod/core.html#addoutputfilterbytype">AddOutputFilterByType</a></code>
-¤Ï¤Þ¤À¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¼ï¡¹¤ÎÌäÂê¤ò¤Ï¤é¤ó¤Ç¤ª¤ê¡¢Èó¿ä¾©¤Ç¤¹¡£
-¥À¥¤¥Ê¥ß¥Ã¥¯¤ÊÀßÄêÊýË¡¤òÂå¤ï¤ê¤Ë»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-  </div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./en/filter.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/filter.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./fr/filter.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/filter.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/filter.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/filter.html.ja.utf8 b/docs/manual/filter.html.ja.utf8
new file mode 100644
index 00000000..a7351ec1
--- /dev/null
+++ b/docs/manual/filter.html.ja.utf8
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>フィルタ - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>フィルタ</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./en/filter.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/filter.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/filter.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/filter.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/filter.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+
+    <p>Apache ��フィルタ�使�方����記述�����。</p>
+  </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#intro">Apache 2 �フィルタ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#smart">スマートフィルタ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#using">フィルタ�使�方</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="intro" id="intro">Apache 2 �フィルタ</a></h2>
+    
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_filter.html">mod_filter</a></code></li><li><code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code></li><li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_charset_lite.html">mod_charset_lite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_filter.html#filterchain">FilterChain</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterdeclare">FilterDeclare</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterprotocol">FilterProtocol</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterprovider">FilterProvider</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#addinputfilter">AddInputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#removeinputfilter">RemoveInputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#removeoutputfilter">RemoveOutputFilter</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></code></li><li><code class="directive"><a href="./mod/mod_ext_filter.html#extfilteroptions">ExtFilterOptions</a></code></li><li><code class="directive"><a href="./mod/core.html#setinputfilter">SetInputFilter</a></code></li><li><code class="directive"><a href="./mod/core.html#setoutputfilter">SetOutputFilter</a></code></li></ul></td></tr></table>
+
+<p>Apache 2.0 以���フィルタ�ェイン機能�使��データ�
+���ら�る��関�ら���常�柔軟�調整�や��方法�
+入出力データを処�����。
+入力データをプリプロセス��り出力データを�ストプロセス��り����。
+��処����れ���リクエスト処�フェーズ��根本的�独立��
+処���り��。</p>
+<p class="figure">
+<img src="images/filter_arch.png" width="569" height="392" alt="Filters can be chained, in a Data Axis orthogonal to request processing" />
+</p>
+<p>Apache �標準的�ディストリビューション��フィルタ例� :</p>
+<ul>
+<li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code> ��サー�サイドインクルード SSI を実装�����</li>
+<li><code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code> ��SSL 暗�化 (https) を実装�����。</li>
+<li><code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code> ��on-the-fly �データ圧縮・展開機能を実装�����。</li>
+<li><code class="module"><a href="./mod/mod_charset_lite.html">mod_charset_lite</a></code> ��異�る文字セット間�変�を実装�����。</li>
+<li><code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code> ��外部プログラムをフィルタ���実行���。</li>
+</ul>
+<p>�ャンキングや�イトレンジ処�����処�を行����
+Apache ��内部的������フィルタを使�����。</p>
+
+<p>様々�アプリケーション�サードパーティ製�フィルタモジュール���
+実装�れ����<a href="http://modules.apache.org/">modules.apache.org</a>
+���ら�得����。���� :</p>
+
+<ul>
+<li>HTML や XML �処��書���</li>
+<li>XSLT 変�� XIncludes</li>
+<li>XML ��空間�サ�ート</li>
+<li>ファイルアップロード処�や HTML フォーム�デコード</li>
+<li>画�処�</li>
+<li>PHP スクリプト���アプリケーション�対�る�護機能</li>
+<li>テキスト�検索置�・編集機能</li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="smart" id="smart">スマートフィルタ</a></h2>
+
+<p class="figure">
+<img src="images/mod_filter_new.png" width="423" height="331" alt="Smart filtering applies different filter providers according to the state of request processing" />
+</p>
+<p>Apache 2.1 移行���れる <code class="module"><a href="./mod/mod_filter.html">mod_filter</a></code> ���
+実行時�動的�フィルタ�ェインを有効�����。
+���ら�����HTML を HTML フィルタ��JPEG 画�を�れ��
+全�別�フィルタ��書���るよ��プロクシを設定�る��も����。
+��上���プロクシ���オリジンサー��コンテンツを�信�る�
+事�情報無����よ��構�����。
+�れ��実行時�実際�コンテンツ�応��別々�フィルタプロ�イダ�
+ディスパッ��るフィルタ�ー�スを使����実��れ����。
+�ェイン�中�直接入れ�無�件��用��り�動的�プロ�イダ���
+�用�るよ����り�る�����ん�フィルタ�も����。
+�����</p>
+<ul>
+<li>HTML 処�フィルタ�コンテント� text/html �る��
+application/xhtml+xml �場����実行�れ��</li>
+<li>圧縮フィルタ�圧縮�能�入力���圧縮状態�も��
+対����実行�れ��</li>
+<li>文字セット変�フィルタ�テキスト文書�
+希望�文字セット�������場��挿入�れ��</li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="using" id="using">フィルタ�使�方</a></h2>
+
+<p>フィルタ�使�方��二��方法��り��: シンプル�ダイナミック。
+一般的����ら���を使�����よ���ょ�。
+�れらを組�����使用�る��予期����果��る�も�れ��ん。
+(�����シンプル�入力フィルタ�シンプル�る��ダイナミック�
+出力フィルタを組����る���自由�出���。)</p>
+<p>シンプル�方法��入力フィルタ��を設定��必��応��
+�的�フィルタ�ェインを出力フィルタ���設定�る方法��。
+関連�るディレクティブ��
+    <code class="directive"><a href="./mod/core.html#setinputfilter">SetInputFilter</a></code>,
+    <code class="directive"><a href="./mod/core.html#setoutputfilter">SetOutputFilter</a></code>,
+    <code class="directive"><a href="./mod/core.html#addinputfilter">AddInputFilter</a></code>,
+    <code class="directive"><a href="./mod/core.html#addoutputfilter">AddOutputFilter</a></code>,
+    <code class="directive"><a href="./mod/mod_mime.html#removeinputfilter">RemoveInputFilter</a></code>,
+    <code class="directive"><a href="./mod/mod_mime.html#removeoutputfilter">RemoveOutputFilter</a></code>
+    ��り��。</p>
+
+<p>ダイナミック�方法���的�も��フレキシブル�も�を両方有効��る
+方法��<code class="module"><a href="./mod/mod_filter.html">mod_filter</a></code> �ページ�述�られ����。
+関連�るディレクティブ��
+    <code class="directive"><a href="./mod/mod_filter.html#filterchain">FilterChain</a></code>,
+    <code class="directive"><a href="./mod/mod_filter.html#filterdeclare">FilterDeclare</a></code>, 
+    <code class="directive"><a href="./mod/mod_filter.html#filterprovider">FilterProvider</a></code>
+    ��り��。</p>
+
+<p>ディレクティブ <code class="directive"><a href="./mod/core.html#addoutputfilterbytype">AddOutputFilterByType</a></code>
+���サ�ート�れ������種々��題を�らん��り��推奨��。
+ダイナミック�設定方法を代�り�使������。</p>
+
+  </div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./en/filter.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/filter.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/filter.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/filter.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/filter.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/filter.html.ko.euc-kr b/docs/manual/filter.html.ko.euc-kr
index 1c32dbc8..5a9a3d38 100644
--- a/docs/manual/filter.html.ko.euc-kr
+++ b/docs/manual/filter.html.ko.euc-kr
@@ -75,6 +75,6 @@
 <a href="./ja/filter.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/filter.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/glossary.html b/docs/manual/glossary.html
index 35303ba4..a5048e28 100644
--- a/docs/manual/glossary.html
+++ b/docs/manual/glossary.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: glossary.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -17,3 +19,7 @@ Content-type: text/html; charset=ISO-8859-1
 URI: glossary.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: glossary.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/glossary.html.de b/docs/manual/glossary.html.de
index 3fcc3d53..76d0e78f 100644
--- a/docs/manual/glossary.html.de
+++ b/docs/manual/glossary.html.de
@@ -22,7 +22,8 @@
 <a href="./en/glossary.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/glossary.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/glossary.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/glossary.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">Diese Übersetzung ist möglicherweise
             nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
@@ -547,8 +548,9 @@
 <a href="./en/glossary.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/glossary.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/glossary.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/glossary.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/glossary.html.en b/docs/manual/glossary.html.en
index 0bec62e0..a53658c7 100644
--- a/docs/manual/glossary.html.en
+++ b/docs/manual/glossary.html.en
@@ -22,7 +22,8 @@
 <a href="./en/glossary.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/glossary.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/glossary.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/glossary.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>This glossary defines some of the common terminology related to Apache in
@@ -450,8 +451,9 @@
 <a href="./en/glossary.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/glossary.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/glossary.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/glossary.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/glossary.html.es b/docs/manual/glossary.html.es
index 09c4f23f..eb94cd1f 100644
--- a/docs/manual/glossary.html.es
+++ b/docs/manual/glossary.html.es
@@ -22,7 +22,8 @@
 <a href="./en/glossary.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/glossary.html" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/glossary.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/glossary.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">Esta traducción podría estar
             obsoleta. Consulte la versión en inglés de la
@@ -390,8 +391,9 @@ SSL/TLS.<br /> Consulte: <a href="ssl/">Encriptado SSL/TLS</a></dd>
 <a href="./en/glossary.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/glossary.html" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/glossary.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/glossary.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Módulos</a> | <a href="./mod/directives.html">Directivas</a> | <a href="./faq/">Preguntas Frecuentes</a> | <a href="./glossary.html">Glosario</a> | <a href="./sitemap.html">Mapa de este sitio web</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/glossary.html.fr b/docs/manual/glossary.html.fr
index 119f97ed..a51eee96 100644
--- a/docs/manual/glossary.html.fr
+++ b/docs/manual/glossary.html.fr
@@ -22,7 +22,8 @@
 <a href="./en/glossary.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/glossary.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/glossary.html" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/glossary.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>Ce glossaire définit la terminologie courante relative à Apache en
@@ -60,7 +61,7 @@
     <dd>L'identification formelle d'une entité du réseau comme un serveur, un
     client, ou un utilisateur.<br />
       Voir : <a href="howto/auth.html">Authentification, Autorisation, et
-      contrôle d'accès</a>
+      contrôle d'accès</a>
     </dd>
 
     <dt><a name="certificationauthority" id="certificationauthority">Autorité de Certification
@@ -128,13 +129,13 @@
       pour décrire les directives d'Apache</a>
     </dd>
 
-    <dt><a name="accesscontrol" id="accesscontrol">Contrôle d'accès
+    <dt><a name="accesscontrol" id="accesscontrol">Contrôle d'accès
     (Access Control)</a></dt>
     <dd>La restriction d'accès à des zones du réseau. Habituellement
     dans un contexte Apache,
       la restriction d'accès à certaines <em>URLs</em>.<br />
       Voir :  <a href="howto/auth.html">Authentification, Autorisation et
-      Contrôle d'accès</a>
+      Contrôle d'accès</a>
     </dd>
 
     <dt><a name="securesocketslayer" id="securesocketslayer">
@@ -183,7 +184,7 @@
     </dd>
 
     <dt><a name="directive" id="directive">Directive</a></dt>
-    <dd>Une commande de configuration qui contrôle un ou plusieurs aspects du
+    <dd>Une commande de configuration qui contrôle un ou plusieurs aspects du
     comportement d'Apache.  Les directives sont placées dans le <a class="glossarylink" href="./glossary.html#configurationfile" title="see glossary">Fichier de configuration</a><br />
     Voir : <a href="mod/directives.html">Index des directives</a>
     </dd>
@@ -218,7 +219,7 @@
     (Configuration File)</a></dt>
     <dd>Un fichier texte contenant des
     <a class="glossarylink" href="./glossary.html#directive" title="see glossary">Directives</a>
-      qui contrôlent la configuration d'Apache.<br />
+      qui contrôlent la configuration d'Apache.<br />
       Voir : <a href="configuring.html">Fichiers de configuration</a>
     </dd>
 
@@ -230,7 +231,7 @@
       Par exemple, le filtre en sortie
       <code>INCLUDES</code>
       traite les documents pour les
-      <a class="glossarylink" href="./glossary.html#ssi" title="see glossary">Server Side Includes (Inclusions côté Serveur)
+      <a class="glossarylink" href="./glossary.html#ssi" title="see glossary">Server Side Includes (Inclusions côté Serveur)
       </a>.<br />
       Voir : <a href="filter.html">Filtres</a>
     </dd>
@@ -256,12 +257,12 @@
     <dt><a name="virtualhosting" id="virtualhosting">Hébergement Virtuel
     (Virtual Hosting)</a></dt>
   <dd>Servir des sites web multiples en utilisant une seule instance d'Apache.
-  Les <em>Hôtes virtuels basés sur IP</em> différencient les sites web en se
+  Les <em>Hôtes virtuels basés sur IP</em> différencient les sites web en se
   basant sur leur adresse IP, alors que les
-  <em>Hôtes virtuels basés sur le nom</em> utilisent uniquement le nom d'hôte
+  <em>Hôtes virtuels basés sur le nom</em> utilisent uniquement le nom d'hôte
   et peuvent en conséquence héberger de nombreux sites avec la même
   adresse IP.<br />
-    Voir la <a href="vhosts/">Documentation des Hôtes Virtuels d'Apache</a>
+    Voir la <a href="vhosts/">Documentation des Hôtes Virtuels d'Apache</a>
   </dd>
 
 
@@ -271,7 +272,7 @@
     <a class="glossarylink" href="./glossary.html#directive" title="see glossary">directives</a> de configuration au
     répertoire dans lequel il est placé, ainsi qu'à tous ses sous-répertoires.
     En dépit de son nom, ce fichier peut contenir pratiquement tout type de
-    directive, et pas seulement des directives de contrôle d'accès.<br />
+    directive, et pas seulement des directives de contrôle d'accès.<br />
       Voir : <a href="configuring.html">Fichiers de configuration</a>
     </dd>
 
@@ -300,12 +301,12 @@
   </dd>
 
     <dt><a name="serversideincludes" id="serversideincludes">
-    Inclusions Côté Serveur
+    Inclusions Côté Serveur
     (Server Side Includes)</a> <a name="ssi" id="ssi">(SSI)
       </a></dt>
   <dd>Une technique permettant d'englober des directives de traitement dans
   des fichiers HTML.<br />
-    Voir : <a href="howto/ssi.html">Introduction aux Inclusions Côté Serveur</a>
+    Voir : <a href="howto/ssi.html">Introduction aux Inclusions Côté Serveur</a>
   </dd>
 
 <dt><a name="commongatewayinterface" id="commongatewayinterface">
@@ -338,7 +339,7 @@ Localisation de Ressource Uniformisée
       Identificateur de Ressource Uniformisé</a>.
     Les URLs sont généralement construites selon un schéma, comme
     <code>http</code> ou
-    <code>https</code>, un nom d'hôte, et un chemin.  Une URL pour cette page
+    <code>https</code>, un nom d'hôte, et un chemin.  Une URL pour cette page
     pourrait être
     <code>http://httpd.apache.org/docs/2.2/glossary.html</code>.
   </dd>
@@ -350,7 +351,7 @@ Localisation de Ressource Uniformisée
     Il prend en compte les requêtes des clients, les transmet au serveur
     d'origine, puis renvoie la réponse du serveur d'origine au client.
     Si plusieurs clients demandent le même contenu, le mandataire peut l'extraire
-    de son cache, plutôt que le demander au serveur d'origine
+    de son cache, plutôt que le demander au serveur d'origine
     à chaque fois, ce qui réduit le temps de réponse.<br />
       Voir : <a href="mod/mod_proxy.html">mod_proxy</a>
     </dd>
@@ -398,9 +399,9 @@ Localisation de Ressource Uniformisée
     <dt><a name="fully-qualifieddomain-name" id="fully-qualifieddomain-name">Nom de domaine entièrement qualifié
 	(Fully-Qualified Domain-Name)</a>
       <a name="fqdn" id="fqdn">(FQDN)</a></dt>
-    <dd>Le nom unique d'une entité du réseau, comprenant un nom d'hôte et un
+    <dd>Le nom unique d'une entité du réseau, comprenant un nom d'hôte et un
     nom de domaine qui peuvent être résolus en une adresse IP. Par exemple,
-      <code>www</code> est un nom d'hôte, <code>example.com</code> est un nom
+      <code>www</code> est un nom d'hôte, <code>example.com</code> est un nom
       de domaine, et <code>www.example.com</code> est un nom de domaine
       entièrement qualifié.
     </dd>
@@ -544,8 +545,9 @@ Localisation de Ressource Uniformisée
 <a href="./en/glossary.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/glossary.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/glossary.html" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/glossary.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossaire</a> | <a href="./sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/glossary.html.ko.euc-kr b/docs/manual/glossary.html.ko.euc-kr
index 047655af..2589ec3c 100644
--- a/docs/manual/glossary.html.ko.euc-kr
+++ b/docs/manual/glossary.html.ko.euc-kr
@@ -22,7 +22,8 @@
 <a href="./en/glossary.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/glossary.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="./fr/glossary.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
-<a href="./ko/glossary.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/glossary.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/glossary.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
             ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
@@ -359,8 +360,9 @@ ITU-T)ÀÌ ±ÇÀåÇÏ´Â ÀÎÁõ¼­ ¾ç½Ä. SSL/TLS ÀÎÁõ¿¡¼­ »ç¿ëÇÑ´Ù.<br />
 <a href="./en/glossary.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/glossary.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="./fr/glossary.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
-<a href="./ko/glossary.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/glossary.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/glossary.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/glossary.html.tr.utf8 b/docs/manual/glossary.html.tr.utf8
new file mode 100644
index 00000000..c3f56c15
--- /dev/null
+++ b/docs/manual/glossary.html.tr.utf8
@@ -0,0 +1,471 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Terim Sözlüğü - Apache HTTP Sunucusu</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page" class="no-sidebar"><div id="page-header">
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="./">Sürüm 2.2</a></div><div id="page-content"><div id="preamble"><h1>Terim Sözlüğü</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="./de/glossary.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/glossary.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/glossary.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/glossary.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/glossary.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+    <p>Bu sözlük, genelinde HTML sayfa sunumuna, özelinde Apache HTTP Sunucusuna
+      özgü ortak terminolojinin bir kısmını içerir. Her kavram ile ilgili daha
+      ayrıntılı bilgi bağlarla sağlanmıştır.</p>
+  </div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="definitions" id="definitions">Tanımlar</a></h2>
+
+  <dl>
+    <dt><a name="algorithm" id="algorithm">Algoritma</a></dt>
+
+    <dd>Bir sorunu sonlu sayıda adımda çözümlemek için uygulanan kurallar
+      kümesi veya anlam belirsizliği içermeyen bir formül. Şifreleme için
+      kullanılan algoritmalara <dfn>şifre</dfn> denir.
+    </dd>
+
+    <dt><a name="transportlayersecurity" id="transportlayersecurity">Aktarım Katmanı Güvenliği</a></dt>
+    <dd>Ä°ngilizcesi: Transport Layer Security <a name="tls" id="tls">(TLS)</a></dd>
+    <dd>TCP/IP ağları üzerinden genel iletişimin kimlik doğrulamalı ve şifreli
+      yapılabilmesi için SSL’nin ardılı olarak Genel Ağ Mühendisliği Görev Gücü
+      (IETF) tarafından oluşturulmuş protokol. TLS’nin 1. sürümü ile SSL’in 3.
+      sürümü hemen hemen aynıdır.<br />
+      Bakınız: <a href="ssl/">SSL/TLS Şifrelemesi</a>
+    </dd>
+
+    <dt><a name="passphrase" id="passphrase">Anahtar Parolası</a></dt>
+    <dd>Özel anahtar dosyalarını yetkisiz kişilerden koruyan sözcük veya
+      cümle. Genellikle sadece <a class="glossarylink" href="./glossary.html#cipher" title="sözlüğe bakınız">şifreler</a>
+      için kullanılan gizli şifreleme/şifre çözme anahtarını korur.<br />
+      Bakınız: <a href="ssl/">SSL/TLS Şifrelemesi</a>
+    </dd>
+
+    <dt><a name="apacheextensiontool" id="apacheextensiontool">Apache Eklenti
+      Aracı</a> <a name="apxs" id="apxs">(apxs)</a></dt>
+    <dd>Ä°ngilizcesi: APache eXtension Tool - apxs</dd>
+    <dd><a class="glossarylink" href="./glossary.html#module" title="sözlüğe bakınız">Modül</a> kaynak kodlarının devinen
+      paylaşımlı nesneler (<a class="glossarylink" href="./glossary.html#dso" title="sözlüğe bakınız">DSO</a>) halinde
+      derlenmesine ve Apache Sunucusu içinde kurulmasına yardım eden bir Perl
+      betiği.<br />Daha ayrıntılı bilgi için <code class="program"><a href="./programs/apxs.html">apxs</a></code> kılavuz
+      sayfasına bakınız.
+    </dd>
+
+    <dt><a name="apacheportableruntime" id="apacheportableruntime">Apache Taşınabilir Arayüzü</a> <a name="apr" id="apr">(APR)</a></dt>
+    <dd>Ä°ngilizcesi: Apache Portable Runtime - APR</dd>
+    <dd>Sunucu ile işletim sistemi arasındaki temel arayüzleri oluşturan
+      kütüphaneler kümesine verilen ad. APR, Apache HTTP Sunucusuna paralel
+      bağımsız bir proje olarak geliştirilmektedir.<br />
+      Bakınız: <a href="http://apr.apache.org/">Apache Taşınabilir Arayüzü
+      Projesi</a>
+    </dd>
+
+    <dt><a name="context" id="context">BaÄŸlam</a></dt>
+    <dd><a class="glossarylink" href="./glossary.html#configurationfile" title="sözlüğe bakınız">Yapılandırma dosyaları</a>nda
+      sadece belli türdeki <a class="glossarylink" href="./glossary.html#directive" title="sözlüğe bakınız">yönerge</a>lerin
+      bulunmasına izin verilen bir bölge.<br />
+      Bakınız: <a href="mod/directive-dict.html#Context">Apache Yönergelerini
+      Açıklamak için Kullanılan Terimler</a>
+    </dd>
+
+    <dt><a name="symmetriccryptophraphy" id="symmetriccryptophraphy">Bakışımlı Şifreleme Tekniği</a></dt>
+    <dd>Şifreleme ve şifre çözme için tek bir anahtarın kullanıldığı
+      bir ÅŸifreleme tekniÄŸi.<br />
+      Bakınız: <a href="ssl/">SSL/TLS Şifrelemesi</a>
+    </dd>
+
+    <dt><a name="header" id="header">Başlık</a></dt>
+    <dd>Bir <a class="glossarylink" href="./glossary.html#http" title="sözlüğe bakınız">HTTP</a> isteğinin parçası olarak,
+      gönderilen yanıtta asıl içerikten önce yer alan ve içerik hakkında
+      mecazlar içeren veri.
+    </dd>
+
+    <dt><a name="connect" id="connect">CONNECT</a></dt>
+    <dd>Ham veri kanallarını HTTP üzerinden yönlendirmek için kullanılan bir HTTP <a class="glossarylink" href="./glossary.html#method" title="sözlüğe bakınız">yöntemi</a>. SSL protokolü gibi diğer protokolleri sarmalamakta kullanılabilir.
+    </dd>
+
+    <dt><a name="dynamicsharedobject" id="dynamicsharedobject">Devingen
+      Paylaşımlı Nesne</a> <a name="dso" id="dso">(DSO)</a></dt>
+    <dd>Ä°ngilizcesi: Dynamic Shared Object (DSO)</dd>
+    <dd>İstek halinde yüklenebilen, Apache <code class="program"><a href="./programs/httpd.html">httpd</a></code>
+      çalıştırılabilir dosyasından ayrı olarak derlenmiş <a class="glossarylink" href="./glossary.html#module" title="sözlüğe bakınız">modül</a>lerin ortak adı.<br />
+      Bakınız: <a href="dso.html">Devingen Paylaşımlı Nesne Desteği</a>
+    </dd>
+
+    <dt><a name="plaintext" id="plaintext">Düz Metin</a></dt>
+    <dd>ÅžifrelenmemiÅŸ metin.</dd>
+
+    <dt><a name="regularexpresion" id="regularexpresion">Düzenli İfade</a>
+      <a name="regex" id="regex">(Regex)</a></dt>
+    <dd>Metin içinde bir şablon tanımlama yolu. Örneğin, “A harfi ile
+      başlayan bütün sözcükler� veya “10 rakamlı telefon numaraları� ya da
+      “Baş harfi Z olmayan ve iki virgül içeren cümleler� gibi. Düzenli
+      ifadeler, Apache’de belli özniteliklere uygun dosya veya özkaynakları
+      toplamak için esnek bir yol sağlamasından ötürü oldukça yararlıdır.
+      Örneğin, “resimler� dizini altındaki dosyalardan .gif ve .jpg uzantılı
+      olanları toplamak için “<code>/resimler/.*(jpg|gif)$</code>� düzenli
+      ifadesi yazılabilir. Apache, <a href="http://www.pcre.org/">PCRE</a>
+      kütüphanesi ile sağlanan Perl uyumlu düzenli ifadeleri kullanır.
+    </dd>
+
+    <dt><a name="accesscontrol" id="accesscontrol">EriÅŸim Denetimi</a></dt>
+    
+    <dd>Ağ bölgelerine erişimin kısıtlanması. Apache bağlamında normal
+      olarak belli <em>URL</em>’lere erişimi kısıtlamak şeklinde
+      uygulanır.<br /> Bakınız:  <a href="howto/auth.html">Kimlik Doğrulama,
+      Yetkilendirme ve EriÅŸim Denetimi</a>
+    </dd>
+
+    <dt><a name="handler" id="handler">Eylemci</a></dt>
+    <dd>Bir dosya istendiğinde uygulanacak eylemi Apache içinde gerçekleştiren
+      nesne. Genellikle dosyalar, dosya türüne bağlı dolaylı eylemcilere
+      sahiptir. Normalde tüm dosyalar sunucu tarafından sıradan birer dosya
+      olarak işleme sokulduğu halde bazı belli dosyalar diğerlerinden ayrı
+      ele alınır. Örneğin, <code>cgi-script</code> eylemcisi dosyaları
+      <a class="glossarylink" href="./glossary.html#cgi" title="sözlüğe bakınız">CGI</a>’ler tarafından işlenebilir hale
+      getirmek üzere işleme sokar.<br />
+      Bakınız: <a href="handler.html">Apache Eylemcilerinin Kullanımı</a>
+    </dd>
+
+    <dt><a name="publickey" id="publickey">Genel Anahtar</a></dt>
+    <dd><a class="glossarylink" href="./glossary.html#publickeycryptography" title="sözlüğe bakınız">Genel Anahtarlı
+      Şifreleme Tekniği</a>nde, sahibinin yaptığı imzaları çözmeye ve
+      sahibine gönderilen iletileri şifrelemeye yarayan genel erişime açık
+      anahtar.<br />
+      Bakınız: <a href="ssl/">SSL/TLS Şifrelemesi</a>
+    </dd>
+
+    <dt><a name="publickeycryptography" id="publickeycryptography">Genel Anahtarlı Şifreleme Tekniği</a></dt>
+    <dd>Şifreleme ve şifre çözme için iki ayrı anahtarın kullanıldığı
+      bakışımsız şifreleme sistemlerinin konusu veya uygulaması. Bu amaçla
+      kullanılan anahtarlar bir anahtar çiftinden oluşur. Genel Anahtarlı
+      Şifrelemeye Bakışımsız Şifreleme de denir.<br />
+      Bakınız: <a href="ssl/">SSL/TLS Şifrelemesi</a>
+    </dd>
+
+    <dt><a name="privatekey" id="privatekey">Gizli Anahtar</a></dt>
+    <dd><a class="glossarylink" href="./glossary.html#publickeycryptography" title="sözlüğe bakınız">Genel Anahtarlı
+      Åžifreleme TekniÄŸi</a>nde, giden iletileri imzalamak ve gelen
+      iletilerin şifrelerini çözmek amacıyla kullanılan gizli anahtar.<br />
+      Bakınız: <a href="ssl/">SSL/TLS Şifrelemesi</a>
+    </dd>
+
+    <dt><a name="https" id="https">Güvenli Hiper Metin Aktarım Protokolü
+      (HTTPS)</a></dt>
+    <dd>Ä°ngilizcesi: The HyperText Transfer Protocol (Secure), (HTTPS)</dd>
+    <dd>Güvenli Hiper Metin Aktarım Protokolü, Genel Ağ’da kullanılan standart
+      şifreli iletişim mekanizmasıdır. Aslında HTTP protokolünün <a class="glossarylink" href="./glossary.html#ssl" title="sözlüğe bakınız">SSL</a> üzerinden gerçekleştirilmesinden başka bir
+      ÅŸey deÄŸildir.<br />
+      Bakınız: <a href="ssl/">SSL/TLS Şifrelemesi</a>
+    </dd>
+
+    <dt><a name="securesocketslayer" id="securesocketslayer">Güvenli Soket Katmanı</a></dt>
+    <dd>Ä°ngilizcesi: Secure Sockets Layer <a name="ssl" id="ssl">(SSL)</a></dd>
+    <dd>TCP/IP ağları üzerinden genel iletişimin kimlik doğrulamalı ve şifreli
+      yapılabilmesi için Netscape Communications Corporation tarafından
+      oluşturulmuş bir protokol. Günümüzde en çok <em>HTTPS</em>, yani SSL
+      üzerinden Hiper Metin Aktarım Protokolü şeklinde kullanılmaktadır.<br />
+      Bakınız: <a href="ssl/">SSL/TLS Şifrelemesi</a>
+    </dd>
+
+    <dt><a name="hypertexttransferprotocol" id="hypertexttransferprotocol">Hiper Metin Aktarım Protokolü</a>
+      <a name="http" id="hhtp">(HTTP)</a></dt>
+    <dd>Ä°ngilizcesi: HyperText Transfer Protocol (HTTP)</dd>
+    <dd>Genel Ağ’da kullanılan standart aktarım protokollerinden biri.
+      Apache, <a href="http://ietf.org/rfc/rfc2616.txt">RFC 2616</a> ile
+      tanımlanmış protokolün HTTP/1.1 olarak bilinen 1.1 sürümünü gerçekler.
+    </dd>
+
+    <dt><a name="htaccess" id="htaccess">.htaccess</a></dt>
+    <dd>Belge dosyaları ağacı içine yerleştirilen bir <a class="glossarylink" href="./glossary.html#configurationfile" title="sözlüğe bakınız">yapılandırma dosyası</a> olup yerleştiği
+      dizine ve o dizinin alt dizinlerine yapılandırma yönergeleri
+      uygulanmasını sağlar. İsmine rağmen böyle bir dosyanın içerebileceği
+      yönergeler erişim denetleme yönergeleri ile sınırlı değildir; hemen
+      her tür yönergeyi içerebilir.<br />
+      Bakınız: <a href="configuring.html">Yapılandırma Dosyaları</a>
+    </dd>
+
+    <dt><a name="httpd.conf" id="httpd.conf">httpd.conf</a></dt>
+    <dd>Ana Apache <a class="glossarylink" href="./glossary.html#configurationfile" title="sözlüğe bakınız">yapılandırma
+      dosyası</a>.  Dosya sistemindeki öntanımlı yeri
+      <code>/usr/local/apache2/conf/httpd.conf</code> olup derleme
+      sırasındaki yapılandırmayla veya çalışma anındaki yapılandırmayla
+      baÅŸka bir yer belirtilebilir.<br />
+      Bakınız: <a href="configuring.html">Yapılandırma Dosyaları</a>
+    </dd>
+
+    <dt><a name="export-crippled" id="export-crippled">Ä°hracat Engelli</a></dt>
+    <dd>Ä°ngilizcesi: Export-Crippled</dd>
+    <dd>Amerika Birleşik Devletlerinin İhracat Yönetim Düzenlemelerine (EAR)
+      uymak için şifreleme yoluyla sakatlanmış yazılım. İhracat engelli olması
+      için şifrelenmiş yazılımları birer şifreli metin haline getiren şifre
+      anahtarları küçük boyutlu olduğundan şifreleme zor
+      kullanılarak kırılabilir.<br />
+      Bakınız: <a href="ssl/">SSL/TLS Şifrelemesi</a>
+    </dd>
+
+    <dt><a name="messagedigest" id="messagedigest">İleti Özeti</a></dt>
+    <dd>Ä°ngilizcesi: Message Digest</dd>
+    <dd>Aktarım sırasında içeriğinin değişme olasılığı bulunan bir iletinin
+      içeriğini doğrulamak için kullanılan bir <a class="glossarylink" href="./glossary.html#hash" title="sözlüğe bakınız">özet</a>.<br />
+      Bakınız: <a href="ssl/">SSL/TLS Şifrelemesi</a>
+    </dd>
+
+    <dt><a name="reverseproxy" id="reverseproxy">Karşı Vekil</a></dt>
+    <dd>İstemciye kendini <em>asıl sunucu</em> imiş gibi gösteren bir
+      <a class="glossarylink" href="./glossary.html#proxy" title="sözlüğe bakınız">vekil</a> sunucu. Güvenlik, yük dengelemesi
+      gibi sebeplerle asıl sunucuyu istemcilerden gizlemek için yararlıdır.
+    </dd>
+
+    <dt><a name="authentication" id="authentication">Kimlik DoÄŸrulama</a></dt>
+    <dd>Sunucu, istemci veya kullanıcı gibi bir ağ öğesinin kimliğinin
+      olumlanması.<br />Bakınız: <a href="howto/auth.html">Kimlik Doğrulama,
+      Yetkilendirme ve EriÅŸim Denetimi</a>
+    </dd>
+
+    <dt><a name="mime-type" id="mime-type">MIME türü</a></dt>
+    <dd>Aktarılan belgenin çeşidini betimlemenin bir yolu. MIME, Türkçe’ye
+      ‘Çok Amaçlı Genel Ağ Posta Eklentileri’ olarak çevrilebilecek olan
+      "Multipurpose Internet Mail Extensions" sözcüklerinden türetilmiş bir
+      kısaltmadır. MIME türleri bir bölü çizgisi ile ayrılmış bir ana ve bir
+      alt belge türünün birleşiminden oluşur. <code>text/html</code>,
+      <code>image/gif</code> ve <code>application/octet-stream</code> örnek
+      olarak verilebilir. HTTP protokolünde MIME türleri
+      <code>Content-Type</code> <a class="glossarylink" href="./glossary.html#header" title="sözlüğe bakınız">başlığında</a>
+      aktarılır.<br />Bakınız: <a href="mod/mod_mime.html">mod_mime</a>
+    </dd>
+
+    <dt><a name="module" id="module">Modül</a></dt>
+    <dd>Bir programın bağımsız parçalarından her biri. Apache işlevselliğinin
+      çoğu yapılandırmaya dahil edilip edilmeyeceğine kullanıcı tarafından
+      karar verilebilen modüllerden oluşur. Apache <code class="program"><a href="./programs/httpd.html">httpd</a></code>
+      çalıştırılabiliri içinde derlenmiş modüllere <dfn>durağan modüller</dfn>
+      adı verilirken ayrı bir yerde saklanan ve çalışma anında isteğe bağlı
+      olarak yüklenebilen modüllere <dfn>devingen modüller</dfn> veya
+      <a class="glossarylink" href="./glossary.html#dso" title="sözlüğe bakınız">DSO</a>’lar denir. Yapılandırmaya öntanımlı
+      olarak dahil edilen modüllere <dfn>temel modüller</dfn> denir. Apache
+      için kullanılabilecek modüllerin çoğu Apache HTTP Sunucusunun
+      <a class="glossarylink" href="./glossary.html#tarball" title="sözlüğe bakınız">tar paketi</a> içinde dağıtılmaz; bunlara
+      <dfn>üçüncü parti modüller</dfn> denir.<br />
+      Bakınız: <a href="mod/">Modül Dizini</a>
+    </dd>
+
+    <dt><a name="openssl" id="openssl">OpenSSL</a></dt>
+    <dd>SSL/TLS için açık kaynak kodlu araç kiti.<br />Daha ayrıntılı bilgi
+    için <a href="http://www.openssl.org/">http://www.openssl.org/</a>
+    adresine bakınız.
+    </dd>
+
+    <dt><a name="commongatewayinterface" id="commongatewayinterface">Ortak Ağgeçidi Arayüzü</a> <a name="cgi" id="cgi">(CGI)</a></dt>
+    <dd>Ä°ngilizcesi: Common Gateway Interface (CGI)</dd>
+    <dd>Bir HTTP sunucusunun bir harici programa hizmet istekleri yapmasını
+      mümkün kılan, sunucu ile bir harici program arasındaki bir arayüz
+      standardı. Özgün arayüz <a href="http://hoohoo.ncsa.uiuc.edu/cgi/overview.html">NCSA</a> tarafından
+      tanımlanmış olmakla birlikte ayrıca bir <a href="http://www.ietf.org/rfc/rfc3875">CGI RFC’si</a> de vardır.<br />
+      Bakınız: <a href="howto/cgi.html">CGI ile Devingen İçerik</a>
+    </dd>
+
+    <dt><a name="environmentvariable" id="environmentvariable">Ortam DeÄŸiÅŸkeni</a> <a name="env-variable" id="env-variable">(ortam-deÄŸiÅŸkeni)</a></dt>
+    <dd>İşletim sistemi kabuğu tarafından yönetilen ve programlar arasında
+      bilgi alışverişi amacıyla kullanılan isimli değişkenler. Ayrıca,
+      Apache de ortam değişkenleri olarak tanımlanabilecek dahili değişkenler
+      içerir fakat bunlar kabuk ortamında değil dahili Apache yapıları içinde
+      saklanır.<br />
+      Bakınız: <a href="env.html">Apache Ortam Değişkenleri</a>
+    </dd>
+
+    <dt><a name="session" id="session">Oturum</a></dt>
+    <dd>Bir iletiÅŸimin baÄŸlamsal bilgileri.</dd>
+
+    <dt><a name="hash" id="hash">Özet</a></dt>
+    <dd>UzunluÄŸu deÄŸiÅŸebilen bir dizgenin belli bir durumuna iliÅŸkin sabit
+      uzunlukta bir dizge üretmek için kullanılan geri dönüşümsüz bir
+      algoritma. Algoritmaya girdi olan farklı uzunluktaki dizgeler (özet
+      işlevine bağlı olarak) aynı uzunlukta farklı özetler üretir.
+    </dd>
+
+    <dt><a name="virtualhosting" id="virtualhosting">Sanal Konaklık</a></dt>
+    <dd>Tek bir Apache sunucusundan çok sayıda site sunulması. <em>IP tabanlı
+      sanal konaklık</em>ta siteler birbirlerinden IP adreslerine göre
+      ayrılırken, <em>isim tabanlı sanal konaklık</em>ta siteler aynı IP
+      adresinden kendi isimleriyle sunulabilirler.<br />
+      Bakınız: <a href="vhosts/">Apache Sanal Konak Belgeleri</a>
+    </dd>
+
+    <dt><a name="digitalsignature" id="digitalsignature">Sayısal İmza</a></dt>
+    <dd>Bir sertifikayı veya bir dosyayı doğrulamakta kullanılan şifreli bir
+      metin. Bir imza <a class="glossarylink" href="./glossary.html#certificationauthority" title="sözlüğe bakınız">Sertifika
+      Makamı</a> tarafından bir <em>sertifikaya</em> gömülü olan
+      <em>genel anahtardan</em> bir özet üretilerek oluşturulur. İmza şifresi
+      sadece <em>sertifika</em> sahibi ağ öğesinin kimliğini doğrulayacak
+      SM’nin genel anahtarı kullanılarak çözülebilir.<br />
+      Bakınız: <a href="ssl/">SSL/TLS Şifrelemesi</a>
+    </dd>
+
+    <dt><a name="certificate" id="certificate">Sertifika</a></dt>
+    <dd>Sunucu, istemci gibi ağ öğelerinin kimliğini kanıtlamakta kullanılan
+      bir veri kaydı. Bir sertifika, sertifika sahibi (buna sertifikanın
+      konusu da denir), sertifikayı imzalayan <a class="glossarylink" href="./glossary.html#certificationauthority" title="sözlüğe bakınız">Sertifika Makamı</a> (SM) (buna
+      sertifika yayıncısı da denir), sertifika sahibinin <a class="glossarylink" href="./glossary.html#publickey" title="sözlüğe bakınız">genel anahtarı</a> ve SM tarafından üretilen imza
+      gibi parçalardan oluşan X.509 bilgisi içerir. Ağ öğeleri bu imzaları SM
+      sertifikalarını kullanarak doğrular.<br />
+      Bakınız: <a href="ssl/">SSL/TLS Şifrelemesi</a>
+    </dd>
+
+    <dt><a name="certificatsigningrequest" id="certificatsigningrequest">Sertifika Ä°mzalama Ä°steÄŸi</a> <a name="csr" id="csr">(SÄ°Ä°)</a></dt>
+    <dd>Ä°ngilizcesi: Certificate Signing Request (CSR)</dd>
+    <dd>İmzasız bir sertifikayı  <a class="glossarylink" href="./glossary.html#certificationauthority" title="sözlüğe bakınız">Sertifika Makamı</a>na kendi SM <em>Sertifika</em>sının
+      <a class="glossarylink" href="./glossary.html#privatekey" title="sözlüğe bakınız">özel anahtar</a>ı ile imzalaması
+      için yapılan istek. Sİİ imzalanınca bir gerçek sertifika haline
+      gelir.<br />Bakınız: <a href="ssl/">SSL/TLS Şifrelemesi</a>
+    </dd>
+
+    <dt><a name="certificationauthority" id="certificationauthority">Sertifika Makamı</a> <a name="ca" id="ca">(SM)</a></dt>
+    <dd>Ä°ngilizcesi: Certification Authority (CA)</dd>
+    <dd>Ağ öğelerinin güvenilir olarak kimliklerinin doğrulanması için
+      sertifikaları imzalayan güvenilir üçüncü şahıs. Diğer ağ öğeleri,
+      sertifikalı bir öğenin kimliğini kanıtlayan bir SM’yi doğrulamak
+      için imzayı sınayabilir.<br />
+      Bakınız: <a href="ssl/">SSL/TLS Şifrelemesi</a>
+    </dd>
+
+    <dt><a name="modulemagicnumber" id="modulemagicnumber">Sihirli Modül
+      Numarası</a> (<a name="mmn" id="mmn">SMN</a>)</dt>
+    <dd>Sihirli Modül Numarası, modüllerin ikil uyumluluğu ile ilgili olarak
+      Apache kaynak kodunda tanımlanmış bir sabittir. Apache dahili yapıları,
+      uygulama programlama arayüzünün önemli parçaları ve işlev çağrıları artık
+      ikil uyumluluÄŸun garanti edilemeyeceÄŸi kadar deÄŸiÅŸtiÄŸi zaman SMN
+      değiştirilir. Bir SMN değişikliğinde ve bazen de sırf yeni bir Apache
+      sürümü ile çalışmak icabettiğinde tüm üçüncü parti modüllerin en azından
+      yeniden derlenmesi gerekir.
+    </dd>
+
+    <dt><a name="ssleay" id="ssleay">SSLeay</a></dt>
+    <dd>Eric A. Young tarafından geliştirilmiş özgün SSL/TLS
+      gerçeklenim kütüphanesi.
+    </dd>
+
+    <dt><a name="serversideincludes" id="serversideincludes">Sunucu Taraflı İçerik Yerleştirme</a></dt>
+    <dd>Ä°ngilizcesi: Server Side Includes <a name="ssi" id="ssi">(SSI)</a></dd>
+    <dd>İşlem yönergelerini HTML dosyalara gömme tekniği.<br />
+      Bakınız: <a href="howto/ssi.html">Sunucu Taraflı İçerik Yerleştirmeye
+      GiriÅŸ</a>
+    </dd>
+
+    <dt><a name="filter" id="filter">Süzgeç</a></dt>
+    <dd>Sunucu tarafından alınan ve gönderilen veriye uygulanan bir işlem.
+      Giriş süzgeçleri sunucuya istemci tarafından gönderilen veriyi işlerken
+      çıkış süzgeçleri sunucu tarafından istemciye gönderilen belgeleri işler.
+      Örneğin, <code>INCLUDES</code> çıkış süzgeci, belgeleri <a class="glossarylink" href="./glossary.html#ssi" title="sözlüğe bakınız">sunucu taraflı içerik</a> için işleme sokar.<br />
+      Bakınız: <a href="filter.html">Süzgeçler</a>
+    </dd>
+
+    <dt><a name="cipher" id="cipher">Åžifre</a></dt>
+    <dd>Veri şifrelemek için kullanılan bir algoritma veya sistem. DES, IDEA
+      veya RC4 örnek verilebilir.<br />
+      Bakınız: <a href="ssl/">SSL/TLS Şifrelemesi</a>
+    </dd>
+
+    <dt><a name="ciphertext" id="ciphertext">Åžifreli Metin</a></dt>
+    <dd>Bir <a class="glossarylink" href="./glossary.html#plaintext" title="sözlüğe bakınız">Düz Metin</a> bir
+      <a class="glossarylink" href="./glossary.html#cipher" title="sözlüğe bakınız">Şifre</a>den geçirilince elde edilen
+      sonuç.<br />Bakınız: <a href="ssl/">SSL/TLS Şifrelemesi</a>
+    </dd>
+
+    <dt><a name="fully-qualifieddomain-name" id="fully-qualifieddomain-name">Tam Alan Adı</a>
+      <a name="fqdn" id="fqdn">(TAA)</a></dt>
+    <dd>Ä°ngilizcesi: Fully-Qualified Domain-Name (FQDN)</dd>
+    <dd>Bir IP adresiyle eşleşebilen, bir konak adıyla bir alan adının
+      birleşiminden oluşan eşsiz bir ağ öğesi ismi. Örneğin,
+      <code>httpd.apache.org</code> tam alan adında <code>httpd</code> bir konak
+      adıyken <code>apache.org</code> bir alan adıdır.
+    </dd>
+
+    <dt><a name="tarball" id="tarball">Tar Paketi</a></dt>
+    <dd><code>tar</code> uygulaması kullanılarak bir araya getirilmiş
+      dosyalardan oluşan bir paket. Apache dağıtımları sıkıştırılmış tar
+      arşivleri içinde veya pkzip kullanılarak saklanır.
+    </dd>
+
+    <dt><a name="uniformresourceidentifier" id="uniformresourceidentifier">Tektip Özkaynak Betimleyici</a></dt>
+    <dd>Ä°ngilizcesi: Uniform Resource Identifier
+      <a name="URI" id="URI">(URI)</a></dd>
+    <dd>Soyut veya somut bir özkaynağı betimlemek için kullanılan bütünleşik
+      bir karakter dizisi. Aslen <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a> tarafından tanımlanmıştır. Genel Ağ’da kullanılan URI’lerden
+      genellikle <a class="glossarylink" href="./glossary.html#url" title="sözlüğe bakınız">URL</a>’ler olarak bahsedilir.
+    </dd>
+
+    <dt><a name="uniformresourcelocator" id="uniformresourcelocator">Tektip Özkaynak Konumlayıcı</a></dt>
+    <dd>Ä°ngilizcesi: Uniform Resource Locator <a name="url" id="url">(URL)</a></dd>
+    <dd>Genel Ağ üzerindeki bir özkaynağın ismi veya adresi. Aslen <a class="glossarylink" href="./glossary.html#uniformresourceidentifier" title="sözlüğe bakınız">Tektip Özkaynak Betimleyici</a>
+      denilen terimin gayrı resmi karşılığıdır. URL’ler <code>http</code> veya
+      <code>https</code> gibi bir şemayı takip eden bir konak adı ve bir dosya
+      yolundan oluşurlar.  Örneğin, bu sayfanın URL’si
+      <code>http://httpd.apache.org/docs/2.2/glossary.html</code> olurdu.
+    </dd>
+
+    <dt><a name="proxy" id="proxy">Vekil</a></dt>
+    <dd><em>Asıl sunucu</em> ile istemci arasında aracılık yapan sunucu.
+      İstemciden aldığı istekleri asıl sunucuya gönderip, ondan aldığı
+      yanıtları istemciye gönderir. Aynı içeriğe birden fazla istemci talip
+      olursa vekil sunucu bu istekleri her seferinde asıl sunucudan istemek
+      yerine kendi deposundan karşılar, böylece yanıt zamanı kısalır.<br />
+      Bakınız: <a href="mod/mod_proxy.html">mod_proxy</a>
+    </dd>
+
+    <dt><a name="configurationfile" id="configurationfile">Yapılandırma Dosyası</a></dt>
+    <dd>Apache yapılandırmasını denetim altına alan <a class="glossarylink" href="./glossary.html#directive" title="sözlüğe bakınız">yönergeleri</a> içeren bir metin dosyası.<br />
+      Bakınız: <a href="configuring.html">Yapılandırma Dosyaları</a>
+    </dd>
+
+    <dt><a name="configurationdirective" id="configurationdirective">Yapılandırma Yönergesi</a></dt>
+    <dd>Bakınız: <a class="glossarylink" href="./glossary.html#directive" title="sözlüğe bakınız">Yönerge</a></dd>
+
+    <dt><a name="directive" id="directive">Yönerge</a></dt>
+    <dd>Belli Apache davranışlarından bir veya daha fazlasını denetim altına
+      alan bir yapılandırma komutu. Yönergeler <a class="glossarylink" href="./glossary.html#configurationfile" title="sözlüğe bakınız">yapılandırma dosyalarına</a> yerleştirilir.<br />
+      Bakınız: <a href="mod/directives.html">Yönerge Dizini</a>
+    </dd>
+
+    <dt><a name="method" id="method">Yöntem</a></dt>
+    <dd><a class="glossarylink" href="./glossary.html#http" title="sözlüğe bakınız">HTTP</a> bağlamında, istemci tarafından
+      istek satırında belirtilen, bir özkaynağa uygulanacak bir eylem. HTTP
+      bağlamında belirtilebilecek yöntemlere örnek olarak <code>GET</code>,
+      <code>POST</code> ve <code>PUT</code> verilebilir.
+    </dd>
+
+    <dt><a name="x.509" id="x.509">X.509</a></dt>
+    <dd>SSL/TLS kimlik doğrulamasında kullanılmak üzere Uluslararası Telekom
+      Birliği (ITU-T) tarafından önerilmiş bir kimlik doğrulama sertitifası
+      şeması<br /> Bakınız: <a href="ssl/">SSL/TLS Şifrelemesi</a>
+    </dd>
+</dl>
+</div></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="./de/glossary.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/glossary.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/glossary.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/glossary.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ko/glossary.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/glossary.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/handler.html b/docs/manual/handler.html
index e41ed135..5c373209 100644
--- a/docs/manual/handler.html
+++ b/docs/manual/handler.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: handler.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
@@ -10,9 +12,9 @@ URI: handler.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: handler.html.ja.euc-jp
+URI: handler.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: handler.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/handler.html.en b/docs/manual/handler.html.en
index 11e30342..3bc3a3cc 100644
--- a/docs/manual/handler.html.en
+++ b/docs/manual/handler.html.en
@@ -152,6 +152,6 @@
 <a href="./ko/handler.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./ru/handler.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/handler.html.es b/docs/manual/handler.html.es
index 4f0e3dba..6b3be64a 100644
--- a/docs/manual/handler.html.es
+++ b/docs/manual/handler.html.es
@@ -165,6 +165,6 @@
 <a href="./ko/handler.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./ru/handler.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Módulos</a> | <a href="./mod/directives.html">Directivas</a> | <a href="./faq/">Preguntas Frecuentes</a> | <a href="./glossary.html">Glosario</a> | <a href="./sitemap.html">Mapa de este sitio web</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/handler.html.fr b/docs/manual/handler.html.fr
index 0d4cebef..1478cb43 100644
--- a/docs/manual/handler.html.fr
+++ b/docs/manual/handler.html.fr
@@ -158,6 +158,6 @@
 <a href="./ko/handler.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./ru/handler.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossaire</a> | <a href="./sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/handler.html.ja.euc-jp b/docs/manual/handler.html.ja.euc-jp
deleted file mode 100644
index ea074245..00000000
--- a/docs/manual/handler.html.ja.euc-jp
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>Apache ¤Î¥Ï¥ó¥É¥é¤Î»ÈÍÑ - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache ¤Î¥Ï¥ó¥É¥é¤Î»ÈÍÑ</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./en/handler.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/handler.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./fr/handler.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/handler.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/handler.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./ru/handler.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-    <p>Apache ¤Î¥Ï¥ó¥É¥é¤Î»ÈÍѤ˴ؤ·¤Æµ­½Ò¤·¤Æ¤¤¤Þ¤¹¡£</p>
-  </div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#definition">¥Ï¥ó¥É¥é¤È¤Ï</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#examples">Îã</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#programmer">¥×¥í¥°¥é¥Þ¸þ¤±¤Î¥á¥â</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="definition" id="definition">¥Ï¥ó¥É¥é¤È¤Ï</a></h2>
-    
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_actions.html">mod_actions</a></code></li><li><code class="module"><a href="./mod/mod_asis.html">mod_asis</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_imagemap.html">mod_imagemap</a></code></li><li><code class="module"><a href="./mod/mod_info.html">mod_info</a></code></li><li><code class="module"><a href="./mod/mod_mime.html">mod_mime</a></code></li><li><code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code></li><li><code class="module"><a href="./mod/mod_status.html">mod_status</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_actions.html#action">Action</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#removehandler">RemoveHandler</a></code></li><li><code class="directive"><a href="./mod/core.html#sethandler">SetHandler</a></code></li></ul></td></tr></table>
-
-
-    <p>¡Ö¥Ï¥ó¥É¥é¡×¤È¤Ï¡¢¥Õ¥¡¥¤¥ë¤¬¸Æ¤Ð¤ì¤¿¤È¤­¤Ë¼Â¹Ô¤µ¤ì¤ëÆ°ºî¤Î
-    Apache ¤Ë¤ª¤±¤ëÆâÉôɽ¸½¤Ç¤¹¡£
-    Ä̾¥Õ¥¡¥¤¥ë¤Ï¥Õ¥¡¥¤¥ë·¿¤Ë´ð¤Å¤¤¤¿°ÅÌۤΥϥó¥É¥é¤¬¤¢¤ê¤Þ¤¹¡£
-    ÉáÄ̤Ϥ¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤Ïñ¤Ë¥µ¡¼¥Ð¤Ë°·¤ï¤ì¤Þ¤¹¤¬¡¢
-    ¥Õ¥¡¥¤¥ë¥¿¥¤¥×¤ÎÃæ¤Ë¤ÏÊ̤ˡ֥ϥó¥É¥ë¡×(ÌõÃí: °·¤¦)
-    ¤µ¤ì¤ë¤â¤Î¤â¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>Apache 1.1 ¤Ç¤Ï¡¢¥Ï¥ó¥É¥é¤òÌÀ¼¨Åª¤Ë»ÈÍѤ¹¤ëµ¡Ç½¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
-    ¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤äÃÖ¤¤¤Æ¤¤¤ë¾ì½ê¤Ë´ð¤Å¤¤¤Æ¡¢
-    ¥Õ¥¡¥¤¥ë·¿¤È´Ø·¸¤Ê¤¯¥Ï¥ó¥É¥é¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤³¤ì¤Ï¤è¤êÍ¥²í¤Ê²ò·èË¡¤È¤¤¤¦ÅÀ¤È¡¢¥Õ¥¡¥¤¥ë¤Ë¥¿¥¤¥×<strong>¤È</strong>¥Ï¥ó¥É¥é¤ÎξÊý¤ò´ØÏ¢ÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤ë¤È¤¤¤¦ÅÀ¤ÇÍ¥¤ì¤Æ¤¤¤Þ¤¹¡£
-    (<a href="mod/mod_mime.html#multipleext">Ê£¿ô¤Î³ÈÄ¥»Ò¤Î¤¢¤ë¥Õ¥¡¥¤¥ë</a>¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤)¡£</p>
-
-    <p>¥Ï¥ó¥É¥é¤Ï¥µ¡¼¥Ð¤ËÁȤ߹þ¤ó¤À¤ê¡¢¥â¥¸¥å¡¼¥ë¤È¤·¤Æ´Þ¤á¤¿¤ê¡¢
-    <code class="directive"><a href="./mod/mod_actions.html#action">Action</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È¤·¤ÆÄɲä·¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    °Ê²¼¤Ïɸ½àÇÛÉÛ¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ë¥Ï¥ó¥É¥é¤Ç¤¹¡£
-    </p>
-
-    <ul>
-      <li><strong>default-handler</strong>:<code>default_handelr()</code>
-      ¤ò»È¤Ã¤Æ¥Õ¥¡¥¤¥ë¤òÁ÷¤ê¤Þ¤¹¡£
-      ÀÅŪ¤Ê¥³¥ó¥Æ¥ó¥Ä¤ò°·¤¦¤È¤­¤Ë¥Ç¥Õ¥©¥ë¥È¤Ç»ÈÍѤµ¤ì¤ë¥Ï¥ó¥É¥é¤Ç¤¹¡£
-      (<code class="module"><a href="./mod/core.html">core</a></code>)</li>
-
-      <li><strong>send-as-is</strong>:
-      HTTP ¥Ø¥Ã¥À¤Î¤¢¤ë¥Õ¥¡¥¤¥ë¤ò¤½¤Î¤Þ¤ÞÁ÷¤ê¤Þ¤¹¡£
-      (<code class="module"><a href="./mod/mod_asis.html">mod_asis</a></code>)</li>
-
-      <li><strong>cgi-script</strong>: ¥Õ¥¡¥¤¥ë¤ò CGI
-      ¥¹¥¯¥ê¥×¥È¤È¤·¤Æ°·¤¤¤Þ¤¹¡£
-      (<code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code>)</li>
-
-      <li><strong>imap-file</strong>:
-      ¥¤¥á¡¼¥¸¥Þ¥Ã¥×¤Î¥ë¡¼¥ë¥Õ¥¡¥¤¥ë¤È¤·¤Æ²òÀϤ·¤Þ¤¹¡£
-      (<code class="module"><a href="./mod/mod_imagemap.html">mod_imagemap</a></code>)</li>
-
-      <li><strong>server-info</strong>: ¥µ¡¼¥Ð¤ÎÀßÄê¾ðÊó¤ò¼èÆÀ¤·¤Þ¤¹¡£
-      (<code class="module"><a href="./mod/mod_info.html">mod_info</a></code>)</li>
-
-      <li><strong>server-status</strong>: ¥µ¡¼¥Ð¤Î¾õÂÖÊó¹ð¤ò¼èÆÀ¤·¤Þ¤¹¡£
-      (<code class="module"><a href="./mod/mod_status.html">mod_status</a></code>)</li>
-
-      <li><strong>type-map</strong>:
-      ¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤Î¤¿¤á¤Î¥¿¥¤¥×¥Þ¥Ã¥×¤È¤·¤Æ²òÀϤ·¤Þ¤¹¡£
-      (<code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code>)</li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Îã</a></h2>
-    
-
-    <h3><a name="example1" id="example1">CGI ¥¹¥¯¥ê¥×¥È¤òÍѤ¤¤ÆÀÅŪ¤Ê¥³¥ó¥Æ¥ó¥Ä¤òÊѹ¹¤¹¤ë</a></h3>
-      
-
-      <p>°Ê²¼¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤Ã¤Æ¡¢³ÈÄ¥»Ò¤¬ <code>html</code>
-      ¤Ç¤¢¤ë¥Õ¥¡¥¤¥ë¤Ï <code>footer.pl</code>
-      CGI ¥¹¥¯¥ê¥×¥È¤òµ¯Æ°¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-      <div class="example"><p><code>
-        Action add-footer /cgi-bin/footer.pl<br />
-        AddHandler add-footer .html
-      </code></p></div>
-
-      <p>CGI ¥¹¥¯¥ê¥×¥È¤Ï´õ˾¤Î½¤Àµ¤äÄɲäò¹Ô¤Ê¤Ã¤Æ¡¢¸µ¡¹Í׵ᤵ¤ì¤¿Ê¸½ñ
-      (´Ä¶­ÊÑ¿ô <code>PATH_TRANSLATED</code>
-      ¤Ç»Ø¤µ¤ì¤Æ¤¤¤Þ¤¹) ¤òÁ÷¤ëÀÕǤ¤¬¤¢¤ê¤Þ¤¹¡£
-      </p>
-
-    
-    <h3><a name="example2" id="example2">HTTP ¥Ø¥Ã¥À¤Î¤¢¤ë¥Õ¥¡¥¤¥ë</a></h3>
-      
-
-      <p>°Ê²¼¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code>send-as-is</code>
-      ¥Ï¥ó¥É¥é¤ò»ÈÍѤ¹¤ë¤è¤¦¤Ë»Ø¼¨¤·¤Þ¤¹¡£¤³¤Î¥Ï¥ó¥É¥é¤Ï¼«Ê¬¼«¿È¤Î HTTP
-      ¥Ø¥Ã¥À¤ò»ý¤Ã¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£¤³¤³¤Ç¤Ï¡¢³ÈÄ¥»Ò¤Ë´Ø¤ï¤é¤º¡¢
-      <code>/web/htdocs/asis</code> ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ëÁ´¤Æ¤Î¥Õ¥¡¥¤¥ë¤Ï
-      <code>send-as-is</code> ¥Ï¥ó¥É¥é¤Ë¤è¤Ã¤Æ°·¤ï¤ì¤Þ¤¹¡£</p>
-
-      <div class="example"><p><code>
-        &lt;Directory /web/htdocs/asis&gt;<br />
-        SetHandler send-as-is<br />
-        &lt;/Directory&gt;
-      </code></p></div>
-
-    
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="programmer" id="programmer">¥×¥í¥°¥é¥Þ¸þ¤±¤Î¥á¥â</a></h2>
-    
-
-    <p>¥Ï¥ó¥É¥é¤Îµ¡Ç½¤ò¼ÂÁõ¤¹¤ë¤¿¤á¤Ë¡¢ÍøÍѤ¹¤ë¤ÈÊØÍø¤«¤â¤·¤ì¤Ê¤¤¤â¤Î¤¬
-    <a href="developer/API.html">Apache API</a>
-    ¤ËÄɲ䵤ì¤Þ¤·¤¿¡£¾Ü¤·¤¯¸À¤¦¤È¡¢<code>request_rec</code>
-    ¹½Â¤ÂΤ˿·¤·¤¤¥ì¥³¡¼¥É¤¬Äɲ䵤줿¤È¤¤¤¦¤³¤È¤Ç¤¹¡£</p>
-
-    <div class="example"><p><code>
-     char *handler
-    </code></p></div>
-
-    <p>¤â¤·¥â¥¸¥å¡¼¥ë¤¬¥Ï¥ó¥É¥é¤Ë´Ø¤ï¤ê¤¿¤¤¾ì¹ç¡¢
-    ¤ä¤é¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤³¤È¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤¬ <code>invoke_handler</code>
-    ¥¹¥Æ¡¼¥¸¤Ë㤹¤ë°ÊÁ°¤Ë <code>r-&gt;handler</code>
-    ¤òÀßÄꤹ¤ë¤³¤È¤À¤±¤Ç¤¹¡£¥Ï¥ó¥É¥é¤Ï¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤ÎÂå¤ï¤ê¤Ë
-    ¥Ï¥ó¥É¥é̾¤ò»È¤¦¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤³¤È°Ê³°¤Ï¡¢°ÊÁ°¤ÈƱ¤¸¤è¤¦¤Ë¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-    ɬ¤ºÍ׵ᤵ¤ì¤Æ¤¤¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢¥á¥Ç¥£¥¢¥¿¥¤¥×
-    ¤Î̾Á°¶õ´Ö¤ò¿¯¤µ¤Ê¤¤¤è¤¦¤Ë¡¢¥Ï¥ó¥É¥é¤Î̾Á°¤Ë¤Ï¥¹¥é¥Ã¥·¥å¤ò´Þ¤Þ¤Ê¤¤¡¢
-    ¥À¥Ã¥·¥å (ÌõÃí: "-") ¤ÇʬΥ¤µ¤ì¤¿Ì¾Á°¤òÉÕ¤±¤ë½¬´·¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
-  </div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./en/handler.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/handler.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./fr/handler.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/handler.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/handler.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./ru/handler.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/handler.html.ja.utf8 b/docs/manual/handler.html.ja.utf8
new file mode 100644
index 00000000..4638ca0e
--- /dev/null
+++ b/docs/manual/handler.html.ja.utf8
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Apache ��ンドラ�使用 - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache ��ンドラ�使用</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./en/handler.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/handler.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/handler.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/handler.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/handler.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./ru/handler.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+</div>
+
+    <p>Apache ��ンドラ�使用�関��記述�����。</p>
+  </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#definition">�ンドラ��</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#examples">例</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#programmer">プログラマ���メモ</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="definition" id="definition">�ンドラ��</a></h2>
+    
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_actions.html">mod_actions</a></code></li><li><code class="module"><a href="./mod/mod_asis.html">mod_asis</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_imagemap.html">mod_imagemap</a></code></li><li><code class="module"><a href="./mod/mod_info.html">mod_info</a></code></li><li><code class="module"><a href="./mod/mod_mime.html">mod_mime</a></code></li><li><code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code></li><li><code class="module"><a href="./mod/mod_status.html">mod_status</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_actions.html#action">Action</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><code class="directive"><a href="./mod/mod_mime.html#removehandler">RemoveHandler</a></code></li><li><code class="directive"><a href="./mod/core.html#sethandler">SetHandler</a></code></li></ul></td></tr></table>
+
+
+    <p>「�ンドラ����ファイル�呼�れ����実行�れる動作�
+    Apache ���る内部表���。
+    通常�ファイル�ファイル型�基���暗黙��ンドラ��り��。
+    普通�����ファイル���サー��扱�れ����
+    ファイルタイプ�中��別�「�ンドル�(訳注: 扱�)
+    �れるも�も�り��。</p>
+
+    <p>ファイル型�関係���ファイル�拡張�や置���る場所�基���
+    明示的��ンドラを指定�る��も����。
+    �れ�より優雅�解決法���点��ファイル�タイプ<strong>�</strong>�ンドラ�両方を関連付�る�����る���点�優れ����。
+    (<a href="mod/mod_mime.html#multipleext">複数�拡張���るファイル</a>も�照������)。</p>
+
+    <p>�ンドラ�サー��組�込ん�り�モジュール������り�
+    <code class="directive"><a href="./mod/mod_actions.html#action">Action</a></code>
+    ディレクティブ���追加��り�る�������。
+    以下�標準�布�組�込�れ��る�ンドラ��。
+    </p>
+
+    <ul>
+      <li><strong>default-handler</strong>:<code>default_handelr()</code>
+      を使��ファイルを�り��。
+      �的�コンテンツを扱����デフォルト�使用�れる�ンドラ��。
+      (<code class="module"><a href="./mod/core.html">core</a></code>)</li>
+
+      <li><strong>send-as-is</strong>:
+      HTTP ヘッダ��るファイルを�����り��。
+      (<code class="module"><a href="./mod/mod_asis.html">mod_asis</a></code>)</li>
+
+      <li><strong>cgi-script</strong>: ファイルを CGI
+      スクリプト���扱���。
+      (<code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code>)</li>
+
+      <li><strong>imap-file</strong>:
+      イメージマップ�ルールファイル���解����。
+      (<code class="module"><a href="./mod/mod_imagemap.html">mod_imagemap</a></code>)</li>
+
+      <li><strong>server-info</strong>: サー��設定情報を�得���。
+      (<code class="module"><a href="./mod/mod_info.html">mod_info</a></code>)</li>
+
+      <li><strong>server-status</strong>: サー��状態報告を�得���。
+      (<code class="module"><a href="./mod/mod_status.html">mod_status</a></code>)</li>
+
+      <li><strong>type-map</strong>:
+      コンテント�ゴシエーション����タイプマップ���解����。
+      (<code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code>)</li>
+    </ul>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">例</a></h2>
+    
+
+    <h3><a name="example1" id="example1">CGI スクリプトを用���的�コンテンツを変更�る</a></h3>
+      
+
+      <p>以下�ディレクティブ�よ���拡張�� <code>html</code>
+      ��るファイル� <code>footer.pl</code>
+      CGI スクリプトを起動�るよ���り��。</p>
+
+      <div class="example"><p><code>
+        Action add-footer /cgi-bin/footer.pl<br />
+        AddHandler add-footer .html
+      </code></p></div>
+
+      <p>CGI スクリプト�希望�修正や追加を行����元々�求�れ�文書
+      (環境変数 <code>PATH_TRANSLATED</code>
+      �指�れ����) を�る責任��り��。
+      </p>
+
+    
+    <h3><a name="example2" id="example2">HTTP ヘッダ��るファイル</a></h3>
+      
+
+      <p>以下�ディレクティブ� <code>send-as-is</code>
+      �ンドラを使用�るよ��指示���。���ンドラ�自分自身� HTTP
+      ヘッダを����るファイル�使用�れ��。�����拡張��関�ら��
+      <code>/web/htdocs/asis</code> ディレクトリ��る全��ファイル�
+      <code>send-as-is</code> �ンドラ�よ��扱�れ��。</p>
+
+      <div class="example"><p><code>
+        &lt;Directory /web/htdocs/asis&gt;<br />
+        SetHandler send-as-is<br />
+        &lt;/Directory&gt;
+      </code></p></div>
+
+    
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="programmer" id="programmer">プログラマ���メモ</a></h2>
+    
+
+    <p>�ンドラ�機能を実装�る����利用�る�便利�も�れ��も��
+    <a href="developer/API.html">Apache API</a>
+    �追加�れ���。詳��言���<code>request_rec</code>
+    構造体�新��レコード�追加�れ��������。</p>
+
+    <div class="example"><p><code>
+     char *handler
+    </code></p></div>
+
+    <p>も�モジュール��ンドラ�関�り��場��
+    やら��れ��ら������リクエスト� <code>invoke_handler</code>
+    ステージ���る以�� <code>r-&gt;handler</code>
+    を設定�る������。�ンドラ�コンテントタイプ�代�り�
+    �ンドラ�を使�よ������る��以外��以����よ��実装�れ����。
+    必��求�れ��る�����り��ん��メディアタイプ
+    ���空間を侵���よ����ンドラ�����スラッシュを�����
+    ダッシュ (訳注: "-") �分離�れ���を付�る習慣�������。</p>
+  </div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./en/handler.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/handler.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/handler.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/handler.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/handler.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./ru/handler.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/handler.html.ko.euc-kr b/docs/manual/handler.html.ko.euc-kr
index 11056f96..fea3f23e 100644
--- a/docs/manual/handler.html.ko.euc-kr
+++ b/docs/manual/handler.html.ko.euc-kr
@@ -148,6 +148,6 @@
 <a href="./ko/handler.html" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./ru/handler.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/handler.html.ru.koi8-r b/docs/manual/handler.html.ru.koi8-r
index 8190fa36..2eb1f1bb 100644
--- a/docs/manual/handler.html.ru.koi8-r
+++ b/docs/manual/handler.html.ru.koi8-r
@@ -164,6 +164,6 @@
 <a href="./ko/handler.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./ru/handler.html" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">íÏÄÕÌÉ</a> | <a href="./mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="./sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/access.html b/docs/manual/howto/access.html
index e4762a1e..dad5faec 100644
--- a/docs/manual/howto/access.html
+++ b/docs/manual/howto/access.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: access.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/howto/access.html.en b/docs/manual/howto/access.html.en
index 38a0cf13..e7755ed8 100644
--- a/docs/manual/howto/access.html.en
+++ b/docs/manual/howto/access.html.en
@@ -138,14 +138,6 @@ discussed in this document include <code class="module"><a href="../mod/mod_sete
     this variable is set. This blocks that particular user agent from
     the site.
     </p>
-
-    <p>An environment variable test can be negated using the <code>=!</code>
-    syntax:</p>
-
-    <div class="example"><p>
-    Allow from env=!GoAway
-    </p></div>
-
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="rewrite" id="rewrite">Access control with mod_rewrite</a></h2>
@@ -184,6 +176,6 @@ that approach is preferred.</p>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/howto/access.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/auth.html b/docs/manual/howto/auth.html
index fddd9973..9f137e8e 100644
--- a/docs/manual/howto/auth.html
+++ b/docs/manual/howto/auth.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: auth.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: auth.html.ja.euc-jp
+URI: auth.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: auth.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/howto/auth.html.en b/docs/manual/howto/auth.html.en
index d682745c..15205bef 100644
--- a/docs/manual/howto/auth.html.en
+++ b/docs/manual/howto/auth.html.en
@@ -390,6 +390,6 @@ person in</a></h2>
 <a href="../ja/howto/auth.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/auth.html.ja.euc-jp b/docs/manual/howto/auth.html.ja.euc-jp
deleted file mode 100644
index ce927702..00000000
--- a/docs/manual/howto/auth.html.ja.euc-jp
+++ /dev/null
@@ -1,386 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>ǧ¾Ú¡¢¾µÇ§¡¢¥¢¥¯¥»¥¹À©¸æ - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">How-To / ¥Á¥å¡¼¥È¥ê¥¢¥ë</a></div><div id="page-content"><div id="preamble"><h1>ǧ¾Ú¡¢¾µÇ§¡¢¥¢¥¯¥»¥¹À©¸æ</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/howto/auth.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/howto/auth.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-    <p>¡Öǧ¾Ú¡×¤È¤Ï¡¢Ã¯¤«¤¬¼«Ê¬¤Ïï¤Ç¤¢¤ë¤«¤ò¼çÄ¥¤·¤¿¾ì¹ç¤Ë¡¢
-    ¤½¤ì¤ò³Îǧ¤¹¤ë¤¿¤á¤ÎÁ´²áÄø¤ò»Ø¤·¤Þ¤¹¡£¡Ö¾µÇ§¡×¤È¤Ï¡¢
-    狼¤¬¹Ô¤­¤¿¤¤¾ì½ê¤Ë¹Ô¤±¤ë¤è¤¦¤Ë¡¢¤¢¤ë¤¤¤ÏÍߤ·¤¤¾ðÊó¤ò
-    ÆÀ¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤ÎÁ´²áÄø¤ò»Ø¤·¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">´ØÏ¢¤¹¤ë¥â¥¸¥å¡¼¥ë¤È¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#introduction">¤Ï¤¸¤á¤Ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#theprerequisites">½àÈ÷</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#gettingitworking">Æ°ºî¤µ¤»¤ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#lettingmorethanonepersonin">
-Ê£¿ô¤Î¿Í¤¬Æþ¤ì¤ë¤è¤¦¤Ë¤¹¤ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#possibleproblems">µ¯¤³¤ê¤¨¤ëÌäÂê</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#whatotherneatstuffcanido">¤â¤Ã¤È¹ª¤ß¤ËÀ©¸æ¤Ç¤­¤Ê¤¤
-?</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#moreinformation">ÄɲþðÊó</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="related" id="related">´ØÏ¢¤¹¤ë¥â¥¸¥å¡¼¥ë¤È¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code></li><li><code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code></li><li><code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code></li><li><code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code></li><li><code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code></li><li><code class="directive"><a href="../mod/core.html#authname">AuthName</a></code></li><li><code class="directive"><a href="../mod/core.html#authtype">AuthType</a></code></li><li><code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code></li><li><code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/core.html#require">Require</a></code></li></ul></td></tr></table>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="introduction" id="introduction">¤Ï¤¸¤á¤Ë</a></h2>
-    <p>¤â¤·µ¡Ì©¤Î¾ðÊó¤ä¡¢¤´¤¯¤´¤¯¾¯¿ô¥°¥ë¡¼¥×¤Î¿Í¸þ¤±¤Î¾ðÊó¤ò
-    ¥¦¥§¥Ö¥µ¥¤¥È¤ËÃÖ¤¯¤Î¤Ç¤¢¤ì¤Ð¡¢¤³¤Îʸ½ñ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë
-    ¥Æ¥¯¥Ë¥Ã¥¯¤ò»È¤¦¤³¤È¤Ç¡¢¤½¤Î¥Ú¡¼¥¸¤ò¸«¤Æ¤¤¤ë¿Í¤¿¤Á¤¬
-    ˾¤ß¤Î¿Í¤¿¤Á¤Ç¤¢¤ë¤³¤È¤ò³Î¼Â¤Ë¤Ç¤­¤ë¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>¤³¤Îʸ½ñ¤Ç¤Ï¡¢Â¿¤¯¤Î¿Í¤¬ºÎÍѤ¹¤ë¤Ç¤¢¤í¤¦¡¢
-    ¥¦¥§¥Ö¥µ¥¤¥È¤Î°ìÉôʬ¤òÊݸ¤ë¡Ö°ìÈÌŪ¤Ê¡×
-    ÊýË¡¤Ë¤Ä¤¤¤Æ¥«¥Ð¡¼¤·¤Æ¤¤¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="theprerequisites" id="theprerequisites">½àÈ÷</a></h2>
-    <p>¤³¤Îʸ½ñ¤Ç¼è¤ê°·¤ï¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥á¥¤¥ó¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë (ÉáÄÌ¤Ï 
-    <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
-    ¥»¥¯¥·¥ç¥óÃæ) ¤«¡¢¤¢¤ë¤¤¤Ï¥Ç¥£¥ì¥¯¥È¥êËè¤ÎÀßÄê¥Õ¥¡¥¤¥ë 
-    (<code>.htaccess</code> ¥Õ¥¡¥¤¥ë) ¤«¤ÇÍѤ¤¤Þ¤¹¡£</p>
-
-    <p><code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤òÍѤ¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
-    ¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ëǧ¾ÚÍѤΥǥ£¥ì¥¯¥Æ¥£¥Ö¤òÃÖ¤±¤ë¤è¤¦¤Ë
-    ¥µ¡¼¥Ð¤ÎÀßÄê¤ò¤·¤Ê¤¤¤È¤¤¤±¤Ê¤¤¤Ç¤·¤ç¤¦¡£¤³¤ì¤Ï
-    <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç²Äǽ¤Ë¤Ê¤ê¤Þ¤¹¡£
-    <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤Ï¡¢¥Ç¥£¥ì¥¯¥È¥êËè¤ÎÀßÄê¥Õ¥¡¥¤¥ëÃæ¤ËÃÖ¤¯¤³¤È¤Î¤Ç¤­¤ë
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¡¢¤â¤·¤¢¤ì¤Ð¡¢»ØÄꤷ¤Þ¤¹¡£</p>
-
-    <p>ǧ¾Ú¤Ë¤Ä¤¤¤ÆÏäò¿Ê¤á¤Æ¤¤¤ë¤Î¤Ç¡¢¼¡¤Î¤è¤¦¤Ê
-    <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬É¬Íפˤʤë¤Ç¤·¤ç¤¦¡£</p>
-
-    <div class="example"><p><code>
-      AllowOverride AuthConfig
-    </code></p></div>
-
-    <p>¤½¤¦¤Ç¤Ê¤¯¡¢¥á¥¤¥ó¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ë
-    ľÀÜÃÖ¤¯¤Î¤Ç¤¢¤ì¤Ð¡¢ÅöÁ³¤Ê¤¬¤é¤½¤Î¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß
-    ¸¢¸Â¤ò»ý¤Ã¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>¤Þ¤¿¡¢¤É¤Î¥Õ¥¡¥¤¥ë¤¬¤É¤³¤ËÊݸ¤µ¤ì¤Æ¤¤¤ë¤«ÃΤ뤿¤á¤Ë¡¢
-    ¥µ¡¼¥Ð¤Î¥Ç¥£¥ì¥¯¥È¥ê¹½Â¤¤Ë¤Ä¤¤¤Æ¾¯¤·ÃΤäƤª¤¯
-    ɬÍפ¬¤¢¤ë¤Ç¤·¤ç¤¦¡£
-    ¤³¤ì¤Ï¤½¤ó¤Ê¤ËÆñ¤·¤¯¤Ê¤¤¤Î¤Ç¡¢¤³¤Îʸ½ñÃæ¤Ç
-    ¥Ç¥£¥ì¥¯¥È¥ê¹½Â¤¤Ë¤Ä¤¤¤ÆÃΤäƤª¤¯É¬Íפ¬¤¢¤ë¾ìÌ̤Ǥϡ¢
-    ÌÀ¤é¤«¤Ë¤Ê¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="gettingitworking" id="gettingitworking">Æ°ºî¤µ¤»¤ë</a></h2>
-    <p>¤Ç¤Ï¡¢¥µ¡¼¥Ð¾å¤Î¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ë
-    ´ðËܼê½ç¤ò¼¨¤·¤Þ¤¹¡£</p>
-
-    <p>¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤òºî¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢¥¦¥§¥Ö¤«¤é¥¢¥¯¥»¥¹¤Ç¤­¤ë¾ì½ê¤Ë
-    ÃÖ¤¯¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£Â¾¤Î¿Í¤¬¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤ò
-    ¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ç¤¹¡£Î㤨¤Ð¡¢
-    <code>/usr/local/apache/htdocs</code> ¤Ç¥É¥­¥å¥á¥ó¥È¤ò
-    Ä󶡤·¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤Ï
-    <code>/usr/local/apache/passwd</code>
-    ¤Ê¤É¤ËÃÖ¤¤¤¿Êý¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>¥Õ¥¡¥¤¥ë¤òºî¤ë¤¿¤á¤Ë¤Ï¡¢Apache ÉÕ°¤Î <code class="program"><a href="../programs/htpasswd.html">htpasswd</a></code> 
-    ¤ò»È¤¤¤Þ¤¹¡£¤³¤Î¥³¥Þ¥ó¥É¤Ï Apache ¤ò¤É¤³¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤·¤è¤¦¤È¤â¡¢
-    ¥¤¥ó¥¹¥È¡¼¥ë¥Ç¥£¥ì¥¯¥È¥ê¤Î <code>bin</code> 
-    ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ËÃÖ¤«¤ì¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤òºî¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë
-    ¥¿¥¤¥×¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <div class="example"><p><code>
-      htpasswd -c /usr/local/apache/passwd/passwords rbowen
-    </code></p></div>
-
-    <p><code class="program"><a href="../programs/htpasswd.html">htpasswd</a></code> ¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É¤òÍ׵ᤷ¡¢¤½¤Î¸å
-    ³Îǧ¤Î¤¿¤á¤Ë¤â¤¦°ìÅÙÆþÎϤ¹¤ë¤è¤¦¤ËÍ׵ᤷ¤Æ¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      # htpasswd -c /usr/local/apache/passwd/passwords rbowen<br />
-      New password: mypassword<br />
-      Re-type new password: mypassword<br />
-      Adding password for user rbowen
-    </code></p></div>
-
-    <p>¤â¤· <code class="program"><a href="../programs/htpasswd.html">htpasswd</a></code> ¤¬¥Ñ¥¹¤ÎÃæ¤ËÆþ¤Ã¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢
-    ¤â¤Á¤í¤ó¡¢¼Â¹Ô¤¹¤ë¤¿¤á¤Ë¥×¥í¥°¥é¥à¤Þ¤Ç¤Î¥Õ¥ë¥Ñ¥¹¤ò
-    ¥¿¥¤¥×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£»ä¤Î¥µ¡¼¥Ð¤Ç¤¢¤ì¤Ð¡¢
-    <code>/usr/local/apache/bin/htpasswd</code>
-    ¤Ë¥×¥í¥°¥é¥à¤¬ÃÖ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p>¼¡¤Ë¡¢¥µ¡¼¥Ð¤¬¥Ñ¥¹¥ï¡¼¥É¤òÍ׵᤹¤ë¤è¤¦¤ËÀßÄꤷ¤Æ¡¢
-    ¤É¤Î¥æ¡¼¥¶¤¬¥¢¥¯¥»¥¹¤òµö¤µ¤ì¤Æ¤¤¤ë¤«¤ò¥µ¡¼¥Ð¤ËÃΤ餻¤Ê¤±¤ì¤Ð
-    ¤Ê¤ê¤Þ¤»¤ó¡£ <code>httpd.conf</code> ¤òÊÔ½¸¤¹¤ë¤«
-    <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ¹¤ë¤«¤Ç
-    ÀßÄꤷ¤Þ¤¹¡£Î㤨¤Ð¡¢¥Ç¥£¥ì¥¯¥È¥ê
-    <code>/usr/local/apache/htdocs/secret</code>
-    ¤òÊݸ¤¿¤¤¾ì¹ç¤Ï¡¢
-    <code>/usr/local/apache/htdocs/secret/.htaccess</code>
-    ¤« httpd.conf Ãæ¤Î &lt;Directory
-    /usr/local/apache/apache/htdocs/secret&gt; ¥»¥¯¥·¥ç¥ó¤Ë
-    ÇÛÃÖ¤·¤Æ¡¢¼¡¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      AuthType Basic<br />
-      AuthName "Restricted Files"<br />
-      AuthUserFile /usr/local/apache/passwd/passwords<br />
-      Require user rbowen
-    </code></p></div>
-
-    <p>¸Ä¡¹¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤Ä¤¤¤Æ¸«¤Æ¤ß¤Þ¤·¤ç¤¦¡£
-    <code class="directive"><a href="../mod/core.html#authtype">AuthType</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤É¤¦¤¤¤¦Ç§¾ÚÊýË¡¤Ç¥æ¡¼¥¶¤Îǧ¾Ú¤ò¹Ô¤¦¤«¤ò
-    ÁªÂò¤·¤Þ¤¹¡£ºÇ¤â°ìÈÌŪ¤ÊÊýË¡¤Ï <code>Basic</code>
-    ¤Ç¡¢¤³¤ì¤Ï <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code>
-    ¤Ç¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤·¤«¤·¤Ê¤¬¤é¡¢
-    ¤³¤ì¤Ïµ¤¤òÉÕ¤±¤ë¤Ù¤­½ÅÍפʥݥ¤¥ó¥È¤Ê¤Î¤Ç¤¹¤¬¡¢
-    Basic ǧ¾Ú¤Ï¥¯¥é¥¤¥¢¥ó¥È¤«¤é¥µ¡¼¥Ð¤Ø¡¢
-    ¥Ñ¥¹¥ï¡¼¥É¤ò°Å¹æ²½¤»¤º¤ËÁ÷¤ê¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢
-    ¤³¤ÎÊýË¡¤ÏÆä˵¡Ì©À­¤Î¹â¤¤¥Ç¡¼¥¿¤ËÂФ·¤Æ¤ÏÍѤ¤¤ë¤Ù¤­¤Ç¤Ï
-    ¤¢¤ê¤Þ¤»¤ó¡£ Apache ¤Ç¤Ï¤â¤¦°ì¤ÄÊ̤Îǧ¾ÚÊýË¡:
-    <code>AuthType Digest</code> ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤¹¡£
-    ¤³¤ÎÊýË¡¤Ï <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>
-    ¤Ç¼ÂÁõ¤µ¤ì¤Æ¤¤¤Æ¡¢¤â¤Ã¤È°ÂÁ´¤Ç¤¹¡£
-    ¤´¤¯¤´¤¯ºÇ¶á¤Î¥¯¥é¥¤¥¢¥ó¥È¤·¤« Digest
-    ǧ¾Ú¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¤è¤¦¤Ç¤¹¡£</p>
-
-    <p><code class="directive"><a href="../mod/core.html#authname">AuthName</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤Ï¡¢Ç§¾Ú¤Ë»È¤¦ <dfn>Realm</dfn> (ÌõÃí: Îΰè)
-    ¤òÀßÄꤷ¤Þ¤¹¡£Realm ¤ÏÂ礭¤¯Ê¬¤±¤ÆÆó¤Ä¤Îµ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£
-    °ì¤ÄÌܤϡ¢¥¯¥é¥¤¥¢¥ó¥È¤¬¥Ñ¥¹¥ï¡¼¥É¥À¥¤¥¢¥í¥°¥Ü¥Ã¥¯¥¹¤Î
-    °ìÉô¤È¤·¤Æ¥æ¡¼¥¶¤Ë¤³¤Î¾ðÊó¤ò¤è¤¯Ä󼨤¹¤ë¡¢¤È¤¤¤¦¤â¤Î¤Ç¤¹¡£
-    Æó¤ÄÌܤˤϡ¢¥¯¥é¥¤¥¢¥ó¥È¤¬Í¿¤¨¤é¤ì¤¿Ç§¾ÚÎΰè¤ËÂФ·¤Æ¤É¤Î¥Ñ¥¹¥ï¡¼¥É¤ò
-    Á÷¿®¤¹¤ì¤ÐÎɤ¤¤Î¤«¤ò·èÄꤹ¤ë¤¿¤á¤Ë»È¤ï¤ì¤ë¡¢¤È¤¤¤¦µ¡Ç½¤Ç¤¹¡£</p>
-
-    <p>Î㤨¤Ð¡¢<code>"Restricted Files"</code> ÎΰèÃæ¤Ç
-    °ìÅÙǧ¾Ú¤µ¤ì¤ì¤Ð¡¢Æ±°ì¥µ¡¼¥Ð¾å¤Ç <code>"Restricted Files"</code>
-    Realm ¤È¤·¤Æ¥Þ¡¼¥¯¤µ¤ì¤¿¤É¤ó¤ÊÎΰè¤Ç¤â¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ï
-    ¼«Æ°Åª¤ËƱ¤¸¥Ñ¥¹¥ï¡¼¥É¤ò»È¤ª¤¦¤È»î¤ß¤Þ¤¹¡£
-    ¤³¤Î¤ª¤«¤²¤Ç¡¢Ê£¿ô¤ÎÀ©¸ÂÎΰè¤ËƱ¤¸ realm ¤ò¶¦Í­¤µ¤»¤Æ¡¢
-    ¥æ¡¼¥¶¤¬¥Ñ¥¹¥ï¡¼¥É¤ò²¿ÅÙ¤âÍ׵ᤵ¤ì¤ë»öÂÖ¤ò
-    Ëɤ°¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤â¤Á¤í¤ó¡¢¥»¥­¥å¥ê¥Æ¥£¾å¤ÎÍýͳ¤«¤é¡¢
-    ¥µ¡¼¥Ð¤Î¥Û¥¹¥È̾¤¬ÊѤï¤ì¤Ð¤¤¤Ä¤Ç¤âɬ¤º¡¢
-    ¥¯¥é¥¤¥¢¥ó¥È¤ÏºÆ¤Ó¥Ñ¥¹¥ï¡¼¥É¤ò¿Ò¤Í¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p><code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code class="program"><a href="../programs/htpasswd.html">htpasswd</a></code> ¤Çºî¤Ã¤¿
-    ¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤òÀßÄꤷ¤Þ¤¹¡£
-    ¥æ¡¼¥¶¿ô¤¬Â¿¤¤¾ì¹ç¤Ï¡¢¥ê¥¯¥¨¥¹¥ÈËè¤Î¥æ¡¼¥¶¤Îǧ¾Ú¤Î¤¿¤á¤Î
-    ¥×¥ì¡¼¥ó¥Æ¥­¥¹¥È¤Îõº÷¤¬Èó¾ï¤ËÃÙ¤¯¤Ê¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-    Apache ¤Ç¤Ï¥æ¡¼¥¶¾ðÊó¤ò¹â®¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë¤Ë
-    Êݴɤ¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-    <code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code> ¥â¥¸¥å¡¼¥ë¤¬
-    <code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÄ󶡤·¤Þ¤¹¡£¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï <code class="program"><a href="../programs/dbmmanage.html">dbmmanage</a></code>
-    ¥×¥í¥°¥é¥à¤ÇºîÀ®¤·¤¿¤êÁàºî¤·¤¿¤ê¤Ç¤­¤Þ¤¹¡£
-    <a href="http://modules.apache.org/">Apache 
-    ¥â¥¸¥å¡¼¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹</a>Ãæ¤Ë¤¢¤ë¥µ¡¼¥É¥Ñ¡¼¥Æ¥£¡¼À½¤Î
-    ¥â¥¸¥å¡¼¥ë¤Ç¡¢¤½¤Î¾¿¤¯¤Î¥¿¥¤¥×¤Îǧ¾Ú¥ª¥×¥·¥ç¥ó¤¬
-    ÍøÍѲÄǽ¤Ç¤¹¡£</p>
-
-    <p>ºÇ¸å¤Ë¡¢<code class="directive"><a href="../mod/core.html#require">Require</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬¡¢¥µ¡¼¥Ð¤Î¤³¤ÎÎΰè¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤ë¥æ¡¼¥¶¤ò
-    »ØÄꤹ¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢¥×¥í¥»¥¹¤Î¾µÇ§Éôʬ¤òÄ󶡤·¤Þ¤¹¡£
-    ¼¡¤Î¥»¥¯¥·¥ç¥ó¤Ç¤Ï¡¢<code class="directive"><a href="../mod/core.html#require">Require</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÍÍ¡¹¤ÊÍÑË¡¤Ë¤Ä¤¤¤Æ½Ò¤Ù¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="lettingmorethanonepersonin" id="lettingmorethanonepersonin">
-Ê£¿ô¤Î¿Í¤¬Æþ¤ì¤ë¤è¤¦¤Ë¤¹¤ë</a></h2>
-    <p>¾åµ­¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¤¿¤À°ì¿Í (¶ñÂÎŪ¤Ë¤Ï¥æ¡¼¥¶Ì¾
-    <code>rbowen</code> ¤Î狼) ¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ë
-    Æþ¤ì¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£Â¿¤¯¤Î¾ì¹ç¤Ï¡¢Ê£¿ô¤Î¿Í¤¬
-    Æþ¤ì¤ë¤è¤¦¤Ë¤·¤¿¤¤¤Ç¤·¤ç¤¦¡£¤³¤³¤Ç
-    <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code>
-    ¤ÎÅоì¤Ç¤¹¡£</p>
-
-    <p>¤â¤·Ê£¿ô¤Î¿Í¤¬Æþ¤ì¤ë¤è¤¦¤Ë¤·¤¿¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
-    ¥°¥ë¡¼¥×¤Ë°¤¹¤ë¥æ¡¼¥¶¤Î°ìÍ÷¤ÎÆþ¤Ã¤Æ¤¤¤ë¡¢¥°¥ë¡¼¥×̾¤Î¤Ä¤¤¤¿
-    ¥°¥ë¡¼¥×¥Õ¥¡¥¤¥ë¤òºî¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë¤Î
-    ½ñ¼°¤Ï¤­¤ï¤á¤Æñ½ã¤Ç¡¢¤ª¹¥¤ß¤Î¥¨¥Ç¥£¥¿¤ÇÀ¸À®¤Ç¤­¤Þ¤¹¡£
-    ¥Õ¥¡¥¤¥ë¤ÎÃæ¿È¤Ï¼¡¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤¹¡£</p>
-
-   <div class="example"><p><code>
-     GroupName: rbowen dpitts sungo rshersey
-   </code></p></div>
-
-    <p>°ì¹Ô¤Ë¥¹¥Ú¡¼¥¹¶èÀÚ¤ê¤Ç¡¢¥°¥ë¡¼¥×¤Ë½ê°¤¹¤ë¥á¥ó¥Ð¡¼¤Î
-    °ìÍ÷¤ò¤Ê¤é¤Ù¤ë¤À¤±¤Ç¤¹¡£</p>
-
-    <p>´û¤Ë¸ºß¤¹¤ë¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤Ë¥æ¡¼¥¶¤ò²Ã¤¨¤ë¾ì¹ç¤Ï¡¢
-    ¼¡¤Î¤è¤¦¤Ë¥¿¥¤¥×¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <div class="example"><p><code>
-      htpasswd /usr/local/apache/passwd/passwords dpitts
-    </code></p></div>
-
-    <p>°ÊÁ°¤ÈƱ¤¸±þÅú¤¬ÊÖ¤µ¤ì¤Þ¤¹¤¬¡¢¿·¤·¤¤¥Õ¥¡¥¤¥ë¤ò
-    ºî¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢´û¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤ËÄɲ䵤ì¤Æ¤¤¤Þ¤¹¡£
-    (¿·¤·¤¤¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤òºî¤ë¤Ë¤Ï <code>-c</code>
-    ¤ò»È¤¤¤Þ¤¹¡£)</p>
-
-    <p>¤³¤³¤Ç¼¡¤Î¤è¤¦¤Ë¤·¤Æ <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤ò
-    ½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      AuthType Basic<br />
-      AuthName "By Invitation Only"<br />
-      AuthUserFile /usr/local/apache/passwd/passwords<br />
-      AuthGroupFile /usr/local/apache/passwd/groups<br />
-      Require group GroupName
-    </code></p></div>
-
-    <p>¤³¤ì¤Ç¡¢¥°¥ë¡¼¥× <code>GroupName</code> ¤Ë¥ê¥¹¥È¤µ¤ì¤Æ¤¤¤Æ¡¢
-    <code>password</code> ¥Õ¥¡¥¤¥ë¤Ë¥¨¥ó¥È¥ê¤¬¤¢¤ë¿Í¤Ï¡¢
-    Àµ¤·¤¤¥Ñ¥¹¥ï¡¼¥É¤ò¥¿¥¤¥×¤¹¤ì¤ÐÆþ¤ë¤³¤È¤¬¤Ç¤­¤ë¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>¤â¤Ã¤ÈÆÃÄꤻ¤º¤ËÊ£¿ô¤Î¥æ¡¼¥¶¤¬Æþ¤ì¤ë¤è¤¦¤Ë¤¹¤ë¡¢
-    ¤â¤¦°ì¤Ä¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£¥°¥ë¡¼¥×¥Õ¥¡¥¤¥ë¤òºî¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢
-    ¼¡¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¨¤Ð¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      Require valid-user
-    </code></p></div>
-
-    <p><code>require user rbowen</code> ¹Ô¤Ç¤Ê¤¯¡¢¾åµ­¤ò»È¤¦¤È¡¢
-    ¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤Ë¥ê¥¹¥È¤µ¤ì¤Æ¤¤¤ë¿Í¤Ç¤¢¤ì¤Ðï¤Ç¤â
-    µö²Ä¤µ¤ì¤Þ¤¹¡£
-    ñ¤Ë¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤ò¥°¥ë¡¼¥×Ëè¤Ëʬ¤±¤Æ¤ª¤¯¤³¤È¤Ç¡¢
-    ¥°¥ë¡¼¥×¤Î¤è¤¦¤Ê¿¶¤ëÉñ¤¤¤ò¤µ¤»¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-    ¤³¤Î¥¢¥×¥í¡¼¥Á¤ÎÍøÅÀ¤Ï¡¢Apache ¤ÏÆó¤Ä¤Ç¤Ï¤Ê¤¯¡¢
-    ¤¿¤À°ì¤Ä¤Î¥Õ¥¡¥¤¥ë¤À¤±¤ò¸¡ºº¤¹¤ì¤Ð¤è¤¤¤È¤¤¤¦ÅÀ¤Ç¤¹¡£
-    ·çÅÀ¤Ï¡¢¤¿¤¯¤µ¤ó¤Î¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤ò´ÉÍý¤·¤Æ¡¢¤½¤ÎÃ椫¤é
-    <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ËÀµ¤·¤¤¥Õ¥¡¥¤¥ë¤ò»²¾È¤µ¤»¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤ÅÀ¤Ç¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="possibleproblems" id="possibleproblems">µ¯¤³¤ê¤¨¤ëÌäÂê</a></h2>
-    <p>Basic ǧ¾Ú¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-    ¥µ¡¼¥Ð¤Ë¥É¥­¥å¥á¥ó¥È¤ò¥ê¥¯¥¨¥¹¥È¤¹¤ëÅÙ¤Ë
-    ¥æ¡¼¥¶Ì¾¤È¥Ñ¥¹¥ï¡¼¥É¤ò¸¡ºº¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-    ¤³¤ì¤ÏƱ¤¸¥Ú¡¼¥¸¡¢¥Ú¡¼¥¸¤Ë¤¢¤ëÁ´¤Æ¤Î²èÁü¤ò
-    ¥ê¥í¡¼¥É¤¹¤ë¾ì¹ç¤Ç¤¢¤Ã¤Æ¤â³ºÅö¤·¤Þ¤¹
-     (¤â¤·²èÁü¤âÊݸ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤«¤éÍè¤ë¤Î¤Ç¤¢¤ì¤Ð) ¡£
-    ͽÁÛ¤µ¤ì¤ëÄ̤ꡢ¤³¤ì¤ÏÆ°ºî¤ò¿¾¯ÃÙ¤¯¤·¤Þ¤¹¡£
-    ÃÙ¤¯¤Ê¤ëÄøÅ٤ϥѥ¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤ÎÂ礭¤µ¤ÈÈæÎ㤷¤Þ¤¹¤¬¡¢
-    ¤³¤ì¤Ï¡¢¥Õ¥¡¥¤¥ë¤ò³«¤¤¤Æ¤¢¤Ê¤¿¤Î̾Á°¤òȯ¸«¤¹¤ë¤Þ¤Ç
-    ¥æ¡¼¥¶Ì¾¤Î¥ê¥¹¥È¤òÆɤޤʤ±¤ì¤Ð¤Ê¤é¤Ê¤¤¤«¤é¤Ç¤¹¡£
-    ¤½¤·¤Æ¡¢¥Ú¡¼¥¸¤¬¥í¡¼¥É¤µ¤ì¤ëÅ٤ˤ³¤ì¤ò¹Ô¤ï¤Ê¤±¤ì¤Ð
-    ¤Ê¤ê¤Þ¤»¤ó¡£</p>
-
-    <p>·ëÏÀ¤È¤·¤Æ¤Ï¡¢°ì¤Ä¤Î¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤ËÃÖ¤¯¤³¤È¤Î¤Ç¤­¤ë
-    ¥æ¡¼¥¶¿ô¤Ë¤Ï¼Â¼ÁŪ¤Ê¸Â³¦¤¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤Î¸Â³¦¤Ï¥µ¡¼¥Ð¥Þ¥·¥ó¤ÎÀ­Ç½¤Ë°Í¸¤·¤ÆÊѤï¤ê¤Þ¤¹¤¬¡¢
-    ¿ôÉ´¤Î¥¨¥ó¥È¥ê¤ò±Û¤¨¤¿¤¢¤¿¤ê¤«¤é®ÅÙÄã²¼¤¬¸«¤é¤ì¤ë¤Èͽ´ü¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¤½¤Î»þ¤Ï¾¤Îǧ¾ÚÊýË¡¤ò¹Íθ¤ËÆþ¤ì¤¿Êý¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="whatotherneatstuffcanido" id="whatotherneatstuffcanido">¤â¤Ã¤È¹ª¤ß¤ËÀ©¸æ¤Ç¤­¤Ê¤¤
-?</a></h2>
-    <p>¥æ¡¼¥¶Ì¾¤È¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤ëǧ¾Ú¤Ïǧ¾Ú¤Î°ì¤Ä¤ÎÊýË¡¤Ë²á¤®¤Þ¤»¤ó¡£
-    ¤·¤Ð¤·¤Ðï¤Ç¤¢¤ë¤«¤È¤¤¤¦¤³¤È¤È¤Ï°ã¤¦²¿¤«¤Ë´ð¤Å¤¤¤Æ¡¢
-    Æþ¤ì¤ë¤è¤¦¤Ë¤·¤¿¤¯¤Ê¤ë¤³¤È¤â¤¢¤ë¤Ç¤·¤ç¤¦¡£
-    Î㤨¤Ð¤½¤Î¿Í¤¬¤É¤³¤«¤éÍè¤Æ¤¤¤ë¤«¤È¤¤¤Ã¤¿¤³¤È¤Ç¤¹¡£</p>
-
-    <p><code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code> ¤È
-    <code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ¡¢¥É¥­¥å¥á¥ó¥È¤òÍ׵ᤷ¤Æ¤­¤¿¥Þ¥·¥ó¤Î
-    ¥Û¥¹¥È̾¤ä¥Û¥¹¥È¥¢¥É¥ì¥¹¤Ë´ð¤Å¤¤¤Æµö²ÄÉÔµö²Ä¤òÀ©¸æ¤Ç¤­¤Þ¤¹¡£
-    <code class="directive"><a href="../mod/mod_authz_host.html#order">Order</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤³¤ÎÆó¤Ä¤ÈÏ¢·È¤·¤ÆÆ°ºî¤·¡¢Apache 
-    ¤Ë¤É¤Î½çÈ֤ǥե£¥ë¥¿¤òŬÍѤ¹¤ë¤«¤òÃΤ餻¤Þ¤¹¡£</p>
-
-    <p>¤³¤ì¤é¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î»È¤¤Êý¤Ï¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      Allow from <var>address</var>
-    </code></p></div>
-
-    <p>¤³¤³¤Ç¡¢<var>address</var> ¤Ï IP ¥¢¥É¥ì¥¹
-    (¤Þ¤¿¤Ï IP ¥¢¥É¥ì¥¹¤Î°ìÉô)¡¢¤¢¤ë¤¤¤Ï´°Á´½¤¾þ¥É¥á¥¤¥ó̾
-    (¤Þ¤¿¤Ï¥É¥á¥¤¥ó̾¤Î°ìÉô) ¤Ç¤¹¡£
-    ɬÍפǤ¢¤ì¤ÐÊ£¿ô¤Î¥¢¥É¥ì¥¹¤ä¥É¥á¥¤¥ó̾¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>Î㤨¤Ð¡¢¤â¤·Ã¯¤«¤¬·Ç¼¨ÈĤò¹¶·â¤·¤Æ¤¤¤Æ¡¢
-    ¤½¤Î¿Í¤òÊĤá½Ð¤·¤¿¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
-    ¼¡¤Î¤è¤¦¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      Deny from 205.252.46.165
-    </code></p></div>
-
-    <p>¤³¤Î¥¢¥É¥ì¥¹¤«¤éÍè¤ë¿Í¤Ï¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÈÏ°ÏÆâ¤Î
-    ¥³¥ó¥Æ¥ó¥Ä¤ò¸«¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¤¤Þ¤»¤ó¡£¤â¤· IP
-    ¥¢¥É¥ì¥¹¤ÎÂå¤ï¤ê¤Ë¥Þ¥·¥ó̾¤¬¤¢¤ì¤Ð¡¢¤½¤ì¤ò»È¤¨¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      Deny from <var>host.example.com</var>
-    </code></p></div>
-
-    <p>¥É¥á¥¤¥óÁ´ÂΤ«¤é¤Î¥¢¥¯¥»¥¹¤òËɤ®¤¿¤±¤ì¤Ð¡¢
-    ñ¤Ë¥¢¥É¥ì¥¹¤ä¥É¥á¥¤¥ó̾¤Î°ìÉô¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      Deny from <var>192.101.205</var><br />
-      Deny from <var>cyberthugs.com</var> <var>moreidiots.com</var><br />
-      Deny from ke
-    </code></p></div>
-
-    <p><code class="directive"><a href="../mod/mod_authz_host.html#order">Order</a></code> ¤ò»È¤¦¤³¤È¤Ç¡¢
-    <code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code> ¤È
-    <code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code> ¤ÎÁȤ߹ç¤ï¤»¤Ç
-    Æþ¤Ã¤Æ¤âÎɤ¤¥°¥ë¡¼¥×¤¬ËÜÅö¤Ë³Î¼Â¤Ë¸ÂÄê¤Ç¤­¤Æ¤¤¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      Order deny,allow<br />
-      Deny from all<br />
-      Allow from <var>dev.example.com</var>
-    </code></p></div>
-
-    <p><code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òñ½ã¤ËÎóµó¤¹¤ë¤Î¤Ç¤Ï˾¤ß¤ÎÆ°ºî¤ò¤·¤Ê¤¤¤Ç¤·¤ç¤¦¡£
-    ¤Ê¤¼¤Ê¤é¡¢Á´¤Æ¤Î¿Í¤¬Æþ¤ì¤ë¤È¤¤¤¦¤³¤È¤Ë²Ã¤¨¤Æ¡¢
-    »ØÄꤷ¤¿¥Û¥¹¥È¤«¤é¤Î¿Í¤¬Æþ¤ì¤ë¤è¤¦¤Ë¤¹¤ë¤«¤é¤Ç¤¹¡£
-    ¤ä¤ê¤¿¤¤¤³¤È¤Ï¡¢»ØÄꤷ¤¿¿Í¤¿¤Á<em>¤À¤±</em>¤¬Æþ¤ì¤ë¤è¤¦¤Ë
-    ¤¹¤ë¤³¤È¤Ç¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="moreinformation" id="moreinformation">ÄɲþðÊó</a></h2>
-    <p>¤³¤ì¤éÁ´¤Æ¤¬¤É¤Î¤è¤¦¤ËÆ°ºî¤¹¤ë¤«¤Ë¤Ä¤¤¤Æ
-    ¤â¤Ã¤È¿¤¯¤Î¾ðÊ󤬽ñ¤«¤ì¤Æ¤¤¤ë <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> ¤È
-    <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>
-    ¤Îʸ½ñ¤âÆɤà¤È¤è¤¤¤Ç¤·¤ç¤¦¡£</p>
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/howto/auth.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/howto/auth.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/auth.html.ja.utf8 b/docs/manual/howto/auth.html.ja.utf8
new file mode 100644
index 00000000..e638e1dc
--- /dev/null
+++ b/docs/manual/howto/auth.html.ja.utf8
@@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>�証�承��アクセス制御 - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">How-To / �ュートリアル</a></div><div id="page-content"><div id="preamble"><h1>�証�承��アクセス制御</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/howto/auth.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/howto/auth.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+
+    <p>「�証����誰��自分�誰��る�を主張��場���
+    �れを確��る���全�程を指���。「承�����
+    誰��行���場所�行�るよ����る��欲��情報を
+    得る�����るよ���る���全�程を指���。</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">関連�るモジュール�ディレクティブ</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#introduction">����</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#theprerequisites">準備</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#gettingitworking">動作��る</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#lettingmorethanonepersonin">
+複数�人�入れるよ���る</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#possibleproblems">起�り�る�題</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#whatotherneatstuffcanido">も��巧��制御����
+?</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#moreinformation">追加情報</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="related" id="related">関連�るモジュール�ディレクティブ</a></h2>
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code></li><li><code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code></li><li><code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code></li><li><code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code></li><li><code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code></li><li><code class="directive"><a href="../mod/core.html#authname">AuthName</a></code></li><li><code class="directive"><a href="../mod/core.html#authtype">AuthType</a></code></li><li><code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code></li><li><code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/core.html#require">Require</a></code></li></ul></td></tr></table>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="introduction" id="introduction">����</a></h2>
+    <p>も�機密�情報や�����少数グループ�人���情報を
+    ウェブサイト�置����れ����文書�書�れ��る
+    テクニックを使�������ページを見��る人���
+    望��人����る��を確実���る��ょ�。</p>
+
+    <p>��文書���多��人�採用�る�����
+    ウェブサイト�一部分を�護�る「一般的��
+    方法����カ�ー�����。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="theprerequisites" id="theprerequisites">準備</a></h2>
+    <p>��文書��り扱�れるディレクティブ��
+    メインサー�設定ファイル (普通� 
+    <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
+    セクション中) ���る��ディレクトリ毎�設定ファイル 
+    (<code>.htaccess</code> ファイル) ��用���。</p>
+
+    <p><code>.htaccess</code> ファイルを用�る���れ��
+    �れら�ファイル��証用�ディレクティブを置�るよ��
+    サー��設定を����������ょ�。�れ�
+    <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
+    ディレクティブ��能��り��。
+    <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
+    ディレクティブ���ディレクトリ毎�設定ファイル中�置������る
+    ディレクティブを�も��れ��指定���。</p>
+
+    <p>�証����話を進���る���次�よ��
+    <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
+    ディレクティブ�必���る��ょ�。</p>
+
+    <div class="example"><p><code>
+      AllowOverride AuthConfig
+    </code></p></div>
+
+    <p>������メインサー�設定ファイル�中�
+    直接置����れ��当然��ら��ファイル��書�込�
+    権�を������れ��ら����ょ�。</p>
+
+    <p>�����ファイル�����存�れ��る�知る����
+    サー��ディレクトリ構造����少�知����
+    必���る��ょ�。
+    �れ��ん��難���������文書中�
+    ディレクトリ構造����知����必���る場����
+    明ら���るよ�����。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="gettingitworking" id="gettingitworking">動作��る</a></h2>
+    <p>���サー�上��るディレクトリをパスワード��護�る
+    基本手順を示���。</p>
+
+    <p>パスワードファイルを作る必���り��。
+    ��ファイル��ウェブ�らアクセス��る場所�
+    置������り��ん。他�人�パスワードファイルを
+    ダウンロード����よ���る����。例���
+    <code>/usr/local/apache/htdocs</code> �ドキュメントを
+    �供���る���れ��パスワードファイル�
+    <code>/usr/local/apache/passwd</code>
+    ���置��方�良���ょ�。</p>
+
+    <p>ファイルを作る�����Apache 付属� <code class="program"><a href="../programs/htpasswd.html">htpasswd</a></code> 
+    を使���。��コマンド� Apache を���インストール�よ��も�
+    インストールディレクトリ� <code>bin</code> 
+    ディレクトリ以下�置�れ��。ファイルを作る���次�よ��
+    タイプ������。</p>
+
+    <div class="example"><p><code>
+      htpasswd -c /usr/local/apache/passwd/passwords rbowen
+    </code></p></div>
+
+    <p><code class="program"><a href="../programs/htpasswd.html">htpasswd</a></code> ��パスワードを�求����後
+    確�����も�一度入力�るよ���求�����。</p>
+
+    <div class="example"><p><code>
+      # htpasswd -c /usr/local/apache/passwd/passwords rbowen<br />
+      New password: mypassword<br />
+      Re-type new password: mypassword<br />
+      Adding password for user rbowen
+    </code></p></div>
+
+    <p>も� <code class="program"><a href="../programs/htpasswd.html">htpasswd</a></code> �パス�中�入�����場���
+    も��ん�実行�る���プログラム���フルパスを
+    タイプ�る必���り��。��サー���れ��
+    <code>/usr/local/apache/bin/htpasswd</code>
+    �プログラム�置�れ����。</p>
+
+    <p>次��サー��パスワードを�求�るよ��設定���
+    ��ユーザ�アクセスを許�れ��る�をサー��知ら���れ�
+    �り��ん。 <code>httpd.conf</code> を編集�る�
+    <code>.htaccess</code> ファイルを使用�る��
+    設定���。例���ディレクトリ
+    <code>/usr/local/apache/htdocs/secret</code>
+    を�護���場���
+    <code>/usr/local/apache/htdocs/secret/.htaccess</code>
+    � httpd.conf 中� &lt;Directory
+    /usr/local/apache/apache/htdocs/secret&gt; セクション�
+    �置���次�ディレクティブを使��������。</p>
+
+    <div class="example"><p><code>
+      AuthType Basic<br />
+      AuthName "Restricted Files"<br />
+      AuthUserFile /usr/local/apache/passwd/passwords<br />
+      Require user rbowen
+    </code></p></div>
+
+    <p>個々�ディレクティブ����見����ょ�。
+    <code class="directive"><a href="../mod/core.html#authtype">AuthType</a></code>
+    ディレクティブ������証方法�ユーザ��証を行��を
+    �択���。最も一般的�方法� <code>Basic</code>
+    ���れ� <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code>
+    �実装�れ����。�����ら�
+    �れ�気を付�る������イント������
+    Basic �証�クライアント�らサー���
+    パスワードを暗�化����り��。���ら�
+    ��方法�特�機密性�高�データ�対���用�る����
+    �り��ん。 Apache ��も�一�別��証方法:
+    <code>AuthType Digest</code> をサ�ート�����。
+    ��方法� <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>
+    �実装�れ����も��安全��。
+    ����最近�クライアント�� Digest
+    �証をサ�ート�����よ���。</p>
+
+    <p><code class="directive"><a href="../mod/core.html#authname">AuthName</a></code>
+    ディレクティブ����証�使� <dfn>Realm</dfn> (訳注: 領域)
+    を設定���。Realm �大��分��二��機能を�供���。
+    一�目��クライアント�パスワードダイアログボックス�
+    一部���ユーザ���情報をよ��示�る����も���。
+    二�目���クライアント�与�られ��証領域�対����パスワードを
+    �信�れ�良���を決定�る���使�れる����機能��。</p>
+
+    <p>例���<code>"Restricted Files"</code> 領域中�
+    一度�証�れれ���一サー�上� <code>"Restricted Files"</code>
+    Realm ���マーク�れ��ん�領域�も�クライアント�
+    自動的���パスワードを使���試���。
+    �������複数�制�領域��� realm を共有����
+    ユーザ�パスワードを何度も�求�れる事態を
+    防��������。も��ん�セキュリティ上��由�ら�
+    サー��ホスト��変�れ����も必��
+    クライアント���パスワードを尋�る必���り��。</p>
+
+    <p><code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>
+    ディレクティブ� <code class="program"><a href="../programs/htpasswd.html">htpasswd</a></code> �作��
+    パスワードファイル��パスを設定���。
+    ユーザ数�多�場���リクエスト毎�ユーザ��証����
+    プレーンテキスト�探索��常����る����り��。
+    Apache ��ユーザ情報を高速�データベースファイル�
+    �管�る��も����。
+    <code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code> モジュール�
+    <code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code>
+    ディレクティブを�供���。�れら�ファイル� <code class="program"><a href="../programs/dbmmanage.html">dbmmanage</a></code>
+    プログラム�作���り�作��り����。
+    <a href="http://modules.apache.org/">Apache 
+    モジュールデータベース</a>中��るサードパーティー製�
+    モジュール����他多��タイプ��証オプション�
+    利用�能��。</p>
+
+    <p>最後��<code class="directive"><a href="../mod/core.html#require">Require</a></code>
+    ディレクティブ��サー����領域�アクセス��るユーザを
+    指定�る���よ���プロセス�承�部分を�供���。
+    次�セクション���<code class="directive"><a href="../mod/core.html#require">Require</a></code>
+    ディレクティブ�様々�用法����述���。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="lettingmorethanonepersonin" id="lettingmorethanonepersonin">
+複数�人�入れるよ���る</a></h2>
+    <p>上記�ディレクティブ����一人 (具体的��ユーザ�
+    <code>rbowen</code> �誰�) �ディレクトリ�
+    入れるよ�����。多��場���複数�人�
+    入れるよ�������ょ�。���
+    <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code>
+    �登場��。</p>
+
+    <p>も�複数�人�入れるよ��������れ��
+    グループ�属�るユーザ�一覧�入���る�グループ�����
+    グループファイルを作る必���り��。��ファイル�
+    書�������純���好��エディタ�生�����。
+    ファイル�中身�次�よ��も���。</p>
+
+   <div class="example"><p><code>
+     GroupName: rbowen dpitts sungo rshersey
+   </code></p></div>
+
+    <p>一行�スペース区切り��グループ�所属�るメン�ー�
+    一覧を�ら�る����。</p>
+
+    <p>既�存在�るパスワードファイル�ユーザを加�る場���
+    次�よ��タイプ������。</p>
+
+    <div class="example"><p><code>
+      htpasswd /usr/local/apache/passwd/passwords dpitts
+    </code></p></div>
+
+    <p>以����応答�返�れ����新��ファイルを
+    作る������既��るファイル�追加�れ����。
+    (新��パスワードファイルを作る�� <code>-c</code>
+    を使���。)</p>
+
+    <p>���次�よ���� <code>.htaccess</code> ファイルを
+    修正�る必���り��。</p>
+
+    <div class="example"><p><code>
+      AuthType Basic<br />
+      AuthName "By Invitation Only"<br />
+      AuthUserFile /usr/local/apache/passwd/passwords<br />
+      AuthGroupFile /usr/local/apache/passwd/groups<br />
+      Require group GroupName
+    </code></p></div>
+
+    <p>�れ��グループ <code>GroupName</code> �リスト�れ����
+    <code>password</code> ファイル�エントリ��る人��
+    正��パスワードをタイプ�れ�入る�����る��ょ�。</p>
+
+    <p>も��特定���複数�ユーザ�入れるよ���る�
+    も�一��方法��り��。グループファイルを作る������
+    次�ディレクティブを使������。</p>
+
+    <div class="example"><p><code>
+      Require valid-user
+    </code></p></div>
+
+    <p><code>require user rbowen</code> 行����上記を使���
+    パスワードファイル�リスト�れ��る人��れ�誰�も
+    許��れ��。
+    ��パスワードファイルをグループ毎�分��������
+    グループ�よ��振る舞�を��る��も����。
+    ��アプロー��利点��Apache �二������
+    ��一��ファイル��を検査�れ�よ����点��。
+    欠点�����ん�パスワードファイルを管������中�ら
+    <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>
+    ディレクティブ�正��ファイルを�照����れ��ら��点��。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="possibleproblems" id="possibleproblems">起�り�る�題</a></h2>
+    <p>Basic �証�指定�れ��る場���
+    サー��ドキュメントをリクエスト�る度�
+    ユーザ��パスワードを検査���れ��り��ん。
+    �れ���ページ�ページ��る全��画�を
+    リロード�る場�����も該当���
+     (も�画�も�護�れ�ディレクトリ�ら�る���れ�) 。
+    予想�れる通り��れ�動作を多少�����。
+    ���る程度�パスワードファイル�大���比例�����
+    �れ��ファイルを開��������を発見�る��
+    ユーザ��リストを読���れ��ら���ら��。
+    ����ページ�ロード�れる度��れを行���れ�
+    �り��ん。</p>
+
+    <p>�論�����一��パスワードファイル�置������る
+    ユーザ数��実質的��界��り��。
+    ���界�サー�マシン�性能��存��変�り����
+    数百�エントリを越����り�ら速度低下�見られる�予期�れ����。
+    ��時�他��証方法を考慮�入れ�方�良���ょ�。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="whatotherneatstuffcanido" id="whatotherneatstuffcanido">も��巧��制御����
+?</a></h2>
+    <p>ユーザ��パスワード�よる�証��証�一��方法�����ん。
+    ����誰��る����������何��基����
+    入れるよ������る��も�る��ょ�。
+    例����人����ら���る���������。</p>
+
+    <p><code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code> �
+    <code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code>
+    ディレクティブを使���ドキュメントを�求����マシン�
+    ホスト�やホストアドレス�基���許��許�を制御����。
+    <code class="directive"><a href="../mod/mod_authz_host.html#order">Order</a></code>
+    ディレクティブ���二��連���動作��Apache 
+    ���順番�フィルタを�用�る�を知ら���。</p>
+
+    <p>�れら�ディレクティブ�使�方�次�よ���り��。</p>
+
+    <div class="example"><p><code>
+      Allow from <var>address</var>
+    </code></p></div>
+
+    <p>����<var>address</var> � IP アドレス
+    (��� IP アドレス�一部)��る��完全修飾ドメイン�
+    (���ドメイン��一部) ��。
+    必���れ�複数�アドレスやドメイン�を指定����。</p>
+
+    <p>例���も�誰��掲示�を攻撃�����
+    ��人を閉�出������れ��
+    次�よ���る�������。</p>
+
+    <div class="example"><p><code>
+      Deny from 205.252.46.165
+    </code></p></div>
+
+    <p>��アドレス�ら�る人����ディレクティブ�範囲内�
+    コンテンツを見る�������ん。も� IP
+    アドレス�代�り�マシン���れ���れを使���。</p>
+
+    <div class="example"><p><code>
+      Deny from <var>host.example.com</var>
+    </code></p></div>
+
+    <p>ドメイン全体�ら�アクセスを防���れ��
+    ��アドレスやドメイン��一部を指定�る�������。</p>
+
+    <div class="example"><p><code>
+      Deny from <var>192.101.205</var><br />
+      Deny from <var>cyberthugs.com</var> <var>moreidiots.com</var><br />
+      Deny from ke
+    </code></p></div>
+
+    <p><code class="directive"><a href="../mod/mod_authz_host.html#order">Order</a></code> を使�����
+    <code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code> �
+    <code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code> �組�����
+    入��も良�グループ�本当�確実��定����るよ������。</p>
+
+    <div class="example"><p><code>
+      Order deny,allow<br />
+      Deny from all<br />
+      Allow from <var>dev.example.com</var>
+    </code></p></div>
+
+    <p><code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code>
+    ディレクティブを�純�列挙�る���望��動作を�����ょ�。
+    ���ら�全��人�入れる������加���
+    指定��ホスト�ら�人�入れるよ���る�ら��。
+    やり������指定��人��<em>��</em>�入れるよ��
+    �る����。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="moreinformation" id="moreinformation">追加情報</a></h2>
+    <p>�れら全����よ��動作�る�����
+    も��多��情報�書�れ��る <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> �
+    <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>
+    �文書も読む�よ���ょ�。</p>
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/howto/auth.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/howto/auth.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/auth.html.ko.euc-kr b/docs/manual/howto/auth.html.ko.euc-kr
index 0f5b5bc8..4bdfcdfd 100644
--- a/docs/manual/howto/auth.html.ko.euc-kr
+++ b/docs/manual/howto/auth.html.ko.euc-kr
@@ -318,6 +318,6 @@
 <a href="../ja/howto/auth.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/auth.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/cgi.html b/docs/manual/howto/cgi.html
index 8d3dbcba..61f160a2 100644
--- a/docs/manual/howto/cgi.html
+++ b/docs/manual/howto/cgi.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: cgi.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: cgi.html.ja.euc-jp
+URI: cgi.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: cgi.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/howto/cgi.html.en b/docs/manual/howto/cgi.html.en
index c47fc5b8..2cfa32bb 100644
--- a/docs/manual/howto/cgi.html.en
+++ b/docs/manual/howto/cgi.html.en
@@ -550,6 +550,6 @@
 <a href="../ja/howto/cgi.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/cgi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/cgi.html.ja.euc-jp b/docs/manual/howto/cgi.html.ja.euc-jp
deleted file mode 100644
index a25e1b70..00000000
--- a/docs/manual/howto/cgi.html.ja.euc-jp
+++ /dev/null
@@ -1,549 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>Apache Tutorial: CGI ¤Ë¤è¤ëưŪ¥³¥ó¥Æ¥ó¥Ä - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">How-To / ¥Á¥å¡¼¥È¥ê¥¢¥ë</a></div><div id="page-content"><div id="preamble"><h1>Apache Tutorial: CGI ¤Ë¤è¤ëưŪ¥³¥ó¥Æ¥ó¥Ä</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/howto/cgi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/howto/cgi.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/cgi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#intro">¤Ï¤¸¤á¤Ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#configuring">CGI ¤òµö²Ä¤¹¤ë¤è¤¦¤Ë Apache ¤òÀßÄꤹ¤ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#writing">CGI ¥×¥í¥°¥é¥à¤ò½ñ¤¯</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#troubleshoot">¤·¤«¤·¡¢¤Þ¤ÀÆ°¤«¤Ê¤¤ !</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#behindscenes">΢¤Ç²¿¤¬µ¯¤³¤Ã¤Æ¤¤¤ë¤Î¤«?</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#libraries">CGI ¥â¥¸¥å¡¼¥ë/¥é¥¤¥Ö¥é¥ê</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#moreinfo">¹¹¤Ê¤ë¾ðÊó</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="intro" id="intro">¤Ï¤¸¤á¤Ë</a></h2>
-    
-
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code></li><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li></ul></td></tr></table>
-
-    <p>CGI (Common Gateway Interface) ¤Ï¡¢¥¦¥§¥Ö¥µ¡¼¥Ð¤¬
-    ¥³¥ó¥Æ¥ó¥ÄÀ¸À®¤ò¤¹¤ë³°Éô¥×¥í¥°¥é¥à¤È¶¨Ä´¤·¤ÆÆ°ºî¤¹¤ë¤¿¤á¤ÎÊýË¡¤ò
-    ÄêµÁ¤·¤Æ¤¤¤Þ¤¹¡£¤½¤Î¥×¥í¥°¥é¥à¤Ï¤·¤Ð¤·¤Ð CGI ¥×¥í¥°¥é¥à¤ä
-    CGI ¥¹¥¯¥ê¥×¥È¤È¸Æ¤Ð¤ì¤Þ¤¹¡£CGI ¤Ï¡¢¥¦¥§¥Ö¥µ¥¤¥È¤ËưŪ¤Ê
-    ¥³¥ó¥Æ¥ó¥Ä¤òÃÖ¤¯¤¿¤á¤ÎºÇ¤â´Êñ¤Ç°ìÈÌŪ¤ÊÊýË¡¤Ç¤¹¡£¤³¤Î¥É¥­¥å¥á¥ó¥È¤Ï¡¢
-    Apache ¥¦¥§¥Ö¥µ¡¼¥Ð¤Ç CGI ¤òÀßÄꤷ¡¢
-    CGI ¥×¥í¥°¥é¥à¤ò½ñ¤­»Ï¤á¤ë¤¿¤á¤ÎÆþÌç½ñ¤È¤Ê¤ë¤Ç¤·¤ç¤¦¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="configuring" id="configuring">CGI ¤òµö²Ä¤¹¤ë¤è¤¦¤Ë Apache ¤òÀßÄꤹ¤ë</a></h2>
-    
-
-    <p>CGI ¥×¥í¥°¥é¥à¤òÀµ¤·¤¯Æ°ºî¤µ¤»¤ë¤Ë¤Ï¡¢CGI ¤òµö²Ä¤¹¤ë¤è¤¦¤Ë
-    Apache ¤ÎÀßÄê¤ò¹Ô¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤ì¤ò¹Ô¤Ê¤¦¤¿¤á¤ÎÊýË¡¤¬¤¤¤¯¤Ä¤«¤¢¤ê¤Þ¤¹¡£</p>
-
-    <h3><a name="scriptalias" id="scriptalias">ScriptAlias</a></h3>
-      
-
-      <p><code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ·¤Æ¡¢
-      CGI ¥×¥í¥°¥é¥àÍѤÎÆÃÊ̤ÊÊ̥ǥ£¥ì¥¯¥È¥ê¤ò Apache ¤ËÀßÄꤷ¤Þ¤¹¡£
-      Apache ¤Ï¡¢¤³¤Î¥Ç¥£¥ì¥¯¥È¥êÃæ¤ÎÁ´¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò CGI
-      ¥×¥í¥°¥é¥à¤Ç¤¢¤ë¤È²¾Äꤷ¤Þ¤¹¡£
-      ¤½¤·¤Æ¡¢¤³¤ÎÆÃÊ̤ʥ꥽¡¼¥¹¤¬¥¯¥é¥¤¥¢¥ó¥È¤«¤éÍ׵ᤵ¤ì¤ë¤È¡¢
-      ¤½¤Î¥×¥í¥°¥é¥à¤Î¼Â¹Ô¤ò»î¤ß¤Þ¤¹¡£</p>
-
-      <p><code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï°Ê²¼¤Î¤è¤¦¤Ë»ÈÍѤ·¤Þ¤¹:</p>
-
-      <div class="example"><p><code>
-        ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
-      </code></p></div>
-
-      <p>¥Ç¥Õ¥©¥ë¥È°ÌÃÖ¤Ë Apache ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤Ê¤é¤Ð¡¢
-      ¤³¤ÎÎã¤Ï¥Ç¥Õ¥©¥ë¥È¾õÂ֤Π<code>httpd.conf</code>
-      ÀßÄê¥Õ¥¡¥¤¥ë¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-      <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢URL ¤ÎÁ°¤ËÉղ乤ë¥Ç¥£¥ì¥¯¥È¥ê¤òÄêµÁ¤¹¤ë
-      <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È¤«¤Ê¤ê»÷¤Æ¤¤¤Þ¤¹¡£
-      <code class="directive">Alias</code> ¤È <code class="directive">ScriptAlias</code>
-      ¤ÏÄ̾<code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
-      ¥Ç¥£¥ì¥¯¥È¥ê³°¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î¤¿¤á¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£
-      <code class="directive">Alias</code> ¤È <code class="directive">ScriptAlias</code>
-      ¤È¤Îº¹¤Ï¡¢<code class="directive">ScriptAlias</code> ¤¬ÀÜƬ¼­¤Ç»Ï¤Þ¤ë¤¹¤Ù¤Æ¤Î
-      URL ¤Ï CGI ¥×¥í¥°¥é¥à¤È¤ß¤Ê¤µ¤ì¤ë¤È¤¤¤¦ÄɲäΰÕÌ£¤ò´Þ¤ó¤Ç¤¤¤ë¤³¤È¤Ç¤¹¡£
-      ½¾¤Ã¤Æ¡¢¾åµ­¤ÎÎã¤Ç¤Ï¡¢<code>/cgi-bin/</code>
-      ¤Ç»Ï¤Þ¤ë¥ê¥½¡¼¥¹¤Ø¤Î¤¢¤é¤æ¤ë¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ¡¢¥Ç¥£¥ì¥¯¥È¥ê
-      <code>/usr/local/apache2/cgi-bin/</code> ¤«¤éÄ󶡤·¡¢¤½¤ì¤é¤ò
-      CGI ¥×¥í¥°¥é¥à¤È¤·¤Æ°·¤¦¤è¤¦ Apache ¤Ë¼¨¤·¤Þ¤¹¡£</p>
-
-      <p>Î㤨¤Ð¡¢URL <code>http://www.example.com/cgi-bin/test.pl</code>
-      ¤¬Í׵ᤵ¤ì¤¿¾ì¹ç¡¢Apache ¤Ï ¥Õ¥¡¥¤¥ë
-      <code>/usr/local/apache2/cgi-bin/test.pl</code>
-      ¤ò¼Â¹Ô¤·¡¢¤½¤Î½ÐÎϤòÊÖ¤¹¤³¤È¤ò»î¤ß¤Þ¤¹¡£
-      ¤â¤Á¤í¤ó¡¢¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¡¢¼Â¹Ô²Äǽ¤Ç¤¢¤ê¡¢·è¤á¤é¤ì¤¿ÊýË¡¤Ç½ÐÎϤòÊÖ¤·¤Þ¤¹¡£
-      ¤½¤¦¤Ç¤Ê¤±¤ì¤Ð¡¢Apache ¤Ï¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤òÊÖ¤·¤Þ¤¹¡£</p>
-    
-
-    <h3><a name="nonscriptalias" id="nonscriptalias">ScriptAlias ¥Ç¥£¥ì¥¯¥È¥ê³°¤Î CGI</a></h3>
-      
-
-      <p>CGI ¥×¥í¥°¥é¥à¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¾å¤ÎÍýͳ¤«¤é 
-      <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
-      ¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤ËÀ©¸Â¤µ¤ì¤ë¤³¤È¤¬¤·¤Ð¤·¤Ð¤¢¤ê¤Þ¤¹¡£¤³¤ÎÊýË¡¤Ë¤è¤ê¡¢
-      CGI ¥×¥í¥°¥é¥à¤ò»ÈÍѤǤ­¤ë¥æ¡¼¥¶¤ò´ÉÍý¼Ô¤¬¸·¤·¤¯À©¸æ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¤·¤«¤·¤Ê¤¬¤é¡¢Å¬Àڤʥ»¥­¥å¥ê¥Æ¥£»öÁ°Âкö¤¬¤È¤é¤ì¤ë¤Ê¤é¤Ð¡¢CGI
-      ¥×¥í¥°¥é¥à¤òǤ°Õ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¼Â¹Ô¤Ç¤­¤Ê¤¤¤è¤¦¤Ë¤¹¤ëÍýͳ¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-      Î㤨¤Ð¡¢¥æ¡¼¥¶¤Ë <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÈà¤é¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥êÇÛ²¼¤Ë¥¦¥§¥Ö¥³¥ó¥Æ¥ó¥Ä¤ò»ý¤¿¤»¤¿¤¤¤È¤·¤Þ¤¹¡£
-      ¤â¤·¡¢Èà¤é¤¬ CGI ¥×¥í¥°¥é¥à¤ò»ý¤Ä¤³¤È¤ò˾¤ó¤Ç¤¤¤Æ¤â¡¢¥á¥¤¥ó¤Î
-      <code>cgi-bin</code> ¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î¥¢¥¯¥»¥¹¤¬¤Ç¤­¤Ê¤¤¾ì¹ç¡¢
-      CGI ¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¾¤Î¾ì½ê¤¬É¬Íפˤʤê¤Þ¤¹¡£</p>
-
-      <p>Ǥ°Õ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç CGI ¤Î¼Â¹Ô¤òµö²Ä¤¹¤ë¤Ë¤ÏÆóÃʳ¬¤ÎÀßÄ꤬ɬÍפǤ¹¡£
-      ¤Þ¤º¡¢<code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> ¤ä <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤Ã¤Æ
-      <code>cgi-script</code> ¥Ï¥ó¥É¥é¤¬²Äǽ¤Ë¤Ê¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-      ¼¡¤Ë¡¢<code class="directive"><a href="../mod/core.html#options">Options</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç
-      <code>ExecCGI</code> ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-    
-
-    <h3><a name="options" id="options">CGI ¤Î¼Â¹Ô¤ò²Äǽ¤Ë¤¹¤ë¤¿¤á¤Ë Options ¤òÌÀ¼¨Åª¤Ë»ÈÍѤ¹¤ë</a></h3>
-      
-
-      <p>¥µ¡¼¥Ð¤Î¥á¥¤¥ó¤ÎÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Ç <code class="directive"><a href="../mod/core.html#options">Options</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÌÀ¼¨Åª¤Ë»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢ÆÃÄê¤Î¥Ç¥£¥ì¥¯¥È¥êÇÛ²¼¤Ç
-      CGI ¤Î¼Â¹Ô¤òµö²Ä¤¹¤ë¤è¤¦¤Ë»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-      <div class="example"><p><code>
-        &lt;Directory /usr/local/apache2/htdocs/somedir&gt;<br />
-        <span class="indent">
-          Options +ExecCGI<br />
-        </span>
-        &lt;/Directory&gt;
-      </code></p></div>
-
-      <p>¾åµ­¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢CGI ¥Õ¥¡¥¤¥ë¤Î¼Â¹Ô¤ò²Äǽ¤Ë¤¹¤ë¤è¤¦
-      Apache ¤ËÅÁ¤¨¤Þ¤¹¡£¤Þ¤¿¡¢¤É¤Î¥Õ¥¡¥¤¥ë¤¬ CGI ¥Õ¥¡¥¤¥ë¤«¤ò
-      ¥µ¡¼¥Ð¤ËÅÁ¤¨¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¼¡¤Î
-      <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÎã¤Ç¤Ï¡¢<code>cgi</code> ¤Þ¤¿¤Ï <code>pl</code>
-      ¤ò³ÈÄ¥»Ò¤Ë»ý¤Ä¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò CGI
-      ¥×¥í¥°¥é¥à¤È¤·¤Æ¤ß¤Ê¤¹¤³¤È¤ò¥µ¡¼¥Ð¤ËÅÁ¤¨¤Þ¤¹:</p>
-
-      <div class="example"><p><code>
-        AddHandler cgi-script .cgi .pl
-      </code></p></div>
-    
-
-    <h3><a name="htaccess" id="htaccess">.htaccess ¥Õ¥¡¥¤¥ë</a></h3>
-      
-
-      <p><a href="htaccess.html"><code>.htaccess</code> ¥Á¥å¡¼¥È¥ê¥¢¥ë</a>
-      ¤Ï <code>httpd.conf</code> ¤òÊѹ¹¤Ç¤­¤Ê¤¤¾ì¹ç¤Ë¤É¤¦¤ä¤Ã¤Æ CGI ¥×¥í¥°¥é¥à¤ò
-      »È¤¨¤ë¤è¤¦¤Ë¤¹¤ë¤«¤òÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</p>
-    
-
-    <h3><a name="userdir" id="userdir">User ¥Ç¥£¥ì¥¯¥È¥ê</a></h3>
-      
-
-      <p><code>.cgi</code> ¤Ç½ª¤ï¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ CGI ¥×¥í¥°¥é¥à¤Î
-      ¼Â¹Ô¤òµö²Ä¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤ÎÀßÄê¤ò»ÈÍѤǤ­¤Þ¤¹¡£</p>
-
-      <div class="example"><p><code>
-      &lt;Directory /home/*/public_html&gt;<br />
-      <span class="indent">
-        Options +ExecCGI<br />
-        AddHandler cgi-script .cgi<br />
-      </span>
-      &lt;/Directory&gt;
-      </code></p></div>
-
-      <p>¥æ¡¼¥¶¥Ç¥£¥ì¥¯¥È¥ê¤Î <code>cgi-bin</code> ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Î
-      ¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò CGI ¥×¥í¥°¥é¥à¤È¤·¤Æ»ØÄꤷ¤¿¤¤¾ì¹ç¤Ë¤Ï
-      °Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤ò»È¤¤¤Þ¤¹¡£</p>
-
-      <div class="example"><p><code>
-      &lt;Directory /home/*/public_html/cgi-bin&gt;<br />
-      <span class="indent">
-        Options ExecCGI<br />
-        SetHandler cgi-script<br />
-      </span>
-      &lt;/Directory&gt;
-      </code></p></div>
-
-    
-  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="writing" id="writing">CGI ¥×¥í¥°¥é¥à¤ò½ñ¤¯</a></h2>
-    
-
-    <p>¡ÖÄ̾ï¤Î¡×¥×¥í¥°¥é¥ß¥ó¥°¤È CGI
-    ¥×¥í¥°¥é¥ß¥ó¥°¤Î´Ö¤Ë¤Ï¼ç¤ËÆó¤Ä¤Î°ã¤¤¤¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>°ì¤Ä¤Ï¡¢CGI ¥×¥í¥°¥é¥à¤Î¤¹¤Ù¤Æ¤Î½ÐÎÏ¤Ë¤Ï MIME-type
-    ¥Ø¥Ã¥À¤òÉÕ¤±¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-    ¤³¤ì¤Ï¤É¤Î¤è¤¦¤Ê¼ïÎà¤Î¥³¥ó¥Æ¥ó¥Ä¤ò¼õ¤±¼è¤Ã¤Æ¤¤¤ë¤«¤ò¥¯¥é¥¤¥¢¥ó¥È¤Ë¼¨¤¹
-    HTTP ¥Ø¥Ã¥À¤Ç¤¹¡£¤Û¤È¤ó¤É¤Î¾ì¹ç¤Ç¤Ï¡¢¼¡¤Î¤è¤¦¤Ë½ÐÎϤ·¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      Content-type: text/html
-    </code></p></div>
-
-    <p>¤â¤¦°ì¤Ä¤Ï¡¢½ÐÎϤò HTML
-    ¤«¡¢¥Ö¥é¥¦¥¶¤¬É½¼¨¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë²¿¤«Â¾¤Î·Á¼°¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ÂçÄñ¤Î¾ì¹ç¤Ï HTML ¤Ç¤·¤ç¤¦¤¬¡¢GIF ¥¤¥á¡¼¥¸¤ä¾¤ÎÈó HTML
-    ¥³¥ó¥Æ¥ó¥Ä¤ò½ÐÎϤ¹¤ë CGI ¥×¥í¥°¥é¥à¤ò½ñ¤¯¤³¤È¤â¤¢¤ë¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>¤³¤ì¤éÆóÅÀ°Ê³°¤Ç¤Ï¡¢CGI ¥×¥í¥°¥é¥à¤ò½ñ¤¯¤³¤È¤Ï¡¢
-    ¤¢¤Ê¤¿¤¬½ñ¤¤¤Æ¤¤¤ë¾¤Î¥×¥í¥°¥é¥à¤È¤è¤¯»÷¤Æ¤¤¤ë¤Ç¤·¤ç¤¦¡£</p>
-
-    <h3><a name="firstcgi" id="firstcgi">ºÇ½é¤Î CGI ¥×¥í¥°¥é¥à</a></h3>
-      
-
-      <p>¼¡¤Ë¼¨¤¹¤Î¤Ï¡¢¥Ö¥é¥¦¥¶¤Ë 1 ¹Ô°õ»ú¤¹¤ë CGI
-      ¥×¥í¥°¥é¥à¤ÎÎã¤Ç¤¹¡£°Ê²¼¤òÆþÎϤ·¡¢<code>first.pl</code>
-      ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤ËÊݸ¤·¡¢¤½¤ì¤ò <code>cgi-bin</code>
-      ¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤¤¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-      <div class="example"><p><code>
-        #!/usr/bin/perl<br />
-        print "Content-type: text/html\n\n";<br />
-        print "Hello, World.";
-      </code></p></div>
-
-      <p>Perl ¤ËÀºÄ̤·¤Æ¤¤¤Ê¤¯¤Æ¤â¡¢
-      ²¿¤¬µ¯¤³¤ë¤«¤òÍý²ò¤¹¤ë¤³¤È¤Ï¤Ç¤­¤ë¤Ç¤·¤ç¤¦¡£1 ¹ÔÌܤϡ¢
-      <code>/usr/bin/perl</code> ¤Ç¸«¤Ä¤±¤é¤ì¤ë¥¤¥ó¥¿¥×¥ê¥¿¤Ë
-      ¤³¤Î¥Õ¥¡¥¤¥ë¤ò¶¡µë¤¹¤ë¤³¤È¤Ç¤³¤Î¥×¥í¥°¥é¥à¤¬¼Â¹Ô¤µ¤ì¤ë¤³¤È¤ò
-      Apache ¤Ë (¥·¥§¥ë¾å¤Ç¼Â¹Ô¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤Ê¤é¤Ð¡¢¤½¤Î¥·¥§¥ë¤Ë ) 
-      ¼¨¤·¤Þ¤¹¡£2 ¹ÔÌܤϡ¢Á°½Ò¤·¤¿¤È¤ª¤ê content-type ¤ÎÄêµÁ¤ò°õ»ú¤·¤Þ¤¹¡£
-      ¤³¤ì¤Ë¤ÏÉüµ¢²þ¹Ô¤ÎÆó¤Ä¤ÎÁȤò¸å¤ËÉղä·¤Þ¤¹¡£
-      ¤³¤ì¤Ë¤è¤ê¡¢¥Ø¥Ã¥À¤Î½ª¤ê¤Ë¶õ¹Ô¤¬ÃÖ¤«¤ì¡¢HTTP
-      ¥Ø¥Ã¥À¤Î½ª¤ê¤È¥Ü¥Ç¥£¤Î»Ï¤Þ¤ê¤ò¼¨¤·¤Þ¤¹¡£3 ¹ÔÌܤϡ¢"Hello, World."
-      ¤È¤¤¤¦Ê¸»úÎó¤ò°õ»ú¤·¡¢¤³¤ì¤Ç½ª¤ê¤È¤Ê¤ê¤Þ¤¹¡£</p>
-
-      <p>¹¥¤ß¤Î¥Ö¥é¥¦¥¶¤ò³«¤­¡¢¥¢¥É¥ì¥¹</p>
-
-      <div class="example"><p><code>
-        http://www.example.com/cgi-bin/first.pl
-      </code></p></div>
-
-      <p>¤¢¤ë¤¤¤Ï¥Õ¥¡¥¤¥ë¤òÃÖ¤¤¤¿¥í¥±¡¼¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È¡¢
-      <code>Hello, World.</code>
-      ¤È¤¤¤¦ 1 ¹Ô¤¬¥Ö¥é¥¦¥¶¥¦¥£¥ó¥É¤Ë¸½¤ì¤ë¤Ç¤·¤ç¤¦¡£
-      ¤½¤ì¤Ï¤¢¤Þ¤ê¥¨¥­¥µ¥¤¥Æ¥£¥ó¥°¤Ê¤³¤È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-      ¤·¤«¤·¡¢¤³¤ì¤¬¤¦¤Þ¤¯Æ°¤±¤Ð¡¢
-      ¾¤Î¤É¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤âÆ°¤«¤¹¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-    
-  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="troubleshoot" id="troubleshoot">¤·¤«¤·¡¢¤Þ¤ÀÆ°¤«¤Ê¤¤ !</a></h2>
-    
-
-    <p>¥¦¥§¥Ö¤«¤é CGI ¥×¥í¥°¥é¥à¤Ø¤Î¥¢¥¯¥»¥¹¤ò¹Ô¤Ê¤Ã¤¿¤È¤­¡¢
-    ¥Ö¥é¥¦¥¶¤Ç¸«¤ë²ÄǽÀ­¤¬¤¢¤ë»Í¤Ä¤Î´ðËÜŪ¤Ê¤³¤È¤¬¤¢¤ê¤Þ¤¹:</p>
-
-    <dl>
-      <dt>CGI ¥×¥í¥°¥é¥à¤Î½ÐÎÏ</dt>
-      <dd>ÁÇÀ²¤é¤·¤¤ ! ¤½¤ì¤Ï¤¹¤Ù¤Æ¤¬¤¦¤Þ¤¯Æ°¤¤¤¿¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
-      ½ÐÎϤ¬Àµ¾ï¤À¤±¤ì¤É¤â¡¢¥Ö¥é¥¦¥¶¤¬Àµ¾ï¤Ë½èÍý¤·¤Æ¤¯¤ì¤Ê¤¤¾ì¹ç¤Ï¡¢
-      Àµ¤·¤¤ <code>Content-Type</code> ¤ò CGI ¥×¥í¥°¥é¥àÆâ¤Ç
-      ¥»¥Ã¥È¤·¤¿¤«¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</dd>
-
-      <dt>CGI ¥×¥í¥°¥é¥à¤Î¥½¡¼¥¹¥³¡¼¥É¡¢¤Þ¤¿¤Ï "POST Method Not Allowed"
-      ¤È¤¤¤¦¥á¥Ã¥»¡¼¥¸</dt> 
-      <dd>¤³¤ì¤Ï¡¢CGI ¥×¥í¥°¥é¥à¤ò½èÍý¤Ç¤­¤ë¤è¤¦ Apache
-      ¤òŬÀÚ¤ËÀßÄꤷ¤Æ¤¤¤Ê¤«¤Ã¤¿¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£<a href="#configuring">¡ÖCGI ¤òµö²Ä¤¹¤ë¤è¤¦¤Ë
-      Apache ¤òÀßÄꤹ¤ë¡×</a>¤Î¾Ï¤òÆɤßľ¤·¡¢
-      ¤¢¤Ê¤¿¤¬²¿¤ò´Ö°ã¤¨¤¿¤«¤òõ¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£
-      </dd>
-
-      <dt>¥á¥Ã¥»¡¼¥¸¤¬ "Forbidden" ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ë</dt>
-      <dd>¤³¤ì¤Ï¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤ÎÌäÂê¤È¤¤¤¦¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
-      <a href="#errorlogs">Apache ¤Î¥¨¥é¡¼¥í¥°</a>¤È¡¢¸å½Ò¤Î<a href="#permissions">¡Ö¥Õ¥¡¥¤¥ë¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¡×</a>
-      ¤Î¾Ï¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£
-      </dd>
-
-      <dt>"Internal Server Error" ¤È¤¤¤¦¥á¥Ã¥»¡¼¥¸</dt>
-      <dd><a href="#errorlogs">Apache
-      ¤Î¥¨¥é¡¼¥í¥°</a>¤ò¥Á¥§¥Ã¥¯¤¹¤ë¤È¡¢"Premature end of script headers"
-      ¤È¤¤¤¦¥í¥°¤¬µ­Ï¿¤µ¤ì¤Æ¤¤¤ë¤È»×¤¤¤Þ¤¹¡£¤½¤·¤Æ¡¢¤ª¤½¤é¤¯ CGI
-      ¥×¥í¥°¥é¥à¤Ë¤è¤Ã¤ÆÀ¸À®¤µ¤ì¤¿¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤âµ­Ï¿¤µ¤ì¤Æ¤¤¤ë¤Ç¤·¤ç¤¦¡£
-      ¤³¤Î¾ì¹ç¡¢CGI ¥×¥í¥°¥é¥à¤¬Å¬ÀÚ¤Ê
-      HTTP ¥Ø¥Ã¥À¤ò½ÐÎϤǤ­¤Ê¤¤¸¶°ø¤òÃΤ뤿¤á¤Ë¡¢
-      °Ê²¼¤Î³Æ¾Ï¤Ç¥Á¥§¥Ã¥¯¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£</dd>
-    </dl>
-
-    <h3><a name="permissions" id="permissions">¥Õ¥¡¥¤¥ë¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó</a></h3>
-      
-
-      <p>¥µ¡¼¥Ð¤Ï¤¢¤Ê¤¿¤Î¸¢¸Â¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤Ê¤¤¤Î¤ò˺¤ì¤Ê¤¤¤è¤¦¤Ë¡£
-      ¤Ä¤Þ¤ê¡¢µ¯Æ°¤¹¤ë¤È¤­¡¢¥µ¡¼¥Ð¤ÏÆø¢¤ò¤â¤¿¤Ê¤¤¥æ¡¼¥¶ - Ä̾ï <code>nobody</code>
-      ¤ä <code>www</code> ¤Î¸¢¸Â¤Ç¼Â¹Ô¤µ¤ì¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢¤¢¤Ê¤¿¤¬½êÍ­¤¹¤ë
-      ¥Õ¥¡¥¤¥ë¤ò¼Â¹Ô¤¹¤ë¤Ë¤ÏÊ̤Υѡ¼¥ß¥Ã¥·¥ç¥ó¤¬É¬ÍפȤʤê¤Þ¤¹¡£
-      Ä̾<code>nobody</code> ¤¬¼Â¹Ô¤¹¤ë¤Î¤Ë½½Ê¬¤Ê¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤òÍ¿¤¨¤ëÊýË¡¤Ï¡¢
-      ¥Õ¥¡¥¤¥ë¤Ëï¤Ç¤â¼Â¹Ô²Äǽ¤È¤¹¤ë¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤òÍ¿¤¨¤ë¤³¤È¤Ç¤¹:</p>
-
-      <div class="example"><p><code>
-        chmod a+x first.pl
-      </code></p></div>
-
-      <p>¤Þ¤¿¡¢¤â¤·¤¢¤Ê¤¿¤Î¥×¥í¥°¥é¥à¤¬Â¾¤Î¥Õ¥¡¥¤¥ë¤òÆɤ߽ñ¤­¤¹¤ë¤Ê¤é¤Ð¡¢
-      ¤½¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢¤³¤ì¤¬²Äǽ¤È¤Ê¤ëÀµ¤·¤¤¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó
-      ¤ò»ý¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    
-
-    <h3><a name="pathinformation" id="pathinformation">¥Ñ¥¹¾ðÊó¤È´Ä¶­</a></h3>
-      
-
-      <p>¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤¹¤ë¤È¤­¡¢
-      °Õ¼±¤·¤Ê¤¯¤Æ¤â¥·¥§¥ë¤ËÅϤµ¤ì¤ë¾ðÊ󤬤¢¤ê¤Þ¤¹¡£
-      Î㤨¤Ð¡¢»²¾È¤¹¤ë¥Õ¥¡¥¤¥ë¤Î¤¿¤á¤Ë¤É¤³¤ò¸¡º÷¤·¤¿¤é¤è¤¤¤«¤ò
-      ¥·¥§¥ë¤ËÅÁ¤¨¤ë <code>PATH</code> ¤¬¤¢¤ê¤Þ¤¹¡£</p>
-
-      <p>¥×¥í¥°¥é¥à¤¬ CGI ¥×¥í¥°¥é¥à¤È¤·¤Æ¥¦¥§¥Ö¥µ¡¼¥Ð¤Ë¤è¤Ã¤Æ¼Â¹Ô¤µ¤ì¤ë¤È¤­¡¢
-      ¤½¤ì¤ÏƱ¤¸ <code>PATH</code> ¤Ç¤Ï¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-      CGI ¥×¥í¥°¥é¥àÆâ¤Ç¸Æ¤Ó½Ð¤¹¤¢¤é¤æ¤ë¥×¥í¥°¥é¥à
-      (Î㤨¤Ð¡¢<code>sendmail</code> ¤Î¤è¤¦¤Ê¤â¤Î) ¤Ï¡¢
-      ¥Õ¥ë¥Ñ¥¹¤Ç»ØÄꤹ¤ëɬÍפ¬¤¢¤ë¤Ç¤·¤ç¤¦¡£¤½¤ì¤Ë¤è¤ê¡¢CGI
-      ¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤·¤è¤¦¤È¤·¤¿¤È¤­¡¢
-      ¥·¥§¥ë¤Ï¤½¤Î¤è¤¦¤Ê¥×¥í¥°¥é¥à¤ò¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-      <p>ƱÍͤʤ³¤È¤Ï¡¢¥¹¥¯¥ê¥×¥È¤Î¥¤¥ó¥¿¥×¥ê¥¿ (¤·¤Ð¤·¤Ð <code>perl</code>)
-      ¤Ø¤Î¥Ñ¥¹¤Ç¡¢CGI ¥×¥í¥°¥é¥à¤Î 1 ¹ÔÌܤ˼¡¤Î¤è¤¦¤Ë¼¨¤µ¤ì¤Þ¤¹:</p>
-
-      <div class="example"><p><code>
-        #!/usr/bin/perl
-      </code></p></div>
-
-      <p>¤³¤ì¤¬¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Ø¤Î¼ÂºÝ¤Î¥Ñ¥¹¤Ç¤¢¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤ª¤­¤Þ¤¹¡£</p>
-    
-
-      <p>¤Þ¤¿¡¢CGI ¥×¥í¥°¥é¥à¤¬Â¾¤Î<a href="#env">´Ä¶­ÊÑ¿ô</a>¤Ë°Í¸¤·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤½¤Î´Ä¶­ÊÑ¿ô¤¬
-      Apache ¤«¤éÅϤµ¤ì¤ë¤è¤¦¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <h3><a name="syntaxerrors" id="syntaxerrors">¥×¥í¥°¥é¥à¥¨¥é¡¼</a></h3>
-      
-
-      <p>CGI
-      ¥×¥í¥°¥é¥à¤¬¼ºÇÔ¤¹¤ë¤Î¤ÏÂçÄñ¡¢¥×¥í¥°¥é¥à¼«¿È¤ËÌäÂ꤬¤¢¤ë¾ì¹ç¤Ç¤¹¡£
-      °ìÅÙ CGI ¤Î»È¤¤Êý¤òÍý²ò¤·¡¢Á°½Ò¤ÎÆó¤Ä¤Î¸í¤ê¤òÈȤ·¤Æ¤¤¤Ê¤¤¤Ê¤é¤Ð¡¢
-      ¤Þ¤º´Ö°ã¤¤¤Ê¤¯¤½¤¦¤Ç¤·¤ç¤¦¡£¥Ö¥é¥¦¥¶¤ò»È¤Ã¤Æ¥Æ¥¹¥È¤¹¤ëÁ°¤Ë
-      ¤Þ¤º³Îǧ¤¹¤ë¤³¤È¤Ï¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é¥×¥í¥°¥é¥à¤¬¼Â¹Ô¤Ç¤­¤ë¤³¤È¤Ç¤¹¡£
-      Î㤨¤Ð¡¢°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤:</p>
-
-      <div class="example"><p><code>
-      cd /usr/local/apache2/cgi-bin<br />
-      ./first.pl
-      </code></p></div>
-
-      <p>(<code>perl</code> ¥¤¥ó¥¿¥×¥ê¥¿¤Ï¸Æ¤Ð¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-      ¥·¥§¥ë¤È Apache ¤¬¥¹¥¯¥ê¥×¥È¤ÎºÇ½é¤Î¹Ô¤Î <a href="#pathinformation">¥Ñ¥¹¾ðÊó</a> ¤ò»È¤Ã¤Æ¸«¤Ä¤±¤Þ¤¹¡£)</p>
-
-      <p>ºÇ½é¤Ë¥×¥í¥°¥é¥à¤«¤é½ÐÎϤµ¤ì¤ë¤Î¤Ï <code>Content-Type</code> ¤ò´Þ¤ß¡¢
-      ¸å¤Ë¶õ¹Ô¤Î³¤¯ HTTP ¥Ø¥Ã¥À¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£Â¾¤Î¤â¤Î¤¬½ÐÎϤµ¤ì¤Æ¤¤¤ë
-      ¾ì¹ç¤Ï¡¢Apache ¤Ï¤³¤Î¥×¥í¥°¥é¥à¤ò¥µ¡¼¥Ð·Ðͳ¤Ç¼Â¹Ô¤·¤è¤¦¤È¤·¤¿¤È¤­¤Ë¤Ï
-      <code>Premature end of script headers</code> ¥¨¥é¡¼¤ò½ÐÎϤ·¤Þ¤¹¡£¾ÜºÙ¤Ï
-      ¾åµ­¤Î <a href="#writing">CGI ¥×¥í¥°¥é¥à¤ò½ñ¤¯</a> ¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£</p>
-    
-
-    <h3><a name="errorlogs" id="errorlogs">¥¨¥é¡¼¥í¥°</a></h3>
-      
-
-      <p>¥¨¥é¡¼¥í¥°¤Ïͧã¤Ç¤¹¡£
-      Á´¤Æ¤Î¤¦¤Þ¤¯¤¤¤«¤Ê¤¤¤³¤È¤Ï¡¢¥¨¥é¡¼¥í¥°¤Ë¥á¥Ã¥»¡¼¥¸¤òÀ¸À®¤·¤Þ¤¹¡£
-      ɬ¤º¤½¤ì¤òºÇ½é¤Ë¸«¤ë¤Ù¤­¤Ç¤¹¡£
-      ¤â¤·¡¢¤¢¤Ê¤¿¤¬¥¦¥§¥Ö¥µ¥¤¥È¤ò¼çºÅ¤·¤Æ¤¤¤ë¾ì½ê¤¬
-      ¥¨¥é¡¼¥í¥°¤Î»²¾È¤òµö¤·¤Æ¤¤¤Ê¤¤¤Ê¤é¤Ð¡¢¤­¤Ã¤È¾¤Î¥µ¥¤¥È¤Ç¼çºÅ¤¹¤ë¤Ù¤­¤Ç¤¹¡£
-      ¥¨¥é¡¼¥í¥°¤ÎÆɤßÊý¤ò³Ø¤Ö¤³¤È¤Ç¡¢¤Û¤È¤ó¤ÉÁ´¤Æ¤ÎÌäÂ꤬¿×®¤Ë³Îǧ¤µ¤ì¡¢
-      ¿×®¤Ë²ò·è¤µ¤ì¤ë¤È¤¤¤¦¤³¤È¤¬Ê¬¤«¤ë¤Ç¤·¤ç¤¦¡£</p>
-    
-
-    <h3><a name="suexec" id="suexec">Suexec</a></h3>
-      
-
-      <p><a href="../suexec.html">suexec</a> ¥µ¥Ý¡¼¥È¥×¥í¥°¥é¥à¤Ï
-      ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ä¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Î¾ì½ê¤Ë°Í¤Ã¤Æ
-      CGI ¥×¥í¥°¥é¥à¤ò°ã¤¦¥æ¡¼¥¶¸¢¸Â¤Î²¼¤ÇÁö¤é¤»¤ë¤³¤È¤ò²Äǽ¤Ë¤·¤Þ¤¹¡£
-      Suexec ¤Î¸¢¸Â¤Î¥Á¥§¥Ã¥¯¤ÏÈó¾ï¤Ë¸·¤·¤¯¡¢¤½¤ì¤òËþ¤¿¤µ¤Ê¤¤¾ì¹ç¤Ï
-      CGI ¥×¥í¥°¥é¥à¤¬ <code>Premature end of script headers</code> ¥¨¥é¡¼¤Ç
-      ¼Â¹Ô¤µ¤ì¤Þ¤»¤ó¡£</p>
-
-      <p>suexec ¤ò»È¤Ã¤Æ¤¤¤ë¤«¤É¤¦¤«¤òÄ´¤Ù¤¿¤á¤Ë¤Ï <code>apachectl
-      -V</code> ¤ò¼Â¹Ô¤·¤Æ¡¢<code>SUEXEC_BIN</code> ¤Î¾ì½ê¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£
-      Apache ¤¬¤½¤³¤Ë <code class="program"><a href="../programs/suexec.html">suexec</a></code> ¤Î¥Ð¥¤¥Ê¥ê¤òȯ¸«¤·¤¿¾ì¹ç¤Ï¡¢suexec ¤¬
-      »ÈÍѤµ¤ì¤Þ¤¹¡£</p>
-
-      <p>suexec ¤ò´°Á´¤ËÍý²ò¤·¤Æ¤¤¤Ê¤¤¸Â¤ê¡¢»È¤¦¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-      suexec ¤ò̵¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢<code>SUEXEC_BIN</code> ¤«¤é»Ø¤µ¤ì¤Æ¤¤¤ë
-      <code class="program"><a href="../programs/suexec.html">suexec</a></code> ¥Ð¥¤¥Ê¥ê¤òºï½ü (¤«Ì¾Á°¤òÊѹ¹) ¤¹¤ë¤À¤±¤Ç¤¹¡£
-      <a href="../suexec.html">suexec</a> ¤òÆɤó¤À¸å¤Ç¡¢¤Þ¤À¤½¤ì¤ò
-      »È¤¤¤¿¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢<code>suexec -V</code> ¤ò¼Â¹Ô¤·¤Æ suexec ¤Î
-      ¥í¥°¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÄ´¤Ù¡¢¤½¤Î¥í¥°¥Õ¥¡¥¤¥ë¤ò»È¤Ã¤Æ¥Ý¥ê¥·¡¼°ãÈ¿¤ò
-      ¸«¤Ä¤±¤Æ¤¯¤À¤µ¤¤¡£</p>
-    
-  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="behindscenes" id="behindscenes">΢¤Ç²¿¤¬µ¯¤³¤Ã¤Æ¤¤¤ë¤Î¤«?</a></h2>
-    
-
-    <p>CGI ¥×¥í¥°¥é¥ß¥ó¥°¤Ë½¬½Ï¤¹¤ë¤È¡¢
-    ΢¤Çµ¯¤³¤Ã¤Æ¤¤¤ë¤³¤È¤Ë¤Ä¤¤¤Æ¹¹¤ËÍý²ò¤¹¤ë¤³¤È¤ÎÌò¤ËΩ¤Á¤Þ¤¹¡£
-    ¥Ö¥é¥¦¥¶¤È¥µ¡¼¥Ð¤¬¤É¤Î¤è¤¦¤ËÁê¸ßÄÌ¿®¤¹¤ë¤«¤Ë¤Ä¤¤¤Æ¤ÏÆäˤ½¤¦¤Ç¤¹¡£
-    ¤Ê¤¼¤Ê¤é¡¢"Hello, World."
-    ¤ò°õ»ú¤¹¤ë¥×¥í¥°¥é¥à¤ò½ñ¤¯¤³¤È¤Ï¤ª¤ª¤¤¤Ë·ë¹½¤Ç¤¹¤¬¡¢
-    ¤½¤ì¤ÏÆäËÍ­±×¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</p>
-
-    <h3><a name="env" id="env">´Ä¶­ÊÑ¿ô</a></h3>
-      
-
-      <p>´Ä¶­ÊÑ¿ô¤Ï¡¢
-      ¤¢¤Ê¤¿¤¬¥³¥ó¥Ô¥å¡¼¥¿¤ò»È¤¦¤È¤­¤ËÊÕ¤ê¤Ë¸ºß¤·¤Æ¤¤¤ëÃͤǤ¹¡£
-      ¤½¤ì¤é¤Ï¡¢¥Ñ¥¹
-      (¥³¥Þ¥ó¥É¤ò¥¿¥¤¥×¤·¤¿¤È¤­¤Ë¼Â¹Ô¤¹¤ë¼ÂºÝ¤Î¥Õ¥¡¥¤¥ë¤òõ¤·½Ð¤¹¤È¤³¤í)¡¢
-      ¥æ¡¼¥¶Ì¾¡¢Ã¼Ëö·¿¤Ê¤É¤Î¤è¤¦¤ÊÊØÍø¤Ê¤â¤Î¤Ç¤¹¡£
-      Ä̾ÉáÃÊ»ÈÍѤ·¤Æ¤¤¤ë´Ä¶­ÊÑ¿ô¤Î´°Á´¤Ê¥ê¥¹¥È¤òÄ´¤Ù¤ë¤Ë¤Ï¡¢
-      ¥³¥Þ¥ó¥É¥×¥í¥ó¥×¥È¤Ç <code>env</code> ¤òÆþÎϤ·¤Þ¤¹¡£</p>
-
-      <p>CGI ¤Î½èÍýÃæ¡¢¥µ¡¼¥Ð¤È¥Ö¥é¥¦¥¶¤â´Ä¶­ÊÑ¿ô¤òÀßÄꤷ¡¢
-      ¤½¤ì¤Ë¤è¤êÁê¸ß¤ËÄÌ¿®¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-      ¤½¤Î´Ä¶­ÊÑ¿ô¤Ï¡¢¥Ö¥é¥¦¥¶¥¿¥¤¥× (Netscape, IE, Lynx)¡¢¥µ¡¼¥Ð¥¿¥¤¥×
-      (Apache, IIS, WebSite)¡¢¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë CGI
-      ¥×¥í¥°¥é¥à¤Î̾Á°¤Ê¤É¤Ç¤¹¡£</p>
-
-      <p>¤³¤ì¤é¤ÎÊÑ¿ô¤Ï CGI ¥×¥í¥°¥é¥Þ¤¬»ÈÍѤǤ­¤Þ¤¹¡£
-      ¤½¤·¤Æ¡¢¤½¤ì¤Ï¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð¤ÎÄÌ¿®¤ÎÏäÎȾʬ¤Ç¤¹¡£
-      ɬÍפÊÊÑ¿ô¤Î´°Á´¤Ê¥ê¥¹¥È¤Ï <a href="http://hoohoo.ncsa.uiuc.edu/cgi/env.html">http://hoohoo.ncsa.uiuc.edu/cgi/env.html</a> ¤Ë¤¢¤ê¤Þ¤¹¡£</p>
-
-      <p>°Ê²¼¤Îñ½ã¤Ê Perl CGI
-      ¥×¥í¥°¥é¥à¤Ï¡¢ÅϤµ¤ì¤ëÁ´¤Æ¤Î´Ä¶­ÊÑ¿ô¤òɽ¼¨¤·¤Þ¤¹¡£Æ±ÍÍ¤Î¥×¥í¥°¥é¥à¤Ï¡¢
-      Apache ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Î <code>cgi-bin</code>
-      ¥Ç¥£¥ì¥¯¥È¥ê¤ËÆó¤Ä´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-      ¤¤¤¯¤Ä¤«¤ÎÊÑ¿ô¤¬É¬¿Ü¤Ç¤¢¤ê¡¢¤¤¤¯¤Ä¤«¤ÏǤ°Õ¤Ç¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-      ¤½¤·¤Æ¡¢¸ø¼°¤Î¥ê¥¹¥È¤Ë¤Ï¤Ê¤¤¤¤¤¯¤Ä¤«¤ÎÊÑ¿ô¤¬É½¼¨¤µ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-      ¤µ¤é¤Ë¡¢Apache ¤Ï¥Ç¥Õ¥©¥ë¥È¤ÇÍÑ°Õ¤µ¤ì¤Æ¤¤¤ë´ðËÜŪ¤Ê¤â¤Î¤Ë
-      <a href="../env.html">¤¢¤Ê¤¿¼«¿È¤Î´Ä¶­ÊÑ¿ô¤ò²Ã¤¨¤ë</a>¤¿¤á¤Î¡¢
-      ¿¤¯¤Î°Û¤Ê¤ëÊýË¡¤òÍÑ°Õ¤·¤Æ¤·¤Þ¤¹¡£</p>
-
-      <div class="example"><p><code>
-        #!/usr/bin/perl<br />
-        print "Content-type: text/html\n\n";<br />
-        foreach $key (keys %ENV) {<br />
-        <span class="indent">
-          print "$key --&gt; $ENV{$key}&lt;br&gt;";<br />
-        </span>
-        }
-      </code></p></div>
-    
-
-    <h3><a name="stdin" id="stdin">STDIN ¤È STDOUT</a></h3>
-      
-
-      <p>¥µ¡¼¥Ð¤È¥¯¥é¥¤¥¢¥ó¥È´Ö¤Î¤â¤¦°ì¤Ä¤ÎÄÌ¿®¤Ï¡¢É¸½àÆþÎÏ
-      (<code>STDIN</code>)¤Èɸ½à½ÐÎÏ (<code>STDOUT</code>)
-      ¤òÄ̤¸¤Æ¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£Ä̾ï¤Îʸ̮¤Ë¤ª¤¤¤Æ¡¢<code>STDIN</code>
-      ¤Ï¥­¡¼¥Ü¡¼¥É¤ä¥×¥í¥°¥é¥à¤¬Æ°ºî¤¹¤ë¤¿¤á¤ËÍ¿¤¨¤é¤ì¤ë¥Õ¥¡¥¤¥ë¤ò°ÕÌ£¤·¡¢
-      <code>STDOUT</code> ¤ÏÄ̾拾¥ó¥½¡¼¥ë¤Þ¤¿¤Ï¥¹¥¯¥ê¡¼¥ó¤ò°ÕÌ£¤·¤Þ¤¹¡£</p>
-
-      <p>¥¦¥§¥Ö¥Õ¥©¡¼¥à¤«¤é CGI ¥×¥í¥°¥é¥à¤Ø<code>POST</code>
-      ¤·¤¿¤È¤­¡¢¥Õ¥©¡¼¥à¤Î¥Ç¡¼¥¿¤ÏÆÃÊ̤ʥե©¡¼¥Þ¥Ã¥È¤Ç«¤Í¤é¤ì¡¢
-      <code>STDIN</code> ¤òÄ̤·¤Æ¡¢CGI ¥×¥í¥°¥é¥à¤Ë°ú¤­ÅϤµ¤ì¤Þ¤¹¡£
-      ¥×¥í¥°¥é¥à¤Ï¥Ç¡¼¥¿¤¬¥­¡¼¥Ü¡¼¥É
-      ¤â¤·¤¯¤Ï¥Õ¥¡¥¤¥ë¤«¤éÍè¤Æ¤¤¤¿¤«¤Î¤è¤¦¤Ë½èÍý¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-      <p>¡ÖÆÃÊ̤ʥե©¡¼¥Þ¥Ã¥È¡×¤Ï¤È¤Æ¤âñ½ã¤Ç¤¹¡£¥Õ¥£¡¼¥ë¥É̾¤ÈÃͤϥ¤¥³¡¼¥ë
-      (=) ¤Ç·ë¤Ð¤ì¤Þ¤¹¡£¤½¤·¤ÆÃͤÎÁȤϥ¢¥ó¥Ñ¥µ¥ó¥É (&amp;) ¤Ç·ë¤Ð¤ì¤Þ¤¹¡£
-      ¥¹¥Ú¡¼¥¹¡¢¥¢¥ó¥Ñ¥µ¥ó¥É¡¢¥¤¥³¡¼¥ë¤Î¤è¤¦¤ÊÌÌÅݤÊʸ»ú¤Ï¡¢
-      ¤½¤ì¤é¤¬Æ°ºî¤òÂÌÌܤˤ·¤Ê¤¤¤è¤¦¤Ë¤½¤Îʸ»ú¤ËÁêÅö¤¹¤ë 16 ¿Ê¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£
-      Á´¥Ç¡¼¥¿Ê¸»úÎó¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹:
-      </p>
-
-      <div class="example"><p><code>
-        name=Rich%20Bowen&amp;city=Lexington&amp;state=KY&amp;sidekick=Squirrel%20Monkey
-      </code></p></div>
-
-      <p>»þ¡¹¡¢¤³¤Î¤è¤¦¤Êʸ»úÎó¤¬ URL
-      ¤ËÉղ䵤ì¤ë¤Î¤ò¸«¤ë¤Ç¤·¤ç¤¦¡£¤½¤Î¾ì¹ç¡¢¥µ¡¼¥Ð¤Ï
-      <code>QUERY_STRING</code> ¤È¤¤¤¦´Ä¶­ÊÑ¿ô¤Ë¤½¤Îʸ»úÎó¤òÆþ¤ì¤Þ¤¹¡£¤½¤ì¤Ï
-      <code>GET</code> ¥ê¥¯¥¨¥¹¥È¤È¸Æ¤Ð¤ì¤Þ¤¹¡£
-      HTML ¥Õ¥©¡¼¥à¤Ç¤Ï¡¢¥Ç¡¼¥¿¤òÅϤ¹¤¿¤á¤Ë <code>GET</code> ¤È
-      <code>POST</code> ¤Î¤É¤Á¤é¤ò»ÈÍѤ¹¤ë¤«¤ò¡¢<code>FORM</code> ¥¿¥°¤Î
-      <code>METHOD</code> °À­¤ÎÀßÄê¤Ç»ØÄꤷ¤Þ¤¹¡£</p>
-
-      <p>CGI ¥×¥í¥°¥é¥à¤Ï¡¢¤½¤Îʸ»úÎó¤òÌò¤ËΩ¤Ä¾ðÊó¤Ëʬ³ä¤¹¤ëÀÕǤ¤¬¤¢¤ê¤Þ¤¹¡£
-      ¹¬¤¤¤Ë¤â¡¢¤½¤Î¥Ç¡¼¥¿½èÍý¤ò½õ¤±¤ë¥é¥¤¥Ö¥é¥ê¤ä¥â¥¸¥å¡¼¥ë¤¬Â¸ºß¤·¤Þ¤¹¡£
-      ¤³¤ì¤é¤Ï¡¢CGI ¥×¥í¥°¥é¥à¤Î¾¤ÎÌ̤ǤâƱÍͤËÌò¤ËΩ¤Á¤Þ¤¹¡£</p>
-    
-  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="libraries" id="libraries">CGI ¥â¥¸¥å¡¼¥ë/¥é¥¤¥Ö¥é¥ê</a></h2>
-    
-
-    <p>CGI ¥×¥í¥°¥é¥à¤ò½ñ¤¯¤È¤­¡¢ÌÌÅݤʻŻö¤ÎÂçÉôʬ¤ò¤·¤Æ¤¯¤ì¤ë
-    ¥³¡¼¥É¥é¥¤¥Ö¥é¥ê¤Þ¤¿¤Ï¥â¥¸¥å¡¼¥ë¤ò»È¤¦¤³¤È¤ò¸¡Æ¤¤¹¤Ù¤­¤Ç¤¹¡£
-    ¤³¤ì¤Ï¥¨¥é¡¼¤ò¸º¤é¤·¡¢Áᤤ³«È¯¤Ë¤Ä¤Ê¤¬¤ê¤Þ¤¹¡£</p>
-
-    <p>Perl ¤Ç CGI ¥×¥í¥°¥é¥à¤ò½ñ¤¤¤Æ¤¤¤ë¤Ê¤é¡¢¥â¥¸¥å¡¼¥ë¤Ï <a href="http://www.cpan.org/">CPAN</a> ¤ÇÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¤³¤ÎÌÜŪ¤Î¤¿¤á¤ÎºÇ¤âÉáµÚ¤·¤Æ¤¤¤ë¥â¥¸¥å¡¼¥ë¤Ï <code>CGI.pm</code> ¤Ç¤¹¡£
-    <code>CGI::Lite</code> ¤â¸¡Æ¤¤·¤Þ¤·¤ç¤¦¡£¤³¤ì¤Ï¡¢¤Û¤È¤ó¤É¤Î¥×¥í¥°¥é¥à
-    ¤Ë¤ª¤¤¤ÆɬÍפȤ¹¤ë¤¹¤Ù¤Æ¤Îµ¡Ç½¤ÎºÇ¾®¥»¥Ã¥È¤Î¼ÂÁõ¤Ç¤¹¡£</p>
-
-    <p>C ¤Ç CGI ¥×¥í¥°¥é¥à¤ò½ñ¤¤¤Æ¤¤¤ë¤Ê¤é¡¢¤¤¤í¤¤¤í¤Ê
-    ¥ª¥×¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤é¤ÎÆâ¤Î°ì¤Ä¤Ï <a href="http://www.boutell.com/cgic/">http://www.boutell.com/cgic/</a>
-    ¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë <code>CGIC</code> ¥é¥¤¥Ö¥é¥ê¤Ç¤¹¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="moreinfo" id="moreinfo">¹¹¤Ê¤ë¾ðÊó</a></h2>
-    
-
-    <p>CGI ¤Ë´Ø¤¹¤ë¾ðÊó¤Ï¥¦¥§¥Ö¤Ç¿ô¿¤¯Ä󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£CGI
-    ¤ÎÌäÂê¤Ë¤Ä¤¤¤Æ¤Ï Usenet ¤Î <a href="news:comp.infosystems.www.authoring.cgi">comp.infosystems.www.authoring.cgi</a> ¤Ç¡¢
-    ¾¤Î¥æ¡¼¥¶¤ÈÏÀµÄ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£HTML Writers Guide ¤Î
-    -servers ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢¤¢¤Ê¤¿¤Î¼ÁÌä¤Ë²óÅú¤·¤Æ¤¯¤ì¤ë°ÎÂç¤Ê¥ê¥½¡¼¥¹¤Ç¤¹¡£
-    <a href="http://www.hwg.org/lists/hwg-servers/">http://www.hwg.org/lists/hwg-servers/</a>
-    ¤Ç¹¹¤Ë¿¤¯¤òõ¤·½Ð¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¤½¤·¤Æ¤â¤Á¤í¤ó¡¢¤ª¤½¤é¤¯ CGI
-    ¥×¥í¥°¥é¥à¤ÎÆ°ºî¤Ë´Ø¤¹¤ë¾ÜºÙ¤ÎÁ´¤Æ¤¬µ­½Ò¤µ¤ì¤Æ¤¤¤ë
-    CGI ¤Î»ÅÍͤòÆɤà¤Ù¤­¤Ç¤¹¡£¥ª¥ê¥¸¥Ê¥ë¥Ð¡¼¥¸¥ç¥ó¤ò
-    <a href="http://hoohoo.ncsa.uiuc.edu/cgi/interface.html">NCSA</a>
-    ¤Ç¡¢¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤¿¥É¥é¥Õ¥È¤ò
-    <a href="http://web.golux.com/coar/cgi/">Common Gateway Interface RFC
-    ¥×¥í¥¸¥§¥¯¥È</a>¤Ç»²¾È¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>CGI ¤ÎÌäÂê¤Ë¤Ä¤¤¤Æ¡¢²Ã¤ï¤Ã¤Æ¤¤¤ë¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Þ¤¿¤Ï¥Ë¥å¡¼¥¹
-    ¥°¥ë¡¼¥×¤Ë¼ÁÌä¤òÁ÷¤ë¤È¤­¡¢µ¯¤³¤Ã¤¿¤â¤Î¡¢µ¯¤³¤Ã¤Æ¤Û¤·¤¤¤³¤È¡¢
-    ¼ÂºÝ¤Ëµ¯¤³¤Ã¤¿¤³¤È¤¬¤É¤¦°ã¤¦¤«¡¢»ÈÍѤ·¤Æ¤¤¤ë¥µ¡¼¥Ð¡¢
-    CGI ¥×¥í¥°¥é¥à¤òµ­½Ò¤·¤Æ¤¤¤ë¸À¸ì¤Ë´Ø¤¹¤ë½½Ê¬¤Ê¾ðÊó¤È¡¢
-    ²Äǽ¤Ç¤¢¤ì¤ÐÌäÂê¤Î¥³¡¼¥É¤òÄ󶡤¹¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ¤½¤¦¤¹¤ë¤³¤È¤Ç¡¢ÌäÂ꤬¤è¤ê´Öñ¤Ë¸«¤Ä¤«¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p>Apache ¤Î¥½¡¼¥¹¥³¡¼¥É¤Ë¤ª¤¤¤ÆÌäÂê¤òȯ¸«¤·¤¿¤³¤È¤ò³Î¿®¤·¤Æ¤¤¤Ê¤¤¸Â¤ê¡¢
-    CGI ¤ÎÌäÂê¤Ë´Ø¤¹¤ë¼ÁÌä¤ò Apache
-    ¥Ð¥°¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë<strong>Á÷¤ë¤Ù¤­¤Ç¤Ê¤¤</strong>
-    ¤³¤È¤ËÃíÌܤ·¤Æ¤¯¤À¤µ¤¤¡£</p>
-  </div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/howto/cgi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/howto/cgi.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/cgi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/cgi.html.ja.utf8 b/docs/manual/howto/cgi.html.ja.utf8
new file mode 100644
index 00000000..228ab0c6
--- /dev/null
+++ b/docs/manual/howto/cgi.html.ja.utf8
@@ -0,0 +1,547 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Apache Tutorial: CGI �よる動的コンテンツ - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">How-To / �ュートリアル</a></div><div id="page-content"><div id="preamble"><h1>Apache Tutorial: CGI �よる動的コンテンツ</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/howto/cgi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/howto/cgi.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/howto/cgi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#intro">����</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#configuring">CGI を許��るよ�� Apache を設定�る</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#writing">CGI プログラムを書�</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#troubleshoot">������動��� !</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#behindscenes">��何�起����る��?</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#libraries">CGI モジュール/ライブラリ</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#moreinfo">更�る情報</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="intro" id="intro">����</a></h2>
+    
+
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code></li><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li></ul></td></tr></table>
+
+    <p>CGI (Common Gateway Interface) ��ウェブサー��
+    コンテンツ生�を�る外部プログラム��調��動作�る���方法を
+    定義�����。��プログラム����� CGI プログラムや
+    CGI スクリプト�呼�れ��。CGI ��ウェブサイト�動的�
+    コンテンツを置����最も簡��一般的�方法��。��ドキュメント��
+    Apache ウェブサー�� CGI を設定��
+    CGI プログラムを書�始�る���入門書��る��ょ�。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="configuring" id="configuring">CGI を許��るよ�� Apache を設定�る</a></h2>
+    
+
+    <p>CGI プログラムを正��動作��る���CGI を許��るよ��
+    Apache �設定を行�必���り��。
+    �れを行�����方法������り��。</p>
+
+    <h3><a name="scriptalias" id="scriptalias">ScriptAlias</a></h3>
+      
+
+      <p><code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
+      ディレクティブを使用���
+      CGI プログラム用�特別�別ディレクトリを Apache �設定���。
+      Apache ����ディレクトリ中�全��ファイルを CGI
+      プログラム��る�仮定���。
+      ������特別�リソース�クライアント�ら�求�れる��
+      ��プログラム�実行を試���。</p>
+
+      <p><code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
+      ディレクティブ�以下�よ��使用���:</p>
+
+      <div class="example"><p><code>
+        ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
+      </code></p></div>
+
+      <p>デフォルト�置� Apache をインストール���ら��
+      ��例�デフォルト状態� <code>httpd.conf</code>
+      設定ファイル���れ����。
+      <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
+      ディレクティブ��URL ���付加�るディレクトリを定義�る
+      <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code>
+      ディレクティブ���り似����。
+      <code class="directive">Alias</code> � <code class="directive">ScriptAlias</code>
+      �通常�<code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
+      ディレクトリ外�ディレクトリ����使用�れ��。
+      <code class="directive">Alias</code> � <code class="directive">ScriptAlias</code>
+      ��差��<code class="directive">ScriptAlias</code> �接頭辞�始�る����
+      URL � CGI プログラム����れる���追加��味を�ん��る����。
+      従���上記�例���<code>/cgi-bin/</code>
+      �始�るリソース���らゆるリクエスト�対���ディレクトリ
+      <code>/usr/local/apache2/cgi-bin/</code> �ら�供���れらを
+      CGI プログラム���扱�よ� Apache �示���。</p>
+
+      <p>例���URL <code>http://www.example.com/cgi-bin/test.pl</code>
+      ��求�れ�場��Apache � ファイル
+      <code>/usr/local/apache2/cgi-bin/test.pl</code>
+      を実行����出力を返���を試���。
+      も��ん�ファイル�存在��実行�能��り�決�られ�方法�出力を返���。
+      �����れ��Apache �エラーメッセージを返���。</p>
+    
+
+    <h3><a name="nonscriptalias" id="nonscriptalias">ScriptAlias ディレクトリ外� CGI</a></h3>
+      
+
+      <p>CGI プログラム��セキュリティ上��由�ら 
+      <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
+      �れ�ディレクトリ�制��れる��������り��。��方法�より�
+      CGI プログラムを使用��るユーザを管�者�厳��制御�る�������。
+      �����ら��切�セキュリティ事�対策��られる�ら��CGI
+      プログラムを任��ディレクトリ�実行����よ���る�由��り��ん。
+      例���ユーザ� <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code>
+      ディレクティブ�彼ら�ホームディレクトリ�下�ウェブコンテンツを���������。
+      も��彼ら� CGI プログラムを����を望ん���も�メイン�
+      <code>cgi-bin</code> ディレクトリ��アクセス�����場��
+      CGI プログラムを実行�る�����る他�場所�必���り��。</p>
+
+      <p>任��ディレクトリ� CGI �実行を許��る��二段階�設定�必���。
+      ���<code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> や <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code> ディレクティブ�よ��
+      <code>cgi-script</code> �ンドラ��能�����る必���り��。
+      次��<code class="directive"><a href="../mod/core.html#options">Options</a></code> ディレクティブ�
+      <code>ExecCGI</code> �指定�れ����れ��り��ん。</p>
+    
+
+    <h3><a name="options" id="options">CGI �実行を�能��る��� Options を明示的�使用�る</a></h3>
+      
+
+      <p>サー��メイン�設定ファイル中� <code class="directive"><a href="../mod/core.html#options">Options</a></code>
+      ディレクティブを明示的�使用�る����特定�ディレクトリ�下�
+      CGI �実行を許��るよ��指定�る�������:</p>
+
+      <div class="example"><p><code>
+        &lt;Directory /usr/local/apache2/htdocs/somedir&gt;<br />
+        <span class="indent">
+          Options +ExecCGI<br />
+        </span>
+        &lt;/Directory&gt;
+      </code></p></div>
+
+      <p>上記ディレクティブ��CGI ファイル�実行を�能��るよ�
+      Apache �����。�����ファイル� CGI ファイル�を
+      サー����る必���り��。次�
+      <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code>
+      ディレクティブ�例���<code>cgi</code> ��� <code>pl</code>
+      を拡張��������ファイルを CGI
+      プログラム��������をサー������:</p>
+
+      <div class="example"><p><code>
+        AddHandler cgi-script .cgi .pl
+      </code></p></div>
+    
+
+    <h3><a name="htaccess" id="htaccess">.htaccess ファイル</a></h3>
+      
+
+      <p><a href="htaccess.html"><code>.htaccess</code> �ュートリアル</a>
+      � <code>httpd.conf</code> を変更����場����や�� CGI プログラムを
+      使�るよ���る�を説明�����。</p>
+    
+
+    <h3><a name="userdir" id="userdir">User ディレクトリ</a></h3>
+      
+
+      <p><code>.cgi</code> �終�る����ファイル�対�� CGI プログラム�
+      実行を許��る���以下�設定を使用����。</p>
+
+      <div class="example"><p><code>
+      &lt;Directory /home/*/public_html&gt;<br />
+      <span class="indent">
+        Options +ExecCGI<br />
+        AddHandler cgi-script .cgi<br />
+      </span>
+      &lt;/Directory&gt;
+      </code></p></div>
+
+      <p>ユーザディレクトリ� <code>cgi-bin</code> サブディレクトリ�
+      ����ファイルを CGI プログラム���指定���場���
+      以下�よ��も�を使���。</p>
+
+      <div class="example"><p><code>
+      &lt;Directory /home/*/public_html/cgi-bin&gt;<br />
+      <span class="indent">
+        Options ExecCGI<br />
+        SetHandler cgi-script<br />
+      </span>
+      &lt;/Directory&gt;
+      </code></p></div>
+
+    
+  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="writing" id="writing">CGI プログラムを書�</a></h2>
+    
+
+    <p>「通常��プログラミング� CGI
+    プログラミング�間��主�二������り��。</p>
+
+    <p>一���CGI プログラム�����出力�� <a class="glossarylink" href="../glossary.html#mime-type" title="用語集を�照">MIME-type</a>
+    ヘッダを付���れ��り��ん。
+    �れ���よ��種類�コンテンツを������る�をクライアント�示�
+    HTTP ヘッダ��。��ん��場����次�よ��出力���:</p>
+
+    <div class="example"><p><code>
+      Content-type: text/html
+    </code></p></div>
+
+    <p>も�一���出力を HTML
+    ��ブラウザ�表示�る�����る何�他�形���る必���り��。
+    大抵�場�� HTML ��ょ���GIF イメージや他�� HTML
+    コンテンツを出力�る CGI プログラムを書���も�る��ょ�。</p>
+
+    <p>�れら二点以外���CGI プログラムを書�����
+    ����書���る他�プログラム�よ�似��る��ょ�。</p>
+
+    <h3><a name="firstcgi" id="firstcgi">最�� CGI プログラム</a></h3>
+      
+
+      <p>次�示����ブラウザ� 1 行�字�る CGI
+      プログラム�例��。以下を入力��<code>first.pl</code>
+      ���ファイル��存���れを <code>cgi-bin</code>
+      ディレクトリ�置������。</p>
+
+      <div class="example"><p><code>
+        #!/usr/bin/perl<br />
+        print "Content-type: text/html\n\n";<br />
+        print "Hello, World.";
+      </code></p></div>
+
+      <p>Perl �精通������も�
+      何�起�る�を�解�る�����る��ょ�。1 行目��
+      <code>/usr/bin/perl</code> �見��られるインタプリタ�
+      ��ファイルを供給�る�����プログラム�実行�れる��を
+      Apache � (シェル上�実行�よ�����る�ら����シェル� ) 
+      示���。2 行目���述����り content-type �定義を�字���。
+      �れ��復帰改行�二��組を後�付加���。
+      �れ�より�ヘッダ�終り�空行�置�れ�HTTP
+      ヘッダ�終り�ボディ�始�りを示���。3 行目��"Hello, World."
+      ���文字列を�字���れ�終り��り��。</p>
+
+      <p>好��ブラウザを開��アドレス</p>
+
+      <div class="example"><p><code>
+        http://www.example.com/cgi-bin/first.pl
+      </code></p></div>
+
+      <p>�る��ファイルを置��ロケーションを指定�る��
+      <code>Hello, World.</code>
+      ��� 1 行�ブラウザウィンド��れる��ょ�。
+      �れ���りエキサイティング������り��ん。
+      �����れ����動���
+      他���よ��も��も動�������るよ���り��。</p>
+    
+  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="troubleshoot" id="troubleshoot">������動��� !</a></h2>
+    
+
+    <p>ウェブ�ら CGI プログラム��アクセスを行������
+    ブラウザ�見る�能性��る四��基本的�����り��:</p>
+
+    <dl>
+      <dt>CGI プログラム�出力</dt>
+      <dd>素晴ら�� ! �れ��������動����を�味���。
+      出力�正常��れ�も�ブラウザ�正常�処����れ��場���
+      正�� <code>Content-Type</code> を CGI プログラム内�
+      セット���を確�������。</dd>
+
+      <dt>CGI プログラム�ソースコード���� "POST Method Not Allowed"
+      ���メッセージ</dt> 
+      <dd>�れ��CGI プログラムを処���るよ� Apache
+      を�切�設定���������を�味���。<a href="#configuring">「CGI を許��るよ��
+      Apache を設定�る�</a>�章を読�直��
+      ����何を間����を探��������。
+      </dd>
+
+      <dt>メッセージ� "Forbidden" �始����る</dt>
+      <dd>�れ�パーミッション��題�����を�味���。
+      <a href="#errorlogs">Apache �エラーログ</a>��後述�<a href="#permissions">「ファイル�パーミッション�</a>
+      �章を�ェック������。
+      </dd>
+
+      <dt>"Internal Server Error" ���メッセージ</dt>
+      <dd><a href="#errorlogs">Apache
+      �エラーログ</a>を�ェック�る��"Premature end of script headers"
+      ���ログ�記録�れ��る�����。������ら� CGI
+      プログラム�よ��生��れ�エラーメッセージも記録�れ��る��ょ�。
+      ��場��CGI プログラム��切�
+      HTTP ヘッダを出力����原因を知る����
+      以下��章��ェック��������。</dd>
+    </dl>
+
+    <h3><a name="permissions" id="permissions">ファイル�パーミッション</a></h3>
+      
+
+      <p>サー������権��実行�れ�����を忘れ��よ��。
+      ��り�起動�る���サー��特権をも���ユーザ - 通常 <code>nobody</code>
+      や <code>www</code> �権��実行�れ��。����������所有�る
+      ファイルを実行�る��別�パーミッション�必���り��。
+      通常�<code>nobody</code> �実行�る���分�パーミッションを与�る方法��
+      ファイル�誰�も実行�能��るパーミッションを与�る����:</p>
+
+      <div class="example"><p><code>
+        chmod a+x first.pl
+      </code></p></div>
+
+      <p>���も�����プログラム�他�ファイルを読�書��る�ら��
+      �れら�ファイル���れ��能��る正��パーミッション
+      を����る必���り��。</p>
+
+    
+
+    <h3><a name="pathinformation" id="pathinformation">パス情報�環境</a></h3>
+      
+
+      <p>コマンドライン�らプログラムを実行�る���
+      �識����もシェル�渡�れる情報��り��。
+      例����照�るファイル������を検索��らよ��を
+      シェル���る <code>PATH</code> ��り��。</p>
+
+      <p>プログラム� CGI プログラム���ウェブサー��よ��実行�れる���
+      �れ��� <code>PATH</code> �����も�れ��ん。
+      CGI プログラム内�呼�出��らゆるプログラム
+      (例���<code>sendmail</code> �よ��も�) ��
+      フルパス�指定�る必���る��ょ�。�れ�より�CGI
+      プログラムを実行�よ�������
+      シェル���よ��プログラムを見��る�������。</p>
+
+      <p>�様�����スクリプト�インタプリタ (���� <code>perl</code>)
+      ��パス��CGI プログラム� 1 行目�次�よ��示�れ��:</p>
+
+      <div class="example"><p><code>
+        #!/usr/bin/perl
+      </code></p></div>
+
+      <p>�れ�インタープリタ��実際�パス��る��を確�������。</p>
+    
+
+      <p>���CGI プログラム�他�<a href="#env">環境変数</a>��存���る場�����環境変数�
+      Apache �ら渡�れるよ���る必���り��。</p>
+
+    <h3><a name="syntaxerrors" id="syntaxerrors">プログラムエラー</a></h3>
+      
+
+      <p>CGI
+      プログラム�失敗�る��大抵�プログラム自身��題��る場���。
+      一度 CGI �使�方を�解���述�二��誤りを犯������ら��
+      ��間��������ょ�。ブラウザを使��テスト�る��
+      ��確��る����コマンドライン�らプログラム�実行��る����。
+      例���以下を実行��������:</p>
+
+      <div class="example"><p><code>
+      cd /usr/local/apache2/cgi-bin<br />
+      ./first.pl
+      </code></p></div>
+
+      <p>(<code>perl</code> インタプリタ�呼��������。
+      シェル� Apache �スクリプト�最��行� <a href="#pathinformation">パス情報</a> を使��見����。)</p>
+
+      <p>最��プログラム�ら出力�れる�� <code>Content-Type</code> を���
+      後�空行�続� HTTP ヘッダ���れ��り��ん。他�も��出力�れ��る
+      場���Apache ���プログラムをサー�経由�実行�よ��������
+      <code>Premature end of script headers</code> エラーを出力���。詳細�
+      上記� <a href="#writing">CGI プログラムを書�</a> を読ん�����。</p>
+    
+
+    <h3><a name="errorlogs" id="errorlogs">エラーログ</a></h3>
+      
+
+      <p>エラーログ�����。
+      全�������������エラーログ�メッセージを生����。
+      必��れを最��見る����。
+      も������ウェブサイトを主催���る場所�
+      エラーログ��照を許������ら�����他�サイト�主催�る����。
+      エラーログ�読�方を学�������ん�全���題�迅速�確��れ�
+      迅速�解決�れる������分�る��ょ�。</p>
+    
+
+    <h3><a name="suexec" id="suexec">Suexec</a></h3>
+      
+
+      <p><a href="../suexec.html">suexec</a> サ�ートプログラム�
+      �ー�ャルホストやユーザ�ホームディレクトリ�場所����
+      CGI プログラムを��ユーザ権��下�走ら�る��を�能����。
+      Suexec �権���ェック��常�厳����れを満����場��
+      CGI プログラム� <code>Premature end of script headers</code> エラー�
+      実行�れ��ん。</p>
+
+      <p>suexec を使���る����を調����� <code>apachectl
+      -V</code> を実行���<code>SUEXEC_BIN</code> �場所を調������。
+      Apache ���� <code class="program"><a href="../programs/suexec.html">suexec</a></code> ��イナリを発見��場���suexec �
+      使用�れ��。</p>
+
+      <p>suexec を完全��解������り�使������り��ん。
+      suexec を無効��る���<code>SUEXEC_BIN</code> �ら指�れ��る
+      <code class="program"><a href="../programs/suexec.html">suexec</a></code> �イナリを削除 (���を変更) �る����。
+      <a href="../suexec.html">suexec</a> を読ん�後�����れを
+      使������れ��<code>suexec -V</code> を実行�� suexec �
+      ログファイル��置を調����ログファイルを使���リシー��を
+      見�������。</p>
+    
+  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="behindscenes" id="behindscenes">��何�起����る��?</a></h2>
+    
+
+    <p>CGI プログラミング�習熟�る��
+    ��起����る������更��解�る���役�立���。
+    ブラウザ�サー����よ��相互通信�る������特�����。
+    ���ら�"Hello, World."
+    を�字�るプログラムを書���������構����
+    �れ�特�有益���り��ん。</p>
+
+    <h3><a name="env" id="env">環境変数</a></h3>
+      
+
+      <p>環境変数��
+      ����コンピュータを使����辺り�存在���る値��。
+      �れら��パス
+      (コマンドをタイプ�����実行�る実際�ファイルを探�出����)�
+      ユーザ��端末型���よ��便利�も���。
+      通常�普段使用���る環境変数�完全�リストを調�る���
+      コマンドプロンプト� <code>env</code> を入力���。</p>
+
+      <p>CGI �処�中�サー��ブラウザも環境変数を設定��
+      �れ�より相互�通信�る�����るよ���り��。
+      ��環境変数��ブラウザタイプ (Netscape, IE, Lynx)�サー�タイプ
+      (Apache, IIS, WebSite)�実行�れ��る CGI
+      プログラム�������。</p>
+
+      <p>�れら�変数� CGI プログラマ�使用����。
+      �����れ�クライアント�サー��通信�話��分��。
+      必��変数�完全�リスト� <a href="http://hoohoo.ncsa.uiuc.edu/cgi/env.html">http://hoohoo.ncsa.uiuc.edu/cgi/env.html</a> ��り��。</p>
+
+      <p>以下��純� Perl CGI
+      プログラム��渡�れる全��環境変数を表示���。�様�プログラム��
+      Apache ディストリビューション� <code>cgi-bin</code>
+      ディレクトリ�二���れ����。
+      �����変数�必須��り������任���る���注�������。
+      ����公��リスト���������変数�表示�れ��る�も�れ��ん。
+      �ら��Apache �デフォルト�用��れ��る基本的�も��
+      <a href="../env.html">���自身�環境変数を加�る</a>����
+      多��異�る方法を用������。</p>
+
+      <div class="example"><p><code>
+        #!/usr/bin/perl<br />
+        print "Content-type: text/html\n\n";<br />
+        foreach $key (keys %ENV) {<br />
+        <span class="indent">
+          print "$key --&gt; $ENV{$key}&lt;br&gt;";<br />
+        </span>
+        }
+      </code></p></div>
+    
+
+    <h3><a name="stdin" id="stdin">STDIN � STDOUT</a></h3>
+      
+
+      <p>サー��クライアント間�も�一��通信��標準入力
+      (<code>STDIN</code>)�標準出力 (<code>STDOUT</code>)
+      を通��行��れ��。通常�文脈�����<code>STDIN</code>
+      �キーボードやプログラム�動作�る���与�られるファイルを�味��
+      <code>STDOUT</code> �通常コンソール���スクリーンを�味���。</p>
+
+      <p>ウェブフォーム�ら CGI プログラム�<code>POST</code>
+      �����フォーム�データ�特別�フォーマット���られ�
+      <code>STDIN</code> を通���CGI プログラム�引�渡�れ��。
+      プログラム�データ�キーボード
+      も���ファイル�ら������よ��処��る�������。</p>
+
+      <p>「特別�フォーマット����も�純��。フィールド��値�イコール
+      (=) ���れ��。���値�組�アンパサンド (&amp;) ���れ��。
+      スペース�アンパサンド�イコール�よ���倒�文字��
+      �れら�動作を駄目����よ����文字�相当�る 16 進�変��れ��。
+      全データ文字列��以下�よ���り��:
+      </p>
+
+      <div class="example"><p><code>
+        name=Rich%20Bowen&amp;city=Lexington&amp;state=KY&amp;sidekick=Squirrel%20Monkey
+      </code></p></div>
+
+      <p>時々���よ��文字列� URL
+      �付加�れる�を見る��ょ�。��場��サー��
+      <code>QUERY_STRING</code> ���環境変数���文字列を入れ��。�れ�
+      <code>GET</code> リクエスト�呼�れ��。
+      HTML フォーム���データを渡���� <code>GET</code> �
+      <code>POST</code> ���らを使用�る�を�<code>FORM</code> タグ�
+      <code>METHOD</code> 属性�設定�指定���。</p>
+
+      <p>CGI プログラム����文字列を役�立�情報�分割�る責任��り��。
+      幸��も���データ処�を助�るライブラリやモジュール�存在���。
+      �れら��CGI プログラム�他���も�様�役�立���。</p>
+    
+  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="libraries" id="libraries">CGI モジュール/ライブラリ</a></h2>
+    
+
+    <p>CGI プログラムを書�����倒�仕事�大部分を���れる
+    コードライブラリ���モジュールを使���を検討�����。
+    �れ�エラーを減ら��早�開発����り��。</p>
+
+    <p>Perl � CGI プログラムを書���る�ら�モジュール� <a href="http://www.cpan.org/">CPAN</a> ��供�れ����。
+    ��目的����最も普����るモジュール� <code>CGI.pm</code> ��。
+    <code>CGI::Lite</code> も検討���ょ�。�れ����ん��プログラム
+    ����必���る����機能�最�セット�実装��。</p>
+
+    <p>C � CGI プログラムを書���る�ら������
+    オプション��り��。�れら�内�一�� <a href="http://www.boutell.com/cgic/">http://www.boutell.com/cgic/</a>
+    ��供�れ��る <code>CGIC</code> ライブラリ��。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="moreinfo" id="moreinfo">更�る情報</a></h2>
+    
+
+    <p>CGI �関�る情報�ウェブ�数多��供�れ����。CGI
+    ��題����� Usenet � <a href="news:comp.infosystems.www.authoring.cgi">comp.infosystems.www.authoring.cgi</a> ��
+    他�ユーザ�論議�る�������。HTML Writers Guide �
+    -servers メーリングリスト������質��回答���れる�大�リソース��。
+    <a href="http://www.hwg.org/lists/hwg-servers/">http://www.hwg.org/lists/hwg-servers/</a>
+    �更�多�を探�出��������。</p>
+
+    <p>���も��ん���ら� CGI
+    プログラム�動作�関�る詳細�全��記述�れ��る
+    CGI �仕様を読む����。オリジナル�ージョンを
+    <a href="http://hoohoo.ncsa.uiuc.edu/cgi/interface.html">NCSA</a>
+    ��アップデート�れ�ドラフトを
+    <a href="http://web.golux.com/coar/cgi/">Common Gateway Interface RFC
+    プロジェクト</a>��照�る�������。</p>
+
+    <p>CGI ��題�����加����るメーリングリスト���ニュース
+    グループ�質�を�る���起���も��起���������
+    実際�起������������使用���るサー��
+    CGI プログラムを記述���る言語�関�る�分�情報��
+    �能��れ��題�コードを�供�るよ��������。
+    ���る�����題�より間��見��るよ���り��。</p>
+
+    <p>Apache �ソースコード�����題を発見����を確信������り�
+    CGI ��題�関�る質�を Apache
+    �グデータベース�<strong>�る�����</strong>
+    ���注目������。</p>
+  </div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/howto/cgi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/howto/cgi.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/howto/cgi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/cgi.html.ko.euc-kr b/docs/manual/howto/cgi.html.ko.euc-kr
index 08650604..4579a2cd 100644
--- a/docs/manual/howto/cgi.html.ko.euc-kr
+++ b/docs/manual/howto/cgi.html.ko.euc-kr
@@ -498,6 +498,6 @@
 <a href="../ja/howto/cgi.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/cgi.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/htaccess.html b/docs/manual/howto/htaccess.html
index 9c6579d8..fd70b651 100644
--- a/docs/manual/howto/htaccess.html
+++ b/docs/manual/howto/htaccess.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: htaccess.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: htaccess.html.ja.euc-jp
+URI: htaccess.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: htaccess.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/howto/htaccess.html.en b/docs/manual/howto/htaccess.html.en
index c349e461..719297df 100644
--- a/docs/manual/howto/htaccess.html.en
+++ b/docs/manual/howto/htaccess.html.en
@@ -380,6 +380,6 @@ Options +IncludesNoExec -ExecCGI<br />
 <a href="../ko/howto/htaccess.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../pt-br/howto/htaccess.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/htaccess.html.ja.euc-jp b/docs/manual/howto/htaccess.html.ja.euc-jp
deleted file mode 100644
index 7de23ad7..00000000
--- a/docs/manual/howto/htaccess.html.ja.euc-jp
+++ /dev/null
@@ -1,383 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>Apache ¥Á¥å¡¼¥È¥ê¥¢¥ë: .htaccess ¥Õ¥¡¥¤¥ë - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">How-To / ¥Á¥å¡¼¥È¥ê¥¢¥ë</a></div><div id="page-content"><div id="preamble"><h1>Apache ¥Á¥å¡¼¥È¥ê¥¢¥ë: .htaccess ¥Õ¥¡¥¤¥ë</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/howto/htaccess.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/howto/htaccess.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/htaccess.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../pt-br/howto/htaccess.html" hreflang="pt-br" rel="alternate" title="Portugu�«´s (Brasil)">&nbsp;pt-br&nbsp;</a></p>
-</div>
-
-<p><code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ï¥Ç¥£¥ì¥¯¥È¥êËè¤ËÀßÄê¤òÊѹ¹¤¹¤ëÊýË¡¤ò
-Ä󶡤·¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">.htaccess ¥Õ¥¡¥¤¥ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#what">.htaccess ¥Õ¥¡¥¤¥ë¤È¤Ï²¿¤«/¤½¤Î»È¤¤Êý</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#when">¤¤¤Ä .htaccess ¥Õ¥¡¥¤¥ë¤ò»È¤¦(»È¤ï¤Ê¤¤)¤«¡£</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#how">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎŬÍѤΤµ¤ìÊý</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#auth">ǧ¾Ú¤ÎÎã</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#ssi">SSI ¤ÎÎã</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cgi">CGI ¤ÎÎã</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#troubleshoot">ÌäÂê²ò·è</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="related" id="related">.htaccess ¥Õ¥¡¥¤¥ë</a></h2>
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="../mod/core.html">core</a></code></li><li><code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code></li><li><code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code></li><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="../mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#accessfilename">AccessFileName</a></code></li><li><code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#authtype">AuthType</a></code></li><li><code class="directive"><a href="../mod/core.html#authname">AuthName</a></code></li><li><code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code></li><li><code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code></li><li><code class="directive"><a href="../mod/core.html#require">Require</a></code></li></ul></td></tr></table>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="what" id="what">.htaccess ¥Õ¥¡¥¤¥ë¤È¤Ï²¿¤«/¤½¤Î»È¤¤Êý</a></h2>
-
-
-    <p><code>.htaccess</code> ¥Õ¥¡¥¤¥ë (¡Öʬ»¶ÀßÄê¥Õ¥¡¥¤¥ë¡×) ¤Ï
-    ¥Ç¥£¥ì¥¯¥È¥êËè¤ËÀßÄê¤òÊѹ¹¤¹¤ëÊýË¡¤òÄ󶡤·¤Þ¤¹¡£¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-    ½ñ¤«¤ì¤¿¥Õ¥¡¥¤¥ë¤ò¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤¯¤³¤È¤Ç¡¢¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤È¤½¤Î
-    ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤¹¤Ù¤Æ¤Ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òŬÍѤµ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>Ãí:</h3>
-      <p><code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤òÊ̤Î̾Á°¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢
-      <code class="directive"><a href="../mod/core.html#accessfilename">AccessFileName</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-      »È¤Ã¤ÆÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Î㤨¤Ð¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤ò <code>.config</code> 
-      ¤È¤¤¤¦Ì¾Á°¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢°Ê²¼¤ÎÀßÄê¤ò¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë¤ËÆþ¤ì¤ë¤³¤È¤¬
-      ¤Ç¤­¤Þ¤¹:</p>
-
-      <div class="example"><p><code>
-        AccessFileName .config
-      </code></p></div>
-    </div>
-
-    <p>°ìÈ̤ˡ¢<code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Î¹½Ê¸¤Ï
-    <a href="../configuring.html#syntax">¼çÀßÄê¥Õ¥¡¥¤¥ë</a>
-    ¤ÈƱ¤¸¤Ç¤¹¡£¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ë½ñ¤¯¤³¤È¤Î¤Ç¤­¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê·è¤Þ¤ê¤Þ¤¹¡£
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢<code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ë
-    ½ñ¤«¤ì¤¿¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÃæ¤Ç¡¢¡¢
-    ¤É¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Å¬ÍѤµ¤ì¤ë¤«¤ò¥«¥Æ¥´¥ê¡¼Ã±°Ì¤Ç»ØÄꤷ¤Þ¤¹¡£
-    <code>.htaccess</code> ¤Ë½ñ¤¯¤³¤È¤Î¤Ç¤­¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤¢¤ì¤Ð¡¢
-    ÀâÌÀʸ½ñ¤Ë¤Ï¡Ö¾å½ñ¤­¡×¤È¤¤¤¦¹àÌܤ¬¤¢¤ê¡¢.htaccess ¤Ë½ñ¤¯¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë
-    ¤Ê¤ë¤¿¤á¤Î <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> ¤ÎÃͤ¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p>Î㤨¤Ð¡¢<code class="directive"><a href="../mod/core.html#adddefaultcharset">AddDefaultCharset</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÀâÌÀ¤ò
-    ¸«¤ë¤È¡¢<code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ç¤Î»ÈÍѤ¬µö²Ä¤µ¤ì¤Æ¤¤¤ë¤³¤È¤¬
-    ¤ï¤«¤ê¤Þ¤¹¡£ (¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î³µÍפνê¤Ë¤¢¤ë¡Ö¥³¥ó¥Æ¥­¥¹¥È¡×¤È½ñ¤«¤ì¤Æ¤¤¤ë
-    ¹Ô¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£) <a href="../mod/directive-dict.html#Context">¾å½ñ¤­</a>¤È½ñ¤«¤ì¤Æ¤¤¤ë¹Ô¤Ë¤Ï
-    <code>FileInfo</code> ¤È¤¢¤ê¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢<code>.htaccess</code> Ãæ¤Î
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Í­¸ú¤Ë¤Ê¤ë¤¿¤á¤Ë¤Ï¡¢¾¯¤Ê¤¯¤È¤â
-    <code>AllowOverride FileInfo</code> ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã:</h3><table>
-        <tr>
-          <td><a href="../mod/directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></td>
-          <td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë,¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È,¥Ç¥£¥ì¥¯¥È¥ê,.htaccess</td>
-        </tr>
-
-        <tr>
-          <td><a href="../mod/directive-dict.html#Override">¾å½ñ¤­:</a></td>
-          <td>FileInfo</td>
-        </tr>
-      </table></div>
-
-    <p>¤¢¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ë½ñ¤¯¤³¤È¤¬¤Ç¤­¤ë¤«
-    ¤É¤¦¤«¤ï¤«¤é¤Ê¤¤¤È¤­¤Ï¡¢¤½¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÀâÌÀ¤òõ¤·¤Æ¡¢".htaccess"
-    ¤Î¤¿¤á¤Î¡Ö¥³¥ó¥Æ¥­¥¹¥È¡×¤Î¹Ô¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£</p>
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="when" id="when">¤¤¤Ä .htaccess ¥Õ¥¡¥¤¥ë¤ò»È¤¦(»È¤ï¤Ê¤¤)¤«¡£</a></h2>
-
-    <p>°ìÈÌŪ¤Ë¡¢¥µ¡¼¥Ð¤Î¼çÀßÄê¥Õ¥¡¥¤¥ë¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¾ì¹ç¤ò½ü¤¤¤Æ¡¢
-    <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Î»ÈÍѤ϶ËÎÏÈò¤±¤Æ¤¯¤À¤µ¤¤¡£
-    À¤¤ÎÃæ¤Ë¤Ï¡¢Î㤨¤Ð¡¢¥æ¡¼¥¶Ç§¾Ú¤Ï¾ï¤Ë <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ç
-    ¹Ô¤Ê¤ï¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡¢¤È¤¤¤¦¸í²ò¤¬¹­¤Þ¤Ã¤Æ¤¤¤Þ¤¹¤¬¡¢¤Þ¤Ã¤¿¤¯¤½¤ó¤Ê¤³¤È¤Ï
-    ¤¢¤ê¤Þ¤»¤ó¡£¥æ¡¼¥¶Ç§¾Ú¤ÎÀßÄê¤Ï¥µ¡¼¥Ð¼çÀßÄê¥Õ¥¡¥¤¥ë¤Ë½ñ¤¯¤³¤È¤¬¤Ç¤­¡¢
-    ¼ÂºÝ¡¢¤½¤ÎÊý¤¬¤è¤êÎɤ¤ÀßÄêÊýË¡¤Ç¤¹¡£</p>
-
-    <p><code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ï¥³¥ó¥Æ¥ó¥ÄÄ󶡼Ԥ¬¥Ç¥£¥ì¥¯¥È¥êËè¤Î
-    ÀßÄê¤ò¹Ô¤Ê¤¤¤¿¤¤¤±¤ì¤É¡¢¥µ¡¼¥Ð¥·¥¹¥Æ¥à¤Î root ¥¢¥¯¥»¥¹¸¢¸Â¤ò»ý¤Ã¤Æ¤¤¤Ê¤¤
-    ¤È¤¤¤¦¾ì¹ç¤Ë¤Î¤ß»È¤¦¤Ù¤­¤â¤Î¤Ç¤¹¡£¥µ¡¼¥Ð´ÉÍý¼Ô¤¬ÉÑÈˤËÀßÄêÊѹ¹¤ò¹Ô¤Ê¤¤¤¿¤¯¤Ï
-    ¤Ê¤¤¡¢¤È¤¤¤¦¤È¤­¤Ë¤Ï¸Ä¡¹¤Î¥æ¡¼¥¶¤¬ <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤ò»È¤Ã¤Æ
-    ¼«Ê¬¤ÇÀßÄê¤ÎÊѹ¹¤ò¹Ô¤Ê¤¦¤³¤È¤òµö²Ä¤·¤¿Êý¤¬Îɤ¤¤È¤­¤â¤¢¤ë¤Ç¤·¤ç¤¦¡£
-    ¤³¤ì¤ÏÆäˡ¢ISP ¤¬Ê£¿ô¤Î¥æ¡¼¥¶¤Î¥µ¥¤¥È¤ò°ì¤Ä¤Î¥Þ¥·¥ó¤Ç¥Û¥¹¥È¤·¤Æ¤¤¤Æ¡¢
-    ³Æ¥æ¡¼¥¶¤¬ÀßÄê¤ÎÊѹ¹¤ò¤Ç¤­¤ë¤è¤¦¤Ë¤·¤¿¤¤¤è¤¦¤Ê¤È¤­¤Ë¤¢¤Æ¤Ï¤Þ¤ê¤Þ¤¹¡£</p>
-
-    <p>¤·¤«¤·¡¢ÉáÄ̤ϲÄǽ¤Ç¤¢¤ì¤Ð <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Î»ÈÍѤÏ
-    Èò¤±¤Æ¤¯¤À¤µ¤¤¡£<code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ë½ñ¤³¤¦¤È¹Í¤¨¤ë¤è¤¦¤Ê
-    ¤¹¤Ù¤Æ¤ÎÀßÄê¤Ï¡¢¥µ¡¼¥Ð¤Î¼çÀßÄê¥Õ¥¡¥¤¥ë¤Î <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤ÇƱ¤¸¤è¤¦¤Ë¹Ô¤Ê¤¦¤³¤È¤¬
-    ¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p><code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Î»ÈÍѤòÈò¤±¤ëÍýͳ¤Ï¼ç¤ËÆó¤Ä¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>°ì¤ÄÌܤϥµ¡¼¥Ð¤ÎÀ­Ç½¤ÎÌäÂê¤Ç¤¹¡£<code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬
-    <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤ÎÀßÄê¤òµö²Ä¤·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢Apache ¤Ï
-    ³Æ¥Ç¥£¥ì¥¯¥È¥ê¤Ç <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤òõ¤·¤Þ¤¹¡£
-    ¤Ç¤¹¤«¤é¡¢<code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤òµö²Ä¤¹¤ë¤È¡¢¼ÂºÝ¤Ë»ÈÍѤ·¤Æ¤¤¤ë¤«
-    ¤É¤¦¤«¤Ë´Ø¤ï¤é¤º¡¢À­Ç½¤ÎÄã²¼¤ò¾·¤¯¤³¤È¤Ë¤Ê¤ê¤Þ¤¹! ¤Þ¤¿¡¢<code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ë¤Ïʸ½ñ¤¬¥ê¥¯¥¨¥¹¥È¤µ¤ì¤ëÅÙ¤ËÆɤ߹þ¤Þ¤ì¤Þ¤¹¡£</p>
-
-    <p>¤µ¤é¤Ë¡¢Apache ¤ÏŬÍѤ¹¤Ù¤­¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò½¸¤á¤ë¤¿¤á¤Ë¡¢¤¹¤Ù¤Æ¤Î
-    ¾å°Ì¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤òõ¤¹É¬Íפ¬¤¢¤ë¤³¤È¤Ë¤â
-    Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£(<a href="#how">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Å¬ÍѤµ¤ì¤ëÊýË¡</a>¤ò
-    »²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£)¤Ç¤¹¤«¤é¡¢<code>/www/htdocs/example</code> ¤Ë¤¢¤ë
-    ¥Õ¥¡¥¤¥ë¤¬¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿¤È¤­¤Ï¡¢Apache ¤Ï°Ê²¼¤Î¥Õ¥¡¥¤¥ë¤òÄ´¤Ù¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      /.htaccess<br />
-      /www/.htaccess<br />
-      /www/htdocs/.htaccess<br />
-      /www/htdocs/example/.htaccess
-    </code></p></div>
-
-    <p>¤Ç¤¹¤«¤é¡¢¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î¤½¤ì¤¾¤ì¤Î¥Õ¥¡¥¤¥ë¤Ø¤Î¥¢¥¯¥»¥¹¤ËÂФ·¤Æ¡¢
-    ¾å¤ÎÎã¤Î¥Õ¥¡¥¤¥ë¤¬¤Þ¤Ã¤¿¤¯Â¸ºß¤·¤Ê¤¤¤È¤­¤Ç¤â¡¢ÄɲäΥե¡¥¤¥ë¥·¥¹¥Æ¥à¤Î
-    ¥¢¥¯¥»¥¹¤¬¹Ô¤Ê¤ï¤ì¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£(¤³¤ì¤Ï¡¢<code>.htaccess</code> ¤¬
-    <code>/</code> ¤ËÂФ·¤ÆÍ­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤È¤­¤Î¾ì¹ç¤Ç¡¢ÉáÄ̤Ϥ½¤¦¤Ê¤Ã¤Æ
-    ¤¤¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£)</p>
-
-    <p>Æó¤ÄÌܤϥ»¥­¥å¥ê¥Æ¥£¤Ç¤¹¡£¥æ¡¼¥¶¤Ë¥µ¡¼¥Ð¤ÎÀßÄê¤òÊѹ¹¤¹¤ë¤³¤È¤ò
-    µö²Ä¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¤Î¤Ç¡¢¤¢¤Ê¤¿¼«¿È¤¬´ÉÍý¤Ç¤­¤Ê¤¤Êѹ¹¤ò¤µ¤ì¤ë
-    ¶²¤ì¤¬¤¢¤ê¤Þ¤¹¡£¥æ¡¼¥¶¤Ë¤³¤ÎÆø¢¤òÍ¿¤¨¤ë¤Î¤¬Îɤ¤¤Î¤«¤É¤¦¤«¡¢½½Ê¬
-    ¸¡Æ¤¤·¤Æ¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢¥æ¡¼¥¶¤ËÍ¿¤¨¤ë¸¢¸Â¤¬É¬Íפʤâ¤Î¤è¤ê¤â¾¯¤Ê¤¹¤®¤ë¤È¡¢
-    ;ʬ¤Êµ»½Ñ¥µ¥Ý¡¼¥ÈÊó¹ð¤ò¼õ¤±¼è¤ë¤è¤¦¤Ë¤Ê¤ë²ÄǽÀ­¤¬¹â¤¤¤³¤È¤Ë¤â
-    Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£³Î¼Â¤Ë¡¢¥æ¡¼¥¶¤Ë¤É¤ÎÄøÅ٤θ¢¸Â¤òÍ¿¤¨¤¿¤«ÌÀ³Î¤Ë¹ð¤²¤ë¤è¤¦¤Ë
-    ¤·¤Æ¤¯¤À¤µ¤¤¡£<code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> ¤Ë
-    ²¿¤òÀßÄꤷ¤¿¤«¤È¤¤¤¦¤³¤È¤È¡¢´ØÏ¢¤¹¤ëʸ½ñ¤ò¼¨¤¹¤³¤È¤Ç¡¢
-    ¸å¡¹¤Îº®Íð¤ò¤°¤Ã¤È¸º¤é¤¹¤³¤È¤¬
-    ¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¤È¤³¤í¤Ç¡¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î½ñ¤«¤ì¤¿ <code>.htaccess</code> ¤ò
-    <code>/www/htdocs/example</code> ¤ËÃÖ¤¯¤³¤È¤È¡¢Æ±¤¸¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    ¼ç¥µ¡¼¥ÐÀßÄê¤Î Directory ¥»¥¯¥·¥ç¥ó
-    <code>&lt;Directory /www/htdocs/example&gt;</code> ¤Ë½ñ¤¯¤³¤È¤Ï
-    ´°Á´¤ËÅù²Á¤Ç¤¹:</p>
-
-    <p><code>/www/htdocs/example</code> ¤Î <code>.htaccess</code> ¥Õ¥¡¥¤¥ë:</p>
-
-    <div class="example"><h3><code>/www/htdocs/example</code> ¤Î .htaccess ¥Õ¥¡¥¤¥ë¤Î
-    ÆâÍÆ</h3><p><code>
-        AddType text/example .exm
-    </code></p></div>
-
-    <div class="example"><h3><code>httpd.conf ¤Î¥»¥¯¥·¥ç¥ó</code>
-    file</h3><p><code>
-      &lt;Directory /www/htdocs/example&gt;<br />
-      <span class="indent">
-        AddType text/example .exm<br />
-      </span>
-      &lt;/Directory&gt;
-    </code></p></div>
-
-    <p>¤·¤«¤·¡¢¤³¤ÎÀßÄê¤Ï¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë¤Ë½ñ¤¤¤¿Êý¤¬¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤Î
-    Äã²¼¤¬¾¯¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤¬¥ê¥¯¥¨¥¹¥È¤µ¤ì¤ëÅÙ¤Ë
-    Æɤ߹þ¤Þ¤ì¤ëÂå¤ï¤ê¤Ë¡¢Apache ¤Îµ¯Æ°»þ¤Ë 1 ²ó¤À¤±Æɤ߹þ¤á¤Ð
-    ¤è¤¯¤Ê¤ë¤«¤é¤Ç¤¹¡£</p>
-
-    <p><code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-    Ãͤò <code>none</code> ¤ËÀßÄꤹ¤ë¤³¤È¤Ç <code>.htaccess</code> ¥Õ¥¡¥¤¥ë
-    ¤Î»ÈÍѤò´°Á´¤Ë̵¸ú¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      AllowOverride None
-    </code></p></div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="how" id="how">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎŬÍѤΤµ¤ìÊý</a></h2>
-
-    <p><code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤ÎÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ë¤Î¸ºß¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤È¡¢¤½¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤¹¤Ù¤Æ¤ËŬÍѤµ¤ì¤Þ¤¹¡£
-    ¤·¤«¤·¡¢¾å¤Î³¬ÁؤΥǥ£¥ì¥¯¥È¥ê¤Ë¤â <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤¬
-    ¸ºß¤¹¤ë¤«¤â¤·¤ì¤Ê¤¤¤³¤È¤ò³Ð¤¨¤Æ¤ª¤¯¤³¤È¤ÏÂçÀڤǤ¹¡£¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¸½¤ì¤ë
-    ½çÈÖ¤ËŬÍѤµ¤ì¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î <code>.htaccess</code> ¤Ï
-    ¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼¤Î¤è¤ê¾å¤Î³¬ÁؤΠ<code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Î
-    ÀßÄê¤ò¾å½ñ¤­¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤½¤·¤Æ¡¢¤½¤Î <code>.htaccess</code> ¤â
-    ¤è¤ê¾å¤Î³¬Áؤǽñ¤«¤ì¤¿¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¾å½ñ¤­¤·¤¿¤ê¡¢¼ç¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë
-    ¤½¤Î¤â¤Î¤ÎÀßÄê¤ò¾å½ñ¤­¤·¤¿¤ê¤·¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>
-
-    <p>Îã:</p>
-
-    <p>¥Ç¥£¥ì¥¯¥È¥ê <code>/www/htdocs/example1</code> ¤Ë°Ê²¼¤ÎÆâÍƤÎ
-    <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-       Options +ExecCGI
-    </code></p></div>
-
-    <p>(Ãí: <code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ë¤Ç "<code class="directive"><a href="../mod/core.html#options">Options</a></code>" ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Í­¸ú¤Ë¤Ê¤ë¤¿¤á¤Ë¤Ï¡¢
-    "<code>AllowOverride Options</code>" ¤òÍ­¸ú¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£)</p>
-
-    <p>¥Ç¥£¥ì¥¯¥È¥ê <code>/www/htdocs/example1/example2</code> ¤Ë¤Ï
-    °Ê²¼¤Î¤è¤¦¤Ê <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-       Options Includes
-    </code></p></div>
-
-    <p>Æó¤Ä¤á¤Î <code>.htaccess</code> ¤Ë¤è¤ê¡¢¥Ç¥£¥ì¥¯¥È¥ê
-    <code>/www/htdocs/example1/example2</code> ¤Ç¤Ï CGI ¤Î¼Â¹Ô¤Ï
-    µö²Ä¤µ¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ï¡¢<code>Options Includes</code> ¤Î¤ß¤¬
-    ¸úÎϤò»ý¤Á¡¢¤½¤ì¤¬¤¹¤Ù¤Æ¤Î°ÊÁ°¤ÎÀßÄê¤ò¾å½ñ¤­¤¹¤ë¤«¤é¤Ç¤¹¡£</p>
-
-    <h3><a name="merge" id="merge">¥á¥¤¥óÀßÄê¥Õ¥¡¥¤¥ë¤ËÂФ¹¤ë
-    .htaccess ¤Î¥Þ¡¼¥¸</a></h3>
-
-    <p>As discussed in the documentation on <a href="../sections.html">Configuration Sections</a>,
-    <code>.htaccess</code> files can override the <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> sections for
-    the corresponding directory, but will be overriden by other types
-    of configuration sections from the main configuration files.  This
-    fact can be used to enforce certain configurations, even in the
-    presence of a liberal <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> setting.  For example, to
-    prevent script execution while allowing anything else to be set in
-    <code>.htaccess</code> you can use:</p>
-    <p><a href="../sections.html">¥»¥¯¥·¥ç¥ó¤ÎÀßÄê</a>
-    ¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢<code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤ò»È¤Ã¤Æ
-    <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
-    ¥»¥¯¥·¥ç¥ó¤ÎÀßÄê¤ò¥Ç¥£¥ì¥¯¥È¥êËè¤Ë¾å½ñ¤­¤Ç¤­¤Þ¤¹¤¬¡¢
-    ¥á¥¤¥óÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Ë¤¢¤ë¡¢Â¾¤Î¼ïÎà¤ÎÀßÄꥻ¥¯¥·¥ç¥ó¤Ë¤è¤Ã¤Æ
-    ¤µ¤é¤Ë¾å½ñ¤­¤µ¤ì¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¡£
-    ¤³¤ÎÆÃħ¤ò»È¤Ã¤Æ¡¢
-    <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
-    ¤Ç¼«Í³Å٤ι⤤ÀßÄ꤬¤¢¤Ã¤¿¤È¤·¤Æ¤â¡¢¤¢¤ëÆÃÄê¤ÎÀßÄ꤬³Î¼Â¤Ë
-    È¿±Ç¤µ¤ì¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£Î㤨¤Ð¡¢CGI ¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ï
-    ÉÔµö²Ä¤Ë¡¢¤«¤Ä¡¢<code>.htaccess</code> ¤Ç¤½¤Î¾¤Î¹àÌܤÏ
-    ÀßÄê¤Ç¤­¤ë¤è¤¦¤Ë¡¢¤È¤¤¤¦¾ì¹ç¤Ï¼¡¤Î¤è¤¦¤Ë¤Ç¤­¤Þ¤¹ :</p>
-    
-    <div class="example"><p><code>
-&lt;Directory /&gt;<br />
-<span class="indent">
-Allowoverride All<br />
-</span>
-&lt;/Directory&gt;<br />
-<br />
-&lt;Location /&gt;<br />
-<span class="indent">
-Options +IncludesNoExec -ExecCGI<br />
-</span>
-&lt;/Location&gt;
-    </code></p></div>
-
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="auth" id="auth">ǧ¾Ú¤ÎÎã</a></h2>
-
-    <p>¤â¤·Ç§¾Ú¤ÎÊýË¡¤òÃΤ뤿¤á¤Ë¤³¤ÎÉôʬ¤ËľÀÜÍ褿¤Î¤Ç¤¢¤ì¤Ð¡¢¼¡¤Î¤³¤È¤ò
-    ÃΤäƤª¤¯¤³¤È¤¬½ÅÍפǤ¹¡£¤è¤¯¤¢¤ë¸í²ò¤Ë¡¢¥Ñ¥¹¥ï¡¼¥Éǧ¾Ú¤ò¹Ô¤Ê¤¦¤¿¤á¤Ë¤Ï
-    <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤ò»È¤¦É¬Íפ¬¤¢¤ë¡¢¤È¤¤¤¦¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤ì¤ÏÀµ¤·¤¯¤¢¤ê¤Þ¤»¤ó¡£¼ç¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë¤Î <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤Ë
-    ǧ¾ÚÍѤΥǥ£¥ì¥¯¥Æ¥£¥Ö¤ò½ñ¤¯Êý¤¬¿ä¾©¤µ¤ì¤ëÊýË¡¤Ç¡¢<code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ë¤Ï¼ç¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë¤òÊѹ¹¤Ç¤­¤Ê¤¤¤È¤­¤Ë¤Î¤ß»ÈÍѤ¹¤Ù¤­¤Ç¤¹¡£
-    ¤¤¤Ä <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤ò»È¤¦¤Ù¤­¤Ç¡¢¤¤¤Ä»È¤¦¤Ù¤­¤Ç¤Ï¤Ê¤¤¤«¤Ë
-    ¤Ä¤¤¤Æ¤Ï <a href="#when">¾å</a>¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>°Ê¾å¤Î¤³¤È¤ò¤Õ¤Þ¤¨¤¿¾å¤Ç¡¢¤â¤· <code>.htaccess</code> ¤Î»ÈÍѤ¬
-    ¤Þ¤ÀɬÍפÀ¤È»×¤¦¾ì¹ç¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¤â¤Î¤¬Ë¾¤ß¤Î¤³¤È¤ò¤·¤Æ¤¯¤ì¤ë¤«¤â
-    ¤·¤ì¤Þ¤»¤ó¡£</p>
-
-    <p><code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤ÎÆâÍÆ:</p>
-
-    <div class="example"><p><code>
-      AuthType Basic<br />
-      AuthName "Password Required"<br />
-      AuthUserFile /www/passwords/password.file<br />
-      AuthGroupFile /www/passwords/group.file<br />
-      Require Group admins
-    </code></p></div>
-
-    <p>¤³¤ì¤é¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Í­¸ú¤Ë¤Ê¤ë¤¿¤á¤Ë¤Ï¡¢
-    <code>AllowOverride AuthConfig</code> ¤¬Í­¸ú¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤é¤Ê¤¤¤³¤È¤Ë
-    Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>ǧ¾Ú¤È¾µÇ§¤Ë¤Ä¤¤¤Æ¤Ï <a href="auth.html">ǧ¾Ú¥Á¥å¡¼¥È¥ê¥¢¥ë</a>¤ò
-    »²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="ssi" id="ssi">SSI ¤ÎÎã</a></h2>
-
-    <p>¤â¤¦°ì¤Ä¤Î <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Î¤è¤¯¤¢¤ëÍøÍÑË¡¤Ï
-    ÆÃÄê¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç SSI ¤òÍ­¸ú¤Ë¤¹¤ë¤³¤È¤Ç¤¹¡£¤³¤ì¤Ï¡¢Ë¾¤ß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î
-    <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ë°Ê²¼¤ÎÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò½ñ¤¯¤³¤È¤Ç
-    ãÀ®¤Ç¤­¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-       Options +Includes<br />
-       AddType text/html shtml<br />
-       AddHandler server-parsed shtml
-    </code></p></div>
-
-    <p>¤³¤ì¤é¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Í­¸ú¤Ë¤Ê¤ë¤¿¤á¤Ë¤Ï¡¢
-    <code>AllowOverride Options</code> ¤È <code>AllowOverride
-    FileInfo</code> ¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>¤è¤ê¤Þ¤È¤Þ¤Ã¤¿ SSI ¤ÎÀâÌÀ¤Ï <a href="ssi.html">SSI ¥Á¥å¡¼¥È¥ê¥¢¥ë</a>¤ò
-    »²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="cgi" id="cgi">CGI ¤ÎÎã</a></h2>
-
-    <p>ºÇ¸å¤Ë¡¢ÆÃÄê¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç CGI ¥×¥í¥°¥é¥à¤Î¼Â¹Ô¤òµö²Ä¤·¤¿¤¤¤³¤È¤¬
-    ¤¢¤ë¤Ç¤·¤ç¤¦¡£¤³¤ì¤Ï°Ê²¼¤ÎÀßÄê¤Ç¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-       Options +ExecCGI<br />
-       AddHandler cgi-script cgi pl
-    </code></p></div>
-
-    <p>¤â¤·¤¯¤Ï¡¢¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤¬ CGI ¥×¥í¥°¥é¥à¤È
-    ¤ß¤Ê¤µ¤ì¤ë¤è¤¦¤Ë¤·¤¿¤¤¤Ê¤é¡¢°Ê²¼¤ÎÀßÄê¤Ç¼Â¸½¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-       Options +ExecCGI<br />
-       SetHandler cgi-script
-    </code></p></div>
-
-    <p>¤³¤ì¤é¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Í­¸ú¤Ë¤Ê¤ë¤¿¤á¤Ë¤Ï¡¢
-    <code>AllowOverride Options</code> ¤È <code>AllowOverride
-    FileInfo</code> ¤¬Í­¸ú¤Ç¤¢¤ëɬÍפ¬¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>CGI ¥×¥í¥°¥é¥à¤ÈÀßÄê¤Î¤è¤ê¤Þ¤È¤Þ¤Ã¤¿ÀâÌÀ¤Ï <a href="cgi.html">CGI ¥Á¥å¡¼¥È¥ê¥¢¥ë</a>¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="troubleshoot" id="troubleshoot">ÌäÂê²ò·è</a></h2>
-
-    <p>ÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ë½ñ¤¤¤¿¤±¤ì¤É¤â¡¢
-    ´üÂÔ¤·¤¿¸ú²Ì¤¬ÆÀ¤é¤ì¤Ê¤¤¤È¤­¤Ë¤Ï¡¢¤¤¤¯¤Ä¤«¤Î¸¶°ø¤¬¹Í¤¨¤é¤ì¤Þ¤¹¡£</p>
-
-    <p>°ìÈ֤褯¤¢¤ë¤³¤È¤Ï¡¢ÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬¹Í褵¤ì¤ë¤è¤¦¤Ë¤Ï
-    <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤
-    ¤È¤¤¤¦¤â¤Î¤Ç¤¹¡£³ºÅö¤Î¥Õ¥¡¥¤¥ë¤Î¥¹¥³¡¼¥×¤Ë <code>AllowOverride None</code>
-    ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤ì¤òÄ´¤Ù¤ë¤¿¤á¤ÎÎɤ¤ÊýË¡¤Ï¡¢
-    <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ë¤´¤ß¤ò½ñ¤¤¤Æ¡¢¥ê¥í¡¼¥É¤¹¤ë¤³¤È¤Ç¤¹¡£
-    ¥µ¡¼¥Ð¤Î¥¨¥é¡¼¤¬À¸À®¤µ¤ì¤Ê¤¤¤È¤­¤Ï¡¢¤Û¤Ü³Î¼Â¤Ë <code>AllowOverride
-    None</code> ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¾õÂ֤ˤʤäƤ¤¤Þ¤¹¡£</p>
-
-    <p>¤½¤¦¤Ç¤Ï¤Ê¤¯¡¢Ê¸½ñ¤ò¥¢¥¯¥»¥¹¤·¤è¤¦¤È¤·¤¿¤È¤­¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Æ¤¤¤ë
-    ¤È¤­¤Ï¡¢Apache ¤Î¥¨¥é¡¼¥í¥°¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£<code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ç
-    »ÈÍѤµ¤ì¤¿¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬µö²Ä¤µ¤ì¤Æ¤¤¤Ê¤¤¡¢¤È¤¤¤¦¤³¤È¤òÃΤ餻¤Æ¤¤¤ë
-    ²ÄǽÀ­¤¬¹â¤¤¤Ç¤¹¡£¤Þ¤¿¤Ï¡¢¹½Ê¸¤Î´Ö°ã¤¤¤¬¤¢¤ë¤³¤È¤ò½Ò¤Ù¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-    ¤½¤Î¾ì¹ç¤Ë¤Ï¤Þ¤º¤½¤ì¤ò½¤Àµ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/howto/htaccess.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/howto/htaccess.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/htaccess.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../pt-br/howto/htaccess.html" hreflang="pt-br" rel="alternate" title="Portugu�«´s (Brasil)">&nbsp;pt-br&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/htaccess.html.ja.utf8 b/docs/manual/howto/htaccess.html.ja.utf8
new file mode 100644
index 00000000..39db39c0
--- /dev/null
+++ b/docs/manual/howto/htaccess.html.ja.utf8
@@ -0,0 +1,383 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Apache �ュートリアル: .htaccess ファイル - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">How-To / �ュートリアル</a></div><div id="page-content"><div id="preamble"><h1>Apache �ュートリアル: .htaccess ファイル</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/howto/htaccess.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/howto/htaccess.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/howto/htaccess.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../pt-br/howto/htaccess.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
+</div>
+
+<p><code>.htaccess</code> ファイル�ディレクトリ毎�設定を変更�る方法を
+�供���。</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">.htaccess ファイル</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#what">.htaccess ファイル��何�/��使�方</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#when">�� .htaccess ファイルを使�(使���)�。</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#how">ディレクティブ��用��れ方</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#auth">�証�例</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ssi">SSI �例</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cgi">CGI �例</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#troubleshoot">�題解決</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="related" id="related">.htaccess ファイル</a></h2>
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="../mod/core.html">core</a></code></li><li><code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code></li><li><code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code></li><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="../mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#accessfilename">AccessFileName</a></code></li><li><code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code></li><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li><li><code class="directive"><a href="../mod/core.html#authtype">AuthType</a></code></li><li><code class="directive"><a href="../mod/core.html#authname">AuthName</a></code></li><li><code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code></li><li><code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code></li><li><code class="directive"><a href="../mod/core.html#require">Require</a></code></li></ul></td></tr></table>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="what" id="what">.htaccess ファイル��何�/��使�方</a></h2>
+
+
+    <p><code>.htaccess</code> ファイル (「分散設定ファイル�) �
+    ディレクトリ毎�設定を変更�る方法を�供���。ディレクティブ�
+    書�れ�ファイルをディレクトリ�置�������ディレクトリ���
+    サブディレクトリ����ディレクティブを�用��る�������。</p>
+
+    <div class="note"><h3>注:</h3>
+      <p><code>.htaccess</code> ファイルを別�������場���
+      <code class="directive"><a href="../mod/core.html#accessfilename">AccessFileName</a></code> ディレクティブを
+      使��変更�る�������。例�����ファイルを <code>.config</code> 
+      ���������場���以下�設定をサー�設定ファイル�入れる���
+      ����:</p>
+
+      <div class="example"><p><code>
+        AccessFileName .config
+      </code></p></div>
+    </div>
+
+    <p>一般��<code>.htaccess</code> ファイル�構文�
+    <a href="../configuring.html#syntax">主設定ファイル</a>
+    �����。�れら�ファイル�書������るディレクティブ� <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> ディレクティブ�より決�り��。
+    ��ディレクティブ��<code>.htaccess</code> ファイル�
+    書�れ�ディレクティブ�中���
+    ��ディレクティブ��用�れる�をカテゴリー���指定���。
+    <code>.htaccess</code> �書������るディレクティブ��れ��
+    説明文書��「上書�����項目��り�.htaccess �書������るよ��
+    �る��� <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> �値�指定�れ����。</p>
+
+    <p>例���<code class="directive"><a href="../mod/core.html#adddefaultcharset">AddDefaultCharset</a></code> ディレクティブ�説明を
+    見る��<code>.htaccess</code> ファイル��使用�許��れ��る���
+    ��り��。 (ディレクティブ�概��所��る「コンテキスト��書�れ��る
+    行を見�����。) <a href="../mod/directive-dict.html#Context">上書�</a>�書�れ��る行��
+    <code>FileInfo</code> ��り��。���ら�<code>.htaccess</code> 中�
+    ��ディレクティブ�有効��る�����少���も
+    <code>AllowOverride FileInfo</code> �設定�れ��る必���り��。</p>
+
+    <div class="example"><h3>例:</h3><table>
+        <tr>
+          <td><a href="../mod/directive-dict.html#Context">コンテキスト:</a></td>
+          <td>サー�設定ファイル,�ー�ャルホスト,ディレクトリ,.htaccess</td>
+        </tr>
+
+        <tr>
+          <td><a href="../mod/directive-dict.html#Override">上書�:</a></td>
+          <td>FileInfo</td>
+        </tr>
+      </table></div>
+
+    <p>�るディレクティブを <code>.htaccess</code> ファイル�書������る�
+    �����ら��������ディレクティブ�説明を探���".htaccess"
+    ����「コンテキスト��行を調������。</p>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="when" id="when">�� .htaccess ファイルを使�(使���)�。</a></h2>
+
+    <p>一般的��サー��主設定ファイル�アクセス����場�を除���
+    <code>.htaccess</code> ファイル�使用�極力�������。
+    世�中���例���ユーザ�証�常� <code>.htaccess</code> ファイル�
+    行����れ��ら������誤解�広�������������ん����
+    �り��ん。ユーザ�証�設定�サー�主設定ファイル�書�������
+    実際���方�より良�設定方法��。</p>
+
+    <p><code>.htaccess</code> ファイル�コンテンツ�供者�ディレクトリ毎�
+    設定を行�����れ��サー�システム� root アクセス権�を������
+    ���場����使���も���。サー�管�者�頻��設定変更を行�����
+    ����������個々�ユーザ� <code>.htaccess</code> ファイルを使��
+    自分�設定�変更を行����を許���方�良���も�る��ょ�。
+    �れ�特��ISP �複数�ユーザ�サイトを一��マシン�ホスト�����
+    �ユーザ�設定�変更を��るよ�����よ���������り��。</p>
+
+    <p>����普通��能��れ� <code>.htaccess</code> ファイル�使用�
+    �������。<code>.htaccess</code> ファイル�書���考�るよ��
+    ����設定��サー��主設定ファイル� <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> セクション���よ��行�����
+    ����。</p>
+
+    <p><code>.htaccess</code> ファイル�使用を��る�由�主�二��り��。</p>
+
+    <p>一�目�サー��性能��題��。<code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> ディレクティブ�
+    <code>.htaccess</code> ファイル�設定を許����る場���Apache �
+    �ディレクトリ� <code>.htaccess</code> ファイルを探���。
+    ���ら�<code>.htaccess</code> ファイルを許��る��実際�使用���る�
+    ����関�ら��性能�低下を招�����り��! ���<code>.htaccess</code>
+    ファイル�文書�リクエスト�れる度�読�込�れ��。</p>
+
+    <p>�ら��Apache ��用���ディレクティブを集�る��������
+    上��ディレクトリ� <code>.htaccess</code> ファイルを探�必���る���も
+    注�������。(<a href="#how">ディレクティブ��用�れる方法</a>を
+    �照������。)���ら�<code>/www/htdocs/example</code> ��る
+    ファイル�リクエスト�れ�����Apache �以下�ファイルを調���。</p>
+
+    <div class="example"><p><code>
+      /.htaccess<br />
+      /www/.htaccess<br />
+      /www/htdocs/.htaccess<br />
+      /www/htdocs/example/.htaccess
+    </code></p></div>
+
+    <p>���ら���ディレクトリ��れ�れ�ファイル��アクセス�対���
+    上�例�ファイル�����存在������も�追加�ファイルシステム�
+    アクセス�行��れる����り��。(�れ��<code>.htaccess</code> �
+    <code>/</code> �対��有効�����る���場���普通������
+    ������注�������。)</p>
+
+    <p>二�目�セキュリティ��。ユーザ�サー��設定を変更�る��を
+    許��る����り��������自身�管�����変更を�れる
+    �れ��り��。ユーザ���特権を与�る��良��������分
+    検討������。���ユーザ�与�る権��必��も�よりも少���る��
+    余分�技術サ�ート報告を���るよ���る�能性�高����も
+    注�������。確実��ユーザ���程度�権�を与���明確�告�るよ��
+    ������。<code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> �
+    何を設定����������関連�る文書を示�����
+    後々�混乱を���減ら����
+    ����。</p>
+
+    <p>�����ディレクティブ�書�れ� <code>.htaccess</code> を
+    <code>/www/htdocs/example</code> �置�������ディレクティブを
+    主サー�設定� Directory セクション
+    <code>&lt;Directory /www/htdocs/example&gt;</code> �書����
+    完全�等価��:</p>
+
+    <p><code>/www/htdocs/example</code> � <code>.htaccess</code> ファイル:</p>
+
+    <div class="example"><h3><code>/www/htdocs/example</code> � .htaccess ファイル�
+    内容</h3><p><code>
+        AddType text/example .exm
+    </code></p></div>
+
+    <div class="example"><h3><code>httpd.conf �セクション</code>
+    file</h3><p><code>
+      &lt;Directory /www/htdocs/example&gt;<br />
+      <span class="indent">
+        AddType text/example .exm<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p>������設定�サー�設定ファイル�書��方�パフォーマンス�
+    低下�少���り��。ファイル�リクエスト�れる度�
+    読�込�れる代�り��Apache �起動時� 1 回��読�込��
+    よ��る�ら��。</p>
+
+    <p><code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> ディレクティブ�
+    値を <code>none</code> �設定�る��� <code>.htaccess</code> ファイル
+    �使用を完全�無効��る�������。</p>
+
+    <div class="example"><p><code>
+      AllowOverride None
+    </code></p></div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="how" id="how">ディレクティブ��用��れ方</a></h2>
+
+    <p><code>.htaccess</code> ファイル�設定ディレクティブ� <code>.htaccess</code>
+    ファイル�存在�るディレクトリ����サブディレクトリ�����用�れ��。
+    ����上�階層�ディレクトリ�も <code>.htaccess</code> ファイル�
+    存在�る�も�れ����を覚�������大切��。ディレクティブ��れる
+    順番��用�れ��。���ら��るディレクトリ� <code>.htaccess</code> �
+    ディレクトリツリー�より上�階層� <code>.htaccess</code> ファイル�
+    設定を上書��る�も�れ��ん。������ <code>.htaccess</code> も
+    より上�階層�書�れ�ディレクティブを上書���り�主サー�設定ファイル
+    ��も��設定を上書���り���る�も�れ��ん。</p>
+
+    <p>例:</p>
+
+    <p>ディレクトリ <code>/www/htdocs/example1</code> �以下�内容�
+    <code>.htaccess</code> ファイル��り��:</p>
+
+    <div class="example"><p><code>
+       Options +ExecCGI
+    </code></p></div>
+
+    <p>(注: <code>.htaccess</code>
+    ファイル� "<code class="directive"><a href="../mod/core.html#options">Options</a></code>" ディレクティブ�有効��る�����
+    "<code>AllowOverride Options</code>" を有効��る必���り��。)</p>
+
+    <p>ディレクトリ <code>/www/htdocs/example1/example2</code> ��
+    以下�よ�� <code>.htaccess</code> ファイル��り��:</p>
+
+    <div class="example"><p><code>
+       Options Includes
+    </code></p></div>
+
+    <p>二��� <code>.htaccess</code> �より�ディレクトリ
+    <code>/www/htdocs/example1/example2</code> �� CGI �実行�
+    許��れ��ん。�れ��<code>Options Includes</code> ���
+    効力を����れ�����以��設定を上書��る�ら��。</p>
+
+    <h3><a name="merge" id="merge">メイン設定ファイル�対�る
+    .htaccess �マージ</a></h3>
+
+    <p>As discussed in the documentation on <a href="../sections.html">Configuration Sections</a>,
+    <code>.htaccess</code> files can override the <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> sections for
+    the corresponding directory, but will be overriden by other types
+    of configuration sections from the main configuration files.  This
+    fact can be used to enforce certain configurations, even in the
+    presence of a liberal <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> setting.  For example, to
+    prevent script execution while allowing anything else to be set in
+    <code>.htaccess</code> you can use:</p>
+    <p><a href="../sections.html">セクション�設定</a>
+    �記載�れ��るよ���<code>.htaccess</code> ファイルを使��
+    <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
+    セクション�設定をディレクトリ毎�上書�������
+    メイン設定ファイル中��る�他�種類�設定セクション�よ��
+    �ら�上書��れる��も�り��。
+    ��特徴を使���
+    <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
+    �自由度�高�設定�������も��る特定�設定�確実�
+    �映�れるよ������。例���CGI スクリプト�実行�
+    �許������<code>.htaccess</code> ���他�項目�
+    設定��るよ������場��次�よ������ :</p>
+    
+    <div class="example"><p><code>
+&lt;Directory /&gt;<br />
+<span class="indent">
+Allowoverride All<br />
+</span>
+&lt;/Directory&gt;<br />
+<br />
+&lt;Location /&gt;<br />
+<span class="indent">
+Options +IncludesNoExec -ExecCGI<br />
+</span>
+&lt;/Location&gt;
+    </code></p></div>
+
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="auth" id="auth">�証�例</a></h2>
+
+    <p>も��証�方法を知る�����部分�直接�����れ��次���を
+    知�����������。よ��る誤解��パスワード�証を行������
+    <code>.htaccess</code> ファイルを使�必���る����も���り��。
+    �れ�正���り��ん。主サー�設定ファイル� <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> セクション�
+    �証用�ディレクティブを書�方�推奨�れる方法��<code>.htaccess</code>
+    ファイル�主サー�設定ファイルを変更���������使用�����。
+    �� <code>.htaccess</code> ファイルを使�������使���������
+    ���� <a href="#when">上</a>を�照������。</p>
+
+    <p>以上���を����上��も� <code>.htaccess</code> �使用�
+    ��必�����場���次�よ��も��望����を���れる�も
+    �れ��ん。</p>
+
+    <p><code>.htaccess</code> ファイル�内容:</p>
+
+    <div class="example"><p><code>
+      AuthType Basic<br />
+      AuthName "Password Required"<br />
+      AuthUserFile /www/passwords/password.file<br />
+      AuthGroupFile /www/passwords/group.file<br />
+      Require Group admins
+    </code></p></div>
+
+    <p>�れら�ディレクティブ�有効��る�����
+    <code>AllowOverride AuthConfig</code> �有効������ら�����
+    注�������。</p>
+
+    <p>�証�承������ <a href="auth.html">�証�ュートリアル</a>を
+    �照������。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ssi" id="ssi">SSI �例</a></h2>
+
+    <p>も�一�� <code>.htaccess</code> ファイル�よ��る利用法�
+    特定�ディレクトリ� SSI を有効��る����。�れ��望��ディレクトリ�
+    <code>.htaccess</code> ファイル�以下�設定ディレクティブを書����
+    ������:</p>
+
+    <div class="example"><p><code>
+       Options +Includes<br />
+       AddType text/html shtml<br />
+       AddHandler server-parsed shtml
+    </code></p></div>
+
+    <p>�れら�ディレクティブ�有効��る�����
+    <code>AllowOverride Options</code> � <code>AllowOverride
+    FileInfo</code> �有効�����る必���る���注�������。</p>
+
+    <p>より����� SSI �説明� <a href="ssi.html">SSI �ュートリアル</a>を
+    �照������。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="cgi" id="cgi">CGI �例</a></h2>
+
+    <p>最後��特定�ディレクトリ� CGI プログラム�実行を許�������
+    �る��ょ�。�れ�以下�設定�行���������:</p>
+
+    <div class="example"><p><code>
+       Options +ExecCGI<br />
+       AddHandler cgi-script cgi pl
+    </code></p></div>
+
+    <p>も�����るディレクトリ�����ファイル� CGI プログラム�
+    ���れるよ������ら�以下�設定�実��る�������:</p>
+
+    <div class="example"><p><code>
+       Options +ExecCGI<br />
+       SetHandler cgi-script
+    </code></p></div>
+
+    <p>�れら�ディレクティブ�有効��る�����
+    <code>AllowOverride Options</code> � <code>AllowOverride
+    FileInfo</code> �有効��る必���る���注�������。</p>
+
+    <p>CGI プログラム�設定�より�����説明� <a href="cgi.html">CGI �ュートリアル</a>を�照������。</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="troubleshoot" id="troubleshoot">�題解決</a></h2>
+
+    <p>設定ディレクティブを <code>.htaccess</code> ファイル�書���れ�も�
+    期待��効果�得られ������������原因�考�られ��。</p>
+
+    <p>一番よ��る����設定ディレクティブ�考慮�れるよ���
+    <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> �設定�れ����
+    ���も���。該当�ファイル�スコープ� <code>AllowOverride None</code>
+    �設定�れ������を確�������。�れを調�る���良�方法��
+    <code>.htaccess</code> ファイル���を書���リロード�る����。
+    サー��エラー�生��れ��������確実� <code>AllowOverride
+    None</code> �設定�れ��る状態�������。</p>
+
+    <p>�������文書をアクセス�よ�������エラー�発生���る
+    ����Apache �エラーログを調������。<code>.htaccess</code> ファイル�
+    使用�れ�ディレクティブ�許��れ����������を知ら���る
+    �能性�高���。����構文�間����る��を述���る�も�れ��ん。
+    ��場������れを修正�る必���り��。</p>
+
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/howto/htaccess.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/howto/htaccess.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/howto/htaccess.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../pt-br/howto/htaccess.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/htaccess.html.ko.euc-kr b/docs/manual/howto/htaccess.html.ko.euc-kr
index 092688b4..a1590f69 100644
--- a/docs/manual/howto/htaccess.html.ko.euc-kr
+++ b/docs/manual/howto/htaccess.html.ko.euc-kr
@@ -328,6 +328,6 @@
 <a href="../ko/howto/htaccess.html" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../pt-br/howto/htaccess.html" hreflang="pt-br" rel="alternate" title="Portugu&#234;s (Brasil)">&nbsp;pt-br&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/htaccess.html.pt-br b/docs/manual/howto/htaccess.html.pt-br
index 2424fafe..d9bc4367 100644
--- a/docs/manual/howto/htaccess.html.pt-br
+++ b/docs/manual/howto/htaccess.html.pt-br
@@ -23,6 +23,8 @@
 <a href="../ko/howto/htaccess.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../pt-br/howto/htaccess.html" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
 </div>
+<div class="outofdate">Esta tradução pode estar desatualizada. 
+        Verifique a versão em Inglês para mudanças recentes.</div>
 
 <p>Arquivos <code>.htaccess</code> oferecem um meio de fazer mudanças
  nas configurações por-diretório.</p>
@@ -370,6 +372,6 @@
 <a href="../ko/howto/htaccess.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="../pt-br/howto/htaccess.html" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licenciado sob a <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licenciado sob a <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Módulos</a> | <a href="../mod/directives.html">Diretrizes</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossário</a> | <a href="../sitemap.html">Mapa do site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/index.html b/docs/manual/howto/index.html
index 9ee33086..4f3357b3 100644
--- a/docs/manual/howto/index.html
+++ b/docs/manual/howto/index.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: index.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: index.html.ja.euc-jp
+URI: index.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: index.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/howto/index.html.en b/docs/manual/howto/index.html.en
index 7de9c8af..83d02494 100644
--- a/docs/manual/howto/index.html.en
+++ b/docs/manual/howto/index.html.en
@@ -112,6 +112,6 @@
 <a href="../ja/howto/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/index.html.ja.euc-jp b/docs/manual/howto/index.html.ja.euc-jp
deleted file mode 100644
index 5cbf0739..00000000
--- a/docs/manual/howto/index.html.ja.euc-jp
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>How-To / ¥Á¥å¡¼¥È¥ê¥¢¥ë - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page" class="no-sidebar"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="../"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>How-To / ¥Á¥å¡¼¥È¥ê¥¢¥ë</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/howto/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/howto/" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="howto" id="howto">How-To / ¥Á¥å¡¼¥È¥ê¥¢¥ë</a></h2>
-
-    
-
-    <dl>
-      <dt>ǧ¾Ú</dt>
-      <dd>
-        <p>ǧ¾Ú¤È¤Ï¡¢Ã¯¤«¤¬¼«Ê¬¤Ïï¤Ç¤¢¤ë¤«¤ò̾¾è¤Ã¤Æ¤¤¤ë¤â¤Î¤ò¸¡¾Ú¤¹¤ë
-        ½èÍý¤Î¤³¤È¤Ç¤¹¡£¾µÇ§¤È¤Ï¡¢Ã¯¤«¤¬Ë¾¤ß¤Î¾ì½ê¤Ëé¤êÃ失¤¿¤ê¡¢
-        ˾¤ß¤Î¾ðÊó¤ò¼ê¤ËÆþ¤ì¤¿¤ê¤¹¤ë¤³¤È¤òµö²Ä¤¹¤ë½èÍý¤Î¤³¤È¤Ç¤¹¡£</p>
-
-        <p>»²¾È: <a href="auth.html">ǧ¾Ú¡¢¾µÇ§¡¢¥¢¥¯¥»¥¹À©¸æ</a></p>
-      </dd>
-    </dl>
-
-    <dl>
-      <dt>CGI ¤Ë¤è¤ëưŪ¥³¥ó¥Æ¥ó¥Ä</dt>
-      <dd>
-        <p>CGI (Common Gateway Interface) ¤Ï¥¦¥§¥Ö¥µ¡¼¥Ð¤¬³°Éô¤Î¥³¥ó¥Æ¥ó¥Ä
-        À¸À®¥×¥í¥°¥é¥à¤È¤É¤Î¤è¤¦¤ËÁê¸ßÆ°ºî¤ò¤¹¤ë¤«¤òÄêµÁ¤·¤Þ¤¹¡£
-        ¤½¤Î³°Éô¥×¥í¥°¥é¥à¤ÏÄ̾ï CGI ¥×¥í¥°¥é¥à¤ä CGI ¥¹¥¯¥ê¥×¥È¤È¸Æ¤Ð¤ì¤Þ¤¹¡£
-        CGI ¤Ï¥¦¥§¥Ö¥µ¥¤¥È¤ËưŪ¤Ê¥³¥ó¥Æ¥ó¥Ä¤òÄɲ乤뤿¤á¤Î¡¢
-        °ìÈÖñ½ã¤Ç¤è¤¯»È¤ï¤ì¤Æ¤¤¤ëÊýË¡¤Ç¤¹¡£¤³¤Îʸ½ñ¤Ï Apache ¥¦¥§¥Ö¥µ¡¼¥Ð¤Ë
-        CGI ¤òÀßÄꤷ¡¢CGI ¥×¥í¥°¥é¥à¤ò½ñ¤­»Ï¤á¤ë¤¿¤á¤Î¥¤¥ó¥È¥í¥À¥¯¥·¥ç¥ó¤Ç¤¹¡£</p>
-
-        <p>»²¾È: <a href="cgi.html">CGI: ưŪ¥³¥ó¥Æ¥ó¥Ä</a></p>
-      </dd>
-    </dl>
-
-    <dl>
-      <dt><code>.htaccess</code> ¥Õ¥¡¥¤¥ë</dt>
-      <dd>
-        <p><code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ï¥Ç¥£¥ì¥¯¥È¥êËè¤ËÀßÄê¤òÊѹ¹¤¹¤ë¤¿¤á¤Î
-        ÊýË¡¤òÄ󶡤·¤Þ¤¹¡£ÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬½ñ¤«¤ì¤¿¥Õ¥¡¥¤¥ë¤¬¡¢¤¢¤ë¥É¥­¥å¥á¥ó¥È
-        ¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤«¤ì¤ë¤È¡¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤È
-        ¤¹¤Ù¤Æ¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ËŬÍѤµ¤ì¤Þ¤¹¡£</p>
-
-        <p>»²¾È: <a href="htaccess.html"><code>.htaccess</code> ¥Õ¥¡¥¤¥ë</a></p>
-      </dd>
-    </dl>
-
-    <dl>
-      <dt>Server Side Includes ¥¤¥ó¥È¥í¥À¥¯¥·¥ç¥ó</dt>
-      <dd>
-        <p>SSI (Server Side Includes) ¤Ï HTML ¥Ú¡¼¥¸Ãæ¤Ë½ñ¤«¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¡¢
-        ¥Ú¡¼¥¸¤¬Á÷¤é¤ì¤ë»þ¤Ë¥µ¡¼¥Ð¤Ë¤è¤êɾ²Á¤µ¤ì¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢¥Ú¡¼¥¸Á´ÂΤò
-        CGI ¥×¥í¥°¥é¥à¤ÇÀ¸À®¤·¤¿¤ê¡¢Â¾¤ÎưŪ¤Êµ»½Ñ¤ò»È¤¦¤³¤È¤Ê¤¯¡¢´û¸¤Î HTML
-        ¥Ú¡¼¥¸¤ËưŪ¤ËÀ¸À®¤µ¤ì¤¿ÆâÍƤòÉղ乤뤳¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-        <p>»²¾È: <a href="ssi.html">Server Side Includes (SSI)</a></p>
-      </dd>
-    </dl>
-
-    <dl>
-      <dt>¥æ¡¼¥¶Ëè¤Î¥¦¥§¥Ö¥Ç¥£¥ì¥¯¥È¥ê</dt>
-      <dd>
-        <p>Ê£¿ô¥æ¡¼¥¶¤Î¸ºß¤¹¤ë¥·¥¹¥Æ¥à¤Ç¤Ï¡¢¤½¤ì¤¾¤ì¤Î¥æ¡¼¥¶¤Ï <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¦¤³¤È¤Ë¤è¤Ã¤Æ
-        ¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¾å¤Ë¥¦¥§¥Ö¥µ¥¤¥È¤òºîÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-        URL <code>http://example.com/~username/</code> ¤òˬ¤ì¤¿¿Í¤Ï
-        ¥æ¡¼¥¶ "<code>username</code>" ¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Î¡¢<code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤵ¤ì¤¿
-       ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¥³¥ó¥Æ¥ó¥Ä¤òÆÀ¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-        <p>»²¾È: <a href="public_html.html">¥æ¡¼¥¶¥¦¥§¥Ö¥Ç¥£¥ì¥¯¥È¥ê (<code>public_html</code>)</a></p>
-      </dd>
-    </dl>
-
-  </div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/howto/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/howto/" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/index.html.ja.utf8 b/docs/manual/howto/index.html.ja.utf8
new file mode 100644
index 00000000..7271af08
--- /dev/null
+++ b/docs/manual/howto/index.html.ja.utf8
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>How-To / �ュートリアル - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page" class="no-sidebar"><div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="../"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>How-To / �ュートリアル</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/howto/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/howto/" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/howto/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="howto" id="howto">How-To / �ュートリアル</a></h2>
+
+    
+
+    <dl>
+      <dt>�証�承�</dt>
+      <dd>
+        <p>�証���誰��自分�誰��る�を�乗���るも�を検証�る
+        処������。承����誰��望��場所�辿り���り�
+        望��情報を手�入れ�り�る��を許��る処������。</p>
+
+        <p>�照: <a href="auth.html">�証�承�</a></p>
+      </dd>
+    </dl>
+
+    <dl>
+      <dt>アクセス制御</dt>
+      <dd>
+        <p>アクセス制御��������戦略�基���リソース�対�る
+        アクセスを制���り許���り�るプロセスを指���。
+        アクセス制御を実��る方法��������方法��り��。</p>
+
+        <p>See: <a href="access.html">アクセス制御</a></p>
+      </dd>
+    </dl>
+
+   <dl>
+      <dt>CGI �よる動的コンテンツ</dt>
+      <dd>
+        <p>CGI (Common Gateway Interface) �ウェブサー��外部�コンテンツ
+        生�プログラム���よ��相互動作を�る�を定義���。
+        ��外部プログラム�通常 CGI プログラムや CGI スクリプト�呼�れ��。
+        CGI �ウェブサイト�動的�コンテンツを追加�る����
+        一番�純�よ�使�れ��る方法��。��文書� Apache ウェブサー��
+        CGI を設定��CGI プログラムを書�始�る���イントロダクション��。</p>
+
+        <p>�照: <a href="cgi.html">CGI: 動的コンテンツ</a></p>
+      </dd>
+    </dl>
+
+    <dl>
+      <dt><code>.htaccess</code> ファイル</dt>
+      <dd>
+        <p><code>.htaccess</code> ファイル�ディレクトリ毎�設定を変更�る���
+        方法を�供���。設定ディレクティブ�書�れ�ファイル���るドキュメント
+        ディレクトリ�置�れる��ディレクティブ���ディレクトリ�
+        ����サブディレクトリ��用�れ��。</p>
+
+        <p>�照: <a href="htaccess.html"><code>.htaccess</code> ファイル</a></p>
+      </dd>
+    </dl>
+
+    <dl>
+      <dt>Server Side Includes イントロダクション</dt>
+      <dd>
+        <p>SSI (Server Side Includes) � HTML ページ中�書�れるディレクティブ��
+        ページ��られる時�サー��より評価�れ��。�れ�より�ページ全体を
+        CGI プログラム�生���り�他�動的�技術を使������既存� HTML
+        ページ�動的�生��れ�内容を付加�る�������。</p>
+
+        <p>�照: <a href="ssi.html">Server Side Includes (SSI)</a></p>
+      </dd>
+    </dl>
+
+    <dl>
+      <dt>ユーザ毎�ウェブディレクトリ</dt>
+      <dd>
+        <p>複数ユーザ�存在�るシステム����れ�れ�ユーザ� <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> ディレクティブを使����よ��
+        ホームディレクトリ上�ウェブサイトを作��る�������。
+        URL <code>http://example.com/~username/</code> を訪れ�人�
+        ユーザ "<code>username</code>" �ホームディレクトリ��<code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> ディレクティブ�指定�れ�
+       サブディレクトリ�らコンテンツを得る����り��。</p>
+
+        <p>�照: <a href="public_html.html">ユーザウェブディレクトリ (<code>public_html</code>)</a></p>
+      </dd>
+    </dl>
+
+  </div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/howto/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/howto/" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/howto/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/index.html.ko.euc-kr b/docs/manual/howto/index.html.ko.euc-kr
index 1004e520..4017763c 100644
--- a/docs/manual/howto/index.html.ko.euc-kr
+++ b/docs/manual/howto/index.html.ko.euc-kr
@@ -104,6 +104,6 @@
 <a href="../ja/howto/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/public_html.html b/docs/manual/howto/public_html.html
index 690c35b2..f3447477 100644
--- a/docs/manual/howto/public_html.html
+++ b/docs/manual/howto/public_html.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: public_html.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: public_html.html.ja.euc-jp
+URI: public_html.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: public_html.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/howto/public_html.html.en b/docs/manual/howto/public_html.html.en
index 1fee5263..a1f9d808 100644
--- a/docs/manual/howto/public_html.html.en
+++ b/docs/manual/howto/public_html.html.en
@@ -32,6 +32,7 @@
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">Per-user web directories</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#userdir">Setting the file path with UserDir</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#redirect">Redirecting to external URLs</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#enable">Restricting what users are permitted to use this 
     feature</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#cgi">Enabling a cgi directory for each user</a></li>
@@ -86,6 +87,32 @@
     translated to the file path
     <code>/var/www/rbowen/docs/file.html</code></p>
 
+    <p>Multiple directories or directory paths can also be set.</p>
+
+    <div class="example"><p><code>
+      UserDir public_html /var/html
+    </code></p></div>
+
+    <p>For the URL <code>http://example.com/~rbowen/file.html</code>, 
+    Apache will search for <code>~rbowen</code>. If it isn't found, 
+    Apache will search for <code>rbowen</code> in <code>/var/html</code>. If
+    found, the above URL will then be translated to the file path 
+    <code>/var/html/rbowen/file.html</code></p>
+
+  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="redirect" id="redirect">Redirecting to external URLs</a></h2>
+    
+    <p>The <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> directive can be
+      used to redirect user directory requests to external URLs.</p>
+      
+    <div class="example"><p><code>
+      UserDir http://example.org/users/*/
+    </code></p></div>
+    
+    <p>The above example will redirect a request for
+    <code>http://example.com/~bob/abc.html</code> to
+    <code>http://example.org/users/bob/abc.html</code>.</p>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="enable" id="enable">Restricting what users are permitted to use this 
@@ -156,6 +183,6 @@
 <a href="../ja/howto/public_html.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/public_html.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/public_html.html.ja.euc-jp b/docs/manual/howto/public_html.html.ja.euc-jp
deleted file mode 100644
index aeeb1d9c..00000000
--- a/docs/manual/howto/public_html.html.ja.euc-jp
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>¥æ¡¼¥¶Ëè¤Î¥¦¥§¥Ö¥Ç¥£¥ì¥¯¥È¥ê - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">How-To / ¥Á¥å¡¼¥È¥ê¥¢¥ë</a></div><div id="page-content"><div id="preamble"><h1>¥æ¡¼¥¶Ëè¤Î¥¦¥§¥Ö¥Ç¥£¥ì¥¯¥È¥ê</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/howto/public_html.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/howto/public_html.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/public_html.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-
-<p>Ê£¿ô¤Î¥æ¡¼¥¶¤Î¤¤¤ë¥·¥¹¥Æ¥à¤Ç¤Ï¡¢<code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ
-    ³Æ¥æ¡¼¥¶¤¬¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥¦¥§¥Ö¥µ¥¤¥È¤ò¹½ÃۤǤ­¤ë¤è¤¦¤ËÀßÄꤹ¤ë¤³¤È¤¬
-    ²Äǽ¤Ç¤¹¡£URL <code>http://example.com/~username/</code> ¤òˬ¤ì¤¿¿Í¤Ï
-    "<code>username</code>" ¤È¤¤¤¦¥æ¡¼¥¶¤Î <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤵ¤ì¤¿
-    ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¥³¥ó¥Æ¥ó¥Ä¤òÆÀ¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">¥æ¡¼¥¶Ëè¤Î¥¦¥§¥Ö¥Ç¥£¥ì¥¯¥È¥ê</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#userdir">UserDir ¤ò»È¤Ã¤Æ¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¤òÀßÄꤹ¤ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#enable">¤³¤Îµ¡Ç½¤ò»ÈÍѤǤ­¤ë¥æ¡¼¥¶¤òÀ©¸Â¤¹¤ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cgi">¥æ¡¼¥¶Ëè¤Î CGI ¥Ç¥£¥ì¥¯¥È¥ê</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#htaccess">¥æ¡¼¥¶¤Ë¤è¤ëÀßÄêÊѹ¹¤òµö²Ä</a></li>
-</ul><h3>»²¾È</h3><ul class="seealso"><li><a href="../urlmapping.html">URL ¤«¤é¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ø¤Î¥Þ¥Ã¥Ô¥ó¥°</a></li></ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="related" id="related">¥æ¡¼¥¶Ëè¤Î¥¦¥§¥Ö¥Ç¥£¥ì¥¯¥È¥ê</a></h2>
-    
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_userdir.html">mod_userdir</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code></li><li><code class="directive"><a href="../mod/core.html#directorymatch">DirectoryMatch</a></code></li><li><code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code></li></ul></td></tr></table>
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="userdir" id="userdir">UserDir ¤ò»È¤Ã¤Æ¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¤òÀßÄꤹ¤ë</a></h2>
-    
-
-    <p><code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¥æ¡¼¥¶Ëè¤Î¥³¥ó¥Æ¥ó¥Ä¤¬Æɤ߹þ¤Þ¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤷ¤Þ¤¹¡£
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤¤¤í¤¤¤í°ã¤Ã¤¿·Á¼°¤ò¼è¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¥¹¥é¥Ã¥·¥å¤Ç»Ï¤Þ¤é¤Ê¤¤¥Ñ¥¹¤¬Í¿¤¨¤é¤ì¤¿¤È¤­¤Ï¡¢¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê
-    ¤«¤é¤ÎÁêÂХѥ¹¤È¤ß¤Ê¤µ¤ì¤Þ¤¹¡£¼¡¤ÎÀßÄ꤬¤¢¤Ã¤¿¤È¤­¤Ë:</p>
-
-    <div class="example"><p><code>
-      UserDir public_html
-    </code></p></div>
-
-    <p>URL <code>http://example.com/~rbowen/file.html</code> ¤Ï
-    ¥Ñ¥¹ <code>/home/rbowen/public_html/file.html</code> ¤Ø
-    ÊÑ´¹¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>¥Ñ¥¹¤¬¥¹¥é¥Ã¥·¥å¤Ç»Ï¤Þ¤ë¤È¤­¤Ï¡¢¥Ç¥£¥ì¥¯¥È¥ê¥Ñ¥¹¤Ï¤½¤Î¥Ñ¥¹¤Ë
-    ¥æ¡¼¥¶Ì¾¤ò²Ã¤¨¤¿¤â¤Î¤«¤é¤Ê¤ê¤Þ¤¹¡£¼¡¤ÎÀßÄê¤Î¤È¤­:</p>
-
-    <div class="example"><p><code>
-      UserDir /var/html
-    </code></p></div>
-
-    <p>URL <code>http://example.com/~rbowen/file.html</code> ¤Ï
-    ¥Ñ¥¹ <code>/var/html/rbowen/file.html</code> ¤ØÊÑ´¹¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>¥¢¥¹¥¿¥ê¥¹¥¯ (*) ¤ò´Þ¤à¥Ñ¥¹¤¬»ØÄꤵ¤ì¤¿¤È¤­¤Ï¡¢¥¢¥¹¥¿¥ê¥¹¥¯¤ò
-    ¥æ¡¼¥¶Ì¾¤ÇÃÖ´¹¤·¤¿¤â¤Î¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£¤³¤Î¤è¤¦¤ÊÀßÄê¤À¤È:</p>
-
-    <div class="example"><p><code>
-      UserDir /var/www/*/docs
-    </code></p></div>
-
-    <p>URL <code>http://example.com/~rbowen/file.html</code> ¤Ï
-    ¥Ñ¥¹ <code>/var/www/rbowen/docs/file.html</code> ¤ØÊÑ´¹¤µ¤ì¤Þ¤¹¡£</p>
-
-  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="enable" id="enable">¤³¤Îµ¡Ç½¤ò»ÈÍѤǤ­¤ë¥æ¡¼¥¶¤òÀ©¸Â¤¹¤ë</a></h2>
-    
-
-    <p>UserDir ¤Î¥É¥­¥å¥á¥ó¥È¤Ë¼¨¤µ¤ì¤Æ¤¤¤ë¹½Ê¸¤ò»È¤¦¤³¤È¤Ç¡¢
-    ¤É¤Î¥æ¡¼¥¶¤¬¤³¤Îµ¡Ç½¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤ë¤«¤òÀ©¸Â¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      UserDir enabled<br />
-      UserDir disabled root jro fish
-    </code></p></div>
-
-    <p>¾å¤ÎÀßÄê¤Ï <code>dissabled</code> ʸ¤Î¥æ¡¼¥¶°Ê³°¤Î¤¹¤Ù¤Æ¤Î¥æ¡¼¥¶¤Ë
-    ÂФ·¤Æ UserDir ¤Îµ¡Ç½¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£Æ±Íͤˤ·¤Æ¡¢°Ê²¼¤Î¤è¤¦¤Ë
-    ¿ô̾¤Î¥æ¡¼¥¶°Ê³°¤ËÂФ·¤Æ¤³¤Îµ¡Ç½¤ò̵¸ú¤Ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      UserDir disabled<br />
-      UserDir enabled rbowen krietz
-    </code></p></div>
-
-    <p>¾¤ÎÎã¤Ï <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code>
-    ¤ÎÀâÌÀ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="cgi" id="cgi">¥æ¡¼¥¶Ëè¤Î CGI ¥Ç¥£¥ì¥¯¥È¥ê</a></h2>
-  
-
-   <p>¤½¤ì¤¾¤ì¤Î¥æ¡¼¥¶¤ËÀìÍѤΠcgi-bin ¥Ç¥£¥ì¥¯¥È¥ê¤òÍ¿¤¨¤ë¤¿¤á¤Ë¡¢
-    <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
-    ¤ò»È¤Ã¤Æ¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Î»ØÄꤵ¤ì¤¿Îΰè¤ËÂФ·¤Æ CGI ¤òÍ­¸ú¤Ë
-    ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      &lt;Directory /home/*/public_html/cgi-bin/&gt;<br />
-       Options ExecCGI<br />
-       SetHandler cgi-script<br />
-       &lt;/Directory&gt;
-    </code></p></div>
-
-    <p>¤½¤·¤Æ¡¢<code>UserDir</code> ¤¬
-    <code>public_html</code> ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¤È²¾Äꤹ¤ë¤È¡¢
-    ¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î CGI ¥×¥í¥°¥é¥à <code>example.cgi</code>
-    ¤Ï°Ê²¼¤ÎÍͤ˸ƤӽФµ¤ì¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-    http://example.com/~rbowen/cgi-bin/example.cgi
-    </code></p></div>
-
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="htaccess" id="htaccess">¥æ¡¼¥¶¤Ë¤è¤ëÀßÄêÊѹ¹¤òµö²Ä</a></h2>
-    
-
-    <p>¥æ¡¼¥¶¤ËÈà¤é¤Î¥¦¥§¥Ö¶õ´Ö¤Ç¤Î¥µ¡¼¥Ð¤ÎÀßÄê¤ÎÊѹ¹¤òµö²Ä¤¹¤ë¾ì¹ç¡¢
-    ¥æ¡¼¥¶¤Ï <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤ò»È¤Ã¤ÆÀßÄê¤òÊѹ¹¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> ¤ÎÃͤò
-    ¥æ¡¼¥¶¤¬Êѹ¹¤¹¤ë¤³¤È¤òµö²Ä¤·¤¿¤¤¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ËÂФ·¤Æ½½Ê¬¤Ê¤â¤Î¤Ë
-    ÀßÄꤷ¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Îµ¡Ç½¤¬¤É¤Î¤è¤¦¤Ë¤·¤ÆÆ°ºî¤·¤Æ¤¤¤ë¤«
-    ¤Î¾ÜºÙ¤Ï <a href="htaccess.html">.htaccess ¥Á¥å¡¼¥È¥ê¥¢¥ë</a> ¤òÆɤó¤Ç
-    ¤¯¤À¤µ¤¤¡£</p>
-
-  </div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/howto/public_html.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/howto/public_html.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/public_html.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/public_html.html.ja.utf8 b/docs/manual/howto/public_html.html.ja.utf8
new file mode 100644
index 00000000..7c857b92
--- /dev/null
+++ b/docs/manual/howto/public_html.html.ja.utf8
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>ユーザ毎�ウェブディレクトリ - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">How-To / �ュートリアル</a></div><div id="page-content"><div id="preamble"><h1>ユーザ毎�ウェブディレクトリ</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/howto/public_html.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/howto/public_html.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/howto/public_html.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+
+<p>複数�ユーザ��るシステム���<code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> ディレクティブを使��
+    �ユーザ�ホームディレクトリ�ウェブサイトを構築��るよ��設定�る���
+    �能��。URL <code>http://example.com/~username/</code> を訪れ�人�
+    "<code>username</code>" ���ユーザ� <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> ディレクティブ�指定�れ�
+    サブディレクトリ�らコンテンツを得る����り��。</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">ユーザ毎�ウェブディレクトリ</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#userdir">UserDir を使��ファイル�パスを設定�る</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#enable">��機能を使用��るユーザを制��る</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cgi">ユーザ毎� CGI ディレクトリ</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#htaccess">ユーザ�よる設定変更を許�</a></li>
+</ul><h3>�照</h3><ul class="seealso"><li><a href="../urlmapping.html">URL �らファイルシステム��マッピング</a></li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="related" id="related">ユーザ毎�ウェブディレクトリ</a></h2>
+    
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_userdir.html">mod_userdir</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code></li><li><code class="directive"><a href="../mod/core.html#directorymatch">DirectoryMatch</a></code></li><li><code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code></li></ul></td></tr></table>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="userdir" id="userdir">UserDir を使��ファイル�パスを設定�る</a></h2>
+    
+
+    <p><code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> ディレクティブ�
+    ユーザ毎�コンテンツ�読�込�れるディレクトリを指定���。
+    ��ディレクティブ��������形�を�る�������。</p>
+
+    <p>スラッシュ�始�ら��パス�与�られ�����ユーザ�ホームディレクトリ
+    �ら�相対パス����れ��。次�設定�������:</p>
+
+    <div class="example"><p><code>
+      UserDir public_html
+    </code></p></div>
+
+    <p>URL <code>http://example.com/~rbowen/file.html</code> �
+    パス <code>/home/rbowen/public_html/file.html</code> �
+    変��れ��。</p>
+
+    <p>パス�スラッシュ�始�る����ディレクトリパス���パス�
+    ユーザ�を加��も��ら�り��。次�設定���:</p>
+
+    <div class="example"><p><code>
+      UserDir /var/html
+    </code></p></div>
+
+    <p>URL <code>http://example.com/~rbowen/file.html</code> �
+    パス <code>/var/html/rbowen/file.html</code> �変��れ��。</p>
+
+    <p>アスタリスク (*) を�むパス�指定�れ�����アスタリスクを
+    ユーザ��置���も��使用�れ��。��よ��設定��:</p>
+
+    <div class="example"><p><code>
+      UserDir /var/www/*/docs
+    </code></p></div>
+
+    <p>URL <code>http://example.com/~rbowen/file.html</code> �
+    パス <code>/var/www/rbowen/docs/file.html</code> �変��れ��。</p>
+
+  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="enable" id="enable">��機能を使用��るユーザを制��る</a></h2>
+    
+
+    <p>UserDir �ドキュメント�示�れ��る構文を使�����
+    ��ユーザ���機能を使������る�を制��る�������:</p>
+
+    <div class="example"><p><code>
+      UserDir enabled<br />
+      UserDir disabled root jro fish
+    </code></p></div>
+
+    <p>上�設定� <code>dissabled</code> 文�ユーザ以外�����ユーザ�
+    対�� UserDir �機能を有効����。�様����以下�よ��
+    数��ユーザ以外�対����機能を無効��る��も����:</p>
+
+    <div class="example"><p><code>
+      UserDir disabled<br />
+      UserDir enabled rbowen krietz
+    </code></p></div>
+
+    <p>他�例� <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code>
+    �説明を�照������。</p>
+
+  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="cgi" id="cgi">ユーザ毎� CGI ディレクトリ</a></h2>
+  
+
+   <p>�れ�れ�ユーザ�専用� cgi-bin ディレクトリを与�る����
+    <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
+    を使��ユーザ�ホームディレクトリ�指定�れ�領域�対�� CGI を有効�
+    �る�������。</p>
+
+    <div class="example"><p><code>
+      &lt;Directory /home/*/public_html/cgi-bin/&gt;<br />
+       Options ExecCGI<br />
+       SetHandler cgi-script<br />
+       &lt;/Directory&gt;
+    </code></p></div>
+
+    <p>����<code>UserDir</code> �
+    <code>public_html</code> �設定�れ��る�仮定�る��
+    ��ディレクトリ� CGI プログラム <code>example.cgi</code>
+    �以下�様�呼�出�れる�������:</p>
+
+    <div class="example"><p><code>
+    http://example.com/~rbowen/cgi-bin/example.cgi
+    </code></p></div>
+
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="htaccess" id="htaccess">ユーザ�よる設定変更を許�</a></h2>
+    
+
+    <p>ユーザ�彼ら�ウェブ空間��サー��設定�変更を許��る場��
+    ユーザ� <code>.htaccess</code> ファイルを使��設定を変更�る必���り��。
+    <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> �値を
+    ユーザ�変更�る��を許����ディレクティブ�対���分�も��
+    設定���る��を確�������。��機能���よ����動作���る�
+    �詳細� <a href="htaccess.html">.htaccess �ュートリアル</a> を読ん�
+    ����。</p>
+
+  </div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/howto/public_html.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/howto/public_html.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/howto/public_html.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/public_html.html.ko.euc-kr b/docs/manual/howto/public_html.html.ko.euc-kr
index b748546b..77ae0e50 100644
--- a/docs/manual/howto/public_html.html.ko.euc-kr
+++ b/docs/manual/howto/public_html.html.ko.euc-kr
@@ -22,6 +22,8 @@
 <a href="../ja/howto/public_html.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/public_html.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
+<div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
+            ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
 
 <p>¿©·¯ »ç¿ëÀÚ°¡ ÀÖ´Â ½Ã½ºÅÛ¿¡¼­ <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> Áö½Ã¾î¸¦ »ç¿ëÇϸé
     °¢ »ç¿ëÀÚ´Â ÀÚ½ÅÀÇ È¨µð·ºÅ丮 ¾È¿¡ À¥»çÀÌÆ®¸¦ ¸¸µé ¼ö ÀÖ´Ù.
@@ -151,6 +153,6 @@
 <a href="../ja/howto/public_html.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/public_html.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/ssi.html b/docs/manual/howto/ssi.html
index 6142aec8..477d79ca 100644
--- a/docs/manual/howto/ssi.html
+++ b/docs/manual/howto/ssi.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: ssi.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: ssi.html.ja.euc-jp
+URI: ssi.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: ssi.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/howto/ssi.html.en b/docs/manual/howto/ssi.html.en
index 590f5b91..72f0175c 100644
--- a/docs/manual/howto/ssi.html.en
+++ b/docs/manual/howto/ssi.html.en
@@ -481,6 +481,6 @@ modified?</a></h3>
 <a href="../ja/howto/ssi.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/ssi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/ssi.html.ja.euc-jp b/docs/manual/howto/ssi.html.ja.euc-jp
deleted file mode 100644
index 0582b301..00000000
--- a/docs/manual/howto/ssi.html.ja.euc-jp
+++ /dev/null
@@ -1,481 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>Apache ¥Á¥å¡¼¥È¥ê¥¢¥ë: Server Side Includes ÆþÌç - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">How-To / ¥Á¥å¡¼¥È¥ê¥¢¥ë</a></div><div id="page-content"><div id="preamble"><h1>Apache ¥Á¥å¡¼¥È¥ê¥¢¥ë: Server Side Includes ÆþÌç</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/howto/ssi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/howto/ssi.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/ssi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-
-<p>¥µ¡¼¥Ð¥µ¥¤¥É¥¤¥ó¥¯¥ë¡¼¥É¤Ë¤è¤Ã¤Æ¡¢´û¸¤Î HTML
-¥É¥­¥å¥á¥ó¥È¤ËưŪ¤Ê¥³¥ó¥Æ¥ó¥Ä¤òÄɲ乤뤳¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">¤Ï¤¸¤á¤Ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#what">SSI ¤È¤Ï ?</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#configuring">SSI ¤òµö²Ä¤¹¤ë¤¿¤á¤Î¥µ¡¼¥Ð¤ÎÀßÄê</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#basic">´ðËÜŪ¤Ê SSI ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#additionalexamples">ÄɲäÎÎã</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#config">¾¤Ë²¿¤¬ÀßÄê¤Ç¤­¤ë¤Î¤« ?</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#exec">¥³¥Þ¥ó¥É¤Î¼Â¹Ô</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#advanced">¹âÅÙ¤Ê SSI ¥Æ¥¯¥Ë¥Ã¥¯</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#conclusion">½ª¤ï¤ê¤Ë</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="related" id="related">¤Ï¤¸¤á¤Ë</a></h2>
- <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="../mod/mod_expires.html">mod_expires</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code></li><li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code></li><li><code class="directive"><a href="../mod/mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></code></li></ul></td></tr></table>
-
-    <p>¤³¤Îµ­»ö¤Ï¡¢Ä̾ï¤Ïñ¤Ë SSI ¤È¸Æ¤Ð¤ì¤ë Server Side Includes
-    ¤ò°·¤¤¤Þ¤¹¡£¤³¤Îµ­»ö¤Ë¤ª¤¤¤Æ¤Ï¡¢¥µ¡¼¥Ð¤Ç¤Î SSI ¤òµö²Ä¤¹¤ë¤¿¤á¤ÎÀßÄê¤È¡¢
-    ¸½ºß¤Î HTML ¥Ú¡¼¥¸¤ËưŪ¤Ê¥³¥ó¥Æ¥ó¥Ä¤ò²Ã¤¨¤ë¤¿¤á¤Î¤¤¤¯¤Ä¤«¤Î´ðËÜŪ¤Ê
-    SSI µ»½Ñ¤ò¾Ò²ð¤·¤Þ¤¹¡£</p>
-
-    <p>µ­»ö¤Î¸åȾ¤Ç¤Ï¡¢SSI ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç SSI
-    ¤È¶¦¤Ë¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¾ò·ïʸ¤Î¤è¤¦¤Ê
-    ´öʬ¹âÅ٤ʻöÊÁ¤Ë¤Ä¤¤¤Æ½Ò¤Ù¤Æ¤¤¤Þ¤¹¡£</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="what" id="what">SSI ¤È¤Ï ?</a></h2>
-
-    <p>SSI (Server Side Includes) ¤Ï¡¢HTML
-    ¥Ú¡¼¥¸Ãæ¤ËÇÛÃÖ¤µ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤¢¤ê¡¢
-    ¥µ¡¼¥Ð¤Ç¥Ú¡¼¥¸¤òÄ󶡤¹¤ë»þ¤Ëɾ²Á¤µ¤ì¤Þ¤¹¡£SSI ¤Ï¡¢CGI
-    ¥×¥í¥°¥é¥à¤ä¤½¤Î¾¤ÎưŪ¤Êµ»½Ñ¤ÇÁ´¤Æ¤Î¥Ú¡¼¥¸¤òÄ󶡤»¤º¤Ë¡¢
-    ưŪ¤ËÀ¸À®¤µ¤ì¤¿¥³¥ó¥Æ¥ó¥Ä¤ò¸½ºß¤Î HTML ¥Ú¡¼¥¸¤Ë²Ã¤¨¤Þ¤¹¡£</p>
-
-    <p>¤É¤¦¤¤¤¦¾ì¹ç¤Ë SSI ¤ò»È¤¤¡¢¤É¤¦¤¤¤¦¾ì¹ç¤Ë¥×¥í¥°¥é¥à¤Ç
-    ¥Ú¡¼¥¸¤ò´°Á´¤ËÀ¸À®¤¹¤ë¤«¤Ï¡¢¥Ú¡¼¥¸¤Î¤¦¤Á¤É¤ÎÄøÅÙ¤¬ÀÅŪ¤Ç¤¢¤ê¡¢
-    ¥Ú¡¼¥¸¤¬Ä󶡤µ¤ì¤ë¤¿¤Ó¤ËºÆ·×»»¤¹¤ëɬÍפ¬¤É¤ÎÄøÅÙ¤¢¤ë¤«¤ÇÄ̾ï¤Ï·èÄꤷ¤Þ¤¹¡£
-    SSI ¤Ï¸½ºß»þ¹ï¤Î¤è¤¦¤Ê¾®¤µ¤¤¾ðÊó¤ò²Ã¤¨¤ë¤Ë¤Ï¤¦¤Ã¤Æ¤Ä¤±¤ÎÊýË¡¤Ç¤¹¡£
-    ¤·¤«¤·¡¢¤½¤Î¥Ú¡¼¥¸¤Î¤Û¤È¤ó¤É¤ÎÉôʬ¤¬Ä󶡻þ¤ËÀ¸À®¤µ¤ì¤ë¾ì¹ç¤Ï¡¢
-    ¾¤ÎÊýË¡¤òõ¤¹É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="configuring" id="configuring">SSI ¤òµö²Ä¤¹¤ë¤¿¤á¤Î¥µ¡¼¥Ð¤ÎÀßÄê</a></h2>
-
-
-    <p>¥µ¡¼¥Ð¤Ç SSI ¤òµö²Ä¤¹¤ë¤Ë¤Ï¡¢<code>httpd.conf</code>
-    ¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï <code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ë¤Ë¼¡¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹:</p>
-<div class="example"><p><code>
-        Options +Includes
-</code></p></div>
-
-    <p>¤³¤Î»ØÄê¤Ï¡¢¥Õ¥¡¥¤¥ë¤ò SSI
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç²òÀϤµ¤»¤ë¤³¤È¤òµö²Ä¤¹¤ë¤È¤¤¤¦¤³¤È¤ò Apache
-    ¤ËÅÁ¤¨¤Þ¤¹¡£¤Û¤È¤ó¤É¤ÎÀßÄê¤Ç¤Ï¤ª¸ß¤¤¤ò¾å½ñ¤­¤Ç¤­¤ë¡¢Ê£¿ô¤Î
-    <code class="directive"><a href="../mod/core.html#options">Options</a></code> ¤¬¤¢¤ë¤³¤È¤Ë
-    Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¤ª¤½¤é¤¯¡¢ÀßÄ꤬ºÇ¸å¤Ëɾ²Á¤µ¤ì¤ë¤³¤È¤ò
-    Êݾڤµ¤ì¤ë¤¿¤á¤Ë¡¢SSI ¤ò»ÈÍѤ·¤¿¤¤¥Ç¥£¥ì¥¯¥È¥ê¤Ë <code>Options</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òŬÍѤ¹¤ëɬÍפ¬¤¢¤ë¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>Á´¤Æ¤Î¥Õ¥¡¥¤¥ë¤¬ SSI
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç²òÀϤµ¤ì¤ë¤È¤¤¤¦¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-    ¤É¤Î¥Õ¥¡¥¤¥ë¤¬²òÀϤµ¤ì¤ë¤«¤ò Apache ¤ËÅÁ¤¨¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤ì¤ò¹Ô¤Ê¤¦¤Ë¤ÏÆó¤ÄÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£
-    ¼¡¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¦¤³¤È¤Ç¡¢Î㤨¤Ð <code>.shtml</code>
-    ¤Î¤è¤¦¤ÊÆÃÊ̤ʥե¡¥¤¥ë³ÈÄ¥»Ò¤ò»ý¤Ä¥Õ¥¡¥¤¥ë¤ò²òÀϤ¹¤ë¤è¤¦
-    Apache ¤ËÅÁ¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-<div class="example"><p><code>
-        AddType text/html .shtml<br />
-	AddOutputFilter INCLUDES .shtml
-</code></p></div>
-
-    <p>¤³¤ÎÊýË¡¤Î·çÅÀ¤Ï¡¢¤â¤·¸½ºß¤Î¥Ú¡¼¥¸¤Ë SSI ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò²Ã¤¨¤¿¤¤¾ì¹ç¡¢
-    ¤½¤ì¤é¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬¼Â¹Ô¤µ¤ì¤ë¤è¤¦¤Ë 
-    <code>.shtml</code> ³ÈÄ¥»Ò¤Ë¤¹¤ë¤¿¤á¡¢¤½¤Î¥Ú¡¼¥¸¤Î̾Á°¤È¡¢
-    ¤½¤Î¥Ú¡¼¥¸¤Ø¤ÎÁ´¤Æ¤Î¥ê¥ó¥¯¤òÊѹ¹¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤³¤È¤Ç¤¹¡£</p>
-
-    <p>¤â¤¦°ì¤Ä¤ÎÊýË¡¤Ï¡¢<code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¤¹:</p>
-<div class="example"><p><code>
-        XBitHack on
-</code></p></div>
-
-    <p><code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code> 
-    ¤Ï¡¢¥Õ¥¡¥¤¥ë¤Î¼Â¹Ô¥Ó¥Ã¥È¤¬Î©¤Ã¤Æ¤¤¤ë¾ì¹ç¡¢
-    SSI ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê²òÀϤ¹¤ë¤³¤È¤ò Apache ¤ËÅÁ¤¨¤Þ¤¹¡£
-    ½¾¤Ã¤Æ¡¢SSI ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¸½ºß¤Î¥Ú¡¼¥¸¤Ë²Ã¤¨¤ë¤¿¤á¤Ë¤Ï¡¢
-    ¥Õ¥¡¥¤¥ë̾¤òÊѹ¹¤·¤Ê¤¯¤Æ¤â¤è¤¯¡¢Ã±¤Ë <code>chmod</code>
-    ¤ò»ÈÍѤ·¤Æ¥Õ¥¡¥¤¥ë¤ò¼Â¹Ô²Äǽ¤Ë¤¹¤ë¤À¤±¤ÇºÑ¤ß¤Þ¤¹¡£</p>
-<div class="example"><p><code>
-        chmod +x pagename.html
-</code></p></div>
-
-    <p>¹Ô¤Ê¤¦¤Ù¤­¤Ç¤Ï¤Ê¤¤¤³¤È¤Ë´Ø¤¹¤ëû¤¤¥³¥á¥ó¥È¡£»þ¡¹Ã¯¤«¤¬¡¢Á´¤Æ¤Î
-    <code>.html</code> ¥Õ¥¡¥¤¥ë¤ò SSI ¤Ç²òÀϤ¹¤ë¤è¤¦ Apache ¤ËÅÁ¤¨¤ì¤Ð¡¢
-    ¤ï¤¶¤ï¤¶ <code>.shtml</code> ¤È¤¤¤¦¥Õ¥¡¥¤¥ë̾¤Ë¤¹¤ëɬÍפ¬¤Ê¤¤¤È¤¤¤Ã¤Æ
-    Á¦¤á¤ë¤Î¤ò¸«¤ë¤³¤È¤Ç¤·¤ç¤¦¡£¤³¤¦¤¤¤¦¿Í¤¿¤Á¤Ï¡¢¤ª¤½¤é¤¯
-    <code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code>
-    ¤Ë¤Ä¤¤¤Æʹ¤¤¤¿¤³¤È¤¬¤Ê¤¤¤Î¤Ç¤·¤ç¤¦¡£
-    ¤³¤ÎÊýË¡¤Ë¤Ä¤¤¤ÆÃí°Õ¤¹¤ë¤³¤È¤Ï¡¢¤¿¤È¤¨ SSI
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÁ´¤¯´Þ¤Þ¤Ê¤¤¾ì¹ç¤Ç¤â¡¢Apache ¤¬¥¯¥é¥¤¥¢¥ó¥È¤Ë
-    Á÷¤ëÁ´¤Æ¤Î¥Õ¥¡¥¤¥ë¤òºÇ¸å¤Þ¤ÇÆɤ߹þ¤Þ¤»¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¤³¤ÎÊýË¡¤Ï¤«¤Ê¤ê½èÍý¤òÃÙ¤¯¤¹¤ë¤â¤Î¤Ç¤¢¤ê¡¢Îɤ¯¤Ê¤¤¥¢¥¤¥Ç¥¢¤Ç¤¹¡£</p>
-
-    <p>¤â¤Á¤í¤ó¡¢Windows ¤Ç¤Ï¤½¤Î¤è¤¦¤Ê¼Â¹Ô¥Ó¥Ã¥È¤ò¥»¥Ã¥È
-    ¤¹¤ë¤è¤¦¤Ê¤â¤Î¤Ï¤¢¤ê¤Þ¤»¤ó¤Î¤Ç¥ª¥×¥·¥ç¥ó¤¬¾¯¤·À©¸Â¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p>¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤Ç¤Ï¡¢Apache ¤Ï SSI ¥Ú¡¼¥¸¤Ë¤Ä¤¤¤ÆºÇ½ªÊѹ¹»þ¹ï¤ä
-    ¥³¥ó¥Æ¥ó¥Ä¤ÎŤµ¤ò HTTP ¥Ø¥Ã¥À¤ËÁ÷¤ê¤Þ¤»¤ó¡£
-    ưŪ¤Ê¥³¥ó¥Æ¥ó¥Ä¤Ç¤¢¤ë¤¿¤á¡¢¤½¤ì¤é¤ÎÃͤò·×»»¤¹¤ë¤Î¤¬Æñ¤·¤¤¤«¤é¤Ç¤¹¡£
-    ¤³¤Î¤¿¤á¥É¥­¥å¥á¥ó¥È¤¬¥­¥ã¥Ã¥·¥å¤µ¤ì¤Ê¤¯¤Ê¤ê¡¢
-    ·ë²Ì¤È¤·¤Æ¥¯¥é¥¤¥¢¥ó¥È¤ÎÀ­Ç½¤¬ÃÙ¤¯¤Ê¤Ã¤¿¤è¤¦¤Ë´¶¤¸¤µ¤»¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¤³¤ì¤ò²ò·è¤¹¤ëÊýË¡¤¬Æó¤Ä¤¢¤ê¤Þ¤¹:</p>
-
-    <ol>
-      <li><code>XBitHack Full</code> ÀßÄê¤ò»ÈÍѤ¹¤ë¡£
-      ¤³¤ÎÀßÄê¤Ë¤è¤ê¡¢¤â¤È¤â¤ÈÍ׵ᤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤Î»þ¹ï¤ò»²¾È¤·¡¢
-      Æɤ߹þ¤Þ¤ì¤ë¥Õ¥¡¥¤¥ë¤ÎÊѹ¹»þ¹ï¤ò̵»ë¤·¤ÆºÇ½ªÊѹ¹»þ¹ï¤ò·èÄꤹ¤ë¤è¤¦
-      Apache ¤ËÅÁ¤¨¤Þ¤¹¡£</li>
-
-      <li><a href="../mod/mod_expires.html">mod_expires</a>
-      ¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ·¤Æ¡¢
-      ¥Õ¥¡¥¤¥ë¤¬Ìµ¸ú¤Ë¤Ê¤ë»þ¹ï¤òÌÀ¼¨¤·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢
-      ¥Ö¥é¥¦¥¶¤È¥×¥í¥­¥·¤Ë¥­¥ã¥Ã¥·¥å¤¬Í­¸ú¤Ç¤¢¤ë¤³¤È¤òÄÌÃΤ·¤Þ¤¹¡£</li>
-    </ol>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="basic" id="basic">´ðËÜŪ¤Ê SSI ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-
-    <p>SSI ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï°Ê²¼¤Îʸˡ¤Çµ­½Ò¤·¤Þ¤¹:</p>
-<div class="example"><p><code>
-        &lt;!--#element attribute=value attribute=value ... --&gt;
-</code></p></div>
-
-    <p>HTML ¤Î¥³¥á¥ó¥È¤Î¤è¤¦¤Ê½ñ¼°¤ò¤·¤Æ¤¤¤ë¤Î¤Ç¡¢¤â¤· SSI
-    ¤òÀµ¤·¤¯Æ°ºî²Äǽ¤Ë¤·¤Ê¤±¤ì¤Ð¡¢¥Ö¥é¥¦¥¶¤Ï¤½¤ì¤ò̵»ë¤¹¤ë¤Ç¤·¤ç¤¦¡£
-    ¤·¤«¤·¡¢HTML ¥½¡¼¥¹Ãæ¤Ç¤Ï¸«¤¨¤Þ¤¹¡£¤â¤· SSI ¤òÀµ¤·¤¯ÀßÄꤷ¤¿¤Ê¤é¡¢
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤½¤Î·ë²Ì¤ÈÃÖ¤­´¹¤¨¤é¤ì¤Þ¤¹¡£</p>
-
-    <p>element ¤Ï¤¿¤¯¤µ¤ó¤¢¤ë¤â¤Î¤«¤é°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    »ØÄê¤Ç¤­¤ë¤â¤Î¤ÎÂç¿¿ô¤Ë¤Ä¤¤¤Æ¤Ï¡¢¼¡²ó¤â¤¦¾¯¤·¾Ü¤·¤¯ÀâÌÀ¤·¤Þ¤¹¡£
-    ¤³¤³¤Ç¤Ï¡¢SSI ¤Ç¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤ëÎã¤ò¤¤¤¯¤Ä¤«¼¨¤·¤Þ¤¹¡£</p>
-
-<h3><a name="todaysdate" id="todaysdate">º£Æü¤ÎÆüÉÕ</a></h3>
-
-<div class="example"><p><code>
-        &lt;!--#echo var="DATE_LOCAL" --&gt;
-</code></p></div>
-
-    <p><code>echo</code> Í×ÁǤÏñ¤ËÊÑ¿ô¤ÎÃͤò½ÐÎϤ·¤Þ¤¹¡£
-    CGI ¥×¥í¥°¥é¥à¤ËÍøÍѲÄǽ¤Ê´Ä¶­ÊÑ¿ô¤ÎÁ´¤Æ¤Î
-    ¥»¥Ã¥È¤ò´Þ¤à¿¤¯¤Îɸ½àÊÑ¿ô¤¬¤¢¤ê¤Þ¤¹¡£¤Þ¤¿¡¢<code>set</code>
-    Í×ÁǤòÍѤ¤¤ë¤³¤È¤Ç¡¢Æȼ«¤ÎÊÑ¿ô¤òÄêµÁ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    </p>
-
-    <p>½ÐÎϤµ¤ì¤ëÆüÉդνñ¼°¤¬¹¥¤­¤Ç¤Ï¤Ê¤¤¾ì¹ç¡¢¤½¤Î½ñ¼°¤ò½¤Àµ¤¹¤ë¤¿¤á¤Ë¡¢
-    <code>config</code> Í×ÁÇ¤Ë <code>timefmt</code>
-    °À­¤ò»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>
-        &lt;!--#config timefmt="%A %B %d, %Y" --&gt;<br />
-        Today is &lt;!--#echo var="DATE_LOCAL" --&gt;
-</code></p></div>
-
-
-<h3><a name="lastmodified" id="lastmodified">¥Õ¥¡¥¤¥ë¤ÎÊѹ¹Æü</a></h3>
-
-<div class="example"><p><code>
-        This document last modified &lt;!--#flastmod file="index.html" --&gt;
-</code></p></div>
-
-    <p>¤³¤ÎÍ×ÁǤâ <code>timefmt</code>
-    ¥Õ¥©¡¼¥Þ¥Ã¥È¤ÎÀßÄê¤Ë½¾¤¤¤Þ¤¹¡£</p>
-
-
-<h3><a name="cgi" id="cgi">CGI ¥×¥í¥°¥é¥à¤Î·ë²Ì¤ò¼è¤ê¹þ¤à</a></h3>
-
-    <p>¤³¤ì¤Ï¡¢Á´¤Æ¤Î¿Í¤Î¤ªµ¤¤ËÆþ¤ê¤Ç¤¢¤ë ``¥Ò¥Ã¥È¥«¥¦¥ó¥¿'' ¤Î¤è¤¦¤Ê
-    CGI ¥×¥í¥°¥é¥à¤Î·ë²Ì¤ò½ÐÎϤ¹¤ë SSI
-    ¤Î¤è¤ê°ìÈÌŪ¤Ê»ÈÍѤΤ¦¤Á¤Î°ì¤Ä¤Ç¤¹¡£</p>
-
-<div class="example"><p><code>
-        &lt;!--#include virtual="/cgi-bin/counter.pl" --&gt;
-</code></p></div>
-
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="additionalexamples" id="additionalexamples">ÄɲäÎÎã</a></h2>
-
-
-    <p>°Ê²¼¤Ï¡¢SSI ¤ò»ÈÍѤ·¤Æ HTML
-    ¥É¥­¥å¥á¥ó¥È¤Ë¤ª¤¤¤Æ¤Ç¤­¤ë¤³¤È¤Î¤¤¤¯¤Ä¤«¤ÎÆÃÊ̤ÊÎã¤Ç¤¹¡£</p>
-
-<h3><a name="docmodified" id="docmodified">¤¤¤Ä¤³¤Î¥É¥­¥å¥á¥ó¥È¤Ï½¤Àµ¤µ¤ì¤¿¤Î¤«
-?</a></h3>
-
-    <p>Àè¤Ë¡¢¥É¥­¥å¥á¥ó¥È¤¬ºÇ¸å¤ËÊѹ¹¤µ¤ì¤¿¤Î¤Ï¤¤¤Ä¤«¤ò
-    ¥æ¡¼¥¶¤ËÄÌÃΤ¹¤ë¤¿¤á¤Ë SSI ¤ò»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤³¤È¤ò½Ò¤Ù¤Þ¤·¤¿¡£
-    ¤·¤«¤·¤Ê¤¬¤é¡¢¼ÂºÝ¤ÎÊýË¡¤Ï¡¢¤¤¤¯¤Ö¤óÌäÂê¤Î¤Þ¤Þ¤Ë¤·¤Æ¤ª¤­¤Þ¤·¤¿¡£
-    HTML ¥É¥­¥å¥á¥ó¥È¤ËÇÛÃÖ¤µ¤ì¤¿¼¡¤Î¥³¡¼¥É¤Ï¡¢¥Ú¡¼¥¸¤Ë¤½¤Î¤è¤¦¤Ê
-    ¥¿¥¤¥à¥¹¥¿¥ó¥×¤òÆþ¤ì¤ë¤Ç¤·¤ç¤¦¡£¤â¤Á¤í¤ó¡¢¾å½Ò¤Î¤è¤¦¤Ë¡¢
-    SSI ¤òÀµ¤·¤¯Æ°ºî²Äǽ¤Ë¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</p>
-<div class="example"><p><code>
-        &lt;!--#config timefmt="%A %B %d, %Y" --&gt;<br />
-        This file last modified &lt;!--#flastmod file="ssi.shtml" --&gt;
-</code></p></div>
-
-    <p>¤â¤Á¤í¤ó¡¢<code>ssi.shtml</code>
-    ¤ÎÉôʬ¤ò¼ÂºÝ¤ÎÅö³º¥Õ¥¡¥¤¥ë̾¤ÈÃÖ¤­´¹¤¨¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤â¤·¡¢¤¢¤é¤æ¤ë¥Õ¥¡¥¤¥ë¤ËÄ¥¤ë¤³¤È¤¬¤Ç¤­¤ë°ìÈÌŪ¤Ê¥³¡¼¥É¤òõ¤·¤Æ¤¤¤ë¤Ê¤é¡¢
-    ¤³¤ì¤ÏÉÔÊؤǤ¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤ª¤½¤é¤¯¤½¤Î¾ì¹ç¤Ï¡¢
-    ¤½¤¦¤¹¤ëÂå¤ï¤ê¤ËÊÑ¿ô <code>LAST_MODIFIED</code>
-    ¤ò»ÈÍѤ·¤¿¤¤¤È¹Í¤¨¤ë¤Ç¤·¤ç¤¦:</p>
-<div class="example"><p><code>
-        &lt;!--#config timefmt="%D" --&gt;<br />
-        This file last modified &lt;!--#echo var="LAST_MODIFIED" --&gt;
-</code></p></div>
-
-    <p><code>timefmt</code>
-    ½ñ¼°¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢¤ª¹¥¤ß¤Î¸¡º÷¥µ¥¤¥È¤Ë¹Ô¤­¡¢
-    <code>strftime</code> ¤Ç¸¡º÷¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£Ê¸Ë¡¤ÏƱ¤¸¤Ç¤¹¡£</p>
-
-
-<h3><a name="standard-footer" id="standard-footer">ɸ½à¤Î¥Õ¥Ã¥¿¤òÁÞÆþ¤¹¤ë</a></h3>
-
-
-    <p>¤â¤·¿ô¥Ú¡¼¥¸¤òĶ¤¨¤ë¥Ú¡¼¥¸¤ò»ý¤Ä¥µ¥¤¥È¤ò´ÉÍý¤·¤Æ¤¤¤ë¤Ê¤é¤Ð¡¢
-    Á´¥Ú¡¼¥¸¤ËÂФ·¤ÆÊѹ¹¤ò¹Ô¤Ê¤¦¤³¤È¤¬ËÜÅö¤Ë¶ìÄˤȤʤêÆÀ¤ë¤³¤È¤¬
-    ʬ¤«¤ë¤Ç¤·¤ç¤¦¡£Á´¤Æ¤Î¥Ú¡¼¥¸¤ËÅϤäƤ¢¤ë¼ï¤Îɸ½àŪ¤Ê³°´Ñ¤ò
-    °Ý»ý¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤Ê¤é¤ÐÆäˤ½¤¦¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>¥Ø¥Ã¥À¤ä¥Õ¥Ã¥¿ÍѤÎÁÞÆþÍÑ¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢
-    ¤³¤Î¤è¤¦¤Ê¹¹¿·¤Ë¤«¤«¤ëÉéô¤ò¸º¤é¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    °ì¤Ä¤Î¥Õ¥Ã¥¿¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¡¢¤½¤ì¤ò <code>include</code>
-    SSI ¥³¥Þ¥ó¥É¤Ç³Æ¥Ú¡¼¥¸¤ËÆþ¤ì¤ë¤À¤±¤ÇºÑ¤ß¤Þ¤¹¡£<code>include</code>
-    Í×ÁǤϡ¢<code>file</code> °À­¤Þ¤¿¤Ï <code>virtual</code>
-    °À­¤Î¤¤¤º¤ì¤«¤ò»ÈÍѤ·¤Æ¤É¤Î¥Õ¥¡¥¤¥ë¤òÁÞÆþ¤¹¤ë¤«¤ò·è¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    <code>file</code> °À­¤Ï¡¢<em>¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤ÎÁêÂХѥ¹¤Ç¼¨¤µ¤ì¤¿
-    </em>¥Õ¥¡¥¤¥ë¥Ñ¥¹¤Ç¤¹¡£
-    ¤½¤ì¤Ï / ¤Ç»Ï¤Þ¤ëÀäÂÐ¥Õ¥¡¥¤¥ë¥Ñ¥¹¤Ë¤Ï¤Ç¤­¤º¡¢¤Þ¤¿¡¢¤½¤Î¥Ñ¥¹¤Î°ìÉô¤Ë ../
-    ¤ò´Þ¤à¤³¤È¤¬¤Ç¤­¤Ê¤¤¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£<code>virtual</code>
-    °À­¤Ï¡¢¤ª¤½¤é¤¯¤è¤êÊØÍø¤À¤È»×¤¤¤Þ¤¹¤¬¡¢Ä󶡤¹¤ë¥É¥­¥å¥á¥ó¥È¤«¤é¤ÎÁêÂÐ
-    URL ¤Ç»ØÄꤹ¤Ù¤­¤Ç¤¹¡£¤½¤ì¤Ï / ¤Ç»Ï¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢
-    Ä󶡤¹¤ë¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¥µ¡¼¥Ð¾å¤Ë¸ºß¤·¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£</p>
-<div class="example"><p><code>
-        &lt;!--#include virtual="/footer.html" --&gt;
-</code></p></div>
-
-    <p>»ä¤ÏºÇ¸å¤ÎÆó¤Ä¤òÁȤ߹ç¤ï¤»¤Æ¡¢<code>LAST_MODIFIED</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¥Õ¥Ã¥¿¥Õ¥¡¥¤¥ë¤ÎÃæ¤ËÃÖ¤¯¤³¤È¤¬¤è¤¯¤¢¤ê¤Þ¤¹¡£
-    SSI ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢ÁÞÆþÍѤΥե¡¥¤¥ë¤Ë´Þ¤Þ¤»¤¿¤ê¡¢
-    ÁÞÆþ¥Õ¥¡¥¤¥ë¤Î¥Í¥¹¥È¤ò¤·¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¹¤Ê¤ï¤Á¡¢
-    ÁÞÆþÍѤΥե¡¥¤¥ë¤Ï¾¤Î¥Õ¥¡¥¤¥ë¤òºÆµ¢Åª¤ËÁÞÆþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="config" id="config">¾¤Ë²¿¤¬ÀßÄê¤Ç¤­¤ë¤Î¤« ?</a></h2>
-
-
-    <p>»þ¹ï½ñ¼°¤ò <code>config</code> ¤ÇÀßÄê¤Ç¤­¤ë¤³¤È¤Ë²Ã¤¨¤Æ¡¢
-    ¹¹¤ËÆó¤Ä <code>config</code> ¤ÇÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>Ä̾SSI ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç²¿¤«¤¬¤¦¤Þ¤¯¤¤¤«¤Ê¤¤¤È¤­¤Ï¡¢
-    ¼¡¤Î¥á¥Ã¥»¡¼¥¸¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£</p>
-<div class="example"><p><code>
-        [an error occurred while processing this directive]
-</code></p></div>
-
-    <p>¤³¤Î¥á¥Ã¥»¡¼¥¸¤ò¾¤Î¤â¤Î¤Ë¤·¤¿¤¤¾ì¹ç¡¢<code>config</code>
-    Í×ÁǤΠ<code>errmsg</code> °À­¤ÇÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-<div class="example"><p><code>
-        &lt;!--#config errmsg="[It appears that you don't know how to use SSI]" --&gt;
-</code></p></div>
-
-    <p>¤ª¤½¤é¤¯¡¢¥¨¥ó¥É¥æ¡¼¥¶¤Ï¤³¤Î¥á¥Ã¥»¡¼¥¸¤ò·è¤·¤Æ¸«¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-    ¤Ê¤¼¤Ê¤é¡¢¤½¤Î¥µ¥¤¥È¤¬À¸¤­¤¿¾õÂ֤ˤʤëÁ°¤Ë SSI ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë´Ø¤¹¤ë
-    Á´¤Æ¤ÎÌäÂê¤ò²ò·è¤·¤Æ¤¤¤ë¤Ï¤º¤À¤«¤é¤Ç¤¹¡£(¤½¤¦¤Ç¤¹¤è¤Í?)</p>
-
-    <p>¤½¤·¤Æ¡¢<code>config</code> ¤Ë¤ª¤¤¤Æ <code>sizefmt</code>
-    °À­¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢
-    ÊÖ¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤Î½ñ¼°¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¥Ð¥¤¥È¿ô¤Ë¤Ï <code>bytes</code> ¤ò¡¢Å¬Åö¤Ë Kb ¤ä Mb
-    ¤Ëû½Ì¤µ¤»¤ë¤Ë¤Ï <code>abbrev</code> ¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="exec" id="exec">¥³¥Þ¥ó¥É¤Î¼Â¹Ô</a></h2>
-    
-
-    <p>º£¸å¿ô¥ö·î¤Î¤¦¤Á¤Ë¡¢¾®¤µ¤Ê CGI ¥×¥í¥°¥é¥à¤È SSI
-    ¤ò»ÈÍѤ¹¤ëµ­»ö¤ò½Ð¤·¤¿¤¤¤È¹Í¤¨¤Æ¤¤¤Þ¤¹¡£¤³¤³¤Ç¤Ï¤½¤ì¤È¤ÏÊ̤ˡ¢
-    <code>exec</code> Í×ÁǤˤè¤Ã¤Æ¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£
-    SSI ¤Ë¥·¥§¥ë (Àµ³Î¤Ë¤Ï <code>/bin/sh</code>¡£Win32 ¤Ê¤é¤Ð DOS ¥·¥§¥ë)
-    ¤ò»ÈÍѤ·¤Æ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ²¼µ­¤ÎÎã¤Ç¤Ï¡¢¥Ç¥£¥ì¥¯¥È¥ê¥ê¥¹¥È½ÐÎϤò¹Ô¤Ê¤¤¤Þ¤¹¡£</p>
-<div class="example"><p><code>
-        &lt;pre&gt;<br />
-        &lt;!--#exec cmd="ls" --&gt;<br />
-        &lt;/pre&gt;
-</code></p></div>
-
-    <p>Windows ¾å¤Ç¤Ï¡¢</p>
-<div class="example"><p><code>
-        &lt;pre&gt;<br />
-        &lt;!--#exec cmd="dir" --&gt;<br />
-        &lt;/pre&gt;
-</code></p></div>
-
-    <p>Windows ¾å¤Ç¤Ï¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤Ã¤Æ¤¤¤¯¤Ä¤«¤Î´ñ̯¤Ê
-    ½ñ¼°¤Ëµ¤¤Å¤¯¤Ç¤·¤ç¤¦¡£¤Ê¤¼¤Ê¤é <code>dir</code> ¤Î½ÐÎϤ¬Ê¸»úÎó
-    ``&lt;<code>dir</code>&gt;'' ¤ò´Þ¤ß¡¢¥Ö¥é¥¦¥¶¤òº®Í𤵤»¤ë¤«¤é¤Ç¤¹¡£</p>
-
-    <p>¤³¤Îµ¡Ç½¤ÏÈó¾ï¤Ë´í¸±¤Ç¤¢¤ê¡¢¤É¤ó¤Ê¥³¡¼¥É¤Ç¤â <code>exec</code>
-    ¥¿¥°¤ËËä¤á¹þ¤Þ¤ì¤Æ¤·¤Þ¤¨¤Ð¼Â¹Ô¤¹¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£Î㤨¤Ð 
-    `` ¥²¥¹¥È¥Ö¥Ã¥¯ '' ¤Î¤è¤¦¤Ë¡¢¤â¤·¡¢
-    ¥æ¡¼¥¶¤¬¥Ú¡¼¥¸¤ÎÆâÍƤòÊÔ½¸¤Ç¤­¤ë¾õ¶·¤Ë¤¢¤ë¤Ê¤é¤Ð¡¢
-    ¤³¤Îµ¡Ç½¤ò³Î¼Â¤ËÍÞÀ©¤·¤Æ¤¯¤À¤µ¤¤¡£<code>Options</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î <code>IncludesNOEXEC</code> °ú¿ô¤ò»ØÄꤹ¤ë¤³¤È¤Ç¡¢
-    SSI ¤Ïµö²Ä¤¹¤ë¤±¤ì¤É <code>exec</code>
-    µ¡Ç½¤Ïµö²Ä¤·¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="advanced" id="advanced">¹âÅÙ¤Ê SSI ¥Æ¥¯¥Ë¥Ã¥¯</a></h2>
-
-
-    <p>¥³¥ó¥Æ¥ó¥Ä¤ò½ÐÎϤ¹¤ë¤³¤È¤Ë²Ã¤¨¡¢Apache SSI ¤ÏÊÑ¿ô¤òÀßÄꤷ¡¢
-    ¤½¤·¤ÆÈæ³Ó¤È¾ò·ïʬ´ô¤Ë¤½¤ÎÊÑ¿ô¤ò»ÈÍѤǤ­¤ëµ¡Ç½¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
-    </p>
-
-<h3><a name="caveat" id="caveat">·Ù¹ð</a></h3>
-
-    <p>¤³¤Îµ­»ö¤Ç½Ò¤Ù¤¿ÂçÉôʬ¤Îµ¡Ç½¤Ï¡¢Apache 1.2
-    °Ê¹ß¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Î¤ßÍøÍѲÄǽ¤Ç¤¹¡£¤â¤Á¤í¤ó¡¢¤â¤· Apache 1.2
-    °Ê¹ß¤ò»ÈÍѤ·¤Æ¤Ê¤¤¾ì¹ç¡¢Ä¾¤Á¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤µ¤¡¡¢º£¤½¤ì¤ò¹Ô¤Ê¤¤¤Ê¤µ¤¤¡£¤½¤ì¤Þ¤ÇÂԤäƤ¤¤Þ¤¹¡£</p>
-
-
-<h3><a name="variables" id="variables">ÊÑ¿ô¤òÀßÄꤹ¤ë</a></h3>
-
-    <p><code>set</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ·¤Æ¡¢
-    ¸å¤Ç»ÈÍѤ¹¤ë¤¿¤á¤ËÊÑ¿ô¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤³¤ì¤Ï¸å¤ÎÀâÌÀ¤ÇɬÍפˤʤë¤Î¤Ç¡¢¤³¤³¤Ç¤½¤ì¤Ë¤Ä¤¤¤Æ½Ò¤Ù¤Æ¤¤¤Þ¤¹¡£
-    ʸˡ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹:</p>
-<div class="example"><p><code>
-        &lt;!--#set var="name" value="Rich" --&gt;
-</code></p></div>
-
-    <p>¤³¤Î¤è¤¦¤Ëñ½ã¤Ëʸ»ú¤É¤ª¤ê¤ËÀßÄꤹ¤ë¤³¤È¤Ë²Ã¤¨¡¢
-    <a href="../env.html">´Ä¶­ÊÑ¿ô</a>¤ä¾åµ­¤ÎÊÑ¿ô
-    (Î㤨¤Ð <code>LAST_MODIFIED</code> ¤Î¤è¤¦¤Ê)
-    ¤ò´Þ¤à¾¤Î¤¢¤é¤æ¤ëÊÑ¿ô¤òÃͤòÀßÄꤹ¤ë¤Î¤Ë»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ÊÑ¿ô̾¤ÎÁ°¤Ë¥É¥ëµ­¹æ ($) ¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢
-    ¤½¤ì¤¬¥ê¥Æ¥é¥ëʸ»úÎó¤Ç¤Ï¤Ê¤¯¤ÆÊÑ¿ô¤Ç¤¢¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£</p>
-<div class="example"><p><code>
-        &lt;!--#set var="modified" value="$LAST_MODIFIED" --&gt;
-</code></p></div>
-
-    <p>¥É¥ëµ­¹æ ($) ¤òʸ»ú¤È¤·¤ÆÊÑ¿ô¤ÎÃͤËÆþ¤ì¤ë¤Ë¤Ï¡¢
-    ¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤Ë¤è¤Ã¤Æ¥É¥ëµ­¹æ¤ò¥¨¥¹¥±¡¼¥×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-<div class="example"><p><code>
-        &lt;!--#set var="cost" value="\$100" --&gt;
-</code></p></div>
-
-    <p>ºÇ¸å¤Ë¤Ê¤ê¤Þ¤¹¤¬¡¢Ä¹¤¤Ê¸»úÎó¤ÎÃæ¤ËÊÑ¿ô¤òÃÖ¤­¤¿¤¤¾ì¹ç¤Ç¡¢
-    ÊÑ¿ô̾¤¬Â¾¤Îʸ»ú¤È¤Ö¤Ä¤«¤ë²ÄǽÀ­¤¬¤¢¤ê¡¢
-    ¤½¤ì¤é¤Îʸ»ú¤Ë¤Ä¤¤¤Æº®Í𤷤Ƥ·¤Þ¤¦¾ì¹ç¡¢¤³¤Îº®Íð¤ò¼è¤ê½ü¤¯¤¿¤á¡¢
-    ÊÑ¿ô̾¤òÃæ³ç¸Ì¤Ç°Ï¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹
-    (¤³¤ì¤Ë¤Ä¤¤¤Æ¤ÎÎɤ¤Îã¤ò¼¨¤¹¤Î¤ÏÆñ¤·¤¤¤Î¤Ç¤¹¤¬¡¢
-    ¤ª¤½¤é¤¯Ê¬¤«¤Ã¤Æ¤¤¤¿¤À¤±¤ë¤Ç¤·¤ç¤¦)¡£
-    </p>
-<div class="example"><p><code>
-        &lt;!--#set var="date" value="${DATE_LOCAL}_${DATE_GMT}" --&gt;
-</code></p></div>
-
-
-<h3><a name="conditional" id="conditional">¾ò·ï¼°</a></h3>
-
-
-    <p>¤µ¤Æ¡¢ÊÑ¿ô¤ò»ý¤Ã¤Æ¤¤¤Æ¡¢
-    ¤½¤ì¤é¤ÎÃͤòÀßÄꤷ¤ÆÈæ³Ó¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤Î¤Ç¤¹¤«¤é¡¢
-    ¾ò·ï¤òɽ¤¹¤¿¤á¤Ë¤½¤ì¤é¤ò»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê
-    SSI ¤Ï¤¢¤ë¼ï¤Î¾®¤µ¤Ê¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-    <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> ¤Ï¾ò·ï¤òɽ¸½¤¹¤ë¤¿¤á¤Ë <code>if</code>,
-    <code>elif</code>, <code>else</code>, <code>endif</code>
-    ¹½Â¤¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ë¤è¤Ã¤Æ¡¢
-    °ì¤Ä¤Î¼ÂºÝ¤Î¥Ú¡¼¥¸¤«¤éÊ£¿ô¤ÎÏÀÍý¥Ú¡¼¥¸¤ò¸ú²ÌŪ¤ËÀ¸À®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¾ò·ï¹½Â¤¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹:</p>
-<div class="example"><p><code>
-    &lt;!--#if expr="test_condition" --&gt;<br />
-    &lt;!--#elif expr="test_condition" --&gt;<br />
-    &lt;!--#else --&gt;<br />
-    &lt;!--#endif --&gt;
-</code></p></div>
-
-    <p><em>test_condition</em>
-    ¤Ï¤¢¤é¤æ¤ë¼ïÎà¤ÎÏÀÍýŪÈæ³Ó¤ò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ÃͤòÈæ³Ó¤·¤¿¤ê¡¢¤½¤ÎÃͤ¬ ``¿¿'' ¤«¤É¤¦¤«¤òɾ²Á¤·¤Þ¤¹
-    (¶õ¤Ç¤Ê¤¤¤Ê¤éÍ¿¤¨¤é¤ì¤¿Ê¸»úÎó¤Ï¿¿¤Ç¤¹)¡£
-    ÍøÍѲÄǽ¤ÊÈæ³Ó±é»»»Ò¤ÎÁ´¤Æ¤Î¥ê¥¹¥È¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-    <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ¤³¤³¤Ç¤Ï¡¢¤³¤Î¹½Â¤¤ò¤É¤¦»ÈÍѤ¹¤ë¤«¤ÎÎã¤ò¤¤¤¯¤Ä¤«¼¨¤·¤Þ¤¹¡£</p>
-
-    <p>ÀßÄê¥Õ¥¡¥¤¥ë¤Ç¼¡¤Î¹Ô¤òµ­½Ò¤·¤Þ¤¹:</p>
-<div class="example"><p><code>
-        BrowserMatchNoCase macintosh Mac<br />
-        BrowserMatchNoCase MSIE InternetExplorer
-</code></p></div>
-
-    <p>¤³¤ì¤Ï¥¯¥é¥¤¥¢¥ó¥È¤¬ Macintosh
-    ¾å¤Ç¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥¨¥¯¥¹¥×¥í¡¼¥é¤¬Æ°¤¤¤Æ¤¤¤ë¾ì¹ç¡¢´Ä¶­ÊÑ¿ô
-    ``Mac'' ¤È ``InternetExplorer'' ¤ò¿¿¤ÈÀßÄꤷ¤Þ¤¹¡£</p>
-
-    <p>¼¡¤Ë¡¢SSI ¤¬²Äǽ¤Ë¤Ê¤Ã¤¿¥É¥­¥å¥á¥ó¥È¤Ç°Ê²¼¤ò¹Ô¤Ê¤¤¤Þ¤¹:
-    </p>
-<div class="example"><p><code>
-        &lt;!--#if expr="${Mac} &amp;&amp; ${InternetExplorer}" --&gt;<br />
-        Apologetic text goes here<br />
-        &lt;!--#else --&gt;<br />
-        Cool JavaScript code goes here<br />
-        &lt;!--#endif --&gt;
-</code></p></div>
-
-    <p>Mac ¾å¤Î IE ¤ËÂФ·¤Æ²¿¤«»×¤¦¤È¤³¤í¤¬¤¢¤ë¤ï¤±¤Ç¤¢¤ê¤Þ¤»¤ó¡£
-    ¾¤Ç¤Ï¼Â¹Ô¤Ç¤­¤Æ¤¤¤ë¤¤¤¯¤Ä¤«¤Î JavaScript ¤ò Mac ¾å¤Î IE
-    ¤Ç¼Â¹Ô¤µ¤»¤ë¤Î¤Ë¡¢Àè½µ¿ô»þ´Ö¶ìÏ«¤·¤¿¤È¤¤¤¦¤À¤±¤Î¤³¤È¤Ç¤¹¡£
-    ¾å¤ÎÎã¤Ï¤½¤Î»ÃÄêŪ¤ÊÂнèÊýË¡¤Ç¤¹¡£</p>
-
-    <p>¾¤Î¤É¤ó¤ÊÊÑ¿ô (¤¢¤Ê¤¿¤¬ÄêµÁ¤¹¤ë¤â¤Î¡¢
-    ¤Þ¤¿¤ÏÉáÄ̤δĶ­ÊÑ¿ô¤Î¤¤¤º¤ì¤«) ¤â¡¢¾ò·ïʸ¤Ë»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    Apache ¤Ï <code>SetEnvIf</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ä¾¤Î´ØÏ¢
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ·¤Æ´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤³¤Îµ¡Ç½¤Ë¤è¤ê¡¢CGI
-    ¤ËÍê¤ë¤³¤È¤Ê¤¯¤«¤Ê¤êÊ£»¨¤ÊưŪ¤Ê¤³¤È¤ò¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="conclusion" id="conclusion">½ª¤ï¤ê¤Ë</a></h2>
-
-    <p>SSI ¤Ï³Î¤«¤Ë CGI
-    ¤äưŪ¤Ê¥¦¥§¥Ö¥Ú¡¼¥¸¤òÀ¸À®¤¹¤ë¾¤Îµ»½Ñ¤ËÂå¤ï¤ë¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-    ¤·¤«¤·¡¢¤¿¤¯¤µ¤ó¤Î;ʬ¤Êºî¶È¤ò¤»¤º¤Ë¡¢
-    ¾¯Î̤ÎưŪ¤Ê¥³¥ó¥Æ¥ó¥Ä¤ò²Ã¤¨¤ë¤Ë¤Ï¤¹¤°¤ì¤¿ÊýË¡¤Ç¤¹¡£</p>
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/howto/ssi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/howto/ssi.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/howto/ssi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/ssi.html.ja.utf8 b/docs/manual/howto/ssi.html.ja.utf8
new file mode 100644
index 00000000..ae3500c3
--- /dev/null
+++ b/docs/manual/howto/ssi.html.ja.utf8
@@ -0,0 +1,481 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Apache �ュートリアル: Server Side Includes 入門 - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">How-To / �ュートリアル</a></div><div id="page-content"><div id="preamble"><h1>Apache �ュートリアル: Server Side Includes 入門</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/howto/ssi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/howto/ssi.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/howto/ssi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+
+<p>サー�サイドインクルード�よ���既存� HTML
+ドキュメント�動的�コンテンツを追加�る�������。</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#related">����</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#what">SSI �� ?</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#configuring">SSI を許��る���サー��設定</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#basic">基本的� SSI ディレクティブ</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#additionalexamples">追加�例</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#config">他�何�設定��る�� ?</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#exec">コマンド�実行</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#advanced">高度� SSI テクニック</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#conclusion">終�り�</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="related" id="related">����</a></h2>
+ <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="../mod/mod_expires.html">mod_expires</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code></li><li><code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code></li><li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code></li><li><code class="directive"><a href="../mod/mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></code></li></ul></td></tr></table>
+
+    <p>��記事��通常��� SSI �呼�れる Server Side Includes
+    を扱���。��記事������サー��� SSI を許��る���設定��
+    �在� HTML ページ�動的�コンテンツを加�る��������基本的�
+    SSI 技術を紹介���。</p>
+
+    <p>記事�後����SSI ディレクティブ� SSI
+    �共�実行�る�����る�件文�よ��
+    幾分高度�事柄����述�����。</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="what" id="what">SSI �� ?</a></h2>
+
+    <p>SSI (Server Side Includes) ��HTML
+    ページ中��置�れるディレクティブ��り�
+    サー��ページを�供�る時�評価�れ��。SSI ��CGI
+    プログラムや��他�動的�技術�全��ページを�供����
+    動的�生��れ�コンテンツを�在� HTML ページ�加���。</p>
+
+    <p>����場�� SSI を使������場��プログラム�
+    ページを完全�生��る���ページ�����程度��的��り�
+    ページ��供�れる����計算�る必����程度�る��通常�決定���。
+    SSI ��在時刻�よ�����情報を加�る��������方法��。
+    ������ページ���ん��部分��供時�生��れる場���
+    他�方法を探�必���り��。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="configuring" id="configuring">SSI を許��る���サー��設定</a></h2>
+
+
+    <p>サー�� SSI を許��る���<code>httpd.conf</code>
+    ファイル��� <code>.htaccess</code>
+    ファイル�次�ディレクティブを指定�る必���り��:</p>
+<div class="example"><p><code>
+        Options +Includes
+</code></p></div>
+
+    <p>��指定��ファイルを SSI
+    ディレクティブ�解���る��を許��る�����を Apache
+    �����。��ん��設定���互�を上書���る�複数�
+    <code class="directive"><a href="../mod/core.html#options">Options</a></code> ��る���
+    注�������。��ら��設定�最後�評価�れる��を
+    �証�れる����SSI を使用���ディレクトリ� <code>Options</code>
+    ディレクティブを�用�る必���る��ょ�。</p>
+
+    <p>全��ファイル� SSI
+    ディレクティブ�解��れる��������り��ん。
+    ��ファイル�解��れる�を Apache ���る必���り��。
+    �れを行����二�方法��り��。
+    次�ディレクティブを使�����例�� <code>.shtml</code>
+    �よ��特別�ファイル拡張�を��ファイルを解��るよ�
+    Apache ���る�������:</p>
+<div class="example"><p><code>
+        AddType text/html .shtml<br />
+	AddOutputFilter INCLUDES .shtml
+</code></p></div>
+
+    <p>��方法�欠点��も��在�ページ� SSI ディレクティブを加���場��
+    �れら�ディレクティブ�実行�れるよ�� 
+    <code>.shtml</code> 拡張���る�����ページ�����
+    ��ページ��全��リンクを変更���れ��ら������。</p>
+
+    <p>も�一��方法��<code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code>
+    ディレクティブを使用�る����:</p>
+<div class="example"><p><code>
+        XBitHack on
+</code></p></div>
+
+    <p><code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code> 
+    ��ファイル�実行ビット�立���る場��
+    SSI ディレクティブ�より解��る��を Apache �����。
+    従���SSI ディレクティブを�在�ページ�加�る�����
+    ファイル�を変更����もよ���� <code>chmod</code>
+    を使用��ファイルを実行�能��る���済���。</p>
+<div class="example"><p><code>
+        chmod +x pagename.html
+</code></p></div>
+
+    <p>行�����������関�る短�コメント。時々誰���全��
+    <code>.html</code> ファイルを SSI �解��るよ� Apache ���れ��
+    ���� <code>.shtml</code> ���ファイル���る必��������
+    薦�る�を見る����ょ�。����人������ら�
+    <code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code>
+    ���������������ょ�。
+    ��方法����注��る������� SSI
+    ディレクティブを全�����場��も�Apache �クライアント�
+    �る全��ファイルを最後��読�込��る����り��。
+    ��方法���り処�を���るも���り�良���アイデア��。</p>
+
+    <p>も��ん�Windows ����よ��実行ビットをセット
+    �るよ��も���り��ん��オプション�少�制��れ����。</p>
+
+    <p>デフォルト�設定���Apache � SSI ページ����最終変更時刻や
+    コンテンツ�長�を HTTP ヘッダ��り��ん。
+    動的�コンテンツ��る����れら�値を計算�る��難���ら��。
+    ����ドキュメント�キャッシュ�れ���り�
+    �果���クライアント�性能������よ��感���る����り��。
+    �れを解決�る方法�二��り��:</p>
+
+    <ol>
+      <li><code>XBitHack Full</code> 設定を使用�る。
+      ��設定�より�も�も��求�れ�ファイル�時刻を�照��
+      読�込�れるファイル�変更時刻を無視��最終変更時刻を決定�るよ�
+      Apache �����。</li>
+
+      <li><a href="../mod/mod_expires.html">mod_expires</a>
+      ��供�れ��るディレクティブを使用���
+      ファイル�無効��る時刻を明示���。�れ�より�
+      ブラウザ�プロキシ�キャッシュ�有効��る��を通知���。</li>
+    </ol>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="basic" id="basic">基本的� SSI ディレクティブ</a></h2>
+
+    <p>SSI ディレクティブ�以下�文法�記述���:</p>
+<div class="example"><p><code>
+        &lt;!--#element attribute=value attribute=value ... --&gt;
+</code></p></div>
+
+    <p>HTML �コメント�よ��書�を���る���も� SSI
+    を正��動作�能����れ��ブラウザ��れを無視�る��ょ�。
+    ����HTML ソース中��見���。も� SSI を正��設定���ら�
+    ディレクティブ����果�置���られ��。</p>
+
+    <p>element ����ん�るも��ら一�指定�る�������。
+    指定��るも��大多数������次回も�少�詳��説明���。
+    �����SSI �行�������る例を����示���。</p>
+
+<h3><a name="todaysdate" id="todaysdate">今日�日付</a></h3>
+
+<div class="example"><p><code>
+        &lt;!--#echo var="DATE_LOCAL" --&gt;
+</code></p></div>
+
+    <p><code>echo</code> �素���変数�値を出力���。
+    CGI プログラム�利用�能�環境変数�全��
+    セットを�む多��標準変数��り��。���<code>set</code>
+    �素を用�る����独自�変数を定義�る�������。
+    </p>
+
+    <p>出力�れる日付�書��好�����場����書�を修正�る����
+    <code>config</code> �素� <code>timefmt</code>
+    属性を使用�る�������。</p>
+
+<div class="example"><p><code>
+        &lt;!--#config timefmt="%A %B %d, %Y" --&gt;<br />
+        Today is &lt;!--#echo var="DATE_LOCAL" --&gt;
+</code></p></div>
+
+
+<h3><a name="lastmodified" id="lastmodified">ファイル�変更日</a></h3>
+
+<div class="example"><p><code>
+        This document last modified &lt;!--#flastmod file="index.html" --&gt;
+</code></p></div>
+
+    <p>���素も <code>timefmt</code>
+    フォーマット�設定�従���。</p>
+
+
+<h3><a name="cgi" id="cgi">CGI プログラム��果を�り込む</a></h3>
+
+    <p>�れ��全��人��気�入り��る ``ヒットカウンタ'' �よ��
+    CGI プログラム��果を出力�る SSI
+    �より一般的�使用����一���。</p>
+
+<div class="example"><p><code>
+        &lt;!--#include virtual="/cgi-bin/counter.pl" --&gt;
+</code></p></div>
+
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="additionalexamples" id="additionalexamples">追加�例</a></h2>
+
+
+    <p>以下��SSI を使用�� HTML
+    ドキュメント������る��������特別�例��。</p>
+
+<h3><a name="docmodified" id="docmodified">����ドキュメント�修正�れ���
+?</a></h3>
+
+    <p>先��ドキュメント�最後�変更�れ������を
+    ユーザ�通知�る��� SSI を使用�る�����る��を述����。
+    �����ら�実際�方法�����ん�題�����������。
+    HTML ドキュメント��置�れ�次�コード��ページ���よ��
+    タイムスタンプを入れる��ょ�。も��ん�上述�よ���
+    SSI を正��動作�能�����必���り��。</p>
+<div class="example"><p><code>
+        &lt;!--#config timefmt="%A %B %d, %Y" --&gt;<br />
+        This file last modified &lt;!--#flastmod file="ssi.shtml" --&gt;
+</code></p></div>
+
+    <p>も��ん�<code>ssi.shtml</code>
+    �部分を実際�当該ファイル��置���る必���り��。
+    も���らゆるファイル�張る�����る一般的�コードを探���る�ら�
+    �れ��便��る�も�れ��ん。��ら���場���
+    ���る代�り�変数 <code>LAST_MODIFIED</code>
+    を使用����考�る��ょ�:</p>
+<div class="example"><p><code>
+        &lt;!--#config timefmt="%D" --&gt;<br />
+        This file last modified &lt;!--#echo var="LAST_MODIFIED" --&gt;
+</code></p></div>
+
+    <p><code>timefmt</code>
+    書������より詳細�������好��検索サイト�行��
+    <code>strftime</code> �検索��������。文法�����。</p>
+
+
+<h3><a name="standard-footer" id="standard-footer">標準�フッタを挿入�る</a></h3>
+
+
+    <p>も�数ページを超�るページを��サイトを管����る�ら��
+    全ページ�対��変更を行�����本当�苦痛��り得る���
+    分�る��ょ�。全��ページ�渡���る種�標準的�外観を
+    維��よ�����る�ら�特�����ょ�。</p>
+
+    <p>ヘッダやフッタ用�挿入用ファイルを使用�る����
+    ��よ��更新���る負担を減ら��������。
+    一��フッタファイルを作����れを <code>include</code>
+    SSI コマンド��ページ�入れる���済���。<code>include</code>
+    �素��<code>file</code> 属性��� <code>virtual</code>
+    属性���れ�を使用����ファイルを挿入�る�を決�る�������。
+    <code>file</code> 属性��<em>カレントディレクトリ�ら�相対パス�示�れ�
+    </em>ファイルパス��。
+    �れ� / �始�る絶対ファイルパス�����������パス�一部� ../
+    を�む���������を�味���。<code>virtual</code>
+    属性����ら�より便利���������供�るドキュメント�ら�相対
+    URL �指定�����。�れ� / �始�る���������
+    �供�るファイル���サー�上�存在������り��ん。</p>
+<div class="example"><p><code>
+        &lt;!--#include virtual="/footer.html" --&gt;
+</code></p></div>
+
+    <p>��最後�二�を組������<code>LAST_MODIFIED</code>
+    ディレクティブをフッタファイル�中�置����よ��り��。
+    SSI ディレクティブ��挿入用�ファイル�����り�
+    挿入ファイル��ストを��り�る�������。�����
+    挿入用�ファイル�他�ファイルを�帰的�挿入�る�������。</p>
+
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="config" id="config">他�何�設定��る�� ?</a></h2>
+
+
+    <p>時刻書�を <code>config</code> �設定��る���加���
+    更�二� <code>config</code> �設定�る�������。</p>
+
+    <p>通常�SSI ディレクティブ�何�������������
+    次�メッセージ�出力�れ��。</p>
+<div class="example"><p><code>
+        [an error occurred while processing this directive]
+</code></p></div>
+
+    <p>��メッセージを他�も�����場��<code>config</code>
+    �素� <code>errmsg</code> 属性�変更�る�������:</p>
+<div class="example"><p><code>
+        &lt;!--#config errmsg="[It appears that you don't know how to use SSI]" --&gt;
+</code></p></div>
+
+    <p>��ら��エンドユーザ���メッセージを決��見る����り��ん。
+    ���ら���サイト�生��状態��る�� SSI ディレクティブ�関�る
+    全���題を解決���る����ら��。(����よ�?)</p>
+
+    <p>����<code>config</code> ���� <code>sizefmt</code>
+    属性を使用�る����
+    返�れるファイルサイズ�書�を設定�る�������。
+    �イト数�� <code>bytes</code> を��当� Kb や Mb
+    �短縮��る�� <code>abbrev</code> を指定�る�������。</p>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="exec" id="exec">コマンド�実行</a></h2>
+    
+
+    <p>今後数ヶ月�������� CGI プログラム� SSI
+    を使用�る記事を出����考�����。�����れ��別��
+    <code>exec</code> �素�よ��行�������る��を示���。
+    SSI �シェル (正確�� <code>/bin/sh</code>。Win32 �ら� DOS シェル)
+    を使用��コマンドを実行��る�������。
+    下記�例���ディレクトリリスト出力を行����。</p>
+<div class="example"><p><code>
+        &lt;pre&gt;<br />
+        &lt;!--#exec cmd="ls" --&gt;<br />
+        &lt;/pre&gt;
+</code></p></div>
+
+    <p>Windows 上���</p>
+<div class="example"><p><code>
+        &lt;pre&gt;<br />
+        &lt;!--#exec cmd="dir" --&gt;<br />
+        &lt;/pre&gt;
+</code></p></div>
+
+    <p>Windows 上�����ディレクティブ�よ�������奇妙�
+    書��気����ょ�。���ら <code>dir</code> �出力�文字列
+    ``&lt;<code>dir</code>&gt;'' を���ブラウザを混乱��る�ら��。</p>
+
+    <p>��機能��常��険��り��ん�コード�も <code>exec</code>
+    タグ�埋�込�れ�����実行�る���注�������。例�� 
+    `` ゲストブック '' �よ���も��
+    ユーザ�ページ�内容を編集��る状���る�ら��
+    ��機能を確実�抑制������。<code>Options</code>
+    ディレクティブ� <code>IncludesNOEXEC</code> 引数を指定�る����
+    SSI �許��る�れ� <code>exec</code>
+    機能�許����よ���る�������。</p>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="advanced" id="advanced">高度� SSI テクニック</a></h2>
+
+
+    <p>コンテンツを出力�る���加��Apache SSI �変数を設定��
+    ���比較��件分����変数を使用��る機能を�供�����。
+    </p>
+
+<h3><a name="caveat" id="caveat">警告</a></h3>
+
+    <p>��記事�述��大部分�機能��Apache 1.2
+    以�を使用���る場���利用�能��。も��ん�も� Apache 1.2
+    以�を使用����場��直��アップグレード�る必���り��。
+    ���今�れを行�����。�れ��待�����。</p>
+
+
+<h3><a name="variables" id="variables">変数を設定�る</a></h3>
+
+    <p><code>set</code> ディレクティブを使用���
+    後�使用�る���変数を設定�る�������。
+    �れ�後�説明�必���る�������れ����述�����。
+    文法�以下���り��:</p>
+<div class="example"><p><code>
+        &lt;!--#set var="name" value="Rich" --&gt;
+</code></p></div>
+
+    <p>��よ���純�文字��り�設定�る���加��
+    <a href="../env.html">環境変数</a>や上記�変数
+    (例�� <code>LAST_MODIFIED</code> �よ��)
+    を�む他��らゆる変数を値を設定�る��使用�る�������。
+    変数����ドル記� ($) を使用�る����
+    �れ�リテラル文字列�����変数��る��を示���。</p>
+<div class="example"><p><code>
+        &lt;!--#set var="modified" value="$LAST_MODIFIED" --&gt;
+</code></p></div>
+
+    <p>ドル記� ($) を文字���変数�値�入れる���
+    �ックスラッシュ�よ��ドル記�をエスケープ�る必���り��。</p>
+<div class="example"><p><code>
+        &lt;!--#set var="cost" value="\$100" --&gt;
+</code></p></div>
+
+    <p>最後��り����長�文字列�中�変数を置���場���
+    変数��他�文字����る�能性��り�
+    �れら�文字����混乱�����場����混乱を�り除����
+    変数�を中括弧�囲む�������
+    (�れ�����良�例を示���難�������
+    ��ら�分�������る��ょ�)。
+    </p>
+<div class="example"><p><code>
+        &lt;!--#set var="date" value="${DATE_LOCAL}_${DATE_GMT}" --&gt;
+</code></p></div>
+
+
+<h3><a name="conditional" id="conditional">�件�</a></h3>
+
+
+    <p>���変数を������
+    �れら�値を設定��比較�る�����る����ら�
+    �件を表�����れらを使用�る�������。�れ�より
+    SSI ��る種����プログラミング言語�������。
+    <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> ��件を表��る��� <code>if</code>,
+    <code>elif</code>, <code>else</code>, <code>endif</code>
+    構造を�供�����。�れ�よ���
+    一��実際�ページ�ら複数�論�ページを効果的�生��る�������。</p>
+
+    <p>�件構造�以下���り��:</p>
+<div class="example"><p><code>
+    &lt;!--#if expr="test_condition" --&gt;<br />
+    &lt;!--#elif expr="test_condition" --&gt;<br />
+    &lt;!--#else --&gt;<br />
+    &lt;!--#endif --&gt;
+</code></p></div>
+
+    <p><em>test_condition</em>
+    ��らゆる種類�論�的比較を�る�������。
+    値を比較��り���値� ``真'' ����を評価���
+    (空����ら与�られ�文字列�真��)。
+    利用�能�比較演算��全��リスト������
+    <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> ドキュメンテーションを�照������。
+    �������構造を��使用�る��例を����示���。</p>
+
+    <p>設定ファイル�次�行を記述���:</p>
+<div class="example"><p><code>
+        BrowserMatchNoCase macintosh Mac<br />
+        BrowserMatchNoCase MSIE InternetExplorer
+</code></p></div>
+
+    <p>�れ�クライアント� Macintosh
+    上�インター�ットエクスプローラ�動���る場��環境変数
+    ``Mac'' � ``InternetExplorer'' を真�設定���。</p>
+
+    <p>次��SSI ��能����ドキュメント�以下を行����:
+    </p>
+<div class="example"><p><code>
+        &lt;!--#if expr="${Mac} &amp;&amp; ${InternetExplorer}" --&gt;<br />
+        Apologetic text goes here<br />
+        &lt;!--#else --&gt;<br />
+        Cool JavaScript code goes here<br />
+        &lt;!--#endif --&gt;
+</code></p></div>
+
+    <p>Mac 上� IE �対��何��������る����り��ん。
+    他��実行����る����� JavaScript を Mac 上� IE
+    �実行��る���先週数時間苦労������������。
+    上�例���暫定的�対処方法��。</p>
+
+    <p>他��ん�変数 (����定義�るも��
+    ���普通�環境変数���れ�) も��件文�使用�る�������。
+    Apache � <code>SetEnvIf</code> ディレクティブや他�関連
+    ディレクティブを使用��環境変数を設定�る�������。
+    ��機能�より�CGI
+    �頼る������り複雑�動的���を��る�������。</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="conclusion" id="conclusion">終�り�</a></h2>
+
+    <p>SSI �確�� CGI
+    や動的�ウェブページを生��る他�技術�代�るも����り��ん。
+    �������ん�余分�作業を����
+    少��動的�コンテンツを加�る����れ�方法��。</p>
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/howto/ssi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/howto/ssi.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/howto/ssi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/howto/ssi.html.ko.euc-kr b/docs/manual/howto/ssi.html.ko.euc-kr
index af05d5fe..65b0eadf 100644
--- a/docs/manual/howto/ssi.html.ko.euc-kr
+++ b/docs/manual/howto/ssi.html.ko.euc-kr
@@ -421,6 +421,6 @@
 <a href="../ja/howto/ssi.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/ssi.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/index.html b/docs/manual/index.html
index 90fa64a5..777ed96e 100644
--- a/docs/manual/index.html
+++ b/docs/manual/index.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: index.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -14,9 +16,9 @@ URI: index.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: index.html.ja.euc-jp
+URI: index.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: index.html.ko.euc-kr
 Content-Language: ko
@@ -25,3 +27,7 @@ Content-type: text/html; charset=EUC-KR
 URI: index.html.pt-br
 Content-Language: pt-br
 Content-type: text/html; charset=ISO-8859-1
+
+URI: index.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/index.html.de b/docs/manual/index.html.de
index 2c021445..de29dcae 100644
--- a/docs/manual/index.html.de
+++ b/docs/manual/index.html.de
@@ -28,8 +28,12 @@
 <a href="./fr/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
+<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Diese Übersetzung ist möglicherweise
+            nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
+            die neuesten Änderungen.</div>
 <form method="get" action="http://www.google.com/search"><p><input name="as_q" value="" type="text" /> <input value="Google-Suche" type="submit" /><input value="10" name="num" type="hidden" /><input value="de" name="hl" type="hidden" /><input value="ISO-8859-1" name="ie" type="hidden" /><input value="Google Search" name="btnG" type="hidden" /><input name="as_epq" value="Version 2.2" type="hidden" /><input name="as_oq" value="" type="hidden" /><input name="as_eq" value="&quot;List-Post&quot;" type="hidden" /><input value="" name="lr" type="hidden" /><input value="i" name="as_ft" type="hidden" /><input value="" name="as_filetype" type="hidden" /><input value="all" name="as_qdr" type="hidden" /><input value="any" name="as_occt" type="hidden" /><input value="i" name="as_dt" type="hidden" /><input value="httpd.apache.org" name="as_sitesearch" type="hidden" /><input value="off" name="safe" type="hidden" /></p></form>
 <table id="indextable"><tr><td class="col1"><div class="category"><h2><a name="release" id="release">Hinweise zur Version</a></h2>
 <ul><li><a href="new_features_2_2.html">Neue Funktionen in Version 2.1/2.2</a></li>
@@ -97,8 +101,9 @@
 <a href="./fr/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
+<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/index.html.en b/docs/manual/index.html.en
index 3cbd41a1..1536534c 100644
--- a/docs/manual/index.html.en
+++ b/docs/manual/index.html.en
@@ -28,7 +28,8 @@ Documentation</h1>
 <a href="./fr/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
+<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <form method="get" action="http://www.google.com/search"><p><input name="as_q" value="" type="text" /> <input value="Google Search" type="submit" /><input value="10" name="num" type="hidden" /><input value="en" name="hl" type="hidden" /><input value="ISO-8859-1" name="ie" type="hidden" /><input value="Google Search" name="btnG" type="hidden" /><input name="as_epq" value="Version 2.2" type="hidden" /><input name="as_oq" value="" type="hidden" /><input name="as_eq" value="&quot;List-Post&quot;" type="hidden" /><input value="" name="lr" type="hidden" /><input value="i" name="as_ft" type="hidden" /><input value="" name="as_filetype" type="hidden" /><input value="all" name="as_qdr" type="hidden" /><input value="any" name="as_occt" type="hidden" /><input value="i" name="as_dt" type="hidden" /><input value="httpd.apache.org" name="as_sitesearch" type="hidden" /><input value="off" name="safe" type="hidden" /></p></form>
 <table id="indextable"><tr><td class="col1"><div class="category"><h2><a name="release" id="release">Release Notes</a></h2>
@@ -65,7 +66,7 @@ Documentation</h1>
 <li><a href="server-wide.html">Server-Wide Configuration</a></li>
 <li><a href="ssl/">SSL/TLS Encryption</a></li>
 <li><a href="suexec.html">Suexec Execution for CGI</a></li>
-<li><a href="misc/rewriteguide.html">URL Rewriting Guide</a></li>
+<li><a href="rewrite/">URL Rewriting Guide</a></li>
 <li><a href="vhosts/">Virtual Hosts</a></li>
 </ul>
 </div></td><td class="col3"><div class="category"><h2><a name="howto" id="howto">How-To / Tutorials</a></h2>
@@ -96,8 +97,9 @@ Documentation</h1>
 <a href="./fr/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
+<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/index.html.es b/docs/manual/index.html.es
index c01382e2..ac2b390f 100644
--- a/docs/manual/index.html.es
+++ b/docs/manual/index.html.es
@@ -28,7 +28,8 @@ Servidor de HTTP Apache</h1>
 <a href="./fr/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
+<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">Esta traducción podría estar
             obsoleta. Consulte la versión en inglés de la
@@ -103,8 +104,9 @@ ejecución</a></li>
 <a href="./fr/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
+<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Módulos</a> | <a href="./mod/directives.html">Directivas</a> | <a href="./faq/">Preguntas Frecuentes</a> | <a href="./glossary.html">Glosario</a> | <a href="./sitemap.html">Mapa de este sitio web</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/index.html.fr b/docs/manual/index.html.fr
index f320aa48..96a69c31 100644
--- a/docs/manual/index.html.fr
+++ b/docs/manual/index.html.fr
@@ -28,7 +28,8 @@
 <a href="./fr/" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
+<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <form method="get" action="http://www.google.com/search"><p><input name="as_q" value="" type="text" /> <input value="Recherche Google" type="submit" /><input value="10" name="num" type="hidden" /><input value="fr" name="hl" type="hidden" /><input value="ISO-8859-1" name="ie" type="hidden" /><input value="Google Search" name="btnG" type="hidden" /><input name="as_epq" value="Version 2.2" type="hidden" /><input name="as_oq" value="" type="hidden" /><input name="as_eq" value="&quot;List-Post&quot;" type="hidden" /><input value="" name="lr" type="hidden" /><input value="i" name="as_ft" type="hidden" /><input value="" name="as_filetype" type="hidden" /><input value="all" name="as_qdr" type="hidden" /><input value="any" name="as_occt" type="hidden" /><input value="i" name="as_dt" type="hidden" /><input value="httpd.apache.org" name="as_sitesearch" type="hidden" /><input value="off" name="safe" type="hidden" /></p></form>
 <table id="indextable"><tr><td class="col1"><div class="category"><h2><a name="release" id="release">Notes de version</a></h2>
@@ -65,11 +66,11 @@
 <li><a href="server-wide.html">Configuration à l'échelle du serveur</a></li>
 <li><a href="ssl/">Chiffrement SSL/TLS</a></li>
 <li><a href="suexec.html">Exécution des CGI avec suexec</a></li>
-<li><a href="misc/rewriteguide.html">Guide de réécriture des URLs</a></li>
-<li><a href="vhosts/">Hôtes virtuels</a></li>
+<li><a href="rewrite/">Guide de réécriture des URLs</a></li>
+<li><a href="vhosts/">Hôtes virtuels</a></li>
 </ul>
 </div></td><td class="col3"><div class="category"><h2><a name="howto" id="howto">Recettes / Tutoriels</a></h2>
-<ul><li><a href="howto/auth.html">Authentification, autorisation, et contrôle d'accès</a></li>
+<ul><li><a href="howto/auth.html">Authentification, autorisation, et contrôle d'accès</a></li>
 <li><a href="howto/cgi.html">CGI: Contenu dynamique</a></li>
 <li><a href="howto/htaccess.html">Fichiers .htaccess</a></li>
 <li><a href="howto/ssi.html">Server Side Includes (SSI)</a></li>
@@ -94,8 +95,9 @@
 <a href="./fr/" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
+<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossaire</a> | <a href="./sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/index.html.ja.euc-jp b/docs/manual/index.html.ja.euc-jp
deleted file mode 100644
index 8d4f8457..00000000
--- a/docs/manual/index.html.ja.euc-jp
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2
-¥É¥­¥å¥á¥ó¥È - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="index-page">
-<div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="http://httpd.apache.org/docs-project/"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a></div>
-<div id="page-content"><h1>Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2
-¥É¥­¥å¥á¥ó¥È</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./de/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./fr/" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Portugu�«´s (Brasil)">&nbsp;pt-br&nbsp;</a></p>
-</div>
-<form method="get" action="http://www.google.com/search"><p><input name="as_q" value="" type="text" /> <input value="Google Search" type="submit" /><input value="10" name="num" type="hidden" /><input value="ja" name="hl" type="hidden" /><input value="EUC-JP" name="ie" type="hidden" /><input value="Google Search" name="btnG" type="hidden" /><input name="as_epq" value="¥Ð¡¼¥¸¥ç¥ó 2.2" type="hidden" /><input name="as_oq" value="" type="hidden" /><input name="as_eq" value="&quot;List-Post&quot;" type="hidden" /><input value="" name="lr" type="hidden" /><input value="i" name="as_ft" type="hidden" /><input value="" name="as_filetype" type="hidden" /><input value="all" name="as_qdr" type="hidden" /><input value="any" name="as_occt" type="hidden" /><input value="i" name="as_dt" type="hidden" /><input value="httpd.apache.org" name="as_sitesearch" type="hidden" /><input value="off" name="safe" type="hidden" /></p></form>
-<table id="indextable"><tr><td class="col1"><div class="category"><h2><a name="release" id="release">¥ê¥ê¡¼¥¹¥Î¡¼¥È</a></h2>
-<ul><li><a href="new_features_2_2.html">Apache 2.1/2.2 ¤Î¿·µ¡Ç½</a></li>
-<li><a href="new_features_2_0.html">Apache 2.0 ¤Î¿·µ¡Ç½</a></li>
-<li><a href="upgrading.html">2.0 ¤«¤é 2.2 ¤Ø¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É</a></li>
-<li><a href="license.html">Apache ¥é¥¤¥»¥ó¥¹</a></li>
-</ul>
-</div><div class="category"><h2><a name="manual" id="manual">¥ê¥Õ¥¡¥ì¥ó¥¹¥Þ¥Ë¥å¥¢¥ë</a></h2>
-<ul><li><a href="install.html">¥³¥ó¥Ñ¥¤¥ë¤È¥¤¥ó¥¹¥È¡¼¥ë</a></li>
-<li><a href="invoking.html">µ¯Æ°</a></li>
-<li><a href="stopping.html">½ªÎ»¤ÈºÆµ¯Æ°</a></li>
-<li><a href="mod/directives.html">¼Â¹Ô¤ÎÀßÄêÍѥǥ£¥ì¥¯¥Æ¥£¥Ö</a></li>
-<li><a href="mod/quickreference.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö ¥¯¥¤¥Ã¥¯¥ê¥Õ¥¡¥ì¥ó¥¹</a></li>
-<li><a href="mod/">¥â¥¸¥å¡¼¥ë</a></li>
-<li><a href="mpm.html">¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë (MPM)</a></li>
-<li><a href="filter.html">¥Õ¥£¥ë¥¿</a></li>
-<li><a href="handler.html">¥Ï¥ó¥É¥é</a></li>
-<li><a href="programs/">¥µ¡¼¥Ð¤È¥µ¥Ý¡¼¥È¥×¥í¥°¥é¥à</a></li>
-<li><a href="glossary.html">ÍѸ콸</a></li>
-</ul>
-</div></td><td><div class="category"><h2><a name="usersguide" id="usersguide">¥æ¡¼¥¶¤Î¼ê°ú</a></h2>
-<ul><li><a href="bind.html">¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤Î¥Ð¥¤¥ó¥É</a></li>
-<li><a href="configuring.html">ÀßÄê¥Õ¥¡¥¤¥ë</a></li>
-<li><a href="sections.html">¥»¥¯¥·¥ç¥ó¤ÎÀßÄê</a></li>
-<li><a href="caching.html">¥­¥ã¥Ã¥·¥åµ¡Ç½</a></li>
-<li><a href="content-negotiation.html">¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó</a></li>
-<li><a href="dso.html">ưŪ¶¦Í­¥ª¥Ö¥¸¥§¥¯¥È (DSO)</a></li>
-<li><a href="env.html">´Ä¶­ÊÑ¿ô</a></li>
-<li><a href="logs.html">¥í¥°¥Õ¥¡¥¤¥ë</a></li>
-<li><a href="urlmapping.html">URL ¤ò¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë¥Þ¥Ã¥×¤¹¤ë</a></li>
-<li><a href="misc/perf-tuning.html">À­Ç½¤Ë´Ø¤¹¤ëÄ´À°</a></li>
-<li><a href="misc/security_tips.html">¥»¥­¥å¥ê¥Æ¥£¾ðÊó</a></li>
-<li><a href="server-wide.html">¥µ¡¼¥ÐÁ´ÂΤÎÀßÄê</a></li>
-<li><a href="ssl/">SSL/TLS ¤Ë¤è¤ë°Å¹æ²½</a></li>
-<li><a href="suexec.html">CGI ¤Î Suexec ¼Â¹Ô</a></li>
-<li><a href="misc/rewriteguide.html">URL Rewriting ¤Î¼ê°ú¤­</a></li>
-<li><a href="vhosts/">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></li>
-</ul>
-</div></td><td class="col3"><div class="category"><h2><a name="howto" id="howto">How-To / ¥Á¥å¡¼¥È¥ê¥¢¥ë</a></h2>
-<ul><li><a href="howto/auth.html">ǧ¾Ú¡¢¾µÇ§¡¢¥¢¥¯¥»¥¹À©¸æ
-    </a></li>
-<li><a href="howto/cgi.html">CGI: ưŪ¥³¥ó¥Æ¥ó¥Ä</a></li>
-<li><a href="howto/htaccess.html">.htaccess ¥Õ¥¡¥¤¥ë</a></li>
-<li><a href="howto/ssi.html">Server Side Includes (SSI)</a></li>
-<li><a href="howto/public_html.html">¥æ¡¼¥¶ÀìÍѥǥ£¥ì¥¯¥È¥ê
-    (public_html)</a></li>
-</ul>
-</div><div class="category"><h2><a name="platform" id="platform">¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¸ÇÍ­¤Î¾ðÊó</a></h2>
-<ul><li><a href="platform/windows.html">Microsoft Windows</a></li>
-<li><a href="platform/netware.html">Novell NetWare</a></li>
-<li><a href="platform/ebcdic.html">EBCDIC ÈÇ</a></li>
-</ul>
-</div><div class="category"><h2><a name="other" id="other">¤½¤Î¾</a></h2>
-<ul><li><a href="faq/">¤è¤¯¤¢¤ë¼ÁÌä (FAQ)</a></li>
-<li><a href="sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></li>
-<li><a href="developer/">³«È¯¼Ô¤Î¤¿¤á¤Î¥É¥­¥å¥á¥ó¥È</a></li>
-<li><a href="misc/">¤½¤Î¾</a></li>
-</ul>
-</div></td></tr></table></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./de/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./fr/" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Portugu�«´s (Brasil)">&nbsp;pt-br&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/index.html.ja.utf8 b/docs/manual/index.html.ja.utf8
new file mode 100644
index 00000000..5b0a8c56
--- /dev/null
+++ b/docs/manual/index.html.ja.utf8
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Apache HTTP サー� �ージョン 2.2
+ドキュメント - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="index-page">
+<div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="http://httpd.apache.org/docs-project/"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a></div>
+<div id="page-content"><h1>Apache HTTP サー� �ージョン 2.2
+ドキュメント</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./de/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<form method="get" action="http://www.google.com/search"><p><input name="as_q" value="" type="text" /> <input value="Google Search" type="submit" /><input value="10" name="num" type="hidden" /><input value="ja" name="hl" type="hidden" /><input value="UTF-8" name="ie" type="hidden" /><input value="Google Search" name="btnG" type="hidden" /><input name="as_epq" value="�ージョン 2.2" type="hidden" /><input name="as_oq" value="" type="hidden" /><input name="as_eq" value="&quot;List-Post&quot;" type="hidden" /><input value="" name="lr" type="hidden" /><input value="i" name="as_ft" type="hidden" /><input value="" name="as_filetype" type="hidden" /><input value="all" name="as_qdr" type="hidden" /><input value="any" name="as_occt" type="hidden" /><input value="i" name="as_dt" type="hidden" /><input value="httpd.apache.org" name="as_sitesearch" type="hidden" /><input value="off" name="safe" type="hidden" /></p></form>
+<table id="indextable"><tr><td class="col1"><div class="category"><h2><a name="release" id="release">リリースノート</a></h2>
+<ul><li><a href="new_features_2_2.html">Apache 2.1/2.2 �新機能</a></li>
+<li><a href="new_features_2_0.html">Apache 2.0 �新機能</a></li>
+<li><a href="upgrading.html">2.0 �ら 2.2 ��アップグレード</a></li>
+<li><a href="license.html">Apache ライセンス</a></li>
+</ul>
+</div><div class="category"><h2><a name="manual" id="manual">リファレンスマニュアル</a></h2>
+<ul><li><a href="install.html">コンパイル�インストール</a></li>
+<li><a href="invoking.html">èµ·å‹•</a></li>
+<li><a href="stopping.html">終了��起動</a></li>
+<li><a href="mod/directives.html">実行�設定用ディレクティブ</a></li>
+<li><a href="mod/quickreference.html">ディレクティブ クイックリファレンス</a></li>
+<li><a href="mod/">モジュール</a></li>
+<li><a href="mpm.html">マル�プロセッシングモジュール (MPM)</a></li>
+<li><a href="filter.html">フィルタ</a></li>
+<li><a href="handler.html">�ンドラ</a></li>
+<li><a href="programs/">サー��サ�ートプログラム</a></li>
+<li><a href="glossary.html">用語集</a></li>
+</ul>
+</div></td><td><div class="category"><h2><a name="usersguide" id="usersguide">ユーザ�手引</a></h2>
+<ul><li><a href="bind.html">アドレス��ート��インド</a></li>
+<li><a href="configuring.html">設定ファイル</a></li>
+<li><a href="sections.html">セクション�設定</a></li>
+<li><a href="caching.html">キャッシュ機能</a></li>
+<li><a href="content-negotiation.html">コンテント�ゴシエーション</a></li>
+<li><a href="dso.html">動的共有オブジェクト (DSO)</a></li>
+<li><a href="env.html">環境変数</a></li>
+<li><a href="logs.html">ログファイル</a></li>
+<li><a href="urlmapping.html">URL をファイルシステム�マップ�る</a></li>
+<li><a href="misc/perf-tuning.html">性能�関�る調整</a></li>
+<li><a href="misc/security_tips.html">セキュリティ情報</a></li>
+<li><a href="server-wide.html">サー�全体�設定</a></li>
+<li><a href="ssl/">SSL/TLS �よる暗�化</a></li>
+<li><a href="suexec.html">CGI � Suexec 実行</a></li>
+<li><a href="misc/rewriteguide.html">URL Rewriting �手引�</a></li>
+<li><a href="vhosts/">�ー�ャルホスト</a></li>
+</ul>
+</div></td><td class="col3"><div class="category"><h2><a name="howto" id="howto">How-To / �ュートリアル</a></h2>
+<ul><li><a href="howto/auth.html">�証�承��アクセス制御
+    </a></li>
+<li><a href="howto/cgi.html">CGI: 動的コンテンツ</a></li>
+<li><a href="howto/htaccess.html">.htaccess ファイル</a></li>
+<li><a href="howto/ssi.html">Server Side Includes (SSI)</a></li>
+<li><a href="howto/public_html.html">ユーザ専用ディレクトリ
+    (public_html)</a></li>
+</ul>
+</div><div class="category"><h2><a name="platform" id="platform">プラットフォーム固有�情報</a></h2>
+<ul><li><a href="platform/windows.html">Microsoft Windows</a></li>
+<li><a href="platform/netware.html">Novell NetWare</a></li>
+<li><a href="platform/ebcdic.html">EBCDIC 版</a></li>
+</ul>
+</div><div class="category"><h2><a name="other" id="other">��他</a></h2>
+<ul><li><a href="faq/">よ��る質� (FAQ)</a></li>
+<li><a href="sitemap.html">サイトマップ</a></li>
+<li><a href="developer/">開発者����ドキュメント</a></li>
+<li><a href="misc/">��他</a></li>
+</ul>
+</div></td></tr></table></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./de/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/index.html.ko.euc-kr b/docs/manual/index.html.ko.euc-kr
index 970d6560..adafeb2b 100644
--- a/docs/manual/index.html.ko.euc-kr
+++ b/docs/manual/index.html.ko.euc-kr
@@ -26,7 +26,8 @@
 <a href="./fr/" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Portugu&#234;s (Brasil)">&nbsp;pt-br&nbsp;</a></p>
+<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Portugu&#234;s (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./tr/" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
             ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
@@ -94,8 +95,9 @@
 <a href="./fr/" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Portugu&#234;s (Brasil)">&nbsp;pt-br&nbsp;</a></p>
+<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Portugu&#234;s (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./tr/" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/index.html.pt-br b/docs/manual/index.html.pt-br
index 7b40883b..14978b60 100644
--- a/docs/manual/index.html.pt-br
+++ b/docs/manual/index.html.pt-br
@@ -28,7 +28,8 @@
 <a href="./fr/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
+<a href="./pt-br/" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">Esta tradução pode estar desatualizada. 
         Verifique a versão em Inglês para mudanças recentes.</div>
@@ -95,8 +96,9 @@
 <a href="./fr/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
+<a href="./pt-br/" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licenciado sob a <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licenciado sob a <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Módulos</a> | <a href="./mod/directives.html">Diretrizes</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossário</a> | <a href="./sitemap.html">Mapa do site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/index.html.tr.utf8 b/docs/manual/index.html.tr.utf8
new file mode 100644
index 00000000..bfa2ee48
--- /dev/null
+++ b/docs/manual/index.html.tr.utf8
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Apache HTTP Sunucusu Sürüm 2.2
+Belgeleri - Apache HTTP Sunucusu</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="index-page">
+<div id="page-header">
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="http://httpd.apache.org/docs-project/"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a></div>
+<div id="page-content"><h1>Apache HTTP Sunucusu Sürüm 2.2
+Belgeleri</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="./de/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./tr/" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+<form method="get" action="http://www.google.com/search"><p><input name="as_q" value="" type="text" /> <input value="Google’de Ara" type="submit" /><input value="10" name="num" type="hidden" /><input value="tr" name="hl" type="hidden" /><input value="UTF-8" name="ie" type="hidden" /><input value="Google Search" name="btnG" type="hidden" /><input name="as_epq" value="Sürüm 2.2" type="hidden" /><input name="as_oq" value="" type="hidden" /><input name="as_eq" value="&quot;List-Post&quot;" type="hidden" /><input value="" name="lr" type="hidden" /><input value="i" name="as_ft" type="hidden" /><input value="" name="as_filetype" type="hidden" /><input value="all" name="as_qdr" type="hidden" /><input value="any" name="as_occt" type="hidden" /><input value="i" name="as_dt" type="hidden" /><input value="httpd.apache.org" name="as_sitesearch" type="hidden" /><input value="off" name="safe" type="hidden" /></p></form>
+<table id="indextable"><tr><td class="col1"><div class="category"><h2><a name="release" id="release">Sürümlerin Dağıtım Bilgileri</a></h2>
+<ul><li><a href="new_features_2_2.html">Apache 2.1/2.2’deki yeni özellikler</a></li>
+<li><a href="new_features_2_0.html">Apache 2.0’daki yeni özellikler</a></li>
+<li><a href="upgrading.html">2.0’dan 2.2’ye yükseltme</a></li>
+<li><a href="license.html">Apache Lisansı</a></li>
+</ul>
+</div><div class="category"><h2><a name="manual" id="manual">Başvuru Kılavuzu</a></h2>
+<ul><li><a href="install.html">Derleme ve Kurulum</a></li>
+<li><a href="invoking.html">BaÅŸlatma</a></li>
+<li><a href="stopping.html">Durdurma ve Yeniden BaÅŸlatma</a></li>
+<li><a href="mod/directives.html">Çalışma anı Yapılandırma Yönergeleri</a></li>
+<li><a href="mod/quickreference.html">Hızlı Yönerge Kılavuzu</a></li>
+<li><a href="mod/">Modüller</a></li>
+<li><a href="mpm.html">Çok Süreçlilik Modülleri (MPM’ler)</a></li>
+<li><a href="filter.html">Süzgeçler</a></li>
+<li><a href="handler.html">Eylemciler</a></li>
+<li><a href="programs/">Sunucu ve Desteklenen Programlar</a></li>
+<li><a href="glossary.html">Terimler</a></li>
+</ul>
+</div></td><td><div class="category"><h2><a name="usersguide" id="usersguide">Kullanıcı Kılavuzu</a></h2>
+<ul><li><a href="bind.html">Dinleme</a></li>
+<li><a href="configuring.html">Yapılandırma Dosyaları</a></li>
+<li><a href="sections.html">Yapılandırma Bölümleri</a></li>
+<li><a href="caching.html">İçerik Bellekleme</a></li>
+<li><a href="content-negotiation.html">İçerik Dili Yönetimi</a></li>
+<li><a href="dso.html">Devingen Paylaşımlı Nesneler (DSO’lar)</a></li>
+<li><a href="env.html">Ortam DeÄŸiÅŸkenleri</a></li>
+<li><a href="logs.html">Günlük Dosyaları</a></li>
+<li><a href="urlmapping.html">URL’lerin Dosya Sistemi ile Eşlenmesi</a></li>
+<li><a href="misc/perf-tuning.html">Başarım Arttırma</a></li>
+<li><a href="misc/security_tips.html">Güvenlik İpuçları</a></li>
+<li><a href="server-wide.html">Sunucu Genelinde Yapılandırma</a></li>
+<li><a href="ssl/">SSL/TLS Åžifrelemesi</a></li>
+<li><a href="suexec.html">CGI için Suexec Desteği</a></li>
+<li><a href="rewrite/">URL Yeniden Yazma Rehberi</a></li>
+<li><a href="vhosts/">Sanal Konaklar</a></li>
+</ul>
+</div></td><td class="col3"><div class="category"><h2><a name="howto" id="howto">Nasıllar ve Öğreticiler</a></h2>
+<ul><li><a href="howto/auth.html">Kimlik DoÄŸrulama, Yetkilendirme ve EriÅŸim Denetimi</a></li>
+<li><a href="howto/cgi.html">CGI: Devingen İçerik</a></li>
+<li><a href="howto/htaccess.html">.htaccess dosyaları</a></li>
+<li><a href="howto/ssi.html">Sunucu Taraflı İçerik Yerleştirme (SSI)</a></li>
+<li><a href="howto/public_html.html">Kullanıcı Dizinleri (public_html)</a></li>
+</ul>
+</div><div class="category"><h2><a name="platform" id="platform">Platformlara Özgü Bilgiler</a></h2>
+<ul><li><a href="platform/windows.html">Microsoft Windows</a></li>
+<li><a href="platform/netware.html">Novell NetWare</a></li>
+<li><a href="platform/ebcdic.html">EBCDIC Port</a></li>
+</ul>
+</div><div class="category"><h2><a name="other" id="other">DiÄŸer Konular</a></h2>
+<ul><li><a href="faq/">Sıkça Sorulan Sorular</a></li>
+<li><a href="sitemap.html">Site Haritası</a></li>
+<li><a href="developer/">Geliştiriciler için Belgeler</a></li>
+<li><a href="misc/">DiÄŸer Bilgiler</a></li>
+</ul>
+</div></td></tr></table></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="./de/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./tr/" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/install.html b/docs/manual/install.html
index 53619faf..b53da3ec 100644
--- a/docs/manual/install.html
+++ b/docs/manual/install.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: install.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -14,10 +16,14 @@ URI: install.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: install.html.ja.euc-jp
+URI: install.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: install.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: install.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/install.html.de b/docs/manual/install.html.de
index ebe188ad..05fc5032 100644
--- a/docs/manual/install.html.de
+++ b/docs/manual/install.html.de
@@ -23,7 +23,8 @@
 <a href="./es/install.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/install.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/install.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/install.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">Diese Übersetzung ist möglicherweise
             nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
@@ -424,8 +425,9 @@
 <a href="./es/install.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/install.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/install.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/install.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en
index 3ed0b881..db213751 100644
--- a/docs/manual/install.html.en
+++ b/docs/manual/install.html.en
@@ -23,7 +23,8 @@
 <a href="./es/install.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/install.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/install.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/install.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
 
@@ -417,8 +418,9 @@
 <a href="./es/install.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/install.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/install.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/install.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/install.html.es b/docs/manual/install.html.es
index 9a65bfe6..08a144cc 100644
--- a/docs/manual/install.html.es
+++ b/docs/manual/install.html.es
@@ -23,7 +23,8 @@
 <a href="./es/install.html" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/install.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/install.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/install.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">Esta traducción podría estar
             obsoleta. Consulte la versión en inglés de la
@@ -431,8 +432,9 @@ prrevia</a></h2>
 <a href="./es/install.html" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/install.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/install.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/install.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Módulos</a> | <a href="./mod/directives.html">Directivas</a> | <a href="./faq/">Preguntas Frecuentes</a> | <a href="./glossary.html">Glosario</a> | <a href="./sitemap.html">Mapa de este sitio web</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/install.html.fr b/docs/manual/install.html.fr
index 1407cbfa..4eb15c48 100644
--- a/docs/manual/install.html.fr
+++ b/docs/manual/install.html.fr
@@ -23,7 +23,8 @@
 <a href="./es/install.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/install.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/install.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/install.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
 
@@ -442,8 +443,9 @@ $ tar xvf httpd-<em>NN</em>.tar
 <a href="./es/install.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/install.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/install.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/install.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossaire</a> | <a href="./sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/install.html.ja.euc-jp b/docs/manual/install.html.ja.euc-jp
deleted file mode 100644
index 9e806772..00000000
--- a/docs/manual/install.html.ja.euc-jp
+++ /dev/null
@@ -1,421 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>¥³¥ó¥Ñ¥¤¥ë¤È¥¤¥ó¥¹¥È¡¼¥ë - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>¥³¥ó¥Ñ¥¤¥ë¤È¥¤¥ó¥¹¥È¡¼¥ë</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./de/install.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/install.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/install.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./fr/install.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/install.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-
-    <p>¤³¤Îʸ½ñ¤Ç°·¤¦ÈϰϤϡ¢Unix ¤ä Unix ¤ËÎà»÷¤·¤¿¥·¥¹¥Æ¥à¤Ç¤Î
-    Apache HTTPd ¥µ¡¼¥Ð¤Î¥³¥ó¥Ñ¥¤¥ë¤È¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤¹¡£ Windows ¤Ë¤ª¤±¤ë
-    ¥³¥ó¥Ñ¥¤¥ë¤È¥¤¥ó¥¹¥È¡¼¥ë¤Ë´Ø¤·¤Æ¤Ï¡Ö<a href="platform/windows.html">Microsoft
-    Windows ¤Ç Apache HTTPd ¤ò»È¤¦</a>¡×¤ò¤´Í÷²¼¤µ¤¤¡£
-    ¤½¤Î¾¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤Ë´Ø¤·¤Æ¤Ï¡Ö<a href="platform/">¥×¥é¥Ã¥È¥Û¡¼¥à</a>¡×¤ò¤´Í÷²¼¤µ¤¤¡£</p>
-
-    <p>Apache HTTPd ¤Ç¤Ï¾¤Î Open Source ¥×¥í¥¸¥§¥¯¥È¤ÈƱÍÍ¡¢
-    ¥Ó¥ë¥É´Ä¶­¹½ÃÛ¤Ë <code>libtool</code> ¤È <code>autoconf</code>
-    ¤ò»È¤¦¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p>¥Þ¥¤¥Ê¡¼¥Ð¡¼¥¸¥ç¥ó¤«¤é¤½¤Î¼¡¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë
-    (2.2.50 ¤«¤é 2.2.51 ¤ØÅù) ¾ì¹ç¤Ï¡¢¤Þ¤º <a href="#upgrading">
-    ¥¢¥Ã¥×¥°¥ì¡¼¥É</a>¤ò¤´Í÷²¼¤µ¤¤¡£</p>
-
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#overview">³µÍ× (¤»¤Ã¤«¤Á¤Ê¿Í¸þ¤±)</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#requirements">ɬÍפʤâ¤Î</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#download">¥À¥¦¥ó¥í¡¼¥É</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#extract">Ÿ³«</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#configure">¥½¡¼¥¹¥Ä¥ê¡¼¤òÀßÄꤹ¤ë</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#compile">¥Ó¥ë¥É</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#install">¥¤¥ó¥¹¥È¡¼¥ë</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#customize">¥«¥¹¥¿¥Þ¥¤¥º</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#test">¥Æ¥¹¥È</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#upgrading">¥¢¥Ã¥×¥°¥ì¡¼¥É</a></li>
-</ul><h3>»²¾È</h3><ul class="seealso"><li><a href="programs/configure.html">¥½¡¼¥¹¥Ä¥ê¡¼¤ÎÀßÄê</a></li><li><a href="invoking.html">Apache HTTPd ¤Îµ¯Æ°</a></li><li><a href="stopping.html">Apache HTTPd ¤ÎÄä»ß¤ÈºÆµ¯Æ°</a></li></ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="overview" id="overview">³µÍ× (¤»¤Ã¤«¤Á¤Ê¿Í¸þ¤±)</a></h2>
-
-    <table>
-      
-      <tr>
-        <td><a href="#download">¥À¥¦¥ó¥í¡¼¥É</a></td>
-
-        <td><code>$ lynx http://httpd.apache.org/download.cgi</code>
-        </td>
-      </tr>
-
-      <tr>
-        <td><a href="#extract">Ÿ³«</a></td>
-
-        <td><code>$ gzip -d httpd-<em>NN</em>.tar.gz<br />
-         $ tar xvf httpd-<em>NN</em>.tar<br />
-         $ cd httpd-<em>NN</em></code></td>
-      </tr>
-
-      <tr>
-        <td><a href="#configure">ÀßÄê</a></td>
-
-        <td><code>$ ./configure --prefix=<em>PREFIX</em></code>
-        </td>
-      </tr>
-
-      <tr>
-        <td><a href="#compile">¥³¥ó¥Ñ¥¤¥ë</a></td>
-
-        <td><code>$ make</code> </td>
-      </tr>
-
-      <tr>
-        <td><a href="#install">¥¤¥ó¥¹¥È¡¼¥ë</a></td>
-
-        <td><code>$ make install</code> </td>
-      </tr>
-
-      <tr>
-        <td><a href="#customize">¥«¥¹¥¿¥Þ¥¤¥º</a></td>
-
-        <td><code>$ vi <em>PREFIX</em>/conf/httpd.conf</code> </td>
-      </tr>
-
-      <tr>
-        <td><a href="#test">¥Æ¥¹¥È</a></td>
-
-        <td><code>$ <em>PREFIX</em>/bin/apachectl -k start</code>
-        </td>
-      </tr>
-    </table>
-
-    <p><em>NN</em> ¤ÏºÇ¿·¤Î¥Ð¡¼¥¸¥ç¥ó¥Ê¥ó¥Ð¡¼¤Ë¡¢
-    <em>PREFIX</em> ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¥µ¡¼¥Ð¤Ç¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Ñ¥¹¤Ë¡¢
-    ÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£<em>PREFIX</em> ¤ò»ØÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢
-    ¥Ç¥Õ¥©¥ë¥È¤Î <code>/usr/local/apache2</code> ¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p>Apache HTTP ¥µ¡¼¥Ð¤Î¥³¥ó¥Ñ¥¤¥ë¤È¥¤¥ó¥¹¥È¡¼¥ë¤ËɬÍפʤâ¤Î¤ò¤Ï¤¸¤á¤È¤·¤Æ¡¢
-    ¥³¥ó¥Ñ¥¤¥ë¤È¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ä¤¤¤Æ¤Ï¡¢¼¡¤Ë¾Ü¤·¤¯µ­½Ò¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="requirements" id="requirements">ɬÍפʤâ¤Î</a></h2>
-
-    <p>Apache HTTPd ¤Î¥Ó¥ë¥É¤Ë¤Ï¼¡¤Î¤â¤Î¤¬É¬ÍפǤ¹:</p>
-
-    <dl>
-      <dt>¥Ç¥£¥¹¥¯¥¹¥Ú¡¼¥¹</dt>
-      <dd>¥Ç¥£¥¹¥¯¤Ë¾¯¤Ê¤¯¤È¤â 50 MB ¤Î°ì»þŪ¤Ê¶õ¤­ÍÆÎ̤¬¤¢¤ë¤è¤¦¤Ë
-      µ¤¤òÉÕ¤±¤Æ¤¯¤À¤µ¤¤¡£¥¤¥ó¥¹¥È¡¼¥ë¸å¤Ï Apache ¤Ï 10 MB ÄøÅÙ¤Î
-      ¥Ç¥£¥¹¥¯¥¹¥Ú¡¼¥¹¤òÀê¤á¤Þ¤¹¡£¼ÂºÝ¤ËɬÍפˤʤë¥Ç¥£¥¹¥¯¥¹¥Ú¡¼¥¹¤Ï¡¢
-      ÀßÄꥪ¥×¥·¥ç¥ó¤ä¥µ¡¼¥É¥Ñ¡¼¥Æ¥£¡¼À½¥â¥¸¥å¡¼¥ë¤ò¤É¤¦ÁªÂò¤¹¤ë¤«¤Ë¤è¤Ã¤Æ
-      Â礭¤¯ÊѤï¤ë¤Ç¤·¤ç¤¦¡£</dd>
-
-      <dt>ANSI-C ¥³¥ó¥Ñ¥¤¥é¤È¥Ó¥ë¥É¥·¥¹¥Æ¥à</dt>
-      <dd>ANSI-C ¥³¥ó¥Ñ¥¤¥é¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤ª¤¤¤Æ²¼¤µ¤¤¡£¤ªÁ¦¤á¤Ï <a href="http://www.gnu.org/">Free Software Foundation (FSF)</a>
-      ¤Ë¤è¤ë <a href="http://www.gnu.org/software/gcc/gcc.html">GNU C
-      compiler (GCC)</a> ¤Ç¤¹¡£GCC ¤¬¤Ê¤¤¾ì¹ç¤Ï¡¢
-      ¾¯¤Ê¤¯¤È¤âÄ󶡤µ¤ì¤Æ¤¤¤ë¥³¥ó¥Ñ¥¤¥é¤¬ ANSI ½àµò¤Ç¤¢¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤ª¤¤¤Æ²¼¤µ¤¤¡£
-      ¤½¤ì¤«¤é¡¢ÊÑ¿ô <code>PATH</code> ¤Ë¤Ï <code>make</code>
-      ¤È¤¤¤Ã¤¿´ðËÜŪ¤Ê¥Ó¥ë¥É¥Ä¡¼¥ë¤¬´Þ¤Þ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</dd>
-
-      <dt>»þ¹ï¤òÀµ³Î¤Ë¤¹¤ë</dt>
-      <dd>HTTP ¥×¥í¥È¥³¥ë¤ÎÍ×ÁǤÏÆü»þ¤Î»þ¹ï¤Çɽ¸½¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢
-      Àµ³Î¤Ê»þ¹ï¤Ë¥·¥ó¥¯¥í¤µ¤»¤ëµ¡Ç½¤ò¥·¥¹¥Æ¥à¤ËÀßÄꤹ¤ë¤³¤È¤ò¶ãÌ£¤·¤Æ¤ß¤Æ²¼¤µ¤¤¡£
-      Network Time Protocol (NTP) ¤ò¥Ù¡¼¥¹¤È¤·¤¿ ntpdate ¤ä xntpd ¥×¥í¥°¥é¥à¤¬
-      ¤³¤ÎÌÜŪ¤Ë¤è¤¯ÍѤ¤¤é¤ì¤Þ¤¹¡£NTP ¥½¥Õ¥È¥¦¥§¥¢¤ä¸ø³« NTP 
-      ¥µ¡¼¥Ð¤Ë´Ø¤¹¤ë¾ÜºÙ¤Ï¡¢<a href="http://www.ntp.org">NTP ¥Û¡¼¥à¥Ú¡¼¥¸</a> ¤ò¤´Í÷²¼¤µ¤¤¡£</dd>
-
-      <dt><a href="http://www.perl.org/">Perl 5</a>
-      [¥ª¥×¥·¥ç¥ó]</dt>
-      <dd>Ä󶡤µ¤ì¤Æ¤¤¤ë¥¹¥¯¥ê¥×¥È´ö¤Ä¤«¡¢Î㤨¤Ð <code class="program"><a href="./programs/apxs.html">apxs</a></code> ¤ä
-      <code class="program"><a href="./programs/dbmmanage.html">dbmmanage</a></code> ¤Ï
-      Perl ¤Ç½ñ¤«¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢Perl 
-      5 ¥¤¥ó¥¿¥×¥ê¥¿¤¬É¬Íפˤʤê¤Þ¤¹ (5.003 °Ê¹ß)¡£
-      Perl ¥¤¥ó¥¿¥×¥ê¥¿¤òÊ£¿ô¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤ë (¤¿¤È¤¨¤ÐÁ´ÂΤΥ·¥¹¥Æ¥à¤Î°ìÉô
-      ¤È¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë Perl 4 ¤È¡¢¼«Ê¬¤ÇÄɲäǥ¤¥ó¥¹¥È¡¼¥ë¤·¤¿
-      Perl 5 ¤¬¤¢¤ë¤Ê¤É¤Î) ¾ì¹ç¡¢<code>--with-perl</code> ¥ª¥×¥·¥ç¥ó (²¼µ­»²¾È)
-      ¤ò»È¤Ã¤Æ <code class="program"><a href="./programs/configure.html">configure</a></code> ¤¬°Õ¿Þ¤·¤¿¤â¤Î¤ò»È¤¦¤è¤¦¤Ë
-      ÌÀ¼¨Åª¤Ë»ØÄꤹ¤ë¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£
-      <code class="program"><a href="./programs/configure.html">configure</a></code> ¥¹¥¯¥ê¥×¥È¤Ç Perl 5 ¥¤¥ó¥¿¥×¥ê¥¿¤¬
-      ¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ï¡¢¤³¤Î±Æ¶Á¤ò¼õ¤±¤ë¥µ¥Ý¡¼¥È¥¹¥¯¥ê¥×¥È¤¬»È¤¨¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£
-      ¤â¤Á¤í¤ó¡¢Apache HTTPd ¤Î¥³¥ó¥Ñ¥¤¥ë¤È¥¤¥ó¥¹¥È¡¼¥ë¤ÏÌäÂê¤Ê¤¯¹Ô¤¨¤Þ¤¹¡£</dd>
-
-      <dt><a href="http://apr.apache.org">apr/apr-util &gt;= 1.2</a></dt>
-      <dd><code>apr</code> ¤È <code>apr-util</code> ¤Ï Apache HTTPd
-      ¥½¡¼¥¹¥ê¥ê¡¼¥¹¤ËƱº­¤µ¤ì¤Æ¤¤¤Þ¤¹¤·¡¢¤É¤ó¤Ê´Ä¶­¤Ç¤â¤Û¤ÜÌäÂê¤Ê¤¯
-      »È¤¨¤ë¤Ï¤º¤Ç¤¹¡£¤¿¤À¤· <code>apr</code> ¤È <code>apr-util</code>
-      ¤Î¥Ð¡¼¥¸¥ç¥ó 1.0 ¤ä 1.1 ¤¬¥·¥¹¥Æ¥à¤Î°ìÉô¤È¤·¤Æ´û¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢
-      <code>apr</code>/<code>apr-util</code> ¤ò 1.2 ¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤«¡¢
-      httpd ¤ò³ÖÎ¥¤·¤¿´Ä¶­¤Ç¥Ó¥ë¥É¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-      ¥Ð¥ó¥É¥ë¤µ¤ì¤Æ¤¤¤ë <code>apr</code>/<code>apr-util</code> ¤ò»È¤Ã¤Æ
-      ¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¾ì¹ç¤Ï¡¢¤³¤ì¤é¤ò¼êÆ°¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹ :
-      <div class="example"><p><code>
-        # Build and install apr 1.2<br />
-        cd srclib/apr<br />
-        ./configure --prefix=/usr/local/apr-httpd/<br />
-        make<br />
-        make install<br />
-        <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 ../../<br />
-        ./configure --with-apr=/usr/local/apr-httpd/ 
-          --with-apr-util=/usr/local/apr-util-httpd/
-      </code></p></div>
-      </dd>
-    </dl>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="download" id="download">¥À¥¦¥ó¥í¡¼¥É</a></h2>
-
-    <p>Apache HTTP ¥µ¡¼¥Ð¤Ï <a href="http://httpd.apache.org/download.cgi">Apache HTTP
-    ¥µ¡¼¥Ð¥À¥¦¥ó¥í¡¼¥É¥µ¥¤¥È</a>¤«¤é¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Þ¤¹¤·¡¢
-    Ʊ¤¸¾ì½ê¤Ë´ö¤Ä¤«¤Î¥ß¥é¡¼¥µ¥¤¥È¤â¥ê¥¹¥È¤·¤Æ¤¤¤Þ¤¹¡£
-    UNIX ¤ËÎà»÷¤¹¤ë¥·¥¹¥Æ¥à¤Ç Apache HTTPd ¤ò»È¤¦¥æ¡¼¥¶¤Ï¡¢¥½¡¼¥¹¤ò
-    ¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¥Ó¥ë¥É¤·¤¿¤Û¤¦¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£
-    ¥Ó¥ë¥É¤Î¼ê½ç¡Ê²¼µ­¡Ë¤Ï´Êñ¤Ç¤¹¤·¡¢¤½¤Î¤ª¤«¤²¤Ç¥Ë¡¼¥º¤Ë
-    ¸«¹ç¤Ã¤¿¥«¥¹¥¿¥Þ¥¤¥º¤ò´Êñ¤Ë¤Ç¤­¤Þ¤¹¡£
-    ¤µ¤é¤Ë¡¢¥Ð¥¤¥Ê¥ê¤Î¥ê¥ê¡¼¥¹¤Ï¥½¡¼¥¹¥ê¥ê¡¼¥¹¤è¤ê¤â
-    ÃÙ¤ì¤Æ¤¤¤ë¤³¤È¤¬¤è¤¯¤¢¤ê¤Þ¤¹¡£
-    ¤½¤ì¤Ç¤â¥Ð¥¤¥Ê¥ê¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤¿¤Î¤Ç¤¢¤ì¤Ð¡¢
-    ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ÎÃæ¤Ë¤¢¤ë <code>INSSTALL.bindist</code> 
-    ¥Õ¥¡¥¤¥ë¤ÎÀâÌÀ¤Ë½¾¤Ã¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>¥À¥¦¥ó¥í¡¼¥É¸å¡¢¥À¥¦¥ó¥í¡¼¥É¤·¤¿¤â¤Î¤¬ Apache HTTP 
-    ¥µ¡¼¥Ð¤Î´°Á´¤Ç²þã⤵¤ì¤Æ¤¤¤Ê¤¤¥Ð¡¼¥¸¥ç¥ó¤Ç¤¢¤ë¤³¤È¤ò
-    ¸¡¾Ú¤¹¤ë¤³¤È¤¬½ÅÍפǤ¹¡£¤³¤ì¤Ï¥À¥¦¥ó¥í¡¼¥É¤·¤¿ tarball ¤Î PGP ½ð̾¤ò
-    ¥Æ¥¹¥È¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¸¡¾Ú¤·¤Þ¤¹¡£
-    ¤³¤Î¼ê½ç¤Î¾ÜºÙ¤Ï <a href="http://httpd.apache.org/download.cgi#verify">¥À¥¦¥ó¥í¡¼¥É
-    ¥Ú¡¼¥¸</a> ¤Ë¤¢¤ê¡¢¤µ¤é¤Ë¾Ü¤·¤¤Îã¤Ï <a href="http://httpd.apache.org/dev/verification.html">PGP ¤Î»ÈÍÑ
-    </a> ¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="extract" id="extract">Ÿ³«</a></h2>
-
-    <p>Apache HTTPd ¤Î tarball
-    ¤«¤é¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤òŸ³«¤·¤Æ¼è¤ê½Ð¤¹¤È¤Ï¡¢
-    ñ¤Ê¤ë°µ½Ì¤Î²ò½ü¤È tar ¤ÎŸ³«¤Ç¤¹:</p>
-
-    <div class="example"><p><code>
-      $ gzip -d httpd-<em>NN</em>.tar.gz<br />
-      $ tar xvf httpd-<em>NN</em>.tar
-    </code></p></div>
-
-    <p>ÇÛÉÛÍѤΥ½¡¼¥¹¥³¡¼¥É¤¬¤¢¤ë¸½ºß¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î²¼¤Ë¡¢
-    ¿·¤·¤¤¥Ç¥£¥ì¥¯¥È¥ê¤¬ºî¤é¤ì¤Þ¤¹¡£
-    ¥µ¡¼¥Ð¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ëÃʳ¬¤Ë¿Ê¤àÁ°¤Ë¡¢¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë
-    <code>cd</code> ¤Ç°ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="configure" id="configure">¥½¡¼¥¹¥Ä¥ê¡¼¤òÀßÄꤹ¤ë</a></h2>
-
-    <p>¼¡¤Î¥¹¥Æ¥Ã¥×¤Ï¡¢¤¢¤Ê¤¿¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤È
-    ¸Ä¿ÍŪ¤ÊÍ×µá¤Ë¹ç¤¦¤è¤¦¤Ë Apache HTTPd
-    ¥½¡¼¥¹¥Ä¥ê¡¼¤òÀßÄꤹ¤ë¤³¤È¤Ç¤¹¡£
-    ¤³¤ì¤ÏÇÛÉۥǥ£¥ì¥¯¥È¥ê¤Î¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë¡¢
-    <code class="program"><a href="./programs/configure.html">configure</a></code>
-    ¥¹¥¯¥ê¥×¥È¤Ç¹Ô¤Ê¤¤¤Þ¤¹¡£
-     (Apache HTTPd ¥½¡¼¥¹¥Ä¥ê¡¼¤Î̤¥ê¥ê¡¼¥¹
-    ÈǤò¥À¥¦¥ó¥í¡¼¥É¤·¤¿³«È¯¼Ô¤Ï¡¢¼¡¤Î¥¹¥Æ¥Ã¥×¤Ë¿Ê¤àÁ°¤Ë
-    <code>autoconf</code> ¤È<code>libtool</code>
-    ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ <code>buildconf</code>
-    ¤ò¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¸ø¼°¥ê¥ê¡¼¥¹¤Ç¤Ï¤³¤Îºî¶È¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£) </p>
-
-    <p>¥Ç¥Õ¥©¥ë¥È¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¥½¡¼¥¹¥Ä¥ê¡¼¤òÁ´¤ÆÀßÄꤹ¤ë
-    ¤Î¤Ç¤¢¤ì¤Ð¡¢Ã±½ã¤Ë <code>./configure</code> ¤È¥¿¥¤¥×¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ¥Ç¥Õ¥©¥ë¥È¥ª¥×¥·¥ç¥ó¤òÊѹ¹¤Ç¤­¤ë¤è¤¦¤Ë¡¢<code class="program"><a href="./programs/configure.html">configure</a></code>
-    ¤Ë¤ÏÍÍ¡¹¤ÊÊÑ¿ô¤ä¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p>ºÇ¤â½ÅÍפʥª¥×¥·¥ç¥ó¤Ï¡¢Apache HTTPd ¤¬¤³¤Î¸å¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤ë°ÌÃÖ
-    <code>--prefix</code> ¤Ç¤¹¡£Apache HTTPd ¤Ï¡¢¤³¤Î¥¤¥ó¥¹¥È¡¼¥ë°ÌÃÖ¤Ë
-    ¤ª¤¤¤ÆÀµ¾ï¤ËÆ°ºî¤¹¤ë¤è¤¦¤ËÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤«¤é¤Ç¤¹¡£
-    ¤µ¤é¤Ë¾ÜºÙ¤Ê¥Õ¥¡¥¤¥ë°ÌÃÖ¤ÎÀ©¸æ¤ÏÄɲäΠ<a href="programs/configure.html#installationdirectories">ÀßÄꥪ¥×¥·¥ç¥ó
-    </a> ¤Ç¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î»þÅÀ¤Ç¡¢<a href="mod/">¥â¥¸¥å¡¼¥ë</a> ¤òÍ­¸ú¤Ë¤·¤¿¤ê
-    ̵¸ú¤Ë¤·¤¿¤ê¤¹¤ë¤³¤È¤Ç Apache HTTPd ËÜÂΤ˴ޤޤì¤ë <a href="programs/configure.html#optionalfeatures">µ¡Ç½</a>
-    ¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£Apache HTTPd ËÜÂΤˤϥǥե©¥ë¥È¤Ç¡¢¥â¥¸¥å¡¼¥ë¤Î <a href="mod/module-dict.html#Status">Base</a> ¥»¥Ã¥È¤¬
-    ´Þ¤Þ¤ì¤Þ¤¹¡£¤½¤Î¾¤Î¥â¥¸¥å¡¼¥ë¤Ï 
-    <code>--enable-<var>module</var></code> ¥ª¥×¥·¥ç¥ó¤Ç
-    Í­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤³¤Ç <var>module</var> ¤Ï¥â¥¸¥å¡¼¥ë¤Î̾Á°¤Ç¡¢
-    ¤Ä¤Þ¤ê¤½¤ì¤Ï¥â¥¸¥å¡¼¥ë¤Î̾Á°¤«¤é <code>mod_</code> ʸ»úÎó¤ò¼è¤ê½ü¤¤¤¿¸å¤Ë
-    ¥¢¥ó¥À¡¼¥¹¥³¥¢¤ò¥À¥Ã¥·¥å¤ÇÃÖ´¹¤·¤¿Ê¸»úÎó¤Ç¤¹¡£
-    ¤³¤ì¤È¤ÏÊ̤ÎÊýË¡¤Ç <code>--enable-<var>module</var>=shared</code>
-    ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¡¢¥â¥¸¥å¡¼¥ë¤ò<a href="dso.html">
-    ¥·¥§¥¢¡¼¥É¥ª¥Ö¥¸¥§¥¯¥È (DSO)</a> -- ¼Â¹Ô»þ¤Ë¥í¡¼¥É¤·¤¿¤ê
-    ¥¢¥ó¥í¡¼¥É¤·¤¿¤ê¤Ç¤­¤ë·Á¼° -- ¤È¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-    ƱÍͤˡ¢<code>--disable-<var>module</var></code> ¥ª¥×¥·¥ç¥ó¤Ç
-    Base ¥â¥¸¥å¡¼¥ë¤ò̵¸ú²½¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-    ¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¤¤ë¤È¤­¤Ë¡¢¤â¤·»ØÄꤷ¤¿¥â¥¸¥å¡¼¥ë¤¬Â¸ºß¤·¤Ê¤¯¤Æ¤â
-    <code class="program"><a href="./programs/configure.html">configure</a></code> ¤Ï·Ù¹ð¤ò¾å¤²¤ë¤³¤È¤Ê¤¯¡¢Ã±½ã¤Ë¥ª¥×¥·¥ç¥ó¤ò
-    ̵»ë¤¹¤ë¤³¤È¤Ëµ¤¤ò¤Ä¤±¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>¾åµ­¤Ë²Ã¤¨¤Æ¡¢<code class="program"><a href="./programs/configure.html">configure</a></code> ¥¹¥¯¥ê¥×¥È¤Ë¡¢
-    ¥³¥ó¥Ñ¥¤¥é¡¢¥é¥¤¥Ö¥é¥ê¡¢¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÄɲþðÊó¤È¤·¤ÆÅϤ¹
-    ɬÍפ¬¤¢¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¤è¤¦¤Ê¾ì¹ç¤Ë¤Ï¡¢´Ä¶­ÊÑ¿ô¤¢¤ë¤¤¤Ï
-    ¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤Ç <code class="program"><a href="./programs/configure.html">configure</a></code> ¤ËÅϤ·¤Þ¤¹¡£
-    ¾ÜºÙ¤Ë´Ø¤·¤Æ¤Ï <code class="program"><a href="./programs/configure.html">configure</a></code> ¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸
-    ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</p>
-
-    <p>¤Á¤ç¤Ã¤È¤É¤ó¤Ê¤³¤È¤¬¤Ç¤­¤ë¤«¤ò¸«¤»¤Þ¤·¤ç¤¦¡£
-    ¤³¤³¤Çŵ·¿Åª¤ÊÎã¤È¤·¤Æ¡¢<code>/sw/pkg/apache</code> 
-    ¤È¤¤¤¦¥¤¥ó¥¹¥È¡¼¥ë¥Ä¥ê¡¼¤Ç¥³¥ó¥Ñ¥¤¥é¤È¥Õ¥é¥°¤ò»ØÄꤷ¤Æ¡¢
-    ¤µ¤é¤ËÆó¤Ä¤ÎÄɲå⥸¥å¡¼¥ë <code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code> ¤È
-    <code class="module"><a href="./mod/mod_speling.html">mod_speling</a></code> ¤ò¸å¤Ç DSO 
-    ¥á¥«¥Ë¥º¥à¤Ç¥í¡¼¥É¤¹¤ë¤è¤¦¤Ë¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤ß¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      $ CC="pgcc" CFLAGS="-O2" \<br />
-       ./configure --prefix=/sw/pkg/apache \<br />
-       --enable-rewrite=shared \<br />
-       --enable-speling=shared
-    </code></p></div>
-
-    <p><code class="program"><a href="./programs/configure.html">configure</a></code> ¤ò¼Â¹Ô¤·¤¿¤é¡¢¥·¥¹¥Æ¥à¤Îµ¡Ç½¤ò
-    ¥Æ¥¹¥È¤·¤¿¤ê¡¢¸å¤Ç¥µ¡¼¥Ð¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤¿¤á¤ËɬÍ×¤Ê Makefile
-    ¤òÀ¸À®¤·¤¿¤ê¤¹¤ë¤Î¤Ë¿ôʬ´Ö¤«¤«¤ë¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>¸Ä¡¹¤Î <code class="program"><a href="./programs/configure.html">configure</a></code> ¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ë´Ø¤·¤Æ¤Ï
-    <code class="program"><a href="./programs/configure.html">configure</a></code> ¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸
-    ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="compile" id="compile">¥Ó¥ë¥É</a></h2>
-
-    <p>¤³¤ì¤Ç Apache HTTPd ¤ÎÍÍ¡¹¤Ê¥Ñ¡¼¥Ä¤ò¥Ó¥ë¥É¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¼¡¤Î¥³¥Þ¥ó¥É¤òñ½ã¤Ë¼Â¹Ô¤¹¤ë¤À¤±¤Ç¤¹:</p>
-
-<div class="example"><p><code>$ make</code></p></div>
-
-    <p>´ðËÜŪ¤ÊÀßÄê¤ò¤¹¤ë¤Î¤Ë¿ôʬ¤«¤«¤ê¤Þ¤¹¤¬¡¢
-    ¤¢¤é¤«¤¸¤á¤´Î»¾µ¤¯¤À¤µ¤¤¡£
-    ¤Þ¤¿¡¢»þ´Ö¤Ï¥Ï¡¼¥É¥¦¥§¥¢¤äÍ­¸ú¤Ë¤·¤¿¥â¥¸¥å¡¼¥ë¤Î¿ô¤Ë
-    Â礭¤¯°Í¸¤¹¤ë¤Ç¤·¤ç¤¦¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="install" id="install">¥¤¥ó¥¹¥È¡¼¥ë</a></h2>
-
-    <p>¤µ¤Æ¡¢ÀßÄꤷ¤¿¥¤¥ó¥¹¥È¡¼¥ë <em>PREFIX</em> 
-     (Á°½Ò¤Î <code>--prefix</code> ¥ª¥×¥·¥ç¥ó¤ò»²¾È) 
-    °Ê²¼¤Ë¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÃʳ¬¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
-    ¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤:</p>
-
-<div class="example"><p><code>$ make install</code></p></div>
-
-    <p>¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¾ì¹ç¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤ÏÀßÄê¥Õ¥¡¥¤¥ë¤ä
-    ¥É¥­¥å¥á¥ó¥È¥Õ¥¡¥¤¥ë¤Î¾å½ñ¤­¤Ï¹Ô¤¤¤Þ¤»¤ó¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="customize" id="customize">¥«¥¹¥¿¥Þ¥¤¥º</a></h2>
-
-    <p>¼¡¤Ë <code><em>PREFIX</em>/conf/</code> °Ê²¼¤Ë¤¢¤ë <a href="configuring.html">ÀßÄê¥Õ¥¡¥¤¥ë</a>¤òÊÔ½¸¤·¤Æ¡¢
-    Apache HTTP ¥µ¡¼¥Ð¤ò¥«¥¹¥¿¥Þ¥¤¥º¤·¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>$ vi <em>PREFIX</em>/conf/httpd.conf</code></p></div>
-
-    <p><a href="./">docs/manual/</a> ¤Î Apache HTTP ¥µ¡¼¥Ð¥Þ¥Ë¥å¥¢¥ë¤ò¤¶¤Ã¤È¸«¤Æ¤¯¤À¤µ¤¤¡£
-    ¤Þ¤¿¤Ï¡¢<a href="http://httpd.apache.org/docs/2.2/">http://httpd.apache.org/docs/2.2/</a>
-    ¤Ë¤¢¤ë¥Þ¥Ë¥å¥¢¥ëºÇ¿·ÈÇ¡¢<a href="mod/directives.html">ÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a>¤ËÅö¤¿¤Ã¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="test" id="test">¥Æ¥¹¥È</a></h2>
-
-    <p>¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ Apache HTTP ¥µ¡¼¥Ð¤ò<a href="invoking.html">³«»Ï</a>¤Ç¤­¤Þ¤¹:</p>
-
-<div class="example"><p><code>$ <em>PREFIX</em>/bin/apachectl -k start</code></p></div>
-
-    <p>URL <code>http://localhost/</code> ¤òÄ̤·¤ÆºÇ½é¤Î¥É¥­¥å¥á¥ó¥È¤ËÂФ¹¤ë
-    ¥ê¥¯¥¨¥¹¥È¤òȯ¹Ô¤¹¤ë»ö¤¬¤Ç¤­¤ë¤Ï¤º¤Ç¤¹¡£¤³¤ì¤Ç¸«¤¨¤ë
-    ¥¦¥§¥Ö¥Ú¡¼¥¸¤Ï <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>
-    °Ê²¼¤ËÃÖ¤«¤ì¤¿¤â¤Î¤Ç¡¢Ä̾ï¤Ï
-    <code><em>PREFIX</em>/htdocs/</code> ¤Ç¤·¤ç¤¦¡£
-    ¥µ¡¼¥Ð¤òºÆ¤Ó<a href="stopping.html">Ää»ß</a>¤¹¤ë¤Ë¤Ï¡¢
-    ¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Þ¤¹:</p>
-
-    <div class="example"><p><code>$ <em>PREFIX</em>/bin/apachectl -k stop</code></p></div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="upgrading" id="upgrading">¥¢¥Ã¥×¥°¥ì¡¼¥É</a></h2>
-
-    <p>¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ç¤Þ¤º¹Ô¤Ê¤¦¤Ù¤­¤³¤È¤Ï¡¢¥ê¥ê¡¼¥¹¥¢¥Ê¥¦¥ó¥¹¤È
-    ¥½¡¼¥¹¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤ËÆþ¤Ã¤Æ¤¤¤ë <code>CHANGES</code> ¤òÆɤó¤Ç¡¢
-    ¼«¿È¤Î¥µ¥¤¥È¤ËÂФ·¤Æ±Æ¶Á¤òµÚ¤Ü¤¹Êѹ¹ÅÀ¤òõ¤¹¤³¤È¤Ç¤¹¡£
-    ¥á¥¸¥ã¡¼¥ê¥ê¡¼¥¹´Ö¤ÎÊѹ¹¤ò¤¹¤ë¾ì¹ç (Î㤨¤Ð 1.3 ¤«¤é 2.0 ¤Ø¡¢2.0 ¤«¤é 2.2 ¤Ø)
-    ¤Ï¡¢¥³¥ó¥Ñ¥¤¥ë»þ¤ä¼Â¹Ô»þ¤ÎÀßÄê¤ËÂ礭¤Êº¹°Û¤¬¤¢¤ë¤Ç¤·¤ç¤¦¤«¤é¡¢
-    ¼êÆ°¤ÎÄ´À°¤¬É¬Íפˤʤë¤Ç¤·¤ç¤¦¡£¥â¥¸¥å¡¼¥ë¤âÁ´¤Æ¡¢API
-    ¤ÎÊѹ¹¤Ë¹ç¤ï¤»¤ë¤¿¤á¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¬É¬Íפˤʤë¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>¥Þ¥¤¥Ê¡¼¥Ð¡¼¥¸¥ç¥ó¤«¤é¼¡¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¾ì¹ç
-    (Î㤨¤Ð 2.2.55 ¤«¤é 2.2.57 ¤Ø) ¤Ï¡¢¤â¤Ã¤È´Êñ¤Ç¤¹¡£
-    <code>make install</code> ¤ò¼Â¹Ô¤·¤Æ¤âº£¤¢¤ë¥É¥­¥å¥á¥ó¥È¡¢
-    ¥í¥°¥Õ¥¡¥¤¥ë¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤Ï¾å½ñ¤­¤µ¤ì¤Þ¤»¤ó¡£
-    ¤µ¤é¤Ë¡¢¥Þ¥¤¥Ê¡¼¥Ð¡¼¥¸¥ç¥ó´Ö¤Ç¤Ï <code class="program"><a href="./programs/configure.html">configure</a></code> ¥ª¥×¥·¥ç¥ó¡¢
-    ¼Â¹Ô»þ¤ÎÀßÄê¡¢¥â¥¸¥å¡¼¥ë API ¤ËÉÔÀ°¹ç¤¬µ¯¤³¤é¤Ê¤¤¤è¤¦¤Ë¡¢
-    ³«È¯¼Ô¤ÏºÇÂç¸Â¤ÎÅØÎϤò¤·¤Æ¤¤¤Þ¤¹¡£
-    ÂçÄñ¤Î¾ì¹ç¡¢Æ±°ì¤Î <code class="program"><a href="./programs/configure.html">configure</a></code> ¥³¥Þ¥ó¥É¥é¥¤¥ó¡¢
-    Ʊ°ì¤ÎÀßÄê¥Õ¥¡¥¤¥ë¡¢¥â¥¸¥å¡¼¥ëÁ´¤Æ¤¬Àµ¾ï¤ËÆ°ºî¤¹¤ë¤Ï¤º¤Ç¤¹¡£</p>
-
-    <p>¥Þ¥¤¥Ê¡¼¥Ð¡¼¥¸¥ç¥ó¤Ç¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¾ì¹ç¤Ï¡¢
-    ´û¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥µ¡¼¥Ð¤Î <code>build</code> ¥Ç¥£¥ì¥¯¥È¥êÆ⤫¡¢
-    °ÊÁ°¥¤¥ó¥¹¥È¡¼¥ë¤Ë»È¤Ã¤¿¥½¡¼¥¹¥³¡¼¥É¥Ä¥ê¡¼¤ÎºÇ¾å°Ì¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë¤¢¤ë¡¢
-    <code>config.nice</code> ¥Õ¥¡¥¤¥ë¤òõ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¥½¡¼¥¹¥Ä¥ê¡¼¤òÀßÄꤷ¤¿»þ¤Ë»È¤Ã¤¿
-    <code class="program"><a href="./programs/configure.html">configure</a></code> ¥³¥Þ¥ó¥É¥é¥¤¥ó¤¬¡¢¤½¤Î¤Þ¤ÞÆþ¤Ã¤Æ¤¤¤Þ¤¹¡£
-    ¼¡¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¾ì¹ç¤Ï <code>config.nice</code>
-    ¥Õ¥¡¥¤¥ë¤ò¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¥½¡¼¥¹¥Ä¥ê¡¼¤Ë¥³¥Ô¡¼¤·¡¢
-    ɬÍפǤ¢¤ì¤Ð¤½¤ì¤òÊÔ½¸¤·¤¿¸å¤Ë¡¢¼¡¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-    $ ./config.nice<br />
-    $ make<br />
-    $ make install<br />
-    $ <em>PREFIX</em>/bin/apachectl -k graceful-stop<br />
-    $ <em>PREFIX</em>/bin/apachectl -k start<br />
-    </code></p></div>
-
-    <div class="warning">¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢
-    ¼ÂºÝ¤Ë±¿ÍѤò»Ï¤á¤ëÁ°¤Ë¡¢É¬¤º¼«Ê¬ÍѤδĶ­¤Ç¥Æ¥¹¥È¤¹¤Ù¤­¤Ç¤¹¡£
-    ºÇ½ªÅª¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ëÁ°¤Ë¡¢Èó¸ß´¹À­¤¬¤Ê¤¤¤«¤ò¥Æ¥¹¥È¤¹¤ë¤¿¤á¤Ë¡¢
-    Î㤨¤Ð¡¢°Û¤Ê¤ë <code>--prefix</code> ¤È°Û¤Ê¤ë¥Ý¡¼¥È (<code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÀßÄꤷ¤Þ¤¹) 
-    ¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Ë±Æ¶Á¤òÍ¿¤¨¤º¤Ë¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤ò
-    ¥¤¥ó¥¹¥È¡¼¥ë¤·¡¢¼Â¹Ô¤Ç¤­¤Þ¤¹¡£</div>
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./de/install.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/install.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/install.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./fr/install.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/install.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/install.html.ja.utf8 b/docs/manual/install.html.ja.utf8
new file mode 100644
index 00000000..ff1ab229
--- /dev/null
+++ b/docs/manual/install.html.ja.utf8
@@ -0,0 +1,423 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>コンパイル�インストール - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>コンパイル�インストール</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./de/install.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/install.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/install.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/install.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/install.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/install.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+
+
+    <p>��文書�扱�範囲��Unix や Unix �類似��システム��
+    Apache HTTPd サー��コンパイル�インストール��。 Windows ���る
+    コンパイル�インストール�関���「<a href="platform/windows.html">Microsoft
+    Windows � Apache HTTPd を使�</a>�を�覧下��。
+    ��他�プラットホーム�関���「<a href="platform/">プラットホーム</a>�を�覧下��。</p>
+
+    <p>Apache HTTPd ��他� Open Source プロジェクト��様�
+    ビルド環境構築� <code>libtool</code> � <code>autoconf</code>
+    を使�よ��������。</p>
+
+    <p>マイナー�ージョン�ら��次��ージョン�アップグレード�る
+    (2.2.50 �ら 2.2.51 �等) 場����� <a href="#upgrading">
+    アップグレード</a>を�覧下��。</p>
+
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#overview">概� (�����人��)</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#requirements">必��も�</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#download">ダウンロード</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#extract">展開</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#configure">ソースツリーを設定�る</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#compile">ビルド</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#install">インストール</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#customize">カスタマイズ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#test">テスト</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#upgrading">アップグレード</a></li>
+</ul><h3>�照</h3><ul class="seealso"><li><a href="programs/configure.html">ソースツリー�設定</a></li><li><a href="invoking.html">Apache HTTPd �起動</a></li><li><a href="stopping.html">Apache HTTPd ��止��起動</a></li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="overview" id="overview">概� (�����人��)</a></h2>
+
+    <table>
+      
+      <tr>
+        <td><a href="#download">ダウンロード</a></td>
+
+        <td><code>$ lynx http://httpd.apache.org/download.cgi</code>
+        </td>
+      </tr>
+
+      <tr>
+        <td><a href="#extract">展開</a></td>
+
+        <td><code>$ gzip -d httpd-<em>NN</em>.tar.gz<br />
+         $ tar xvf httpd-<em>NN</em>.tar<br />
+         $ cd httpd-<em>NN</em></code></td>
+      </tr>
+
+      <tr>
+        <td><a href="#configure">設定</a></td>
+
+        <td><code>$ ./configure --prefix=<em>PREFIX</em></code>
+        </td>
+      </tr>
+
+      <tr>
+        <td><a href="#compile">コンパイル</a></td>
+
+        <td><code>$ make</code> </td>
+      </tr>
+
+      <tr>
+        <td><a href="#install">インストール</a></td>
+
+        <td><code>$ make install</code> </td>
+      </tr>
+
+      <tr>
+        <td><a href="#customize">カスタマイズ</a></td>
+
+        <td><code>$ vi <em>PREFIX</em>/conf/httpd.conf</code> </td>
+      </tr>
+
+      <tr>
+        <td><a href="#test">テスト</a></td>
+
+        <td><code>$ <em>PREFIX</em>/bin/apachectl -k start</code>
+        </td>
+      </tr>
+    </table>
+
+    <p><em>NN</em> �最新��ージョンナン�ー��
+    <em>PREFIX</em> �インストール�るサー���ファイルシステム�パス��
+    置��������。<em>PREFIX</em> を指定�����場���
+    デフォルト� <code>/usr/local/apache2</code> ��り��。</p>
+
+    <p>Apache HTTP サー��コンパイル�インストール�必��も�を�������
+    コンパイル�インストール������次�詳��記述�れ����。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="requirements" id="requirements">必��も�</a></h2>
+
+    <p>Apache HTTPd �ビルド��次�も��必���:</p>
+
+    <dl>
+      <dt>ディスクスペース</dt>
+      <dd>ディスク�少���も 50 MB �一時的�空�容���るよ��
+      気を付������。インストール後� Apache � 10 MB 程度�
+      ディスクスペースを����。実際�必���るディスクスペース��
+      設定オプションやサードパーティー製モジュールを���択�る��よ��
+      大��変�る��ょ�。</dd>
+
+      <dt>ANSI-C コンパイラ�ビルドシステム</dt>
+      <dd>ANSI-C コンパイラをインストール�����下��。�薦�� <a href="http://www.gnu.org/">Free Software Foundation (FSF)</a>
+      �よる <a href="http://www.gnu.org/software/gcc/gcc.html">GNU C
+      compiler (GCC)</a> ��。GCC ���場���
+      少���も�供�れ��るコンパイラ� ANSI 準拠��る��を確������下��。
+      �れ�ら�変数 <code>PATH</code> �� <code>make</code>
+      ����基本的�ビルドツール���れ��る必���り��。</dd>
+
+      <dt>時刻を正確��る</dt>
+      <dd>HTTP プロトコル��素�日時�時刻�表��れ����。���ら�
+      正確�時刻�シンクロ��る機能をシステム�設定�る��を�味����下��。
+      Network Time Protocol (NTP) をベース��� ntpdate や xntpd プログラム�
+      ��目的�よ�用�られ��。NTP ソフトウェアや公開 NTP 
+      サー��関�る詳細��<a href="http://www.ntp.org">NTP ホームページ</a> を�覧下��。</dd>
+
+      <dt><a href="http://www.perl.org/">Perl 5</a>
+      [オプション]</dt>
+      <dd>�供�れ��るスクリプト幾���例�� <code class="program"><a href="./programs/apxs.html">apxs</a></code> や
+      <code class="program"><a href="./programs/dbmmanage.html">dbmmanage</a></code> �
+      Perl �書�れ��る���Perl 
+      5 インタプリタ�必���り�� (5.003 以�)。
+      Perl インタプリタを複数インストール���る (����全体�システム�一部
+      ���インストール�れ��る Perl 4 ��自分�追加�インストール��
+      Perl 5 ��る���) 場��<code>--with-perl</code> オプション (下記�照)
+      を使�� <code class="program"><a href="./programs/configure.html">configure</a></code> ��図��も�を使�よ��
+      明示的�指定�る�良���ょ�。
+      <code class="program"><a href="./programs/configure.html">configure</a></code> スクリプト� Perl 5 インタプリタ�
+      見��ら��場�����影響を��るサ�ートスクリプト�使����り��。
+      も��ん�Apache HTTPd �コンパイル�インストール��題��行���。</dd>
+
+      <dt><a href="http://apr.apache.org">apr/apr-util &gt;= 1.2</a></dt>
+      <dd><code>apr</code> � <code>apr-util</code> � Apache HTTPd
+      ソースリリース��梱�れ�������ん�環境�も���題��
+      使�る����。��� <code>apr</code> � <code>apr-util</code>
+      ��ージョン 1.0 や 1.1 �システム�一部���既�インストール�れ��る場��
+      <code>apr</code>/<code>apr-util</code> を 1.2 �アップグレード�る��
+      httpd を隔離��環境�ビルド�る必���り��。
+      �ンドル�れ��る <code>apr</code>/<code>apr-util</code> を使��
+      アップグレード�る場����れらを手動�インストール�る必���り�� :
+      <div class="example"><p><code>
+        # Build and install apr 1.2<br />
+        cd srclib/apr<br />
+        ./configure --prefix=/usr/local/apr-httpd/<br />
+        make<br />
+        make install<br />
+        <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 ../../<br />
+        ./configure --with-apr=/usr/local/apr-httpd/ 
+          --with-apr-util=/usr/local/apr-util-httpd/
+      </code></p></div>
+      </dd>
+    </dl>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="download" id="download">ダウンロード</a></h2>
+
+    <p>Apache HTTP サー�� <a href="http://httpd.apache.org/download.cgi">Apache HTTP
+    サー�ダウンロードサイト</a>�らダウンロード������
+    ��場所�幾���ミラーサイトもリスト�����。
+    UNIX �類似�るシステム� Apache HTTPd を使�ユーザ��ソースを
+    ダウンロード��ビルド�����良���ょ�。
+    ビルド�手順（下記）�簡�����������ニーズ�
+    見���カスタマイズを簡������。
+    �ら���イナリ�リリース�ソースリリースよりも
+    �れ��る���よ��り��。
+    �れ�も�イナリをダウンロード�����れ��
+    ディストリビューション�中��る <code>INSSTALL.bindist</code> 
+    ファイル�説明�従������。</p>
+
+    <p>ダウンロード後�ダウンロード��も�� Apache HTTP 
+    サー��完全�改竄�れ�����ージョン��る��を
+    検証�る�������。�れ�ダウンロード�� tarball � PGP 署�を
+    テスト�る���よ��検証���。
+    ��手順�詳細� <a href="http://httpd.apache.org/download.cgi#verify">ダウンロード
+    ページ</a> ��り��ら�詳��例� <a href="http://httpd.apache.org/dev/verification.html">PGP �使用
+    </a> �記載�れ����。</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="extract" id="extract">展開</a></h2>
+
+    <p>Apache HTTPd � tarball
+    �らソースファイルを展開���り出����
+    ��る圧縮�解除� tar �展開��:</p>
+
+    <div class="example"><p><code>
+      $ gzip -d httpd-<em>NN</em>.tar.gz<br />
+      $ tar xvf httpd-<em>NN</em>.tar
+    </code></p></div>
+
+    <p>�布用�ソースコード��る�在�るディレクトリ�下��
+    新��ディレクトリ�作られ��。
+    サー�をコンパイル�る段階�進む�����ディレクトリ�
+    <code>cd</code> �移動������。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="configure" id="configure">ソースツリーを設定�る</a></h2>
+
+    <p>次�ステップ������プラットホーム�
+    個人的��求���よ�� Apache HTTPd
+    ソースツリーを設定�る����。
+    �れ��布ディレクトリ�ルートディレクトリ��る�
+    <code class="program"><a href="./programs/configure.html">configure</a></code>
+    スクリプト�行����。
+     (Apache HTTPd ソースツリー�未リリース
+    版をダウンロード��開発者��次�ステップ�進む��
+    <code>autoconf</code> �<code>libtool</code>
+    をインストール�� <code>buildconf</code>
+    を実行�る必���り��。
+    公�リリース����作業�必��り��ん。) </p>
+
+    <p>デフォルトオプションを使��ソースツリーを全�設定�る
+    ���れ���純� <code>./configure</code> �タイプ������。
+    デフォルトオプションを変更��るよ���<code class="program"><a href="./programs/configure.html">configure</a></code>
+    ��様々�変数やコマンドラインオプション�用��れ����。</p>
+
+    <p>最も���オプション��Apache HTTPd ���後�インストール�れる�置
+    <code>--prefix</code> ��。Apache HTTPd ����インストール�置�
+    ���正常�動作�るよ��設定���れ��ら���ら��。
+    �ら�詳細�ファイル�置�制御�追加� <a href="programs/configure.html#installationdirectories">設定オプション
+    </a> �����。</p>
+
+    <p>��時点��<a href="mod/">モジュール</a> を有効���り
+    無効���り�る��� Apache HTTPd 本体���れる <a href="programs/configure.html#optionalfeatures">機能</a>
+    を指定����。Apache HTTPd 本体��デフォルト��モジュール� <a href="mod/module-dict.html#Status">Base</a> セット�
+    ��れ��。��他�モジュール� 
+    <code>--enable-<var>module</var></code> オプション�
+    有効��り��。��� <var>module</var> �モジュール�����
+    ��り�れ�モジュール����ら <code>mod_</code> 文字列を�り除��後�
+    アンダースコアをダッシュ�置���文字列��。
+    �れ��別�方法� <code>--enable-<var>module</var>=shared</code>
+    オプションを使���モジュールを<a href="dso.html">
+    シェアードオブジェクト (DSO)</a> -- 実行時�ロード��り
+    アンロード��り��る形� -- ���コンパイル�る��も����。
+    �様��<code>--disable-<var>module</var></code> オプション�
+    Base モジュールを無効化�る��も����。
+    �れら�オプションを使���る����も�指定��モジュール�存在����も
+    <code class="program"><a href="./programs/configure.html">configure</a></code> �警告を上�る������純�オプションを
+    無視�る���気を�������。</p>
+
+    <p>上記�加���<code class="program"><a href="./programs/configure.html">configure</a></code> スクリプト��
+    コンパイラ�ライブラリ�ヘッダファイル��置を追加情報���渡�
+    必���る場���り��。��よ��場����環境変数�る��
+    コマンドラインオプション� <code class="program"><a href="./programs/configure.html">configure</a></code> �渡���。
+    詳細�関��� <code class="program"><a href="./programs/configure.html">configure</a></code> マニュアルページ
+    を�覧����。</p>
+
+    <p>�ょ���ん������る�を見���ょ�。
+    ���典型的�例����<code>/sw/pkg/apache</code> 
+    ���インストールツリー�コンパイラ�フラグを指定���
+    �ら�二��追加モジュール <code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code> �
+    <code class="module"><a href="./mod/mod_speling.html">mod_speling</a></code> を後� DSO 
+    メカニズム�ロード�るよ��コンパイル�����:</p>
+
+    <div class="example"><p><code>
+      $ CC="pgcc" CFLAGS="-O2" \<br />
+       ./configure --prefix=/sw/pkg/apache \<br />
+       --enable-rewrite=shared \<br />
+       --enable-speling=shared
+    </code></p></div>
+
+    <p><code class="program"><a href="./programs/configure.html">configure</a></code> を実行��ら�システム�機能を
+    テスト��り�後�サー�をコンパイル�る���必�� Makefile
+    を生���り�る��数分間��る��ょ�。</p>
+
+    <p>個々� <code class="program"><a href="./programs/configure.html">configure</a></code> オプション�詳細�関���
+    <code class="program"><a href="./programs/configure.html">configure</a></code> マニュアルページ
+    を�覧����。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="compile" id="compile">ビルド</a></h2>
+
+    <p>�れ� Apache HTTPd �様々�パーツをビルド�る�������。
+    次�コマンドを�純�実行�る����:</p>
+
+<div class="example"><p><code>$ make</code></p></div>
+
+    <p>基本的�設定を�る��数分��り����
+    �ら����了承����。
+    ���時間��ードウェアや有効���モジュール�数�
+    大���存�る��ょ�。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="install" id="install">インストール</a></h2>
+
+    <p>���設定��インストール <em>PREFIX</em> 
+     (�述� <code>--prefix</code> オプションを�照) 
+    以下�パッケージをインストール�る段階��り���。
+    次�コマンドを実行������:</p>
+
+<div class="example"><p><code>$ make install</code></p></div>
+
+    <p>アップグレード�る場���インストール��設定ファイルや
+    ドキュメントファイル�上書��行���ん。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="customize" id="customize">カスタマイズ</a></h2>
+
+    <p>次� <code><em>PREFIX</em>/conf/</code> 以下��る <a href="configuring.html">設定ファイル</a>を編集���
+    Apache HTTP サー�をカスタマイズ���。</p>
+
+<div class="example"><p><code>$ vi <em>PREFIX</em>/conf/httpd.conf</code></p></div>
+
+    <p><a href="./">docs/manual/</a> � Apache HTTP サー�マニュアルを���見�����。
+    ����<a href="http://httpd.apache.org/docs/2.2/">http://httpd.apache.org/docs/2.2/</a>
+    ��るマニュアル最新版�<a href="mod/directives.html">設定ディレクティブ</a>�当���������。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="test" id="test">テスト</a></h2>
+
+    <p>次�コマンドを実行�� Apache HTTP サー�を<a href="invoking.html">開始</a>����:</p>
+
+<div class="example"><p><code>$ <em>PREFIX</em>/bin/apachectl -k start</code></p></div>
+
+    <p>URL <code>http://localhost/</code> を通��最��ドキュメント�対�る
+    リクエストを発行�る事���る����。�れ�見�る
+    ウェブページ� <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>
+    以下�置�れ�も���通常�
+    <code><em>PREFIX</em>/htdocs/</code> ��ょ�。
+    サー�を��<a href="stopping.html">�止</a>�る���
+    次�コマンドを実行���:</p>
+
+    <div class="example"><p><code>$ <em>PREFIX</em>/bin/apachectl -k stop</code></p></div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="upgrading" id="upgrading">アップグレード</a></h2>
+
+    <p>アップグレード���行��������リリースアナウンス�
+    ソースディストリビューション�入���る <code>CHANGES</code> を読ん��
+    自身�サイト�対��影響を���変更点を探�����。
+    メジャーリリース間�変更を�る場� (例�� 1.3 �ら 2.0 ��2.0 �ら 2.2 �)
+    ��コンパイル時や実行時�設定�大��差異��る��ょ��ら�
+    手動�調整�必���る��ょ�。モジュールも全��API
+    �変更����る���アップグレード�必���る��ょ�。</p>
+
+    <p>マイナー�ージョン�ら次��ージョン�アップグレード�る場�
+    (例�� 2.2.55 �ら 2.2.57 �) ��も��簡���。
+    <code>make install</code> を実行��も今�るドキュメント�
+    ログファイル�設定ファイル�上書��れ��ん。
+    �ら��マイナー�ージョン間�� <code class="program"><a href="./programs/configure.html">configure</a></code> オプション�
+    実行時�設定�モジュール API ��整��起�ら��よ���
+    開発者�最大��努力を�����。
+    大抵�場���一� <code class="program"><a href="./programs/configure.html">configure</a></code> コマンドライン�
+    �一�設定ファイル�モジュール全��正常�動作�る����。</p>
+
+    <p>マイナー�ージョン�アップグレード�る場���
+    既�インストール�れ��るサー�� <code>build</code> ディレクトリ内��
+    以�インストール�使��ソースコードツリー�最上�ディレクトリ内��る�
+    <code>config.nice</code> ファイルを探������。
+    ��ファイル��ソースツリーを設定��時�使��
+    <code class="program"><a href="./programs/configure.html">configure</a></code> コマンドライン������入�����。
+    次��ージョン�アップグレード�る場�� <code>config.nice</code>
+    ファイルを新���ージョン�ソースツリー�コピー��
+    必���れ��れを編集��後��次�よ��実行���。</p>
+
+    <div class="example"><p><code>
+    $ ./config.nice<br />
+    $ make<br />
+    $ make install<br />
+    $ <em>PREFIX</em>/bin/apachectl -k graceful-stop<br />
+    $ <em>PREFIX</em>/bin/apachectl -k start<br />
+    </code></p></div>
+
+    <div class="warning">新���ージョンを使用�る場���
+    実際��用を始�る���必�自分用�環境�テスト�����。
+    最終的�アップグレード�る����互�性����をテスト�る����
+    例���異�る <code>--prefix</code> �異�る�ート (<code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> ディレクティブ�設定���) 
+    を使用�る�������ージョン�影響を与���新���ージョンを
+    インストール��実行����。</div>
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./de/install.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/install.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/install.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/install.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/install.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/install.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/install.html.ko.euc-kr b/docs/manual/install.html.ko.euc-kr
index 3ca20b96..e455a46b 100644
--- a/docs/manual/install.html.ko.euc-kr
+++ b/docs/manual/install.html.ko.euc-kr
@@ -23,7 +23,8 @@
 <a href="./es/install.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="./fr/install.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/install.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/install.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/install.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/install.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
             ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
@@ -353,8 +354,9 @@ $ tar xvf httpd-2_1_<em>NN</em>.tar
 <a href="./es/install.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="./fr/install.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/install.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/install.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/install.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/install.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/install.html.tr.utf8 b/docs/manual/install.html.tr.utf8
new file mode 100644
index 00000000..32a6ba84
--- /dev/null
+++ b/docs/manual/install.html.tr.utf8
@@ -0,0 +1,424 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Derleme ve Kurulum - Apache HTTP Sunucusu</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="./">Sürüm 2.2</a></div><div id="page-content"><div id="preamble"><h1>Derleme ve Kurulum</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="./de/install.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/install.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/install.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/install.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/install.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/install.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+
+    <p>Bu belge Apache HTTP Sunucusunun sadece Unix ve Unix benzeri
+      sistemlerde derlenmesini ve kurulmasını kapsar. Windows üzerinde
+      derleme ve kurulum için <a href="platform/windows.html">Apache HTTPd’nin
+      Microsoft Windows ile kullanımı</a> bölümüne bakınız. Diğer platformlar
+      için ise <a href="platform/">platform</a> belgelerine bakınız.</p>
+
+    <p>Apache HTTPd, derleme ortamını oluşturmak için çoğu Açık Kaynak Kodlu
+      projenin yaptığı gibi <code>libtool</code> ve <code>autoconf</code>
+      kullanır.</p>
+
+    <p>Eğer sadece sürüm yükseltiyorsanız (2.2.50’den 2.2.51’e yükseltmek
+      gibi) lütfen doğrudan <a href="#upgrading">Yükseltme</a> bölümüne
+      atlayınız.</p>
+
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#overview">Tez canlılar için genel bir bakış</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#requirements">Gereksinimler</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#download">Ä°ndirme</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#extract">Paketi açma</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#configure">Kaynak ağacının yapılandırılması</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#compile">Derleme</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#install">Kurulum</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#customize">KiÅŸiselleÅŸtirme</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#test">Deneme</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#upgrading">Yükseltme</a></li>
+</ul><h3>Ayrıca bakınız:</h3><ul class="seealso"><li><a href="programs/configure.html">Kaynak ağacının yapılandırılması</a></li><li><a href="invoking.html">Apache HTTPd’nin başlatılması</a></li><li><a href="stopping.html">Durdurma ve yeniden başlatma</a></li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="overview" id="overview">Tez canlılar için genel bir bakış</a></h2>
+
+    <table>
+      
+      <tr>
+        <td><a href="#download">Ä°ndirme</a></td>
+
+        <td><code>$ lynx http://httpd.apache.org/download.cgi</code>
+        </td>
+      </tr>
+
+      <tr>
+        <td><a href="#extract">Paketi açma</a></td>
+
+        <td><code>$ gzip -d httpd-<em>NN</em>.tar.gz<br />
+         $ tar xvf httpd-<em>NN</em>.tar<br />
+         $ cd httpd-<em>NN</em></code></td>
+      </tr>
+
+      <tr>
+        <td><a href="#configure">Yapılandırma</a></td>
+
+        <td><code>$ ./configure --prefix=<em>ÖNEK</em></code>
+        </td>
+      </tr>
+
+      <tr>
+        <td><a href="#compile">Derleme</a></td>
+
+        <td><code>$ make</code> </td>
+      </tr>
+
+      <tr>
+        <td><a href="#install">Kurulum</a></td>
+
+        <td><code>$ make install</code> </td>
+      </tr>
+
+      <tr>
+        <td><a href="#customize">KiÅŸiselleÅŸtirme</a></td>
+
+        <td><code>$ vi <em>ÖNEK</em>/conf/httpd.conf</code> </td>
+      </tr>
+
+      <tr>
+        <td><a href="#test">Deneme</a></td>
+
+        <td><code>$ <em>ÖNEK</em>/bin/apachectl -k start</code>
+        </td>
+      </tr>
+    </table>
+
+    <p><em>NN</em> yerine kuracağınız sürümü, <code><em>ÖNEK</em></code>
+      yerine de dosya sisteminde sunucunun altına kurulacağı dizin yolunu
+      yazınız. <code><em>ÖNEK</em></code> belirtilmezse
+      <code>/usr/local/apache2</code> öntanımlıdır.</p>
+
+    <p>Derleme ve kurulum işleminin her aşaması, Apache HTTPd Sunucusunun
+      derlenmesi ve kurulması için gerekenler başta olmak üzere aşağıda
+      ayrıntılı olarak açıklanmıştır.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="requirements" id="requirements">Gereksinimler</a></h2>
+
+    <p>Apache HTTPd’yi derleyebilmek için şunlar mevcut olmalıdır:</p>
+
+    <dl>
+      <dt>Disk Alanı</dt>
+      <dd>Geçici olarak en azından 50 MB boş disk alanınız olduğundan emin
+        olunuz. Kurulumdan sonra Apache yaklaşık 10 MB disk alanı kaplıyor
+        olacaktır. Asıl disk alanı gereksinimi seçtiğiniz yapılandırma
+        seçenekleri ve üçüncü parti modüllere göre değişiklik
+        gösterecektir.</dd>
+
+      <dt>ANSI-C Derleyici ve Derleme Sistemi</dt>
+      <dd>Bir ANSI-C derleyicinin kurulu olduÄŸundan emin olunuz. <a href="http://www.gnu.org/">Free Software Foundation (FSF)</a>
+        tarafından dağıtılan <a href="http://www.gnu.org/software/gcc/gcc.html">GNU C derleyicisini
+        (GCC)</a> kullanmanız önerilir. GCC yoksa en azından satıcınızın
+        derleyicisinin ANSI uyumlu olduğundan emin olunuz. Ayrıca,
+        <code>PATH</code> ortam değişkeninizin içerdiği yollarda
+        <code>make</code> gibi temel derleme araçları da bulunmalıdır.</dd>
+
+      <dt>Zamanın doğru belirlenmesi</dt>
+      <dd>HTTP protokolünün elemanları sunuldukları tarih ve saate göre ifade
+        edilirler. Bu bakımdan sisteminizdeki zaman ayarlama oluşumunun
+        ayarlarını gözden geçirmenizin tam sırasıdır. Bu amaçla, Ağ Zaman
+        Protokolüne (NTP) göre çalışan <code>ntpdate</code> veya
+        <code>xntpd</code> programları kullanılır. NTP yazılımları ve halka
+        açık zaman sunucuları hakkında daha ayrıntılı bilgi için <a href="http://www.ntp.org">NTP sitesine bakınız</a>.</dd>
+
+      <dt><a href="http://www.perl.org/">Perl 5</a> [SEÇİMLİK]</dt>
+      <dd>Perl ile yazılmış <code class="program"><a href="./programs/apxs.html">apxs</a></code> veya
+        <code class="program"><a href="./programs/dbmmanage.html">dbmmanage</a></code> gibi bazı betikleri desteklemek için
+        Perl 5 yorumlayıcısı gerekir (5.003 veya daha yeni sürümleri
+        yeterlidir). Eğer sisteminizde birden fazla Perl yorumlayıcı
+        kuruluysa (örneğin, sistem geneli için Perl 4, kendi kullanımızı için
+        Perl 5 kurulu olabilir), doğru sürümün kullanılacağından emin olmak
+        bunu <code class="program"><a href="./programs/configure.html">configure</a></code> betiÄŸine <code>--with-perl</code>
+        seçeneğini kullanarak belirtmeniz önerilir. Eğer
+        <code class="program"><a href="./programs/configure.html">configure</a></code> betiği sisteminizde Perl 5 yorumlayıcısı
+        bulamazsa bu betikleri kullanamazsınız. Ancak, bu durum Apache
+        HTTPd’nin derlenip kurulmasına engel değildir.</dd>
+
+      <dt><a href="http://apr.apache.org">apr/apr-util &gt;= 1.2</a></dt>
+      <dd><code>apr</code> ve <code>apr-util</code> Apache HTTPd kaynak
+        paketiyle gelmektedir ve hemen hemen tüm durumlarda sorunsuz
+        kullanılabilecek durumdadır. Ancak sisteminizde <code>apr</code> veya
+        <code>apr-util</code>’in 1.0 veya 1.1 sürümleri kuruluysa onları paket
+        içindeki kütüphaneleri kullanmaya zorlamak için ya 1.2 sürümlerine
+        yükseltmeli ya da ayrı HTTPd derlemeleriniz olmalıdır. Paket içinde
+        gelen <code>apr</code>/<code>apr-util</code> kaynak kodlarını
+        kullanmak için <code class="program"><a href="./programs/configure.html">configure</a></code> betiğine
+        <code>--with-included-apr</code> seçeneğini belirtiniz.
+
+      <div class="note"><h3>Ek bilgi</h3>
+        <code>--with-included-apr</code> seçeneği 2.2.3 sürümünde eklenmiştir.
+      </div>
+      <div class="example"><p><code>
+        # Paketteki apr/apr-util’in kullanımını zorlamak için<br />
+        ./configure --with-included-apr<br />
+      </code></p></div>
+
+        Apache HTTPd’yi ve <code>apr</code>/<code>apr-util</code>’i ayrı ayrı
+        derlemek için:
+      <div class="example"><p><code>
+        # apr 1.2’nin derlenmesi ve kurulması<br />
+        cd srclib/apr<br />
+        ./configure --prefix=/usr/local/apr-httpd/<br />
+        make<br />
+        make install<br />
+        <br />
+        # apr-util 1.2’nin derlenmesi ve kurulması<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 />
+        # HTTPd’nin derlenmesi<br />
+        cd ../../<br />
+        ./configure --with-apr=/usr/local/apr-httpd/
+          --with-apr-util=/usr/local/apr-util-httpd/
+      </code></p></div>
+    </dd>
+  </dl>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="download" id="download">Ä°ndirme</a></h2>
+
+    <p>Apache HTTP Sunucusunu, çeşitli yansıların da listelendiği <a href="http://httpd.apache.org/download.cgi">Apache HTTP Sunucusu
+      indirme sayfasından</a> indirebilirsiniz. Unix benzeri sistemler
+      kullanan Apache HTTPd kullanıcılarının kaynak paketlerinden birini
+      indirip derlemeleri daha iyi olacaktır. Derleme işlemi (aşağıda
+      açıklanmıştır) kolaydır ve sunucunuzu ihtiyaçlarınıza uygun olarak
+      kişiselleştirmenize imkan tanır. Ayrıca, hazır derlenmiş paketler
+      çoğunlukla en son kaynak sürüm kadar güncel değildirler. Eğer böyle bir
+      paket indirmişseniz, kurarken paketin içinde bulunan
+      <code>INSTALL.bindist</code> dosyasındaki talimatlara uyunuz.</p>
+
+    <p>İndirme işleminin ardından Apache HTTP Sunucusunun eksiksiz ve
+      değişikliğe uğramamış olduğunun doğrulanması önemlidir. Bu indirilen
+      tar paketinin PGP imzasına göre sınanması ile sağlanabilir. Bunun nasıl
+      yapılacağı <a href="http://httpd.apache.org/download.cgi#verify">indirme
+      sayfasında</a> anlatıldığı gibi <a href="http://httpd.apache.org/dev/verification.html">PGP
+      kullanımının</a> anlatıldığı daha geniş bir örnek de vardır.</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="extract" id="extract">Paketi açma</a></h2>
+
+    <p>Apache HTTPd tar paketinden sıkıştırmayı kaldırdıktan sonra tar
+      arşivinden dosyaları çıkarmak basit bir işlemdir:</p>
+
+    <div class="example"><p><code>
+      $ gzip -d httpd-<em>NN</em>.tar.gz<br />
+      $ tar xvf httpd-<em>NN</em>.tar
+    </code></p></div>
+
+    <p>Bu işlem bulunduğunuz dizinin içinde dağıtımın kaynak dosyalarını
+      içeren yeni bir dizin oluşturacaktır. Sunucuyu derleme işlmine
+      başlayabilmek için önce <code>cd</code> ile bu dizine geçmelisiniz.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="configure" id="configure">Kaynak ağacının yapılandırılması</a></h2>
+
+    <p>Sonraki adım, Apache HTTPd kaynak ağacının platformunuza ve kişisel
+      gereksinimlerinize uygun olarak yapılandırılmasıdır. Bu işlem dağıtımın
+      kök dizininde bulunan <code class="program"><a href="./programs/configure.html">configure</a></code> betiği kullanılarak
+      yapılır. (Apache HTTPd kaynak ağacının resmen dağıtıma girmemiş bir
+      sürümünü indiren geliştiricilerin sistemlerinde <code>autoconf</code> ve
+      <code>libtool</code> kurulu olması ve sonraki adıma geçmek için
+      <code>buildconf</code> çalıştırmaları gerekir. Bu işlem resmi
+      dağıtımlar için gerekli değildir.)</p>
+
+    <p>Kaynak ağacını tamamen öntanımlı seçenekler kullanılarak derlemek için
+      <code>./configure</code> komutunu vermek yeterlidir. Öntanımlı
+      seçenekleri değiştirmek için <code class="program"><a href="./programs/configure.html">configure</a></code> betiği
+      çeşitli değişkenler ve komut satırı seçenekleri kabul eder.</p>
+
+    <p>En önemli seçenek, Apache HTTP Sunucusunun kurulacağı yerin
+      belirlenmesini, dolayısıyla Apache’nin bu konumda doğru olarak
+      çalışması için yapılandırılmasını sağlayan <code>--prefix</code>’tir.
+      Kurulacak dosyaların yerleri ile ilgili daha ayrıntılı denetim ek <a href="programs/configure.html#installationdirectories">yapılandırma
+      seçenekleri</a> ile mümkün kılınmıştır.</p>
+
+    <p>Bu noktada ayrıca, Apache HTTPd’de hangi özelliklerin bulunmasını
+      istediğinizi <a href="mod/">modülleri</a> etkin kılarak veya iptal
+      ederek belirtebilirsiniz. Apache, öntanımlı olarak içerilmiş <a href="mod/module-dict.html#Status">temel</a> modüllerle gelir. Diğer
+      modüller <code>--enable-<var>modül</var></code> seçenekleri
+      kullanılarak etkinleştirilir. Buradaki <code><var>modül</var></code>,
+      önünden <code>mod_</code> dizgesi kaldırılmış ve içindeki altçizgi
+      imleri tire imleri ile değiştirilmiş modül ismidir. Ayrıca,
+      <code>--enable-<var>modül</var>=shared</code> seçeneklerini kullanarak
+      modülleri çalışma anında gerektiğinde yüklemek veya kaldırmak üzere <a href="dso.html">paylaşımlı nesneler (DSO’lar)</a> olarak derlemeniz de
+      mümkündür. Temel modülleri de benzer şekilde
+      <code>--disable-<var>modül</var></code> seçenekleriyle iptal
+      edebilirsiniz. <code class="program"><a href="./programs/configure.html">configure</a></code> betiÄŸi mevcut olmayan
+      modüller için sizi uyarmayıp, seçeneği yok saymakla yetineceğinden, bu
+      seçenekleri kullanırken dikkatli olmalısınız.</p>
+
+    <p>Ek olarak, bazen kullandığınız derleyici, kütüphaneler veya başlık
+      dosyalarının yerleri hakkında <code class="program"><a href="./programs/configure.html">configure</a></code> betiğine
+      ilave bilgiler sağlamanız gerekir. Bu işlem
+      <code class="program"><a href="./programs/configure.html">configure</a></code> betiÄŸine ya ortam deÄŸiÅŸkenleriyle ya da
+      komut satırı seçenekleriyle bilgi aktarılarak yapılır. Daha fazla bilgi
+      için <code class="program"><a href="./programs/configure.html">configure</a></code> kılavuz sayfasına bakınız.</p>
+
+    <p>Apache’yi derlerken ne gibi olasılıklara sahip olduğunuz hakkında bir
+      izlenim edinmeniz için aşağıda tipik bir örneğe yer verilmiştir. Bu
+      örnekte, Apache’nin <code>/sw/pkg/apache</code> önekiyle başlayan
+      dizinlere kurulması, belli bir derleyici ve derleyici seçenekleriyle
+      derlenmesi ve <code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code> ve
+      <code class="module"><a href="./mod/mod_speling.html">mod_speling</a></code> modüllerinin de DSO mekanizması üzerinden
+      daha sonra yüklenmek üzere derlenmesi istenmektedir:</p>
+
+    <div class="example"><p><code>
+      $ CC="pgcc" CFLAGS="-O2" \<br />
+       ./configure --prefix=/sw/pkg/apache \<br />
+       --enable-rewrite=shared \<br />
+       --enable-speling=shared
+    </code></p></div>
+
+    <p><code class="program"><a href="./programs/configure.html">configure</a></code> betiği başlatıldığında sisteminizde
+      mevcut özelliklerin işe yararlığını sınamak ve sonradan sunucuyu
+      derlemek için kullanılacak Makefile dosyalarını oluşturmak için bir kaç
+      dakika çalışacaktır.</p>
+
+    <p><code class="program"><a href="./programs/configure.html">configure</a></code> seçeneklerinin tamamı ayrıtılı olarak
+      <code class="program"><a href="./programs/configure.html">configure</a></code> kılavuz sayfasında açıklanmıştır.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="compile" id="compile">Derleme</a></h2>
+
+    <p>Artık, Apache HTTPd paketini şekillendiren çeşitli parçaları derlemek
+      için basitçe aşağıdaki komutu verebilirsiniz:</p>
+
+    <div class="example"><p><code>$ make</code></p></div>
+
+    <p>Bu komutu verdikten sonra lütfen sabırlı olunuz. Temel yapılandırmanın
+      derlenmesi bir kaç dakika alsa da modüllerin derlenmesi donanımınıza ve
+      seçtiğiniz modüllerin sayısına bağlı olarak daha uzun süre
+      gerektirecektir.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="install" id="install">Kurulum</a></h2>
+
+    <p>Şimdi sıra <code><em>ÖNEK</em></code> dizini altına kurulmak üzere
+      yapılandırdığınız (yukarı <code>--prefix</code> seçeneğine bakınız)
+      paketi kurmaya geldi. Basitçe şu komutu veriniz:</p>
+
+    <div class="example"><p><code># make install</code></p></div>
+
+    <p><code><em>ÖNEK</em></code> dizininde genellikle yazma izinlerinin
+      sınırlı oluşu nedeniyle bu adım genellikle root yetkilerini
+      gerektirir.</p>
+
+    <p>Eğer sürüm yükseltiyorsanız, kurulum sırasında mevcut yapılandırma
+      dosyalarının ve belgelerin üzerine yazılmayacaktır.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="customize" id="customize">KiÅŸiselleÅŸtirme</a></h2>
+
+    <p>Bu adımda, Apache HTTP Sunucunuzu <code><em>ÖNEK</em>/conf/</code>
+      dizini altındaki <a href="configuring.html">yapılandırma
+      dosyalarını</a> düzenleyerek kişiselleştirebilirsiniz.</p>
+
+    <div class="example"><p><code>$ vi <em>ÖNEK</em>/conf/httpd.conf</code></p></div>
+
+    <p>Bu kılavuz ve kullanılabilecek <a href="mod/directives.html">yapılandırma yönergelerinin</a> kılavuzlarını
+      <a href="./">docs/manual/</a> altında bulabileceğiniz gibi en
+      son sürümünü daima <a href="http://httpd.apache.org/docs/2.2/">http://httpd.apache.org/docs/2.2/</a> adresinde
+      bulabilirsiniz.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="test" id="test">Deneme</a></h2>
+
+    <p>Artık Apache HTTP Sunucunuzu <a href="invoking.html">başlatmaya</a>
+      hazırsınız. Hemen şu komutu verin:</p>
+
+    <div class="example"><p><code>$ <em>ÖNEK</em>/bin/apachectl -k start</code></p></div>
+
+    <p><code>http://localhost/</code> üzerinden ilk belgeniz için bir istek
+      yapmalısınız. Genellikle <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code> olarak bilinen
+      <code><em>ÖNEK</em>/htdocs/</code> altındaki sayfayı görürsünüz.
+      Çalışmakta olan sunucuyu <a href="stopping.html">durdurmak</a> için şu
+      komutu verebilirsiniz:</p>
+
+    <div class="example"><p><code>$ <em>ÖNEK</em>/bin/apachectl -k stop</code></p></div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="upgrading" id="upgrading">Yükseltme</a></h2>
+
+    <p>Sürüm yükseltme işleminin ilk adımı, sitenizi etkileyen değişiklikleri
+      öğrenmek için dağıtım duyurusunu ve kaynak paketindeki
+      <code>CHANGES</code> dosyasını okumaktır. Ana sürümlerden yükseltme
+      yapıyorsanız (1.3’ten 2.0’a veya 2.0’dan 2.2’ye gibi), derleme anı ve
+      çalışma anı yapılandırmalarındaki ana farklılıklar elle ayarlamalar
+      yapmanızı gerektirecektir. Ayrıca, tüm modüllerin de modül API’sindeki
+      değişikliklere uyum sağlaması için yükseltilmesi gerekecektir.</p>
+
+    <p>Aynı ana sürüm içinde yükseltme yapmak (2.2.55’ten 2.2.57’ye
+      yükseltmek gibi) daha kolaydır. <code>make install</code> işlemi,
+      mevcut yapılandırma ve günlük dosyalarınızın ve belgelerin üzerine
+      yazmayacaktır. Ek olarak, geliştiriciler alt sürüm değişikliklerinde
+      <code class="program"><a href="./programs/configure.html">configure</a></code> seçenekleri, çalışma anı yapılandırması
+      veya modül API’sinde uyumsuz değişiklikler yapmamaya özen
+      göstereceklerdir. Çoğu durumda, aynı <code class="program"><a href="./programs/configure.html">configure</a></code> komut
+      satırını, aynı yapılandırma dosyasını kullanabileceksiniz ve tüm
+      modülleriniz de çalışmaya devam edebilecektir.</p>
+
+    <p>Aynı ana sürüm içinde yükseltme işlemine, eski kaynak ağacının kök
+      dizininde veya kurulu sunucunuzun <code>build</code> dizininde
+      bulacağınız <code>config.nice</code> dosyasını yeni kaynak ağacının kök
+      dizinine kopyalamak suretiyle baÅŸlayabilirsiniz. Bu dosya evvelce
+      kaynak ağacını yapılandırmakta kullandığınız
+      <code class="program"><a href="./programs/configure.html">configure</a></code> komut satırını içerir.
+      <code>config.nice</code> dosyasında yapmak istediğiniz değişiklikler
+      varsa yaptıktan sonra şu komutları veriniz:</p>
+
+    <div class="example"><p><code>
+    $ ./config.nice<br />
+    $ make<br />
+    $ make install<br />
+    $ <em>ÖNEK</em>/bin/apachectl -k graceful-stop<br />
+    $ <em>ÖNEK</em>/bin/apachectl -k start<br />
+    </code></p></div>
+
+    <div class="warning">Her yeni sürümü hizmete sokmadan önce daima çalışma
+      ortamınızda denemeniz gerekir. Örneğin, yükseltme işlemini
+      sonuçlandırmadan önce eski sürümün çalışmasını durdurmadan yenisini
+      farklı bir <code>--prefix</code> ile kurabilir ve farklı bir port ile
+      (<code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> yönergesini
+      ayarlamak suretiyle) çalıştırabilirsiniz.</div>
+</div></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="./de/install.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/install.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/install.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/install.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/install.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/install.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/invoking.html b/docs/manual/invoking.html
index 6c5ac3e2..c9a1cbfa 100644
--- a/docs/manual/invoking.html
+++ b/docs/manual/invoking.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: invoking.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -14,9 +16,9 @@ URI: invoking.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: invoking.html.ja.euc-jp
+URI: invoking.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: invoking.html.ko.euc-kr
 Content-Language: ko
@@ -25,3 +27,7 @@ Content-type: text/html; charset=EUC-KR
 URI: invoking.html.ru.koi8-r
 Content-Language: ru
 Content-type: text/html; charset=KOI8-R
+
+URI: invoking.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/invoking.html.de b/docs/manual/invoking.html.de
index e5ee1008..5ea65796 100644
--- a/docs/manual/invoking.html.de
+++ b/docs/manual/invoking.html.de
@@ -24,7 +24,8 @@
 <a href="./fr/invoking.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/invoking.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="./tr/invoking.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">Diese Übersetzung ist möglicherweise
             nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
@@ -154,8 +155,9 @@
 <a href="./fr/invoking.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/invoking.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="./tr/invoking.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/invoking.html.en b/docs/manual/invoking.html.en
index acbed71d..814ea467 100644
--- a/docs/manual/invoking.html.en
+++ b/docs/manual/invoking.html.en
@@ -24,7 +24,8 @@
 <a href="./fr/invoking.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/invoking.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="./tr/invoking.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>On Windows, Apache is normally run as a service on Windows
@@ -72,7 +73,7 @@
     <code class="program"><a href="./programs/httpd.html">httpd</a></code> binary and any command-line arguments that you
     wish to be <em>always</em> present.</p>
 
-    <p>The first thing that <code>httpd</code> does when it is
+    <p>The first thing that <code class="program"><a href="./programs/httpd.html">httpd</a></code> does when it is
     invoked is to locate and read the <a href="configuring.html">configuration file</a>
     <code>httpd.conf</code>. The location of this file is set at
     compile-time, but it is possible to specify its location at run
@@ -144,8 +145,9 @@
 <a href="./fr/invoking.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/invoking.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="./tr/invoking.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/invoking.html.es b/docs/manual/invoking.html.es
index 5e8173e9..fdbc8f30 100644
--- a/docs/manual/invoking.html.es
+++ b/docs/manual/invoking.html.es
@@ -24,7 +24,8 @@
 <a href="./fr/invoking.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/invoking.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="./tr/invoking.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">Esta traducción podría estar
             obsoleta. Consulte la versión en inglés de la
@@ -163,8 +164,9 @@
 <a href="./fr/invoking.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/invoking.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="./tr/invoking.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Módulos</a> | <a href="./mod/directives.html">Directivas</a> | <a href="./faq/">Preguntas Frecuentes</a> | <a href="./glossary.html">Glosario</a> | <a href="./sitemap.html">Mapa de este sitio web</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/invoking.html.fr b/docs/manual/invoking.html.fr
index 5c4d9e9b..5f77565b 100644
--- a/docs/manual/invoking.html.fr
+++ b/docs/manual/invoking.html.fr
@@ -24,7 +24,8 @@
 <a href="./fr/invoking.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/invoking.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="./tr/invoking.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>Apache est habituellement lancé en tant que service
@@ -54,7 +55,7 @@
     permettre d'être associé à ce port privilégié. Lorsque le serveur est
     démarré, après avoir effectué quelques opérations préliminaires
     comme ouvrir ses fichiers de log, il lance plusieurs processus
-    <em>enfants</em> qui ont pour rôle d'écouter et de répondre aux
+    <em>enfants</em> qui ont pour rôle d'écouter et de répondre aux
     requêtes des clients. Le processus <code>httpd</code> principal
     continue à s'exécuter sous l'utilisateur root, tandis que les processus
     enfants s'exécutent sous un utilisateur aux privilèges restreints.
@@ -76,8 +77,8 @@
     localisation du binaire <code class="program"><a href="./programs/httpd.html">httpd</a></code> et tout argument de ligne
     de commande que vous souhaitez voir <em>systématiquement</em> présent.</p>
 
-    <p>La première chose qu'effectue <code>httpd</code> quand il est
-    invoqué et de localiser et lire le <a href="configuring.html">fichier de configuration</a>
+    <p>La première chose qu'effectue <code class="program"><a href="./programs/httpd.html">httpd</a></code> quand il est
+    invoqué est de localiser et lire le <a href="configuring.html">fichier de configuration</a>
     <code>httpd.conf</code>. La localisation de ce fichier est définie à la
     compilation, mais il est possible d'en spécifier une autre à
     l'exécution en utilisant l'option de ligne de commande <code>-f</code> comme suit:</p>
@@ -90,11 +91,7 @@
     Ceci indique que le serveur a démarré et est en cours d'exécution.
     À partir de ce moment, vous pouvez utiliser votre navigateur pour vous connecter
     au serveur et afficher la page de test située dans le répertoire défini
-    par la directive <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>,
-    ainsi qu'une copie locale de la documentation sous forme d'un lien
-    situé sur cette page.
-    (note du traducteur : en fait, vous ne devriez voir que "It works !"
-    s'afficher sur votre écran !)</p>
+    par la directive <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="errors" id="errors">Erreurs en cours de démarrage</a></h2>
@@ -159,8 +156,9 @@
 <a href="./fr/invoking.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/invoking.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="./tr/invoking.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossaire</a> | <a href="./sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/invoking.html.ja.euc-jp b/docs/manual/invoking.html.ja.euc-jp
deleted file mode 100644
index 405f0f80..00000000
--- a/docs/manual/invoking.html.ja.euc-jp
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>Apache ¤Îµ¯Æ° - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache ¤Îµ¯Æ°</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./de/invoking.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/invoking.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/invoking.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./fr/invoking.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/invoking.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-    <p>Windows ¾å¤Ç¤Ï¡¢Apache ¤ÏÄ̾ï¤Ï
-    Windows NT, 2000, XP ¤Ç¤Ï¥µ¡¼¥Ó¥¹¤È¤·¤Æ¡¢Windows 9x, ME 
-    ¤Ç¤Ï¥³¥ó¥½¡¼¥ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤·¤Æ¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
-    ¾ÜºÙ¤Ë´Ø¤·¤Æ¤Ï¡¢¡Ö<a href="platform/windows.html#winsvc">
-    ¥µ¡¼¥Ó¥¹¤È¤·¤Æ¼Â¹Ô¤¹¤ë</a>¡×¤È¡Ö<a href="platform/windows.html#wincons">
-    ¥³¥ó¥½¡¼¥ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤·¤Æ¼Â¹Ô¤¹¤ë</a>¡×¤ò¤´Í÷²¼¤µ¤¤¡£</p>
-
-    <p>Unix¤Ç¤Ï¡¢<code class="program"><a href="./programs/httpd.html">httpd</a></code> 
-    ¥×¥í¥°¥é¥à¤¬¡¢¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤Ç¾ï¤Ë¥ê¥¯¥¨¥¹¥È½èÍý¤ò¹Ô¤¦
-    ¥Ç¡¼¥â¥ó¤È¤·¤Æ¼Â¹Ô¤µ¤ì¤Þ¤¹¡£¤³¤Îʸ½ñ¤Ç¤Ï¤É¤Î¤è¤¦¤Ë
-    <code class="program"><a href="./programs/httpd.html">httpd</a></code> ¤òµ¯Æ°¤¹¤ë¤«¤Ë¤Ä¤¤¤Æµ­½Ò¤·¤Æ¤¤¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#startup">Apache ¤Îµ¯Æ°ÊýË¡</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#errors">µ¯Æ°»þ¤Î¥¨¥é¡¼</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#boot">¥Ö¡¼¥È»þ¤Îµ¯Æ°</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#info">ÄɲþðÊó</a></li>
-</ul><h3>»²¾È</h3><ul class="seealso"><li><a href="stopping.html">Ää»ß¤ÈºÆµ¯Æ°</a></li><li><code class="program"><a href="./programs/httpd.html">httpd</a></code></li><li><code class="program"><a href="./programs/apachectl.html">apachectl</a></code></li></ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="startup" id="startup">Apache ¤Îµ¯Æ°ÊýË¡</a></h2>
-
-    <p>¤â¤·¡¢ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ë
-    <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
-    ¤¬¥Ç¥Õ¥©¥ë¥È¤Î 80 (¤â¤·¤¯¤Ï 1024 °Ê²¼¤Î¾¤Î¥Ý¡¼¥È)
-    ¤Ç¤¢¤ë¾ì¹ç¤Ï¡¢Apache ¤òµ¯Æ°¤¹¤ë¤¿¤á¤Ë¤Ï root
-    ¸¢¸Â¤¬É¬Íפˤʤê¤Þ¤¹¤¬¡¢
-    ¤³¤ì¤Ï¤³¤ÎÆø¢¥Ý¡¼¥È¤Ë¥Ð¥¤¥ó¥É¤¹¤ë¤¿¤á¤Ç¤¹¡£
-    µ¯Æ°¤·¤Æ¡¢°ìÅÙ¥í¥°¥Õ¥¡¥¤¥ë¤ò³«¤¯¤È¤¤¤Ã¤¿½àÈ÷¤Î¤¿¤á¤Î
-    Æ°ºî¤ò´ö¤Ä¤«¼Â¹Ô¤·¤¿¸å¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ¹¤ë
-    listen ¤È±þÅú¤ò¼ÂºÝ¤Ë¹Ô¤¦<em>»Ò</em>¥×¥í¥»¥¹¤òµ¯Æ°¤·¤Þ¤¹¡£
-    ¥á¥¤¥ó¤Î <code class="program"><a href="./programs/httpd.html">httpd</a></code> ¥×¥í¥»¥¹¤Ï root ¸¢¸Â¤ÇÁö¤ê³¤±¤Þ¤¹¤¬¡¢
-    »Ò¥×¥í¥»¥¹¤Ï¤â¤Ã¤ÈÄ㤤¸¢¸Â¤ÇÁö¤ê¤Þ¤¹¡£
-    ¤³¤ì¤ÏÁªÂò¤·¤¿<a href="mpm.html">¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë</a>¤ÇÀ©¸æ¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>¿ä¾©¤Î <code class="program"><a href="./programs/httpd.html">httpd</a></code> ¼Â¹Ô¥×¥í¥°¥é¥à¤Îµ¯Æ°ÊýË¡¤Ï¡¢
-    <code class="program"><a href="./programs/apachectl.html">apachectl</a></code>
-    À©¸æ¥¹¥¯¥ê¥×¥È¤ò»ÈÍѤ¹¤ëÊýË¡¤Ç¤¹¡£¤³¤Î¥¹¥¯¥ê¥×¥È¤Ï¡¢<code class="program"><a href="./programs/httpd.html">httpd</a></code> 
-    ¤¬¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¾å¤ÇÀµ¾ï¤ËÆ°ºî¤¹¤ë¤è¤¦¤ËɬÍפʴĶ­ÊÑ¿ô¤ò
-    ŬÀÚ¤ËÀßÄꤷ¤Æ¡¢<code class="program"><a href="./programs/httpd.html">httpd</a></code> ¥Ð¥¤¥Ê¥ê¤òµ¯Æ°¤·¤Þ¤¹¡£
-    <code class="program"><a href="./programs/apachectl.html">apachectl</a></code> ¤Ï¤É¤ó¤Ê¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤âÄ̲ᤵ¤»¤Þ¤¹¤Î¤Ç¡¢
-    <code class="program"><a href="./programs/httpd.html">httpd</a></code> ¤Î¤É¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤â
-    <code class="program"><a href="./programs/apchectl.html">apchectl</a></code> ¤Î¥ª¥×¥·¥ç¥ó¤È¤·¤Æ»ÈÍѤǤ­¤Þ¤¹¡£
-    ¤Þ¤¿¡¢<code class="program"><a href="./programs/apchectl.html">apchectl</a></code> ¥¹¥¯¥ê¥×¥È¤òľÀÜÊÔ½¸¤·¡¢
-    ¥¹¥¯¥ê¥×¥ÈÀèƬÉÕ¶á¤Î <code>HTTPD</code> ÊÑ¿ô¤òÊѹ¹¤¹¤ë¤³¤È¤Ç¡¢
-    <code class="program"><a href="./programs/httpd.html">httpd</a></code> ¥Ð¥¤¥Ê¥ê¤ÎÀµ¤·¤¤°ÌÃÖ¤ò»ØÄꤷ¤¿¤ê¡¢<em>¾ï¤Ë</em>
-    Éղ䵤»¤ë¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤ò»ØÄꤷ¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p><code>httpd</code> ¤¬µ¯Æ°¤µ¤ì¤Æ¤Þ¤ººÇ½é¤Ë¤¹¤ë¤³¤È¤Ï¡¢
-    <a href="configuring.html">ÀßÄê¥Õ¥¡¥¤¥ë</a>
-    <code>httpd.conf</code> ¤Î°ÌÃÖ¤òÆÃÄꤷ¤ÆÆɤ߹þ¤à¤³¤È¤Ç¤¹¡£
-    ¤³¤Î¥Õ¥¡¥¤¥ë¤Î°ÌÃ֤ϥ³¥ó¥Ñ¥¤¥ë»þ¤ËÀßÄꤵ¤ì¤Þ¤¹¤¬¡¢¼Â¹Ô»þ¤Ë
-    <code>-f</code> ¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ
-    °ÌÃÖ¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£Î㤨¤Ð¼¡¤Î¤è¤¦¤Ë¤Ç¤¹¡£</p>
-
-<div class="example"><p><code>/usr/local/apache2/bin/apachectl -f
-      /usr/local/apache2/conf/httpd.conf</code></p></div>
-
-    <p>¥¹¥¿¡¼¥È¥¢¥Ã¥×¤¬Ëü»ö¾å¼ê¤¯¤¤¤Ã¤¿¤é¡¢¥µ¡¼¥Ð¤Ï¥¿¡¼¥ß¥Ê¥ë¤«¤é
-    ÀÚ¤êÎ¥¤µ¤ì¤Æ¡¢¥³¥Þ¥ó¥É¥×¥í¥ó¥×¥È¤¬Â¨ºÂ¤ËÌá¤Ã¤Æ¤¯¤ë¤Ç¤·¤ç¤¦¡£
-    ¤³¤ì¤Ï¥µ¡¼¥Ð¤¬µ¯Æ°¤·¤Æ¤¤¤ë¾õÂÖ¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
-    ¤½¤Î¸å¤Ï¥Ö¥é¥¦¥¶¤Ç¥µ¡¼¥Ð¤ËÀܳ¤·¤Æ¡¢
-    <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>
-    ¥Ç¥£¥ì¥¯¥È¥ê¤Î¥Æ¥¹¥È¥Ú¡¼¥¸¤ä¤½¤³¤«¤é¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤ë
-    ¥í¡¼¥«¥ë¤Î¥É¥­¥å¥á¥ó¥È¤ò¸«¤ë¤³¤È¤¬¤Ç¤­¤ë¤Ç¤·¤ç¤¦¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="errors" id="errors">µ¯Æ°»þ¤Î¥¨¥é¡¼</a></h2>
-
-    <p>Apache ¤Ï¡¢µ¯Æ°»þ¤ËÃ×̿Ū¤ÊÌäÂê¤ËÁø¶ø¤¹¤ë¤È¡¢
-    ½ªÎ»¤¹¤ëÁ°¤Ë¡¢¥³¥ó¥½¡¼¥ë¤«
-    <code class="directive"><a href="./mod/core.html#errorlog">ErrorLog</a></code>
-    ¤Î¤É¤Á¤é¤«¤ËÌäÂê¤òµ­½Ò¤·¤¿¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Þ¤¹¡£
-    ºÇ¤â¤è¤¯¤¢¤ë¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤Ï
-    ¡Ö<code>Unable to bind to Port ...</code>¡×
-    ¤Ç¤¹¡£¤³¤Î¥á¥Ã¥»¡¼¥¸¤ÏÉáÄ̤ϼ¡¤Î¤É¤Á¤é¤«¤¬¸¶°ø¤Ç¤¹¡£</p>
-
-    <ul>
-      <li>root ¤Ç¥í¥°¥¤¥ó¤·¤Æ¤¤¤Ê¤¤»þ¤Ë¡¢
-      Æø¢¥Ý¡¼¥È¤Ç¥µ¡¼¥Ð¤òµ¯Æ°¤·¤è¤¦¤È¤·¤¿¡£</li>
-
-      <li>Ʊ¤¸¥Ý¡¼¥È¤Ë´û¤Ë¥Ð¥¤¥ó¥É¤µ¤ì¤Æ¤¤¤ë Apache
-      ¤¬¤â¤¦°ì¤Ä¤¢¤ë¤È¤­¤ä¾¤Î¥¦¥§¥Ö¥µ¡¼¥Ð¤¬Â¸ºß¤·¤Æ¤¤¤ë»þ¤Ë¡¢
-      ¥µ¡¼¥Ð¤ò³«»Ï¤·¤è¤¦¤È¤·¤¿¡£</li>
-    </ul>
-
-    <p>¤è¤ê¿¤¯¤ÎÌäÂê²ò·è¤ÎÊýºö¤ÎÀâÌÀ¤Ï¡¢
-    Apache <a href="faq/">FAQ</a> ¤ò¤´Í÷²¼¤µ¤¤¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="boot" id="boot">¥Ö¡¼¥È»þ¤Îµ¯Æ°</a></h2>
-
-    <p>¥·¥¹¥Æ¥à¤¬¥ê¥Ö¡¼¥È¤·¤¿¸å¤Ç¤â
-    ¥µ¡¼¥Ð¤¬¼Â¹Ô¤µ¤ì³¤±¤ë¤è¤¦¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢
-    <code class="program"><a href="./programs/apachectl.html">apachectl</a></code>
-    ¤ò¸Æ¤Ó½Ð¤¹¤â¤Î¤ò¥·¥¹¥Æ¥à¥¹¥¿¡¼¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë
-    (Ä̾ï <code>rc.local</code> ¤ä <code>rc.N</code>
-    Æâ¤Î¥Õ¥¡¥¤¥ë) ¤ËÄɲ䷤ʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-    ¤³¤ÎÊýË¡¤Ç¤Ï Apache ¤ò root ¸¢¸Â¤Çµ¯Æ°¤·¤Þ¤¹¡£
-    ¤³¤ì¤ò¤¹¤ëÁ°¤Ë¡¢¥»¥­¥å¥ê¥Æ¥£¤ä¥¢¥¯¥»¥¹À©¸Â¤¬
-    ŬÀÚ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p><code class="program"><a href="./programs/apachectl.html">apachectl</a></code> ¥¹¥¯¥ê¥×¥È¤ÏÄ̾ï¤Ï¡¢É¸½àŪ¤Ê SysV init 
-    ¥¹¥¯¥ê¥×¥È¤È¤·¤ÆÆ°ºî¤¹¤ë¤è¤¦¤ËÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£
-    <code>start</code>, <code>restart</code>, <code>stop</code>
-    ¤È¤¤¤Ã¤¿°ú¿ô¤ò¤È¤Ã¤Æ¡¢<code class="program"><a href="./programs/httpd.html">httpd</a></code> 
-    ¤Ø¤ÎŬÀڤʥ·¥°¥Ê¥ë¤ËÊÑ´¹¤·¤Þ¤¹¡£
-    ¤Ç¤¹¤«¤é¡¢Ä̾ï¤Ïñ¤ËŬÀÚ¤Ê init ¥Ç¥£¥ì¥¯¥È¥êÆ⤫¤é
-    <code class="program"><a href="./programs/apachectl.html">apachectl</a></code> ¤Ø¥ê¥ó¥¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤·¤«¤·¡¢
-    Ç°¤Î¤¿¤á¥·¥¹¥Æ¥à¤ÎÍ×µá¤Ë¹çÃפ·¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="info" id="info">ÄɲþðÊó</a></h2>
-
-    <p><code class="program"><a href="./programs/httpd.html">httpd</a></code> ¤ä
-    <code class="program"><a href="./programs/apachectl.html">apachectl</a></code>¡¢¥µ¡¼¥Ð¤Ë´Þ¤Þ¤ì¤Æ¤¤¤¿¤½¤Î¾Êä½õ¥×¥í¥°¥é¥à¤Î¡¢
-    ¥³¥Þ¥ó¥É¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤Ë´Ø¤¹¤ëÄɲþðÊó¤Ï¡¢
-    <a href="programs/">¥µ¡¼¥Ð¤ÈÊä½õ¥×¥í¥°¥é¥à</a>¥Ú¡¼¥¸¤Ë
-    µ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-    Apache ÇÛÉۤ˴ޤޤì¤Æ¤¤¤ëÁ´<a href="mod/">¥â¥¸¥å¡¼¥ë</a>¡¢
-    ¤½¤ì¤Ë¤è¤Ã¤ÆÄ󶡤µ¤ì¤ë<a href="mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a>
-    ¤Î¥É¥­¥å¥á¥ó¥È¤â¤¢¤ê¤Þ¤¹¡£</p>
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./de/invoking.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/invoking.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/invoking.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./fr/invoking.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/invoking.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/invoking.html.ja.utf8 b/docs/manual/invoking.html.ja.utf8
new file mode 100644
index 00000000..c635c83c
--- /dev/null
+++ b/docs/manual/invoking.html.ja.utf8
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Apache �起動 - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache �起動</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./de/invoking.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/invoking.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/invoking.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/invoking.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/invoking.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="./tr/invoking.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+
+    <p>Windows 上���Apache �通常�
+    Windows NT, 2000, XP ��サービス����Windows 9x, ME 
+    ��コンソールアプリケーション���実行�れ��。
+    詳細�関����「<a href="platform/windows.html#winsvc">
+    サービス���実行�る</a>��「<a href="platform/windows.html#wincons">
+    コンソールアプリケーション���実行�る</a>�を�覧下��。</p>
+
+    <p>Unix���<code class="program"><a href="./programs/httpd.html">httpd</a></code> 
+    プログラム���ックグラウンド�常�リクエスト処�を行�
+    デーモン���実行�れ��。��文書����よ��
+    <code class="program"><a href="./programs/httpd.html">httpd</a></code> を起動�る�����記述�����。</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#startup">Apache �起動方法</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#errors">起動時�エラー</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#boot">ブート時�起動</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#info">追加情報</a></li>
+</ul><h3>�照</h3><ul class="seealso"><li><a href="stopping.html">�止��起動</a></li><li><code class="program"><a href="./programs/httpd.html">httpd</a></code></li><li><code class="program"><a href="./programs/apachectl.html">apachectl</a></code></li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="startup" id="startup">Apache �起動方法</a></h2>
+
+    <p>も��設定ファイル中�指定�れ��る
+    <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
+    �デフォルト� 80 (も��� 1024 以下�他��ート)
+    ��る場���Apache を起動�る���� root
+    権��必���り����
+    �れ���特権�ート��インド�る����。
+    起動���一度ログファイルを開�����準備����
+    動作を幾��実行��後��クライアント�ら�リクエスト�対�る
+    listen �応答を実際�行�<em>�</em>プロセスを起動���。
+    メイン� <code class="program"><a href="./programs/httpd.html">httpd</a></code> プロセス� root 権��走り続�����
+    �プロセス�も��低�権��走り��。
+    �れ��択��<a href="mpm.html">マル�プロセッシングモジュール</a>�制御�れ��。</p>
+
+    <p>推奨� <code class="program"><a href="./programs/httpd.html">httpd</a></code> 実行プログラム�起動方法��
+    <code class="program"><a href="./programs/apachectl.html">apachectl</a></code>
+    制御スクリプトを使用�る方法��。��スクリプト��<code class="program"><a href="./programs/httpd.html">httpd</a></code> 
+    �オペレーティングシステム上�正常�動作�るよ��必��環境変数を
+    �切�設定���<code class="program"><a href="./programs/httpd.html">httpd</a></code> �イナリを起動���。
+    <code class="program"><a href="./programs/apachectl.html">apachectl</a></code> ��ん�コマンドライン引数も通��������
+    <code class="program"><a href="./programs/httpd.html">httpd</a></code> ���コマンドラインオプションも
+    <code class="program"><a href="./programs/apchectl.html">apchectl</a></code> �オプション���使用����。
+    ���<code class="program"><a href="./programs/apchectl.html">apchectl</a></code> スクリプトを直接編集��
+    スクリプト先頭付近� <code>HTTPD</code> 変数を変更�る����
+    <code class="program"><a href="./programs/httpd.html">httpd</a></code> �イナリ�正���置を指定��り�<em>常�</em>
+    付加��るコマンドライン引数を指定��り�る�������。</p>
+
+    <p><code>httpd</code> �起動�れ���最���る����
+    <a href="configuring.html">設定ファイル</a>
+    <code>httpd.conf</code> ��置を特定��読�込む����。
+    ��ファイル��置�コンパイル時�設定�れ����実行時�
+    <code>-f</code> コマンドラインオプションを使��
+    �置を指定�る��も����。例��次�よ����。</p>
+
+<div class="example"><p><code>/usr/local/apache2/bin/apachectl -f
+      /usr/local/apache2/conf/httpd.conf</code></p></div>
+
+    <p>スタートアップ�万事上手����ら�サー��ターミナル�ら
+    切り離�れ��コマンドプロンプト��座�戻���る��ょ�。
+    �れ�サー��起動���る状態を示�����。
+    ��後�ブラウザ�サー��接続���
+    <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>
+    ディレクトリ�テストページや���らリンク�れ��る
+    ローカル�ドキュメントを見る�����る��ょ�。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="errors" id="errors">起動時�エラー</a></h2>
+
+    <p>Apache ��起動時�致命的��題����る��
+    終了�る���コンソール�
+    <code class="directive"><a href="./mod/core.html#errorlog">ErrorLog</a></code>
+    ���ら���題を記述��メッセージを出力���。
+    最もよ��るエラーメッセージ�
+    「<code>Unable to bind to Port ...</code>�
+    ��。��メッセージ�普通�次���ら��原因��。</p>
+
+    <ul>
+      <li>root �ログイン�����時��
+      特権�ート�サー�を起動�よ����。</li>
+
+      <li>���ート�既��インド�れ��る Apache
+      �も�一��る��や他�ウェブサー��存在���る時��
+      サー�を開始�よ����。</li>
+    </ul>
+
+    <p>より多���題解決�方策�説明��
+    Apache <a href="faq/">FAQ</a> を�覧下��。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="boot" id="boot">ブート時�起動</a></h2>
+
+    <p>システム�リブート��後�も
+    サー��実行�れ続�るよ�����場���
+    <code class="program"><a href="./programs/apachectl.html">apachectl</a></code>
+    を呼�出�も�をシステムスタートアップファイル
+    (通常 <code>rc.local</code> や <code>rc.N</code>
+    内�ファイル) �追加���れ��り��ん。
+    ��方法�� Apache を root 権��起動���。
+    �れを�る���セキュリティやアクセス制��
+    �切�設定�れ��る��を確�������。</p>
+
+    <p><code class="program"><a href="./programs/apachectl.html">apachectl</a></code> スクリプト�通常��標準的� SysV init 
+    スクリプト���動作�るよ��設計�れ����。
+    <code>start</code>, <code>restart</code>, <code>stop</code>
+    ����引数を����<code class="program"><a href="./programs/httpd.html">httpd</a></code> 
+    ���切�シグナル�変����。
+    ���ら�通常����切� init ディレクトリ内�ら
+    <code class="program"><a href="./programs/apachectl.html">apachectl</a></code> �リンク�る�������。����
+    念���システム��求��致���る��を確�������。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="info" id="info">追加情報</a></h2>
+
+    <p><code class="program"><a href="./programs/httpd.html">httpd</a></code> ã‚„
+    <code class="program"><a href="./programs/apachectl.html">apachectl</a></code>�サー����れ�����他補助プログラム��
+    コマンドラインオプション�関�る追加情報��
+    <a href="programs/">サー��補助プログラム</a>ページ�
+    記載�れ����。
+    Apache �布���れ��る全<a href="mod/">モジュール</a>�
+    �れ�よ���供�れる<a href="mod/directives.html">ディレクティブ</a>
+    �ドキュメントも�り��。</p>
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./de/invoking.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/invoking.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/invoking.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/invoking.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/invoking.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="./tr/invoking.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/invoking.html.ko.euc-kr b/docs/manual/invoking.html.ko.euc-kr
index 76cd5e80..00c41dfd 100644
--- a/docs/manual/invoking.html.ko.euc-kr
+++ b/docs/manual/invoking.html.ko.euc-kr
@@ -24,7 +24,8 @@
 <a href="./fr/invoking.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/invoking.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/invoking.html" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="./tr/invoking.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
             ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
@@ -135,8 +136,9 @@
 <a href="./fr/invoking.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/invoking.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/invoking.html" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="./tr/invoking.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/invoking.html.ru.koi8-r b/docs/manual/invoking.html.ru.koi8-r
index c5a9745e..7027d8bb 100644
--- a/docs/manual/invoking.html.ru.koi8-r
+++ b/docs/manual/invoking.html.ru.koi8-r
@@ -24,7 +24,8 @@
 <a href="./fr/invoking.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/invoking.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./ru/invoking.html" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./ru/invoking.html" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="./tr/invoking.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">üÔÏÔ ÐÅÒÅ×ÏÄ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÒÅ×ÛÉÍ. óÍÏÔÒÉÔÅ
             ÁÎÇÌÉÊÓËÕÀ ×ÅÒÓÉÀ ÄÌÑ ÏÚÎÁËÏÍÌÅÎÉÑ ÓÏ ×ÓÅÍÉ ÐÏÓÌÅÄÎÉÍÉ ÉÚÍÅÎÅÎÉÑÍÉ
@@ -141,8 +142,9 @@
 <a href="./fr/invoking.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/invoking.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./ru/invoking.html" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./ru/invoking.html" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="./tr/invoking.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">íÏÄÕÌÉ</a> | <a href="./mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="./sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/invoking.html.tr.utf8 b/docs/manual/invoking.html.tr.utf8
new file mode 100644
index 00000000..31054477
--- /dev/null
+++ b/docs/manual/invoking.html.tr.utf8
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Apache HTTPd’nin başlatılması - Apache HTTP Sunucusu</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="./">Sürüm 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache HTTPd’nin başlatılması</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="./de/invoking.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/invoking.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/invoking.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/invoking.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/invoking.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="./tr/invoking.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+    <p>Apache normal olarak, Windows NT, 2000 ve XP'de bir hizmet olarak,
+      Windows 9x ve ME’de ise bir konsol uygulaması olarak çalışır. Ayrıntılı
+      bilgi için <a href="platform/windows.html#winsvc">Apache HTTPd’nin bir
+      hizmet olarak çalıştırılması</a> ve <a href="platform/windows.html#wincons">Apache HTTPd’nin bir konsol
+      uygulaması olarak çalıştırılması</a> bölümlerine bakınız.</p>
+
+    <p>Unix’te ise artalanda isteklere yanıt vermek için sürekli çalışan bir
+      artalan sürecidir. Bu belgede <code class="program"><a href="./programs/httpd.html">httpd</a></code>’nin nasıl
+      çalıştırılacağı açıklanmaktadır.</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#startup">Apache Nasıl Başlatılır?</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#errors">Başlatma Sırasındaki Hatalar</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#boot">Sistem Açılışında Başlatma</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#info">Ek Bilgiler</a></li>
+</ul><h3>Ayrıca bakınız:</h3><ul class="seealso"><li><a href="stopping.html">Durdurma ve Yeniden Başlatma</a></li><li><code class="program"><a href="./programs/httpd.html">httpd</a></code></li><li><code class="program"><a href="./programs/apachectl.html">apachectl</a></code></li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="startup" id="startup">Apache Nasıl Başlatılır?</a></h2>
+
+    <p>Yapılandırma dosyasında <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code> yönergesi ile öntanımlı olan port
+      80 (veya 1024’ten küçük herhangi bir port) belirtilmişse Apache HTTP
+      Sunucusunu başlatmak için root yetkileri gerekecektir. Sunucu başlatılıp
+      günlük dosyalarını açmak gibi bazı ön hazırlık etkinliklerinde
+      bulunduktan sonra istemcilerden gelen istekleri dinlemek ve yanıt vermek
+      için çeşitli <em>çocuk</em> süreçler başlatır. Ana <code>httpd</code>
+      süreci root kullanıcısının aidiyetinde çalışmasını sürdürürken çocuk
+      süreçler daha az yetkili bir kullanıcının aidiyetinde çalışır. Bu işlem
+      seçilen <a href="mpm.html">Çok Süreçlilik Modülü</a> tarafından
+      denetlenir.</p>
+
+    <p><code class="program"><a href="./programs/httpd.html">httpd</a></code>’yi çalıştırmak için önerilen yöntem
+      <code class="program"><a href="./programs/apachectl.html">apachectl</a></code> betiğini kullanmaktır. Bu betik,
+      <code class="program"><a href="./programs/httpd.html">httpd</a></code>’nin bazı işletim sistemlerinde işlevini
+      gerektiği gibi yerine getirebilmesi için gereken belli ortam
+      değişkenlerini ayarlar ve <code class="program"><a href="./programs/httpd.html">httpd</a></code>’yi çalıştırır.
+      <code class="program"><a href="./programs/apachectl.html">apachectl</a></code>, komut satırı argümanlarını
+      <code class="program"><a href="./programs/httpd.html">httpd</a></code>’ye aktarabildiğinden gerekli
+      <code class="program"><a href="./programs/httpd.html">httpd</a></code> seçenekleri <code class="program"><a href="./programs/apachectl.html">apachectl</a></code>
+      betiğine komut satırı seçenekleri olarak belirtilebilir. Ayrıca,
+      <code class="program"><a href="./programs/apachectl.html">apachectl</a></code> betiğinin içeriğini doğrudan düzenlemek
+      suretiyle betiğin başlangıç satırlarındaki <code>HTTPD</code>
+      değişkenine <code class="program"><a href="./programs/httpd.html">httpd</a></code> çalıştırılabilir dosyasının doğru
+      yerini ve <em>daima</em> mevcut olmasını istediğiniz komut satırı
+      seçeneklerini belirtebilirsiniz.</p>
+
+    <p><code>httpd</code> çalıştırıldığında yaptığı ilk şey <a href="configuring.html">yapılandırma dosyası</a>
+      <code>httpd.conf</code>’u bulup okumaktır. Bu dosyanın yeri derleme
+      sırasında belirtilmekteyse de <code>-f</code> komut satırı seçeneği
+      kullanılarak çalıştırma sırasında belirtmek de mümkündür:</p>
+
+    <div class="example"><p><code>/usr/local/apache2/bin/apachectl -f
+      /usr/local/apache2/conf/httpd.conf</code></p></div>
+
+    <p>Başlatma sırasında herşey yolunda giderse sunucu kendini uçbirimden
+      ayıracak ve hemen ardından uçbirim, komut istemine düşecektir. Bu,
+      sunucunun etkin ve çalışmakta olduğunu gösterir. Artık tarayıcınızı
+      kullanarak sunucuya bağlanabilir ve <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code> dizinindeki deneme sayfasını
+      görebilirsiniz.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="errors" id="errors">Başlatma Sırasındaki Hatalar</a></h2>
+
+    <p>Apache başlatma sırasında ölümcül bir sorunla karşılaşacak olursa
+      çıkmadan önce sorunu açıklayan bir iletiyi konsola veya <code class="directive"><a href="./mod/core.html#errorlog">ErrorLog</a></code> yönergesi ile belirtilen hata
+      günlüğüne yazacaktır. En çok karşılaşılan hata iletilerinden biri
+      "<code>Unable to bind to Port ...</code>" dizgesidir. Bu iletiye
+      genellikle ÅŸu iki durumdan biri sebep olur:</p>
+
+    <ul>
+      <li>Sunucunun, root yetkileri gerektiren bir portu kullanmak üzere root
+        kullanıcısı tarafından çalıştırılmamış olması.</li>
+
+      <li>Aynı portu kullanan başka bir Apache Sunucusunun veya başka bir HTTP
+        sunucusunun zaten çalışmakta oluşu.</li>
+    </ul>
+
+    <p>Bu ve diğer sorun çözme talimatları için Apache <a href="faq/">SSS</a>’sini inceleyiniz.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="boot" id="boot">Sistem Açılışında Başlatma</a></h2>
+
+    <p>Sunucunuzun sistem yeniden başlatıldıktan sonra çalışmasına devam
+      etmesini istiyorsanız sistem başlatma betiklerinize (genellikle ya
+      <code>rc.local</code> dosyasıdır ya da bir <code>rc.N</code> dizininde
+      bir dosyadır) <code class="program"><a href="./programs/apachectl.html">apachectl</a></code> betiği için bir çağrı
+      eklemelisiniz. Bu, Apache sunucunuzu root yetkileriyle başlatacaktır.
+      Bunu yapmadan önce sunucunuzun güvenlik ve erişim kısıtlamaları
+      bakımından gerektiği gibi yapılandırıldığından emin olunuz.</p>
+
+    <p><code class="program"><a href="./programs/apachectl.html">apachectl</a></code> betiÄŸi, bir standart SysV init betiÄŸi gibi
+      davranacak şekilde tasarlanmıştır. <code>start</code>,
+      <code>restart</code> ve <code>stop</code> argümanlarını kabul edebilir
+      ve bunları <code class="program"><a href="./programs/httpd.html">httpd</a></code>’ye uygun sinyallere dönüştürebilir.
+      Bu bakımdan, çoğunlukla uygun init dizinlerinden birine
+      <code class="program"><a href="./programs/apachectl.html">apachectl</a></code> betiği için basitçe bir bağ
+      yerleştirebilirsiniz. Fakat bunu yapmadan önce betiğin sisteminizin
+      gereklerini yerine getirdiÄŸinden emin olunuz.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="info" id="info">Ek Bilgiler</a></h2>
+
+    <p><code class="program"><a href="./programs/httpd.html">httpd</a></code>, <code class="program"><a href="./programs/apachectl.html">apachectl</a></code> ve sunucuyla
+      gelen diğer destek programlarının komut satırı seçenekleri hakkında ek
+      bilgi  <a href="programs/">Sunucu ve Destek Programları</a> sayfasında
+      bulunabilir. Ayrıca, Apache dağıtımında bulunan tüm <a href="mod/">modüller</a> ve bunlarla sağlanan <a href="mod/directives.html">yönergeler</a> hakkında da belgeler
+      vardır.</p>
+</div></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="./de/invoking.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/invoking.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/invoking.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/invoking.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/invoking.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/invoking.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./ru/invoking.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="./tr/invoking.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/license.html b/docs/manual/license.html
index 11472e45..96b08f6d 100644
--- a/docs/manual/license.html
+++ b/docs/manual/license.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: license.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/license.html.en b/docs/manual/license.html.en
index 631ea9b4..d54deab1 100644
--- a/docs/manual/license.html.en
+++ b/docs/manual/license.html.en
@@ -233,6 +233,6 @@ limitations under the License.</pre></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="./en/license.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/logs.html b/docs/manual/logs.html
index 0ab020d4..ec8ba23a 100644
--- a/docs/manual/logs.html
+++ b/docs/manual/logs.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: logs.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: logs.html.ja.euc-jp
+URI: logs.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: logs.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/logs.html.en b/docs/manual/logs.html.en
index 56de1359..7e8a11f4 100644
--- a/docs/manual/logs.html.en
+++ b/docs/manual/logs.html.en
@@ -597,6 +597,6 @@
 <a href="./ja/logs.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/logs.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/logs.html.ja.euc-jp b/docs/manual/logs.html.ja.euc-jp
deleted file mode 100644
index db56b10b..00000000
--- a/docs/manual/logs.html.ja.euc-jp
+++ /dev/null
@@ -1,573 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>¥í¥°¥Õ¥¡¥¤¥ë - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>¥í¥°¥Õ¥¡¥¤¥ë</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./en/logs.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./ja/logs.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/logs.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-    <p>¥¦¥§¥Ö¥µ¡¼¥Ð¤ò¸ú²ÌŪ¤Ë´ÉÍý¤¹¤ë¤¿¤á¤Ë¤Ï¡¢¥µ¡¼¥Ð¤Î³èÆ°¤ä¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¡¢
-    º£È¯À¸¤·¤Æ¤¤¤ë¤«¤â¤·¤ì¤Ê¤¤ÌäÂê¤Ë´Ø¤¹¤ë¥Õ¥£¡¼¥É¥Ð¥Ã¥¯¤òÆÀ¤ë¤³¤È¤¬É¬ÍפǤ¹¡£
-    Apache HTTP ¥µ¡¼¥Ð¤Ë¤ÏÈó¾ï¤ËÊñ³çŪ¤Ç½ÀÆð¤Ê¥í¥®¥ó¥°µ¡Ç½¤¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤Îʸ½ñ¤Ï¥í¥®¥ó¥°µ¡Ç½¤ÎÀßÄê¤Î»ÅÊý¤È¡¢¥í¥°¤Ë²¿¤¬½ñ¤«¤ì¤Æ¤¤¤ë¤«¤ò
-    Íý²ò¤¹¤ë¤¿¤á¤ÎÊýË¡¤òÀâÌÀ¤·¤Þ¤¹¡£</p>
-  </div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#security">
-    ¥»¥­¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ë·Ù¹ð</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#errorlog">¥¨¥é¡¼¥í¥°</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#accesslog">¥¢¥¯¥»¥¹¥í¥°</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#rotation">¥í¥°¤Î¸òÂØ</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#piped">¥Ñ¥¤¥×·Ðͳ¤Î¥í¥°</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#virtualhosts">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#other">¾¤Î¥í¥°¥Õ¥¡¥¤¥ë</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="security" id="security">
-    ¥»¥­¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ë·Ù¹ð</a></h2>
-
-    <p>Apache ¤¬¥í¥°¥Õ¥¡¥¤¥ë¤ò½ñ¤¤¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ë½ñ¤­¹þ¤á¤ë¿Í¤Ï¡¢
-    ¤Û¤Ü³Î¼Â¤Ë¥µ¡¼¥Ð¤¬µ¯Æ°¤µ¤ì¤¿ uid ¤Ø¤Î¥¢¥¯¥»¥¹¤ò¼ê¤ËÆþ¤ì¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤½¤·¤Æ¡¢¤½¤ì¤ÏÄ̾ï¤Ï root ¥æ¡¼¥¶¤Ç¤¹¡£
-    ¤Á¤ã¤ó¤È·ë²Ì¤ò¹Í¤¨¤ë¤³¤È¤Ê¤¯¡¢¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î
-    ½ñ¤­¹þ¤ß¸¢¸Â¤òÍ¿¤¨<em>¤Ê¤¤</em>¤Ç¤¯¤À¤µ¤¤¡£¾Ü¤·¤¯¤Ï
-    <a href="misc/security_tips.html">¥»¥­¥å¥ê¥Æ¥£¤Î¤³¤Ä</a>¤Îʸ½ñ¤ò
-    Æɤó¤Ç¤¯¤À¤µ¤¤¡£</p>
-
-    <p>²Ã¤¨¤Æ¡¢¥í¥°¥Õ¥¡¥¤¥ë¤Ë¤Ï¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î¾ðÊ󤬤½¤Î¤Þ¤Þ¡¢
-    ¥¨¥¹¥±¡¼¥×¤µ¤ì¤ë¤³¤È¤Ê¤¯½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢°­°Õ¤Î¤¢¤ë
-    ¥¯¥é¥¤¥¢¥ó¥È¤¬¥í¥°¥Õ¥¡¥¤¥ë¤ËÀ©¸æʸ»ú¤òÁÞÆþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    À¸¤Î¥í¥°¤ò°·¤¦¤È¤­¤ÏÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="errorlog" id="errorlog">¥¨¥é¡¼¥í¥°</a></h2>
-    
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#errorlog">ErrorLog</a></code></li><li><code class="directive"><a href="./mod/core.html#loglevel">LogLevel</a></code></li></ul></td></tr></table>
-
-    <p><code class="directive"><a href="./mod/core.html#errorlog">ErrorLog</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê
-    ̾Á°¤È¾ì½ê¤¬·è¤Þ¤ë¥µ¡¼¥Ð¤Î¥¨¥é¡¼¥í¥°¤Ï¡¢°ìÈÖ½ÅÍ×¤Ê¥í¥°¥Õ¥¡¥¤¥ë¤Ç¤¹¡£
-    Apache ¤Î¿ÇÃǾðÊó¤Ï¤³¤³¤ËÁ÷¤é¤ì¡¢¥ê¥¯¥¨¥¹¥È¤ò½èÍý¤·¤Æ¤¤¤ë¤È¤­¤Ë
-    ȯÀ¸¤·¤¿¥¨¥é¡¼¤Ï¤¹¤Ù¤Æ¤³¤³¤Ëµ­Ï¿¤µ¤ì¤Þ¤¹¡£¥µ¡¼¥Ð¤òµ¯Æ°¤·¤¿¤È¤­¤ä¡¢
-    ¥µ¡¼¥Ð¤ÎÆ°ºî¤ËÌäÂ꤬µ¯¤³¤Ã¤¿¤È¤­¤Ï¡¢°ìÈֺǽé¤ËÄ´¤Ù¤ë¤Ù¤­
-    ¤È¤³¤í¤Ç¤¹¡£´Ö°ã¤¤¤Î¾ÜºÙ¤ä½¤ÀµÊýË¡¤¬¤½¤³¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¤³¤È¤¬
-    ¤è¤¯¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>¥¨¥é¡¼¥í¥°¤ÏÉáÄ̤ϥե¡¥¤¥ë¤Ë½ñ¤«¤ì¤Þ¤¹ (Ä̾ï unix ¥·¥¹¥Æ¥à¤Ç¤Ï
-    <code>error_log</code>¡¢Windows ¤È OS/2 ¤Ç¤Ï <code>error.log</code>)¡£
-    Unix ¥·¥¹¥Æ¥à¤Ç¤Ï¥¨¥é¡¼¤ò <code>syslog</code> ¤ä
-    <a href="#piped">¥Ñ¥¤¥×¤Ç¥×¥í¥°¥é¥à¤ËÁ÷¤ë</a> ¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¥¨¥é¡¼¥í¥°¤Î½ñ¼°¤ÏÈæ³ÓŪ¼«Í³Å٤ι⤤¤â¤Î¤Ç¡¢ÀâÌÀŪ¤Ë½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¤¿¤À¤·¡¢¤¤¤¯¤Ä¤«¤Î¾ðÊó¤Ï¤Û¤È¤ó¤É¤Î¥¨¥é¡¼¥í¥°¤Î¥¨¥ó¥È¥ê¤Ë¤¢¤ê¤Þ¤¹¡£
-    Î㤨¤Ð¡¢ÂåɽŪ¤Ê¤â¤Î¤Ë¼¡¤Î¤è¤¦¤Ê¥á¥Ã¥»¡¼¥¸¤¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      [Wed Oct 11 14:32:52 2000] [error] [client 127.0.0.1]
-      client denied by server configuration:
-      /export/home/live/ap/htdocs/test
-    </code></p></div>
-
-    <p>¥í¥°¥¨¥ó¥È¥ê¤ÎºÇ½é¤Î¹àÌܤϥá¥Ã¥»¡¼¥¸¤ÎÆüÉդȻþ¹ï¤Ç¤¹¡£
-    Æó¤Ä¤á¤Î¹àÌܤÏÊó¹ð¤µ¤ì¤Æ¤¤¤ë¥¨¥é¡¼¤Î½ÅÍ×Å٤Ǥ¹¡£
-    <code class="directive"><a href="./mod/core.html#loglevel">LogLevel</a></code> ¤Ç½ÅÍ×Å٤Υì¥Ù¥ë¤ò
-    À©¸Â¤¹¤ë¤³¤È¤Ë¤è¤ê¥¨¥é¡¼¥í¥°¤ËÁ÷¤é¤ì¤ë¥¨¥é¡¼¤Î¼ïÎà¤òÀ©¸æ¤¹¤ë¤³¤È¤¬
-    ¤Ç¤­¤Þ¤¹¡£»°¤ÄÌܤιàÌܤϥ¨¥é¡¼¤òȯÀ¸¤µ¤»¤¿¥¯¥é¥¤¥¢¥ó¥È¤Î IP ¥¢¥É¥ì¥¹
-    ¤Ç¤¹¡£»Ä¤ê¤Ï¥á¥Ã¥»¡¼¥¸¤Ç¡¢¤³¤Î¾ì¹ç¤Ï¥µ¡¼¥Ð¤¬¥¯¥é¥¤¥¢¥ó¥È¤Î¥¢¥¯¥»¥¹¤ò
-    µñÈݤ¹¤ë¤è¤¦¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¡¢¤È¤¤¤¦¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
-    ¥µ¡¼¥Ð¤Ï¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿Ê¸½ñ¤Î (¥¦¥§¥Ö¤Î¥Ñ¥¹¤Ç¤Ï¤Ê¤¯) ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î
-    ¥Ñ¥¹¤òÊó¹ð¤·¤Þ¤¹¡£</p>
-
-    <p>Èó¾ï¤Ë¹­ÈϰϤΥá¥Ã¥»¡¼¥¸¤¬¥¨¥é¡¼¥í¥°¤Ë¸½¤ì¤Þ¤¹¡£¤¿¤¤¤Æ¤¤¤Î¤â¤Î¤Ï
-    ¾å¤ÎÎã¤Î¤è¤¦¤Ê´¶¤¸¤Ç¤¹¡£¥¨¥é¡¼¥í¥°¤Ë¤Ï CGI ¥¹¥¯¥ê¥×¥È¤Î¥Ç¥Ð¥Ã¥°
-    ½ÐÎϤâ½ñ¤«¤ì¤Þ¤¹¡£CGI ¥¹¥¯¥ê¥×¥È¤¬ <code>stderr</code> ¤Ë½ñ¤¤¤¿
-    ¤¹¤Ù¤Æ¤Î¾ðÊó¤ÏľÀÜ¥¨¥é¡¼¥í¥°¤Ë¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>¾ðÊó¤òÄɲä·¤¿¤êºï½ü¤·¤¿¤ê¤·¤Æ¥¨¥é¡¼¥í¥°¤ò¥«¥¹¥¿¥Þ¥¤¥º¤¹¤ë¤³¤È¤Ï
-    ¤Ç¤­¤Þ¤»¤ó¡£¤·¤«¤·¡¢¥ê¥¯¥¨¥¹¥È¤ËÂФ¹¤ë¥¨¥é¡¼¥í¥°¤Î¥¨¥ó¥È¥ê¤Ï¡¢
-    Âбþ¤¹¤ë¥¨¥ó¥È¥ê¤¬<a href="#accesslog">¥¢¥¯¥»¥¹¥í¥°</a>¤Ë¤¢¤ê¤Þ¤¹¡£
-    Î㤨¤Ð¡¢¾å¤ÎÎã¤Î¥¨¥ó¥È¥ê¤Ï¥¢¥¯¥»¥¹¥í¥°¤Î¥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É 403 ¤Î
-    ¥¨¥ó¥È¥ê¤ËÂбþ¤·¤Þ¤¹¡£¥¢¥¯¥»¥¹¥í¥°¤Ï¥«¥¹¥¿¥Þ¥¤¥º²Äǽ¤Ç¤¹¤Î¤Ç¡¢
-    ¤½¤Á¤é¤ò»È¤¦¤³¤È¤Ë¤è¤ê¥¨¥é¡¼¤Î¾õ¶·¤Ë´Ø¤¹¤ë¾ðÊó¤ò¤è¤ê¿¤¯
-    ¼ê¤ËÆþ¤ì¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¥Æ¥¹¥È¤ÎºÇÃæ¤Ï¡¢ÌäÂ꤬ȯÀ¸¤·¤Æ¤¤¤ë¤«¤É¤¦¤«¤ò¸«¤ë¤¿¤á¤Ë¡¢
-    ¾ï¤Ë¥¨¥é¡¼¥í¥°¤ò´Æ»ë¤¹¤ë¤Î¤¬Ìò¤ËΩ¤Ä¾ì¹ç¤¬¤è¤¯¤¢¤ê¤Þ¤¹¡£
-    Unix ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢¼¡¤Î¤â¤Î¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      tail -f error_log
-    </code></p></div>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="accesslog" id="accesslog">¥¢¥¯¥»¥¹¥í¥°</a></h2>
-    
-
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_setenvif.html">mod_setenvif</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code></li></ul></td></tr></table>
-
-    <p>¥µ¡¼¥Ð¥¢¥¯¥»¥¹¥í¥°¤Ï¥µ¡¼¥Ð¤¬½èÍý¤ò¤·¤¿¤¹¤Ù¤Æ¤Î¥ê¥¯¥¨¥¹¥È¤ò
-    µ­Ï¿¤·¤Þ¤¹¡£¥¢¥¯¥»¥¹¥í¥°¤Î¾ì½ê¤ÈÆâÍÆ¤Ï <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê·è¤Þ¤ê¤Þ¤¹¡£¥í¥°¤ÎÆâÍƤÎÁªÂò¤ò´Ê·é¤Ë¤¹¤ë¤¿¤á¤Ë
-    <code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¥»¥¯¥·¥ç¥ó¤Ï¥¢¥¯¥»¥¹¥í¥°¤Ë
-    ¾ðÊó¤òµ­Ï¿¤¹¤ë¤¿¤á¤Î¥µ¡¼¥Ð¤ÎÀßÄêÊýË¡¤òÀâÌÀ¤·¤Þ¤¹¡£</p>
-
-    <p>¤â¤Á¤í¤ó¡¢¥¢¥¯¥»¥¹¥í¥°¤Ë¾ðÊó¤òÃßÀѤ¹¤ë¤³¤È¤Ï¥í¥°´ÉÍý¤Î
-    »Ï¤Þ¤ê¤Ë²á¤®¤Þ¤»¤ó¡£¼¡¤ÎÃʳ¬¤ÏÍ­ÍѤÊÅý·×¤ò¼è¤ë¤¿¤á¤Ë¤³¤Î¾ðÊó¤ò
-    ²òÀϤ¹¤ë¤³¤È¤Ç¤¹¡£°ìÈÌŪ¤Ê¥í¥°²òÀϤϤ³¤Îʸ½ñ¤ÎÈϰϳ°¤Ç¡¢
-    ¥¦¥§¥Ö¥µ¡¼¥Ð¼«¿È¤Î»Å»ö¤È¤¤¤¦¤ï¤±¤Ç¤â¤¢¤ê¤Þ¤»¤ó¡£¤³¤ÎÏä䡢
-    ¥í¥°²òÀϤò¹Ô¤Ê¤¦¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¾ðÊó¤òÆÀ¤ë¤Ë¤Ï¡¢<a href="http://dmoz.org/Computers/Software/Internet/Site_Management/Log_analysis/">
-    Open Directory</a> ¤ä <a href="http://dir.yahoo.com/Computers_and_Internet/Software/Internet/World_Wide_Web/Servers/Log_Analysis_Tools/">
-    Yahoo</a> ¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>¤¤¤í¤ó¤Ê¥Ð¡¼¥¸¥ç¥ó¤Î Apache httpd ¤¬ mod_log_config,
-    mod_log_agent, <code>TransferLog</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È¤¤¤Ã¤¿¡¢
-    ¾¤Î¥â¥¸¥å¡¼¥ë¤ä¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ¥¢¥¯¥»¥¹¤Î¥í¥®¥ó¥°¤ò
-    À©¸æ¤·¤Æ¤­¤Þ¤·¤¿¡£º£¤Ç¤Ï¡¢<code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> ¤¬¤¹¤Ù¤Æ¤Î¸Å¤¤
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Îµ¡Ç½¤ò´Þ¤à¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p>¥¢¥¯¥»¥¹¥í¥°¤Î½ñ¼°¤ÏÈó¾ï¤Ë½ÀÆð¤ÊÀßÄ꤬²Äǽ¤Ç¤¹¡£
-    ½ñ¼°¤Ï C ¤Î printf(1) ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤ËÈó¾ï¤Ë»÷¤¿
-    <code class="directive"><a href="./mod/mod_log_config.html#¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó">¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó</a></code>
-    ¤Ë¤è¤ê»ØÄꤵ¤ì¤Þ¤¹¡£¤¤¤¯¤Ä¤«¼¡¤ÎÀá¤ÇÎã¤ò¼¨¤·¤Þ¤¹¡£
-    ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ë»ÈÍѤǤ­¤ëÆâÍƤΰìÍ÷¤Ï <a href="mod/mod_log_config.html">mod_log_config ¤Îʸ½ñ</a>
-    ¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <h3><a name="common" id="common">Common Log Format</a></h3>
-      
-
-      <p>¥¢¥¯¥»¥¹¥í¥°¤Î¤è¤¯¤¢¤ëÀßÄê¤Ë°Ê²¼¤Î¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£</p>
-
-      <div class="example"><p><code>
-        LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common<br />
-         CustomLog logs/access_log common
-      </code></p></div>
-
-      <p>¤³¤ì¤Ï¡¢<em>¥Ë¥Ã¥¯¥Í¡¼¥à</em> <code>common</code> ¤òÄêµÁ¤·¡¢
-      ¥í¥°¤Î¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Î°ì¤Ä¤È´ØÏ¢ÉÕ¤±¤Þ¤¹¡£¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ï
-      ¥Ñ¡¼¥»¥ó¥È¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤«¤é¤Ê¤ê¡¢¤½¤ì¤¾¤ì¤Î¥Ñ¡¼¥»¥ó¥È¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-      ¥µ¡¼¥Ð¤Ë¤É¤Î¾ðÊó¤ò¥í¥®¥ó¥°¤¹¤ë¤«¤ò»Ø¼¨¤·¤Þ¤¹¡£¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ë
-      ʸ»ú¤ò¤½¤Î¤Þ¤ÞÆþ¤ì¤ë¤³¤È¤â¤Ç¤­¡¢¤½¤ì¤é¤Ï¥í¥°¤Î½ÐÎϤËľÀÜ¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡£
-      ¤½¤³¤Ë°úÍÑʸ»ú (<code>"</code>) ¤ò½ñ¤¯¤È¤­¤Ï¡¢
-      ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤ÎºÇ¸å¤È¤·¤Æ²ò¼á
-      ¤µ¤ì¤ë¤³¤È¤òËɤ°¤¿¤á¤Ë¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤Ç¥¨¥¹¥±¡¼¥×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-      ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ë¤Ï²þ¹ÔÍѤΠ"<code>\n</code>"¡¢¥¿¥ÖÍѤÎ
-      "<code>\t</code>" ¤È¤¤¤¦ÆÃÊ̤ÊÀ©¸æʸ»ú¤â´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-      <p><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-      ´û¤ËÄêµÁ¤µ¤ì¤¿
-      <em>¥Ë¥Ã¥¯¥Í¡¼¥à</em> ¤ò»È¤Ã¤Æ¿·¤·¤¤¥í¥°¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£
-      ¥¢¥¯¥»¥¹¥í¥°¤Î¥Õ¥¡¥¤¥ë̾¤Ï¥¹¥é¥Ã¥·¥å¤Ç»Ï¤Þ¤é¤Ê¤¤¸Â¤ê¡¢
-      <code class="directive"><a href="./mod/core.html#serverroot">ServerRoot</a></code> ¤«¤é¤ÎÁêÂХѥ¹¤È¤·¤Æ
-      °·¤ï¤ì¤Þ¤¹¡£</p>
-
-      <p>¾å¤ÎÀßÄê¤Ï Common Log Format (CLF) ¤È¸Æ¤Ð¤ì¤ë·Á¼°¤Ç
-      ¥í¥°¥¨¥ó¥È¥ê¤ò½ñ¤­¤Þ¤¹¡£¤³¤Îɸ½à¤Î·Á¼°¤Ï°Û¤Ê¤ë¥¦¥§¥Ö¥µ¡¼¥Ð¤Î¿¤¯¤¬
-      À¸À®¤¹¤ë¤³¤È¤¬¤Ç¤­¡¢Â¿¤¯¤Î¥í¥°²òÀÏ¥×¥í¥°¥é¥à¤¬Æɤߤ³¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      CLF ¤Ë¤è¤êÀ¸À®¤µ¤ì¤¿¥í¥°¥Õ¥¡¥¤¥ë¤Î¥¨¥ó¥È¥ê¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹:</p>
-
-      <div class="example"><p><code>
-        127.0.0.1 - frank [10/Oct/2000:13:55:36 -0700] "GET
-        /apache_pb.gif HTTP/1.0" 200 2326
-      </code></p></div>
-
-      <p>¤³¤Î¥í¥°¥¨¥ó¥È¥ê¤Î¤½¤ì¤¾¤ì¤ÎÉôʬ¤Î°ÕÌ£¤Ï°Ê²¼¤ÇÀâÌÀ¤·¤Þ¤¹¡£</p>
-
-      <dl>
-	<dt><code>127.0.0.1</code> (<code>%h</code>)</dt>
-
-	<dd>¤³¤ì¤Ï¥µ¡¼¥Ð¤Ø¥ê¥¯¥¨¥¹¥È¤ò¤·¤¿¥¯¥é¥¤¥¢¥ó¥È (¥ê¥â¡¼¥È¥Û¥¹¥È)
-	¤Î IP ¥¢¥É¥ì¥¹¤Ç¤¹¡£<code class="directive"><a href="./mod/core.html#hostnamelookups">HostnameLookups</a></code> ¤¬
-	<code>On</code> ¤Î¾ì¹ç¤Ï¡¢¥µ¡¼¥Ð¤Ï¥Û¥¹¥È̾¤òÄ´¤Ù¤Æ¡¢
-	IP ¥¢¥É¥ì¥¹¤¬½ñ¤«¤ì¤Æ¤¤¤ë¤È¤³¤í¤Ëµ­Ï¿¤·¤Þ¤¹¡£¤·¤«¤·¡¢¤³¤ÎÀßÄê¤Ï
-	¥µ¡¼¥Ð¤ò¤«¤Ê¤êÃÙ¤¯¤¹¤ë¤Î¤Ç¡¢¤¢¤Þ¤ê¤ª´«¤á¤Ç¤­¤Þ¤»¤ó¡£
-	¤½¤¦¤Ç¤Ï¤Ê¤¯¡¢<code class="program"><a href="./programs/logresolve.html">logresolve</a></code> ¤Î
-	¤è¤¦¤Ê¥í¥°¤Î¸å½èÍý¤ò¹Ô¤Ê¤¦¥×¥í¥°¥é¥à¤Ç¥Û¥¹¥È̾¤òÄ´¤Ù¤ë¤Î¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£
-	¤³¤³¤ËÊó¹ð¤µ¤ì¤ë IP ¥¢¥É¥ì¥¹¤Ïɬ¤º¤·¤â¥æ¡¼¥¶¤¬»È¤Ã¤Æ¤¤¤ë¥Þ¥·¥ó¤Î
-	¤â¤Î¤Ç¤¢¤ë¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£¥æ¡¼¥¶¤È¥µ¡¼¥Ð¤Î´Ö¤Ë¥×¥í¥­¥·¥µ¡¼¥Ð¤¬
-	¤¢¤ì¤Ð¡¢¤³¤Î¥¢¥É¥ì¥¹¤Ï¸µ¤Î¥Þ¥·¥ó¤Î¤â¤Î¤Ç¤Ï¤Ê¤¯¡¢¥×¥í¥­¥·¤Î
-	¥¢¥É¥ì¥¹¤Ë¤Ê¤ê¤Þ¤¹¡£</dd>
-
-	<dt><code>-</code> (<code>%l</code>)</dt>
-
-	<dd>½ÐÎÏÃæ¤Î¡Ö¥Ï¥¤¥Õ¥ó¡×¤ÏÍ׵ᤵ¤ì¤¿¾ðÊ󤬼ê¤ËÆþ¤é¤Ê¤«¤Ã¤¿¤È¤¤¤¦¤³¤È¤ò
-	°ÕÌ£¤·¤Þ¤¹¡£¤³¤Î¾ì¹ç¡¢¼èÆÀ¤Ç¤­¤Ê¤«¤Ã¤¿¾ðÊó¤Ï¥¯¥é¥¤¥¢¥ó¥È¤Î¥Þ¥·¥ó¤Î
-	<code>identd</code> ¤Ë¤è¤ê·è¤Þ¤ë RFC 1413 ¤Î¥¯¥é¥¤¥¢¥ó¥È¤Î
-	¥¢¥¤¥Ç¥ó¥Æ¥£¥Æ¥£¤Ç¤¹¡£¤³¤Î¾ðÊó¤Ï¤¢¤Þ¤ê¿®ÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤º¡¢
-	¤·¤Ã¤«¤ê¤È´ÉÍý¤µ¤ì¤¿ÆâÉô¥Í¥Ã¥È¥ï¡¼¥¯¤ò½ü¤¤¤Æ¤Ï»È¤¦¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-	Apache ¤Ï <code class="directive"><a href="./mod/core.html#identitycheck">IdentityCheck</a></code> ¤¬
-	<code>On</code> ¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤¤¸Â¤ê¡¢¤³¤Î¾ðÊó¤òÆÀ¤è¤¦¤È¤¹¤é¤·¤Þ¤»¤ó¡£</dd>
-
-	<dt><code>frank</code> (<code>%u</code>)</dt>
-
-	<dd>¤³¤ì¤Ï HTTP ǧ¾Ú¤Ë¤è¤ë¡¢¥É¥­¥å¥á¥ó¥È¤ò¥ê¥¯¥¨¥¹¥È¤·¤¿¿Í¤Î
-	¥æ¡¼¥¶ ID ¤Ç¤¹¡£CGI ¥¹¥¯¥ê¥×¥È¤Ë¤ÏÄ̾ïƱ¤¸Ãͤ¬ <code>REMOTE_USER</code>
-	´Ä¶­ÊÑ¿ô¤È¤·¤ÆÍ¿¤¨¤é¤ì¤Þ¤¹¡£¥ê¥¯¥¨¥¹¥È¤Î¥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É
-	(°Ê²¼¤ò»²¾È) ¤¬ 401 ¤Ç¤¢¤Ã¤¿¾ì¹ç¤Ï¡¢¥æ¡¼¥¶¤Ïǧ¾Ú¤Ë¼ºÇÔ¤·¤Æ¤¤¤ë¤Î¤Ç¡¢
-	¤³¤ÎÃͤϿ®ÍѤǤ­¤Þ¤»¤ó¡£¥É¥­¥å¥á¥ó¥È¤¬¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ì¤Æ¤¤¤Ê¤¤
-	¾ì¹ç¤Ï¡¢¤³¤Î¥¨¥ó¥È¥ê¤ÏÁ°¤Î¤â¤Î¤ÈƱ¤¸¤è¤¦¤Ë "<code>-</code>" ¤Ë
-	¤Ê¤ê¤Þ¤¹¡£</dd>
-
-	<dt><code>[10/Oct/2000:13:55:36 -0700]</code>
-	(<code>%t</code>)</dt>
-
-	<dd>
-	  ¥µ¡¼¥Ð¤¬¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¼è¤Ã¤¿»þ¹ï¤Ç¤¹¡£½ñ¼°¤Ï:
-
-	    <p class="indent">
-	      <code>[day/month/year:hour:minute:second zone]<br />
-	       day = 2*digit<br />
-	       month = 3*letter<br />
-	       year = 4*digit<br />
-	       hour = 2*digit<br />
-	       minute = 2*digit<br />
-	       second = 2*digit<br />
-	       zone = (`+' | `-') 4*digit</code>
-	    </p>
-	  ¥í¥°¤Î¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ë <code>%{format}t</code> ¤ò
-	  »ØÄꤹ¤ë¤³¤È¤Ç¡¢Ê̤ηÁ¼°¤Ç»þ¹ï¤òɽ¼¨¤µ¤»¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-	  ¤³¤Î¤È¤­¡¢<code>format</code> ¤Ï C ¤Îɸ½à¥é¥¤¥Ö¥é¥ê¤Î
-	  <code>strftime(3)</code> ¤Î·Á¼°¤Ë¤Ê¤ê¤Þ¤¹¡£
-	</dd>
-
-	<dt><code>"GET /apache_pb.gif HTTP/1.0"</code>
-	(<code>\"%r\"</code>)</dt>
-
-	<dd>¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î¥ê¥¯¥¨¥¹¥È¤¬Æó½Å°úÍÑÉä¤ÎÃæ¤Ë¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-	¥ê¥¯¥¨¥¹¥È¤Ë¤Ï¿¤¯¤ÎÍ­ÍѤʾðÊ󤬤¢¤ê¤Þ¤¹¡£¤Þ¤º¡¢¤³¤Î¾ì¹ç¥¯¥é¥¤¥¢¥ó¥È¤¬
-	»È¤Ã¤¿¥á¥½¥Ã¥É¤Ï <code>GET</code> ¤Ç¤¹¡£¼¡¤Ë¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ï
-	¥ê¥½¡¼¥¹ <code>/apache_pb.gif</code> ¤òÍ׵ᤷ¤Þ¤·¤¿¡£¤½¤·¤Æ¡¢
-	¥¯¥é¥¤¥¢¥ó¥È¤Ï¥×¥í¥È¥³¥ë <code>HTTP/1.0</code> ¤ò»ÈÍѤ·¤Þ¤·¤¿¡£
-	¥ê¥¯¥¨¥¹¥È¤Î³ÆÉôʬ¤òÆÈΩ¤Ë¥í¥°¼ý½¸¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£Î㤨¤Ð¡¢
-	¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó "<code>%m %U%q %H</code>" ¤Ï
-	¥á¥½¥Ã¥É¡¢¥Ñ¥¹¡¢¥¯¥¨¥êʸ»úÎó¡¢¥×¥í¥È¥³¥ë¤ò¥í¥°¼ý½¸¤·¡¢
-	·ë¶É "<code>%r</code>" ¤È¤Þ¤Ã¤¿¤¯Æ±¤¸½ÐÎϤˤʤê¤Þ¤¹¡£</dd>
-
-	<dt><code>200</code> (<code>%&gt;s</code>)</dt>
-
-	<dd>¥µ¡¼¥Ð¤¬¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤êÊÖ¤¹¥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É¤Ç¤¹¡£
-	¤³¤Î¾ðÊó¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤¬À®¸ù±þÅú (2 ¤Ç»Ï¤Þ¤ë¥³¡¼¥É) ¤Ç¤¢¤Ã¤¿¤«¡¢
-	¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó (3 ¤Ç»Ï¤Þ¤ë¥³¡¼¥É) ¤Ç¤¢¤Ã¤¿¤«¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ë¤è¤ë
-	¥¨¥é¡¼ (4 ¤Ç»Ï¤Þ¤ë¥³¡¼¥É) ¤Ç¤¢¤Ã¤¿¤«¡¢¥µ¡¼¥Ð¤Î¥¨¥é¡¼ (5 ¤Ç»Ï¤Þ¤ë¥³¡¼¥É)
-	¤Ç¤¢¤Ã¤¿¤«¡¢¤òɽ¤¹¤Î¤Ç¡¢Èó¾ï¤ËÂçÀڤǤ¹¡£¥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É¤Î
-	´°Á´¤Ê¥ê¥¹¥È¤Ï <a href="http://www.w3.org/Protocols/rfc2616/rfc2616.txt">HTTP
-	µ¬³Ê</a> (RFC2616 Âè 10 Àá) ¤Ë¤¢¤ê¤Þ¤¹¡£</dd>
-
-	<dt><code>2326</code> (<code>%b</code>)</dt>
-
-	<dd>¤³¤ÎºÇ¸å¤Î¥¨¥ó¥È¥ê¤Ï¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¿®¤µ¤ì¤¿¥ª¥Ö¥¸¥§¥¯¥È¤Î¡¢
-	±þÅú¥Ø¥Ã¥À¤ò½ü¤¤¤¿¥µ¥¤¥º¤òɽ¤·¤Þ¤¹¡£¥³¥ó¥Æ¥ó¥È¤¬¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤é¤ì¤Ê¤«¤Ã¤¿
-	¾ì¹ç¤Ï¡¢¤³¤ÎÃÍ¤Ï "<code>-</code>" ¤Ë¤Ê¤ê¤Þ¤¹¡£¥³¥ó¥Æ¥ó¥È¤¬Ìµ¤¤¾ì¹ç¤Ë
-	"<code>0</code>" ¤ò¥í¥°¼ý½¸¤¹¤ë¤Ë¤Ï¡¢<code>%b</code> ¤Ç¤Ï¤Ê¤¯
-	<code>%B</code> ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</dd>
-
-      </dl>
-    
-
-    <h3><a name="combined" id="combined">Combined Log Format</a></h3>
-      
-
-      <p>¤â¤¦°ì¤Ä¤Î¤è¤¯»È¤ï¤ì¤ë½ñ¼°¤Ï Combined Log Format ¤È¸Æ¤Ð¤ì¤Æ¤¤¤Þ¤¹¡£
-      °Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-      <div class="example"><p><code>
-        LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\"
-        \"%{User-agent}i\"" combined<br />
-         CustomLog log/access_log combined
-      </code></p></div>
-
-      <p>¤³¤Î½ñ¼°¤ÎºÇ½é¤ÎÊý¤Ï Common Log Format ¤È¤Þ¤Ã¤¿¤¯Æ±¤¸¤Ç¡¢ºÇ¸å¤Ë
-      Æó¤ÄÄɲäΥ¨¥ó¥È¥ê¤¬¤¢¤ê¤Þ¤¹¡£ÄɲäΥ¨¥ó¥È¥ê¤Ï¥Ñ¡¼¥»¥ó¥È¥Ç¥£¥ì¥¯¥Æ¥£¥Ö
-      <code>%{<em>header</em>}i</code> ¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£¤³¤³¤Ç
-      <em>header</em> ¤Ï HTTP ¤Î¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤Î¤É¤ì¤«¤Ç¤¹¡£¤³¤Î½ñ¼°¤Ë¤è¤ë
-      ¥¢¥¯¥»¥¹¥í¥°¤Ï°Ê²¼¤Î¤è¤¦¤Ê´¶¤¸¤Ë¤Ê¤ê¤Þ¤¹:</p>
-
-      <div class="example"><p><code>
-        127.0.0.1 - frank [10/Oct/2000:13:55:36 -0700] "GET
-        /apache_pb.gif HTTP/1.0" 200 2326
-        "http://www.example.com/start.html" "Mozilla/4.08 [en]
-        (Win98; I ;Nav)"
-      </code></p></div>
-
-      <p>ÄɲäΥ¨¥ó¥È¥ê¤Ï:</p>
-
-      <dl>
-	<dt><code>"http://www.example.com/start.html"</code>
-	(<code>\"%{Referer}i\"</code>)</dt>
-
-	<dd>"Referer" (°Õ¿ÞŪ¤ÊÄÖ¤ê´Ö°ã¤¤) HTTP ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤Ç¤¹¡£
-	¤³¤ì¤Ï¥¯¥é¥¤¥¢¥ó¥È¤¬Êó¹ð¤·¤Æ¤¯¤ë»²¾È¸µ¤Î¥µ¥¤¥È¤òɽ¤·¤Þ¤¹¡£
-	(¤³¤Î¾ì¹ç¤Ï¡¢<code>/apache_pb.gif</code> ¤Ë¥ê¥ó¥¯¤·¤Æ¤¤¤ë¤«¡¢
-	¤½¤ì¤ò´Þ¤ó¤Ç¤¤¤ë¥Ú¡¼¥¸¤Ç¤¹)¡£</dd>
-
-	<dt><code>"Mozilla/4.08 [en] (Win98; I ;Nav)"</code>
-	(<code>\"%{User-agent}i\"</code>)</dt>
-
-	<dd>User-Agent HTTP ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤Ç¤¹¡£¤³¤ì¤Ï¥¯¥é¥¤¥¢¥ó¥È¤Î¥Ö¥é¥¦¥¶¤¬
-	¼«Ê¬¼«¿È¤Î¤³¤È¤òÊó¹ð¤·¤Æ¤¯¤ë¾ðÊó¤Ç¤¹¡£</dd>
-      </dl>
-    
-
-    <h3><a name="multiple" id="multiple">Ê£¿ô¤Î¥¢¥¯¥»¥¹¥í¥°</a></h3>
-      
-
-    <p>Ê£¿ô¤Î¥¢¥¯¥»¥¹¥í¥°¤Ïñ¤ËÀßÄê¥Õ¥¡¥¤¥ë¤ËÊ£¿ô¤Î <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò½ñ¤¯¤³¤È¤ÇºîÀ®¤µ¤ì¤Þ¤¹¡£Î㤨¤Ð¡¢°Ê²¼¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    »°¤Ä¤Î¥¢¥¯¥»¥¹¥í¥°¤òºî¤ê¤Þ¤¹¡£ºÇ½é¤Î¤â¤Î¤Ï´ðËÜŪ¤Ê CLF ¤Î¾ðÊó¤Ç¡¢
-    Æó¤ÄÌܤȻ°¤ÄÌÜ¤Ï referer ¤È¥Ö¥é¥¦¥¶¤Î¾ðÊó¤Ç¤¹¡£ºÇ¸åÆó¤Ä¤Î
-    <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> ¤Ï
-    <code>ReferLog</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    <code>AgentLog</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¸ú²Ì¤ò¤Þ¤Í¤ëÊýË¡¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£</p>
-
-      <div class="example"><p><code>
-        LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common<br />
-        CustomLog logs/access_log common<br />
-        CustomLog logs/referer_log "%{Referer}i -&gt; %U"<br />
-        CustomLog logs/agent_log "%{User-agent}i"
-      </code></p></div>
-
-    <p>¤³¤ÎÎã¤Ï <code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code> ¤Ç
-    ¥Ë¥Ã¥¯¥Í¡¼¥à¤òÄêµÁ¤¹¤ëɬÍפ¬¤Ê¤¤¡¢
-    ¤È¤¤¤¦¤³¤È¤â¼¨¤·¤Æ¤¤¤Þ¤¹¡£¥Ë¥Ã¥¯¥Í¡¼¥à¤ÎÂå¤ï¤ê¤Ë¡¢
-    <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë
-    ľÀÜ¥í¥°¤Î½ñ¼°¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-    
-
-    <h3><a name="conditional" id="conditional">¾ò·ïÉÕ¤­¥í¥°</a></h3>
-      
-
-    <p>¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¥¯¥¨¥¹¥È¤ÎÆÃħ¤Ë´ð¤Å¤¤¤Æ¥¢¥¯¥»¥¹¥í¥°¤Ë¥¨¥ó¥È¥ê¤Î
-    °ìÉô¤ò¥í¥®¥ó¥°¤·¤Ê¤¤Êý¤¬ÊØÍø¤Ê¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤Ï <a href="env.html">´Ä¶­ÊÑ¿ô</a> ¤ÎÊä½õ¤Ë¤è¤ê´Êñ¤Ë¼Â¸½¤Ç¤­¤Þ¤¹¡£¤Þ¤º¡¢
-    ¥ê¥¯¥¨¥¹¥È¤¬²¿¤é¤«¤Î¾ò·ï¤Ë¹ç¤¦¤È¤¤¤¦¤³¤È¤òɽ¤¹¤¿¤á¤Ë´Ä¶­ÊÑ¿ô¤¬
-    ÀßÄꤵ¤ì¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤ÏÄ̾ï¤Ï <code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code> ¤Ë¤è¤ê
-    ¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£¤½¤·¤Æ¡¢<code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-    <code>env=</code> Àá¤ò»È¤Ã¤Æ´Ä¶­ÊÑ¿ô¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¥ê¥¯¥¨¥¹¥È¤ò
-    ´Þ¤á¤¿¤êÇÓ½ü¤·¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¤¤¯¤Ä¤«Îã¤òµó¤²¤Þ¤¹:</p>
-
-      <div class="example"><p><code>
-        # Mark requests from the loop-back interface<br />
-        SetEnvIf Remote_Addr "127\.0\.0\.1" dontlog<br />
-        # Mark requests for the robots.txt file<br />
-        SetEnvIf Request_URI "^/robots\.txt$" dontlog<br />
-        # Log what remains<br />
-        CustomLog logs/access_log common env=!dontlog
-      </code></p></div>
-
-    <p>¾¤ÎÎã¤È¤·¤Æ¡¢±Ñ¸ì¤òÏ乿ͤ«¤é¤Î¥ê¥¯¥¨¥¹¥È¤È¤½¤ì°Ê³°¤Î¿Í¤«¤é¤Î¥ê¥¯¥¨¥¹¥È¤ò
-    ʬ¤±¤¿¤¤¡¢¤È¤¤¤¦¾ì¹ç¤ò¹Í¤¨¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-      <div class="example"><p><code>
-        SetEnvIf Accept-Language "en" english<br />
-        CustomLog logs/english_log common env=english<br />
-        CustomLog logs/non_english_log common env=!english
-      </code></p></div>
-
-    <p>¤³¤³¤Þ¤Ç¤Ç¤Ï¾ò·ïÉÕ¤­¥í¥®¥ó¥°¤¬Èó¾ï¤Ë¶¯ÎϤǽÀÆð¤Ç¤¢¤ë¤³¤È¤ò¼¨¤·¤Æ¤­¤Þ¤·¤¿¤¬¡¢
-    ¤½¤ì¤¬¥í¥°¤ÎÆâÍƤòÀ©¸æ¤¹¤ëÍ£°ì¤ÎÊýË¡¤È¤¤¤¦¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¥í¥°¥Õ¥¡¥¤¥ë¤Ï
-    ¥µ¡¼¥Ð¤Î³èÆ°¤Î´°Á´¤Êµ­Ï¿¤Ç¤¢¤ëÊý¤¬¤è¤êÌò¤ËΩ¤Á¤Þ¤¹¡£Ã±½ã¤Ë¥í¥°¥Õ¥¡¥¤¥ë¤ò
-    ¸å½èÍý¤·¤Æ¡¢¹Íθ¤·¤¿¤¯¤Ê¤¤¥í¥°¤òºï½ü¤¹¤ëÊý¤¬´Êñ¤Ç¤¢¤ë¤³¤È¤¬¤è¤¯¤¢¤ê¤Þ¤¹¡£</p>
-    
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="rotation" id="rotation">¥í¥°¤Î¸òÂØ</a></h2>
-    
-
-    <p>ÉáÄ̤ÎÉé²Ù¤Î¥µ¡¼¥Ð¤Ç¤µ¤¨¡¢¥í¥°¥Õ¥¡¥¤¥ë¤ËÊݸ¤µ¤ì¤ë¾ðÊó¤ÎÎ̤Ï
-    ËÄÂç¤Ë¤Ê¤ê¤Þ¤¹¡£¥¢¥¯¥»¥¹¥í¥°¤Î¥Õ¥¡¥¤¥ë¤ÏÉáÄÌ 10,000 ¥ê¥¯¥¨¥¹¥ÈËè¤Ë
-    1 MB °Ê¾åÁý¤¨¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢´û¸¤Î¥í¥°¤ò°ÜÆ°¤·¤¿¤ê¡¢ºï½ü¤·¤¿¤ê¤·¤Æ¡¢
-    Äê´üŪ¤Ë¥í¥°¤ò¸òÂؤµ¤»¤ë¤³¤È¤¬É¬Íפˤʤê¤Þ¤¹¡£¤³¤ì¤Ï¥µ¡¼¥Ð¤Î¼Â¹ÔÃæ¤Ë¤Ï
-    ¹Ô¤Ê¤¨¤Þ¤»¤ó¡£¤È¤¤¤¦¤Î¤Ï¡¢Apache ¤Ï¥Õ¥¡¥¤¥ë¤¬ open ¤µ¤ì¤Æ¤¤¤ë´Ö¤Ï
-    ¤º¤Ã¤È¸Å¤¤¥í¥°¥Õ¥¡¥¤¥ë¤Ë½ñ¤­Â³¤±¤ë¤«¤é¤Ç¤¹¡£
-    ¿·¤·¤¤¥í¥°¥Õ¥¡¥¤¥ë¤ò open ¤Ç¤­¤ë¤è¤¦¤Ë¡¢¥í¥°¥Õ¥¡¥¤¥ë¤¬°ÜÆ°¤µ¤ì¤¿¤ê
-    ºï½ü¤µ¤ì¤¿¸å¤Ë¡¢¥µ¡¼¥Ð¤ò<a href="stopping.html">ºÆµ¯Æ°</a>¤¹¤ë
-    ɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p><em>Í¥²í¤Ê</em> ºÆµ¯Æ°¤ò¹Ô¤Ê¤¦¤³¤È¤Ç¡¢¥µ¡¼¥Ð¤Ï´û¸¤Î¥³¥Í¥¯¥·¥ç¥ó¤ä
-    ½èÍýÂÔ¤Á¤Î¥³¥Í¥¯¥·¥ç¥ó¤ò¼º¤¦¤³¤È¤Ê¤¯¿·¤·¤¤¥í¥°¥Õ¥¡¥¤¥ë¤ò open ¤µ¤»¤ë
-    ¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤·¤«¤·¡¢¤³¤ì¤ò¼Â¸½¤¹¤ë¤¿¤á¤Ë¡¢¥µ¡¼¥Ð¤Ï¸Å¤¤¥ê¥¯¥¨¥¹¥È¤ò
-    °·¤Ã¤Æ¤¤¤ë´Ö¤Ï¸Å¤¤¥í¥°¥Õ¥¡¥¤¥ë¤Ë½ñ¤­Â³¤±¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤Ç¤¹¤«¤é¡¢ºÆµ¯Æ°¤Î¸å¤Ç¤Ï¥í¥°¥Õ¥¡¥¤¥ë¤Î½èÍý¤ò»Ï¤á¤ëÁ°¤Ë¡¢¤·¤Ð¤é¤¯ÂÔ¤¿¤Ê¤±¤ì¤Ð
-    ¤Ê¤ê¤Þ¤»¤ó¡£Ã±¤Ë¥í¥°¤ò¸òÂؤµ¤»¤Æ¡¢¥Ç¥£¥¹¥¯¤ÎÀáÌó¤Î¤¿¤á¤Ë¸Å¤¤¥í¥°¤ò
-    °µ½Ì¤¹¤ëÉáÄ̤Υ·¥Ê¥ê¥ª¤Ï:</p>
-
-    <div class="example"><p><code>
-      mv access_log access_log.old<br />
-      mv error_log error_log.old<br />
-      apachectl graceful<br />
-      sleep 600<br />
-      gzip access_log.old error_log.old
-    </code></p></div>
-
-    <p>¥í¥°¤Î¸òÂؤò¤¹¤ë¤â¤¦°ì¤Ä¤ÎÊýË¡¤Ï<a href="#piped">¥Ñ¥¤¥×·Ðͳ¤Î¥í¥°</a>¤ò»È¤¦¤â¤Î¤Ç¡¢¼¡¤ÎÀá¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="piped" id="piped">¥Ñ¥¤¥×·Ðͳ¤Î¥í¥°</a></h2>
-    
-
-    <p>Apache httpd ¤Ï¥¨¥é¡¼¥í¥°¤È¥¢¥¯¥»¥¹¥í¥°¤ò¥Õ¥¡¥¤¥ë¤ËľÀܽñ¤¯Âå¤ï¤ê¤Ë¡¢
-    ¥Ñ¥¤¥×¤òÄ̤·¤ÆÊÌ¤Î¥×¥í¥°¥é¥à¤Ë½ñ¤­½Ð¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤³¤Îµ¡Ç½¤Ë¤è¤ê¡¢¼ç¥µ¡¼¥Ð¤Ë¥³¡¼¥É¤òÄɲ乤뤳¤È¤Ê¤¯
-    ¥í¥®¥ó¥°¤Î½ÀÆðÀ­¤¬Èó¾ï¤Ë¹â¤Þ¤Ã¤Æ¤¤¤Þ¤¹¡£¥Ñ¥¤¥×¤Ë¥í¥°¤ò½ñ¤¯¤¿¤á¤Ë¤Ï¡¢
-    ñ¤Ë¥Õ¥¡¥¤¥ë̾¤ò¥Ñ¥¤¥×ʸ»ú "<code>|</code>" ¤ËÃÖ¤­´¹¤¨¡¢¤½¤Î³¤­¤Ë
-    ɸ½àÆþÎϤ«¤é¥í¥°¤Î¥¨¥ó¥È¥ê¤ò¼õ¤±¤È¤ë¼Â¹Ô¥×¥í¥°¥é¥à¤Î̾Á°¤ò½ñ¤¯¤À¤±¤Ç¤¹¡£
-    Apache ¤Ï¥Ñ¥¤¥×·Ðͳ¤Î¥í¥°ÍÑ¤Î¥×¥í¥»¥¹¤ò¥µ¡¼¥Ð¤Îµ¯Æ°»þ¤Ë¼Â¹Ô¤·¡¢
-    ¥µ¡¼¥Ð¤Î¼Â¹ÔÃæ¤Ë¤½¤Î¥×¥í¥°¥é¥à¤¬¥¯¥é¥Ã¥·¥å¤·¤¿¤È¤­¤Ï¤½¤ì¤òºÆ¤Ó
-    ¼Â¹Ô¤·¤Þ¤¹¡£(¤³¤ÎºÇ¸å¤Îµ¡Ç½¤¬¤³¤Îµ»½Ñ¤¬¡Ö¿®ÍêÀ­¤Î¤¢¤ë¥Ñ¥¤¥×·Ðͳ¤Î¥í¥®¥ó¥°¡×
-    ¤È¸Æ¤Ð¤ì¤Æ¤¤¤ëÍýͳ¤Ç¤¹¡£)</p>
-
-    <p>¥Ñ¥¤¥×·Ðͳ¤Î¥í¥°ÍÑ¤Î¥×¥í¥»¥¹¤Ï Apache httpd ¤Î¿Æ¥×¥í¥»¥¹¤«¤éµ¯Æ°¤µ¤ì¡¢
-    ¤½¤Î¥×¥í¥»¥¹¤Î¥æ¡¼¥¶ ID ¤ò·Ñ¾µ¤·¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥Ñ¥¤¥×·Ðͳ¤Î¥í¥°ÍѤÎ
-    ¥×¥í¥°¥é¥à¤ÏÉáÄÌ root ¤È¤·¤Æ¼Â¹Ô¤µ¤ì¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
-    ¤Ç¤¹¤«¤é¡¢¥×¥í¥°¥é¥à¤ò´Êñ¤Ç°ÂÁ´¤ËÊݤĤ³¤È¤¬Èó¾ï¤Ë½ÅÍפǤ¹¡£</p>
-
-    <p>¥Ñ¥¤¥×·Ðͳ¤Î¥í¥°¤Î½ÅÍפÊÍøÍÑË¡¤Ï¡¢¥µ¡¼¥Ð¤ÎºÆµ¯Æ°¤Ê¤·¤Ç¥í¥°¤Î¸òÂؤò
-    ¤¹¤ë¤³¤È¤Ç¤¹¡£Apache HTTP ¥µ¡¼¥Ð¤Ë¤Ï¤³¤Î¤¿¤á¤Î  <code class="program"><a href="./programs/rotatelogs.html">rotatelogs</a></code> ¤È¸Æ¤Ð¤ì¤ë´Êñ¤Ê
-    ¥×¥í¥°¥é¥à¤¬ÉÕ°¤·¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢24 »þ´ÖËè¤Ë¥í¥°¤ò¸òÂؤµ¤»¤ë¤Ë¤Ï¡¢
-    °Ê²¼¤Î¤â¤Î¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      CustomLog "|/usr/local/apache/bin/rotatelogs
-      /var/log/access_log 86400" common
-    </code></p></div>
-
-    <p>¥Ñ¥¤¥×¤ÎÀè¤Ç¸Æ¤Ð¤ì¤ë¥³¥Þ¥ó¥ÉÁ´ÂΤ¬°úÍÑÉä¤Ç°Ï¤Þ¤ì¤Æ¤¤¤ë¤³¤È¤ËÃíÌܤ·¤Æ
-    ¤¯¤À¤µ¤¤¡£¤³¤ÎÎã¤Ï¥¢¥¯¥»¥¹¥í¥°¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¤¬¡¢¥¨¥é¡¼¥í¥°¤Ë¤âƱ¤¸µ»½Ñ¤ò
-    »È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>»÷¤Æ¤¤¤ë¤±¤ì¤É¡¢¤è¤ê¤º¤Ã¤È½ÀÆð¤Ê
-    <a href="http://www.cronolog.org/">cronolog</a> ¤È¤¤¤¦¥í¥°¸òÂØÍѤÎ
-    ¥×¥í¥°¥é¥à¤¬³°Éô¤Î¥µ¥¤¥È¤Ë¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>¾ò·ïÉÕ¤­¥í¥®¥ó¥°¤ÈƱÍÍ¡¢¥Ñ¥¤¥×·Ðͳ¤Î¥í¥°¤ÏÈó¾ï¤Ë¶¯ÎϤÊ
-    Æ»¶ñ¤Ç¤¹¤¬¡¢¥ª¥Õ¥é¥¤¥ó¤Î¸å½èÍý¤Î¤è¤¦¤Ê¡¢¤è¤ê´Êñ¤Ê²ò·èÊýË¡¤¬¤¢¤ë¤È¤­¤Ï
-    »È¤ï¤Ê¤¤Êý¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="virtualhosts" id="virtualhosts">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></h2>
-    
-
-    <p>¿¤¯¤Î <a href="vhosts/">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a> ¤Î¤¢¤ë¥µ¡¼¥Ð¤ò¼Â¹Ô¤·¤Æ¤¤¤ë
-    ¤È¤­¤Ï¡¢¥í¥°¥Õ¥¡¥¤¥ë¤Î°·¤¤Êý¤Ë¤¤¤¯¤Ä¤«¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£
-    ¤Þ¤º¡¢Ã±ÆȤΥۥ¹¥È¤Î¤ß¤Î¥µ¡¼¥Ð¤È¤Þ¤Ã¤¿¤¯Æ±¤¸¤è¤¦¤Ë¥í¥°¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¥í¥®¥ó¥°¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¼ç¥µ¡¼¥Ð¤Î¥³¥ó¥Æ¥­¥¹¥È¤Î
-    <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤Î³°¤ËÃÖ¤¯¤³¤È¤Ç¡¢
-    ¤¹¤Ù¤Æ¤Î¥í¥°¤òƱ¤¸¥¢¥¯¥»¥¹¥í¥°¤È¥¨¥é¡¼¥í¥°¤Ë¥í¥°¼ý½¸¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤³¤Î¼êË¡¤Ç¤Ï¸Ä¡¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎÅý·×¤ò´Êñ¤Ë¤È¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£</p>
-
-    <p><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> ¤ä
-    <code class="directive"><a href="./mod/mod_log_config.html#errorlog">ErrorLog</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬
-    <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> ¤ÎÃæ¤Ë
-    ÃÖ¤«¤ì¤¿¾ì¹ç¤Ï¡¢¤½¤Î¥Ð¡¼¥Á¥ã¥ë
-    ¥Û¥¹¥È¤Ø¤Î¤¹¤Ù¤Æ¤Î¥ê¥¯¥¨¥¹¥È¤ä¥¨¥é¡¼¤¬¤½¤³¤Ç»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ë¤Î¤ß
-    ¥í¥°¼ý½¸¤µ¤ì¤Þ¤¹¡£¥í¥®¥ó¥°¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¤Ê¤¤¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ï
-    °ÍÁ³¤È¤·¤Æ¥ê¥¯¥¨¥¹¥È¤¬¼ç¥µ¡¼¥Ð¤Î¥í¥°¤ËÁ÷¤é¤ì¤Þ¤¹¡£¤³¤Î¼êË¡¤Ï¾¯¤Ê¤¤
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ËÂФ·¤Æ¤ÏÈó¾ï¤ËÍ­ÍѤǤ¹¤¬¡¢¥Û¥¹¥È¤Î¿ô¤¬Èó¾ï¤Ë¿¤¯¤Ê¤ë¤È
-    ´ÉÍý¤¬ÂçÊѤˤʤê¤Þ¤¹¡£¤µ¤é¤Ë¡¢<a href="vhosts/fd-limits.html">¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Î¸Â³¦</a>¤ÎÌäÂê¤òµ¯¤³¤¹¤³¤È¤¬
-    ¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>¥¢¥¯¥»¥¹¥í¥°¤Ë¤Ï¡¢Èó¾ï¤ËÎɤ¤ÂŶ¨°Æ¤¬¤¢¤ê¤Þ¤¹¡£¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î
-    ¾ðÊó¤ò¥í¥°¤Î¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ë²Ã¤¨¤ë¤³¤È¤Ç¡¢¤¹¤Ù¤Æ¤Î¥Û¥¹¥È¤Ø¤Î
-    ¥ê¥¯¥¨¥¹¥È¤òƱ¤¸¥í¥°¤Ë¥í¥°¼ý½¸¤·¤Æ¡¢¸å¤Ç¥í¥°¤ò¸Ä¡¹¤Î¥Õ¥¡¥¤¥ë¤Ëʬ³ä¤¹¤ë¤³¤È¤¬
-    ¤Ç¤­¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢°Ê²¼¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <div class="example"><p><code>
-      LogFormat "%v %l %u %t \"%r\" %&gt;s %b"
-      comonvhost<br />
-      CustomLog logs/access_log comonvhost
-    </code></p></div>
-
-    <p><code>%v</code> ¤¬¥ê¥¯¥¨¥¹¥È¤ò°·¤Ã¤Æ¤¤¤ë¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î̾Á°¤ò
-    ¥í¥°¼ý½¸¤¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£¤½¤·¤Æ¡¢<a href="programs/other.html">split-logfile</a> ¤Î¤è¤¦¤Ê¥×¥í¥°¥é¥à¤ò
-    »È¤Ã¤Æ¥¢¥¯¥»¥¹¥í¥°¤ò¸å½èÍý¤¹¤ë¤³¤È¤Ç¡¢
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥ÈËè¤Î¥Õ¥¡¥¤¥ë¤Ë¥í¥°¤òʬ³ä¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>»ÄÇ°¤Ê¤¬¤é¡¢¥¨¥é¡¼¥í¥°¤Ë¤ÏƱÍͤμêË¡¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤Ç¤¹¤«¤é¡¢
-    ¤¹¤Ù¤Æ¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤òƱ¤¸¥¨¥é¡¼¥í¥°¤ÎÃæ¤Ëº®¤¼¤ë¤«¡¢
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥ÈËè¤Ë¥¨¥é¡¼¥í¥°¤ò»È¤¦¤«¤òÁª¤Ð¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="other" id="other">¾¤Î¥í¥°¥Õ¥¡¥¤¥ë</a></h2>
-    
-
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_logio.html">mod_logio</a></code></li><li><code class="module"><a href="./mod/mod_log_forensic.html">mod_log_forensic</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_log_forensic.html#forensiclog">ForensicLog</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritelog">RewriteLog</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriteloglevel">RewriteLogLevel</a></code></li><li><code class="directive"><a href="./mod/mod_cgi.html#scriptlog">ScriptLog</a></code></li><li><code class="directive"><a href="./mod/mod_cgi.html#scriptlogbuffer">ScriptLogBuffer</a></code></li><li><code class="directive"><a href="./mod/mod_cgi.html#scriptloglength">ScriptLogLength</a></code></li></ul></td></tr></table>
-
-    <h3>¼ÂºÝ¤ËÁ÷¼õ¿®¤·¤¿¥Ð¥¤¥È¿ô¤Î¥í¥°</h3>
-      
-
-      <p><code class="module"><a href="./mod/mod_logio.html">mod_logio</a></code> ¤Ï¡¢
-         ¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Ç¼ÂºÝ¤ËÁ÷¼õ¿®¤·¤¿¿ô¤ò¥í¥°¤¹¤ë
-         Æó¤Ä¤Î¥Õ¥£¡¼¥ë¥É (%I ¤È %O) ¤ò
-         <code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code> 
-         ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ËÄɲä·¤Þ¤¹¡£</p>
-    
-
-    <h3>Forensic ¥í¥°</h3>
-      
-
-      <p><code class="module"><a href="./mod/mod_log_forensic.html">mod_log_forensic</a></code> ¤Ï¥¯¥é¥¤¥¢¥ó¥È¥ê¥¯¥¨¥¹¥È¤Î
-         forensic ¥í¥°¤ò¼è¤ê¤Þ¤¹¡£¥í¥°¤Ï¥ê¥¯¥¨¥¹¥È½èÍýÁ°¤È½èÍý¸å¤Ë
-         ¹Ô¤ï¤ì¤Þ¤¹¤Î¤Ç¡¢1 ¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ 2 ¹Ô¤Î¥í¥°¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£
-         forensic ¥í¥¬¡¼¤Ï¤È¤Æ¤â¸·Ì©¤Ç¥«¥¹¥¿¥Þ¥¤¥º¤Ç¤­¤Þ¤»¤ó¡£
-         ¥Ç¥Ð¥Ã¥°¤ä¥»¥­¥å¥ê¥Æ¥£ÍѤΥġ¼¥ë¤È¤·¤ÆÍ­¸ú¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>
-    
-
-    <h3><a name="pidfile" id="pidfile">PID ¥Õ¥¡¥¤¥ë</a></h3>
-      
-
-      <p>µ¯Æ°»þ¤Ë¡¢Apache ¤Ï¿Æ httpd ¥×¥í¥»¥¹¤Î¥×¥í¥»¥¹ ID ¤ò
-      <code>logs/httpd.pid</code> ¤ËÊݸ¤·¤Þ¤¹¡£¤³¤Î
-      ¥Õ¥¡¥¤¥ë̾¤Ï <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ
-      Êѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥×¥í¥»¥¹ ID ¤Ï´ÉÍý¼Ô¤¬¿Æ¥×¥í¥»¥¹¤Ë
-      ¥·¥°¥Ê¥ë¤òÁ÷¤ë¤³¤È¤Ç¥Ç¡¼¥â¥ó¤òºÆµ¯Æ°¤·¤¿¤ê½ªÎ»¤µ¤»¤¿¤ê¤¹¤ë¤È¤­¤Ë
-      »ÈÍѤ·¤Þ¤¹¡£Windows ¤Ç¤Ï¡¢Âå¤ï¤ê¤Ë -k ¥³¥Þ¥ó¥É¥ª¥×¥·¥ç¥ó¤ò
-      »È¤Ã¤Æ¤¯¤À¤µ¤¤¡£¾Ü¤·¤¤¾ðÊó¤Ï <a href="stopping.html">½ªÎ»¤È
-      ºÆµ¯Æ°</a> ¤Î¥Ú¡¼¥¸¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£</p>
-    
-
-    <h3><a name="scriptlog" id="scriptlog">¥¹¥¯¥ê¥×¥È¥í¥°</a></h3>
-      
-
-      <p>¥Ç¥Ð¥Ã¥°¤ÎÊä½õ¤Î¤¿¤á¤Ë¡¢<code class="directive"><a href="./mod/mod_cgi.html#scriptlog">ScriptLog</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-      CGI ¥¹¥¯¥ê¥×¥È¤ÎÆþÎϤȽÐÎϤòµ­Ï¿¤¹¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£
-      ¤³¤ì¤Ï¥Æ¥¹¥ÈÍѤˤΤ߻ÈÍѤ·¤Æ¡¢Ä̾ï¤Î¥µ¡¼¥Ð¤Ç¤Ï»ÈÍѤ·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-      ¾Ü¤·¤¤¾ðÊó¤Ï <a href="mod/mod_cgi.html">mod_cgi ¤Îʸ½ñ</a> ¤Ë¤¢¤ê¤Þ¤¹¡£</p>
-    
-
-    <h3><a name="rewritelog" id="rewritelog">¥ê¥é¥¤¥È¥í¥°</a></h3>
-      
-
-      <p><code class="directive"><a href="./mod/mod_rewrite.html#mod_rewrite">mod_rewrite</a></code> ¤Î¶¯ÎϤÇ
-      Ê£»¨¤Êµ¡Ç½¤ò
-      »È¤Ã¤Æ¤¤¤ë¤È¤­¤Ï¡¢¤Û¤Ü¤¤¤Ä¤â¥Ç¥Ð¥Ã¥°¤ò´Êñ¤Ë¤¹¤ë¤¿¤á¤Ë
-      <code class="directive"><a href="./mod/mod_rewrite.html#rewritelog">RewriteLog</a></code> ¤Î»ÈÍѤ¬
-      ɬÍפǤ·¤ç¤¦¡£¤³¤Î¥í¥°¥Õ¥¡¥¤¥ë¤Ë¤Ï¥ê¥é¥¤¥È¥¨¥ó¥¸¥ó¤¬¥ê¥¯¥¨¥¹¥È¤ò
-      ½ñ¤­´¹¤¨¤ëÊýË¡¤Î¾ÜºÙ¤Ê²òÀϤ¬½ÐÎϤµ¤ì¤Þ¤¹¡£¾Ü¤·¤µ¤ÎÅÙ¹ç¤Ï <code class="directive"><a href="./mod/mod_rewrite.html#rewriteloglevel">RewriteLogLevel</a></code>
-      ¤ÇÀ©¸æ¤Ç¤­¤Þ¤¹¡£</p>
-    
-  </div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./en/logs.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./ja/logs.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/logs.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/logs.html.ja.utf8 b/docs/manual/logs.html.ja.utf8
new file mode 100644
index 00000000..66c9796e
--- /dev/null
+++ b/docs/manual/logs.html.ja.utf8
@@ -0,0 +1,573 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>ログファイル - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>ログファイル</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./en/logs.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./ja/logs.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/logs.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+
+    <p>ウェブサー�を効果的�管��る�����サー��活動やパフォーマンス�
+    今発生���る�も�れ���題�関�るフィード�ックを得る���必���。
+    Apache HTTP サー����常�包括的�柔軟�ロギング機能��り��。
+    ��文書�ロギング機能�設定�仕方��ログ�何�書�れ��る�を
+    �解�る���方法を説明���。</p>
+  </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#security">
+    セキュリティ�関�る警告</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#errorlog">エラーログ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#accesslog">アクセスログ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#rotation">ログ�交替</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#piped">パイプ経由�ログ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#virtualhosts">�ー�ャルホスト</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#other">他�ログファイル</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="security" id="security">
+    セキュリティ�関�る警告</a></h2>
+
+    <p>Apache �ログファイルを書���るディレクトリ�書�込�る人��
+    ��確実�サー��起動�れ� uid ��アクセスを手�入れる�������。
+    �����れ�通常� root ユーザ��。
+    �ゃん��果を考�る�������ディレクトリ��
+    書�込�権�を与�<em>��</em>�����。詳���
+    <a href="misc/security_tips.html">セキュリティ���</a>�文書を
+    読ん�����。</p>
+
+    <p>加���ログファイル��クライアント�ら�情報������
+    エスケープ�れる����書�れ����。���ら�悪���る
+    クライアント�ログファイル�制御文字を挿入�る�������。
+    生�ログを扱����注�������。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="errorlog" id="errorlog">エラーログ</a></h2>
+    
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#errorlog">ErrorLog</a></code></li><li><code class="directive"><a href="./mod/core.html#loglevel">LogLevel</a></code></li></ul></td></tr></table>
+
+    <p><code class="directive"><a href="./mod/core.html#errorlog">ErrorLog</a></code> ディレクティブ�より
+    ���場所�決�るサー��エラーログ��一番���ログファイル��。
+    Apache �診断情報�����られ�リクエストを処����る���
+    発生��エラー�������記録�れ��。サー�を起動����や�
+    サー��動作��題�起�������一番最��調�る��
+    �����。間���詳細や修正方法����書�れ��る���
+    よ��り��。</p>
+
+    <p>エラーログ�普通�ファイル�書�れ�� (通常 unix システム��
+    <code>error_log</code>�Windows � OS/2 �� <code>error.log</code>)。
+    Unix システム��エラーを <code>syslog</code> や
+    <a href="#piped">パイプ�プログラム��る</a> �������。</p>
+
+    <p>エラーログ�書��比較的自由度�高�も���説明的�書�れ����。
+    ���������情報���ん��エラーログ�エントリ��り��。
+    例���代表的�も��次�よ��メッセージ��り��。</p>
+
+    <div class="example"><p><code>
+      [Wed Oct 11 14:32:52 2000] [error] [client 127.0.0.1]
+      client denied by server configuration:
+      /export/home/live/ap/htdocs/test
+    </code></p></div>
+
+    <p>ログエントリ�最��項目�メッセージ�日付�時刻��。
+    二���項目�報告�れ��るエラー���度��。
+    <code class="directive"><a href="./mod/core.html#loglevel">LogLevel</a></code> ���度�レベルを
+    制��る���よりエラーログ��られるエラー�種類を制御�る���
+    ����。三�目�項目�エラーを発生���クライアント� IP アドレス
+    ��。残り�メッセージ����場��サー��クライアント�アクセスを
+    拒��るよ��設定�れ��る������を示�����。
+    サー��リクエスト�れ�文書� (ウェブ�パス����) ファイルシステム�
+    パスを報告���。</p>
+
+    <p>�常�広範囲�メッセージ�エラーログ��れ��。�����も��
+    上�例�よ��感���。エラーログ�� CGI スクリプト�デ�ッグ
+    出力も書�れ��。CGI スクリプト� <code>stderr</code> �書��
+    ����情報�直接エラーログ�コピー�れ��。</p>
+
+    <p>情報を追加��り削除��り��エラーログをカスタマイズ�る���
+    ����ん。����リクエスト�対�るエラーログ�エントリ��
+    対応�るエントリ�<a href="#accesslog">アクセスログ</a>��り��。
+    例���上�例�エントリ�アクセスログ�ステータスコード 403 �
+    エントリ�対応���。アクセスログ�カスタマイズ�能�����
+    ��らを使����よりエラー�状��関�る情報をより多�
+    手�入れる�������。</p>
+
+    <p>テスト�最中���題�発生���る����を見る����
+    常�エラーログを監視�る��役�立�場��よ��り��。
+    Unix システム���次�も�を使��������。</p>
+
+    <div class="example"><p><code>
+      tail -f error_log
+    </code></p></div>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="accesslog" id="accesslog">アクセスログ</a></h2>
+    
+
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code></li><li><code class="module"><a href="./mod/mod_setenvif.html">mod_setenvif</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code></li><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code></li></ul></td></tr></table>
+
+    <p>サー�アクセスログ�サー��処�を������リクエストを
+    記録���。アクセスログ�場所�内容� <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code>
+    ディレクティブ�より決�り��。ログ�内容��択を簡潔��る���
+    <code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code>
+    ディレクティブを使用�る�������。��セクション�アクセスログ�
+    情報を記録�る���サー��設定方法を説明���。</p>
+
+    <p>も��ん�アクセスログ�情報を蓄��る���ログ管��
+    始�り�����ん。次�段階�有用�統計を�る�����情報を
+    解��る����。一般的�ログ解����文書�範囲外��
+    ウェブサー�自身�仕事������も�り��ん。��話や�
+    ログ解�を行��アプリケーション�情報を得る���<a href="http://dmoz.org/Computers/Software/Internet/Site_Management/Log_analysis/">
+    Open Directory</a> ã‚„ <a href="http://dir.yahoo.com/Computers_and_Internet/Software/Internet/World_Wide_Web/Servers/Log_Analysis_Tools/">
+    Yahoo</a> を調������。</p>
+
+    <p>��ん��ージョン� Apache httpd � mod_log_config,
+    mod_log_agent, <code>TransferLog</code> ディレクティブ�����
+    他�モジュールやディレクティブを使��アクセス�ロギングを
+    制御������。今���<code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> �������
+    ディレクティブ�機能を�むよ��������。</p>
+
+    <p>アクセスログ�書���常�柔軟�設定��能��。
+    書�� C � printf(1) フォーマット文字列��常�似�
+    <code class="directive"><a href="./mod/mod_log_config.html#フォーマット文字列">フォーマット文字列</a></code>
+    �より指定�れ��。����次�節�例を示���。
+    フォーマット文字列�使用��る内容�一覧� <a href="mod/mod_log_config.html">mod_log_config �文書</a>
+    を見�����。</p>
+
+    <h3><a name="common" id="common">Common Log Format</a></h3>
+      
+
+      <p>アクセスログ�よ��る設定�以下�も���り��。</p>
+
+      <div class="example"><p><code>
+        LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common<br />
+         CustomLog logs/access_log common
+      </code></p></div>
+
+      <p>�れ��<em>ニック�ーム</em> <code>common</code> を定義��
+      ログ�フォーマット文字列�一��関連付���。フォーマット文字列�
+      パーセントディレクティブ�ら�り��れ�れ�パーセントディレクティブ�
+      サー����情報をロギング�る�を指示���。フォーマット文字列�
+      文字を����入れる��も����れら�ログ�出力�直接コピー�れ��。
+      ���引用文字 (<code>"</code>) を書�����
+      フォーマット文字列�最後���解釈
+      �れる��を防�����ックスラッシュ�エスケープ�る必���り��。
+      フォーマット文字列��改行用� "<code>\n</code>"�タブ用�
+      "<code>\t</code>" ���特別�制御文字も��る�������。</p>
+
+      <p><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> ディレクティブ�
+      既�定義�れ�
+      <em>ニック�ーム</em> を使��新��ログファイルを設定���。
+      アクセスログ�ファイル��スラッシュ�始�ら���り�
+      <code class="directive"><a href="./mod/core.html#serverroot">ServerRoot</a></code> �ら�相対パス���
+      扱�れ��。</p>
+
+      <p>上�設定� Common Log Format (CLF) �呼�れる形��
+      ログエントリを書���。��標準�形��異�るウェブサー��多��
+      生��る������多��ログ解�プログラム�読��む�������。
+      CLF �より生��れ�ログファイル�エントリ�以下�よ���り��:</p>
+
+      <div class="example"><p><code>
+        127.0.0.1 - frank [10/Oct/2000:13:55:36 -0700] "GET
+        /apache_pb.gif HTTP/1.0" 200 2326
+      </code></p></div>
+
+      <p>��ログエントリ��れ�れ�部分��味�以下�説明���。</p>
+
+      <dl>
+	<dt><code>127.0.0.1</code> (<code>%h</code>)</dt>
+
+	<dd>�れ�サー��リクエストを��クライアント (リモートホスト)
+	� IP アドレス��。<code class="directive"><a href="./mod/core.html#hostnamelookups">HostnameLookups</a></code> �
+	<code>On</code> �場���サー��ホスト�を調���
+	IP アドレス�書�れ��る����記録���。������設定�
+	サー�を��り���る�����り�勧�����ん。
+	�������<code class="program"><a href="./programs/logresolve.html">logresolve</a></code> �
+	よ��ログ�後処�を行��プログラム�ホスト�を調�る��良���ょ�。
+	���報告�れる IP アドレス�必��もユーザ�使���るマシン�
+	も���る���り��ん。ユーザ�サー��間�プロキシサー��
+	�れ����アドレス�元�マシン�も������プロキシ�
+	アドレス��り��。</dd>
+
+	<dt><code>-</code> (<code>%l</code>)</dt>
+
+	<dd>出力中�「�イフン���求�れ�情報�手�入ら���������を
+	�味���。��場���得������情報�クライアント�マシン�
+	<code>identd</code> �より決�る RFC 1413 �クライアント�
+	アイデンティティ��。��情報���り信用�る�������
+	���り�管��れ�内部�ットワークを除���使������り��ん。
+	Apache � <code class="directive"><a href="./mod/core.html#identitycheck">IdentityCheck</a></code> �
+	<code>On</code> ��������り���情報を得よ���ら���ん。</dd>
+
+	<dt><code>frank</code> (<code>%u</code>)</dt>
+
+	<dd>�れ� HTTP �証�よる�ドキュメントをリクエスト��人�
+	ユーザ ID ��。CGI スクリプト��通常��値� <code>REMOTE_USER</code>
+	環境変数���与�られ��。リクエスト�ステータスコード
+	(以下を�照) � 401 ����場���ユーザ��証�失敗���る���
+	��値�信用����ん。ドキュメント�パスワード��護�れ����
+	場�����エントリ���も����よ�� "<code>-</code>" �
+	�り��。</dd>
+
+	<dt><code>[10/Oct/2000:13:55:36 -0700]</code>
+	(<code>%t</code>)</dt>
+
+	<dd>
+	  サー��リクエストを�����時刻��。書��:
+
+	    <p class="indent">
+	      <code>[day/month/year:hour:minute:second zone]<br />
+	       day = 2*digit<br />
+	       month = 3*letter<br />
+	       year = 4*digit<br />
+	       hour = 2*digit<br />
+	       minute = 2*digit<br />
+	       second = 2*digit<br />
+	       zone = (`+' | `-') 4*digit</code>
+	    </p>
+	  ログ�フォーマット文字列� <code>%{format}t</code> を
+	  指定�る����別�形��時刻を表示��る��も����。
+	  �����<code>format</code> � C �標準ライブラリ�
+	  <code>strftime(3)</code> �形���り��。
+	</dd>
+
+	<dt><code>"GET /apache_pb.gif HTTP/1.0"</code>
+	(<code>\"%r\"</code>)</dt>
+
+	<dd>クライアント�ら�リクエスト�二�引用符�中�示�れ����。
+	リクエスト��多��有用�情報��り��。�����場�クライアント�
+	使��メソッド� <code>GET</code> ��。次��クライアント�
+	リソース <code>/apache_pb.gif</code> を�求����。����
+	クライアント�プロトコル <code>HTTP/1.0</code> を使用����。
+	リクエスト��部分を独立�ログ�集�る��も����。例���
+	フォーマット文字列 "<code>%m %U%q %H</code>" �
+	メソッド�パス�クエリ文字列�プロトコルをログ�集��
+	�局 "<code>%r</code>" �������出力��り��。</dd>
+
+	<dt><code>200</code> (<code>%&gt;s</code>)</dt>
+
+	<dd>サー��クライアント��り返�ステータスコード��。
+	��情報��リクエスト��功応答 (2 �始�るコード) ������
+	リダイレクション (3 �始�るコード) ������クライアント�よる
+	エラー (4 �始�るコード) ������サー��エラー (5 �始�るコード)
+	������を表�����常�大切��。ステータスコード�
+	完全�リスト� <a href="http://www.w3.org/Protocols/rfc2616/rfc2616.txt">HTTP
+	�格</a> (RFC2616 第 10 節) ��り��。</dd>
+
+	<dt><code>2326</code> (<code>%b</code>)</dt>
+
+	<dd>��最後�エントリ�クライアント��信�れ�オブジェクト��
+	応答ヘッダを除��サイズを表���。コンテント�クライアント��られ����
+	場�����値� "<code>-</code>" ��り��。コンテント�無�場��
+	"<code>0</code>" をログ�集�る���<code>%b</code> ����
+	<code>%B</code> を使������。</dd>
+
+      </dl>
+    
+
+    <h3><a name="combined" id="combined">Combined Log Format</a></h3>
+      
+
+      <p>も�一��よ�使�れる書�� Combined Log Format �呼�れ����。
+      以下�よ����使��������。</p>
+
+      <div class="example"><p><code>
+        LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\"
+        \"%{User-agent}i\"" combined<br />
+         CustomLog log/access_log combined
+      </code></p></div>
+
+      <p>��書��最��方� Common Log Format ���������最後�
+      二�追加�エントリ��り��。追加�エントリ�パーセントディレクティブ
+      <code>%{<em>header</em>}i</code> を使�����。���
+      <em>header</em> � HTTP �リクエストヘッダ��れ���。��書��よる
+      アクセスログ�以下�よ��感���り��:</p>
+
+      <div class="example"><p><code>
+        127.0.0.1 - frank [10/Oct/2000:13:55:36 -0700] "GET
+        /apache_pb.gif HTTP/1.0" 200 2326
+        "http://www.example.com/start.html" "Mozilla/4.08 [en]
+        (Win98; I ;Nav)"
+      </code></p></div>
+
+      <p>追加�エントリ�:</p>
+
+      <dl>
+	<dt><code>"http://www.example.com/start.html"</code>
+	(<code>\"%{Referer}i\"</code>)</dt>
+
+	<dd>"Referer" (�図的�綴り間��) HTTP リクエストヘッダ��。
+	�れ�クライアント�報告���る�照元�サイトを表���。
+	(��場���<code>/apache_pb.gif</code> �リンク���る��
+	�れを�ん��るページ��)。</dd>
+
+	<dt><code>"Mozilla/4.08 [en] (Win98; I ;Nav)"</code>
+	(<code>\"%{User-agent}i\"</code>)</dt>
+
+	<dd>User-Agent HTTP リクエストヘッダ��。�れ�クライアント�ブラウザ�
+	自分自身���を報告���る情報��。</dd>
+      </dl>
+    
+
+    <h3><a name="multiple" id="multiple">複数�アクセスログ</a></h3>
+      
+
+    <p>複数�アクセスログ���設定ファイル�複数� <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code>
+    ディレクティブを書����作��れ��。例���以下�ディレクティブ�
+    三��アクセスログを作り��。最��も��基本的� CLF �情報��
+    二�目�三�目� referer �ブラウザ�情報��。最後二��
+    <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> �
+    <code>ReferLog</code> ディレクティブ�
+    <code>AgentLog</code> ディレクティブ�効果を��る方法を示�����。</p>
+
+      <div class="example"><p><code>
+        LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common<br />
+        CustomLog logs/access_log common<br />
+        CustomLog logs/referer_log "%{Referer}i -&gt; %U"<br />
+        CustomLog logs/agent_log "%{User-agent}i"
+      </code></p></div>
+
+    <p>��例� <code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code> �
+    ニック�ームを定義�る必�����
+    �����も示�����。ニック�ーム�代�り��
+    <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> ディレクティブ�
+    直接ログ�書�を指定�る�������。</p>
+    
+
+    <h3><a name="conditional" id="conditional">�件付�ログ</a></h3>
+      
+
+    <p>クライアント�リクエスト�特徴�基���アクセスログ�エントリ�
+    一部をロギング���方�便利�����り��。�れ� <a href="env.html">環境変数</a> �補助�より簡��実�����。���
+    リクエスト�何ら���件��������を表����環境変数�
+    設定�れる必���り��。�れ�通常� <code class="directive"><a href="./mod/mod_setenvif.html#setenvif">SetEnvIf</a></code> �より
+    行��れ��。����<code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> ディレクティブ�
+    <code>env=</code> 節を使��環境変数�設定�れ��るリクエストを
+    ���り排除��り�る�������。����例を挙���:</p>
+
+      <div class="example"><p><code>
+        # Mark requests from the loop-back interface<br />
+        SetEnvIf Remote_Addr "127\.0\.0\.1" dontlog<br />
+        # Mark requests for the robots.txt file<br />
+        SetEnvIf Request_URI "^/robots\.txt$" dontlog<br />
+        # Log what remains<br />
+        CustomLog logs/access_log common env=!dontlog
+      </code></p></div>
+
+    <p>他�例����英語を話�人�ら�リクエスト��れ以外�人�ら�リクエストを
+    分�������場�を考��������。</p>
+
+      <div class="example"><p><code>
+        SetEnvIf Accept-Language "en" english<br />
+        CustomLog logs/english_log common env=english<br />
+        CustomLog logs/non_english_log common env=!english
+      </code></p></div>
+
+    <p>�������件付�ロギング��常�強力�柔軟��る��を示��������
+    �れ�ログ�内容を制御�る唯一�方法��������り��ん。ログファイル�
+    サー��活動�完全�記録��る方�より役�立���。�純�ログファイルを
+    後処����考慮�����ログを削除�る方�簡���る���よ��り��。</p>
+    
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="rotation" id="rotation">ログ�交替</a></h2>
+    
+
+    <p>普通�負��サー�����ログファイル��存�れる情報���
+    膨大��り��。アクセスログ�ファイル�普通 10,000 リクエスト毎�
+    1 MB 以上増���。���ら�既存�ログを移動��り�削除��り���
+    定期的�ログを交替��る���必���り��。�れ�サー��実行中��
+    行����ん。������Apache �ファイル� open �れ��る間�
+    �����ログファイル�書�続�る�ら��。
+    新��ログファイルを open ��るよ���ログファイル�移動�れ�り
+    削除�れ�後��サー�を<a href="stopping.html">�起動</a>�る
+    必���り��。</p>
+
+    <p><em>優雅�</em> �起動を行������サー��既存�コ�クションや
+    処�待��コ�クションを失�����新��ログファイルを open ��る
+    �������。�����れを実��る����サー����リクエストを
+    扱���る間���ログファイル�書�続�る必���り��。
+    ���ら��起動�後��ログファイル�処�を始�る�����ら�待���れ�
+    �り��ん。��ログを交替����ディスク�節約������ログを
+    圧縮�る普通�シナリオ�:</p>
+
+    <div class="example"><p><code>
+      mv access_log access_log.old<br />
+      mv error_log error_log.old<br />
+      apachectl graceful<br />
+      sleep 600<br />
+      gzip access_log.old error_log.old
+    </code></p></div>
+
+    <p>ログ�交替を�るも�一��方法�<a href="#piped">パイプ経由�ログ</a>を使�も���次�節�説明�れ����。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="piped" id="piped">パイプ経由�ログ</a></h2>
+    
+
+    <p>Apache httpd �エラーログ�アクセスログをファイル�直接書�代�り��
+    パイプを通��別�プログラム�書�出��������。
+    ��機能�より�主サー��コードを追加�る����
+    ロギング�柔軟性��常�高������。パイプ�ログを書������
+    ��ファイル�をパイプ文字 "<code>|</code>" �置������続��
+    標準入力�らログ�エントリを���る実行プログラム���を書�����。
+    Apache �パイプ経由�ログ用�プロセスをサー��起動時�実行��
+    サー��実行中���プログラム�クラッシュ������れを��
+    実行���。(��最後�機能���技術�「信頼性��るパイプ経由�ロギング�
+    �呼�れ��る�由��。)</p>
+
+    <p>パイプ経由�ログ用�プロセス� Apache httpd �親プロセス�ら起動�れ�
+    ��プロセス�ユーザ ID を継承���。�れ��パイプ経由�ログ用�
+    プログラム�普通 root ���実行�れる��を�味���。
+    ���ら�プログラムを簡��安全�������常�����。</p>
+
+    <p>パイプ経由�ログ����利用法��サー���起動���ログ�交替を
+    �る����。Apache HTTP サー��������  <code class="program"><a href="./programs/rotatelogs.html">rotatelogs</a></code> �呼�れる簡��
+    プログラム�付属�����。�����24 時間毎�ログを交替��る���
+    以下�も�を使��������:</p>
+
+    <div class="example"><p><code>
+      CustomLog "|/usr/local/apache/bin/rotatelogs
+      /var/log/access_log 86400" common
+    </code></p></div>
+
+    <p>パイプ�先�呼�れるコマンド全体�引用符�囲�れ��る���注目��
+    ����。��例�アクセスログを使�������エラーログ�も��技術を
+    使��������。</p>
+
+    <p>似��る�れ��より���柔軟�
+    <a href="http://www.cronolog.org/">cronolog</a> ���ログ交替用�
+    プログラム�外部�サイト��り��。</p>
+
+    <p>�件付�ロギング��様�パイプ経由�ログ��常�強力�
+    �具����オフライン�後処��よ���より簡��解決方法��る���
+    使���方�良���ょ�。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="virtualhosts" id="virtualhosts">�ー�ャルホスト</a></h2>
+    
+
+    <p>多�� <a href="vhosts/">�ー�ャルホスト</a> ��るサー�を実行���る
+    ����ログファイル�扱�方������方法��り��。
+    ����独�ホスト���サー��������よ��ログを使��������。
+    ロギングディレクティブを主サー��コンテキスト�
+    <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> セクション�外�置�����
+    ����ログを��アクセスログ�エラーログ�ログ�集�る�������。
+    ��手法��個々��ー�ャルホスト�統計を簡���る�������ん。</p>
+
+    <p><code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> ã‚„
+    <code class="directive"><a href="./mod/mod_log_config.html#errorlog">ErrorLog</a></code> ディレクティブ�
+    <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> �中�
+    置�れ�場������ー�ャル
+    ホスト������リクエストやエラー����指定�れ�ファイル���
+    ログ�集�れ��。ロギングディレクティブ����ー�ャルホスト�
+    �然���リクエスト�主サー��ログ��られ��。��手法�少��
+    �ー�ャルホスト�対����常�有用����ホスト�数��常�多��る�
+    管��大変��り��。�ら��<a href="vhosts/fd-limits.html">ファイル記述���界</a>��題を起�����
+    �り��。</p>
+
+    <p>アクセスログ����常�良�妥�案��り��。�ー�ャルホスト�
+    情報をログ�フォーマット文字列�加�る��������ホスト��
+    リクエストを��ログ�ログ�集���後�ログを個々�ファイル�分割�る���
+    ����。�����以下�ディレクティブを見�����。</p>
+
+    <div class="example"><p><code>
+      LogFormat "%v %l %u %t \"%r\" %&gt;s %b"
+      comonvhost<br />
+      CustomLog logs/access_log comonvhost
+    </code></p></div>
+
+    <p><code>%v</code> �リクエストを扱���る�ー�ャルホスト���を
+    ログ�集�る���使�れ����。����<a href="programs/other.html">split-logfile</a> �よ��プログラムを
+    使��アクセスログを後処��る����
+    �ー�ャルホスト毎�ファイル�ログを分割�る�������。</p>
+
+    <p>残念��ら�エラーログ���様�手法��り��ん。���ら�
+    �����ー�ャルホストを��エラーログ�中�混�る��
+    �ー�ャルホスト毎�エラーログを使��を����れ��り��ん。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="other" id="other">他�ログファイル</a></h2>
+    
+
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_logio.html">mod_logio</a></code></li><li><code class="module"><a href="./mod/mod_log_forensic.html">mod_log_forensic</a></code></li><li><code class="module"><a href="./mod/mod_cgi.html">mod_cgi</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code></li><li><code class="directive"><a href="./mod/mod_log_forensic.html#forensiclog">ForensicLog</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritelog">RewriteLog</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewriteloglevel">RewriteLogLevel</a></code></li><li><code class="directive"><a href="./mod/mod_cgi.html#scriptlog">ScriptLog</a></code></li><li><code class="directive"><a href="./mod/mod_cgi.html#scriptlogbuffer">ScriptLogBuffer</a></code></li><li><code class="directive"><a href="./mod/mod_cgi.html#scriptloglength">ScriptLogLength</a></code></li></ul></td></tr></table>
+
+    <h3>実際���信���イト数�ログ</h3>
+      
+
+      <p><code class="module"><a href="./mod/mod_logio.html">mod_logio</a></code> ��
+         �ットワーク上�実際���信��数をログ�る
+         二��フィールド (%I � %O) を
+         <code class="directive"><a href="./mod/mod_log_config.html#logformat">LogFormat</a></code> 
+         ディレクティブ�追加���。</p>
+    
+
+    <h3>Forensic ログ</h3>
+      
+
+      <p><code class="module"><a href="./mod/mod_log_forensic.html">mod_log_forensic</a></code> �クライアントリクエスト�
+         forensic ログを�り��。ログ�リクエスト処���処�後�
+         行�れ�����1 リクエスト�対�� 2 行�ログ�出力�れ��。
+         forensic ロガー���も厳密�カスタマイズ����ん。
+         デ�ッグやセキュリティ用�ツール���有効�も�れ��ん。</p>
+    
+
+    <h3><a name="pidfile" id="pidfile">PID ファイル</a></h3>
+      
+
+      <p>起動時��Apache �親 httpd プロセス�プロセス ID を
+      <code>logs/httpd.pid</code> ��存���。��
+      ファイル�� <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code> ディレクティブを使��
+      変更�る�������。プロセス ID �管�者�親プロセス�
+      シグナルを�る���デーモンを�起動��り終了���り�る���
+      使用���。Windows ���代�り� -k コマンドオプションを
+      使������。詳��情報� <a href="stopping.html">終了�
+      �起動</a> �ページを見�����。</p>
+    
+
+    <h3><a name="scriptlog" id="scriptlog">スクリプトログ</a></h3>
+      
+
+      <p>デ�ッグ�補助�����<code class="directive"><a href="./mod/mod_cgi.html#scriptlog">ScriptLog</a></code> ディレクティブ�
+      CGI スクリプト�入力�出力を記録�るよ������。
+      �れ�テスト用���使用���通常�サー���使用��������。
+      詳��情報� <a href="mod/mod_cgi.html">mod_cgi �文書</a> ��り��。</p>
+    
+
+    <h3><a name="rewritelog" id="rewritelog">リライトログ</a></h3>
+      
+
+      <p><code class="directive"><a href="./mod/mod_rewrite.html#mod_rewrite">mod_rewrite</a></code> �強力�
+      複雑�機能を
+      使���る��������もデ�ッグを簡���る���
+      <code class="directive"><a href="./mod/mod_rewrite.html#rewritelog">RewriteLog</a></code> �使用�
+      必���ょ�。��ログファイル��リライトエンジン�リクエストを
+      書���る方法�詳細�解��出力�れ��。詳���度�� <code class="directive"><a href="./mod/mod_rewrite.html#rewriteloglevel">RewriteLogLevel</a></code>
+      �制御����。</p>
+    
+  </div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./en/logs.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./ja/logs.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/logs.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/logs.html.ko.euc-kr b/docs/manual/logs.html.ko.euc-kr
index 156cb95b..1e166575 100644
--- a/docs/manual/logs.html.ko.euc-kr
+++ b/docs/manual/logs.html.ko.euc-kr
@@ -516,6 +516,6 @@
 <a href="./ja/logs.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/logs.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/misc/index.html b/docs/manual/misc/index.html
index 5b7bb86f..df57cd0f 100644
--- a/docs/manual/misc/index.html
+++ b/docs/manual/misc/index.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: index.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/misc/index.html.en b/docs/manual/misc/index.html.en
index f730fd2b..d6f92fff 100644
--- a/docs/manual/misc/index.html.en
+++ b/docs/manual/misc/index.html.en
@@ -82,6 +82,6 @@
 <p><span>Available Languages: </span><a href="../en/misc/" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/misc/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/misc/index.html.ko.euc-kr b/docs/manual/misc/index.html.ko.euc-kr
index 21a7359e..b55ffb41 100644
--- a/docs/manual/misc/index.html.ko.euc-kr
+++ b/docs/manual/misc/index.html.ko.euc-kr
@@ -73,6 +73,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/misc/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/misc/" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/misc/password_encryptions.html b/docs/manual/misc/password_encryptions.html
index 1f357ebf..58363fa8 100644
--- a/docs/manual/misc/password_encryptions.html
+++ b/docs/manual/misc/password_encryptions.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: password_encryptions.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/misc/password_encryptions.html.en b/docs/manual/misc/password_encryptions.html.en
index 15c3d46b..4f15b80d 100644
--- a/docs/manual/misc/password_encryptions.html.en
+++ b/docs/manual/misc/password_encryptions.html.en
@@ -49,7 +49,7 @@
        <dt>MD5</dt>
        <dd>"$apr1$" + the result of an Apache-specific algorithm using an
        iterated (1,000 times) MD5 digest of various combinations of a
-       randoml 32-bit salt and the password. See the APR source file
+       random 32-bit salt and the password. See the APR source file
        <a href="http://svn.apache.org/viewvc/apr/apr-util/trunk/crypto/apr_md5.c?view=markup">apr_md5.c</a>
        for the details of the algorithm.</dd>
     </dl>
@@ -108,7 +108,7 @@
       first 8 characters of CRYPT passwords are considered.</p>
       
       <p>The salt for an MD5 password is between <code>$apr1$</code> and the
-      following <code>$</code> (as a Base64-encoded binary value - max 8 chars)
+      following <code>$</code> (as a Base64-encoded binary value - max 8 chars).
       To validate <code>myPassword</code> against
       <code>$apr1$r31.....$HqJZimcKQFAMYayBlzkrA/</code></p>
       
@@ -209,6 +209,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/misc/password_encryptions.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/misc/perf-tuning.html b/docs/manual/misc/perf-tuning.html
index 5eaaf715..f87eb28c 100644
--- a/docs/manual/misc/perf-tuning.html
+++ b/docs/manual/misc/perf-tuning.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: perf-tuning.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/misc/perf-tuning.html.en b/docs/manual/misc/perf-tuning.html.en
index fbfe64bf..2aeffb7a 100644
--- a/docs/manual/misc/perf-tuning.html.en
+++ b/docs/manual/misc/perf-tuning.html.en
@@ -1051,6 +1051,6 @@
 <p><span>Available Languages: </span><a href="../en/misc/perf-tuning.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/misc/perf-tuning.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/misc/perf-tuning.html.ko.euc-kr b/docs/manual/misc/perf-tuning.html.ko.euc-kr
index a22ee0b0..37657a24 100644
--- a/docs/manual/misc/perf-tuning.html.ko.euc-kr
+++ b/docs/manual/misc/perf-tuning.html.ko.euc-kr
@@ -971,6 +971,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/misc/perf-tuning.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/misc/perf-tuning.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/misc/relevant_standards.html b/docs/manual/misc/relevant_standards.html
index ca9e9006..0890a9e4 100644
--- a/docs/manual/misc/relevant_standards.html
+++ b/docs/manual/misc/relevant_standards.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: relevant_standards.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/misc/relevant_standards.html.en b/docs/manual/misc/relevant_standards.html.en
index 1dc055de..a5b762a5 100644
--- a/docs/manual/misc/relevant_standards.html.en
+++ b/docs/manual/misc/relevant_standards.html.en
@@ -194,6 +194,6 @@
 <p><span>Available Languages: </span><a href="../en/misc/relevant_standards.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/misc/relevant_standards.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/misc/relevant_standards.html.ko.euc-kr b/docs/manual/misc/relevant_standards.html.ko.euc-kr
index f90aab9c..7ab2480f 100644
--- a/docs/manual/misc/relevant_standards.html.ko.euc-kr
+++ b/docs/manual/misc/relevant_standards.html.ko.euc-kr
@@ -186,6 +186,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/misc/relevant_standards.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/misc/relevant_standards.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/misc/rewriteguide.html b/docs/manual/misc/rewriteguide.html
index 01caef13..e58a64eb 100644
--- a/docs/manual/misc/rewriteguide.html
+++ b/docs/manual/misc/rewriteguide.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: rewriteguide.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/misc/rewriteguide.html.en b/docs/manual/misc/rewriteguide.html.en
index 44b8bcd3..6c8fe59f 100644
--- a/docs/manual/misc/rewriteguide.html.en
+++ b/docs/manual/misc/rewriteguide.html.en
@@ -22,6 +22,13 @@
 <a href="../ko/misc/rewriteguide.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
 
+
+    <div class="warning">
+     <p>This document is obsolete. It has been replaced with a
+     new <a href="../rewrite/">Rewrite Guide</a>.</p>
+    </div>
+
+
     <div class="note">
       <p>Originally written by<br />
       <cite>Ralf S. Engelschall &lt;rse@apache.org&gt;</cite><br />
@@ -2097,6 +2104,6 @@ while (&lt;&gt;) {
 <p><span>Available Languages: </span><a href="../en/misc/rewriteguide.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/misc/rewriteguide.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/misc/rewriteguide.html.ko.euc-kr b/docs/manual/misc/rewriteguide.html.ko.euc-kr
index ed67dd87..99473d3d 100644
--- a/docs/manual/misc/rewriteguide.html.ko.euc-kr
+++ b/docs/manual/misc/rewriteguide.html.ko.euc-kr
@@ -2001,6 +2001,6 @@ while (&lt;&gt;) {
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/misc/rewriteguide.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/misc/rewriteguide.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/misc/security_tips.html b/docs/manual/misc/security_tips.html
index 3746e186..a5631f3e 100644
--- a/docs/manual/misc/security_tips.html
+++ b/docs/manual/misc/security_tips.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: security_tips.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/misc/security_tips.html.en b/docs/manual/misc/security_tips.html.en
index 5ba2cb21..589a6b8e 100644
--- a/docs/manual/misc/security_tips.html.en
+++ b/docs/manual/misc/security_tips.html.en
@@ -317,7 +317,7 @@
     the second example will list the ten last denied clients, for example:</p>
     
     <div class="example"><p><code>
-      [Thu Jul 11 17:18:39 2002] [error] [client foo.bar.com] client denied 
+      [Thu Jul 11 17:18:39 2002] [error] [client foo.example.com] client denied 
       by server configuration: /usr/local/apache/htdocs/.htpasswd
     </code></p></div>
     
@@ -326,7 +326,7 @@
     would have seen something similar to:</p>
     
     <div class="example"><p><code>
-      foo.bar.com - - [12/Jul/2002:01:59:13 +0200] "GET /.htpasswd HTTP/1.1"
+      foo.example.com - - [12/Jul/2002:01:59:13 +0200] "GET /.htpasswd HTTP/1.1"
     </code></p></div>
     
     <p>in your <a href="../logs.html#accesslog">Access Log</a>. This means 
@@ -345,6 +345,6 @@
 <p><span>Available Languages: </span><a href="../en/misc/security_tips.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/misc/security_tips.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/misc/security_tips.html.ko.euc-kr b/docs/manual/misc/security_tips.html.ko.euc-kr
index 98643b40..a78d8191 100644
--- a/docs/manual/misc/security_tips.html.ko.euc-kr
+++ b/docs/manual/misc/security_tips.html.ko.euc-kr
@@ -338,6 +338,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/misc/security_tips.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/misc/security_tips.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/beos.html b/docs/manual/mod/beos.html
index 3d72b3f9..1bb91b93 100644
--- a/docs/manual/mod/beos.html
+++ b/docs/manual/mod/beos.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: beos.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/beos.html.de b/docs/manual/mod/beos.html.de
index ab69aa57..dfe8009b 100644
--- a/docs/manual/mod/beos.html.de
+++ b/docs/manual/mod/beos.html.de
@@ -104,6 +104,6 @@
 <a href="../es/mod/beos.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ko/mod/beos.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/beos.html.en b/docs/manual/mod/beos.html.en
index f48c5b2d..e94b82ec 100644
--- a/docs/manual/mod/beos.html.en
+++ b/docs/manual/mod/beos.html.en
@@ -102,6 +102,6 @@ will handle during its life</td></tr>
 <a href="../es/mod/beos.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ko/mod/beos.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/beos.html.es b/docs/manual/mod/beos.html.es
index a3336110..94067e94 100644
--- a/docs/manual/mod/beos.html.es
+++ b/docs/manual/mod/beos.html.es
@@ -110,6 +110,6 @@ atender durante su vida</td></tr>
 <a href="../es/mod/beos.html" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ko/mod/beos.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Módulos</a> | <a href="../mod/directives.html">Directivas</a> | <a href="../faq/">Preguntas Frecuentes</a> | <a href="../glossary.html">Glosario</a> | <a href="../sitemap.html">Mapa de este sitio web</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/beos.html.ko.euc-kr b/docs/manual/mod/beos.html.ko.euc-kr
index dde8842a..1a4333d7 100644
--- a/docs/manual/mod/beos.html.ko.euc-kr
+++ b/docs/manual/mod/beos.html.ko.euc-kr
@@ -100,6 +100,6 @@
 <a href="../es/mod/beos.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="../ko/mod/beos.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html
index 424afeda..faf3d61b 100644
--- a/docs/manual/mod/core.html
+++ b/docs/manual/mod/core.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: core.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -6,6 +8,10 @@ URI: core.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: core.html.ja.euc-jp
+URI: core.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
+
+URI: core.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/core.html.de b/docs/manual/mod/core.html.de
index 6cb2eda6..1d81c277 100644
--- a/docs/manual/mod/core.html.de
+++ b/docs/manual/mod/core.html.de
@@ -23,7 +23,8 @@
 <div class="toplang">
 <p><span>Verfügbare Sprachen: </span><a href="../de/mod/core.html" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/core.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
+<a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../tr/mod/core.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">Diese Übersetzung ist möglicherweise
             nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
@@ -573,7 +574,7 @@ HTTP-Response-Headern</td></tr>
 <tr><th><a href="directive-dict.html#Module">Modul:</a></th><td>core</td></tr>
 </table>
     <p>Die Direktive aktiviert die Generierung von
-    <code>Content-MD5</code>-Headern, wie sie in RFC1864 bzw. RFC2068
+    <code>Content-MD5</code>-Headern, wie sie in RFC1864 bzw. RFC2616
     definiert sind.</p>
 
     <p>MD5 ist ein Algorithmus zur Berechnung eines "Datenextrakts"
@@ -3350,8 +3351,9 @@ IP-Adressen angewendet werden</td></tr>
 <div class="bottomlang">
 <p><span>Verfügbare Sprachen: </span><a href="../de/mod/core.html" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/core.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
+<a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../tr/mod/core.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 91b41252..0127d1d9 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -23,7 +23,8 @@
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/core.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
+<a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../tr/mod/core.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Core Apache HTTP Server features that are always
 available</td></tr>
@@ -604,7 +605,7 @@ headers</td></tr>
 </table>
     <p>This directive enables the generation of
     <code>Content-MD5</code> headers as defined in RFC1864
-    respectively RFC2068.</p>
+    respectively RFC2616.</p>
 
     <p>MD5 is an algorithm for computing a "message digest"
     (sometimes called "fingerprint") of arbitrary-length data, with
@@ -877,8 +878,8 @@ from the web</td></tr>
 
 <h3>See also</h3>
 <ul>
-<li><a href="../urlmapping.html">Mapping URLs to Filesystem
-Location</a></li>
+<li><a href="../urlmapping.html#documentroot">Mapping URLs to Filesystem
+Locations</a></li>
 </ul>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1421,13 +1422,28 @@ if a test is true at startup</td></tr>
     multiple-parameter tests. Example:</p>
 
     <div class="example"><p><code>
-      httpd -DReverseProxy ...<br />
+      httpd -DReverseProxy -DUseCache -DMemCache ...<br />
       <br />
       # httpd.conf<br />
       &lt;IfDefine ReverseProxy&gt;<br />
       <span class="indent">
-        LoadModule rewrite_module modules/mod_rewrite.so<br />
-        LoadModule proxy_module   modules/libproxy.so<br />
+        LoadModule proxy_module   modules/mod_proxy.so<br />
+        LoadModule proxy_http_module   modules/mod_proxy_http.so<br />
+        &lt;IfDefine UseCache&gt;<br />
+        <span class="indent">
+          LoadModule cache_module   modules/mod_cache.so<br />
+          &lt;IfDefine MemCache&gt;<br />
+          <span class="indent">
+            LoadModule mem_cache_module   modules/mod_mem_cache.so<br />
+          </span>
+          &lt;/IfDefine&gt;<br />
+          &lt;IfDefine !MemCache&gt;<br />
+          <span class="indent">
+            LoadModule disk_cache_module   modules/mod_disk_cache.so<br />
+          </span>
+          &lt;/IfDefine&gt;
+        </span>
+        &lt;/IfDefine&gt;
       </span>
       &lt;/IfDefine&gt;
     </code></p></div>
@@ -1526,18 +1542,6 @@ the server configuration files</td></tr>
       Include conf/vhosts/*.conf
     </code></p></div>
 
-    <p>Running <code>apachectl configtest</code> will give you a list
-    of the files that are being processed during the configuration
-    check:</p>
-
-    <div class="example"><p><code>
-      root@host# apachectl configtest<br />
-      Processing config file: /usr/local/apache2/conf/ssl.conf<br />
-      Processing config file: /usr/local/apache2/conf/vhosts/vhost1.conf<br />
-      Processing config file: /usr/local/apache2/conf/vhosts/vhost2.conf<br />
-      Syntax OK
-    </code></p></div>
-
 <h3>See also</h3>
 <ul>
 <li><code class="program"><a href="../programs/apachectl.html">apachectl</a></code></li>
@@ -1573,6 +1577,10 @@ the server configuration files</td></tr>
     encoding will be used in order to send content of unknown
     length over persistent connections.</p>
 
+    <p>When a client uses a Keep-Alive connection it will be counted
+    as a single "request" for the MaxRequestsPerChild directive, regardless
+    of how many requests are sent using the connection.</p>
+
 <h3>See also</h3>
 <ul>
 <li><code class="directive"><a href="#maxkeepaliverequests">MaxKeepAliveRequests</a></code></li>
@@ -1598,6 +1606,10 @@ requests on a persistent connection</td></tr>
     may cause performance problems in heavily loaded servers. The
     higher the timeout, the more server processes will be kept
     occupied waiting on connections with idle clients.</p>
+    
+    <p>In a name-based virtual host context, the value of the first
+    defined virtual host (the default host) in a set of <code class="directive"><a href="#namevirtualhost">NameVirtualHost</a></code> will be used.
+    The other values will be ignored.</p>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1808,8 +1820,8 @@ will be accepted from the client</td></tr>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limits the size of the HTTP request header allowed from the
 client</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LimitRequestFieldsize <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LimitRequestFieldsize 8190</code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LimitRequestFieldSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LimitRequestFieldSize 8190</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
@@ -1964,7 +1976,7 @@ URLs</td></tr>
     functionality is especially useful when combined with the
     <code class="directive"><a href="#sethandler">SetHandler</a></code>
     directive. For example, to enable status requests, but allow them
-    only from browsers at <code>foo.com</code>, you might use:</p>
+    only from browsers at <code>example.com</code>, you might use:</p>
 
     <div class="example"><p><code>
       &lt;Location /status&gt;<br />
@@ -1972,7 +1984,7 @@ URLs</td></tr>
         SetHandler server-status<br />
         Order Deny,Allow<br />
         Deny from all<br />
-        Allow from .foo.com<br />
+        Allow from .example.com<br />
       </span>
       &lt;/Location&gt;
     </code></p></div>
@@ -3336,11 +3348,11 @@ hostname or IP address</td></tr>
     <div class="example"><h3>Example</h3><p><code>
       &lt;VirtualHost 10.1.2.3&gt;<br />
       <span class="indent">
-        ServerAdmin webmaster@host.foo.com<br />
-        DocumentRoot /www/docs/host.foo.com<br />
-        ServerName host.foo.com<br />
-        ErrorLog logs/host.foo.com-error_log<br />
-        TransferLog logs/host.foo.com-access_log<br />
+        ServerAdmin webmaster@host.example.com<br />
+        DocumentRoot /www/docs/host.example.com<br />
+        ServerName host.example.com<br />
+        ErrorLog logs/host.example.com-error_log<br />
+        TransferLog logs/host.example.com-access_log<br />
       </span>
       &lt;/VirtualHost&gt;
     </code></p></div>
@@ -3424,8 +3436,9 @@ hostname or IP address</td></tr>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/core.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
+<a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../tr/mod/core.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/core.html.ja.euc-jp b/docs/manual/mod/core.html.ja.euc-jp
deleted file mode 100644
index b00e3854..00000000
--- a/docs/manual/mod/core.html.ja.euc-jp
+++ /dev/null
@@ -1,3382 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>core - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥³¥¢µ¡Ç½</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="../en/mod/core.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/core.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¾ï¤Ë»ÈÍѲÄǽ¤Ê Apache HTTP ¥µ¡¼¥Ð¤Î¥³¥¢µ¡Ç½</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr></table>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#acceptfilter">AcceptFilter</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#acceptpathinfo">AcceptPathInfo</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#accessfilename">AccessFileName</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#adddefaultcharset">AddDefaultCharset</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#addoutputfilterbytype">AddOutputFilterByType</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#allowencodedslashes">AllowEncodedSlashes</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#allowoverride">AllowOverride</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authname">AuthName</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authtype">AuthType</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cgimapextension">CGIMapExtension</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#contentdigest">ContentDigest</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#defaulttype">DefaultType</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#directory">&lt;Directory&gt;</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#directorymatch">&lt;DirectoryMatch&gt;</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#documentroot">DocumentRoot</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#enablemmap">EnableMMAP</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#enablesendfile">EnableSendfile</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#errordocument">ErrorDocument</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#errorlog">ErrorLog</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#fileetag">FileETag</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#files">&lt;Files&gt;</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#filesmatch">&lt;FilesMatch&gt;</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#forcetype">ForceType</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#hostnamelookups">HostnameLookups</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#ifdefine">&lt;IfDefine&gt;</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#ifmodule">&lt;IfModule&gt;</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#include">Include</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#keepalive">KeepAlive</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#keepalivetimeout">KeepAliveTimeout</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#limit">&lt;Limit&gt;</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#limitexcept">&lt;LimitExcept&gt;</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#limitinternalrecursion">LimitInternalRecursion</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#limitrequestbody">LimitRequestBody</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#limitrequestfields">LimitRequestFields</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#limitrequestfieldsize">LimitRequestFieldSize</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#limitrequestline">LimitRequestLine</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#limitxmlrequestbody">LimitXMLRequestBody</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#location">&lt;Location&gt;</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#locationmatch">&lt;LocationMatch&gt;</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#loglevel">LogLevel</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#require">Require</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#rlimitcpu">RLimitCPU</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#rlimitmem">RLimitMEM</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#rlimitnproc">RLimitNPROC</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#satisfy">Satisfy</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#scriptinterpretersource">ScriptInterpreterSource</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#serveradmin">ServerAdmin</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#serveralias">ServerAlias</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#servername">ServerName</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#serverpath">ServerPath</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#serverroot">ServerRoot</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#serversignature">ServerSignature</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#servertokens">ServerTokens</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#sethandler">SetHandler</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#setinputfilter">SetInputFilter</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#setoutputfilter">SetOutputFilter</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#timeout">TimeOut</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#traceenable">TraceEnable</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#usecanonicalname">UseCanonicalName</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#usecanonicalphysicalport">UseCanonicalPhysicalPort</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#virtualhost">&lt;VirtualHost&gt;</a></li>
-</ul>
-</div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AcceptFilter" id="AcceptFilter">AcceptFilter</a> <a name="acceptfilter" id="acceptfilter">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥×¥í¥È¥³¥ë¤ò Listen ¤·¤Æ¤¤¤ë¥½¥±¥Ã¥È¤ÎºÇŬ²½¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AcceptFilter <var>protocol</var> <var>accept_filter</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.1.5 °Ê¹ß</td></tr>
-</table>
-    <p>Listen ¤·¤Æ¤¤¤ë¥½¥±¥Ã¥È¤ËÂФ·¤Æ¡¢OS ¤¬¸ÇÍ­¤Ë»ý¤Ã¤Æ¤¤¤ë¥×¥í¥È¥³¥ë¤Ë¤Ä¤¤¤Æ¤ÎºÇŬ²½¤ò
-       Í­¸ú¤Ë¤¹¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤¹¡£ÂçÁ°Äó¤È¤Ê¤ë¾ò·ï¤Ï¡¢¥Ç¡¼¥¿¤¬¼õ¿®¤µ¤ì¤ë¤«
-       HTTP ¥ê¥¯¥¨¥¹¥ÈÁ´ÂΤ¬¥Ð¥Ã¥Õ¥¡¤µ¤ì¤ë¤«¤¹¤ë¤Þ¤Ç¡¢¥«¡¼¥Í¥ë¤¬¥µ¡¼¥Ð¥×¥í¥»¥¹¤Ë
-       ¥½¥±¥Ã¥È¤òÁ÷¤é¤Ê¤¤¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤ë¡¢¤È¤¤¤¦¤³¤È¤Ç¤¹¡£¸½ºß¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¤Î¤Ï¡¢
-       <a href="http://www.freebsd.org/cgi/man.cgi?query=accept_filter&amp;sektion=9">
-       FreeBSD ¤Î Accept Filter</a> ¤È Linux ¤Î¥×¥ê¥ß¥Æ¥£¥Ö¤Ê
-       <code>TCP_DEFER_ACCEPT</code> ¤Î¤ß¤Ç¤¹¡£</p>
-
-    <p>FreeBSD ¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï :</p>
-    <div class="example"><p><code>
-        AcceptFilter http httpready <br />
-        AcceptFilter https dataready
-    </code></p></div>
-    
-    <p><code>httpready</code> Accept Filter ¤Ï HTTP ¥ê¥¯¥¨¥¹¥ÈÁ´ÂΤò¡¢
-       ¥«¡¼¥Í¥ë¥ì¥Ù¥ë¤Ç¥Ð¥Ã¥Õ¥¡¥ê¥ó¥°¤·¤Þ¤¹¡£¥ê¥¯¥¨¥¹¥ÈÁ´ÂΤò¼õ¿®¤·½ª¤ï¤ë¤È¡¢
-       ¤½¤Î¸å¥µ¡¼¥Ð¥×¥í¥»¥¹¤Ë¤½¤ì¤òÁ÷¤ê¤Þ¤¹¡£¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï <a href="http://www.freebsd.org/cgi/man.cgi?query=accf_http&amp;sektion=9">accf_http(9)</a> 
-       ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£HTTPS ¤Î¥ê¥¯¥¨¥¹¥È¤Ï°Å¹æ²½¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç <a href="http://www.freebsd.org/cgi/man.cgi?query=accf_data&amp;sektion=9">accf_data(9)</a>
-       ¥Õ¥£¥ë¥¿¤Î¤ß¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£</p>
-
-    <p>Linux ¤Ç¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï :</p>
-    <div class="example"><p><code>
-        AcceptFilter http data <br />
-        AcceptFilter https data
-    </code></p></div>
-
-    <p>Linux ¤Î <code>TCP_DEFER_ACCEPT</code> ¤Ï HTTP ¥ê¥¯¥¨¥¹¥È¤Î¥Ð¥Ã¥Õ¥¡¥ê¥ó¥°¤ò
-       ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£<code>none</code> °Ê³°¤ÎÃͤÇ
-       <code>TCP_DEFER_ACCEPT</code> ¤¬Í­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï Linux 
-       man ¥Ú¡¼¥¸ <a href="http://homepages.cwi.nl/~aeb/linux/man2html/man7/tcp.7.html">tcp(7)</a>
-       ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>°ú¿ô¤Ë <code>none</code> ¤ò»ØÄꤹ¤ë¤È¡¢¥×¥í¥È¥³¥ë¤ËÂФ¹¤ëÁ´¤Æ¤Î Accept 
-       Filter ¤¬Ìµ¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£<code>nntp</code> ¤È¤¤¤Ã¤¿¡¢Àè¤Ë¥µ¡¼¥Ð¤Ë¥Ç¡¼¥¿¤ò
-       Á÷¤ëɬÍפΤ¢¤ë¥×¥í¥È¥³¥ë¤ËÍ­¸ú¤Ç¤¹ :</p>
-    <div class="example"><p><code>AcceptFilter nttp none</code></p></div>
-
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AcceptPathInfo" id="AcceptPathInfo">AcceptPathInfo</a> <a name="acceptpathinfo" id="acceptpathinfo">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¸å¤Ë³¤¯¥Ñ¥¹Ì¾¾ðÊó¤ò¼õ¤±ÉÕ¤±¤ë¥ê¥½¡¼¥¹¤Î»ØÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AcceptPathInfo On|Off|Default</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>AcceptPathInfo Default</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0.30 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¼ÂºÝ¤Î¥Õ¥¡¥¤¥ë̾ (¤â¤·¤¯¤Ï¸ºß¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î
-    ¸ºß¤·¤Ê¤¤¥Õ¥¡¥¤¥ë) ¤Î¸å¤Ë³¤¯¥Ñ¥¹Ì¾¾ðÊ󤬤¢¤ë¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±ÉÕ¤±¤ë¤«
-    µñÈݤ¹¤ë¤«¤òÀ©¸æ¤·¤Þ¤¹¡£Â³¤­¤Î¥Ñ¥¹Ì¾¾ðÊó¤Ï¥¹¥¯¥ê¥×¥È¤Ë¤Ï <code>PATH_INFO</code>
-    ´Ä¶­ÊÑ¿ô¤È¤·¤ÆÍøÍѲÄǽ¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p>Î㤨¤Ð¡¢<code>/test/</code> ¤¬¡¢<code>here.html</code> ¤È¤¤¤¦¥Õ¥¡¥¤¥ë
-    °ì¤Ä¤Î¤ß¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»Ø¤·¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£¤½¤¦¤¹¤ë¤È¡¢
-    <code>/test/here.html/more</code> ¤È <code>/test/nothere.html/more</code>
-    ¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ÏξÊý¤È¤â <code>/more</code> ¤ò <code>PATH_INFO</code> ¤È¤·¤Þ¤¹¡£</p>
-
-    <p><code class="directive">AcceptPathInfo</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë»ØÄê²Äǽ¤Ê
-    »°¤Ä¤Î°ú¿ô¤Ï:</p>
-
-    <dl>
-    <dt><code>Off</code></dt><dd>¥ê¥¯¥¨¥¹¥È¤Ï¸ºß¤¹¤ë¥Ñ¥¹¤Ë¤½¤Î¤Þ¤Þ
-    ¥Þ¥Ã¥×¤µ¤ì¤ë¾ì¹ç¤Ë¤Î¤ß¼õ¤±ÉÕ¤±¤é¤ì¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢¾å¤ÎÎã¤Î
-    <code>/test/here.html/more</code> ¤Î¤è¤¦¤Ë¡¢ËÜÅö¤Î¥Õ¥¡¥¤¥ë̾¤Î
-    ¸å¤Ë¥Ñ¥¹Ì¾¾ðÊó¤¬Â³¤¯¥ê¥¯¥¨¥¹¥È¤Ë¤Ï 404 NOT FOUND ¥¨¥é¡¼¤¬ÊÖ¤ê¤Þ¤¹¡£</dd>
-
-    <dt><code>On</code></dt><dd>Á°¤ÎÊý¤Î¥Ñ¥¹¤¬Â¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤Ë¥Þ¥Ã¥×¤¹¤ë¾ì¹ç¤Ï
-    ¥ê¥¯¥¨¥¹¥È¤¬¼õ¤±ÉÕ¤±¤é¤ì¤Þ¤¹¡£¾å¤ÎÎã¤Î <code>/test/here.html/more</code>
-    ¤Ï <code>/test/here.html</code> ¤¬Í­¸ú¤Ê¥Õ¥¡¥¤¥ë¤Ë¥Þ¥Ã¥×¤¹¤ì¤Ð
-    ¼õ¤±ÉÕ¤±¤é¤ì¤Þ¤¹¡£</dd>
-    
-    <dt><code>Default</code></dt><dd>³¤­¤Î¥Ñ¥¹Ì¾¾ðÊó¤Î°·¤¤¤Ï¥ê¥¯¥¨¥¹¥È¤Î
-    <a href="../handler.html">¥Ï¥ó¥É¥é</a>¤Ç·è¤Þ¤ê¤Þ¤¹¡£
-    ÉáÄ̤Υե¡¥¤¥ë¤Î¤¿¤á¤Î¥³¥¢¥Ï¥ó¥É¥é¤Î¥Ç¥Õ¥©¥ë¥È¤Ï <code>PATH_INFO</code> ¤òµñÈݤ·¤Þ¤¹¡£
-    <a href="mod_cgi.html">cgi-script</a> ¤ä <a href="mod_isapi.html">isapi-handler</a> ¤Î¤è¤¦¤Ë¥¹¥¯¥ê¥×¥È¤ò°·¤¦¥Ï¥ó¥É¥é¤Ï
-    °ìÈÌŪ¤Ë¥Ç¥Õ¥©¥ë¥È¤Ç <code>PATH_INFO</code> ¤ò¼õ¤±ÉÕ¤±¤Þ¤¹¡£</dd>
-    </dl>
-
-    <p><code>AcceptPathInfo</code> ¤Î¼ç¤ÊÌÜŪ¤Ï¥Ï¥ó¥É¥é¤Î <code>PATH_INFO</code> ¤ò
-    ¼õ¤±ÉÕ¤±¤ë¤«µñÈݤ¹¤ë¤«¤ÎÁªÂò¤ò¾å½ñ¤­¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¤³¤È¤Ç¤¹¡£
-    Î㤨¤Ð¡¢¤³¤ì¤ÏÎ㤨¤Ð <a href="mod_include.html">INCLUDES</a> ¤Î¤è¤¦¤Ê
-    <a href="../filter.html">¥Õ¥£¥ë¥¿</a>¤ò»È¤Ã¤Æ <code>PATH_INFO</code> ¤Ë
-    ´ð¤Å¤¤¤Æ¥³¥ó¥Æ¥ó¥Ä¤òÀ¸À®¤·¤Æ¤¤¤ë¤È¤­¤ËɬÍפˤʤê¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      &lt;Files "mypaths.shtml"&gt;<br />
-      <span class="indent">
-        Options +Includes<br />
-        SetOutputFilter INCLUDES<br />
-        AcceptPathInfo On<br />
-      </span>
-      &lt;/Files&gt;
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AccessFileName" id="AccessFileName">AccessFileName</a> <a name="accessfilename" id="accessfilename">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ʬ»¶ÀßÄê¥Õ¥¡¥¤¥ë¤Î̾Á°</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AccessFileName <var>filename</var> [<var>filename</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>AccessFileName .htaccess</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>¥ê¥¯¥¨¥¹¥È¤ò½èÍý¤¹¤ë¤È¤­¡¢¥µ¡¼¥Ð¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ë
-    ÂФ·¤Æʬ»¶ÀßÄê¥Õ¥¡¥¤¥ë¤¬<a href="#allowoverride">Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ì¤Ð</a>¡¢
-    ¤½¤Î¥É¥­¥å¥á¥ó¥È¤Ø¤Î
-    ¥Ñ¥¹¾å¤Ë¤¢¤ëÁ´¤Æ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¡¢¤³¤³¤Ç»ØÄꤵ¤ì¤¿Ì¾Á°¤Î°ìÍ÷¤ÎÃæ¤Ç
-    ºÇ½é¤Ë¸«¤Ä¤«¤Ã¤¿¥Õ¥¡¥¤¥ë¤ò¤½¤ì¤¾¤ìÀßÄê¥Õ¥¡¥¤¥ë¤È¤·¤ÆÆɤ߹þ¤ß¤Þ¤¹¡£Î㤨¤Ð:</p>
-
-    <div class="example"><p><code>
-      AccessFileName .acl
-    </code></p></div>
-
-    <p>¤È¤¤¤¦ÀßÄ꤬¤¢¤ë¤È¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤Ê¤¤¸Â¤ê¡¢
-    ¥É¥­¥å¥á¥ó¥È <code>/usr/local/web/index.html</code>
-    ¤òÊÖ¤¹Á°¤Ë¡¢¥µ¡¼¥Ð¤Ï <code>/.acl</code>, <code>/usr/.acl</code>,
-    <code>/usr/local/.acl</code>, <code>/usr/local/web/.acl</code> ¤«¤é
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÆɤ߹þ¤ß¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      &lt;Directory /&gt;<br />
-      <span class="indent">
-        AllowOverride None<br />
-      </span>
-      &lt;/Directory&gt;
-    </code></p></div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#allowoverride">AllowOverride</a></code></li>
-<li><a href="../configuring.html">ÀßÄê¥Õ¥¡¥¤¥ë</a></li>
-<li><a href="../howto/htaccess.html">.htaccess ¥Õ¥¡¥¤¥ë</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddDefaultCharset" id="AddDefaultCharset">AddDefaultCharset</a> <a name="adddefaultcharset" id="adddefaultcharset">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥ì¥¹¥Ý¥ó¥¹¤Î¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤¬ <code>text/plain</code> ¤¢¤ë¤¤¤Ï
-<code>text/html</code> ¤Î¾ì¹ç¤ËÄɲ乤ë¥Ç¥Õ¥©¥ë¥È¤Î charset ¥Ñ¥é¥á¡¼¥¿</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddDefaultCharset On|Off|<var>charset</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>AddDefaultCharset Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>¥ì¥¹¥Ý¥ó¥¹¤Î¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤¬ <code>text/plain</code> 
-    ¤¢¤ë¤¤¤Ï <code>text/html</code> 
-    ¤Î¾ì¹ç¤Ë¸Â¤ê¤Þ¤¹¤¬¡¢¥ì¥¹¥Ý¥ó¥¹¤ËÄɲ乤ë¥á¥Ç¥£¥¢¥¿¥¤¥×¤Îʸ»ú¥»¥Ã¥È¥Ñ¥é¥á¡¼¥¿
-    (ʸ»ú¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î̾Á°) ¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤò¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤷ¤Þ¤¹¡£
-    ¤³¤ì¤Ï¥ì¥¹¥Ý¥ó¥¹ <span class="transnote">(<em>ÌõÃí:</em> ¥ì¥¹¥Ý¥ó¥¹¤Î HTML)</span> Æâ¤Ç <code>META</code> 
-    Í×ÁǤǻØÄꤵ¤ì¤¿¡¢¤É¤Î¤è¤¦¤Êʸ»ú¥»¥Ã¥È¤â̵¸ú¤Ë¤·¤Þ¤¹¤¬¡¢
-    ºÇ½ªÅª¤ÊµóÆ°¤Ï¥æ¡¼¥¶¤Î¥¯¥é¥¤¥¢¥ó¥È¦¤ÎÀßÄê¤Ç·è¤Þ¤ê¤Þ¤¹¡£
-    ¤³¤Îµ¡Ç½¤Ï <code>AddDefaultCharset Off</code> ¤È¤¤¤¦ÀßÄê¤Ç̵¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
-    <code>AddDefaultCharset On</code> ¤Ë¤¹¤ì¤Ð¡¢
-    Apache ÆâÉô¤Î¥Ç¥Õ¥©¥ë¥Èʸ»ú¥»¥Ã¥È <code>iso-8859-1</code> ¤ËÀßÄꤵ¤ì¤Þ¤¹¡£
-    ¤½¤Î¾ <var>charset</var> ¤Ë»ØÄê¤Ç¤­¤ëÃͤǤ¢¤ì¤Ð¡¢¤É¤ó¤ÊÃͤǤâ»È¤¨¤Þ¤¹¡£
-    »ØÄꤹ¤ëÃͤϡ¢MIME ¥á¥Ç¥£¥¢¥¿¥¤¥×¤È¤·¤Æ»È¤ï¤ì¤ë
-    <a href="http://www.iana.org/assignments/character-sets">IANA 
-    ¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤ëʸ»ú¥»¥Ã¥È̾</a>¤Î¤¦¤Á¤Î°ì¤Ä¤Ë¤¹¤Ù¤­¤Ç¤¹¡£
-    Î㤨¤Ð:</p>
-
-    <div class="example"><p><code>
-      AddDefaultCharset utf-8
-    </code></p></div>
-
-    <p><code class="directive">AddDefaultCharset</code> ¤ò»È¤¦¤È¤­¤Ï¡¢Á´¤Æ¤Î¥Æ¥­¥¹¥È¥ê¥½¡¼¥¹¤¬
-    »ØÄꤹ¤ëʸ»ú¥¨¥ó¥³¡¼¥É¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤Èʬ¤«¤Ã¤Æ¤¤¤Æ¡¢¤«¤Ä¡¢
-    ¥ê¥½¡¼¥¹¤Î¸Ä¡¹¤Ëʸ»ú¥»¥Ã¥È¤ò»ØÄꤹ¤ë¤Î¤¬ÂçÊѤʾì¹ç¤Î¤ß¤Ç¤¹¡£
-    Îã¤òµó¤²¤ë¤È¡¢¥ì¥¬¥·¡¼¤Ê CGI ¥¹¥¯¥ê¥×¥È¤Ê¤É¤Î¡¢Æ°Åª¤ËÀ¸À®¤µ¤ì¤ë
-    ¥³¥ó¥Æ¥ó¥Ä¤ò´Þ¤à¥ê¥½¡¼¥¹¤Ëʸ»ú¥»¥Ã¥È¥Ñ¥é¥á¡¼¥¿¤òÄɲ乤ë¾ì¹ç¤Ç¡¢
-    ¥æ¡¼¥¶¤ÎÆþÎϥǡ¼¥¿¤¬½ÐÎϤËÆþ¤ê¡¢¥¯¥í¥¹¥µ¥¤¥È¥¹¥¯¥ê¥×¥Æ¥£¥ó¥°¤¬
-    °ú¤­µ¯¤³¤µ¤ì¤¦¤ë¾ì¹ç¤Ç¤¹¡£¥Ç¥Õ¥©¥ë¥Èʸ»ú¥»¥Ã¥È¤ò¥»¥Ã¥È¤·¤¿¤È¤·¤Æ¤â¡¢
-    ¥Ö¥é¥¦¥¶¤Î "ʸ»ú¥¨¥ó¥³¡¼¥É¤Î¼«Æ°ÁªÂò" µ¡Ç½¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¥æ¡¼¥¶¤ò
-    ¼é¤ë¤³¤È¤Ë¤Ï¤Ê¤é¤Ê¤¤¤Î¤Ç¡¢¤â¤Á¤í¤ó¤è¤êÎɤ¤²ò·èºö¤Ïñ¤Ë¥¹¥¯¥ê¥×¥È¤ò½¤Àµ
-    (¤¢¤ë¤¤¤Ïºï½ü) ¤¹¤ë¤³¤È¤Ç¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="../mod/mod_mime.html#addcharset">AddCharset</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddOutputFilterByType" id="AddOutputFilterByType">AddOutputFilterByType</a> <a name="addoutputfilterbytype" id="addoutputfilterbytype">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>MIME-type ¤Ë½ÐÎÏ¥Õ¥£¥ë¥¿¤ò³ä¤êÅö¤Æ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddOutputFilterByType <var>filter</var>[;<var>filter</var>...] <var>MIME-type</var>
-[<var>MIME-type</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0.33 °Ê¹ß¤Ç»ÈÍѲÄǽ¡£¤¿¤À¤· 2.1 °Ê¹ß¤ÇÈó¿ä¾©¡£</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï±þÅú¤Î <a class="glossarylink" href="../glossary.html#mime-type" title="ÍѸ콸¤ò»²¾È">MIME ¥¿¥¤¥×</a> ¤Ë±þ¤¸¤Æ½ÐÎÏ<a href="../filter.html">¥Õ¥£¥ë¥¿</a>¤ò»ÈÍѤ¹¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
-    ¤¿¤À¤·²¼¤ÇÀâÌÀ¤µ¤ì¤ëÍýͳ¤Ë¤è¤ê¡¢Ëܥǥ£¥ì¥¯¥Æ¥£¥Ö¤ÏÈó¿ä¾©¤Ç¤¹¡£
-    ƱÅù¤Îµ¡Ç½¤Ï <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> ¤ÇÍøÍѤǤ­¤Þ¤¹¡£</p>
-
-    <p>¼¡¤ÎÎã¤Ï <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> ¤Î <code>DEFLATE</code> ¥Õ¥£¥ë¥¿¤ò
-    »È¤Ã¤Æ¤¤¤Þ¤¹¡£<code>text/html</code> ¤È <code>text/plain</code> ¤Î
-    ¤¹¤Ù¤Æ¤Î½ÐÎÏ (ÀÅŪ¤Ê¤â¤Î¤âưŪ¤Ê¤â¤Î¤â) ¤ò¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤é¤ì¤ëÁ°¤Ë
-    °µ½Ì¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      AddOutputFilterByType DEFLATE text/html text/plain
-    </code></p></div>
-
-    <p>Ê£¿ô¤Î¥Õ¥£¥ë¥¿¤Ç¥³¥ó¥Æ¥ó¥Ä¤ò½èÍý¤µ¤»¤¿¤¤¤È¤­¤Ï¡¢¤½¤ì¤¾¤ì¤Î̾Á°¤ò¥»¥ß¥³¥í¥ó¤Ç
-    ʬ¤±¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£³Æ¥Õ¥£¥ë¥¿¤ËÂФ·¤Æ
-    <code class="directive">AddOutputFilterByType</code> ¤ò°ì¤Ä¤º¤Ä½ñ¤¯¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¼¡¤ÎÎã¤Ï <code>text/html</code> ¤Î¥¹¥¯¥ê¥×¥È¤Î¤¹¤Ù¤Æ¤Î½ÐÎϤò
-    ¤Þ¤º <code>INCLUDES</code> ¥Õ¥£¥ë¥¿¤Ç½èÍý¤·¡¢¤µ¤é¤Ë <code>DEFLATE</code> ¥Õ¥£¥ë¥¿¤Ë¤«¤±¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-    &lt;Location /cgi-bin/&gt;<br />
-    <span class="indent">
-      Options Includes<br />
-      AddOutputFilterByType INCLUDES;DEFLATE text/html<br />
-    </span>
-    &lt;/Location&gt;
-    </code></p></div>
-
-    <div class="warning"><h3>Ãí:</h3>
-      <p><code class="directive">AddOutputFilterByType</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê
-      Í­¸ú¤Ë¤·¤¿¥Õ¥£¥ë¥¿¤Ï¾ì¹ç¤Ë¤è¤Ã¤Æ¤Ï¡¢ÉôʬŪ¤â¤·¤¯¤Ï´°Á´¤ËŬÍѤµ¤ì¤Ê¤¤¤³¤È¤¬
-      ¤¢¤ê¤Þ¤¹¡£Î㤨¤Ð¡¢<a class="glossarylink" href="../glossary.html#mime-type" title="ÍѸ콸¤ò»²¾È">MIME ¥¿¥¤¥×</a> ¤¬·èÄê¤Ç¤­¤Ê¤¤¤È¤­¤Ë¤Ï
-      <code class="directive"><a href="#defaulttype">DefaultType</a></code> ¤ÎÀßÄ꤬Ʊ¤¸¤À¤Ã¤¿¤È¤·¤Æ¤â¡¢
-      <code class="directive"><a href="#defaulttype">DefaultType</a></code> ÀßÄê¤ò»È¤¦¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-      <p>¤·¤«¤·¡¢³Î¼Â¤Ë¥Õ¥£¥ë¥¿¤¬Å¬ÍѤµ¤ì¤ë¤è¤¦¤Ë¤·¤¿¤¤¤È¤­¤Ï¡¢¥ê¥½¡¼¥¹¤Ë
-      ÌÀ¼¨Åª¤Ë¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤ò³ä¤êÅö¤Æ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤ì¤Ë¤ÏÎ㤨¤Ð
-      <code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ä
-      <code class="directive"><a href="#forcetype">ForceType</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¤¤Þ¤¹¡£
-      (nph¤Ç¤Ê¤¤) CGI ¥¹¥¯¥ê¥×¥È¤Ç¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤òÀßÄꤹ¤ë¤È¤¤¤¦¤â¤Î¤Ç¤â
-      Âç¾æÉפǤ¹¡£</p>
-
-      <p>¥¿¥¤¥×Ëè¤Î½ÐÎÏ¥Õ¥£¥ë¥¿¤Ï¥×¥í¥­¥·¥ê¥¯¥¨¥¹¥È¤Ë¤Ï·è¤·¤ÆŬÍѤµ¤ì¤Þ¤»¤ó¡£</p>
-    </div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code></li>
-<li><code class="directive"><a href="#setoutputfilter">SetOutputFilter</a></code></li>
-<li><a href="../filter.html">¥Õ¥£¥ë¥¿</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AllowEncodedSlashes" id="AllowEncodedSlashes">AllowEncodedSlashes</a> <a name="allowencodedslashes" id="allowencodedslashes">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>URL Ãæ¤ÎÉä¹æ²½¤µ¤ì¤¿¥Ñ¥¹Ê¬Î¥Ê¸»ú¤¬Àè¤ËÅÁ¤¨¤é¤ì¤ë¤Î¤òµö²Ä¤¹¤ë¤«¤É¤¦¤«¤ò
-·èÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AllowEncodedSlashes On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>AllowEncodedSlashes Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0.46 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p><code class="directive">AllowEncodedSlashes</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÉä¹æ²½¤µ¤ì¤¿
-    ¥Ñ¥¹Ê¬Î¥Ê¸»ú (<code>/</code> ¤Ï <code>%2F</code>¡¢¤µ¤é¤Ë¥·¥¹¥Æ¥à¤Ë¤è¤Ã¤Æ¤Ï
-    <code>\</code> ¤ËÂбþ¤¹¤ë <code>%5C</code>) ¤¬Â¸ºß¤¹¤ë URL ¤Î»ÈÍѤò
-    µö²Ä¤¹¤ë¤«¤É¤¦¤«¤ò·èÄꤷ¤Þ¤¹¡£Ä̾ï¤Ï¤½¤Î¤è¤¦¤Ê URL ¤Ï 404 (Not found) ¥¨¥é¡¼
-    ¤ÇµñÈݤµ¤ì¤Þ¤¹¡£</p>
-
-    <p><code class="directive">AllowEncodedSlashes</code> <code>On</code> ¤Ë¤è¤ë
-    ¥Ñ¥¹Ê¬Î¥Ê¸»ú¤Î»ÈÍѤϡ¢<code>PATH_INFO</code> ¤È¹ç¤ï¤»¤Æ
-    »È¤¦¤È¤­¤Ë°ìÈÖÌò¤ËΩ¤Á¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>Ãí</h3>
-      <p>Éä¹æ²½¤µ¤ì¤¿¥¹¥é¥Ã¥·¥å¤òµö²Ä¤¹¤ë¤³¤È¤Ï¡¢<em>Éü¹æ</em>¤ò¤¹¤ë¤³¤È¤ò
-       °ÕÌ£<em>¤·¤Þ¤»¤ó</em>¡£<code>%2F</code> ¤ä (´Ø·¸¤¹¤ë¥·¥¹¥Æ¥à¤Ç¤Î)
-       <code>%5C</code> ¤Ï¡¢Â¾¤ÎÉôʬ¤¬Éü¹æ¤µ¤ì¤¿ URL ¤ÎÃæ¤Ç¤â¤½¤Î¤Þ¤Þ¤Î·Á¼°¤Ç
-       »Ä¤µ¤ì¤Þ¤¹¡£</p>
-    </div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#acceptpathinfo">AcceptPathInfo</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AllowOverride" id="AllowOverride">AllowOverride</a> <a name="allowoverride" id="allowoverride">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td><code>.htaccess</code> ¤Çµö²Ä¤µ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¼ïÎà</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AllowOverride All|None|<var>directive-type</var> 
-[<var>directive-type</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>AllowOverride All</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>¥µ¡¼¥Ð¤¬ (<code class="directive"><a href="#accessfilename">AccessFileName</a></code> ¤Ë¤è¤Ã¤Æ»ØÄꤵ¤ì¤¿)
-    <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤¿»þ¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ç
-    Àë¸À¤µ¤ì¤¿¤É¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬¤è¤êÁ°¤ËÄêµÁ¤µ¤ì¤¿ÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    ¾å½ñ¤­¤Ç¤­¤ë¤«¤òÃΤëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>&lt;Directory&gt; ¥»¥¯¥·¥ç¥ó¤Ç¤Î¤ß»ÈÍѲÄǽ</h3>
-    <code class="directive">AllowOverride</code> ¤ÏÀµµ¬É½¸½Ìµ¤·¤Î<code class="directive"><a href="#directory">&lt;Directory&gt;</a></code>
-    ¥»¥¯¥·¥ç¥ó¤Ç¤Î¤ßÍ­¸ú¤Ç¡¢<code class="directive"><a href="#location">&lt;Location&gt;</a></code> ¤ä <code class="directive"><a href="#directorymatch">&lt;DirectoryMatch&gt;</a></code>
-    ¤ä <code class="directive"><a href="#files">&lt;Files&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤Ç¤Ï̵¸ú¤Ç¤¹¡£
-    </div>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò <code>None</code> ¤ËÀßÄꤹ¤ë¤È¡¢<a href="#accessfilename">.htaccess</a> ¥Õ¥¡¥¤¥ë¤Ï´°Á´¤Ë
-    ̵»ë¤µ¤ì¤Þ¤¹¡£
-    ¤³¤Î¾ì¹ç¡¢¥µ¡¼¥Ð¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤òÆɤळ¤È¤ò
-    »î¤ß¤µ¤¨¤·¤Þ¤»¤ó¡£</p>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬ <code>All</code> ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë»þ¤Ë¤Ï¡¢
-    <code>.htaccess</code> ¤È¤¤¤¦ <a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È</a> ¤ò»ý¤Ä
-    Á´¤Æ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬ÍøÍѤǤ­¤Þ¤¹¡£</p>
-
-    <p><var>directive-type</var> ¤Ë¤Ï¡¢°Ê²¼¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö·²¤Î
-    ¥­¡¼¥ï¡¼¥É¤Î¤É¤ì¤«¤ò»ØÄꤷ¤Þ¤¹¡£</p>
-
-    <dl>
-      <dt>AuthConfig</dt>
-
-      <dd>
-
-      ǧ¾Ú¤Ë´Ø¤¹¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î»ÈÍѤòµö²Ä¤¹¤ë (<code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></code>,
-      <code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code>,
-      <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code>,
-      <code class="directive"><a href="#authname">AuthName</a></code>, 
-      <code class="directive"><a href="#authtype">AuthType</a></code>, <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>, <code class="directive"><a href="#require">Require</a></code> <em>¤Ê¤É</em>)¡£</dd>
-
-      <dt>FileInfo</dt>
-
-      <dd>
-      ¥É¥­¥å¥á¥ó¥È¥¿¥¤¥×¤òÀ©¸æ¤¹¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö (<code class="directive"><a href="#defaulttype">DefaultType</a></code>, <code class="directive"><a href="#errordocument">ErrorDocument</a></code>, <code class="directive"><a href="#forcetype">ForceType</a></code>, <code class="directive"><a href="../mod/mod_negotiation.html#languagepriority">LanguagePriority</a></code>,
-      <code class="directive"><a href="#sethandler">SetHandler</a></code>, <code class="directive"><a href="#setinputfilter">SetInputFilter</a></code>, <code class="directive"><a href="#setoutputfilter">SetOutputFilter</a></code>, 
-      <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> ¤Î Add* ¤È Remove*
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö<em>¤Ê¤É</em>)¡¢
-      ¥É¥­¥å¥á¥ó¥È¤Î¥á¥¿¥Ç¡¼¥¿¤òÀ©¸æ¤¹¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö (<code class="directive"><a href="../mod/mod_headers.html#header">Header</a></code>, <code class="directive"><a href="../mod/mod_headers.html#requestheader">RequestHeader</a></code>, <code class="directive"><a href="../mod/mod_setenvif.html#setenvif">SetEnvIf</a></code>, <code class="directive"><a href="../mod/mod_setenvif.html#setenvifnocase">SetEnvIfNoCase</a></code>, <code class="directive"><a href="../mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code>, <code class="directive"><a href="../mod/mod_usertrack.html#cookieexpires">CookieExpires</a></code>, <code class="directive"><a href="../mod/mod_usertrack.html#cookiedomain">CookieDomain</a></code>, <code class="directive"><a href="../mod/mod_usertrack.html#cookiestyle">CookieStyle</a></code>, <code class="directive"><a href="../mod/mod_usertrack.html#cookietracking">CookieTracking</a></code>, <code class="directive"><a href="../mod/mod_usertrack.html#cookiename">CookieName</a></code>),
-      <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö <code class="directive"><a href="../mod/mod_rewrite.html#rewriteengine">RewriteEngine</a></code>, <code class="directive"><a href="../mod/mod_rewrite.html#rewriteoptions">RewriteOptions</a></code>, <code class="directive"><a href="../mod/mod_rewrite.html#rewritebase">RewriteBase</a></code>, <code class="directive"><a href="../mod/mod_rewrite.html#rewritecond">RewriteCond</a></code>, <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>) ¤È
-      <code class="module"><a href="../mod/mod_actions.html">mod_actions</a></code> ¤Î
-      <code class="directive"><a href="../mod/mod_actions.html#action">Action</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î»ÈÍѤòµö²Ä¤¹¤ë¡£</dd>
-
-      <dt>Indexes</dt>
-
-      <dd>
-      ¥Ç¥£¥ì¥¯¥È¥ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤òÀ©¸æ¤¹¤ë¤¿¤á¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î»ÈÍѤòµö²Ä¤¹¤ë
-      (<code class="directive"><a href="../mod/mod_autoindex.html#adddescription">AddDescription</a></code>,
-      <code class="directive"><a href="../mod/mod_autoindex.html#addicon">AddIcon</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#addiconbyencoding">AddIconByEncoding</a></code>,
-      <code class="directive"><a href="../mod/mod_autoindex.html#addiconbytype">AddIconByType</a></code>,
-      <code class="directive"><a href="../mod/mod_autoindex.html#defaulticon">DefaultIcon</a></code>, <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#fancyindexing">FancyIndexing</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#headername">HeaderName</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#indexignore">IndexIgnore</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#indexoptions">IndexOptions</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#readmename">ReadmeName</a></code>
-      <em>¤Ê¤É</em>)¡£</dd>
-
-      <dt>Limit</dt>
-
-      <dd>
-      ¥Û¥¹¥È¤Ø¤Î¥¢¥¯¥»¥¹À©¸æ¤ò¹Ô¤¦¤¿¤á¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î»ÈÍѤòµö²Ä¤¹¤ë (<code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code>, <code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code>, <code class="directive"><a href="../mod/mod_authz_host.html#order">Order</a></code>).</dd>
-
-      <dt>Options[=<var>Option</var>,...]</dt>
-
-      <dd>
-      ÆÃÄê¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤ª¤±¤ëµ¡Ç½¤ò»ØÄꤹ¤ë¤¿¤á¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î»ÈÍѤòµö²Ä¤¹¤ë
-      (<code class="directive"><a href="#options">Options</a></code> ¤È
-      <code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code>)¡£
-      <code class="directive"><a href="#options">Options</a></code> ¤ÇÀßÄꤹ¤ë¥ª¥×¥·¥ç¥ó
-      ¤ò¡¢(¶õÇò¤ò´Þ¤á¤Ê¤¤) ¥³¥ó¥Þ¶èÀÚ¤ê¤Î¥ê¥¹¥È¤Ë¤·¤ÆÅù¹æ¤Î¸å¤Ë³¤±¤ë¤³¤È¤Ç
-      ÀßÄê¤Ç¤­¤Þ¤¹¡£</dd>
-    </dl>
-
-    <p>Îã:</p>
-
-    <div class="example"><p><code>
-      AllowOverride AuthConfig Indexes
-    </code></p></div>
-
-    <p>¾å¤ÎÎã¤Ç¤Ï <code>AuthConfig</code> ¤È <code>Indexes</code> ¤Î¤É¤Á¤é¤Ë¤â
-    °¤µ¤Ê¤¤¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤¹¤Ù¤ÆÆâÉô¥µ¡¼¥Ð¥¨¥é¡¼¤ò°ú¤­µ¯¤³¤·¤Þ¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#accessfilename">AccessFileName</a></code></li>
-<li><a href="../configuring.html">ÀßÄê¥Õ¥¡¥¤¥ë</a></li>
-<li><a href="../howto/htaccess.html">.htaccess ¥Õ¥¡¥¤¥ë</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthName" id="AuthName">AuthName</a> <a name="authname" id="authname">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>HTTP ǧ¾Ú¤Îǧ²ÄÎΰè (ÌõÃí: realm)</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AuthName <var>auth-domain</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤ËÂФ¹¤ëǧ²ÄÎΰè (ÌõÃí: realm)
-    ¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£
-    ǧ²ÄÎΰè¤Ï¡¢ÍøÍѼԤ¬¤É¤Î¥æ¡¼¥¶Ì¾¤È¥Ñ¥¹¥ï¡¼¥É¤òÁ÷¿®¤¹¤ì¤Ð¤è¤¤¤Î¤«¤ò
-    ¥¯¥é¥¤¥¢¥ó¥È¤Ë¶µ¤¨¤ë¤¿¤á¤ËÍøÍѤ·¤Þ¤¹¡£
-    <code class="directive">AuthName</code> ¤Ï°ì¤Ä¤Î°ú¿ô¤ò¤È¤ê¡¢
-    ¥¹¥Ú¡¼¥¹¤¬´Þ¤Þ¤ì¤ë¾ì¹ç¤Ë¤Ï¡¢
-    °úÍÑÉä¤Ç³ç¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    <code class="directive"><a href="#authtype">AuthType</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ä
-    <code class="directive"><a href="#require">Require</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È¡¢
-    <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code> ¤ä
-    <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code> ¤Ê¤É¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    °ì½ï¤ËÍøÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-   <p>Î㤨¤Ð:</p>
-
-   <div class="example"><p><code>
-     AuthName "Top Secret"
-   </code></p></div>
-
-    <p>¤³¤³¤Ç <code>AuthName</code> ¤Ë»ØÄꤷ¤¿Ê¸»úÎ󤬡¢
-    ÂçÉôʬ¤Î¥Ö¥é¥¦¥¶¤Î¥Ñ¥¹¥ï¡¼¥É¥À¥¤¥¢¥í¥°¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../howto/auth.html">ǧ¾Ú¡¢¾µÇ§¡¢¥¢¥¯¥»¥¹À©¸æ</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthType" id="AuthType">AuthType</a> <a name="authtype" id="authtype">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥æ¡¼¥¶Ç§¾Ú¤Î¼ïÎà</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AuthType Basic|Digest</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÂоݥǥ£¥ì¥¯¥È¥ê¤ÇÍøÍѤ¹¤ë¥æ¡¼¥¶¡¼Ç§¾Ú¤Î¼ïÎà¤òÁª¤Ó¤Þ¤¹¡£
-    »ÈÍѤǤ­¤ëǧ¾ÚÊý¼°¤Ï <code>Basic</code> (<code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> 
-    ¤Ç¼ÂÁõ) ¤È <code>Digest</code> (<code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>
-    ¤Ç¼ÂÁõ) ¤Ç¤¹¡£</p>
-
-    <p>ǧ¾Ú¤òÍ­¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢<code class="directive"><a href="#authname">AuthName</a></code>
-    ¤È <code class="directive"><a href="#require">Require</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤â
-    »È¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£¤½¤ì¤Ë²Ã¤¨¤Æǧ¾Ú¥×¥í¥Ð¥¤¥À¥â¥¸¥å¡¼¥ë¤Î
-    <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code> Åù¤È¡¢¾µÇ§¥â¥¸¥å¡¼¥ë
-    <code class="module"><a href="../mod/mod_authz_user.html">mod_authz_user</a></code> Åù¤â¥µ¡¼¥Ð¤ËÁȤ߹þ¤àɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../howto/auth.html">ǧ¾Ú¡¢¾µÇ§¡¢¥¢¥¯¥»¥¹À©¸æ</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CGIMapExtension" id="CGIMapExtension">CGIMapExtension</a> <a name="cgimapextension" id="cgimapextension">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>CGI ¥¹¥¯¥ê¥×¥È¤Î¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Î°ÌÃÖ¤òÄ´¤Ù¤ë¤¿¤á¤Î¼êË¡</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CGIMapExtension <var>cgi-path</var> <var>.extension</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>NetWare ¤Î¤ß</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï Apache ¤¬ CGI ¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Î
-    ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤òõ¤¹ÊýË¡¤òÀ©¸æ¤·¤Þ¤¹¡£
-    Î㤨¤Ð¡¢<code>CGIMapExtension sys:\foo.nlm .foo</code> ¤ÈÀßÄꤹ¤ë¤È
-    <code>.foo</code> ¤È¤¤¤¦³ÈÄ¥»Ò¤Î¤¹¤Ù¤Æ¤Î CGI ¥¹¥¯¥ê¥×¥È¤Ï FOO ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Ë
-    ÅϤµ¤ì¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ContentDigest" id="ContentDigest">ContentDigest</a> <a name="contentdigest" id="contentdigest">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td><code>Content-MD5</code> HTTP ±þÅú¥Ø¥Ã¥À¤ÎÀ¸À®¤òÍ­¸ú¤Ë¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ContentDigest On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ContentDigest Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Options</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢RFC1864 µÚ¤Ó RFC2068 ¤Ë¤ª¤¤¤ÆÄêµÁ¤µ¤ì¤Æ¤¤¤ë
-    <code>Content-MD5</code> ¥Ø¥Ã¥À¡¼¤ÎÀ¸À®¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£</p>
-
-    <p>MD5 ¤Ï¡¢Ç¤°ÕĹ¤Î¥Ç¡¼¥¿¤Î¡Ö¥á¥Ã¥»¡¼¥¸¥À¥¤¥¸¥§¥¹¥È¡×(¡Ö»ØÌæ¡×
-    ¤Èɽ¸½¤µ¤ì¤ë¤³¤È¤â¤¢¤ë) ¤ò·×»»¤¹¤ë¥¢¥ë¥´¥ê¥º¥à¤Ç¡¢
-    ¥Ç¡¼¥¿¤ÎÊѹ¹¤¬¤¢¤Ã¤¿¾ì¹ç¤Ë¤ÏÈó¾ï¤Ë¹â¤¤¿®ÍêÅ٤ǥá¥Ã¥»¡¼¥¸¥À¥¤¥¸¥§¥¹¥È¤ËÊѹ¹¤¬
-    È¿±Ç¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p><code>Content-MD5</code> ¥Ø¥Ã¥À¤Ï¡¢¥¨¥ó¥É¥Ä¡¼¥¨¥ó¥É¤Ç
-    ¥¨¥ó¥Æ¥£¥Æ¥£¥Ü¥Ç¥£¡¼¤Ë´Þ¤Þ¤ì¤ë¥á¥Ã¥»¡¼¥¸¤Î´°Á´À­¥Á¥§¥Ã¥¯
-    (Message Integrity Check - MIC)¤òÄ󶡤·¤Þ¤¹¡£
-    ¤³¤Î¥Ø¥Ã¥À¤òÄ´¤Ù¤ë¤³¤È¤Ç¡¢¥×¥í¥­¥·¤ä¥¯¥é¥¤¥¢¥ó¥È¤Ï¡¢
-    ÅÓÃæ·ÐÏ©¤Ë¤ª¤±¤ë¥¨¥ó¥Æ¥£¥Æ¥£¥Ü¥Ç¥£¤Îͽ´ü¤»¤ÌÊѹ¹¤Ê¤É¤ò
-    ¸¡½Ð¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Ø¥Ã¥À¤ÎÎã:</p>
-
-    <div class="example"><p><code>
-      Content-MD5: AuLb7Dp1rqtRtxz2m9kRpA==
-    </code></p></div>
-
-    <p>¥ê¥¯¥¨¥¹¥ÈËè¤Ë¥á¥Ã¥»¡¼¥¸¥À¥¤¥¸¥§¥¹¥È¤ò·×»»¤¹¤ë (Ãͤϥ­¥ã¥Ã¥·¥å¤µ¤ì¤Þ¤»¤ó)
-    ¤³¤È¤«¤é¡¢
-    ¥µ¡¼¥Ð¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤¬Äã²¼¤¹¤ë¤³¤È¤Ë¤Ä¤¤¤ÆÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p><code>Content-MD5</code>¤Ï¡¢<code class="module"><a href="../mod/core.html">core</a></code> µ¡Ç½¤Ë¤è¤ê½èÍý¤µ¤ì¤¿
-    ¥É¥­¥å¥á¥ó¥È¤òÁ÷¤ë¤È¤­¤Î¤ßÍ­¸ú¤Ç¤¢¤ê¡¢
-    SSI ¥É¥­¥å¥á¥ó¥È¤ä CGI ¥¹¥¯¥ê¥×¥È¤Î½ÐÎÏ¡¢¥Ð¥¤¥È¥ì¥ó¥¸¤ò»ØÄꤷ¤¿
-    ±þÅú¤Î¾ì¹ç¤Ë¤Ï¤³¤Î¥Ø¥Ã¥À¤ÏÉÕÍ¿¤µ¤ì¤Þ¤»¤ó¡£
-    </p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DefaultType" id="DefaultType">DefaultType</a> <a name="defaulttype" id="defaulttype">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤¬¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤ò·èÄê¤Ç¤­¤Ê¤¤¤È¤­¤Ë
-Á÷¤é¤ì¤ë MIME ¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>DefaultType <var>MIME-type</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>DefaultType text/plain</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>¥µ¡¼¥Ð¤Ï¡¢<a class="glossarylink" href="../glossary.html#mime-type" title="ÍѸ콸¤ò»²¾È">MIME ¥¿¥¤¥×</a>
-    ¤Î¥Þ¥Ã¥Ô¥ó¥°¤Ç¤Ï·èÄê¤Ç¤­¤Ê¤¤
-    ¥É¥­¥å¥á¥ó¥È¤ÎÁ÷¿®¤òÍ׵ᤵ¤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>¥µ¡¼¥Ð¤Ï¡¢¥É¥­¥å¥á¥ó¥È¤Î¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤ò¥¯¥é¥¤¥¢¥ó¥È¤ËÄÌÃΤ¹¤ëɬÍפ¬
-    ¤¢¤ê¤Þ¤¹¤Î¤Ç¡¢¤³¤Î¤è¤¦¤Ë¥¿¥¤¥×¤¬Ì¤ÃΤξì¹ç¤Ï
-    <code>DefaultType</code> ¤Ç»ØÄꤵ¤ì¤¿¥¿¥¤¥×¤òÍøÍѤ·¤Þ¤¹¡£
-    Îã:</p>
-
-    <div class="example"><p><code>
-      DefaultType image/gif
-    </code></p></div>
-
-    <p>¤³¤ì¤Ï <code>.gif</code> ¤È¤¤¤¦³ÈÄ¥»Ò¤¬¥Õ¥¡¥¤¥ë̾¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Ê¤¤
-    ¿¤¯¤Î GIF ²èÁü¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ËŬ¤·¤Æ¤¤¤ë¤Ç¤·¤ç¤¦¡£</p>
-
-    <p><code class="directive"><a href="#forcetype">ForceType</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    °ã¤Ã¤Æ¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥Ç¥Õ¥©¥ë¥È¤Î MIME ¥¿¥¤¥×¤òÄ󶡤¹¤ë¤À¤±¤Ç
-    ¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤ò´Þ¤á¡¢
-    ¥á¥Ç¥£¥¢¥¿¥¤¥×¤ò·èÄê¤Ç¤­¤ë¾¤Î MIME ¥¿¥¤¥×¤ÎÄêµÁ¤¬¤¢¤ì¤Ð
-    ¤³¤Î¥Ç¥Õ¥©¥ë¥È¤Ï¾å½ñ¤­¤µ¤ì¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Directory" id="Directory">&lt;Directory&gt;</a> <a name="directory" id="directory">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>»ØÄê¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Ç¥£¥ì¥¯¥È¥ê¤È¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤È¤Î¤ß¤Ë
-ŬÍѤµ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò°Ï¤à</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>&lt;Directory <var>directory-path</var>&gt;
-... &lt;/Directory&gt;</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤È¤½¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Î¤ß
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òŬÍѤµ¤»¤ë¤¿¤á¤Ë¤Ï¡¢
-    <code class="directive">&lt;Directory&gt;</code> ¤È 
-    <code>&lt;/Directory&gt;</code> ¤òÂФȤ·¤Æ¡¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö·²¤ò°Ï¤¤¤Þ¤¹¡£
-    ¤½¤ÎÃæ¤Ë¤Ï¡¢¥Ç¥£¥ì¥¯¥È¥ê¥³¥ó¥Æ¥­¥¹¥È¤Çµö²Ä¤µ¤ì¤¿Á´¤Æ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    ÍøÍѤǤ­¤Þ¤¹¡£
-    <var>directive-path</var> ¤Ï¡¢¥Õ¥ë¥Ñ¥¹¤â¤·¤¯¤Ï Unix ¤Î¥·¥§¥ë·Á¼°¤Î
-    ¥ï¥¤¥ë¥É¥«¡¼¥É¤ò»ØÄꤷ¤Þ¤¹¡£
-    <code>?</code> ¤ÏǤ°Õ¤Î 1 ʸ»ú¡¢<code>*</code> ¤ÏǤ°Õ¤Îʸ»úÎó¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
-    ¥·¥§¥ë¤Ë¤ª¤±¤ë»ØÄêƱÍÍ¡¢Ê¸»ú¤ÎÈϰϤò <code>[]</code> ¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£
-    ¥ï¥¤¥ë¥É¥«¡¼¥É¤Ï `/' ʸ»ú¤Ë¤Ï¥Þ¥Ã¥Á¤·¤Þ¤»¤ó¤Î¤Ç¡¢
-    <code>/home/user/public_html</code> ¤Ë¤Ï
-    <code>&lt;Directory /*/public_html&gt;</code> ¤Ï¥Þ¥Ã¥Á¤·¤Þ¤»¤ó¤¬¡¢
-    <code>&lt;Directory /home/*/public_html&gt;</code> ¤Ï¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
-    Îã:</p>
-
-    <div class="example"><p><code>
-      &lt;Directory /usr/local/httpd/htdocs&gt;<br />
-      <span class="indent">
-        Options Indexes FollowSymLinks<br />
-      </span>
-      &lt;/Directory&gt;
-    </code></p></div>
-
-<div class="note">
-<p><var>directory-path</var> °ú¿ô¤Ë¤ÏÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤: ¤½¤Î°ú¿ô¤Ï
-Apache ¤¬¥Õ¥¡¥¤¥ë¤ò¥¢¥¯¥»¥¹¤¹¤ë¤¿¤á¤Ë»È¤¦¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Ñ¥¹¤Ë
-¤½¤Î¤Þ¤Þ¥Þ¥Ã¥Á¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤¢¤ë <code>&lt;Directory&gt;</code> ¤Ë
-ŬÍѤµ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢Ê̤Υ·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò¤¿¤É¤Ã¤¿¤ê¤·¤Æ
-Ʊ¤¸¥Ç¥£¥ì¥¯¥È¥ê¤ò°ã¤¦¥Ñ¥¹¤Ç¥¢¥¯¥»¥¹¤·¤¿¾ì¹ç¤Ë¤ÏŬÍѤµ¤ì¤Þ¤»¤ó¡£</p>
-</div>
-
-    <p><code>~</code> ¤È¤¤¤¦Ê¸»ú¤ò
-    Éղ乤뤳¤È¤Ç<a class="glossarylink" href="../glossary.html#regex" title="ÍѸ콸¤ò»²¾È">Àµµ¬É½¸½</a>¤òÍøÍѤ¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-    Î㤨¤Ð:</p>
-
-<div class="example"><p><code>
-   &lt;Directory ~ "^/www/.*/[0-9]{3}"&gt;
-</code></p></div>
-
-    <p>¤È¤¤¤Ã¤¿»ØÄê¤Î¾ì¹ç¡¢<code>/www/</code> °Ê²¼¤Ë¤¢¤ë¿ô»ú
-    3 ʸ»ú¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£</p>
-
-    <p>¤â¤·Ê£¿ô¤Î (Àµµ¬É½¸½°Ê³°¤Î) <code class="directive">&lt;Directory&gt;</code>¥»¥¯¥·¥ç¥ó¤¬
-    ¥É¥­¥å¥á¥ó¥È¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê (¤ä¤½¤Î¾å°Ì¥Ç¥£¥ì¥¯¥È¥ê¤Î¤É¤ì¤«) ¤È¥Þ¥Ã¥Á¤·¤¿¤Ê¤é¤Ð¡¢
-    <a href="#accessfilename">.htaccess</a> ¥Õ¥¡¥¤¥ë¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤âÆɤ߹þ¤ß¤Ä¤Ä¡¢
-    û¤¤¥Ñ¥¹¤«¤é½ç¤ËŬÍѤµ¤ì¤Þ¤¹¡£
-    Î㤨¤Ð¡¢</p>
-
-    <div class="example"><p><code>
-      &lt;Directory /&gt;<br />
-      <span class="indent">
-        AllowOverride None<br />
-      </span>
-      &lt;/Directory&gt;<br />
-      <br />
-      &lt;Directory /home/&gt;<br />
-      <span class="indent">
-        AllowOverride FileInfo<br />
-      </span>
-      &lt;/Directory&gt;
-    </code></p></div>
-
-    <p>¤ÈÀßÄꤷ¡¢¥É¥­¥å¥á¥ó¥È <code>/home/web/dir/doc.html</code> ¤Ø¤Î
-    ¥¢¥¯¥»¥¹¤¬¤¢¤Ã¤¿¾ì¹ç¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤ËÆ°ºî¤·¤Þ¤¹:</p>
-
-    <ul>
-      <li><code>AllowOverride None</code> ¤¬Å¬ÍѤµ¤ì¤ë¡£
-      (<code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ï̵¸ú¤Ë¤Ê¤ë)</li>
-
-      <li><code>AllowOverride FileInfo</code> ¤¬Å¬ÍѤµ¤ì¤ë
-      (<code>/home</code> ¥Ç¥£¥ì¥¯¥È¥ê¤ËÂФ·¤Æ)¡£</li>
-
-      <li><code>/home/.htaccess</code>, <code>/home/web/.htaccess</code>,
-      <code>/home/web/dir/.htaccess</code> ¤Î½ç¤Ë¤½¤ì¤é¤Î¥Õ¥¡¥¤¥ëÃæ¤Î
-       FileInfo ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Å¬ÍѤµ¤ì¤ë¡£</li>
-    </ul>
-
-    <p>Àµµ¬É½¸½¤Ï¡¢Ä̾ï¤Î¥»¥¯¥·¥ç¥ó¤¬¤¹¤Ù¤ÆŬÍѤµ¤ì¤ë¤Þ¤Ç
-    ¹Í褵¤ì¤Þ¤»¤ó¡£
-    ¤½¤Î¸å¡¢Á´¤Æ¤ÎÀµµ¬É½¸½¤¬ÀßÄê¥Õ¥¡¥¤¥ë¤Ë¸½¤ì¤¿½ç¤Ç»î¤µ¤ì¤Þ¤¹¡£
-    Î㤨¤Ð¡¢°Ê²¼¤Î¤è¤¦¤Ê¾ì¹ç¤Ë</p>
-
-    <div class="example"><p><code>
-      &lt;Directory ~ abc$&gt;<br />
-      <span class="indent">
-        # ... directives here ...<br />
-      </span>
-      &lt;/Directory&gt;
-    </code></p></div>
-
-    <p>Àµµ¬É½¸½¤Î¥»¥¯¥·¥ç¥ó¤Ï¤¹¤Ù¤Æ¤ÎÄ̾ï¤Î <code class="directive">&lt;Directory&gt;</code> ¤È
-    <code>.htaccess</code> ¤ÎŬÍѤ¬½ª¤ï¤ë¤Þ¤Ç¹Í褵¤ì¤Þ¤»¤ó¡£
-    ¤½¤Î¸å¤Ç¡¢Àµµ¬É½¸½¤Ï <code>/home/abc/public_html/abc</code> ¤Ë¥Þ¥Ã¥Á¤·¡¢
-    Âбþ¤¹¤ë <code class="directive">&lt;Directory&gt;</code> ¤¬Å¬ÍѤµ¤ì¤Þ¤¹¡£</p>
-
-    <p><strong>Apache ¤Î¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï <code>&lt;Directory /&gt;</code> ¤Ø¤Î¥¢¥¯¥»¥¹¤Ï
-    <code>Allow from All</code> ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ¤³¤ì¤Ï¡¢URL ¤«¤é¥Þ¥Ã¥×¤µ¤ì¤¿¤É¤Î¥Õ¥¡¥¤¥ë¤Ç¤â Apache ¤ÏÁ÷¤ë¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
-    ¤³¤ì¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤·¤ÆÊѹ¹¤¹¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</strong></p>
-
-    <div class="example"><p><code>
-      &lt;Directory /&gt;<br />
-      <span class="indent">
-        Order Deny,Allow<br />
-        Deny from All<br />
-      </span>
-      &lt;/Directory&gt;
-    </code></p></div>
-
-    <p><strong>¤½¤·¤Æ¥¢¥¯¥»¥¹¤ò<em>²Äǽ¤Ë¤·¤¿¤¤</em>¥Ç¥£¥ì¥¯¥È¥ê¤ËÂФ·¤Æ
-    ¸ÄÊ̤ËÀßÄꤹ¤ì¤Ð¤è¤¤¤Ç¤·¤ç¤¦¡£
-    ¤³¤Î¤¢¤¿¤ê¤Ë¤Ä¤¤¤Æ¤Ï¡¢<a href="../misc/security_tips.html">¥»¥­¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ë¥³¥Ä</a>¤ò
-    »²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</strong></p>
-
-    <p>¥Ç¥£¥ì¥¯¥È¥ê¥»¥¯¥·¥ç¥ó¤Ï <code>httpd.conf</code> ¥Õ¥¡¥¤¥ë½ñ¤­¤Þ¤¹¡£
-    <code class="directive">&lt;Directory&gt;</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÆþ¤ì»Ò¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤º¡¢
-    <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> ¤ä <code class="directive"><a href="#limitexcept">&lt;LimitExcept&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤ÎÃæ¤Ë¤â
-    µ­½Ò¤Ç¤­¤Þ¤»¤ó¡£</p>
-
-
-<h3>»²¾È</h3>
-<ul>
-<li>¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¤¿ºÝ¤Ë¤³¤ì¤é¤Î°Û¤Ê¤ë¥»¥¯¥·¥ç¥ó¤¬
-    ÁȤ߹ç¤ï¤µ¤ì¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï <a href="../sections.html">
-    &lt;Directory&gt;, &lt;Location&gt;, &lt;Files&gt; ¥»¥¯¥·¥ç¥ó¤ÎÆ°ºîË¡</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DirectoryMatch" id="DirectoryMatch">&lt;DirectoryMatch&gt;</a> <a name="directorymatch" id="directorymatch">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>Àµµ¬É½¸½¤Ë¥Þ¥Ã¥Á¤¹¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Ç¥£¥ì¥¯¥È¥ê¤È
-¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤È¤Î¤ß¤ËŬÍѤµ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò°Ï¤à</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>&lt;DirectoryMatch <var>regex</var>&gt;
-... &lt;/DirectoryMatch&gt;</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive"><a href="#directory">&lt;Directory&gt;</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÈƱÍͤˡ¢<code class="directive">&lt;DirectoryMatch&gt;</code>
-    ¤È <code>&lt;/DirectoryMatch&gt;</code> ¤Ï»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤È
-    ¤½¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Î¤ßŬÍѤµ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö·²¤ò°Ï¤¤¤Þ¤¹¡£
-    ¤·¤«¤·¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï°ú¿ô¤È¤·¤Æ<a class="glossarylink" href="../glossary.html#regex" title="ÍѸ콸¤ò»²¾È">Àµµ¬É½¸½</a>¤ò¤È¤ê¤Þ¤¹¡£Î㤨¤Ð:</p>
-
-    <div class="example"><p><code>
-      &lt;DirectoryMatch "^/www/(.+/)?[0-9]{3}"&gt;
-    </code></p></div>
-
-    <p>¤Ï <code>/www/</code> °Ê²¼¤Ë¤¢¤ë¿ô»ú 3 ʸ»ú¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£</p>
-
-
-<h3>»²¾È</h3>
-<ul>
-<li>Ä̾ï¤Î <code class="directive">&lt;Directory&gt;</code> ¤ÈÀµµ¬É½¸½¤Î»ØÄ꤬
-ŬÍѤµ¤ì¤ë½çÈ֤ˤĤ¤¤Æ¤Ï <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code></li>
-<li>¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¤¿ºÝ¤Ë¤³¤ì¤é¤Î°Û¤Ê¤ë¥»¥¯¥·¥ç¥ó¤¬
-    ÁȤ߹ç¤ï¤µ¤ì¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï <a href="../sections.html">
-    &lt;Directory&gt;, &lt;Location&gt;, &lt;Files&gt; ¥»¥¯¥·¥ç¥ó¤ÎÆ°ºîË¡</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DocumentRoot" id="DocumentRoot">DocumentRoot</a> <a name="documentroot" id="documentroot">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¦¥§¥Ö¤«¤é¸«¤¨¤ë¥á¥¤¥ó¤Î¥É¥­¥å¥á¥ó¥È¥Ä¥ê¡¼¤Ë¤Ê¤ë
-¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>DocumentRoot <var>directory-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>DocumentRoot /usr/local/apache/htdocs</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢<code class="program"><a href="../programs/httpd.html">httpd</a></code>
-    ¤¬¥Õ¥¡¥¤¥ë¤òÄ󶡤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤òÀßÄꤷ¤Þ¤¹¡£
-     <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code> ¤Î¤è¤¦¤Ê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¥Þ¥Ã¥Á¤·¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢
-    ¥É¥­¥å¥á¥ó¥È¤Î (ÌõÃí:¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Î) ¥Ñ¥¹¤òÀ¸À®¤¹¤ë¤¿¤á¤Ë¡¢
-    ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤Î¥Ñ¥¹Éôʬ¤ò¥É¥­¥å¥á¥ó¥È¥ë¡¼¥È¤ËÉÕÍ¿¤·¤Þ¤¹¡£
-    Îã:</p>
-
-    <div class="example"><p><code>
-      DocumentRoot /usr/web
-    </code></p></div>
-
-    <p>¤³¤Î¾ì¹ç¡¢
-    <code>http://www.my.host.com/index.html</code> ¤Ø¤Î¥¢¥¯¥»¥¹¤¬¤¢¤ì¤Ð
-    <code>/usr/web/index.html</code> ¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
-    <var>directory-path</var> ¤¬ÀäÂХѥ¹¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢
-    <code class="directive"><a href="#serverroot">ServerRoot</a></code> 
-    ¤«¤é¤ÎÁêÂХѥ¹¤È¤ß¤Ê¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p><code class="directive">DocumentRoot</code> ¤ÏºÇ¸å¤Î¥¹¥é¥Ã¥·¥å̵¤·¤Ç
-    »ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../urlmapping.html">URL ¤ò¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î°ÌÃÖ¤Ë
-¥Þ¥Ã¥×¤¹¤ë</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="EnableMMAP" id="EnableMMAP">EnableMMAP</a> <a name="enablemmap" id="enablemmap">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ÇÛÁ÷Ãæ¤Ë¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à¤¿¤á¤Ë¥á¥â¥ê¥Þ¥Ã¥Ô¥ó¥°¤ò
-»È¤¦¤«¤É¤¦¤«</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>EnableMMAP On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>EnableMMAP On</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÇÛÁ÷Ãæ¤Ë¥Õ¥¡¥¤¥ë¤ÎÆâÍƤòÆɤ߹þ¤àɬÍפ¬¤¢¤ë¤È¤­¤Ë
-    <code class="program"><a href="../programs/httpd.html">httpd</a></code> ¤¬¥á¥â¥ê¥Þ¥Ã¥Ô¥ó¥°¤ò»È¤¦¤«¤É¤¦¤«¤òÀ©¸æ¤·¤Þ¤¹¡£
-    ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢
-    Î㤨¤Ð¡¢<code class="module"><a href="../mod/mod_include.html">mod_include</a></code> ¤ò»È¤Ã¤Æ SSI ¥Õ¥¡¥¤¥ë¤òÇÛÁ÷
-    ¤¹¤ë¤È¤­¤Î¤è¤¦¤Ë¡¢¥Õ¥¡¥¤¥ë¤ÎÅÓÃæ¤Î¥Ç¡¼¥¿¤ò¥¢¥¯¥»¥¹¤¹¤ëɬÍפ¬¤¢¤ë¤È¤­¤Ë¤Ï
-    Apache ¤Ï OS ¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ì¤Ð¥Õ¥¡¥¤¥ë¤ò¥á¥â¥ê¤Ë¥Þ¥Ã¥×¤·¤Þ¤¹¡£</p>
-
-    <p>
-    ¤³¤Î¥á¥â¥ê¥Þ¥Ã¥×¤ÏÀ­Ç½¤Î¸þ¾å¤ò»ý¤¿¤é¤¹¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-    ¤·¤«¤·¡¢´Ä¶­¤Ë¤è¤Ã¤Æ¤Ï±¿ÍѾå¤ÎÌäÂê¤òËɤ°¤¿¤á¤Ë¥á¥â¥ê¥Þ¥Ã¥Ô¥ó¥°¤ò
-    »ÈÍѤ·¤Ê¤¤¤è¤¦¤Ë¤·¤¿Êý¤¬Îɤ¤¾ì¹ç¤â¤¢¤ê¤Þ¤¹:</p>
-
-    <ul>
-    <li>¥Þ¥ë¥Á¥×¥í¥»¥Ã¥µ¥·¥¹¥Æ¥à¤ÎÃæ¤Ë¤Ï¥á¥â¥ê¥Þ¥Ã¥Ô¥ó¥°¤ò¤¹¤ë¤È
-    <code class="program"><a href="../programs/httpd.html">httpd</a></code> ¤ÎÀ­Ç½¤¬Íî¤Á¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£</li>
-    <li>NFS ¥Þ¥¦¥ó¥È¤µ¤ì¤¿ <code class="directive"><a href="#documentroot">DocumentRoot</a></code>
-    ¤Ç¤Ï¡¢<code class="program"><a href="../programs/httpd.html">httpd</a></code> ¤¬¥á¥â¥ê¥Þ¥Ã¥×¤·¤Æ¤¤¤ë´Ö¤Ë¥Õ¥¡¥¤¥ë¤¬ºï½ü¤µ¤ì¤¿¤ê
-    û¤¯¤Ê¤Ã¤¿¤ê¤·¤¿¤È¤­¤Ëµ¯¤³¤ë¥»¥°¥á¥ó¥Æ¡¼¥·¥ç¥ó¥Õ¥©¡¼¥ë¥È¤Î¤¿¤á¤Ë
-    <code class="program"><a href="../programs/httpd.html">httpd</a></code> ¤¬¥¯¥é¥Ã¥·¥å¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£</li>
-    </ul>
-
-    <p>¤³¤ì¤é¤ÎÌäÂê¤ËÅö¤Æ¤Ï¤Þ¤ë¥µ¡¼¥Ð¤ÎÀßÄê¤Î¾ì¹ç¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ
-    ¥Õ¥¡¥¤¥ë¤ÎÇÛÁ÷»þ¤Î¥á¥â¥ê¥Þ¥Ã¥Ô¥ó¥°¤ò»ÈÍÑÉԲĤˤ·¤Æ¤¯¤À¤µ¤¤:</p>
-
-    <div class="example"><p><code>
-      EnableMMAP Off
-    </code></p></div>
-
-    <p>NFS ¥Þ¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢ÌäÂê¤Î¤¢¤ë¥Õ¥¡¥¤¥ë¤Ë¤Î¤ßÌÀ¼¨Åª¤Ë
-    ¤³¤Îµ¡Ç½¤ò»ÈÍÑÉԲĤˤ·¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      &lt;Directory "/path-to-nfs-files"&gt;
-      <span class="indent">
-        EnableMMAP Off
-      </span>
-      &lt;/Directory&gt;
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="EnableSendfile" id="EnableSendfile">EnableSendfile</a> <a name="enablesendfile" id="enablesendfile">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ø¤ÎÇÛÁ÷»þ¤Ë¥«¡¼¥Í¥ë¤Î sendfile ¥µ¥Ý¡¼¥È¤ò
-»È¤¦¤«¤É¤¦¤«</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>EnableSendfile On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>EnableSendfile On</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>¥Ð¡¼¥¸¥ç¥ó 2.0.44 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥¯¥é¥¤¥¢¥ó¥È¤Ë¥Õ¥¡¥¤¥ë¤ÎÆâÍƤòÁ÷¤ë¤È¤­¤Ë
-    <code class="program"><a href="../programs/httpd.html">httpd</a></code> ¤¬¥«¡¼¥Í¥ë¤Î
-    sendfile ¥µ¥Ý¡¼¥È¤ò»È¤¦¤«¤É¤¦¤«¤òÀ©¸æ¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢
-    Î㤨¤ÐÀÅŪ¤Ê¥Õ¥¡¥¤¥ë¤ÎÇÛÁ÷¤Î¤è¤¦¤Ë¡¢¥ê¥¯¥¨¥¹¥È¤Î½èÍý¤Ë¥Õ¥¡¥¤¥ë¤Î
-    ÅÓÃæ¤Î¥Ç¡¼¥¿¤Î¥¢¥¯¥»¥¹¤òɬÍפȤ·¤Ê¤¤¤È¤­¤Ë¤Ï¡¢Apache ¤Ï OS ¤¬
-    ¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ì¤Ð¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à¤³¤È¤Ê¤¯ sendfile ¤ò»È¤Ã¤Æ
-    ¥Õ¥¡¥¤¥ë¤ÎÆâÍƤòÁ÷¤ê¤Þ¤¹¡£</p>
-
-    <p>sendfile ¤Ï read ¤È send ¤òÊÌ¡¹¤Ë¹Ô¤Ê¤¦¤³¤È¤È¡¢¥Ð¥Ã¥Õ¥¡¤Î³ä¤êÅö¤Æ¤ò
-    ²óÈò¤·¤Þ¤¹¡£¤·¤«¤·¡¢¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤ä¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎÃæ¤Ë¤Ï
-    ±¿ÍѾå¤ÎÌäÂê¤òÈò¤±¤ë¤¿¤á¤Ë¤³¤Îµ¡Ç½¤ò»ÈÍÑÉԲĤˤ·¤¿Êý¤¬Îɤ¤¾ì¹ç¤¬¤¢¤ê¤Þ¤¹:</p>
-
-    <ul>
-    <li>¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤ÎÃæ¤Ë¤Ï¥Ó¥ë¥É¥·¥¹¥Æ¥à¤¬¸¡ÃΤǤ­¤Ê¤«¤Ã¤¿¡¢²õ¤ì¤¿
-    sendfile ¤Î¥µ¥Ý¡¼¥È¤¬Â¸ºß¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤ÏÆäË
-    ¥Ð¥¤¥Ê¥ê¤¬Ê̤Υޥ·¥ó¤Ç¥Ó¥ë¥É¤µ¤ì¡¢²õ¤ì¤¿ sendfile ¤Î¤¢¤ë¥Þ¥·¥ó¤Ë
-    °ÜÆ°¤·¤¿¤È¤­¤Ëµ¯¤³¤ê¤Þ¤¹¡£</li>
-    <li>Linux ¤Ç¤Ï¡¢sendfile ¤òÍѤ¤¤ë¤È¡¢
-    IPv6 »ÈÍÑ»þ¤Ë¸ºß¤¹¤ëÆÃÄê¥Í¥Ã¥È¥ï¡¼¥¯¥«¡¼¥É¤Î TCP-checksum
-    ¥ª¥Õ¥í¡¼¥É¤Î¥Ð¥°¤òƧ¤ó¤Ç¤·¤Þ¤¤¤Þ¤¹¡£</li>
-    <li>Itanium ¤ÇÆ°¤¤¤Æ¤¤¤ë Linux ¤Ç¡¢sendfile ¤Ï 2GB °Ê¾å¤Î
-    ¥Õ¥¡¥¤¥ë¤ò°·¤¦¤³¤È¤¬¤Ç¤­¤Ê¤¤¤Ç¤·¤ç¤¦¡£</li>
-    <li>¥Í¥Ã¥È¥ï¡¼¥¯¥Þ¥¦¥ó¥È¤µ¤ì¤¿ <code class="directive"><a href="#documentroot">DocumentRoot</a></code>
-    (Î㤨¤Ð NFS ¤ä SMB)
-    ¤Ç¤Ï¡¢¥«¡¼¥Í¥ë¤Ï¼«¿È¤Î¥­¥ã¥Ã¥·¥å¤ò»È¤Ã¤Æ¥Í¥Ã¥È¥ï¡¼¥¯¤«¤é¤Î¥Õ¥¡¥¤¥ë¤ò
-    Á÷¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¤¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</li>
-    </ul>
-
-    <p>¤³¤ì¤é¤ÎÌäÂê¤ËÅö¤Æ¤Ï¤Þ¤ë¥µ¡¼¥Ð¤ÎÀßÄê¤Î¾ì¹ç¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ
-    ¤³¤Îµ¡Ç½¤ò»ÈÍÑÉԲĤˤ·¤Æ¤¯¤À¤µ¤¤:</p>
-
-
-    <div class="example"><p><code>
-      EnableSendfile Off
-    </code></p></div>
-
-    <p>NFS ¤ä SMB ¥Þ¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢ÌäÂê¤Î¤¢¤ë¥Õ¥¡¥¤¥ë¤Ë¤Î¤ßÌÀ¼¨Åª¤Ë
-    ¤³¤Îµ¡Ç½¤ò»ÈÍÑÉԲĤˤ·¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      &lt;Directory "/path-to-nfs-files"&gt;
-      <span class="indent">
-        EnableSendfile Off
-      </span>
-      &lt;/Directory&gt;
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ErrorDocument" id="ErrorDocument">ErrorDocument</a> <a name="errordocument" id="errordocument">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¨¥é¡¼¤¬È¯À¸¤·¤¿¤È¤­¤Ë¥µ¡¼¥Ð¤¬¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤ë¤â¤Î</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ErrorDocument <var>error-code document</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0 ¤Ç¤Ï¥Æ¥­¥¹¥È¤ò¥¯¥¦¥©¡¼¥È¤¹¤ë¹½Ê¸¤¬°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤«¤é
-ÊѤï¤Ã¤Æ¤¤¤Þ¤¹¡£</td></tr>
-</table>
-    <p>ÌäÂê¤ä¥¨¥é¡¼¤¬È¯À¸¤·¤¿¤È¤­¤ÎÆ°ºî¤È¤·¤Æ¡¢
-    Apache ¤Ë¤Ï°Ê²¼¤Î»Í¤Ä¤Î¤¦¤Á°ì¤Ä¤ÎÆ°ºî¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <ol>
-      <li>Apache ɸ½à¤Î´Êñ¤Ê¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤òɽ¼¨</li>
-
-      <li>¼«Ê¬¤Ç»ØÄꤷ¤¿¥á¥Ã¥»¡¼¥¸¤òɽ¼¨</li>
-
-      <li>ÌäÂê¤ä¥¨¥é¡¼¤Î½èÍý¤ò¤¹¤ë°Ù¤Ë¡¢¼«¥µ¡¼¥ÐÆâ¤Î
-      <var>URL-path</var> ¤Ø¥ê¥À¥¤¥ì¥¯¥È</li>
-
-      <li>ÌäÂê¤ä¥¨¥é¡¼¤Î½èÍý¤ò¤¹¤ë°Ù¤Ë¡¢³°Éô¤Î <var>URL</var> ¤Ø¥ê¥À¥¤¥ì¥¯¥È</li>
-    </ol>
-
-    <p>ºÇ½é¤Î¤â¤Î¤¬¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤Ç¡¢2 ÈÖÌܤ«¤é 4 ÈÖÌܤϡ¢
-    <code class="directive">ErrorDocument</code>¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê¡¢
-    HTTP ¤Î¥ì¥¹¥Ý¥ó¥¹¥³¡¼¥É¤È¡¢¥á¥Ã¥»¡¼¥¸¤« URL ¤ò»ØÄꤹ¤ë¤³¤È¤ÇÀßÄꤷ¤Þ¤¹¡£
-    Apache ¤¬ÌäÂê¤â¤·¤¯¤Ï¥¨¥é¡¼¤Ë´Ø¤¹¤ëÄɲþðÊó¤òÄ󶡤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>URL ¤Î¾ì¹ç¤Ï¡¢¥¹¥é¥Ã¥·¥å¤Ç»Ï¤Þ¤ë (/) ¥í¡¼¥«¥ë¤Î web-path (
-    <code class="directive"><a href="#documentroot">DocumentRoot</a></code> ¤«¤é¤ÎÁêÂХѥ¹
-    ) ¤«¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬²ò·è¤Ç¤­¤ë´°Á´¤Ê URL ¤ò»ØÄꤷ¤Þ¤¹¡£
-    ¤â¤·¤¯¤Ï¡¢¥Ö¥é¥¦¥¶¤Ëɽ¼¨¤µ¤ì¤ë¥á¥Ã¥»¡¼¥¸¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
-    Îã:</p>
-
-    <div class="example"><p><code>
-      ErrorDocument 500 http://foo.example.com/cgi-bin/tester<br />
-      ErrorDocument 404 /cgi-bin/bad_urls.pl<br />
-      ErrorDocument 401 /subscription_info.html<br />
-      ErrorDocument 403 "Sorry can't allow you access today"
-    </code></p></div>
-
-    <p>²Ã¤¨¤Æ¡¢ÆÃÊ̤ÊÃÍ <code>default</code> ¤ò»È¤Ã¤Æ Apache ¤Ë
-    ¥Ï¡¼¥É¥³¡¼¥É¤µ¤ì¤Æ¤¤¤ë´Êñ¤Ê¥á¥Ã¥»¡¼¥¸¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    Ä̾ï¤ÏɬÍפǤϤ¢¤ê¤Þ¤»¤ó¤¬¡¢<code>default</code> ¤ò»È¤¦¤È
-    ´û¸¤Î <code class="directive">ErrorDocument</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÀßÄê¤ò
-    ·Ñ¾µ¤¹¤ë¤È¤³¤í¤Ç¡¢Apache ¤Î¥Ï¡¼¥É¥³¡¼¥É¤µ¤ì¤¿´Êñ¤Ê¥á¥Ã¥»¡¼¥¸¤Ë
-    Ì᤹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      ErrorDocument 404 /cgi-bin/bad_urls.pl<br /><br />
-      &lt;Directory /web/docs&gt;<br />
-      <span class="indent">
-        ErrorDocument 404 default<br />
-      </span>
-      &lt;/Directory&gt;
-    </code></p></div>
-
-    <p>¥ê¥â¡¼¥È URL (Î㤨¤Ð¡¢Æ¬¤Ë <code>http</code> ¤ÈÉÕÍ¿¤·¤¿ÊýË¡) ¤ò
-    <code class="directive">ErrorDocument</code> ¤Ë»ØÄꤹ¤ë¤È¤­¡¢
-    ¤¿¤È¤¨Ê¸½ñ¤¬Æ±¤¸¥µ¡¼¥Ð¤Ë¤¢¤í¤¦¤È¤â¡¢¥É¥­¥å¥á¥ó¥È¤¬¤É¤³¤Ë¤¢¤ë¤«¤òÄÌÃΤ¹¤ë¤¿¤á¤Ë¡¢
-    Apache ¤Ï¥ê¥À¥¤¥ì¥¯¥È¤ò¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷½Ð¤¹¤ë¤È¤¤¤¦¤³¤È¤Ë¡¢Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ¤³¤ì¤Ë¤Ï¤¤¤í¤¤¤í¤È´ØÏ¢¤·¤Æµ¯¤³¤ëÌäÂ꤬¤¢¤ê¤Þ¤¹¡£
-    Ãæ¤Ç¤âºÇ¤â½ÅÍפʤΤϡ¢¥¯¥é¥¤¥¢¥ó¥È¤Ï¸µ¡¹¤Î¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É¤ò¼õ¤±¼è¤é¤º¡¢
-    Âå¤ï¤ê¤Ë¥ê¥À¥¤¥ì¥¯¥È¤Î¥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É¤ò¼õ¤±¼è¤ë¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
-    ¤³¤ì¤Ë¤è¤ê¡¢¥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É¤ò»È¤Ã¤Æ URL ¤¬Í­¸ú¤Ç¤¢¤ë¤«¤É¤¦¤«¤ò·èÄꤷ¤è¤¦¤È¤¹¤ë
-    ¥¦¥§¥Ö¥í¥Ü¥Ã¥È¤ä¤½¤Î¾¥¯¥é¥¤¥¢¥ó¥È¤ò¡¢º®Í𤵤»¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-    ¤µ¤é¤Ë¡¢<code>ErrorDocument 401</code> ¤Ë¥ê¥â¡¼¥È¤Î URL ¤ò»ØÄꤹ¤ë¤È¡¢
-    ¥¯¥é¥¤¥¢¥ó¥È¤Ï 401 ¤È¤¤¤¦¥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É¤ò¼õ¤±¼è¤é¤Ê¤¤¤¿¤á¡¢
-    ¥Ñ¥¹¥ï¡¼¥É¤ò¥æ¡¼¥¶¡¼¤ËÆþÎÏÍ׵ᤷ¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤³¤È¤¬¤ï¤«¤ê¤Þ¤»¤ó¡£
-    ½¾¤Ã¤Æ¡¢<strong><code>ErrorDocument 401</code> ¤È¤¤¤¦¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¦¾ì¹ç¤Ï¡¢
-    ɬ¤º¥í¡¼¥«¥ë¤Êʸ½ñ¤ò»²¾È¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</strong></p>
-
-    <p>Microsoft Internet Explorer (MSIE) ¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥µ¡¼¥Ð¤¬À¸À®¤·¤¿¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤¬
-    ¡Ö¾®¤µ¤¹¤®¤ë¡×¤È¤­¤Ë¤Ï̵»ë¤ò¤·¤Æ¼«Ê¬¼«¿È¤Î¡Ö¤ä¤µ¤·¤¤¡×¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤Ç
-    ÃÖ´¹¤·¤Þ¤¹¡£¥µ¥¤¥º¤Î¤·¤­¤¤Ãͤϥ¨¥é¡¼¤Î¼ïÎà¤Ë¤è¤Ã¤Æ°Û¤Ê¤ê¤Þ¤¹¤¬¡¢
-    °ìÈÌŪ¤Ë¤Ï¥¨¥é¡¼¤Îʸ½ñ¤ò 512 ¥Ð¥¤¥È¤è¤ê¤âÂ礭¤¯¤¹¤ë¤È¡¢MSIE ¤Ï
-    ¥µ¡¼¥Ð¤¬À¸À®¤·¤¿¥¨¥é¡¼¤ò±£¤µ¤º¤Ëɽ¼¨¤·¤Þ¤¹¡£¾Ü¤·¤¤¾ðÊó¤Ï Microsoft
-    Knowledge Base ¤Îµ­»ö <a href="http://support.microsoft.com/default.aspx?scid=kb;en-us;Q294807">Q294807</a>
-    ¤Ë¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>¤Û¤È¤ó¤É¤Î¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤ò¾å½ñ¤­¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢ÆÃÄê¤Î¾õ¶·²¼¤Ç¤Ï
-    <code class="directive"><a href="#errordocument">ErrorDocument</a></code> ¤ÎÀßÄê¤Ë¤«¤«¤ï¤é¤º
-    Æ⢤Υá¥Ã¥»¡¼¥¸¤¬»È¤ï¤ì¤Þ¤¹¡£
-    Æäˡ¢ÉÔÀµ¤Ê·Á¼°¤Î¥ê¥¯¥¨¥¹¥È¤¬¸¡½Ð¤µ¤ì¤¿¾ì¹ç¡¢Ä̾ï¤Î¥ê¥¯¥¨¥¹¥È½èÍý¤Ï
-    ¨ºÂ¤ËÃæ»ß¤µ¤ì¡¢Æ⢤Υ¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
-    ¤³¤Î½èÃÖ¤ÏÉÔÀµ¤Ê¥ê¥¯¥¨¥¹¥È¤Ë¤è¤Ã¤Æ°ú¤­µ¯¤³¤µ¤ì¤ë¡¢¥»¥­¥å¥ê¥Æ¥£ÌäÂ꤫¤é
-    ¼é¤ë¤¿¤á¤ËɬÍפÊÁ¼Ã֤Ǥ¹¡£</p>
-
-    <p>2.0 ¤è¤êÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¢ÂФˤʤäƤ¤¤Ê¤¤Æó½Å°úÍÑÉä¤ò
-    ÀèƬ¤ËÉÕ¤±¤ë¤³¤È¤Ë¤è¤ê¥á¥Ã¥»¡¼¥¸¤Ç¤¢¤ë¤³¤È¤ò»ØÄꤷ¤Æ¤¤¤Þ¤·¤¿¡£</p>
-
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../custom-error.html">¥«¥¹¥¿¥Þ¥¤¥º²Äǽ¤Ê
-¥¨¥é¡¼±þÅú¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ErrorLog" id="ErrorLog">ErrorLog</a> <a name="errorlog" id="errorlog">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤¬¥¨¥é¡¼¤ò¥í¥°¼ý½¸¤¹¤ë¾ì½ê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ErrorLog logs/error_log (Unix) ErrorLog logs/error.log (Windows and OS/2)</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">ErrorLog</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥µ¡¼¥Ð¤ËÀ¸¤¸¤¿¤µ¤Þ¤¶¤Þ¤Ê¥¨¥é¡¼¤ò
-    µ­Ï¿¤¹¤ë°Ù¤Î¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÀßÄꤷ¤Þ¤¹¡£
-    <var>file-path</var> ¤¬ÀäÂХѥ¹¤Ç¤Ê¤¤¤È¤­¤Ï¡¢<code class="directive"><a href="#serverroot">ServerRoot</a></code> ¤«¤é¤ÎÁêÂХѥ¹¤È¤ß¤Ê¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-    ErrorLog /var/log/httpd/error_log
-    </code></p></div>
-    
-    <p><var>file-path</var> ¤¬¥Ñ¥¤¥× (|) ¤«¤é»Ï¤Þ¤ë¾ì¹ç¤Ï¡¢
-    ¥¨¥é¡¼¥í¥°¤ò½èÍý¤¹¤ë¤¿¤á¤Ë¼Â¹Ô¤µ¤ì¤ë¥³¥Þ¥ó¥É¤¬
-    »ØÄꤵ¤ì¤Æ¤¤¤ë¤È²ò¼á¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-    ErrorLog "|/usr/local/bin/httpd_errors"
-    </code></p></div>
-
-    <p>¥Õ¥¡¥¤¥ë̾¤ÎÊѤï¤ê¤Ë <code>syslog</code> ¤È»ØÄꤹ¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢
-    ¥·¥¹¥Æ¥à¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ì¤Ð syslogd(8) ¤òÍøÍѤ·¤¿¥í¥®¥ó¥°¤¬Í­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢<code>local7</code> ¥Õ¥¡¥·¥ê¥Æ¥£¤È¤Ê¤ê¤Þ¤¹¤¬¡¢
-    <code>syslog:<var>facility</var></code> ¤È¤¤¤Ã¤¿·Á¤Çµ­½Ò¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢
-    Ä̾ï syslog(1) ¤Î¥É¥­¥å¥á¥ó¥È¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥·¥ê¥Æ¥£¤Î°ì¤Ä¤ò»È¤¦¤è¤¦¤Ë
-    ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-    ErrorLog syslog:user
-    </code></p></div>
-
-    <p>¥»¥­¥å¥ê¥Æ¥£: 
-    ¥í¥°¥Õ¥¡¥¤¥ë¤ò³ÊǼ¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤¬¡¢¥µ¡¼¥Ð¤òµ¯Æ°¤·¤¿¥æ¡¼¥¶°Ê³°¤Î
-    ¥æ¡¼¥¶¤Ë¤è¤Ã¤Æ½ñ¤­¹þ¤á¤ë¾ì¹ç¤Ë¥»¥­¥å¥ê¥Æ¥£¤¬Çˤé¤ì¤ë²ÄǽÀ­¤¬¤¢¤ë¤³¤È¤Ë
-    ´Ø¤¹¤ë¾ÜºÙ¤Ï <a href="../misc/security_tips.html#serverroot">¥»¥­¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ë¥³¥Ä</a> ¤ò
-    »²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-    <div class="warning"><h3>Ãí</h3>
-      <p>Unix °Ê³°¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¤òÆþÎϤ¹¤ë¤È¤­¤Ï¡¢
-      ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤¬¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤Î»ÈÍѤòµö¤·¤Æ¤¤¤¿¤È¤·¤Æ¤â¡¢
-      ³Î¼Â¤Ë¥¹¥é¥Ã¥·¥å¤Î¤ß¤¬»ÈÍѤµ¤ì¤ë¤è¤¦¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£°ìÈÌŪ¤Ë¤Ï¡¢
-      ÀßÄê¥Õ¥¡¥¤¥ëÁ´È̤ǥ¹¥é¥Ã¥·¥å¤Î¤ß¤ò»È¤¦Êý¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£</p>
-    </div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#loglevel">LogLevel</a></code></li>
-<li><a href="../logs.html">Apache ¥í¥°¥Õ¥¡¥¤¥ë</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="FileETag" id="FileETag">FileETag</a> <a name="fileetag" id="fileetag">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ETag HTTP ±þÅú¥Ø¥Ã¥À¤òºîÀ®¤¹¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤ë
-¥Õ¥¡¥¤¥ë¤Î°À­</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>FileETag <var>component</var> ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>FileETag INode MTime Size</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>
-    <code class="directive">FileETag</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¥É¥­¥å¥á¥ó¥È¤¬¥Õ¥¡¥¤¥ë¤Ë´ð¤Å¤¤¤¿¤â¤Î¤Ç¤¢¤ë¤È¤­¤Ë¡¢
-    <code>ETag</code> (¥¨¥ó¥Æ¥£¥Æ¥£¥¿¥°) ±þÅú¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¤òºîÀ®¤¹¤ë¤È¤­¤Ë»ÈÍѤ¹¤ë
-    ¥Õ¥¡¥¤¥ë¤Î°À­¤òÀßÄꤷ¤Þ¤¹¡£ (<code>ETag</code> ¤ÎÃͤϥͥåȥ¥¯¤ÎÂÓ°è¤òÀáÌ󤹤뤿¤á¤Î
-    ¥­¥ã¥Ã¥·¥å¤Î´ÉÍý¤Ç»È¤ï¤ì¤Þ¤¹¡£) Apache 1.3.22 °ÊÁ°¤Ç¤Ï¡¢<code>ETag</code> ¤ÎÃͤÏ
-    <em>¾ï¤Ë</em>¥Õ¥¡¥¤¥ë¤Î inode, ¥µ¥¤¥º¡¢ºÇ½ª½¤Àµ»þ¹ï (mtime) ¤«¤éºîÀ®
-    ¤µ¤ì¤Æ¤¤¤Þ¤·¤¿¡£<code class="directive">FileETag</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê¡¢¤³¤ì¤é¤Î¤É¤ì¤ò»È¤¦¤«¤ò
-    Áª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Ç§¼±¤µ¤ì¤ë¥­¡¼¥ï¡¼¥É¤Ï:
-    </p>
-
-    <dl>
-     <dt><strong>INode</strong></dt>
-     <dd>¥Õ¥¡¥¤¥ë¤Î inode ÈÖ¹æ¤ò·×»»¤Ë»È¤¤¤Þ¤¹</dd>
-     <dt><strong>MTime</strong></dt>
-     <dd>¥Õ¥¡¥¤¥ë¤ÎºÇ½ª½¤Àµ»þ¹ï¤ò»È¤¤¤Þ¤¹</dd>
-     <dt><strong>Size</strong></dt>
-     <dd>¥Õ¥¡¥¤¥ë¤ÎÃæ¿È¤Î¥Ð¥¤¥È¿ô¤ò»È¤¤¤Þ¤¹</dd>
-     <dt><strong>All</strong></dt>
-     <dd>»ÈÍѲÄǽ¤Ê¤¹¤Ù¤Æ¤Î¥Õ¥£¡¼¥ë¥É¤ò»È¤¤¤Þ¤¹¡£
-     ¤³¤ì¤Ï <div class="example"><p><code>FileETag INode MTime Size</code></p></div> ¤ÈÅù²Á¤Ç¤¹¡£</dd>
-     <dt><strong>None</strong></dt>
-     <dd>¥É¥­¥å¥á¥ó¥È¤¬¥Õ¥¡¥¤¥ë¤Ë´ð¤Å¤¤¤¿¤â¤Î¤Ç¤â¡¢<code>ETag</code> ¥Õ¥£¡¼¥ë¥É¤ò
-    ±þÅú¤ËÉղä·¤Þ¤»¤ó</dd>
-    </dl>
-
-    <p><code>INode</code>, <code>MTime</code>, <code>Size</code> ¥­¡¼¥ï¡¼¥É¤Ë¤Ï
-    <code>+</code> ¤ä <code>-</code> ¤òÁ°¤ËÉÕ¤±¤Æ
-    »ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¤³¤Î¾ì¹ç¤Ï¡¢¤è¤ê¹­¤¤ÈϰϤ«¤é·Ñ¾µ¤µ¤ì¤¿
-    ¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤ËÊѹ¹¤ò²Ã¤¨¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤Î¤è¤¦¤ÊÀÜƬ¼­¤Î
-    ̵¤¤¥­¡¼¥ï¡¼¥É¤ò»ØÄꤹ¤ë¤È¡¢Â¨ºÂ¤Ë·Ñ¾µ¤·¤¿ÀßÄê¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£</p>
-
-    <p>¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ÎÀßÄê¤Ë
-    <code>FileETag&nbsp;INode&nbsp;MTime&nbsp;Size</code> ¤¬¤¢¤ê¡¢
-    ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ÎÀßÄê¤Ë <code>FileETag&nbsp;-INode</code> ¤¬¤¢¤ë¤È¤­¤Ï¡¢
-    ¤½¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ÎÀßÄê¤Ï (ÀßÄ꤬¾å½ñ¤­¤µ¤ì¤Ê¤±¤ì¤Ð¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Î
-    ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤â·Ñ¾µ¤µ¤ì¤Þ¤¹) <code>FileETag&nbsp;MTime&nbsp;Size</code>
-    ¤ÈƱ¤¸¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Files" id="Files">&lt;Files&gt;</a> <a name="files" id="files">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Þ¥Ã¥Á¤¹¤ë¥Õ¥¡¥¤¥ë̾¤ËŬÍѤµ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò°Ï¤à</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>&lt;Files <var>filename</var>&gt; ... &lt;/Files&gt;</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">&lt;Files&gt;</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¤½¤ÎÃæ¤Ë¤¢¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎŬÍÑÈϰϤò¥Õ¥¡¥¤¥ë̾¤ÇÀ©¸Â¤·¤Þ¤¹¡£
-    <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ä <code class="directive"><a href="#location">&lt;Location&gt;</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    Ʊ¤¸¤è¤¦¤Êµ¡Ç½¤ò»ý¤Á¤Þ¤¹¡£
-    ¤³¤ì¤Ï¡¢<code>&lt;/Files&gt;</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÈÂФË
-    ¤Ê¤Ã¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-    ¤³¤Î¥»¥¯¥·¥ç¥óÃæ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥Ù¡¼¥¹Ì¾ (¥Õ¥¡¥¤¥ë̾¤ÎºÇ¸å¤ÎÉôʬ)
-    ¤¬»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤Ë¥Þ¥Ã¥Á¤¹¤ë¤¹¤Ù¤Æ¤Î¥ª¥Ö¥¸¥§¥¯¥È¤ËŬÍѤµ¤ì¤Þ¤¹¡£
-    <code class="directive">&lt;Files&gt;</code> ¥»¥¯¥·¥ç¥ó¤Ï
-    <code class="directive">&lt;Directory&gt;</code> ¥»¥¯¥·¥ç¥ó¤È
-    <code>.htaccess</code> ¤¬Æɤ߹þ¤Þ¤ì¤¿¸å¡¢
-    <code class="directive">&lt;Location&gt;</code> ¥»¥¯¥·¥ç¥ó¤è¤ê¤ÏÀè¤Ë
-    ÀßÄê¥Õ¥¡¥¤¥ë¤Ë¸½¤ì¤¿½ç¤ËŬÍѤµ¤ì¤Þ¤¹¡£
-    <code class="directive">&lt;Files&gt;</code> ¤Ï¡¢
-    <code class="directive">&lt;Directory&gt;</code> ¥»¥¯¥·¥ç¥óÆâ¤Ë
-    ¥Í¥¹¥È¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¡¢
-    ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î°ìÉô¤Ë¤Î¤ß¸ÂÄꤷ¤ÆŬÍѤµ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p><var>filename</var> °ú¿ô¤Ï¡¢¥Õ¥¡¥¤¥ë̾¤«¥ï¥¤¥ë¥É¥«¡¼¥Éʸ»úÎó
-    ¤Ç¡¢¥ï¥¤¥ë¥É¥«¡¼¥É¤Ç¤Ï <code>?</code> ¤Ï°ì¤Ä¤Îʸ»ú¡¢<code>*</code> ¤ÏǤ°Õ¤Îʸ»úÎó¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
-    <code>~</code> ¤È¤¤¤¦Ê¸»ú¤òÉղ乤뤳¤È¤Ç<a class="glossarylink" href="../glossary.html#regex" title="ÍѸ콸¤ò»²¾È">Àµµ¬É½¸½</a>¤ò»È¤¦¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-    Î㤨¤Ð¡¢</p>
-
-    <div class="example"><p><code>
-      &lt;Files ~ "\.(gif|jpe?g|png)$"&gt;
-    </code></p></div>
-
-    <p>¤È¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢°ìÈÌŪ¤Ê¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Î²èÁü¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
-    ¤¿¤À¤·¡¢
-    <code class="directive"><a href="#filesmatch">&lt;FilesMatch&gt;</a></code> ¤ò»È¤¦Êý¤¬
-    ¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p>¤Á¤Ê¤ß¤Ë¡¢<code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> ¤È <code class="directive"><a href="#location">&lt;Location&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤È¤Ï°Û¤Ê¤ê¡¢
-    <code class="directive">&lt;Files&gt;</code>
-    ¤Ï <code>.htaccess</code> ¥Õ¥¡¥¤¥ëÆâ¤ÇÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤³¤ì¤Ë¤è¤ê¡¢¥æ¡¼¥¶¤¬¥Õ¥¡¥¤¥ëËè¤Ë¥¢¥¯¥»¥¹¤ÎÀ©¸æ¤ò¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë
-    ¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
-
-
-<h3>»²¾È</h3>
-<ul>
-<li>¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¤¿ºÝ¤Ë¤³¤ì¤é¤Î°Û¤Ê¤ë¥»¥¯¥·¥ç¥ó¤¬
-    ÁȤ߹ç¤ï¤µ¤ì¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï <a href="../sections.html">
-    &lt;Directory&gt;, &lt;Location&gt;, &lt;Files&gt; ¥»¥¯¥·¥ç¥ó¤ÎÆ°ºîË¡</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="FilesMatch" id="FilesMatch">&lt;FilesMatch&gt;</a> <a name="filesmatch" id="filesmatch">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>Àµµ¬É½¸½¤Ë¥Þ¥Ã¥Á¤¹¤ë¥Õ¥¡¥¤¥ë̾¤ËŬÍѤµ¤ì¤ë
-¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò°Ï¤à</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>&lt;FilesMatch <var>regex</var>&gt; ... &lt;/FilesMatch&gt;</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">&lt;FilesMatch&gt;</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    <code class="directive"><a href="#files">&lt;Files&gt;</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥ÖƱÍͤˤ½¤ÎÃæ¤Ë¤¢¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎŬÍÑÈϰϤò¥Õ¥¡¥¤¥ë̾¤ÇÀ©¸Â¤·¤Þ¤¹¡£¤¿¤À¤·¡¢
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤ÏÀµµ¬É½¸½¤ò»ØÄꤷ¤Þ¤¹¡£
-    Î㤨¤Ð:</p>
-
-    <div class="example"><p><code>
-      &lt;FilesMatch "\.(gif|jpe?g|png)$"&gt;
-    </code></p></div>
-
-    <p>¤Ï°ìÈÌŪ¤Ê¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Î²èÁü·Á¼°¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li>¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¤¿ºÝ¤Ë¤³¤ì¤é¤Î°Û¤Ê¤ë¥»¥¯¥·¥ç¥ó¤¬
-    ÁȤ߹ç¤ï¤µ¤ì¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï <a href="../sections.html">
-    &lt;Directory&gt;, &lt;Location&gt;, &lt;Files&gt; ¥»¥¯¥·¥ç¥ó¤ÎÆ°ºîË¡</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ForceType" id="ForceType">ForceType</a> <a name="forcetype" id="forcetype">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¤¹¤Ù¤Æ¤Î¥Þ¥Ã¥Á¤¹¤ë¥Õ¥¡¥¤¥ë¤¬»ØÄê¤Î MIME ¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤Ç
-Á÷¤é¤ì¤ë¤è¤¦¤Ë¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ForceType <var>MIME-type</var>|None</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0 ¤Ç core ¤Ë°ÜÆ°</td></tr>
-</table>
-    <p><code>.htaccess</code> ¤ä <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> ¥»¥¯¥·¥ç¥ó¡¢
-    <code class="directive"><a href="#location">&lt;Location&gt;</a></code> ¥»¥¯¥·¥ç¥ó¡¢
-    <code class="directive"><a href="#files">&lt;Files&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤Ë
-    ½ñ¤«¤ì¤¿¾ì¹ç¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤½¤³¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤¬
-    <var>MIME-type</var>
-    ¤Ç»ØÄꤵ¤ì¤¿¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤È¤·¤Æ°·¤ï¤ì¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
-    GIF ¥Õ¥¡¥¤¥ë¤Ð¤«¤ê¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¢¤Ã¤Æ¡¢¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò <code>.gif</code>
-    ¤Ç½ª¤ï¤é¤»¤¿¤¯¤Ï¤Ê¤¤¤È¤­¤Ë¡¢°Ê²¼¤Î¤â¤Î¤ò»ÈÍѤ·¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      ForceType image/gif
-    </code></p></div>
-
-    <p><code class="directive"><a href="#defaulttype">DefaultType</a></code> ¤È°ã¤Ã¤Æ
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥á¥Ç¥£¥¢¥¿¥¤¥×¤ò·è¤á¤ë¤³¤È¤¬¤Ç¤­¤ë¤«¤â¤·¤ì¤Ê¤¤
-    ¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤â´Þ¤á¡¢¤¹¤Ù¤Æ¤Î MIME ¥¿¥¤¥×¤Î´ØÏ¢ÉÕ¤±¤ò
-    ¾å½ñ¤­¤¹¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p><code>None</code> ¤È¤¤¤¦Ãͤò»È¤¦¤³¤È¤Ç <code class="directive">ForceType</code> ¤Î
-    ÀßÄê¤ò̵¸ú¤Ë¤Ç¤­¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      # force all files to be image/gif:<br />
-      &lt;Location /images&gt;<br />
-        <span class="indent">
-          ForceType image/gif<br />
-        </span>
-      &lt;/Location&gt;<br />
-      <br />
-      # but normal mime-type associations here:<br />
-      &lt;Location /images/mixed&gt;<br />
-      <span class="indent">
-        ForceType None<br />
-      </span>
-      &lt;/Location&gt;
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="HostnameLookups" id="HostnameLookups">HostnameLookups</a> <a name="hostnamelookups" id="hostnamelookups">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¯¥é¥¤¥¢¥ó¥È¤Î IP ¥¢¥É¥ì¥¹¤Î DNS ¥ë¥Ã¥¯¥¢¥Ã¥×¤ò
-Í­¸ú¤Ë¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>HostnameLookups On|Off|Double</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>HostnameLookups Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥Û¥¹¥È̾¤ò¥í¥°¼ý½¸¤Ç¤­¤ë¤è¤¦¤Ë
-    DNS ¥ë¥Ã¥¯¥¢¥Ã¥×¤òÍ­¸ú¤Ë¤·¤Þ¤¹
-    (¤µ¤é¤Ë¡¢CGI/SSI ¤Ë <code>REMOTE_HOST</code> ÊÑ¿ô¤È¤·¤ÆÅϤ·¤Þ¤¹)¡£
-    <code>Double</code>¤ò»ØÄꤷ¤¿¾ì¹ç¡¢2 ½Å¤ÎµÕ°ú¤­¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£
-    ¤Ä¤Þ¤ê¡¢µÕ°ú¤­¤Î¸å¤Ë¡¢¤½¤Î·ë²Ì¤ËÂФ·¤ÆÀµ°ú¤­¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£Àµ°ú¤­¤Î
-    ·ë²Ì¤Î IP ¥¢¥É¥ì¥¹¤ÎÃæ¤Ë¥ª¥ê¥¸¥Ê¥ë¤Î¥¢¥É¥ì¥¹¤È°ìÃפ¹¤ë¤â¤Î¤¬¤Ê¤±¤ì¤Ð
-    ¤Ê¤ê¤Þ¤»¤ó¡£("tcpwrappers" ¤ÎÍѸì¤Ç¤Ï <code>PARANOID</code> ¤È¸Æ¤Ð¤ì¤Æ¤¤¤Þ¤¹¡£)</p>
-
-    <p><code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> ¤Ç¥Û¥¹¥È̾¤Ë¤è¤ë¥¢¥¯¥»¥¹
-    À©¸æ¤ò¹Ô¤Ê¤¦¾ì¹ç¤Ë¤Ï¡¢
-    ÀßÄê¤ÎÇ¡²¿¤Ë¤è¤é¤º 2 ½Å¤ÎµÕ°ú¤­¤¬¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
-    ¤³¤ì¤Ï¡¢¥»¥­¥å¥ê¥Æ¥£¤òÊݤĤ¿¤á¤ËɬÍפǤ¹¡£
-    <code>HostnameLookups Double</code> ¤òÀßÄꤷ¤Ê¤¤¸Â¤ê¡¢
-    ¾¤ÎÉôʬ¤Ï¤³¤Î 2 ½ÅµÕ°ú¤­¤Î·ë²Ì¤ò»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
-    Î㤨¤Ð¡¢<code>HostnameLookups On</code> ¤ÈÀßÄꤷ¤Æ¤¢¤ë¾õÂ֤ǡ¢
-    ¥Û¥¹¥È̾¤Ë¤è¤ë¥¢¥¯¥»¥¹À©¸Â¤ò¹Ô¤Ê¤Ã¤¿¥ª¥Ö¥¸¥§¥¯¥È¤Ø¤Î
-    ¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¤¿¤È¤¹¤ë¤È¡¢2 ½Å¤ÎµÕ°ú¤­¤¬À®¸ù¤¹¤ë¤«Èݤ«¤Ë¤è¤é¤º¡¢
-    <code>REMOTE_HOST</code> ¤Ë¤ÏÄ̾ï¤ÎµÕ°ú¤­·ë²Ì¤¬ÅϤµ¤ì¤Þ¤¹¡£</p>
-
-    <p>¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¥Ç¥Õ¥©¥ë¥È¤Ï
-    ËÜÅö¤ËµÕ°ú¤­¤òɬÍפȤ·¤Æ¤¤¤ë¤ï¤±¤Ç¤Ï¤Ê¤¤¥µ¥¤¥È¤Î
-    ¥Í¥Ã¥È¥ï¡¼¥¯¥È¥é¥Õ¥£¥Ã¥¯¤òÄ㸺¤µ¤»¤ë¤¿¤á¤Ë¡¢<code>Off</code> ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-    ¥ë¥Ã¥¯¥¢¥Ã¥×¤Ë¤è¤ë;·×¤ÊÃٱ䤬¤Ê¤¯¤Ê¤ë¤¿¤á¡¢
-    ¥¨¥ó¥É¥æ¡¼¥¶¤Ë¤È¤Ã¤Æ¤âÎɤ¤¤Ç¤·¤ç¤¦¡£
-    DNS ¤Î¥ë¥Ã¥¯¥¢¥Ã¥×¤Ë¤Ï¡¢¤«¤Ê¤ê¤Î»þ´Ö¤¬É¬ÍפȤʤë¾ì¹ç¤¬Â¿¤¯¡¢
-    Éé²Ù¤Î¹â¤¤¥µ¥¤¥È¤Ç¤Ï¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code>Off</code> ¤Ë¤¹¤Ù¤­¤Ç¤¹¡£
-    ¤Ê¤ª¡¢<var>/support</var> ¥Ç¥£¥ì¥¯¥È¥ê¤Ë´Þ¤Þ¤ì¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï
-    ¥¤¥ó¥¹¥È¡¼¥ë¥Ç¥£¥ì¥¯¥È¥ê¤Î <code>bin</code> ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë
-    ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤ë <code class="program"><a href="../programs/logresolve.html">logresolve</a></code> ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ë¤è¤ê¡¢
-    Apache ¤ÎÆ°ºî¤È¤ÏÊ̤ˡ¢¥í¥°¤Ë»Ä¤µ¤ì¤Æ¤¤¤ë IP ¥¢¥É¥ì¥¹¤«¤é¥Û¥¹¥È̾¤ò
-    ¥ë¥Ã¥¯¥¢¥Ã¥×¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="IfDefine" id="IfDefine">&lt;IfDefine&gt;</a> <a name="ifdefine" id="ifdefine">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>µ¯Æ°»þ¤Ë¥Æ¥¹¥È¤¬¿¿¤Ç¤¢¤ë¤È¤­¤Î¤ß¤Ë½èÍý¤µ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-°Ï¤à</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>&lt;IfDefine [!]<var>parameter-name</var>&gt; ...
-    &lt;/IfDefine&gt;</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code>&lt;IfDefine <var>test</var>&gt;...&lt;/IfDefine&gt;</code>
-    ¥»¥¯¥·¥ç¥ó¤Ï¡¢
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¾ò·ïÉÕ¤­¤Ç»ØÄꤹ¤ë¤¿¤á¤ËÍøÍѤ·¤Þ¤¹¡£
-    <code class="directive">&lt;IfDefine&gt;</code> ¥»¥¯¥·¥ç¥ó¤Ë
-    ´Þ¤Þ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢<var>test</var>¤¬
-    ÄêµÁ¤µ¤ì¤Æ¤¤¤ë¤È¤­¤Î¤ß½èÍý¤µ¤ì¤Þ¤¹¡£
-    ¤â¤· <var>test</var> ¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢
-    ³«»Ï¤È½ªÎ»¤Î»ØÄê¤Î´Ö¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p><code class="directive">&lt;IfDefine&gt;</code> ¥»¥¯¥·¥ç¥ó¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë
-    »ØÄꤹ¤ë <var>test</var> ¤Ï¡¢
-    ¼¡¤ÎÆó¤Ä¤Î·Á¼°¤Î¤¦¤Á¤Î°ì¤Ä¤ò¤È¤ê¤Þ¤¹:</p>
-
-    <ul>
-      <li><var>parameter-name</var></li>
-
-      <li><code>!</code><var>parameter-name</var></li>
-    </ul>
-
-    <p>Á°¼Ô¤Î¾ì¹ç¤Ë¤Ï¡¢<var>parameter-name</var> ¤È̾ÉÕ¤±¤é¤ì¤¿¥Ñ¥é¥á¡¼¥¿¤¬
-    ÄêµÁ¤µ¤ì¤Æ¤¤¤ì¤Ð³«»Ï¤È½ªÎ»¤Î´Ö¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬½èÍý¤µ¤ì¤Þ¤¹¡£
-    ¸å¼Ô¤Î¾ì¹ç¤ÏµÕ¤Ç¡¢<em>parameter-name</em> ¤¬»ØÄꤵ¤ì¤Æ<strong>¤¤¤Ê¤¤</strong>
-    ¾ì¹ç¤Ë½èÍý¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p><var>parameter-name</var> °ú¿ô¤Ï¡¢¥µ¡¼¥Ð¤òµ¯Æ°¤¹¤ëºÝ¤Ë
-    <code class="program"><a href="../programs/httpd.html">httpd</a></code> ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë
-    <code>-D<var>parameter-</var></code> ¤È¤¤¤¦·Á¤Ç»ØÄꤹ¤ë¤ÈÄêµÁ¤µ¤ì¤Þ¤¹¡£ </p>
-
-    <p><code class="directive">&lt;IfDefine&gt;</code> ¥»¥¯¥·¥ç¥ó¤Ï
-    Æþ¤ì»Ò¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¡¢Ê£¿ô¤Î¥Ñ¥é¥á¡¼¥¿¤Ë¤è¤ë¥Æ¥¹¥È¤ò¤¹¤ë¤¿¤á¤Ë»ÈÍѤǤ­¤Þ¤¹¡£
-    Îã:</p>
-
-    <div class="example"><p><code>
-      httpd -DReverseProxy ...<br />
-      <br />
-      # httpd.conf<br />
-      &lt;IfDefine ReverseProxy&gt;<br />
-      <span class="indent">
-        LoadModule rewrite_module modules/mod_rewrite.so<br />
-        LoadModule proxy_module   modules/libproxy.so<br />
-      </span>
-      &lt;/IfDefine&gt;
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="IfModule" id="IfModule">&lt;IfModule&gt;</a> <a name="ifmodule" id="ifmodule">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥â¥¸¥å¡¼¥ë¤Î¸ºß¤¹¤ë¤«¤·¤Ê¤¤¤«¤Ë±þ¤¸¤Æ½èÍý¤µ¤ì¤ë
-¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò°Ï¤à</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>&lt;IfModule [!]<var>module-file</var>|<var>module-identifier</var>&gt; ...
-    &lt;/IfModule&gt;</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>¥â¥¸¥å¡¼¥ë¼±Ê̻ҤϥС¼¥¸¥ç¥ó 2.1 °Ê¹ß¤Ç»ÈÍѲÄǽ¡£</td></tr>
-</table>
-    <p><code>&lt;IfModule <var>test</var>&gt;...&lt;/IfModule&gt;</code>
-    ¥»¥¯¥·¥ç¥ó¤Ï¡¢¥â¥¸¥å¡¼¥ë¤¬Â¸ºß¤¹¤ë¤È¤­¤Ë½èÍý¤µ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    »ØÄꤹ¤ë¤¿¤á¤ËÍøÍѤ·¤Þ¤¹¡£
-    <code class="directive">&lt;IfModule&gt;</code> ¥»¥¯¥·¥ç¥ó¤Ë
-    ´Þ¤Þ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢<var>test</var>
-    ¤Ç»ØÄꤹ¤ë¥â¥¸¥å¡¼¥ë¤¬ÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ë¤È¤­¤Î¤ß½èÍý¤µ¤ì¤Þ¤¹¡£
-    ¤â¤· <var>test</var> ¤¬ÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢³«»Ï¤È½ªÎ»¤Î´Ö¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö
-    ¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p><code class="directive">&lt;IfModule&gt;</code> ¥»¥¯¥·¥ç¥ó¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë
-    »ØÄꤹ¤ë <var>test</var> ¤Ï¡¢
-    ¼¡¤ÎÆó¤Ä¤Î·Á¼°¤Î¤¦¤Á¤Î°ì¤Ä¤ò¤È¤ê¤Þ¤¹¡£</p>
-
-    <ul>
-      <li><var>module</var></li>
-
-      <li>!<var>module</var></li>
-    </ul>
-
-    <p>Á°¼Ô¤Î¾ì¹ç¤Ï¡¢<var>module</var> ¤È̾ÉÕ¤±¤é¤ì¤¿¥â¥¸¥å¡¼¥ë¤¬
-    Apache ¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ì¤Ð
-    (¥³¥ó¥Ñ¥¤¥ëºÑ¤ß¤Î¤â¤Î¤È¡¢<code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code> ¤òÍøÍѤ·¤Æ
-    ưŪ¤ËÆɤ߹þ¤ó¤À¤â¤Î¤ÎξÊý)¡¢
-    ³«»Ï¤È½ªÎ»¤Î´Ö¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬½èÍý¤µ¤ì¤Þ¤¹¡£
-    ¸å¼Ô¤Î¾ì¹ç¤ÏµÕ¤Ç¡¢<var>module</var> ¤¬ÁȤ߹þ¤Þ¤ì¤Æ<strong>¤¤¤Ê¤¤</strong>
-    ¾ì¹ç¤Ë½èÍý¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p><var>module</var> °ú¿ô¤Ï¡¢¥â¥¸¥å¡¼¥ë¼±Ê̻Ҥ«
-    ¥³¥ó¥Ñ¥¤¥ë¤ò¤·¤¿»þ¤Î¥â¥¸¥å¡¼¥ë¤Î¥Õ¥¡¥¤¥ë̾¤Ç¤¹¡£
-    Î㤨¤Ð¡¢<code>rewrite_module</code> ¤Ï¼±Ê̻ҤÇ
-    <code>mod_rewrite.c</code> ¤Ï¥Õ¥¡¥¤¥ë̾¤Ç¤¹¡£
-    ¥â¥¸¥å¡¼¥ë¤¬Ê£¿ô¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤«¤é¹½À®¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢Ê¸»úÎó
-    <code>STANDARD20_MODULE_STUFF</code> ¤¬¤¢¤ë¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò
-    »È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p><code class="directive">&lt;IfModule&gt;</code> ¥»¥¯¥·¥ç¥ó¤Ï
-    Æþ¤ì»Ò¤Ë¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¢¤ê¡¢
-    Ê£¿ô¤Î¥â¥¸¥å¡¼¥ë¤Î¥Æ¥¹¥È¤ò¹Ô¤Ê¤¦¤¿¤á¤Ë»ÈÍѤǤ­¤Þ¤¹¡£</p>
-
-    <div class="note">ÆÃÄê¤Î¥â¥¸¥å¡¼¥ë¤Î¸ºß¤Ë´Ø¤ï¤é¤ºÆ°ºî¤¹¤ë
-    ÀßÄê¥Õ¥¡¥¤¥ë¤Î¸¶Ëܤ¬É¬ÍפʤȤ­¤Ë¤Î¤ß¤³¤Î¥»¥¯¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
-    Ä̾ï¤ÎÆ°ºî¤Ç¤Ï¡¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    <code class="directive">&lt;IfModule&gt;</code> ¥»¥¯¥·¥ç¥ó¤ÎÃæ¤Ë
-    Æþ¤ì¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£</div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Include" id="Include">Include</a> <a name="include" id="include">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ëÃ椫¤é¾¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò¼è¤ê¹þ¤à</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Include <var>file-path</var>|<var>directory-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>¥ï¥¤¥ë¥É¥«¡¼¥É¤Ë¤è¤ë¥Þ¥Ã¥Á¤Ï 2.0.41 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê¡¢¥µ¡¼¥Ð¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤«¤é
-    ¾¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¯¥ë¡¼¥É¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ò¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤Ë°ìÅÙ¤ËÆɤ߹þ¤à¤¿¤á¤Ë¡¢
-    ¥·¥§¥ë·Á¼° (<code>fnmatch</code>) ¤Î¥ï¥¤¥ë¥É¥«¡¼¥Éʸ»ú¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤µ¤é¤Ë¡¢<code class="directive">Include</code> ¤Ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢
-    ¥Ç¥£¥ì¥¯¥È¥ê¤È¤½¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥êÆâ¤ÎÁ´¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò
-    ¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤ËÆɤ߹þ¤ó¤Ç¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤È¤·¤Æ½èÍý¤·¤Þ¤¹¡£
-    ¤·¤«¤·¡¢¥Ç¥£¥ì¥¯¥È¥êÁ´ÂΤòÆɤ߹þ¤à¤Î¤Ï¤ª´«¤á¤Ç¤­¤Þ¤»¤ó¡£
-    ¤Õ¤È¤·¤¿¤³¤È¤«¤é <code>httpd</code> ¤¬Æɤ߹þ¤ß¤Ë¼ºÇÔ¤¹¤ë¤è¤¦¤Ê
-    °ì»þ¥Õ¥¡¥¤¥ë¤ò¥Ç¥£¥ì¥¯¥È¥ê¤Ë»Ä¤·¤Æ¤·¤Þ¤¦¤è¤¦¤Ê¤³¤È¤¬¤è¤¯¤¢¤ë¤«¤é¤Ç¤¹¡£</p>
-
-    <p>»ØÄꤹ¤ë¥Õ¥¡¥¤¥ë¥Ñ¥¹¤ÏÀäÂХѥ¹¤«¡¢
-    <code class="directive"><a href="#serverroot">ServerRoot</a></code> ¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤Î
-    ÁêÂХѥ¹¤«¡¢¤Î¤É¤Á¤é¤«¤Ç¤¹¡£</p>
-
-    <p>Îã:</p>
-
-    <div class="example"><p><code>
-      Include /usr/local/apache2/conf/ssl.conf<br />
-      Include /usr/local/apache2/conf/vhosts/*.conf
-    </code></p></div>
-
-     <p><code class="directive"><a href="#serverroot">ServerRoot</a></code> ¤«¤é¤ÎÁêÂХѥ¹¤Î¾ì¹ç¤Ï:</p>
-
-    <div class="example"><p><code>
-      Include conf/ssl.conf<br />
-      Include conf/vhosts/*.conf
-    </code></p></div>
-
-    <p><code>apachectl configtest</code> ¤ò¼Â¹Ô¤¹¤ë¤È¡¢ÀßÄê¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¤¤ë»þ¤Ë
-    Æɤ߹þ¤Þ¤ì¤¿¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤¬É½¼¨¤µ¤ì¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      root@host# apachectl configtest<br />
-      Processing config file: /usr/local/apache2/conf/ssl.conf<br />
-      Processing config file: /usr/local/apache2/conf/vhosts/vhost1.conf<br />
-      Processing config file: /usr/local/apache2/conf/vhosts/vhost2.conf<br />
-      Syntax OK
-    </code></p></div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="program"><a href="../programs/apachectl.html">apachectl</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="KeepAlive" id="KeepAlive">KeepAlive</a> <a name="keepalive" id="keepalive">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>HTTP ¤Î»ý³Ū¤ÊÀܳ¤òÍ­¸ú¤Ë¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>KeepAlive On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>KeepAlive On</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>HTTP/1.0 ¤Î Keep-Alive ³ÈÄ¥¤È HTTP/1.1 ¤Î»ý³ŪÀܳ¤Îµ¡Ç½¤Ï¡¢
-    Ê£¿ô¤Î¥ê¥¯¥¨¥¹¥È¤¬Æ±¤¸ TCP ¤ÎÀܳ¤ÇÁ÷¤é¤ì¤ë¡¢Ä¹»þ´Ö»ý³¤¹¤ë
-    HTTP ¥»¥Ã¥·¥ç¥ó¤òÄ󶡤·¤Þ¤¹¡£¤¿¤¯¤µ¤ó¤Î²èÁü¤¬
-    ´Þ¤Þ¤ì¤ë HTML ¥É¥­¥å¥á¥ó¥È¤Ç¤Ï¾ì¹ç¤Ë¤è¤Ã¤Æ¤ÏÃÙ±ä»þ´Ö¤¬ 50% û½Ì¤µ¤ì¤ë·ë²Ì¤â
-    ¤Ç¤Æ¤¤¤Þ¤¹¡£Keep-Alive Àܳ¤òÍ­¸ú¤Ë¤¹¤ë¤Ë¤Ï
-    <code>KeepAlive On</code> ¤ÈÀßÄꤷ¤Þ¤¹¡£</p>
-
-    <p>HTTP/1.0 ¤ËÂбþ¤·¤¿¥¯¥é¥¤¥¢¥ó¥È¤ÎºÝ¤Ë¤Ï¡¢
-    ¥¯¥é¥¤¥¢¥ó¥È¤è¤êÆäËÍ׵᤬¤¢¤Ã¤¿¾ì¹ç¤Î¤ß Keep-Alive Àܳ¤È¤Ê¤ê¤Þ¤¹¡£
-    ¤µ¤é¤Ë¡¢HTTP/1.0 ¥¯¥é¥¤¥¢¥ó¥È¤Ç¤Ï¡¢¥³¥ó¥Æ¥ó¥Ä¤ÎÍÆÎ̤¬Àè¤Ë
-    (ÌõÃí: Í×µá¤ËÂФ·¤Æ±þÅú¤òÊÖ¤¹Á°¤Ë) ¤ï¤«¤ë¾ì¹ç¤Î¤ß Keep-Alive
-    Àܳ¤òÍøÍѤǤ­¤Þ¤¹¡£
-    ¤³¤ì¤Ï¡¢CGI ¤Î½ÐÎϤä SSI ¤Î¥Ú¡¼¥¸¡¢
-    ¥µ¡¼¥Ð¤¬À¸À®¤·¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È¤Î¤è¤¦¤ÊưŪ¥³¥ó¥Æ¥ó¥Ä¤ò
-    HTTP/1.0 ¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤ë¾ì¹ç¤Ë¤Ï Keep-Alive Àܳ¤ò»È¤¨¤Ê¤¤¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
-    HTTP/1.1 ¤ËÂбþ¤·¤¿¥¯¥é¥¤¥¢¥ó¥È¤ÎºÝ¤Ë¤Ï¡¢
-    Æä˻ØÄꤵ¤ì¤Ê¤¤¸Â¤ê¤Ï¥Ç¥Õ¥©¥ë¥È¤È¤·¤Æ»ý³Ū¤ÊÀܳ¤¬¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£
-    ¥¯¥é¥¤¥¢¥ó¥È¤¬Í׵᤹¤ì¤Ð¡¢¥³¥ó¥Æ¥ó¥Ä¤ÎÍÆÎ̤òȽÊ̤Ǥ­¤Ê¤¤¤â¤Î¤ò
-    »ý³Ū¤ÊÀܳ¤òÄ̤·¤ÆÁ÷¤ë¤¿¤á¤Ë¡¢¥Á¥ã¥ó¥¯¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤¬ÍѤ¤¤é¤ì¤Þ¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#maxkeepaliverequests">MaxKeepAliveRequests</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="KeepAliveTimeout" id="KeepAliveTimeout">KeepAliveTimeout</a> <a name="keepalivetimeout" id="keepalivetimeout">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>»ý³Ū¤ÊÀܳ¤Ç¼¡¤Î¥ê¥¯¥¨¥¹¥È¤¬Íè¤ë¤Þ¤Ç¥µ¡¼¥Ð¤¬ÂԤĻþ´Ö</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>KeepAliveTimeout <var>seconds</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>KeepAliveTimeout 5</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>Àܳ¤òÊĤ¸¤ëÁ°¤Ë¡¢Apache ¤¬¼¡¤Î¥ê¥¯¥¨¥¹¥È¤ò²¿ÉÃÂԤĤ«¤ò»ØÄꤷ¤Þ¤¹¡£
-    ¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±ÉÕ¤±¤¿¸å¤Ï¡¢<code class="directive"><a href="#timeout">Timeout</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤Ã¤Æ
-    »ØÄꤵ¤ì¤¿¥¿¥¤¥à¥¢¥¦¥ÈÃͤ¬»È¤ï¤ì¤Þ¤¹¡£</p>
-
-    <p><code class="directive">KeepAliveTimeout</code> ¤òÂ礭¤ÊÃͤËÀßÄꤹ¤ë¤È¡¢
-    Éé²Ù¤Î¹â¤¤¥µ¡¼¥Ð¤Ë¤ª¤¤¤Æ¤Ï¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤ÎÌäÂê¤ò°ú¤­µ¯¤³¤¹¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£
-    ¥¿¥¤¥à¥¢¥¦¥È¤¬Ä¹¤±¤ì¤ÐŤ¤¤Û¤É¡¢¤è¤ê¿¤¯¤Î¥µ¡¼¥Ð¥×¥í¥»¥¹¤¬
-    ³èȯ¤Ç¤Ê¤¤¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤ÎÀܳ¤Î½ªÎ»¤òÂÔ¤Á³¤±¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Limit" id="Limit">&lt;Limit&gt;</a> <a name="limit" id="limit">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>°Ï¤¤¤ÎÃæ¤Ë¤¢¤ë¥¢¥¯¥»¥¹À©¸æ¤ÎŬÍѤòÆÃÄê¤Î HTTP ¥á¥½¥Ã¥É¤Î¤ß¤Ë
-À©¸Â¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>&lt;Limit <var>method</var> [<var>method</var>] ... &gt; ...
-    &lt;/Limit&gt;</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>¥¢¥¯¥»¥¹À©¸æ¤Ï¡¢Ä̾ï<strong>Á´¤Æ¤Î</strong>¥¢¥¯¥»¥¹¥á¥½¥Ã¥É¤ËÂФ·¤Æ
-    ±Æ¶Á¤·¡¢ÉáÄ̤Ϥ³¤ì¤¬Ë¾¤Þ¤·¤¤µóÆ°¤Ç¤¹¡£
-    <strong>¤½¤¦¤·¤¿¤³¤È¤«¤é¡¢ÂçÉôʬ¤Î¾ì¹ç¤Ë¤Ï¥¢¥¯¥»¥¹À©¸æ¤Ë´Ø¤ï¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    <code class="directive">&lt;Limit&gt;</code> ¥»¥¯¥·¥ç¥óÆâ¤Ë
-    ½ñ¤¯¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£ </strong></p>
-
-    <p><code class="directive">&lt;Limit&gt;</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-    ÌÜŪ¤Ï¡¢¥¢¥¯¥»¥¹À©¸æ¤ÎÈϰϤò
-    »ØÄꤵ¤ì¤¿ HTTP ¥á¥½¥Ã¥É¤Ë¸ÂÄꤹ¤ë¤¿¤á¤Ç¤¹¡£
-    ¤½¤ì°Ê³°¤Î¥á¥½¥Ã¥É¤Ï¡¢<code class="directive">&lt;Limit&gt;</code> ¤Ç°Ï¤ï¤ì¤¿¥¢¥¯¥»¥¹À©¸æ¤Î
-    <strong>±Æ¶Á¤ò¼õ¤±¤Þ¤»¤ó</strong>¡£
-    °Ê²¼¤ÎÎã¤Ï¡¢<code>POST</code>, <code>PUT</code>, <code>DELETE</code> ¤Î¥á¥½¥Ã¥É¤ËÂФ·¤Æ¤Î¤ß¥¢¥¯¥»¥¹¤ÎÀ©¸æ¤ò¹Ô¤Ê¤¤¡¢
-    ¤½¤ì°Ê³°¤Î¥á¥½¥Ã¥É¤Ë¤Ä¤¤¤Æ¤ÏÀ©¸Â¤·¤Þ¤»¤ó:</p>
-
-    <div class="example"><p><code>
-      &lt;Limit POST PUT DELETE&gt;<br />
-      <span class="indent">
-        Require valid-user<br />
-      </span>
-      &lt;/Limit&gt;
-    </code></p></div>
-
-    <p>¥á¥½¥Ã¥É̾¤Ë¤Ï°Ê²¼¤ÎÃ椫¤é°ì¤Ä°Ê¾å¤òÎóµó¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:
-    <code>GET</code>,
-    <code>POST</code>, <code>PUT</code>, <code>DELETE</code>,
-    <code>CONNECT</code>, <code>OPTIONS</code>,
-    <code>PATCH</code>, <code>PROPFIND</code>, <code>PROPPATCH</code>,
-    <code>MKCOL</code>, <code>COPY</code>, <code>MOVE</code>,
-    <code>LOCK</code>, <code>UNLOCK</code>. <strong>¥á¥½¥Ã¥É̾¤Ï
-    Âçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Þ¤¹¡£</strong> <code>GET</code> ¤ò»ØÄꤷ¤¿¾ì¹ç¤Ë¤Ï
-    <code>HEAD</code> ¥ê¥¯¥¨¥¹¥È¤Ë¤âÀ©¸Â¤¬¤«¤«¤ê¤Þ¤¹¡£<code>TRACE</code>
-    ¥á¥½¥Ã¥É¤ËÀ©¸Â¤ò¤«¤±¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£</p>
-
-    <div class="warning">¥¢¥¯¥»¥¹À©¸æ¤¬ÌÜŪ¤Î¾ì¹ç¤Ï
-    <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> 
-    ¥»¥¯¥·¥ç¥ó¤ÎÂå¤ï¤ê¤Ë <code class="directive"><a href="#limitexcept">&lt;LimitExcept&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤ò»ÈÍѤ·¤¿Êý¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£
-    <code class="directive"><a href="#limitexcept">&lt;LimitExcept&gt;</a></code>
-    ¥»¥¯¥·¥ç¥ó¤Ç¤ÏÉÔÆÃÄê¤Î¥á¥½¥Ã¥É¤ËÂФ·¤Æ¤âËɸæ¤Ç¤­¤ë¤«¤é¤Ç¤¹¡£</div>
-
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="LimitExcept" id="LimitExcept">&lt;LimitExcept&gt;</a> <a name="limitexcept" id="limitexcept">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>»ØÄꤵ¤ì¤¿¤â¤Î°Ê³°¤Î HTTP ¥á¥½¥Ã¥É¤Ë¥¢¥¯¥»¥¹À©¸æ¤ò
-À©¸Â¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>&lt;LimitExcept <var>method</var> [<var>method</var>] ... &gt; ...
-    &lt;/LimitExcept&gt;</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">&lt;LimitExcept&gt;</code> ¤È
-    <code>&lt;/LimitExcept&gt;</code> ¤Ï¡¢°ú¿ô¤Ë
-    <strong>´Þ¤Þ¤ì¤Æ¤¤¤Ê¤¤</strong>
-    HTTP ¤Î¥¢¥¯¥»¥¹¥á¥½¥Ã¥É¤ËŬÍѤ¹¤ë¤¿¤á¤Î¥¢¥¯¥»¥¹À©¸æ
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò³ç¤ë¤¿¤á¤ËÍøÍѤ·¤Þ¤¹¡£
-    ¤Ä¤Þ¤ê¡¢<code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤ÎÈ¿ÂФÎÆ°ºî¤ò¤·¡¢
-    ɸ½à¤Î¥á¥½¥Ã¥É¤Èɸ½à³°¤ä̤ǧ¼±¤Î¥á¥½¥Ã¥É¤Î¾ì¹ç¤ÎξÊý¤òÀßÄê¤Ç¤­¤Þ¤¹¡£
-    <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> ¤Î¥É¥­¥å¥á¥ó¥È¤â
-    Ê»¤»¤Æ»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>Îã:</p>
-
-    <div class="example"><p><code>
-      &lt;LimitExcept POST GET&gt;<br />
-      <span class="indent">
-        Require valid-user<br />
-      </span>
-      &lt;/LimitExcept&gt;
-    </code></p></div>
-
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="LimitInternalRecursion" id="LimitInternalRecursion">LimitInternalRecursion</a> <a name="limitinternalrecursion" id="limitinternalrecursion">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ÆâÉô¥ê¥À¥¤¥ì¥¯¥È¤ÈÆþ¤ì»Ò¤Ë¤Ê¤Ã¤¿¥µ¥Ö¥ê¥¯¥¨¥¹¥È¤ÎºÇÂç¿ô¤ò·èÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>LimitInternalRecursion <var>number</var> [<var>number</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>LimitInternalRecursion 10</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0.47 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p>ÆâÉô¥ê¥À¥¤¥ì¥¯¥È¤ÏÎ㤨¤Ð <code class="directive">Action</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    »È¤Ã¤Æ¤¤¤ë¤È¤­¤Ëµ¯¤³¤ê¤Þ¤¹¡£<code class="directive">Action</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¸µ¡¹¤Î¥ê¥¯¥¨¥¹¥È¤ò CGI ¥¹¥¯¥ê¥×¥È¤ËÆâÉô¥ê¥À¥¤¥ì¥¯¥È¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£
-    ¥µ¥Ö¥ê¥¯¥¨¥¹¥È¤Ï¤¤¤¯¤Ä¤«¤Î URI ¤ËÂФ·¤Æ¡¢¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿¤È¤­¤Ë
-    ²¿¤¬µ¯¤³¤ë¤«¤òÄ´¤Ù¤ë¤¿¤á¤Î Apache ¤Îµ¡¹½¤Ç¤¹¡£Î㤨¤Ð¡¢<code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code>
-    ¤Ï <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö
-    ¤¬¥ê¥¹¥È¤¹¤ë¥Õ¥¡¥¤¥ë¤òÄ´¤Ù¤ë¤¿¤á¤Ë¥µ¥Ö¥ê¥¯¥¨¥¹¥È¤ò»È¤¤¤Þ¤¹¡£</p>
-
-    <p><code class="directive">LimitInternalRecursion</code> ¤ÏÆâÉô¥ê¥À¥¤¥ì¥¯¥È¤ä
-    ¥µ¥Ö¥ê¥¯¥¨¥¹¥È¤¬Ìµ¸Â¥ë¡¼¥×¤Ë´Ù¤Ã¤¿¤È¤­¤Î¥µ¡¼¥Ð¥¯¥é¥Ã¥·¥å¤òËɤ®¤Þ¤¹¡£
-    ÉáÄÌ¡¢¤½¤Î¤è¤¦¤Ê¥ë¡¼¥×¤ÏÀßÄê¤Ë¼ºÇÔ¤·¤¿¤È¤­¤ËȯÀ¸¤·¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥ê¥¯¥¨¥¹¥ÈËè¤Ëɾ²Á¤µ¤ì¤ë¡¢Æó¤Ä¤Î°ã¤¦¸Â³¦Ãͤò
-    ÀßÄꤷ¤Þ¤¹¡£ºÇ½é¤Î <var>number</var> ¤Ï¡¢µ¯¤³¤êÆÀ¤ë
-    ÆâÉô¥ê¥¯¥¨¥¹¥È¤ÎºÇÂçÃͤòÀßÄꤷ¤Þ¤¹¡£Æó¤Ä¤á¤Î <var>number</var> ¤Ï
-    ¥µ¥Ö¥ê¥¯¥¨¥¹¥È¤¬Æþ¤ì»Ò¤Ë¤Ç¤­¤ë¿¼¤µ¤òÀßÄꤷ¤Þ¤¹¡£<var>number</var> ¤ò
-    °ì¤Ä¤À¤±»ØÄꤷ¤¿¤È¤­¤Ï¡¢Î¾Êý¤Î¸Â³¦Ãͤˤ½¤ÎÃͤ¬ÀßÄꤵ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      LimitInternalRecursion 5
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="LimitRequestBody" id="LimitRequestBody">LimitRequestBody</a> <a name="limitrequestbody" id="limitrequestbody">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¯¥é¥¤¥¢¥ó¥È¤«¤éÁ÷¤é¤ì¤ë HTTP ¥ê¥¯¥¨¥¹¥È¤Î¥Ü¥Ç¥£¤Î
-ÁíÎ̤òÀ©¸Â¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>LimitRequestBody <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>LimitRequestBody 0</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥ê¥¯¥¨¥¹¥È¥Ü¥Ç¥£¤Ëµö¤µ¤ì¤ë¥Ð¥¤¥È¿ô¡¢<var>bytes</var>
-    ¤ò 0 (̵À©¸Â¤ò°ÕÌ£¤·¤Þ¤¹) ¤«¤é 2147483647 (2GB) ¤Þ¤Ç¤Î¿ôÃͤǻØÄꤷ¤Þ¤¹¡£</p>
-
-    <p><code class="directive">LimitRequestBody</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬½ñ¤«¤ì¤¿¥³¥ó¥Æ¥­¥¹¥È
-    (¥µ¡¼¥ÐÁ´ÂΡ¢¥Ç¥£¥ì¥¯¥È¥ê¡¢¥Õ¥¡¥¤¥ë¡¢¥í¥±¡¼¥·¥ç¥ó) Æâ¤Ç
-    µöÍƤ¹¤ë  HTTP ¥ê¥¯¥¨¥¹¥È¥á¥Ã¥»¡¼¥¸¥Ü¥Ç¥£¤Î¥µ¥¤¥º¤ËÀ©¸Â¤ò¤«¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¥¯¥¨¥¹¥È¤¬¤½¤ÎÀ©¸ÂÃͤò±Û¤¨¤Æ¤¤¤ì¤Ð¡¢
-    ¥µ¡¼¥Ð¤Ï¥ê¥¯¥¨¥¹¥È¤ò½èÍý¤»¤º¤Ë¥¨¥é¡¼¤òÊÖ¤·¤Þ¤¹¡£
-    ÉáÄ̤Υꥯ¥¨¥¹¥È¥á¥Ã¥»¡¼¥¸¥Ü¥Ç¥£¤Î¥µ¥¤¥º¤Ï¡¢¥ê¥½¡¼¥¹¤Î¼ïÎà¤ä
-    µö²Ä¤µ¤ì¤Æ¤¤¤ë¥á¥½¥Ã¥É¤Ë¤è¤Ã¤ÆÂ礭¤¯ÊѤï¤ê¤Þ¤¹¡£
-    CGI ¥¹¥¯¥ê¥×¥È¤Ï¡¢¤è¤¯¾ðÊó¤ò¼õ¿®¤¹¤ë¤¿¤á¤Ë
-    ¥á¥Ã¥»¡¼¥¸¥Ü¥Ç¥£¤ò»È¤¤¤Þ¤¹¡£
-    <code>PUT</code> ¥á¥½¥Ã¥É¤Î¼ÂÁõ¤Ï¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÃͤȤ·¤Æ
-    ¾¯¤Ê¤¯¤È¤â¤¢¤ë¥ê¥½¡¼¥¹¤ËÂФ·¤Æ¥µ¡¼¥Ð¤¬¼õ¤±ÉÕ¤±¤è¤¦¤È¤¹¤ë
-    ɽ¸½¤ÎÂ礭¤µ¤Û¤É¤ÎÃͤòɬÍפȤ·¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ´ÉÍý¼Ô¤Ë¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î°Û¾ï¤Ê¥ê¥¯¥¨¥¹¥È¤òÀ©¸æ¤Ç¤­¤ë¤è¤¦¤Ë¤·¡¢
-    ²¿¤é¤«¤Î·Á¤Î¥µ¡¼¥Ó¥¹µñÈݹ¶·â (ÌõÃí:DoS) ¤òÈò¤±¤ë¤Î¤ËÍ­¸ú¤Ç¤¹¡£</p>
-
-    <p>¤¢¤ë¾ì½ê¤Ø¤Î¥Õ¥¡¥¤¥ë¥¢¥Ã¥×¥í¡¼¥É¤òµö²Ä¤¹¤ë¾ì¹ç¤Ë¡¢
-    ¥¢¥Ã¥×¥í¡¼¥É¤Ç¤­¤ë¥Õ¥¡¥¤¥ë¤Î¥µ¥¤¥º¤ò 100K ¤ËÀ©¸Â¤·¤¿¤±¤ì¤Ð¡¢
-    °Ê²¼¤Î¤è¤¦¤Ë»ØÄꤷ¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      LimitRequestBody 102400
-    </code></p></div>
-
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="LimitRequestFields" id="LimitRequestFields">LimitRequestFields</a> <a name="limitrequestfields" id="limitrequestfields">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î HTTP ¥ê¥¯¥¨¥¹¥È¤Î¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¤Î¿ô¤ò
-À©¸Â¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>LimitRequestFields <var>number</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>LimitRequestFields 100</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><var>number</var> ¤Ë¤Ï¡¢0 (̵À©¸Â¤ò°ÕÌ£¤·¤Þ¤¹) ¤«¤é 32767
-    ¤Þ¤Ç¤ÎÀ°¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
-    ¥Ç¥Õ¥©¥ë¥ÈÃͤϡ¢Äê¿ô <code>DEFAULT_LIMIT_REQUEST_FIELDS</code>
-    ¤Ë¤è¤ê¥³¥ó¥Ñ¥¤¥ë»þ¤ËÄêµÁ¤µ¤ì¤Þ¤¹ (ÇÛÉÛ»þ¤Ë¤Ï 100 ¤È»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹)¡£</p>
-
-    <p><code class="directive">LimitRequestBody</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥µ¡¼¥Ð´ÉÍý¼Ô¤¬ HTTP ¥ê¥¯¥¨¥¹¥ÈÃæ¤Ë¤ª¤¤¤Æµö²Ä¤¹¤ë¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¿ô¤ò
-    »ØÄꤷ¤Þ¤¹¡£
-    ¥µ¡¼¥Ð¤Ï¤³¤ÎÃͤˤÏÄ̾ï¤Î¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î¥ê¥¯¥¨¥¹¥È¤Ë´Þ¤Þ¤ì¤ë¤Ç¤¢¤í¤¦
-    ¥Õ¥£¡¼¥ë¥É¤Î¿ô¤è¤êÂ礭¤ÊÃͤ¬É¬ÍפȤ·¤Þ¤¹¡£
-    ¥¯¥é¥¤¥¢¥ó¥È¤Ë¤è¤ê»È¤ï¤ì¤¿Í×µá¥Ø¥Ã¥À¡¼¥Õ¥£¡¼¥ë¥É¤Î¿ô¤¬
-    20 ¤òĶ¤¨¤ë¤³¤È¤Ï¤Û¤È¤ó¤É¤¢¤ê¤Þ¤»¤ó¤¬¡¢
-    ¤³¤ì¤Ï¼ï¡¹¤Î¥¯¥é¥¤¥¢¥ó¥È¤Î¼ÂÁõ¤Ë¤è¤Ã¤ÆÊѤï¤ê¡¢
-    ¾ÜºÙ¤Ê¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤ò¤¹¤ë¤¿¤á¤Î¥Ö¥é¥¦¥¶¤ÎÀßÄê¤Þ¤Ç¤Ë¤â
-    ±Æ¶Á¤µ¤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-    ¥ª¥×¥·¥ç¥ó¤Î HTTP ³ÈÄ¥¤Ï¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¤ò»È¤Ã¤Æɽ¤µ¤ì¤ë¾ì¹ç¤¬
-    ¿¤¯¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ´ÉÍý¼Ô¤Ë¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î°Û¾ï¤Ê¥ê¥¯¥¨¥¹¥È¤òÀ©¸æ¤Ç¤­¤ë¤è¤¦¤Ë¤·¡¢
-    ²¿¤é¤«¤Î·Á¤Î¥µ¡¼¥Ó¥¹µñÈݹ¶·â (ÌõÃí:DoS) ¤òÈò¤±¤ë¤Î¤ËÍ­¸ú¤Ç¤¹¡£
-    ¥ê¥¯¥¨¥¹¥È¤Î¥Õ¥£¡¼¥ë¥É¤¬Â¿²á¤®¤ë¤³¤È¤ò°ÕÌ£¤¹¤ë¥¨¥é¡¼±þÅú¤¬
-    ÉáÄ̤Υ¯¥é¥¤¥¢¥ó¥È¤ËÊÖ¤µ¤ì¤ë¤è¤¦¤Ê»þ¤Ï¤³¤ÎÃͤòÁý¤ä¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>Îã:</p>
-
-    <div class="example"><p><code>
-      LimitRequestFields 50
-    </code></p></div>
-
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="LimitRequestFieldSize" id="LimitRequestFieldSize">LimitRequestFieldSize</a> <a name="limitrequestfieldsize" id="limitrequestfieldsize">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î HTTP ¥ê¥¯¥¨¥¹¥È¤Î¥Ø¥Ã¥À¤Î
-¥µ¥¤¥º¤òÀ©¸Â¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>LimitRequestFieldsize <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>LimitRequestFieldsize 8190</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢HTTP ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À°ì¤Ä¤Ç¼õÉÕ¤±¤ë
-    ¥Ð¥¤¥È¿ô <var>bytes</var> ¤ò»ØÄꤷ¤Þ¤¹¡£</p>
-
-    <p><code class="directive">LimitRequestFieldSize</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    HTTP ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤ÇµöÍƤµ¤ì¤ë¥µ¥¤¥º¤òÁý¸º¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¥µ¡¼¥Ð¤Ï¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÃͤȤ·¤Æ¡¢
-    °ìÈÌŪ¤Ê¥¯¥é¥¤¥¢¥ó¥È¤«¤é¥ê¥¯¥¨¥¹¥È¤¬Á÷¤é¤ì¤¿ºÝ¤Ë¡¢¤½¤Î¥ê¥¯¥¨¥¹¥È¤Ë
-    ÉÕ°¤·¤Æ¤¤¤ë¤É¤Î¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¤Ë¤Ä¤¤¤Æ¤â¡¢
-    ½½Ê¬Â­¤ê¤ëÂ礭¤µ¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-    °ìÈÌŪ¤Ê¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤Î¥µ¥¤¥º¤È¤¤¤Ã¤Æ¤â¡¢¤½¤ÎÂ礭¤µ¤Ï¸Ä¡¹¤Î
-    ¥¯¥é¥¤¥¢¥ó¥È¤Î¼ÂÁõ¤Ë¤è¤Ã¤ÆÂ礭¤¯°Û¤Ê¤ê¡¢
-    ¾ÜºÙ¤Ê¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤ò¥µ¥Ý¡¼¥È¤¹¤ë¤«¤É¤¦¤«¤Î¡¢
-    ¥Ö¥é¥¦¥¶¤ÎÀßÄê¤Ë¤â±Æ¶Á¤µ¤ì¤¿¤ê¤·¤Þ¤¹¡£
-    SPNEGO ǧ¾Ú¥Ø¥Ã¥À¤Ç¤Ï 12392 ¥Ð¥¤¥È¤Ë¤Þ¤ÇµÚ¤Ö¤³¤È¤¹¤é¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ´ÉÍý¼Ô¤Ë¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î°Û¾ï¤Ê¥ê¥¯¥¨¥¹¥È¤òÀ©¸æ¤Ç¤­¤ë¤è¤¦¤Ë¤·¡¢
-    ²¿¤é¤«¤Î·Á¤Î¥µ¡¼¥Ó¥¹µñÈݹ¶·â (ÌõÃí:DoS) ¤òÈò¤±¤ë¤Î¤ËÍ­¸ú¤Ç¤¹¡£</p>
-
-    <p>Îã:</p>
-
-    <div class="example"><p><code>
-      LimitRequestFieldSize 4094
-    </code></p></div>
-
-    <div class="note">Ä̾ï¤Ï¥Ç¥Õ¥©¥ë¥È¤«¤éÊѹ¹¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£</div>
-
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="LimitRequestLine" id="LimitRequestLine">LimitRequestLine</a> <a name="limitrequestline" id="limitrequestline">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î HTTP ¥ê¥¯¥¨¥¹¥È¹Ô¤Î¥µ¥¤¥º¤òÀ©¸Â¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>LimitRequestLine <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>LimitRequestLine 8190</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢HTTP ¥ê¥¯¥¨¥¹¥È¹ÔÆâ¤ÇµöÍƤµ¤ì¤ë¥Ð¥¤¥È¿ô
-    <var>bytes</var> ¤ò»ØÄꤷ¤Þ¤¹¡£</p>
-
-    <p><code class="directive">LimitRequestLine</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê¡¢
-    ¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î HTTP ¥ê¥¯¥¨¥¹¥È¹Ô¤ÎµöÍÆ¥µ¥¤¥º¤òÁý¸º¤Ç¤­¤Þ¤¹¡£ 
-    ¥ê¥¯¥¨¥¹¥È¹Ô¤Ï¡¢HTTP¥á¥½¥Ã¥É¡¢URI¡¢¥×¥í¥È¥³¥ë¥Ð¡¼¥¸¥ç¥ó¤«¤éÀ®¤Ã¤Æ¤ª¤ê¡¢
-    <code class="directive">LimitRequestLine</code> ¤Ï¥µ¡¼¥Ð¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ
-    µöÍƤ¹¤ë¥ê¥¯¥¨¥¹¥È URI ¤ÎŤµ¤òÀ©¸Â¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¥µ¡¼¥Ð¤Ï¡¢<code>GET</code> ¥ê¥¯¥¨¥¹¥È¤Î¥¯¥¨¥êÉôʬ¤â´Þ¤á¤Æ¡¢¥ê¥½¡¼¥¹¤Î̾Á°¤¬Æþ¤ë¤Ë­¤ë
-    Â礭¤µ¤òɬÍפȤ·¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ´ÉÍý¼Ô¤Ë¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î°Û¾ï¤Ê¥ê¥¯¥¨¥¹¥È¤òÀ©¸æ¤Ç¤­¤ë¤è¤¦¤Ë¤·¡¢
-    ²¿¤é¤«¤Î·Á¤Î¥µ¡¼¥Ó¥¹µñÈݹ¶·â (ÌõÃí:DoS) ¤òÈò¤±¤ë¤Î¤ËÍ­¸ú¤Ç¤¹¡£</p>
-
-    <p>Îã:</p>
-
-    <div class="example"><p><code>
-      LimitRequestLine 4094
-    </code></p></div>
-
-    <div class="note">Ä̾ï¤Ï¥Ç¥Õ¥©¥ë¥È¤«¤éÊѹ¹¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£</div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="LimitXMLRequestBody" id="LimitXMLRequestBody">LimitXMLRequestBody</a> <a name="limitxmlrequestbody" id="limitxmlrequestbody">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>XML ·Á¼°¤Î¥ê¥¯¥¨¥¹¥È¤Î¥Ü¥Ç¥£¤Î¥µ¥¤¥º¤òÀ©¸Â¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>LimitXMLRequestBody <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>LimitXMLRequestBody 1000000</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>XML ·Á¼°¤Î¥ê¥¯¥¨¥¹¥È¤Î¥Ü¥Ç¥£¤ÎºÇÂçÃͤò (¥Ð¥¤¥Èñ°Ì¤Ç) À©¸Â¤·¤Þ¤¹¡£
-    ÃÍ¤Ë <code>0</code> ¤ò»ØÄꤹ¤ë¤È¥Á¥§¥Ã¥¯¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£</p>
-
-    <p>Îã:</p>
-
-    <div class="example"><p><code>
-    LimitXMLRequestBody 0
-    </code></p></div>
-
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Location" id="Location">&lt;Location&gt;</a> <a name="location" id="location">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>°Ï¤ó¤À¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¥Þ¥Ã¥Á¤¹¤ë URL ¤Î¤ß¤ËŬÍÑ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>&lt;Location
-    <var>URL-path</var>|<var>URL</var>&gt; ... &lt;/Location&gt;</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">&lt;Location&gt;</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    URL ¤Ë¤è¤êÃæ¤Ë½ñ¤«¤ì¤¿¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎŬÍÑÈϰϤòÀ©¸Â¤·¤Þ¤¹¡£
-    <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È»÷¤Æ¤¤¤Æ¡¢
-    <code>&lt;/Location&gt;</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç½ªÎ»¤¹¤ë
-    ¥µ¥Ö¥»¥¯¥·¥ç¥ó¤ò³«»Ï¤·¤Þ¤¹¡£
-    <code class="directive">&lt;Location&gt;</code> ¥»¥¯¥·¥ç¥ó¤Ï¡¢
-    <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤È
-    <code>.htaccess</code> ¤ÎÆɤ߹þ¤ß¤Î¸å¡¢
-    <code class="directive"><a href="#files">&lt;Files&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤ò
-    ŬÍѤ·¤¿¸å¤Ë¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤Ë¸½¤ì¤¿½ç¤Ë½èÍý¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p><code class="directive">&lt;Location&gt;</code> ¥»¥¯¥·¥ç¥ó¤Ï
-    ´°Á´¤Ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤È´ØÏ¢¤»¤º¤ËÆ°ºî¤·¤Þ¤¹¡£¤³¤Î¤³¤È¤«¤éƳ¤«¤ì¤ë
-    ·ë²Ì¤Ë¤Ï¤¤¤Ä¤¯¤«Ãí°Õ¤¹¤ëÅÀ¤¬¤¢¤ê¤Þ¤¹¡£ºÇ¤â½ÅÍפʤâ¤Î¤Ï¡¢
-    ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î°ÌÃ֤ؤΥ¢¥¯¥»¥¹À©¸æ¤Ë <code class="directive">&lt;Location&gt;</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¦¤Ù¤­¤Ç¤Ï¤Ê¤¤
-    ¤È¤¤¤¦¤³¤È¤Ç¤¹¡£Ê£¿ô¤Î URL ¤¬¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎƱ¤¸°ÌÃ֤˥ޥåפµ¤ì¤ë
-    ²Äǽ¤¬¤¢¤ê¤Þ¤¹¤Î¤Ç¡¢¤½¤Î¤è¤¦¤Ê¥¢¥¯¥»¥¹À©¸æ¤Ï²óÈò¤µ¤ì¤Æ¤·¤Þ¤¦²ÄǽÀ­¤¬
-    ¤¢¤ê¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>¤¤¤Ä <code class="directive">&lt;Location&gt;</code> ¤ò»È¤¦¤«</h3>
-
-    <p><code class="directive">&lt;Location&gt;</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à³°¤Î¥³¥ó¥Æ¥ó¥Ä¤Ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òŬÍѤ¹¤ë¤È¤­¤Ë
-    »ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë¸ºß¤¹¤ë¥³¥ó¥Æ¥ó¥Ä¤ËÂФ·¤Æ¤Ï¡¢
-    <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> ¤È <code class="directive"><a href="#files">&lt;Files&gt;</a></code> ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
-    Îã³°¤Ï¡¢<code>&lt;Location /&gt;</code> ¤Ç¡¢¤³¤ì¤Ï¥µ¡¼¥ÐÁ´ÂΤËÂФ·¤Æ
-    ÀßÄê¤òŬÍѤ¹¤ë´Êñ¤ÊÊýË¡¤Ç¤¹¡£</p>
-    </div>
-
-    <p>Á´¤Æ¤Î (¥×¥í¥­¥·°Ê³°¤Î) ¥ê¥¯¥¨¥¹¥È¤ËÂФ·¡¢
-    URL ¤Ï <code>/path/</code> ¤È¤¤¤¦¡¢
-    ÀÜƬ¼­ <code>http://servername</code> ¤ò´Þ¤Þ¤Ê¤¤·Á¤Ç¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
-    ¥×¥í¥­¥·¥ê¥¯¥¨¥¹¥È¤Î¾ì¹ç¤Ë¤Ï¡¢<code>scheme://servername/path</code>
-    ¤È¤¤¤¦ÀÜƬ¼­¤ò´Þ¤à·Á¤Ç¥Þ¥Ã¥Á¤·¡¢ÀÜƬ¼­¤ò´Þ¤á¤Æ»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>URL ¤Ë¤Ï¥ï¥¤¥ë¥É¥«¡¼¥É¤òÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    <code>?</code> ¤ÏǤ°Õ¤Î°ìʸ»ú¡¢<code>*</code> ¤ÏǤ°Õ¤Îʸ»úÎó¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£ </p>
-
-    <p><code>~</code> ¤È¤¤¤¦Ê¸»ú¤òÄɲ乤뤳¤È¤Ç¡¢<a class="glossarylink" href="../glossary.html#regex" title="ÍѸ콸¤ò»²¾È">Àµµ¬É½¸½</a>¤ò
-    ÍøÍѤ¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-    Î㤨¤Ð:</p>
-
-    <div class="example"><p><code>
-      &lt;Location ~ "/(extra|special)/data"&gt;
-    </code></p></div>
-
-    <p>¤Ï URL ¤Ë <code>/extra/data</code> ¤« <code>/special/data</code> ¤È¤¤¤¦Ê¸»úÎó¤¬
-    ´Þ¤Þ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
-   <code class="directive"><a href="#locationmatch">&lt;LocationMatch&gt;</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    <code class="directive">&lt;Location&gt;</code> ¤ÎÀµµ¬É½¸½
-    ÈǤȤޤ俤¯Æ±¤¸Æ°ºî¤ò¤·¤Þ¤¹¡£</p>
-
-    <p><code class="directive">&lt;Location&gt;</code> µ¡Ç½¤Ï¡¢<code class="directive"><a href="#sethandler">SetHandler</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    Áȹç¤ï¤»¤ÆÍøÍѤ¹¤ë¤ÈÆäËÊØÍø¤Ç¤¹¡£
-    Î㤨¤Ð¡¢<code>foo.com</code> ¤Î¥Ö¥é¥¦¥¶¤«¤é¤Î¤ß¥¹¥Æ¡¼¥¿¥¹¤Î»²¾È¤òÍ­¸ú¤Ë¤·¤¿¤±¤ì¤Ð¡¢
-    ¼¡¤Î¤è¤¦¤Ë¤¹¤ì¤ÐÎɤ¤¤Ç¤·¤ç¤¦¡£</p>
-
-    <div class="example"><p><code>
-      &lt;Location /status&gt;<br />
-      <span class="indent">
-        SetHandler server-status<br />
-        Order Deny,Allow<br />
-        Deny from all<br />
-        Allow from .foo.com<br />
-      </span>
-      &lt;/Location&gt;
-    </code></p></div>
-
-<div class="note"><h3>/ (¥¹¥é¥Ã¥·¥å) ¤Ë´Ø¤¹¤ëÃí</h3>
-    <p>¥¹¥é¥Ã¥·¥åʸ»ú¤Ï¡¢URL Æâ¤Ë¸½¤ì¤ë¾ì½ê¤Ë±þ¤¸¤ÆÊѲ½¤¹¤ë
-    ÆÃÊ̤ʰÕÌ£¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£
-    ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë¤ª¤¤¤ÆÍøÍѤ¹¤ë¾ì¹ç¤Ë¤ÏÊ£¿ô¤Î¥¹¥é¥Ã¥·¥å¤Ç¤â°ì¤Ä¤Î
-    ¥¹¥é¥Ã¥·¥å¤È¤·¤Æ°·¤ï¤ì¤ë¤³¤È¤¬Â¿¤¤¤Ç¤¹¤¬¡¢
-    (<em>¤¹¤Ê¤ï¤Á</em>¡¢<code>/home///foo</code> ¤Ï
-    <code>/home/foo</code> ¤ÈƱ¤¸¤¤¤Ã¤¿¤è¤¦¤Ë)
-    URL ¤Ë¤ª¤¤¤Æ¤Ïɬ¤º¤·¤â¤½¤¦¤Ê¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-    <code class="directive"><a href="#locationmatch">&lt;LocationMatch&gt;</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤äÀµµ¬É½¸½¤òÍøÍѤ·¤¿
-    <code class="directive">&lt;Location&gt;</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¡¢
-    Ê£¿ô¤Î¥¹¥é¥Ã¥·¥å¤Ë¥Þ¥Ã¥Á¤µ¤»¤¿¤¤¤È¤­¤Ë¤Ï¡¢¡¢ÌÀ¼¨Åª¤Ëµ­½Ò¤¹¤ë
-    ɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>Î㤨¤Ð¡¢<code>&lt;LocationMatch ^/abc&gt;</code> ¤Ï¡¢
-    <code>/abc</code> ¤È¤¤¤¦¥ê¥¯¥¨¥¹¥È URL ¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¤¬¡¢
-    <code>//abc</code> ¤È¤¤¤¦¥ê¥¯¥¨¥¹¥È URL ¤Ë¤Ï¥Þ¥Ã¥Á¤·¤Þ¤»¤ó¡£
-    (Àµµ¬É½¸½¤Ç¤Ê¤¤) <code class="directive">&lt;Location&gt;</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    proxy ¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤ÆÍøÍѤ¹¤ëºÝ¤Ë¤ÏƱÍͤﶤëÉñ¤¤¤ò¤·¤Þ¤¹¤¬¡¢
-    (Àµµ¬É½¸½¤Ç¤Ê¤¤) <code class="directive">&lt;Location&gt;</code> ¤ò proxy
-    ¤Ç¤Ê¤¤¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤ÆÍøÍѤ¹¤ëºÝ¤Ë¤Ï¡¢
-    °ì¤Ä¤Î¥¹¥é¥Ã¥·¥å¤ÇÊ£¿ô¤Î¥¹¥é¥Ã¥·¥å¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
-    Î㤨¤Ð¡¢<code>&lt;Location /abc/def&gt;</code> ¤È»ØÄꤷ¡¢
-    <code>/abc//def</code> ¤È¤¤¤¦¥ê¥¯¥¨¥¹¥È¤¬¤¢¤ì¤Ð¡¢
-    ¥Þ¥Ã¥Á¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p></div>
-
-
-<h3>»²¾È</h3>
-<ul>
-<li>¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¤¿ºÝ¤Ë¤³¤ì¤é¤Î°Û¤Ê¤ë¥»¥¯¥·¥ç¥ó¤¬
-    ÁȤ߹ç¤ï¤µ¤ì¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï <a href="../sections.html">
-    &lt;Directory&gt;, &lt;Location&gt;, &lt;Files&gt; ¥»¥¯¥·¥ç¥ó¤ÎÆ°ºîË¡</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="LocationMatch" id="LocationMatch">&lt;LocationMatch&gt;</a> <a name="locationmatch" id="locationmatch">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>°Ï¤ó¤À¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÀµµ¬É½¸½¤Ë¥Þ¥Ã¥Á¤¹¤ë URL ¤Î¤ß¤Ë
-ŬÍÑ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>&lt;LocationMatch
-    <var>regex</var>&gt; ... &lt;/LocationMatch&gt;</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">&lt;LocationMatch&gt;</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    <code class="directive"><a href="#location">&lt;Location&gt;</a></code> ¤ÈƱ¤¸ÍͤË
-    URL ¤Ë¤è¤êÃæ¤Ë½ñ¤«¤ì¤¿¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎŬÍÑÈϰϤòÀ©¸Â¤·¤Þ¤¹¡£
-    ⤷¡¢°ú¿ô¤ÏÉáÄ̤Îʸ»úÎó¤Ç¤Ï¤Ê¤¯¡¢<a class="glossarylink" href="../glossary.html#regex" title="ÍѸ콸¤ò»²¾È">Àµµ¬É½¸½</a>¤È¤Ê¤ê¤Þ¤¹¡£
-    Î㤨¤Ð¡¢</p>
-
-    <div class="example"><p><code>
-      &lt;LocationMatch "/(extra|special)/data"&gt;
-    </code></p></div>
-
-    <p>¤Ï URL ¤Ë <code>/extra/data</code> ¤« <code>/special/data</code>
-    ¤È¤¤¤¦Ê¸»úÎ󤬴ޤޤì¤Æ¤¤¤ë¾ì¹ç¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li>¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¤¿ºÝ¤Ë¤³¤ì¤é¤Î°Û¤Ê¤ë¥»¥¯¥·¥ç¥ó¤¬
-    ÁȤ߹ç¤ï¤µ¤ì¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï <a href="../sections.html">
-    &lt;Directory&gt;, &lt;Location&gt;, &lt;Files&gt; ¥»¥¯¥·¥ç¥ó¤ÎÆ°ºîË¡</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="LogLevel" id="LogLevel">LogLevel</a> <a name="loglevel" id="loglevel">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ErrorLog ¤Î¾éĹÀ­¤òÀ©¸æ¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>LogLevel <var>level</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>LogLevel warn</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">LogLevel</code> ¤Ï¡¢¥¨¥é¡¼¥í¥° (<code class="directive"><a href="#errorlog">ErrorLog</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    ¸«¤Æ¤¯¤À¤µ¤¤) ¤Øµ­Ï¿¤¹¤ë¥á¥Ã¥»¡¼¥¸¤Î¾éĹÀ­¤òÄ´À°¤·¤Þ¤¹¡£
-    °Ê²¼¤Î <var>level</var> ¤ò»ØÄê¤Ç¤­¡¢½ç¤Ë½ÅÍ×ÅÙ¤¬²¼¤¬¤Ã¤Æ¤¤¤­¤Þ¤¹¡£</p>
-
-    <table class="bordered">
-      <tr>
-        <th><strong>¥ì¥Ù¥ë</strong> </th>
-
-        <th><strong>ÀâÌÀ</strong> </th>
-
-        <th><strong>Îã</strong> </th>
-      </tr>
-
-      <tr>
-        <td><code>emerg</code> </td>
-
-        <td>¶ÛµÞ - ¥·¥¹¥Æ¥à¤¬ÍøÍѤǤ­¤Ê¤¤</td>
-
-        <td>Child cannot open lock file. Exiting 
-        (»Ò¥×¥í¥»¥¹¤¬¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤ò³«¤±¤Ê¤¤¤¿¤á½ªÎ»¤·¤¿)</td>
-      </tr>
-
-      <tr>
-        <td><code>alert</code> </td>
-
-        <td>ľ¤Á¤ËÂн褬ɬÍ×</td>
-
-        <td>getpwuid: couldn't determine user name from uid
-        (getpwuid: UID ¤«¤é¥æ¡¼¥¶Ì¾¤òÆÃÄê¤Ç¤­¤Ê¤«¤Ã¤¿)</td>
-      </tr>
-
-      <tr>
-        <td><code>crit</code> </td>
-
-        <td>Ã×̿Ū¤Ê¾õÂÖ</td>
-
-        <td>socket: Failed to get a socket, exiting child
-        (socket: ¥½¥±¥Ã¥È¤¬ÆÀ¤é¤ì¤Ê¤¤¤¿¤á¡¢»Ò¥×¥í¥»¥¹¤ò½ªÎ»¤µ¤»¤¿)</td>
-      </tr>
-
-      <tr>
-        <td><code>error</code> </td>
-
-        <td>¥¨¥é¡¼</td>
-
-        <td>Premature end of script headers
-        (¥¹¥¯¥ê¥×¥È¤Î¥Ø¥Ã¥À¤¬Â­¤ê¤Ê¤¤¤Þ¤Þ¤Ç½ª¤ï¤Ã¤¿)</td>
-      </tr>
-
-      <tr>
-        <td><code>warn</code> </td>
-
-        <td>·Ù¹ð</td>
-
-        <td>child process 1234 did not exit, sending another SIGHUP
-        (»Ò¥×¥í¥»¥¹ 1234 ¤¬½ªÎ»¤·¤Ê¤«¤Ã¤¿¡£¤â¤¦°ìÅÙ SIGHUP ¤òÁ÷¤ë)</td>
-      </tr>
-
-      <tr>
-        <td><code>notice</code> </td>
-
-        <td>ÉáÄ̤À¤¬¡¢½ÅÍפʾðÊó</td>
-
-        <td>httpd: caught SIGBUS, attempting to dump core in ...
-        (httpd: SIGBUS ¥·¥°¥Ê¥ë¤ò¼õ¤±¡¢... ¤Ø¥³¥¢¥À¥ó¥×¤ò¤·¤¿)</td>
-      </tr>
-
-      <tr>
-        <td><code>info</code> </td>
-
-        <td>ÄɲþðÊó</td>
-
-        <td>"Server seems busy, (you may need to increase
-        StartServers, or Min/MaxSpareServers)..." (¡Ö¥µ¡¼¥Ð¤ÏÉé²Ù¤¬¹â¤¤¡¢
-        (StartServers ¤ä Min/MaxSpareServers ¤ÎÃͤòÁý¤ä¤¹É¬Íפ¬¤¢¤ë¤«¤â)¡×)</td>
-      </tr>
-
-      <tr>
-        <td><code>debug</code> </td>
-
-        <td>¥Ç¥Ð¥Ã¥°¥á¥Ã¥»¡¼¥¸</td>
-
-        <td>"Opening config file ..." (ÀßÄê¥Õ¥¡¥¤¥ë¤ò³«¤¤¤Æ¤¤¤ë...)</td>
-      </tr>
-    </table>
-
-    <p>ÆÃÄê¤Î¥ì¥Ù¥ë¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¡¢¤½¤ì¤è¤ê¹â¤¤¥ì¥Ù¥ë¤ÎÁ´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤¬
-    Êó¹ð¤µ¤ì¤Þ¤¹¡£
-    <em>Î㤨¤Ð</em>¡¢<code>LogLevel info</code> ¤Ë»ØÄꤹ¤ë¤È¡¢
-    <code>notice</code> ¤È <code>warn</code> ¤âÊó¹ð¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>¤Ê¤ª <code>crit</code> °Ê¾å¤Î¥ì¥Ù¥ë¤ò»ØÄꤹ¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>Îã:</p>
-
-    <div class="example"><p><code>
-      LogLevel notice
-    </code></p></div>
-
-    <div class="note"><h3>Ãí</h3>
-      <p>¥Õ¥¡¥¤¥ë¤Ë¥í¥°¤ò½ÐÎϤ¹¤ë¾ì¹ç¡¢<code>notice</code>
-      ¥ì¥Ù¥ë¤Î¥á¥Ã¥»¡¼¥¸¤ÏÍÞÀ©¤µ¤ì¤º¡¢¤¹¤Ù¤Æ¥í¥°¤Ë½ÐÎϤµ¤ì¤Þ¤¹¡£
-      ¤·¤«¤· <code>syslog</code> ¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-      ¤³¤ì¤ÏÅö¤Æ¤Ï¤Þ¤ê¤Þ¤»¤ó¡£</p>
-    </div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="MaxKeepAliveRequests" id="MaxKeepAliveRequests">MaxKeepAliveRequests</a> <a name="maxkeepaliverequests" id="maxkeepaliverequests">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>»ý³Ū¤ÊÀܳ¾å¤Çµö²Ä¤µ¤ì¤ë¥ê¥¯¥¨¥¹¥È¤Î¿ô</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>MaxKeepAliveRequests <var>number</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>MaxKeepAliveRequests 100</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">MaxKeepAliveRequests</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    <code class="directive"><a href="#keepalive">KeepAlive</a></code> ¤¬Í­¸ú¤Ê¾ì¹ç¤Ë¡¢
-    °ì²ó¤ÎÀܳ¤Ç¼õ¤±ÉÕ¤±²Äǽ¤Ê¥ê¥¯¥¨¥¹¥È¤Î¿ô¤òÀ©¸Â¤·¤Þ¤¹¡£
-    <code>0</code> ¤ËÀßÄꤷ¤Æ¤¤¤ì¤Ð¡¢¼õ¤±ÉÕ¤±¤ë¥ê¥¯¥¨¥¹¥È¤Ï̵À©¸Â¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¤³¤ÎÀßÄê¤Ï¡¢¥µ¡¼¥ÐÀ­Ç½¤ò¸þ¾å¤µ¤»¤ë¤¿¤á¤Ë¡¢Â礭¤Ê¿ôÃͤò»ØÄꤹ¤ë¤³¤È´«¤á¤Þ¤¹¡£
-    </p>
-
-    <p>Îã:</p>
-
-    <div class="example"><p><code>
-      MaxKeepAliveRequests 500
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="NameVirtualHost" id="NameVirtualHost">NameVirtualHost</a> <a name="namevirtualhost" id="namevirtualhost">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¤¿¤á¤Î IP ¥¢¥É¥ì¥¹¤ò»ØÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>NameVirtualHost <var>addr</var>[:<var>port</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">NameVirtualHost</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    <a href="../vhosts/">̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a>¤ÎÀßÄê¤ò¹Ô¤Ê¤¤¤¿¤¤¾ì¹ç¤Ë
-    ɬÍפȤʤë¤â¤Î¤Ç¤¹¡£</p>
-
-    <p><var>addr</var> ¤Ë¤Ï¥Û¥¹¥È̾¤ò»ØÄê¤Ç¤­¤Þ¤¹¤¬¡¢
-    ¾ï¤Ë IP ¥¢¥É¥ì¥¹¤ò»ØÄꤹ¤ë¤Î¤¬¿ä¾©¤µ¤ì¤Þ¤¹¡£
-    Î㤨¤Ð¡¢</p>
-
-    <div class="example"><p><code>
-      NameVirtualHost 111.22.33.44
-    </code></p></div>
-
-    <p><code class="directive">NameVirtualHost</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò
-    ÍøÍѤ·¤Æ¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±ÉÕ¤±¤ë IP ¥¢¥É¥ì¥¹¤ò»ØÄꤷ¤Þ¤¹¡£
-    ¤³¤ì¤Ï¡¢ÉáÄ̤Ï̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¥¢¥É¥ì¥¹¤Ç¤¹¡£
-    ¤¿¤À¤·¡¢¥Õ¥¡¥¤¥¢¡¼¥¦¥©¡¼¥ë¤ä¾¤Î¥×¥í¥­¥·¤¬¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±ÉÕ¤±¡¢
-    °ã¤¦ IP ¥¢¥É¥ì¥¹¤Î¥µ¡¼¥Ð¤Ë¥Õ¥©¥ï¡¼¥É¤¹¤ë¤È¤¤¤¦¾ì¹ç¤Ï¡¢
-    ¥ê¥¯¥¨¥¹¥È¤òÄ󶡤·¤¿¤¤¥Þ¥·¥ó¾å¤ÎʪÍý¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤Î
-    IP ¥¢¥É¥ì¥¹¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    Ê£¿ô¤Î¥¢¥É¥ì¥¹¤ÇÊ£¿ô¤Î̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò»ØÄꤹ¤ë¾ì¹ç¤Ï
-    ³Æ¥¢¥É¥ì¥¹¤ËÂФ·¤Æ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <div class="note"><h3>Ãæ</h3>
-      <p>¡Ö¼ç¥µ¡¼¥Ð¡×¤ä¡¢¤É¤Î <code>_default_</code> ¥µ¡¼¥Ð¤â¡¢
-      <code class="directive">NameVirtualHost</code> ¤Ç»ØÄꤷ¤¿ IP ¥¢¥É¥ì¥¹¤Ø¤Î¥ê¥¯¥¨¥¹¥È
-      ¤ò½èÍý¤¹¤ë¤³¤È¤Ï<strong>¤¢¤ê¤Þ¤»¤ó</strong> (¤Ê¤¼¤«
-      <code class="directive">NameVirtualHost</code> ¤ò
-      »ØÄꤷ¤¿¤±¤É¤½¤Î¥¢¥É¥ì¥¹¤Ë <code class="directive">VirtualHost</code> ¤òÄêµÁ¤·¤Ê¤«¤Ã¤¿¾ì¹ç¤ò½ü¤¯)¡£</p>
-    </div>
-
-    <p>̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë¥Ý¡¼¥ÈÈÖ¹æ¤ò»ØÄꤹ¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£
-    Î㤨¤Ð</p>
-
-    <div class="example"><p><code>
-      NameVirtualHost 111.22.33.44:8080
-    </code></p></div>
-
-    <p>IPV6 ¤Î¥¢¥É¥ì¥¹¤Ï¼¡¤ÎÎã¤Î¤è¤¦¤Ë³Ñ³ç¸Ì¤Ç°Ï¤àɬÍפ¬¤¢¤ê¤Þ¤¹:</p>
- 
-    <div class="example"><p><code>
-      NameVirtualHost [2001:db8::a00:20ff:fea7:ccea]:8080
-    </code></p></div>
-
-    <p>¤¹¤Ù¤Æ¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¼è¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë¤Ï¡¢
-    °ú¿ô¤È¤·¤Æ <code>*</code> ¤ò»È¤¤¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      NameVirtualHost *
-    </code></p></div>
-
-    <div class="note"><h3><code class="directive">&lt;VirtualHost&gt;</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î°ú¿ô</h3>
-      <p><code class="directive">&lt;VirtualHost&gt;</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î°ú¿ô¤Ï <code class="directive">NameVirtualHost</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î°ú¿ô¤ËÀµ³Î¤Ë
-      ¹ç¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-      <div class="example"><p><code>
-        NameVirtualHost 1.2.3.4<br />
-        &lt;VirtualHost 1.2.3.4&gt;<br />
-        # ...<br />
-        &lt;/VirtualHost&gt;<br />
-      </code></p></div>
-    </div>
-
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../vhosts/">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥ÈÀâÌÀ½ñ
-</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Options" id="Options">Options</a> <a name="options" id="options">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê¤ËÂФ·¤Æ»ÈÍѲÄǽ¤Êµ¡Ç½¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Options
-    [+|-]<var>option</var> [[+|-]<var>option</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>Options All</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Options</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">Options</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢ÆÃÄê¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÂФ·¤Æ
-    ¤É¤Îµ¡Ç½¤¬»ÈÍѲÄǽ¤«¤òÀ©¸æ¤·¤Þ¤¹¡£</p>
-
-    <p><var>option</var> ¤ò <code>None</code>¤Ë»ØÄꤹ¤ë¤È¡¢
-    ÆÃÊ̤ʵ¡Ç½¤ÏÁ´¤Æ̵¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¤Þ¤¿¡¢°Ê²¼¤Î¼¨¤¹ 1 ¸Ä°Ê¾å¤Î¤â¤Î¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£</p>
-
-    <dl>
-      <dt><code>All</code></dt>
-
-      <dd><code>MultiViews</code> ¤ò½ü¤¤¤¿Á´¤Æ¤Îµ¡Ç½¤¬Í­¸ú¤È¤Ê¤ê¤Þ¤¹¡£
-      ¤³¤ì¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¹¡£</dd>
-
-      <dt><code>ExecCGI</code></dt>
-
-      <dd>
-      <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> ¤Ë¤è¤ë CGI ¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤òµö²Ä¤·¤Þ¤¹¡£</dd>
-
-      <dt><code>FollowSymLinks</code></dt>
-
-      <dd>
-      ¥µ¡¼¥Ð¤¬¡¢¤³¤Î¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ç¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò¤¿¤É¤ì¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
-      <div class="note"><p>¥µ¡¼¥Ð¤¬¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò¤¿¤É¤ë¾ì¹ç¤Ç¤â¡¢
-      <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤Ë
-      ¥Þ¥Ã¥Á¤µ¤»¤ë¤¿¤á¤Î
-      ¥Ñ¥¹Ì¾¤Ï<em>Êѹ¹¤µ¤ì¤Þ¤»¤ó</em>¡£</p>
-      <p><code class="directive"><a href="#location">&lt;Location&gt;</a></code> Æâ¤Ë
-      ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Æ¤â<strong>̵»ë¤µ¤ì¤ë</strong>¤³¤È¤Ë
-      Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p></div></dd>
-
-      <dt><code>Includes</code></dt>
-
-      <dd>
-      <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> ¤¬Ä󶡤¹¤ë SSI ¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£</dd>
-
-      <dt><code>IncludesNOEXEC</code></dt>
-
-      <dd>
-      SSI ¤ÏÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¤¬¡¢<code>#exec</code> ¥³¥Þ¥ó¥É ¤È <code>#exec CGI</code> ¤Ï̵¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
-      ¤¿¤À¤·¡¢<code>#include virtual</code> ¤Ë¤è¤ê¡¢<code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code> ¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ç
-      CGI ¤ò¼Â¹Ô¤¹¤ë¤³¤È¤Ï²Äǽ¤Ç¤¹¡£</dd>
-
-      <dt><code>Indexes</code></dt>
-
-      <dd>
-      ¤â¤·¡¢URL ¤¬¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥Þ¥Ã¥×¤¹¤ë¥ê¥¯¥¨¥¹¥È¤Ç¤¢¤Ã¤Æ¡¢
-      ³î¤Ä <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code> ¤Ç»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë (Î㤨¤Ð¡¢<code>index.html</code>) ¤¬
-      ¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë̵¤±¤ì¤Ð¡¢<code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> ¤¬
-      ¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î°ìÍ÷¤òÀ°·Á¤·¤ÆÊÖ¤·¤Þ¤¹¡£</dd>
-
-      <dt><code>MultiViews</code></dt>
-
-      <dd>
-      <code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code> ¤Ë¤è¤ë
-      <a href="../content-negotiation.html">¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó</a> 
-      ¤µ¤ì¤¿ "MultiViews" ¤òµö²Ä¤·¤Þ¤¹¡£</dd>
-
-      <dt><code>SymLinksIfOwnerMatch</code></dt>
-
-      <dd>
-      ¥·¥ó¥Ü¥ê¥Ã¥¯Àè¤Î¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤¬¡¢
-      ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤Î½êÍ­¥æ¡¼¥¶ ID ¤ÈƱ¤¸¾ì¹ç¤Ë¤Î¤ß¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò
-      ¤¿¤É¤ì¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
-
-      <div class="note"><h3>Ãí</h3> <code class="directive"><a href="#location">&lt;Location&gt;</a></code> Æâ¤Ë¤³¤Î¥ª¥×¥·¥ç¥ó¤ò
-      »ØÄꤷ¤Æ¤â̵»ë¤µ¤ì¤Þ¤¹¡£</div>
-      </dd>
-    </dl>
-
-    <p>Ä̾¥Ç¥£¥ì¥¯¥È¥ê¤ËÂФ·¤ÆÊ£¿ô¤Î <code class="directive">Options</code> ¤¬
-    ŬÍѲÄǽ¤Ê¾ì¹ç¡¢
-    ºÇ¤â¶á¤¤¤â¤Î°ì¤Ä¤Î¤ß¤¬Å¬ÍѤµ¤ì¡¢Â¾¤Î¤â¤Î¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£
-    Ê£¿ô¤Î»ØÄ꤬¥Þ¡¼¥¸¤µ¤ì¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£(<a href="../sections.html#mergin">¥»¥¯¥·¥ç¥ó¤Î¥Þ¡¼¥¸ÊýË¡</a>¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£)
-    ¤·¤«¤·¡¢¤¹¤Ù¤Æ¤Î <code class="directive">Options</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬ <code>+</code> ¤ä <code>-</code> ÉÕ¤­¤Ç
-    »ØÄꤵ¤ì¤¿¾ì¹ç¤Ï¥ª¥×¥·¥ç¥ó¤ÎÃͤϥޡ¼¥¸¤µ¤ì¤Þ¤¹¡£
-    <code>+</code> ¤òƬ¤Ë¤Ä¤±¤ì¤Ð¸½ºß¤ÎÀßÄê¤Ë²Ã¤¨¤é¤ì¡¢
-    <code>-</code> ¤òÉÕ¤±¤ì¤Ð¸½ºß¤ÎÀßÄ꤫¤éºï½ü¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>Î㤨¤Ð¡¢<code>+</code> ¤ä <code>-</code> ¤òÍøÍѤ·¤Ê¤¤¾ì¹ç¤Ï:</p>
-
-    <div class="example"><p><code>
-      &lt;Directory /web/docs&gt;<br />
-      <span class="indent">
-        Options Indexes FollowSymLinks<br />
-      </span>
-      &lt;/Directory&gt;<br />
-      <br />
-      &lt;Directory /web/docs/spec&gt;<br />
-      <span class="indent">
-        Options Includes<br />
-      </span>
-      &lt;/Directory&gt;
-    </code></p></div>
-
-    <p><code>/web/docs/spec</code> ¤È¤¤¤¦¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï¡¢
-    <code>Includes</code> ¤À¤±¤¬Å¬ÍѤµ¤ì¤Þ¤¹¡£
-    ¤·¤«¤·¡¢2 ÈÖÌܤΠ<code class="directive">Options</code> ¤Ç <code>+</code> ¤ä <code>-</code> ¤òÍøÍѤ·¤Æ¤ß¤ë¤È:</p>
- 
-    <div class="example"><p><code>
-      &lt;Directory /web/docs&gt;<br />
-      <span class="indent">
-        Options Indexes FollowSymLinks<br />
-      </span>
-      &lt;/Directory&gt;<br />
-      <br />
-      &lt;Directory /web/docs/spec&gt;<br />
-      <span class="indent">
-        Options +Includes -Indexes<br />
-      </span>
-      &lt;/Directory&gt;
-    </code></p></div>
-
-    <p><code>/web/docs/spec</code> ¤È¤¤¤¦¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï¡¢ <code>FollowSymLinks</code> ¤È
-    <code>Includes</code> ¤¬Å¬ÍѤµ¤ì¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>Ãí</h3>
-      <p><code>-IncludesNOEXEC</code> ¤â¤·¤¯¤Ï
-      <code>-Includes</code> ¤ò»ØÄꤹ¤ë¤È¡¢
-      Á°¤ÎÀßÄ꤬¤É¤Î¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤è¤¦¤È¤â SSI ¤Ï̵¸ú¤È¤Ê¤ê¤Þ¤¹¡£</p>
-    </div>
-
-    <p>¤É¤Î¤è¤¦¤ÊÀßÄê¤â¤µ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï <code>All</code> ¤Ë
-    ¤Ê¤ê¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Require" id="Require">Require</a> <a name="require" id="require">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¤É¤Îǧ¾ÚºÑ¤ß¥æ¡¼¥¶¤¬¥ê¥½¡¼¥¹¤ò¥¢¥¯¥»¥¹¤Ç¤­¤ë¤«¤òÁªÂò¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Require <var>entity-name</var> [<var>entity-name</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢Ç§¾Ú¤µ¤ì¤¿¥æ¡¼¥¶¤¬¥ê¥½¡¼¥¹¤ËÂФ·¤Æ
-    ¥¢¥¯¥»¥¹¤Ç¤­¤ë¤«¤òÀ©¸æ¤·¤Þ¤¹¡£
-    À©¸Â¾ò·ï¤Ï¾µÇ§¥â¥¸¥å¡¼¥ë¤Ç½èÍý¤µ¤ì¤Þ¤¹¡£
-    <code class="module"><a href="../mod/mod_authz_user.html">mod_authz_user</a></code> ¤È <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code>
-    ¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë¹½Ê¸¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¤â¤Î¤â¤¢¤ê¤Þ¤¹:</p>
-
-    <dl>
-      <dt><code>Require user <var>userid</var> [<var>userid</var>] ...</code></dt>
-
-      <dd>»ØÄꤵ¤ì¤¿¥æ¡¼¥¶¤Î¤ß¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î¥¢¥¯¥»¥¹¤òµö²Ä¤·¤Þ¤¹¡£</dd>
-
-      <dt><code>Require group <var>group-name</var> [<var>group-name</var>] ...</code></dt>
-
-      <dd>»ØÄꤵ¤ì¤¿¥°¥ë¡¼¥×¤Ë°¤¹¤ë¥æ¡¼¥¶¤Î¤ß¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î¥¢¥¯¥»¥¹¤òµö²Ä¤·¤Þ¤¹¡£</dd>
-
-      <dt><code>Require valid-user</code></dt>
-
-      <dd>Á´¤Æ¤Îǧ¾Ú¤µ¤ì¤¿¥æ¡¼¥¶¤Ë¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î¥¢¥¯¥»¥¹¤òµö²Ä¤·¤Þ¤¹¡£</dd>
-    </dl>
-
-    <p>require ¥ª¥×¥·¥ç¥ó¤ò¼ÂÁõ¤·¤Æ¤¤¤ë¾¤Î¾µÇ§¥â¥¸¥å¡¼¥ë¤Ë¤Ï¡¢
-    <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code>,
-    <code class="module"><a href="../mod/mod_authz_dbm.html">mod_authz_dbm</a></code>,
-    <code class="module"><a href="../mod/mod_authz_owner.html">mod_authz_owner</a></code> ¤È¤¤¤Ã¤¿¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p><code class="directive">Require</code> ¤Ï¡¢Àµ¤·¤¯Æ°ºî¤¹¤ë¤¿¤á¤Ë¤Ï <code class="directive"><a href="#authname">AuthName</a></code> µÚ¤Ó <code class="directive"><a href="#authtype">AuthType</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ä¡¢
-    (¥æ¡¼¥¶¤È¥°¥ë¡¼¥×¤ò»ØÄꤹ¤ë¤¿¤á¤Ë) <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code> µÚ¤Ó <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code>
-    ¤È¤¤¤Ã¤¿¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È¶¦¤Ë
-    »ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    Î㤨¤Ð:</p>
-
-    <div class="example"><p><code>
-       AuthType Basic<br />
-       AuthName "Restricted Resource"<br />
-       AuthUserFile /web/users<br />
-       AuthGroupFile /web/groups<br />
-       Require group admin
-    </code></p></div>
-
-    <p>¤³¤Î¤è¤¦¤Ë¤·¤ÆŬÍѤµ¤ì¤¿¥¢¥¯¥»¥¹À©¸æ¤Ï¡¢<strong>Á´¤Æ¤Î</strong>¥á¥½¥Ã¥É¤Ë
-    ÂФ·¤Æ¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£
-    <strong>Ä̾ï¤Ï¡¢¤³¤ì¤¬Ë¾¤Þ¤·¤¤Æ°ºî¤Ç¤¹¡£</strong>
-    ¤â¤·¡¢ÆÃÄê¤Î¥á¥½¥Ã¥É¤ËÂФ·¤Æ¤Î¤ß¥¢¥¯¥»¥¹¤ÎÀ©¸æ¤òŬÍѤ·¡¢
-    ¾¤Î¥á¥½¥Ã¥É¤ÏÀ©¸Â¤·¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢<code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> ¥»¥¯¥·¥ç¥óÆâ¤Ë
-    <code class="directive">Require</code> ¤ò
-    »ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p><code class="directive">Require</code> ¤ò <code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ä <code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    ÁȤ߹ç¤ï¤»¤Æ»È¤Ã¤¿¾ì¹ç¡¢¤³¤ì¤é¤ÎÀ©Ìó¤ÎÁê¸ßºîÍÑ¤Ï <code class="directive"><a href="#satisfy">Satisfy</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÀ©¸æ¤µ¤ì¤Þ¤¹¡£
-    </p>
-
-    <div class="note"><h3>¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ÇÀ©¸æ¤ò²ò½ü¤¹¤ëÊýË¡</h3>
-    <p><code class="directive"><a href="#satisfy">Satisfy</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö
-    ¤Ç¡¢Êݸ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ç¥¢¥¯¥»¥¹À©¸æ¤ò
-    ̵¸ú¤Ë¤¹¤ëÎã¤Ï¡¢²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-    <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> ¤Ë¤è¤ë¥¢¥¯¥»¥¹À©¸æ¤â̵¸ú²½¤µ¤ì¤ë¤Î¤Ç¡¢
-    ¤³¤Î¥Æ¥¯¥Ë¥Ã¥¯¤ÏÃí°Õ¤·¤Æ¤´³èÍѤ¯¤À¤µ¤¤¡£</p>
-    <div class="example"><p><code>
-      &lt;Directory /path/to/protected/&gt;<br />
-        <span class="indent">
-        Require user david<br />
-        </span>
-      &lt;/Directory&gt;<br />
-      &lt;Directory /path/to/protected/unprotected&gt;<br />
-        <span class="indent">
-        # All access controls and authentication are disabled<br />
-        # in this directory<br />
-        Satisfy Any<br />
-        Allow from all<br />
-        </span>
-      &lt;/Directory&gt;<br />
-    </code></p></div>
-    </div>
-      
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../howto/auth.html">ǧ¾Ú¡¦¾µÇ§¡¦¥¢¥¯¥»¥¹À©¸æ</a></li>
-<li><code class="directive"><a href="#satisfy">Satisfy</a></code></li>
-<li><code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="RLimitCPU" id="RLimitCPU">RLimitCPU</a> <a name="rlimitcpu" id="rlimitcpu">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>Apache ¤Î»Ò¥×¥í¥»¥¹¤«¤éµ¯Æ°¤µ¤ì¤¿¥×¥í¥»¥¹¤Î CPU ¾ÃÈñÎ̤ò
-À©¸Â¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>̤ÀßÄê¡£¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¥Ç¥Õ¥©¥ë¥È¤ò»ÈÍÑ</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>°ì¤Ä¤«Æó¤Ä¤Î¥Ñ¥é¥á¡¼¥¿¤ò¤È¤ê¤Þ¤¹¡£
-    ºÇ½é¤Î¥Ñ¥é¥á¡¼¥¿¤ÏÁ´¥×¥í¥»¥¹¤ËÂФ¹¤ë¥ê¥½¡¼¥¹¤Î¥½¥Õ¥È¥ê¥ß¥Ã¥È¤òÀßÄꤷ¡¢
-    2 ÈÖÌܤΥѥé¥á¡¼¥¿¤ÏºÇÂç¤Î¥ê¥½¡¼¥¹¥ê¥ß¥Ã¥È¤òÀßÄꤷ¤Þ¤¹¡£
-    ¥Ñ¥é¥á¡¼¥¿¤Ë¤Ï¿ô»ú¤«¡¢¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ÎºÇÂç¤È¤Ê¤ë
-    <code>max</code> ¤Î¤É¤Á¤é¤«¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ºÇÂç¤Î¥ê¥½¡¼¥¹¥ê¥ß¥Ã¥È¤ò¾å¤²¤ë¤¿¤á¤Ë¤Ï¡¢¥µ¡¼¥Ð¤ò
-    <code>root</code> ¤Ç¼Â¹Ô¤¹¤ë¤«µ¯Æ°¤µ¤ì¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó¡£</p>
-
-    <p>¤Á¤Ê¤ß¤Ë¡¢¤³¤ÎÀßÄê¤Ï Apache ¤Î»Ò¥×¥í¥»¥¹¼«ÂΤǤϤʤ¯¡¢
-    ¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±ÉÕ¤±¤¿ Apache ¤Î»Ò¥×¥í¥»¥¹¤«¤é fork ¤µ¤ì¤¿¥×¥í¥»¥¹¤Ë
-    ŬÍѤµ¤ì¤Þ¤¹¡£
-    ¤³¤ì¤Ë¤Ï CGI ¤ä SSI ¤«¤é¼Â¹Ô¤µ¤ì¤¿¥³¥Þ¥ó¥É¤¬´Þ¤Þ¤ì¤Þ¤¹¤¬¡¢Apache ¤Î
-    ¿Æ¥×¥í¥»¥¹¤«¤é fork ¤µ¤ì¤¿¥í¥°¤Î¥Ñ¥¤¥×¥×¥í¥»¥¹¤Ê¤É¤Ë¤ÏŬÍѤµ¤ì¤Þ¤»¤ó¡£</p>
-
-    <p>CPU ¥ê¥½¡¼¥¹¤Î¥ê¥ß¥Ã¥È¤Ï¥×¥í¥»¥¹¤¢¤¿¤ê¤ÎÉÿô¤Çɽ¤ï¤µ¤ì¤Þ¤¹¡£</p>
-
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#rlimitmem">RLimitMEM</a></code></li>
-<li><code class="directive"><a href="#rlimitnproc">RLimitNPROC</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="RLimitMEM" id="RLimitMEM">RLimitMEM</a> <a name="rlimitmem" id="rlimitmem">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>Apache ¤Î»Ò¥×¥í¥»¥¹¤«¤éµ¯Æ°¤µ¤ì¤¿¥×¥í¥»¥¹¤Î¥á¥â¥ê¾ÃÈñÎ̤ò
-À©¸Â¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>̤ÀßÄê¡£¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¥Ç¥Õ¥©¥ë¥È¤ò»ÈÍÑ</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>°ì¤Ä¤«Æó¤Ä¤Î¥Ñ¥é¥á¡¼¥¿¤ò¤È¤ê¤Þ¤¹¡£
-    ºÇ½é¤Î¥Ñ¥é¥á¡¼¥¿¤ÏÁ´¥×¥í¥»¥¹¤ËÂФ¹¤ë¥ê¥½¡¼¥¹¤Î¥½¥Õ¥È¥ê¥ß¥Ã¥È¤òÀßÄꤷ¡¢
-    2 ÈÖÌܤΥѥé¥á¡¼¥¿¤ÏºÇÂç¤Î¥ê¥½¡¼¥¹¥ê¥ß¥Ã¥È¤òÀßÄꤷ¤Þ¤¹¡£
-    ¥Ñ¥é¥á¡¼¥¿¤Ë¤Ï¿ô»ú¤«¡¢¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ÎºÇÂç¤È¤Ê¤ë
-    <code>max</code> ¤Î¤É¤Á¤é¤«¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ºÇÂç¤Î¥ê¥½¡¼¥¹¥ê¥ß¥Ã¥È¤ò¾å¤²¤ë¤¿¤á¤Ë¤Ï¡¢¥µ¡¼¥Ð¤ò
-    <code>root</code> ¤Ç¼Â¹Ô¤¹¤ë¤«µ¯Æ°¤µ¤ì¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó¡£</p>
-
-    <p>¤³¤ÎÀßÄê¤Ï Apache ¤Î»Ò¥×¥í¥»¥¹¼«ÂΤǤϤʤ¯¡¢
-    ¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±ÉÕ¤±¤¿ Apache ¤Î»Ò¥×¥í¥»¥¹¤«¤é fork ¤µ¤ì¤¿¥×¥í¥»¥¹¤Ë
-    ŬÍѤµ¤ì¤Þ¤¹¡£
-    ¤³¤ì¤Ë¤Ï CGI ¤ä SSI ¤«¤é¼Â¹Ô¤µ¤ì¤¿¥³¥Þ¥ó¥É¤¬´Þ¤Þ¤ì¤Þ¤¹¤¬¡¢Apache ¤Î
-    ¿Æ¥×¥í¥»¥¹¤«¤é fork ¤µ¤ì¤¿¥í¥°¤Î¥Ñ¥¤¥×¥×¥í¥»¥¹¤Ê¤É¤Ë¤ÏŬÍѤµ¤ì¤Þ¤»¤ó¡£</p>
-
-    <p>¥á¥â¥ê¥ê¥½¡¼¥¹¤Î¥ê¥ß¥Ã¥È¤Ï¥×¥í¥»¥¹¤¢¤¿¤ê¤Î¥Ð¥¤¥È¿ô¤Çɽ¤ï¤µ¤ì¤Þ¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#rlimitcpu">RLimitCPU</a></code></li>
-<li><code class="directive"><a href="#rlimitnproc">RLimitNPROC</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="RLimitNPROC" id="RLimitNPROC">RLimitNPROC</a> <a name="rlimitnproc" id="rlimitnproc">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>Apache ¤Î»Ò¥×¥í¥»¥¹¤«¤éµ¯Æ°¤µ¤ì¤¿¥×¥í¥»¥¹¤¬µ¯Æ°¤¹¤ë¥×¥í¥»¥¹¤Î
-¿ô¤òÀ©¸Â¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>RLimitNPROC <var>number</var>|max [<var>number</var>|max]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>̤ÀßÄê¡£¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¥Ç¥Õ¥©¥ë¥È¤ò»ÈÍÑ</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>°ì¤Ä¤«Æó¤Ä¤Î¥Ñ¥é¥á¡¼¥¿¤ò¤È¤ê¤Þ¤¹¡£
-    ºÇ½é¤Î¥Ñ¥é¥á¡¼¥¿¤ÏÁ´¥×¥í¥»¥¹¤ËÂФ¹¤ë¥ê¥½¡¼¥¹¤Î¥½¥Õ¥È¥ê¥ß¥Ã¥È¤òÀßÄꤷ¡¢
-    2 ÈÖÌܤΥѥé¥á¡¼¥¿¤ÏºÇÂç¤Î¥ê¥½¡¼¥¹¥ê¥ß¥Ã¥È¤òÀßÄꤷ¤Þ¤¹¡£
-    ¥Ñ¥é¥á¡¼¥¿¤Ë¤Ï¿ô»ú¤«¡¢¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ÎºÇÂç¤È¤Ê¤ë
-    <code>max</code> ¤Î¤É¤Á¤é¤«¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ºÇÂç¤Î¥ê¥½¡¼¥¹¥ê¥ß¥Ã¥È¤ò¾å¤²¤ë¤¿¤á¤Ë¤Ï¡¢¥µ¡¼¥Ð¤ò
-    <code>root</code> ¤Ç¼Â¹Ô¤¹¤ë¤«µ¯Æ°¤µ¤ì¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó¡£</p>
-
-    <p>¤³¤ÎÀßÄê¤Ï Apache ¤Î»Ò¥×¥í¥»¥¹¼«ÂΤǤϤʤ¯¡¢
-    ¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±ÉÕ¤±¤¿ Apache ¤Î»Ò¥×¥í¥»¥¹¤«¤é fork ¤µ¤ì¤¿¥×¥í¥»¥¹¤Ë
-    ŬÍѤµ¤ì¤Þ¤¹¡£
-    ¤³¤ì¤Ë¤Ï CGI ¤ä SSI ¤«¤é¼Â¹Ô¤µ¤ì¤¿¥³¥Þ¥ó¥É¤¬´Þ¤Þ¤ì¤Þ¤¹¤¬¡¢Apache ¤Î
-    ¿Æ¥×¥í¥»¥¹¤«¤é fork ¤µ¤ì¤¿¥í¥°¤Î¥Ñ¥¤¥×¥×¥í¥»¥¹¤Ê¤É¤Ë¤ÏŬÍѤµ¤ì¤Þ¤»¤ó¡£</p>
-
-    <p>¥×¥í¥»¥¹¤ÎÀ©¸Â¤Ï¡¢¥æ¡¼¥¶¤¢¤¿¤ê¤Î¥×¥í¥»¥¹¿ô¤ÇÀ©¸æ¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>Ãí</h3>
-      <p> CGI ¥×¥í¥»¥¹¤¬¥¦¥§¥Ö¥µ¡¼¥Ð¤Î¥æ¡¼¥¶ ID °Ê³°¤Ç¼Â¹Ô¤µ¤ì¤ë¤Î¤Ç
-      <strong>̵¤±¤ì¤Ð</strong>¡¢
-      ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥µ¡¼¥Ð¼«¿È¤¬À¸À®¤Ç¤­¤ë¥×¥í¥»¥¹¤Î¿ô¤òÀ©¸Â¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
-      ¤½¤Î¤è¤¦¤Ê¾õ¶·¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤É¤¦¤«¤Ï¡¢<code>error_log</code> Ãæ¤Î
-      <strong><code>cannot fork</code></strong> ¤È¤¤¤¦¥á¥Ã¥»¡¼¥¸¤Ë¤è¤ê
-      ³Îǧ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-    </div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#rlimitmem">RLimitMEM</a></code></li>
-<li><code class="directive"><a href="#rlimitcpu">RLimitCPU</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Satisfy" id="Satisfy">Satisfy</a> <a name="satisfy" id="satisfy">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Û¥¹¥È¥ì¥Ù¥ë¤Î¥¢¥¯¥»¥¹À©¸æ¤È¥æ¡¼¥¶Ç§¾Ú¤È¤ÎÁê¸ßºîÍѤò»ØÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Satisfy Any|All</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>Satisfy All</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>¥Ð¡¼¥¸¥ç¥ó 2.0.51 °Ê¹ß¤Ç¤Ï <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È <code class="directive"><a href="#limitexcept">&lt;LimitExcept&gt;</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î±Æ¶Á¤ò¼õ¤±¤ë
-</td></tr>
-</table>
-    <p><code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code> ¤È
-    <code class="directive"><a href="#require">Require</a></code> ¤ÎξÊý¤¬»È¤ï¤ì¤Æ¤¤¤ë¤È¤­¤Î
-    ¥¢¥¯¥»¥¹¥Ý¥ê¥·¡¼¤òÀßÄꤷ¤Þ¤¹¡£¥Ñ¥é¥á¡¼¥¿¤Ï <code>All</code> ¤« <code>Any</code>
-    ¤Ç¤¹¡£¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤¢¤ë¾ì½ê¤Ø¤Î¥¢¥¯¥»¥¹¤¬¥æ¡¼¥¶Ì¾/¥Ñ¥¹¥ï¡¼¥É
-    <em>¤È</em>¥¯¥é¥¤¥¢¥ó¥È¤Î¥Û¥¹¥È¤Î¥¢¥É¥ì¥¹¤ÇÀ©¸Â¤µ¤ì¤Æ¤¤¤ë¤È¤­¤Ë¤Î¤ß
-    ÌòΩ¤Á¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî (<code>All</code>) ¤Ï¥¯¥é¥¤¥¢¥ó¥È¤¬¥¢¥É¥ì¥¹¤Ë¤è¤ë
-    ¥¢¥¯¥»¥¹À©¸Â¤òËþ¤¿¤·¡¢<em>¤«¤Ä</em>Àµ¤·¤¤¥æ¡¼¥¶Ì¾¤È¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ¹¤ë¤³¤È¤ò
-    Í׵ᤷ¤Þ¤¹¡£<code>Any</code> ¤Ç¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ï¥Û¥¹¥È¤ÎÀ©¸Â¤òËþ¤¿¤¹¤«¡¢
-    Àµ¤·¤¤¥æ¡¼¥¶Ì¾¤È¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤò¤¹¤ë¤«¤ò¤¹¤ì¤Ð¥¢¥¯¥»¥¹¤òµö²Ä¤µ¤ì¤Þ¤¹¡£
-    ¤³¤ì¤Ï¡¢¤¢¤ë¾ì½ê¤ò¥Ñ¥¹¥ï¡¼¥É¤ÇÊݸ¤ë¤±¤ì¤É¡¢ÆÃÄê¤Î¥¢¥É¥ì¥¹¤«¤é¤Î
-    ¥¯¥é¥¤¥¢¥ó¥È¤Ë¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòÍ׵᤻¤º¤Ë¥¢¥¯¥»¥¹¤òµö²Ä¤¹¤ë¡¢
-    ¤È¤¤¤¦¤è¤¦¤Ê¤È¤­¤Ë»ÈÍѤǤ­¤Þ¤¹¡£</p>
-
-    <p>Î㤨¤Ð¡¢Æ±¤¸¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Ë¤¤¤ë¿Í¤Ë¤Ï¥¦¥§¥Ö¥µ¥¤¥È¤Î¤¢¤ëÉôʬ¤Ë¤Ä¤¤¤Æ
-    ̵À©¸Â¤Î¥¢¥¯¥»¥¹¤òµö¤·¤¿¤¤¤±¤ì¤É¡¢³°¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤Î¿Í¤Ë¤Ï
-    ¥Ñ¥¹¥ï¡¼¥É¤òÄ󶡤µ¤»¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤ÊÀßÄê¤ò¤¹¤ë¤³¤È¤¬
-    ¤Ç¤­¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-    Require valid-user<br />
-    Allow from 192.168.1<br />
-    Satisfy Any
-    </code></p></div>
-   
-    <p>¥Ð¡¼¥¸¥ç¥ó 2.0.51 ¤«¤é¤Ï
-    <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤È
-    <code class="directive"><a href="#limitexcept">&lt;LimitExcept&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç
-    <code class="directive">Satisfy</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬
-    ŬÍѤµ¤ì¤ë¥á¥½¥Ã¥É¤òÀ©¸Â¤¹¤ë¤³¤È¤¬
-    ¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code></li>
-<li><code class="directive"><a href="#require">Require</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ScriptInterpreterSource" id="ScriptInterpreterSource">ScriptInterpreterSource</a> <a name="scriptinterpretersource" id="scriptinterpretersource">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>CGI ¥¹¥¯¥ê¥×¥È¤Î¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Î°ÌÃÖ¤òÄ´¤Ù¤ë¤¿¤á¤Î¼êË¡</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ScriptInterpreterSource Registry|Registry-Strict|Script</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ScriptInterpreterSource Script</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Win32 ¤Î¤ß¡£
-¥ª¥×¥·¥ç¥ó <code>Registry-Strict</code> ¤Ï Apache 2.0 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢Apache ¤Ç CGI ¥¹¥¯¥ê¥×¥È¤ò
-    ¼Â¹Ô¤¹¤ë¾ì¹ç¤ËÍøÍѤ¹¤ë¥¤¥ó¥¿¡¼¥×¥ê¥¿¤ò¡¢
-    ¤É¤Î¤è¤¦¤Ëõ¤·½Ð¤¹¤«¤Ë¤Ä¤¤¤ÆÀ©¸æ¤¹¤ë¤¿¤á¤Ë»ÈÍѤ·¤Þ¤¹¡£
-    ¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤Ï <code>Script</code> ¤Ç¤¹¡£¤³¤ì¤Ï¥¹¥¯¥ê¥×¥È¤Î
-    shebang ¹Ô (ºÇ½é¤Î¹Ô¤Ç <code>#!</code> ¤«¤é»Ï¤Þ¤ë¤â¤Î)
-    ¤Ë»Ø¤µ¤ì¤Æ¤¤¤ë¥¤¥ó¥¿¡¼¥×¥ê¥¿¤ò»ÈÍѤ·¤Þ¤¹¡£Win32 ¤Ç¤Ï¤½¤Î¹Ô¤Ï
-    °Ê²¼¤ÎÍͤˤʤê¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      #!C:/Perl/bin/perl.exe
-    </code></p></div>
-
-    <p>¤â¤·¤¯¤Ï¡¢<code>perl</code> ¤¬ <code>PATH</code> ¤Ë¤¢¤ë¾ì¹ç¤Ïñ¤Ë:</p>
-
-    <div class="example"><p><code>
-      #!perl
-    </code></p></div>
-
-    <p><code>ScriptInterpreterSource Registry</code> ¤ò»ØÄꤹ¤ë¤È¡¢
-    ¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò (Î㤨¤Ð¡¢<code>.pl</code>) ¤ò
-    ¥­¡¼¤È¤·¤Æ¡¢Windows ¤Î¥ì¥¸¥¹¥È¥ê¥Ä¥ê¡¼ <code>HKEY_CLASSES_ROOT</code>
-    ¤ò¸¡º÷¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£¥ì¥¸¥¹¥È¥ê¤Î¥µ¥Ö¥­¡¼
-    <code>Shell\ExecCGI\Command</code> ¤«¡¢¤½¤ì¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ï
-    <code>Shell\Open\Command</code> ¤¬¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤ò³«¤¯¤¿¤á¤Ë
-    »È¤ï¤ì¤Þ¤¹¡£¥ì¥¸¥¹¥È¥ê¥­¡¼¤¬¸«¤Ä¤«¤é¤Ê¤¤¤È¤­¤Ï¡¢Apache ¤Ï <code>Script</code>
-    ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤¿¤È¤­¤ÎÆ°ºî¤ËÌá¤ê¤Þ¤¹¡£</p>
-
-    <div class="warning"><h3>¥»¥­¥å¥ê¥Æ¥£</h3> 
-    <p><code>ScriptInterpreterSource Registry</code> ¤ò <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code> ¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ç»È¤¦¤È¤­¤Ï
-    Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£Apache ¤Ï¤½¤Î¥Ç¥£¥ì¥¯¥È¥êÃæ¤Î<em>¤¹¤Ù¤Æ¤Î</em>¥Õ¥¡¥¤¥ë¤ò
-    ¼Â¹Ô¤·¤è¤¦¤È¤·¤Þ¤¹¡£<code>Registry</code> ¤È¤¤¤¦ÀßÄê¤ÏÄ̾ï¤Ï¼Â¹Ô¤µ¤ì¤Ê¤¤
-    ¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ˾¤Þ¤·¤¯¤Ê¤¤¥×¥í¥°¥é¥à¤Î¼Â¹Ô¤¬È¯À¸¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
-    Î㤨¤Ð¡¢¤Û¤È¤ó¤É¤Î Windows ¥·¥¹¥Æ¥à¤Ç¡¢
-    <code>.htm</code> ¥Õ¥¡¥¤¥ë¤Î¥Ç¥Õ¥©¥ë¥È¤Î¡Ö³«¤¯¡×¥³¥Þ¥ó¥É¤Ï
-    Microsoft Internet Explorer ¤ò¼Â¹Ô¤·¤Þ¤¹¤Î¤Ç¡¢¥¹¥¯¥ê¥×¥È¤Ë»ØÄꤵ¤ì¤¿
-    ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë <code>.htm</code> ¥Õ¥¡¥¤¥ë¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ï¥µ¡¼¥Ð¤Î
-    ¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤Ç¥Ö¥é¥¦¥¶¤ò¼Â¹Ô¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤ì¤Ï¡¢°ìʬÆ⤯¤é¤¤¤Ç
-    ¥·¥¹¥Æ¥à¤ò¥¯¥é¥Ã¥·¥å¤µ¤ë¤¿¤á¤ÎÎɤ¤ÊýË¡¤Ç¤¹¡£</p>
-    </div>
-
-    <p>Apache 2.0 ¤«¤éƳÆþ¤µ¤ì¤¿¥ª¥×¥·¥ç¥ó <code>Registry-Strict</code> ¤Ï
-    <code>Registry</code> ¤ÈƱ¤¸¤³¤È¤ò¹Ô¤Ê¤¤¤Þ¤¹¤¬¡¢¥µ¥Ö¥­¡¼
-    <code>Shell\ExecCGI\Command</code> ¤Î¤ß¤ò»È¤¤¤Þ¤¹¡£
-    <code>ExecCGI</code> ¥­¡¼¤ÏÉáÄ̤˻Ȥï¤ì¤ë¥­¡¼¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£Windows 
-    ¥ì¥¸¥¹¥È¥ê¤Ë¼êÆ°¤ÇÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤Î¤Ç¡¢¥·¥¹¥Æ¥à¤Ç¤Î¶öȯŪ¤Ê¥×¥í¥°¥é¥à¤Î
-    ¼Â¹Ô¤òËɤ°¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ServerAdmin" id="ServerAdmin">ServerAdmin</a> <a name="serveradmin" id="serveradmin">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤¬¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤ë¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤Ë´Þ¤á¤ëÅŻҥ᡼¥ë¤Î
-¥¢¥É¥ì¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ServerAdmin <var>email-address</var>|<var>URL</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">ServerAdmin</code> ¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤ËÊÖ¤¹¤µ¤Þ¤¶¤Þ¤Ê
-    ¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸Ãæ¤Ëµ­½Ò¤¹¤ë¡¢
-    Ìä¹ç¤»¥¢¥É¥ì¥¹¤òÀßÄꤷ¤Þ¤¹¡£Í¿¤¨¤é¤ì¤¿°ú¿ô¤ò <code>httpd</code> ¤¬
-    URL ¤Èǧ¼±¤·¤Ê¤¤¾ì¹ç¤Ï¡¢<var>email-address</var> ¤À¤È²ò¼á¤·¤Æ¡¢
-    ¥Ï¥¤¥Ñ¡¼¥ê¥ó¥¯¤Î¥¿¡¼¥²¥Ã¥È¤Ë <code>mailto:</code> ¤òÉÕ¤±¤Þ¤¹¡£
-    ¼ÂºÝ¤Ë¤Ï¡¢¤³¤³¤Ë¤ÏÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤ò»È¤¦¤³¤È¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¿¤¯¤Î CGI ¥¹¥¯¥ê¥×¥È¤Ï¤½¤¦¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤ò²¾Äꤷ¤Æ¤¤¤Þ¤¹¡£
-    URL ¤ò»È¤¦¾ì¹ç¤Ï¡¢¤¢¤Ê¤¿¤Î´ÉÍý²¼¤Ë¤¢¤ëÊÌ¥µ¡¼¥Ð¤ò»Ø¤¹¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ¤½¤¦¤Ç¤Ê¤¤¤È¡¢¥¨¥é¡¼¤¬µ¯¤³¤Ã¤¿¤È¤­¤ËÏ¢Íí¤ò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¯¤Ê¤Ã¤Æ
-    ¤·¤Þ¤¤¤Þ¤¹¡£
-</p>
-
-    <p>¤½¤ÎºÝ¡¢¤³¤ì¤Î¤¿¤á¤ËÀìÍѤΥ¢¥É¥ì¥¹¤òÀßÄꤹ¤ë¤Î¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£
-    Î㤨¤Ð¡¢</p>
-
-    <div class="example"><p><code>
-      ServerAdmin www-admin@foo.example.com
-    </code></p></div>
-
-    <p>¤È¤¤¤Ã¤¿¤è¤¦¤Ë¤·¤Þ¤¹¡£¥æ¡¼¥¶¤Ï¤¤¤Ä¤â¥µ¡¼¥Ð¤Ë´Ø¤¹¤ëÏäǤ¢¤ë¤È¤¤¤¦¤³¤È¤ò
-    ÌÀµ­¤·¤Æ¤¯¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤Î¤Ç¡£</p>
-
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ServerAlias" id="ServerAlias">ServerAlias</a> <a name="serveralias" id="serveralias">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥ê¥¯¥¨¥¹¥È¤ò̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë¥Þ¥Ã¥Á¤µ¤»¤Æ¤¤¤ë¤È¤­¤Ë
-»ÈÍѤµ¤ì¤ë¥Û¥¹¥È¤ÎÊÌ̾</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ServerAlias <var>hostname</var> [<var>hostname</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">ServerAlias</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢<a href="../vhosts/name-based.html">¥Í¡¼¥à¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a>¤Ë¤ª¤¤¤Æ
-    »ÈÍѤ¹¤ë¥Û¥¹¥È¤ÎÊÌ̾¤ò»ØÄꤷ¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      &lt;VirtualHost *&gt;<br />
-      ServerName server.domain.com<br />
-      ServerAlias server server2.domain.com server2<br />
-      # ...<br />
-      &lt;/VirtualHost&gt;
-    </code></p></div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../vhosts/">Apache ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥ÈÀâÌÀ½ñ</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ServerName" id="ServerName">ServerName</a> <a name="servername" id="servername">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤¬¼«Ê¬¼«¿È¤ò¼¨¤¹¤È¤­¤Ë»È¤¦¥Û¥¹¥È̾¤È¥Ý¡¼¥È</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ServerName [<var>scheme</var>://]<var>fully-qualified-domain-name</var>[:<var>port</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥Ð¡¼¥¸¥ç¥ó 2.0 ¤Ç¤Ï¥Ð¡¼¥¸¥ç¥ó 1.3 ¤Î
-    <code class="directive">Port</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Îµ¡Ç½¤â´Þ¤ß¤Þ¤¹¡£</td></tr>
-</table>
-    <p><code class="directive">ServerName</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥µ¡¼¥Ð¤¬¼«Ê¬¼«¿È¤ò¼¨¤¹¥ê¥¯¥¨¥¹¥È¥¹¥­¡¼¥à¤È¥Û¥¹¥È̾¤È¥Ý¡¼¥È¤òÀßÄꤷ¤Þ¤¹¡£
-    ¤³¤ì¤Ï¡¢¥ê¥À¥¤¥ì¥¯¥È¤¹¤ë URL ¤òÀ¸À®¤¹¤ëºÝ¤ËÍøÍѤµ¤ì¤Þ¤¹¡£
-    Î㤨¤Ð¡¢¥¦¥§¥Ö¥µ¡¼¥Ð¤òÆ°¤«¤·¤Æ¤¤¤ë¥Þ¥·¥ó¤Ï <code>simple.example.com</code>
-    ¤Ç¡¢DNS ¤Î¥¨¥¤¥ê¥¢¥¹ <code>www.example.com</code> ¤â¤¢¤ë¤È¤­¤Ë¡¢
-    ¥¦¥§¥Ö¥µ¡¼¥Ð¤¬¸å¼Ô¤È¤·¤Æǧ¼±¤µ¤ì¤ÆÍߤ·¤¤¤È¤­¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    »È¤¤¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      ServerName www.example.com:80
-    </code></p></div>
-
-    <p><code class="directive">ServerName</code> ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Ï¡¢
-    ¥µ¡¼¥Ð¤Ï IP ¥¢¥É¥ì¥¹¤«¤éµÕ°ú¤­¤ò¹Ô¤Ê¤¦¤³¤È¤Ç¥Û¥¹¥È̾¤òÃÎ¤í¤¦¤È¤·¤Þ¤¹¡£
-    <code class="directive">ServerName</code> ¤Ë¥Ý¡¼¥È¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Ï¡¢
-    ¥µ¡¼¥Ð¤Ï¥ê¥¯¥¨¥¹¥È¤¬Íè¤Æ¤¤¤ë
-    ¥Ý¡¼¥È¤ò»È¤¤¤Þ¤¹¡£ºÇ¹â¤Î¿®ÍêÀ­¤È³Î¼ÂÀ­¤ò¤â¤¿¤é¤¹¤¿¤á¤Ë¤Ï¡¢
-    <code class="directive">ServerName</code> ¤ò»È¤Ã¤Æ¥Û¥¹¥È̾¤È¥Ý¡¼¥È¤òÌÀ¼¨Åª¤Ë
-    »ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p><a href="../vhosts/name-based.html">̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a>
-    ¤òÍøÍѤ·¤Æ¤¤¤ë¾ì¹ç¡¢<code class="directive"><a href="#virtualhost">&lt;VirtualHost&gt;</a></code> ¥»¥¯¥·¥ç¥óÆâ¤Î
-    <code class="directive">ServerName</code> ¤Ï¤³¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë¥Þ¥Ã¥Á¤¹¤ë¤¿¤á¤Ë
-    ²¿¤¬¥ê¥¯¥¨¥¹¥È¤Î Host: ¥Ø¥Ã¥À¤Ë¸½¤ì¤ëɬÍפ¬¤¢¤ë¤Î¤«¤ò»ØÄꤷ¤Þ¤¹¡£</p>
-
-    <p>¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤ä¥í¡¼¥É¥Ð¥é¥ó¥µ¤äSSLÉé²Ù·Ú¸ºÁõÃ֤Τ褦¤Ê¡¢
-    SSL¤ò½èÍý¤¹¤ë¥Þ¥·¥ó¤Î¸å¤í¤Ç¥µ¡¼¥Ð¤òÆ°¤«¤¹¾ì¹ç¤Ï¡¢
-    ¥µ¡¼¥Ð¤¬Àµ¤·¤¤¼«¸Ê»²¾È URL¤ò³Î¼Â¤ËÀ¸À®¤¹¤ë¤è¤¦¤Ë¡¢
-    <code>https://</code> ¥¹¥­¡¼¥à¤È¥¯¥é¥¤¥¢¥ó¥È¤¬Àܳ¤¹¤ë¥Ý¡¼¥ÈÈÖ¹æ¤ò¡¢
-    <code class="directive">ServerName</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
-    </p>
-
-    <p>¼«¸Ê»²¾È URL (Î㤨¤Ð <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code> ¥â¥¸¥å¡¼¥ë¤Ë¤è¤ë¤â¤Î¤Ê¤É)
-    ¤¬»ØÄꤵ¤ì¤¿¥Ý¡¼¥È¤ò»È¤¦¤«¡¢¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¥¯¥¨¥¹¥È¤Î¥Ý¡¼¥ÈÈÖ¹æ¤ò»È¤¦¤«¤ò
-    ·èÄꤹ¤ëÀßÄê¤Ï <code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code> 
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È <code class="directive"><a href="#usecanonicalphysicalport">UseCanonicalPhysicalPort</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../dns-caveats.html">DNS ¤È Apache ¤Ë´Ø¤¹¤ëÏÃ</a></li>
-<li><a href="../vhosts/">Apache ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥ÈÀâÌÀ½ñ</a></li>
-<li><code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code></li>
-<li><code class="directive"><a href="#usecanonicalphysicalport">UseCanonicalPhysicalPort</a></code></li>
-<li><code class="directive"><a href="#namevirtualhost">NameVirtualHost</a></code></li>
-<li><code class="directive"><a href="#serveralias">ServerAlias</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ServerPath" id="ServerPath">ServerPath</a> <a name="serverpath" id="serverpath">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>Èó¸ß´¹¤Î¥Ö¥é¥¦¥¶¤¬Ì¾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë¥¢¥¯¥»¥¹¤·¤¿¤È¤­¤Î
-¤¿¤á¤Î¸ß´¹ÍÑ URL ¥Ñ¥¹Ì¾</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ServerPath <var>URL-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">ServerPath</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢<a href="../vhosts/">¥Í¡¼¥à¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a>¤Ë¤ª¤¤¤ÆÍøÍѤ¹¤ë
-    ¸ß´¹ÍÑ URL ¥Ñ¥¹Ì¾¤òÀßÄꤷ¤Þ¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../vhosts/">Apache ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥ÈÀâÌÀ½ñ</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ServerRoot" id="ServerRoot">ServerRoot</a> <a name="serverroot" id="serverroot">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¥µ¡¼¥Ð¤Î¥Ù¡¼¥¹¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ServerRoot <var>directory-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ServerRoot /usr/local/apache</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">ServerRoot</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥µ¡¼¥Ð¤¬Â¸ºß¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤òÀßÄꤷ¤Þ¤¹¡£
-    Ä̾<code>conf/</code> ¤ä <code>logs/</code> ¤È¤¤¤Ã¤¿¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤¬
-    ¸ºß¤·¤Þ¤¹¡£
-    ¤Þ¤¿¡¢Â¾¤ÎÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö (Î㤨¤Ð <code class="directive"><a href="#include">Include</a></code> ¤ä <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code> ¤Ê¤É) ¤Ë¤ª¤±¤ëÁêÂХѥ¹¤Ï¡¢
-    ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤ÎÁêÂаÌÃ֤Ȥʤê¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      ServerRoot /home/httpd
-    </code></p></div>
-
-
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../invoking.html"><code>httpd</code> ¤Î <code>-d</code>
-    ¥ª¥×¥·¥ç¥ó</a></li>
-<li><code class="directive">ServerRoot</code> ¤Î¸¢¸Â¤òŬÀÚ¤ËÀßÄꤹ¤ëÊýË¡¤Ï<a href="../misc/security_tips.html#serverroot">¥»¥­¥å¥ê¥Æ¥£¤Î¤³¤Ä</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ServerSignature" id="ServerSignature">ServerSignature</a> <a name="serversignature" id="serversignature">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤¬À¸À®¤¹¤ë¥É¥­¥å¥á¥ó¥È¤Î¥Õ¥Ã¥¿¤òÀßÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ServerSignature On|Off|EMail</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ServerSignature Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">ServerSignature</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥µ¡¼¥Ð¤¬À¸À®¤¹¤ë¥É¥­¥å¥á¥ó¥È
-    (¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¡¢<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ¤Ë¤ª¤±¤ë FTP ¤Î¥Ç¥£¥ì¥¯¥È¥ê¥ê¥¹¥È¡¢
-    <code class="module"><a href="../mod/mod_info.html">mod_info</a></code> ¤Î½ÐÎÏ¡¢Åù¡¹)
-    ¤ÎºÇ²¼¹Ô¤ËÉÕÍ¿¤¹¤ë¥Õ¥Ã¥¿¤ÎÀßÄê¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£
-    ¤½¤Î¤è¤¦¤Ê¥Õ¥Ã¥¿¹Ô¤òÍ­¸ú¤Ë¤·¤¿¤¤Íýͳ¤Ë¤Ï¡¢
-    ¥×¥í¥­¥·¤¬Ê£¿ôÏ¢¤Ê¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¡¢¥æ¡¼¥¶¤Ï¤É¤Î¥µ¡¼¥Ð¤¬ÊÖ¤·¤¿
-    ¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤«¤òÃΤë¼êÃʤ¬¤Û¤È¤ó¤É̵¤¤¤È¤¤¤¦¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£</p>
-
-
-    <p>¥Ç¥Õ¥©¥ë¥È¤Ç¤¢¤ë <code>Off</code> ¤ËÀßÄê¤ò¤¹¤ë¤È¡¢¥Õ¥Ã¥¿¹Ô¤¬ÍÞÀ©¤µ¤ì¤Þ¤¹
-    (¤½¤·¤Æ¡¢Apache-1.2 °ÊÁ°¤È¸ß´¹¤ÎÆ°ºî¤ò¤·¤Þ¤¹)¡£
-    <code>On</code> ¤ËÀßÄꤷ¤¿¾ì¹ç¤Ï¡¢Ã±¤Ë¥É¥­¥å¥á¥ó¥È¤ÎÃæ¤Ë¡¢¥µ¡¼¥Ð¤Î¥Ð¡¼¥¸¥ç¥ó¡¢
-    ²ÔÆ°Ãæ¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î <a href="#servername">ServerName</a> ¤Î½ñ¤«¤ì¤¿¹Ô¤òÄɲä·¡¢
-    <code>EMail</code> ¤Ë¤·¤¿¾ì¹ç¤Ï¤µ¤é¤Ë»²¾È¤µ¤ì¤¿¥É¥­¥å¥á¥ó¥È¤ËÂФ¹¤ë <a href="#serveradmin">ServerAdmin</a> ¤ò»Ø¤¹ "mailto:" ¤¬Äɲ䵤ì¤Þ¤¹¡£</p>
-
-    <p>¥Ð¡¼¥¸¥ç¥ó 2.0.44 °Ê¹ß¤Ç¤Ï¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code class="directive"><a href="#serversignature">ServerSignature</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤êɽ¼¨¤µ¤ì¤ë¾ðÊó¤âÀ©¸æ¤·¤Þ¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#servertokens">ServerTokens</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ServerTokens" id="ServerTokens">ServerTokens</a> <a name="servertokens" id="servertokens">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td><code>Server</code> HTTP ±þÅú¥Ø¥Ã¥À¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ServerTokens Full</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤êÊÖ¤¹ <code>Server</code>
-    ±þÅú¥Ø¥Ã¥ÀÆâ¤Ë¡¢¥µ¡¼¥Ð¤Î°ìÈÌŪ¤Ê OS ¼ïÊ̤䡢
-    ¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤ÆÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ë¥â¥¸¥å¡¼¥ë¤Î¾ðÊó¤ò
-    ´Þ¤á¤ë¤«¤É¤¦¤«¤ò»ØÄꤷ¤Þ¤¹¡£</p>
-
-    <dl>
-      <dt><code>ServerTokens Prod[uctOnly]</code></dt>
-
-      <dd>¥µ¡¼¥Ð¤Ï (Î㤨¤Ð): <code>Server:
-      Apache</code> ¤È¤¤¤Ã¤¿¤è¤¦¤ËÁ÷¤ê¤Þ¤¹¡£</dd>
-
-      <dt><code>ServerTokens Major</code></dt>
-
-      <dd>Server sends (<em>e.g.</em>): <code>Server:
-      Apache/2</code></dd>
-
-      <dt><code>ServerTokens Minor</code></dt>
-
-      <dd>Server sends (<em>e.g.</em>): <code>Server:
-      Apache/2.0</code></dd>
-
-      <dt><code>ServerTokens Min[imal]</code></dt>
-
-      <dd>¥µ¡¼¥Ð¤Ï (Î㤨¤Ð): <code>Server:
-      Apache/2.0.41</code> ¤È¤¤¤Ã¤¿¤è¤¦¤ËÁ÷¤ê¤Þ¤¹¡£</dd>
-
-      <dt><code>ServerTokens OS</code></dt>
-
-      <dd>¥µ¡¼¥Ð¤Ï (Î㤨¤Ð): <code>Server: Apache/2.0.41
-      (Unix)</code> ¤È¤¤¤Ã¤¿¤è¤¦¤ËÁ÷¤ê¤Þ¤¹¡£</dd>
-
-      <dt><code>ServerTokens Full</code> (¤â¤·¤¯¤Ï̤»ØÄê)</dt>
-
-      <dd>¥µ¡¼¥Ð¤Ï (Î㤨¤Ð): <code>Server: Apache/2.0.41
-      (Unix) PHP/4.2.2 MyMod/1.2</code> ¤È¤¤¤Ã¤¿¤è¤¦¤ËÁ÷¤ê¤Þ¤¹¡£</dd>
-    </dl>
-
-    <p>¤³¤ÎÀßÄê¤Ï¥µ¡¼¥ÐÁ´ÂΤËŬÍѤµ¤ì¡¢¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¾å¤ÇÍ­¸ú¤Ë¤·¤¿¤ê
-    ̵¸ú¤Ë¤·¤¿¤ê¤Ï¤Ç¤­¤Þ¤»¤ó¡£</p>
-
-    <p>¥Ð¡¼¥¸¥ç¥ó 2.0.44 °Ê¹ß¤Ç¤Ï¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code class="directive"><a href="#serversignature">ServerSignature</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤êɽ¼¨¤µ¤ì¤ë¾ðÊó¤âÀ©¸æ¤·¤Þ¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#serversignature">ServerSignature</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SetHandler" id="SetHandler">SetHandler</a> <a name="sethandler" id="sethandler">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Þ¥Ã¥Á¤¹¤ë¥Õ¥¡¥¤¥ë¤¬¥Ï¥ó¥É¥é¤Ç½èÍý¤µ¤ì¤ë¤è¤¦¤Ë¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>SetHandler <var>handler-name</var>|None</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0 ¤Ç core ¤Ë°ÜÆ°</td></tr>
-</table>
-    <p><code>.htaccess</code> ¤ä <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code>
-    ¥»¥¯¥·¥ç¥ó¡¢<code class="directive"><a href="#location">&lt;Location&gt;</a></code>
-    ¥»¥¯¥·¥ç¥ó¤Ë½ñ¤«¤ì¤¿¾ì¹ç¡¢
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤½¤³¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤¬
-    <var>handler-name</var> ¤Ç»ØÄꤵ¤ì¤¿<a href="../handler.html">¥Ï¥ó¥É¥é</a>¤Ç°·¤ï¤ì¤ë¤³¤È¤ò¶¯À©¤·¤Þ¤¹¡£Î㤨¤Ð¡¢³ÈÄ¥»Ò¤Ë´Ø¤ï¤é¤º¡¢
-    ¥Ç¥£¥ì¥¯¥È¥êÁ´ÂΤ¬¥¤¥á¡¼¥¸¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤È¤·¤Æ²òÀϤ·¤ÆÍߤ·¤¤¾ì¹ç¤Ë¤Ï¡¢
-    °Ê²¼¤ò¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î <code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ë¤Ëµ­½Ò¤·¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      SetHandler imap-file
-    </code></p></div>
-
-    <p>Ê̤ÎÎã: URL <code>http://servername/status</code>
-    ¤¬»ØÄꤵ¤ì¤¿¤È¤­¤Ë¥µ¡¼¥Ð¤¬¾õÂÖÊó¹ð¤ò¤¹¤ë¤è¤¦¤Ë¤·¤¿¤¤¤È¤­¤Ï¡¢°Ê²¼¤ò
-    <code>httpd.conf</code> ¤Ëµ­½Ò¤·¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      &lt;Location /status&gt;<br />
-      <span class="indent">
-        SetHandler server-status<br />
-      </span>
-      &lt;/Location&gt;
-    </code></p></div>
-
-    <p><code>None</code> ¤È¤¤¤¦ÃͤòÀßÄꤹ¤ë¤³¤È¤Ç¡¢
-    Á°¤ÎÊý¤Î <code class="directive">SetHandler</code> ¤ÇÄêµÁ¤µ¤ì¤¿ÀßÄê¤ò̵¸ú¤Ë¤¹¤ë¤³¤È¤¬
-    ¤Ç¤­¤Þ¤¹¡£</p>
-    <p><strong>Ãí°Õ:</strong>SetHandler ¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥Ï¥ó¥É¥é¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É
-    ¤·¤Þ¤¹¤Î¤Ç¡¢Ä̾ï¤ÎµóÆ°¡¢¤¿¤È¤¨¤Ð¡¢¥¹¥é¥Ã¥·¥å (/) ¤Ç½ª¤ï¤ë URL ¤¬
-    ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿¤È¤­¤Ë¥Ç¥£¥ì¥¯¥È¥ê¤ä¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤òÊÖ¤¹¤è¤¦¼è¤ê°·¤¦µóÆ°¤Ï¡¢
-    ¹Ô¤ï¤ì¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£
-    </p>
-
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SetInputFilter" id="SetInputFilter">SetInputFilter</a> <a name="setinputfilter" id="setinputfilter">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¥¯¥¨¥¹¥È¤ä POST ¤ÎÆþÎϤò½èÍý¤¹¤ë¥Õ¥£¥ë¥¿¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>SetInputFilter <var>filter</var>[;<var>filter</var>...]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">SetInputFilter</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥¯¥é¥¤¥¢¥ó¥È¤Î
-    ¥ê¥¯¥¨¥¹¥È¤ä POST ¤ÎÆþÎϤò¥µ¡¼¥Ð¤¬¼õ¤±¼è¤Ã¤¿¤È¤­¤Ë½èÍý¤¹¤ë¥Õ¥£¥ë¥¿¤ò
-    ÀßÄꤷ¤Þ¤¹¡£¤³¤ì¤Ï <code class="directive"><a href="../mod/mod_mime.html#addinputfilter">AddInputFilter</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò´Þ¤á¡¢Â¾¤Î¾ì½ê¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¥Õ¥£¥ë¥¿¤ÎÀßÄê¤Ë
-    Äɲ䵤ì¤Þ¤¹¡£</p>
-
-    <p>Ê£¿ô¤Î¥Õ¥£¥ë¥¿¤ò»ØÄꤹ¤ë¤È¤­¤Ï¡¢¥Ç¡¼¥¿¤ò½èÍý¤¹¤ë½çÈÖ¤Ë
-    ¥»¥ß¥³¥í¥ó¤Ç¶èÀÚ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../filter.html">¥Õ¥£¥ë¥¿</a>ÀâÌÀ½ñ</li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SetOutputFilter" id="SetOutputFilter">SetOutputFilter</a> <a name="setoutputfilter" id="setoutputfilter">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤Î±þÅú¤ò½èÍý¤¹¤ë¥Õ¥£¥ë¥¿¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>SetOutputFilter <var>filter</var>[;<var>filter</var>...]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">SetOutputFilter</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¥µ¡¼¥Ð¤Î±þÅú¤ò¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤êÊÖ¤µ¤ì¤ëÁ°¤Ë½èÍý¤¹¤ë¥Õ¥£¥ë¥¿¤òÀßÄꤷ¤Þ¤¹¡£
-    ¤³¤ì¤Ï <code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò´Þ¤á¡¢Â¾¤Î¾ì½ê¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¥Õ¥£¥ë¥¿¤ÎÀßÄê¤Ë
-    Äɲ䵤ì¤Þ¤¹¡£</p>    
-
-    <p>Î㤨¤Ð¡¢°Ê²¼¤ÎÀßÄê¤Ï <code>/www/data/</code> ¥Ç¥£¥ì¥¯¥È¥ê¤Î¤¹¤Ù¤Æ¤Î
-    ¥Õ¥¡¥¤¥ë¤ò SSI ¤Ç½èÍý¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      &lt;Directory /www/data/&gt;<br />
-      <span class="indent">
-        SetOutputFilter INCLUDES<br />
-      </span>
-      &lt;/Directory&gt;
-    </code></p></div>
-
-    <p>Ê£¿ô¤Î¥Õ¥£¥ë¥¿¤ò»ØÄꤹ¤ë¤È¤­¤Ï¡¢¥Ç¡¼¥¿¤ò½èÍý¤¹¤ë½çÈÖ¤Ë
-    ¥»¥ß¥³¥í¥ó¤Ç¶èÀÚ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../filter.html">¥Õ¥£¥ë¥¿</a>ÀâÌÀ½ñ</li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="TimeOut" id="TimeOut">TimeOut</a> <a name="timeout" id="timeout">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>³Æ¥¤¥Ù¥ó¥È¤Ë¤Ä¤¤¤Æ¡¢¥ê¥¯¥¨¥¹¥È¤ò¼ºÇÔ¤µ¤»¤ë¤Þ¤Ç¤Ë¥µ¡¼¥Ð¤¬
-ÂԤĻþ´Ö¤òÀßÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>TimeOut <var>seconds</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>TimeOut 300</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">TimeOut</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¸½ºß¤Î¤È¤³¤í
-    °Ê²¼¤Î»°¤Ä¤ÎÂÔ¤Á»þ´Ö¤Ë¤Ä¤¤¤Æ¤ÎÄêµÁ¤ò¹Ô¤¤¤Þ¤¹:</p>
-
-    <ol>
-      <li>GET ¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¼è¤ë¤Î¤Ë¤«¤«¤ëÁí»þ´Ö</li>
-
-      <li>POST ¤ä PUT¥ê¥¯¥¨¥¹¥È¤Ë¤ª¤¤¤Æ¡¢¼¡¤Î TCP ¥Ñ¥±¥Ã¥È¤¬ÆϤ¯¤Þ¤Ç¤ÎÂÔ¤Á»þ´Ö</li>
-
-      <li>¥ì¥¹¥Ý¥ó¥¹¤òÊÖ¤¹ºÝ¡¢TCP ¤Î ACK ¤¬µ¢¤Ã¤Æ¤¯¤ë¤Þ¤Ç¤Î»þ´Ö</li>
-    </ol>
-    
-    <p>¾­Íè¤Ë¤ÏÊÌ¡¹¤ÎÀßÄê¤ò¤¹¤ë¤³¤È¤¬²Äǽ¤Ë¤Ç¤­¤ë¤è¤¦¹ÍθÃæ¤Ç¤¹¡£
-    Apache 1.2 °ÊÁ°¤Ï¥¿¥¤¥Þ¡¼¤Ï 1200 ¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤·¤¿¤¬¡¢
-    300 ¤Ë²¼¤²¤é¤ì¤Þ¤·¤¿¡£300 ¤Ç¤â¤Û¤È¤ó¤É¤Î¾ì¹ç¤Ï½½Ê¬¤¹¤®¤ëÃͤǤ¹¡£
-    ¥³¡¼¥ÉÃæ¤ÎÊѤʾì½ê¤Ë¤Þ¤À¥Ñ¥±¥Ã¥È¤òÁ÷¤ëºÝ¤Ë¥¿¥¤¥Þ¤ò¥ê¥»¥Ã¥È¤·¤Ê¤¤
-    ¾ì½ê¤¬¤¢¤ë¤«¤â¤·¤ì¤Ê¤¤¤Î¤Ç¡¢¥Ç¥Õ¥©¥ë¥È¤ò¤è¤ê¾®¤µ¤¤ÃͤˤϤ·¤Æ¤¤¤Þ¤»¤ó¡£</p>
-
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="TraceEnable" id="TraceEnable">TraceEnable</a> <a name="traceenable" id="traceenable">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td><code>TRACE</code> ¥á¥½¥Ã¥É¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ¹¤ë±þÅúÊýË¡¤ò·è¤á¤ë
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>TraceEnable <var>[on|off|extended]</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>TraceEnable on</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 1.3.34, 2.0.55 °Ê¹ß</td></tr>
-</table>
-    <p>¥³¥¢¥µ¡¼¥Ð¤È <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ξÊý¤Î <code>TRACE</code>
-    ¤ÎµóÆ°¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Î <code>TraceEnable on</code>
-    ¤Ï¡¢¥ê¥¯¥¨¥¹¥È¥Ü¥Ç¥£¤ò¼õ¤±Æþ¤ì¤Ê¤¤¤è¤¦¤Ê¡¢RFC2616 ¤Ë½àµò¤·¤¿
-    <code>TRACE</code> ¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±ÉÕ¤±¤Þ¤¹¡£
-    <code>TraceEnale off</code> ¤ÈÀßÄꤹ¤ë¤È¡¢¥³¥¢¥µ¡¼¥Ð¤È
-    <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ¤Ï <code>405</code> (¥á¥½¥Ã¥ÉÉÔµö²Ä)
-    ¥¨¥é¡¼¤ò¥¯¥é¥¤¥¢¥ó¥È¤ËÊÖ¤·¤Þ¤¹¡£</p>
-
-    <p>ºÇ¸å¤Ë¡¢¥Æ¥¹¥È¤äÄ´ººÌÜŪ¤Ê¤É¤Î¸ÂÄêÍÑÅӤȤ·¤Æ¡¢»ÈÍѤ˽àµò¤·¤Ê¤¤
-    <code>TraceEnable extended</code> ¤ò»È¤Ã¤Æ¡¢¥ê¥¯¥¨¥¹¥È¥Ü¥Ç¥£¤ò
-    ¼õ¤±ÉÕ¤±¤ë¤è¤¦¤ËµóÆ°¤òÊѹ¹¤Ç¤­¤Þ¤¹¡£(¥ª¥ê¥¸¥ó¥µ¡¼¥Ð¤È¤·¤Æ¤Î)
-    ¥³¥¢¥µ¡¼¥Ð¤Ç¤Ï¡¢¥ê¥¯¥¨¥¹¥È¥Ü¥Ç¥£¤Î¥µ¥¤¥º¤Ï 64k (
-    <code>Transfer-Encoding: chunked</code> ¤¬»È¤ï¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï 
-    chunk ¥Ø¥Ã¥ÀÍÑ¤Ë +8k) ¤ËÀ©¸Â¤µ¤ì¤Þ¤¹¡£
-    ¥³¥¢¥µ¡¼¥Ð¤Ï¡¢¥Õ¥ë¥Ø¥Ã¥À¤ÈÁ´¤Æ¤Î chunk ¥Ø¥Ã¥À¤ò¥ì¥¹¥Ý¥ó¥¹¤Î
-    ¥Ü¥Ç¥£¤È¤·¤ÆÊֵѤ·¤Þ¤¹¡£
-    proxy ¥µ¡¼¥Ð¤È¤·¤Æ¤Ï¡¢¥ê¥¯¥¨¥¹¥È¥Ü¥Ç¥£¤Î¥µ¥¤¥º¤Ï 64k ¤ËÀ©¸Â¤µ¤ì¤Þ¤»¤ó¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="UseCanonicalName" id="UseCanonicalName">UseCanonicalName</a> <a name="usecanonicalname" id="usecanonicalname">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤¬¼«Ê¬¼«¿È¤Î̾Á°¤È¥Ý¡¼¥È¤ò·èÄꤹ¤ëÊýË¡¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>UseCanonicalName On|Off|Dns</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>UseCanonicalName Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>¿¤¯¤Î¾õ¶·¤Ç Apache ¤Ï<em>¼«¸Ê»²¾È</em> URL¡¢¤¹¤Ê¤ï¤Á
-    Ʊ¤¸¥µ¡¼¥Ð¤ò»Ø¤¹ URL¡¢¤òºîÀ®¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    <code>UseCanonicalName On</code> ¤Î¾ì¹ç¤Ï¡¢<code class="directive"><a href="#servername">ServerName</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ë
-    ¥Û¥¹¥È̾¤È¥Ý¡¼¥ÈÈÖ¹æ¤ò»È¤Ã¤Æ¡¢¤½¤ÎÀµµ¬Ì¾ (¼«¸Ê»²¾È¤Î̾Á°) ¤òÀ¸À®¤·¤Þ¤¹¡£
-    ¤³¤Î̾Á°¤Ï¡¢¤¹¤Ù¤Æ¤Î¼«¸Ê»²¾È URL ¤Ç»È¤ï¤ì¤Þ¤¹¤·¡¢CGI ¤Î 
-    <code>SERVER_NAME</code> ¤È <code>SERVER_PORT</code> ¤Ç¤â»È¤ï¤ì¤Þ¤¹¡£</p>
-
-    <p><code>UseCanonicalName Off</code> ¤Î¾ì¹ç¡¢
-    ¥¯¥é¥¤¥¢¥ó¥È¤¬¥Û¥¹¥È̾¤È¥Ý¡¼¥È¤ò»ØÄꤷ¤¿¤È¤­¤Ë¤Ï¡¢
-    ¤½¤ì¤é¤ò¸µ¤Ë¼«¸Ê»²¾È URL ¤òºîÀ®¤·¤Þ¤¹ (»ØÄ꤬¤Ê¤«¤Ã¤¿¤È¤­¤Ï
-    ¾å¤ÎÄêµÁ¤ÈƱÍͤˤ·¤ÆÀµµ¬Ì¾¤ò²ò·è¤·¤Þ¤¹)¡£
-    ¤³¤ì¤é¤ÎÃͤÏ<a href="../vhosts/name-based.html">̾Á°¥Ù¡¼¥¹¤Î
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a>¤ò¼ÂÁõ¤Ç»È¤ï¤ì¤Æ¤¤¤ë¤Î¤ÈƱ¤¸Ãͤǡ¢
-    Ʊ¤¸¥¯¥é¥¤¥¢¥ó¥È¤Ç¼èÆÀ¤Ç¤­¤ëÃͤˤʤäƤ¤¤Þ¤¹¡£
-    CGI ÊÑ¿ô <code>SERVER_NAME</code> ¤È <code>SERVER_PORT</code> 
-    ¤â¥¯¥é¥¤¥¢¥ó¥È¤«¤éÍ¿¤¨¤é¤ì¤¿Ãͤ«¤éºîÀ®¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¤è¤¦¤ÊµóÆ°¤¬ÊØÍø¤ÊÎã¤Ï¡¢¥¤¥ó¥È¥é¥Í¥Ã¥È¤Î¥µ¡¼¥Ð¤Ç <code>www</code>
-    ¤Î¤è¤¦¤Êû¤¤Ì¾Á°¤Ç¥æ¡¼¥¶¤¬¥Þ¥·¥ó¤ËÀܳ¤¹¤ë¤È¤­¤Ç¤¹¡£
-    ¥æ¡¼¥¶¤ÎÆþÎϤÇû¤¤¥Û¥¹¥È̾¤¬»È¤ï¤ì¤Æ¤¤¤Æ¡¢URL ¤¬<em>ºÇ¸å¤Î¥¹¥é¥Ã¥·¥å̵¤·¤Î</em>
-    ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ê¤Ã¤Æ¤¤¤ë <code>http://www/splat</code> ¤Î¤è¤¦¤Ê¤È¤­¡¢
-    Apache ¤Ï¥ê¥¯¥¨¥¹¥È¤ò <code>http://www.domain.com/splat/</code> 
-    ¤Ø¥ê¥À¥¤¥ì¥¯¥È¤·¤Þ¤¹¡£
-    ǧ¾Ú¤ò¤¹¤ë¤è¤¦¤ËÀßÄꤷ¤Æ¤¤¤ë¤È¡¢¤³¤Î¾ì¹ç
-    ¥æ¡¼¥¶¤Ï 2 ²óǧ¾Ú¤ò¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¯¤Ê¤ê¤Þ¤¹ (<code>www</code> ¤Ë
-    ÂФ·¤Æ 1 ²ó¡¢<code>www.domain.com</code> ¤ËÂФ·¤Æ¤â¤¦ 1 ²ó -- 
-    ¾ÜºÙ¤Ï <a href="http://httpd.apache.org/docs/misc/FAQ.html#prompted-twice">¤³¤ÎÏÃÂê¤Î
-    FAQ</a> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤)¡£
-    ¤·¤«¤· <code class="directive">UseCanonicalName</code> ¤¬ <code>Off</code> ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤È¡¢
-    Apache ¤Ï <code>http://www/splat/</code> ¤Ë¥ê¥À¥¤¥ì¥¯¥È¤·¤Þ¤¹¡£</p>
-
-    <p>»°¤ÄÌܤΥª¥×¥·¥ç¥ó <code>UseCanonicalName DNS</code> ¤Ï¡¢
-    Â絬ÌÏ¤Ê IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥Æ¥£¥ó¥°¤Ç¡¢
-    <code>Host:</code> ¥Ø¥Ã¥À¤òÄ󶡤·¤Ê¤¤¸Å¤¤¥¯¥é¥¤¥¢¥ó¥È¤ò
-    ¥µ¥Ý¡¼¥È¤¹¤ë¾ì¹ç¤òÁÛÄꤷ¤Æ¤¤¤Þ¤¹¡£
-    ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¤Ï Apache ¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬Àܳ¤·¤¿ IP ¥¢¥É¥ì¥¹¤ËÂФ·¤Æ
-    DNS ¤ÎµÕ°ú¤­¤ò¹Ô¤Ê¤Ã¤Æ¡¢¼«¸Ê»²¾È URL ¤òºîÀ®¤·¤Þ¤¹¡£</p>
-
-    <div class="warning"><h3>·Ù¹ð</h3>
-    <p>CGI ¤¬ <code>SERVER_NAME</code> ¤Ë´Ø¤·¤Æ²¿¤é¤«¤ÎÁ°Äó¾ò·ï¤ò
-    ²¾Äꤷ¤Æ¤¤¤ë¤È¤­¤Ë¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤ÎÀßÄê¤Ë¤è¤Ã¤Æ¤ÏÆ°ºî¤·¤Ê¤¯
-    ¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¥¯¥é¥¤¥¢¥ó¥È¤Ï¼Â¼ÁŪ¤Ë¤Ï¥Û¥¹¥È̾¤È¤·¤Æ
-    ²¿¤Ç¤â˾¤ß¤ÎÃͤò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£CGI ¤¬
-    <code>SERVER_NAME</code> ¤ò»È¤Ã¤Æ¼«¸Ê»²¾È URL ¤òºîÀ®¤¹¤ë¤³¤È¤·¤«¤·¤Ê¤¤
-    ¾ì¹ç¤Ï¡¢¤É¤ÎÀßÄê¤ò¹Ô¤Ê¤Ã¤Æ¤âÂç¾æÉפʤϤº¤Ç¤¹¡£</p></div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#usecanonicalphysicalport">UseCanonicalPhysicalPort</a></code></li>
-<li><code class="directive"><a href="#servername">ServerName</a></code></li>
-<li><code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="UseCanonicalPhysicalPort" id="UseCanonicalPhysicalPort">UseCanonicalPhysicalPort</a> <a name="usecanonicalphysicalport" id="usecanonicalphysicalport">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤Î̾Á°¤È¥Ý¡¼¥È¤Î²ò·èÊýË¡¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>UseCanonicalPhysicalPort On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>UseCanonicalPhysicalPort Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p>Apache ¤ÏÍÍ¡¹¤Ê¾õ¶·¤Ç <em>¼«¸Ê»²¾È</em> URL ¤Ä¤Þ¤ê¥µ¡¼¥Ð¤¬¼«Ê¬¼«¿È¤ò»Ø¤·¼¨¤¹
-    URL ¤òÀ¸À®¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    <code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-    ÀßÄê¤Ë¤è¤Ã¤Æ¥µ¡¼¥Ð¤ÎÊÌ̾¤ò¹½À®¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¤¬¡¢
-    ¤½¤ÎºÝ¤ÎÊÌ̾¤Ë»È¤¦¥Ý¡¼¥È¤Ï
-    <code>UseCanonicalPhysicalPort On</code> ¤È¤¤¤¦ÀßÄ꤬¤¢¤ì¤Ð¡¢
-    ¼ÂºÝ¤Î¥Ý¡¼¥ÈÈÖ¹æ¤ò¥Ý¡¼¥ÈÈÖ¹æ¤È¤·¤Æ»È¤¦¸õÊä¤ËÆþ¤ì¤Æ¥ê¥¯¥¨¥¹¥È¤ò
-    ½èÍý¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£<code>UseCanonicalPhysicalPort Off</code>
-    ¤È¤¤¤¦ÀßÄê¤Ç¤¢¤ì¤Ð¡¢¼ÂºÝ¤Î¥Ý¡¼¥ÈÈÖ¹æ¤Ï»ÈÍѤ»¤º¡¢ÀßÄꤵ¤ì¤Æ¤¤¤ë¾ðÊó¤ò
-    Á´¤Æ¿®¤¸¤Æ¥Ý¡¼¥ÈÈÖ¹æ¤ò¹½À®¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>Ãí</h3>
-    <p>¼ÂºÝ¤Î¥Ý¡¼¥ÈÈֹ椬»È¤ï¤ì¤ë½ç½ø¤Ï¼¡¤Î¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹ :<br /><br />
-     <code>UseCanonicalName On</code></p>
-     <ul>
-      <li><code>ServerName</code> ¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ë¥Ý¡¼¥ÈÈÖ¹æ</li>
-      <li>¼ÂºÝ¤Î¥Ý¡¼¥ÈÈÖ¹æ</li>
-      <li>¥Ç¥Õ¥©¥ë¥È¤Î¥Ý¡¼¥ÈÈÖ¹æ</li>
-     </ul>
-     <code>UseCanonicalName Off | DNS</code>
-     <ul>
-      <li><code>Host:</code> ¥Ø¥Ã¥À¤«¤éÃê½Ð¤µ¤ì¤¿¥Ý¡¼¥ÈÈÖ¹æ</li>
-      <li>¼ÂºÝ¤Î¥Ý¡¼¥ÈÈÖ¹æ</li>
-      <li><code>ServerName</code> ¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ë¥Ý¡¼¥ÈÈÖ¹æ</li>
-      <li>¥Ç¥Õ¥©¥ë¥È¤Î¥Ý¡¼¥ÈÈÖ¹æ</li>
-     </ul>
-    
-    <p><code>UseCanonicalPhysicalPort Off</code> ¤Ç¡¢
-    ¼ÂºÝ¤Î¥Ý¡¼¥ÈÈֹ椬¾å¤Î½ç½ø¤«¤é¼è¤ê½ü¤«¤ì¤Þ¤¹¡£</p>
-    </div>
-
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code></li>
-<li><code class="directive"><a href="#servername">ServerName</a></code></li>
-<li><code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="VirtualHost" id="VirtualHost">&lt;VirtualHost&gt;</a> <a name="virtualhost" id="virtualhost">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ÆÃÄê¤Î¥Û¥¹¥È̾¤ä IP ¥¢¥É¥ì¥¹¤Î¤ß¤ËŬÍѤµ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-°Ï¤à</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>&lt;VirtualHost
-    <var>addr</var>[:<var>port</var>] [<var>addr</var>[:<var>port</var>]]
-    ...&gt; ... &lt;/VirtualHost&gt;</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Core</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>core</td></tr>
-</table>
-    <p><code class="directive">&lt;VirtualHost&gt;</code> µÚ¤Ó
-    <code>&lt;/VirtualHost&gt;</code> ¤Ï¡¢
-    ÆÃÄê¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ËÂФ·¤Æ¤Î¤ßŬÍѤµ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö·²¤ò³ç¤ë
-    ¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¥³¥ó¥Æ¥­¥¹¥È¤Çµö²Ä¤µ¤ì¤ëÁ´¤Æ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ØÄê²Äǽ¤Ç¤¹¡£
-    ¥µ¡¼¥Ð¤¬¡¢»ØÄꤵ¤ì¤¿¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë¤¢¤ë¥É¥­¥å¥á¥ó¥È¤Ø¤Î
-    ¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±ÉÕ¤±¤¿¾ì¹ç¡¢
-    <code class="directive">&lt;VirtualHost&gt;</code> ¥»¥¯¥·¥ç¥ó¤ÎÃæ¤Ë¤¢¤ë
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Å¬ÍѤµ¤ì¤Þ¤¹¡£
-    <var>Addr</var>¤Ï¡¢¼¡¤Î¤â¤Î¤¬ÍøÍѤǤ­¤Þ¤¹:</p>
-
-    <ul>
-      <li>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î IP ¥¢¥É¥ì¥¹</li>
-
-      <li>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î IP ¤ËÂбþ¤¹¤ë´°Á´¤Ê¥É¥á¥¤¥ó̾</li>
-
-      <li><code>NameVirtualHost *</code> ¤È¶¦¤Ë»È¤ï¤ì¤ë¡¢
-      ¤¹¤Ù¤Æ¤Î IP ¥¢¥É¥ì¥¹¤Ë¥Þ¥Ã¥Á¤¹¤ëʸ»ú <code>*</code></li>
-
-      <li>IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ç¾¤Î¤â¤Î¤Ë¥Þ¥Ã¥Á¤·¤Ê¤¤ IP ¥¢¥É¥ì¥¹
-      ¤Î¤¿¤á¤Îʸ»úÎó <code>_default_</code></li>
-    </ul>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      &lt;VirtualHost 10.1.2.3&gt;<br />
-      <span class="indent">
-        ServerAdmin webmaster@host.foo.com<br />
-        DocumentRoot /www/docs/host.foo.com<br />
-        ServerName host.foo.com<br />
-        ErrorLog logs/host.foo.com-error_log<br />
-        TransferLog logs/host.foo.com-access_log<br />
-      </span>
-      &lt;/VirtualHost&gt;
-    </code></p></div>    
- 
-    <p>IPv6 ¥¢¥É¥ì¥¹¤Ï¥ª¥×¥·¥ç¥ó¤Î¥Ý¡¼¥ÈÈÖ¹æ¤Î»ØÄê¤È¶èÊ̤¹¤ë¤¿¤á¤Ë¡¢
-    ³Ñ³ç¸Ì¤Ç³ç¤Ã¤Æ»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¼¡¤Ï IPv6 ¤ÎÎã¤Ç¤¹:</p>
-
-    <div class="example"><p><code>
-      &lt;VirtualHost [2001:db8::a00:20ff:fea7:ccea]&gt;<br />
-      <span class="indent">
-        ServerAdmin webmaster@host.example.com<br />
-        DocumentRoot /www/docs/host.example.com<br />
-        ServerName host.example.com<br />
-        ErrorLog logs/host.example.com-error_log<br />
-        TransferLog logs/host.example.com-access_log<br />
-      </span>
-      &lt;/VirtualHost&gt;
-    </code></p></div>  
-
-    <p>³Æ¡¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë¤Ï¤½¤ì¤¾¤ì°ã¤¦ IP ¥¢¥É¥ì¥¹¡¢¥Ý¡¼¥ÈÈÖ¹æ
-    ¤â¤·¤¯¤Ï¥Û¥¹¥È̾¤ËÂбþ¤¹¤ëɬÍפ¬¤¢¤ê¡¢
-    1 ÈÖÌܤξì¹ç¤Ë¤ÏÊ£¿ô¤Î¥¢¥É¥ì¥¹¤Ç IP ¥Ñ¥±¥Ã¥È¤ò¼õ¿®¤Ç¤­¤ë¤è¤¦¤Ë
-    ¥µ¡¼¥Ð¥Þ¥·¥ó¤òÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-    (¤â¤·¡¢¥Þ¥·¥ó¤¬Ê£¿ô¤Î¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤È»ý¤¿¤Ê¤¤¾ì¹ç¤Ï¡¢
-    (OS¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ì¤Ð) <code>ifconfig alias</code> ¥³¥Þ¥ó¥É¤Ë¤è¤ê
-    ãÀ®¤Ç¤­¤Þ¤¹)¡£</p>
-
-    <div class="note"><h3>Ãí°ÕÅÀ</h3>
-    <p><code class="directive">&lt;VirtualHost&gt;</code> ¤Ï Apache ¤¬ Listen ¤¹¤ë
-    IP ¥¢¥É¥ì¥¹¤Ë¤Ï±Æ¶Á¤òÍ¿¤¨<strong>¤Þ¤»¤ó</strong>¡£
-    <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code> ¤ò
-    »È¤Ã¤Æ Apache ¤¬Àµ¤·¤¤¥¢¥É¥ì¥¹¤ò listen ¤¹¤ë¤è¤¦¤ËÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-    </div>
-
-    <p>IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢ÆÃÊ̤Ê̾Á°
-    <code>_default_</code> ¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤½¤Î¾ì¹ç¤Ï
-    ¤½¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ï¾¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÇÌÀ¼¨Åª¤Ëµó¤²¤é¤ì¤Æ¤¤¤Ê¤¤
-    ¤¹¤Ù¤Æ¤Î IP ¥¢¥É¥ì¥¹¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£<code>_default_</code> ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤¬Ìµ¤¤
-    ¾ì¹ç¤Ë IP ¤¬¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ç»ØÄꤵ¤ì¤¿¤â¤Î¤Ë¥Þ¥Ã¥Á¤·¤Ê¤¤¤È¤­¤Ï¡¢
-    VirtualHost ¥»¥¯¥·¥ç¥ó¤Î³°¤Î¤¹¤Ù¤Æ¤ÎÄêµÁ¤«¤é¤Ê¤ë¡Ö¼ç¡×¥µ¡¼¥ÐÀßÄ꤬
-    »È¤ï¤ì¤Þ¤¹¡£(¤¿¤À¤·¡¢<code class="directive"><a href="#namevirtualhost">NameVirtualHost</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¥Þ¥Ã¥Á¤¹¤ë
-    ¤¹¤Ù¤Æ¤Î IP ¥¢¥É¥ì¥¹¤Ï¡Ö¼ç¡×¥µ¡¼¥ÐÀßÄê¤â <code>_default_</code> ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤â
-    »È¤ï¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¾Ü¤·¤¯¤Ï <a href="../vhosts/name-based.html">¥Í¡¼¥à¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a> ¤ò
-    »²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£)</p>
-
-    <p><code>:port</code> ¤È¤¤¤Ã¤¿·Á¼°¤Çµ­½Ò¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢
-    ¥Þ¥Ã¥Á¤µ¤»¤ë¥Ý¡¼¥È¤òÊѹ¹²Äǽ¤Ç¤¹¡£
-    ¤³¤Î»ØÄê¤ò¤·¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢¼ç¥µ¡¼¥ÐÀßÄê¤Ë¤ª¤±¤ë
-    °ìÈֺǸå¤Ë <code><a href="#port">Port</a></code> ¤Ç»ØÄꤵ¤ì¤¿¥Ý¡¼¥È¤¬
-    ¥Ç¥Õ¥©¥ë¥È¤È¤Ê¤ê¤Þ¤¹¡£
-    <code>:*</code> ¤ò»ØÄꤹ¤ë¤³¤È¤Ë¤è¤ê¡¢
-    ¥¢¥É¥ì¥¹¾å¤ÎÁ´¤Æ¤Î¥Ý¡¼¥È¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£(<code>_default_</code> ¤Î¤È¤­¤Ï
-    ¤³¤ì¤ò»È¤¦¤³¤È¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£)</p>
-
-    <div class="warning"><h3>¥»¥­¥å¥ê¥Æ¥£</h3>
-    <p>¥µ¡¼¥Ð¡¼¤òµ¯Æ°¤·¤¿°Ê³°¤Î¥æ¡¼¥¶¤¬¥í¥°¥Õ¥¡¥¤¥ë¤¬Êݴɤµ¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ë
-    ½ñ¤­¹þ¤ß²Äǽ¤Ê¤È¤­¤Ë¤Ê¤¼¥»¥­¥å¥ê¥Æ¥£¤¬Çˤé¤ì¤ë²ÄǽÀ­¤¬¤¢¤ë¤«¤Î¾ÜºÙ¤Ï
-    <a href="../misc/security_tips.html">¥»¥­¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ë¥³¥Ä</a> ¤ò
-    »²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p></div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../vhosts/">Apache ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥ÈÀâÌÀ½ñ</a></li>
-<li><a href="../dns-caveats.html">DNS ¤È Apache ¤Ë´Ø¤¹¤ëÏÃ</a></li>
-<li><a href="../bind.html">Apache ¤¬»ÈÍѤ¹¤ë¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤ÎÀßÄê</a></li>
-<li>¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¤¿ºÝ¤Ë¤³¤ì¤é¤Î°Û¤Ê¤ë¥»¥¯¥·¥ç¥ó¤¬
-    ÁȤ߹ç¤ï¤µ¤ì¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï <a href="../sections.html">
-    &lt;Directory&gt;, &lt;Location&gt;, &lt;Files&gt; ¥»¥¯¥·¥ç¥ó¤ÎÆ°ºîË¡</a></li>
-</ul>
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="../en/mod/core.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/core.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/core.html.ja.utf8 b/docs/manual/mod/core.html.ja.utf8
new file mode 100644
index 00000000..bf7ac578
--- /dev/null
+++ b/docs/manual/mod/core.html.ja.utf8
@@ -0,0 +1,3428 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>core - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache コア機能</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/core.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/core.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../tr/mod/core.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>常�使用�能� Apache HTTP サー��コア機能</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Core</td></tr></table>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#acceptfilter">AcceptFilter</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#acceptpathinfo">AcceptPathInfo</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#accessfilename">AccessFileName</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#adddefaultcharset">AddDefaultCharset</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#addoutputfilterbytype">AddOutputFilterByType</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#allowencodedslashes">AllowEncodedSlashes</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#allowoverride">AllowOverride</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#authname">AuthName</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#authtype">AuthType</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cgimapextension">CGIMapExtension</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#contentdigest">ContentDigest</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#defaulttype">DefaultType</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#directory">&lt;Directory&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#directorymatch">&lt;DirectoryMatch&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#documentroot">DocumentRoot</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#enablemmap">EnableMMAP</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#enablesendfile">EnableSendfile</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#errordocument">ErrorDocument</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#errorlog">ErrorLog</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#fileetag">FileETag</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#files">&lt;Files&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#filesmatch">&lt;FilesMatch&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#forcetype">ForceType</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#hostnamelookups">HostnameLookups</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ifdefine">&lt;IfDefine&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ifmodule">&lt;IfModule&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#include">Include</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#keepalive">KeepAlive</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#keepalivetimeout">KeepAliveTimeout</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#limit">&lt;Limit&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#limitexcept">&lt;LimitExcept&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#limitinternalrecursion">LimitInternalRecursion</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#limitrequestbody">LimitRequestBody</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#limitrequestfields">LimitRequestFields</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#limitrequestfieldsize">LimitRequestFieldSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#limitrequestline">LimitRequestLine</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#limitxmlrequestbody">LimitXMLRequestBody</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#location">&lt;Location&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#locationmatch">&lt;LocationMatch&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#loglevel">LogLevel</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#require">Require</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#rlimitcpu">RLimitCPU</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#rlimitmem">RLimitMEM</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#rlimitnproc">RLimitNPROC</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#satisfy">Satisfy</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#scriptinterpretersource">ScriptInterpreterSource</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#serveradmin">ServerAdmin</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#serveralias">ServerAlias</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#servername">ServerName</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#serverpath">ServerPath</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#serverroot">ServerRoot</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#serversignature">ServerSignature</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#servertokens">ServerTokens</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#sethandler">SetHandler</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#setinputfilter">SetInputFilter</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#setoutputfilter">SetOutputFilter</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#timeout">TimeOut</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#traceenable">TraceEnable</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#usecanonicalname">UseCanonicalName</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#usecanonicalphysicalport">UseCanonicalPhysicalPort</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#virtualhost">&lt;VirtualHost&gt;</a></li>
+</ul>
+</div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AcceptFilter" id="AcceptFilter">AcceptFilter</a> <a name="acceptfilter" id="acceptfilter">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>プロトコルを Listen ���るソケット�最�化を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AcceptFilter <var>protocol</var> <var>accept_filter</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.1.5 以�</td></tr>
+</table>
+    <p>Listen ���るソケット�対���OS �固有�����るプロトコル�����最�化を
+       有効��るディレクティブ��。大����る�件��データ��信�れる�
+       HTTP リクエスト全体��ッファ�れる��る���カー�ル�サー�プロセス�
+       ソケットを�ら��よ������る��������。�在サ�ート�れ��る���
+       <a href="http://www.freebsd.org/cgi/man.cgi?query=accept_filter&amp;sektion=9">
+       FreeBSD � Accept Filter</a> � Linux �プリミティブ�
+       <code>TCP_DEFER_ACCEPT</code> ����。</p>
+
+    <p>FreeBSD �デフォルト値� :</p>
+    <div class="example"><p><code>
+        AcceptFilter http httpready <br />
+        AcceptFilter https dataready
+    </code></p></div>
+    
+    <p><code>httpready</code> Accept Filter � HTTP リクエスト全体を�
+       カー�ルレベル��ッファリング���。リクエスト全体を�信�終�る��
+       ��後サー�プロセス��れを�り��。詳細����� <a href="http://www.freebsd.org/cgi/man.cgi?query=accf_http&amp;sektion=9">accf_http(9)</a> 
+       を�照������。HTTPS �リクエスト�暗�化�れ��る�� <a href="http://www.freebsd.org/cgi/man.cgi?query=accf_data&amp;sektion=9">accf_data(9)</a>
+       フィルタ���使用�れ��。</p>
+
+    <p>Linux ��デフォルト値� :</p>
+    <div class="example"><p><code>
+        AcceptFilter http data <br />
+        AcceptFilter https data
+    </code></p></div>
+
+    <p>Linux � <code>TCP_DEFER_ACCEPT</code> � HTTP リクエスト��ッファリングを
+       サ�ート�����ん。<code>none</code> 以外�値�
+       <code>TCP_DEFER_ACCEPT</code> �有効��り��。詳細����� Linux 
+       man ページ <a href="http://homepages.cwi.nl/~aeb/linux/man2html/man7/tcp.7.html">tcp(7)</a>
+       を�照������。</p>
+
+    <p>引数� <code>none</code> を指定�る��プロトコル�対�る全�� Accept 
+       Filter �無効��り��。<code>nntp</code> �����先�サー��データを
+       �る必���るプロトコル�有効�� :</p>
+    <div class="example"><p><code>AcceptFilter nntp none</code></p></div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AcceptPathInfo" id="AcceptPathInfo">AcceptPathInfo</a> <a name="acceptpathinfo" id="acceptpathinfo">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>後�続�パス�情報を��付�るリソース�指定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AcceptPathInfo On|Off|Default</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>AcceptPathInfo Default</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0.30 以��使用�能</td></tr>
+</table>
+
+    <p>��ディレクティブ�実際�ファイル� (も���存在�るディレクトリ�
+    存在���ファイル) �後�続�パス�情報��るリクエストを��付�る�
+    拒��る�を制御���。続��パス�情報�スクリプト�� <code>PATH_INFO</code>
+    環境変数���利用�能��り��。</p>
+
+    <p>例���<code>/test/</code> ��<code>here.html</code> ���ファイル
+    一�����るディレクトリを指���る����。���る��
+    <code>/test/here.html/more</code> � <code>/test/nothere.html/more</code>
+    ��リクエスト�両方�も <code>/more</code> を <code>PATH_INFO</code> ����。</p>
+
+    <p><code class="directive">AcceptPathInfo</code> ディレクティブ�指定�能�
+    三��引数�:</p>
+
+    <dl>
+    <dt><code>Off</code></dt><dd>リクエスト�存在�るパス�����
+    マップ�れる場������付�られ��。���ら�上�例�
+    <code>/test/here.html/more</code> �よ���本当�ファイル��
+    後�パス�情報�続�リクエスト�� 404 NOT FOUND エラー�返り��。</dd>
+
+    <dt><code>On</code></dt><dd>��方�パス�存在�るファイル�マップ�る場��
+    リクエスト���付�られ��。上�例� <code>/test/here.html/more</code>
+    � <code>/test/here.html</code> �有効�ファイル�マップ�れ�
+    ��付�られ��。</dd>
+    
+    <dt><code>Default</code></dt><dd>続��パス�情報�扱��リクエスト�
+    <a href="../handler.html">�ンドラ</a>�決�り��。
+    普通�ファイル����コア�ンドラ�デフォルト� <code>PATH_INFO</code> を拒����。
+    <a href="mod_cgi.html">cgi-script</a> や <a href="mod_isapi.html">isapi-handler</a> �よ��スクリプトを扱��ンドラ�
+    一般的�デフォルト� <code>PATH_INFO</code> を��付���。</dd>
+    </dl>
+
+    <p><code>AcceptPathInfo</code> �主�目的��ンドラ� <code>PATH_INFO</code> を
+    ��付�る�拒��る���択を上書���るよ���る����。
+    例����れ�例�� <a href="mod_include.html">INCLUDES</a> �よ��
+    <a href="../filter.html">フィルタ</a>を使�� <code>PATH_INFO</code> �
+    基���コンテンツを生����る���必���り��。</p>
+
+    <div class="example"><p><code>
+      &lt;Files "mypaths.shtml"&gt;<br />
+      <span class="indent">
+        Options +Includes<br />
+        SetOutputFilter INCLUDES<br />
+        AcceptPathInfo On<br />
+      </span>
+      &lt;/Files&gt;
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AccessFileName" id="AccessFileName">AccessFileName</a> <a name="accessfilename" id="accessfilename">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>分散設定ファイル���</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AccessFileName <var>filename</var> [<var>filename</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>AccessFileName .htaccess</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>リクエストを処��る���サー��ディレクトリ�
+    対��分散設定ファイル�<a href="#allowoverride">有効�����れ�</a>�
+    ��ドキュメント��
+    パス上��る全��ディレクトリ�ら����指定�れ����一覧�中�
+    最��見����ファイルを�れ�れ設定ファイル���読�込���。例��:</p>
+
+    <div class="example"><p><code>
+      AccessFileName .acl
+    </code></p></div>
+
+    <p>���設定��る��以下�よ����無効��れ�����り�
+    ドキュメント <code>/usr/local/web/index.html</code>
+    を返����サー�� <code>/.acl</code>, <code>/usr/.acl</code>,
+    <code>/usr/local/.acl</code>, <code>/usr/local/web/.acl</code> �ら
+    ディレクティブを読�込���。</p>
+
+    <div class="example"><p><code>
+      &lt;Directory /&gt;<br />
+      <span class="indent">
+        AllowOverride None<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#allowoverride">AllowOverride</a></code></li>
+<li><a href="../configuring.html">設定ファイル</a></li>
+<li><a href="../howto/htaccess.html">.htaccess ファイル</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddDefaultCharset" id="AddDefaultCharset">AddDefaultCharset</a> <a name="adddefaultcharset" id="adddefaultcharset">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>レス�ンス�コンテントタイプ� <code>text/plain</code> �る��
+<code>text/html</code> �場��追加�るデフォルト� charset パラメータ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddDefaultCharset On|Off|<var>charset</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>AddDefaultCharset Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>レス�ンス�コンテントタイプ� <code>text/plain</code> 
+    �る�� <code>text/html</code> 
+    �場���り����レス�ンス�追加�るメディアタイプ�文字セットパラメータ
+    (文字エンコーディング���) �デフォルト値を���ディレクティブ�指定���。
+    �れ�レス�ンス <span class="transnote">(<em>訳注:</em> レス�ンス� HTML)</span> 内� <code>META</code> 
+    �素�指定�れ����よ��文字セットも無効������
+    最終的�挙動�ユーザ�クライアント��設定�決�り��。
+    ��機能� <code>AddDefaultCharset Off</code> ���設定�無効��り��。
+    <code>AddDefaultCharset On</code> ��れ��
+    Apache 内部�デフォルト文字セット <code>iso-8859-1</code> �設定�れ��。
+    ��他 <var>charset</var> �指定��る値��れ���ん�値�も使���。
+    指定�る値��MIME メディアタイプ���使�れる
+    <a href="http://www.iana.org/assignments/character-sets">IANA 
+    �登録�れ��る文字セット�</a>����一�������。
+    例��:</p>
+
+    <div class="example"><p><code>
+      AddDefaultCharset utf-8
+    </code></p></div>
+
+    <p><code class="directive">AddDefaultCharset</code> を使�����全��テキストリソース�
+    指定�る文字エンコード�����る�分���������
+    リソース�個々�文字セットを指定�る��大変�場�����。
+    例を挙�る��レガシー� CGI スクリプト����動的�生��れる
+    コンテンツを�むリソース�文字セットパラメータを追加�る場���
+    ユーザ�入力データ�出力�入り�クロスサイトスクリプティング�
+    引�起��れ�る場���。デフォルト文字セットをセット�����も�
+    ブラウザ� "文字エンコード�自動�択" 機能�有効�����るユーザを
+    守る�����ら�����も��んより良�解決策���スクリプトを修正
+    (�る��削除) �る����。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addcharset">AddCharset</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddOutputFilterByType" id="AddOutputFilterByType">AddOutputFilterByType</a> <a name="addoutputfilterbytype" id="addoutputfilterbytype">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>MIME-type �出力フィルタを割り当�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddOutputFilterByType <var>filter</var>[;<var>filter</var>...] <var>MIME-type</var>
+[<var>MIME-type</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0.33 以��使用�能。��� 2.1 以���推奨。</td></tr>
+</table>
+    <p>��ディレクティブ�応答� <a class="glossarylink" href="../glossary.html#mime-type" title="用語集を�照">MIME タイプ</a> �応��出力<a href="../filter.html">フィルタ</a>を使用�るよ�����。
+    ���下�説明�れる�由�より�本ディレクティブ��推奨��。
+    �等�機能� <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> �利用����。</p>
+
+    <p>次�例� <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> � <code>DEFLATE</code> フィルタを
+    使�����。<code>text/html</code> � <code>text/plain</code> �
+    ����出力 (�的�も�も動的�も�も) をクライアント��られる��
+    圧縮���。</p>
+
+    <div class="example"><p><code>
+      AddOutputFilterByType DEFLATE text/html text/plain
+    </code></p></div>
+
+    <p>複数�フィルタ�コンテンツを処����������れ�れ���をセミコロン�
+    分�る必���り��。�フィルタ�対��
+    <code class="directive">AddOutputFilterByType</code> を一���書���も����。</p>
+
+    <p>次�例� <code>text/html</code> �スクリプト�����出力を
+    �� <code>INCLUDES</code> フィルタ�処����ら� <code>DEFLATE</code> フィルタ�����。</p>
+
+    <div class="example"><p><code>
+    &lt;Location /cgi-bin/&gt;<br />
+    <span class="indent">
+      Options Includes<br />
+      AddOutputFilterByType INCLUDES;DEFLATE text/html<br />
+    </span>
+    &lt;/Location&gt;
+    </code></p></div>
+
+    <div class="warning"><h3>注:</h3>
+      <p><code class="directive">AddOutputFilterByType</code> ディレクティブ�より
+      有効���フィルタ�場��よ����部分的も���完全��用�れ�����
+      �り��。例���<a class="glossarylink" href="../glossary.html#mime-type" title="用語集を�照">MIME タイプ</a> �決定��������
+      <code class="directive"><a href="#defaulttype">DefaultType</a></code> �設定���������も�
+      <code class="directive"><a href="#defaulttype">DefaultType</a></code> 設定を使�よ���り��。</p>
+      <p>����確実�フィルタ��用�れるよ���������リソース�
+      明示的�コンテントタイプを割り当�る�������。�れ��例��
+      <code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code> ディレクティブや
+      <code class="directive"><a href="#forcetype">ForceType</a></code> ディレクティブを使���。
+      (nph���) CGI スクリプト�コンテントタイプを設定�る���も��も
+      大丈夫��。</p>
+    </div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code></li>
+<li><code class="directive"><a href="#setoutputfilter">SetOutputFilter</a></code></li>
+<li><a href="../filter.html">フィルタ</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AllowEncodedSlashes" id="AllowEncodedSlashes">AllowEncodedSlashes</a> <a name="allowencodedslashes" id="allowencodedslashes">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>URL 中�符�化�れ�パス分離文字�先���られる�を許��る����を
+決定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AllowEncodedSlashes On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>AllowEncodedSlashes Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0.46 以��使用�能</td></tr>
+</table>
+    <p><code class="directive">AllowEncodedSlashes</code> ディレクティブ�符�化�れ�
+    パス分離文字 (<code>/</code> � <code>%2F</code>��ら�システム�よ���
+    <code>\</code> �対応�る <code>%5C</code>) �存在�る URL �使用を
+    許��る����を決定���。通常���よ�� URL � 404 (Not found) エラー
+    �拒��れ��。</p>
+
+    <p><code class="directive">AllowEncodedSlashes</code> <code>On</code> �よる
+    パス分離文字�使用��<code>PATH_INFO</code> �����
+    使����一番役�立���。</p>
+
+    <div class="note"><h3>注</h3>
+      <p>符�化�れ�スラッシュを許��る����<em>復�</em>を�る��を
+       �味<em>���ん</em>。<code>%2F</code> や (関係�るシステム��)
+       <code>%5C</code> ��他�部分�復��れ� URL �中�も�����形��
+       残�れ��。</p>
+    </div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#acceptpathinfo">AcceptPathInfo</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AllowOverride" id="AllowOverride">AllowOverride</a> <a name="allowoverride" id="allowoverride">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td><code>.htaccess</code> �許��れるディレクティブ�種類</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AllowOverride All|None|<var>directive-type</var> 
+[<var>directive-type</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>AllowOverride All</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>サー�� (<code class="directive"><a href="#accessfilename">AccessFileName</a></code> �よ��指定�れ�)
+    <code>.htaccess</code> ファイルを見���時���ファイル�中�
+    宣言�れ���ディレクティブ�より��定義�れ�設定ディレクティブを
+    上書���る�を知る必���り��。</p>
+
+    <div class="note"><h3>&lt;Directory&gt; セクション���使用�能</h3>
+    <code class="directive">AllowOverride</code> �正�表�無��<code class="directive"><a href="#directory">&lt;Directory&gt;</a></code>
+    セクション���有効��<code class="directive"><a href="#location">&lt;Location&gt;</a></code> や <code class="directive"><a href="#directorymatch">&lt;DirectoryMatch&gt;</a></code>
+    や <code class="directive"><a href="#files">&lt;Files&gt;</a></code> セクション��無効��。
+    </div>
+
+    <p>��ディレクティブを <code>None</code> �設定�る��<a href="#accessfilename">.htaccess</a> ファイル�完全�
+    無視�れ��。
+    ��場��サー��ファイルシステム� <code>.htaccess</code> ファイルを読む��を
+    試������ん。</p>
+
+    <p>��ディレクティブ� <code>All</code> �設定�れ��る時���
+    <code>.htaccess</code> ��� <a href="directive-dict.html#Context">コンテキスト</a> を��
+    全��ディレクティブ�利用����。</p>
+
+    <p><var>directive-type</var> ���以下�ディレクティブ群�
+    キーワード��れ�を指定���。</p>
+
+    <dl>
+      <dt>AuthConfig</dt>
+
+      <dd>
+
+      �証�関�るディレクティブ�使用を許��る (<code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></code>,
+      <code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code>,
+      <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code>,
+      <code class="directive"><a href="#authname">AuthName</a></code>, 
+      <code class="directive"><a href="#authtype">AuthType</a></code>, <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>, <code class="directive"><a href="#require">Require</a></code> <em>��</em>)。</dd>
+
+      <dt>FileInfo</dt>
+
+      <dd>
+      ドキュメントタイプを制御�るディレクティブ (<code class="directive"><a href="#defaulttype">DefaultType</a></code>, <code class="directive"><a href="#errordocument">ErrorDocument</a></code>, <code class="directive"><a href="#forcetype">ForceType</a></code>, <code class="directive"><a href="../mod/mod_negotiation.html#languagepriority">LanguagePriority</a></code>,
+      <code class="directive"><a href="#sethandler">SetHandler</a></code>, <code class="directive"><a href="#setinputfilter">SetInputFilter</a></code>, <code class="directive"><a href="#setoutputfilter">SetOutputFilter</a></code>, 
+      <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> � Add* � Remove*
+      ディレクティブ<em>��</em>)�
+      ドキュメント�メタデータを制御�るディレクティブ (<code class="directive"><a href="../mod/mod_headers.html#header">Header</a></code>, <code class="directive"><a href="../mod/mod_headers.html#requestheader">RequestHeader</a></code>, <code class="directive"><a href="../mod/mod_setenvif.html#setenvif">SetEnvIf</a></code>, <code class="directive"><a href="../mod/mod_setenvif.html#setenvifnocase">SetEnvIfNoCase</a></code>, <code class="directive"><a href="../mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code>, <code class="directive"><a href="../mod/mod_usertrack.html#cookieexpires">CookieExpires</a></code>, <code class="directive"><a href="../mod/mod_usertrack.html#cookiedomain">CookieDomain</a></code>, <code class="directive"><a href="../mod/mod_usertrack.html#cookiestyle">CookieStyle</a></code>, <code class="directive"><a href="../mod/mod_usertrack.html#cookietracking">CookieTracking</a></code>, <code class="directive"><a href="../mod/mod_usertrack.html#cookiename">CookieName</a></code>),
+      <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> �ディレクティブ <code class="directive"><a href="../mod/mod_rewrite.html#rewriteengine">RewriteEngine</a></code>, <code class="directive"><a href="../mod/mod_rewrite.html#rewriteoptions">RewriteOptions</a></code>, <code class="directive"><a href="../mod/mod_rewrite.html#rewritebase">RewriteBase</a></code>, <code class="directive"><a href="../mod/mod_rewrite.html#rewritecond">RewriteCond</a></code>, <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>) �
+      <code class="module"><a href="../mod/mod_actions.html">mod_actions</a></code> �
+      <code class="directive"><a href="../mod/mod_actions.html#action">Action</a></code>
+      ディレクティブ�使用を許��る。</dd>
+
+      <dt>Indexes</dt>
+
+      <dd>
+      ディレクトリインデックスを制御�る���ディレクティブ�使用を許��る
+      (<code class="directive"><a href="../mod/mod_autoindex.html#adddescription">AddDescription</a></code>,
+      <code class="directive"><a href="../mod/mod_autoindex.html#addicon">AddIcon</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#addiconbyencoding">AddIconByEncoding</a></code>,
+      <code class="directive"><a href="../mod/mod_autoindex.html#addiconbytype">AddIconByType</a></code>,
+      <code class="directive"><a href="../mod/mod_autoindex.html#defaulticon">DefaultIcon</a></code>, <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#fancyindexing">FancyIndexing</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#headername">HeaderName</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#indexignore">IndexIgnore</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#indexoptions">IndexOptions</a></code>, <code class="directive"><a href="../mod/mod_autoindex.html#readmename">ReadmeName</a></code>
+      <em>��</em>)。</dd>
+
+      <dt>Limit</dt>
+
+      <dd>
+      ホスト��アクセス制御を行����ディレクティブ�使用を許��る (<code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code>, <code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code>, <code class="directive"><a href="../mod/mod_authz_host.html#order">Order</a></code>).</dd>
+
+      <dt>Options[=<var>Option</var>,...]</dt>
+
+      <dd>
+      特定�ディレクトリ���る機能を指定�る���ディレクティブ�使用を許��る
+      (<code class="directive"><a href="#options">Options</a></code> �
+      <code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code>)。
+      <code class="directive"><a href="#options">Options</a></code> �設定�るオプション
+      を�(空白を����) コンマ区切り�リスト���等��後�続�る���
+      設定����。</dd>
+    </dl>
+
+    <p>例:</p>
+
+    <div class="example"><p><code>
+      AllowOverride AuthConfig Indexes
+    </code></p></div>
+
+    <p>上�例�� <code>AuthConfig</code> � <code>Indexes</code> ���ら�も
+    属���ディレクティブ����内部サー�エラーを引�起����。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#accessfilename">AccessFileName</a></code></li>
+<li><a href="../configuring.html">設定ファイル</a></li>
+<li><a href="../howto/htaccess.html">.htaccess ファイル</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthName" id="AuthName">AuthName</a> <a name="authname" id="authname">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>HTTP �証���領域 (訳注: realm)</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AuthName <var>auth-domain</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>��ディレクティブ�ディレクトリ�対�る��領域 (訳注: realm)
+    ���を指定���。
+    ��領域��利用者���ユーザ��パスワードを�信�れ�よ���を
+    クライアント�教�る���利用���。
+    <code class="directive">AuthName</code> �一��引数を�り�
+    スペース���れる場����
+    引用符�括ら��れ��り��ん。
+    ��ディレクティブ�
+    <code class="directive"><a href="#authtype">AuthType</a></code> ディレクティブや
+    <code class="directive"><a href="#require">Require</a></code> ディレクティブ��
+    <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code> ã‚„
+    <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code> ���ディレクティブ�
+    一緒�利用�る必���り��。</p>
+
+   <p>例��:</p>
+
+   <div class="example"><p><code>
+     AuthName "Top Secret"
+   </code></p></div>
+
+    <p>��� <code>AuthName</code> �指定��文字列��
+    大部分�ブラウザ�パスワードダイアログ�表示�れ��。</p>
+
+<h3>�照</h3>
+<ul>
+<li><a href="../howto/auth.html">�証�承��アクセス制御</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthType" id="AuthType">AuthType</a> <a name="authtype" id="authtype">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ユーザ�証�種類</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AuthType Basic|Digest</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>��ディレクティブ�対象ディレクトリ�利用�るユーザー�証�種類を����。
+    使用��る�証方�� <code>Basic</code> (<code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> 
+    �実装) � <code>Digest</code> (<code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>
+    �実装) ��。</p>
+
+    <p>�証を有効��る���<code class="directive"><a href="#authname">AuthName</a></code>
+    � <code class="directive"><a href="#require">Require</a></code> ディレクティブも
+    使�必���り��。�れ�加���証プロ�イダモジュール�
+    <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code> 等��承�モジュール
+    <code class="module"><a href="../mod/mod_authz_user.html">mod_authz_user</a></code> 等もサー��組�込む必���り��。</p>
+
+<h3>�照</h3>
+<ul>
+<li><a href="../howto/auth.html">�証�承��アクセス制御</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CGIMapExtension" id="CGIMapExtension">CGIMapExtension</a> <a name="cgimapextension" id="cgimapextension">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>CGI スクリプト�インタープリタ��置を調�る���手法</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CGIMapExtension <var>cgi-path</var> <var>.extension</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>NetWare ��</td></tr>
+</table>
+    <p>��ディレクティブ� Apache � CGI スクリプトを実行�る���
+    インタープリタを探�方法を制御���。
+    例���<code>CGIMapExtension sys:\foo.nlm .foo</code> �設定�る�
+    <code>.foo</code> ���拡張������ CGI スクリプト� FOO インタープリタ�
+    渡�れ��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ContentDigest" id="ContentDigest">ContentDigest</a> <a name="contentdigest" id="contentdigest">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td><code>Content-MD5</code> HTTP 応答ヘッダ�生�を有効��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ContentDigest On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ContentDigest Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Options</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>��ディレクティブ��RFC1864 �� RFC2616 ����定義�れ��る
+    <code>Content-MD5</code> ヘッダー�生�を有効����。</p>
+
+    <p>MD5 ��任�長�データ�「メッセージダイジェスト�(「指紋�
+    �表��れる��も�る) を計算�るアルゴリズム��
+    データ�変更����場����常�高�信頼度�メッセージダイジェスト�変更�
+    �映�れ��。</p>
+
+    <p><code>Content-MD5</code> ヘッダ��エンドツーエンド�
+    エンティティボディー���れるメッセージ�完全性�ェック
+    (Message Integrity Check - MIC)を�供���。
+    ��ヘッダを調�る����プロキシやクライアント��
+    途中経路���るエンティティボディ�予期��変更��を
+    検出�る�������。ヘッダ�例:</p>
+
+    <div class="example"><p><code>
+      Content-MD5: AuLb7Dp1rqtRtxz2m9kRpA==
+    </code></p></div>
+
+    <p>リクエスト毎�メッセージダイジェストを計算�る (値�キャッシュ�れ��ん)
+    ���ら�
+    サー�パフォーマンス�低下�る������注�������。</p>
+
+    <p><code>Content-MD5</code>��<code class="module"><a href="../mod/core.html">core</a></code> 機能�より処��れ�
+    ドキュメントを�る����有効��り�
+    SSI ドキュメントや CGI スクリプト�出力��イトレンジを指定��
+    応答�場�����ヘッダ�付与�れ��ん。
+    </p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DefaultType" id="DefaultType">DefaultType</a> <a name="defaulttype" id="defaulttype">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>サー��コンテントタイプを決定�������
+�られる MIME コンテントタイプ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DefaultType <var>MIME-type|none</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DefaultType text/plain</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>サー���<a class="glossarylink" href="../glossary.html#mime-type" title="用語集を�照">MIME タイプ</a>
+    �マッピング��決定����
+    ドキュメント��信を�求�れる����り��。</p>
+
+    <p>サー���ドキュメント�コンテントタイプをクライアント�通知�る��(SHOULD)��。
+    も�通常�方法��コンテントタイプ�分�ら��場���
+    <code>DefaultType</code> �指定�れ�タイプを利用���。
+    例:</p>
+
+    <div class="example"><p><code>
+      DefaultType image/gif
+    </code></p></div>
+
+    <p>�れ� <code>.gif</code> ���拡張��ファイル����れ����
+    多�� GIF 画����れ��るディレクトリ�����る��ょ�。</p>
+    
+    <p>サー���も管�者�(���� proxy)�もコンテントタイプ�分�ら��場���
+    MIME タイプ�情報�誤������る�も�れ���ら���れ�む��無����よ��
+    ���場�も�る��ょ�。��よ��場���次�よ�����。</p>
+    <div class="example"><p><code>
+      DefaultType None
+    </code></p></div>
+    <p>DefaultType None � httpd-2.2.7 以��使���。</p>
+
+    <p><code class="directive"><a href="#forcetype">ForceType</a></code> ディレクティブ�
+    ������ディレクティブ�デフォルト� MIME タイプを�供�る���
+    �る���注�������。ファイル��拡張�を���
+    メディアタイプを決定��る他� MIME タイプ�定義��れ�
+    ��デフォルト�上書��れ��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Directory" id="Directory">&lt;Directory&gt;</a> <a name="directory" id="directory">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>指定�ファイルシステム�ディレクトリ�サブディレクトリ����
+�用�れるディレクティブを囲む</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>&lt;Directory <var>directory-path</var>&gt;
+... &lt;/Directory&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>指定�れ�ディレクトリ���サブディレクトリ���
+    ディレクティブを�用��る�����
+    <code class="directive">&lt;Directory&gt;</code> � 
+    <code>&lt;/Directory&gt;</code> を対����ディレクティブ群を囲���。
+    ��中���ディレクトリコンテキスト�許��れ�全��ディレクティブを
+    利用����。
+    <var>directive-path</var> ��フルパスも��� Unix �シェル形��
+    ワイルドカードを指定���。
+    <code>?</code> �任�� 1 文字�<code>*</code> �任��文字列�マッ����。
+    シェル���る指定�様�文字�範囲を <code>[]</code> �指定����。
+    ワイルドカード� `/' 文字��マッ����ん���
+    <code>/home/user/public_html</code> ��
+    <code>&lt;Directory /*/public_html&gt;</code> �マッ����ん��
+    <code>&lt;Directory /home/*/public_html&gt;</code> �マッ����。
+    例:</p>
+
+    <div class="example"><p><code>
+      &lt;Directory /usr/local/httpd/htdocs&gt;<br />
+      <span class="indent">
+        Options Indexes FollowSymLinks<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+<div class="note">
+<p><var>directory-path</var> 引数��注�������: ��引数�
+Apache �ファイルをアクセス�る���使�ファイルシステム�パス�
+����マッ��る必���り��。�る <code>&lt;Directory&gt;</code> �
+�用�れるディレクティブ��別�シンボリックリンクを����り��
+��ディレクトリを��パス�アクセス��場����用�れ��ん。</p>
+</div>
+
+    <p><code>~</code> ���文字を
+    付加�る���<a class="glossarylink" href="../glossary.html#regex" title="用語集を�照">正�表�</a>を利用�る��も����。
+    例��:</p>
+
+<div class="example"><p><code>
+   &lt;Directory ~ "^/www/.*/[0-9]{3}"&gt;
+</code></p></div>
+
+    <p>����指定�場��<code>/www/</code> 以下��る数字
+    3 文字�ディレクトリ�マッ����。</p>
+
+    <p>も�複数� (正�表�以外�) <code class="directive">&lt;Directory&gt;</code>セクション�
+    ドキュメントを�むディレクトリ (や��上�ディレクトリ��れ�) �マッ����ら��
+    <a href="#accessfilename">.htaccess</a> ファイル�ディレクティブも読�込����
+    短�パス�ら順��用�れ��。
+    例���</p>
+
+    <div class="example"><p><code>
+      &lt;Directory /&gt;<br />
+      <span class="indent">
+        AllowOverride None<br />
+      </span>
+      &lt;/Directory&gt;<br />
+      <br />
+      &lt;Directory /home/&gt;<br />
+      <span class="indent">
+        AllowOverride FileInfo<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p>�設定��ドキュメント <code>/home/web/dir/doc.html</code> ��
+    アクセス����場���以下�よ��動作���:</p>
+
+    <ul>
+      <li><code>AllowOverride None</code> ��用�れる。
+      (<code>.htaccess</code> ファイル�無効��る)</li>
+
+      <li><code>AllowOverride FileInfo</code> ��用�れる
+      (<code>/home</code> ディレクトリ�対��)。</li>
+
+      <li><code>/home/.htaccess</code>, <code>/home/web/.htaccess</code>,
+      <code>/home/web/dir/.htaccess</code> �順��れら�ファイル中�
+       FileInfo ディレクティブ��用�れる。</li>
+    </ul>
+
+    <p>正�表���通常�セクション�����用�れる��
+    考慮�れ��ん。
+    ��後�全��正�表��設定ファイル��れ�順�試�れ��。
+    例���以下�よ��場��</p>
+
+    <div class="example"><p><code>
+      &lt;Directory ~ abc$&gt;<br />
+      <span class="indent">
+        # ... directives here ...<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p>正�表��セクション�����通常� <code class="directive">&lt;Directory&gt;</code> �
+    <code>.htaccess</code> ��用�終�る��考慮�れ��ん。
+    ��後��正�表�� <code>/home/abc/public_html/abc</code> �マッ���
+    対応�る <code class="directive">&lt;Directory&gt;</code> ��用�れ��。</p>
+
+    <p><strong>Apache �デフォルト�� <code>&lt;Directory /&gt;</code> ��アクセス�
+    <code>Allow from All</code> �����る���注�������。
+    �れ��URL �らマップ�れ���ファイル�も Apache ��る�������。
+    �れ�以下�よ����変更�る���推奨�れ����。</strong></p>
+
+    <div class="example"><p><code>
+      &lt;Directory /&gt;<br />
+      <span class="indent">
+        Order Deny,Allow<br />
+        Deny from All<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p><strong>���アクセスを<em>�能����</em>ディレクトリ�対��
+    個別�設定�れ�よ���ょ�。
+    ����り������<a href="../misc/security_tips.html">セキュリティ�関�るコツ</a>を
+    �照������。</strong></p>
+
+    <p>ディレクトリセクション� <code>httpd.conf</code> ファイル書���。
+    <code class="directive">&lt;Directory&gt;</code>
+    ディレクティブ�入れ���る�������
+    <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> や <code class="directive"><a href="#limitexcept">&lt;LimitExcept&gt;</a></code> セクション�中�も
+    記述����ん。</p>
+
+
+<h3>�照</h3>
+<ul>
+<li>リクエストを���際��れら�異�るセクション�
+    組����れる方法����� <a href="../sections.html">
+    &lt;Directory&gt;, &lt;Location&gt;, &lt;Files&gt; セクション�動作法</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DirectoryMatch" id="DirectoryMatch">&lt;DirectoryMatch&gt;</a> <a name="directorymatch" id="directorymatch">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>正�表��マッ��るファイルシステム�ディレクトリ�
+サブディレクトリ�����用�れるディレクティブを囲む</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>&lt;DirectoryMatch <var>regex</var>&gt;
+... &lt;/DirectoryMatch&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive"><a href="#directory">&lt;Directory&gt;</a></code>
+    ディレクティブ��様��<code class="directive">&lt;DirectoryMatch&gt;</code>
+    � <code>&lt;/DirectoryMatch&gt;</code> �指定�れ�ディレクトリ�
+    ��サブディレクトリ����用�れるディレクティブ群を囲���。
+    ������ディレクティブ�引数���<a class="glossarylink" href="../glossary.html#regex" title="用語集を�照">正�表�</a>を�り��。例��:</p>
+
+    <div class="example"><p><code>
+      &lt;DirectoryMatch "^/www/(.+/)?[0-9]{3}"&gt;
+    </code></p></div>
+
+    <p>� <code>/www/</code> 以下��る数字 3 文字�ディレクトリ�マッ����。</p>
+
+
+<h3>�照</h3>
+<ul>
+<li>通常� <code class="directive">&lt;Directory&gt;</code> �正�表��指定�
+�用�れる順番����� <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code></li>
+<li>リクエストを���際��れら�異�るセクション�
+    組����れる方法����� <a href="../sections.html">
+    &lt;Directory&gt;, &lt;Location&gt;, &lt;Files&gt; セクション�動作法</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DocumentRoot" id="DocumentRoot">DocumentRoot</a> <a name="documentroot" id="documentroot">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ウェブ�ら見�るメイン�ドキュメントツリー��る
+ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DocumentRoot <var>directory-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DocumentRoot /usr/local/apache/htdocs</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>��ディレクティブ��<code class="program"><a href="../programs/httpd.html">httpd</a></code>
+    �ファイルを�供�るディレクトリを設定���。
+     <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code> �よ��ディレクティブ�マッ����場����
+    ドキュメント� (訳注:ファイルシステム上�) パスを生��る����
+    リクエスト�れ� URL �パス部分をドキュメントルート�付与���。
+    例:</p>
+
+    <div class="example"><p><code>
+      DocumentRoot /usr/web
+    </code></p></div>
+
+    <p>��場��
+    <code>http://www.my.host.com/index.html</code> ��アクセス��れ�
+    <code>/usr/web/index.html</code> �返�れ��。
+    <var>directory-path</var> �絶対パス���場���
+    <code class="directive"><a href="#serverroot">ServerRoot</a></code> 
+    �ら�相対パス����れ��。</p>
+
+    <p><code class="directive">DocumentRoot</code> �最後�スラッシュ無��
+    指定�る必���り��。</p>
+
+<h3>�照</h3>
+<ul>
+<li><a href="../urlmapping.html">URL をファイルシステム��置�
+マップ�る</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="EnableMMAP" id="EnableMMAP">EnableMMAP</a> <a name="enablemmap" id="enablemmap">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>��中�ファイルを読�込む���メモリマッピングを
+使�����</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>EnableMMAP On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>EnableMMAP On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>��ディレクティブ���中�ファイル�内容を読�込む必���る���
+    <code class="program"><a href="../programs/httpd.html">httpd</a></code> �メモリマッピングを使�����を制御���。
+    デフォルト���
+    例���<code class="module"><a href="../mod/mod_include.html">mod_include</a></code> を使�� SSI ファイルを��
+    �る���よ���ファイル�途中�データをアクセス�る必���る����
+    Apache � OS �サ�ート���れ�ファイルをメモリ�マップ���。</p>
+
+    <p>
+    ��メモリマップ�性能��上を��ら�����り��。
+    ����環境�よ����用上��題を防����メモリマッピングを
+    使用���よ����方�良�場�も�り��:</p>
+
+    <ul>
+    <li>マル�プロセッサシステム�中��メモリマッピングを�る�
+    <code class="program"><a href="../programs/httpd.html">httpd</a></code> �性能���るも���り��。</li>
+    <li>NFS マウント�れ� <code class="directive"><a href="#documentroot">DocumentRoot</a></code>
+    ���<code class="program"><a href="../programs/httpd.html">httpd</a></code> �メモリマップ���る間�ファイル�削除�れ�り
+    短����り�����起�るセグメンテーションフォールト����
+    <code class="program"><a href="../programs/httpd.html">httpd</a></code> �クラッシュ�る�能性��り��。</li>
+    </ul>
+
+    <p>�れら��題�当���るサー��設定�場���以下�よ����
+    ファイル���時�メモリマッピングを使用���������:</p>
+
+    <div class="example"><p><code>
+      EnableMMAP Off
+    </code></p></div>
+
+    <p>NFS マウント�れ�ファイル����題��るファイル���明示的�
+    ��機能を使用������:</p>
+
+    <div class="example"><p><code>
+      &lt;Directory "/path-to-nfs-files"&gt;
+      <span class="indent">
+        EnableMMAP Off
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="EnableSendfile" id="EnableSendfile">EnableSendfile</a> <a name="enablesendfile" id="enablesendfile">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル�クライアント����時�カー�ル� sendfile サ�ートを
+使�����</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>EnableSendfile On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>EnableSendfile On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>�ージョン 2.0.44 以��使用�能</td></tr>
+</table>
+    <p>��ディレクティブ�クライアント�ファイル�内容を�る���
+    <code class="program"><a href="../programs/httpd.html">httpd</a></code> �カー�ル�
+    sendfile サ�ートを使�����を制御���。デフォルト���
+    例���的�ファイル����よ���リクエスト�処��ファイル�
+    途中�データ�アクセスを必����������Apache � OS �
+    サ�ート���れ�ファイルを読�込む���� sendfile を使��
+    ファイル�内容を�り��。</p>
+
+    <p>sendfile � read � send を別々�行�������ッファ�割り当�を
+    回����。����プラットフォームやファイルシステム�中��
+    �用上��題を��る�����機能を使用�����方�良�場���り��:</p>
+
+    <ul>
+    <li>プラットフォーム�中��ビルドシステム�検知�������壊れ�
+    sendfile �サ�ート�存在�るも���り��。�れ�特�
+    �イナリ�別�マシン�ビルド�れ�壊れ� sendfile ��るマシン�
+    移動�����起�り��。</li>
+    <li>Linux ���sendfile を用�る��
+    IPv6 使用時�存在�る特定�ットワークカード� TCP-checksum
+    オフロード��グを�ん������。</li>
+    <li>Itanium �動���る Linux ��sendfile � 2GB 以上�
+    ファイルを扱����������ょ�。</li>
+    <li>�ットワークマウント�れ� <code class="directive"><a href="#documentroot">DocumentRoot</a></code>
+    (例�� NFS や SMB)
+    ���カー�ル�自身�キャッシュを使���ットワーク�ら�ファイルを
+    �る�����������り��。</li>
+    </ul>
+
+    <p>�れら��題�当���るサー��設定�場���以下�よ����
+    ��機能を使用���������:</p>
+
+
+    <div class="example"><p><code>
+      EnableSendfile Off
+    </code></p></div>
+
+    <p>NFS や SMB マウント�れ�ファイル����題��るファイル���明示的�
+    ��機能を使用������:</p>
+
+    <div class="example"><p><code>
+      &lt;Directory "/path-to-nfs-files"&gt;
+      <span class="indent">
+        EnableSendfile Off
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ErrorDocument" id="ErrorDocument">ErrorDocument</a> <a name="errordocument" id="errordocument">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>エラー�発生�����サー��クライアント��るも�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ErrorDocument <var>error-code document</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0 ��テキストをクウォート�る構文�以���ージョン�ら
+変������。</td></tr>
+</table>
+    <p>�題やエラー�発生�����動作����
+    Apache ��以下�四����一��動作を設定�る�������。</p>
+
+    <ol>
+      <li>Apache 標準�簡��エラーメッセージを表示</li>
+
+      <li>自分�指定��メッセージを表示</li>
+
+      <li>�題やエラー�処�を�る為��自サー�内�
+      <var>URL-path</var> �リダイレクト</li>
+
+      <li>�題やエラー�処�を�る為��外部� <var>URL</var> �リダイレクト</li>
+    </ol>
+
+    <p>最��も��デフォルト�動作��2 番目�ら 4 番目��
+    <code class="directive">ErrorDocument</code>ディレクティブ�より�
+    HTTP �レス�ンスコード��メッセージ� URL を指定�る���設定���。
+    Apache ��題も���エラー�関�る追加情報を�供�る����り��。</p>
+
+    <p>URL �場���スラッシュ�始�る (/) ローカル� web-path (
+    <code class="directive"><a href="#documentroot">DocumentRoot</a></code> �ら�相対パス
+    ) ��クライアント�解決��る完全� URL を指定���。
+    も����ブラウザ�表示�れるメッセージを指定����。
+    例:</p>
+
+    <div class="example"><p><code>
+      ErrorDocument 500 http://foo.example.com/cgi-bin/tester<br />
+      ErrorDocument 404 /cgi-bin/bad_urls.pl<br />
+      ErrorDocument 401 /subscription_info.html<br />
+      ErrorDocument 403 "Sorry can't allow you access today"
+    </code></p></div>
+
+    <p>加���特別�値 <code>default</code> を使�� Apache �
+    �ードコード�れ��る簡��メッセージを指定�る�������。
+    通常�必����り��ん��<code>default</code> を使��
+    既存� <code class="directive">ErrorDocument</code> ディレクティブ�設定を
+    継承�る�����Apache ��ードコード�れ�簡��メッセージ�
+    戻��������。</p>
+
+    <div class="example"><p><code>
+      ErrorDocument 404 /cgi-bin/bad_urls.pl<br /><br />
+      &lt;Directory /web/docs&gt;<br />
+      <span class="indent">
+        ErrorDocument 404 default<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p>リモート URL (例���頭� <code>http</code> �付与��方法) を
+    <code class="directive">ErrorDocument</code> �指定�る���
+    ���文書���サー������も�ドキュメント�����る�を通知�る����
+    Apache �リダイレクトをクライアント��出�る�������注�������。
+    �れ�������関連��起�る�題��り��。
+    中�も最も������クライアント�元々�エラーステータスコードを���ら��
+    代�り�リダイレクト�ステータスコードを���る�������。
+    �れ�より�ステータスコードを使�� URL �有効��る����を決定�よ���る
+    ウェブロボットや��他クライアントを�混乱��る�も�れ��ん。
+    �ら��<code>ErrorDocument 401</code> �リモート� URL を指定�る��
+    クライアント� 401 ���ステータスコードを���ら�����
+    パスワードをユーザー�入力�求���れ��ら�������り��ん。
+    従���<strong><code>ErrorDocument 401</code> ���ディレクティブを使�場���
+    必�ローカル�文書を�照���れ��り��ん。</strong></p>
+
+    <p>Microsoft Internet Explorer (MSIE) �デフォルト��サー��生���エラーメッセージ�
+    「����る�����無視を��自分自身�「や����エラーメッセージ�
+    置����。サイズ����値�エラー�種類�よ��異�り����
+    一般的��エラー�文書を 512 �イトよりも大���る��MSIE �
+    サー��生���エラーを隠���表示���。詳��情報� Microsoft
+    Knowledge Base �記事 <a href="http://support.microsoft.com/default.aspx?scid=kb;en-us;Q294807">Q294807</a>
+    ��り��。</p>
+
+    <p>��ん��エラーメッセージを上書��る���������特定�状�下��
+    <code class="directive"><a href="#errordocument">ErrorDocument</a></code> �設定����ら�
+    内蔵�メッセージ�使�れ��。
+    特���正�形��リクエスト�検出�れ�場��通常�リクエスト処��
+    �座�中止�れ�内蔵�エラーメッセージ�返�れ��。
+    ��処置��正�リクエスト�よ��引�起��れる�セキュリティ�題�ら
+    守る���必��措置��。</p>
+
+    <p>2.0 より���ージョン���対�������二�引用符を
+    先頭�付�る���よりメッセージ��る��を指定������。</p>
+
+
+<h3>�照</h3>
+<ul>
+<li><a href="../custom-error.html">カスタマイズ�能�
+エラー応答�ドキュメンテーション</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ErrorLog" id="ErrorLog">ErrorLog</a> <a name="errorlog" id="errorlog">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>サー��エラーをログ�集�る場所</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ErrorLog logs/error_log (Unix) ErrorLog logs/error.log (Windows and OS/2)</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">ErrorLog</code> ディレクティブ��
+    サー��生�������エラーを
+    記録�る為�ファイル���を設定���。
+    <var>file-path</var> �絶対パス�������<code class="directive"><a href="#serverroot">ServerRoot</a></code> �ら�相対パス����れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+    ErrorLog /var/log/httpd/error_log
+    </code></p></div>
+    
+    <p><var>file-path</var> �パイプ (|) �ら始�る場���
+    エラーログを処��る���実行�れるコマンド�
+    指定�れ��る�解釈�れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+    ErrorLog "|/usr/local/bin/httpd_errors"
+    </code></p></div>
+
+    <p>ファイル��変�り� <code>syslog</code> �指定�る���よ���
+    システム�サ�ート���れ� syslogd(8) を利用��ロギング�有効��り��。
+    デフォルト���<code>local7</code> ファシリティ��り����
+    <code>syslog:<var>facility</var></code> ����形�記述�る���より�
+    通常 syslog(1) �ドキュメント�説明�れ��るファシリティ�一�を使�よ��
+    �る�������。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+    ErrorLog syslog:user
+    </code></p></div>
+
+    <p>セキュリティ: 
+    ログファイルを格��るディレクトリ��サー�を起動��ユーザ以外�
+    ユーザ�よ��書�込�る場��セキュリティ�破られる�能性��る���
+    関�る詳細� <a href="../misc/security_tips.html#serverroot">セキュリティ�関�るコツ</a> を
+    �照������。</p>
+    <div class="warning"><h3>注</h3>
+      <p>Unix 以外�プラットフォーム�ファイル�パスを入力�る����
+      プラットフォーム��ックスラッシュ�使用を許�������も�
+      確実�スラッシュ���使用�れるよ��注�������。一般的���
+      設定ファイル全般�スラッシュ��を使�方�良���ょ�。</p>
+    </div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#loglevel">LogLevel</a></code></li>
+<li><a href="../logs.html">Apache ログファイル</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="FileETag" id="FileETag">FileETag</a> <a name="fileetag" id="fileetag">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ETag HTTP 応答ヘッダを作��る���使用�れる
+ファイル�属性</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>FileETag <var>component</var> ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>FileETag INode MTime Size</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>
+    <code class="directive">FileETag</code> ディレクティブ�
+    ドキュメント�ファイル�基���も���る����
+    <code>ETag</code> (エンティティタグ) 応答ヘッダフィールドを作��る���使用�る
+    ファイル�属性を設定���。 (<code>ETag</code> �値��ットワーク�帯域を節約�る���
+    キャッシュ�管��使�れ��。) Apache 1.3.22 以����<code>ETag</code> �値�
+    <em>常�</em>ファイル� inode, サイズ�最終修正時刻 (mtime) �ら作�
+    �れ�����。<code class="directive">FileETag</code> ディレクティブ�より��れら��れを使��を
+    ���������。�識�れるキーワード�:
+    </p>
+
+    <dl>
+     <dt><strong>INode</strong></dt>
+     <dd>ファイル� inode 番�を計算�使���</dd>
+     <dt><strong>MTime</strong></dt>
+     <dd>ファイル�最終修正時刻を使���</dd>
+     <dt><strong>Size</strong></dt>
+     <dd>ファイル�中身��イト数を使���</dd>
+     <dt><strong>All</strong></dt>
+     <dd>使用�能�����フィールドを使���。
+     �れ� <div class="example"><p><code>FileETag INode MTime Size</code></p></div> �等価��。</dd>
+     <dt><strong>None</strong></dt>
+     <dd>ドキュメント�ファイル�基���も��も�<code>ETag</code> フィールドを
+    応答�付加���ん</dd>
+    </dl>
+
+    <p><code>INode</code>, <code>MTime</code>, <code>Size</code> キーワード��
+    <code>+</code> や <code>-</code> を��付��
+    指定�る��も����。��場���より広�範囲�ら継承�れ�
+    デフォルト�設定�変更を加�るよ���り��。��よ��接頭辞�
+    無�キーワードを指定�る���座�継承��設定を無効����。</p>
+
+    <p>�るディレクトリ�設定�
+    <code>FileETag&nbsp;INode&nbsp;MTime&nbsp;Size</code> ��り�
+    サブディレクトリ�設定� <code>FileETag&nbsp;-INode</code> ��る����
+    ��サブディレクトリ�設定� (設定�上書��れ��れ�サブディレクトリ�
+    サブディレクトリ�も継承�れ��) <code>FileETag&nbsp;MTime&nbsp;Size</code>
+    �����り��。</p>
+    <div class="warning"><h3>警告</h3>
+    WebDAV を使�����<code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code> をストレージプロ�イダ���
+    使���るよ�� Directory や Location ���デフォルト値を変更��������。
+    �件��リクエスト中��<code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code> �� 
+    <code>INode&nbsp;MTime&nbsp;Size</code>
+    ���形��固定フォーマット��る��を�����
+    <code>ETag</code> �比較を行�����。も� <code>ETag</code> フォーマットを
+    <code class="directive">FileETag</code> �変��������件��リクエスト�
+    ���動作����る��ょ�。
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Files" id="Files">&lt;Files&gt;</a> <a name="files" id="files">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>マッ��るファイル���用�れるディレクティブを囲む</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>&lt;Files <var>filename</var>&gt; ... &lt;/Files&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">&lt;Files&gt;</code> ディレクティブ��
+    ��中��るディレクティブ��用範囲をファイル��制����。
+    <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> ディレクティブや <code class="directive"><a href="#location">&lt;Location&gt;</a></code> ディレクティブ�
+    ��よ��機能を����。
+    �れ��<code>&lt;/Files&gt;</code> ディレクティブ�対�
+    ������れ��り��ん。
+    ��セクション中�ディレクティブ��ベース� (ファイル��最後�部分)
+    �指定�れ�ファイル��マッ��る����オブジェクト��用�れ��。
+    <code class="directive">&lt;Files&gt;</code> セクション�
+    <code class="directive">&lt;Directory&gt;</code> セクション�
+    <code>.htaccess</code> �読�込�れ�後�
+    <code class="directive">&lt;Location&gt;</code> セクションより�先�
+    設定ファイル��れ�順��用�れ��。
+    <code class="directive">&lt;Files&gt;</code> ��
+    <code class="directive">&lt;Directory&gt;</code> セクション内�
+    �スト��る������
+    ファイルシステム�一部����定���用��る�������。</p>
+
+    <p><var>filename</var> 引数��ファイル��ワイルドカード文字列
+    ��ワイルドカード�� <code>?</code> �一��文字�<code>*</code> �任��文字列�マッ����。
+    <code>~</code> ���文字を付加�る���<a class="glossarylink" href="../glossary.html#regex" title="用語集を�照">正�表�</a>を使���も����。
+    例���</p>
+
+    <div class="example"><p><code>
+      &lt;Files ~ "\.(gif|jpe?g|png)$"&gt;
+    </code></p></div>
+
+    <p>��る���より�一般的�インター�ット�画�フォーマット�マッ����。
+    ����
+    <code class="directive"><a href="#filesmatch">&lt;FilesMatch&gt;</a></code> を使�方�
+    推奨�れ����。</p>
+
+    <p>�����<code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> � <code class="directive"><a href="#location">&lt;Location&gt;</a></code> セクション��異�り�
+    <code class="directive">&lt;Files&gt;</code>
+    � <code>.htaccess</code> ファイル内�利用�る�������。
+    �れ�より�ユーザ�ファイル毎�アクセス�制御を行�������るよ��
+    ������。</p>
+
+
+<h3>�照</h3>
+<ul>
+<li>リクエストを���際��れら�異�るセクション�
+    組����れる方法����� <a href="../sections.html">
+    &lt;Directory&gt;, &lt;Location&gt;, &lt;Files&gt; セクション�動作法</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="FilesMatch" id="FilesMatch">&lt;FilesMatch&gt;</a> <a name="filesmatch" id="filesmatch">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>正�表��マッ��るファイル���用�れる
+ディレクティブを囲む</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>&lt;FilesMatch <var>regex</var>&gt; ... &lt;/FilesMatch&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">&lt;FilesMatch&gt;</code> ディレクティブ��
+    <code class="directive"><a href="#files">&lt;Files&gt;</a></code>
+    ディレクティブ�様���中��るディレクティブ��用範囲をファイル��制����。����
+    ��ディレクティブ��正�表�を指定���。
+    例��:</p>
+
+    <div class="example"><p><code>
+      &lt;FilesMatch "\.(gif|jpe?g|png)$"&gt;
+    </code></p></div>
+
+    <p>�一般的�インター�ット�画�形��マッ����。</p>
+
+<h3>�照</h3>
+<ul>
+<li>リクエストを���際��れら�異�るセクション�
+    組����れる方法����� <a href="../sections.html">
+    &lt;Directory&gt;, &lt;Location&gt;, &lt;Files&gt; セクション�動作法</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ForceType" id="ForceType">ForceType</a> <a name="forcetype" id="forcetype">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>����マッ��るファイル�指定� MIME コンテントタイプ�
+�られるよ���る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ForceType <var>MIME-type</var>|None</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0 � core �移動</td></tr>
+</table>
+    <p><code>.htaccess</code> や <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> セクション�
+    <code class="directive"><a href="#location">&lt;Location&gt;</a></code> セクション�
+    <code class="directive"><a href="#files">&lt;Files&gt;</a></code> セクション�
+    書�れ�場����ディレクティブ�����る����ファイル�
+    <var>MIME-type</var>
+    �指定�れ�コンテントタイプ���扱�れるよ�����。�����
+    GIF ファイル��り�ディレクトリ���������ファイルを <code>.gif</code>
+    �終�ら����������以下�も�を使用���:</p>
+
+    <div class="example"><p><code>
+      ForceType image/gif
+    </code></p></div>
+
+    <p><code class="directive"><a href="#defaulttype">DefaultType</a></code> ����
+    ��ディレクティブ�メディアタイプを決�る�����る�も�れ��
+    ファイル�拡張�も������� MIME タイプ�関連付�を
+    上書��る���注�������。</p>
+
+    <p><code>None</code> ���値を使���� <code class="directive">ForceType</code> �
+    設定を無効�����:</p>
+
+    <div class="example"><p><code>
+      # force all files to be image/gif:<br />
+      &lt;Location /images&gt;<br />
+        <span class="indent">
+          ForceType image/gif<br />
+        </span>
+      &lt;/Location&gt;<br />
+      <br />
+      # but normal mime-type associations here:<br />
+      &lt;Location /images/mixed&gt;<br />
+      <span class="indent">
+        ForceType None<br />
+      </span>
+      &lt;/Location&gt;
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="HostnameLookups" id="HostnameLookups">HostnameLookups</a> <a name="hostnamelookups" id="hostnamelookups">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>クライアント� IP アドレス� DNS ルックアップを
+有効��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>HostnameLookups On|Off|Double</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>HostnameLookups Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>��ディレクティブ��ホスト�をログ�集��るよ��
+    DNS ルックアップを有効����
+    (�ら��CGI/SSI � <code>REMOTE_HOST</code> 変数���渡���)。
+    <code>Double</code>を指定��場��2 ��逆引�を行����。
+    ��り�逆引��後�����果�対��正引�を行����。正引��
+    �果� IP アドレス�中�オリジナル�アドレス�一致�るも����れ�
+    �り��ん。("tcpwrappers" �用語�� <code>PARANOID</code> �呼�れ����。)</p>
+
+    <p><code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> �ホスト��よるアクセス
+    制御を行��場����
+    設定�如何�よら� 2 ��逆引��実行�れ��。
+    �れ��セキュリティを�����必���。
+    <code>HostnameLookups Double</code> を設定����り�
+    他�部分��� 2 �逆引���果を使��������ん。
+    例���<code>HostnameLookups On</code> �設定���る状態��
+    ホスト��よるアクセス制�を行���オブジェクト��
+    リクエストを�����る��2 ��逆引���功�る����よら��
+    <code>REMOTE_HOST</code> ��通常�逆引��果�渡�れ��。</p>
+
+    <p>ディレクティブ�デフォルト�
+    本当�逆引�を必�����る������サイト�
+    �ットワークトラフィックを低減��る����<code>Off</code> �������。
+    ルックアップ�よる余計��延����る���
+    エンドユーザ����も良���ょ�。
+    DNS �ルックアップ�����り�時間�必���る場��多��
+    負��高�サイト����ディレクティブ� <code>Off</code> ������。
+    ���<var>/support</var> ディレクトリ���れ�デフォルト��
+    インストールディレクトリ� <code>bin</code> サブディレクトリ�
+    インストール�れる <code class="program"><a href="../programs/logresolve.html">logresolve</a></code> ユーティリティ�より�
+    Apache �動作��別��ログ�残�れ��る IP アドレス�らホスト�を
+    ルックアップ�る����能��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IfDefine" id="IfDefine">&lt;IfDefine&gt;</a> <a name="ifdefine" id="ifdefine">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>起動時�テスト�真��る�����処��れるディレクティブを
+囲む</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>&lt;IfDefine [!]<var>parameter-name</var>&gt; ...
+    &lt;/IfDefine&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code>&lt;IfDefine <var>test</var>&gt;...&lt;/IfDefine&gt;</code>
+    セクション��
+    ディレクティブを�件付��指定�る���利用���。
+    <code class="directive">&lt;IfDefine&gt;</code> セクション�
+    ��れるディレクティブ��<var>test</var>�
+    定義�れ��る����処��れ��。
+    も� <var>test</var> �定義�れ����れ��
+    開始�終了�指定�間�ディレクティブ�無視�れ��。</p>
+
+    <p><code class="directive">&lt;IfDefine&gt;</code> セクションディレクティブ�
+    指定�る <var>test</var> ��
+    次�二��形�����一�を�り��:</p>
+
+    <ul>
+      <li><var>parameter-name</var></li>
+
+      <li><code>!</code><var>parameter-name</var></li>
+    </ul>
+
+    <p>�者�場����<var>parameter-name</var> ��付�られ�パラメータ�
+    定義�れ��れ�開始�終了�間�ディレクティブ�処��れ��。
+    後者�場��逆��<em>parameter-name</em> �指定�れ�<strong>���</strong>
+    場��処��れ��。</p>
+
+    <p><var>parameter-name</var> 引数��サー�を起動�る際�
+    <code class="program"><a href="../programs/httpd.html">httpd</a></code> �コマンドライン�
+    <code>-D<var>parameter-</var></code> ���形�指定�る�定義�れ��。 </p>
+
+    <p><code class="directive">&lt;IfDefine&gt;</code> セクション�
+    入れ���る������複数�パラメータ�よるテストを�る���使用����。
+    例:</p>
+
+    <div class="example"><p><code>
+      httpd -DReverseProxy ...<br />
+      <br />
+      # httpd.conf<br />
+      &lt;IfDefine ReverseProxy&gt;<br />
+      <span class="indent">
+        LoadModule rewrite_module modules/mod_rewrite.so<br />
+        LoadModule proxy_module   modules/libproxy.so<br />
+      </span>
+      &lt;/IfDefine&gt;
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IfModule" id="IfModule">&lt;IfModule&gt;</a> <a name="ifmodule" id="ifmodule">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>モジュール�存在�る������応��処��れる
+ディレクティブを囲む</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>&lt;IfModule [!]<var>module-file</var>|<var>module-identifier</var>&gt; ...
+    &lt;/IfModule&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>モジュール識別���ージョン 2.1 以��使用�能。</td></tr>
+</table>
+    <p><code>&lt;IfModule <var>test</var>&gt;...&lt;/IfModule&gt;</code>
+    セクション��モジュール�存在�る���処��れるディレクティブを
+    指定�る���利用���。
+    <code class="directive">&lt;IfModule&gt;</code> セクション�
+    ��れるディレクティブ��<var>test</var>
+    �指定�るモジュール�組�込�れ��る����処��れ��。
+    も� <var>test</var> �組�込�れ����れ��開始�終了�間�ディレクティブ
+    �無視�れ��。</p>
+
+    <p><code class="directive">&lt;IfModule&gt;</code> セクションディレクティブ�
+    指定�る <var>test</var> ��
+    次�二��形�����一�を�り��。</p>
+
+    <ul>
+      <li><var>module</var></li>
+
+      <li>!<var>module</var></li>
+    </ul>
+
+    <p>�者�場���<var>module</var> ��付�られ�モジュール�
+    Apache �組�込�れ��れ�
+    (コンパイル済��も���<code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code> を利用��
+    動的�読�込ん�も��両方)�
+    開始�終了�間�ディレクティブ�処��れ��。
+    後者�場��逆��<var>module</var> �組�込�れ�<strong>���</strong>
+    場��処��れ��。</p>
+
+    <p><var>module</var> 引数��モジュール識別��
+    コンパイルを��時�モジュール�ファイル���。
+    例���<code>rewrite_module</code> �識別��
+    <code>mod_rewrite.c</code> �ファイル���。
+    モジュール�複数�ソースファイル�ら構��れ��る場���文字列
+    <code>STANDARD20_MODULE_STUFF</code> ��るファイル���を
+    使������。</p>
+
+    <p><code class="directive">&lt;IfModule&gt;</code> セクション�
+    入れ���る����能��り�
+    複数�モジュール�テストを行�����使用����。</p>
+
+    <div class="note">特定�モジュール�存在�関�ら�動作�る
+    設定ファイル�原本�必���������セクションを使用������。
+    通常�動作���ディレクティブを
+    <code class="directive">&lt;IfModule&gt;</code> セクション�中�
+    入れる必���り��ん。</div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Include" id="Include">Include</a> <a name="include" id="include">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>サー�設定ファイル中�ら他�設定ファイルを�り込む</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Include <var>file-path</var>|<var>directory-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>ワイルドカード�よるマッ�� 2.0.41 以��使用�能</td></tr>
+</table>
+    <p>��ディレクティブ�より�サー��設定ファイル�ら
+    他�設定ファイルをインクルード�る�������。</p>
+
+    <p>複数�ファイルをアルファベット順�一度�読�込む����
+    シェル形� (<code>fnmatch</code>) �ワイルドカード文字を使��������。
+    �ら��<code class="directive">Include</code> �ディレクトリを指定��場���
+    ディレクトリ���サブディレクトリ内�全��ファイルを
+    アルファベット順�読�込ん��設定ファイル���処����。
+    ����ディレクトリ全体を読�込む���勧�����ん。
+    �������ら <code>httpd</code> �読�込��失敗�るよ��
+    一時ファイルをディレクトリ�残�����よ�����よ��る�ら��。</p>
+
+    <p>指定�るファイルパス�絶対パス��
+    <code class="directive"><a href="#serverroot">ServerRoot</a></code> ディレクトリ�ら�
+    相対パス�����ら���。</p>
+
+    <p>例:</p>
+
+    <div class="example"><p><code>
+      Include /usr/local/apache2/conf/ssl.conf<br />
+      Include /usr/local/apache2/conf/vhosts/*.conf
+    </code></p></div>
+
+     <p><code class="directive"><a href="#serverroot">ServerRoot</a></code> �ら�相対パス�場��:</p>
+
+    <div class="example"><p><code>
+      Include conf/ssl.conf<br />
+      Include conf/vhosts/*.conf
+    </code></p></div>
+
+    <p><code>apachectl configtest</code> を実行�る��設定を�ェック���る時�
+    読�込�れ�ファイル�リスト�表示�れ��:</p>
+
+    <div class="example"><p><code>
+      root@host# apachectl configtest<br />
+      Processing config file: /usr/local/apache2/conf/ssl.conf<br />
+      Processing config file: /usr/local/apache2/conf/vhosts/vhost1.conf<br />
+      Processing config file: /usr/local/apache2/conf/vhosts/vhost2.conf<br />
+      Syntax OK
+    </code></p></div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="program"><a href="../programs/apachectl.html">apachectl</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="KeepAlive" id="KeepAlive">KeepAlive</a> <a name="keepalive" id="keepalive">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>HTTP ��続的�接続を有効��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>KeepAlive On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>KeepAlive On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>HTTP/1.0 � Keep-Alive 拡張� HTTP/1.1 ��続的接続�機能��
+    複数�リクエスト��� TCP �接続��られる�長時間�続�る
+    HTTP セッションを�供���。���ん�画��
+    ��れる HTML ドキュメント��場��よ����延時間� 50% 短縮�れる�果も
+    �����。Keep-Alive 接続を有効��る��
+    <code>KeepAlive On</code> �設定���。</p>
+
+    <p>HTTP/1.0 �対応��クライアント�際���
+    クライアントより特��求����場��� Keep-Alive 接続��り��。
+    �ら��HTTP/1.0 クライアント���コンテンツ�容��先�
+    (訳注: �求�対��応答を返���) ��る場��� Keep-Alive
+    接続を利用����。
+    �れ��CGI �出力や SSI �ページ�
+    サー��生���ディレクトリ�リスト�よ��動的コンテンツを
+    HTTP/1.0 クライアント��る場��� Keep-Alive 接続を使�����を�味���。
+    HTTP/1.1 �対応��クライアント�際���
+    特�指定�れ���り�デフォルト����続的�接続�行��れ��。
+    クライアント��求�れ��コンテンツ�容�を判別����も�を
+    �続的�接続を通���る�����ャンクエンコーディング�用�られ��。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#maxkeepaliverequests">MaxKeepAliveRequests</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="KeepAliveTimeout" id="KeepAliveTimeout">KeepAliveTimeout</a> <a name="keepalivetimeout" id="keepalivetimeout">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�続的�接続�次�リクエスト��る��サー��待�時間</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>KeepAliveTimeout <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>KeepAliveTimeout 5</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>接続を閉�る���Apache �次�リクエストを何秒待��を指定���。
+    リクエストを��付��後��<code class="directive"><a href="#timeout">Timeout</a></code> ディレクティブ�よ��
+    指定�れ�タイムアウト値�使�れ��。</p>
+
+    <p><code class="directive">KeepAliveTimeout</code> を大��値�設定�る��
+    負��高�サー������パフォーマンス��題を引�起��場���り��。
+    タイムアウト�長�れ�長����より多��サー�プロセス�
+    活発���クライアント�ら�接続�終了を待�続�る����り��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Limit" id="Limit">&lt;Limit&gt;</a> <a name="limit" id="limit">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>囲��中��るアクセス制御��用を特定� HTTP メソッド���
+制��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>&lt;Limit <var>method</var> [<var>method</var>] ... &gt; ...
+    &lt;/Limit&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>アクセス制御��通常<strong>全��</strong>アクセスメソッド�対��
+    影響��普通��れ�望���挙動��。
+    <strong>�������ら�大部分�場���アクセス制御�関�るディレクティブを
+    <code class="directive">&lt;Limit&gt;</code> セクション内�
+    書������り��ん。 </strong></p>
+
+    <p><code class="directive">&lt;Limit&gt;</code> ディレクティブ�
+    目的��アクセス制御�範囲を
+    指定�れ� HTTP メソッド��定�る����。
+    �れ以外�メソッド��<code class="directive">&lt;Limit&gt;</code> �囲�れ�アクセス制御�
+    <strong>影響を����ん</strong>。
+    以下�例��<code>POST</code>, <code>PUT</code>, <code>DELETE</code> �メソッド�対����アクセス�制御を行���
+    �れ以外�メソッド�����制����ん:</p>
+
+    <div class="example"><p><code>
+      &lt;Limit POST PUT DELETE&gt;<br />
+      <span class="indent">
+        Require valid-user<br />
+      </span>
+      &lt;/Limit&gt;
+    </code></p></div>
+
+    <p>メソッド���以下�中�ら一�以上を列挙�る�������:
+    <code>GET</code>,
+    <code>POST</code>, <code>PUT</code>, <code>DELETE</code>,
+    <code>CONNECT</code>, <code>OPTIONS</code>,
+    <code>PATCH</code>, <code>PROPFIND</code>, <code>PROPPATCH</code>,
+    <code>MKCOL</code>, <code>COPY</code>, <code>MOVE</code>,
+    <code>LOCK</code>, <code>UNLOCK</code>. <strong>メソッド��
+    大文字�文字を区別���。</strong> <code>GET</code> を指定��場���
+    <code>HEAD</code> リクエスト�も制����り��。<code>TRACE</code>
+    メソッド�制�を��る�������ん。</p>
+
+    <div class="warning">アクセス制御�目的�場��
+    <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> 
+    セクション�代�り� <code class="directive"><a href="#limitexcept">&lt;LimitExcept&gt;</a></code> セクションを使用��方�良���ょ�。
+    <code class="directive"><a href="#limitexcept">&lt;LimitExcept&gt;</a></code>
+    セクション���特定�メソッド�対��も防御��る�ら��。</div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitExcept" id="LimitExcept">&lt;LimitExcept&gt;</a> <a name="limitexcept" id="limitexcept">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>指定�れ�も�以外� HTTP メソッド�アクセス制御を
+制��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>&lt;LimitExcept <var>method</var> [<var>method</var>] ... &gt; ...
+    &lt;/LimitExcept&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">&lt;LimitExcept&gt;</code> �
+    <code>&lt;/LimitExcept&gt;</code> ��引数�
+    <strong>��れ����</strong>
+    HTTP �アクセスメソッド��用�る���アクセス制御
+    ディレクティブを括る���利用���。
+    ��り�<code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> セクション��対�動作を��
+    標準�メソッド�標準外や未�識�メソッド�場��両方を設定����。
+    <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> �ドキュメントも
+    併���照������。</p>
+
+    <p>例:</p>
+
+    <div class="example"><p><code>
+      &lt;LimitExcept POST GET&gt;<br />
+      <span class="indent">
+        Require valid-user<br />
+      </span>
+      &lt;/LimitExcept&gt;
+    </code></p></div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitInternalRecursion" id="LimitInternalRecursion">LimitInternalRecursion</a> <a name="limitinternalrecursion" id="limitinternalrecursion">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>内部リダイレクト�入れ�����サブリクエスト�最大数を決定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LimitInternalRecursion <var>number</var> [<var>number</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>LimitInternalRecursion 10</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0.47 以��使用�能</td></tr>
+</table>
+    <p>内部リダイレクト�例�� <code class="directive">Action</code> ディレクティブを
+    使���る���起�り��。<code class="directive">Action</code> ディレクティブ�
+    元々�リクエストを CGI スクリプト�内部リダイレクトを行����。
+    サブリクエスト������ URI �対���リクエスト�れ����
+    何�起�る�を調�る��� Apache �機構��。例���<code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code>
+    � <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code> ディレクティブ
+    �リスト�るファイルを調�る���サブリクエストを使���。</p>
+
+    <p><code class="directive">LimitInternalRecursion</code> �内部リダイレクトや
+    サブリクエスト�無�ループ�陥�����サー�クラッシュを防���。
+    普通���よ��ループ�設定�失敗�����発生���。</p>
+
+    <p>��ディレクティブ��リクエスト毎�評価�れる�二�����界値を
+    設定���。最�� <var>number</var> ��起�り得る
+    内部リクエスト�最大値を設定���。二��� <var>number</var> �
+    サブリクエスト�入れ����る深�を設定���。<var>number</var> を
+    一���指定������両方��界値���値�設定�れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      LimitInternalRecursion 5
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitRequestBody" id="LimitRequestBody">LimitRequestBody</a> <a name="limitrequestbody" id="limitrequestbody">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>クライアント�ら�られる HTTP リクエスト�ボディ�
+��を制��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LimitRequestBody <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>LimitRequestBody 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>��ディレクティブ��リクエストボディ�許�れる�イト数�<var>bytes</var>
+    を 0 (無制�を�味���) �ら 2147483647 (2GB) ���数値�指定���。</p>
+
+    <p><code class="directive">LimitRequestBody</code> ディレクティブ��
+    ディレクティブ�書�れ�コンテキスト
+    (サー�全体�ディレクトリ�ファイル�ロケーション) 内�
+    許容�る  HTTP リクエストメッセージボディ�サイズ�制�を��る�������。
+    クライアント�リクエスト���制�値を越���れ��
+    サー��リクエストを処����エラーを返���。
+    普通�リクエストメッセージボディ�サイズ��リソース�種類や
+    許��れ��るメソッド�よ��大��変�り��。
+    CGI スクリプト��よ�情報を�信�る���
+    メッセージボディを使���。
+    <code>PUT</code> メソッド�実装����ディレクティブ�値���
+    少���も�るリソース�対��サー����付�よ���る
+    表��大�����値を必�����。</p>
+
+    <p>��ディレクティブ��
+    管�者�クライアント�ら�異常�リクエストを制御��るよ����
+    何ら��形�サービス拒�攻撃 (訳注:DoS) を��る��有効��。</p>
+
+    <p>�る場所��ファイルアップロードを許��る場���
+    アップロード��るファイル�サイズを 100K �制����れ��
+    以下�よ��指定���:</p>
+
+    <div class="example"><p><code>
+      LimitRequestBody 102400
+    </code></p></div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitRequestFields" id="LimitRequestFields">LimitRequestFields</a> <a name="limitrequestfields" id="limitrequestfields">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>クライアント�ら� HTTP リクエスト�ヘッダフィールド�数を
+制��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LimitRequestFields <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>LimitRequestFields 100</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><var>number</var> ���0 (無制�を�味���) �ら 32767
+    ���整数を指定���。
+    デフォルト値��定数 <code>DEFAULT_LIMIT_REQUEST_FIELDS</code>
+    �よりコンパイル時�定義�れ�� (�布時�� 100 �指定�れ����)。</p>
+
+    <p><code class="directive">LimitRequestBody</code> ディレクティブ��
+    サー�管�者� HTTP リクエスト中����許��るリクエストヘッダフィールド数を
+    指定���。
+    サー����値��通常�クライアント�ら�リクエスト���れる����
+    フィールド�数より大��値�必�����。
+    クライアント�より使�れ��求ヘッダーフィールド�数�
+    20 を超�る�����ん��り��ん��
+    �れ�種々�クライアント�実装�よ��変�り�
+    詳細�コンテント�ゴシエーションを�る���ブラウザ�設定���も
+    影響�れる����り��。
+    オプション� HTTP 拡張�リクエストヘッダフィールドを使��表�れる場��
+    多��り��。</p>
+
+    <p>��ディレクティブ��
+    管�者�クライアント�ら�異常�リクエストを制御��るよ����
+    何ら��形�サービス拒�攻撃 (訳注:DoS) を��る��有効��。
+    リクエスト�フィールド�多��る��を�味�るエラー応答�
+    普通�クライアント�返�れるよ��時���値を増や������。</p>
+
+    <p>例:</p>
+
+    <div class="example"><p><code>
+      LimitRequestFields 50
+    </code></p></div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitRequestFieldSize" id="LimitRequestFieldSize">LimitRequestFieldSize</a> <a name="limitrequestfieldsize" id="limitrequestfieldsize">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>クライアント�ら� HTTP リクエスト�ヘッダ�
+サイズを制��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LimitRequestFieldSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>LimitRequestFieldSize 8190</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>��ディレクティブ��HTTP リクエストヘッダ一���付�る
+    �イト数 <var>bytes</var> を指定���。</p>
+
+    <p><code class="directive">LimitRequestFieldSize</code> ディレクティブ��
+    HTTP リクエストヘッダ�許容�れるサイズを増減��る�������。
+    サー�����ディレクティブ�値����
+    一般的�クライアント�らリクエスト��られ�際����リクエスト�
+    付属���る��ヘッダフィールド����も�
+    �分足りる大���������れ��り��ん。
+    一般的�リクエストヘッダ�サイズ����も���大���個々�
+    クライアント�実装�よ��大��異�り�
+    詳細�コンテント�ゴシエーションをサ�ート�る������
+    ブラウザ�設定�も影響�れ�り���。
+    SPNEGO �証ヘッダ�� 12392 �イト��������ら�り��。</p>
+
+    <p>��ディレクティブ��
+    管�者�クライアント�ら�異常�リクエストを制御��るよ����
+    何ら��形�サービス拒�攻撃 (訳注:DoS) を��る��有効��。</p>
+
+    <p>例:</p>
+
+    <div class="example"><p><code>
+      LimitRequestFieldSize 4094
+    </code></p></div>
+
+    <div class="note">通常�デフォルト�ら変更�る必���り��ん。</div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitRequestLine" id="LimitRequestLine">LimitRequestLine</a> <a name="limitrequestline" id="limitrequestline">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>クライアント�ら� HTTP リクエスト行�サイズを制��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LimitRequestLine <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>LimitRequestLine 8190</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>��ディレクティブ��HTTP リクエスト行内�許容�れる�イト数
+    <var>bytes</var> を指定���。</p>
+
+    <p><code class="directive">LimitRequestLine</code> ディレクティブ�より�
+    クライアント�ら� HTTP リクエスト行�許容サイズを増減����。 
+    リクエスト行��HTTPメソッド�URI�プロトコル�ージョン�ら����り�
+    <code class="directive">LimitRequestLine</code> �サー���リクエスト�対��
+    許容�るリクエスト URI �長�を制��る����り��。
+    サー���<code>GET</code> リクエスト�クエリ部分も����リソース����入る�足る
+    大��を必�����。</p>
+
+    <p>��ディレクティブ��
+    管�者�クライアント�ら�異常�リクエストを制御��るよ����
+    何ら��形�サービス拒�攻撃 (訳注:DoS) を��る��有効��。</p>
+
+    <p>例:</p>
+
+    <div class="example"><p><code>
+      LimitRequestLine 4094
+    </code></p></div>
+
+    <div class="note">通常�デフォルト�ら変更�る必���り��ん。</div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitXMLRequestBody" id="LimitXMLRequestBody">LimitXMLRequestBody</a> <a name="limitxmlrequestbody" id="limitxmlrequestbody">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>XML 形��リクエスト�ボディ�サイズを制��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LimitXMLRequestBody <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>LimitXMLRequestBody 1000000</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>XML 形��リクエスト�ボディ�最大値を (�イト���) 制����。
+    値� <code>0</code> を指定�る��ェックを無効����。</p>
+
+    <p>例:</p>
+
+    <div class="example"><p><code>
+    LimitXMLRequestBody 0
+    </code></p></div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Location" id="Location">&lt;Location&gt;</a> <a name="location" id="location">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>囲ん�ディレクティブをマッ��る URL ����用</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>&lt;Location
+    <var>URL-path</var>|<var>URL</var>&gt; ... &lt;/Location&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">&lt;Location&gt;</code> ディレクティブ��
+    URL �より中�書�れ�ディレクティブ��用範囲を制����。
+    <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code>
+    ディレクティブ�似����
+    <code>&lt;/Location&gt;</code> ディレクティブ�終了�る
+    サブセクションを開始���。
+    <code class="directive">&lt;Location&gt;</code> セクション��
+    <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> セクション�
+    <code>.htaccess</code> �読�込��後�
+    <code class="directive"><a href="#files">&lt;Files&gt;</a></code> セクションを
+    �用��後��設定ファイル��れ�順�処��れ��。</p>
+
+    <p><code class="directive">&lt;Location&gt;</code> セクション�
+    完全�ファイルシステム�関連���動作���。�����ら導�れる
+    �果������注��る点��り��。最も���も���
+    ファイルシステム��置��アクセス制御� <code class="directive">&lt;Location&gt;</code> ディレクティブを使�������
+    �������。複数� URL �ファイルシステム����置�マップ�れる
+    �能��り�������よ��アクセス制御�回��れ�����能性�
+    �り��。</p>
+
+    <div class="note"><h3>�� <code class="directive">&lt;Location&gt;</code> を使��</h3>
+
+    <p><code class="directive">&lt;Location&gt;</code> ディレクティブ�
+    ファイルシステム外�コンテンツ�ディレクティブを�用�る���
+    使用������。ファイルシステム�存在�るコンテンツ�対����
+    <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> � <code class="directive"><a href="#files">&lt;Files&gt;</a></code> を使������。
+    例外��<code>&lt;Location /&gt;</code> ���れ�サー�全体�対��
+    設定を�用�る簡��方法��。</p>
+    </div>
+
+    <p>全�� (プロキシ以外�) リクエスト�対��
+    URL � <code>/path/</code> ����
+    接頭辞 <code>http://servername</code> を����形�マッ����。
+    プロキシリクエスト�場����<code>scheme://servername/path</code>
+    ���接頭辞を�む形�マッ���接頭辞を���指定�る必���り��。</p>
+
+    <p>URL ��ワイルドカードを利用�る�������。
+    <code>?</code> �任��一文字�<code>*</code> �任��文字列�マッ����。
+    ��ら�ワイルドカード文字も URL-path � / ��マッ����ん。</p>
+
+    <p><code>~</code> ���文字を追加�る����<a class="glossarylink" href="../glossary.html#regex" title="用語集を�照">正�表�</a>を
+    利用�る��も����。
+    例��:</p>
+
+    <div class="example"><p><code>
+      &lt;Location ~ "/(extra|special)/data"&gt;
+    </code></p></div>
+
+    <p>� URL � <code>/extra/data</code> � <code>/special/data</code> ���文字列�
+    ��れ��る場��マッ����。
+   <code class="directive"><a href="#locationmatch">&lt;LocationMatch&gt;</a></code> ディレクティブ�
+    <code class="directive">&lt;Location&gt;</code> �正�表�
+    版�������動作を���。</p>
+
+    <p><code class="directive">&lt;Location&gt;</code> 機能��<code class="directive"><a href="#sethandler">SetHandler</a></code> ディレクティブ�
+    組����利用�る�特�便利��。
+    例���<code>foo.com</code> �ブラウザ�ら��ステータス��照を有効����れ��
+    次�よ���れ�良���ょ�。</p>
+
+    <div class="example"><p><code>
+      &lt;Location /status&gt;<br />
+      <span class="indent">
+        SetHandler server-status<br />
+        Order Deny,Allow<br />
+        Deny from all<br />
+        Allow from .foo.com<br />
+      </span>
+      &lt;/Location&gt;
+    </code></p></div>
+
+<div class="note"><h3>/ (スラッシュ) �関�る注</h3>
+    <p>スラッシュ文字��URL 内��れる場所�応��変化�る
+    特別��味を������。
+    ファイルシステム����利用�る場���複数�スラッシュ�も一��
+    スラッシュ���扱�れる���多�����
+    (<em>����</em>�<code>/home///foo</code> �
+    <code>/home/foo</code> ������よ��)
+    URL �����必��も���る�����り��ん。
+    <code class="directive"><a href="#locationmatch">&lt;LocationMatch&gt;</a></code>
+    ディレクティブや正�表�を利用��
+    <code class="directive">&lt;Location&gt;</code> ディレクティブ��
+    複数�スラッシュ�マッ�����������明示的�記述�る
+    必���り��。</p>
+
+    <p>例���<code>&lt;LocationMatch ^/abc&gt;</code> ��
+    <code>/abc</code> ���リクエスト URL �マッ������
+    <code>//abc</code> ���リクエスト URL ��マッ����ん。
+    (正�表����) <code class="directive">&lt;Location&gt;</code>
+    ディレクティブ��
+    proxy リクエスト�対��利用�る際���様�振る舞�を�����
+    (正�表����) <code class="directive">&lt;Location&gt;</code> を proxy
+    ���リクエスト�対��利用�る際���
+    一��スラッシュ�複数�スラッシュ�マッ����。
+    例���<code>&lt;Location /abc/def&gt;</code> �指定��
+    <code>/abc//def</code> ���リクエスト��れ��
+    マッ��る����り��。</p></div>
+
+
+<h3>�照</h3>
+<ul>
+<li>リクエストを���際��れら�異�るセクション�
+    組����れる方法����� <a href="../sections.html">
+    &lt;Directory&gt;, &lt;Location&gt;, &lt;Files&gt; セクション�動作法</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LocationMatch" id="LocationMatch">&lt;LocationMatch&gt;</a> <a name="locationmatch" id="locationmatch">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>囲ん�ディレクティブを正�表��マッ��る URL ���
+�用</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>&lt;LocationMatch
+    <var>regex</var>&gt; ... &lt;/LocationMatch&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">&lt;LocationMatch&gt;</code> ディレクティブ��
+    <code class="directive"><a href="#location">&lt;Location&gt;</a></code> ���様�
+    URL �より中�書�れ�ディレクティブ��用範囲を制����。
+    但��引数�普通�文字列�����<a class="glossarylink" href="../glossary.html#regex" title="用語集を�照">正�表�</a>��り��。
+    例���</p>
+
+    <div class="example"><p><code>
+      &lt;LocationMatch "/(extra|special)/data"&gt;
+    </code></p></div>
+
+    <p>� URL � <code>/extra/data</code> � <code>/special/data</code>
+    ���文字列���れ��る場��マッ����。</p>
+
+<h3>�照</h3>
+<ul>
+<li>リクエストを���際��れら�異�るセクション�
+    組����れる方法����� <a href="../sections.html">
+    &lt;Directory&gt;, &lt;Location&gt;, &lt;Files&gt; セクション�動作法</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LogLevel" id="LogLevel">LogLevel</a> <a name="loglevel" id="loglevel">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ErrorLog �冗長性を制御�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LogLevel <var>level</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>LogLevel warn</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">LogLevel</code> ��エラーログ (<code class="directive"><a href="#errorlog">ErrorLog</a></code> ディレクティブを
+    見�����) �記録�るメッセージ�冗長性を調整���。
+    以下� <var>level</var> を指定���順���度�下�������。</p>
+
+    <table class="bordered">
+      <tr>
+        <th><strong>レベル</strong> </th>
+
+        <th><strong>説明</strong> </th>
+
+        <th><strong>例</strong> </th>
+      </tr>
+
+      <tr>
+        <td><code>emerg</code> </td>
+
+        <td>緊急 - システム�利用����</td>
+
+        <td>Child cannot open lock file. Exiting 
+        (�プロセス�ロックファイルを開�����終了��)</td>
+      </tr>
+
+      <tr>
+        <td><code>alert</code> </td>
+
+        <td>直��対処�必�</td>
+
+        <td>getpwuid: couldn't determine user name from uid
+        (getpwuid: UID �らユーザ�を特定������)</td>
+      </tr>
+
+      <tr>
+        <td><code>crit</code> </td>
+
+        <td>致命的�状態</td>
+
+        <td>socket: Failed to get a socket, exiting child
+        (socket: ソケット�得られ������プロセスを終了���)</td>
+      </tr>
+
+      <tr>
+        <td><code>error</code> </td>
+
+        <td>エラー</td>
+
+        <td>Premature end of script headers
+        (スクリプト�ヘッダ�足り�����終���)</td>
+      </tr>
+
+      <tr>
+        <td><code>warn</code> </td>
+
+        <td>警告</td>
+
+        <td>child process 1234 did not exit, sending another SIGHUP
+        (�プロセス 1234 �終了�����。も�一度 SIGHUP を�る)</td>
+      </tr>
+
+      <tr>
+        <td><code>notice</code> </td>
+
+        <td>普通������情報</td>
+
+        <td>httpd: caught SIGBUS, attempting to dump core in ...
+        (httpd: SIGBUS シグナルを���... �コアダンプを��)</td>
+      </tr>
+
+      <tr>
+        <td><code>info</code> </td>
+
+        <td>追加情報</td>
+
+        <td>"Server seems busy, (you may need to increase
+        StartServers, or Min/MaxSpareServers)..." (「サー��負��高��
+        (StartServers や Min/MaxSpareServers �値を増や�必���る�も)�)</td>
+      </tr>
+
+      <tr>
+        <td><code>debug</code> </td>
+
+        <td>デ�ッグメッセージ</td>
+
+        <td>"Opening config file ..." (設定ファイルを開���る...)</td>
+      </tr>
+    </table>
+
+    <p>特定�レベル�指定�れ�場���れより高�レベル�全��メッセージ�
+    報告�れ��。
+    <em>例��</em>�<code>LogLevel info</code> �指定�る��
+    <code>notice</code> � <code>warn</code> も報告�れ��。</p>
+
+    <p>�� <code>crit</code> 以上�レベルを指定�る���推奨�れ��。</p>
+
+    <p>例:</p>
+
+    <div class="example"><p><code>
+      LogLevel notice
+    </code></p></div>
+
+    <div class="note"><h3>注</h3>
+      <p>ファイル�ログを出力�る場��<code>notice</code>
+      レベル�メッセージ�抑制�れ�����ログ�出力�れ��。
+      ��� <code>syslog</code> を使用���る場���
+      �れ�当���り��ん。</p>
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxKeepAliveRequests" id="MaxKeepAliveRequests">MaxKeepAliveRequests</a> <a name="maxkeepaliverequests" id="maxkeepaliverequests">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�続的�接続上�許��れるリクエスト�数</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>MaxKeepAliveRequests <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>MaxKeepAliveRequests 100</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">MaxKeepAliveRequests</code> ディレクティブ��
+    <code class="directive"><a href="#keepalive">KeepAlive</a></code> �有効�場���
+    一回�接続���付��能�リクエスト�数を制����。
+    <code>0</code> �設定���れ����付�るリクエスト�無制���り��。
+    ��設定��サー�性能を�上��る����大��数値を指定�る��勧���。
+    </p>
+
+    <p>例:</p>
+
+    <div class="example"><p><code>
+      MaxKeepAliveRequests 500
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="NameVirtualHost" id="NameVirtualHost">NameVirtualHost</a> <a name="namevirtualhost" id="namevirtualhost">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>��ベース��ー�ャルホスト���� IP アドレスを指定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>NameVirtualHost <var>addr</var>[:<var>port</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">NameVirtualHost</code> ディレクティブ��
+    <a href="../vhosts/">��ベース��ー�ャルホスト</a>�設定を行����場��
+    必���るも���。</p>
+
+    <p><var>addr</var> ��ホスト�を指定������
+    常� IP アドレスを指定�る��推奨�れ��。
+    例���</p>
+
+    <div class="example"><p><code>
+      NameVirtualHost 111.22.33.44
+    </code></p></div>
+
+    <p><code class="directive">NameVirtualHost</code> ディレクティブ��
+    ��ベース��ー�ャルホストを
+    利用��リクエストを��付�る IP アドレスを指定���。
+    �れ��普通���ベース��ー�ャルホストアドレス��。
+    ����ファイアーウォールや他�プロキシ�リクエストを��付��
+    �� IP アドレス�サー��フォワード�る���場���
+    リクエストを�供���マシン上�物�インターフェース�
+    IP アドレスを指定�る必���り��。
+    複数�アドレス�複数���ベース��ー�ャルホストを指定�る場��
+    �アドレス�対��ディレクティブを書������。</p>
+
+    <div class="note"><h3>中</h3>
+      <p>「主サー��や��� <code>_default_</code> サー�も�
+      <code class="directive">NameVirtualHost</code> �指定�� IP アドレス��リクエスト
+      を処��る���<strong>�り��ん</strong> (���
+      <code class="directive">NameVirtualHost</code> ã‚’
+      指定������アドレス� <code class="directive">VirtualHost</code> を定義�����場�を除�)。</p>
+    </div>
+
+    <p>��ベース��ー�ャルホスト��ート番�を指定�る��も�能��。
+    例��</p>
+
+    <div class="example"><p><code>
+      NameVirtualHost 111.22.33.44:8080
+    </code></p></div>
+
+    <p>IPV6 �アドレス�次�例�よ��角括弧�囲む必���り��:</p>
+ 
+    <div class="example"><p><code>
+      NameVirtualHost [2001:db8::a00:20ff:fea7:ccea]:8080
+    </code></p></div>
+
+    <p>����インタフェース��リクエストを���るよ���る�����
+    引数��� <code>*</code> を使���。</p>
+
+    <div class="example"><p><code>
+      NameVirtualHost *
+    </code></p></div>
+
+    <div class="note"><h3><code class="directive">&lt;VirtualHost&gt;</code> ディレクティブ�引数</h3>
+      <p><code class="directive">&lt;VirtualHost&gt;</code> ディレクティブ�引数� <code class="directive">NameVirtualHost</code> ディレクティブ�引数�正確�
+      ����る必���る���注�������。</p>
+
+      <div class="example"><p><code>
+        NameVirtualHost 1.2.3.4<br />
+        &lt;VirtualHost 1.2.3.4&gt;<br />
+        # ...<br />
+        &lt;/VirtualHost&gt;<br />
+      </code></p></div>
+    </div>
+
+
+<h3>�照</h3>
+<ul>
+<li><a href="../vhosts/">�ー�ャルホスト説明書
+</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Options" id="Options">Options</a> <a name="options" id="options">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ディレクトリ�対��使用�能�機能を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Options
+    [+|-]<var>option</var> [[+|-]<var>option</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>Options All</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Options</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">Options</code> ディレクティブ��特定�ディレクトリ�対��
+    ��機能�使用�能�を制御���。</p>
+
+    <p><var>option</var> を <code>None</code>�指定�る��
+    特別�機能�全�無効��り��。
+    ���以下�示� 1 個以上�も�を指定����。</p>
+
+    <dl>
+      <dt><code>All</code></dt>
+
+      <dd><code>MultiViews</code> を除��全��機能�有効��り��。
+      �れ�デフォルト��。</dd>
+
+      <dt><code>ExecCGI</code></dt>
+
+      <dd>
+      <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> �よる CGI スクリプト�実行を許����。</dd>
+
+      <dt><code>FollowSymLinks</code></dt>
+
+      <dd>
+      サー�����ディレクトリ内�シンボリックリンクを��れるよ�����。
+      <div class="note"><p>サー��シンボリックリンクを��る場��も�
+      <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> セクション�
+      マッ���る���
+      パス��<em>変更�れ��ん</em>。</p>
+      <p><code class="directive"><a href="#location">&lt;Location&gt;</a></code> 内�
+      ��オプションを指定��も<strong>無視�れる</strong>���
+      注�������。</p>
+      <p>��オプションを�略���ら����セキュリティ�強化���り��ん。
+      ���ら symlink �検査�レースコンディションを引�起���能性��り�
+      ����回��能��る�ら��。</p>
+      </div></dd>
+
+      <dt><code>Includes</code></dt>
+
+      <dd>
+      <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> ��供�る SSI を有効����。</dd>
+
+      <dt><code>IncludesNOEXEC</code></dt>
+
+      <dd>
+      SSI �有効��り����<code>#exec</code> コマンド � <code>#exec CGI</code> �無効��り��。
+      ����<code>#include virtual</code> �より�<code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code> �れ�ディレクトリ�
+      CGI を実行�る����能��。</dd>
+
+      <dt><code>Indexes</code></dt>
+
+      <dd>
+      も��URL �ディレクトリ�マップ�るリクエスト�����
+      且� <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code> �指定��ファイル (例���<code>index.html</code>) �
+      ディレクトリ内�無�れ��<code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> �
+      ディレクトリ内�一覧を整形��返���。</dd>
+
+      <dt><code>MultiViews</code></dt>
+
+      <dd>
+      <code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code> �よる
+      <a href="../content-negotiation.html">コンテント�ゴシエーション</a> 
+      �れ� "MultiViews" を許����。</dd>
+
+      <dt><code>SymLinksIfOwnerMatch</code></dt>
+
+      <dd>
+      シンボリック先�ファイル���ディレクトリ��
+      シンボリックリンク�所有ユーザ ID ���場����シンボリックリンクを
+      ��れるよ�����。
+
+      <div class="note"><h3>注</h3> <p><code class="directive"><a href="#location">&lt;Location&gt;</a></code> 内���オプションを
+      指定��も無視�れ��。</p>
+      <p>��オプション�セキュリティ�強化���り��ん。
+      ���ら symlink �検査�レースコンディションを引�起���能性��り�
+      ����回��能��る�ら��。</p>
+      </div>
+      </dd>
+    </dl>
+
+    <p>通常�ディレクトリ�対��複数� <code class="directive">Options</code> �
+    �用�能�場��
+    最も近�も�一�����用�れ�他�も��無視�れ��。
+    複数�指定�マージ�れる�����り��ん。(<a href="../sections.html#mergin">セクション�マージ方法</a>を�照������。)
+    �������� <code class="directive">Options</code> ディレクティブ� <code>+</code> や <code>-</code> 付��
+    指定�れ�場��オプション�値�マージ�れ��。
+    <code>+</code> を頭���れ��在�設定�加�られ�
+    <code>-</code> を付�れ��在�設定�ら削除�れ��。</p>
+
+    <div class="warning"><h3>警告</h3>
+    <p><code class="directive">Options</code> �指定�る際��
+    <code>+</code> や <code>-</code> ����も���������も�を
+    混��指定�る記述�誤��構文��予期����果��る�も�れ��ん。
+    </p>
+    </div>
+
+    <p>例���<code>+</code> や <code>-</code> を利用���場��:</p>
+
+    <div class="example"><p><code>
+      &lt;Directory /web/docs&gt;<br />
+      <span class="indent">
+        Options Indexes FollowSymLinks<br />
+      </span>
+      &lt;/Directory&gt;<br />
+      <br />
+      &lt;Directory /web/docs/spec&gt;<br />
+      <span class="indent">
+        Options Includes<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p><code>/web/docs/spec</code> ���ディレクトリ���
+    <code>Includes</code> ����用�れ��。
+    ����2 番目� <code class="directive">Options</code> � <code>+</code> や <code>-</code> を利用���る�:</p>
+ 
+    <div class="example"><p><code>
+      &lt;Directory /web/docs&gt;<br />
+      <span class="indent">
+        Options Indexes FollowSymLinks<br />
+      </span>
+      &lt;/Directory&gt;<br />
+      <br />
+      &lt;Directory /web/docs/spec&gt;<br />
+      <span class="indent">
+        Options +Includes -Indexes<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p><code>/web/docs/spec</code> ���ディレクトリ��� <code>FollowSymLinks</code> �
+    <code>Includes</code> ��用�れ��。</p>
+
+    <div class="note"><h3>注</h3>
+      <p><code>-IncludesNOEXEC</code> も���
+      <code>-Includes</code> を指定�る��
+      ��設定���よ������よ��も SSI �無効��り��。</p>
+    </div>
+
+    <p>��よ��設定も�れ����れ��デフォルト�� <code>All</code> �
+    �り��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Require" id="Require">Require</a> <a name="require" id="require">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>���証済�ユーザ�リソースをアクセス��る�を�択�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Require <var>entity-name</var> [<var>entity-name</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>��ディレクティブ���証�れ�ユーザ�リソース�対��
+    アクセス��る�を制御���。
+    制��件�承�モジュール�処��れ��。
+    <code class="module"><a href="../mod/mod_authz_user.html">mod_authz_user</a></code> � <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code>
+    ��供�れ��る構文���次�よ��も�も�り��:</p>
+
+    <dl>
+      <dt><code>Require user <var>userid</var> [<var>userid</var>] ...</code></dt>
+
+      <dd>指定�れ�ユーザ���ディレクトリ��アクセスを許����。</dd>
+
+      <dt><code>Require group <var>group-name</var> [<var>group-name</var>] ...</code></dt>
+
+      <dd>指定�れ�グループ�属�るユーザ���ディレクトリ��アクセスを許����。</dd>
+
+      <dt><code>Require valid-user</code></dt>
+
+      <dd>全���証�れ�ユーザ��ディレクトリ��アクセスを許����。</dd>
+    </dl>
+
+    <p>require オプションを実装���る他�承�モジュール���
+    <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code>,
+    <code class="module"><a href="../mod/mod_authz_dbm.html">mod_authz_dbm</a></code>,
+    <code class="module"><a href="../mod/mod_authz_owner.html">mod_authz_owner</a></code> ����も���り��。</p>
+
+    <p><code class="directive">Require</code> ��正��動作�る���� <code class="directive"><a href="#authname">AuthName</a></code> �� <code class="directive"><a href="#authtype">AuthType</a></code> ディレクティブや�
+    (ユーザ�グループを指定�る���) <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code> �� <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code>
+    ����ディレクティブ�共�
+    指定�る必���り��。
+    例��:</p>
+
+    <div class="example"><p><code>
+       AuthType Basic<br />
+       AuthName "Restricted Resource"<br />
+       AuthUserFile /web/users<br />
+       AuthGroupFile /web/groups<br />
+       Require group admin
+    </code></p></div>
+
+    <p>��よ�����用�れ�アクセス制御��<strong>全��</strong>メソッド�
+    対��行��れ��。
+    <strong>通常���れ�望���動作��。</strong>
+    も��特定�メソッド�対����アクセス�制御を�用��
+    他�メソッド�制����場����<code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> セクション内�
+    <code class="directive">Require</code> ã‚’
+    指定������。</p>
+
+    <p><code class="directive">Require</code> を <code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code> ディレクティブや <code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code> ディレクティブ�
+    組�����使��場���れら�制約�相互作用� <code class="directive"><a href="#satisfy">Satisfy</a></code> ディレクティブ�制御�れ��。
+    </p>
+
+    <div class="note"><h3>サブディレクトリ�制御を解除�る方法</h3>
+    <p><code class="directive"><a href="#satisfy">Satisfy</a></code> ディレクティブ
+    ���護�れ�ディレクトリ�サブディレクトリ内�アクセス制御を
+    無効��る例��下�よ���り��。
+    <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> �よるアクセス制御も無効化�れる���
+    ��テクニック�注����活用����。</p>
+    <div class="example"><p><code>
+      &lt;Directory /path/to/protected/&gt;<br />
+        <span class="indent">
+        Require user david<br />
+        </span>
+      &lt;/Directory&gt;<br />
+      &lt;Directory /path/to/protected/unprotected&gt;<br />
+        <span class="indent">
+        # All access controls and authentication are disabled<br />
+        # in this directory<br />
+        Satisfy Any<br />
+        Allow from all<br />
+        </span>
+      &lt;/Directory&gt;<br />
+    </code></p></div>
+    </div>
+      
+
+<h3>�照</h3>
+<ul>
+<li><a href="../howto/auth.html">�証・承�・アクセス制御</a></li>
+<li><code class="directive"><a href="#satisfy">Satisfy</a></code></li>
+<li><code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RLimitCPU" id="RLimitCPU">RLimitCPU</a> <a name="rlimitcpu" id="rlimitcpu">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Apache ��プロセス�ら起動�れ�プロセス� CPU 消費�を
+制��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>未設定。オペレーティングシステム�デフォルトを使用</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>一��二��パラメータを�り��。
+    最��パラメータ�全プロセス�対�るリソース�ソフトリミットを設定��
+    2 番目�パラメータ�最大�リソースリミットを設定���。
+    パラメータ��数字��オペレーティングシステム�最大��る
+    <code>max</code> ���ら�を指定�る�������。
+    最大�リソースリミットを上�る�����サー�を
+    <code>root</code> �実行�る�起動�れ��れ�����ん。</p>
+
+    <p>�������設定� Apache ��プロセス自体�����
+    リクエストを��付�� Apache ��プロセス�ら fork �れ�プロセス�
+    �用�れ��。
+    �れ�� CGI や SSI �ら実行�れ�コマンド���れ����Apache �
+    親プロセス�ら fork �れ�ログ�パイププロセス�����用�れ��ん。</p>
+
+    <p>CPU リソース�リミット�プロセス��り�秒数�表��れ��。</p>
+
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#rlimitmem">RLimitMEM</a></code></li>
+<li><code class="directive"><a href="#rlimitnproc">RLimitNPROC</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RLimitMEM" id="RLimitMEM">RLimitMEM</a> <a name="rlimitmem" id="rlimitmem">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Apache ��プロセス�ら起動�れ�プロセス�メモリ消費�を
+制��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>未設定。オペレーティングシステム�デフォルトを使用</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>一��二��パラメータを�り��。
+    最��パラメータ�全プロセス�対�るリソース�ソフトリミットを設定��
+    2 番目�パラメータ�最大�リソースリミットを設定���。
+    パラメータ��数字��オペレーティングシステム�最大��る
+    <code>max</code> ���ら�を指定�る�������。
+    最大�リソースリミットを上�る�����サー�を
+    <code>root</code> �実行�る�起動�れ��れ�����ん。</p>
+
+    <p>��設定� Apache ��プロセス自体�����
+    リクエストを��付�� Apache ��プロセス�ら fork �れ�プロセス�
+    �用�れ��。
+    �れ�� CGI や SSI �ら実行�れ�コマンド���れ����Apache �
+    親プロセス�ら fork �れ�ログ�パイププロセス�����用�れ��ん。</p>
+
+    <p>メモリリソース�リミット�プロセス��り��イト数�表��れ��。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#rlimitcpu">RLimitCPU</a></code></li>
+<li><code class="directive"><a href="#rlimitnproc">RLimitNPROC</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RLimitNPROC" id="RLimitNPROC">RLimitNPROC</a> <a name="rlimitnproc" id="rlimitnproc">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Apache ��プロセス�ら起動�れ�プロセス�起動�るプロセス�
+数を制��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>RLimitNPROC <var>number</var>|max [<var>number</var>|max]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>未設定。オペレーティングシステム�デフォルトを使用</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>一��二��パラメータを�り��。
+    最��パラメータ�全プロセス�対�るリソース�ソフトリミットを設定��
+    2 番目�パラメータ�最大�リソースリミットを設定���。
+    パラメータ��数字��オペレーティングシステム�最大��る
+    <code>max</code> ���ら�を指定�る�������。
+    最大�リソースリミットを上�る�����サー�を
+    <code>root</code> �実行�る�起動�れ��れ�����ん。</p>
+
+    <p>��設定� Apache ��プロセス自体�����
+    リクエストを��付�� Apache ��プロセス�ら fork �れ�プロセス�
+    �用�れ��。
+    �れ�� CGI や SSI �ら実行�れ�コマンド���れ����Apache �
+    親プロセス�ら fork �れ�ログ�パイププロセス�����用�れ��ん。</p>
+
+    <p>プロセス�制���ユーザ��り�プロセス数�制御�れ��。</p>
+
+    <div class="note"><h3>注</h3>
+      <p> CGI プロセス�ウェブサー��ユーザ ID 以外�実行�れる��
+      <strong>無�れ�</strong>�
+      ��ディレクティブ��サー�自身�生���るプロセス�数を制��る����り��。
+      ��よ��状������る������<code>error_log</code> 中�
+      <strong><code>cannot fork</code></strong> ���メッセージ�より
+      確��る�������。</p>
+    </div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#rlimitmem">RLimitMEM</a></code></li>
+<li><code class="directive"><a href="#rlimitcpu">RLimitCPU</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Satisfy" id="Satisfy">Satisfy</a> <a name="satisfy" id="satisfy">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ホストレベル�アクセス制御�ユーザ�証��相互作用を指定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Satisfy Any|All</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>Satisfy All</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>�ージョン 2.0.51 以��� <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> ディレクティブ� <code class="directive"><a href="#limitexcept">&lt;LimitExcept&gt;</a></code> ディレクティブ�影響を��る
+</td></tr>
+</table>
+    <p><code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code> �
+    <code class="directive"><a href="#require">Require</a></code> �両方�使�れ��る���
+    アクセス�リシーを設定���。パラメータ� <code>All</code> � <code>Any</code>
+    ��。��ディレクティブ��る場所��アクセス�ユーザ�/パスワード
+    <em>�</em>クライアント�ホスト�アドレス�制��れ��る�����
+    役立���。デフォルト�動作 (<code>All</code>) �クライアント�アドレス�よる
+    アクセス制�を満���<em>��</em>正��ユーザ��パスワードを入力�る��を
+    �求���。<code>Any</code> ���クライアント�ホスト�制�を満����
+    正��ユーザ��パスワード�入力を�る�を�れ�アクセスを許��れ��。
+    �れ���る場所をパスワード��護�る�れ��特定�アドレス�ら�
+    クライアント��パスワード�入力を�求���アクセスを許��る�
+    ���よ�����使用����。</p>
+
+    <p>例������ットワーク上��る人��ウェブサイト��る部分����
+    無制��アクセスを許����れ��外��ットワーク�人��
+    パスワードを�供��るよ���る�����次�よ��設定を�る���
+    ����:</p>
+
+    <div class="example"><p><code>
+      Require valid-user<br />
+      Order allow,deny<br />
+      Allow from 192.168.1<br />
+      Satisfy Any
+    </code></p></div>
+   
+    <p>�ージョン 2.0.51 �ら�
+    <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> セクション�
+    <code class="directive"><a href="#limitexcept">&lt;LimitExcept&gt;</a></code> セクションを使用�る���
+    <code class="directive">Satisfy</code> ディレクティブ�
+    �用�れるメソッドを制��る���
+    ��るよ���り���。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code></li>
+<li><code class="directive"><a href="#require">Require</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScriptInterpreterSource" id="ScriptInterpreterSource">ScriptInterpreterSource</a> <a name="scriptinterpretersource" id="scriptinterpretersource">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>CGI スクリプト�インタープリタ��置を調�る���手法</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ScriptInterpreterSource Registry|Registry-Strict|Script</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ScriptInterpreterSource Script</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Win32 ��。
+オプション <code>Registry-Strict</code> � Apache 2.0 以��使用�能</td></tr>
+</table>
+    <p>��ディレクティブ��Apache � CGI スクリプトを
+    実行�る場��利用�るインタープリタを�
+    ��よ��探�出������制御�る���使用���。
+    デフォルト�設定� <code>Script</code> ��。�れ�スクリプト�
+    shebang 行 (最��行� <code>#!</code> �ら始�るも�)
+    �指�れ��るインタープリタを使用���。Win32 ����行�
+    以下�様��り��。</p>
+
+    <div class="example"><p><code>
+      #!C:/Perl/bin/perl.exe
+    </code></p></div>
+
+    <p>も����<code>perl</code> � <code>PATH</code> ��る場����:</p>
+
+    <div class="example"><p><code>
+      #!perl
+    </code></p></div>
+
+    <p><code>ScriptInterpreterSource Registry</code> を指定�る��
+    スクリプトファイル�拡張� (例���<code>.pl</code>) を
+    キー����Windows �レジストリツリー <code>HKEY_CLASSES_ROOT</code>
+    を検索�るよ���り��。レジストリ�サブキー
+    <code>Shell\ExecCGI\Command</code> ���れ�存在���場��
+    <code>Shell\Open\Command</code> �スクリプトファイルを開����
+    使�れ��。レジストリキー�見��ら������Apache � <code>Script</code>
+    オプション�指定�れ����動作�戻り��。</p>
+
+    <p>�����レジストリ�設定� .pl 拡張�� perl �関連付�られ��る：</p>
+
+    <div class="example"><p><code><code>HKEY_CLASSES_ROOT\.pl\Shell\ExecCGI\Command\(Default) =&gt; C:\Perl\bin\perl.exe -wT</code></code></p></div>
+
+
+    <div class="warning"><h3>セキュリティ</h3> 
+    <p><code>ScriptInterpreterSource Registry</code> を <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code> �れ�ディレクトリ�使����
+    注�������。Apache ���ディレクトリ中�<em>����</em>ファイルを
+    実行�よ�����。<code>Registry</code> ���設定�通常�実行�れ��
+    ファイル�対��望�����プログラム�実行�発生�る�能性��り��。
+    例�����ん�� Windows システム��
+    <code>.htm</code> ファイル�デフォルト�「開��コマンド�
+    Microsoft Internet Explorer を実行������スクリプト�指定�れ�
+    ディレクトリ��る <code>.htm</code> ファイル��リクエスト�サー��
+    �ックグラウンド�ブラウザを実行�る����り��。�れ��一分内�ら��
+    システムをクラッシュ�る���良�方法��。</p>
+    </div>
+
+    <p>Apache 2.0 �ら導入�れ�オプション <code>Registry-Strict</code> �
+    <code>Registry</code> �����を行������サブキー
+    <code>Shell\ExecCGI\Command</code> ��を使���。
+    <code>ExecCGI</code> キー�普通�使�れるキー���り��ん。Windows 
+    レジストリ�手動�設定�る必���り�����システム���発的�プログラム�
+    実行を防��������。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerAdmin" id="ServerAdmin">ServerAdmin</a> <a name="serveradmin" id="serveradmin">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>サー��クライアント��るエラーメッセージ���る電�メール�
+アドレス</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ServerAdmin <var>email-address</var>|<var>URL</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">ServerAdmin</code> ��クライアント�返������
+    エラーメッセージ中�記述�る�
+    ���アドレスを設定���。与�られ�引数を <code>httpd</code> �
+    URL ��識���場���<var>email-address</var> ��解釈���
+    �イパーリンク�ターゲット� <code>mailto:</code> を付���。
+    実際�������電�メールアドレスを使����推奨�れ����。
+    多�� CGI スクリプト�������る��を仮定�����。
+    URL を使�場�������管�下��る別サー�を指�よ��������。
+    �������エラー�起������連絡を�る����������
+    �����。
+</p>
+
+    <p>��際��れ����専用�アドレスを設定�る��良���ょ�。
+    例���</p>
+
+    <div class="example"><p><code>
+      ServerAdmin www-admin@foo.example.com
+    </code></p></div>
+
+    <p>����よ�����。ユーザ���もサー��関�る話��る�����を
+    明記���る�����り��ん��。</p>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerAlias" id="ServerAlias">ServerAlias</a> <a name="serveralias" id="serveralias">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>リクエストを��ベース��ー�ャルホスト�マッ�����る���
+使用�れるホスト�別�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ServerAlias <var>hostname</var> [<var>hostname</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>�ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">ServerAlias</code> ディレクティブ��<a href="../vhosts/name-based.html">�ームベース��ー�ャルホスト</a>����
+    使用�るホスト�別�を指定���。<code class="directive">ServerAlias</code>
+    ��切��れ�ワイルドカードも��る�������。</p>
+
+    <div class="example"><p><code>
+      &lt;VirtualHost *&gt;<br />
+      ServerName server.domain.com<br />
+      ServerAlias server server2.domain.com server2<br />
+      # ...<br />
+      &lt;/VirtualHost&gt;
+    </code></p></div>
+
+<h3>�照</h3>
+<ul>
+<li><a href="../vhosts/">Apache �ー�ャルホスト説明書</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerName" id="ServerName">ServerName</a> <a name="servername" id="servername">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>サー��自分自身を示����使�ホスト���ート</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ServerName [<var>scheme</var>://]<var>fully-qualified-domain-name</var>[:<var>port</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>��ディレクティブ��ージョン 2.0 ���ージョン 1.3 �
+    <code class="directive">Port</code> ディレクティブ�機能も����。</td></tr>
+</table>
+    <p><code class="directive">ServerName</code> ディレクティブ��
+    サー��自分自身を示�リクエストスキーム�ホスト���ートを設定���。
+    �れ��リダイレクト�る URL を生��る際�利用�れ��。
+    例���ウェブサー�を動����るマシン� <code>simple.example.com</code>
+    ��DNS �エイリアス <code>www.example.com</code> も�る����
+    ウェブサー��後者����識�れ�欲������以下�よ��ディレクティブを
+    使���。</p>
+
+    <div class="example"><p><code>
+      ServerName www.example.com:80
+    </code></p></div>
+
+    <p><code class="directive">ServerName</code> �指定�れ��������
+    サー�� IP アドレス�ら逆引�を行�����ホスト�を知������。
+    <code class="directive">ServerName</code> ��ート�指定�れ��������
+    サー��リクエスト����る
+    �ートを使���。最高�信頼性�確実性をも�ら������
+    <code class="directive">ServerName</code> を使��ホスト���ートを明示的�
+    指定������。</p>
+
+    <p><a href="../vhosts/name-based.html">��ベース��ー�ャルホスト</a>
+    を利用���る場��<code class="directive"><a href="#virtualhost">&lt;VirtualHost&gt;</a></code> セクション内�
+    <code class="directive">ServerName</code> ����ー�ャルホスト�マッ��る���
+    何�リクエスト� Host: ヘッダ��れる必���る��を指定���。</p>
+
+    <p>リ�ースプロキシやロード�ランサやSSL負�軽減装置�よ���
+    SSLを処��るマシン�後��サー�を動��場���
+    サー��正��自己�照 URLを確実�生��るよ���
+    <code>https://</code> スキーム�クライアント�接続�る�ート番�を�
+    <code class="directive">ServerName</code> ディレクティブ�指定������。
+    </p>
+
+    <p>自己�照 URL (例�� <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code> モジュール�よるも���)
+    �指定�れ��ートを使���クライアント�リクエスト��ート番�を使��を
+    決定�る設定� <code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code> 
+    ディレクティブ� <code class="directive"><a href="#usecanonicalphysicalport">UseCanonicalPhysicalPort</a></code>
+    ディレクティブを�照������。</p>
+
+<h3>�照</h3>
+<ul>
+<li><a href="../dns-caveats.html">DNS � Apache �関�る話</a></li>
+<li><a href="../vhosts/">Apache �ー�ャルホスト説明書</a></li>
+<li><code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code></li>
+<li><code class="directive"><a href="#usecanonicalphysicalport">UseCanonicalPhysicalPort</a></code></li>
+<li><code class="directive"><a href="#namevirtualhost">NameVirtualHost</a></code></li>
+<li><code class="directive"><a href="#serveralias">ServerAlias</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerPath" id="ServerPath">ServerPath</a> <a name="serverpath" id="serverpath">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�互��ブラウザ���ベース��ー�ャルホスト�アクセス�����
+���互�用 URL パス�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ServerPath <var>URL-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>�ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">ServerPath</code> ディレクティブ��<a href="../vhosts/">�ームベース��ー�ャルホスト</a>����利用�る
+    互�用 URL パス�を設定���。</p>
+
+<h3>�照</h3>
+<ul>
+<li><a href="../vhosts/">Apache �ー�ャルホスト説明書</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerRoot" id="ServerRoot">ServerRoot</a> <a name="serverroot" id="serverroot">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>インストール�れ�サー��ベースディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ServerRoot <var>directory-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ServerRoot /usr/local/apache</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">ServerRoot</code> ディレクティブ��
+    サー��存在�るディレクトリを設定���。
+    通常�<code>conf/</code> や <code>logs/</code> ����サブディレクトリ�
+    存在���。
+    ���他�設定ディレクティブ (例�� <code class="directive"><a href="#include">Include</a></code> や <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code> ��) ���る相対パス��
+    ��ディレクトリ�ら�相対�置��り��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      ServerRoot /home/httpd
+    </code></p></div>
+
+
+
+<h3>�照</h3>
+<ul>
+<li><a href="../invoking.html"><code>httpd</code> � <code>-d</code>
+    オプション</a></li>
+<li><code class="directive">ServerRoot</code> �権�を�切�設定�る方法�<a href="../misc/security_tips.html#serverroot">セキュリティ���</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerSignature" id="ServerSignature">ServerSignature</a> <a name="serversignature" id="serversignature">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>サー��生��るドキュメント�フッタを設定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ServerSignature On|Off|EMail</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ServerSignature Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">ServerSignature</code> ディレクティブ��
+    サー��生��るドキュメント
+    (エラーメッセージ�<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ���る FTP �ディレクトリリスト�
+    <code class="module"><a href="../mod/mod_info.html">mod_info</a></code> �出力�等々)
+    �最下行�付与�るフッタ�設定を行����。
+    ��よ��フッタ行を有効�����由���
+    プロキシ�複数連����る場���ユーザ���サー��返��
+    エラーメッセージ�を知る手段���ん�無����も���り��。</p>
+
+
+    <p>デフォルト��る <code>Off</code> �設定を�る��フッタ行�抑制�れ��
+    (����Apache-1.2 以��互��動作を���)。
+    <code>On</code> �設定��場�����ドキュメント�中��サー���ージョン�
+    稼動中��ー�ャルホスト� <a href="#servername">ServerName</a> �書�れ�行を追加��
+    <code>EMail</code> ���場���ら��照�れ�ドキュメント�対�る <a href="#serveradmin">ServerAdmin</a> を指� "mailto:" �追加�れ��。</p>
+
+    <p>�ージョン 2.0.44 以�����ディレクティブ� <code class="directive"><a href="#serversignature">ServerSignature</a></code>
+    ディレクティブ�より表示�れる情報も制御���。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#servertokens">ServerTokens</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerTokens" id="ServerTokens">ServerTokens</a> <a name="servertokens" id="servertokens">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td><code>Server</code> HTTP 応答ヘッダを設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ServerTokens Full</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>��ディレクティブ��クライアント��り返� <code>Server</code>
+    応答ヘッダ内��サー��一般的� OS 種別や�
+    コンパイル�れ�組�込�れ��るモジュール�情報を
+    ��る����を指定���。</p>
+
+    <dl>
+      <dt><code>ServerTokens Prod[uctOnly]</code></dt>
+
+      <dd>サー�� (例��): <code>Server:
+      Apache</code> ����よ���り��。</dd>
+
+      <dt><code>ServerTokens Major</code></dt>
+
+      <dd>Server sends (<em>e.g.</em>): <code>Server:
+      Apache/2</code></dd>
+
+      <dt><code>ServerTokens Minor</code></dt>
+
+      <dd>Server sends (<em>e.g.</em>): <code>Server:
+      Apache/2.0</code></dd>
+
+      <dt><code>ServerTokens Min[imal]</code></dt>
+
+      <dd>サー�� (例��): <code>Server:
+      Apache/2.0.41</code> ����よ���り��。</dd>
+
+      <dt><code>ServerTokens OS</code></dt>
+
+      <dd>サー�� (例��): <code>Server: Apache/2.0.41
+      (Unix)</code> ����よ���り��。</dd>
+
+      <dt><code>ServerTokens Full</code> (も���未指定)</dt>
+
+      <dd>サー�� (例��): <code>Server: Apache/2.0.41
+      (Unix) PHP/4.2.2 MyMod/1.2</code> ����よ���り��。</dd>
+    </dl>
+
+    <p>��設定�サー�全体��用�れ��ー�ャルホスト上�有効���り
+    無効���り�����ん。</p>
+
+    <p>�ージョン 2.0.44 以�����ディレクティブ� <code class="directive"><a href="#serversignature">ServerSignature</a></code>
+    ディレクティブ�より表示�れる情報も制御���。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#serversignature">ServerSignature</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SetHandler" id="SetHandler">SetHandler</a> <a name="sethandler" id="sethandler">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>マッ��るファイル��ンドラ�処��れるよ���る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SetHandler <var>handler-name</var>|None</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0 � core �移動</td></tr>
+</table>
+    <p><code>.htaccess</code> ã‚„ <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code>
+    セクション�<code class="directive"><a href="#location">&lt;Location&gt;</a></code>
+    セクション�書�れ�場��
+    ��ディレクティブ�����る����ファイル�
+    <var>handler-name</var> �指定�れ�<a href="../handler.html">�ンドラ</a>�扱�れる��を強制���。例���拡張��関�ら��
+    ディレクトリ全体�イメージマップファイル���解���欲��場����
+    以下を��ディレクトリ� <code>.htaccess</code>
+    ファイル�記述���:</p>
+
+    <div class="example"><p><code>
+      SetHandler imap-file
+    </code></p></div>
+
+    <p>別�例: URL <code>http://servername/status</code>
+    �指定�れ����サー��状態報告を�るよ���������以下を
+    <code>httpd.conf</code> �記述���:</p>
+
+    <div class="example"><p><code>
+      &lt;Location /status&gt;<br />
+      <span class="indent">
+        SetHandler server-status<br />
+      </span>
+      &lt;/Location&gt;
+    </code></p></div>
+
+    <p><code>None</code> ���値を設定�る����
+    ��方� <code class="directive">SetHandler</code> �定義�れ�設定を無効��る���
+    ����。</p>
+    <p><strong>注�:</strong>SetHandler �デフォルト��ンドラをオー�ーライド
+    ������通常�挙動������スラッシュ (/) �終�る URL �
+    リクエスト�れ����ディレクトリやインデックスファイルを返�よ��り扱�挙動��
+    行�れ���り��。
+    </p>
+
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SetInputFilter" id="SetInputFilter">SetInputFilter</a> <a name="setinputfilter" id="setinputfilter">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>クライアント�リクエストや POST �入力を処��るフィルタを設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SetInputFilter <var>filter</var>[;<var>filter</var>...]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">SetInputFilter</code> ディレクティブ�クライアント�
+    リクエストや POST �入力をサー����������処��るフィルタを
+    設定���。�れ� <code class="directive"><a href="../mod/mod_mime.html#addinputfilter">AddInputFilter</a></code>
+    ディレクティブを���他�場所�定義�れ��るフィルタ�設定�
+    追加�れ��。</p>
+
+    <p>複数�フィルタを指定�る����データを処��る順番�
+    セミコロン�区切る必���り��。</p>
+
+
+<h3>�照</h3>
+<ul>
+<li><a href="../filter.html">フィルタ</a>説明書</li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SetOutputFilter" id="SetOutputFilter">SetOutputFilter</a> <a name="setoutputfilter" id="setoutputfilter">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>サー��応答を処��るフィルタを設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SetOutputFilter <var>filter</var>[;<var>filter</var>...]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">SetOutputFilter</code> ディレクティブ�
+    サー��応答をクライアント��り返�れる��処��るフィルタを設定���。
+    �れ� <code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code>
+    ディレクティブを���他�場所�定義�れ��るフィルタ�設定�
+    追加�れ��。</p>    
+
+    <p>例���以下�設定� <code>/www/data/</code> ディレクトリ�����
+    ファイルを SSI �処����。</p>
+
+    <div class="example"><p><code>
+      &lt;Directory /www/data/&gt;<br />
+      <span class="indent">
+        SetOutputFilter INCLUDES<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p>複数�フィルタを指定�る����データを処��る順番�
+    セミコロン�区切る必���り��。</p>
+
+<h3>�照</h3>
+<ul>
+<li><a href="../filter.html">フィルタ</a>説明書</li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="TimeOut" id="TimeOut">TimeOut</a> <a name="timeout" id="timeout">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�イベント�����リクエストを失敗��る���サー��
+待�時間を設定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>TimeOut <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>TimeOut 300</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">TimeOut</code> ディレクティブ���在����
+    以下�三��待�時間�����定義を行���:</p>
+
+    <ol>
+      <li>GET リクエストを���る����る�時間</li>
+
+      <li>POST や PUTリクエスト�����次� TCP パケット�届����待�時間</li>
+
+      <li>レス�ンスを返�際�TCP � ACK �帰���る���時間</li>
+    </ol>
+    
+    <p>将���別々�設定を�る����能���るよ�考慮中��。
+    Apache 1.2 以��タイマー� 1200 �デフォルト�����
+    300 �下�られ���。300 �も��ん��場���分��る値��。
+    コード中�変�場所���パケットを�る際�タイマをリセット���
+    場所��る�も�れ�����デフォルトをより���値�������ん。</p>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="TraceEnable" id="TraceEnable">TraceEnable</a> <a name="traceenable" id="traceenable">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td><code>TRACE</code> メソッド�リクエスト�対�る応答方法を決�る
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>TraceEnable <var>[on|off|extended]</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>TraceEnable on</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 1.3.34, 2.0.55 以�</td></tr>
+</table>
+    <p>コアサー�� <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> 両方� <code>TRACE</code>
+    �挙動をオー�ーライド���。デフォルト� <code>TraceEnable on</code>
+    ��リクエストボディを��入れ��よ���RFC2616 �準拠��
+    <code>TRACE</code> リクエストを��付���。
+    <code>TraceEnale off</code> �設定�る��コアサー��
+    <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> � <code>405</code> (メソッド�許�)
+    エラーをクライアント�返���。</p>
+
+    <p>最後��テストや調査目的����定用途����仕様�準拠���
+    <code>TraceEnable extended</code> を使���リクエストボディを
+    ��付�るよ��挙動を変更����。(オリジンサー�����)
+    コアサー����リクエストボディ�サイズ� 64k (
+    <code>Transfer-Encoding: chunked</code> �使�れ��る場�� 
+    chunk ヘッダ用� +8k) �制��れ��。
+    コアサー���フルヘッダ�全�� chunk ヘッダをレス�ンス�
+    ボディ���返����。
+    proxy サー������リクエストボディ�サイズ� 64k �制��れ��ん。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="UseCanonicalName" id="UseCanonicalName">UseCanonicalName</a> <a name="usecanonicalname" id="usecanonicalname">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>サー��自分自身�����ートを決定�る方法を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>UseCanonicalName On|Off|Dns</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>UseCanonicalName Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>多��状�� Apache �<em>自己�照</em> URL�����
+    ��サー�を指� URL�を作��る必���り��。
+    <code>UseCanonicalName On</code> �場���<code class="directive"><a href="#servername">ServerName</a></code> ディレクティブ�指定�れ��る
+    ホスト���ート番�を使�����正�� (自己�照���) を生����。
+    ����������自己�照 URL �使�れ����CGI � 
+    <code>SERVER_NAME</code> � <code>SERVER_PORT</code> �も使�れ��。</p>
+
+    <p><code>UseCanonicalName Off</code> �場��
+    クライアント�ホスト���ートを指定�������
+    �れらを元�自己�照 URL を作���� (指定��������
+    上�定義��様���正��を解決���)。
+    �れら�値�<a href="../vhosts/name-based.html">��ベース�
+    �ー�ャルホスト</a>を実装�使�れ��る����値��
+    ��クライアント��得��る値�������。
+    CGI 変数 <code>SERVER_NAME</code> � <code>SERVER_PORT</code> 
+    もクライアント�ら与�られ�値�ら作��れ��。</p>
+
+    <p>��よ��挙動�便利�例��イントラ�ット�サー�� <code>www</code>
+    �よ��短����ユーザ�マシン�接続�る����。
+    ユーザ�入力�短�ホスト��使�れ����URL �<em>最後�スラッシュ無��</em>
+    ディレクトリ�����る <code>http://www/splat</code> �よ�����
+    Apache �リクエストを <code>http://www.domain.com/splat/</code> 
+    �リダイレクト���。
+    �証を�るよ��設定���る����場�
+    ユーザ� 2 回�証を���れ��ら���り�� (<code>www</code> �
+    対�� 1 回�<code>www.domain.com</code> �対��も� 1 回 -- 
+    詳細� <a href="http://httpd.apache.org/docs/misc/FAQ.html#prompted-twice">��話題�
+    FAQ</a> を�照������)。
+    ��� <code class="directive">UseCanonicalName</code> � <code>Off</code> �����る��
+    Apache � <code>http://www/splat/</code> �リダイレクト���。</p>
+
+    <p>三�目�オプション <code>UseCanonicalName DNS</code> ��
+    大�模� IP ベース��ー�ャルホスティング��
+    <code>Host:</code> ヘッダを�供�����クライアントを
+    サ�ート�る場�を想定�����。
+    ��オプション�� Apache ��クライアント�接続�� IP アドレス�対��
+    DNS �逆引�を行����自己�照 URL を作����。</p>
+
+    <div class="warning"><h3>警告</h3>
+    <p>CGI � <code>SERVER_NAME</code> �関��何ら�����件を
+    仮定���る�������オプション�設定�よ���動作���
+    �る�も�れ��ん。クライアント�実質的��ホスト����
+    何�も望��値を指定�る�������。CGI �
+    <code>SERVER_NAME</code> を使��自己�照 URL を作��る�������
+    場�����設定を行���も大丈夫�����。</p></div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#usecanonicalphysicalport">UseCanonicalPhysicalPort</a></code></li>
+<li><code class="directive"><a href="#servername">ServerName</a></code></li>
+<li><code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="UseCanonicalPhysicalPort" id="UseCanonicalPhysicalPort">UseCanonicalPhysicalPort</a> <a name="usecanonicalphysicalport" id="usecanonicalphysicalport">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>サー������ート�解決方法を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>UseCanonicalPhysicalPort On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>UseCanonicalPhysicalPort Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p>Apache �様々�状�� <em>自己�照</em> URL ��りサー��自分自身を指�示�
+    URL を生��る必���り��。
+    <code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code> ディレクティブ�
+    設定�よ��サー��別�を構��るよ���り����
+    ��際�別��使��ート�
+    <code>UseCanonicalPhysicalPort On</code> ���設定��れ��
+    実際��ート番�を�ート番����使�候補�入れ�リクエストを
+    処��るよ���り��。<code>UseCanonicalPhysicalPort Off</code>
+    ���設定��れ��実際��ート番��使用���設定�れ��る情報を
+    全�信���ート番�を構��るよ���り��。</p>
+
+    <div class="note"><h3>注</h3>
+    <p>実際��ート番��使�れる順��次�よ�������� :<br /><br />
+     <code>UseCanonicalName On</code></p>
+     <ul>
+      <li><code>ServerName</code> �指定�れ��る�ート番�</li>
+      <li>実際��ート番�</li>
+      <li>デフォルト��ート番�</li>
+     </ul>
+     <code>UseCanonicalName Off | DNS</code>
+     <ul>
+      <li><code>Host:</code> ヘッダ�ら抽出�れ��ート番�</li>
+      <li>実際��ート番�</li>
+      <li><code>ServerName</code> �指定�れ��る�ート番�</li>
+      <li>デフォルト��ート番�</li>
+     </ul>
+    
+    <p><code>UseCanonicalPhysicalPort Off</code> ��
+    実際��ート番��上�順��ら�り除�れ��。</p>
+    </div>
+
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code></li>
+<li><code class="directive"><a href="#servername">ServerName</a></code></li>
+<li><code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="VirtualHost" id="VirtualHost">&lt;VirtualHost&gt;</a> <a name="virtualhost" id="virtualhost">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>特定�ホスト�や IP アドレス����用�れるディレクティブを
+囲む</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>&lt;VirtualHost
+    <var>addr</var>[:<var>port</var>] [<var>addr</var>[:<var>port</var>]]
+    ...&gt; ... &lt;/VirtualHost&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">&lt;VirtualHost&gt;</code> ��
+    <code>&lt;/VirtualHost&gt;</code> ��
+    特定��ー�ャルホスト�対�����用�れるディレクティブ群を括る
+    ���使�れ��。
+    �ー�ャルホストコンテキスト�許��れる全��ディレクティブを指定�能��。
+    サー���指定�れ��ー�ャルホスト��るドキュメント��
+    リクエストを��付��場��
+    <code class="directive">&lt;VirtualHost&gt;</code> セクション�中��る
+    ディレクティブ��用�れ��。
+    <var>Addr</var>��次�も��利用����:</p>
+
+    <ul>
+      <li>�ー�ャルホスト� IP アドレス</li>
+
+      <li>�ー�ャルホスト� IP �対応�る完全�ドメイン�(�推奨)</li>
+
+      <li><code>NameVirtualHost *</code> �共�使�れる�
+      ���� IP アドレス�マッ��る文字 <code>*</code></li>
+
+      <li>IP ベース��ー�ャルホスト�他�も��マッ���� IP アドレス
+      ����文字列 <code>_default_</code></li>
+    </ul>
+
+    <div class="example"><h3>例</h3><p><code>
+      &lt;VirtualHost 10.1.2.3&gt;<br />
+      <span class="indent">
+        ServerAdmin webmaster@host.foo.com<br />
+        DocumentRoot /www/docs/host.foo.com<br />
+        ServerName host.foo.com<br />
+        ErrorLog logs/host.foo.com-error_log<br />
+        TransferLog logs/host.foo.com-access_log<br />
+      </span>
+      &lt;/VirtualHost&gt;
+    </code></p></div>    
+ 
+    <p>IPv6 アドレス�オプション��ート番��指定�区別�る����
+    角括弧�括��指定�る必���り��。次� IPv6 �例��:</p>
+
+    <div class="example"><p><code>
+      &lt;VirtualHost [2001:db8::a00:20ff:fea7:ccea]&gt;<br />
+      <span class="indent">
+        ServerAdmin webmaster@host.example.com<br />
+        DocumentRoot /www/docs/host.example.com<br />
+        ServerName host.example.com<br />
+        ErrorLog logs/host.example.com-error_log<br />
+        TransferLog logs/host.example.com-access_log<br />
+      </span>
+      &lt;/VirtualHost&gt;
+    </code></p></div>  
+
+    <p>�々��ー�ャルホスト���れ�れ�� IP アドレス��ート番�
+    も���ホスト��対応�る必���り�
+    1 番目�場���複数�アドレス� IP パケットを�信��るよ��
+    サー�マシンを設定���れ��り��ん。
+    (も��マシン�複数��ットワークインターフェース�����場���
+    (OS�サ�ート���れ�) <code>ifconfig alias</code> コマンド�より
+    ������)。</p>
+
+    <div class="note"><h3>注�点</h3>
+    <p><code class="directive">&lt;VirtualHost&gt;</code> � Apache � Listen �る
+    IP アドレス��影響を与�<strong>��ん</strong>。
+    <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code> ã‚’
+    使�� Apache �正��アドレスを listen �るよ��設定�る必���り��。</p>
+    </div>
+
+    <p>IP ベース��ー�ャルホストを使���る場���特別���
+    <code>_default_</code> を指定�る�������。��場��
+    ���ー�ャルホスト�他��ー�ャルホスト�明示的�挙�られ����
+    ���� IP アドレス�マッ����。<code>_default_</code> �ー�ャルホスト�無�
+    場�� IP ��ー�ャルホスト�指定�れ�も��マッ��������
+    VirtualHost セクション�外�����定義�ら�る「主�サー�設定�
+    使�れ��。(����<code class="directive"><a href="#namevirtualhost">NameVirtualHost</a></code> ディレクティブ�マッ��る
+    ���� IP アドレス�「主�サー�設定も <code>_default_</code> �ー�ャルホストも
+    使������注�������。詳��� <a href="../vhosts/name-based.html">�ームベース��ー�ャルホスト</a> を
+    �照������。)</p>
+
+    <p><code>:port</code> ����形��記述�る���より�
+    マッ���る�ートを変更�能��。
+    ��指定を���場����主サー�設定���る
+    一番最後� <code><a href="#port">Port</a></code> �指定�れ��ート�
+    デフォルト��り��。
+    <code>:*</code> を指定�る���より�
+    アドレス上�全���ート�マッ����。(<code>_default_</code> ����
+    �れを使����推奨�れ����。)</p>
+
+    <p>�れ�れ� <code class="directive">&lt;VirtualHost&gt;</code>
+    ブロック内� <code class="directive"><a href="#servername">ServerName</a></code>
+    を指定���。も��れ�無���"main" サー�設定�
+    <code class="directive"><a href="#servername">ServerName</a></code> �引�継�れ��。</p>
+
+    <div class="warning"><h3>セキュリティ</h3>
+    <p>サー�ーを起動��以外�ユーザ�ログファイル��管�れるディレクトリ�
+    書�込��能������セキュリティ�破られる�能性��る��詳細�
+    <a href="../misc/security_tips.html">セキュリティ�関�るコツ</a> を
+    �照������。</p></div>
+
+<h3>�照</h3>
+<ul>
+<li><a href="../vhosts/">Apache �ー�ャルホスト説明書</a></li>
+<li><a href="../dns-caveats.html">DNS � Apache �関�る話</a></li>
+<li><a href="../bind.html">Apache �使用�るアドレス��ート�設定</a></li>
+<li>リクエストを���際��れら�異�るセクション�
+    組����れる方法����� <a href="../sections.html">
+    &lt;Directory&gt;, &lt;Location&gt;, &lt;Files&gt; セクション�動作法</a></li>
+</ul>
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/core.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/core.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../tr/mod/core.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/core.html.tr.utf8 b/docs/manual/mod/core.html.tr.utf8
new file mode 100644
index 00000000..cf5df323
--- /dev/null
+++ b/docs/manual/mod/core.html.tr.utf8
@@ -0,0 +1,3337 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>core - Apache HTTP Sunucusu</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="../">Sürüm 2.2</a> &gt; <a href="./">Modüller</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Temel Özellikleri</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/core.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../tr/mod/core.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">Açıklama:</a></th><td>Apache HTTP Sunucusunda daima mevcut olan çekirdek
+ özellikler</td></tr>
+<tr><th><a href="module-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr></table>
+</div>
+<div id="quickview"><h3 class="directives">Yönergeler</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#acceptfilter">AcceptFilter</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#acceptpathinfo">AcceptPathInfo</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#accessfilename">AccessFileName</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#adddefaultcharset">AddDefaultCharset</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#addoutputfilterbytype">AddOutputFilterByType</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#allowencodedslashes">AllowEncodedSlashes</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#allowoverride">AllowOverride</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#authname">AuthName</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#authtype">AuthType</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cgimapextension">CGIMapExtension</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#contentdigest">ContentDigest</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#defaulttype">DefaultType</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#directory">&lt;Directory&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#directorymatch">&lt;DirectoryMatch&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#documentroot">DocumentRoot</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#enablemmap">EnableMMAP</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#enablesendfile">EnableSendfile</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#errordocument">ErrorDocument</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#errorlog">ErrorLog</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#fileetag">FileETag</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#files">&lt;Files&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#filesmatch">&lt;FilesMatch&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#forcetype">ForceType</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#hostnamelookups">HostnameLookups</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ifdefine">&lt;IfDefine&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ifmodule">&lt;IfModule&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#include">Include</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#keepalive">KeepAlive</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#keepalivetimeout">KeepAliveTimeout</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#limit">&lt;Limit&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#limitexcept">&lt;LimitExcept&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#limitinternalrecursion">LimitInternalRecursion</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#limitrequestbody">LimitRequestBody</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#limitrequestfields">LimitRequestFields</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#limitrequestfieldsize">LimitRequestFieldSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#limitrequestline">LimitRequestLine</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#limitxmlrequestbody">LimitXMLRequestBody</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#location">&lt;Location&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#locationmatch">&lt;LocationMatch&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#loglevel">LogLevel</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#require">Require</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#rlimitcpu">RLimitCPU</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#rlimitmem">RLimitMEM</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#rlimitnproc">RLimitNPROC</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#satisfy">Satisfy</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#scriptinterpretersource">ScriptInterpreterSource</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#serveradmin">ServerAdmin</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#serveralias">ServerAlias</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#servername">ServerName</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#serverpath">ServerPath</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#serverroot">ServerRoot</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#serversignature">ServerSignature</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#servertokens">ServerTokens</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#sethandler">SetHandler</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#setinputfilter">SetInputFilter</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#setoutputfilter">SetOutputFilter</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#timeout">TimeOut</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#traceenable">TraceEnable</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#usecanonicalname">UseCanonicalName</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#usecanonicalphysicalport">UseCanonicalPhysicalPort</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#virtualhost">&lt;VirtualHost&gt;</a></li>
+</ul>
+</div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AcceptFilter" id="AcceptFilter">AcceptFilter</a> <a name="acceptfilter" id="acceptfilter">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir protokolün dinleyici soketleri için en iyilemeleri ayarlar
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>AcceptFilter <var>protocol</var> <var>kabul_süzgeci</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Apache 2.1.5 ve sonrasında mevcuttur.</td></tr>
+</table>
+    <p>Bu yönerge protokol türüne göre bir dinleme soketinin işletim
+      sistemine özgü en iyilemelerini etkin kılar. İşletim sistemi çekirdeği
+      için temel önerme veri alınıncaya kadar veya HTTP isteğinin tamamı
+      tamponlanana kadar sunucu sürecine bir soket tahsis etmemektir.
+      Şimdilik sadece <a href="http://www.freebsd.org/cgi/man.cgi?query=accept_filter&amp;sektion=9">FreeBSD’nin Kabul Süzgeçleri</a> ve Linux’un soket seçeneklerinden
+      <code>TCP_DEFER_ACCEPT</code> desteklenmektedir.</p>
+
+    <p>FreeBSD için öntanımlı değerler:</p>
+    <div class="example"><p><code>
+        AcceptFilter http httpready <br />
+        AcceptFilter https dataready
+    </code></p></div>
+
+    <p><code>httpready</code> kabul süzgeci HTTP isteklerinin tamamını
+      işletim sistemi çekirdeği seviyesinde tamponlar. Çekirdek isteğin
+      tamamını alır almaz sunucuya gönderir. Ayrıntılar için <a href="http://www.freebsd.org/cgi/man.cgi?query=accf_http&amp;sektion=9">accf_http(9)</a> kılavuz sayfasına bakınız. HTTPS istekleri şifrelenmiş
+      olduğundan sadece <a href="http://www.freebsd.org/cgi/man.cgi?query=accf_data&amp;sektion=9">accf_data(9)</a> süzgeci kullanılır.</p>
+
+    <p>Linux’taki ön tanımlı değerler:</p>
+    <div class="example"><p><code>
+        AcceptFilter http data <br />
+        AcceptFilter https data
+    </code></p></div>
+
+    <p>Linux’un <code>TCP_DEFER_ACCEPT</code> soket seçeneği HTTP isteklerinin
+      tamponlanmasını desteklemez.  <code>none</code> dahil her değer
+      dinleyici üzerinde <code>TCP_DEFER_ACCEPT</code> seçeneğini etkin kılar.
+      Daha ayrıntılı bilgi edinmek için Linux
+      <a href="http://homepages.cwi.nl/~aeb/linux/man2html/man7/tcp.7.html">tcp(7)</a> kılavuz sayfasına bakınız.</p>
+
+    <p>Argüman olarak <code>none</code> kullanımı o protokol için kabul
+      süzgeçlerini iptal edecektir. Bu, <code>nntp</code> gibi, sunucunun
+      baştan bir veri göndermesinin gerekli olduğu protokoller için
+      kullanışlıdır:</p>
+    <div class="example"><p><code>AcceptFilter nntp none</code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AcceptPathInfo" id="AcceptPathInfo">AcceptPathInfo</a> <a name="acceptpathinfo" id="acceptpathinfo">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Dosya isminden sonra belirtilen yol verisini kabul veya
+  reddeder.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>AcceptPathInfo On|Off|Default</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>AcceptPathInfo Default</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Apache 2.0.30 ve sonrasında mevcuttur.</td></tr>
+</table>
+    <p>Bu yönerge, istekte dosya isminden sonra (dizinde belirtilen dosya
+      bulunmayabilir) belirtilen yol verisinin kabul edilip edilmeyeceÄŸini
+      denetler. Dosya isminden sonra belirtilen yol verisi
+      <code>PATH_INFO</code> ortam değişkeninde betiklerin kullanımına
+      sunulabilir.</p>
+
+    <p>Örneğin, içinde sadece <code>here.html</code> dosyası bulunan bir
+      <code>/test/</code> dizinimiz olsun. <code>/test/here.html/more</code>
+      ve <code>/test/nothere.html/more</code> isteklerinin her ikisi de
+      <code>PATH_INFO</code> deÄŸiÅŸkenine <code>/more</code> verisinin
+      atanmasını sağlar.</p>
+
+    <p><code class="directive">AcceptPathInfo</code> yönergesine atanabilecek argüman
+      sayısı üçtür:</p>
+    <dl>
+    <dt><code>Off</code></dt><dd>Sadece dosya isminden sonra yol verisi
+      bulunmayan istekler kabul edilir. Yukarıdaki örnekteki gibi
+      <code>/test/here.html/more</code> ÅŸeklindeki istekler bir 404 (Nesne
+      bulunamadı) hatasıyla sonuçlanır.</dd>
+
+    <dt><code>On</code></dt><dd>Mevcut bir dosyaya ait bir dosya isminden
+      sonra bir yol verisinin de belirtildiÄŸi istekler kabul edilir.
+      Yukarıdaki örnekteki gibi <code>/test/here.html/more</code> şeklindeki
+      istekler, <code>/test/here.html</code> geçerli bir dosya olduğu
+      takdirde kabul edilir.</dd>
+
+    <dt><code>Default</code></dt><dd>Dosya isminden sonra yol verisi
+      belirtilen isteklerin nasıl ele alınacağı istekten sorumlu <a href="../handler.html">eylemci</a> tarafından saptanır. Normal dosyalar
+      için çekirdek eylemci öntanımlı olarak <code>PATH_INFO</code>
+      isteklerini reddeder. <a href="mod_cgi.html"><code>cgi-script</code></a> ve <a href="mod_isapi.html"><code>isapi-handler</code></a> gibi betiklere
+      hizmet eden eylemciler ise genellikle <code>PATH_INFO</code>
+      isteklerini öntanımlı olarak kabul ederler.</dd>
+    </dl>
+
+    <p><code>AcceptPathInfo</code> yönergesinin birincil amacı eylemcinin
+      <code>PATH_INFO</code> istekleri hakkında verdiği kabul veya red
+      kararını geçersiz kılabilmenizi sağlamaktır. Örneğin,
+      <code>PATH_INFO</code>’ya dayalı olarak içerik üretmek için <a href="mod_include.html"><code>INCLUDES</code></a> gibi bir <a href="../filter.html">süzgeç</a> kullandığınız takdirde bu
+      geçersizleştirme zorunlu olur. Normal dosyalar için çekirdek eylemci
+      normal olarak isteği reddederdi, böyle bir durumda bir betiği etkin
+      kılmak için aşağıdaki gibi bir yapılandırma kullanabilirsiniz:</p>
+
+    <div class="example"><p><code>
+      &lt;Files "mypaths.shtml"&gt;<br />
+      <span class="indent">
+        Options +Includes<br />
+        SetOutputFilter INCLUDES<br />
+        AcceptPathInfo On<br />
+      </span>
+      &lt;/Files&gt;
+    </code></p></div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AccessFileName" id="AccessFileName">AccessFileName</a> <a name="accessfilename" id="accessfilename">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Dağıtık yapılandırma dosyasının ismi belirtilir.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>AccessFileName <var>filename</var> [<var>filename</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>AccessFileName .htaccess</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Belge yolu üzerindeki dizinlerde dağıtık yapılandırma dosyalarının <a href="#allowoverride">bulunmasına izin verilmişse</a> sunucu bir isteği
+      işlerken önce bu dizinlerde bu yönergede belirtilmiş yapılandırma
+      dosyasını arar. Örnek:</p>
+
+    <div class="example"><p><code>
+      AccessFileName .acl
+    </code></p></div>
+
+    <p>Sunucu, <code>/usr/local/web/index.html</code> belgesini döndürmeden
+      önce,</p>
+
+    <div class="example"><p><code>
+      &lt;Directory /&gt;<br />
+      <span class="indent">
+        AllowOverride None<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p>şeklinde bir yapılandırma ile iptal edilmiş olmadıkça yönergeler için
+      <code>/.acl</code>, <code>/usr/.acl</code>,
+      <code>/usr/local/.acl</code> ve <code>/usr/local/web/.acl</code>
+      dosyalarını okur.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="#allowoverride">AllowOverride</a></code></li>
+<li><a href="../configuring.html">Yapılandırma Dosyaları</a></li>
+<li><a href="../howto/htaccess.html">.htaccess Dosyaları</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddDefaultCharset" id="AddDefaultCharset">AddDefaultCharset</a> <a name="adddefaultcharset" id="adddefaultcharset">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir yanıtın içerik türü <code>text/plain</code> veya
+  <code>text/html</code> olduğunda eklenecek öntanımlı karakter kümesi
+  parametresini belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>AddDefaultCharset On|Off|<var>karküm</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>AddDefaultCharset Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Bu yönerge, yanıtın içerik türü <code>text/plain</code> veya
+      <code>text/html</code> olmak şartıyla yanıta eklenecek karakter
+      kümesini (karakter kodlamasınının ismini) belirler. Bu, asıl davranış
+      çoğunlukla kullanıcının istemci yapılandırmasına bağlı olmakla
+      birlikte, yanıtın gövdesinde <code>META</code> elemanı vasıtasıyla
+      belirtilmiş karakter kümesini geçersiz kılar. <code>AddDefaultCharset
+      Off</code> ÅŸeklinde bir atama bu iÅŸlevselliÄŸi iptal eder.
+      <code>AddDefaultCharset On</code> ile bu işlevsellik etkin kılınmaktan
+      başka <code>iso-8859-1</code> karakter kümesini öntanımlı olarak yanıta
+      eklenir. Yönergede <var>karküm</var> olarak belirtilecek değerler, MIME
+      ortam türlerinde kullanmak üzere <a href="http://www.iana.org/assignments/character-sets">IANA’da kayıtlı
+      karakter kümesi değerleri</a>nden biri olmalıdır. Örnek:</p>
+
+    <div class="example"><p><code>
+      AddDefaultCharset utf-8
+    </code></p></div>
+
+    <p><code class="directive">AddDefaultCharset</code> yönergesi sadece, metin
+      kaynaklarının hepsinin aynı karakter kümesine sahip olduğu bilindiği
+      takdirde ve her birinde ayrı ayrı karakter kümesi belirtmek çok
+      külfetli olacaksa kullanılmalıdır. Buna bir örnek, CGI betikleri
+      tarafından üretilmiş içeriğe sahip kaynaklara karakter kümesinin
+      eklenmesidir; böyle kaynaklar çıktıda kullanıcı tarafından sağlanmış
+      veri içermeleri nedeniyle karşı siteden kaynaklanan betikli
+      saldırılardan zarar görebilir. Bununla birlikte, bir öntanımlı karakter
+      kümesi belirtmek, tarayıcılarında “karakter kodlamasını kendiliğinden
+      sapta� özelliğini etkin kılmış kullanıcıları korumayacağından daha iyi
+      bir çözüm bu betikleri bu tür saldırılara karşı düzeltmek veya en iyisi
+      silmektir.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addcharset">AddCharset</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddOutputFilterByType" id="AddOutputFilterByType">AddOutputFilterByType</a> <a name="addoutputfilterbytype" id="addoutputfilterbytype">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Belli bir MIME türüne bir çıktı süzgeci atar.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>AddOutputFilterByType <var>süzgeç</var>[;<var>süzgeç</var>...]
+<var>MIME-türü</var> [<var>MIME-türü</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>2.0.33 ve sonrasında mevcuttur; Apache 2.1 ve sonrasında
+kullanımı önerilmemektedir.</td></tr>
+</table>
+    <p>Bu yönerge yanıtın <a class="glossarylink" href="../glossary.html#mime-type" title="sözlüğe bakınız">MIME türü</a>ne
+      bağlı olarak bir istek için belli bir <a href="../filter.html">çıktı
+      süzgecini</a> etkin kılar. Aşağıda açıklanan belli başlı sorunlardan
+      dolayı bu yönergenin kullanımı önerilmemektedir. Aynı işlevsellik
+      <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> kullanarak saÄŸlanabilmektedir.</p>
+
+    <p>Aşağıdaki örnekte <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> modülünce sağlanan
+      <code>DEFLATE</code> süzgeci kullanılmıştır. Bu süzgeç,
+      <code>text/html</code> veya <code>text/plain</code> olarak yaftalanmış
+      tüm çıktıyı (ister durağan ister devingen olsun) istemciye göndermeden
+      önce sıkıştırır.</p>
+
+    <div class="example"><p><code>
+      AddOutputFilterByType DEFLATE text/html text/plain
+    </code></p></div>
+
+    <p>İçeriğin birden fazla süzgeç tarafından işlenmesini isterseniz süzgeç
+      isimlerini noktalı virgüllerle ayırarak belirtebilirsiniz. Ayrıca, bu
+      süzgeçlerin her biri için ayrı bir
+      <code class="directive">AddOutputFilterByType</code> yönergesi belirtmek de
+      mümkündür.</p>
+
+    <p>Aşağıdaki yapılandırma <code>text/html</code> olarak yaftalanmış tüm
+      betik çıktılarının önce <code>INCLUDES</code> sonra da
+      <code>DEFLATE</code> süzgecinden geçirilmesine sebep olur.</p>
+
+    <div class="example"><p><code>
+    &lt;Location /cgi-bin/&gt;<br />
+    <span class="indent">
+      Options Includes<br />
+      AddOutputFilterByType INCLUDES;DEFLATE text/html<br />
+    </span>
+    &lt;/Location&gt;
+    </code></p></div>
+
+    <div class="warning"><h3>Ek Bilgi</h3>
+      <p>Süzgeçlerin <code class="directive">AddOutputFilterByType</code> ile etkin
+        kılınması bazı durumlarda kısmen bazılarında da tamamen başarısızlığa
+        uğrayabilir. Örneğin, <a class="glossarylink" href="../glossary.html#mime-type" title="sözlüğe bakınız">MIME türü</a>
+        saptanamadığı takdirde hiçbir süzgeç uygulanmaz ve <code class="directive"><a href="#defaulttype">DefaultType</a></code> aynı olsa bile son çare olarak
+        <code class="directive"><a href="#defaulttype">DefaultType</a></code> ayarlarına geri
+        dönülür.</p>
+
+      <p>Bununla birlikte, süzgeçlerin uygulanacağına emin olmak isterseniz,
+        bir kaynağa içerik türünü örneğin, <code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code> veya
+        <code class="directive"><a href="#forcetype">ForceType</a></code> ile açıkça
+        atayabilirsiniz. Ayrıca, içerik türünü (bir nph-olmayan) CGI betiği
+        içinde ayarlamak da bu güvenceyi sağlar.</p>
+
+    </div>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code></li>
+<li><code class="directive"><a href="#setoutputfilter">SetOutputFilter</a></code></li>
+<li><a href="../filter.html">Süzgeçler</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AllowEncodedSlashes" id="AllowEncodedSlashes">AllowEncodedSlashes</a> <a name="allowencodedslashes" id="allowencodedslashes">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Kodlanmış dosya yolu ayracı içeren URL’lere izin verilip
+  verilmeyeceÄŸini belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>AllowEncodedSlashes On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>AllowEncodedSlashes Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Apache 2.0.46 ve sonrasında mevcuttur.</td></tr>
+</table>
+    <p><code class="directive">AllowEncodedSlashes</code> yönergesi kodlanmış dosya
+      yolu ayracı içeren URL’lere izin verir (<code>/</code> yerine
+      <code>%2F</code> ve ek olarak <code>\</code> için ilgili sistemlerde
+      <code>%5C</code> kullanılmış URL’ler). Normalde böyle URL’ler bir 404
+      (Nesne bulunamadı) hatasıyla reddedilirler.</p>
+
+    <p><code class="directive">AllowEncodedSlashes</code> <code>On</code>, çoğunlukla
+      <code>PATH_INFO</code> ile bir arada kullanıldığı zaman
+      kullanışlıdır.</p>
+
+    <div class="note"><h3>Ek Bilgi</h3>
+      <p>Kodlanmış bölü çizgilerine izin vermek bu kodlamanın karakter olarak
+        çözümleneceği anlamına gelmez. URL içindeki <code>%2F</code> veya
+        <code>%5C</code>’ler (sadece ilgili sistemlerde), tıpkı normal
+        URL’lere yapıldığı gibi, oldukları gibi bırakılırlar.</p>
+    </div>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="#acceptpathinfo">AcceptPathInfo</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AllowOverride" id="AllowOverride">AllowOverride</a> <a name="allowoverride" id="allowoverride">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td><code>.htaccess</code> dosyalarında bulunmasına izin verilen
+  yönerge türleri belirtilir.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>AllowOverride All|None|<var>yönerge-türü</var>
+[<var>yönerge-türü</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>AllowOverride All</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>dizin</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Sunucu <code class="directive"><a href="#accessfilename">AccessFileName</a></code> yönergesi
+      ile belirtildiği şekilde bir <code>.htaccess</code> dosyasına rastlarsa
+      önceki yapılandırma yönergelerinin hangilerinin geçersiz kılınmak üzere
+      bildirildiÄŸini bilmek ister.</p>
+
+    <div class="note"><h3>Sadece &lt;Directory&gt; bölümlerinde geçerli</h3>
+      <code class="directive">AllowOverride</code> yönergesi, <code class="directive"><a href="#location">&lt;Location&gt;</a></code>, <code class="directive"><a href="#directorymatch">&lt;DirectoryMatch&gt;</a></code> veya <code class="directive"><a href="#files">&lt;Files&gt;</a></code> bölümlerinde değil,
+      sadece düzenli ifade içermeyen <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> bölümlerinde geçerlidir.
+    </div>
+
+    <p>Yönergeye değer olarak <code>None</code> belirtilirse <a href="#accessfilename">.htaccess</a> dosyaları tamamen yok sayılır. Bu
+      durumda, sunucu dosya sisteminde rastladığı <code>.htaccess</code>
+      dosyalarını okumaya dahi çalışmayacaktır.</p>
+
+    <p>Bu yönergeye <code>All</code> değeri atanırsa, .htaccess <a href="directive-dict.html#Context">bağlamında</a> kullanılabilecek her
+      yönergeye <code>.htaccess</code> dosyalarında izin verilir.</p>
+
+    <p><code><var>yönerge-türü</var></code> olarak aşağıdaki yönerge grup
+      isimlerinden biri belirtilebilir:</p>
+
+    <dl>
+      <dt>AuthConfig</dt>
+
+      <dd><code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></code>,
+        <code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code>,
+        <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code>,
+        <code class="directive"><a href="#authname">AuthName</a></code>,
+        <code class="directive"><a href="#authtype">AuthType</a></code>,
+        <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code>,
+        <code class="directive"><a href="#require">Require</a></code>
+        <em>ve benzeri</em> yetkilendirme yönergelerinin kullanımını izin
+        verilir.</dd>
+
+      <dt>FileInfo</dt>
+
+      <dd>Belge türünü denetleyen <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code>
+        <code>Add*</code> ve <code>Remove*</code> yönergeleri,
+        <code class="directive"><a href="#defaulttype">DefaultType</a></code>,
+        <code class="directive"><a href="#errordocument">ErrorDocument</a></code>,
+        <code class="directive"><a href="#forcetype">ForceType</a></code>,
+        <code class="directive"><a href="../mod/mod_negotiation.html#languagepriority">LanguagePriority</a></code>,
+        <code class="directive"><a href="#sethandler">SetHandler</a></code>,
+        <code class="directive"><a href="#setinputfilter">SetInputFilter</a></code>,
+        <code class="directive"><a href="#setoutputfilter">SetOutputFilter</a></code>
+        yönergeleri ve benzerleri ile
+        <code class="directive"><a href="../mod/mod_headers.html#header">Header</a></code>,
+        <code class="directive"><a href="../mod/mod_headers.html#requestheader">RequestHeader</a></code>,
+        <code class="directive"><a href="../mod/mod_setenvif.html#setenvif">SetEnvIf</a></code>,
+        <code class="directive"><a href="../mod/mod_setenvif.html#setenvifnocase">SetEnvIfNoCase</a></code>,
+        <code class="directive"><a href="../mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code>,
+        <code class="directive"><a href="../mod/mod_usertrack.html#cookieexpires">CookieExpires</a></code>,
+        <code class="directive"><a href="../mod/mod_usertrack.html#cookiedomain">CookieDomain</a></code>,
+        <code class="directive"><a href="../mod/mod_usertrack.html#cookiestyle">CookieStyle</a></code>,
+        <code class="directive"><a href="../mod/mod_usertrack.html#cookietracking">CookieTracking</a></code>,
+        <code class="directive"><a href="../mod/mod_usertrack.html#cookiename">CookieName</a></code>
+        belge meta veri yönergelerinin,
+        <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> modülündeki
+        <code class="directive"><a href="../mod/mod_rewrite.html#rewriteengine">RewriteEngine</a></code>,
+        <code class="directive"><a href="../mod/mod_rewrite.html#rewriteoptions">RewriteOptions</a></code>,
+        <code class="directive"><a href="../mod/mod_rewrite.html#rewritebase">RewriteBase</a></code>,
+        <code class="directive"><a href="../mod/mod_rewrite.html#rewritecond">RewriteCond</a></code>,
+        <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>
+        yönergelerinin ve <code class="module"><a href="../mod/mod_actions.html">mod_actions</a></code> modülündeki
+        <code class="directive"><a href="../mod/mod_actions.html#action">Action</a></code>
+        yönergesinin kullanımına izin verilir.
+      </dd>
+
+      <dt>Indexes</dt>
+
+      <dd>Dizin içeriğinin listelenmesini denetleyen
+        <code class="directive"><a href="../mod/mod_autoindex.html#adddescription">AddDescription</a></code>,
+        <code class="directive"><a href="../mod/mod_autoindex.html#addicon">AddIcon</a></code>,
+        <code class="directive"><a href="../mod/mod_autoindex.html#addiconbyencoding">AddIconByEncoding</a></code>,
+        <code class="directive"><a href="../mod/mod_autoindex.html#addiconbytype">AddIconByType</a></code>,
+        <code class="directive"><a href="../mod/mod_autoindex.html#defaulticon">DefaultIcon</a></code>,
+        <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>,
+        <code class="directive"><a href="../mod/mod_autoindex.html#fancyindexing">FancyIndexing</a></code>,
+        <code class="directive"><a href="../mod/mod_autoindex.html#headername">HeaderName</a></code>,
+        <code class="directive"><a href="../mod/mod_autoindex.html#indexignore">IndexIgnore</a></code>,
+        <code class="directive"><a href="../mod/mod_autoindex.html#indexoptions">IndexOptions</a></code>,
+        <code class="directive"><a href="../mod/mod_autoindex.html#readmename">ReadmeName</a></code>
+        yönergelerinin <em>ve benzerlerinin</em> kullanımına izin
+        verilir.</dd>
+
+      <dt>Limit</dt>
+
+      <dd>Konak eriÅŸimini denetleyen
+        <code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code>,
+        <code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code> ve
+        <code class="directive"><a href="../mod/mod_authz_host.html#order">Order</a></code>
+        yönergelerinin kullanımına izin verilir.</dd>
+
+      <dt>Options[=<var>seçenek</var>,...]</dt>
+
+      <dd>Dizinlere özgü özellikleri denetleyen
+        <code class="directive"><a href="#options">Options</a></code> ve
+        <code class="directive"><a href="../mod/mod_include.html#xbithack">XBitHack</a></code> yönergelerinin
+        kullanımına izin verilir. <code class="directive"><a href="#options">Options</a></code> komutunda belirtilecek seçenekler
+        bir eşit işaretinden sonra aralarına sadece virgül konarak
+        (boÅŸluksuz)  belirtilebilir.</dd>
+    </dl>
+
+    <p>Örnek:</p>
+
+    <div class="example"><p><code>
+      AllowOverride AuthConfig Indexes
+    </code></p></div>
+
+    <p>Bu örnekte <code>AuthConfig</code> ve <code>Indexes</code> grubundaki
+     yönergeler bir dahili sunucu hatasına yol açmayacaktır.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="#accessfilename">AccessFileName</a></code></li>
+<li><a href="../configuring.html">Yapılandırma Dosyaları</a></li>
+<li><a href="../howto/htaccess.html">.htaccess Dosyaları</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthName" id="AuthName">AuthName</a> <a name="authname" id="authname">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>HTTP kimlik doğrulamasında kullanmak için yetki alanı ismi</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>AuthName <var>yetki-alanı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Bu yönerge bir dizin için yetki alanı ismi belirler. Bu alan istemciye bildirilerek kullanıcının hangi kullanıcı ismini ve parolasını kullanacağını bilmesi sağlanır. <code class="directive">AuthName</code> tek bir argüman alır. Bu bakımdan eğer alan ismi boşluk karakterleri içeriyorsa ismin tırnak içine alınması gerekir. Çalışması için <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code> ve
+    <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code> gibi yönergelerden başka <code class="directive"><a href="#authtype">AuthType</a></code> ve <code class="directive"><a href="#require">Require</a></code> yönergelerinin kendine eşlik etmesini gerektirir.</p>
+
+   <p>Örnek:</p>
+
+   <div class="example"><p><code>
+     AuthName "Top Secret"
+   </code></p></div>
+
+    <p><code>AuthName</code> için belirtilen dizge çoğu tarayıcı tarafından parola diyaloğunda gösterilir.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><a href="../howto/auth.html">Kimlik DoÄŸrulama, Yetkilendirme ve EriÅŸim Denetimi</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthType" id="AuthType">AuthType</a> <a name="authtype" id="authtype">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Kullanıcı kimlik doğrulaması türü</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>AuthType Basic|Digest</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Bu yönerge bir dizin için kullanıcı kimlik doğrulaması türünü belirler. Olası kimlik doğrulama türleri <code>Basic</code> (<code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> modülüyle sağlanır) ve <code>Digest</code>’tir (<code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code> modülüyle sağlanır).</p>
+
+    <p>Kimlik doğrulamasının gerçekleşmesi için <code class="directive"><a href="#authname">AuthName</a></code> ve <code class="directive"><a href="#require">Require</a></code> yönergelerini de kullanmalısınız. Bunlara ek olarak sunucunun <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code> gibi bir kimlik doğrulayıcı modülüne ve <code class="module"><a href="../mod/mod_authz_user.html">mod_authz_user</a></code> gibi bir yetkilendirme modülüne ihtiyacı vardır.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><a href="../howto/auth.html">Kimlik DoÄŸrulama, Yetkilendirme ve EriÅŸim Denetimi</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CGIMapExtension" id="CGIMapExtension">CGIMapExtension</a> <a name="cgimapextension" id="cgimapextension">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>CGI betik yorumlayıcısını saptama tekniğini belirler.
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>CGIMapExtension <var>cgi-yolu</var> <var>.uzantı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Sadece NetWare’de geçerlidir.</td></tr>
+</table>
+    <p>Bu yönerge Apache’inin CGI bekitlerini çalıştırmak için kullanacağı
+      yorumlayıcıyı nasıl bulacağını denetlemek için kullanılır. Örneğin,
+      <code>CGIMapExtension sys:\foo.nlm .foo</code> satırı <code>.foo</code>
+      uzantılı CGI betik dosyalarının FOO yorumlayıcıya aktarılmasını
+      saÄŸlar.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ContentDigest" id="ContentDigest">ContentDigest</a> <a name="contentdigest" id="contentdigest">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td><code>Content-MD5</code> HTTP yanıt başlıklarının üretimini
+  etkin kılar.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ContentDigest On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>ContentDigest Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>Options</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Bu yönerge RFC2616 ve RFC1864’te tanımlandığı gibi
+      <code>Content-MD5</code> üretimini etkin kılar.</p>
+
+    <p>MD5, verideki herhangi bir değişikliğin ileti özetinin değişmesi
+      olarak yansıması nedeniyle yüksek derecede itimat sağlayan keyfi
+      uzunlukta bir "ileti özeti" (bazen "parmakizi" dendiği de olur)
+      hesaplama algoritmasıdır.</p>
+
+    <p><code>Content-MD5</code> başlığı öğe gövdesinin iki uç arasında ileti
+      bütünlük sınamasının yapılabilmesini sağlar. Bir istemci veya vekil
+      aktarılan öğe gövdesinde rastlantısal bir değişiklik olup olmadığını
+      saptamak için bu başlığın doğruluğunu sınayabilir. Başlık örneği:</p>
+
+    <div class="example"><p><code>
+      Content-MD5: AuLb7Dp1rqtRtxz2m9kRpA==
+    </code></p></div>
+
+    <p>Her istekte ileti özeti hesaplanacağından (değerler saklanmaz), bu
+      yönergenin sunucunuzda başarım sorunlarına yol açacağına dikkat
+      ediniz.</p>
+
+    <p><code>Content-MD5</code>, herhangi bir modül değil, sadece
+      <code class="module"><a href="../mod/core.html">core</a></code> modülü tarafından sunulan belgeler için
+      gönderilir. Örneğin, SSI belgeleri CGI betikleri tarafından
+      çıktılanırlar ve bayt seviyesinden çıktılar bu başlığa sahip
+      olmazlar.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DefaultType" id="DefaultType">DefaultType</a> <a name="defaulttype" id="defaulttype">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Sunucunun MIME türünü saptayamadığı durumda göndereceği MIME
+  içerik türünü belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>DefaultType <var>MIME-türü</var>|none</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>DefaultType text/plain</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Sunucudan zaman zaman kendi <a class="glossarylink" href="../glossary.html#mime-type" title="sözlüğe bakınız">MIME
+      türü</a> ile uyuşmayan bir belge sunması istenir.</p>
+
+    <p>Sunucu, belgenin içerik türünü istemciye bildirmek zorundadır. Eğer
+      sunucu bunu normal yollardan saptayamazsa içerik türü olarak
+      <code>DefaultType</code> ile belirtilen değeri gönderir. Örneğin, GIF
+      dosyaları bulunan bir dizinde <code>.gif</code> uzantısına sahip
+      olmayan dosyaların da bulunması durumunda, bu dizin için,</p>
+
+    <div class="example"><p><code>
+      DefaultType image/gif
+    </code></p></div>
+
+    <p>belirtilmesi uygun olurdu.</p>
+
+    <p>İçerik türünün ne sunucu ne de yönetici (örneğin, vekil) tarafından
+      saptanabildiği durumlarda MIME türünün yanlış belirtilmesindense tür
+      belirtmemek tercih edilebilir. Bu, şöyle yapılabilir:</p>
+    <div class="example"><p><code>
+      DefaultType None
+    </code></p></div>
+    <p><code>DefaultType None</code> sadece httpd-2.2.7 ve sonrasında
+      mevcuttur..</p>
+
+    <p>Bu yönergenin sadece öntanımlı MIME-türünü sağlaması nedeniyle
+      <code class="directive"><a href="#forcetype">ForceType</a></code> yönergesinden farklı
+      olduğuna dikkat ediniz. Dosya ismi uzantıları dahil, tüm diğer
+      MIME-türü tanımları ortam türünü tanımladığı noktada bu öntanımlı türü
+      sunulan veri için geçersiz kılacaktır.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Directory" id="Directory">&lt;Directory&gt;</a> <a name="directory" id="directory">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Sadece ismi belirtilen dosya sistemi dizininde ve bunun
+  altdizinlerinde uygulanacak bir yönerge grubunu sarmalar.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>&lt;Directory <var>dizin-yolu</var>&gt;
+... &lt;/Directory&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">&lt;Directory&gt;</code> ve
+      <code>&lt;/Directory&gt;</code> sadece ismi belirtilen dosya sistemi
+      dizininde ve bunun altdizinlerinde uygulanacak bir yönerge grubunu
+      sarmalamakta kullanılır. Bir dizin bağlamında kullanılabilecek her
+      yönergeye izin verilir. <var>dizin-yolu</var> bir dizinin tam yolu
+      olabileceği gibi Unix kabuk tarzı bir dosya ismi eşleştirme kalıbı da
+      olabilir. Kalıp dizgesinde, <code>?</code> herhangi bir tek karakterle,
+      <code>*</code> herhangi bir karakter dizisiyle eşleşir. Ayrıca
+      <code>[]</code> karakter aralıkları da kullanılabilir. ‘/’ karakteri
+      ile hiçbir kalıp karakteri eşleşmez, bu bakımdan <code>&lt;Directory
+      /*/public_html&gt;</code> ile <code>/home/user/public_html</code>
+      deÄŸil, ama <code>&lt;Directory /home/*/public_html&gt;</code>
+      eşleşecektir. Örnek:</p>
+
+    <div class="example"><p><code>
+      &lt;Directory /usr/local/httpd/htdocs&gt;<br />
+      <span class="indent">
+        Options Indexes FollowSymLinks<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <div class="note">
+      <p><var>dizin-yolu</var> argümanlarını belirtirken dikkatli
+        olmalısınız: Apache’nin dosyalara erişmekte kullandığı dosya sistemi
+        yolu ile bire bir eÅŸleÅŸmelidir. Belli bir
+        <code>&lt;Directory&gt;</code> dizinine uygulanan yönergeler, aynı
+        dizine farklı bir yoldan, örneğin başka bir sembolik bağ üzerinden
+        erişilen dosyalara uygulanmayacaktır.</p>
+    </div>
+
+    <p><code>~</code> karakterine ek olarak <a class="glossarylink" href="../glossary.html#regex" title="sözlüğe bakınız">düzenli
+      ifadeler</a> de kullanılabilir. Örnek:</p>
+
+    <div class="example"><p><code>
+      &lt;Directory ~ "^/www/.*/[0-9]{3}"&gt;
+    </code></p></div>
+
+    <p>yönergesi <code>/www/</code> içindeki üç rakamdan oluşan dizinlerle
+      eÅŸleÅŸecektir.</p>
+
+    <p>Eğer çok sayıda (düzenli ifade olmayan) <code class="directive">&lt;Directory&gt;</code> bölümü, bir dosyayı içeren bir
+      dizinle veya üst dizinlerinden biri ile eşleşiyorsa, uygulama en kısa
+      eşleşmedeki yönergelerden başlayarak <a href="#accessfilename">.htaccess</a> dosyalarındaki yönergelere kadar
+      genişletilir. Örneğin,</p>
+
+    <div class="example"><p><code>
+      &lt;Directory /&gt;<br />
+      <span class="indent">
+        AllowOverride None<br />
+      </span>
+      &lt;/Directory&gt;<br />
+      <br />
+      &lt;Directory /home/&gt;<br />
+      <span class="indent">
+        AllowOverride FileInfo<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p>bölümleri ile <code>/home/web/dir/doc.html</code> belgesine erişirken
+      şu aşamalardan geçilir:</p>
+
+    <ul>
+      <li><code>AllowOverride None</code> yönergesi uygulanır
+        (<code>.htaccess</code> dosyaları iptal edilir).</li>
+
+      <li><code>AllowOverride FileInfo</code> yönergesi uygulanır
+        (<code>/home</code> dizini için).</li>
+
+      <li>Sırayla <code>/home/.htaccess</code>,
+        <code>/home/web/.htaccess</code> ve
+        <code>/home/web/dir/.htaccess</code> dosyaları içindeki
+        <code>FileInfo</code> yönergeleri uygulanır.</li>
+    </ul>
+
+    <p>Normal bölümlerin tamamı uygulanıncaya kadar düzenli ifadeler
+      değerlendirilmez. Düzenli ifadelerin tamamı yapılandırma dosyasında
+      görüldükleri sıraya göre sınanırlar. Örneğin,</p>
+
+    <div class="example"><p><code>
+      &lt;Directory ~ abc$&gt;<br />
+      <span class="indent">
+        # ... yönergeler burada ...<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p>düzenli ifadeli bölümü, tüm normal <code class="directive">&lt;Directory&gt;</code> bölümleri ve
+      <code>.htaccess</code> dosyaları uygulanıncaya kadar
+      değerlendirilmeyecektir. Düzenli ifadeleri değerlendirmeye sıra gelince
+      düzenli ifade <code>/home/abc/public_html/abc</code> ile eşleştirilecek
+      ve buna iliÅŸkin <code class="directive">&lt;Directory&gt;</code>
+      uygulanacaktır.</p>
+
+   <p><strong><code>&lt;Directory /&gt;</code> için öntanımlı Apache
+    erişiminin  <code>Allow from All</code> oluşuna dikkat ediniz. Bunu şöyle
+    bir blokla deÄŸiÅŸtirmeniz,</strong></p>
+
+    <div class="example"><p><code>
+      &lt;Directory /&gt;<br />
+      <span class="indent">
+        Order Deny,Allow<br />
+        Deny from All<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p><strong>ve erişilebilir olmasını istediğiniz dizinleri ayrıca
+      belirtmeniz önerilir. Daha ayrıntılı bilgi edinmek için <a href="../misc/security_tips.html">Güvenlik İpuçları</a> belgesine
+      bakınız.</strong></p>
+
+    <p>Dizin bölümleri <code>httpd.conf</code> dosyasında yer alır.
+      <code class="directive">&lt;Directory&gt;</code> yönergeleri iç içe
+      olamazlar ve bir <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> veya <code class="directive"><a href="#limitexcept">&lt;LimitExcept&gt;</a></code> bölümü içinde bulunamazlar.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li>Bir istek alındığında farklı yapılandırma bölümlerinin nasıl bir
+  arada ele alındığının anlatıldığı <a href="../sections.html">&lt;Directory&gt;, &lt;Location&gt; ve
+  &lt;Files&gt; bölümleri nasıl çalışır?</a> belgesine de bakınız.</li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DirectoryMatch" id="DirectoryMatch">&lt;DirectoryMatch&gt;</a> <a name="directorymatch" id="directorymatch">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir düzenli ifade ile eşleşen dosya sistemi dizininde ve bunun
+  altdizinlerinde uygulanacak bir yönerge grubunu sarmalar.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>&lt;DirectoryMatch <var>düzifd</var>&gt;
+... &lt;/DirectoryMatch&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">&lt;DirectoryMatch&gt;</code> and
+    <code>&lt;/DirectoryMatch&gt;</code> yönergeleri <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> gibi sadece ismi
+      belirtilen dosya sistemi dizininde ve bunun altdizinlerinde uygulanacak
+      bir yönerge grubunu sarmalamakta kullanılır. Tek farkla argüman olarak
+      bir <a class="glossarylink" href="../glossary.html#regex" title="sözlüğe bakınız">düzenli ifade</a> alır. Örnek:</p>
+
+    <div class="example"><p><code>
+      &lt;DirectoryMatch "^/www/(.+/)?[0-9]{3}"&gt;
+    </code></p></div>
+
+    <p>yönergesi <code>/www/</code> içindeki üç rakamdan oluşan dizinlerle
+      eÅŸleÅŸecektir.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li>Normal <code class="directive">&lt;Directory&gt;</code>
+  bölümlerindeki yönergelerle düzenli ifadelerin nasıl karıştırıldığının bir
+  açıklaması için <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> yönergesine bakınız.</li>
+<li>Bir istek alındığında farklı yapılandırma bölümlerinin nasıl bir arada
+  ele alındığının açıklaması için <a href="../sections.html">&lt;Directory&gt;, &lt;Location&gt; ve
+  &lt;Files&gt; bölümleri nasıl çalışır?</a> belgesine bakınız.</li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DocumentRoot" id="DocumentRoot">DocumentRoot</a> <a name="documentroot" id="documentroot">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>İstemciye görünür olan ana belge ağacının kök dizinini belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>DocumentRoot <var>dizin-yolu</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>DocumentRoot /usr/local/apache/htdocs</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Bu yönerge <code class="program"><a href="../programs/httpd.html">httpd</a></code> tarafından dosyalarının sunulacağı
+      dizini belirler. <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code>
+      benzeri bir yönerge ile eşleşmedikçe, sunucu istenen URL’deki yolu,
+      belge yolu haline getirmek için belge kök dizinine ekler. Örnek:</p>
+
+    <div class="example"><p><code>
+      DocumentRoot /usr/web
+    </code></p></div>
+
+    <p>yapılandırması ile <code>http://www.my.host.com/index.html</code>
+      isteÄŸi <code>/usr/web/index.html</code> ile eÅŸleÅŸtirilir.
+      <var>dizin-yolu</var> ile göreli dosya yolu belirtildiği takdirde belge
+      kök dizininin <code class="directive"><a href="#serverroot">ServerRoot</a></code> ile
+      belirtilen sunucu kök dizinine göre belirtildiği varsayılır.</p>
+
+    <p><code class="directive">DocumentRoot</code> ile belirtilen dizin bir bölü
+      çizgisi ile bitirilmemelidir.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><a href="../urlmapping.html#documentroot">URL’lerin Dosya Sistemi
+  ile EÅŸlenmesi</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="EnableMMAP" id="EnableMMAP">EnableMMAP</a> <a name="enablemmap" id="enablemmap">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Teslimat sırasında okunacak dosyalar için bellek eşlemeyi etkin
+  kılar.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>EnableMMAP On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>EnableMMAP On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Bu yönerge, sunucunun teslimat sırasında gerektiği takdirde bir dosya
+      içeriğinin okunması için bellek eşleme kullanıp kullanmayacağını
+      belirler. Öntanımlı olarak, bir isteğin yerine getirilmesi,
+      <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> kullanarak sunucu tarafından çözümlenen
+      bir dosyanın teslimatı sırasında olduğu gibi, bir dosya içindeki veriye
+      erişilmesini gerektirdiğinde Apache, işletim sistemi tarafından
+      desteklendiği takdirde dosyayı belleğe eşler.</p>
+
+    <p>Böyle bellek eşleme kimi zaman başarım artışını beraberinde getirirse
+      de bazen sorunlardan kaçınmak için bellek eşlemeyi kapatmak daha iyi
+      sonuç verir:</p>
+
+    <ul>
+    <li>Bazı çok işlemcili sistemlerde bellek eşleme
+      <code class="program"><a href="../programs/httpd.html">httpd</a></code>’nin başarımını düşürebilmektedir.</li>
+    <li><code class="directive"><a href="#documentroot">DocumentRoot</a></code> NFS gibi bir aÄŸ
+      dosya sistemi üzerinde ise ağ kopması sonucunda, bir dosyanın silinmesi
+      veya dosya okuma iÅŸleminin  kesilmesi durumunda
+      <code class="program"><a href="../programs/httpd.html">httpd</a></code> parçalama arızası vererek çökebilir.</li>
+    </ul>
+
+    <p>Bu tür sorunlardan dolayı zarar görülebilecek sunucu
+      yapılandırmalarında dosya teslimatında bellek eşlemlerinin kullanımını
+      ÅŸu ÅŸekilde iptal etmeniz gerekir:</p>
+
+    <div class="example"><p><code>
+      EnableMMAP Off
+    </code></p></div>
+
+    <p>Bu özellik, sadece NFS dosya sistemi üzerinde sunulan dosyaları
+      kapsamak üzere şu şekilde kolayca kapatılabilir:</p>
+
+    <div class="example"><p><code>
+      &lt;Directory "/nfs-dosya-yolu"&gt;
+      <span class="indent">
+        EnableMMAP Off
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="EnableSendfile" id="EnableSendfile">EnableSendfile</a> <a name="enablesendfile" id="enablesendfile">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Dosyaların istemciye tesliminde çekirdeğin dosya gönderme
+  desteğinin kullanımını etkin kılar.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>EnableSendfile On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>EnableSendfile On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>2.0.44 ve sonrasında mevcuttur.</td></tr>
+</table>
+    <p>Bu yönerge, dosya içeriğinin istemciye teslimi için
+      <code class="program"><a href="../programs/httpd.html">httpd</a></code>’nin çekirdeğin dosya gönderme desteğini
+      kullanıp kullanmayacağını belirler. Öntanımlı olarak, bir isteğin
+      yerine getirilmesi, bir durağan dosyanın teslimatı sırasında olduğu
+      gibi, bir dosya içindeki veriye erişilmesini gerektirmediği takdirde
+      Apache, işletim sistemi tarafından destekleniyorsa dosyayı istemciye
+      teslim etmek için çekirdeğin dosya gönderme özelliğini kullanır.</p>
+
+    <p>Çekirdeğin dosya gönderme mekanizması, okuma, gönderme ve tampon
+      ayırma işlemlerini ayrı ayrı yapmaktan kaçınır. Fakat bazı
+      platformlarda veya bazı dosya sistemlerinde aşağıda belirtilen işlemsel
+      sorunlardan kaçınmak için bu özelliği iptal etmek daha iyidir:</p>
+
+    <ul>
+    <li>Bazı platformlar,  derleme sistemince saptanamayan bozuk bir dosya
+      gönderme desteğine sahiptir; özellikle eğer derleme işlemi dosya
+      gönderme desteğinde sorun olmayan bir makinede yapılıp çalıştırılabilir
+      dosyaların sorunlu makineye kurulduğu durumda bu saptama
+      yapılamayacaktır.</li>
+    <li>Linux’ta IPv6 kullanırken dosya gönderme desteği bazı ağ
+      kartlarındaki TCP toplama sağlaması aktarım hatasını tetikler.</li>
+    <li>Itanium üzerinde çalışan Linux’ta dosya gönderme desteği 2GB’tan
+      büyük dosyalarla çalışamamaktadır.</li>
+    <li><code class="directive"><a href="#documentroot">DocumentRoot</a></code> aÄŸ dosya sistemi
+      (NFS veya SMB gibi) üzerinde olduğu durumda çekirdek ağ dosyalarını
+      kendi arabelleği üzerinden sunamayabilir.</li>
+    </ul>
+
+    <p>Bu sorunlardan muzdarip sunucu yapılandırmaları için bu özelliği şöyle
+      iptal edebilirsiniz:</p>
+
+    <div class="example"><p><code>
+      EnableSendfile Off
+    </code></p></div>
+
+    <p>Bu özellik, sadece bir NFS veya SMB dosya sistemi üzerinde sunulan
+      dosyaları kapsamak üzere şu şekilde kolayca kapatılabilir:</p>
+
+    <div class="example"><p><code>
+      &lt;Directory "/path-to-nfs-files"&gt;
+      <span class="indent">
+        EnableSendfile Off
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ErrorDocument" id="ErrorDocument">ErrorDocument</a> <a name="errordocument" id="errordocument">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir hata durumunda sunucunun istemciye ne döndüreceğini
+  belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ErrorDocument <var>hata-kodu</var> <var>belge</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Metin iletilerini tırnak içine alma sözdizimi Apache 2.0’da
+  farklıdır.</td></tr>
+</table>
+    <p>Bir sorun çıktığında veya hata oluştuğunda Apache şu dört işlemden
+      birini yapacak şekilde yapılandırılabilir:</p>
+
+    <ol>
+      <li>Yerleşik bir hata iletisi çıktılanır.</li>
+
+      <li>Özel bir ileti çıktılanır.</li>
+
+      <li>Sorunu/hatayı işleyecek yerel bir <var>URL-yoluna</var> yönlendirme
+        yapılır.</li>
+
+      <li>Sorunu/hatayı işleyecek harici bir <var>URL-yoluna</var>
+        yönlendirme yapılır.</li>
+    </ol>
+
+    <p>İlk seçenek öntanımlıdır. Diğer üç seçenek
+      <code class="directive">ErrorDocument</code> yönergesinin argümanları (hata
+      kodundan sonra bir URL veya hata iletisi) ile belirtilir. Apache bazı
+      durumlarda sorun/hata ile ilgili ek bilgi verecektir.</p>
+
+    <p>URL’ler yerel yollarda (<code class="directive"><a href="#documentroot">DocumentRoot</a></code>’a göre) bir bölü çizgisi (/) ile
+      başlatılabileceği gibi istemci tarafından çözümlenecek tam bir URL
+      şeklinde de belirtilebilir. Bunlar yerine, tarayıcıda gösterilmek üzere
+      bir ileti de belirtilebilir. Örnekler:</p>
+
+    <div class="example"><p><code>
+      ErrorDocument 500 http://hata.meselae.dom/cgi-bin/dnmci<br />
+      ErrorDocument 404 /cgi-bin/bad_urls.pl<br />
+      ErrorDocument 401 /subscription_info.html<br />
+      ErrorDocument 403 "Kusura bakmayın, bugün hizmet veremiyoruz."
+    </code></p></div>
+
+    <p>Bunlardan başka, Apache’nin kendi hata iletilerinin kullanılacağı özel
+      <code>default</code> değeri ile belirtilebilir. Normal şartlar altında
+      gerekmese de, bir ÅŸey belirtilmediÄŸi takdirde mevcut bir
+      <code class="directive">ErrorDocument</code> yönergesini miras alan
+      yapılandırmalarda Apache’nin kendi hata iletilerinin kullanımı
+      <code>default</code> değeri açıkça belirtilerek örnekteki gibi
+      zorlanabilir:</p>
+
+    <div class="example"><p><code>
+      ErrorDocument 404 /cgi-bin/bad_urls.pl<br /><br />
+      &lt;Directory /web/docs&gt;<br />
+      <span class="indent">
+        ErrorDocument 404 default<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p><code class="directive">ErrorDocument</code> yönergesinde bir uzak URL (önünde
+      <code>http</code> bulunan bir yol) belirtildiğinde, belge aynı sunucuda
+      olsa bile, Apache’nin istemciye belgeyi bulacağı yer için bir
+      yönlendirme göndereceğine dikkat ediniz. Bunun bazı istenmeyen etkileri
+      vardır; en önemlilerinden biri istemcinin hata kodu yerine bir
+      yönlendirme durum kodu alacak olmasıdır. Bu, bir URL’nin geçerliliğini
+      durum koduna göre saptayan istemciler veya robotlar için yanıltıcı
+      olacaktır. Buna ek olarak, <code>ErrorDocument 401</code> için bir uzak
+      URL belirttiğiniz durumda istemci 401 durum kodunu almayacağı için
+      kullanıcıdan parola isteğinde bulunamayacaktır. Bu bakımdan,
+      <strong>ihtiyaç duyduğunuz takdirde, <code>ErrorDocument 401</code>
+      yönergesine yerel bir belge belirtmelisiniz.</strong></p>
+
+    <p>Sunucunun ürettiği hata iletileri "çok kısa" olduğu takdirde,
+      Microsoft Internet Explorer (MSIE) öntanımlı olarak bu hata iletilerini
+      yoksayar ve bunun yerine kendi "kullanıcı dostu" hata iletilerini
+      kullanır. "Çok kısa" eşiği duruma göre değişmekle birlikte, genellikle,
+      hata iletileriniz 512 bayttan büyük olduğu takdirde MSIE kendi hata
+      iletileri yerine sunucunun ürettiği hata iletilerini gösterecektir. Bu
+      konuda daha fazla bilgiyi <a href="http://support.microsoft.com/default.aspx?scid=kb;tr-tr;Q294807">Q294807</a> kodlu Microsoft Knowledge Base makalesinde
+      bulabilirsiniz.</p>
+
+    <p>Çoğu yerleşik hata iletisi özel iletilerle değiştirilebilse de bazı
+      durumlarda <code class="directive"><a href="#errordocument">ErrorDocument</a></code> ile ne
+      belirtildiğine bakılmaksızın yerleşik hata iletileri kullanılır.
+      Özellikle, bozuk bir istek saptandığında normal istek işleme hemen
+      devre dışı bırakılır ve yerleşik hata iletisi döndürülür. Bu, hatalı
+      istekler yaparak güvenlik sorunlarına yol açılmak istenmesi
+      durumlarında gereklidir.</p>
+
+    <p>2.0 öncesi sürümlerde iletiler bir çift çift-tırnak içine alınmayıp,
+      tek bir çift-tırnak ile başlatılması yeterli olurdu.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><a href="../custom-error.html">Özel Hata Yanıtları</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ErrorLog" id="ErrorLog">ErrorLog</a> <a name="errorlog" id="errorlog">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Sunucunun hata günlüğünü tutacağı yeri belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code> ErrorLog <var>dosya-yolu</var>|syslog[:<var>oluşum</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>ErrorLog logs/error_log (Unix) ErrorLog logs/error.log (Windows ve
+  OS/2)</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">ErrorLog</code> yönergesi sunucunun saptadığı hataları
+      kaydedeceği dosyanın ismini belirtmek için kullanılır.
+      <var>dosya-yolu</var> ile göreli dosya yolu belirtildiği takdirde
+      dizininin <code class="directive"><a href="#serverroot">ServerRoot</a></code> ile
+      belirtilen sunucu kök dizinine göre belirtildiği varsayılır.</p>
+
+    <div class="example"><h3>Örnek</h3><p><code>
+    ErrorLog /var/log/httpd/error_log
+    </code></p></div>
+
+    <p><var>dosya-yolu</var> bir boru imi (|) ile başlatıldığı takdirde hata
+      iletilerinin hata günlüğünü işleme sokacak komuta borulanacağı
+      varsayılır.</p>
+
+    <div class="example"><h3>Örnek</h3><p><code>
+    ErrorLog "|/usr/local/bin/httpd_errors"
+    </code></p></div>
+
+    <p>Dosya adı yerine <code>syslog</code> kullanılırsa, sistem desteklediği
+      takdirde günlük kaydı syslogd(8) üzerinden yürütülür. Öntanımlı olarak
+      <code>local7</code> syslog oluşumu kullanılır. Bunu
+      <code>syslog:<var>oluşum</var></code> sözdizimini kullanarak
+      deÄŸiÅŸtirebilirsiniz. Buradaki <code><var>oluÅŸum</var></code>
+      syslog.conf(5) kılavuz sayfasında belirtilen oluşum isimlerinden biri
+      olabilir.</p>
+
+    <div class="example"><h3>Örnek</h3><p><code>
+    ErrorLog syslog:user
+    </code></p></div>
+
+    <p>GÜVENLİK: Günlük dosyalarının saklandığı dizin, sunucuyu başlatan
+      kullanıcı dışındakiler tarafından yazılabilir olduğu takdirde
+      güvenliğinizin nasıl tehlikeye gireceği <a href="../misc/security_tips.html#serverroot">güvenlik ipuçları</a>
+      belgesinde ayrıntılı olarak açıklanmıştır.</p>
+    <div class="warning"><h3>Ek Bilgi</h3>
+      <p>Unix-dışı platformlarda dosya yolunu girerken, platform ters bölü
+        çizgilerini desteklese bile normal bölü çizgileri kullanmaya özen
+        göstermelisiniz. Genel olarak, dosya yollarını belirtirken
+        yapılandırma dosyası boyunca normal bölü çizgisi kullanmak her zaman
+        daha iyidir.</p>
+    </div>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="#loglevel">LogLevel</a></code></li>
+<li><a href="../logs.html">Apache Günlük Dosyaları</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="FileETag" id="FileETag">FileETag</a> <a name="fileetag" id="fileetag">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td><code>ETag</code> HTTP yanıt başlığını oluşturmakta kullanılacak
+  dosya özniteliklerini belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>FileETag <var>bileşen</var> ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>FileETag INode MTime Size</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">FileETag</code> yönergesi, belge bir dosyaya dayandığı
+      takdirde <code>ETag</code> (Entity Tag - öğe etiketi kısaltması) yanıt
+      başlığı alanını oluşturmakta kullanılacak dosya özniteliklerini
+      yapılandırır. (<code>ETag</code> değeri, ağ band genişliğinden kazanmak
+      için arabellek yönetiminde kullanılır.) Apache 1.3.22 ve öncesinde
+      <code>ETag</code> değeri <em>daima</em>  dosyanın düğümü, boyutu ve son
+      değişiklik zamanından (mtime) oluşurdu. <code class="directive">FileETag</code>
+      yönergesi ne kullanılması gerektiğini belirleyebilmenizi sağlar. Değer
+      olarak belirtilebilecek anahtar sözcükler şunlardır:</p>
+
+    <dl>
+     <dt><strong>INode</strong></dt>
+     <dd>Dosyanın düğüm numarası hesaba katılır.</dd>
+     <dt><strong>MTime</strong></dt>
+     <dd>Dosyanın son değişiklik tarih ve saati dahil edilir.</dd>
+     <dt><strong>Size</strong></dt>
+     <dd>Dosyanın bayt cinsinden uzunluğu dahil edilir.</dd>
+     <dt><strong>All</strong></dt>
+     <dd>Olası tüm alanlar kullanılır. Bu şuna eşdeğerdir:
+         <div class="example"><p><code>FileETag INode MTime Size</code></p></div></dd>
+     <dt><strong>None</strong></dt>
+     <dd>Bir belge dosyasıyla sunulsa bile yanıta hiçbir <code>ETag</code>
+      alanı dahil edilmez.</dd>
+    </dl>
+
+    <p>Öntanımlı ayarları miras alıp bunların kapsamını genişletmek/daraltmak
+      için <code>INode</code>, <code>MTime</code> ve <code>Size</code>
+      anahtar sözcüklerinin önüne <code>+</code> veya <code>-</code> imi
+      konabilir. Bu imlerin bulunmadığı bir anahtar sözcüğün varlığı halinde
+      hiçbir değer miras alınmaz.</p>
+
+    <p>Eğer bir dizinin yapılandırması
+      <code>FileETag&nbsp;INode&nbsp;MTime&nbsp;Size</code> ve alt dizini
+      <code>FileETag&nbsp;-INode</code> içeriyorsa bu alt dizinin (ve bir
+      geçersizleştirme olmadığı takdirde onun alt dizinlerinin) ayarları
+      <code>FileETag&nbsp;MTime&nbsp;Size</code> yapılandırmasına eşdeğer
+      olacaktır.</p>
+    <div class="warning"><h3>Uyarı</h3>
+      WebDAV’ın etkin olduğu yerlerde veya dizinlerde saklama alanı sağlayıcı
+      olarak <code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code> kullanılıyorsa öntanımlı ayarları
+      deÄŸiÅŸtirmeyiniz. <code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code>, koÅŸullu isteklerde
+      <code>ETag</code> karşılaştırmaları yapabilmek için
+      <code>INode&nbsp;MTime&nbsp;Size</code> yapılandırmasını kullanır. Eğer
+      <code>ETag</code> ayarı <code class="directive">FileETag</code> yönergesi
+      kullanılarak değiştirilirse koşullu istekler gerektiği gibi yerine
+      getirilemez.
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Files" id="Files">&lt;Files&gt;</a> <a name="files" id="files">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Dosya isimleriyle eşleşme halinde uygulanacak yönergeleri
+  içerir.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>&lt;Files <var>dosya-adı</var>&gt; ... &lt;/Files&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">&lt;Files&gt;</code> yönergesi, içerdiği
+      yönergelerin etki alanını dosya isimlerine göre sınırlandırır.
+      <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> ve
+      <code class="directive"><a href="#location">&lt;Location&gt;</a></code> bölümleri
+      ile karşılaştırılabilir. Bir <code>&lt;/Files&gt;</code> yönergesi ile
+      sonlandırılması gerekir. Bu bölüm içinde belirtilen yönergeler,
+      <code class="directive">&lt;Files&gt;</code> yönergesinde belirtilen
+      <var>dosya-adı</var>’nın son bileşeniyle (dizinler atıldıktan sonda
+      kalan dosya ismi) eşleşen nesnelere uygulanır. <code class="directive">&lt;Files&gt;</code> bölümleri yapılandırma dosyasında,
+      <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> bölümleri
+      ve <code>.htaccess</code> dosyaları okunduktan sonra fakat <code class="directive"><a href="#location">&lt;Location&gt;</a></code> yönergelerinden önce
+      göründükleri sıraya göre işleme sokulurlar. <code class="directive">&lt;Files&gt;</code> bölümlerinin <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> bölümlerinin içinde uygulama
+      alanını sınırlamak amacıyla kullanılabileceğine dikkat ediniz.</p>
+
+    <p><var>dosya-adı</var> argümanının bir dosya ismi veya bir dosya ismi
+      kalıbı içermesi gerekir. Bir dosya ismi kalıbındaki her <code>?</code>
+      imi bir karakterle eÅŸleÅŸtirilirken <code>*</code> imi karakter dizileri
+      ile eşleştirilir. <code>~</code> imine ek olarak <a class="glossarylink" href="../glossary.html#regex" title="sözlüğe bakınız">düzenli ifadeler</a> de kullanılabilir. Örneğin</p>
+
+    <div class="example"><p><code>
+      &lt;Files ~ "\.(gif|jpe?g|png)$"&gt;
+    </code></p></div>
+
+    <p>satırı en bilinen resim dosyası biçimleriyle eşleşecektir. Bunun
+      yerine <code class="directive"><a href="#filesmatch">&lt;FilesMatch&gt;</a></code>
+      yönergesi de tercih edilebilirdi.</p>
+
+    <p><code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> ve
+      <code class="directive"><a href="#location">&lt;Location&gt;</a></code>
+      bölümlerinin aksine, <code class="directive">&lt;Files&gt;</code>
+      bölümleri <code>.htaccess</code> dosyaları içinde kullanılabilir. Bu
+      sayede kullanıcıların kendi dosyalarına erişimi dosya seviyesinde
+      denetlemelerine imkan sağlanmış olur.</p>
+
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li>Bir istek alındığında farklı yapılandırma bölümlerinin nasıl bir
+  arada ele alındığının açıklaması için <a href="../sections.html">
+  &lt;Directory&gt;, &lt;Location&gt; ve &lt;Files&gt; bölümleri nasıl
+  çalışır?</a> belgesine bakınız.</li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="FilesMatch" id="FilesMatch">&lt;FilesMatch&gt;</a> <a name="filesmatch" id="filesmatch">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Düzenli ifadelerin dosya isimleriyle eşleşmesi halinde
+  uygulanacak yönergeleri içerir.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>&lt;FilesMatch <var>düzifd</var>&gt; ... &lt;/FilesMatch&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">&lt;FilesMatch&gt;</code> yönergesi, içerdiği
+      yönergelerin etki alanını <code class="directive"><a href="#files">&lt;Files&gt;</a></code> yönergesinin yaptığı gibi dosya
+      isimlerine göre sınırlandırır. Ancak, argüman olarak bir <a class="glossarylink" href="../glossary.html#regex" title="sözlüğe bakınız">düzenli ifade</a> kabul eder. Örneğin</p>
+
+    <div class="example"><p><code>
+      &lt;FilesMatch "\.(gif|jpe?g|png)$"&gt;
+    </code></p></div>
+
+    <p>satırı en bilinen resim dosyası biçimleriyle eşleşecektir.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li>Bir istek alındığında farklı yapılandırma bölümlerinin nasıl bir
+  arada ele alındığının açıklaması için <a href="../sections.html">
+  &lt;Directory&gt;, &lt;Location&gt; ve &lt;Files&gt; bölümleri nasıl
+  çalışır?</a> belgesine bakınız.</li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ForceType" id="ForceType">ForceType</a> <a name="forcetype" id="forcetype">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bütün dosyaların belirtilen MIME içerik türüyle sunulmasına
+  sebep olur.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ForceType <var>MIME-türü</var>|None</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Apache 2.0’da core modülüne taşındı.</td></tr>
+</table>
+    <p>Bu yönerge, bir <code>.htaccess</code> dosyası veya bir
+      <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code>,
+      <code class="directive"><a href="#location">&lt;Location&gt;</a></code> veya
+      <code class="directive"><a href="#files">&lt;Files&gt;</a></code> bölümüne
+      yerleştirildiği zaman, eşleşen tüm dosyaların <var>MIME-türü</var> ile
+      belirtilen içerik türüyle sunulmasına sebep olur. Örneğin, altında
+      sadece GIF dosyaları bulunan bir dizininiz varsa ve bunlara tek tek
+      <code>.gif</code> uzantısı belirtmek istemiyorsanız şu yapılandırmayı
+      kullanabilirsiniz:</p>
+
+    <div class="example"><p><code>
+      ForceType image/gif
+    </code></p></div>
+
+    <p><code class="directive"><a href="#defaulttype">DefaultType</a></code> yönergesinin tersine
+      bu yönerge ortam türünü betimleyen tüm MIME-türü tanımlarını geçersiz
+      kılar.</p>
+
+    <p>Mevcut <code class="directive">ForceType</code> ayarlarını <code>None</code>
+      değeriyle geçersiz kılabilirsiniz:</p>
+
+    <div class="example"><p><code>
+      # tüm dosyaların image/gif olarak sunulması için:<br />
+      &lt;Location /images&gt;<br />
+        <span class="indent">
+          ForceType image/gif<br />
+        </span>
+      &lt;/Location&gt;<br />
+      <br />
+      # normal MIME-türüne geri dönmek için:<br />
+      &lt;Location /images/mixed&gt;<br />
+      <span class="indent">
+        ForceType None<br />
+      </span>
+      &lt;/Location&gt;
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="HostnameLookups" id="HostnameLookups">HostnameLookups</a> <a name="hostnamelookups" id="hostnamelookups">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>İstemci IP adresleri üzerinde DNS sorgularını etkin kılar.
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>HostnameLookups On|Off|Double</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>HostnameLookups Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Bu yönerge oturum açabilecek konak isimlerini tespit edebilmek için
+      DNS sorgularını etkin kılar (ve sonuç <code>REMOTE_HOST</code>’ta
+      belirtilerek CGI/SSI’lere aktarılır). <code>Double</code> değeri
+      sorgunun çift yönlü yapılacağını belirtir. Yani, bir tersine sorgunun
+      ardından bir normal sorgu yapılır. Normal sorguda elde edilen IP
+      adreslerinden birinin istek yapan IP adresi ile eÅŸleÅŸmesi gerekir.
+      ("tcpwrappers" terminolojisinde buna <code>PARANOID</code> adı
+      verilir.)</p>
+
+    <p>Konak ismine göre erişimi denetlemek için
+      <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> kullanıldığında, nasıl bir ayar
+      yapıldığına bakılmaksızın, çift yönlü sorgulama yapılır. Bu güvenlik
+      için gereklidir. Bunun dışında açıkça <code>HostnameLookups
+      Double</code> belirtilmedikçe genellikle çift yönlü sorgulama yapılmaz.
+      Örneğin, sadece  <code>HostnameLookups On</code> belirtilmiş ve konak
+      ismi kısıtlamalarıyla korunmuş bir nesne için bir istek yapılmışsa çift
+      yönlü sorgunun başarısına bakılmaksızın CGI’lere
+      <code>REMOTE_HOST</code> olarak tek yönlü sorgu sonucu aktarılır.</p>
+
+    <p>Gerçekte ters yönlü sorguya gerek duyulmayan sitelerde ağ trafiğini
+      yormamak için <code>Off</code>, öntanımlı değerdir. Ayrıca, son
+      kullanıcıların DNS sorguları nedeniyle gereksiz yere bir beklemeye
+      maruz kalmaması için de bu daha iyidir. Yükü zaten ağır olan sitelerde,
+      DNS sorgularının görece uzun zaman alması nedeniyle bu yönergenin
+      değeri <code>Off</code> olarak bırakılmalıdır. Öntanımlı olarak kurulum
+      dizininizin <code>bin</code> alt dizinine kurulan
+      <code class="program"><a href="../programs/logresolve.html">logresolve</a></code> uygulaması kullanılarak oturum açan IP
+      adresleri için isim sorguları çevrim dışıyken yapılabilir.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IfDefine" id="IfDefine">&lt;IfDefine&gt;</a> <a name="ifdefine" id="ifdefine">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Başlatma sırasında bir doğruluk sınamasından sonra işleme
+sokulacak yönergeleri sarmalar.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>&lt;IfDefine [!]<var>parametre-adı</var>&gt; ...
+    &lt;/IfDefine&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code>&lt;IfDefine <var>sınama</var>&gt;...&lt;/IfDefine&gt;
+      </code> bölümü koşullu olarak işleme sokulacak yönergeleri içerir.
+      Bir <code class="directive">&lt;IfDefine&gt;</code> bölümü içindeki
+      yönergeler sadece <var>sınama</var> doğru sonuç verirse işleme sokulur.
+      Aksi takdirde, bölüm içinde kalan her şey yok sayılır.</p>
+
+    <p><code class="directive">&lt;IfDefine&gt;</code> bölüm yönergesinde
+      <var>sınama</var> için belirtilebilecek iki biçim vardır:</p>
+
+    <ul>
+      <li><var>parametre-adı</var></li>
+
+      <li><code>!</code><var>parametre-adı</var></li>
+    </ul>
+
+    <p>Birinci durumda bölüm içinde kalan yönergeler sadece
+      <var>parametre-adı</var> ile belirtilen parametre tanımlı ise işleme
+      sokulur. İkinci durumda ise tersi yapılır, yani sadece
+      <var>parametre-adı</var> ile belirtilen parametre tanımlı
+      <strong>değil</strong> ise yönergeler işleme sokulur.</p>
+
+    <p><var>parametre-adı</var> argümanı sunucu başlatılırken
+      <code class="program"><a href="../programs/httpd.html">httpd</a></code> komut satırında
+      <code>-D<var>parametre</var></code> ile
+      belirtilerek tanımlı hale getirilebilir.</p>
+
+    <p><code class="directive">&lt;IfDefine&gt;</code> bölümleri iç içe
+      olabilir, dolayısıyla çok parametreli basit sınamalar gerçeklenebilir.
+      Örnek:</p>
+
+    <div class="example"><p><code>
+      httpd -DReverseProxy -DUseCache -DMemCache ...<br />
+      <br />
+      # httpd.conf<br />
+      &lt;IfDefine ReverseProxy&gt;<br />
+      <span class="indent">
+        LoadModule proxy_module   modules/mod_proxy.so<br />
+        LoadModule proxy_http_module   modules/mod_proxy_http.so<br />
+        &lt;IfDefine UseCache&gt;<br />
+        <span class="indent">
+          LoadModule cache_module   modules/mod_cache.so<br />
+          &lt;IfDefine MemCache&gt;<br />
+          <span class="indent">
+            LoadModule mem_cache_module   modules/mod_mem_cache.so<br />
+          </span>
+          &lt;/IfDefine&gt;<br />
+          &lt;IfDefine !MemCache&gt;<br />
+          <span class="indent">
+            LoadModule disk_cache_module   modules/mod_disk_cache.so<br />
+          </span>
+          &lt;/IfDefine&gt;
+        </span>
+        &lt;/IfDefine&gt;
+      </span>
+      &lt;/IfDefine&gt;
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IfModule" id="IfModule">&lt;IfModule&gt;</a> <a name="ifmodule" id="ifmodule">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Belli bir modülün varlığına veya yokluğuna göre işleme sokulacak
+yönergeleri sarmalar.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>&lt;IfModule [!]<var>modül-dosyası</var>|<var>modül-betimleyici</var>&gt; ...
+    &lt;/IfModule&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Modül betimleyiciler 2.1 sürümünde ve sonrası için geçerlidir.</td></tr>
+</table>
+    <p><code>&lt;IfModule <var>sınama</var>&gt;...&lt;/IfModule&gt;</code>
+      bölümü belli bir modülün varlığına veya yokluğuna göre işleme sokulacak
+      yönergeleri içerir. Bir <code class="directive">&lt;IfModule&gt;</code>
+      bölümü içindeki yönergeler sadece <var>sınama</var> doğru sonuç verirse
+      işleme sokulur. Aksi takdirde, bölüm içinde kalan her şey yok sayılır.</p>
+
+    <p><code class="directive">&lt;IfModule&gt;</code> bölüm yönergesinde
+      <var>sınama</var> için belirtilebilecek iki biçim vardır:</p>
+
+    <ul>
+      <li><var>modül</var></li>
+
+      <li>!<var>modül</var></li>
+    </ul>
+
+    <p>Birinci durumda bölüm içinde kalan yönergeler sadece
+      <var>modül</var> ile belirtilen modül Apache içine dahil edilmişse veya
+      <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code> yönergesi ile devingen
+      olarak yüklenmişse işleme sokulur. İkinci durumda ise tersi yapılır, yani
+      sadece <var>modül</var> içerilmiş <strong>değil</strong> ise yönergeler
+      iÅŸleme sokulur.</p>
+
+    <p><var>modül</var> argümanında bir modül betimleyici veya modülün derleme
+      sırasındaki dosya adı belirtilebilir. Örneğin, <code>rewrite_module</code>
+      bir betimleyici, <code>mod_rewrite.c</code> ise bir dosya ismidir. EÄŸer
+      modül çok sayıda kaynak dosyasından oluşuyorsa
+      <code>STANDARD20_MODULE_STUFF</code> dizgesini içeren dosyanın ismi
+      kullanılır.</p>
+
+    <p><code class="directive">&lt;IfModule&gt;</code> bölümleri iç içe
+      olabilir, dolayısıyla çok parametreli basit sınamalar gerçeklenebilir.</p>
+
+    <div class="note">Bu bölümü sadece yapılandırma dosyanızın belli modüllerin varlığına
+      veya yokluğuna bağlı olarak çalışması gerektiği durumlarda
+      kullanmalısınız. Normal işlemlerde yönergelerin <code class="directive">&lt;IfModule&gt;</code> bölümlerine yerleştirilmeleri
+      gerekmez.</div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Include" id="Include">Include</a> <a name="include" id="include">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Sunucu yapılandırma dosyalarının başka dosyaları içermesini sağlar.
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>Include <var>dosya-yolu</var>|<var>dizin-yolu</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Dosya kalıbıyla eşleşme 2.0.41 ve sonrasında mevcuttur.
+</td></tr>
+</table>
+    <p>Bu yönerge sunucu yapılandırma dosyalarının başka dosyaları içermesini
+      mümkün kılar.</p>
+
+    <p>Çok sayıda dosyayı bir kerede alfabetik sırada içermek için kabuk tarzı
+      (<code>fnmatch()</code>) dosya ismi kalıp karakterleri kullanılabilir.
+      Ayrıca, eğer <code class="directive">Include</code> yönergesi bir dosya değil de
+      bir dizin gösteriyorsa Apache bu dizindeki ve alt dizinlerindeki bütün
+      dosyaları okuyacaktır. Fakat dizinin bir bütün olarak okutulması
+      önerilmez, çünkü dizinde <code class="program"><a href="../programs/httpd.html">httpd</a></code> programının çökmesine
+      sebep olabilecek geçici dosyalar unutulabilir.</p>
+
+    <p>Dosya yolu mutlak bir dosya yolu olarak belirtilebileceÄŸi gibi
+      <code class="directive"><a href="#serverroot">ServerRoot</a></code> dizinine göreli olarak da
+      belirtilebilir.</p>
+
+    <p>Örnekler:</p>
+
+    <div class="example"><p><code>
+      Include /usr/local/apache2/conf/ssl.conf<br />
+      Include /usr/local/apache2/conf/vhosts/*.conf
+    </code></p></div>
+
+    <p>Veya dizinler <code class="directive"><a href="#serverroot">ServerRoot</a></code> dizinine
+      göre belirtilebilir:</p>
+
+    <div class="example"><p><code>
+      Include conf/ssl.conf<br />
+      Include conf/vhosts/*.conf
+    </code></p></div>
+
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="program"><a href="../programs/apachectl.html">apachectl</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="KeepAlive" id="KeepAlive">KeepAlive</a> <a name="keepalive" id="keepalive">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>HTTP kalıcı bağlantılarını etkin kılar</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>KeepAlive On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>KeepAlive On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code>Keep-Alive</code> yönergesi HTTP/1.0 protokolüne bir eklenti olup
+      HTTP/1.1 protokolünün kalıcı bağlantı özelliği aynı TCP bağlantısı
+      üzerinden çok sayıda isteğin gönderilmesini mümkün kılan uzun süreli HTTP
+      oturumları açılmasını sağlar. Bunun, çok sayıda resim içeren HTML
+      belgelerin yanıt zamanlarında bazı durumlarda %50’lik bir hızlanmayla
+      sonuçlandığı gösterilmiştir. Kalıcı bağlantıları etkin kılmak için
+      yönerge <code>KeepAlive On</code> şeklinde kullanılır.</p>
+
+    <p>HTTP/1.0 istemcileri için kalıcı bağlantılar sadece bir istemci
+      tarafından özellikle istendiği takdirde kullanılabilir. Ek olarak,
+      HTTP/1.0 istemci kalıcı bağlantıları sadece içerik uzunluğu baştan
+      bilindiği zaman kullanılabilir. Bu, CGI çıktısı, SSI sayfaları ve
+      sunucunun ürettiği dizin listeleri gibi genellikle HTTP/1.0 istemcilere
+      kalıcı bağlantılar kullanmayan devingen içeriklere uygulanır. HTTP/1.1
+      istemciler için kalıcı bağlantılar aksi belirtilmedikçe öntanımlıdır.
+      İstemci istediği takdirde, uzunluğu bilinmeyen içerik kalıcı bağlantılar
+      üzerinden gönderilirken parçalı kodlama kullanılacaktır.</p>
+
+    <p>Bir istemci kalıcı bağlantı kullandığı takdirde, bağlantı üzerinden kaç
+      istek gönderilirse gönderilsin,
+      <code class="directive">MaxRequestsPerChild</code> yönergesi bakımından tek bir
+      istek olarak deÄŸerlendirilir.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="#maxkeepaliverequests">MaxKeepAliveRequests</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="KeepAliveTimeout" id="KeepAliveTimeout">KeepAliveTimeout</a> <a name="keepalivetimeout" id="keepalivetimeout">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir kalıcı bağlantıda sunucunun bir sonraki isteği bekleme süresi
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>KeepAliveTimeout <var>saniye</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>KeepAliveTimeout 5</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Sunucunun kalıcı bir bağlantıyı kapatmadan önce bir sonraki isteği kaç
+      saniye bekleyeceğini belirler. İstek alındıktan sonra <code class="directive"><a href="#timeout">Timeout</a></code> yönergesiyle belirtilen zaman aşımı
+      değeri uygulanır.</p>
+
+    <p><code class="directive">KeepAliveTimeout</code> için yüksek bir değer belirtmek
+      ağır yüklü sunucularda başarım sorunlarına yol açar. Daha yüksek bir
+      zaman aşımı, boştaki istemcilerin bulunduğu bağlantıları bekleyen daha
+      fazla sunucu sürecini meşgul edecektir.</p>
+
+    <p>İsme dayalı sanal konak bağlamında, <code class="directive"><a href="#namevirtualhost">NameVirtualHost</a></code> bölümleri içinde tanımlanmış ilk sanal konağın (öntanımlı konak) değeri kullanılır. Diğer değerler görmezden gelinir.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Limit" id="Limit">&lt;Limit&gt;</a> <a name="limit" id="limit">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Erişimi sınırlanacak HTTP yöntemleri için erişim sınırlayıcıları
+sarmalar.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>&lt;Limit <var>yöntem</var> [<var>yöntem</var>] ... &gt; ...
+    &lt;/Limit&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Erişim denetleyicileri normalde <strong>tüm</strong> erişim yöntemleri
+      için etkindir ve olağan olanı da budur. <strong>Genel durum olarak,
+      erişim denetim yönergeleri bir <code class="directive">&lt;Limit&gt;</code> bölümüne
+      yerleÅŸtirilmemelidir.</strong></p>
+
+    <p><code class="directive">&lt;Limit&gt;</code> bölümünün amacı, erişim
+      denetleyicilerinin etkilerini belli HTTP yöntemleri için sınırlamaktır.
+      <code class="directive">&lt;Limit&gt;</code> bölümü içinde listelenen
+      erişim sınırlamaları, kalan tüm diğer yöntemler için <strong>etkisiz
+      olacaktır</strong>. Aşağıdaki örnekte, erişim sınırlaması
+      <code>POST</code>, <code>PUT</code> ve <code>DELETE</code> yöntemleri
+      için uygulanmakta, diğer tüm yöntemler korumasız bırakılmaktadır:</p>
+
+    <div class="example"><p><code>
+      &lt;Limit POST PUT DELETE&gt;<br />
+      <span class="indent">
+        Require valid-user<br />
+      </span>
+      &lt;/Limit&gt;
+    </code></p></div>
+
+    <p>Birden fazla bölümde kullanılabilecek yöntem isimleri: <code>GET</code>,
+      <code>POST</code>, <code>PUT</code>, <code>DELETE</code>,
+      <code>CONNECT</code>, <code>OPTIONS</code>,
+      <code>PATCH</code>, <code>PROPFIND</code>, <code>PROPPATCH</code>,
+      <code>MKCOL</code>, <code>COPY</code>, <code>MOVE</code>,
+      <code>LOCK</code> ve <code>UNLOCK</code>. <strong>Yöntem isimleri harf
+      büyüklüğüne duyarlıdır.</strong> <code>GET</code> yöntemi sınırlanırsa
+      <code>HEAD</code> istekleri de sınırlanmış olur. <code>TRACE</code>
+      yöntemi sınırlanamaz.</p>
+
+    <div class="warning">Erişimi sınarlarken bir <code class="directive">&lt;Limit&gt;</code> bölümü yerine daima bir <code class="directive"><a href="#limitexcept">&lt;LimitExcept&gt;</a></code> bölümünü tercih
+      etmelisiniz, çünkü <code class="directive"><a href="#limitexcept">&lt;LimitExcept&gt;</a></code> bölümü belirtilen yöntemler dışında kalanlara
+      erişim koruması sağlar.</div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitExcept" id="LimitExcept">&lt;LimitExcept&gt;</a> <a name="limitexcept" id="limitexcept">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>İsimleri belirtilenler dışında kalan HTTP yöntemleri için
+kullanılacak erişim sınırlayıcıları sarmalar.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>&lt;LimitExcept <var>yöntem</var> [<var>yöntem</var>] ... &gt; ...
+    &lt;/LimitExcept&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">&lt;LimitExcept&gt;</code> ve
+      <code>&lt;/LimitExcept&gt;</code> argüman olarak belirtilenler
+      <strong>dışında</strong> kalan HTTP yöntemleri için kullanılacak erişim
+      sınırlayıcıları gruplamakta kullanılır. Yani, <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> bölümünün tersine, standart olsun olmasın
+      bütün yöntemler için erişimi kısıtlamakta kullanılabilir. Daha ayrıntılı
+      bilgi edinmek için <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> yönergesinin açıklamasına bakınız.</p>
+
+    <p>Örnek:</p>
+
+    <div class="example"><p><code>
+      &lt;LimitExcept POST GET&gt;<br />
+      <span class="indent">
+        Require valid-user<br />
+      </span>
+      &lt;/LimitExcept&gt;
+    </code></p></div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitInternalRecursion" id="LimitInternalRecursion">LimitInternalRecursion</a> <a name="limitinternalrecursion" id="limitinternalrecursion">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Dahili yönlendirmelerin ve istek içi isteklerin azami sayısını
+belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>LimitInternalRecursion <var>sayı</var> [<var>sayı</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>LimitInternalRecursion 10</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Apache 2.0.47 ve sonrasında mevcuttur.</td></tr>
+</table>
+    <p>Örneğin, özgün istekleri dahili olarak bir CGI betiğine yönlendiren
+      <code class="directive"><a href="../mod/mod_actions.html#action">Action</a></code> yönergesi
+      kullanıldığında bir dahili yönlendirme oluşur. İstek içi istekler ise
+      bazı URI’ler için istek yapıldığında ne olacağını bulmak için Apache’nin
+      kullandığı bir mekanizmadır. Örneğin, <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code>,
+      <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code> yönergesinde
+      listelenen dosyalara bakmak için istek içi istekler kullanır.</p>
+
+    <p><code class="directive">LimitInternalRecursion</code> yönergesi sunucunun dahili
+      yönlendirmeler ve istek içi isteklerin oluşturduğu döngülerden dolayı
+      çökmemesini sağlar. Böyle döngüler genellikle yanlış yapılandırma sonucu
+      ortaya çıkarlar.</p>
+
+    <p>Yönerge her istek için değerlendirmeye alınacak iki farklı sınırlama
+      için kullanılabilir. İlk <var>sayı</var> ardarda gelebilen dahili
+      yönlendirmelerin azami sayısını, ikinci <var>sayı</var> ise istek içi
+      isteklerin ne kadar iç içe olabileceğini belirler. Tek bir
+      <var>sayı</var> belirtilirse iki sınırlama için de aynı değer
+      kullanılır.</p>
+
+    <div class="example"><h3>Örnek</h3><p><code>
+      LimitInternalRecursion 5
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitRequestBody" id="LimitRequestBody">LimitRequestBody</a> <a name="limitrequestbody" id="limitrequestbody">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>İstemci tarafından gönderilen HTTP istek gövdesinin toplam
+uzunluğunu sınırlar.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>LimitRequestBody <var>bayt-sayısı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>LimitRequestBody 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Bu yönerge, bir istek gövdesinde izin verilen bayt sayısını 0 (sınırsız
+      anlamında) ile 2147483647 (2GB) arasında sınırlamak için kullanılır.</p>
+
+    <p><code class="directive">LimitRequestBody</code> yönergesi kullanıcıya yönergenin
+      kullanıldığı bağlam (sunucu, belli bir dizin, belli bir dosya, belli bir
+      yer) dahilinde bir HTTP istek iletisi gövdesinin izin verilen uzunluğu
+      için bir sınır belirleme imkanı verir. Eğer istemcinin isteği bu sınırı
+      aşarsa sunucu isteği sunmak yerine bir hata iletisi döndürecektir. Normal
+      bir istek ileti gövdesinin uzunluğu büyük oranda özkaynağın doğasına ve
+      bu özkaynak üzerinde izin verilen yöntemlere bağlıdır. CGI betikleri
+      genellikle ileti gövdesini form bilgisini almak için kullanır.
+      <code>PUT</code> yöntemi gerçeklenimleri, en azından, sunucunun o
+      özkaynak için kabul etmek isteyeceği herhangi bir gösterim kadar büyük
+      bir deÄŸer gerektirecektir.</p>
+
+    <p>Bu yönerge, bazı hizmet reddi (DoS) saldırılarından kaçınmak için sunucu
+      yöneticilerine, anormal istemci istekleri üzerinde daha iyi denetim
+      imkanı sağlar.</p>
+
+    <p>Eğer, örneğin, belli bir yere dosya yükleme izni verir ve buraya
+      yüklenebilecek dosya boyutunu 100 kB ile sınırlamak isterseniz yönergeyi
+      şöyle kullanabilirsiniz:</p>
+
+    <div class="example"><p><code>
+      LimitRequestBody 102400
+    </code></p></div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitRequestFields" id="LimitRequestFields">LimitRequestFields</a> <a name="limitrequestfields" id="limitrequestfields">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>İstemciden kabul edilecek HTTP isteği başlık alanlarının sayısını
+sınırlar.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>LimitRequestFields <var>sayı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>LimitRequestFields 100</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><var>sayı</var>, en küçük 0 (sınırsız anlamında), en büyük 32767
+      olabilir. Öntanımlı değer bir derleme zamanı sabiti olan
+      <code>DEFAULT_LIMIT_REQUEST_FIELDS</code> ile belirlenir (dağıtımla gelen
+      değeri 100’dür).</p>
+
+    <p><code class="directive">LimitRequestFields</code> yönergesi sunucu
+      yöneticilerine bir HTTP isteğinde izin verilen istek başlık alanlarının
+      sayısı üzerindeki sınırı değiştirebilme imkanı verir. Sunucu bu değerin,
+      normal bir istemci isteğinin içerebileceği alan sayısından daha büyük
+      olmasına ihtiyaç duyar. Bir istemci tarafından kullanılan istek başlık
+      alanlarının sayısı nadiren 20’yi geçer, fakat bu farklı istemci
+      gerçeklenimleri için değişiklik gösterir ve çoğunlukla kullanıcının
+      tarayıcısını ayrıntılı içerik müzakeresini desteklemek için nasıl
+      yapılandırdığıyla ilgilidir. İsteğe bağlı HTTP eklentileri çoğunlukla
+      istek başlık alanları kullanılarak ifade edilir.</p>
+
+    <p>Bu yönerge, bazı hizmet reddi (DoS) saldırılarından kaçınmak için sunucu
+      yöneticilerine, anormal istemci istekleri üzerinde daha iyi denetim
+      imkanı sağlar. Eğer normal istemciler sunucudan istekte bulunurken çok
+      fazla başlık alanı gönderildiğine dair bir hata iletisi alırlarsa bu
+      değerin arttırılması gerekir.</p>
+
+    <p>Örnek:</p>
+
+    <div class="example"><p><code>
+      LimitRequestFields 50
+    </code></p></div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitRequestFieldSize" id="LimitRequestFieldSize">LimitRequestFieldSize</a> <a name="limitrequestfieldsize" id="limitrequestfieldsize">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>İstemciden kabul edilecek HTTP isteği başlık uzunluğunu sınırlar.
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>LimitRequestFieldSize <var>bayt-sayısı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>LimitRequestFieldSize 8190</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Bu yönerge, HTTP istek başlığında izin verilecek bayt sayısını
+      belirler.</p>
+
+    <p><code class="directive">LimitRequestFieldSize</code> yönergesi, sunucu
+      yöneticilerine  HTTP istek başlık alanının azami uzunluğunu arttırıp
+      azaltma imkanı verir. Sunucu bu değerin, normal bir istemci isteğinin
+      içerebileceği herhangi bir başlık alanını tutabilecek kadar büyük
+      olmasını gerektirir. Normal bir istek başlık alanı uzunluğu kullanıcının
+      tarayıcısını ayrıntılı içerik müzakeresini desteklemek için nasıl
+      yapılandırdığıyla ilgilidir. SPNEGO kimlik doğrulama başlıkları 12392
+      baytlık olabilir.</p>
+
+    <p>Bu yönerge, bazı hizmet reddi (DoS) saldırılarından kaçınmak için sunucu
+      yöneticilerine, anormal istemci istekleri üzerinde daha iyi denetim
+      imkanı sağlar.</p>
+
+    <p>Örnek:</p>
+
+    <div class="example"><p><code>
+      LimitRequestFieldSize 4094
+    </code></p></div>
+
+    <div class="note">Normal şartlar altında öntanımlı değer değiştirilmemelidir.</div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitRequestLine" id="LimitRequestLine">LimitRequestLine</a> <a name="limitrequestline" id="limitrequestline">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>İstemciden kabul edilecek HTTP istek satırının uzunluğunu sınırlar.
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>LimitRequestLine <var>bayt-sayısı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>LimitRequestLine 8190</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Bu yönerge, HTTP istek satırında izin verilecek bayt sayısını
+      belirler.</p>
+
+    <p><code class="directive">LimitRequestLine</code> yönergesi, sunucu yöneticilerine
+      bir istemcinin HTTP istek satırının azami uzunluğunu arttırıp azaltma
+      imkanı verir. İstek satırının içeriği HTTP yöntemi, URI ve protokol
+      sürümünden oluştuğundan <code class="directive">LimitRequestLine</code>
+      yönergesi, sunucudan bir istek için kullanılan istek adresinin uzunluğunu
+      sınırlamış olur. Sunucu bu değerin, bir <code>GET</code> isteğinin sorgu
+      kısmında aktarılabilen her bilgi dahil, özkaynak isimlerinden her birini
+      tutabilecek kadar büyük olmasını gerektirir.</p>
+
+    <p>Bu yönerge, bazı hizmet reddi (DoS) saldırılarından kaçınmak için sunucu
+      yöneticilerine, anormal istemci istekleri üzerinde daha iyi denetim
+      imkanı sağlar.</p>
+
+    <p>Örnek:</p>
+
+    <div class="example"><p><code>
+      LimitRequestLine 4094
+    </code></p></div>
+
+    <div class="note">Normal şartlar altında öntanımlı değer değiştirilmemelidir.</div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LimitXMLRequestBody" id="LimitXMLRequestBody">LimitXMLRequestBody</a> <a name="limitxmlrequestbody" id="limitxmlrequestbody">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir XML temelli istek gövdesinin uzunluğunu sınırlar.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>LimitXMLRequestBody <var>bayt-sayısı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>LimitXMLRequestBody 1000000</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Bir  XML temelli istek gövdesinin azami bayt sayısını belirler. Değer
+      olarak <code>0</code> belirtildiğinde herhangi bir boyut sınaması
+      yapılmaz.</p>
+
+    <p>Örnek:</p>
+
+    <div class="example"><p><code>
+      LimitXMLRequestBody 0
+    </code></p></div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Location" id="Location">&lt;Location&gt;</a> <a name="location" id="location">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>İçerdiği yönergeler sadece eşleşen URL’lere uygulanır.
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>&lt;Location <var>URL-yolu</var>|<var>URL</var>&gt; ...
+&lt;/Location&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">&lt;Location&gt;</code> bölüm yönergesi kapsadığı
+      yönergelerin etki alanını belirtilen URL’lerle sınırlar. Bu yönerge,
+      <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> yönergesine
+      benzer ve <code>&lt;/Location&gt;</code> yönergesi ile biten bir alt
+      bölüm başlatır. <code class="directive">&lt;Location&gt;</code> bölümleri
+      yapılandırma dosyasında göründükleri sıraya göre, <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> bölümleri ve
+      <code>.htaccess</code> dosyaları okunup <code class="directive"><a href="#files">&lt;Files&gt;</a></code> bölümleri de işlendikten sonra işleme
+      sokulurlar.</p>
+
+    <p><code class="directive">&lt;Location&gt;</code> bölümleri dosya
+      sisteminin tamamen dışında işlem görürler. Bunun çeşitli sonuçları olur.
+      En önemlisi, <code class="directive">&lt;Location&gt;</code>
+      yönergelerinin dosya sistemi konumlarına erişimi denetim altına almak
+      için kullanılmaması gerekliliğidir. Aynı dosya sistemi konumuna farklı
+      URL’lerle erişmek mümkün olduğundan bu tür erişim denetimleri hile ile
+      atlatılabilir olacaktır.</p>
+
+    <div class="note"><h3><code class="directive">&lt;Location&gt;</code> ne zaman
+      kullanılmalı</h3>
+
+    <p><code class="directive">&lt;Location&gt;</code> yönergesini dosya sistemi
+      dışındaki içeriğe çeşitli yönergeler uygulamak için kullanın. Dosya
+      sisteminde bulunan içerik için <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> ve <code class="directive"><a href="#files">&lt;Files&gt;</a></code> bölümlerini kullanın. Bunun istisnası,
+      sunucunun tamamına bir yapılandırma uygulamak için kolay bir yol olan
+      <code>&lt;Location /&gt;</code>  kullanımıdır.</p>
+    </div>
+
+    <p>Kaynağa yapılan (vekil olmayan) tüm istekler için eşleşecek URL,
+      <code>/yol/</code> şeklinde bir URL yolu olmalı; ne şema, ne konak ismi
+      ne port ne de sorgu dizgesi içermelidir. Vekil istekleri için eşleşecek
+      URL ise <code>şema://sunucuadı/dosya-yolu</code> şeklinde olmalı ve önek
+      içermelidir.</p>
+
+    <p>URL içinde dosya kalıp karakterleri kullanılabilir. Dosya kalıp
+      karakterleri bulunan bir dizgede bulunan <code>?</code> karakteri
+      herhangi bir tek karakterle eÅŸleÅŸirken <code>*</code> karakteri herhangi
+      bir karakter dizisi ile eşleşecektir. URL yolu içindeki / karakterleri
+      ile hiçbir dosya kalıp karakteri eşleşmez.</p>
+
+    <p>Ayrıca, <code>~</code> karakteri eşliğinde <a class="glossarylink" href="../glossary.html#regex" title="sözlüğe bakınız">düzenli
+      ifadeler</a> de kullanılabilir. Örneğin,</p>
+
+    <div class="example"><p><code>
+      &lt;Location ~ "/(ek|hususi)/veri"&gt;
+    </code></p></div>
+
+    <p>yönergesi <code>/ek/veri</code> ve <code>/hususi/veri</code> alt
+      dizgeleriyle eşleşecektir. <code class="directive"><a href="#locationmatch">&lt;LocationMatch&gt;</a></code> yönergesi <code class="directive">&lt;Location&gt;</code> yönergesinin düzenli ifade sürümüne
+      eşdeğer davranır.</p>
+
+    <p><code class="directive">&lt;Location&gt;</code> işlevselliği özellikle
+      <code class="directive"><a href="#sethandler">SetHandler</a></code> yönergesi ile birlikte
+      kullanışlı olur. Örneğin, durum isteklerini etkin kılmak ama sadece
+      <code>mesela.dom</code>’dan gelen isteklere izin vermek için şöyle bir
+      uygulama yapabilirsiniz:</p>
+
+    <div class="example"><p><code>
+      &lt;Location /status&gt;<br />
+      <span class="indent">
+        SetHandler server-status<br />
+        Order Deny,Allow<br />
+        Deny from all<br />
+        Allow from .mesela.dom<br />
+      </span>
+      &lt;/Location&gt;
+    </code></p></div>
+
+    <div class="note"><h3>/ (bölü çizgisi) hakkında</h3>
+      <p>Bölü çizgisinin URL içinde bulunduğu yere bağlı olarak özel anlamları
+        vardır. Dosya sistemindeki çok sayıda yanyana kullanımının tek bir bölü
+        çizgisi olarak ele alındığı duruma alışkın olanlar olabilir (yani,
+        <code>/home///foo</code> ile <code>/home/foo</code> aynıdır). URL
+        uzayında bunun böyle olması gerekli değildir. Eğer çok sayıda bölü
+        çizgisini yanyana belirtmeniz gerekiyorsa <code class="directive"><a href="#locationmatch">&lt;LocationMatch&gt;</a></code> yönergesinde ve  <code class="directive">&lt;Location&gt;</code> yönergesinin düzenli ifadeli
+        kullanımında bunu açıkça belirtmeniz gerekir.</p>
+
+      <p>Örneğin, <code>&lt;LocationMatch ^/abc&gt;</code> yönergesi
+        <code>/abc</code> ile eÅŸleÅŸecek ama <code>//abc</code> ile
+        eÅŸleÅŸmeyecektir. <code class="directive">&lt;Location&gt;</code>
+        yönergesinin düzenli ifade içermeyen kullanımındaki davranış vekil
+        isteklerinde kullanılana benzer ve doğrudan kaynağa yapılan (vekil
+        olmayan) isteklerde çok sayıda bölü çizgisi dolaylı olarak tek bir bölü
+        çizgisiyle eşleşecektir. Örneğin, <code>&lt;Location
+        /abc/def&gt;</code> belirtirseniz ve istek <code>/abc//def</code>
+        ÅŸeklinde olursa bu ikisi eÅŸleÅŸir.</p>
+    </div>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li>Bir istek alındığında farklı yapılandırma bölümlerinin nasıl bir arada
+  ele alındığının açıklaması için <a href="../sections.html">
+  &lt;Directory&gt;, &lt;Location&gt; ve &lt;Files&gt; bölümleri nasıl
+  çalışır?</a> belgesine bakınız.</li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LocationMatch" id="LocationMatch">&lt;LocationMatch&gt;</a> <a name="locationmatch" id="locationmatch">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>İçerdiği yönergeler sadece düzenli ifadelerle eşleşen URL’lere
+uygulanır.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>&lt;LocationMatch
+    <var>düzifade</var>&gt; ... &lt;/LocationMatch&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">&lt;LocationMatch&gt;</code> yönergesi içerdiği
+      yönergelerin etki alanını <code class="directive"><a href="#location">&lt;Location&gt;</a></code> yönergesinin yaptığı gibi belirtilen URL’lerle
+      sınırlar. Ancak argüman olarak basit bir dizge değil bir <a class="glossarylink" href="../glossary.html#regex" title="sözlüğe bakınız">düzenli ifade</a> alır. Örneğin,</p>
+
+    <div class="example"><p><code>
+      &lt;LocationMatch "/(ek|hususi)/veri"&gt;
+    </code></p></div>
+
+    <p>yönergesi <code>/ek/veri</code> ve <code>/hususi/veri</code> alt
+      dizgeleriyle eÅŸleÅŸecektir.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li>Bir istek alındığında farklı yapılandırma bölümlerinin nasıl bir arada
+  ele alındığının açıklaması için <a href="../sections.html">
+  &lt;Directory&gt;, &lt;Location&gt; ve &lt;Files&gt; bölümleri nasıl
+  çalışır?</a> belgesine bakınız.</li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LogLevel" id="LogLevel">LogLevel</a> <a name="loglevel" id="loglevel">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Hata günlüklerinin ayrıntı seviyesini belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>LogLevel <var>seviye</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>LogLevel warn</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">LogLevel</code> yönergesi hata günlüklerine kaydedilen
+      hata iletilerinde hangi ayrıntılara yer verileceğini belirler (<code class="directive"><a href="#errorlog">ErrorLog</a></code> yönergesine bakınız). En yüksek önem
+      derecesinden başlayarak olası <var>seviye</var> değerleri aşağıda
+      sıralanmıştır:</p>
+
+    <table class="bordered">
+    
+      <tr>
+        <th><strong>Seviye</strong> </th>
+        <th><strong>Açıklama</strong> </th>
+        <th><strong>Örnek</strong> </th>
+      </tr>
+
+      <tr>
+        <td><code>emerg</code> </td>
+        <td>Acil durumlar - sistem kullanışsız.</td>
+        <td>"Child cannot open lock file. Exiting"<br />(Alt süreç kilit
+          dosyasını açamıyor. Çıkılıyor)</td>
+      </tr>
+
+      <tr>
+        <td><code>alert</code> </td>
+        <td>Ne yapılacaksa beklemeden yapılmalı.</td>
+        <td>"getpwuid: couldn't determine user name from uid"<br />(getpwuid:
+          Kullanıcı ismi numarasından saptanamadı)</td>
+      </tr>
+
+      <tr>
+        <td><code>crit</code> </td>
+        <td>Kriz durumları.</td>
+        <td>"socket: Failed to get a socket, exiting child"<br />(socket: bir
+          soket alınamadı, alt süreç çıkıyor)</td>
+      </tr>
+
+      <tr>
+        <td><code>error</code> </td>
+        <td>Hata durumları.</td>
+        <td>"Premature end of script headers"<br />(Betik başlıkları
+          beklenmedik ÅŸekilde bitti)</td>
+      </tr>
+
+      <tr>
+        <td><code>warn</code> </td>
+        <td>Uyarı durumları.</td>
+        <td>"child process 1234 did not exit, sending another
+          SIGHUP"<br />(1234 alt süreci çıkmadı, başka bir SIGHUP
+          gönderiliyor)</td>
+      </tr>
+
+      <tr>
+        <td><code>notice</code> </td>
+        <td>Normal fakat önemli durum.</td>
+        <td>"httpd: caught SIGBUS, attempting to dump core in
+          ..."<br />(httpd: SIGBUS alındı, core dökümlenmeye çalışılıyor:
+          ...)</td>
+      </tr>
+
+      <tr>
+        <td><code>info</code> </td>
+        <td>Bilgilendirme.</td>
+        <td>"Server seems busy, (you may need to increase
+          StartServers, or Min/MaxSpareServers)..."<br />(Sunucu meÅŸgul
+          görünüyor, (StartServers veya Min/MaxSpareServers değerlerini
+          arttırmanız gerekebilir)...)</td>
+      </tr>
+
+      <tr>
+        <td><code>debug</code> </td>
+        <td>Hata ayıklama seviyesi iletileri</td>
+        <td>"Opening config file ..."<br />(... yapılandırma dosyası
+          açılıyor)</td>
+      </tr>
+    </table>
+
+    <p>Belli bir seviye belirtildiğinde daha yüksek seviyeden iletiler de
+      raporlanır. Örneğin, <code>LogLevel info</code> belirtildiğinde
+      <code>notice</code> ve <code>warn</code> günlük seviyelerinin iletileri
+      ayrıca raporlanacaktır.</p>
+
+    <p>En az <code>crit</code> seviyesinin kullanılması önerilir.</p>
+
+    <p>Örnek:</p>
+
+    <div class="example"><p><code>
+      LogLevel notice
+    </code></p></div>
+
+    <div class="note"><h3>Ek Bilgi</h3>
+      <p>Günlük iletileri normal bir dosyaya yazılırken <code>notice</code>
+        seviyesinden iletiler engellenemez ve dolayısıyla daima raporlanırlar.
+        Ancak, günlük kaydı <code>syslog</code> kullanılarak yapılıyorsa bu
+        uygulanmaz.</p>
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxKeepAliveRequests" id="MaxKeepAliveRequests">MaxKeepAliveRequests</a> <a name="maxkeepaliverequests" id="maxkeepaliverequests">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir kalıcı bağlantıda izin verilen istek sayısı</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>MaxKeepAliveRequests <var>sayı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>MaxKeepAliveRequests 100</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">MaxKeepAliveRequests</code> yönergesi <code class="directive"><a href="#keepalive">KeepAlive</a></code> etkinken bağlantı başına izin
+      verilecek istek sayısını sınırlar. Değer olarak <code>0</code>
+      belirtilirse istek sayısı sınırsız olur. Sunucu başarımını yüksek tutmak
+      için yüksekçe bir değer belirtmenizi öneririz.</p>
+
+    <p>Örnek:</p>
+
+    <div class="example"><p><code>
+      MaxKeepAliveRequests 500
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="NameVirtualHost" id="NameVirtualHost">NameVirtualHost</a> <a name="namevirtualhost" id="namevirtualhost">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>İsme dayalı sanal konaklar için IP adresi belirtir</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>NameVirtualHost <var>adres</var>[:<var>port</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">NameVirtualHost</code> yönergesi <a href="../vhosts/">isme dayalı sanal konakları</a> yapılandırmak isterseniz gerekli olur.
+    </p>
+
+    <p><var>adres</var> olarak bir konak ismi de belirtebilirsiniz ama daima
+      bir IP adresi kullanmanızı öneririz. Örnek:</p>
+
+    <div class="example"><p><code>
+      NameVirtualHost 111.22.33.44
+    </code></p></div>
+
+    <p><code class="directive">NameVirtualHost</code> yönergesi ile sunucunun isme
+      dayalı sanal konaklar için istekleri hangi IP adresinden alacağı
+      belirtilir. Bu adres genellikle isme dayalı sanal konak isimleri
+      çözümlendiğinde elde edilen IP adresidir. İstekleri bir güvenlik
+      duvarının veya bir vekilin alıp sunucuya yönlendirdiği durumlarda ise bu
+      adres sunucunun istekleri aldığı fiziksel arabirimin IP adresi olmalıdır.
+      Çok sayıda adres üzerinde çok sayıda isme dayalı sanal konak varsa her
+      adresin kendi yönergeleri olmalıdır.</p>
+
+    <div class="note"><h3>Ek Bilgi</h3>
+      <p>“Ana sunucu� ve <code>_default_</code> sunucuların bir
+        <code class="directive">NameVirtualHost</code> IP adresine yapılan bir isteği
+        <strong>asla</strong> sunmayacağına dikkat ediniz (bir sebeple
+        <code class="directive">NameVirtualHost</code> belirtip bu adres için herhangi
+        bir <code class="directive">VirtualHost</code> tanımlamadığınız durumlar
+        hariç).</p>
+    </div>
+
+    <p>Seçimlik olarak, isme dayalı sanal konakların kullanması gereken port
+      numarasını örnekteki gibi belirtebilirsiniz:</p>
+
+    <div class="example"><p><code>
+      NameVirtualHost 111.22.33.44:8080
+    </code></p></div>
+
+    <p>IPv6 adresleri belirtilirken örnekteki gibi köşeli ayraçlar arasına
+      alınmalıdır:</p>
+
+    <div class="example"><p><code>
+      NameVirtualHost [2001:db8::a00:20ff:fea7:ccea]:8080
+    </code></p></div>
+
+    <p>İsteklerin bütün arabirimlerden alınacağını belirtmek için değer olarak
+      <code>*</code> belirtebilirsiniz:</p>
+
+    <div class="example"><p><code>
+      NameVirtualHost *
+    </code></p></div>
+
+    <div class="note"><h3><code class="directive">&lt;VirtualHost&gt;</code> yönergesinin
+      argümanı</h3>
+      <p><code class="directive">&lt;VirtualHost&gt;</code> yönergesinin
+      argümanının <code class="directive">NameVirtualHost</code> yönergesininkiyle tam
+      olarak eÅŸleÅŸmesi gerektiÄŸine dikkat ediniz.</p>
+
+      <div class="example"><p><code>
+        NameVirtualHost 1.2.3.4<br />
+        &lt;VirtualHost 1.2.3.4&gt;<br />
+        # ...<br />
+        &lt;/VirtualHost&gt;<br />
+      </code></p></div>
+    </div>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><a href="../vhosts/">Apache Sanal Konak Belgeleri</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Options" id="Options">Options</a> <a name="options" id="options">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Belli bir dizinde geçerli olacak özellikleri yapılandırır.
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>Options
+    [+|-]<var>seçenek</var> [[+|-]<var>seçenek</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>Options All</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>Options</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">Options</code> yönergesi belli bir dizinde hangi sunucu
+      özelliklerinin etkin olacağını (veya olmayacağını) belirler.</p>
+
+    <p><var>seçenek</var> olarak hiçbir ek özellik etkin olmayacaksa
+      <code>None</code>, aksi takdirde aşağıdakilerden biri veya bir kaçı
+      belirtilir:</p>
+
+    <dl>
+      <dt><code>All</code></dt>
+      <dd><code>MultiViews</code> hariç tüm seçenekler. Bu öntanımlıdır.</dd>
+
+      <dt><code>ExecCGI</code></dt>
+      <dd><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> kullanan CGI betiklerinin çalışmasına izin
+        verilir.</dd>
+
+      <dt><code>FollowSymLinks</code></dt>
+      <dd>Sunucu bu dizindeki sembolik bağları izler.
+      <div class="note">
+      <p>Sembolik bağlar izlense bile <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> bölümleriyle eşleşen dosya yolları
+        deÄŸiÅŸtirilmez.</p>
+      <p>Ayrıca, bu seçenek bir <code class="directive"><a href="#location">&lt;Location&gt;</a></code> bölümü içinde belirtildiği takdirde <strong>yok
+        sayılır</strong>.</p>
+      <p>Sembolik bağ sınamaları, atlatılabilir yarış koşullarına konu
+        olduğundan bu seçeneğin yokluğu bir güvenlik sınırlaması olarak
+        deÄŸerlendirilmemelidir.</p>
+      </div></dd>
+
+      <dt><code>Includes</code></dt>
+      <dd><code class="module"><a href="../mod/mod_include.html">mod_include</a></code> tarafından sağlanan sunucu taraflı
+        içeriklere izin verilir.</dd>
+
+      <dt><code>IncludesNOEXEC</code></dt>
+      <dd>Sunucu taraflı içeriklere izin verilir fakat <code>#exec cmd</code>
+        ve <code>#exec cgi</code> iptal edilir. Ancak, <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>’lı dizinlerdeki CGI
+        betikleri için <code>#include virtual</code> hala mümkün olacaktır.</dd>
+
+      <dt><code>Indexes</code></dt>
+      <dd>İstenen URL bir dizin ile eşleşiyorsa ve bu dizin için bir <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code> (<code>index.html</code>
+        gibi) belirtilmemiÅŸse <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> bu dizinin
+        biçimlenmiş bir listesini döndürecektir.</dd>
+
+      <dt><code>MultiViews</code></dt>
+      <dd><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code> kullanılarak <a href="../content-negotiation.html">içerik uzlaştırmalı</a> çok
+        görünümlü içeriğe izin verilir.</dd>
+
+      <dt><code>SymLinksIfOwnerMatch</code></dt>
+      <dd>Sunucu sembolik bağları sadece sembolik bağın hedefi ile bulunduğu
+        dizinin sahibinin aynı kullanıcı olması halinde izleyecektir.
+
+      <div class="note"><h3>Ek Bilgi</h3> <p>Bu seçenek bir <code class="directive"><a href="#location">&lt;Location&gt;</a></code> bölümü içinde belirtildiğinde yok
+        sayılır.</p>
+      <p>Sembolik bağ sınamaları, atlatılabilir yarış koşullarına konu
+        olduğundan bu seçenek bir güvenlik sınırlaması olarak
+        deÄŸerlendirilmemelidir.</p></div>
+      </dd>
+    </dl>
+
+    <p>Normalde, bir dizine çok sayıda <code class="directive">Options</code>
+      uygulanabilirse de, dizine en uygun olanı uygulanıp diğerleri yok
+      sayılır; seçenekler katıştırılmaz (bkz, <a href="../sections.html#mergin">Bölümler Nasıl Katıştırılır?</a>). Bununla birlikte, önüne bir
+      <code>+</code> veya <code>-</code> simgesi konmuş seçenekler varsa, o
+      seçenekler katıştırılır. Önüne <code>+</code> konmuş seçenekler
+      mevcutlara eklenirken <code>-</code> konmuş seçenekler silinir.</p>
+
+    <div class="warning"><h3>Uyarı</h3>
+    <p><code>+</code> veya <code>-</code> imli seçenekler içeren
+      <code class="directive">Options</code> ile imsiz seçenekler içerenlerin karışık
+      olarak kullanılması beklenmedik sonuçlara yol açması sebebiyle aslında
+      geçersiz bir sözdizimidir.</p>
+    </div>
+
+    <p>Örneğin, <code>+</code> ve <code>-</code> imleri olmaksızın,</p>
+
+    <div class="example"><p><code>
+      &lt;Directory /web/docs&gt;<br />
+      <span class="indent">
+        Options Indexes FollowSymLinks<br />
+      </span>
+      &lt;/Directory&gt;<br />
+      <br />
+      &lt;Directory /web/docs/spec&gt;<br />
+      <span class="indent">
+        Options Includes<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p>yapılandırmasıyla <code>/web/docs/spec</code> dizininde sadece
+      <code>Includes</code> seçeneği etkin olacaktır. Bununla birlikte, ikinci
+      <code class="directive">Options</code> yönergesinde <code>+</code> ve
+      <code>-</code> imleri kullanılırsa,</p>
+
+    <div class="example"><p><code>
+      &lt;Directory /web/docs&gt;<br />
+      <span class="indent">
+        Options Indexes FollowSymLinks<br />
+      </span>
+      &lt;/Directory&gt;<br />
+      <br />
+      &lt;Directory /web/docs/spec&gt;<br />
+      <span class="indent">
+        Options +Includes -Indexes<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p>yapılandırmasıyla <code>/web/docs/spec</code> dizininde
+      <code>FollowSymLinks</code> ve <code>Includes</code> seçenekleri etkin
+      olacaktır.</p>
+
+    <div class="note"><h3>Ek Bilgi</h3>
+      <p><code>-IncludesNOEXEC</code> veya <code>-Includes</code> kullanımı,
+        önceki ayarların ne olduğuna bakılmaksızın sunucu taraflı içeriğin
+        tamamen iptaline sebep olur.</p>
+    </div>
+
+    <p>Herhangi bir başka değer belirtilmedikçe <code>All</code>
+      öntanımlıdır.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Require" id="Require">Require</a> <a name="require" id="require">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir özkaynağa erişebilecek kimliği doğrulanmış kullanıcıları belirler</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>Require <var>öğe-adı</var> [<var>öğe-adı</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Bu yönerge br özkaynağa erişebilecek kimliği doğrulanmış kullanıcıları belirlemek için kullanılır. Kısıtlamalar yetkilendirme modülleri tarafından işleme sokulur. <code class="module"><a href="../mod/mod_authz_user.html">mod_authz_user</a></code> ve
+    <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> tarafından izin verilen bazı sözdizimleri:</p>
+
+    <dl>
+      <dt><code>Require user <var>kull-kiml</var> [<var>kull-kiml</var>]
+      ...</code></dt>
+      <dd>Sadece belirtilen kullanıcılar özkaynağa erişebilir.</dd>
+
+      <dt><code>Require group <var>grup-adı</var> [<var>grup-adı</var>]
+      ...</code></dt>
+      <dd>Sadece belirtilen gruplara üye kullanıcılar özkaynağa erişebilir.</dd>
+
+      <dt><code>Require valid-user</code></dt>
+      <dd>Geçerli kullanıcıların hepsi özkaynağa erişebilir.</dd>
+    </dl>
+
+    <p>Gerekli diğer seçenekleri sağlayan yetkilendirme modülleri olarak <code class="module"><a href="../mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code>, <code class="module"><a href="../mod/mod_authz_dbm.html">mod_authz_dbm</a></code> ve
+    <code class="module"><a href="../mod/mod_authz_owner.html">mod_authz_owner</a></code> sayılabilir.</p>
+
+    <p><code class="directive">Require</code> yönergesinin düzgün çalışması için kendisine <code class="directive"><a href="#authname">AuthName</a></code> ve <code class="directive"><a href="#authtype">AuthType</a></code> yönergelerinin yanı sıra kullanıcıları ve grupları tanımlamak için <code class="directive"><a href="../mod/mod_authn_file.html#authuserfile">AuthUserFile</a></code> ve <code class="directive"><a href="../mod/mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></code> gibi yönergelerinin de eşlik etmesi gerekir. Örnek:</p>
+
+    <div class="example"><p><code>
+       AuthType Basic<br />
+       AuthName "Restricted Resource"<br />
+       AuthUserFile /web/users<br />
+       AuthGroupFile /web/groups<br />
+       Require group admin
+    </code></p></div>
+
+    <p>Bu yolla uygulanan erişim denetimleri <strong>tüm</strong> yöntemler için etkilidir. <strong>Normalde istenen zaten budur.</strong> Erişim denetimlerini diğerlerini korumasız bırakmak pahasına sadece belli yöntemlerle sınırlamak isterseniz <code class="directive">Require</code>  yönergesini bir <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> bölümüne yerleştirin.</p>
+
+    <p>Eğer <code class="directive">Require</code> yönergesini <code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code> veya
+    <code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code> yönergeleri ile birlikte kullanırsanız bu sınırlamalarla olan etkileşim <code class="directive"><a href="#satisfy">Satisfy</a></code> yönergesi tarafından denetlenir.</p>
+
+    <div class="note"><h3>Denetimlerin alt dizinlerden kaldırılması</h3>
+    <p>Aşağıdaki örnekte korunmuş bir dizinin bir alt dizinindeki erişim denetimlerinin kaldırılması için <code class="directive"><a href="#satisfy">Satisfy</a></code> yönergesinin nasıl kullanılacağı gösterilmiştir. Bu teknik, <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> tarafından dayatılan erişim denetimlerini de ortadan kaldırdığından dikkatli kullanılmalıdır.</p>
+    <div class="example"><p><code>
+      &lt;Directory /korunmuÅŸ/dizine/giden/yol/&gt;<br />
+        <span class="indent">
+        Require user david<br />
+        </span>
+      &lt;/Directory&gt;<br />
+      &lt;Directory /korunmuş/dizine/giden/yol/korunmamış-dizin/&gt;<br />
+        <span class="indent">
+        # Bu dizinde tüm erişim denetimleri ve kimlik doğrulaması<br />
+        # iptal ediliyor<br />
+        Satisfy Any<br />
+        Allow from all<br />
+        </span>
+      &lt;/Directory&gt;<br />
+    </code></p></div>
+    </div>
+
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><a href="../howto/auth.html"> Kimlik DoÄŸrulama, Yetkilendirme ve EriÅŸim Denetimi</a></li>
+<li><code class="directive"><a href="#satisfy">Satisfy</a></code></li>
+<li><code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RLimitCPU" id="RLimitCPU">RLimitCPU</a> <a name="rlimitcpu" id="rlimitcpu">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Apache alt süreçleri tarafından çalıştırılan süreçlerin işlemci
+tüketimine sınırlama getirir.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>RLimitCPU <var>saniye</var>|max [<var>saniye</var>|max]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>Bir değer belirtilmemiştir; işletim sistemi öntanımlıları kullanılır
+</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>1 veya 2 değer alır. İlk değer bütün süreçler için sanal özkaynak
+      sınırını, ikinci değer ise kesin özkaynak sınırını belirler. İki değer de
+      birer sayı olabileceği gibi bu sınırın işletim sistemi yapılandırmasında
+      izin verilen üst sınıra ayarlanacağını belirtmek üzere <code>max</code>
+      olabilir. Kesin özkaynak sınırını yükseltmek için sunucunun
+      <code>root</code> olarak veya sistem açılışı sırasında çalıştırılması
+      gerekir.</p>
+
+    <p>Bu sınırlar Apache’nin kendi alt süreçlerine değil, isteklere yanıt
+      verirken Apache alt süreçlerinin çatalladıkları süreçlere uygulanır.
+      Bunlar CGI betikleri ve SSI çalıştırma komutları olabilir fakat borulu
+      günlük kaydı gibi ana Apache süreci tarafından çatallanmış süreçler
+      olmazlar.</p>
+
+    <p>İşlemci özkaynak sınırları saniye cinsinden ifade edilir.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="#rlimitmem">RLimitMEM</a></code></li>
+<li><code class="directive"><a href="#rlimitnproc">RLimitNPROC</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RLimitMEM" id="RLimitMEM">RLimitMEM</a> <a name="rlimitmem" id="rlimitmem">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Apache alt süreçleri tarafından çalıştırılan süreçlerin bellek
+tüketimine sınırlama getirir.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>RLimitMEM <var>bayt-sayısı</var>|max [<var>bayt-sayısı</var>|max]
+</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>Bir değer belirtilmemiştir; işletim sistemi öntanımlıları kullanılır
+</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>1 veya 2 değer alır. İlk değer bütün süreçler için sanal özkaynak
+      sınırını, ikinci değer ise kesin özkaynak sınırını belirler. İki değer de
+      birer sayı olabileceği gibi bu sınırın işletim sistemi yapılandırmasında
+      izin verilen üst sınıra ayarlanacağını belirtmek üzere <code>max</code>
+      olabilir. Kesin özkaynak sınırını yükseltmek için sunucunun
+      <code>root</code> olarak veya sistem açılışı sırasında çalıştırılması
+      gerekir.</p>
+
+    <p>Bu sınırlar Apache’nin kendi alt süreçlerine değil, isteklere yanıt
+      verirken Apache alt süreçlerinin çatalladıkları süreçlere uygulanır.
+      Bunlar CGI betikleri ve SSI çalıştırma komutları olabilir fakat borulu
+      günlük kaydı gibi ana Apache süreci tarafından çatallanmış süreçler
+      olmazlar.</p>
+
+    <p>Bellek özkaynak sınırları süreç başına bayt sayısı olarak ifade edilir.
+    </p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="#rlimitcpu">RLimitCPU</a></code></li>
+<li><code class="directive"><a href="#rlimitnproc">RLimitNPROC</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RLimitNPROC" id="RLimitNPROC">RLimitNPROC</a> <a name="rlimitnproc" id="rlimitnproc">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Apache alt süreçleri tarafından çalıştırılabilecek süreç sayısına
+sınırlama getirir.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>RLimitNPROC <var>sayı</var>|max [<var>sayı</var>|max]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>Bir değer belirtilmemiştir; işletim sistemi öntanımlıları kullanılır
+</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>1 veya 2 değer alır. İlk değer bütün süreçler için sanal özkaynak
+      sınırını, ikinci değer ise kesin özkaynak sınırını belirler. İki değer de
+      birer sayı olabileceği gibi bu sınırın işletim sistemi yapılandırmasında
+      izin verilen üst sınıra ayarlanacağını belirtmek üzere <code>max</code>
+      olabilir. Kesin özkaynak sınırını yükseltmek için sunucunun
+      <code>root</code> olarak veya sistem açılışı sırasında çalıştırılması
+      gerekir.</p>
+
+    <p>Bu sınırlar Apache’nin kendi alt süreçlerine değil, isteklere yanıt
+      verirken Apache alt süreçlerinin çatalladıkları süreçlere uygulanır.
+      Bunlar CGI betikleri ve SSI çalıştırma komutları olabilir fakat borulu
+      günlük kaydı gibi ana Apache süreci tarafından çatallanmış süreçler
+      olmazlar.</p>
+
+    <p>Süreç sayısı sınırı kullanıcı başına süreç sayısına sınırlama getirir.
+    </p>
+
+    <div class="note"><h3>Ek Bilgi</h3>
+      <p>CGI süreçleri sunucu kullanıcı kimliğinden farklı bir kullanıcı
+        kimliği altında çalışmıyorsa bu yönerge sunucunun kendi oluşturduğu
+        süreç sayısını sınırlayacaktır. Bunun kanıtı <code>error_log</code>’da
+        iletilerin çatallanamamasıdır.</p>
+    </div>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="#rlimitmem">RLimitMEM</a></code></li>
+<li><code class="directive"><a href="#rlimitcpu">RLimitCPU</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Satisfy" id="Satisfy">Satisfy</a> <a name="satisfy" id="satisfy">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Konak seviyesinde erişim denetimi ile kullanıcı kimlik doğrulaması arasındaki etkileşim</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>Satisfy Any|All</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>Satisfy All</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>2.0.51 sürümü ve sonrasında <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> ve <code class="directive"><a href="#limitexcept">&lt;LimitExcept&gt;</a></code> tarafından etkin kılınır.</td></tr>
+</table>
+    <p><code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code> ve <code class="directive"><a href="#require">Require</a></code> yönergelerinin ikisi birden kullanıldığında uygulanacak erişim kuralını belirler. Değer olarak sadece <code>All</code> veya <code>Any</code> belirtilebilir. Bu yönergenin yararlı olabilmesi için belli bir alana hem istemci konak adresi hem de kullanıcı ismi ve parolası belirtmek suretiyle erişilebiliyor olunması gerekir. Bu durumda öntanımlı davranış (<code>All</code>), istemcinin belli bir adrese erişebilmek için belli kısıtlamaları aşması ve geçerli bir kullanıcı adı ve parola girmesi gerekir. <code>Any</code> seçeneğinin belirtildiği durumda ise istemcinin ya konak kısıtlamalarıdan geçmesi ya da geçerli bir kullanıcı adı ve parolası girmesi gerekir. Bu seçenek, belli bir alana erişimi parolayla kısıtlayıp, belli adreslerden gelen kullanıcılara parolasız erişim vermek için kullanılabilir.</p>
+
+    <p>Örneğin, sitenizin belli bir bölümü için iç ağınızdan gelen isteklere sınırsız erişim vermek ama dışardan gelen istekleri parolayla kısıtlamak isterseniz şöyle bir yapılandırma kullanabilirsiniz:</p>
+
+    <div class="example"><p><code>
+      Require valid-user<br />
+      Order allow,deny<br />
+      Allow from 192.168.1<br />
+      Satisfy Any
+    </code></p></div>
+
+    <p>2.0.51 sürümünden itibaren <code class="directive">Satisfy</code> yönergeleri <code class="directive"><a href="#limit">&lt;Limit&gt;</a></code> ve <code class="directive"><a href="#limitexcept">&lt;LimitExcept&gt;</a></code> bölümleri tarafından belli yöntemlerle kısıtlanmış olabilir.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code></li>
+<li><code class="directive"><a href="#require">Require</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScriptInterpreterSource" id="ScriptInterpreterSource">ScriptInterpreterSource</a> <a name="scriptinterpretersource" id="scriptinterpretersource">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>CGI betikleri için yorumlayıcı belirleme tekniği</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ScriptInterpreterSource Registry|Registry-Strict|Script</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>ScriptInterpreterSource Script</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Sadece Win32 için; <code>Registry-Strict</code> seçeneği Apache
+2.0 ve sonrası için geçerlidir.</td></tr>
+</table>
+    <p>Bu yönerge Apache’nin CGI betiklerini çalıştıracak yorumlayıcıyı nasıl
+      tespit edeceğini belirler. <code>Script</code> öntanımlı olup Apache’nin
+      yorumlayıcı olarak betiğin diyezli ünlem satırında (<code>#!</code> ile
+      başlayan ilk satır) belirtilen yorumlayıcıyı kullanacağını belirtir.
+      Win32 sistemlerinde bu satır genellikle şöyledir:</p>
+
+    <div class="example"><p><code>
+      #!C:/Perl/bin/perl.exe
+    </code></p></div>
+
+    <p><code>perl</code> yorumlayıcının yeri <code>PATH</code> değişkeninde
+      kayıtlı ise şöyle de olabilir:</p>
+
+    <div class="example"><p><code>
+      #!perl
+    </code></p></div>
+
+    <p><code>ScriptInterpreterSource Registry</code> değeri ise betik dosyası
+      uzantısının (<code>.pl</code> gibi) Windows Sicili içindeki
+      <code>HKEY_CLASSES_ROOT</code> ağacında arama yapmak için bir arama
+      anahtarı olarak kullanılmasını sağlar. Betik dosyasını çalıştırmak için
+      tanımlanmış komutu bulmak için <code>Shell\ExecCGI\Command</code> yoluna,
+      orada yoksa <code>Shell\Open\Command</code> yoluna bakılır. İkisi de
+      yoksa son çare olarak <code>Script</code> seçeneğinin davranışına
+      dönülür.</p>
+
+    <p>Örneğin, .pl uzantılı bir betiğin perl ile işlenmesi için sicil ayarı
+      şöyle olabilir:</p>
+
+    <div class="example"><p><code><code>HKEY_CLASSES_ROOT\.pl\Shell\ExecCGI\Command\(Default) =&gt;
+      C:\Perl\bin\perl.exe -wT</code></code></p></div>
+
+    <div class="warning"><h3>Güvenlik</h3>
+    <p><code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>’lı dizinlerde
+      Apache bulduğu <strong>her</strong> dosyayı çalıştırmayı deneyeceğinden
+      <code>ScriptInterpreterSource Registry</code> yapılandırmasını
+      kullanırken dikkatli olun. <code>Registry</code> seçeneği genellikle
+      çalıştırılmayacak dosyalar için istenmeyen program çağrılarına sebep
+      olabilir. Örneğin, çoğu Windows sisteminde <code>.htm</code> dosyaları
+      için ön tanımlı "open" komutu Microsoft Internet Explorer’ın
+      çalıştırılmasına sebep olur; bu bakımdan, betik dizininde bulunan bir
+      <code>.htm</code> dosyası için yapılan bir HTTP isteği tarayıcının sunucu
+      artalanında çalıştırılmasına sebep olacaktır. Bu, sistemi bir kaç dakika
+      içinde çökertmek için iyi bir yoldur.</p>
+    </div>
+
+    <p><code>Registry-Strict</code> seçeneği Apache 2.0’da yeni olup
+      <code>Registry</code> seçeneğinin yaptığını
+      <code>Shell\ExecCGI\Command</code> yolu için yapar. <code>ExecCGI</code>
+      sistem tarafından bilinen bir anahtar olmadığından Windows Siciline elle
+      kaydedilmesi gerekir ve dolayısıyla sisteminiz üzerinde istenmeyen
+      program çağrılarına sebep olmaz.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerAdmin" id="ServerAdmin">ServerAdmin</a> <a name="serveradmin" id="serveradmin">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Sunucunun hata iletilerinde istemciye göstereceği eposta adresi
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ServerAdmin <var>eposta-adresi</var>|<var>URL</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">ServerAdmin</code> yönergesi, sunucunun bir hata
+      durumunda istemciye döndüreceği hata iletilerinde içereceği iletişim
+      adresini belirtmek için kullanılır. Eğer <code>httpd</code> sağlanan
+      değerin bir URL olmadığını saptarsa değerin bir eposta adresi olduğuna
+      hükmeder ve önüne <code>mailto:</code> getirerek onu bir hiper bağ hedefi
+      olarak kullanır. Çoğu CGI betiği bir eposta adresi belirtildiği kabulünü
+      yaptığından değer olarak bir URL değil bir eposta adresi belirtmeniz
+      önerilir. Eğer bir URL belirtecekseniz hedef sizin denetiminizde olan
+      başka bir sunucuda bulunmalıdır, yoksa kullanıcılar hata durumunda bu
+      adrese eriÅŸemeyebilirler.</p>
+
+    <p>Kullanıcıların sunucu hakkında konuşurken isminizden bahsetmemeleri için
+      burada belirtilecek adresin sırf bu işe adanmış bir adres olması daha
+      iyidir. Örnek:</p>
+
+    <div class="example"><p><code>
+      ServerAdmin www-admin@falan.filan.dom
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerAlias" id="ServerAlias">ServerAlias</a> <a name="serveralias" id="serveralias">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>İstekleri isme dayalı sanal konaklarla eşleştirilirken
+kullanılacak konak adları için başka isimler belirtebilmeyi sağlar.
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ServerAlias <var>konakadı</var> [<var>konakadı</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">ServerAlias</code> yönergesi, istekleri <a href="../vhosts/name-based.html">isme dayalı sanal konaklarla</a>
+      eşleştirilirken kullanılacak konak adları için başka isimler
+      belirtebilmeyi sağlar. <code class="directive">ServerAlias</code> dosya adı kalıp
+      karakterleri içerebilir.</p>
+
+    <div class="example"><p><code>
+      &lt;VirtualHost *&gt;<br />
+      ServerName sunucu.mesela.dom<br />
+      ServerAlias sunucu sunucu2.mesela.dom sunucu2<br />
+      # ...<br />
+      &lt;/VirtualHost&gt;
+    </code></p></div>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><a href="../vhosts/">Apache Sanal Konak Belgeleri</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerName" id="ServerName">ServerName</a> <a name="servername" id="servername">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Sunucunun özdeşleşeceği konak ismi ve port.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ServerName [<var>şema</var>://]<var>tam-nitelenmiş-alan-adı</var>[:<var>port</var>]
+</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Bu yönerge 2.0 sürümünden itibaren 1.3 sürümündeki
+<code class="directive">Port</code> yönergesinin işlevselliğini de
+üstlenmiştir.</td></tr>
+</table>
+    <p><code class="directive">ServerName</code> yönergesi, sunucunun kendini
+      betimlemekte kullanacağı şema, konak adı ve port değerlerini belirler.
+      Bu, yönlendirme URL’leri oluşturulurken kullanılır. Örneğin, HTTP
+      sunucusunun barındırıldığı makinenin ismi <code>falan.filan.dom</code>
+      olduÄŸu halde makinenin bir de <code>www.filan.dom</code> diye bir de DNS
+      rumuzu varsa ve HTTP sunucunuzun bu rumuzla kendini özdeşleştirmesini
+      isterseniz bunu şöyle belirtebilirsiniz:</p>
+
+    <div class="example"><p><code>
+      ServerName www.filan.dom:80
+    </code></p></div>
+
+    <p>Bir <code class="directive">ServerName</code> ataması yapılmamışsa sunucu IP
+      adresine atanmış sunucu ismi için bir ters DNS sorgusu yapacaktır.
+      <code class="directive">ServerName</code> yönergesinde bir port belirtilmediği
+      takdirde sunucu, isteğin geldiği portu kullanacaktır. Öngörülebilirlik ve
+      güvenilirlik açısından en iyisi <code class="directive">ServerName</code>
+      yönergesini kullanarak açıkça bir konak ismi ve port belirtmektir.</p>
+
+    <p><a href="../vhosts/name-based.html">İsme dayalı sanal konaklar</a>
+      kullanıyorsanız, <code class="directive"><a href="#virtualhost">&lt;VirtualHost&gt;</a></code> bölümü içindeki
+      <code class="directive">ServerName</code> yönergesi, isteğin <code>Host:</code>
+      başlığında bu sanal konakla eşleşecek konak ismini belirler.</p>
+
+
+    <p>Bazen sunucu, bir ters vekil, yük dengeleyici veya SSL yük aktarım
+      uygulaması gibi bir aygıtın arkasında çalışır. Böyle durumlarda sunucunun
+      kendine yönelik URL’leri doğru üretebildiğinden emin olmak için
+      <code class="directive">ServerName</code> yönergesinde istemcinin bağlanacağı
+      <code>https://</code> şeması ve port numarası belirtilir.</p>
+
+    <p>Sunucunun kendine yönelik URL’lerin belirtilen portu içerip içermediğini
+      veya istemcinin yaptığı istekte belirtilen port numarasının verilip
+      verilmediğinin saptamasını sağlayan (örneğin, <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code>
+      modülü tarafından) ayarlar için <code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code> ve
+      <code class="directive"><a href="#usecanonicalphysicalport">UseCanonicalPhysicalPort</a></code>
+      yönergelerinin açıklamalarına bakınız.</p>
+
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><a href="../dns-caveats.html">DNS ile ilgili konular ve Apache</a>
+</li>
+<li><a href="../vhosts/">Apache Sanal Konak Belgeleri</a></li>
+<li><code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code></li>
+<li><code class="directive"><a href="#usecanonicalphysicalport">UseCanonicalPhysicalPort</a></code></li>
+<li><code class="directive"><a href="#namevirtualhost">NameVirtualHost</a></code></li>
+<li><code class="directive"><a href="#serveralias">ServerAlias</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerPath" id="ServerPath">ServerPath</a> <a name="serverpath" id="serverpath">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Uyumsuz bir tarayıcı tarafından erişilmesi için bir isme dayalı sanal konak için meşru URL yolu</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ServerPath <var>URL-yolu</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">ServerPath</code> yönergesi <a href="../vhosts/">isme
+      dayalı sanal konaklar</a>da kullanmak için konağa meşru bir URL yolu
+      belirler.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><a href="../vhosts/">Apache Sanal Konak Belgeleri</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerRoot" id="ServerRoot">ServerRoot</a> <a name="serverroot" id="serverroot">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Sunucu yapılandırması için kök dizin</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ServerRoot <var>dizin-yolu</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>ServerRoot /usr/local/apache</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">ServerRoot</code> yönergesi sunucu yapılandırmasını
+      içeren dizinin yerini belirtir. Genellikle <code>conf/</code> ve
+      <code>logs/</code> gibi alt dizinler içerir. <code class="directive"><a href="#include">Include</a></code>, <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code> gibi diğer yapılandırma
+      yönergelerindeki göreli yollar bu dizine göre ele alınır.</p>
+
+    <div class="example"><h3>Örnek</h3><p><code>
+      ServerRoot /home/httpd
+    </code></p></div>
+
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><a href="../invoking.html"><code>httpd</code> için <code>-d</code> seçeneği</a></li>
+<li><code class="directive">ServerRoot</code> dizininin erişim izinlerinin nasıl
+  ayarlanması gerektiğini öğrenmek için <a href="../misc/security_tips.html#serverroot">güvenlik ipuçları</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerSignature" id="ServerSignature">ServerSignature</a> <a name="serversignature" id="serversignature">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Sunucu tarafından üretilen belgelerin dipnotunu ayarlar.
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ServerSignature On|Off|EMail</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>ServerSignature Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">ServerSignature</code> yönergesi, sunucu tarafından
+      üretilen belgelerin (hata iletileri, <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ftp dizin
+      listeleri, <code class="module"><a href="../mod/mod_info.html">mod_info</a></code> çıktısı, vs.) altındaki dipnot
+      satırını yapılandırabilmenizi sağlar. Böyle bir dipnot satırın
+      istenmesinin sebebi vekil zincirlerinde istemciye dönen hata iletisinin
+      aslında hangi sunucu tarafından üretildiğini kullanıcıya bildirmektir.</p>
+
+    <p><code>Off</code> değeri öntanımlı değer olup dipnot satırının
+      gösterilmemesini sağlar (Apache-1.2 ve öncesi ile uyumluluk).
+      <code>On</code> değeri, sunucu sürüm numarası ve hizmeti sunan sanal
+      konağın isminden (<code class="directive"><a href="#servername">ServerName</a></code>) oluşan
+      bir dipnot satırı oluşturulmasını sağlar; <code>EMail</code> değeri bu
+      ikisine ek olarak satıra <code class="directive"><a href="#serveradmin">ServerAdmin</a></code>
+      ile belirtilen adres için bir "mailto:" bağı ekler.</p>
+
+    <p>2.0.44 sürümünden beri sunucu sürüm numarasının ayrıntıları <code class="directive"><a href="#servertokens">ServerTokens</a></code> yönergesi ile belirlenmektedir.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="#servertokens">ServerTokens</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerTokens" id="ServerTokens">ServerTokens</a> <a name="servertokens" id="servertokens">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td><code>Server</code> HTTP yanıt başlığını yapılandırır.
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>ServerTokens Full</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Bu yönerge <code>Server</code> HTTP yanıt başlığı alanında istemcilere
+      sunucunun işletim sistemi, sunucuyla derlenmiş modüller, vs. hakkında
+      bilgi verilip verilmeyeceÄŸini belirler.</p>
+
+    <dl>
+      <dt><code>ServerTokens Prod[uctOnly]</code></dt>
+
+      <dd>Sunucu şunu gönderir (<em>örnek</em>): <code>Server:
+      Apache</code></dd>
+
+      <dt><code>ServerTokens Major</code></dt>
+
+      <dd>Sunucu şunu gönderir (<em>örnek</em>): <code>Server:
+      Apache/2</code></dd>
+
+      <dt><code>ServerTokens Minor</code></dt>
+
+      <dd>Sunucu şunu gönderir (<em>örnek</em>): <code>Server:
+      Apache/2.0</code></dd>
+
+      <dt><code>ServerTokens Min[imal]</code></dt>
+
+      <dd>Sunucu şunu gönderir (<em>örnek</em>): <code>Server:
+      Apache/2.0.41</code></dd>
+
+      <dt><code>ServerTokens OS</code></dt>
+
+      <dd>Sunucu şunu gönderir (<em>örnek</em>): <code>Server: Apache/2.0.41
+      (Unix)</code></dd>
+
+      <dt><code>ServerTokens Full</code> (ya da belirtilmezse)</dt>
+
+      <dd>Sunucu şunu gönderir (<em>örnek</em>): <code>Server: Apache/2.0.41
+      (Unix) PHP/4.2.2 MyMod/1.2</code></dd>
+    </dl>
+
+    <p>Bu ayarlama sunucunun tamamını etkiler ve her sanal konak için
+      farklılaştırılamaz.</p>
+
+    <p>2.0.44 sürümünden itibaren bu yönerge <code class="directive"><a href="#serversignature">ServerSignature</a></code> yönergesi tarafından sunulan
+      bilgiyi de etkilemektedir.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="#serversignature">ServerSignature</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SetHandler" id="SetHandler">SetHandler</a> <a name="sethandler" id="sethandler">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Eşleşen tüm dosyaların belli bir eylemci tarafından işlenmesine
+sebep olur.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>SetHandler <var>eylemci-ismi</var>|None</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Apache 2.0’da core modülüne taşındı.</td></tr>
+</table>
+    <p>Bir <code>.htaccess</code> dosyasına veya bir <code class="directive"><a href="#directory">&lt;Directory&gt;</a></code> ya da <code class="directive"><a href="#location">&lt;Location&gt;</a></code> bölümüne yerleştirildiğinde, eşleşen
+      tüm dosyaların, ismi <var>eylemci-ismi</var> ile belirtilen <a href="../handler.html">eylemci</a> tarafından çözümlenmesine sebep olur.
+      Örneğin, bir dizin içindeki bütün dosyaların, uzantılarına bakılmaksızın
+      birer imagemap kural dosyası olarak çözümlenmesini istersiniz, bu dizin
+      içindeki bir <code>.htaccess</code> dosyasına şöyle bir satır
+      koyabilirsiniz:</p>
+
+    <div class="example"><p><code>
+      SetHandler imap-file
+    </code></p></div>
+
+    <p>Başka bir örnek: <code>http://localhost/status</code> gibi bir istek
+      yapıldığında sunucunun bir durum bilgisi göstermesi için
+      <code>httpd.conf</code> dosyasına şöyle bir satır koyabilirsiniz:</p>
+
+    <div class="example"><p><code>
+      &lt;Location /status&gt;<br />
+      <span class="indent">
+        SetHandler server-status<br />
+      </span>
+      &lt;/Location&gt;
+    </code></p></div>
+
+    <p>Evvelce tanımlanmış bir <code class="directive">SetHandler</code> yönergesini
+      <code>None</code> değeriyle geçersiz hale getirebilirsiniz.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SetInputFilter" id="SetInputFilter">SetInputFilter</a> <a name="setinputfilter" id="setinputfilter">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>POST girdilerini ve istemci isteklerini işleyecek süzgeçleri
+belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>SetInputFilter <var>süzgeç</var>[;<var>süzgeç</var>...]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">SetInputFilter</code> yönergesi, istemci isteklerini 
+      ve sunucu tarafından alındığı takdirde POST girdisini işleyecek süzgeç 
+      veya süzgeçleri belirler. Bu, diğer <code class="directive"><a href="../mod/mod_mime.html#addinputfilter">AddInputFilter</a></code> yönergeleri dahil evvelce tanımlanmış 
+      süzgeçlere eklenir.</p>
+
+    <p>Birden fazla süzgeç belirtilmek istenirse birbirlerinden noktalı
+     virgüllerle ayrılmalı ve çıktıyı işleyecekleri sıraya uygun olarak
+     sıralanmalıdırlar.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><a href="../filter.html">Süzgeçler</a> belgesi</li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SetOutputFilter" id="SetOutputFilter">SetOutputFilter</a> <a name="setoutputfilter" id="setoutputfilter">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Sunucunun yanıtlarını işleyecek süzgeçleri belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>SetOutputFilter <var>süzgeç</var>[;<var>süzgeç</var>...]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Geçersizleştirme:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">SetOutputFilter</code> yönergesi, istemciye
+     gönderilmeden önce sunucunun yanıtlarını işleyecek süzgeçleri belirler.
+     Bu, diÄŸer <code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code>
+     yönergeleri dahil evvelce tanımlanmış süzgeçlere eklenir.</p>
+
+    <p>Örneğin, aşağıdaki yapılandırma ile <code>/www/data/</code> dizinindeki
+     bütün dosyalar sunucu taraflı içerik kapsamında ele alınacaktır.</p>
+
+    <div class="example"><p><code>
+      &lt;Directory /www/data/&gt;<br />
+      <span class="indent">
+        SetOutputFilter INCLUDES<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p>Birden fazla süzgeç belirtilmek istenirse birbirlerinden noktalı
+     virgüllerle ayrılmalı ve çıktıyı işleyecekleri sıraya uygun olarak
+     sıralanmalıdırlar.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><a href="../filter.html">Süzgeçler</a> belgesi</li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="TimeOut" id="TimeOut">TimeOut</a> <a name="timeout" id="timeout">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir istek için başarısız olmadan önce belirli olayların
+gerçekleşmesi için sunucunun geçmesini bekleyeceği süre.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>TimeOut <var>saniye</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>TimeOut 300</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">TimeOut</code> yönergesi Apache’nin aşağıdaki üç durum
+      için bekleyeceği süreyi belirler:</p>
+
+    <ol>
+      <li>Bir GET isteğini almak için geçecek toplam süre.</li>
+
+      <li>Bir POST veya PUT isteğinde TCP paketlerinin alımları arasında geçen
+        süre.</li>
+
+      <li>Yanıtlarda TCP paketlerinin aktarımı için alındılar arasında geçen
+        süre.</li>
+    </ol>
+    <p>Bunları ileride ayrı ayrı yapılandırılabilir kılmayı planlıyoruz. 1.2
+      öncesinde zaman aşımı öntanımlı olarak 1200 saniye idi, fakat çoğu durum
+      için hala gereğinden fazla olsa bile şimdi 300 saniyeye düşürüldü. Kodun
+      içinde, bir paket gönderilmediği takdirde zaman aşımı değerinin
+      sıfırlanmadan kaldığı tuhaf yerler bulunabileceğinden bu değer öntanımlı
+      değerin altına ayarlanmamalıdır.</p>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="TraceEnable" id="TraceEnable">TraceEnable</a> <a name="traceenable" id="traceenable">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td><code>TRACE</code> isteklerinde davranış şeklini belirler
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>TraceEnable <var>[on|off|extended]</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>TraceEnable on</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Apache 1.3.34, 2.0.55 ve sonrasında mevcuttur.</td></tr>
+</table>
+    <p>Bu yönerge çekirdek ve vekil (<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>) sunucuların
+      her ikisi için öntanımlı <code>TRACE</code> davranışını değiştirir.
+      Öntanımlı olan <code>TraceEnable on</code> ile RFC 2616’dan kaynaklanan
+      ve isteğe herhangi bir istek gövdesinin eşlik etmesine izin vermeyen
+      <code>TRACE</code> isteklerine izin verilir. <code>TraceEnable off</code>
+      ile çekirdek ve vekil (<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>) sunucuların her ikisi
+      de <code>TRACE</code> isteklerine yanıt olarak bir <code>405</code>
+      (Yönteme izin verilmiyor) hatası döndürür.</p>
+
+    <p><code>TraceEnable extended</code> ile sadece sınama ve tanı koyma
+      amaçlarına yönelik olarak istek gövdelerine izin verilir. Asıl sunucu
+      istek gövdesini 64k ile sınırlar (<code>Transfer-Encoding: chunked</code>
+      kullanılmışsa bölüm başlıkları için 8k daha). Asıl sunucu yanıt
+      gövdesinde tüm başlıkları ve bölüm başlıklarının tamamını yansıtacaktır.
+      Vekil sunucuda ise istek gövdesi için 64k’lık sınır yoktur.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="UseCanonicalName" id="UseCanonicalName">UseCanonicalName</a> <a name="usecanonicalname" id="usecanonicalname">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Sunucunun kendi adını ve portunu nasıl belirleyeceğini ayarlar
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>UseCanonicalName On|Off|DNS</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>UseCanonicalName Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Apache‘nin çoğu durumda özüne yönelik URL‘ler (isteğin tekrar aynı
+      sunucuya yapıldığı bir URL türü) oluşturması gerekir.
+      <code>UseCanonicalName On</code> ile Apache, sunucu için meşru ismi ve
+      portu oluşturmak için <code class="directive"><a href="#servername">ServerName</a></code>
+      yönergesinde belirtilen ismi ve portu kullanır. Bu isim  CGI'lerde
+      <code>SERVER_NAME</code> ve <code>SERVER_PORT</code> değerlerinde ve tüm
+      özüne yönelik URL’lerde kullanılır.</p>
+
+    <p><code>UseCanonicalName Off</code> ile Apache, özüne yönelik URL’leri
+      varsa istemci tarafından sağlanan konak ismini ve portu kullanarak
+      oluşturur; bunlar istemci tarafından sağlanmamışsa yukarıda tanımlanan
+      iÅŸleme baÅŸvurulur. Bu deÄŸerler, <a href="../vhosts/name-based.html">isme
+      dayalı sanal konakları</a> gerçekleştirirken kullanılan değerlerle aynı
+      olup aynı istemcilerle kullanılabilir. <code>SERVER_NAME</code> ve
+      <code>SERVER_PORT</code> CGI değişkenleri de istemci tarafından sağlanan
+      isim ve portla oluÅŸturulur.</p>
+
+    <p>Bir örnek olarak, iç ağdaki istemcilerin sunucuya <code>www</code> gibi
+      bir kısa isim kullanarak bağlandığı durumu ele alırsak daha yararlı olur.
+      Kullanıcılar bir kısa isim ve bir dizin isminden oluşan ve <em>bir / ile
+      sonlandırılmamış</em> <code>http://www/splat</code> şeklinde bir istek
+      yaparlarsa, Apache onları <code>http://www.mesela.dom/splat/</code>
+      adresine yönlendirecektir. Eğer kimlik doğrulama da etkinse bu
+      kullanıcının iki defa kimlik doğrulamasına sokulmasına sebep olacaktır
+      (bir kere <code>www</code> için bir kere de <code>www.mesela.dom</code>
+      için; daha ayrıntılı bilgi için <a href="http://httpd.apache.org/docs/misc/FAQ.html#prompted-twice">SSS</a>’y
+      e bakınız). Fakat <code class="directive">UseCanonicalName Off</code> olsaydı
+      Apache isteği <code>http://www/splat/</code> adresine yönlendirecekti.</p>
+
+    <p><code>UseCanonicalName DNS</code> diye üçüncü bir seçenek daha vardır ve
+      istek yaparken <code>Host:</code> başlığını kullanmayan eski istemcileri
+      desteklemek amacıyla IP’ye dayalı sanal konaklarla kullanmak için
+      tasarlanmıştır. Bu seçenek etkin olduğunda Apache, istemciyi özüne
+      yönelik URL’lerle doğru yere bağlamak için sunucu IP adresi üzerinde bir
+      ters DNS sorgusu yapar.</p>
+
+    <div class="warning"><h3>Uyarı</h3>
+    <p>Eğer CGI’ler <code>SERVER_NAME</code> değerleri için önkabuller
+      yapıyorlarsa bu seçenek işlerinin bozulmasına yol açabilir. Aslında
+      istemciler konak ismi olarak istedikleri değeri vermekte özgürdürler.
+      Fakat eğer CGI, özüne yönelik URL’leri oluştururken sadece
+      <code>SERVER_NAME</code> değerini kullanıyorsa bu istendiği gibi
+      çalışacaktır.</p>
+    </div>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="#usecanonicalphysicalport">UseCanonicalPhysicalPort</a></code></li>
+<li><code class="directive"><a href="#servername">ServerName</a></code></li>
+<li><code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="UseCanonicalPhysicalPort" id="UseCanonicalPhysicalPort">UseCanonicalPhysicalPort</a> <a name="usecanonicalphysicalport" id="usecanonicalphysicalport">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Sunucunun kendi adını ve portunu nasıl belirleyeceğini ayarlar
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>UseCanonicalPhysicalPort On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>UseCanonicalPhysicalPort Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli, sanal konak, dizin</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p>Apache‘nin çoğu durumda özüne yönelik URL‘ler (isteğin tekrar aynı
+      sunucuya yapıldığı bir URL türü) oluşturması gerekir. Apache <code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code> yönergesine bağlı olarak
+      sunucu için meşru portu oluştururken <code>UseCanonicalPhysicalPort
+      On</code> ile olası port olarak istek tarafından kullanılmakta olan
+      fiziksel portu kullanacaktır. <code>UseCanonicalPhysicalPort Off</code>
+      olduğunda ise geçerli bir port numarası oluşturmak için asıl fiziksel
+      port yerine yapılandırma bilgisi kullanılır.</p>
+
+    <div class="note"><h3>Ek Bilgi</h3>
+    <p>Fiziksel port kullanımı etkin olduğunda işlemler şu sırayla
+      yürütülür:<br /><br />
+     <code>UseCanonicalName On</code></p>
+     <ul>
+      <li><code>Servername</code> yönergesinde belirtilen port</li>
+      <li>Fiziksel port</li>
+      <li>Öntanımlı port</li>
+     </ul>
+     <code>UseCanonicalName Off | DNS</code>
+     <ul>
+      <li><code>Host:</code> başlığından çözümlenen port</li>
+      <li>Fiziksel port</li>
+      <li><code>Servername</code> yönergesinde belirtilen port</li>
+      <li>Öntanımlı port</li>
+     </ul>
+
+    <p><code>UseCanonicalPhysicalPort Off</code> olduğunda işlem sırasında
+      fiziksel port adımları atlanır.</p>
+    </div>
+
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="#usecanonicalname">UseCanonicalName</a></code></li>
+<li><code class="directive"><a href="#servername">ServerName</a></code></li>
+<li><code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="VirtualHost" id="VirtualHost">&lt;VirtualHost&gt;</a> <a name="virtualhost" id="virtualhost">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Sadece belli bir konak ismine ve porta uygulanacak yönergeleri barındırır.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>&lt;VirtualHost
+    <var>adres</var>[:<var>port</var>] [<var>adres</var>[:<var>port</var>]]
+    ...&gt; ... &lt;/VirtualHost&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>Çekirdek</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td>core</td></tr>
+</table>
+    <p><code class="directive">&lt;VirtualHost&gt;</code> ve
+      <code>&lt;/VirtualHost&gt;</code> birlikte sadece belli bir sanal konaÄŸa
+      uygulanacak yönergeleri sarmalamakta kullanılırlar. Bir sanal konak
+      kapsamında belirtilebilecek her yönerge kullanılabilir. Sunucu belli bir
+      sanal konak üzerindeki bir belge için bir istek aldığında <code class="directive">&lt;VirtualHost&gt;</code> bölümünde bulunan yapılandırma
+      yönergelerini kullanır. <var>adres</var> şunlardan biri olabilir:</p>
+
+    <ul>
+      <li>Sanal konağın IP adresi.</li>
+
+      <li>Sanal konağın IP adresi için tam nitelenmiş alan adı (önerilmez).</li>
+
+      <li><code>NameVirtualHost *</code> ile birlikte tüm IP adresleri ile
+        eşleşmek üzere <code>*</code> karakteri.</li>
+
+      <li>Sadece IP sanal konaklarında kullanmak için eşleşmeyen IP adreslerini
+        yakalamak amacıyla <code>_default_</code> dizgesi.</li>
+    </ul>
+
+    <div class="example"><h3>Örnek</h3><p><code>
+      &lt;VirtualHost 10.1.2.3&gt;<br />
+      <span class="indent">
+        ServerAdmin webmaster@konak.mesela.dom<br />
+        DocumentRoot /www/docs/konak.mesela.dom<br />
+        ServerName konak.mesela.dom<br />
+        ErrorLog logs/konak.mesela.dom-error_log<br />
+        TransferLog logs/konak.mesela.dom-access_log<br />
+      </span>
+      &lt;/VirtualHost&gt;
+    </code></p></div>
+
+
+    <p>İsteğe bağlı port numarasını belirtmeyi mümkün kılmak için IPv6
+      adresleri köşeli ayraç içine alınır. IPv6 adresi kullanılan bir örnek:</p>
+
+    <div class="example"><p><code>
+      &lt;VirtualHost [2001:db8::a00:20ff:fea7:ccea]&gt;<br />
+      <span class="indent">
+        ServerAdmin webmaster@konak.mesela.dom<br />
+        DocumentRoot /www/docs/konak.mesela.dom<br />
+        ServerName konak.mesela.dom<br />
+        ErrorLog logs/konak.mesela.dom-error_log<br />
+        TransferLog logs/konak.mesela.dom-access_log<br />
+      </span>
+      &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    <p>Her sanal konağın ya farklı bir IP adresi ve port ile ya da farklı bir
+      konak ismiyle eşleşmesi gerekir. Birinci durumda sunucu makinesinin çok
+      sayıda adresten IP paketleri kabul edecek şekilde yapılandırılması
+      gerekir. (Eğer makinede çok sayıda ağ arabirimi yoksa bu, işletim sistemi
+      desteklediÄŸi takdirde <code>ifconfig alias</code> komutuyla
+      saÄŸlanabilir.)</p>
+
+    <div class="note"><h3>Ek Bilgi</h3>
+    <p><code class="directive">&lt;VirtualHost&gt;</code> kullanımı Apache’nin
+      dinleyeceği adresler üzerinde belirleyici değildir. Apache’nin doğru
+      adresi dinlediğinden emin olmak için <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code> kullanmanız gerekebilir.</p>
+    </div>
+
+    <p>IP’ye dayalı sanal konakları kullanıyorsanız, diğer sanal konaklarda
+      açıkça belirtilmemiş IP adresleriyle eşleşecek sanal konağı
+      <code>_default_</code> özel ismiyle belirtebilirsiniz. "Ana" sunucu
+      yapılandırmasında <code>_default_</code> diye bir sanal konağın
+      bulunmaması halinde, hiçbir IP adresi eşleşmesi bulunamadığı takdirde
+      <code class="directive">&lt;VirtualHost&gt;</code> bölümleri dışında kalan
+      tüm yapılandırmalar bu amaca yönelik olarak kullanılır. (Yalnız dikkat
+      edin, bir <code class="directive"><a href="#namevirtualhost">NameVirtualHost</a></code> yönergesi
+      ile eşleşen bir IP adresi için ne "ana" sunucu yapılandırması ne de
+      <code>_default_</code> sanal konak yapılandırması kullanılır. Bu konuda
+      daha ayrıntılı bilgi için <a href="../vhosts/name-based.html">isme dayalı
+      sanal konaklar</a> belgesine bakınız.)</p>
+
+    <p>Eşleşilecek portu değiştirmek için bir <code>:port</code>
+      belirtebilirsiniz. Port bu ÅŸekilde deÄŸiÅŸtirilmediÄŸi takdirde ana
+      sunucunun son <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code>
+      yönergesinde belirtilen port kullanılır. Bir adresteki tüm portlarla
+      eşleşileceğini belirtmek için <code>:*</code> kullanabilirsiniz. (Bu,
+      <code>_default_</code> kullanıldığı takdirde önerilir.)</p>
+
+    <p>Her <code class="directive">&lt;VirtualHost&gt;</code> bloku içinde bir
+      <code class="directive"><a href="#servername">ServerName</a></code> yönergesi mutlaka
+      olmalıdır. Yokluğu halinde "ana" sunucu yapılandırmasındaki <code class="directive"><a href="#servername">ServerName</a></code> miras alınacaktır (yani, sanal konak
+      belirtmek için boşuna uğraşmış olursunuz).</p>
+
+    <div class="warning"><h3>Güvenlik</h3>
+    <p>Günlük dosyalarının sunucuyu çalıştıran kullanıcıdan başka herkes
+      tarafından yazılabilen bir yerde saklanmasından dolayı ortaya çıkabilecek
+      güvenlik sorunları hakkında daha ayrıntılı bilgi için <a href="../misc/security_tips.html">güvenlik ipuçları</a> belgesine
+      bakınız.</p>
+    </div>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><a href="../vhosts/">Apache Sanal Konak Belgeleri</a></li>
+<li><a href="../dns-caveats.html">DNS ile Ä°lgili Konular ve Apache</a></li>
+<li><a href="../bind.html">Apache’nin belli adresleri ve portları dinlemek
+  üzere yapılandırılması</a></li>
+<li>Bir istek alındığında farklı yapılandırma bölümlerinin nasıl bir arada
+  ele alındığının açıklaması için <a href="../sections.html">
+  &lt;Directory&gt;, &lt;Location&gt; ve &lt;Files&gt; bölümleri nasıl
+  çalışır?</a> belgesine bakınız.</li>
+</ul>
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/core.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../tr/mod/core.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/directive-dict.html b/docs/manual/mod/directive-dict.html
index 1ed62d36..07c06097 100644
--- a/docs/manual/mod/directive-dict.html
+++ b/docs/manual/mod/directive-dict.html
@@ -1,11 +1,17 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: directive-dict.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: directive-dict.html.ja.euc-jp
+URI: directive-dict.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: directive-dict.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: directive-dict.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/directive-dict.html.en b/docs/manual/mod/directive-dict.html.en
index 9e1a17af..e0999ca7 100644
--- a/docs/manual/mod/directive-dict.html.en
+++ b/docs/manual/mod/directive-dict.html.en
@@ -20,7 +20,8 @@
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../en/mod/directive-dict.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/directive-dict.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/directive-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/mod/directive-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/directive-dict.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>This document describes the terms that are used to describe
@@ -284,8 +285,9 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/directive-dict.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/directive-dict.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/directive-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/mod/directive-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/directive-dict.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/directive-dict.html.ja.euc-jp b/docs/manual/mod/directive-dict.html.ja.euc-jp
deleted file mode 100644
index cb39f028..00000000
--- a/docs/manual/mod/directive-dict.html.ja.euc-jp
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î²òÀâ¤Ë»È¤ï¤ì¤ëÍѸì - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î²òÀâ¤Ë»È¤ï¤ì¤ëÍѸì</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/directive-dict.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/directive-dict.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/directive-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-    <p>¤³¤Îʸ½ñ¤Ï³Æ Apache <a href="directives.html">ÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a>
-    ¤òÀâÌÀ¤¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤Æ¤¤¤ëÍѸì¤òÀâÌÀ¤·¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#Description">ÀâÌÀ</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#Syntax">¹½Ê¸</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#Default">¥Ç¥Õ¥©¥ë¥È</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#Context">¥³¥ó¥Æ¥­¥¹¥È</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#Override">¾å½ñ¤­</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#Status">¥¹¥Æ¡¼¥¿¥¹</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#Module">¥â¥¸¥å¡¼¥ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#Compatibility">¸ß´¹À­</a></li>
-</ul><h3>»²¾È</h3><ul class="seealso"><li><a href="../configuring.html">ÀßÄê¥Õ¥¡¥¤¥ë</a></li></ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="Description" id="Description">ÀâÌÀ</a></h2>
-
-<p>¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÌÜŪ¤Î´Êñ¤ÊÀâÌÀ¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="Syntax" id="Syntax">¹½Ê¸</a></h2>
-
-    <p>ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î½ñ¼°¤ò¼¨¤·¤Þ¤¹¡£
-    ¤³¤Î¹½Ê¸¤Ï¥Ç¥£¥ì¥¯¥Æ¥£¥ÖÆÃÍ­¤Ê¤Î¤Ç¡¢¾ÜºÙ¤Ï¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÀâÌÀ¤ò
-    »²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£°ìÈÌŪ¤Ë¡¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö̾¤Î¸å¤Ë¤Ï
-    ¶õÇò¤Ë¤è¤êʬ³ä¤µ¤ì¤¿¤¤¤¯¤Ä¤«¤Î°ú¿ô¤¬Â³¤­¤Þ¤¹¡£
-    °ú¿ô¤¬¶õÇò¤ò´Þ¤à¤È¤­¤ÏÆó½Å°úÍÑÉä (ÌõÃí: ")
-    ¤Ç°Ï¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ ¥ª¥×¥·¥ç¥Ê¥ë¤Ê°ú¿ô¤Ï³ç¸Ì
-    (ÌõÃí: []) ¤Ç°Ï¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
-    °ú¿ô¤¬Ê£¿ô¤ÎÃͤò¼è¤êÆÀ¤ë¾ì¹ç¤Ï¡¢¤½¤ì¤é¤ÎÃͤϿ⾤ÎËÀ "|"
-    ¤Ç ʬ³ä¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-    Êѹ¹¤µ¤ì¤Ê¤¤¥Æ¥­¥¹¥È¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥©¥ó¥È¤Çɽ¼¨¤µ¤ì¡¢ÃÖ´¹¤ÎɬÍפÊ
-    °ú¿ô¤Ï<em>¶¯Ä´¤µ¤ì¤Æ</em>ɽ¼¨¤µ¤ì¤Þ¤¹¡£
-    °ú¿ô¤Î¿ô¤¬ÊѤï¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏºÇ¸å¤Î
-    °ú¿ô¤¬·«¤êÊÖ¤µ¤ì¤ë¤³¤È¤ò¼¨¤¹¤¿¤á¤Ë "..."
-    ¤Ç½ª¤ï¤ê¤Þ¤¹¡£</p>
-
-    <p>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¿¤¯¤Î°ã¤¦·¿¤Î°ú¿ô¤ò¤È¤ê¤Þ¤¹¡£¤¤¤¯¤Ä¤«¡¢Îɤ¯
-    »È¤ï¤ì¤ë¤â¤Î¤ò°Ê²¼¤ÇÄêµÁ¤·¤Þ¤¹¡£</p>
-
-    <dl>
-      <dt><em>URL</em></dt>
-
-      <dd><code>http://www.example.com/path/to/file.html</code>
-      ¤Î¤è¤¦¤Ë¡¢
-      ¥¹¥­¡¼¥à¡¢¥Û¥¹¥È̾¡¢¥Ñ¥¹Ì¾(¾Êά²Äǽ)¤ò´Þ¤ó¤Ç¤¤¤ë´°Á´¤Ê
-      Uniform Resource Locator¡£</dd>
-
-      <dt><em>URL-path</em></dt>
-
-      <dd><code>/path/to/file.html</code> ¤Î¤è¤¦¤Ë¡¢¥¹¥­¡¼¥à¤È
-      ¥Û¥¹¥È̾¤Î¸å¤Ë³¤¯ <em>url</em>
-      ¤Î°ìÉô¡£<em>url-path</em> ¤Ï
-      ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤«¤é¤Î»ëÅÀ¤Ç¤Ï¤Ê¤¯¡¢
-      ¥¦¥§¥Ö¤«¤é¤Î»ëÅÀ¤Ç¥ê¥½¡¼¥¹¤òɽ¸½¤·¤Þ¤¹¡£</dd>
-
-      <dt><em>file-path</em></dt>
-
-      <dd><code>/usr/local/apache/htdocs/path/to/file.html</code>
-      ¤Î¤è¤¦¤Ë¡¢
-      ¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê¤«¤é»Ï¤Þ¤ë¥í¡¼¥«¥ë¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Î¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¡£
-      Ä̾¥¹¥é¥Ã¥·¥å¤Ç»Ï¤Þ¤é¤Ê¤¤ <em>file-path</em> ¤Ï <a href="core.html#serverroot">ServerRoot</a>
-      ¤«¤é¤ÎÁêÂХѥ¹¤È¤·¤Æ °·¤ï¤ì¤Þ¤¹¡£</dd>
-
-      <dt><em>directory-path</em></dt>
-
-      <dd><code>/usr/local/apache/htdocs/path/to/</code>
-      ¤Î¤è¤¦¤Ë¡¢
-      ¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê¤«¤é»Ï¤Þ¤ë¥í¡¼¥«¥ë¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î
-      ¥Ñ¥¹¡£</dd>
-
-      <dt><em>filename</em></dt>
-
-      <dd><code>file.html</code> ¤Î¤è¤¦¤Ë¡¢¥Ñ¥¹¾ðÊó¤ÎÉÕ¤¤¤Æ¤¤¤Ê¤¤
-      ¥Õ¥¡¥¤¥ë̾¡£</dd>
-
-      <dt><em>regex</em></dt>
-
-      <dd>Perl ¸ß´¹¤Î<a href="../glossary.html#regex">Àµµ¬É½¸½</a>¤Ç¤¹¡£
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÄêµÁ¤¬ <em>regex</em>
-      ¤¬²¿¤ËÂФ·¤Æ¥Þ¥Ã¥Á¤ò¹Ô¤Ê¤¦¤Î¤«¤ò»ØÄꤷ¤Þ¤¹¡£</dd>
-
-      <dt><em>extension</em></dt>
-
-      <dd>°ìÈÌŪ¤Ë¤Ï <em>filename</em>
-      ¤ÎºÇ¸å¤Î¥É¥Ã¥È¤Î¸å¤ÎÉôʬ¤Ç¤¹¡£ ¤·¤«¤·¡¢Apache
-      ¤ÏÊ£¿ô¤Î¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤òǧ¼±¤·¤Þ¤¹¤Î¤Ç¡¢<em>filename</em>
-      ¤ËÊ£¿ô¤Î¥É¥Ã¥È¤¬¤¢¤ë¤È¡¢ºÇ½é¤Î¥É¥Ã¥È¤Î¸å¤Î¡¢¤½¤ì¤¾¤ì¤Î¥É¥Ã¥È¤ÇʬΥ¤µ¤ì¤¿Éôʬ¤¬
-      <em>extension</em> (ÌõÃí: ³ÈÄ¥»Ò)
-      ¤Ë¤Ê¤ê¤Þ¤¹¡£Î㤨¤Ð¡¢<em>filename</em>
-      <code>file.html.en</code>
-      ¤Ë¤ÏÆó¤Ä¤Î³ÈÄ¥»Ò¤¬¤¢¤ê¤Þ¤¹¡£<code>.html</code> ¤È
-      <code>.en</code> ¤Ç¤¹¡£Apache
-      ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤Ï¡¢<em>extension</em>
-      ¤Ï¥É¥Ã¥ÈÉÕ¤­¤Ç¤â̵¤·¤Ç¤â»ØÄê¤Ç¤­¤Þ¤¹¡£¤µ¤é¤Ë¡¢<em>extension</em>
-      ¤Ï Âçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Þ¤»¤ó¡£</dd>
-
-      <dt><em>MIME-type</em></dt>
-
-      <dd><code>text/html</code> ¤Î¤è¤¦¤Ë¡¢¥¹¥é¥Ã¥·¥å¤ÇʬΥ¤µ¤ì¤¿
-      ¼ç¥Õ¥©¡¼¥Þ¥Ã¥È¤ÈÉû¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë¤è¤Ã¤Æ¥Õ¥¡¥¤¥ë¤Î·Á¼°¤ò
-      ɽ¤¹ÊýË¡¤Ç¤¹¡£</dd>
-
-      <dt><em>env-variable</em></dt>
-
-      <dd>Apache ¤ÎÀßÄê¤Ë¤è¤êÄêµÁ¤µ¤ì¤ë <a href="../env.html">´Ä¶­ÊÑ¿ô</a>¤Î̾Á°¤Ç¤¹¡£¤³¤ì¤Ï¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î
-      ´Ä¶­ÊÑ¿ô¤ÈƱ¤¸¤È¤Ï¸Â¤é¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¾ÜºÙ¤Ï <a href="../env.html">´Ä¶­ÊÑ¿ô¤ÎÀâÌÀ</a>¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</dd>
-    </dl>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="Default" id="Default">¥Ç¥Õ¥©¥ë¥È</a></h2>
-
-    <p>¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¥Ç¥Õ¥©¥ë¥ÈÃÍ
-    (<em>¤¹¤Ê¤ï¤Á</em>¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤«¤é
-    ¾Êά¤µ¤ì¤Æ¤¤¤Æ¤â¡¢Apache
-    ¥¦¥§¥Ö¥µ¡¼¥Ð¤ÏÆÃÄê¤ÎÃͤËÀßÄꤵ¤ì¤Æ¤¤¤ë¤«¤Î¤è¤¦¤Ë
-    Æ°ºî¤·¤Þ¤¹) ¤¬¤¢¤ë¾ì¹ç¤Ï¤³¤³¤Ëµ­½Ò¤µ¤ì¤Þ¤¹¡£
-    ¥Ç¥Õ¥©¥ë¥ÈÃͤÎ̵¤¤¾ì¹ç¡¢¤³¤³¤Ï "<em>None</em>" ¤È
-    ½ñ¤«¤ì¤Þ¤¹¡£¤³¤³¤Ç½ñ¤«¤ì¤Æ¤¤¤ë¥Ç¥Õ¥©¥ë¥È¤Ï¥µ¡¼¥Ð¤È¶¦¤ËÇÛÉÛ¤µ¤ì¤Æ¤¤¤ë
-    ¥Ç¥Õ¥©¥ë¥È¤Î httpd.conf
-    Æâ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÃͤÈ
-    °ã¤¦²ÄǽÀ­¤¬¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="Context" id="Context">¥³¥ó¥Æ¥­¥¹¥È</a></h2>
-
-    <p>
-    ¤³¤ì¤Ï¡¢¥µ¡¼¥Ð¤ÎÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Î¤É¤³¤Ç¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Í­¸ú¤Ê¤Î¤«¤ò¼¨¤·¤Þ¤¹¡£
-    ¼¡¤Ë¼¨¤¹Ãͤ¬°ì¤Ä°Ê¾å¥«¥ó¥Þ¶èÀÚ¤ê¤ÇÎóµó¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <dl>
-      <dt>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</dt>
-
-      <dd>¤³¤ì¤Ï¡¢¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë
-      (<em>Î㤨¤Ð</em>¡¢<code>httpd.conf</code>,
-      <code>srm.conf</code>, <code>access.conf</code>)
-      Æâ¤Ç¤Ï»ÈÍѤǤ­¤Þ¤¹¤¬¡¢
-      <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> ¤ä
-      <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> ¤ÎÃæ¤Ç¤Ï
-      <strong>»ÈÍѤǤ­¤Ê¤¤</strong>¤³¤È¤ò¼¨¤·¤Þ¤¹¡£
-      <code>.htaccess</code>¥Õ¥¡¥¤¥ë¤Ç¤Î»ÈÍѤϵö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£</dd>
-
-      <dt>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</dt>
-
-      <dd>¤³¤ì¤Ï¡¢¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë¤Î
-      <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-      ¤ÎÃæ¤Ç»ÈÍѤǤ­¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£</dd>
-
-      <dt>¥Ç¥£¥ì¥¯¥È¥ê</dt>
-
-      <dd>¤³¤ì¤Ï¡¢¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë¤Î
-      <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, 
-      <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>, 
-      <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, 
-      <code class="directive"><a href="../mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>
-      ¥³¥ó¥Æ¥Ê¤ÎÃæ¤Ç¡¢ <a href="../sections.html">ÀßÄꥻ¥¯¥·¥ç¥ó</a>
-      ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ëÀ©¸Â¤Î²¼¤Ç»ÈÍѤǤ­¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£</dd>
-
-      <dt>.htaccess</dt>
-
-      <dd>¤³¤ì¤Ï¡¢¥Ç¥£¥ì¥¯¥È¥ê<em>Ëè</em>¤Î
-      <code>.htaccess</code> ¥Õ¥¡¥¤¥ëÆâ¤Ç
-      »ÈÍѲÄǽ¤Ç¤¢¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£ ¤¿¤À¡¢<a href="#Override">¾å½ñ¤­</a>
-      ¤ÎÀßÄê¤Ë¤è¤Ã¤Æ¤Ï¡¢½èÍý¤µ¤ì¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£</dd>
-    </dl>
-
-    <p>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï»Ø¼¨¤µ¤ì¤¿¥³¥ó¥Æ¥­¥¹¥È¤Ç<em>¤Î¤ß</em>µö²Ä¤µ¤ì¤Þ¤¹¡£
-    ¾¤Î¾ì½ê¤Ç»È¤ª¤¦¤È¤¹¤ë¤È¡¢¥µ¡¼¥Ð¤¬¤½¤Î¥³¥ó¥Æ¥­¥¹¥È¤òÀµ¤·¤¯°·¤¨¤Ê¤¯
-    ¤Ê¤ë¤è¤¦¤ÊÀßÄꥨ¥é¡¼¤¬È¯À¸¤¹¤ë¤«¡¢¥µ¡¼¥Ð¤¬¤Þ¤Ã¤¿¤¯Æ°ºî¤·¤Ê¤¯¤Ê¤ë¡¢
-    <em>¤¹¤Ê¤ï¤Á</em>¡¢¥µ¡¼¥Ð¤¬µ¯Æ°¤·¤Ê¤¯¤Ê¤ë¤È¤¤¤¦¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÍ­¸ú¤Ê°ÌÃ֤ϡ¢¼ÂºÝ¤Ïµó¤²¤é¤ì¤Æ¤¤¤ë¥³¥ó¥Æ¥­¥¹¥È¤Î
-    ÏÀÍýÏÂ (ÌõÃí: Boolen OR)
-    ¤Ë¤Ê¤ê¤Þ¤¹¡£¸À¤¤´¹¤¨¤ë¤È¡¢
-    "<code>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë¡¢.htaccess</code>" ¤ÇÍ­¸ú¤À¤È
-    µ­¤µ¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code>httpd.conf</code>
-    ¥Õ¥¡¥¤¥ë¤È <code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ë¤È¤ÇÍ­¸ú¤Ç¤¹¤¬¡¢ <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
-    ¤ä <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-    ¤ÎÃæ¤Ç¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="Override" id="Override">¾å½ñ¤­</a></h2>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î°À­¤Ï¡¢<code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ëÃæ¤Ë
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬¸½¤ì¤¿¤È¤­¤Ë¡¢¤½¤ì¤Î½èÍý¤òÍ­¸ú¤Ë¤¹¤ë¤¿¤á¤Ë
-    ¤É¤ÎÀßÄê¤Î¾å½ñ¤­¤¬É¬Íפ«¤ò¼¨¤·¤Þ¤¹¡£ ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-    <a href="#Context">¥³¥ó¥Æ¥­¥¹¥È</a>
-    ¤¬¡¢<code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ëÃæ¤Ç¤Ïµö²Ä¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢ ¤³¤Î°À­¤Ï
-    "<em>ŬÍÑÉÔ²Ä</em>" ¤È½ñ¤«¤ì¤Þ¤¹¡£</p>
-
-    <p>¾å½ñ¤­¤Ï¡¢<code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤Ã¤ÆÍ­¸ú¤Ë¤µ¤ì¡¢
-    ÆÃÄê¤Î¥¹¥³¡¼¥×(¥Ç¥£¥ì¥¯¥È¥ê¤Ê¤É)¤È¡¢
-    ¤µ¤é¤Ë²¼°Ì¤Î¥ì¥Ù¥ë¤Î <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
-    ¤Ç½¤Àµ¤µ¤ì¤Ê¤¤¸Â¤ê¡¢ ¤½¤ÎÇÛ²¼¤ËÂФ·¤ÆŬÍѤµ¤ì¤Þ¤¹¡£
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¥É¥­¥å¥á¥ó¥È¤Ï¼è¤êÆÀ¤ë¾å½ñ¤­¤Î̾Á°¤âµó¤²¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="Status" id="Status">¥¹¥Æ¡¼¥¿¥¹</a></h2>
-
-    <p>¤³¤ì¤Ï¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬ Apache
-    ¥¦¥§¥Ö¥µ¡¼¥Ð¤Ë¤É¤ì¤¯¤é¤¤¤­¤Ä¤¯ÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ë¤«¤ò
-    ¼¨¤·¤Þ¤¹¡£¸À¤¤´¹¤¨¤ì¤Ð¡¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È¤½¤Îµ¡Ç½¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¡¢
-    ¥â¥¸¥å¡¼¥ë¤Î¿ô¤òÁý¤ä¤·¤Æ¡¢¥µ¡¼¥Ð¤òºÆ¥³¥ó¥Ñ¥¤¥ë¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Ê¤¤
-    ¤È¤¤¤¦¤³¤È¤ò¼¨¤·¤Þ¤¹¡£
-    ¤³¤Î°À­¤¬¼è¤êÆÀ¤ëÃͤϰʲ¼¤Î¤â¤Î¤Ç¤¹:</p>
-
-    <dl>
-      <dt>Core</dt>
-
-      <dd>"Core" ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï Apache
-      ¥¦¥§¥Ö¥µ¡¼¥Ð¤Î´ðËܤȤʤë¤Ù¤­¤â¤Î¤Ç¤¢¤ê¡¢
-      ¾ï¤Ë»ÈÍѲÄǽ¤Ç¤¢¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£</dd>
-
-      <dt>MPM</dt>
-
-      <dd>"MPM" ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï<a href="../mpm.html">¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë</a>¤ÇÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-      ¤³¤Î¼ïÎà¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÄêµÁ¤Î<a href="#Module">¥â¥¸¥å¡¼¥ë</a>¤Î¹Ô¤Ë»È¤Ã¤Æ¤¤¤ë¥â¥¸¥å¡¼¥ë¤Î̾Á°¤¬½ñ¤«¤ì¤Æ¤¤¤ë
-      ¾ì¹ç¤Ë¤Î¤ß»ÈÍѲÄǽ¤Ç¤¹¡£</dd>
-
-      <dt>Base</dt>
-
-      <dd>"Base" ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-      ¥Ç¥Õ¥©¥ë¥È¤Ç¥µ¡¼¥Ð¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ëɸ½à¥â¥¸¥å¡¼¥ë¤ÎÃæ¤Î°ì¤Ä¤Ç¥µ
-      ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Æ¡¢¤ï¤¶¤ï¤¶ÀßÄ꤫¤é¥â¥¸¥å¡¼¥ë¤òºï½ü¤·¤¿¤È¤­¤ò½ü¤¤¤Æ¡¢
-      Ä̾ï¤Ç¤Ï»ÈÍѲÄǽ¤Ç¤¢¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£</dd>
-
-      <dt>Extension</dt>
-
-      <dd>"Extension" ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢ Apache
-      ¥µ¡¼¥Ð¤ÎÇÛÉÛʪ¤ËƱº­¤µ¤ì¤Æ¤¤¤ë¥â¥¸¥å¡¼¥ë¤Î°ì¤Ä¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë¤â¤Î¤Î¡¢
-      Ä̾ï¤Ç¤Ï¥µ¡¼¥Ð¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò¼¨¤·¤Þ¤¹¡£
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È¤½¤Îµ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢¥µ¡¼¥Ð¥Ó¥ë¥ÉÍѤÎÀßÄê¥Õ¥¡¥¤¥ë¤ò
-      Êѹ¹¤·¤Æ Apache
-      ¤òºÆ¥³¥ó¥Ñ¥¤¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</dd>
-
-      <dt>Experimental</dt>
-
-      <dd>"Experimental" ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢Apache
-      ÇÛÉÛʪ¤Ë
-      Ʊº­¤µ¤ì¤Æ¤¤¤ë¤â¤Î¤Î¡¢»î¤·¤¿¤¤¾ì¹ç¤Ï¼«¸ÊÀÕǤ¤Ç¹Ô¤Ê¤¦
-      ɬÍפ¬¤¢¤ë¤È¤¤¤¦¤³¤È¤ò¼¨¤·¤Þ¤¹¡£¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥È¤ò
-      ´°Á´¤Ë¤½¤í¤ï¤»¤ë¤¿¤á¤Ë²òÀ⤵¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÄ󶡤¹¤ë¥â¥¸¥å¡¼¥ë¤Ï¥Ç¥Õ¥©¥ë¥È¤ÇÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ë¤«¤â
-      ¤·¤ì¤Þ¤»¤ó¤·¡¢¤½¤¦¤Ç¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£»ÈÍѲÄǽ¤«¤É¤¦¤«¤Ï¡¢
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È¥â¥¸¥å¡¼¥ë¤ÎÀâÌÀ¤ò¤·¤Æ¤¤¤ë¥Ú¡¼¥¸¤ÎÀèƬ¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£</dd>
-    </dl>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="Module" id="Module">¥â¥¸¥å¡¼¥ë</a></h2>
-
-    <p>
-    ¤³¤ì¤Ïñ½ã¤Ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ë¥â¥¸¥å¡¼¥ë¤Î̾Á°¤òµ­ºÜ¤·¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="Compatibility" id="Compatibility">¸ß´¹À­</a></h2>
-
-    <p>¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬ Apache 2
-    ¤ÎÇÛÉÛ¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿¾ì¹ç¡¢
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Æ³Æþ¤µ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤¬¤³¤³¤Ë½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¤Þ¤¿¡¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬ÆÃÄê¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ë¤Î¤ß¸ºß¤¹¤ë¤È¤­¤â
-    ¤³¤³¤Ë½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/directive-dict.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/directive-dict.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/directive-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/directive-dict.html.ja.utf8 b/docs/manual/mod/directive-dict.html.ja.utf8
new file mode 100644
index 00000000..51b0b2bc
--- /dev/null
+++ b/docs/manual/mod/directive-dict.html.ja.utf8
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>ディレクティブ�解説�使�れる用語 - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>ディレクティブ�解説�使�れる用語</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/directive-dict.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/directive-dict.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/directive-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/directive-dict.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+    <p>��文書�� Apache <a href="directives.html">設定ディレクティブ</a>
+    を説明�る���使�れ��る用語を説明���。</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#Description">説明</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Syntax">構文</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Default">デフォルト</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Context">コンテキスト</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Override">上書�</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Status">ステータス</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Module">モジュール</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Compatibility">互�性</a></li>
+</ul><h3>�照</h3><ul class="seealso"><li><a href="../configuring.html">設定ファイル</a></li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Description" id="Description">説明</a></h2>
+
+<p>ディレクティブ�目的�簡��説明。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Syntax" id="Syntax">構文</a></h2>
+
+    <p>設定ファイル中�ディレクティブ�書�を示���。
+    ��構文�ディレクティブ特有����詳細�ディレクティブ�説明を
+    �照������。一般的��ディレクティブ��後��
+    空白�より分割�れ������引数�続���。
+    引数�空白を�む���二�引用符 (訳注: ")
+    �囲�れ����。 オプショナル�引数�括弧
+    (訳注: []) �囲�れ����。
+    引数�複数�値を�り得る場����れら�値�垂直�棒 "|"
+    � 分割�れ����。
+    変更�れ��テキスト�デフォルト�フォント�表示�れ�置��必��
+    引数�<em>強調�れ�</em>表示�れ��。
+    引数�数�変�るディレクティブ�最後�
+    引数�繰り返�れる��を示���� "..."
+    �終�り��。</p>
+
+    <p>
+    ディレクティブ�多����型�引数を�り��。�����良�
+    使�れるも�を以下�定義���。</p>
+
+    <dl>
+      <dt><em>URL</em></dt>
+
+      <dd><code>http://www.example.com/path/to/file.html</code>
+      �よ���
+      スキーム�ホスト��パス�(�略�能)を�ん��る完全�
+      Uniform Resource Locator。</dd>
+
+      <dt><em>URL-path</em></dt>
+
+      <dd><code>/path/to/file.html</code> �よ���スキーム�
+      ホスト��後�続� <em>url</em>
+      �一部。<em>url-path</em> �
+      ファイルシステム�ら�視点�����
+      ウェブ�ら�視点�リソースを表����。</dd>
+
+      <dt><em>file-path</em></dt>
+
+      <dd><code>/usr/local/apache/htdocs/path/to/file.html</code>
+      �よ���
+      ルートディレクトリ�ら始�るローカル�ファイルシステム上�ファイル��パス。
+      通常�スラッシュ�始�ら�� <em>file-path</em> � <a href="core.html#serverroot">ServerRoot</a>
+      �ら�相対パス��� 扱�れ��。</dd>
+
+      <dt><em>directory-path</em></dt>
+
+      <dd><code>/usr/local/apache/htdocs/path/to/</code>
+      �よ���
+      ルートディレクトリ�ら始�るローカル�ファイルシステム�ディレクトリ��
+      パス。</dd>
+
+      <dt><em>filename</em></dt>
+
+      <dd><code>file.html</code> �よ���パス情報�付�����
+      ファイル�。</dd>
+
+      <dt><em>regex</em></dt>
+
+      <dd>Perl 互��<a class="glossarylink" href="../glossary.html#regex" title="用語集を�照">正�表�</a>��。
+      ディレクティブ�定義� <em>regex</em>
+      �何�対��マッ�を行����を指定���。</dd>
+
+      <dt><em>extension</em></dt>
+
+      <dd>一般的�� <em>filename</em>
+      �最後�ドット�後�部分��。 ����Apache
+      �複数�ファイル�拡張�を�識������<em>filename</em>
+      �複数�ドット��る��最��ドット�後���れ�れ�ドット�分離�れ�部分�
+      <em>extension</em> (訳注: 拡張�)
+      ��り��。例���<em>filename</em>
+      <code>file.html.en</code>
+      ��二��拡張���り��。<code>.html</code> �
+      <code>.en</code> ��。Apache
+      �ディレクティブ���<em>extension</em>
+      �ドット付��も無��も指定����。�ら��<em>extension</em>
+      � 大文字�文字を区別���ん。</dd>
+
+      <dt><em>MIME-type</em></dt>
+
+      <dd><code>text/html</code> �よ���スラッシュ�分離�れ�
+      主フォーマット�副フォーマット�よ��ファイル�形�を
+      表�方法��。</dd>
+
+      <dt><em>env-variable</em></dt>
+
+      <dd>Apache �設定�より定義�れる <a href="../env.html">環境変数</a>�����。�れ�オペレーティングシステム�
+      環境変数������ら�����注�������。詳細� <a href="../env.html">環境変数�説明</a>を�照������。</dd>
+    </dl>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Default" id="Default">デフォルト</a></h2>
+
+    <p>ディレクティブ�デフォルト値
+    (<em>����</em>�設定ファイル�ら
+    �略�れ���も�Apache
+    ウェブサー��特定�値�設定�れ��る��よ��
+    動作���) ��る場�����記述�れ��。
+    デフォルト値�無�場����� "<em>None</em>" �
+    書�れ��。���書�れ��るデフォルト�サー��共��布�れ��る
+    デフォルト� httpd.conf
+    内�書�れ��るディレクティブ�値�
+    ���能性��る���注�������。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Context" id="Context">コンテキスト</a></h2>
+
+    <p>
+    �れ��サー��設定ファイル中����ディレクティブ�有効���を示���。
+    次�示�値�一�以上カンマ区切り�列挙�れ����。</p>
+
+    <dl>
+      <dt>サー�設定ファイル</dt>
+
+      <dd>�れ��サー�設定ファイル
+      (<em>例��</em>�<code>httpd.conf</code>,
+      <code>srm.conf</code>, <code>access.conf</code>)
+      内��使用������
+      <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> ã‚„
+      <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> �中��
+      <strong>使用����</strong>��を示���。
+      <code>.htaccess</code>ファイル��使用�許��れ����ん。</dd>
+
+      <dt>�ー�ャルホスト</dt>
+
+      <dd>�れ��サー�設定ファイル�
+      <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+      �中�使用��る��を示���。</dd>
+
+      <dt>ディレクトリ</dt>
+
+      <dd>�れ��サー�設定ファイル�
+      <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, 
+      <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>, 
+      <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, 
+      <code class="directive"><a href="../mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>
+      コンテナ�中�� <a href="../sections.html">設定セクション</a>
+      �説明�れ��る制��下�使用��る��を示���。</dd>
+
+      <dt>.htaccess</dt>
+
+      <dd>�れ��ディレクトリ<em>毎</em>�
+      <code>.htaccess</code> ファイル内�
+      使用�能��る��を示���。 ���<a href="#Override">上書�</a>
+      �設定�よ����処��れ���も�れ��ん。</dd>
+    </dl>
+
+    <p>
+    ディレクティブ�指示�れ�コンテキスト�<em>��</em>許��れ��。
+    他�場所�使����る��サー����コンテキストを正��扱���
+    �るよ��設定エラー�発生�る��サー������動作����る�
+    <em>����</em>�サー��起動����る�������り��。</p>
+
+    <p>
+    ディレクティブ�有効��置��実際�挙�られ��るコンテキスト�
+    論�和 (訳注: Boolen OR)
+    ��り��。言���る��
+    "<code>サー�設定ファイル�.htaccess</code>" �有効��
+    記�れ��るディレクティブ� <code>httpd.conf</code>
+    ファイル� <code>.htaccess</code>
+    ファイル��有効���� <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
+    ã‚„ <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+    �中��使用����ん。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Override" id="Override">上書�</a></h2>
+
+    <p>��ディレクティブ�属性��<code>.htaccess</code>
+    ファイル中�
+    ディレクティブ��れ������れ�処�を有効��る���
+    ��設定�上書��必��を示���。 ディレクティブ�
+    <a href="#Context">コンテキスト</a>
+    ��<code>.htaccess</code>
+    ファイル中��許������場��� ��属性�
+    "<em>�用��</em>" �書�れ��。</p>
+
+    <p>上書���<code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
+    ディレクティブ�よ��有効��れ�
+    特定�スコープ(ディレクトリ��)��
+    �ら�下��レベル� <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
+    �修正�れ���り� ���下�対���用�れ��。
+    ディレクティブ�ドキュメント��り得る上書����も挙���。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Status" id="Status">ステータス</a></h2>
+
+    <p>�れ�ディレクティブ� Apache
+    ウェブサー���れ�ら����組�込�れ��る�を
+    示���。言���れ��ディレクティブ���機能を利用�る����
+    モジュール�数を増や���サー�を�コンパイル�る必���る�も�れ��
+    �����を示���。
+    ��属性��り得る値�以下�も���:</p>
+
+    <dl>
+      <dt>Core</dt>
+
+      <dd>"Core" �ディレクティブ� Apache
+      ウェブサー��基本��る��も���り�
+      常�使用�能��る��を示���。</dd>
+
+      <dt>MPM</dt>
+
+      <dd>"MPM" �ディレクティブ�<a href="../mpm.html">マル�プロセッシングモジュール</a>��供�れ����。
+      ��種類�ディレクティブ�ディレクティブ�定義�<a href="#Module">モジュール</a>�行�使���るモジュール����書�れ��る
+      場����使用�能��。</dd>
+
+      <dt>Base</dt>
+
+      <dd>"Base" �ディレクティブ�
+      デフォルト�サー��組�込�れ��る標準モジュール�中�一��サ
+      �ート�れ��������設定�らモジュールを削除����を除���
+      通常��使用�能��る��を示���。</dd>
+
+      <dt>Extension</dt>
+
+      <dd>"Extension" �ディレクティブ�� Apache
+      サー���布物��梱�れ��るモジュール�一���供�れ��るも���
+      通常��サー��組�込�れ������を示���。
+      ディレクティブ���機能を有効��る���サー�ビルド用�設定ファイルを
+      変更�� Apache
+      を�コンパイル�る必���り��。</dd>
+
+      <dt>Experimental</dt>
+
+      <dd>"Experimental" �ディレクティブ��Apache
+      �布物�
+      �梱�れ��るも���試���場��自己責任�行��
+      必���る�����を示���。ディレクティブ������ドキュメントを
+      完全�����る���解説�れ������サ�ート�れ��る���り��ん。
+      ディレクティブを�供�るモジュール�デフォルト�組�込�れ��る�も
+      �れ��ん��������も�れ��ん。使用�能������
+      ディレクティブ�モジュール�説明を���るページ�先頭を調������。</dd>
+    </dl>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Module" id="Module">モジュール</a></h2>
+
+    <p>
+    �れ��純�ディレクティブ�定義�れ��るモジュール���を記載���。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Compatibility" id="Compatibility">互�性</a></h2>
+
+    <p>ディレクティブ� Apache 2
+    ��布�組�込�れ������場��
+    ディレクティブ�導入�れ��ージョン����書�れ����。
+    ���ディレクティブ�特定�プラットフォーム���存在�る��も
+    ���書�れ����。</p>
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/directive-dict.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/directive-dict.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/directive-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/directive-dict.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/directive-dict.html.ko.euc-kr b/docs/manual/mod/directive-dict.html.ko.euc-kr
index d83a74dd..031b948a 100644
--- a/docs/manual/mod/directive-dict.html.ko.euc-kr
+++ b/docs/manual/mod/directive-dict.html.ko.euc-kr
@@ -20,7 +20,8 @@
 <div class="toplang">
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/directive-dict.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/directive-dict.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/directive-dict.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/mod/directive-dict.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/directive-dict.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
             ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
@@ -245,8 +246,9 @@
 <div class="bottomlang">
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/directive-dict.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/directive-dict.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/directive-dict.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/mod/directive-dict.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/directive-dict.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/directive-dict.html.tr.utf8 b/docs/manual/mod/directive-dict.html.tr.utf8
new file mode 100644
index 00000000..a173871a
--- /dev/null
+++ b/docs/manual/mod/directive-dict.html.tr.utf8
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Yönergeleri Tanımlamakta Kullanılan Terimler - Apache HTTP Sunucusu</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="../">Sürüm 2.2</a></div><div id="page-content"><div id="preamble"><h1>Yönergeleri Tanımlamakta Kullanılan Terimler</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="../en/mod/directive-dict.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/directive-dict.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/directive-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/directive-dict.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+    <p>Bu belgede Apache <a href="directives.html">yapılandırma yönergeler</a>ini tanımlamakta kullanılan terimler açıklanmıştır.</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#Description">Açıklama</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Syntax">Sözdizimi</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Default">Öntanımlı</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Context">BaÄŸlam</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Override">Geçersizleştirme</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Status">Durum</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Module">Modül</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Compatibility">Uyumluluk</a></li>
+</ul><h3>Ayrıca bakınız:</h3><ul class="seealso"><li><a href="../configuring.html">Yapılandırma dosyaları</a></li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Description" id="Description">Açıklama</a></h2>
+
+<p>Yönergenin kullanım amacının kısa bir açıklaması.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Syntax" id="Syntax">Sözdizimi</a></h2>
+
+    <p>Yönergenin bir yapılandırma dosyasında hangi söz dizimiyle görünebileceği belirtilir. Bu sözdizimi yönergeye özeldir ve ayrıntıları yönerge tanımında açıklanır. Genelde yönerge ismini aralarında boşluklar bırakılmış bir dizi argüman izler. Eğer argümanlardan biri kendi içinde boşluk içeriyorsa çift tırnak içine alınır. İsteğe bağlı argümanlar sözdiziminde köşeli ayraçların arasında gösterilmiştir. Birden fazla olası değeri olan argümanlarda değerler aralarına | karakteri konarak ayrılmıştır. Değerin yerine ismi belirtilen argümanlarda bu isimler <em>eğik</em> yazılırken, kendisi değer olan dizgeler öntanımlı yazıtipi ile gösterilmiştir. Değişik sayıda argüman alan yönergelerde bu durum son argümanı takibeden “...� ile belirtilmiştir.</p>
+
+    <p>Yönergelerde kullanılan argüman türleri çok çeşitlidir. Çok kullanılanlardan bazıları aşağıda tanımlanmıştır.</p>
+
+    <dl>
+      <dt><em>URL</em></dt>
+
+      <dd><code>http://www.mesela.dom/yol/yordam/dosya.html</code> örneğindeki gibi protokol şeması ve konak ismini isteğe bağlı bir dosya yolunun izlediği, açılımı “Uniform Resource Locator� olan ve Türkçe’ye “Tektip Özkaynak Konumlayıcı� şeklinde çevrilebilecek adresleri betimler.</dd>
+
+      <dt><em>URL-yolu</em></dt>
+
+      <dd><code>/yol/yordam/dosya.html</code> örneğindeki gibi bir <em>url</em>’nin parçası olarak protokol şeması ve konak ismini izleyen bir yol dizgesini betimler. <em>url-yolu</em>, bir dosya sisteminin kök dizinine göre değil, <a href="core.html#documentroot">DocumentRoot</a> ile belirtilen dizine göre bir dosya yolu betimler.</dd>
+
+      <dt><em>dosya-yolu</em></dt>
+
+      <dd><code>/usr/local/apache/htdocs/yol/yordam/dosya.html</code> örneğindeki gibi yerel dosya sisteminin kök dizini ile başlayan bir dosya yolunu betimler. Aksi belirtilmedikçe, bir / ile başlamayan bir <em>dosya-yolu</em> <a href="core.html#serverroot">ServerRoot</a> ile belirtilen dizine göre ele alınır.</dd>
+
+      <dt><em>dizin-yolu</em></dt>
+
+      <dd><code>/usr/local/apache/htdocs/yol/yordam/</code> örneğindeki gibi kök dizin ile başlayan, yerel dosya sistemindeki bir dizin yolunu betimler.</dd>
+
+      <dt><em>dosya-ismi</em></dt>
+
+      <dd><code>dosya.html</code> örneğindeki gibi dizin yolu içermeyen bir dosya ismini betimler.</dd>
+
+      <dt><em>düzifd</em></dt>
+
+      <dd>Bir Perl uyumlu <a class="glossarylink" href="../glossary.html#regex" title="sözlüğe bakınız">düzenli ifade</a> betimler. Yönerge tanımında <em>düzifd</em> ile eşleşenler argüman olarak ele alınır.</dd>
+
+      <dt><em>uzantı</em></dt>
+
+      <dd>Bu genelde, <em>dosya-ismi</em>’nin bir parçası olarak son noktadan sonraki kısmı betimler. Bununla birlikte, Apache çok sayıda nokta içeren dosya isimlerinde ilk noktadan sonrasını <em>uzantı</em> kabul eden çoklu dosya ismi uzantılarını da tanır. Örneğin, <em>dosya-ismi</em> olarak <code>dosya.html.tr</code> değeri iki uzantı içerir: <code>.html</code> ve
+      <code>.tr</code>. Apache yönergelerinde <em>uzantı</em>’ları başında noktası olmaksızın da belirtebilirsiniz. Ayrıca, <em>uzantı</em>’lar harf büyüklüğüne de duyarlı değildir.</dd>
+
+      <dt><em>MIME-türü</em></dt>
+
+      <dd>Dosya biçiminin, <code>text/html</code> örneğindeki gibi aralarına bir / konulmuş asıl ve alt biçimler şeklinde açıklandığı yönteme göre belirtileceğini betimler.</dd>
+
+      <dt><em>ortam-deÄŸiÅŸkeni</em></dt>
+
+      <dd>Apache yapılandırma sürecinde tanımlanmış bir <a href="../env.html">ortam değişkeni</a>nin ismini betimler. Daha ayrıntılı bilgi için <a href="../env.html">ortam değişkenleri belgesi</a>ne bakınız.</dd>
+    </dl>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Default" id="Default">Öntanımlı</a></h2>
+
+    <p>Eğer yönerge öntanımlı bir değere sahipse o burada belirtilir (öntanımlı değer, yönergede kullanıcı tarafından belirtilmediği halde Apache tarafından belirtildiği varsayılarak işlem yapılan değerdir). Eğer öntanımlı bir değer yoksa bu bölümde bu durum “<em>Yok</em>� şeklinde belirtilir. Burada belirtilen öntanımlı değerin sunucu ile dağıtılan öntanımlı httpd.conf içindeki yönergede kullanılan değerle aynı olmasının gerekmediğine dikkat ediniz.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Context" id="Context">BaÄŸlam</a></h2>
+
+    <p>Yönergenin sunucunun yapılandırma dosyalarının nerelerinde meşru kabul edildiği aşağıdaki değerlerin virgül ayraçlı bir listesi halinde burada belirtilir.</p>
+
+    <dl>
+      <dt>sunucu geneli</dt>
+
+      <dd>Yönergenin sunucunun (<code>httpd.conf</code> gibi) yapılandırma dosyalarında <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> ve <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> bölümleri <strong>dışında</strong> her yerde kullanılabileceğini belirtir. Ayrıca, <code>.htaccess</code> dosyalarında bulunmasına da izin verilmez.</dd>
+
+      <dt>sanal konak</dt>
+
+      <dd>Yönergenin sunucunun yapılandırma dosyalarının sadece <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> bölümlerinde kullanıldığında geçerli kabul edileceğini belirtir.</dd>
+
+      <dt>dizin</dt>
+
+      <dd>Yönergenin sunucunun yapılandırma dosyalarında sadece <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>, <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code> ve <code class="directive"><a href="../mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code> bölümlerinde kullanıldığında geçerli kabul edileceğini belirtir. Bu bağlama konu sınırlamaların çerçevesi  <a href="../sections.html">Yapılandırma Bölümleri</a> içinde çizilmiştir.</dd>
+
+      <dt>.htaccess</dt>
+
+      <dd>Bu bağlamda geçerli olacağı kabul edilen bir yönerge sadece dizin içi <code>.htaccess</code> dosyalarında görüldüğü zaman işleme sokulur. Üzerinde bir <a href="#Override">geçersizleştirme</a> etkin kılınmışsa yönerge her şeye rağmen işleme sokulmayabilir.</dd>
+    </dl>
+
+    <p>Yönergeye <em>sadece</em> tasarlandığı bağlam içinde izin verilir; başka bir yerde kullanmayı denerseniz ya sunucunun bu bağlamı doğru şekilde işlemesine engel olan ya da sunucunun tamamen işlevsiz kalmasına sebep olan  -- sunucu hiç başlatılamayabilir -- bir yapılandırma hatası alırsınız.</p>
+
+    <p>Yönergenin geçerli olacağı konumlar, aslında, listelenen bağlamların tamamına mantıksal VEYA uygulanarak bulunur. Başka bir deyişle, bir yönergenin geçerli olacağı yerler "<code>sunucu geneli, .htaccess</code>" şeklinde belirtilmişse yönerge <code>httpd.conf</code> dosyasında ve <code>.htaccess</code> dosyalarında, <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> veya <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> bölümleri haricinde her yerde kullanılabilir.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Override" id="Override">Geçersizleştirme</a></h2>
+
+    <p>Bir <code>.htaccess</code> dosyasında göründüğü takdirde yönerge işlenirken hangi yapılandırma geçersizleşirmesinin etkin olacağı burada belirtilir. Eğer yönerge <a href="#Context">bağlam</a>ının <code>.htaccess</code> dosyalarında görünmesine izin verilmiyorsa hiçbir bağlam listelenmez.</p>
+
+    <p>Geçersizleştirmeler <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> yönergesi tarafından etkinleştirilir ve belli bir bağlama ve alt seviyelerde başka <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> yönergeleri ile değiştirilmedikçe tüm çocuklarına uygulanır. Yönergenin belgesinde ayrıca kullanılabilecek tüm olası geçersizleştirme isimleri belirtilir.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Status" id="Status">Durum</a></h2>
+
+    <p>Yönergenin Apache HTTP sunucusuna ne kadar sıkı bağlı olduğunu belirtir. Başka bir deyişle, yönergeye ve işlevselliğine erişim kazanmak için sunucuyu belli bir modül kümesiyle yeniden derlemek gerekip gerekmediği ile ilgili durumu belirtir. Bu özniteliğin olası değerleri şunlardır:</p>
+
+    <dl>
+      <dt>Çekirdek</dt>
+
+      <dd>Eğer bir yönerge “Çekirdek� durumuna sahip olarak listelenmişse bu, yönergenin Apache HTTP sunucusunun en iç kısımlarının bir parçası olduğu ve daima kullanılabilir olacağı anlamına gelir.</dd>
+
+      <dt>MPM</dt>
+
+      <dd>“MPM� durumuna sahip bir yönerge <a href="../mpm.html">Çok Süreklilik Modülü</a> tarafından sağlanır. Bu yönerge türü sadece ve sadece yönerge tanımının <a href="#Module">Modül</a> satırında listelenmiş MPM’lerden birini kullanıyorsanız mevcut olacaktır.</dd>
+
+      <dt>Temel</dt>
+
+      <dd>“Temel� durumuna sahip bir yönerge, sunucuda öntanımlı derlenmiş standart Apache modüllerinden biri tarafından destekleniyor demektir. Bu nedenle sunucuyu derlemek için yapılandırırken yönergeyi içeren modülü yapılandırmadan özellikle kaldırmazsanız yönerge normal olarak kullanılabilir olacaktır.</dd>
+
+      <dt>Eklenti</dt>
+
+      <dd>“Eklenti� durumuna sahip bir yönerge, Apache sunucu kitinde bulunan ancak normalde sunucuyla birlikte derlenmeyen modüllerden biri tarafından sağlanır. Yönergeyi ve işlevselliğini etkin kılmak için sunucunun derleme öncesi paket yapılandırması sırasında modülün derleneceğini açıkça belirttikten sonra gerekirse sunucuyu yeniden derlemeniz gerekir.</dd>
+
+      <dt>Deneysel</dt>
+
+      <dd>“Deneysel� durumuna sahip bir yönerge, Apache sunucu kitinde bulunan modüllerden biri tarafından sağlanır ve modülün denenmesi tamamen sizin insiyatifinize bırakılır. Böyle bir yönerge her şeyiyle belgelenmiştir fakat gerektiği gibi desteklenmemiştir. Yönergeyi içeren modül öntanımlı olarak sunucuyla birlikte derlenebileceği gibi derlenmeyebilir de; bunun için yönergenin açıklandığı sayfanın başına ve kullanılabilirliği hakkında bilgi edinmek için yönergeyi içeren modüle bakın.</dd>
+    </dl>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Module" id="Module">Modül</a></h2>
+
+    <p>Burada sadece yönergeyi tanımlayan kaynak modülün ismi yazılır.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Compatibility" id="Compatibility">Uyumluluk</a></h2>
+
+    <p>Eğer yönerge Apache’nin 2. sürüm dağıtımının özgün parçası değilse söz konusu sürüm burada belirtilir. Ayrıca, yönergenin kullanımı belli platformlarla sınırlıysa bunun ayrıntıları da burada belirtilir.</p>
+</div></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="../en/mod/directive-dict.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/directive-dict.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/directive-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/directive-dict.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/directives.html b/docs/manual/mod/directives.html
index d52769de..27f6ac5a 100644
--- a/docs/manual/mod/directives.html
+++ b/docs/manual/mod/directives.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: directives.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -10,9 +12,9 @@ URI: directives.html.es
 Content-Language: es
 Content-type: text/html; charset=ISO-8859-1
 
-URI: directives.html.ja.euc-jp
+URI: directives.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: directives.html.ko.euc-kr
 Content-Language: ko
@@ -21,3 +23,7 @@ Content-type: text/html; charset=EUC-KR
 URI: directives.html.ru.koi8-r
 Content-Language: ru
 Content-type: text/html; charset=KOI8-R
+
+URI: directives.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de
index e5acf3e8..a483cd37 100644
--- a/docs/manual/mod/directives.html.de
+++ b/docs/manual/mod/directives.html.de
@@ -23,7 +23,8 @@
 <a href="../es/mod/directives.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/directives.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/directives.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/directives.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>
@@ -297,6 +298,7 @@
 <li><a href="mod_proxy.html#proxymatch">&lt;ProxyMatch&gt;</a></li>
 <li><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards</a></li>
 <li><a href="mod_proxy.html#proxypass">ProxyPass</a></li>
+<li><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
 <li><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch</a></li>
 <li><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse</a></li>
 <li><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain</a></li>
@@ -433,8 +435,9 @@
 <a href="../es/mod/directives.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/directives.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/directives.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/directives.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en
index c3f9eb43..5b037a68 100644
--- a/docs/manual/mod/directives.html.en
+++ b/docs/manual/mod/directives.html.en
@@ -23,7 +23,8 @@
 <a href="../es/mod/directives.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/directives.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/directives.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/directives.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>
@@ -300,6 +301,7 @@
 <li><a href="mod_proxy.html#proxymatch">&lt;ProxyMatch&gt;</a></li>
 <li><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards</a></li>
 <li><a href="mod_proxy.html#proxypass">ProxyPass</a></li>
+<li><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
 <li><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch</a></li>
 <li><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse</a></li>
 <li><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain</a></li>
@@ -439,8 +441,9 @@
 <a href="../es/mod/directives.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/directives.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/directives.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/directives.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/directives.html.es b/docs/manual/mod/directives.html.es
index 1c9da55c..9ff3df35 100644
--- a/docs/manual/mod/directives.html.es
+++ b/docs/manual/mod/directives.html.es
@@ -23,7 +23,8 @@
 <a href="../es/mod/directives.html" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/directives.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/directives.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/directives.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>
@@ -302,6 +303,7 @@
 <li><a href="mod_proxy.html#proxymatch">&lt;ProxyMatch&gt;</a></li>
 <li><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards</a></li>
 <li><a href="mod_proxy.html#proxypass">ProxyPass</a></li>
+<li><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
 <li><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch</a></li>
 <li><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse</a></li>
 <li><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain</a></li>
@@ -441,8 +443,9 @@
 <a href="../es/mod/directives.html" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/directives.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/directives.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/directives.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Módulos</a> | <a href="../mod/directives.html">Directivas</a> | <a href="../faq/">Preguntas Frecuentes</a> | <a href="../glossary.html">Glosario</a> | <a href="../sitemap.html">Mapa de este sitio web</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/directives.html.ja.euc-jp b/docs/manual/mod/directives.html.ja.utf8
index a6c8cce6..a0f8a315 100644
--- a/docs/manual/mod/directives.html.ja.euc-jp
+++ b/docs/manual/mod/directives.html.ja.utf8
@@ -1,39 +1,40 @@
-<?xml version="1.0" encoding="EUC-JP"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
               This file is generated from xml source: DO NOT EDIT
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       -->
-<title>¥Ç¥£¥ì¥¯¥Æ¥£¥Ö°ìÍ÷ - Apache HTTP ¥µ¡¼¥Ð</title>
+<title>ディレクティブ一覧 - Apache HTTP サー�</title>
 <link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
 <link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
 <link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
 <link href="../images/favicon.ico" rel="shortcut icon" /></head>
 <body id="directive-index"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
 <img alt="" src="../images/feather.gif" /></div>
 <div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
 <div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div><div id="preamble"><h1>¥Ç¥£¥ì¥¯¥Æ¥£¥Ö°ìÍ÷</h1>
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div><div id="preamble"><h1>ディレクティブ一覧</h1>
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../de/mod/directives.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/directives.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../es/mod/directives.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
+<a href="../es/mod/directives.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/directives.html" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/directives.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/directives.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>
-      ɸ½à Apache ÇÛÉۤˤ¢¤ë¤¹¤Ù¤Æ¤Î Apache ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î°ìÍ÷¤Ç¤¹¡£
-      ¤³¤ì¤é¤Ï°ì´Ó¤·¤¿·Á¼°¤Ç½ñ¤«¤ì¤Æ¤¤¤Æ¡¢»È¤ï¤ì¤Æ¤¤¤ëÍѸì¤Î
-      <a href="directive-dict.html" rel="Glossary">ÍѸ콸</a> ¤âÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+      標準 Apache �布��る���� Apache �ディレクティブ�一覧��。
+      �れら�一貫��形��書�れ����使�れ��る用語�
+      <a href="directive-dict.html" rel="Glossary">用語集</a> も用��れ����。
     </p>
     <p>
-      ³Æ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î³µÍפòÀâÌÀ¤·¤¿ <a href="quickreference.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¥¯¥¤¥Ã¥¯¥ê¥Õ¥¡¥ì¥ó¥¹</a>¤â
-      ¤¢¤ê¤Þ¤¹¡£
+      �ディレクティブ�概�を説明�� <a href="quickreference.html">ディレクティブクイックリファレンス</a>も
+      �り��。
     </p>
   
 <p class="letters"><a href="#A">&nbsp;A&nbsp;</a> | <a href="#B">&nbsp;B&nbsp;</a> | <a href="#C">&nbsp;C&nbsp;</a> | <a href="#D">&nbsp;D&nbsp;</a> | <a href="#E">&nbsp;E&nbsp;</a> | <a href="#F">&nbsp;F&nbsp;</a> | <a href="#G">&nbsp;G&nbsp;</a> | <a href="#H">&nbsp;H&nbsp;</a> | <a href="#I">&nbsp;I&nbsp;</a> | <a href="#K">&nbsp;K&nbsp;</a> | <a href="#L">&nbsp;L&nbsp;</a> | <a href="#M">&nbsp;M&nbsp;</a> | <a href="#N">&nbsp;N&nbsp;</a> | <a href="#O">&nbsp;O&nbsp;</a> | <a href="#P">&nbsp;P&nbsp;</a> | <a href="#R">&nbsp;R&nbsp;</a> | <a href="#S">&nbsp;S&nbsp;</a> | <a href="#T">&nbsp;T&nbsp;</a> | <a href="#U">&nbsp;U&nbsp;</a> | <a href="#V">&nbsp;V&nbsp;</a> | <a href="#W">&nbsp;W&nbsp;</a> | <a href="#X">&nbsp;X&nbsp;</a></p>
@@ -423,11 +424,12 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../de/mod/directives.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/directives.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../es/mod/directives.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
+<a href="../es/mod/directives.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/directives.html" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/directives.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/directives.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/directives.html.ko.euc-kr b/docs/manual/mod/directives.html.ko.euc-kr
index 7877975a..ea9822b1 100644
--- a/docs/manual/mod/directives.html.ko.euc-kr
+++ b/docs/manual/mod/directives.html.ko.euc-kr
@@ -23,7 +23,8 @@
 <a href="../es/mod/directives.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/directives.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/directives.html" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/directives.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>
@@ -292,6 +293,7 @@
 <li><a href="mod_proxy.html#proxymatch">&lt;ProxyMatch&gt;</a></li>
 <li><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards</a></li>
 <li><a href="mod_proxy.html#proxypass">ProxyPass</a></li>
+<li><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
 <li><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch</a></li>
 <li><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse</a></li>
 <li><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain</a></li>
@@ -430,8 +432,9 @@
 <a href="../es/mod/directives.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/directives.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/directives.html" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/directives.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/directives.html.ru.koi8-r b/docs/manual/mod/directives.html.ru.koi8-r
index e58f1980..929e30f0 100644
--- a/docs/manual/mod/directives.html.ru.koi8-r
+++ b/docs/manual/mod/directives.html.ru.koi8-r
@@ -23,7 +23,8 @@
 <a href="../es/mod/directives.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/directives.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/directives.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/directives.html" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/directives.html" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/directives.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>úÄÅÓØ ÐÒÉ×ÏÄÉÔÓÑ ÓÐÉÓÏË ×ÓÅÈ ÄÉÒÅËÔÉ×, ËÏÔÏÒÙÅ ÄÏÓÔÕÐÎÙ
@@ -299,6 +300,7 @@
 <li><a href="mod_proxy.html#proxymatch">&lt;ProxyMatch&gt;</a></li>
 <li><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards</a></li>
 <li><a href="mod_proxy.html#proxypass">ProxyPass</a></li>
+<li><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
 <li><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch</a></li>
 <li><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse</a></li>
 <li><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain</a></li>
@@ -438,8 +440,9 @@
 <a href="../es/mod/directives.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/directives.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/directives.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/directives.html" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/directives.html" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/directives.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">íÏÄÕÌÉ</a> | <a href="../mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="../sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/directives.html.tr.utf8 b/docs/manual/mod/directives.html.tr.utf8
new file mode 100644
index 00000000..5982f231
--- /dev/null
+++ b/docs/manual/mod/directives.html.tr.utf8
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Yönerge Dizini - Apache HTTP Sunucusu</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="directive-index"><div id="page-header">
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="../">Sürüm 2.2</a> &gt; <a href="./">Modüller</a></div><div id="preamble"><h1>Yönerge Dizini</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="../de/mod/directives.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/directives.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/mod/directives.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="../ja/mod/directives.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/directives.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/directives.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+    <p>Standart Apache dağıtımında bulunan yönergelerin tamamı burada
+    listelenmiştir. Hepsi aralarında şekilsel bir uyum sağlanarak
+    açıklanmışlardır. Açıklamalarında kullanılan terimler için <a href="directive-dict.html" rel="Glossary">Yönerge Sözlüğü</a>ne
+    bakabilirsiniz.</p>
+
+    <p>Ayrıca, yönerge ayrıntılarının bir özet olarak listelendiği bir
+    <a href="quickreference.html">Hızlı Yönerge Kılavuzu</a> da
+    mevcuttur.</p>
+  
+<p class="letters"><a href="#A">&nbsp;A&nbsp;</a> | <a href="#B">&nbsp;B&nbsp;</a> | <a href="#C">&nbsp;C&nbsp;</a> | <a href="#D">&nbsp;D&nbsp;</a> | <a href="#E">&nbsp;E&nbsp;</a> | <a href="#F">&nbsp;F&nbsp;</a> | <a href="#G">&nbsp;G&nbsp;</a> | <a href="#H">&nbsp;H&nbsp;</a> | <a href="#I">&nbsp;I&nbsp;</a> | <a href="#K">&nbsp;K&nbsp;</a> | <a href="#L">&nbsp;L&nbsp;</a> | <a href="#M">&nbsp;M&nbsp;</a> | <a href="#N">&nbsp;N&nbsp;</a> | <a href="#O">&nbsp;O&nbsp;</a> | <a href="#P">&nbsp;P&nbsp;</a> | <a href="#R">&nbsp;R&nbsp;</a> | <a href="#S">&nbsp;S&nbsp;</a> | <a href="#T">&nbsp;T&nbsp;</a> | <a href="#U">&nbsp;U&nbsp;</a> | <a href="#V">&nbsp;V&nbsp;</a> | <a href="#W">&nbsp;W&nbsp;</a> | <a href="#X">&nbsp;X&nbsp;</a></p>
+</div>
+<div id="directive-list"><ul>
+<li><a href="core.html#acceptfilter" id="A" name="A">AcceptFilter</a></li>
+<li><a href="mpm_common.html#acceptmutex">AcceptMutex</a></li>
+<li><a href="core.html#acceptpathinfo">AcceptPathInfo</a></li>
+<li><a href="core.html#accessfilename">AccessFileName</a></li>
+<li><a href="mod_actions.html#action">Action</a></li>
+<li><a href="mod_autoindex.html#addalt">AddAlt</a></li>
+<li><a href="mod_autoindex.html#addaltbyencoding">AddAltByEncoding</a></li>
+<li><a href="mod_autoindex.html#addaltbytype">AddAltByType</a></li>
+<li><a href="mod_mime.html#addcharset">AddCharset</a></li>
+<li><a href="core.html#adddefaultcharset">AddDefaultCharset</a></li>
+<li><a href="mod_autoindex.html#adddescription">AddDescription</a></li>
+<li><a href="mod_mime.html#addencoding">AddEncoding</a></li>
+<li><a href="mod_mime.html#addhandler">AddHandler</a></li>
+<li><a href="mod_autoindex.html#addicon">AddIcon</a></li>
+<li><a href="mod_autoindex.html#addiconbyencoding">AddIconByEncoding</a></li>
+<li><a href="mod_autoindex.html#addiconbytype">AddIconByType</a></li>
+<li><a href="mod_mime.html#addinputfilter">AddInputFilter</a></li>
+<li><a href="mod_mime.html#addlanguage">AddLanguage</a></li>
+<li><a href="mod_info.html#addmoduleinfo">AddModuleInfo</a></li>
+<li><a href="mod_mime.html#addoutputfilter">AddOutputFilter</a></li>
+<li><a href="core.html#addoutputfilterbytype">AddOutputFilterByType</a></li>
+<li><a href="mod_mime.html#addtype">AddType</a></li>
+<li><a href="mod_alias.html#alias">Alias</a></li>
+<li><a href="mod_alias.html#aliasmatch">AliasMatch</a></li>
+<li><a href="mod_authz_host.html#allow">Allow</a></li>
+<li><a href="mod_proxy.html#allowconnect">AllowCONNECT</a></li>
+<li><a href="core.html#allowencodedslashes">AllowEncodedSlashes</a></li>
+<li><a href="core.html#allowoverride">AllowOverride</a></li>
+<li><a href="mod_authn_anon.html#anonymous">Anonymous</a></li>
+<li><a href="mod_authn_anon.html#anonymous_logemail">Anonymous_LogEmail</a></li>
+<li><a href="mod_authn_anon.html#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></li>
+<li><a href="mod_authn_anon.html#anonymous_nouserid">Anonymous_NoUserID</a></li>
+<li><a href="mod_authn_anon.html#anonymous_verifyemail">Anonymous_VerifyEmail</a></li>
+<li><a href="mod_auth_basic.html#authbasicauthoritative">AuthBasicAuthoritative</a></li>
+<li><a href="mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></li>
+<li><a href="mod_authn_dbd.html#authdbduserpwquery">AuthDBDUserPWQuery</a></li>
+<li><a href="mod_authn_dbd.html#authdbduserrealmquery">AuthDBDUserRealmQuery</a></li>
+<li><a href="mod_authz_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></li>
+<li><a href="mod_authn_dbm.html#authdbmtype">AuthDBMType</a></li>
+<li><a href="mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></li>
+<li><a href="mod_authn_default.html#authdefaultauthoritative">AuthDefaultAuthoritative</a></li>
+<li><a href="mod_auth_digest.html#authdigestalgorithm">AuthDigestAlgorithm</a></li>
+<li><a href="mod_auth_digest.html#authdigestdomain">AuthDigestDomain</a></li>
+<li><a href="mod_auth_digest.html#authdigestnccheck">AuthDigestNcCheck</a></li>
+<li><a href="mod_auth_digest.html#authdigestnonceformat">AuthDigestNonceFormat</a></li>
+<li><a href="mod_auth_digest.html#authdigestnoncelifetime">AuthDigestNonceLifetime</a></li>
+<li><a href="mod_auth_digest.html#authdigestprovider">AuthDigestProvider</a></li>
+<li><a href="mod_auth_digest.html#authdigestqop">AuthDigestQop</a></li>
+<li><a href="mod_auth_digest.html#authdigestshmemsize">AuthDigestShmemSize</a></li>
+<li><a href="mod_authz_groupfile.html#authgroupfile">AuthGroupFile</a></li>
+<li><a href="mod_authnz_ldap.html#authldapbinddn">AuthLDAPBindDN</a></li>
+<li><a href="mod_authnz_ldap.html#authldapbindpassword">AuthLDAPBindPassword</a></li>
+<li><a href="mod_authnz_ldap.html#authldapcharsetconfig">AuthLDAPCharsetConfig</a></li>
+<li><a href="mod_authnz_ldap.html#authldapcomparednonserver">AuthLDAPCompareDNOnServer</a></li>
+<li><a href="mod_authnz_ldap.html#authldapdereferencealiases">AuthLDAPDereferenceAliases</a></li>
+<li><a href="mod_authnz_ldap.html#authldapgroupattribute">AuthLDAPGroupAttribute</a></li>
+<li><a href="mod_authnz_ldap.html#authldapgroupattributeisdn">AuthLDAPGroupAttributeIsDN</a></li>
+<li><a href="mod_authnz_ldap.html#authldapremoteuserattribute">AuthLDAPRemoteUserAttribute</a></li>
+<li><a href="mod_authnz_ldap.html#authldapremoteuserisdn">AuthLDAPRemoteUserIsDN</a></li>
+<li><a href="mod_authnz_ldap.html#authldapurl">AuthLDAPUrl</a></li>
+<li><a href="core.html#authname">AuthName</a></li>
+<li><a href="mod_authn_alias.html#authnprovideralias">&lt;AuthnProviderAlias&gt;</a></li>
+<li><a href="core.html#authtype">AuthType</a></li>
+<li><a href="mod_authn_file.html#authuserfile">AuthUserFile</a></li>
+<li><a href="mod_authz_dbm.html#authzdbmauthoritative">AuthzDBMAuthoritative</a></li>
+<li><a href="mod_authz_dbm.html#authzdbmtype">AuthzDBMType</a></li>
+<li><a href="mod_authz_default.html#authzdefaultauthoritative">AuthzDefaultAuthoritative</a></li>
+<li><a href="mod_authz_groupfile.html#authzgroupfileauthoritative">AuthzGroupFileAuthoritative</a></li>
+<li><a href="mod_authnz_ldap.html#authzldapauthoritative">AuthzLDAPAuthoritative</a></li>
+<li><a href="mod_authz_owner.html#authzownerauthoritative">AuthzOwnerAuthoritative</a></li>
+<li><a href="mod_authz_user.html#authzuserauthoritative">AuthzUserAuthoritative</a></li>
+<li><a href="mod_proxy.html#balancermember" id="B" name="B">BalancerMember</a></li>
+<li><a href="mod_setenvif.html#browsermatch">BrowserMatch</a></li>
+<li><a href="mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></li>
+<li><a href="mod_log_config.html#bufferedlogs">BufferedLogs</a></li>
+<li><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire</a></li>
+<li><a href="mod_disk_cache.html#cachedirlength">CacheDirLength</a></li>
+<li><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></li>
+<li><a href="mod_cache.html#cachedisable">CacheDisable</a></li>
+<li><a href="mod_cache.html#cacheenable">CacheEnable</a></li>
+<li><a href="mod_file_cache.html#cachefile">CacheFile</a></li>
+<li><a href="mod_cache.html#cacheignorecachecontrol">CacheIgnoreCacheControl</a></li>
+<li><a href="mod_cache.html#cacheignoreheaders">CacheIgnoreHeaders</a></li>
+<li><a href="mod_cache.html#cacheignorenolastmod">CacheIgnoreNoLastMod</a></li>
+<li><a href="mod_cache.html#cacheignorequerystring">CacheIgnoreQueryString</a></li>
+<li><a href="mod_cache.html#cachelastmodifiedfactor">CacheLastModifiedFactor</a></li>
+<li><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire</a></li>
+<li><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize</a></li>
+<li><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></li>
+<li><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
+<li><a href="mod_disk_cache.html#cacheroot">CacheRoot</a></li>
+<li><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore</a></li>
+<li><a href="mod_cache.html#cachestoreprivate">CacheStorePrivate</a></li>
+<li><a href="core.html#cgimapextension">CGIMapExtension</a></li>
+<li><a href="mod_charset_lite.html#charsetdefault">CharsetDefault</a></li>
+<li><a href="mod_charset_lite.html#charsetoptions">CharsetOptions</a></li>
+<li><a href="mod_charset_lite.html#charsetsourceenc">CharsetSourceEnc</a></li>
+<li><a href="mod_speling.html#checkcaseonly">CheckCaseOnly</a></li>
+<li><a href="mod_speling.html#checkspelling">CheckSpelling</a></li>
+<li><a href="core.html#contentdigest">ContentDigest</a></li>
+<li><a href="mod_usertrack.html#cookiedomain">CookieDomain</a></li>
+<li><a href="mod_usertrack.html#cookieexpires">CookieExpires</a></li>
+<li><a href="mod_log_config.html#cookielog">CookieLog</a></li>
+<li><a href="mod_usertrack.html#cookiename">CookieName</a></li>
+<li><a href="mod_usertrack.html#cookiestyle">CookieStyle</a></li>
+<li><a href="mod_usertrack.html#cookietracking">CookieTracking</a></li>
+<li><a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
+<li><a href="mod_log_config.html#customlog">CustomLog</a></li>
+<li><a href="mod_dav.html#dav" id="D" name="D">Dav</a></li>
+<li><a href="mod_dav.html#davdepthinfinity">DavDepthInfinity</a></li>
+<li><a href="mod_dav_lock.html#davgenericlockdb">DavGenericLockDB</a></li>
+<li><a href="mod_dav_fs.html#davlockdb">DavLockDB</a></li>
+<li><a href="mod_dav.html#davmintimeout">DavMinTimeout</a></li>
+<li><a href="mod_dbd.html#dbdexptime">DBDExptime</a></li>
+<li><a href="mod_dbd.html#dbdkeep">DBDKeep</a></li>
+<li><a href="mod_dbd.html#dbdmax">DBDMax</a></li>
+<li><a href="mod_dbd.html#dbdmin">DBDMin</a></li>
+<li><a href="mod_dbd.html#dbdparams">DBDParams</a></li>
+<li><a href="mod_dbd.html#dbdpersist">DBDPersist</a></li>
+<li><a href="mod_dbd.html#dbdpreparesql">DBDPrepareSQL</a></li>
+<li><a href="mod_dbd.html#dbdriver">DBDriver</a></li>
+<li><a href="mod_autoindex.html#defaulticon">DefaultIcon</a></li>
+<li><a href="mod_mime.html#defaultlanguage">DefaultLanguage</a></li>
+<li><a href="core.html#defaulttype">DefaultType</a></li>
+<li><a href="mod_deflate.html#deflatebuffersize">DeflateBufferSize</a></li>
+<li><a href="mod_deflate.html#deflatecompressionlevel">DeflateCompressionLevel</a></li>
+<li><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote</a></li>
+<li><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel</a></li>
+<li><a href="mod_deflate.html#deflatewindowsize">DeflateWindowSize</a></li>
+<li><a href="mod_authz_host.html#deny">Deny</a></li>
+<li><a href="core.html#directory">&lt;Directory&gt;</a></li>
+<li><a href="mod_dir.html#directoryindex">DirectoryIndex</a></li>
+<li><a href="core.html#directorymatch">&lt;DirectoryMatch&gt;</a></li>
+<li><a href="mod_dir.html#directoryslash">DirectorySlash</a></li>
+<li><a href="core.html#documentroot">DocumentRoot</a></li>
+<li><a href="mod_dumpio.html#dumpioinput">DumpIOInput</a></li>
+<li><a href="mod_dumpio.html#dumpiologlevel">DumpIOLogLevel</a></li>
+<li><a href="mod_dumpio.html#dumpiooutput">DumpIOOutput</a></li>
+<li><a href="mpm_common.html#enableexceptionhook" id="E" name="E">EnableExceptionHook</a></li>
+<li><a href="core.html#enablemmap">EnableMMAP</a></li>
+<li><a href="core.html#enablesendfile">EnableSendfile</a></li>
+<li><a href="core.html#errordocument">ErrorDocument</a></li>
+<li><a href="core.html#errorlog">ErrorLog</a></li>
+<li><a href="mod_example.html#example">Example</a></li>
+<li><a href="mod_expires.html#expiresactive">ExpiresActive</a></li>
+<li><a href="mod_expires.html#expiresbytype">ExpiresByType</a></li>
+<li><a href="mod_expires.html#expiresdefault">ExpiresDefault</a></li>
+<li><a href="mod_status.html#extendedstatus">ExtendedStatus</a></li>
+<li><a href="mod_ext_filter.html#extfilterdefine">ExtFilterDefine</a></li>
+<li><a href="mod_ext_filter.html#extfilteroptions">ExtFilterOptions</a></li>
+<li><a href="core.html#fileetag" id="F" name="F">FileETag</a></li>
+<li><a href="core.html#files">&lt;Files&gt;</a></li>
+<li><a href="core.html#filesmatch">&lt;FilesMatch&gt;</a></li>
+<li><a href="mod_filter.html#filterchain">FilterChain</a></li>
+<li><a href="mod_filter.html#filterdeclare">FilterDeclare</a></li>
+<li><a href="mod_filter.html#filterprotocol">FilterProtocol</a></li>
+<li><a href="mod_filter.html#filterprovider">FilterProvider</a></li>
+<li><a href="mod_filter.html#filtertrace">FilterTrace</a></li>
+<li><a href="mod_negotiation.html#forcelanguagepriority">ForceLanguagePriority</a></li>
+<li><a href="core.html#forcetype">ForceType</a></li>
+<li><a href="mod_log_forensic.html#forensiclog">ForensicLog</a></li>
+<li><a href="mpm_common.html#gracefulshutdowntimeout" id="G" name="G">GracefulShutdownTimeout</a></li>
+<li><a href="mpm_common.html#group">Group</a></li>
+<li><a href="mod_headers.html#header" id="H" name="H">Header</a></li>
+<li><a href="mod_autoindex.html#headername">HeaderName</a></li>
+<li><a href="core.html#hostnamelookups">HostnameLookups</a></li>
+<li><a href="mod_ident.html#identitycheck" id="I" name="I">IdentityCheck</a></li>
+<li><a href="mod_ident.html#identitychecktimeout">IdentityCheckTimeout</a></li>
+<li><a href="core.html#ifdefine">&lt;IfDefine&gt;</a></li>
+<li><a href="core.html#ifmodule">&lt;IfModule&gt;</a></li>
+<li><a href="mod_version.html#ifversion">&lt;IfVersion&gt;</a></li>
+<li><a href="mod_imagemap.html#imapbase">ImapBase</a></li>
+<li><a href="mod_imagemap.html#imapdefault">ImapDefault</a></li>
+<li><a href="mod_imagemap.html#imapmenu">ImapMenu</a></li>
+<li><a href="core.html#include">Include</a></li>
+<li><a href="mod_autoindex.html#indexignore">IndexIgnore</a></li>
+<li><a href="mod_autoindex.html#indexoptions">IndexOptions</a></li>
+<li><a href="mod_autoindex.html#indexorderdefault">IndexOrderDefault</a></li>
+<li><a href="mod_autoindex.html#indexstylesheet">IndexStyleSheet</a></li>
+<li><a href="mod_isapi.html#isapiappendlogtoerrors">ISAPIAppendLogToErrors</a></li>
+<li><a href="mod_isapi.html#isapiappendlogtoquery">ISAPIAppendLogToQuery</a></li>
+<li><a href="mod_isapi.html#isapicachefile">ISAPICacheFile</a></li>
+<li><a href="mod_isapi.html#isapifakeasync">ISAPIFakeAsync</a></li>
+<li><a href="mod_isapi.html#isapilognotsupported">ISAPILogNotSupported</a></li>
+<li><a href="mod_isapi.html#isapireadaheadbuffer">ISAPIReadAheadBuffer</a></li>
+<li><a href="core.html#keepalive" id="K" name="K">KeepAlive</a></li>
+<li><a href="core.html#keepalivetimeout">KeepAliveTimeout</a></li>
+<li><a href="mod_negotiation.html#languagepriority" id="L" name="L">LanguagePriority</a></li>
+<li><a href="mod_ldap.html#ldapcacheentries">LDAPCacheEntries</a></li>
+<li><a href="mod_ldap.html#ldapcachettl">LDAPCacheTTL</a></li>
+<li><a href="mod_ldap.html#ldapconnectiontimeout">LDAPConnectionTimeout</a></li>
+<li><a href="mod_ldap.html#ldapopcacheentries">LDAPOpCacheEntries</a></li>
+<li><a href="mod_ldap.html#ldapopcachettl">LDAPOpCacheTTL</a></li>
+<li><a href="mod_ldap.html#ldapsharedcachefile">LDAPSharedCacheFile</a></li>
+<li><a href="mod_ldap.html#ldapsharedcachesize">LDAPSharedCacheSize</a></li>
+<li><a href="mod_ldap.html#ldaptrustedclientcert">LDAPTrustedClientCert</a></li>
+<li><a href="mod_ldap.html#ldaptrustedglobalcert">LDAPTrustedGlobalCert</a></li>
+<li><a href="mod_ldap.html#ldaptrustedmode">LDAPTrustedMode</a></li>
+<li><a href="mod_ldap.html#ldapverifyservercert">LDAPVerifyServerCert</a></li>
+<li><a href="core.html#limit">&lt;Limit&gt;</a></li>
+<li><a href="core.html#limitexcept">&lt;LimitExcept&gt;</a></li>
+<li><a href="core.html#limitinternalrecursion">LimitInternalRecursion</a></li>
+<li><a href="core.html#limitrequestbody">LimitRequestBody</a></li>
+<li><a href="core.html#limitrequestfields">LimitRequestFields</a></li>
+<li><a href="core.html#limitrequestfieldsize">LimitRequestFieldSize</a></li>
+<li><a href="core.html#limitrequestline">LimitRequestLine</a></li>
+<li><a href="core.html#limitxmlrequestbody">LimitXMLRequestBody</a></li>
+<li><a href="mpm_common.html#listen">Listen</a></li>
+<li><a href="mpm_common.html#listenbacklog">ListenBackLog</a></li>
+<li><a href="mod_so.html#loadfile">LoadFile</a></li>
+<li><a href="mod_so.html#loadmodule">LoadModule</a></li>
+<li><a href="core.html#location">&lt;Location&gt;</a></li>
+<li><a href="core.html#locationmatch">&lt;LocationMatch&gt;</a></li>
+<li><a href="mpm_common.html#lockfile">LockFile</a></li>
+<li><a href="mod_log_config.html#logformat">LogFormat</a></li>
+<li><a href="core.html#loglevel">LogLevel</a></li>
+<li><a href="mpm_common.html#maxclients" id="M" name="M">MaxClients</a></li>
+<li><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests</a></li>
+<li><a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
+<li><a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
+<li><a href="beos.html#maxrequestsperthread">MaxRequestsPerThread</a></li>
+<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>
+<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
+<li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
+<li><a href="mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount</a></li>
+<li><a href="mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize</a></li>
+<li><a href="mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer</a></li>
+<li><a href="mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize</a></li>
+<li><a href="mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></li>
+<li><a href="mod_mem_cache.html#mcachesize">MCacheSize</a></li>
+<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>
+<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>
+<li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>
+<li><a href="mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></li>
+<li><a href="prefork.html#minspareservers">MinSpareServers</a></li>
+<li><a href="mpm_common.html#minsparethreads">MinSpareThreads</a></li>
+<li><a href="mod_file_cache.html#mmapfile">MMapFile</a></li>
+<li><a href="mod_mime.html#modmimeusepathinfo">ModMimeUsePathInfo</a></li>
+<li><a href="mod_mime.html#multiviewsmatch">MultiviewsMatch</a></li>
+<li><a href="core.html#namevirtualhost" id="N" name="N">NameVirtualHost</a></li>
+<li><a href="mod_proxy.html#noproxy">NoProxy</a></li>
+<li><a href="mod_nw_ssl.html#nwssltrustedcerts">NWSSLTrustedCerts</a></li>
+<li><a href="mod_nw_ssl.html#nwsslupgradeable">NWSSLUpgradeable</a></li>
+<li><a href="core.html#options" id="O" name="O">Options</a></li>
+<li><a href="mod_authz_host.html#order">Order</a></li>
+<li><a href="mod_env.html#passenv" id="P" name="P">PassEnv</a></li>
+<li><a href="mpm_common.html#pidfile">PidFile</a></li>
+<li><a href="mod_echo.html#protocolecho">ProtocolEcho</a></li>
+<li><a href="mod_proxy.html#proxy">&lt;Proxy&gt;</a></li>
+<li><a href="mod_proxy.html#proxybadheader">ProxyBadHeader</a></li>
+<li><a href="mod_proxy.html#proxyblock">ProxyBlock</a></li>
+<li><a href="mod_proxy.html#proxydomain">ProxyDomain</a></li>
+<li><a href="mod_proxy.html#proxyerroroverride">ProxyErrorOverride</a></li>
+<li><a href="mod_proxy.html#proxyftpdircharset">ProxyFtpDirCharset</a></li>
+<li><a href="mod_proxy.html#proxyiobuffersize">ProxyIOBufferSize</a></li>
+<li><a href="mod_proxy.html#proxymatch">&lt;ProxyMatch&gt;</a></li>
+<li><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards</a></li>
+<li><a href="mod_proxy.html#proxypass">ProxyPass</a></li>
+<li><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
+<li><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch</a></li>
+<li><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse</a></li>
+<li><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain</a></li>
+<li><a href="mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath</a></li>
+<li><a href="mod_proxy.html#proxypreservehost">ProxyPreserveHost</a></li>
+<li><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize</a></li>
+<li><a href="mod_proxy.html#proxyremote">ProxyRemote</a></li>
+<li><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch</a></li>
+<li><a href="mod_proxy.html#proxyrequests">ProxyRequests</a></li>
+<li><a href="mod_proxy.html#proxyset">ProxySet</a></li>
+<li><a href="mod_proxy.html#proxystatus">ProxyStatus</a></li>
+<li><a href="mod_proxy.html#proxytimeout">ProxyTimeout</a></li>
+<li><a href="mod_proxy.html#proxyvia">ProxyVia</a></li>
+<li><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName</a></li>
+<li><a href="mpm_common.html#receivebuffersize">ReceiveBufferSize</a></li>
+<li><a href="mod_alias.html#redirect">Redirect</a></li>
+<li><a href="mod_alias.html#redirectmatch">RedirectMatch</a></li>
+<li><a href="mod_alias.html#redirectpermanent">RedirectPermanent</a></li>
+<li><a href="mod_alias.html#redirecttemp">RedirectTemp</a></li>
+<li><a href="mod_mime.html#removecharset">RemoveCharset</a></li>
+<li><a href="mod_mime.html#removeencoding">RemoveEncoding</a></li>
+<li><a href="mod_mime.html#removehandler">RemoveHandler</a></li>
+<li><a href="mod_mime.html#removeinputfilter">RemoveInputFilter</a></li>
+<li><a href="mod_mime.html#removelanguage">RemoveLanguage</a></li>
+<li><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter</a></li>
+<li><a href="mod_mime.html#removetype">RemoveType</a></li>
+<li><a href="mod_headers.html#requestheader">RequestHeader</a></li>
+<li><a href="core.html#require">Require</a></li>
+<li><a href="mod_rewrite.html#rewritebase">RewriteBase</a></li>
+<li><a href="mod_rewrite.html#rewritecond">RewriteCond</a></li>
+<li><a href="mod_rewrite.html#rewriteengine">RewriteEngine</a></li>
+<li><a href="mod_rewrite.html#rewritelock">RewriteLock</a></li>
+<li><a href="mod_rewrite.html#rewritelog">RewriteLog</a></li>
+<li><a href="mod_rewrite.html#rewriteloglevel">RewriteLogLevel</a></li>
+<li><a href="mod_rewrite.html#rewritemap">RewriteMap</a></li>
+<li><a href="mod_rewrite.html#rewriteoptions">RewriteOptions</a></li>
+<li><a href="mod_rewrite.html#rewriterule">RewriteRule</a></li>
+<li><a href="core.html#rlimitcpu">RLimitCPU</a></li>
+<li><a href="core.html#rlimitmem">RLimitMEM</a></li>
+<li><a href="core.html#rlimitnproc">RLimitNPROC</a></li>
+<li><a href="core.html#satisfy" id="S" name="S">Satisfy</a></li>
+<li><a href="mpm_common.html#scoreboardfile">ScoreBoardFile</a></li>
+<li><a href="mod_actions.html#script">Script</a></li>
+<li><a href="mod_alias.html#scriptalias">ScriptAlias</a></li>
+<li><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch</a></li>
+<li><a href="core.html#scriptinterpretersource">ScriptInterpreterSource</a></li>
+<li><a href="mod_cgi.html#scriptlog">ScriptLog</a></li>
+<li><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer</a></li>
+<li><a href="mod_cgi.html#scriptloglength">ScriptLogLength</a></li>
+<li><a href="mod_cgid.html#scriptsock">ScriptSock</a></li>
+<li><a href="mod_nw_ssl.html#securelisten">SecureListen</a></li>
+<li><a href="mod_status.html#seerequesttail">SeeRequestTail</a></li>
+<li><a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
+<li><a href="core.html#serveradmin">ServerAdmin</a></li>
+<li><a href="core.html#serveralias">ServerAlias</a></li>
+<li><a href="mpm_common.html#serverlimit">ServerLimit</a></li>
+<li><a href="core.html#servername">ServerName</a></li>
+<li><a href="core.html#serverpath">ServerPath</a></li>
+<li><a href="core.html#serverroot">ServerRoot</a></li>
+<li><a href="core.html#serversignature">ServerSignature</a></li>
+<li><a href="core.html#servertokens">ServerTokens</a></li>
+<li><a href="mod_env.html#setenv">SetEnv</a></li>
+<li><a href="mod_setenvif.html#setenvif">SetEnvIf</a></li>
+<li><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase</a></li>
+<li><a href="core.html#sethandler">SetHandler</a></li>
+<li><a href="core.html#setinputfilter">SetInputFilter</a></li>
+<li><a href="core.html#setoutputfilter">SetOutputFilter</a></li>
+<li><a href="mod_include.html#ssienableaccess">SSIEnableAccess</a></li>
+<li><a href="mod_include.html#ssiendtag">SSIEndTag</a></li>
+<li><a href="mod_include.html#ssierrormsg">SSIErrorMsg</a></li>
+<li><a href="mod_include.html#ssistarttag">SSIStartTag</a></li>
+<li><a href="mod_include.html#ssitimeformat">SSITimeFormat</a></li>
+<li><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho</a></li>
+<li><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile</a></li>
+<li><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath</a></li>
+<li><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile</a></li>
+<li><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath</a></li>
+<li><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile</a></li>
+<li><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath</a></li>
+<li><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile</a></li>
+<li><a href="mod_ssl.html#sslcertificatefile">SSLCertificateFile</a></li>
+<li><a href="mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile</a></li>
+<li><a href="mod_ssl.html#sslciphersuite">SSLCipherSuite</a></li>
+<li><a href="mod_ssl.html#sslcryptodevice">SSLCryptoDevice</a></li>
+<li><a href="mod_ssl.html#sslengine">SSLEngine</a></li>
+<li><a href="mod_ssl.html#sslhonorcipherorder">SSLHonorCipherOrder</a></li>
+<li><a href="mod_ssl.html#sslmutex">SSLMutex</a></li>
+<li><a href="mod_ssl.html#ssloptions">SSLOptions</a></li>
+<li><a href="mod_ssl.html#sslpassphrasedialog">SSLPassPhraseDialog</a></li>
+<li><a href="mod_ssl.html#sslprotocol">SSLProtocol</a></li>
+<li><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile</a></li>
+<li><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath</a></li>
+<li><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile</a></li>
+<li><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath</a></li>
+<li><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite</a></li>
+<li><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine</a></li>
+<li><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile</a></li>
+<li><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath</a></li>
+<li><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol</a></li>
+<li><a href="mod_ssl.html#sslproxyverify">SSLProxyVerify</a></li>
+<li><a href="mod_ssl.html#sslproxyverifydepth">SSLProxyVerifyDepth</a></li>
+<li><a href="mod_ssl.html#sslrandomseed">SSLRandomSeed</a></li>
+<li><a href="mod_ssl.html#sslrequire">SSLRequire</a></li>
+<li><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></li>
+<li><a href="mod_ssl.html#sslsessioncache">SSLSessionCache</a></li>
+<li><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout</a></li>
+<li><a href="mod_ssl.html#sslusername">SSLUserName</a></li>
+<li><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient</a></li>
+<li><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth</a></li>
+<li><a href="mpm_common.html#startservers">StartServers</a></li>
+<li><a href="mpm_common.html#startthreads">StartThreads</a></li>
+<li><a href="mod_substitute.html#substitute">Substitute</a></li>
+<li><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup</a></li>
+<li><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit</a></li>
+<li><a href="mpm_common.html#threadsperchild">ThreadsPerChild</a></li>
+<li><a href="mpm_common.html#threadstacksize">ThreadStackSize</a></li>
+<li><a href="core.html#timeout">TimeOut</a></li>
+<li><a href="core.html#traceenable">TraceEnable</a></li>
+<li><a href="mod_log_config.html#transferlog">TransferLog</a></li>
+<li><a href="mod_mime.html#typesconfig">TypesConfig</a></li>
+<li><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv</a></li>
+<li><a href="core.html#usecanonicalname">UseCanonicalName</a></li>
+<li><a href="core.html#usecanonicalphysicalport">UseCanonicalPhysicalPort</a></li>
+<li><a href="mpm_common.html#user">User</a></li>
+<li><a href="mod_userdir.html#userdir">UserDir</a></li>
+<li><a href="mod_vhost_alias.html#virtualdocumentroot" id="V" name="V">VirtualDocumentRoot</a></li>
+<li><a href="mod_vhost_alias.html#virtualdocumentrootip">VirtualDocumentRootIP</a></li>
+<li><a href="core.html#virtualhost">&lt;VirtualHost&gt;</a></li>
+<li><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias</a></li>
+<li><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP</a></li>
+<li><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></li>
+<li><a href="mod_include.html#xbithack" id="X" name="X">XBitHack</a></li>
+</ul></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="../de/mod/directives.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/directives.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/mod/directives.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="../ja/mod/directives.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/directives.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../ru/mod/directives.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/directives.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/event.html b/docs/manual/mod/event.html
index df756d52..082d1215 100644
--- a/docs/manual/mod/event.html
+++ b/docs/manual/mod/event.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: event.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/event.html.en b/docs/manual/mod/event.html.en
index cd442d2b..00a8c1ca 100644
--- a/docs/manual/mod/event.html.en
+++ b/docs/manual/mod/event.html.en
@@ -141,6 +141,6 @@ MPM</td></tr>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/event.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/index.html b/docs/manual/mod/index.html
index 15e69b07..a7474c15 100644
--- a/docs/manual/mod/index.html
+++ b/docs/manual/mod/index.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: index.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -10,10 +12,14 @@ URI: index.html.es
 Content-Language: es
 Content-type: text/html; charset=ISO-8859-1
 
-URI: index.html.ja.euc-jp
+URI: index.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: index.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: index.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/index.html.de b/docs/manual/mod/index.html.de
index 1a6028c2..542f5b6c 100644
--- a/docs/manual/mod/index.html.de
+++ b/docs/manual/mod/index.html.de
@@ -22,7 +22,8 @@
 <a href="../en/mod/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../es/mod/" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>
@@ -187,8 +188,9 @@ hosting</dd>
 <a href="../en/mod/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../es/mod/" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/index.html.en b/docs/manual/mod/index.html.en
index bda41ed1..fe392457 100644
--- a/docs/manual/mod/index.html.en
+++ b/docs/manual/mod/index.html.en
@@ -22,7 +22,8 @@
 <a href="../en/mod/" title="English">&nbsp;en&nbsp;</a> |
 <a href="../es/mod/" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>
@@ -185,8 +186,9 @@ hosting</dd>
 <a href="../en/mod/" title="English">&nbsp;en&nbsp;</a> |
 <a href="../es/mod/" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/index.html.es b/docs/manual/mod/index.html.es
index 1158be6e..25e56dbd 100644
--- a/docs/manual/mod/index.html.es
+++ b/docs/manual/mod/index.html.es
@@ -22,7 +22,8 @@
 <a href="../en/mod/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../es/mod/" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>
@@ -188,8 +189,9 @@ hosting</dd>
 <a href="../en/mod/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../es/mod/" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Módulos</a> | <a href="../mod/directives.html">Directivas</a> | <a href="../faq/">Preguntas Frecuentes</a> | <a href="../glossary.html">Glosario</a> | <a href="../sitemap.html">Mapa de este sitio web</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/index.html.ja.euc-jp b/docs/manual/mod/index.html.ja.euc-jp
deleted file mode 100644
index 0b018465..00000000
--- a/docs/manual/mod/index.html.ja.euc-jp
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>¥â¥¸¥å¡¼¥ë°ìÍ÷ - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body id="module-index"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>¥â¥¸¥å¡¼¥ë°ìÍ÷</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../de/mod/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="../en/mod/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../es/mod/" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="../ja/mod/" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-
-    <p>
-      °Ê²¼¤Ï Apache ¤ÎÇÛÉۤΰìÉô¤È¤·¤ÆÇÛ¤é¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥â¥¸¥å¡¼¥ë¤Î
-      °ìÍ÷¤Ç¤¹¡£¤¹¤Ù¤Æ¤Î <a href="directives.html">Apache
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> ¤Î¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤Î¥ê¥¹¥È¤â¸«¤Æ¤¯¤À¤µ¤¤¡£
-    </p>
-  </div>
-<div id="quickview"><ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#core">¥³¥¢µ¡Ç½¤È MPM</a></li><li><img alt="" src="../images/down.gif" /> <a href="#other">¾¤Î¥â¥¸¥å¡¼¥ë</a></li></ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><a href="../mpm.html">¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë (MPMs)</a>
-  </li>
-<li><a href="quickreference.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö ¥¯¥¤¥Ã¥¯¥ê¥Õ¥¡¥ì¥ó¥¹</a>
-  </li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section"><h2><a id="core" name="core">¥³¥¢µ¡Ç½¤È MPM</a></h2>
-<dl>
-<dt><a href="core.html">core</a></dt><dd>¾ï¤Ë»ÈÍѲÄǽ¤Ê Apache HTTP ¥µ¡¼¥Ð¤Î¥³¥¢µ¡Ç½</dd>
-<dt><a href="mpm_common.html">mpm_common</a></dt><dd class="separate">Æó¤Ä°Ê¾å¤Î¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë (MPM)
-¤Ç¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¥³¥ì¥¯¥·¥ç¥ó</dd>
-<dt><a href="beos.html">beos</a></dt><dd>This Multi-Processing Module is optimized for BeOS.</dd>
-<dt><a href="event.html">event</a></dt><dd>An experimental variant of the standard <code class="module"><a href="../mod/worker.html">worker</a></code>
-MPM</dd>
-<dt><a href="mpm_netware.html">mpm_netware</a></dt><dd>Multi-Processing Module implementing an exclusively threaded web
-    server optimized for Novell NetWare</dd>
-<dt><a href="mpmt_os2.html">mpmt_os2</a></dt><dd>Hybrid multi-process, multi-threaded MPM for OS/2</dd>
-<dt><a href="prefork.html">prefork</a></dt><dd>¥¹¥ì¥Ã¥É¤ò»È¤ï¤º¡¢Àè¹Ô¤·¤Æ fork ¤ò¹Ô¤Ê¤¦¥¦¥§¥Ö¥µ¡¼¥Ð¤ò¼ÂÁõ
-</dd>
-<dt><a href="mpm_winnt.html">mpm_winnt</a></dt><dd>Windows NT
-¸þ¤±¤ËºÇŬ²½¤µ¤ì¤¿¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë</dd>
-<dt><a href="worker.html">worker</a></dt><dd>¥Þ¥ë¥Á¥¹¥ì¥Ã¥É¤È¥Þ¥ë¥Á¥×¥í¥»¥¹¤Î¥Ï¥¤¥Ö¥ê¥Ã¥É·¿
-¥¦¥§¥Ö¥µ¡¼¥Ð¤ò¼ÂÁõ¤·¤¿¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë</dd>
-</dl></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section"><h2><a id="other" name="other">¾¤Î¥â¥¸¥å¡¼¥ë</a></h2>
-<p class="letters"><a href="#A">&nbsp;A&nbsp;</a> | <a href="#C">&nbsp;C&nbsp;</a> | <a href="#D">&nbsp;D&nbsp;</a> | <a href="#E">&nbsp;E&nbsp;</a> | <a href="#F">&nbsp;F&nbsp;</a> | <a href="#H">&nbsp;H&nbsp;</a> | <a href="#I">&nbsp;I&nbsp;</a> | <a href="#L">&nbsp;L&nbsp;</a> | <a href="#M">&nbsp;M&nbsp;</a> | <a href="#N">&nbsp;N&nbsp;</a> | <a href="#P">&nbsp;P&nbsp;</a> | <a href="#R">&nbsp;R&nbsp;</a> | <a href="#S">&nbsp;S&nbsp;</a> | <a href="#U">&nbsp;U&nbsp;</a> | <a href="#V">&nbsp;V&nbsp;</a></p>
-<dl><dt><a href="mod_actions.html" id="A" name="A">mod_actions</a></dt><dd>¥á¥Ç¥£¥¢¥¿¥¤¥×¤ä¥ê¥¯¥¨¥¹¥È¥á¥½¥Ã¥É¤Ë±þ¤¸¤Æ
-CGI ¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤¹¤ëµ¡Ç½¤òÄó¶¡</dd>
-<dt><a href="mod_alias.html">mod_alias</a></dt><dd>¥Û¥¹¥È¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Î¤¤¤í¤¤¤í¤Ê°ã¤¦¾ì½ê¤ò
-    ¥É¥­¥å¥á¥ó¥È¥Ä¥ê¡¼¤Ë¥Þ¥Ã¥×¤¹¤ëµ¡Ç½¤È¡¢
-    URL ¤Î¥ê¥À¥¤¥ì¥¯¥È¤ò¹Ô¤Ê¤¦µ¡Ç½¤òÄ󶡤¹¤ë</dd>
-<dt><a href="mod_asis.html">mod_asis</a></dt><dd>¼«Ê¬ÍѤΠHTTP ¥Ø¥Ã¥À¤Î½ñ¤«¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤òÁ÷¿®¤¹¤ë</dd>
-<dt><a href="mod_auth_basic.html">mod_auth_basic</a></dt><dd>´ðËÜǧ¾Ú</dd>
-<dt><a href="mod_auth_digest.html">mod_auth_digest</a></dt><dd>User authentication using MD5
-    Digest Authentication.</dd>
-<dt><a href="mod_authn_alias.html">mod_authn_alias</a></dt><dd>Provides the ability to create extended authentication 
-    providers based on actual providers</dd>
-<dt><a href="mod_authn_anon.html">mod_authn_anon</a></dt><dd>ǧ¾Ú¤¬É¬ÍפÊÎΰè¤Ø¤Î "anonymous" ¥æ¡¼¥¶¤Î¥¢¥¯¥»¥¹¤òµö²Ä¤¹¤ë
-</dd>
-<dt><a href="mod_authn_dbd.html">mod_authn_dbd</a></dt><dd>User authentication using an SQL database</dd>
-<dt><a href="mod_authn_dbm.html">mod_authn_dbm</a></dt><dd>DBM ¥Õ¥¡¥¤¥ë¤òÍѤ¤¤¿¥æ¡¼¥¶Ç§¾Ú</dd>
-<dt><a href="mod_authn_default.html">mod_authn_default</a></dt><dd>ǧ¾Ú¥Õ¥©¡¼¥ë¥Ð¥Ã¥¯¥â¥¸¥å¡¼¥ë</dd>
-<dt><a href="mod_authn_file.html">mod_authn_file</a></dt><dd>¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤òÍѤ¤¤¿¥æ¡¼¥¶Ç§¾Ú</dd>
-<dt><a href="mod_authnz_ldap.html">mod_authnz_ldap</a></dt><dd>Allows an LDAP directory to be used to store the database
-for HTTP Basic authentication.</dd>
-<dt><a href="mod_authz_dbm.html">mod_authz_dbm</a></dt><dd>Group authorization using DBM files</dd>
-<dt><a href="mod_authz_default.html">mod_authz_default</a></dt><dd>¾µÇ§¥Õ¥©¡¼¥ë¥Ð¥Ã¥¯¥â¥¸¥å¡¼¥ë</dd>
-<dt><a href="mod_authz_groupfile.html">mod_authz_groupfile</a></dt><dd>¥×¥ì¡¼¥ó¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤òÍѤ¤¤¿¥°¥ë¡¼¥×¾µÇ§</dd>
-<dt><a href="mod_authz_host.html">mod_authz_host</a></dt><dd>¥Û¥¹¥È (̾Á°¤â¤·¤¯¤Ï IP ¥¢¥É¥ì¥¹) ¤Ë´ð¤Å¤¤¤¿¥°¥ë¡¼¥×¾µÇ§</dd>
-<dt><a href="mod_authz_owner.html">mod_authz_owner</a></dt><dd>¥Õ¥¡¥¤¥ë¤Î½êÍ­¼Ô¤Ë´ð¤Å¤¤¤¿¾µÇ§</dd>
-<dt><a href="mod_authz_user.html">mod_authz_user</a></dt><dd>¥æ¡¼¥¶¾µÇ§</dd>
-<dt><a href="mod_autoindex.html">mod_autoindex</a></dt><dd>Unix ¤Î <code>ls</code> ¥³¥Þ¥ó¥É¤ä
-    Win32 ¤Î <code>dir</code> ¥·¥§¥ë¥³¥Þ¥ó¥É¤Ë»÷¤¿
-    ¥Ç¥£¥ì¥¯¥È¥ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤òÀ¸À®¤¹¤ë</dd>
-<dt><a href="mod_cache.html" id="C" name="C">mod_cache</a></dt><dd>URI ¤ò¥­¡¼¤Ë¤·¤¿¥³¥ó¥Æ¥ó¥Ä¤Î¥­¥ã¥Ã¥·¥å</dd>
-<dt><a href="mod_cern_meta.html">mod_cern_meta</a></dt><dd>CERN httpd metafile semantics</dd>
-<dt><a href="mod_cgi.html">mod_cgi</a></dt><dd>CGI ¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô</dd>
-<dt><a href="mod_cgid.html">mod_cgid</a></dt><dd>³°Éô CGI ¥Ç¡¼¥â¥ó¤ò»È¤Ã¤¿ CGI ¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô</dd>
-<dt><a href="mod_charset_lite.html">mod_charset_lite</a></dt><dd>Specify character set translation or recoding</dd>
-<dt><a href="mod_dav.html" id="D" name="D">mod_dav</a></dt><dd>ʬ»¶¥ª¡¼¥µ¥ê¥ó¥°¤È¥Ð¡¼¥¸¥ç¥ó´ÉÍý
-(<a href="http://www.webdav.org/">WebDAV</a>) µ¡Ç½</dd>
-<dt><a href="mod_dav_fs.html">mod_dav_fs</a></dt><dd><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> ¤Î¤¿¤á¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥×¥í¥Ð¥¤¥À</dd>
-<dt><a href="mod_dav_lock.html">mod_dav_lock</a></dt><dd><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> ÍѤÎÈÆÍÑ¥í¥Ã¥¯¥â¥¸¥å¡¼¥ë</dd>
-<dt><a href="mod_dbd.html">mod_dbd</a></dt><dd>Manages SQL database connections</dd>
-<dt><a href="mod_deflate.html">mod_deflate</a></dt><dd>¥¯¥é¥¤¥¢¥ó¥È¤ØÁ÷¤é¤ì¤ëÁ°¤Ë¥³¥ó¥Æ¥ó¥Ä¤ò°µ½Ì¤¹¤ë</dd>
-<dt><a href="mod_dir.html">mod_dir</a></dt><dd>¡ÖºÇ¸å¤Î¥¹¥é¥Ã¥·¥å¡×¤Î¥ê¥À¥¤¥ì¥¯¥È¤È¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Î
-¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤ò°·¤¦µ¡Ç½¤òÄ󶡤¹¤ë</dd>
-<dt><a href="mod_disk_cache.html">mod_disk_cache</a></dt><dd>URI ¤ò¥­¡¼¤Ë¤·¤¿¥³¥ó¥Æ¥ó¥Ä¥­¥ã¥Ã¥·¥å¥¹¥È¥ì¡¼¥¸´ÉÍý</dd>
-<dt><a href="mod_dumpio.html">mod_dumpio</a></dt><dd>˾¤à¤è¤¦¤Ë¤¹¤Ù¤Æ¤Î I/O ¤ò¥¨¥é¡¼¥í¥°¤Ë¥À¥ó¥×¤¹¤ë</dd>
-<dt><a href="mod_echo.html" id="E" name="E">mod_echo</a></dt><dd>¥×¥í¥È¥³¥ë¥â¥¸¥å¡¼¥ë¤Î³µÍפò¼¨¤¹¤¿¤á¤Îñ½ã¤Ê¥¨¥³¡¼¥µ¡¼¥Ð
-</dd>
-<dt><a href="mod_env.html">mod_env</a></dt><dd>CGI ¥¹¥¯¥ê¥×¥ÈµÚ¤Ó SSI
-¥Ú¡¼¥¸¤ËÅϤµ¤ì¤ë´Ä¶­ÊÑ¿ô¤òÊѹ¹¤¹¤ëµ¡Ç½¤òÄ󶡤¹¤ë</dd>
-<dt><a href="mod_example.html">mod_example</a></dt><dd>Illustrates the Apache module API</dd>
-<dt><a href="mod_expires.html">mod_expires</a></dt><dd>¥æ¡¼¥¶¤Î»ØÄꤷ¤¿´ð½à¤Ë´ð¤Å¤¤¤¿ <code>Expires</code> ¤È
-<code>Cache-Control</code> HTTP ¥Ø¥Ã¥À¤ÎÀ¸À®</dd>
-<dt><a href="mod_ext_filter.html">mod_ext_filter</a></dt><dd>¥ì¥¹¥Ý¥ó¥¹¤Î¥Ü¥Ç¥£¤ò¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤ëÁ°¤Ë³°Éô¥×¥í¥°¥é¥à¤Ç½èÍý¤¹¤ë</dd>
-<dt><a href="mod_file_cache.html" id="F" name="F">mod_file_cache</a></dt><dd>Caches a static list of files in memory</dd>
-<dt><a href="mod_filter.html">mod_filter</a></dt><dd>Context-sensitive smart filter configuration module</dd>
-<dt><a href="mod_headers.html" id="H" name="H">mod_headers</a></dt><dd>HTTP ¥ê¥¯¥¨¥¹¥È¤Î¥Ø¥Ã¥À¤È±þÅú¤Î¥Ø¥Ã¥À¤Î¥«¥¹¥¿¥Þ¥¤¥º</dd>
-<dt><a href="mod_ident.html" id="I" name="I">mod_ident</a></dt><dd>RFC 1413 ident lookups</dd>
-<dt><a href="mod_imagemap.html">mod_imagemap</a></dt><dd>Server-side imagemap processing</dd>
-<dt><a href="mod_include.html">mod_include</a></dt><dd>¥µ¡¼¥Ð¤¬¥Ñ¡¼¥¹¤¹¤ë html ¥É¥­¥å¥á¥ó¥È (Server Side Includes)</dd>
-<dt><a href="mod_info.html">mod_info</a></dt><dd>¥µ¡¼¥Ð¤ÎÀßÄê¤ÎÊñ³çŪ¤Ê³µ´Ñ¤òÄ󶡤¹¤ë</dd>
-<dt><a href="mod_isapi.html">mod_isapi</a></dt><dd>ISAPI Extensions within Apache for Windows</dd>
-<dt><a href="mod_ldap.html" id="L" name="L">mod_ldap</a></dt><dd>LDAP connection pooling and result caching services for use
-by other LDAP modules</dd>
-<dt><a href="mod_log_config.html">mod_log_config</a></dt><dd>¥µ¡¼¥Ð¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Î¥í¥®¥ó¥°</dd>
-<dt><a href="mod_log_forensic.html">mod_log_forensic</a></dt><dd>¥µ¡¼¥Ð¤ËÁ÷¤é¤ì¤¿¥ê¥¯¥¨¥¹¥È¤Î forensic ¥í¥®¥ó¥°</dd>
-<dt><a href="mod_logio.html">mod_logio</a></dt><dd>¥ê¥¯¥¨¥¹¥ÈËè¤ËÆþÎϥХ¤¥È¿ô¤È½ÐÎϥХ¤¥È¿ô¤È¤ò¥í¥®¥ó¥°</dd>
-<dt><a href="mod_mem_cache.html" id="M" name="M">mod_mem_cache</a></dt><dd>URI ¤ò¥­¡¼¤Ë¤·¤¿¥³¥ó¥Æ¥ó¥Ä¤Î¥­¥ã¥Ã¥·¥å</dd>
-<dt><a href="mod_mime.html">mod_mime</a></dt><dd>¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤È¥Õ¥¡¥¤¥ë¤Î¿¶¤ëÉñ¤¤
-    (¥Ï¥ó¥É¥é¤È¥Õ¥£¥ë¥¿)¡¢ÆâÍÆ (MIME ¥¿¥¤¥×¡¢¸À¸ì¡¢Ê¸»ú¥»¥Ã¥È¡¢¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°)
-    ¤È¤ò´ØÏ¢ÉÕ¤±¤ë</dd>
-<dt><a href="mod_mime_magic.html">mod_mime_magic</a></dt><dd>Determines the MIME type of a file
-    by looking at a few bytes of its contents</dd>
-<dt><a href="mod_negotiation.html" id="N" name="N">mod_negotiation</a></dt><dd><a href="../content-negotiation.html">¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó</a>
-  µ¡Ç½¤òÄ󶡤¹¤ë</dd>
-<dt><a href="mod_nw_ssl.html">mod_nw_ssl</a></dt><dd>Enable SSL encryption for NetWare</dd>
-<dt><a href="mod_proxy.html" id="P" name="P">mod_proxy</a></dt><dd>HTTP/1.1 ¥×¥í¥­¥·/¥²¡¼¥È¥¦¥§¥¤¥µ¡¼¥Ð</dd>
-<dt><a href="mod_proxy_ajp.html">mod_proxy_ajp</a></dt><dd><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ¤Ç AJP 
-¤ò¥µ¥Ý¡¼¥È¤¹¤ë¤¿¤á¤Î¥â¥¸¥å¡¼¥ë</dd>
-<dt><a href="mod_proxy_balancer.html">mod_proxy_balancer</a></dt><dd>Éé²Ùʬ»¶¤Î¤¿¤á¤Î <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ³ÈÄ¥</dd>
-<dt><a href="mod_proxy_connect.html">mod_proxy_connect</a></dt><dd><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension for
-<code>CONNECT</code> request handling</dd>
-<dt><a href="mod_proxy_ftp.html">mod_proxy_ftp</a></dt><dd>FTP support module for
-<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
-<dt><a href="mod_proxy_http.html">mod_proxy_http</a></dt><dd>HTTP support module for
-<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
-<dt><a href="mod_rewrite.html" id="R" name="R">mod_rewrite</a></dt><dd>Provides a rule-based rewriting engine to rewrite requested
-URLs on the fly</dd>
-<dt><a href="mod_setenvif.html" id="S" name="S">mod_setenvif</a></dt><dd>¥ê¥¯¥¨¥¹¥È¤ÎÆÃħ¤Ë´ð¤Å¤¤¤¿´Ä¶­ÊÑ¿ô¤ÎÀßÄê¤ò²Äǽ¤Ë¤¹¤ë</dd>
-<dt><a href="mod_so.html">mod_so</a></dt><dd>µ¯Æ°»þ¤äºÆµ¯Æ°»þ¤Ë¼Â¹Ô¥³¡¼¥É¤È¥â¥¸¥å¡¼¥ë¤ò¥µ¡¼¥Ð¤Ë¥í¡¼¥É¤¹¤ë
-</dd>
-<dt><a href="mod_speling.html">mod_speling</a></dt><dd>¥æ¡¼¥¶¤¬ÆþÎϤ·¤¿¤Ç¤¢¤í¤¦´Ö°ã¤Ã¤¿ URL ¤ò¡¢
-Âçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤ò̵»ë¤¹¤ë¤³¤È¤È°ì¤Ä°Ê²¼¤ÎÄÖ¤ê´Ö°ã¤¤¤òµöÍƤ¹¤ë¤³¤È¤Ç
-½¤Àµ¤ò»î¤ß¤ë</dd>
-<dt><a href="mod_ssl.html">mod_ssl</a></dt><dd>Strong cryptography using the Secure Sockets
-Layer (SSL) and Transport Layer Security (TLS) protocols</dd>
-<dt><a href="mod_status.html">mod_status</a></dt><dd>¥µ¡¼¥Ð¤Î³èÆ°¾õ¶·¤ÈÀ­Ç½¤Ë´Ø¤¹¤ë¾ðÊó¤òÄ󶡤¹¤ë</dd>
-<dt><a href="mod_substitute.html">mod_substitute</a></dt><dd>Perform search and replace operations on response bodies</dd>
-<dt><a href="mod_suexec.html">mod_suexec</a></dt><dd>»ØÄꤵ¤ì¤¿¥æ¡¼¥¶¤È¥°¥ë¡¼¥×¤Ç CGI ¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤¹¤ë</dd>
-<dt><a href="mod_unique_id.html" id="U" name="U">mod_unique_id</a></dt><dd>¤½¤ì¤¾¤ì¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ¹¤ë°ì°Õ¤Ê¼±Ê̻ҤÎÆþ¤Ã¤¿´Ä¶­ÊÑ¿ô¤ò
-Ä󶡤¹¤ë</dd>
-<dt><a href="mod_userdir.html">mod_userdir</a></dt><dd>¥æ¡¼¥¶ÀìÍѤΥǥ£¥ì¥¯¥È¥ê¤òÄó¶¡
-  </dd>
-<dt><a href="mod_usertrack.html">mod_usertrack</a></dt><dd>
-<em>Clickstream</em> logging of user activity on a site
-</dd>
-<dt><a href="mod_version.html" id="V" name="V">mod_version</a></dt><dd>¥Ð¡¼¥¸¥ç¥ó°Í¸¤ÎÀßÄê</dd>
-<dt><a href="mod_vhost_alias.html">mod_vhost_alias</a></dt><dd>Provides for dynamically configured mass virtual
-hosting</dd>
-</dl></div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../de/mod/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="../en/mod/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../es/mod/" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="../ja/mod/" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/index.html.ja.utf8 b/docs/manual/mod/index.html.ja.utf8
new file mode 100644
index 00000000..0f0259cd
--- /dev/null
+++ b/docs/manual/mod/index.html.ja.utf8
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>モジュール一覧 - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="module-index"><div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>モジュール一覧</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../de/mod/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/mod/" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="../ja/mod/" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+    <p>
+      以下� Apache ��布�一部����られ��る����モジュール�
+      一覧��。���� <a href="directives.html">Apache
+      ディレクティブ</a> �アルファベット順�リストも見�����。
+    </p>
+  </div>
+<div id="quickview"><ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#core">コア機能� MPM</a></li><li><img alt="" src="../images/down.gif" /> <a href="#other">他�モジュール</a></li></ul><h3>�照</h3>
+<ul class="seealso">
+<li><a href="../mpm.html">マル�プロセッシングモジュール (MPMs)</a>
+  </li>
+<li><a href="quickreference.html">ディレクティブ クイックリファレンス</a>
+  </li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section"><h2><a id="core" name="core">コア機能� MPM</a></h2>
+<dl>
+<dt><a href="core.html">core</a></dt><dd>常�使用�能� Apache HTTP サー��コア機能</dd>
+<dt><a href="mpm_common.html">mpm_common</a></dt><dd class="separate">二�以上�マル�プロセッシングモジュール (MPM)
+�実装�れ��るディレクティブ�コレクション</dd>
+<dt><a href="beos.html">beos</a></dt><dd>This Multi-Processing Module is optimized for BeOS.</dd>
+<dt><a href="event.html">event</a></dt><dd>An experimental variant of the standard <code class="module"><a href="../mod/worker.html">worker</a></code>
+MPM</dd>
+<dt><a href="mpm_netware.html">mpm_netware</a></dt><dd>Multi-Processing Module implementing an exclusively threaded web
+    server optimized for Novell NetWare</dd>
+<dt><a href="mpmt_os2.html">mpmt_os2</a></dt><dd>Hybrid multi-process, multi-threaded MPM for OS/2</dd>
+<dt><a href="prefork.html">prefork</a></dt><dd>スレッドを使���先行�� fork を行��ウェブサー�を実装
+</dd>
+<dt><a href="mpm_winnt.html">mpm_winnt</a></dt><dd>Windows NT
+���最�化�れ�マル�プロセッシングモジュール</dd>
+<dt><a href="worker.html">worker</a></dt><dd>マル�スレッド�マル�プロセス��イブリッド型
+ウェブサー�を実装��マル�プロセッシングモジュール</dd>
+</dl></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section"><h2><a id="other" name="other">他�モジュール</a></h2>
+<p class="letters"><a href="#A">&nbsp;A&nbsp;</a> | <a href="#C">&nbsp;C&nbsp;</a> | <a href="#D">&nbsp;D&nbsp;</a> | <a href="#E">&nbsp;E&nbsp;</a> | <a href="#F">&nbsp;F&nbsp;</a> | <a href="#H">&nbsp;H&nbsp;</a> | <a href="#I">&nbsp;I&nbsp;</a> | <a href="#L">&nbsp;L&nbsp;</a> | <a href="#M">&nbsp;M&nbsp;</a> | <a href="#N">&nbsp;N&nbsp;</a> | <a href="#P">&nbsp;P&nbsp;</a> | <a href="#R">&nbsp;R&nbsp;</a> | <a href="#S">&nbsp;S&nbsp;</a> | <a href="#U">&nbsp;U&nbsp;</a> | <a href="#V">&nbsp;V&nbsp;</a></p>
+<dl><dt><a href="mod_actions.html" id="A" name="A">mod_actions</a></dt><dd>メディアタイプやリクエストメソッド�応��
+CGI スクリプトを実行�る機能を�供</dd>
+<dt><a href="mod_alias.html">mod_alias</a></dt><dd>ホストファイルシステム上��������場所を
+    ドキュメントツリー�マップ�る機能��
+    URL �リダイレクトを行��機能を�供�る</dd>
+<dt><a href="mod_asis.html">mod_asis</a></dt><dd>自分用� HTTP ヘッダ�書�れ��るファイルを�信�る</dd>
+<dt><a href="mod_auth_basic.html">mod_auth_basic</a></dt><dd>基本�証</dd>
+<dt><a href="mod_auth_digest.html">mod_auth_digest</a></dt><dd>User authentication using MD5
+    Digest Authentication.</dd>
+<dt><a href="mod_authn_alias.html">mod_authn_alias</a></dt><dd>Provides the ability to create extended authentication 
+    providers based on actual providers</dd>
+<dt><a href="mod_authn_anon.html">mod_authn_anon</a></dt><dd>�証�必��領域�� "anonymous" ユーザ�アクセスを許��る
+</dd>
+<dt><a href="mod_authn_dbd.html">mod_authn_dbd</a></dt><dd>User authentication using an SQL database</dd>
+<dt><a href="mod_authn_dbm.html">mod_authn_dbm</a></dt><dd>DBM ファイルを用��ユーザ�証</dd>
+<dt><a href="mod_authn_default.html">mod_authn_default</a></dt><dd>�証フォール�ックモジュール</dd>
+<dt><a href="mod_authn_file.html">mod_authn_file</a></dt><dd>テキストファイルを用��ユーザ�証</dd>
+<dt><a href="mod_authnz_ldap.html">mod_authnz_ldap</a></dt><dd>Allows an LDAP directory to be used to store the database
+for HTTP Basic authentication.</dd>
+<dt><a href="mod_authz_dbm.html">mod_authz_dbm</a></dt><dd>Group authorization using DBM files</dd>
+<dt><a href="mod_authz_default.html">mod_authz_default</a></dt><dd>承�フォール�ックモジュール</dd>
+<dt><a href="mod_authz_groupfile.html">mod_authz_groupfile</a></dt><dd>プレーンテキストファイルを用��グループ承�</dd>
+<dt><a href="mod_authz_host.html">mod_authz_host</a></dt><dd>ホスト (��も��� IP アドレス) �基���グループ承�</dd>
+<dt><a href="mod_authz_owner.html">mod_authz_owner</a></dt><dd>ファイル�所有者�基���承�</dd>
+<dt><a href="mod_authz_user.html">mod_authz_user</a></dt><dd>ユーザ承�</dd>
+<dt><a href="mod_autoindex.html">mod_autoindex</a></dt><dd>Unix � <code>ls</code> コマンドや
+    Win32 � <code>dir</code> シェルコマンド�似�
+    ディレクトリインデックスを生��る</dd>
+<dt><a href="mod_cache.html" id="C" name="C">mod_cache</a></dt><dd>URI をキー���コンテンツ�キャッシュ</dd>
+<dt><a href="mod_cern_meta.html">mod_cern_meta</a></dt><dd>CERN httpd metafile semantics</dd>
+<dt><a href="mod_cgi.html">mod_cgi</a></dt><dd>CGI スクリプト�実行</dd>
+<dt><a href="mod_cgid.html">mod_cgid</a></dt><dd>外部 CGI デーモンを使�� CGI スクリプト�実行</dd>
+<dt><a href="mod_charset_lite.html">mod_charset_lite</a></dt><dd>Specify character set translation or recoding</dd>
+<dt><a href="mod_dav.html" id="D" name="D">mod_dav</a></dt><dd>分散オーサリング��ージョン管�
+(<a href="http://www.webdav.org/">WebDAV</a>) 機能</dd>
+<dt><a href="mod_dav_fs.html">mod_dav_fs</a></dt><dd><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> ����ファイルシステムプロ�イダ</dd>
+<dt><a href="mod_dav_lock.html">mod_dav_lock</a></dt><dd><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> 用�汎用ロックモジュール</dd>
+<dt><a href="mod_dbd.html">mod_dbd</a></dt><dd>Manages SQL database connections</dd>
+<dt><a href="mod_deflate.html">mod_deflate</a></dt><dd>クライアント��られる��コンテンツを圧縮�る</dd>
+<dt><a href="mod_dir.html">mod_dir</a></dt><dd>「最後�スラッシュ��リダイレクト��ディレクトリ�
+インデックスファイルを扱�機能を�供�る</dd>
+<dt><a href="mod_disk_cache.html">mod_disk_cache</a></dt><dd>URI をキー���コンテンツキャッシュストレージ管�</dd>
+<dt><a href="mod_dumpio.html">mod_dumpio</a></dt><dd>望むよ������ I/O をエラーログ�ダンプ�る</dd>
+<dt><a href="mod_echo.html" id="E" name="E">mod_echo</a></dt><dd>プロトコルモジュール�概�を示�����純�エコーサー�
+</dd>
+<dt><a href="mod_env.html">mod_env</a></dt><dd>CGI スクリプト�� SSI
+ページ�渡�れる環境変数を変更�る機能を�供�る</dd>
+<dt><a href="mod_example.html">mod_example</a></dt><dd>Illustrates the Apache module API</dd>
+<dt><a href="mod_expires.html">mod_expires</a></dt><dd>ユーザ�指定��基準�基��� <code>Expires</code> �
+<code>Cache-Control</code> HTTP ヘッダ�生�</dd>
+<dt><a href="mod_ext_filter.html">mod_ext_filter</a></dt><dd>レス�ンス�ボディをクライアント��る��外部プログラム�処��る</dd>
+<dt><a href="mod_file_cache.html" id="F" name="F">mod_file_cache</a></dt><dd>Caches a static list of files in memory</dd>
+<dt><a href="mod_filter.html">mod_filter</a></dt><dd>Context-sensitive smart filter configuration module</dd>
+<dt><a href="mod_headers.html" id="H" name="H">mod_headers</a></dt><dd>HTTP リクエスト�ヘッダ�応答�ヘッダ�カスタマイズ</dd>
+<dt><a href="mod_ident.html" id="I" name="I">mod_ident</a></dt><dd>RFC 1413 ident lookups</dd>
+<dt><a href="mod_imagemap.html">mod_imagemap</a></dt><dd>Server-side imagemap processing</dd>
+<dt><a href="mod_include.html">mod_include</a></dt><dd>サー��パース�る html ドキュメント (Server Side Includes)</dd>
+<dt><a href="mod_info.html">mod_info</a></dt><dd>サー��設定�包括的�概観を�供�る</dd>
+<dt><a href="mod_isapi.html">mod_isapi</a></dt><dd>ISAPI Extensions within Apache for Windows</dd>
+<dt><a href="mod_ldap.html" id="L" name="L">mod_ldap</a></dt><dd>LDAP connection pooling and result caching services for use
+by other LDAP modules</dd>
+<dt><a href="mod_log_config.html">mod_log_config</a></dt><dd>サー���リクエスト�ロギング</dd>
+<dt><a href="mod_log_forensic.html">mod_log_forensic</a></dt><dd>サー���られ�リクエスト� forensic ロギング</dd>
+<dt><a href="mod_logio.html">mod_logio</a></dt><dd>リクエスト毎�入力�イト数�出力�イト数�をロギング</dd>
+<dt><a href="mod_mem_cache.html" id="M" name="M">mod_mem_cache</a></dt><dd>URI をキー���コンテンツ�キャッシュ</dd>
+<dt><a href="mod_mime.html">mod_mime</a></dt><dd>リクエスト�れ�ファイル�拡張��ファイル�振る舞�
+    (�ンドラ�フィルタ)�内容 (MIME タイプ�言語�文字セット�エンコーディング)
+    �を関連付�る</dd>
+<dt><a href="mod_mime_magic.html">mod_mime_magic</a></dt><dd>Determines the MIME type of a file
+    by looking at a few bytes of its contents</dd>
+<dt><a href="mod_negotiation.html" id="N" name="N">mod_negotiation</a></dt><dd><a href="../content-negotiation.html">コンテント�ゴシエーション</a>
+  機能を�供�る</dd>
+<dt><a href="mod_nw_ssl.html">mod_nw_ssl</a></dt><dd>Enable SSL encryption for NetWare</dd>
+<dt><a href="mod_proxy.html" id="P" name="P">mod_proxy</a></dt><dd>HTTP/1.1 プロキシ/ゲートウェイサー�</dd>
+<dt><a href="mod_proxy_ajp.html">mod_proxy_ajp</a></dt><dd><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> � AJP 
+をサ�ート�る���モジュール</dd>
+<dt><a href="mod_proxy_balancer.html">mod_proxy_balancer</a></dt><dd>負�分散���� <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> 拡張</dd>
+<dt><a href="mod_proxy_connect.html">mod_proxy_connect</a></dt><dd><code>CONNECT</code> リクエストを扱�
+<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> 用�拡張</dd>
+<dt><a href="mod_proxy_ftp.html">mod_proxy_ftp</a></dt><dd>FTP support module for
+<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
+<dt><a href="mod_proxy_http.html">mod_proxy_http</a></dt><dd>HTTP support module for
+<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
+<dt><a href="mod_rewrite.html" id="R" name="R">mod_rewrite</a></dt><dd>Provides a rule-based rewriting engine to rewrite requested
+URLs on the fly</dd>
+<dt><a href="mod_setenvif.html" id="S" name="S">mod_setenvif</a></dt><dd>リクエスト�特徴�基���環境変数�設定を�能��る</dd>
+<dt><a href="mod_so.html">mod_so</a></dt><dd>起動時や�起動時�実行コード�モジュールをサー��ロード�る
+</dd>
+<dt><a href="mod_speling.html">mod_speling</a></dt><dd>ユーザ�入力������間��� URL を�
+大文字�文字�区別を無視�る���一�以下�綴り間��を許容�る���
+修正を試�る</dd>
+<dt><a href="mod_ssl.html">mod_ssl</a></dt><dd>Strong cryptography using the Secure Sockets
+Layer (SSL) and Transport Layer Security (TLS) protocols</dd>
+<dt><a href="mod_status.html">mod_status</a></dt><dd>サー��活動状��性能�関�る情報を�供�る</dd>
+<dt><a href="mod_substitute.html">mod_substitute</a></dt><dd>Perform search and replace operations on response bodies</dd>
+<dt><a href="mod_suexec.html">mod_suexec</a></dt><dd>指定�れ�ユーザ�グループ� CGI スクリプトを実行�る</dd>
+<dt><a href="mod_unique_id.html" id="U" name="U">mod_unique_id</a></dt><dd>�れ�れ�リクエスト�対�る一��識別��入��環境変数を
+�供�る</dd>
+<dt><a href="mod_userdir.html">mod_userdir</a></dt><dd>ユーザ専用�ディレクトリを�供
+  </dd>
+<dt><a href="mod_usertrack.html">mod_usertrack</a></dt><dd>
+<em>Clickstream</em> logging of user activity on a site
+</dd>
+<dt><a href="mod_version.html" id="V" name="V">mod_version</a></dt><dd>�ージョン�存�設定</dd>
+<dt><a href="mod_vhost_alias.html">mod_vhost_alias</a></dt><dd>Provides for dynamically configured mass virtual
+hosting</dd>
+</dl></div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../de/mod/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/mod/" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="../ja/mod/" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/index.html.ko.euc-kr b/docs/manual/mod/index.html.ko.euc-kr
index 84f3f3f6..37ac7c3c 100644
--- a/docs/manual/mod/index.html.ko.euc-kr
+++ b/docs/manual/mod/index.html.ko.euc-kr
@@ -22,7 +22,8 @@
 <a href="../en/mod/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../es/mod/" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/mod/" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>
@@ -167,8 +168,9 @@ hosting</dd>
 <a href="../en/mod/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../es/mod/" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/mod/" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/index.html.tr.utf8 b/docs/manual/mod/index.html.tr.utf8
new file mode 100644
index 00000000..3bfe7c8e
--- /dev/null
+++ b/docs/manual/mod/index.html.tr.utf8
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Modül Dizini - Apache HTTP Sunucusu</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="module-index"><div id="page-header">
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="../">Sürüm 2.2</a></div><div id="page-content"><div id="preamble"><h1>Modül Dizini</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="../de/mod/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/mod/" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="../ja/mod/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+    <p>Apache dağıtımının parçası olarak gelen modüllerin tamamı aşağıda
+    listelenmiştir. Ayrıca, tüm Apache yönergelerinin alfabetik olarak
+    listelendiği bir <a href="directives.html">Yönerge Dizini</a> de
+    mevcuttur.</p>
+  </div>
+<div id="quickview"><ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#core">Temel Özellikler ve Çoklu İşlem Modülleri</a></li><li><img alt="" src="../images/down.gif" /> <a href="#other">Diğer Modüller</a></li></ul><h3>Ayrıca bakınız:</h3>
+<ul class="seealso">
+<li><a href="../mpm.html">Çok Süreçlilik Modülleri (MPM’ler)</a>
+  </li>
+<li><a href="quickreference.html">Hızlı Yönerge Kılavuzu</a>
+  </li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section"><h2><a id="core" name="core">Temel Özellikler ve Çoklu İşlem Modülleri</a></h2>
+<dl>
+<dt><a href="core.html">core</a></dt><dd>Apache HTTP Sunucusunda daima mevcut olan çekirdek
+ özellikler</dd>
+<dt><a href="mpm_common.html">mpm_common</a></dt><dd class="separate">Birden fazla Çok Süreçlilik Modülü (MPM) tarafından gerçeklenmiş
+  yönergeler bütünü.</dd>
+<dt><a href="beos.html">beos</a></dt><dd>This Multi-Processing Module is optimized for BeOS.</dd>
+<dt><a href="event.html">event</a></dt><dd>An experimental variant of the standard <code class="module"><a href="../mod/worker.html">worker</a></code>
+MPM</dd>
+<dt><a href="mpm_netware.html">mpm_netware</a></dt><dd>Multi-Processing Module implementing an exclusively threaded web
+    server optimized for Novell NetWare</dd>
+<dt><a href="mpmt_os2.html">mpmt_os2</a></dt><dd>Hybrid multi-process, multi-threaded MPM for OS/2</dd>
+<dt><a href="prefork.html">prefork</a></dt><dd>Implements a non-threaded, pre-forking web server</dd>
+<dt><a href="mpm_winnt.html">mpm_winnt</a></dt><dd>This Multi-Processing Module is optimized for Windows
+NT.</dd>
+<dt><a href="worker.html">worker</a></dt><dd>Multi-Processing Module implementing a hybrid
+    multi-threaded multi-process web server</dd>
+</dl></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section"><h2><a id="other" name="other">Diğer Modüller</a></h2>
+<p class="letters"><a href="#A">&nbsp;A&nbsp;</a> | <a href="#C">&nbsp;C&nbsp;</a> | <a href="#D">&nbsp;D&nbsp;</a> | <a href="#E">&nbsp;E&nbsp;</a> | <a href="#F">&nbsp;F&nbsp;</a> | <a href="#H">&nbsp;H&nbsp;</a> | <a href="#I">&nbsp;I&nbsp;</a> | <a href="#L">&nbsp;L&nbsp;</a> | <a href="#M">&nbsp;M&nbsp;</a> | <a href="#N">&nbsp;N&nbsp;</a> | <a href="#P">&nbsp;P&nbsp;</a> | <a href="#R">&nbsp;R&nbsp;</a> | <a href="#S">&nbsp;S&nbsp;</a> | <a href="#U">&nbsp;U&nbsp;</a> | <a href="#V">&nbsp;V&nbsp;</a></p>
+<dl><dt><a href="mod_actions.html" id="A" name="A">mod_actions</a></dt><dd>This module provides for executing CGI scripts based on
+media type or request method.</dd>
+<dt><a href="mod_alias.html">mod_alias</a></dt><dd>Provides for mapping different parts of the host
+    filesystem in the document tree and for URL redirection</dd>
+<dt><a href="mod_asis.html">mod_asis</a></dt><dd>Sends files that contain their own
+HTTP headers</dd>
+<dt><a href="mod_auth_basic.html">mod_auth_basic</a></dt><dd>Basic authentication</dd>
+<dt><a href="mod_auth_digest.html">mod_auth_digest</a></dt><dd>User authentication using MD5
+    Digest Authentication.</dd>
+<dt><a href="mod_authn_alias.html">mod_authn_alias</a></dt><dd>Provides the ability to create extended authentication 
+    providers based on actual providers</dd>
+<dt><a href="mod_authn_anon.html">mod_authn_anon</a></dt><dd>Allows "anonymous" user access to authenticated
+    areas</dd>
+<dt><a href="mod_authn_dbd.html">mod_authn_dbd</a></dt><dd>User authentication using an SQL database</dd>
+<dt><a href="mod_authn_dbm.html">mod_authn_dbm</a></dt><dd>User authentication using DBM files</dd>
+<dt><a href="mod_authn_default.html">mod_authn_default</a></dt><dd>Authentication fallback module</dd>
+<dt><a href="mod_authn_file.html">mod_authn_file</a></dt><dd>User authentication using text files</dd>
+<dt><a href="mod_authnz_ldap.html">mod_authnz_ldap</a></dt><dd>Allows an LDAP directory to be used to store the database
+for HTTP Basic authentication.</dd>
+<dt><a href="mod_authz_dbm.html">mod_authz_dbm</a></dt><dd>Group authorization using DBM files</dd>
+<dt><a href="mod_authz_default.html">mod_authz_default</a></dt><dd>Authorization fallback module</dd>
+<dt><a href="mod_authz_groupfile.html">mod_authz_groupfile</a></dt><dd>Group authorization using plaintext files</dd>
+<dt><a href="mod_authz_host.html">mod_authz_host</a></dt><dd>Group authorizations based on host (name or IP
+address)</dd>
+<dt><a href="mod_authz_owner.html">mod_authz_owner</a></dt><dd>Authorization based on file ownership</dd>
+<dt><a href="mod_authz_user.html">mod_authz_user</a></dt><dd>User Authorization</dd>
+<dt><a href="mod_autoindex.html">mod_autoindex</a></dt><dd>Generates directory indexes,
+    automatically, similar to the Unix <code>ls</code> command or the
+    Win32 <code>dir</code> shell command</dd>
+<dt><a href="mod_cache.html" id="C" name="C">mod_cache</a></dt><dd>Content cache keyed to URIs.</dd>
+<dt><a href="mod_cern_meta.html">mod_cern_meta</a></dt><dd>CERN httpd metafile semantics</dd>
+<dt><a href="mod_cgi.html">mod_cgi</a></dt><dd>Execution of CGI scripts</dd>
+<dt><a href="mod_cgid.html">mod_cgid</a></dt><dd>Execution of CGI scripts using an
+    external CGI daemon</dd>
+<dt><a href="mod_charset_lite.html">mod_charset_lite</a></dt><dd>Specify character set translation or recoding</dd>
+<dt><a href="mod_dav.html" id="D" name="D">mod_dav</a></dt><dd>Distributed Authoring and Versioning
+(<a href="http://www.webdav.org/">WebDAV</a>) functionality</dd>
+<dt><a href="mod_dav_fs.html">mod_dav_fs</a></dt><dd>filesystem provider for <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></dd>
+<dt><a href="mod_dav_lock.html">mod_dav_lock</a></dt><dd>generic locking module for <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></dd>
+<dt><a href="mod_dbd.html">mod_dbd</a></dt><dd>Manages SQL database connections</dd>
+<dt><a href="mod_deflate.html">mod_deflate</a></dt><dd>Compress content before it is delivered to the
+client</dd>
+<dt><a href="mod_dir.html">mod_dir</a></dt><dd>Provides for "trailing slash" redirects and
+    serving directory index files</dd>
+<dt><a href="mod_disk_cache.html">mod_disk_cache</a></dt><dd>Content cache storage manager keyed to URIs</dd>
+<dt><a href="mod_dumpio.html">mod_dumpio</a></dt><dd>Dumps all I/O to error log as desired.</dd>
+<dt><a href="mod_echo.html" id="E" name="E">mod_echo</a></dt><dd>A simple echo server to illustrate protocol 
+modules</dd>
+<dt><a href="mod_env.html">mod_env</a></dt><dd>Modifies the environment which is passed to CGI scripts and
+SSI pages</dd>
+<dt><a href="mod_example.html">mod_example</a></dt><dd>Illustrates the Apache module API</dd>
+<dt><a href="mod_expires.html">mod_expires</a></dt><dd>Generation of <code>Expires</code> and
+<code>Cache-Control</code> HTTP headers according to user-specified
+criteria</dd>
+<dt><a href="mod_ext_filter.html">mod_ext_filter</a></dt><dd>Pass the response body through an external program before
+delivery to the client</dd>
+<dt><a href="mod_file_cache.html" id="F" name="F">mod_file_cache</a></dt><dd>Caches a static list of files in memory</dd>
+<dt><a href="mod_filter.html">mod_filter</a></dt><dd>Context-sensitive smart filter configuration module</dd>
+<dt><a href="mod_headers.html" id="H" name="H">mod_headers</a></dt><dd>Customization of HTTP request and response
+headers</dd>
+<dt><a href="mod_ident.html" id="I" name="I">mod_ident</a></dt><dd>RFC 1413 ident lookups</dd>
+<dt><a href="mod_imagemap.html">mod_imagemap</a></dt><dd>Server-side imagemap processing</dd>
+<dt><a href="mod_include.html">mod_include</a></dt><dd>Server-parsed html documents (Server Side Includes)</dd>
+<dt><a href="mod_info.html">mod_info</a></dt><dd>Provides a comprehensive overview of the server
+configuration</dd>
+<dt><a href="mod_isapi.html">mod_isapi</a></dt><dd>ISAPI Extensions within Apache for Windows</dd>
+<dt><a href="mod_ldap.html" id="L" name="L">mod_ldap</a></dt><dd>LDAP connection pooling and result caching services for use
+by other LDAP modules</dd>
+<dt><a href="mod_log_config.html">mod_log_config</a></dt><dd>Logging of the requests made to the server</dd>
+<dt><a href="mod_log_forensic.html">mod_log_forensic</a></dt><dd>Forensic Logging of the requests made to the server</dd>
+<dt><a href="mod_logio.html">mod_logio</a></dt><dd>Logging of input and output bytes per request</dd>
+<dt><a href="mod_mem_cache.html" id="M" name="M">mod_mem_cache</a></dt><dd>Content cache keyed to URIs</dd>
+<dt><a href="mod_mime.html">mod_mime</a></dt><dd>Associates the requested filename's extensions
+    with the file's behavior (handlers and filters)
+    and content (mime-type, language, character set and
+    encoding)</dd>
+<dt><a href="mod_mime_magic.html">mod_mime_magic</a></dt><dd>Determines the MIME type of a file
+    by looking at a few bytes of its contents</dd>
+<dt><a href="mod_negotiation.html" id="N" name="N">mod_negotiation</a></dt><dd>Provides for <a href="../content-negotiation.html">content negotiation</a></dd>
+<dt><a href="mod_nw_ssl.html">mod_nw_ssl</a></dt><dd>Enable SSL encryption for NetWare</dd>
+<dt><a href="mod_proxy.html" id="P" name="P">mod_proxy</a></dt><dd>HTTP/1.1 proxy/gateway server</dd>
+<dt><a href="mod_proxy_ajp.html">mod_proxy_ajp</a></dt><dd>AJP support module for
+<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
+<dt><a href="mod_proxy_balancer.html">mod_proxy_balancer</a></dt><dd><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension for load balancing </dd>
+<dt><a href="mod_proxy_connect.html">mod_proxy_connect</a></dt><dd><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension for
+<code>CONNECT</code> request handling</dd>
+<dt><a href="mod_proxy_ftp.html">mod_proxy_ftp</a></dt><dd>FTP support module for
+<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
+<dt><a href="mod_proxy_http.html">mod_proxy_http</a></dt><dd>HTTP support module for
+<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
+<dt><a href="mod_rewrite.html" id="R" name="R">mod_rewrite</a></dt><dd>Provides a rule-based rewriting engine to rewrite requested
+URLs on the fly</dd>
+<dt><a href="mod_setenvif.html" id="S" name="S">mod_setenvif</a></dt><dd>Allows the setting of environment variables based
+on characteristics of the request</dd>
+<dt><a href="mod_so.html">mod_so</a></dt><dd>Loading of executable code and
+modules into the server at start-up or restart time</dd>
+<dt><a href="mod_speling.html">mod_speling</a></dt><dd>Attempts to correct mistaken URLs that
+users might have entered by ignoring capitalization and by
+allowing up to one misspelling</dd>
+<dt><a href="mod_ssl.html">mod_ssl</a></dt><dd>Strong cryptography using the Secure Sockets
+Layer (SSL) and Transport Layer Security (TLS) protocols</dd>
+<dt><a href="mod_status.html">mod_status</a></dt><dd>Provides information on server activity and
+performance</dd>
+<dt><a href="mod_substitute.html">mod_substitute</a></dt><dd>Perform search and replace operations on response bodies</dd>
+<dt><a href="mod_suexec.html">mod_suexec</a></dt><dd>Allows CGI scripts to run as a specified user
+and Group</dd>
+<dt><a href="mod_unique_id.html" id="U" name="U">mod_unique_id</a></dt><dd>Provides an environment variable with a unique
+identifier for each request</dd>
+<dt><a href="mod_userdir.html">mod_userdir</a></dt><dd>User-specific directories</dd>
+<dt><a href="mod_usertrack.html">mod_usertrack</a></dt><dd>
+<em>Clickstream</em> logging of user activity on a site
+</dd>
+<dt><a href="mod_version.html" id="V" name="V">mod_version</a></dt><dd>Version dependent configuration</dd>
+<dt><a href="mod_vhost_alias.html">mod_vhost_alias</a></dt><dd>Provides for dynamically configured mass virtual
+hosting</dd>
+</dl></div></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="../de/mod/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/mod/" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="../ja/mod/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_actions.html b/docs/manual/mod/mod_actions.html
index 8b947013..05ae1049 100644
--- a/docs/manual/mod/mod_actions.html
+++ b/docs/manual/mod/mod_actions.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_actions.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -6,9 +8,9 @@ URI: mod_actions.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_actions.html.ja.euc-jp
+URI: mod_actions.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_actions.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_actions.html.de b/docs/manual/mod/mod_actions.html.de
index c2e50651..0d358a1c 100644
--- a/docs/manual/mod/mod_actions.html.de
+++ b/docs/manual/mod/mod_actions.html.de
@@ -28,7 +28,7 @@
 </div>
 <table class="module"><tr><th><a href="module-dict.html#Description">Beschreibung:</a></th><td>Dieses Modul ermöglicht die Ausführung von CGI-Skripten
   in Abhängigkeit von Medientypen und Anfragemethoden.</td></tr>
-<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Basis</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">Modulbezeichner:</a></th><td>actions_module</td></tr>
 <tr><th><a href="module-dict.html#SourceFile">Quelltext-Datei:</a></th><td>mod_actions.c</td></tr></table>
 <h3>Zusammenfassung</h3>
@@ -60,7 +60,7 @@
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Action <var>Aktionsart</var> <var>CGI-Skript</var> [virtual]</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Kontext:</a></th><td>Serverkonfiguration, Virtual Host, Verzeichnis, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Override">AllowOverride:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Basis</td></tr>
 <tr><th><a href="directive-dict.html#Module">Modul:</a></th><td>mod_actions</td></tr>
 <tr><th><a href="directive-dict.html#Compatibility">Kompatibilität:</a></th><td>Der Schalter <code>virtual</code> und die Übergabe des 
   Handlers wurden in Apache 2.1 eingeführt.</td></tr>
@@ -118,7 +118,7 @@
   Anfragemethode.</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Script <var>Methode</var> <var>CGI-Skript</var></code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Kontext:</a></th><td>Serverkonfiguration, Virtual Host, Verzeichnis</td></tr>
-<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Basis</td></tr>
 <tr><th><a href="directive-dict.html#Module">Modul:</a></th><td>mod_actions</td></tr>
 </table>
   <p>Die Direktive fügt eine Aktion hinzu, welche das
@@ -161,6 +161,6 @@
 <a href="../ja/mod/mod_actions.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_actions.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_actions.html.en b/docs/manual/mod/mod_actions.html.en
index 51363cf2..c878b415 100644
--- a/docs/manual/mod/mod_actions.html.en
+++ b/docs/manual/mod/mod_actions.html.en
@@ -159,6 +159,6 @@ method.</td></tr>
 <a href="../ja/mod/mod_actions.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_actions.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_actions.html.ja.euc-jp b/docs/manual/mod/mod_actions.html.ja.euc-jp
deleted file mode 100644
index 2a7f23df..00000000
--- a/docs/manual/mod/mod_actions.html.ja.euc-jp
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_actions - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_actions</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../de/mod/mod_actions.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="../en/mod/mod_actions.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_actions.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_actions.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥á¥Ç¥£¥¢¥¿¥¤¥×¤ä¥ê¥¯¥¨¥¹¥È¥á¥½¥Ã¥É¤Ë±þ¤¸¤Æ
-CGI ¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤¹¤ëµ¡Ç½¤òÄó¶¡</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>actions_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_actions.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ë¤ÏÆó¤Ä¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬¤¢¤ê¤Þ¤¹¡£<code class="directive"><a href="#action">Action</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÆÃÄê¤Î MIME ¥¿¥¤¥×¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿¾ì¹ç¤Ë
-    CGI ¥¹¥¯¥ê¥×¥È¤¬¼Â¹Ô¤µ¤ì¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£<code class="directive"><a href="#script">Script</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥ê¥¯¥¨¥¹¥È¤ÇÆÃÄê¤Î¥á¥½¥Ã¥É¤¬»ÈÍѤµ¤ì¤¿¤È¤­¤Ë CGI
-    ¥¹¥¯¥ê¥×¥È¤¬¼Â¹Ô¤µ¤ì¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
-    ¤³¤ì¤Ï¥Õ¥¡¥¤¥ë¤ò½èÍý¤¹¤ë¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤ò¤º¤Ã¤È´Êñ¤Ë¤·¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#action">Action</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#script">Script</a></li>
-</ul>
-<h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li>
-<li><a href="../howto/cgi.html">CGI ¤Ë¤è¤ëưŪ¥³¥ó¥Æ¥ó¥Ä</a></li>
-<li><a href="../handler.html">Apache ¤Î¥Ï¥ó¥É¥é¤Î»ÈÍÑ</a></li>
-</ul></div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Action" id="Action">Action</a> <a name="action" id="action">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ÆÃÄê¤Î¥Ï¥ó¥É¥é¤ä¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤ËÂФ·¤Æ CGI ¤ò¼Â¹Ô¤¹¤ë¤è¤¦¤Ë
-ÀßÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Action <var>action-type</var> <var>cgi-script</var> [virtual]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_actions</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td><code>virtual</code> ½¤¾þ»Ò¤È¥Ï¥ó¥É¥éÅϤ·¤Ï
-Apache 2.1 ¤ÇƳÆþ¤µ¤ì¤Þ¤·¤¿</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <var>action-type</var>
-    ¤¬¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿¤È¤­¤Ë <var>cgi-script</var>
-    ¤¬¼Â¹Ô¤µ¤ì¤ë¤È¤¤¤¦Æ°ºî¤òÄɲä·¤Þ¤¹¡£<var>cgi-script</var> ¤Ï
-    <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code> ¤ä
-    <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> ¤Ë¤è¤Ã¤Æ
-    CGI ¥¹¥¯¥ê¥×¥È¤ËÀßÄꤵ¤ì¤¿¥ê¥½¡¼¥¹¤Ø¤Î URL-path ¤Ç¤¹¡£
-    <var>Action-type</var> ¤Ë¤Ï
-    <a href="../handler.html">handler</a> ¤« MIME
-    ¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿¥É¥­¥å¥á¥ó¥È¤Î URL
-    ¤È¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¤Ïɸ½à CGI ´Ä¶­ÊÑ¿ô <code>PATH_INFO</code> ¤È
-    <code>PATH_TRANSLATED</code> ¤ò»È¤Ã¤ÆÅÁ¤¨¤é¤ì¤Þ¤¹¡£
-    ÆÃÄê¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ»ÈÍѤµ¤ì¤ë¥Ï¥ó¥É¥é¤Ø¤Ï¡¢
-    <code>REDIRECT_HANDLER</code> ÊÑ¿ô¤ò»È¤Ã¤ÆÅϤ»¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      # Requests for files of a particular MIME content type:<br />
-      Action image/gif /cgi-bin/images.cgi<br />
-      <br />
-      # Files of a particular file extension<br />
-      AddHandler my-file-type .xyz<br />
-      Action my-file-type /cgi-bin/program.cgi<br />
-    </code></p></div>
-
-    <p>ºÇ½é¤ÎÎã¤Ç¤Ï¡¢MIME ¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤¬ <code>image/gif</code>
-    ¤Î¥Õ¥¡¥¤¥ë¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ï¡¢»ØÄꤷ¤¿¥¹¥¯¥ê¥×¥È
-    <code>/cgi-bin/images.cgi</code> ¤Ç½èÍý¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>2 ÈÖÌܤÎÎã¤Ç¤Ï¡¢³ÈÄ¥»Ò¤¬ <code>.xyz</code> 
-    ¤Î¥Õ¥¡¥¤¥ë¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ï¡¢»ØÄꤷ¤¿¥¹¥¯¥ê¥×¥È
-    <code>/cgi-bin/program.cgi</code> ¤Ç½èÍý¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>¥ª¥×¥·¥ç¥ó¤Î <code>virtual</code> ½¤¾þ»Ò¤ò»ÈÍѤ¹¤ë¤È¡¢
-    ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤¬¼ÂºÝ¤Ë¸ºß¤¹¤ë¤«¤É¤¦¤«¤ò¸¡ºº¤·¤Ê¤¤¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£
-    ¤³¤ì¤ÏÎ㤨¤Ð¡¢<code class="directive">Action</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¥Ð¡¼¥Á¥ã¥ë¤Ê
-    Location ¤Ë»ÈÍѤ·¤¿¤¤¡¢¤È¤¤¤Ã¤¿¾ì¹ç¤ËÊØÍø¤Ç¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      &lt;Location /news&gt;<br />
-      <span class="indent">
-        SetHandler news-handler<br />
-        Action news-handler /cgi-bin/news.cgi virtual<br />
-      </span>
-      &lt;/Location&gt;
-    </code></p></div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Script" id="Script">Script</a> <a name="script" id="script">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ÆÃÄê¤Î¥ê¥¯¥¨¥¹¥È¥á¥½¥Ã¥É¤ËÂФ·¤Æ CGI ¥¹¥¯¥ê¥×¥È¤ò
-¼Â¹Ô¤¹¤ë¤è¤¦¤ËÀßÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Script <var>method</var> <var>cgi-script</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_actions</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <var>method</var>
-    ¤È¤¤¤¦¥á¥½¥Ã¥É¤ò»È¤Ã¤Æ¥ê¥¯¥¨¥¹¥È¤¬¹Ô¤Ê¤ï¤ì¤¿¤È¤­¤Ë
-    <var>cgi-script</var> ¤ò¼Â¹Ô¤¹¤ë¤È¤¤¤¦Æ°ºî¤òÄɲä·¤Þ¤¹¡£
-    <var>cgi-script</var> ¤Ï
-    <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code> ¤ä
-    <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> ¤Ë¤è¤Ã¤Æ
-    CGI ¥¹¥¯¥ê¥×¥È¤ËÀßÄꤵ¤ì¤¿¥ê¥½¡¼¥¹¤Ø¤Î URL-path ¤Ç¤¹¡£
-    ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿¥É¥­¥å¥á¥ó¥È¤Î URL ¤È¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¤Ïɸ½à CGI
-    ´Ä¶­ÊÑ¿ô <code>PATH_INFO</code> ¤È <code>PATH_TRANSLATED</code>
-    ¤ò»È¤Ã¤ÆÅÁ¤¨¤é¤ì¤Þ¤¹¡£</p>
-
-    <div class="note">
-      Ǥ°Õ¤Î¥á¥½¥Ã¥É̾¤ò»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      <strong>¥á¥½¥Ã¥É̾¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Þ¤¹</strong>¡£¤Ç¤¹¤«¤é¡¢
-      <code>Script PUT</code> ¤È <code>Script put</code>
-      ¤Ï¤Þ¤Ã¤¿¤¯°ã¤Ã¤¿¸ú²Ì¤Ë¤Ê¤ê¤Þ¤¹¡£
-    </div>
-
-    <p><code class="directive">Script</code> ¥³¥Þ¥ó¥É¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤ò
-    Äɲ乤ë¤À¤±¤Ç¤¢¤ë¤³¤È¤Ë
-    Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¤â¤· CGI ¥¹¥¯¥ê¥×¥È¤¬¸Æ¤Ð¤ì¤¿¤ê¡¢¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿
-    ¥á¥½¥Ã¥É¤òÆâÉô¤Ç°·¤¦¤³¤È¤Î¤Ç¤­¤ë¾¤Î¥ê¥½¡¼¥¹¤¬¤¢¤ì¤Ð¡¢¤½¤ì¤¬¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£
-    <code>GET</code> ¥á¥½¥Ã¥É¤Î <code class="directive">Script</code> ¤ÏÌä¹ç¤»
-    °ú¿ô¤¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ß
-    (<em>¤¿¤È¤¨¤Ð</em>¡¢foo.html?hi) ¸Æ¤Ð¤ì¤ë¤È¤¤¤¦¤³¤È¤Ë¤âÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤ÏÄ̾ïÄ̤ê½èÍý¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      # For &lt;ISINDEX&gt;-style searching<br />
-      Script GET /cgi-bin/search<br />
-      <br />
-      # A CGI PUT handler<br />
-      Script PUT /~bob/put.cgi<br />
-    </code></p></div>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../de/mod/mod_actions.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="../en/mod/mod_actions.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_actions.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_actions.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_actions.html.ja.utf8 b/docs/manual/mod/mod_actions.html.ja.utf8
new file mode 100644
index 00000000..3d0511d8
--- /dev/null
+++ b/docs/manual/mod/mod_actions.html.ja.utf8
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_actions - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_actions</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../de/mod/mod_actions.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/mod_actions.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_actions.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_actions.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>メディアタイプやリクエストメソッド�応��
+CGI スクリプトを実行�る機能を�供</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>actions_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_actions.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール��二��ディレクティブ��り��。<code class="directive"><a href="#action">Action</a></code>
+    ディレクティブ�特定� <a class="glossarylink" href="../glossary.html#mime-type" title="用語集を�照">MIME タイプ</a>
+    �ファイルをリクエスト�れ�場��
+    CGI スクリプト�実行�れるよ�����。<code class="directive"><a href="#script">Script</a></code>
+    ディレクティブ�リクエスト�特定�メソッド�使用�れ���� CGI
+    スクリプト�実行�れるよ�����。
+    �れ�ファイルを処��るスクリプト�実行を���簡�����。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#action">Action</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#script">Script</a></li>
+</ul>
+<h3>�照</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li>
+<li><a href="../howto/cgi.html">CGI �よる動的コンテンツ</a></li>
+<li><a href="../handler.html">Apache ��ンドラ�使用</a></li>
+</ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Action" id="Action">Action</a> <a name="action" id="action">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>特定��ンドラやコンテントタイプ�対�� CGI を実行�るよ��
+設定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Action <var>action-type</var> <var>cgi-script</var> [virtual]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_actions</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td><code>virtual</code> 修飾���ンドラ渡��
+Apache 2.1 �導入�れ���</td></tr>
+</table>
+    <p>��ディレクティブ� <var>action-type</var>
+    �リクエスト�れ���� <var>cgi-script</var>
+    �実行�れる���動作を追加���。<var>cgi-script</var> �
+    <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code> ã‚„
+    <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> �よ��
+    CGI スクリプト�設定�れ�リソース�� URL-path ��。
+    <var>Action-type</var> ��
+    <a href="../handler.html">handler</a> � <a class="glossarylink" href="../glossary.html#mime-type" title="用語集を�照">MIME
+    コンテントタイプ</a>を指定����。リクエスト�れ�ドキュメント� URL
+    �ファイル�パス�標準 CGI 環境変数 <code>PATH_INFO</code> �
+    <code>PATH_TRANSLATED</code> を使����られ��。
+    特定�リクエスト�対��使用�れる�ンドラ���
+    <code>REDIRECT_HANDLER</code> 変数を使��渡���。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      # Requests for files of a particular MIME content type:<br />
+      Action image/gif /cgi-bin/images.cgi<br />
+      <br />
+      # Files of a particular file extension<br />
+      AddHandler my-file-type .xyz<br />
+      Action my-file-type /cgi-bin/program.cgi<br />
+    </code></p></div>
+
+    <p>最��例���MIME コンテントタイプ� <code>image/gif</code>
+    �ファイル��リクエスト��指定��スクリプト
+    <code>/cgi-bin/images.cgi</code> �処��れ��。</p>
+
+    <p>2 番目�例���拡張�� <code>.xyz</code> 
+    �ファイル��リクエスト��指定��スクリプト
+    <code>/cgi-bin/program.cgi</code> �処��れ��。</p>
+
+    <p>オプション� <code>virtual</code> 修飾�を使用�る��
+    リクエスト�れ�ファイル�実際�存在�る����を検査���よ������。
+    �れ�例���<code class="directive">Action</code> ディレクティブを�ー�ャル�
+    Location �使用��������場��便利��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      &lt;Location /news&gt;<br />
+      <span class="indent">
+        SetHandler news-handler<br />
+        Action news-handler /cgi-bin/news.cgi virtual<br />
+      </span>
+      &lt;/Location&gt;
+    </code></p></div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Script" id="Script">Script</a> <a name="script" id="script">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>特定�リクエストメソッド�対�� CGI スクリプトを
+実行�るよ��設定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Script <var>method</var> <var>cgi-script</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_actions</td></tr>
+</table>
+    <p>��ディレクティブ� <var>method</var>
+    ���メソッドを使��リクエスト�行��れ����
+    <var>cgi-script</var> を実行�る���動作を追加���。
+    <var>cgi-script</var> �
+    <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code> ã‚„
+    <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> �よ��
+    CGI スクリプト�設定�れ�リソース�� URL-path ��。
+    リクエスト�れ�ドキュメント� URL �ファイル�パス�標準 CGI
+    環境変数 <code>PATH_INFO</code> � <code>PATH_TRANSLATED</code>
+    を使����られ��。</p>
+
+    <div class="note">
+      任��メソッド�を使用�る�������。
+      <strong>メソッド��大文字�文字を区別���</strong>。���ら�
+      <code>Script PUT</code> � <code>Script put</code>
+      ��������効果��り��。
+    </div>
+
+    <p><code class="directive">Script</code> コマンド�デフォルト�動作を
+    追加�る����る���
+    注�������。も� CGI スクリプト�呼�れ�り�リクエスト�れ�
+    メソッドを内部�扱������る他�リソース��れ���れ�行��れ��。
+    <code>GET</code> メソッド� <code class="directive">Script</code> ����
+    引数��る場����
+    (<em>����</em>�foo.html?hi) 呼�れる������も注�������。
+    �����場���リクエスト�通常通り処��れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      # For &lt;ISINDEX&gt;-style searching<br />
+      Script GET /cgi-bin/search<br />
+      <br />
+      # A CGI PUT handler<br />
+      Script PUT /~bob/put.cgi<br />
+    </code></p></div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../de/mod/mod_actions.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/mod_actions.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_actions.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_actions.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_actions.html.ko.euc-kr b/docs/manual/mod/mod_actions.html.ko.euc-kr
index 3c510ce3..012faa65 100644
--- a/docs/manual/mod/mod_actions.html.ko.euc-kr
+++ b/docs/manual/mod/mod_actions.html.ko.euc-kr
@@ -161,6 +161,6 @@
 <a href="../ja/mod/mod_actions.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_actions.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_alias.html b/docs/manual/mod/mod_alias.html
index cbf64ded..16e7a5ed 100644
--- a/docs/manual/mod/mod_alias.html
+++ b/docs/manual/mod/mod_alias.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_alias.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_alias.html.ja.euc-jp
+URI: mod_alias.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_alias.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en
index 4ec0fd65..17933914 100644
--- a/docs/manual/mod/mod_alias.html.en
+++ b/docs/manual/mod/mod_alias.html.en
@@ -434,6 +434,6 @@ and designates the target as a CGI script</td></tr>
 <a href="../ja/mod/mod_alias.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_alias.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_alias.html.ja.euc-jp b/docs/manual/mod/mod_alias.html.ja.euc-jp
deleted file mode 100644
index cf2175d7..00000000
--- a/docs/manual/mod/mod_alias.html.ja.euc-jp
+++ /dev/null
@@ -1,387 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_alias - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_alias</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_alias.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_alias.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_alias.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥Û¥¹¥È¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Î¤¤¤í¤¤¤í¤Ê°ã¤¦¾ì½ê¤ò
-    ¥É¥­¥å¥á¥ó¥È¥Ä¥ê¡¼¤Ë¥Þ¥Ã¥×¤¹¤ëµ¡Ç½¤È¡¢
-    URL ¤Î¥ê¥À¥¤¥ì¥¯¥È¤ò¹Ô¤Ê¤¦µ¡Ç½¤òÄ󶡤¹¤ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>alias_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_alias.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥µ¡¼¥Ð¤Ë¥ê¥¯¥¨¥¹¥È¤¬ÅþÃ夷¤¿¤È¤­¤Ë
-    URL ¤ÎÁàºî¤äÀ©¸æ¤ò¤¹¤ë¤³¤È¤ò²Äǽ¤Ë¤·¤Þ¤¹¡£<code class="directive"><a href="#alias">Alias</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È <code class="directive"><a href="#scriptalias">ScriptAlias</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    URL ¤È¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Ñ¥¹¤ò¥Þ¥Ã¥×¤¹¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£¤³¤ì¤Ï
-    <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
-    ¤Î²¼¤Ë¤Ê¤¤¥É¥­¥å¥á¥ó¥È¤ò¥¦¥§¥Ö¤Î¥É¥­¥å¥á¥ó¥È¥Ä¥ê¡¼¤Î°ìÉô¤È¤·¤Æ
-    Á÷¤é¤ì¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£<code class="directive"><a href="#scriptalias">ScriptAlias</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤Ï¥Þ¥Ã¥×Àè¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬ CGI
-    ¥¹¥¯¥ê¥×¥È¤Î¤ß¤Ç¤¢¤ë¤³¤È¤ò¼¨¤¹¤È¤¤¤¦Äɲäθú²Ì¤¬¤¢¤ê¤Þ¤¹¡£
-    </p>
-
-    <p><code class="directive"><a href="#redirect">Redirect</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¥¯¥é¥¤¥¢¥ó¥È¤Ë°ã¤Ã¤¿
-    URL ¤Ë¿·¤·¤¤¥ê¥¯¥¨¥¹¥È¤òÁ÷¤ë¤è¤¦¤Ë»Ø¼¨¤·¤Þ¤¹¡£¤³¤ì¤Ï¡¢
-    ¥ê¥½¡¼¥¹¤¬¿·¤·¤¤¾ì½ê¤Ë°ÜÆ°¤·¤¿¤È¤­¤Ë¤è¤¯»ÈÍѤµ¤ì¤Þ¤¹¡£</p>
-
-    <p><code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> ¤Ï´Êñ¤Ê URL Áàºî¸þ¤±¤ËÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¤è¤êÊ£»¨¤ÊÁàºî¡¢¥¯¥¨¥ê¡¼¥¹¥È¥ê¥ó¥°¤ÎÁàºî¤Ë¤Ï¡¢<code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
-    ¤ÇÄ󶡤µ¤ì¤ë¥Ä¡¼¥ë¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#alias">Alias</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#aliasmatch">AliasMatch</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#redirect">Redirect</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#redirectmatch">RedirectMatch</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#redirectpermanent">RedirectPermanent</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#redirecttemp">RedirectTemp</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#scriptalias">ScriptAlias</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#scriptaliasmatch">ScriptAliasMatch</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#order">½èÍý¤Î½çÈÖ</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code></li>
-<li><a href="../urlmapping.html">URL ¤«¤é¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Î°ÌÃ֤ؤΥޥåԥó¥°</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="order" id="order">½èÍý¤Î½çÈÖ</a></h2>
-
-<p>ÍÍ¡¹¤Ê¥³¥ó¥Æ¥­¥¹¥ÈÃæ¤Ç¤Î Alias ¤ä Redirect ¤Ï¾¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-Ʊ¤¸¤è¤¦¤Ëɸ½à¤Î <a href="../sections.html#mergin">¥Þ¡¼¥¸µ¬Â§</a> ¤Ë
-½¾¤Ã¤Æ½èÍý¤µ¤ì¤Þ¤¹¡£¤¿¤À¤·¡¢(Î㤨¤Ð <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤ÎÃæ¤Î¤è¤¦¤Ë) Ê£¿ô¤Î Alias ¤ä Redirect ¤¬
-Ʊ¤¸¥³¥ó¥Æ¥­¥¹¥ÈÃæ¤Ë¸½¤ì¤¿¾ì¹ç¤Ï·è¤Þ¤Ã¤¿½çÈ֤ǽèÍý¤µ¤ì¤Þ¤¹¡£</p>
-
-<p>¤Þ¤º¡¢Alias ¤ÎÁ°¤Ë¤¹¤Ù¤Æ¤Î Redirect ¤¬½èÍý¤µ¤ì¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢<code class="directive"><a href="#redirect">Redirect</a></code> ¤« <code class="directive"><a href="#redirectmatch">RedirectMatch</a></code> ¤Ë¥Þ¥Ã¥Á¤¹¤ë¥ê¥¯¥¨¥¹¥È¤Ë¤Ï
-Alias ¤Ï·è¤·¤ÆŬÍѤµ¤ì¤Þ¤»¤ó¡£¼¡¤Ë¡¢Alias ¤È Redirect ¤¬ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Î
-½çÈÖ¤ËŬÍѤµ¤ì¡¢ºÇ½é¤Ë¥Þ¥Ã¥Á¤·¤¿¤â¤Î¤¬Í¥À褵¤ì¤Þ¤¹¡£</p>
-
-<p>¤Ç¤¹¤«¤é¡¢Æó¤Ä°Ê¾å¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Æ±¤¸¥Ñ¥¹¤ËŬÍѤµ¤ì¤ë¤È¤­¤Ï¡¢
-¤¹¤Ù¤Æ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¸ú²Ì¤òÆÀ¤ë¤¿¤á¤Ë¤Ï¤è¤ê¾Ü¤·¤¤¥Ñ¥¹¤òÀè¤Ë½ñ¤¯
-ɬÍפ¬¤¢¤ê¤Þ¤¹¡£Î㤨¤Ð¡¢¼¡¤ÎÀßÄê¤Ï´üÂÔÄ̤ê¤ÎÆ°ºî¤ò¤·¤Þ¤¹:</p>
-
-<div class="example"><p><code>
-Alias /foo/bar /baz<br />
-Alias /foo /gaq
-</code></p></div>
-
-<p>¤·¤«¤·¡¢¾åµ­¤ÎÆó¤Ä¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î½çÈÖ¤¬µÕ¤Ë¤Ê¤ë¤È¡¢
-<code>/foo</code> <code class="directive"><a href="#alias">Alias</a></code> ¤¬
-¾ï¤Ë <code>/foo/bar</code> <code class="directive"><a href="#alias">Alias</a></code> ¤è¤êÀè¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¤Î¤Ç¡¢¸å¼Ô¤Ï
-·è¤·¤ÆŬÍѤµ¤ì¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Alias" id="Alias">Alias</a> <a name="alias" id="alias">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>URL ¤ò¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î°ÌÃ֤˥ޥåפ¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Alias <var>URL-path</var>
-<var>file-path</var>|<var>directory-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_alias</td></tr>
-</table>
-    <p><code class="directive">Alias</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥É¥­¥å¥á¥ó¥È¤ò
-    ¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î
-    <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
-    °Ê³°¤Î¾ì½ê¤ËÊݴɤ¹¤ë¤³¤È¤ò²Äǽ¤Ë¤·¤Þ¤¹¡£
-    URL ¤Î (% ¤¬Éü¹æ¤µ¤ì¤¿) ¥Ñ¥¹¤¬ <var>url-path</var> ¤Ç»Ï¤Þ¤ë¤â¤Î¤Ï
-    <var>directory-filename</var>
-    ¤Ç»Ï¤Þ¤ë¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤Ë¥Þ¥Ã¥×¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      Alias /image /ftp/pub/image
-    </code></p></div>
-
-    <p>http://myserver/image/foo.gif ¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ¡¢¥µ¡¼¥Ð¤Ï
-    ¥Õ¥¡¥¤¥ë /ftp/pub/image/foo.gif ¤òÊÖ¤·¤Þ¤¹¡£</p>
-
-    <p>¤â¤· <var>url-path</var> ¤ÎºÇ¸å¤Ë /
-    ¤ò½ñ¤¤¤¿¤Ê¤é¡¢¥µ¡¼¥Ð¤¬¥¨¥¤¥ê¥¢¥¹¤òŸ³«¤¹¤ë¤¿¤á¤Ë¤Ï¡¢ºÇ¸å¤Î /
-    ¤¬É¬Íפˤʤ뤳¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¤¹¤Ê¤ï¤Á¡¢<code>Alias /icons/
-     /usr/local/apache/icons/</code> ¤È¤¤¤¦¤â¤Î¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-    <code>/icons</code> ¤È¤¤¤¦ url ¤Ï¥¨¥¤¥ê¥¢¥¹¤µ¤ì¤Þ¤»¤ó¡£</p>
-
-    <p>¥¨¥¤¥ê¥¢¥¹¤Î<em>¹Ô¤­Àè</em>¤ò´Þ¤ó¤Ç¤¤¤ë <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
-    ¥»¥¯¥·¥ç¥ó¤òÄɲ乤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ¥¨¥¤¥ê¥¢¥¹¤ÎŸ³«¤Ï <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
-    ¥»¥¯¥·¥ç¥ó¤òÄ´¤Ù¤ëÁ°¤Ë¹Ô¤Ê¤ï¤ì¤Þ¤¹¤Î¤Ç¡¢
-    ¥¨¥¤¥ê¥¢¥¹¤Î¹Ô¤­Àè¤Î <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤Î¤ß
-    ¸ú²Ì¤¬¤¢¤ê¤Þ¤¹¡£
-    (¤·¤«¤·¡¢<code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
-    ¥»¥¯¥·¥ç¥ó¤Ï¥¨¥¤¥ê¥¢¥¹¤¬½èÍý¤µ¤ì¤ëÁ°¤Ë¼Â¹Ô¤µ¤ì¤Þ¤¹¤Î¤Ç¡¢
-    ¤³¤Á¤é¤ÏŬÍѤµ¤ì¤Þ¤¹¡£)</p>
-
-    <p>Æäˡ¢<code>Alias</code> ¤ò
-    <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
-    ¥Ç¥£¥ì¥¯¥È¥ê¤Î³°Â¦¤ËÇÛÃÖ¤·¤¿¾ì¹ç¤Ï¡¢¹Ô¤­Àè¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÂФ¹¤ë
-    ¥¢¥¯¥»¥¹¸¢¸Â¤òÌÀ¼¨Åª¤ËÀ©¸Â¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤Ç¤·¤ç¤¦¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-        Alias /image /ftp/pub/image<br />
-        &lt;Directory /ftp/pub/image&gt;<br />
-        <span class="indent">
-            Order allow,deny<br />
-            Allow from all<br />
-        </span>
-        &lt;/Directory&gt;
-    </code></p></div>
-
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AliasMatch" id="AliasMatch">AliasMatch</a> <a name="aliasmatch" id="aliasmatch">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>Àµµ¬É½¸½¤ò»È¤Ã¤Æ URL ¤ò¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î°ÌÃ֤˥ޥåפ¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AliasMatch <var>regex</var>
-<var>file-path</var>|<var>directory-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_alias</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code class="directive"><a href="#alias">Alias</a></code>
-    ¤È¤Û¤È¤ó¤ÉƱ¤¸¤Ç¤¹¤¬¡¢´Êñ¤ÊÀèƬ¤«¤é¤Î¥Þ¥Ã¥Á¤ò¹Ô¤Ê¤¦¤Î¤Ç¤Ï¤Ê¤¯¡¢
-    ɸ½àÀµµ¬É½¸½¤òÍøÍѤ·¤Þ¤¹¡£¤³¤³¤Ç»ØÄꤵ¤ì¤¿Àµµ¬É½¸½¤È URL ¤Î¥Ñ¥¹
-    ¤¬¹ç¤¦¤«¤É¤¦¤«¤òÄ´¤Ù¡¢¹ç¤¦¾ì¹ç¤Ï³ç¸Ì¤Ç³ç¤é¤ì¤¿¥Þ¥Ã¥Á¤ò
-    Í¿¤¨¤é¤ì¤¿Ê¸»úÎó¤ÇÃÖ¤­´¹¤¨¡¢¤½¤ì¤ò¥Õ¥¡¥¤¥ë̾¤È¤·¤Æ»ÈÍѤ·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
-    <code>/icons</code> ¥Ç¥£¥ì¥¯¥È¥ê¤ò»È¤¦
-    ¤¿¤á¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤¬»ÈÍѤǤ­¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      AliasMatch ^/icons(.*) /usr/local/apache/icons$1
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Redirect" id="Redirect">Redirect</a> <a name="redirect" id="redirect">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¯¥é¥¤¥¢¥ó¥È¤¬°ã¤¦ URL ¤ò¼èÆÀ¤¹¤ë¤è¤¦¤Ë³°Éô¤Ø¤Î¥ê¥À¥¤¥ì¥¯¥È¤ò
-Á÷¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Redirect [<var>status</var>] <var>URL-path</var>
-<var>URL</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_alias</td></tr>
-</table>
-    <p>Redirect ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¸Å¤¤ URL ¤ò¿·¤·¤¤¤â¤Î¤Ø¥Þ¥Ã¥×¤·¤Þ¤¹¡£
-    ¿·¤·¤¤ URL ¤¬¥¯¥é¥¤¥¢¥ó¥È¤ËÊÖ¤µ¤ì¤Þ¤¹¡£¤½¤·¤Æ¡¢
-    ¥¯¥é¥¤¥¢¥ó¥È¤Ï¿·¤·¤¤¥¢¥É¥ì¥¹¤ò¤â¤¦°ì²ó¼èÆÀ¤·¤è¤¦¤È¤·¤Þ¤¹¡£
-    <var>URL-path</var> (% ¤¬Éü¹æ¤µ¤ì¤¿) ¥Ñ¥¹¤Ç»Ï¤Þ¤ë¥É¥­¥å¥á¥ó¥È¤Ø¤Î
-    ¤¹¤Ù¤Æ¤Î¥ê¥¯¥¨¥¹¥È¤Ï <var>URL</var> ¤Ç»Ï¤Þ¤ë¿·¤·¤¤
-    (% ¤¬Éä¹æ²½¤µ¤ì¤¿) URL ¤Ø¤Î¥ê¥À¥¤¥ì¥¯¥È¥¨¥é¡¼¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      Redirect /service http://foo2.bar.com/service
-    </code></p></div>
-
-    <p>¥¯¥é¥¤¥¢¥ó¥È¤Ï http://myserver/service/foo.txt
-    ¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ò¹Ô¤Ê¤¦¤È¡¢Âå¤ï¤ê¤Ë http://foo2.bar.com/service/foo.txt
-    ¤ò¥¢¥¯¥»¥¹¤¹¤ë¤è¤¦¤Ë¹ð¤²¤é¤ì¤Þ¤¹¡£</p>
-
-<div class="note"><h3>Ãí°Õ</h3><p>ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Î½çÈ֤˴ؤï¤é¤º¡¢
-Redirect ·Ï¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï Alias
-¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È ScriptAlias ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤è¤ê¤âÍ¥À褵¤ì¤Þ¤¹¡£
-¤Þ¤¿¡¢.htaccess ¥Õ¥¡¥¤¥ë¤ä <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
-¥»¥¯¥·¥ç¥ó¤ÎÃæ¤Ç»È¤ï¤ì¤Æ¤¤¤¿¤È¤·¤Æ¤â¡¢<var>URL-path</var>
-¤ÏÁêÂХѥ¹¤Ç¤Ï¤Ê¤¯¡¢´°Á´¤Ê URL ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p></div>
-
-    <p>¤â¤· <var>status</var> °ú¿ô¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢¥ê¥À¥¤¥ì¥¯¥È¤Ï
-    "temporary" (HTTP ¥¹¥Æ¡¼¥¿¥¹ 302) ¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤ì¤Ï¥¯¥é¥¤¥¢¥ó¥È¤Ë
-    ¥ê¥½¡¼¥¹¤¬°ì»þŪ¤Ë°ÜÆ°¤·¤¿¤È¤¤¤¦¤³¤È¤ò¼¨¤·¤Þ¤¹¡£<var>Status</var>
-    °ú¿ô¤Ï ¾¤Î HTTP ¤Î¥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É¤òÊÖ¤¹¤¿¤á¤Ë»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-    <dl>
-      <dt>permanent</dt>
-
-      <dd>±Êµ×¤Ë¥ê¥À¥¤¥ì¥¯¥È¤ò¤¹¤ë¥¹¥Æ¡¼¥¿¥¹ (301) ¤òÊÖ¤·¤Þ¤¹¡£
-      ¤³¤ì¤Ï¥ê¥½¡¼¥¹¤¬±Êµ×¤Ë°ÜÆ°¤·¤¿¤È¤¤¤¦¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£</dd>
-
-      <dt>temp</dt>
-
-      <dd>°ì»þŪ¤Ê¥ê¥À¥¤¥ì¥¯¥È¥¹¥Æ¡¼¥¿¥¹ (302)
-      ¤òÊÖ¤·¤Þ¤¹¡£¤³¤ì¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¹¡£</dd>
-
-      <dt>seeother</dt>
-
-      <dd>"See Other" ¥¹¥Æ¡¼¥¿¥¹ (303) ¤òÊÖ¤·¤Þ¤¹¡£
-      ¤³¤ì¤Ï¥ê¥½¡¼¥¹¤¬Â¾¤Î¤â¤Î¤ÇÃÖ¤­´¹¤¨¤é¤ì¤¿¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£</dd>
-
-    <dt>gone</dt>
-
-      <dd>"Gone" ¥¹¥Æ¡¼¥¿¥¹ (410) ¤òÊÖ¤·¤Þ¤¹¡£¤³¤ì¤Ï¥ê¥½¡¼¥¹¤¬±Êµ×¤Ë
-      ºï½ü¤µ¤ì¤¿¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£¤³¤Î¥¹¥Æ¡¼¥¿¥¹¤¬»ÈÍѤµ¤ì¤¿¾ì¹ç¡¢
-      <var>url</var> °ú¿ô¤Ï¾Êά¤µ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</dd>
-    </dl>
-
-    <p><var>Status</var> ¤ÎÃͤ˥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É¤ò¿ôÃͤÇÍ¿¤¨¤ë¤³¤È¤Ç
-    ¾¤Î¥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É¤âÊÖ¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥¹¥Æ¡¼¥¿¥¹¤¬ 300 ¤È 399
-    ¤Î´Ö¤Ë¤¢¤ë¾ì¹ç¡¢<var>url</var> °ú¿ô¤Ï¸ºß¤·¤Æ¤¤¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó¡£
-    ¤½¤Î¾¤Î¾ì¹ç¤Ï¾Êά¤µ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¤¿¤À¤·¡¢
-    ¥¹¥Æ¡¼¥¿¥¹¤Ï Apache ¤Î¥³¡¼¥É¤¬ÃΤäƤ¤¤ë¤â¤Î¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹
-    (http_protocol.c ¤Î´Ø¿ô <code>send_error_response</code>
-    ¤ò¸«¤Æ¤¯¤À¤µ¤¤)¡£</p>
-    <p>Îã:</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      Redirect permanent /one http://example.com/two<br />
-      Redirect 303 /three http://example.com/other
-    </code></p></div>
-
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="RedirectMatch" id="RedirectMatch">RedirectMatch</a> <a name="redirectmatch" id="redirectmatch">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¸½ºß¤Î URL ¤Ø¤ÎÀµµ¬É½¸½¤Î¥Þ¥Ã¥Á¤Ë¤è¤ê
-³°Éô¤Ø¤Î¥ê¥À¥¤¥ì¥¯¥È¤òÁ÷¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>RedirectMatch [<var>status</var>] <var>regex</var>
-<var>URL</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_alias</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code class="directive"><a href="#redirect">Redirect</a></code>
-    ¤È¤Û¤È¤ó¤ÉƱ¤¸¤Ç¤¹¤¬¡¢´Êñ¤ÊÀèƬ¤«¤é¤Î¥Þ¥Ã¥Á¤ò¹Ô¤Ê¤¦¤Î¤Ç¤Ï¤Ê¤¯¡¢
-    ɸ½àÀµµ¬É½¸½¤òÍøÍѤ·¤Þ¤¹¡£¤³¤³¤Ç»ØÄꤵ¤ì¤¿Àµµ¬É½¸½¤È URL-path
-    ¤¬¹ç¤¦¤«¤É¤¦¤«¤òÄ´¤Ù¡¢¹ç¤¦¾ì¹ç¤Ï³ç¸Ì¤Ç³ç¤é¤ì¤¿¥Þ¥Ã¥Á¤ò
-    Í¿¤¨¤é¤ì¤¿Ê¸»úÎó¤ÇÃÖ¤­´¹¤¨¡¢¤½¤ì¤ò¥Õ¥¡¥¤¥ë̾¤È¤·¤Æ»ÈÍѤ·¤Þ¤¹¡£
-    ¤¿¤È¤¨¤Ð¡¢¤¹¤Ù¤Æ¤Î GIF ¥Õ¥¡¥¤¥ë¤òÊÌ¥µ¡¼¥Ð¤ÎƱÍͤÊ̾Á°¤Î JPEG
-    ¥Õ¥¡¥¤¥ë¤Ë¥ê¥À¥¤¥ì¥¯¥È¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤ò»È¤¤¤Þ¤¹:
-    </p>
-
-    <div class="example"><p><code>
-      RedirectMatch (.*)\.gif$ http://www.anotherserver.com$1.jpg
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="RedirectPermanent" id="RedirectPermanent">RedirectPermanent</a> <a name="redirectpermanent" id="redirectpermanent">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¯¥é¥¤¥¢¥ó¥È¤¬°ã¤¦ URL ¤ò¼èÆÀ¤¹¤ë¤è¤¦¤Ë³°Éô¤Ø¤Î±Êµ×Ū¤Ê
-¥ê¥À¥¤¥ì¥¯¥È¤òÁ÷¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>RedirectPermanent <var>URL-path</var> <var>URL</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_alias</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥¯¥é¥¤¥¢¥ó¥È¤Ë Redirect ¤¬±Êµ×Ū¤Ê¤â¤Î
-    (¥¹¥Æ¡¼¥¿¥¹ 301) ¤Ç¤¢¤ë¤³¤È¤òÃΤ餻¤Þ¤¹¡£
-    <code>Redirect permanent</code> ¤È¤Þ¤Ã¤¿¤¯Æ±¤¸¤Ç¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="RedirectTemp" id="RedirectTemp">RedirectTemp</a> <a name="redirecttemp" id="redirecttemp">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¯¥é¥¤¥¢¥ó¥È¤¬°ã¤¦ URL ¤ò¼èÆÀ¤¹¤ë¤è¤¦¤Ë³°Éô¤Ø¤Î°ì»þŪ¤Ê
-¥ê¥À¥¤¥ì¥¯¥È¤òÁ÷¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>RedirectTemp <var>URL-path</var> <var>URL</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_alias</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥¯¥é¥¤¥¢¥ó¥È¤Ë Redirect
-    ¤¬°ì»þŪ¤Ê¤â¤Î¤Ç¤¢¤ë (¥¹¥Æ¡¼¥¿¥¹ 302) ¤³¤È¤òÃΤ餻¤Þ¤¹¡£
-    <code>Redirect temp</code> ¤È¤Þ¤Ã¤¿¤¯Æ±¤¸¤Ç¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ScriptAlias" id="ScriptAlias">ScriptAlias</a> <a name="scriptalias" id="scriptalias">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>URL ¤ò¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î°ÌÃ֤إޥåפ·¡¢¥Þ¥Ã¥×Àè¤ò
-CGI ¥¹¥¯¥ê¥×¥È¤Ë»ØÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ScriptAlias <var>URL-path</var>
-<var>file-path</var>|<var>directory-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_alias</td></tr>
-</table>
-    <p><code class="directive">ScriptAlias</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢Âоݥǥ£¥ì¥¯¥È¥ê¤Ë
-    <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> ¤Î cgi-script
-    ¥Ï¥ó¥É¥é¤Ç½èÍý¤µ¤ì¤ë CGI
-    ¥¹¥¯¥ê¥×¥È¤¬¤¢¤ë¤³¤È¤ò¼¨¤¹°Ê³°¤Ï
-    <code class="directive"><a href="#alias">Alias</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÈƱ¤¸¿¶¤ëÉñ¤¤¤ò¤·¤Þ¤¹¡£
-    URL ¤Î (% ¤¬Éü¹æ¤µ¤ì¤¿) ¥Ñ¥¹¤¬ <var>URL-path</var> ¤Ç»Ï¤Þ¤ë¤â¤Î¤Ï
-    ¥í¡¼¥«¥ë¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î
-    ¥Õ¥ë¥Ñ¥¹¤Ç¤¢¤ëÆóÈÖÌܤΰú¿ô¤Ë¥Þ¥Ã¥×¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      ScriptAlias /cgi-bin/ /web/cgi-bin/
-    </code></p></div>
-
-    <p><code>http://myserver/cgi-bin/foo</code>
-    ¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ¥µ¡¼¥Ð¤Ï¥¹¥¯¥ê¥×¥È
-    <code>/web/cgi-bin/foo</code> ¤ò¼Â¹Ô¤·¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ScriptAliasMatch" id="ScriptAliasMatch">ScriptAliasMatch</a> <a name="scriptaliasmatch" id="scriptaliasmatch">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>URL ¤òÀµµ¬É½¸½¤ò»È¤Ã¤Æ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î°ÌÃ֤إޥåפ·¡¢¥Þ¥Ã¥×Àè¤ò
-CGI ¥¹¥¯¥ê¥×¥È¤Ë»ØÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ScriptAliasMatch <var>regex</var>
-<var>file-path</var>|<var>directory-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_alias</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code class="directive"><a href="#scriptalias">ScriptAlias</a></code>
-    ¤È¤Û¤È¤ó¤ÉƱ¤¸¤Ç¤¹¤¬¡¢´Êñ¤ÊÀèƬ¤«¤é¤Î¥Þ¥Ã¥Á¤ò¹Ô¤Ê¤¦¤Î¤Ç¤Ï¤Ê¤¯¡¢
-    ɸ½àÀµµ¬É½¸½¤òÍøÍѤ·¤Þ¤¹¡£¤³¤³¤Ç»ØÄꤵ¤ì¤¿Àµµ¬É½¸½¤È URL-path
-    ¤¬¹ç¤¦¤«¤É¤¦¤«¤òÄ´¤Ù¡¢¹ç¤¦¾ì¹ç¤Ï³ç¸Ì¤Ç³ç¤é¤ì¤¿¥Þ¥Ã¥Á¤ò
-    Í¿¤¨¤é¤ì¤¿Ê¸»úÎó¤ÇÃÖ¤­´¹¤¨¡¢¤½¤ì¤ò¥Õ¥¡¥¤¥ë̾¤È¤·¤Æ»ÈÍѤ·¤Þ¤¹¡£
-    ¤¿¤È¤¨¤Ð¡¢É¸½à¤Î <code>/cgi-bin</code>
-    ¤ò»ÈÍѤ¹¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤ò»È¤¤¤Þ¤¹:
-    </p>
-
-    <div class="example"><p><code>
-      ScriptAliasMatch ^/cgi-bin(.*) /usr/local/apache/cgi-bin$1
-    </code></p></div>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_alias.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_alias.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_alias.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_alias.html.ja.utf8 b/docs/manual/mod/mod_alias.html.ja.utf8
new file mode 100644
index 00000000..7c3b9067
--- /dev/null
+++ b/docs/manual/mod/mod_alias.html.ja.utf8
@@ -0,0 +1,403 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_alias - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_alias</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_alias.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_alias.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_alias.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>ホストファイルシステム上��������場所を
+    ドキュメントツリー�マップ�る機能��
+    URL �リダイレクトを行��機能を�供�る</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>alias_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_alias.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール�ディレクティブ�サー��リクエスト�到������
+    URL ��作や制御を�る��を�能����。<code class="directive"><a href="#alias">Alias</a></code>
+    ディレクティブ� <code class="directive"><a href="#scriptalias">ScriptAlias</a></code>
+    ディレクティブ�
+    URL �ファイルシステム�パスをマップ�る���使用�れ��。�れ�
+    <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
+    �下���ドキュメントをウェブ�ドキュメントツリー�一部���
+    �られるよ�����。<code class="directive"><a href="#scriptalias">ScriptAlias</a></code>
+    ディレクティブ��マップ先�ディレクトリ� CGI
+    スクリプト����る��を示����追加�効果��り��。
+    </p>
+
+    <p><code class="directive"><a href="#redirect">Redirect</a></code> ディレクティブ�
+    クライアント����
+    URL �新��リクエストを�るよ��指示���。�れ��
+    リソース�新��場所�移動�����よ�使用�れ��。</p>
+
+    <p><code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> �簡�� URL �作���設計�れ����。
+    より複雑��作�クエリーストリング��作���<code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
+    ��供�れるツールを使用������。</p>
+
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#alias">Alias</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#aliasmatch">AliasMatch</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#redirect">Redirect</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#redirectmatch">RedirectMatch</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#redirectpermanent">RedirectPermanent</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#redirecttemp">RedirectTemp</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#scriptalias">ScriptAlias</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#scriptaliasmatch">ScriptAliasMatch</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#order">処��順番</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code></li>
+<li><a href="../urlmapping.html">URL �らファイルシステム上��置��マッピング</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="order" id="order">処��順番</a></h2>
+
+<p>様々�コンテキスト中�� Alias や Redirect �他�ディレクティブ�
+��よ��標準� <a href="../sections.html#mergin">マージ�則</a> �
+従��処��れ��。����(例�� <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> セクション�中�よ��) 複数� Alias や Redirect �
+��コンテキスト中��れ�場��決���順番�処��れ��。</p>
+
+<p>���Alias ������� Redirect �処��れ��。���ら�<code class="directive"><a href="#redirect">Redirect</a></code> � <code class="directive"><a href="#redirectmatch">RedirectMatch</a></code> �マッ��るリクエスト��
+Alias �決���用�れ��ん。次��Alias � Redirect �設定ファイル中�
+順番��用�れ�最��マッ���も��優先�れ��。</p>
+
+<p>���ら�二�以上�ディレクティブ���パス��用�れる����
+����ディレクティブ�効果を得る����より詳��パスを先�書�
+必���り��。例���次�設定�期待通り�動作を���:</p>
+
+<div class="example"><p><code>
+Alias /foo/bar /baz<br />
+Alias /foo /gaq
+</code></p></div>
+
+<p>����上記�二��ディレクティブ�順番�逆��る��
+<code>/foo</code> <code class="directive"><a href="#alias">Alias</a></code> �
+常� <code>/foo/bar</code> <code class="directive"><a href="#alias">Alias</a></code> より先�マッ�������後者�
+決���用�れる����り��ん。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Alias" id="Alias">Alias</a> <a name="alias" id="alias">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>URL をファイルシステム��置�マップ�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Alias <var>URL-path</var>
+<var>file-path</var>|<var>directory-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_alias</td></tr>
+</table>
+    <p><code class="directive">Alias</code> ディレクティブ�ドキュメントを
+    ローカルファイルシステム�
+    <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
+    以外�場所��管�る��を�能����。
+    URL � (% �復��れ�) パス� <var>url-path</var> �始�るも��
+    <var>directory-filename</var>
+    �始�るローカルファイル�マップ�れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      Alias /image /ftp/pub/image
+    </code></p></div>
+
+    <p>http://myserver/image/foo.gif ��リクエスト�対���サー��
+    ファイル /ftp/pub/image/foo.gif を返���。完全�パスセグメント�
+    一致��時����������上�例� http://myserver/imagefoo.gif
+    �対�るリクエスト��マッ����ん。正�表�を使��より複雑�
+    マッ�ング�関��� <code class="directive"><a href="#aliasmatch">AliasMatch</a></code>
+    ディレクティブを�覧����。</p>
+
+    <p>も� <var>url-path</var> �最後� /
+    を書���ら�サー��エイリアスを展開�る�����最後� /
+    �必���る���注�������。�����<code>Alias /icons/
+     /usr/local/apache/icons/</code> ���も�を使用���る場���
+    <code>/icons</code> ��� url �エイリアス�れ��ん。</p>
+
+    <p>エイリアス�<em>行�先</em>を�ん��る <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
+    セクションを追加�る必���る�も�れ�����注�������。
+    エイリアス�展開� <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
+    セクションを調�る��行��れ�����
+    エイリアス�行�先� <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> セクション��
+    効果��り��。
+    (����<code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
+    セクション�エイリアス�処��れる��実行�れ�����
+    ��ら��用�れ��。)</p>
+
+    <p>特��<code>Alias</code> を
+    <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
+    ディレクトリ�外���置��場���行�先�ディレクトリ�対�る
+    アクセス権�を明示的�制����れ��ら����ょ�。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+        Alias /image /ftp/pub/image<br />
+        &lt;Directory /ftp/pub/image&gt;<br />
+        <span class="indent">
+            Order allow,deny<br />
+            Allow from all<br />
+        </span>
+        &lt;/Directory&gt;
+    </code></p></div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AliasMatch" id="AliasMatch">AliasMatch</a> <a name="aliasmatch" id="aliasmatch">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>正�表�を使�� URL をファイルシステム��置�マップ�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AliasMatch <var>regex</var>
+<var>file-path</var>|<var>directory-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_alias</td></tr>
+</table>
+    <p>��ディレクティブ� <code class="directive"><a href="#alias">Alias</a></code>
+    ���ん�������簡��先頭�ら�マッ�を行��������
+    <a class="glossarylink" href="../glossary.html#regex" title="用語集を�照">正�表�</a>を利用���。
+    ���指定�れ�正�表�� URL �パス
+    �������を調����場��括弧�括られ�マッ�を
+    与�られ�文字列�置�����れをファイル����使用���。�����
+    <code>/icons</code> ディレクトリを使�
+    ����以下�よ��も��使用����:</p>
+
+    <div class="example"><p><code>
+      AliasMatch ^/icons(.*) /usr/local/apache/icons$1
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Redirect" id="Redirect">Redirect</a> <a name="redirect" id="redirect">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>クライアント��� URL を�得�るよ��外部��リダイレクトを
+�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Redirect [<var>status</var>] <var>URL-path</var>
+<var>URL</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_alias</td></tr>
+</table>
+    <p>Redirect ディレクティブ��� URL を新��も��マップ���
+    クライアント�新��場所を訪れるよ��指�示���。</p>
+    
+    <p>�� <var>URL-path</var> (% �復��れ�) パス��
+    スラッシュ�始�るも���。相対パス�使用����ん。
+    新�� <em>URL</em> �絶対 URL ���りスキーム�ホスト��
+    始�るも���る������URL-path ��スラッシュ�始�るも�も
+    使用�能��。��場����在�スキーム�ホスト��追加�れ����
+    �り��。</p>
+
+    <p><em>URL-Path</em> �始�る�ん�リクエストも�ターゲット�
+    <em>URL</em> ��リダイレクト�返�れ��。<em>URL-Path</em>
+    �マッ��� path 情報��ターゲット URL �後��追加�れ�
+    形�引�継�れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      Redirect /service http://foo2.example.com/service
+    </code></p></div>
+
+    <p>クライアント� http://example.com/service/foo.txt
+    ��リクエストを行����代�り� http://foo2.example.com/service/foo.txt
+    をアクセス�るよ��告�られ��。
+    パスセグメント�完全�一致��も����マッ�������
+    上記�例� http://example.com/servicefoo.txt ��マッ����ん。
+    正�表�を使��より複雑�マッ�ング������
+    <code class="directive"><a href="#redirectmatch">RedirectMatch</a></code>
+    ディレクティブを�覧����。</p>
+
+<div class="note"><h3>注�</h3><p>設定ファイル中�順番�関�ら��
+Redirect 系�ディレクティブ� Alias
+ディレクティブ� ScriptAlias ディレクティブよりも優先�れ��。</p></div>
+
+    <p>も� <var>status</var> 引数�与�られ����れ��リダイレクト�
+    "temporary" (HTTP ステータス 302) ��り��。�れ�クライアント�
+    リソース�一時的�移動�������を示���。<var>Status</var>
+    引数� 他� HTTP �ステータスコードを返����使用�る�������:</p>
+
+    <dl>
+      <dt>permanent</dt>
+
+      <dd>永久�リダイレクトを�るステータス (301) を返���。
+      �れ�リソース�永久�移動�������を�味���。</dd>
+
+      <dt>temp</dt>
+
+      <dd>一時的�リダイレクトステータス (302)
+      を返���。�れ�デフォルト��。</dd>
+
+      <dt>seeother</dt>
+
+      <dd>"See Other" ステータス (303) を返���。
+      �れ�リソース�他�も��置���られ���を�味���。</dd>
+
+    <dt>gone</dt>
+
+      <dd>"Gone" ステータス (410) を返���。�れ�リソース�永久�
+      削除�れ���を�味���。��ステータス�使用�れ�場��
+      <var>url</var> 引数��略�れ��れ��り��ん。</dd>
+    </dl>
+
+    <p><var>Status</var> �値�ステータスコードを数値�与�る���
+    他�ステータスコードも返��������。ステータス� 300 � 399
+    �間��る場��<var>url</var> 引数�存在�����れ�����ん。
+    ��他�場���略�れ����れ��り��ん。����
+    ステータス� Apache �コード�知���るも���る必���り��
+    (http_protocol.c �関数 <code>send_error_response</code>
+    を見�����)。</p>
+    <p>例:</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      Redirect permanent /one http://example.com/two<br />
+      Redirect 303 /three http://example.com/other
+    </code></p></div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RedirectMatch" id="RedirectMatch">RedirectMatch</a> <a name="redirectmatch" id="redirectmatch">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�在� URL ��正�表��マッ��より
+外部��リダイレクトを�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>RedirectMatch [<var>status</var>] <var>regex</var>
+<var>URL</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_alias</td></tr>
+</table>
+    <p>��ディレクティブ� <code class="directive"><a href="#redirect">Redirect</a></code>
+    ���ん�������簡��先頭�ら�マッ�を行��������
+    <a class="glossarylink" href="../glossary.html#regex" title="用語集を�照">正�表�</a>を利用���。
+    ���指定�れ�正�表�� URL-path
+    �������を調����場��括弧�括られ�マッ�を
+    与�られ�文字列�置�����れをファイル����使用���。
+    ��������� GIF ファイルを別サー���様���� JPEG
+    ファイル�リダイレクト�る���以下�よ��も�を使���:
+    </p>
+
+    <div class="example"><p><code>
+      RedirectMatch (.*)\.gif$ http://www.anotherserver.com$1.jpg
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RedirectPermanent" id="RedirectPermanent">RedirectPermanent</a> <a name="redirectpermanent" id="redirectpermanent">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>クライアント��� URL を�得�るよ��外部��永久的�
+リダイレクトを�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>RedirectPermanent <var>URL-path</var> <var>URL</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_alias</td></tr>
+</table>
+    <p>��ディレクティブ�クライアント� Redirect �永久的�も�
+    (ステータス 301) ��る��を知ら���。
+    <code>Redirect permanent</code> ���������。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RedirectTemp" id="RedirectTemp">RedirectTemp</a> <a name="redirecttemp" id="redirecttemp">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>クライアント��� URL を�得�るよ��外部��一時的�
+リダイレクトを�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>RedirectTemp <var>URL-path</var> <var>URL</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_alias</td></tr>
+</table>
+    <p>��ディレクティブ�クライアント� Redirect
+    �一時的�も���る (ステータス 302) ��を知ら���。
+    <code>Redirect temp</code> ���������。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScriptAlias" id="ScriptAlias">ScriptAlias</a> <a name="scriptalias" id="scriptalias">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>URL をファイルシステム��置�マップ��マップ先を
+CGI スクリプト�指定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ScriptAlias <var>URL-path</var>
+<var>file-path</var>|<var>directory-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_alias</td></tr>
+</table>
+    <p><code class="directive">ScriptAlias</code> ディレクティブ��対象ディレクトリ�
+    <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> � cgi-script
+    �ンドラ�処��れる CGI
+    スクリプト��る��を示�以外�
+    <code class="directive"><a href="#alias">Alias</a></code>
+    ディレクティブ���振る舞�を���。
+    URL � (% �復��れ�) パス� <var>URL-path</var> �始�るも��
+    ローカル�ファイルシステム�
+    フルパス��る二番目�引数�マップ�れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      ScriptAlias /cgi-bin/ /web/cgi-bin/
+    </code></p></div>
+
+    <p><code>http://myserver/cgi-bin/foo</code>
+    ��リクエスト�対��サー��スクリプト
+    <code>/web/cgi-bin/foo</code> を実行���。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScriptAliasMatch" id="ScriptAliasMatch">ScriptAliasMatch</a> <a name="scriptaliasmatch" id="scriptaliasmatch">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>URL を正�表�を使��ファイルシステム��置�マップ��マップ先を
+CGI スクリプト�指定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ScriptAliasMatch <var>regex</var>
+<var>file-path</var>|<var>directory-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_alias</td></tr>
+</table>
+    <p>��ディレクティブ� <code class="directive"><a href="#scriptalias">ScriptAlias</a></code>
+    ���ん�������簡��先頭�ら�マッ�を行��������
+    <a class="glossarylink" href="../glossary.html#regex" title="用語集を�照">正�表�</a>を利用���。���指定�れ�正�表�� URL-path
+    �������を調����場��括弧�括られ�マッ�を
+    与�られ�文字列�置�����れをファイル����使用���。
+    �����標準� <code>/cgi-bin</code>
+    を使用�るよ���る�����以下�よ��も�を使���:
+    </p>
+
+    <div class="example"><p><code>
+      ScriptAliasMatch ^/cgi-bin(.*) /usr/local/apache/cgi-bin$1
+    </code></p></div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_alias.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_alias.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_alias.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_alias.html.ko.euc-kr b/docs/manual/mod/mod_alias.html.ko.euc-kr
index 64afead5..2e651f50 100644
--- a/docs/manual/mod/mod_alias.html.ko.euc-kr
+++ b/docs/manual/mod/mod_alias.html.ko.euc-kr
@@ -351,6 +351,6 @@ Alias /foo /gaq
 <a href="../ja/mod/mod_alias.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_alias.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_asis.html b/docs/manual/mod/mod_asis.html
index 66ab1a74..f2f687b0 100644
--- a/docs/manual/mod/mod_asis.html
+++ b/docs/manual/mod/mod_asis.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_asis.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_asis.html.ja.euc-jp
+URI: mod_asis.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_asis.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_asis.html.en b/docs/manual/mod/mod_asis.html.en
index 8b08cfd6..66c2a2dd 100644
--- a/docs/manual/mod/mod_asis.html.en
+++ b/docs/manual/mod/mod_asis.html.en
@@ -107,6 +107,6 @@ HTTP headers</td></tr>
 <a href="../ja/mod/mod_asis.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_asis.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_asis.html.ja.euc-jp b/docs/manual/mod/mod_asis.html.ja.euc-jp
deleted file mode 100644
index f1831239..00000000
--- a/docs/manual/mod/mod_asis.html.ja.euc-jp
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_asis - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_asis</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_asis.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_asis.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_asis.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¼«Ê¬ÍѤΠHTTP ¥Ø¥Ã¥À¤Î½ñ¤«¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤òÁ÷¿®¤¹¤ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>asis_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_asis.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¥Ï¥ó¥É¥é <code>send-as-is</code>
-    ¤òÄ󶡤·¤Þ¤¹¡£¤³¤Î¥Ï¥ó¥É¥é¤ÏÄ̾ï¤Î HTTP
-    ¥Ø¥Ã¥À¤ò¤Û¤È¤ó¤ÉÄɲ乤뤳¤È¤Ê¤¯¥É¥­¥å¥á¥ó¥È¤òÁ÷¿®¤·¤Þ¤¹¡£</p>
-
-    <p>¤³¤ì¤Ï¥µ¡¼¥Ð¤«¤é¤É¤ó¤Ê¼ïÎà¤Î¥Ç¡¼¥¿¤òÁ÷¤ë¤È¤­¤Ë¤â»ÈÍѤǤ­¤Þ¤¹¡£
-    Cgi ¥¹¥¯¥ê¥×¥È¤ä nph ¥¹¥¯¥ê¥×¥È¤¬Ìµ¤¯¤Æ¤â¥ê¥À¥¤¥ì¥¯¥È¤ä¾¤ÎÆÃÊ̤Ê
-    HTTP ±þÅú¤òÁ÷¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>Îò»ËŪ¤ÊÍýͳ¤Ë¤è¤ê¡¢¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï mime ¥¿¥¤¥×
-    <code>httpd/send-as-is</code> ¤Î¥Õ¥¡¥¤¥ë¤â½èÍý¤·¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤¢¤ê¤Þ¤»¤ó¡£</p>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#usage">»ÈÍÑË¡</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code></li>
-<li><code class="module"><a href="../mod/mod_cern_meta.html">mod_cern_meta</a></code></li>
-<li><a href="../handler.html">Apache ¤Î¥Ï¥ó¥É¥é¤Î»ÈÍÑ</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="usage" id="usage">»ÈÍÑË¡</a></h2>
-
-    <p>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë¤Ç¡¢¥Õ¥¡¥¤¥ë¤È <code>send-as-is</code>
-    ¥Ï¥ó¥É¥é¤òÎ㤨¤Ð°Ê²¼¤Î¤è¤¦¤Ë´ØÏ¢ÉÕ¤±¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <div class="example"><p><code>AddHandler send-as-is asis</code></p></div>
-
-    <p>³ÈÄ¥»Ò¤¬ <code>.asis</code> ¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ÎÆâÍÆ¤Ï Apache
-    ¤«¤é¥¯¥é¥¤¥¢¥ó¥È¤Ø¤Û¤È¤ó¤ÉÊѹ¹Ìµ¤¯Á÷¤é¤ì¤Þ¤¹¡£¥¯¥é¥¤¥¢¥ó¥È¤Ë¤Ï
-    HTTP ¥Ø¥Ã¥À¤¬É¬ÍפǤ¹¤Î¤Ç¡¢¥Õ¥¡¥¤¥ë¤Ë½ñ¤¯¤³¤È¤ò˺¤ì¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-    Status: ¥Ø¥Ã¥À¤âɬÍפǤ¹¡£¥Ç¡¼¥¿¤Ï 3 ·å¤Î HTTP
-    ±þÅú¥³¡¼¥É¤È¡¢¤½¤Î¸å¤Ë¥Æ¥­¥¹¥È¥á¥Ã¥»¡¼¥¸¤¬Â³¤¤¤¿¤â¤Î¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-
-    <p>¤³¤ì¤Ï¥¯¥é¥¤¥¢¥ó¥È¤Ë¥Õ¥¡¥¤¥ë¤¬°ÜÆ°¤·¤¿¤³¤È¤òÃΤ餻¤ë¤¿¤á¤Ë
-    <em>as is</em> (¤½¤Î¤Þ¤Þ) ¤ÇÁ÷¤é¤ì¤ë¥Õ¥¡¥¤¥ë¤ÎÆâÍƤÎÎã¤Ç¤¹¡£
-    </p>
-
-
-    <div class="example"><p><code>
-      Status: 301 Now where did I leave that URL<br />
-      Location: http://xyz.abc.com/foo/bar.html<br />
-      Content-type: text/html<br />
-      <br />
-      &lt;html&gt;<br />
-      &lt;head&gt;<br />
-      &lt;title&gt;Lame excuses'R'us&lt;/title&gt;<br />
-      &lt;/head&gt;<br />
-      &lt;body&gt;<br />
-      &lt;h1&gt;Fred's exceptionally wonderful page has moved to<br />
-      &lt;a href="http://xyz.abc.com/foo/bar.html"&gt;Joe's&lt;/a&gt;
-      site.<br />
-      &lt;/h1&gt;<br />
-      &lt;/body&gt;<br />
-      &lt;/html&gt;
-    </code></p></div>
-
-    <div class="note"><h3>Ãí°Õ</h3>
-    <p>Ãí°Õ: ¥µ¡¼¥Ð¤Ï¥¯¥é¥¤¥¢¥ó¥È¤ËÊÖ¤µ¤ì¤ë¥Ç¡¼¥¿¤Ë¾ï¤Ë <code>Date:</code>
-    ¤È <code>Server:</code> ¥Ø¥Ã¥À¤òÄɲä·¤Þ¤¹¤Î¤Ç¡¢
-    ¤½¤ì¤é¤¬¥Õ¥¡¥¤¥ë¤Ë½ñ¤«¤ì¤Æ¤¤¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£
-    ¥µ¡¼¥Ð¤Ï <code>Last-Modified</code> ¥Ø¥Ã¥À¤òÄɲÃ<em>¤·¤Þ¤»¤ó</em>¡£
-    ¤ª¤½¤é¤¯¤Ï¤½¤¦¤¹¤Ù¤­¤Ç¤·¤ç¤¦¤±¤ì¤É¡£</p>
-    </div>
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_asis.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_asis.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_asis.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_asis.html.ja.utf8 b/docs/manual/mod/mod_asis.html.ja.utf8
new file mode 100644
index 00000000..04963d06
--- /dev/null
+++ b/docs/manual/mod/mod_asis.html.ja.utf8
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_asis - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_asis</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_asis.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_asis.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_asis.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>自分用� HTTP ヘッダ�書�れ��るファイルを�信�る</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>asis_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_asis.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール��ンドラ <code>send-as-is</code>
+    を�供���。���ンドラ�通常� HTTP
+    ヘッダを��ん�追加�る����ドキュメントを�信���。</p>
+
+    <p>�れ�サー��ら�ん�種類�データを�る���も使用����。
+    Cgi スクリプトや nph スクリプト�無��もリダイレクトや他�特別�
+    HTTP 応答を�る�������。</p>
+
+    <p>歴�的��由�より���モジュール� mime タイプ
+    <code>httpd/send-as-is</code> �ファイルも処����。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<p>��モジュール�ディレクティブ��り��ん。</p>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#usage">使用法</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code></li>
+<li><code class="module"><a href="../mod/mod_cern_meta.html">mod_cern_meta</a></code></li>
+<li><a href="../handler.html">Apache ��ンドラ�使用</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="usage" id="usage">使用法</a></h2>
+
+    <p>サー�設定ファイル��ファイル� <code>send-as-is</code>
+    �ンドラを例��以下�よ��関連付������。</p>
+
+    <div class="example"><p><code>AddHandler send-as-is asis</code></p></div>
+
+    <p>拡張�� <code>.asis</code> �����ファイル�内容� Apache
+    �らクライアント���ん�変更無��られ��。
+    特��HTTP ヘッダ�ファイル�れ自体�ら <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> 
+    ����則�読��られ�����asis ファイル���切�ヘッダ�
+    ��れ����れ��り��ん��CGI �� Status: ヘッダを
+    書�� HTTP レス�ンスコードを決�る��も����。</p>
+
+    <p>�れ�クライアント�ファイル�移動����を知ら�る���
+    <em>as is</em> (����) ��られるファイル�内容�例��。
+    </p>
+
+
+    <div class="example"><p><code>
+      Status: 301 Now where did I leave that URL<br />
+      Location: http://xyz.abc.com/foo/bar.html<br />
+      Content-type: text/html<br />
+      <br />
+      &lt;html&gt;<br />
+      &lt;head&gt;<br />
+      &lt;title&gt;Lame excuses'R'us&lt;/title&gt;<br />
+      &lt;/head&gt;<br />
+      &lt;body&gt;<br />
+      &lt;h1&gt;Fred's exceptionally wonderful page has moved to<br />
+      &lt;a href="http://xyz.abc.com/foo/bar.html"&gt;Joe's&lt;/a&gt;
+      site.<br />
+      &lt;/h1&gt;<br />
+      &lt;/body&gt;<br />
+      &lt;/html&gt;
+    </code></p></div>
+
+    <div class="note"><h3>注�</h3>
+    <p>注�: サー��クライアント�返�れるデータ�常� <code>Date:</code>
+    � <code>Server:</code> ヘッダを追加������
+    �れら�ファイル�書�れ��������ん。
+    サー�� <code>Last-Modified</code> ヘッダを追加<em>���ん</em>。
+    ��ら���������ょ��れ�。</p>
+    </div>
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_asis.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_asis.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_asis.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_asis.html.ko.euc-kr b/docs/manual/mod/mod_asis.html.ko.euc-kr
index 3e479396..a75bd695 100644
--- a/docs/manual/mod/mod_asis.html.ko.euc-kr
+++ b/docs/manual/mod/mod_asis.html.ko.euc-kr
@@ -105,6 +105,6 @@
 <a href="../ja/mod/mod_asis.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_asis.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_auth_basic.html b/docs/manual/mod/mod_auth_basic.html
index e93a9911..1df9fdba 100644
--- a/docs/manual/mod/mod_auth_basic.html
+++ b/docs/manual/mod/mod_auth_basic.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_auth_basic.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_auth_basic.html.ja.euc-jp
+URI: mod_auth_basic.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_auth_basic.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_auth_basic.html.en b/docs/manual/mod/mod_auth_basic.html.en
index 00239b9b..9c80b106 100644
--- a/docs/manual/mod/mod_auth_basic.html.en
+++ b/docs/manual/mod/mod_auth_basic.html.en
@@ -122,6 +122,6 @@ lower level modules</td></tr>
 <a href="../ja/mod/mod_auth_basic.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_auth_basic.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_auth_basic.html.ja.euc-jp b/docs/manual/mod/mod_auth_basic.html.ja.euc-jp
deleted file mode 100644
index 6e755fda..00000000
--- a/docs/manual/mod/mod_auth_basic.html.ja.euc-jp
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_auth_basic - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_auth_basic</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_auth_basic.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_auth_basic.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_auth_basic.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>´ðËÜǧ¾Ú</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>auth_basic_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_auth_basic.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.1 °Ê¹ß</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>Í¿¤¨¤é¤ì¤¿¥×¥í¥Ð¥¤¥À (ÌõÃí: ǧ¾Ú¤Ç¤Î¾È²ñ¤ò¹Ô¤¦Ì䤤¹ç¤ï¤»Àè) 
-    ¤Ç¥æ¡¼¥¶¤ò¸¡º÷¤·¡¢HTTP ´ðËÜǧ¾Ú¤Ç¥¢¥¯¥»¥¹À©¸Â¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-    HTTP ¥À¥¤¥¸¥§¥¹¥Èǧ¾Ú¤Ë¤Ä¤¤¤Æ¤Ï <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>
-    ¤ÇÄ󶡤µ¤ì¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#authbasicauthoritative">AuthBasicAuthoritative</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authbasicprovider">AuthBasicProvider</a></li>
-</ul>
-<h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="directive"><a href="../mod/core.html#authname">AuthName</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#authtype">AuthType</a></code></li>
-</ul></div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthBasicAuthoritative" id="AuthBasicAuthoritative">AuthBasicAuthoritative</a> <a name="authbasicauthoritative" id="authbasicauthoritative">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ǧ¾Ú¤È¾µÇ§¤ò¡¢¤è¤êÄ㤤¥ì¥Ù¥ë¤Î¥â¥¸¥å¡¼¥ë¤Ë°Ü¹Ô¤µ¤»¤ë¤«¤ò
-ÀßÄꤷ¤Þ¤¹¡£</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AuthBasicAuthoritative On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>AuthBasicAuthoritative On</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_auth_basic</td></tr>
-</table>
-    <p><code class="directive">AuthBasicAuthoritative</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÌÀ¼¨Åª¤Ë <code>Off</code>¤ËÀßÄꤹ¤ë¤È¡¢
-    Í¿¤¨¤é¤ì¤¿Ç§¾Ú¥æ¡¼¥¶ ID ¤ËÂФ·¤Æ<strong>¥æ¡¼¥¶ ID ¤¬¤Ê¤¤</strong>
-    ¤Þ¤¿¤Ï<strong>¥ë¡¼¥ë¤¬¤Ê¤¤</strong>¾ì¹ç¤Ë¡¢
-    ǧ¾Ú¤È¾µÇ§¤ÎξÊý¤Î¥×¥í¥»¥¹¤¬¡¢
-    ¤è¤êÄ㤤¥ì¥Ù¥ë¤Î¥â¥¸¥å¡¼¥ë (<code>modules.c</code> ¥Õ¥¡¥¤¥ë¤ÇÄêµÁ) ¤Ë°Ü¹Ô¤¹¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£
-    ¥æ¡¼¥¶ ID ¤¬¤¢¤ë¡¢¤«¤Ä¤Þ¤¿¤Ï¡¢¥ë¡¼¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-    Ä̾ï¤Î¥Ñ¥¹¥ï¡¼¥É¤È¥¢¥¯¥»¥¹¥Á¥§¥Ã¥¯¤¬Å¬ÍѤµ¤ì¤Æ¡¢
-    ǧ¾Ú¤Ë¼ºÇÔ¤¹¤ë¤È "Authentication Required" ±þÅú¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>¤Ç¤¹¤«¤é¡¢Æó¤Ä°Ê¾å¤Î¥â¥¸¥å¡¼¥ë¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÇƱ°ì¤Î
-    ¥æ¡¼¥¶ ID ¤¬¸½¤ï¤ì¤¿¤ê¡¢
-    ¤Þ¤¿¤Ï¡¢Àµ¤·¤¤ <code class="directive"><a href="../mod/core.html#require">Require</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Æó¤Ä°Ê¾å¤Î¥â¥¸¥å¡¼¥ë¤Ç¸½¤ï¤ì¤¿¤ê¤·¤¿¾ì¹ç¤Ï¡¢
-    °ì¤ÄÌܤΥ⥸¥å¡¼¥ë¤¬Ç§Äê¤ò¹Ô¤Ã¤Æ¡¢<code class="directive">AuthAuthoritative</code>
-    ÀßÄê¤Ë´Ø¤ï¤é¤º¡¢¥¢¥¯¥»¥¹¤Ï°Ü¹Ô¤·¤Þ¤»¤ó¡£</p>
-
-    <p>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢À©¸æ¤Ï°Ü¹Ô¤·¤Þ¤»¤ó¡£¤½¤·¤Æ¡¢Ì¤ÃΤΥ桼¥¶ ID ¤ä
-    ¥ë¡¼¥ë¤¬¤¢¤Ã¤Æ¤â "Authentication Required" ±þÅú¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
-    ¤Ç¤¹¤«¤é¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÀßÄꤷ¤Ê¤¤¤³¤È¤Ç¥·¥¹¥Æ¥à¤Î°ÂÁ´¤ò°Ý»ý¤Ç¤­¤Æ¡¢¤Þ¤¿¡¢
-    NCSA ½àµò¤ÎµóÆ°¤ò¶¯À©¤Ç¤­¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthBasicProvider" id="AuthBasicProvider">AuthBasicProvider</a> <a name="authbasicprovider" id="authbasicprovider">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¤³¤Î°ÌÃÖ¤ËÂФ¹¤ëǧ¾Ú¥×¥í¥Ð¥¤¥À¤òÀßÄꤷ¤Þ¤¹¡£</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AuthBasicProvider On|Off|<var>provider-name</var>
-[<var>provider-name</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>AuthBasicProvider On</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_auth_basic</td></tr>
-</table>
-    <p><code class="directive">AuthBasicProvider</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¡¢
-    ¤³¤Î°ÌÃÖ¤ËÂФ¹¤ë¥æ¡¼¥¶Ç§¾Ú¤ËÍѤ¤¤é¤ì¤ëǧ¾Ú¥×¥í¥Ð¥¤¥À¤òÀßÄꤷ¤Þ¤¹¡£
-    <code>On</code> ¤ËÀßÄꤹ¤ë¤È¥Ç¥Õ¥©¥ë¥È¤Îǧ¾Ú¥×¥í¥Ð¥¤¥À
-    (<code>file</code>) ¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£<code>file</code>
-    ¥×¥í¥Ð¥¤¥À¤Ï <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>
-    ¥â¥¸¥å¡¼¥ë¤Ç¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤¹¤Î¤Ç¡¢
-    ¤³¤Î¥â¥¸¥å¡¼¥ë¤¬¥µ¡¼¥Ð¤ËÆþ¤Ã¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <div class="example"><h3>Example</h3><p><code>
-      &lt;Location /secure&gt;<br />
-      <span class="indent">
-        AuthBasicProvider  dbm<br />
-        AuthDBMType        SDBM<br />
-        AuthDBMUserFile    /www/etc/dbmpasswd<br />
-        Require            valid-user<br />
-      </span>
-      &lt;/Location&gt;
-    </code></p></div>
-
-    <p>ǧ¾Ú¥×¥í¥Ð¥¤¥À¤Ë¤Ä¤¤¤Æ¤Ï
-    <code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code> ¤È <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>
-    ¤ò¤´Í÷²¼¤µ¤¤¡£</p>
-
-    <p><code>Off</code> ¤Ï¥×¥í¥Ð¥¤¥À¥ê¥¹¥È¤ò¥¯¥ê¥¢¤·¤Æ¡¢¥Ç¥Õ¥©¥ë¥È¤Î
-    ¾õÂÖ¤ËÌᤷ¤Þ¤¹¡£</p>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_auth_basic.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_auth_basic.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_auth_basic.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_auth_basic.html.ja.utf8 b/docs/manual/mod/mod_auth_basic.html.ja.utf8
new file mode 100644
index 00000000..01d25b5f
--- /dev/null
+++ b/docs/manual/mod/mod_auth_basic.html.ja.utf8
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_auth_basic - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_auth_basic</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_auth_basic.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_auth_basic.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_auth_basic.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>基本�証</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>auth_basic_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_auth_basic.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>Apache 2.1 以�</td></tr></table>
+<h3>概�</h3>
+
+    <p>与�られ�プロ�イダ (訳注: �証��照会を行������先) 
+    �ユーザを検索��HTTP 基本�証�アクセス制���るよ���り��。
+    HTTP ダイジェスト�証����� <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>
+    ��供�れ��。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#authbasicauthoritative">AuthBasicAuthoritative</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#authbasicprovider">AuthBasicProvider</a></li>
+</ul>
+<h3>�照</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/core.html#authname">AuthName</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#authtype">AuthType</a></code></li>
+</ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthBasicAuthoritative" id="AuthBasicAuthoritative">AuthBasicAuthoritative</a> <a name="authbasicauthoritative" id="authbasicauthoritative">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�証�承�を�より低�レベル�モジュール�移行��る�を
+設定���。</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AuthBasicAuthoritative On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>AuthBasicAuthoritative On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_auth_basic</td></tr>
+</table>
+    <p><code class="directive">AuthBasicAuthoritative</code>
+    ディレクティブ�明示的� <code>Off</code>�設定�る��
+    与�られ��証ユーザ ID �対��<strong>ユーザ ID ���</strong>
+    ���<strong>ルール���</strong>場���
+    �証�承��両方�プロセス��
+    より低�レベル�モジュール (<code>modules.c</code> ファイル�定義) �移行�るよ������。
+    ユーザ ID ��る�������ルール�指定�れ��る場���
+    通常�パスワード�アクセス�ェック��用�れ��
+    �証�失敗�る� "Authentication Required" 応答�返�れ��。</p>
+
+    <p>���ら�二�以上�モジュール�データベース��一�
+    ユーザ ID ���れ�り�
+    ����正�� <code class="directive"><a href="../mod/core.html#require">Require</a></code>
+    ディレクティブ�二�以上�モジュール���れ�り��場���
+    一�目�モジュール��定を行���<code class="directive">AuthAuthoritative</code>
+    設定�関�ら��アクセス�移行���ん。</p>
+
+    <p>デフォルト���制御�移行���ん。����未知�ユーザ ID や
+    ルール����も "Authentication Required" 応答�返�れ��。
+    ���ら���ディレクティブを設定������システム�安全を維��������
+    NCSA 準拠�挙動を強制����。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthBasicProvider" id="AuthBasicProvider">AuthBasicProvider</a> <a name="authbasicprovider" id="authbasicprovider">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>���置�対�る�証プロ�イダを設定���。</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AuthBasicProvider On|Off|<var>provider-name</var>
+[<var>provider-name</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>AuthBasicProvider On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_auth_basic</td></tr>
+</table>
+    <p><code class="directive">AuthBasicProvider</code> ディレクティブ��
+    ���置�対�るユーザ�証�用�られる�証プロ�イダを設定���。
+    <code>On</code> �設定�る�デフォルト��証プロ�イダ
+    (<code>file</code>) �使用�れ��。<code>file</code>
+    プロ�イダ� <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>
+    モジュール�実装�れ�������
+    ��モジュール�サー��入���る��を確�������。</p>
+
+    <div class="example"><h3>Example</h3><p><code>
+      &lt;Location /secure&gt;<br />
+      <span class="indent">
+        AuthBasicProvider  dbm<br />
+        AuthDBMType        SDBM<br />
+        AuthDBMUserFile    /www/etc/dbmpasswd<br />
+        Require            valid-user<br />
+      </span>
+      &lt;/Location&gt;
+    </code></p></div>
+
+    <p>�証プロ�イダ�����
+    <code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code> � <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>
+    を�覧下��。</p>
+
+    <p><code>Off</code> �プロ�イダリストをクリア���デフォルト�
+    状態�戻���。</p>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_auth_basic.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_auth_basic.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_auth_basic.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_auth_basic.html.ko.euc-kr b/docs/manual/mod/mod_auth_basic.html.ko.euc-kr
index 99d4156a..a6f79d47 100644
--- a/docs/manual/mod/mod_auth_basic.html.ko.euc-kr
+++ b/docs/manual/mod/mod_auth_basic.html.ko.euc-kr
@@ -125,6 +125,6 @@
 <a href="../ja/mod/mod_auth_basic.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_auth_basic.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_auth_digest.html b/docs/manual/mod/mod_auth_digest.html
index ff515283..eeb065dd 100644
--- a/docs/manual/mod/mod_auth_digest.html
+++ b/docs/manual/mod/mod_auth_digest.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_auth_digest.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_auth_digest.html.en b/docs/manual/mod/mod_auth_digest.html.en
index 16ed805a..7b9ea450 100644
--- a/docs/manual/mod/mod_auth_digest.html.en
+++ b/docs/manual/mod/mod_auth_digest.html.en
@@ -327,6 +327,6 @@ of clients</td></tr>
 <p><span>Available Languages: </span><a href="../en/mod/mod_auth_digest.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_auth_digest.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_auth_digest.html.ko.euc-kr b/docs/manual/mod/mod_auth_digest.html.ko.euc-kr
index d274b13c..7e2a2e03 100644
--- a/docs/manual/mod/mod_auth_digest.html.ko.euc-kr
+++ b/docs/manual/mod/mod_auth_digest.html.ko.euc-kr
@@ -316,6 +316,6 @@ URIµé</td></tr>
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/mod_auth_digest.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_auth_digest.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_alias.html b/docs/manual/mod/mod_authn_alias.html
index 6abb4b34..0d181584 100644
--- a/docs/manual/mod/mod_authn_alias.html
+++ b/docs/manual/mod/mod_authn_alias.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_authn_alias.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_authn_alias.html.en b/docs/manual/mod/mod_authn_alias.html.en
index f45bfcbe..6408ed1a 100644
--- a/docs/manual/mod/mod_authn_alias.html.en
+++ b/docs/manual/mod/mod_authn_alias.html.en
@@ -116,6 +116,6 @@ the specified alias</td></tr>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_authn_alias.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_anon.html b/docs/manual/mod/mod_authn_anon.html
index 3afcbf61..4da4dffe 100644
--- a/docs/manual/mod/mod_authn_anon.html
+++ b/docs/manual/mod/mod_authn_anon.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_authn_anon.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_authn_anon.html.ja.euc-jp
+URI: mod_authn_anon.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_authn_anon.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_authn_anon.html.en b/docs/manual/mod/mod_authn_anon.html.en
index 4fbb62f1..4acfc693 100644
--- a/docs/manual/mod/mod_authn_anon.html.en
+++ b/docs/manual/mod/mod_authn_anon.html.en
@@ -219,6 +219,6 @@ formatted email address</td></tr>
 <a href="../ja/mod/mod_authn_anon.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authn_anon.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_anon.html.ja.euc-jp b/docs/manual/mod/mod_authn_anon.html.ja.euc-jp
deleted file mode 100644
index 6b3620fc..00000000
--- a/docs/manual/mod/mod_authn_anon.html.ja.euc-jp
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_authn_anon - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_authn_anon</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authn_anon.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authn_anon.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authn_anon.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>ǧ¾Ú¤¬É¬ÍפÊÎΰè¤Ø¤Î "anonymous" ¥æ¡¼¥¶¤Î¥¢¥¯¥»¥¹¤òµö²Ä¤¹¤ë
-</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>authn_anon_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_authn_anon.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.1 °Ê¹ß</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> ¤Î¤è¤¦¤Ê
-    ǧ¾Ú¥Õ¥í¥ó¥È¥¨¥ó¥É¤È¤·¤Æ¡¢anonymous-ftp ¥µ¥¤¥È¤Î¤è¤¦¤Ê¡¢¡ÖËâË¡¤Î¡×¥æ¡¼¥¶ ID
-    'anonymous' ¤ÈÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤ò¥Ñ¥¹¥ï¡¼¥É¤Ë¤·¤¿¥æ¡¼¥¶Ç§¾Ú¤ò
-    ¹Ô¤Ê¤¦µ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£¤³¤ÎÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤Ï¥í¥°¼ý½¸¤¹¤ë¤³¤È¤¬
-    ¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¾¤Î (¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë¤è¤ë) ¥¢¥¯¥»¥¹À©¸æÊýË¡¤ÈÁȤ߹ç¤ï¤»¤ë¤³¤È¤Ç¡¢
-    ¡Ö̤ÅÐÏ¿¡×¥æ¡¼¥¶¤ËÂФ·¤Æ¥µ¥¤¥È¤ò¸ø³«¤·¤Ä¤Ä¡¢¸úΨ¤è¤¯¥æ¡¼¥¶ÄÉÀפ·¤¿¤ê¡¢
-    ¥æ¡¼¥¶¤Î¥×¥í¥Õ¥¡¥¤¥ë¤Ë±þ¤¸¤¿¥«¥¹¥¿¥Þ¥¤¥º¤ò¤·¤¿¤ê¤Ç¤­¤Þ¤¹¡£
-    ¤³¤Î¤è¤¦¤Êǧ¾Ú¤Ë´ð¤Å¤¤¤¿¥æ¡¼¥¶ÄÉÀפÎÍøÅÀ¤Î°ì¤Ä¤Ï¡¢
-    ¥Þ¥¸¥Ã¥¯¥¯¥Ã¥­¡¼¤Ë´ð¤Å¤¯¥æ¡¼¥¶ÄÉÀ×ÊýË¡¤ä¡¢
-    ÄÁ̯¤Ê URL ¤ÎÀÜƬ¼­¤äÀÜÈø¼­¤òÍøÍѤ·¤¿¥æ¡¼¥¶ÄÉÀ×ÊýË¡¤È¤Ï°Û¤Ê¤ê¡¢
-    ´°Á´¤Ë¥Ö¥é¥¦¥¶Èó°Í¸¤Ç¤¢¤ê¡¢¥æ¡¼¥¶´Ö¤Ç URL ¤ò¶¦Í­¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤È¤¤¤¦
-    ÅÀ¤Ç¤¹¡£</p>
-
-    <p><code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> ¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï
-    <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> ¤Ë
-    <code>anon</code> ¤È¤¤¤¦ÃͤòÀßÄꤹ¤ë¤³¤È¤Çµ¯Æ°¤µ¤ì¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#anonymous">Anonymous</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_logemail">Anonymous_LogEmail</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_nouserid">Anonymous_NoUserID</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_verifyemail">Anonymous_VerifyEmail</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#example">Îã</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="example" id="example">Îã</a></h2>
-    <p>°Ê²¼¤ÎÎã¤Ï¡ÖÉáÄ̡פΠhtpasswd ¥Õ¥¡¥¤¥ë¤Ë´ð¤Å¤¤¤¿Ç§¾Ú¤ÈÁȤ߹ç¤ï¤µ¤ì¤Æ
-    ¤ª¤ê¡¢°Ê²¼¤ÎÍ×·ï¤ò¸«¤¿¤¹¥æ¡¼¥¶¤ò¡Ö¥²¥¹¥È¡×¤È¤·¤Æµö²Ä¤·¤Þ¤¹:</p>
-
-    <ul>
-      <li>¥æ¡¼¥¶¤Ï userID ¤òÆþÎϤ·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-      (<code class="directive"><a href="#anonymous_nouserid">Anonymous_NoUserID</a></code>)</li>
-
-      <li>¥æ¡¼¥¶¤Ï¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-      (<code class="directive"><a href="#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></code>)</li>
-
-      <li>ÆþÎϤµ¤ì¤¿¥Ñ¥¹¥ï¡¼¥É¤ÏÍ­¸ú¤ÊÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤Ç¤Ê¤±¤ì¤Ð
-      ¤Ê¤ê¤Þ¤»¤ó¡£<em>¤¹¤Ê¤ï¤Á</em>¡¢¾¯¤¯¤È¤â°ì¤Ä¤Î '@' ¤È '.' ¤¬
-      ´Þ¤Þ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-      (<code class="directive"><a href="#anonymous_verifyemail">Anonymous_VerifyEmail</a></code>)</li>
-
-      <li>userID ¤Ï <code>anonymous guest www test
-      welcome</code> ¤Î¤É¤ì¤«¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-      ¥æ¡¼¥¶Ì¾¤ÎÈæ³Ó¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊÌ<strong>¤·¤Þ¤»¤ó¡£</strong></li>
-
-      <li>¥Ñ¥¹¥ï¡¼¥ÉÍó¤ËÆþÎϤµ¤ì¤¿ÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤Ï¥¨¥é¡¼¥í¥°¥Õ¥¡¥¤¥ë¤Ë
-      ¥í¥®¥ó¥°¤µ¤ì¤Þ¤¹¡£
-      (<code class="directive"><a href="#anonymous_logemail">Anonymous_LogEmail</a></code>)</li>
-    </ul>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      &lt;Directory /foo&gt;
-      <span class="indent">
-        AuthName "Use 'anonymous' &amp; Email address for guest entry"<br />
-        AuthType Basic<br />
-        AuthBasicProvider file anon<br />
-        AuthUserFile /path/to/your/.htpasswd<br />
-        <br />
-        Anonymous_NoUserID off<br />
-        Anonymous_MustGiveEmail on<br />
-        Anonymous_VerifyEmail on<br />
-        Anonymous_LogEmail on<br />
-        Anonymous anonymous guest www test welcome<br />
-        <br />
-        Order Deny,Allow<br />
-        Allow from all<br />
-        <br />
-        Require valid-user<br />
-      </span>
-      &lt;/Directory&gt;
-    </code></p></div>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Anonymous" id="Anonymous">Anonymous</a> <a name="anonymous" id="anonymous">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Ñ¥¹¥ï¡¼¥É¤Î¸¡ººÌµ¤·¤Ç¥¢¥¯¥»¥¹¤òµö²Ä¤¹¤ë userID ¤ò»ØÄꤹ¤ë
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Anonymous <var>user</var> [<var>user</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_authn_anon</td></tr>
-</table>
-    <p>¥Ñ¥¹¥ï¡¼¥É¤Î¸¡ºº¤ò¤·¤Ê¤¤¤Ç¥¢¥¯¥»¥¹¤òµö²Ä¤¹¤ë¡ÖËâË¡¤Î¡× userID ¤ò
-    ÀßÄꤷ¤Þ¤¹¡£userID Ãæ¤Ë¶õÇò¤ò»È¤¨¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¡¢
-    ¥¨¥¹¥±¡¼¥×ʸ»ú \ ¤Ë¤è¤ëÊýË¡¤È¡¢°úÍÑÉä ' ¤È " ¤Ë¤è¤ë¥¯¥ª¡¼¥Æ¥£¥ó¥°
-    ¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¥æ¡¼¥¶Ì¾¤ÎÈæ³Ó¤Ï<strong>Âçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Ê¤¤</strong>¤³¤È¤Ë
-    Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£<br />
-    ËâË¡¤Î¥æ¡¼¥¶Ì¾ '<code>anonymous</code>' ¤¬µö²Ä¤µ¤ì¤Æ¤¤¤ë userID ¤Ë
-    ´Þ¤à¤è¤¦¤Ë¤¹¤ë¤³¤È¤Ï¶¯¤¯¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã:</h3><p><code>
-      Anonymous anonymous "Not Registered" "I don't know"
-    </code></p></div>
-
-    <p>¤³¤ì¤Ï¡¢userID "anonymous",
-    "AnonyMous", "Not Registered", "I Don't Know" ¤Î¤É¤ì¤«¤ò»È¤Ã¤Æ¤â
-    ¥Ñ¥¹¥ï¡¼¥É̵¤·¤Ç¥æ¡¼¥¶¤¬¥µ¥¤¥È¤ËÆþ¤ì¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£</p>
-
-    <p>Apache 2.1 ¤Ç¤Ï userID ¤Ë "<code>*</code>" ¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤³¤Î¾ì¹ç¡¢<em>¤¹¤Ù¤Æ¤Î</em>userID ¤òµö²Ä¤·¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Anonymous_LogEmail" id="Anonymous_LogEmail">Anonymous_LogEmail</a> <a name="anonymous_logemail" id="anonymous_logemail">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ÆþÎϤµ¤ì¤¿¥Ñ¥¹¥ï¡¼¥É¤¬¥¨¥é¡¼¥í¥°¤Ë¥í¥®¥ó¥°¤µ¤ì¤ë¤«¤É¤¦¤«¤ò
-ÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Anonymous_LogEmail On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>Anonymous_LogEmail On</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_authn_anon</td></tr>
-</table>
-    <p>¥Ç¥Õ¥©¥ë¥È¤Î <code>On</code> ¤ËÀßÄꤵ¤ì¤¿¾ì¹ç¤Ï¡¢
-    ÆþÎϤµ¤ì¤¿ (¤Þ¤Ã¤È¤¦¤ÊÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤Ç¤¢¤ë¤³¤È¤¬
-    ´üÂÔ¤µ¤ì¤ë) ¡Ö¥Ñ¥¹¥ï¡¼¥É¡×¤¬¥¨¥é¡¼¥í¥°¤Ë¥í¥®¥ó¥°¤µ¤ì¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Anonymous_MustGiveEmail" id="Anonymous_MustGiveEmail">Anonymous_MustGiveEmail</a> <a name="anonymous_mustgiveemail" id="anonymous_mustgiveemail">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¶õ¥Ñ¥¹¥ï¡¼¥É¤òµö²Ä¤¹¤ë¤«¤É¤¦¤«¤ò»ØÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Anonymous_MustGiveEmail On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>Anonymous_MustGiveEmail On</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_authn_anon</td></tr>
-</table>
-    <p>¥æ¡¼¥¶¤¬¥Ñ¥¹¥ï¡¼¥É¤È¤·¤ÆÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ë¤«¤É¤¦¤«¤ò
-    ÀßÄꤷ¤Þ¤¹¡£¤³¤ì¤Ï¶õ¥Ñ¥¹¥ï¡¼¥É¤ò¶Ø»ß¤·¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Anonymous_NoUserID" id="Anonymous_NoUserID">Anonymous_NoUserID</a> <a name="anonymous_nouserid" id="anonymous_nouserid">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¶õ userID ¤òµö²Ä¤¹¤ë¤«¤ò»ØÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Anonymous_NoUserID On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>Anonymous_NoUserID Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_authn_anon</td></tr>
-</table>
-    <p><code>On</code> ¤ËÀßÄꤹ¤ë¤È¡¢¥æ¡¼¥¶¤Ï userID (¤È¤ª¤½¤é¤¯¤Ï
-    ¥Ñ¥¹¥ï¡¼¥ÉÍó¤â) ¶õ¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤ì¤Ïñ¤Ë¥ê¥¿¡¼¥ó¥­¡¼¤ò
-    ᤤ¤¿¤ê OK ¥Ü¥¿¥ó¤òľÀÜ¥¯¥ê¥Ã¥¯¤·¤¿¤ê¤¹¤ë MS-Explorer ¥æ¡¼¥¶¤Ë¤Ï
-    Èó¾ï¤ËÊØÍø¤Ç¤¹¡£¤½¤Î¤è¤¦¤ÊÁàºî¤Ï¤´¤¯¤´¤¯¼«Á³¤Ê¤â¤Î¤Ç¤·¤ç¤¦¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Anonymous_VerifyEmail" id="Anonymous_VerifyEmail">Anonymous_VerifyEmail</a> <a name="anonymous_verifyemail" id="anonymous_verifyemail">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Ñ¥¹¥ï¡¼¥ÉÍó¤¬Àµ¤·¤¤·Á¼°¤ÎÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤Ç¤¢¤ë¤³¤È¤ò
-Ä´¤Ù¤ë¤«¤É¤¦¤«¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Anonymous_VerifyEmail On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>Anonymous_VerifyEmail Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_authn_anon</td></tr>
-</table>
-    <p><code>On</code> ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥æ¡¼¥¶¤¬Í­¸ú¤ÊÅŻҥ᡼¥ë
-    ¥¢¥É¥ì¥¹¤òÆþÎϤ¹¤ë¤³¤È¤ò¿ä¾©¤¹¤ë¤¿¤á¡¢ÆþÎϤµ¤ì¤¿¡Ö¥Ñ¥¹¥ï¡¼¥É¡×¤Ï
-    ¾¯¤Ê¤¯¤È¤â°ì¤Ä¤Î '@' ¤È '.' ¤ò´Þ¤ó¤Ç¤¤¤ë¤«¤É¤¦¤«¤òÄ´¤Ù¤Þ¤¹
-    (¾å¤Î <code class="directive"><a href="#anonymous_logemail">Anonymous_LogEmail</a></code> »²¾È)¡£</p>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authn_anon.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authn_anon.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authn_anon.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_anon.html.ja.utf8 b/docs/manual/mod/mod_authn_anon.html.ja.utf8
new file mode 100644
index 00000000..1b3430b1
--- /dev/null
+++ b/docs/manual/mod/mod_authn_anon.html.ja.utf8
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_authn_anon - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_authn_anon</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authn_anon.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authn_anon.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authn_anon.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>�証�必��領域�� "anonymous" ユーザ�アクセスを許��る
+</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>authn_anon_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_authn_anon.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>Apache 2.1 以�</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール� <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> �よ��
+    �証フロントエンド����anonymous-ftp サイト�よ���「魔法��ユーザ ID
+    'anonymous' �電�メールアドレスをパスワード���ユーザ�証を
+    行��機能を�供���。��電�メールアドレス�ログ�集�る���
+    ����。</p>
+
+    <p>他� (データベース�よる) アクセス制御方法�組����る����
+    「未登録�ユーザ�対��サイトを公開����効率よ�ユーザ追跡��り�
+    ユーザ�プロファイル�応��カスタマイズを��り����。
+    ��よ���証�基���ユーザ追跡�利点�一���
+    マジッククッキー�基��ユーザ追跡方法や�
+    �妙� URL �接頭辞や接尾辞を利用��ユーザ追跡方法��異�り�
+    完全�ブラウザ��存��り�ユーザ間� URL を共有�る�����る���
+    点��。</p>
+
+    <p><code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> を使用���る場�����モジュール�
+    <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> �
+    <code>anon</code> ���値を設定�る���起動�れ��。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#anonymous">Anonymous</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_logemail">Anonymous_LogEmail</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_nouserid">Anonymous_NoUserID</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#anonymous_verifyemail">Anonymous_VerifyEmail</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#example">例</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="example" id="example">例</a></h2>
+    <p>以下�例�「普通�� htpasswd ファイル�基����証�組����れ�
+    �り�以下��件を見��ユーザを「ゲスト����許����:</p>
+
+    <ul>
+      <li>ユーザ� userID を入力���れ��り��ん。
+      (<code class="directive"><a href="#anonymous_nouserid">Anonymous_NoUserID</a></code>)</li>
+
+      <li>ユーザ�パスワードを入力���れ��り��ん。
+      (<code class="directive"><a href="#anonymous_mustgiveemail">Anonymous_MustGiveEmail</a></code>)</li>
+
+      <li>入力�れ�パスワード�有効�電�メールアドレス���れ�
+      �り��ん。<em>����</em>�少��も一�� '@' � '.' �
+      ��れ��る必���り��。
+      (<code class="directive"><a href="#anonymous_verifyemail">Anonymous_VerifyEmail</a></code>)</li>
+
+      <li>userID � <code>anonymous guest www test
+      welcome</code> ��れ����れ��り��ん。
+      ユーザ��比較�大文字�文字を区別<strong>���ん。</strong></li>
+
+      <li>パスワード欄�入力�れ�電�メールアドレス�エラーログファイル�
+      ロギング�れ��。
+      (<code class="directive"><a href="#anonymous_logemail">Anonymous_LogEmail</a></code>)</li>
+    </ul>
+
+    <div class="example"><h3>例</h3><p><code>
+      &lt;Directory /foo&gt;
+      <span class="indent">
+        AuthName "Use 'anonymous' &amp; Email address for guest entry"<br />
+        AuthType Basic<br />
+        AuthBasicProvider file anon<br />
+        AuthUserFile /path/to/your/.htpasswd<br />
+        <br />
+        Anonymous_NoUserID off<br />
+        Anonymous_MustGiveEmail on<br />
+        Anonymous_VerifyEmail on<br />
+        Anonymous_LogEmail on<br />
+        Anonymous anonymous guest www test welcome<br />
+        <br />
+        Order Deny,Allow<br />
+        Allow from all<br />
+        <br />
+        Require valid-user<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Anonymous" id="Anonymous">Anonymous</a> <a name="anonymous" id="anonymous">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>パスワード�検査無��アクセスを許��る userID を指定�る
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Anonymous <var>user</var> [<var>user</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_authn_anon</td></tr>
+</table>
+    <p>パスワード�検査を����アクセスを許��る「魔法�� userID を
+    設定���。userID 中�空白を使�るよ���る���
+    エスケープ文字 \ �よる方法��引用符 ' � " �よるクオーティング
+    を使��������。</p>
+
+    <p>ユーザ��比較�<strong>大文字�文字を区別���</strong>���
+    注�������。<br />
+    魔法�ユーザ� '<code>anonymous</code>' �許��れ��る userID �
+    �むよ���る���強�推奨�れ����。</p>
+
+    <div class="example"><h3>例:</h3><p><code>
+      Anonymous anonymous "Not Registered" "I don't know"
+    </code></p></div>
+
+    <p>�れ��userID "anonymous",
+    "AnonyMous", "Not Registered", "I Don't Know" ��れ�を使��も
+    パスワード無��ユーザ�サイト�入れるよ�����。</p>
+
+    <p>Apache 2.1 �� userID � "<code>*</code>" を指定�る�������。
+    ��場��<em>����</em>userID を許����。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Anonymous_LogEmail" id="Anonymous_LogEmail">Anonymous_LogEmail</a> <a name="anonymous_logemail" id="anonymous_logemail">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>入力�れ�パスワード�エラーログ�ロギング�れる����を
+設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Anonymous_LogEmail On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>Anonymous_LogEmail On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_authn_anon</td></tr>
+</table>
+    <p>デフォルト� <code>On</code> �設定�れ�場���
+    入力�れ� (�����電�メールアドレス��る���
+    期待�れる) 「パスワード��エラーログ�ロギング�れ��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Anonymous_MustGiveEmail" id="Anonymous_MustGiveEmail">Anonymous_MustGiveEmail</a> <a name="anonymous_mustgiveemail" id="anonymous_mustgiveemail">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>空パスワードを許��る����を指定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Anonymous_MustGiveEmail On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>Anonymous_MustGiveEmail On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_authn_anon</td></tr>
+</table>
+    <p>ユーザ�パスワード���電�メールアドレスを指定�る必���る����を
+    設定���。�れ�空パスワードを�止���。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Anonymous_NoUserID" id="Anonymous_NoUserID">Anonymous_NoUserID</a> <a name="anonymous_nouserid" id="anonymous_nouserid">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>空 userID を許��る�を指定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Anonymous_NoUserID On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>Anonymous_NoUserID Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_authn_anon</td></tr>
+</table>
+    <p><code>On</code> �設定�る��ユーザ� userID (���ら��
+    パスワード欄も) 空��る�������。�れ���リターンキーを
+    ���り OK ボタンを直接クリック��り�る MS-Explorer ユーザ��
+    �常�便利��。��よ���作�����自然�も���ょ�。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Anonymous_VerifyEmail" id="Anonymous_VerifyEmail">Anonymous_VerifyEmail</a> <a name="anonymous_verifyemail" id="anonymous_verifyemail">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>パスワード欄�正��形��電�メールアドレス��る��を
+調�る����を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Anonymous_VerifyEmail On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>Anonymous_VerifyEmail Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_authn_anon</td></tr>
+</table>
+    <p><code>On</code> �設定�れ��る場��ユーザ�有効�電�メール
+    アドレスを入力�る��を推奨�る���入力�れ�「パスワード��
+    少���も一�� '@' � '.' を�ん��る����を調���
+    (上� <code class="directive"><a href="#anonymous_logemail">Anonymous_LogEmail</a></code> �照)。</p>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authn_anon.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authn_anon.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authn_anon.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_anon.html.ko.euc-kr b/docs/manual/mod/mod_authn_anon.html.ko.euc-kr
index 00622df6..835c1129 100644
--- a/docs/manual/mod/mod_authn_anon.html.ko.euc-kr
+++ b/docs/manual/mod/mod_authn_anon.html.ko.euc-kr
@@ -206,6 +206,6 @@
 <a href="../ja/mod/mod_authn_anon.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authn_anon.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_dbd.html b/docs/manual/mod/mod_authn_dbd.html
index f86a5a66..0a3217f5 100644
--- a/docs/manual/mod/mod_authn_dbd.html
+++ b/docs/manual/mod/mod_authn_dbd.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_authn_dbd.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_authn_dbd.html.en b/docs/manual/mod/mod_authn_dbd.html.en
index cfe842bf..7c3f99e5 100644
--- a/docs/manual/mod/mod_authn_dbd.html.en
+++ b/docs/manual/mod/mod_authn_dbd.html.en
@@ -74,44 +74,39 @@
 <p>This simple example shows use of this module in the context of
 the Authentication and DBD frameworks.</p>
 <div class="example"><pre>
-#Database Management
+# mod_dbd configuration
+DBDriver pgsql
+DBDParams "dbname=apacheauth user=apache password=xxxxxx"
 
-#Use the PostgreSQL driver
-<code>DBDriver pgsql</code>
+DBDMin  4
+DBDKeep 8
+DBDMax  20
+DBDExptime 300
 
-#Connection string: database name and login credentials
-<code>DBDParams "dbname=htpasswd user=apache password=xxxxxx"</code>
+&lt;Directory /usr/www/myhost/private&gt;
+  # core authentication and mod_auth_basic configuration
+  # for mod_authn_dbd
+  AuthType Basic
+  AuthName "My Server"
+  AuthBasicProvider dbd
 
-#Parameters for Connection Pool Management
-<code>DBDMin  1
-DBDKeep 2
-DBDMax  10
-DBDExptime 60</code>
+  # core authorization configuration
+  Require valid-user
 
-#Authentication Section
-<code>&lt;Directory /usr/www/myhost/private&gt;</code>
-
-    #mod_auth configuration for authn_dbd
-    <code>AuthType Basic
-    AuthName "My Server"
-    AuthBasicProvider dbd</code>
-
-    #authz configuration
-    <code>Require valid-user</code>
-
-    #SQL query to verify a user
-    #(note: DBD drivers recognise both stdio-like %s and native syntax)
-    <code>AuthDBDUserPWQuery "select password from authn where username = %s"
-&lt;/Directory&gt;</code>
+  # mod_authn_dbd SQL query to authenticate a user
+  AuthDBDUserPWQuery \
+    "SELECT password FROM authn WHERE user = %s"
+&lt;/Directory&gt;
 </pre></div>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="exposed" id="exposed">Exposing Login Information</a></h2>
 
 <p>
-Whenever a query is made to the database server, all columns returned by
-the query are placed in the environment, using environment variables with
-the prefix "AUTHENTICATE_".
+If httpd was built against <a class="glossarylink" href="../glossary.html#apr" title="see glossary">APR</a> version 1.3.0
+or higher, then whenever a query is made to the database server, all
+column values in the first row returned by the query are placed in the
+environment, using environment variables with the prefix "AUTHENTICATE_".
 </p>
 <p>If a database query for example returned the username, full name
 and telephone number of a user, a CGI program will have access to
@@ -131,16 +126,22 @@ configuration required in some web applications.
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_authn_dbd</td></tr>
 </table>
     <p>The <code class="directive">AuthDBDUserPWQuery</code> specifies an
-    SQL query to look up a password for a specified user.
-    The query must take a single string (typically SQL varchar)
-    argument (username), and return a single value (encrypted password).
-    </p>
-    <div class="example"><p><code>
-    AuthDBDUserPWQuery "SELECT password FROM authn WHERE username = %s"
-    </code></p></div>
-    <p>If httpd was built against apr v1.3.0 or higher, any additional
-    columns specified in the select statement will be inserted into
-    the environment with the name <code>AUTHENTICATE_&lt;COLUMN&gt;</code>.
+    SQL query to look up a password for a specified user.  The user's ID
+    will be passed as a single string parameter when the SQL query is
+    executed.  It may be referenced within the query statement using
+    a <code>%s</code> format specifier.</p>
+    <div class="example"><h3>Example</h3><pre>
+AuthDBDUserPWQuery \
+  "SELECT password FROM authn WHERE user = %s"
+</pre></div>
+    <p>The first column value of the first row returned by the query
+    statement should be a string containing the encrypted password.
+    Subsequent rows will be ignored.  If no rows are returned, the user
+    will not be authenticated through <code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code>.</p>
+    <p>If httpd was built against <a class="glossarylink" href="../glossary.html#apr" title="see glossary">APR</a> version 1.3.0
+    or higher, any additional column values in the first row returned by
+    the query statement will be stored as environment variables with
+    names of the form <code>AUTHENTICATE_<var>COLUMN</var></code>.
     </p>
 
 </div>
@@ -156,24 +157,28 @@ configuration required in some web applications.
 </table>
     <p>The <code class="directive">AuthDBDUserRealmQuery</code> specifies an
     SQL query to look up a password for a specified user and realm.
-    The query must take two string (typically SQL varchar) arguments
-    (username and realm), and return a single value (encrypted password).
-    </p>
-    <div class="example"><p><code>
-    AuthDBDUserRealmQuery "SELECT password FROM authn
-                              WHERE username = %s AND realm = %s"
-    </code></p></div>
-    <p>If httpd was built against apr v1.3.0 or higher, any additional
-    columns specified in the select statement will be inserted into
-    the environment with the name <code>AUTHENTICATE_&lt;COLUMN&gt;</code>.
+    The user's ID and the realm, in that order, will be passed as string
+    parameters when the SQL query is executed.  They may be referenced
+    within the query statement using <code>%s</code> format specifiers.</p>
+    <div class="example"><h3>Example</h3><pre>
+AuthDBDUserRealmQuery \
+  "SELECT password FROM authn WHERE user = %s AND realm = %s"
+</pre></div>
+    <p>The first column value of the first row returned by the query
+    statement should be a string containing the encrypted password.
+    Subsequent rows will be ignored.  If no rows are returned, the user
+    will not be authenticated through <code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code>.</p>
+    <p>If httpd was built against <a class="glossarylink" href="../glossary.html#apr" title="see glossary">APR</a> version 1.3.0
+    or higher, any additional column values in the first row returned by
+    the query statement will be stored as environment variables with
+    names of the form <code>AUTHENTICATE_<var>COLUMN</var></code>.
     </p>
 
-
 </div>
 </div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_authn_dbd.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_dbm.html b/docs/manual/mod/mod_authn_dbm.html
index a4472a2c..e4cb7d7a 100644
--- a/docs/manual/mod/mod_authn_dbm.html
+++ b/docs/manual/mod/mod_authn_dbm.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_authn_dbm.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_authn_dbm.html.ja.euc-jp
+URI: mod_authn_dbm.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_authn_dbm.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_authn_dbm.html.en b/docs/manual/mod/mod_authn_dbm.html.en
index 2d396ba0..5b457bc4 100644
--- a/docs/manual/mod/mod_authn_dbm.html.en
+++ b/docs/manual/mod/mod_authn_dbm.html.en
@@ -131,6 +131,6 @@ passwords for authentication</td></tr>
 <a href="../ja/mod/mod_authn_dbm.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authn_dbm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_dbm.html.ja.euc-jp b/docs/manual/mod/mod_authn_dbm.html.ja.euc-jp
deleted file mode 100644
index 3c648dc7..00000000
--- a/docs/manual/mod/mod_authn_dbm.html.ja.euc-jp
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_authn_dbm - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_authn_dbm</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authn_dbm.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authn_dbm.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authn_dbm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>DBM ¥Õ¥¡¥¤¥ë¤òÍѤ¤¤¿¥æ¡¼¥¶Ç§¾Ú</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>authn_dbm_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_authn_dbm.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.1 °Ê¹ß</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>Ëܥ⥸¥å¡¼¥ë¤Ï <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code> ¤ä
-    <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> ¤È¤¤¤Ã¤¿Ç§¾Ú¥Õ¥í¥ó¥È¥¨¥ó¥É¤ËÂФ·¤Æ¡¢
-    <dfn>dbm</dfn> ¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ëÆ⤫¤é¤Î¥æ¡¼¥¶¸¡º÷¤Ë¤è¤ë
-    ¥æ¡¼¥¶Ç§¾Úµ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£»÷¤¿¤è¤¦¤Êµ¡Ç½¤Ï <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>
-    ¤Ç¤âÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p><code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> ¤ä <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>
-    ¤ò»ÈÍѤ¹¤ëºÝ¤Ë¤Ï¡¢¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï
-    <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> ¤ä
-    <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprivider">AuthDigestPrivider</a></code>
-    ¤Ç <code>dbm</code> ¤È»ØÄꤹ¤ë¤³¤È¤Çµ¯Æ°¤µ¤ì¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#authdbmtype">AuthDBMType</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authdbmuserfile">AuthDBMUserFile</a></li>
-</ul>
-<h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="directive"><a href="../mod/core.html#authname">AuthName</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#authtype">AuthType</a></code></li>
-<li>
-  <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code>
-</li>
-<li>
-  <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</a></code>
-</li>
-</ul></div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthDBMType" id="AuthDBMType">AuthDBMType</a> <a name="authdbmtype" id="authdbmtype">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Ñ¥¹¥ï¡¼¥É¤òÊݸ¤¹¤ë¤¿¤á¤ËɬÍפʥǡ¼¥¿¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¼ïÎà¤ò
-ÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AuthDBMType default|SDBM|GDBM|NDBM|DB</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>AuthDBMType default</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_authn_dbm</td></tr>
-</table>
-    <p>¥Ñ¥¹¥ï¡¼¥É¤òÊݸ¤¹¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë¥Ç¡¼¥¿¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¼ïÎà¤ò
-    ÀßÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¼ïÎà¤Ï¥³¥ó¥Ñ¥¤¥ë»þ¤Ë·è¤Þ¤ê¤Þ¤¹¡£
-    ¾¤Î¼ïÎà¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬»ÈÍѲÄǽ¤«¤É¤¦¤«¤â <a href="../install.html#dbm">¥³¥ó¥Ñ¥¤¥ë»þ¤ÎÀßÄê</a>¤Ë°Í¸¤·¤Þ¤¹¡£</p>
-
-    <p>¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë¤Î¤Ë»ÈÍѤ¹¤ë¥×¥í¥°¥é¥à¤¬Æ±¤¸¼ïÎà¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò
-    »ÈÍѤ¹¤ë¤è¤¦¤ËÀßÄꤹ¤ë¤³¤È¤ÏÈó¾ï¤Ë½ÅÍפǤ¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthDBMUserFile" id="AuthDBMUserFile">AuthDBMUserFile</a> <a name="authdbmuserfile" id="authdbmuserfile">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ǧ¾ÚÍѤΥ桼¥¶¤È¥Ñ¥¹¥ï¡¼¥É¤Î¥ê¥¹¥È¤òÊÝ»ý¤·¤Æ¤¤¤ë
-¥Ç¡¼¥¿¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë̾¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AuthDBMUserFile <var>file-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_authn_dbm</td></tr>
-</table>
-    <p><code class="directive">AuthDBMUserFile</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ǧ¾ÚÍѤΥ桼¥¶¤È¥Ñ¥¹¥ï¡¼¥É¤Î¥ê¥¹¥È¤òÊÝ»ý¤·¤Æ¤¤¤ë DBM ¥Õ¥¡¥¤¥ë¤Î
-    ̾Á°¤òÀßÄꤷ¤Þ¤¹¡£<var>File-path</var> ¤Ï¥æ¡¼¥¶¥Õ¥¡¥¤¥ë¤Ø¤Î
-    ÀäÂХѥ¹¤Ç¤¹¡£</p>
-
-    <p>¥æ¡¼¥¶¥Õ¥¡¥¤¥ë¤Î¥­¡¼¤Ï¥æ¡¼¥¶Ì¾¤Ç¤¹¡£¥æ¡¼¥¶¤ËÂФ·¤ÆÊÖ¤µ¤ì¤ëÃͤÏ
-    °Å¹æ²½¤µ¤ì¤¿¥Ñ¥¹¥ï¡¼¥É¤Ç¡¢¤½¤Î¸å¤Ë¡¢¥³¥í¥ó¤Ë³¤¤¤ÆǤ°Õ¤Î¥Ç¡¼¥¿¤¬
-    ³¤¤¤Æ¤¤¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¡£¥³¥í¥ó¤È¤½¤Î¸å¤Î¥Ç¡¼¥¿¤Ï¥µ¡¼¥Ð¤Ï
-    ̵»ë¤·¤Þ¤¹¡£</p>
-
-    <div class="warning"><h3>¥»¥­¥å¥ê¥Æ¥£</h3>
-      <p><code class="directive">AuthDBMUserFile </code> ¤Ï¡¢
-      ¥¦¥§¥Ö¥µ¡¼¥Ð¤Î¥É¥­¥å¥á¥ó¥È¥Ä¥ê¡¼¤Î³°Â¦¤ËÊݴɤ¹¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-      Êݸ¤è¤¦¤È¤·¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Ë¤Ï
-      <strong>ÃÖ¤«¤Ê¤¤¤Ç²¼¤µ¤¤</strong>¡£
-      ¤½¤¦¤·¤Ê¤¤¤È¥¯¥é¥¤¥¢¥ó¥È¤¬ <code class="directive">AuthUserFile</code> ¤ò
-      ¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Æ¤·¤Þ¤¤¤Þ¤¹¡£</p>
-    </div>
-
-    <p>½ÅÍפʸߴ¹À­¤Ë´Ø¤¹¤ëÃí°Õ: apache module ¤Î <code>dbmopen</code> ¤Î¼ÂÁõ¤Ï
-    ʸ»úÎó¤¬ NULL ¤Ç½ª¤ï¤Ã¤Æ¤¤¤ë¤³¤È¤Ë°Í¸¤¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢DBM ¥Ç¡¼¥¿¥¹¥È¥é¥¯¥Á¥ã
-    ¤Î¥Ï¥Ã¥·¥åÃͤÎʸ»úÎó¤ÎŤµ¤òÆɤ߼è¤ê¤Þ¤¹¡£Netscape ¥¦¥§¥Ö¥µ¡¼¥Ð¤Ê¤É¡¢
-    ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÎÃæ¤Ë¤Ïʸ»úÎó¤¬ NULL ¤Ç½ª¤ï¤Ã¤Æ¤¤¤ë¤³¤È¤Ë°Í¸¤·¤Æ¤¤¤ë
-    ¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢°Û¤Ê¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó´Ö¤Ç¤Î DBM ¥Õ¥¡¥¤¥ë¤Î
-    »ÈÍѤËÌäÂ꤬¤¢¤ë¾ì¹ç¤Ï¡¢¤³¤ì¤¬¸¶°ø¤Ë¤Ê¤Ã¤Æ¤¤¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>Apache ¤Ë¤Ï <code class="program"><a href="../programs/dbmmanage.html">dbmmanage</a></code> ¤È¤¤¤¦
-    perl ¥¹¥¯¥ê¥×¥È¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥×¥í¥°¥é¥à¤ò»È¤Ã¤Æ¤³¤Î
-    ¥â¥¸¥å¡¼¥ë¤¬»ÈÍѤ¹¤ë DBM ¥Õ¥©¡¼¥Þ¥Ã¥È¤Î¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤¿¤ê
-    ¹¹¿·¤·¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authn_dbm.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authn_dbm.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authn_dbm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_dbm.html.ja.utf8 b/docs/manual/mod/mod_authn_dbm.html.ja.utf8
new file mode 100644
index 00000000..c6651b13
--- /dev/null
+++ b/docs/manual/mod/mod_authn_dbm.html.ja.utf8
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_authn_dbm - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_authn_dbm</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authn_dbm.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authn_dbm.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authn_dbm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>DBM ファイルを用��ユーザ�証</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>authn_dbm_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_authn_dbm.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>Apache 2.1 以�</td></tr></table>
+<h3>概�</h3>
+
+    <p>本モジュール� <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code> や
+    <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> �����証フロントエンド�対���
+    <dfn>dbm</dfn> パスワードファイル内�ら�ユーザ検索�よる
+    ユーザ�証機能を�供���。似�よ��機能� <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>
+    �も�供�れ����。</p>
+
+    <p><code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> ã‚„ <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>
+    を使用�る際�����モジュール�
+    <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> ã‚„
+    <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprivider">AuthDigestPrivider</a></code>
+    � <code>dbm</code> �指定�る���起動�れ��。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#authdbmtype">AuthDBMType</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#authdbmuserfile">AuthDBMUserFile</a></li>
+</ul>
+<h3>�照</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/core.html#authname">AuthName</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#authtype">AuthType</a></code></li>
+<li>
+  <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code>
+</li>
+<li>
+  <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</a></code>
+</li>
+</ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthDBMType" id="AuthDBMType">AuthDBMType</a> <a name="authdbmtype" id="authdbmtype">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>パスワードを�存�る���必��データベースファイル�種類を
+設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AuthDBMType default|SDBM|GDBM|NDBM|DB</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>AuthDBMType default</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_authn_dbm</td></tr>
+</table>
+    <p>パスワードを�存�る���使用�るデータベースファイル�種類を
+    設定���。デフォルト�データベース�種類�コンパイル時�決�り��。
+    他�種類�データベース�使用�能����も <a href="../install.html#dbm">コンパイル時�設定</a>��存���。</p>
+
+    <p>パスワードファイルを作��る��使用�るプログラム���種類�データベースを
+    使用�るよ��設定�る����常�����。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthDBMUserFile" id="AuthDBMUserFile">AuthDBMUserFile</a> <a name="authdbmuserfile" id="authdbmuserfile">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�証用�ユーザ�パスワード�リストを�����る
+データベースファイル�を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AuthDBMUserFile <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_authn_dbm</td></tr>
+</table>
+    <p><code class="directive">AuthDBMUserFile</code> ディレクティブ�
+    �証用�ユーザ�パスワード�リストを�����る DBM ファイル�
+    ��を設定���。<var>File-path</var> �ユーザファイル��
+    絶対パス��。</p>
+
+    <p>ユーザファイル�キー�ユーザ���。ユーザ�対��返�れる値�
+    暗�化�れ�パスワード����後��コロン�続��任��データ�
+    続���る��も�り��。コロン���後�データ�サー��
+    無視���。</p>
+
+    <div class="warning"><h3>セキュリティ</h3>
+      <p><code class="directive">AuthDBMUserFile </code> ��
+      ウェブサー��ドキュメントツリー�外���管�るよ��������。
+      �護�よ�����るディレクトリ以下��
+      <strong>置����下��</strong>。
+      ������クライアント� <code class="directive">AuthUserFile</code> を
+      ダウンロード��������。</p>
+    </div>
+
+    <p>���互�性�関�る注�: apache module � <code>dbmopen</code> �実装�
+    文字列� NULL �終����る����存�る������DBM データストラク�ャ
+    ��ッシュ値�文字列�長�を読��り��。Netscape ウェブサー����
+    アプリケーション�中��文字列� NULL �終����る����存���る
+    も���り��。���ら�異�るアプリケーション間�� DBM ファイル�
+    使用��題��る場����れ�原因�����る�能性��り��。</p>
+
+    <p>Apache �� <code class="program"><a href="../programs/dbmmanage.html">dbmmanage</a></code> ���
+    perl スクリプト���れ����。��プログラムを使����
+    モジュール�使用�る DBM フォーマット�パスワードファイルを作���り
+    更新��り�る�������。</p>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authn_dbm.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authn_dbm.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authn_dbm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_dbm.html.ko.euc-kr b/docs/manual/mod/mod_authn_dbm.html.ko.euc-kr
index a6af5108..accadbd5 100644
--- a/docs/manual/mod/mod_authn_dbm.html.ko.euc-kr
+++ b/docs/manual/mod/mod_authn_dbm.html.ko.euc-kr
@@ -126,6 +126,6 @@
 <a href="../ja/mod/mod_authn_dbm.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authn_dbm.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_default.html b/docs/manual/mod/mod_authn_default.html
index 9a1beb27..1c491160 100644
--- a/docs/manual/mod/mod_authn_default.html
+++ b/docs/manual/mod/mod_authn_default.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_authn_default.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_authn_default.html.ja.euc-jp
+URI: mod_authn_default.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_authn_default.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_authn_default.html.en b/docs/manual/mod/mod_authn_default.html.en
index ed938fa2..cd0eba03 100644
--- a/docs/manual/mod/mod_authn_default.html.en
+++ b/docs/manual/mod/mod_authn_default.html.en
@@ -75,6 +75,6 @@ modules</td></tr>
 <a href="../ja/mod/mod_authn_default.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authn_default.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_default.html.ja.euc-jp b/docs/manual/mod/mod_authn_default.html.ja.euc-jp
deleted file mode 100644
index 0d8bfd6c..00000000
--- a/docs/manual/mod/mod_authn_default.html.ja.euc-jp
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_authn_default - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_authn_default</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authn_default.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authn_default.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authn_default.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>ǧ¾Ú¥Õ¥©¡¼¥ë¥Ð¥Ã¥¯¥â¥¸¥å¡¼¥ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>authn_default_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_authn_default.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.1 °Ê¹ß</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p><code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> ¤Î¤è¤¦¤Êǧ¾Ú¥â¥¸¥å¡¼¥ë¤ò
-    ÀßÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢Ëܥ⥸¥å¡¼¥ë¤¬¥Õ¥©¡¼¥ë¥Ð¥Ã¥¯¤È¤Ê¤ê¤Þ¤¹¡£
-    ¥æ¡¼¥¶¤«¤éÄ󼨤µ¤ì¤¿¤É¤ó¤Ê¾Ú½ñ¤âñ¤ËµñÈݤ·¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#authdefaultauthoritative">AuthDefaultAuthoritative</a></li>
-</ul>
-</div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthDefaultAuthoritative" id="AuthDefaultAuthoritative">AuthDefaultAuthoritative</a> <a name="authdefaultauthoritative" id="authdefaultauthoritative">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¼¡¤ÎÄ㼡¥ì¥Ù¥ë¤Îǧ¾Ú¥â¥¸¥å¡¼¥ë¤ËÀ©¸æ¤òÅϤ¹¤«¤É¤¦¤«¤ò
-ÀßÄꤷ¤Þ¤¹</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AuthDefaultAuthoritative On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>AuthDefaultAuthoritative On</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_authn_default</td></tr>
-</table>
-    <p><code class="directive">AuthDefaultAuthoritative</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    ÌÀ¼¨Åª¤Ë <code>Off</code> ¤ËÀßÄꤹ¤ë¤È¡¢
-    ǧ¾Ú¤ò¼¡¤Î (<code>modules.c</code> ¥Õ¥¡¥¤¥ë¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë)
-    Ä㼡¥ì¥Ù¥ë¤Î¥â¥¸¥å¡¼¥ë¤ËÅϤ·¤Þ¤¹¡£
-    </p>
-
-    <div class="note"><h3>Ãí°Õ</h3>
-      <p><code class="module"><a href="../mod/mod_authn_default.html">mod_authn_default</a></code> ¼«ÂΤ¬<em>¤È¤Æ¤âÄ㤤</em>
-      ¥ì¥Ù¥ë¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¤Î¤Ç¡¢Ä̾ï¤Ï¤³¤ì¤è¤ê¤âÄ㼡¤Î
-      ¥â¥¸¥å¡¼¥ë¤Ï¸ºß¤·¤Þ¤»¤ó¡£¤Ç¤¹¤«¤é
-      <code class="directive">AuthDefaultAuthoritative</code> ¤Ï¥Ç¥Õ¥©¥ë¥È
-      (<code>On</code>) ¤Î¤Þ¤Þ¤Ë¤·¤¿¤Û¤¦¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£</p>
-    </div>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authn_default.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authn_default.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authn_default.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_default.html.ja.utf8 b/docs/manual/mod/mod_authn_default.html.ja.utf8
new file mode 100644
index 00000000..71a7c6d4
--- /dev/null
+++ b/docs/manual/mod/mod_authn_default.html.ja.utf8
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_authn_default - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_authn_default</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authn_default.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authn_default.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authn_default.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>�証フォール�ックモジュール</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>authn_default_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_authn_default.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>Apache 2.1 以�</td></tr></table>
+<h3>概�</h3>
+
+    <p><code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> �よ���証モジュールを
+    設定�����場���本モジュール�フォール�ック��り��。
+    ユーザ�ら�示�れ��ん�証書も��拒����。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#authdefaultauthoritative">AuthDefaultAuthoritative</a></li>
+</ul>
+</div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthDefaultAuthoritative" id="AuthDefaultAuthoritative">AuthDefaultAuthoritative</a> <a name="authdefaultauthoritative" id="authdefaultauthoritative">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>次�低次レベル��証モジュール�制御を渡�����を
+設定���</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AuthDefaultAuthoritative On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>AuthDefaultAuthoritative On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_authn_default</td></tr>
+</table>
+    <p><code class="directive">AuthDefaultAuthoritative</code> ディレクティブを
+    明示的� <code>Off</code> �設定�る��
+    �証を次� (<code>modules.c</code> ファイル�定義�れ��る)
+    低次レベル�モジュール�渡���。
+    </p>
+
+    <div class="note"><h3>注�</h3>
+      <p><code class="module"><a href="../mod/mod_authn_default.html">mod_authn_default</a></code> 自体�<em>��も低�</em>
+      レベル���定義�れ�������通常��れよりも低次�
+      モジュール�存在���ん。���ら
+      <code class="directive">AuthDefaultAuthoritative</code> �デフォルト
+      (<code>On</code>) ���������良���ょ�。</p>
+    </div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authn_default.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authn_default.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authn_default.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_default.html.ko.euc-kr b/docs/manual/mod/mod_authn_default.html.ko.euc-kr
index 36ea80d9..afdd70b3 100644
--- a/docs/manual/mod/mod_authn_default.html.ko.euc-kr
+++ b/docs/manual/mod/mod_authn_default.html.ko.euc-kr
@@ -71,6 +71,6 @@
 <a href="../ja/mod/mod_authn_default.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authn_default.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_file.html b/docs/manual/mod/mod_authn_file.html
index d3f6ce2a..1f67fc3f 100644
--- a/docs/manual/mod/mod_authn_file.html
+++ b/docs/manual/mod/mod_authn_file.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_authn_file.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_authn_file.html.ja.euc-jp
+URI: mod_authn_file.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_authn_file.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_authn_file.html.en b/docs/manual/mod/mod_authn_file.html.en
index e032e919..21bc60ab 100644
--- a/docs/manual/mod/mod_authn_file.html.en
+++ b/docs/manual/mod/mod_authn_file.html.en
@@ -127,6 +127,6 @@ passwords for authentication</td></tr>
 <a href="../ja/mod/mod_authn_file.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authn_file.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_file.html.ja.euc-jp b/docs/manual/mod/mod_authn_file.html.ja.euc-jp
deleted file mode 100644
index 8210ad67..00000000
--- a/docs/manual/mod/mod_authn_file.html.ja.euc-jp
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_authn_file - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_authn_file</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authn_file.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authn_file.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authn_file.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤òÍѤ¤¤¿¥æ¡¼¥¶Ç§¾Ú</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>authn_file_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_authn_file.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.1 °Ê¹ß</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>Ëܥ⥸¥å¡¼¥ë¤Ï <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code> ¤ä
-    <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> ¤È¤¤¤Ã¤¿Ç§¾Ú¥Õ¥í¥ó¥È¥¨¥ó¥É¤ËÂФ·¤Æ¡¢
-    ¥×¥ì¥¤¥ó¥Æ¥­¥¹¥È¤Î¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ëÆ⤫¤é¥æ¡¼¥¶¤ò¸¡º÷¤¹¤ë¤³¤È¤Ç¡¢
-    ¥æ¡¼¥¶Ç§¾Úµ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£»÷¤¿¤è¤¦¤Êµ¡Ç½¤Ï <code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code>
-    ¤Ç¤âÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p><code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> ¤ä <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>
-    ¤ò»ÈÍѤ¹¤ëºÝ¤Ë¤Ï¡¢
-    <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> ¤ä
-    <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprivider">AuthDigestPrivider</a></code>
-    ¤Ç <code>file</code> ¤È»ØÄꤹ¤ë¤³¤È¤Ç¤³¤Î¥â¥¸¥å¡¼¥ë¤Ïµ¯Æ°¤µ¤ì¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#authuserfile">AuthUserFile</a></li>
-</ul>
-<h3>»²¾È</h3>
-<ul class="seealso">
-<li>
-  <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code>
-</li>
-<li>
-  <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</a></code>
-</li>
-<li><code class="program"><a href="../programs/htpasswd.html">htpasswd</a></code></li>
-<li><code class="program"><a href="../programs/htdigest.html">htdigest</a></code></li>
-</ul></div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthUserFile" id="AuthUserFile">AuthUserFile</a> <a name="authuserfile" id="authuserfile">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ǧ¾Ú¤Ë»ÈÍѤ¹¤ë¥æ¡¼¥¶¤È¥Ñ¥¹¥ï¡¼¥É¤Î°ìÍ÷¤¬³ÊǼ¤µ¤ì¤Æ¤¤¤ë¡¢
-¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AuthUserFile <var>file-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_authn_file</td></tr>
-</table>
-    <p><code class="directive">AuthUserFile</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥æ¡¼¥¶Ç§¾Ú¤Î¤¿¤á¤Î¥æ¡¼¥¶¤È¥Ñ¥¹¥ï¡¼¥É¤Î°ìÍ÷¤ò³ÊǼ¤·¤¿
-    ¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÀßÄꤷ¤Þ¤¹¡£<var>file-path</var>
-    ¤Ï¥æ¡¼¥¶¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤Ç¤¹¡£
-    ¤â¤·ÀäÂХѥ¹¤Ç¤Ê¤±¤ì¤Ð¡¢
-    <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
-    ¤«¤é¤ÎÁêÂХѥ¹¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£</p>
-
-    <p>¥æ¡¼¥¶¥Õ¥¡¥¤¥ë¤Î³Æ¹Ô¤Ë¤Ï¡¢¥æ¡¼¥¶Ì¾¡¢¥³¥í¥ó¡¢
-    °Å¹æ²½¤·¤¿¥Ñ¥¹¥ï¡¼¥É¤òµ­½Ò¤·¤Þ¤¹¡£
-    Ʊ°ì¥æ¡¼¥¶ ID ¤¬Ê£¿ô²óÅÐÏ¿¤µ¤ì¤¿»þ¤Ï¡¢
-    <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>
-    ¤ÏºÇ½é¤Ë¸«¤Ä¤«¤Ã¤¿¥Ñ¥¹¥ï¡¼¥É¤ò»ÈÍѤ·¤Æǧ¾Ú¤·¤Þ¤¹¡£</p>
-
-    <p>¥Ð¥¤¥Ê¥êÇÛÉۤΰìÉô¤È¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤ë¤«¡¢
-    ¤¢¤ë¤¤¤Ï <code>src/support</code> ¤Ë¤¢¤ë
-    <code class="program"><a href="../programs/htpasswd.html">htpasswd</a></code>
-    ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤Ç¡¢¤³¤Î <em>HTTP ´ðËÜǧ¾Ú</em>
-    Íѥѥ¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤ò¥á¥¤¥ó¥Æ¥Ê¥ó¥¹¤·¤Þ¤¹¡£
-    ¾ÜºÙ¤Ï <a href="../programs/htpasswd.html">man
-    ¥Ú¡¼¥¸</a>¤ò¤´Í÷ĺ¤¯¤È¤·¤Æ¡¢´Êñ¤Ë¤Ï:</p>
-
-    <p>½é´ü ID <code>username</code> ¤Ç¡¢<code>Filename</code>
-    ¤È¤¤¤¦¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£
-    ¼¡¤Î¥³¥Þ¥ó¥É¤òȯ¹Ô¤¹¤ë¤È¥Ñ¥¹¥ï¡¼¥É¤¬Í׵ᤵ¤ì¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      htpasswd -c Filename username
-    </code></p></div>
-
-    <p>¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë <code>Filename</code> ¤Ë¡¢<code>username2</code>
-    ¤òÄɲä·¤¿¤ê½¤Àµ¤·¤¿¤ê¤·¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      htpasswd Filename username2
-    </code></p></div>
-
-    <p>(ÌõÃí: Èó¾ï¤Ë¿¤¯¤Î¥æ¡¼¥¶¤òÅÐÏ¿¤¹¤ë¤ÈÂ礭¤Ê¥Õ¥¡¥¤¥ë¤Ë¤Ê¤ê¤Þ¤¹¤¬)
-    Â礭¤Ê¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤¹¤ë¤Î¤Ï<em>Èó¾ï¤Ë¸úΨ¤¬°­¤¤</em>
-    ¤È¤¤¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¤½¤Î¤è¤¦¤ÊɬÍפΤ¢¤ë»þ¤Ï¡¢
-    <code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code>
-    ¤òÂå¤ï¤ê¤Ë»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p><em>HTTP ¥À¥¤¥¸¥§¥¹¥Èǧ¾Ú</em>¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢
-    <a href="../programs/htpasswd.html">htpasswd</a>
-    ¥×¥í¥°¥é¥à¤Ç¤ÏÉÔ½½Ê¬¤Ç¤¹¡£¤½¤ÎÂå¤ï¤ê¤Ë
-    <code class="program"><a href="../programs/htdigest.html">htdigest</a></code>
-    ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£¥À¥¤¥¸¥§¥¹¥Èǧ¾ÚÍѤΥǡ¼¥¿¤È
-    ´ðËÜǧ¾ÚÍѤΥǡ¼¥¿¤òƱ°ì¥Õ¥¡¥¤¥ë¤Ëº®¤¼¤ÆÊݸ¤Ç¤­¤Ê¤¤¡¢
-    ¤È¤¤¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <div class="warning"><h3>¥»¥­¥å¥ê¥Æ¥£</h3>
-    <p><code class="directive">AuthUserFile </code>
-        ¤Ï¡¢¥¦¥§¥Ö¥µ¡¼¥Ð¤Î¥É¥­¥å¥á¥ó¥È¥Ä¥ê¡¼¤Î³°Â¦¤ËÊݴɤ¹¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-        Êݸ¤è¤¦¤È¤·¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Ë¤Ï¡¢<strong>ÃÖ¤«¤Ê¤¤¤Ç²¼¤µ¤¤</strong>¡£
-        ¤½¤¦¤·¤Ê¤¤¤È <code class="directive">AuthUserFile</code> ¤Ï
-        ¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Æ¤·¤Þ¤¤¤Þ¤¹¡£</p>
-    </div>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authn_file.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authn_file.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authn_file.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_file.html.ja.utf8 b/docs/manual/mod/mod_authn_file.html.ja.utf8
new file mode 100644
index 00000000..b07863de
--- /dev/null
+++ b/docs/manual/mod/mod_authn_file.html.ja.utf8
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_authn_file - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_authn_file</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authn_file.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authn_file.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authn_file.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>テキストファイルを用��ユーザ�証</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>authn_file_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_authn_file.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>Apache 2.1 以�</td></tr></table>
+<h3>概�</h3>
+
+    <p>本モジュール� <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code> や
+    <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> �����証フロントエンド�対���
+    プレインテキスト�パスワードファイル内�らユーザを検索�る����
+    ユーザ�証機能を�供���。似�よ��機能� <code class="module"><a href="../mod/mod_authn_dbm.html">mod_authn_dbm</a></code>
+    �も�供�れ����。</p>
+
+    <p><code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> ã‚„ <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code>
+    を使用�る際���
+    <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> ã‚„
+    <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprivider">AuthDigestPrivider</a></code>
+    � <code>file</code> �指定�る�����モジュール�起動�れ��。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#authuserfile">AuthUserFile</a></li>
+</ul>
+<h3>�照</h3>
+<ul class="seealso">
+<li>
+  <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code>
+</li>
+<li>
+  <code class="directive"><a href="../mod/mod_auth_digest.html#authdigestprovider">AuthDigestProvider</a></code>
+</li>
+<li><code class="program"><a href="../programs/htpasswd.html">htpasswd</a></code></li>
+<li><code class="program"><a href="../programs/htdigest.html">htdigest</a></code></li>
+</ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthUserFile" id="AuthUserFile">AuthUserFile</a> <a name="authuserfile" id="authuserfile">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�証�使用�るユーザ�パスワード�一覧�格��れ��る�
+テキストファイル���を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AuthUserFile <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_authn_file</td></tr>
+</table>
+    <p><code class="directive">AuthUserFile</code> ディレクティブ��
+    ユーザ�証����ユーザ�パスワード�一覧を格���
+    テキストファイル���を設定���。<var>file-path</var>
+    �ユーザファイル��パス��。
+    も�絶対パス���れ��
+    <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
+    �ら�相対パス���扱�れ��。</p>
+
+    <p>ユーザファイル��行���ユーザ��コロン�
+    暗�化��パスワードを記述���。
+    �一ユーザ ID �複数回登録�れ�時��
+    <code class="module"><a href="../mod/mod_authn_file.html">mod_authn_file</a></code>
+    �最��見����パスワードを使用���証���。</p>
+
+    <p>�イナリ�布�一部���インストール�れる��
+    �る�� <code>src/support</code> ��る
+    <code class="program"><a href="../programs/htpasswd.html">htpasswd</a></code>
+    ユーティリティ���� <em>HTTP 基本�証</em>
+    用パスワードファイルをメインテナンス���。
+    詳細� <a href="../programs/htpasswd.html">man
+    ページ</a>を�覧頂�����簡���:</p>
+
+    <p>�期 ID <code>username</code> ��<code>Filename</code>
+    ���パスワードファイルを生����。
+    次�コマンドを発行�る�パスワード��求�れ��:</p>
+
+    <div class="example"><p><code>
+      htpasswd -c Filename username
+    </code></p></div>
+
+    <p>パスワードファイル <code>Filename</code> ��<code>username2</code>
+    を追加��り修正��り���:</p>
+
+    <div class="example"><p><code>
+      htpasswd Filename username2
+    </code></p></div>
+
+    <p>(訳注: �常�多��ユーザを登録�る�大��ファイル��り���)
+    大��テキストファイルを検索�る��<em>�常�効率�悪�</em>
+    ������注�������。��よ��必���る時��
+    <code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code>
+    を代�り�使������。</p>
+
+    <p><em>HTTP ダイジェスト�証</em>を使用�る場���
+    <a href="../programs/htpasswd.html">htpasswd</a>
+    プログラム����分��。��代�り�
+    <code class="program"><a href="../programs/htdigest.html">htdigest</a></code>
+    を使用������。ダイジェスト�証用�データ�
+    基本�証用�データを�一ファイル�混���存�����
+    ������注�������。</p>
+
+    <div class="warning"><h3>セキュリティ</h3>
+    <p><code class="directive">AuthUserFile </code>
+        ��ウェブサー��ドキュメントツリー�外���管�るよ��������。
+        �護�よ�����るディレクトリ以下���<strong>置����下��</strong>。
+        ������ <code class="directive">AuthUserFile</code> �
+        ダウンロード��������。</p>
+    </div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authn_file.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authn_file.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authn_file.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authn_file.html.ko.euc-kr b/docs/manual/mod/mod_authn_file.html.ko.euc-kr
index 3b263038..f21605c1 100644
--- a/docs/manual/mod/mod_authn_file.html.ko.euc-kr
+++ b/docs/manual/mod/mod_authn_file.html.ko.euc-kr
@@ -124,6 +124,6 @@
 <a href="../ja/mod/mod_authn_file.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authn_file.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authnz_ldap.html b/docs/manual/mod/mod_authnz_ldap.html
index 54401c84..7fdb47e0 100644
--- a/docs/manual/mod/mod_authnz_ldap.html
+++ b/docs/manual/mod/mod_authnz_ldap.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_authnz_ldap.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_authnz_ldap.html.en b/docs/manual/mod/mod_authnz_ldap.html.en
index 38708508..2cd3b9d9 100644
--- a/docs/manual/mod/mod_authnz_ldap.html.en
+++ b/docs/manual/mod/mod_authnz_ldap.html.en
@@ -463,7 +463,7 @@ uniqueMember: cn=Fred User, o=Airius<br />
         Grant access to anyone who exists in the LDAP directory,
         using their UID for searches. 
 <div class="example"><p><code>
-AuthLDAPURL ldap://ldap1.airius.com:389/ou=People, o=Airius?uid?sub?(objectClass=*)<br />
+AuthLDAPURL "ldap://ldap1.airius.com:389/ou=People, o=Airius?uid?sub?(objectClass=*)"<br />
 Require valid-user
 </code></p></div>
       </li>
@@ -472,7 +472,7 @@ Require valid-user
         The next example is the same as above; but with the fields
         that have useful defaults omitted. Also, note the use of a
         redundant LDAP server. 
-<div class="example"><p><code>AuthLDAPURL ldap://ldap1.airius.com ldap2.airius.com/ou=People, o=Airius<br />
+<div class="example"><p><code>AuthLDAPURL "ldap://ldap1.airius.com ldap2.airius.com/ou=People, o=Airius"<br />
 Require valid-user
 </code></p></div>
       </li>
@@ -487,7 +487,7 @@ Require valid-user
         choose an attribute that is guaranteed unique in your
         directory, such as <code>uid</code>. 
 <div class="example"><p><code>
-AuthLDAPURL ldap://ldap.airius.com/ou=People, o=Airius?cn<br />
+AuthLDAPURL "ldap://ldap.airius.com/ou=People, o=Airius?cn"<br />
 Require valid-user
 </code></p></div>
       </li>
@@ -570,11 +570,11 @@ Require valid-user
 <div class="section">
 <h2><a name="exposed" id="exposed">Exposing Login Information</a></h2>
 
-    <p>Whenever a query is made to the LDAP server, all LDAP attributes
-    returned by the query are placed in the environment, using environment
-    variables with the prefix "AUTHENTICATE_".</p>
+    <p>When this module performs authentication, LDAP attributes specified
+    in the <code class="directive"><a href="#authldapurl">AuthLDAPUrl</a></code> 
+    directive are placed in environment variables with the prefix "AUTHENTICATE_".</p>
 
-    <p>If an LDAP query for example returned the username, common name
+    <p>If the attribute field contains the username, common name
     and telephone number of a user, a CGI program will have access to
     this information without the need to make a second independent LDAP
     query to gather this additional information.</p>
@@ -982,6 +982,6 @@ authenticating the user if this one fails</td></tr>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_authnz_ldap.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_dbm.html b/docs/manual/mod/mod_authz_dbm.html
index 5b5cdad6..1f8698ac 100644
--- a/docs/manual/mod/mod_authz_dbm.html
+++ b/docs/manual/mod/mod_authz_dbm.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_authz_dbm.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_authz_dbm.html.en b/docs/manual/mod/mod_authz_dbm.html.en
index 7d7127bb..f343c396 100644
--- a/docs/manual/mod/mod_authz_dbm.html.en
+++ b/docs/manual/mod/mod_authz_dbm.html.en
@@ -180,6 +180,6 @@ store list of user groups</td></tr>
 <p><span>Available Languages: </span><a href="../en/mod/mod_authz_dbm.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_authz_dbm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_dbm.html.ko.euc-kr b/docs/manual/mod/mod_authz_dbm.html.ko.euc-kr
index 41228ccb..33484922 100644
--- a/docs/manual/mod/mod_authz_dbm.html.ko.euc-kr
+++ b/docs/manual/mod/mod_authz_dbm.html.ko.euc-kr
@@ -165,6 +165,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/mod_authz_dbm.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_authz_dbm.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_default.html b/docs/manual/mod/mod_authz_default.html
index 612b1b68..4cce69d1 100644
--- a/docs/manual/mod/mod_authz_default.html
+++ b/docs/manual/mod/mod_authz_default.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_authz_default.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_authz_default.html.ja.euc-jp
+URI: mod_authz_default.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_authz_default.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_authz_default.html.en b/docs/manual/mod/mod_authz_default.html.en
index 4f310de1..a1a85d12 100644
--- a/docs/manual/mod/mod_authz_default.html.en
+++ b/docs/manual/mod/mod_authz_default.html.en
@@ -75,6 +75,6 @@ modules</td></tr>
 <a href="../ja/mod/mod_authz_default.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authz_default.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_default.html.ja.euc-jp b/docs/manual/mod/mod_authz_default.html.ja.euc-jp
deleted file mode 100644
index 3dae157f..00000000
--- a/docs/manual/mod/mod_authz_default.html.ja.euc-jp
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_authz_default - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_authz_default</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authz_default.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authz_default.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authz_default.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¾µÇ§¥Õ¥©¡¼¥ë¥Ð¥Ã¥¯¥â¥¸¥å¡¼¥ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>authz_default_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_authz_default.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.1 °Ê¹ß</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï <code class="module"><a href="../mod/mod_authz_user.html">mod_authz_user</a></code> ¤ä
-    <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> ¤È¤¤¤Ã¤¿¾µÇ§¥â¥¸¥å¡¼¥ë¤ò
-    ÀßÄꤷ¤Ê¤«¤Ã¤¿¾ì¹ç¤Î¥Õ¥©¡¼¥ë¥Ð¥Ã¥¯¥â¥¸¥å¡¼¥ë¤È¤·¤ÆÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¤É¤Î¤è¤¦¤Ê¾µÇ§¥ê¥¯¥¨¥¹¥È¤âñ¤ËµñÈݤ·¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#authzdefaultauthoritative">AuthzDefaultAuthoritative</a></li>
-</ul>
-</div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthzDefaultAuthoritative" id="AuthzDefaultAuthoritative">AuthzDefaultAuthoritative</a> <a name="authzdefaultauthoritative" id="authzdefaultauthoritative">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¾µÇ§¤¬Äã°Ì¤Î¥â¥¸¥å¡¼¥ë¤ËÅϤµ¤ì¤ë¤«¤É¤¦¤«¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AuthzDefaultAuthoritative On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>AuthzDefaultAuthoritative On</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_authz_default</td></tr>
-</table>
-    <p><code class="directive">AuthzDefaultAuthoritative</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    ÌÀ¼¨Åª¤Ë <code>Off</code> ¤ËÀßÄꤹ¤ë¤È
-    ǧ¾Ú¤ò¼¡¤Î (<code>modules.c</code> ¥Õ¥¡¥¤¥ë¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë)
-    Äã°Ì¤Î¥â¥¸¥å¡¼¥ë¤ËÅϤ¹¤³¤È¤òµö²Ä¤·¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>Ãí°Õ</h3>
-      <p><code class="module"><a href="../mod/mod_authz_default.html">mod_authz_default</a></code> ¼«ÂΤ¬<em>¤È¤Æ¤âÄ㤤</em>
-      ¥ì¥Ù¥ë¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¤Î¤Ç¡¢Ä̾ï¤Ï¤³¤ì¤è¤ê¤âÄ㼡¤Î
-      ¥â¥¸¥å¡¼¥ë¤Ï¸ºß¤·¤Þ¤»¤ó¡£¤Ç¤¹¤«¤é
-      <code class="directive">AuthDefaultAuthoritative</code> ¤Ï¥Ç¥Õ¥©¥ë¥È
-      (<code>On</code>) ¤Î¤Þ¤Þ¤Ë¤·¤¿¤Û¤¦¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£</p>
-    </div>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authz_default.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authz_default.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authz_default.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_default.html.ja.utf8 b/docs/manual/mod/mod_authz_default.html.ja.utf8
new file mode 100644
index 00000000..993ca09b
--- /dev/null
+++ b/docs/manual/mod/mod_authz_default.html.ja.utf8
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_authz_default - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_authz_default</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authz_default.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authz_default.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authz_default.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>承�フォール�ックモジュール</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>authz_default_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_authz_default.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>Apache 2.1 以�</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール� <code class="module"><a href="../mod/mod_authz_user.html">mod_authz_user</a></code> や
+    <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> ����承�モジュールを
+    設定�����場��フォール�ックモジュール���設計�れ����。
+    ��よ��承�リクエストも��拒����。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#authzdefaultauthoritative">AuthzDefaultAuthoritative</a></li>
+</ul>
+</div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthzDefaultAuthoritative" id="AuthzDefaultAuthoritative">AuthzDefaultAuthoritative</a> <a name="authzdefaultauthoritative" id="authzdefaultauthoritative">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>承��低��モジュール�渡�れる����を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AuthzDefaultAuthoritative On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>AuthzDefaultAuthoritative On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_authz_default</td></tr>
+</table>
+    <p><code class="directive">AuthzDefaultAuthoritative</code> ディレクティブを
+    明示的� <code>Off</code> �設定�る�
+    �証を次� (<code>modules.c</code> ファイル�定義�れ��る)
+    低��モジュール�渡���を許����。</p>
+
+    <div class="note"><h3>注�</h3>
+      <p><code class="module"><a href="../mod/mod_authz_default.html">mod_authz_default</a></code> 自体�<em>��も低�</em>
+      レベル���定義�れ�������通常��れよりも低次�
+      モジュール�存在���ん。���ら
+      <code class="directive">AuthDefaultAuthoritative</code> �デフォルト
+      (<code>On</code>) ���������良���ょ�。</p>
+    </div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authz_default.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authz_default.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authz_default.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_default.html.ko.euc-kr b/docs/manual/mod/mod_authz_default.html.ko.euc-kr
index 816dde03..d5104463 100644
--- a/docs/manual/mod/mod_authz_default.html.ko.euc-kr
+++ b/docs/manual/mod/mod_authz_default.html.ko.euc-kr
@@ -73,6 +73,6 @@
 <a href="../ja/mod/mod_authz_default.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authz_default.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_groupfile.html b/docs/manual/mod/mod_authz_groupfile.html
index eae1ea35..d9289ad2 100644
--- a/docs/manual/mod/mod_authz_groupfile.html
+++ b/docs/manual/mod/mod_authz_groupfile.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_authz_groupfile.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_authz_groupfile.html.ja.euc-jp
+URI: mod_authz_groupfile.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_authz_groupfile.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_authz_groupfile.html.en b/docs/manual/mod/mod_authz_groupfile.html.en
index 68223b0b..0d2531d3 100644
--- a/docs/manual/mod/mod_authz_groupfile.html.en
+++ b/docs/manual/mod/mod_authz_groupfile.html.en
@@ -120,6 +120,6 @@ modules</td></tr>
 <a href="../ja/mod/mod_authz_groupfile.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authz_groupfile.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_groupfile.html.ja.euc-jp b/docs/manual/mod/mod_authz_groupfile.html.ja.euc-jp
deleted file mode 100644
index 1a9d8fbe..00000000
--- a/docs/manual/mod/mod_authz_groupfile.html.ja.euc-jp
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_authz_groupfile - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_authz_groupfile</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authz_groupfile.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authz_groupfile.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authz_groupfile.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥×¥ì¡¼¥ó¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤òÍѤ¤¤¿¥°¥ë¡¼¥×¾µÇ§</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>authz_groupfile_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_authz_groupfile.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.1 °Ê¹ß</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ïǧ¾Ú¤µ¤ì¤¿¥æ¡¼¥¶¤¬¥°¥ë¡¼¥×¤Î¥á¥ó¥Ð¡¼¤«
-    Èݤ«¤Ë¤è¤Ã¤Æ¥¦¥§¥Ö¥µ¥¤¥È¤Î°ìÉô¤Ø¤Î¥¢¥¯¥»¥¹¤òµö²Ä¤¹¤ë¤«µñÈݤ¹¤ë¤«¤Î
-    ¾µÇ§µ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£Æ±Íͤε¡Ç½¤Ï <code class="module"><a href="../mod/mod_authz_dbm.html">mod_authz_dbm</a></code>
-    ¤Ë¤è¤Ã¤Æ¤âÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#authgroupfile">AuthGroupFile</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#authzgroupfileauthoritative">AuthzGroupFileAuthoritative</a></li>
-</ul>
-<h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="directive"><a href="../mod/core.html#require">Require</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code></li>
-</ul></div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthGroupFile" id="AuthGroupFile">AuthGroupFile</a> <a name="authgroupfile" id="authgroupfile">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¾Úǧ¤Ë»ÈÍѤ¹¤ë¥æ¡¼¥¶¥°¥ë¡¼¥×¤Î°ìÍ÷¤¬³ÊǼ¤µ¤ì¤Æ¤¤¤ë¡¢
-¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AuthGroupFile <var>file-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_authz_groupfile</td></tr>
-</table>
-    <p><code class="directive">AuthGroupFile</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¾Úǧ¤Ë»ÈÍѤ¹¤ë¥æ¡¼¥¶¥°¥ë¡¼¥×¤Î°ìÍ÷¤¬³ÊǼ¤µ¤ì¤Æ¤¤¤ë¡¢
-    ¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÀßÄꤷ¤Þ¤¹¡£
-    <var>file-path</var> ¤Ï¥°¥ë¡¼¥×¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤Ç¤¹¡£
-    ÀäÂХѥ¹¤Ç¤Ê¤±¤ì¤Ð¡¢
-    <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
-    ¤«¤é¤ÎÁêÂХѥ¹¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£</p>
-
-    <p>¥°¥ë¡¼¥×¥Õ¥¡¥¤¥ë³Æ¹Ô¤Ï¡¢¥°¥ë¡¼¥×̾¡¢¥³¥í¥ó¡¢¤½¤·¤Æ
-    ¥¹¥Ú¡¼¥¹¶èÀÚ¤ê¤Ç¤½¤Î¥á¥ó¥Ð¡¼¤Î¥æ¡¼¥¶Ì¾¤òµ­½Ò¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã:</h3><p><code>
-      mygroup: bob joe anne
-    </code></p></div> 
-
-    <p>Â礭¤Ê¥Õ¥¡¥¤¥ë¤òõº÷¤¹¤ë¤Î¤Ï¡¢<em>Èó¾ï¤Ë</em>¸úΨ¤¬°­¤¤¤È¤¤¤¦ÅÀ¤Ë
-    Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¤½¤Î¤è¤¦¤Ê¾ì¹ç¤Ï¡¢
-    <code class="directive"><a href="../mod/mod_authz_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></code>
-    ¤ÎÊý¤¬¤º¤Ã¤ÈÎɤ¤À­Ç½¤òȯ´ø¤·¤Þ¤¹¡£</p>
-
-    <div class="warning"><h3>¥»¥­¥å¥ê¥Æ¥£</h3>
-      <p><code class="directive">AuthGroupFile</code> ¤Ï¡¢
-      ¥¦¥§¥Ö¥µ¡¼¥Ð¤Î¥É¥­¥å¥á¥ó¥È¥Ä¥ê¡¼¤Î³°Â¦¤Ë
-      Êݴɤ¹¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-      Êݸ¤è¤¦¤È¤·¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Ë¤Ï¡¢<em>ÃÖ¤«¤Ê¤¤¤Ç²¼¤µ¤¤</em>¡£
-      ¤½¤¦¤·¤Ê¤¤¤È¥¯¥é¥¤¥¢¥ó¥È¤¬ <code class="directive">AuthGroupFile</code> ¤ò
-      ¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Æ¤·¤Þ¤¦²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£</p>
-    </div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthzGroupFileAuthoritative" id="AuthzGroupFileAuthoritative">AuthzGroupFileAuthoritative</a> <a name="authzgroupfileauthoritative" id="authzgroupfileauthoritative">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¾µÇ§¤¬²¼°Ì¤Î¥â¥¸¥å¡¼¥ë¤ËÅϤµ¤ì¤ë¤«¤É¤¦¤«¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AuthzGroupFileAuthoritative On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>AuthzGroupFileAuthoritative On</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_authz_groupfile</td></tr>
-</table>
-    <p><code class="directive">AuthzGroupFileAuthoritative</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    ÌÀ¼¨Åª¤Ë <code>Off</code> ¤ËÀßÄꤹ¤ë¤È userID ¤ËÂбþ¤¹¤ë
-    <strong>¥°¥ë¡¼¥×¤¬¤Ê¤¤¾ì¹ç¤Ë</strong>¡¢
-    (<code>module.c</code> ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë) ²¼°Ì¤Î¥â¥¸¥å¡¼¥ë¤Ë¥°¥ë¡¼¥×¾µÇ§¤ò
-    ÅϤ¹¤³¤È¤òµö²Ä¤·¤Þ¤¹¡£</p>
-
-
-    <p>¥Ç¥Õ¥©¥ë¥È¤Ç¤ÏÀ©¸æ¤ÏÅϤµ¤ì¤º¡¢Ì¤ÃΤΥ°¥ë¡¼¥×¤Î¾ì¹ç¤Ï Authentication
-    Required ±þÅú¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢¤³¤ì¤òÀßÄꤷ¤Ê¤¤¤È
-    ¥·¥¹¥Æ¥à¤ò°ÂÁ´¤ËÊݤĤ³¤È¤¬¤Ç¤­¡¢NCSA ¸ß´¹¤Î¿¶¤ëÉñ¤¤¤ò¤µ¤»¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <div class="warning"><h3>¥»¥­¥å¥ê¥Æ¥£</h3>
-      <p>¥æ¡¼¥¶¤Î <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ç¾¤Î¾µÇ§¼êÃʤؤÎ
-      °Ñ¾ù¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¤³¤È¤Î°ÕÌ£¤¹¤ë¤È¤³¤í¤Ï½½Ê¬¤Ë¹Íθ¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£
-      ¤½¤·¤Æ¤½¤ì¤¬¡¢ËÜÅö¤Ë˾¤àµóÆ°¤Ç¤¢¤ë¤³¤È¤ò³Î¤«¤á¤Æ¤¯¤À¤µ¤¤¡£
-      Ä̾ï¤Ï°ì¤Ä¤Î <code>.htpasswd</code> ¥Õ¥¡¥¤¥ë¤ò°ÂÁ´¤Ë¤¹¤ëÊý¤¬
-      ¤è¤ê¿¤¯¤Î¥¢¥¯¥»¥¹¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò»ý¤Ä¤«¤â¤·¤ì¤Ê¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò
-      °ÂÁ´¤Ë¤¹¤ë¤è¤ê¤â´Êñ¤Ç¤¹¡£</p>
-    </div>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authz_groupfile.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authz_groupfile.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authz_groupfile.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_groupfile.html.ja.utf8 b/docs/manual/mod/mod_authz_groupfile.html.ja.utf8
new file mode 100644
index 00000000..3bdee881
--- /dev/null
+++ b/docs/manual/mod/mod_authz_groupfile.html.ja.utf8
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_authz_groupfile - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_authz_groupfile</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authz_groupfile.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authz_groupfile.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authz_groupfile.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>プレーンテキストファイルを用��グループ承�</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>authz_groupfile_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_authz_groupfile.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>Apache 2.1 以�</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール��証�れ�ユーザ�グループ�メン�ー�
+    ���よ��ウェブサイト�一部��アクセスを許��る�拒��る��
+    承�機能を�供���。�様�機能� <code class="module"><a href="../mod/mod_authz_dbm.html">mod_authz_dbm</a></code>
+    �よ��も�供�れ����。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#authgroupfile">AuthGroupFile</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#authzgroupfileauthoritative">AuthzGroupFileAuthoritative</a></li>
+</ul>
+<h3>�照</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/core.html#require">Require</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code></li>
+</ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthGroupFile" id="AuthGroupFile">AuthGroupFile</a> <a name="authgroupfile" id="authgroupfile">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>証��使用�るユーザグループ�一覧�格��れ��る�
+テキストファイル���を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AuthGroupFile <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_authz_groupfile</td></tr>
+</table>
+    <p><code class="directive">AuthGroupFile</code> ディレクティブ��
+    証��使用�るユーザグループ�一覧�格��れ��る�
+    テキストファイル���を設定���。
+    <var>file-path</var> �グループファイル��パス��。
+    絶対パス���れ��
+    <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
+    �ら�相対パス���扱�れ��。</p>
+
+    <p>グループファイル�行��グループ��コロン����
+    スペース区切り���メン�ー�ユーザ�を記述���。</p>
+
+    <div class="example"><h3>例:</h3><p><code>
+      mygroup: bob joe anne
+    </code></p></div> 
+
+    <p>大��ファイルを探索�る���<em>�常�</em>効率�悪����点�
+    注�������。��よ��場���
+    <code class="directive"><a href="../mod/mod_authz_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></code>
+    �方����良�性能を発����。</p>
+
+    <div class="warning"><h3>セキュリティ</h3>
+      <p><code class="directive">AuthGroupFile</code> ��
+      ウェブサー��ドキュメントツリー�外��
+      �管�るよ��������。
+      �護�よ�����るディレクトリ以下���<em>置����下��</em>。
+      ������クライアント� <code class="directive">AuthGroupFile</code> を
+      ダウンロード�������能性��り��。</p>
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthzGroupFileAuthoritative" id="AuthzGroupFileAuthoritative">AuthzGroupFileAuthoritative</a> <a name="authzgroupfileauthoritative" id="authzgroupfileauthoritative">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>承��下��モジュール�渡�れる����を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AuthzGroupFileAuthoritative On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>AuthzGroupFileAuthoritative On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_authz_groupfile</td></tr>
+</table>
+    <p><code class="directive">AuthzGroupFileAuthoritative</code> ディレクティブを
+    明示的� <code>Off</code> �設定�る� userID �対応�る
+    <strong>グループ���場��</strong>�
+    (<code>module.c</code> �定義�れ��る) 下��モジュール�グループ承�を
+    渡���を許����。</p>
+
+
+    <p>デフォルト��制御�渡�れ��未知�グループ�場�� Authentication
+    Required 応答�返�れ��。���ら��れを設定����
+    システムを安全���������NCSA 互��振る舞�を��る����り��。</p>
+
+    <div class="warning"><h3>セキュリティ</h3>
+      <p>ユーザ� <code>.htaccess</code> ファイル�他�承�手段��
+      委譲���るよ���る����味�る�����分�考慮���������。
+      ����れ��本当�望む挙動��る��を確�������。
+      通常�一�� <code>.htpasswd</code> ファイルを安全��る方�
+      より多��アクセスインタフェースを���も�れ��データベースを
+      安全��るよりも簡���。</p>
+    </div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authz_groupfile.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authz_groupfile.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authz_groupfile.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_groupfile.html.ko.euc-kr b/docs/manual/mod/mod_authz_groupfile.html.ko.euc-kr
index 629dc158..2bea31e5 100644
--- a/docs/manual/mod/mod_authz_groupfile.html.ko.euc-kr
+++ b/docs/manual/mod/mod_authz_groupfile.html.ko.euc-kr
@@ -116,6 +116,6 @@
 <a href="../ja/mod/mod_authz_groupfile.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authz_groupfile.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_host.html b/docs/manual/mod/mod_authz_host.html
index fc883205..3c0aeb25 100644
--- a/docs/manual/mod/mod_authz_host.html
+++ b/docs/manual/mod/mod_authz_host.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_authz_host.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_authz_host.html.ja.euc-jp
+URI: mod_authz_host.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_authz_host.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_authz_host.html.en b/docs/manual/mod/mod_authz_host.html.en
index 9e388876..26764a34 100644
--- a/docs/manual/mod/mod_authz_host.html.en
+++ b/docs/manual/mod/mod_authz_host.html.en
@@ -365,6 +365,6 @@ evaluated.</td></tr>
 <a href="../ja/mod/mod_authz_host.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authz_host.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_host.html.ja.euc-jp b/docs/manual/mod/mod_authz_host.html.ja.euc-jp
deleted file mode 100644
index 816f57cd..00000000
--- a/docs/manual/mod/mod_authz_host.html.ja.euc-jp
+++ /dev/null
@@ -1,349 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_authz_host - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_authz_host</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authz_host.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authz_host.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authz_host.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥Û¥¹¥È (̾Á°¤â¤·¤¯¤Ï IP ¥¢¥É¥ì¥¹) ¤Ë´ð¤Å¤¤¤¿¥°¥ë¡¼¥×¾µÇ§</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>authz_host_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_authz_host.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.1 °Ê¹ß</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p><code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> ¤Ë¤è¤êÄ󶡤µ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¥µ¡¼¥Ð¤ÎÆÃÄê¤ÎÉôʬ¤Ø¤Î
-    ¥¢¥¯¥»¥¹¤òÀ©¸æ¤¹¤ë¤¿¤á¤Ë <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
-    ¤È <code><a href="core.html#accessfilename">.htaccess</a></code> ¥Õ¥¡¥¤¥ë¤Ç»ÈÍѤµ¤ì¤Þ¤¹¡£¥¯¥é¥¤¥¢¥ó¥È¤Î¥Û¥¹¥È̾¡¢IP
-    ¥¢¥É¥ì¥¹¤ä <a href="../env.html">´Ä¶­ÊÑ¿ô</a>¤È¤·¤Æ¼èÆÀ¤µ¤ì¤¿¡¢¤½¤Î¾¤Î¥ê¥¯¥¨¥¹¥È¤ÎÆÃħ¤Ë´ð¤Å¤¤¤Æ
-    ¥¢¥¯¥»¥¹À©¸æ¤ò¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£<code class="directive"><a href="#allow">Allow</a></code> ¤È
-    <code class="directive"><a href="#deny">Deny</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¤É¤Î¤è¤¦¤Ê¥¯¥é¥¤¥¢¥ó¥È¤Ë¥¢¥¯¥»¥¹¤ò
-    µö²Ä¤¹¤ë¡¢¤·¤Ê¤¤¤«¤ò»ØÄꤹ¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£°ìÊý¡¢
-    <code class="directive"><a href="#order">Order</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¥Ç¥Õ¥©¥ë¥È¤Î¥¢¥¯¥»¥¹¾õÂ֤ȡ¢
-    <code class="directive"><a href="#allow">Allow</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    <code class="directive"><a href="#deny">Deny</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È¤Î¤ª¸ß¤¤¤Ø¤Î±Æ¶Á¤Î»ÅÊý¤òÀßÄꤷ¤Þ¤¹¡£
-    </p>
-
-    <p>¥Û¥¹¥È¤Ë¤è¤ë¥¢¥¯¥»¥¹À©¸Â¤È¥Ñ¥¹¥ï¡¼¥É¤Ë¤è¤ëǧ¾Ú¤òƱ»þ¤Ë
-    ¹Ô¤Ê¤¦¤³¤È¤¬²Äǽ¤Ç¤¹¡£¤½¤Î¾ì¹ç¡¢¤½¤ÎÆó¤Ä¤ÎÀ©¸Â¤Î´Ø·¸¤ò»ØÄꤹ¤ë¤¿¤á¤Ë
-    <code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ·¤Þ¤¹¡£</p>
-
-    <p>°ìÈÌŪ¤Ë¤Ï¡¢¥¢¥¯¥»¥¹À©¸Â¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤¹¤Ù¤Æ¤Î¥¢¥¯¥»¥¹¥á¥½¥Ã¥É
-    (<code>GET</code>, <code>PUT</code>, <code>POST</code> ¤Ê¤É)
-    ¤ËŬÍѤµ¤ì¤Þ¤¹¡£¤½¤·¤Æ¡¢¤Û¤È¤ó¤É¤Î¾ì¹ç¤³¤ì¤¬Ë¾¤Þ¤·¤¤Æ°ºî¤Ç¤¹¡£
-    ¤·¤«¤·¡¢<code class="directive"><a href="../mod/core.html#limit">&lt;Limit&gt;</a></code>
-    ¥»¥¯¥·¥ç¥ó¤ÎÃæ¤Ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò½ñ¤¯¤³¤È¤Ç¡¢
-    °ìÉô¤Î¥á¥½¥Ã¥É¤Ë¤Î¤ßÀ©¸Â¤ò¤«¤±¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#allow">Allow</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#deny">Deny</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#order">Order</a></li>
-</ul>
-<h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#require">Require</a></code></li>
-</ul></div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Allow" id="Allow">Allow</a> <a name="allow" id="allow">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤Î¤¢¤ëÎΰè¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤ë¥Û¥¹¥È¤òÀ©¸æ¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code> Allow from all|<var>host</var>|env=<var>env-variable</var>
-[<var>host</var>|env=<var>env-variable</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Limit</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_authz_host</td></tr>
-</table>
-    <p><code class="directive">Allow</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤É¤Î¥Û¥¹¥È¤¬
-    ¥µ¡¼¥Ð¤Î¤¢¤ëÎΰè¤ò¥¢¥¯¥»¥¹¤Ç¤­¤ë¤«¤Ë±Æ¶Á¤òÍ¿¤¨¤Þ¤¹¡£
-    ¥¢¥¯¥»¥¹¤Ï¥Û¥¹¥È̾¡¢IP ¥¢¥É¥ì¥¹¡¢IP ¥¢¥É¥ì¥¹¤ÎÈϰϤ䡢
-    ´Ä¶­ÊÑ¿ô¤È¤·¤Æ¼èÆÀ¤µ¤ì¤¿¡¢¤½¤Î¾¤Î¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¥¯¥¨¥¹¥È¤Î
-    ÆÃħ¤Ë¤è¤Ã¤ÆÀ©¸æ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p> 
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎºÇ½é¤Î°ú¿ô¤Ï¾ï¤Ë <code>from</code> ¤Ç¤¹¡£
-    ¤½¤ì¤Ë³¤¯°ú¿ô¤Ï»°¤Ä¤Î°ã¤Ã¤¿·Á¼°¤¬¤¢¤ê¤Þ¤¹¡£<code>Allow from
-    all</code> ¤¬»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢¤¹¤Ù¤Æ¤Î¥Û¥¹¥È¤Ë¥¢¥¯¥»¥¹¤òµö²Ä¤·¡¢
-    ¥¢¥¯¥»¥¹À©¸Â¤Ï²¼¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢
-    <code class="directive"><a href="#deny">Deny</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È <code class="directive"><a href="#order">Order</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÀßÄê¤Ç·è¤Þ¤ê¤Þ¤¹¡£
-    ÆÃÄê¤Î¥Û¥¹¥È¤ä¥Û¥¹¥È·²¤Ë¤Î¤ß¥µ¡¼¥Ð¤Ø¤Î¥¢¥¯¥»¥¹¤òµö²Ä¤¹¤ë¤¿¤á¤Ë¤Ï¡¢
-    °Ê²¼¤Î¤É¤ì¤«¤Î·Á¼°¤Ç <em>host</em> ¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-    <dl>
-      <dt>¥É¥á¥¤¥ó̾ (¤Î°ìÉô)</dt>
-
-      <dd>
-      <div class="example"><h3>Îã</h3><p><code>
-        Allow from apache.org<br />
-        Allow from .net example.edu
-      </code></p></div>
-      <p>¤³¤Îʸ»úÎó¤Ë¹ç¤¦¤«¡¢¤³¤ì¤Ç½ª¤ï¤ë̾Á°¤Î¥Û¥¹¥È¤Î¥¢¥¯¥»¥¹¤¬µö²Ä¤µ¤ì¤Þ¤¹¡£
-      ³ÆÉôʬ¤¬´°Á´¤Ë¹ç¤¦¤â¤Î¤À¤±¤ËŬÍѤµ¤ì¤Þ¤¹¤Î¤Ç¡¢¾å¤ÎÎã¤Ï
-      <code>foo.apache.org</code> ¤Ë¤Ï¥Þ¥Ã¥Á¤·¤Þ¤¹¤¬¡¢
-      <code>fooapache.org</code> ¤Ë¤Ï¥Þ¥Ã¥Á¤·¤Þ¤»¤ó¡£
-      ¤³¤ÎÀßÄê¤ò¤¹¤ë¤È¡¢Apache ¤Ï
-      <code class="directive"><a href="../mod/core.html#hostnamelookups">HostnameLookups</a></code>
-      ¤ÎÀßÄê¤Ë´Ø¤ï¤é¤º¡¢¥¯¥é¥¤¥¢¥ó¥È¤Î IP ¥¢¥É¥ì¥¹¤ËÂФ·¤Æ
-      DNS ¤Î 2 ½ÅµÕ°ú¤­¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£
-      ¥Û¥¹¥È̾¤«¤é¥ª¥ê¥¸¥Ê¥ë¤Î IP ¥¢¥É¥ì¥¹¤ò½ç°ú¤­¤·¤Þ¤¹¡£
-      ½ç°ú¤­¤ÈµÕ°ú¤­¤¬°ìÃפ·¡¢¥Û¥¹¥È̾¤¬³ºÅö¤·¤¿¾ì¹ç¤Ë¤Î¤ß¡¢
-      ¥¢¥¯¥»¥¹¤¬µö²Ä¤µ¤ì¤Þ¤¹¡£</p></dd>
-
-      <dt>´°Á´¤Ê IP ¥¢¥É¥ì¥¹</dt>
-
-      <dd>
-      <div class="example"><h3>Îã</h3><p><code>
-        Allow from 10.1.2.3<br />
-        Allow from 192.168.1.104 192.168.1.205
-      </code></p></div>
-      <p>¥¢¥¯¥»¥¹¤òµö²Ä¤¹¤ë IP ¥¢¥É¥ì¥¹¤Ç¤¹¡£</p></dd>
-
-      <dt>IP ¥¢¥É¥ì¥¹¤Î°ìÉô</dt>
-
-      <dd>
-      <div class="example"><h3>Îã</h3><p><code>
-        Allow from 10.1<br />
-        Allow from 10 172.20 192.168.2
-      </code></p></div>
-      <p>¥µ¥Ö¥Í¥Ã¥È¤ÎÀ©¸ÂÍѤΡ¢IP
-      ¥¢¥É¥ì¥¹¤ÎºÇ½é¤Î°ì¤Ä¤«¤é»°¤Ä¤Þ¤Ç¤Î¥Ð¥¤¥È¤Ç¤¹¡£</p></dd>
-
-      <dt>¥Í¥Ã¥È¥ï¡¼¥¯/¥Í¥Ã¥È¥Þ¥¹¥¯ ¤ÎÂÐ</dt>
-
-      <dd>
-      <div class="example"><h3>Îã</h3><p><code>
-        Allow from 10.1.0.0/255.255.0.0
-      </code></p></div>
-      <p>¥Í¥Ã¥È¥ï¡¼¥¯ a.b.c.d ¤È¥Í¥Ã¥È¥Þ¥¹¥¯ w.x.y.z ¤Ç¤¹¡£
-      ¤è¤êºÙγÅ٤Υµ¥Ö¥Í¥Ã¥ÈÀ©¸ÂÍѤǤ¹¡£</p></dd>
-
-      <dt>¥Í¥Ã¥È¥ï¡¼¥¯/nnn CIDR »ØÄê</dt>
-
-      <dd>
-      <div class="example"><h3>Îã</h3><p><code>
-        Allow from 10.1.0.0/16
-      </code></p></div>
-      <p>¥Í¥Ã¥È¥Þ¥¹¥¯¤¬ nnn ¤Î¾å°Ì¥Ó¥Ã¥È¤¬ 1
-      ¤È¤Ê¤Ã¤Æ¤¤¤ë¤â¤Î¤«¤é¤Ê¤ë¤³¤È°Ê³°¤ÏÁ°¤Î¤â¤Î¤ÈƱ¤¸¤Ç¤¹¡£</p></dd>
-    </dl>
-
-    <p>Ãí: ºÇ¸å¤Î»°¤Ä¤ÎÎã¤Ï¤Þ¤Ã¤¿¤¯Æ±¤¸¥Û¥¹¥È¤Ë¹ç¤¤¤Þ¤¹¡£</p>
-
-
-    <p>IPv6 ¥¢¥É¥ì¥¹¤È IPv6 ¤Î¥µ¥Ö¥Í¥Ã¥È¤Ï°Ê²¼¤Î¤è¤¦¤Ë»ØÄê¤Ç¤­¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-       Allow from 2001:db8::a00:20ff:fea7:ccea<br />
-       Allow from 2001:db8::a00:20ff:fea7:ccea/10
-    </code></p></div>
-
-    <p><code class="directive">Allow</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î°ú¿ô¤Î»°¤ÄÌܤηÁ¼°¤Ï¡¢
-    <a href="../env.html">´Ä¶­ÊÑ¿ô</a>
-    ¤Î¸ºß¤Ë¤è¤ê¥¢¥¯¥»¥¹¤ÎÀ©¸æ¤ò¹Ô¤Ê¤¨¤ë¤è¤¦¤Ë¤¹¤ë¤â¤Î¤Ç¤¹¡£
-    <code>Allow from env=<var>env-variable</var></code>
-    ¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¤È¡¢´Ä¶­ÊÑ¿ô <var>env-variable</var>
-    ¤¬Â¸ºß¤·¤¿¾ì¹ç¤Ë¥ê¥¯¥¨¥¹¥È¤Ï¥¢¥¯¥»¥¹¤òµö²Ä¤µ¤ì¤Þ¤¹¡£¥µ¡¼¥Ð¤Ï
-    <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>
-    ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê¡¢¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¥¯¥¨¥¹¥È
-    ¤ÎÆÃħ¤Ë´ð¤Å¤¤¤Æ½ÀÆð¤Ë´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ëµ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£
-    ¤Ç¤¹¤«¤é¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥¯¥é¥¤¥¢¥ó¥È¤Î
-    <code>User-Agent</code> (¥Ö¥é¥¦¥¶¤Î¼ïÎà)¡¢<code>Referer</code>
-    ¤ä¾¤Î HTTP ¥ê¥¯¥¨¥¹¥È¤Î¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¤Ê¤É¤Ë´ð¤Å¤¤¤Æ
-    ¥¢¥¯¥»¥¹µö²Ä¤ò¤¹¤ë¤¿¤á¤Ë»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    </p>
-
-    <div class="example"><h3>Example:</h3><p><code>
-      SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in<br />
-      &lt;Directory /docroot&gt;<br />
-      <span class="indent">
-        Order Deny,Allow<br />
-        Deny from all<br />
-        Allow from env=let_me_in<br />
-      </span>
-      &lt;/Directory&gt;
-    </code></p></div>
-
-    <p>¤³¤Î¾ì¹ç¡¢user-agent ¤Îʸ»úÎó¤¬ <code>KnockKnock/2.0</code>
-    ¤Ç»Ï¤Þ¤ë¥Ö¥é¥¦¥¶¤Î¤ß¤¬¥¢¥¯¥»¥¹¤òµö²Ä¤µ¤ì¡¢
-    ¾¤Î¤â¤Î¤Ï¥¢¥¯¥»¥¹¤òµñÈݤµ¤ì¤Þ¤¹¡£</p>
-
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Deny" id="Deny">Deny</a> <a name="deny" id="deny">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤¬¥¢¥¯¥»¥¹¤òµñÈݤ¹¤ë¥Û¥¹¥È¤òÀ©¸æ¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code> Deny from all|<var>host</var>|env=<var>env-variable</var>
-[<var>host</var>|env=<var>env-variable</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Limit</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_authz_host</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥Û¥¹¥È̾¡¢IP
-    ¥¢¥É¥ì¥¹¡¢´Ä¶­ÊÑ¿ô¤Ë´ð¤Å¤¤¤Æ¥µ¡¼¥Ð¤Ø¤Î¥¢¥¯¥»¥¹¤òÀ©¸Â¤·¤Þ¤¹¡£
-    <code class="directive">Deny</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î°ú¿ô¤Ï <code class="directive"><a href="#allow">Allow</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È¤Þ¤Ã¤¿¤¯Æ±¤¸¤Ç¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Order" id="Order">Order</a> <a name="order" id="order">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Ç¥Õ¥©¥ë¥È¤Î¥¢¥¯¥»¥¹²Äǽ¤Ê¾õÂ֤ȡ¢<code class="directive">Allow</code> ¤È
-<code class="directive">Deny</code> ¤¬É¾²Á¤µ¤ì¤ë½çÈÖ¤òÀ©¸æ¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code> Order <var>ordering</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>Order Deny,Allow</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Limit</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_authz_host</td></tr>
-</table>
-    <p><code class="directive">Order</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥¢¥¯¥»¥¹¤Î¾õÂÖ¤È
-    <code class="directive"><a href="#allow">Allow</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    <code class="directive"><a href="#deny">Deny</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬É¾²Á¤µ¤ì¤ë½çÈÖ¤òÀ©¸æ¤·¤Þ¤¹¡£
-    <var>Ordering</var> ¤Ï°Ê²¼¤Î¤É¤ì¤«¤Ç¤¹¡£</p>
-
-    <dl>
-      <dt><code>Deny,Allow</code></dt>
-
-      <dd><code class="directive"><a href="#deny">Deny</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬
-      <code class="directive"><a href="#allow">Allow</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÁ°¤Ëɾ²Á¤µ¤ì¤Þ¤¹¡£
-      ¥¢¥¯¥»¥¹¤Ï¥Ç¥Õ¥©¥ë¥È¤Çµö²Ä¤µ¤ì¤Þ¤¹¡£<code class="directive"><a href="#deny">Deny</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¹ç¤ï¤Ê¤¤¤«¡¢<code class="directive"><a href="#allow">Allow</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¹ç¤¦¥¯¥é¥¤¥¢¥ó¥È¤Ï¥¢¥¯¥»¥¹¤òµö²Ä¤µ¤ì¤Þ¤¹¡£</dd>
-
-      <dt><code>Allow,Deny</code></dt>
-
-      <dd><code class="directive"><a href="#allow">Allow</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬ <code class="directive"><a href="#deny">Deny</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÁ°¤Ëɾ²Á¤µ¤ì¤Þ¤¹¡£
-      ¥¢¥¯¥»¥¹¤Ï¥Ç¥Õ¥©¥ë¥È¤ÇµñÈݤµ¤ì¤Þ¤¹¡£<code class="directive"><a href="#allow">Allow</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¹ç¤ï¤Ê¤¤¤«¡¢<code class="directive"><a href="#deny">Deny</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¹ç¤¦¥¯¥é¥¤¥¢¥ó¥È¤Ï¥¢¥¯¥»¥¹¤òµñÈݤµ¤ì¤Þ¤¹¡£
-      </dd>
-
-      <dt><code>Mutual-failure</code></dt>
-
-      <dd><code class="directive"><a href="#allow">Allow</a></code> ¤Î¥ê¥¹¥È¤Ë¸½¤ì¤Æ¡¢
-      <code class="directive"><a href="#deny">Deny</a></code>
-      ¤Î¥ê¥¹¥È¤Ë¸½¤ì¤Ê¤¤¥Û¥¹¥È¤Î¤ß¤¬¥¢¥¯¥»¥¹¤òµö²Ä¤µ¤ì¤Þ¤¹¡£
-      ¤³¤Î½çÈÖÉÕ¤±¤Ï <code>Order Allow,Deny</code> ¤ÈƱ¤¸¸ú²Ì¤ò»ý¤Á¡¢
-      ¤½¤ÎÀßÄê¤ÎÊý¤¬¹¥¤Þ¤·¤¤¤¿¤á¤ËÈó¿ä¾©¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</dd>
-    </dl>
-
-    <p>¥­¡¼¥ï¡¼¥É¤Ï¥³¥ó¥Þ¤ÇʬΥ¤¹¤ë¤³¤È¤À¤±¤¬²Äǽ¤Ç¤¹¡£
-    ´Ö¤Ë<em>¶õÇò¤¬¤¢¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó</em>¡£¤É¤Î¾ì¹ç¤Ç¤â¡¢<code class="directive"><a href="#allow">Allow</a></code> ¤È
-    <code class="directive"><a href="#deny">Deny</a></code> ʸ¤Ï
-    Á´¤Æɾ²Á¤µ¤ì¤ë¤È¤¤¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    </p>
-
-    <p>°Ê²¼¤ÎÎã¤Ç¤Ï¡¢apache.org
-    ¥É¥á¥¤¥ó¤Î¤¹¤Ù¤Æ¤Î¥Û¥¹¥È¤Ï¥¢¥¯¥»¥¹¤òµö²Ä¤µ¤ì¤Þ¤¹¡£
-    ¾¤Î¤¹¤Ù¤Æ¤Î¥Û¥¹¥È¤Ï¥¢¥¯¥»¥¹¤òµñÈݤµ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      Order Deny,Allow<br />
-      Deny from all<br />
-      Allow from apache.org
-    </code></p></div>
-
-    <p>¼¡¤ÎÎã¤Ç¤Ï¡¢foo.apache.org ¥µ¥Ö¥É¥á¥¤¥ó¤Ë¤¢¤ë¥Û¥¹¥È°Ê³°¤Î¡¢
-    apache.org ¥É¥á¥¤¥ó¤Î¤¹¤Ù¤Æ¤Î¥Û¥¹¥È¤¬¥¢¥¯¥»¥¹¤òµö²Ä¤µ¤ì¤Þ¤¹¡£
-    apache.org
-    ¥É¥á¥¤¥ó¤Ç¤Ê¤¤¥Û¥¹¥È¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Î¾õÂÖ¤¬¥¢¥¯¥»¥¹µñÈݤΤ¿¤á¡¢
-    ¥µ¡¼¥Ð¤Ø¤Î¥¢¥¯¥»¥¹¤òµñÈݤµ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      Order Allow,Deny<br />
-      Allow from apache.org<br />
-      Deny from foo.apache.org
-    </code></p></div>
-
-    <p>°ìÊý¡¢¾å¤ÎÎã¤Î <code class="directive">Order</code> ¤¬ <code>Deny,Allow</code>
-    ¤ËÊѤï¤Ã¤Æ¤¤¤ì¤Ð¡¢¤¹¤Ù¤Î¥Û¥¹¥È¤Ë¥¢¥¯¥»¥¹¤¬µö²Ä¤µ¤ì¤Þ¤¹¡£
-    ¤³¤ì¤Ï¡¢ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Î¼ÂºÝ¤Î½çÈ֤˴ؤï¤é¤º¡¢
-    <code>Allow from apache.org</code> ¤¬ºÇ¸å¤Ëɾ²Á¤µ¤ì¤Æ¡¢
-    <code>Deny from foo.apache.org</code> ¤ò¾å½ñ¤­¤¹¤ë¤«¤é¤Ç¤¹¡£
-    <code>apache.org</code>
-    ¥É¥á¥¤¥ó¤Ë¤Ê¤¤¥Û¥¹¥È¤â¡¢¥Ç¥Õ¥©¥ë¥È¤Î¾õÂÖ¤¬ <em>allow</em>
-    ¤ËÊѲ½¤¹¤ë¤¿¤á¤Ë¡¢¥¢¥¯¥»¥¹¤òµö²Ä¤µ¤ì¤Þ¤¹¡£
-    </p>
-
-    <p><code class="directive">Order</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥¢¥¯¥»¥¹¤Î¾õÂ֤˱ƶÁ¤òÍ¿¤¨¤ë¤Î¤Ç¡¢
-    <code class="directive"><a href="#allow">Allow</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    <code class="directive"><a href="#deny">Deny</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Ìµ¤¯¤Æ¤â¡¢¥µ¡¼¥Ð¤Î¥¢¥¯¥»¥¹¤Ë±Æ¶Á¤òÍ¿¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤¿¤È¤¨¤Ð¡¢</p>
-
-    <div class="example"><p><code>
-      &lt;Directory /www&gt;<br />
-      <span class="indent">
-        Order Allow,Deny<br />
-      </span>
-      &lt;/Directory&gt;
-    </code></p></div>
-
-    <p>¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥¢¥¯¥»¥¹¾õÂÖ¤¬ <em>deny</em> ¤Ë¤Ê¤ë¤¿¤á¡¢
-    <code>/www</code> ¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î¤¹¤Ù¤Æ¤Î¥¢¥¯¥»¥¹¤òµñÈݤ·¤Þ¤¹¡£
-    </p>
-
-    <p><code class="directive">Order</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥µ¡¼¥Ð¤ÎÀßÄê½èÍý¤Î³ÆÃʳ¬¤Ç¤À¤±
-    ¥¢¥¯¥»¥¹¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î½èÍý¤Î½çÈÖ¤òÊѹ¹¤·¤Þ¤¹¡£¤³¤ì¤Ï¡¢¤¿¤È¤¨¤Ð¡¢
-    <code class="directive">Order</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÀßÄê¤Ë´Ø¤ï¤é¤º¡¢
-    <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤Î
-    <code class="directive"><a href="#allow">Allow</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ä
-    <code class="directive"><a href="#deny">Deny</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    <code class="directive"><a href="../mod/core.html#directory">Directory</a></code> ¥»¥¯¥·¥ç¥ó¤ä
-    <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Î <code class="directive"><a href="#allow">Allow</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ä <code class="directive"><a href="#deny">Deny</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤è¤ê¤â¾ï¤Ë¸å¤Ëɾ²Á¤µ¤ì¤ë¤È¤¤¤¦¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
-    ÀßÄꥻ¥¯¥·¥ç¥ó¤Î¥Þ¡¼¥¸¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-    <a href="../sections.html">Directory,Location, Files
-    ¥»¥¯¥·¥ç¥ó¤ÎÆ°ºîÊýË¡</a> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authz_host.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authz_host.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authz_host.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_host.html.ja.utf8 b/docs/manual/mod/mod_authz_host.html.ja.utf8
new file mode 100644
index 00000000..f5f5bce9
--- /dev/null
+++ b/docs/manual/mod/mod_authz_host.html.ja.utf8
@@ -0,0 +1,349 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_authz_host - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_authz_host</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authz_host.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authz_host.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authz_host.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>ホスト (��も��� IP アドレス) �基���グループ承�</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>authz_host_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_authz_host.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>Apache 2.1 以�</td></tr></table>
+<h3>概�</h3>
+
+    <p><code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> �より�供�れるディレクティブ�
+    サー��特定�部分��
+    アクセスを制御�る��� <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>, <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
+    � <code><a href="core.html#accessfilename">.htaccess</a></code> ファイル�使用�れ��。クライアント�ホスト��IP
+    アドレスや <a href="../env.html">環境変数</a>����得�れ����他�リクエスト�特徴�基���
+    アクセス制御を行���������。<code class="directive"><a href="#allow">Allow</a></code> �
+    <code class="directive"><a href="#deny">Deny</a></code> ディレクティブ�
+    ��よ��クライアント�アクセスを
+    許��る�����を指定�る���使用�れ��。一方�
+    <code class="directive"><a href="#order">Order</a></code> ディレクティブ�
+    デフォルト�アクセス状態��
+    <code class="directive"><a href="#allow">Allow</a></code> ディレクティブ�
+    <code class="directive"><a href="#deny">Deny</a></code>
+    ディレクティブ���互���影響�仕方を設定���。
+    </p>
+
+    <p>ホスト�よるアクセス制��パスワード�よる�証を�時�
+    行������能��。��場����二��制��関係を指定�る���
+    <code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code>
+    ディレクティブを使用���。</p>
+
+    <p>一般的���アクセス制�ディレクティブ�����アクセスメソッド
+    (<code>GET</code>, <code>PUT</code>, <code>POST</code> ��)
+    ��用�れ��。������ん��場��れ�望���動作��。
+    ����<code class="directive"><a href="../mod/core.html#limit">&lt;Limit&gt;</a></code>
+    セクション�中�ディレクティブを書�����
+    一部�メソッド���制�を��る��も����。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#allow">Allow</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#deny">Deny</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#order">Order</a></li>
+</ul>
+<h3>�照</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#require">Require</a></code></li>
+</ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Allow" id="Allow">Allow</a> <a name="allow" id="allow">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>サー���る領域�アクセス��るホストを制御�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code> Allow from all|<var>host</var>|env=<var>env-variable</var>
+[<var>host</var>|env=<var>env-variable</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Limit</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_authz_host</td></tr>
+</table>
+    <p><code class="directive">Allow</code> ディレクティブ���ホスト�
+    サー���る領域をアクセス��る��影響を与���。
+    アクセス�ホスト��IP アドレス�IP アドレス�範囲や�
+    環境変数����得�れ����他�クライアント�リクエスト�
+    特徴�よ��制御�る�������。</p> 
+
+    <p>��ディレクティブ�最��引数�常� <code>from</code> ��。
+    �れ�続�引数�三�����形���り��。<code>Allow from
+    all</code> �指定�れ��れ������ホスト�アクセスを許���
+    アクセス制��下�説明�れ��るよ���
+    <code class="directive"><a href="#deny">Deny</a></code>
+    ディレクティブ� <code class="directive"><a href="#order">Order</a></code>
+    ディレクティブ�設定�決�り��。
+    特定�ホストやホスト群���サー���アクセスを許��る�����
+    以下��れ��形�� <em>host</em> を指定�る�������:</p>
+
+    <dl>
+      <dt>ドメイン� (�一部)</dt>
+
+      <dd>
+      <div class="example"><h3>例</h3><p><code>
+        Allow from apache.org<br />
+        Allow from .net example.edu
+      </code></p></div>
+      <p>��文字列������れ�終�る���ホスト�アクセス�許��れ��。
+      �部分�完全���も�����用�れ�����上�例�
+      <code>foo.apache.org</code> ��マッ������
+      <code>fooapache.org</code> ��マッ����ん。
+      ��設定を�る��Apache �
+      <code class="directive"><a href="../mod/core.html#hostnamelookups">HostnameLookups</a></code>
+      �設定�関�ら��クライアント� IP アドレス�対��
+      DNS � 2 �逆引�を行����。
+      ホスト��らオリジナル� IP アドレスを順引����。
+      順引��逆引��一致��ホスト��該当��場�����
+      アクセス�許��れ��。</p></dd>
+
+      <dt>完全� IP アドレス</dt>
+
+      <dd>
+      <div class="example"><h3>例</h3><p><code>
+        Allow from 10.1.2.3<br />
+        Allow from 192.168.1.104 192.168.1.205
+      </code></p></div>
+      <p>アクセスを許��る IP アドレス��。</p></dd>
+
+      <dt>IP アドレス�一部</dt>
+
+      <dd>
+      <div class="example"><h3>例</h3><p><code>
+        Allow from 10.1<br />
+        Allow from 10 172.20 192.168.2
+      </code></p></div>
+      <p>サブ�ット�制�用��IP
+      アドレス�最��一��ら三�����イト��。</p></dd>
+
+      <dt>�ットワーク/�ットマスク �対</dt>
+
+      <dd>
+      <div class="example"><h3>例</h3><p><code>
+        Allow from 10.1.0.0/255.255.0.0
+      </code></p></div>
+      <p>�ットワーク a.b.c.d ��ットマスク w.x.y.z ��。
+      より細粒度�サブ�ット制�用��。</p></dd>
+
+      <dt>�ットワーク/nnn CIDR 指定</dt>
+
+      <dd>
+      <div class="example"><h3>例</h3><p><code>
+        Allow from 10.1.0.0/16
+      </code></p></div>
+      <p>�ットマスク� nnn �上�ビット� 1
+      �����るも��ら�る��以外���も������。</p></dd>
+    </dl>
+
+    <p>注: 最後�三��例�������ホスト�����。</p>
+
+
+    <p>IPv6 アドレス� IPv6 �サブ�ット�以下�よ��指定����:</p>
+
+    <div class="example"><p><code>
+       Allow from 2001:db8::a00:20ff:fea7:ccea<br />
+       Allow from 2001:db8::a00:20ff:fea7:ccea/10
+    </code></p></div>
+
+    <p><code class="directive">Allow</code> ディレクティブ�引数�三�目�形���
+    <a href="../env.html">環境変数</a>
+    �存在�よりアクセス�制御を行��るよ���るも���。
+    <code>Allow from env=<var>env-variable</var></code>
+    �指定�れ��る��環境変数 <var>env-variable</var>
+    �存在��場��リクエスト�アクセスを許��れ��。サー��
+    <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>
+    �ディレクティブ�より�クライアント�リクエスト
+    �特徴�基���柔軟�環境変数を設定�る機能を�供���。
+    ���ら���ディレクティブ�クライアント�
+    <code>User-Agent</code> (ブラウザ�種類)�<code>Referer</code>
+    や他� HTTP リクエスト�ヘッダフィールド���基���
+    アクセス許�を�る���使��������。
+    </p>
+
+    <div class="example"><h3>Example:</h3><p><code>
+      SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in<br />
+      &lt;Directory /docroot&gt;<br />
+      <span class="indent">
+        Order Deny,Allow<br />
+        Deny from all<br />
+        Allow from env=let_me_in<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p>��場��user-agent �文字列� <code>KnockKnock/2.0</code>
+    �始�るブラウザ���アクセスを許��れ�
+    他�も��アクセスを拒��れ��。</p>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Deny" id="Deny">Deny</a> <a name="deny" id="deny">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>サー��アクセスを拒��るホストを制御�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code> Deny from all|<var>host</var>|env=<var>env-variable</var>
+[<var>host</var>|env=<var>env-variable</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Limit</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_authz_host</td></tr>
+</table>
+    <p>��ディレクティブ�ホスト��IP
+    アドレス�環境変数�基���サー���アクセスを制����。
+    <code class="directive">Deny</code> ディレクティブ�引数� <code class="directive"><a href="#allow">Allow</a></code>
+    ディレクティブ���������。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Order" id="Order">Order</a> <a name="order" id="order">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>デフォルト�アクセス�能�状態��<code class="directive">Allow</code> �
+<code class="directive">Deny</code> �評価�れる順番を制御�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code> Order <var>ordering</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>Order Deny,Allow</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Limit</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_authz_host</td></tr>
+</table>
+    <p><code class="directive">Order</code> ディレクティブ�デフォルト�アクセス�状態�
+    <code class="directive"><a href="#allow">Allow</a></code> ディレクティブ�
+    <code class="directive"><a href="#deny">Deny</a></code>
+    ディレクティブ�評価�れる順番を制御���。
+    <var>Ordering</var> �以下��れ���。</p>
+
+    <dl>
+      <dt><code>Deny,Allow</code></dt>
+
+      <dd><code class="directive"><a href="#deny">Deny</a></code> ディレクティブ�
+      <code class="directive"><a href="#allow">Allow</a></code>
+      ディレクティブ���評価�れ��。
+      アクセス�デフォルト�許��れ��。<code class="directive"><a href="#deny">Deny</a></code>
+      ディレクティブ�������<code class="directive"><a href="#allow">Allow</a></code>
+      ディレクティブ���クライアント�アクセスを許��れ��。</dd>
+
+      <dt><code>Allow,Deny</code></dt>
+
+      <dd><code class="directive"><a href="#allow">Allow</a></code>
+      ディレクティブ� <code class="directive"><a href="#deny">Deny</a></code>
+      ディレクティブ���評価�れ��。
+      アクセス�デフォルト�拒��れ��。<code class="directive"><a href="#allow">Allow</a></code>
+      ディレクティブ�������<code class="directive"><a href="#deny">Deny</a></code>
+      ディレクティブ���クライアント�アクセスを拒��れ��。
+      </dd>
+
+      <dt><code>Mutual-failure</code></dt>
+
+      <dd><code class="directive"><a href="#allow">Allow</a></code> �リスト��れ��
+      <code class="directive"><a href="#deny">Deny</a></code>
+      �リスト��れ��ホスト���アクセスを許��れ��。
+      ��順番付�� <code>Order Allow,Deny</code> ���効果を���
+      ��設定�方�好�������推奨�������。</dd>
+    </dl>
+
+    <p>キーワード�コンマ�分離�る������能��。
+    間�<em>空白���������ん</em>。��場��も�<code class="directive"><a href="#allow">Allow</a></code> �
+    <code class="directive"><a href="#deny">Deny</a></code> 文�
+    全�評価�れる������注�������。
+    </p>
+
+    <p>以下�例���apache.org
+    ドメイン�����ホスト�アクセスを許��れ��。
+    他�����ホスト�アクセスを拒��れ��。</p>
+
+    <div class="example"><p><code>
+      Order Deny,Allow<br />
+      Deny from all<br />
+      Allow from apache.org
+    </code></p></div>
+
+    <p>次�例���foo.apache.org サブドメイン��るホスト以外��
+    apache.org ドメイン�����ホスト�アクセスを許��れ��。
+    apache.org
+    ドメイン���ホスト��デフォルト�状態�アクセス拒�����
+    サー���アクセスを拒��れ��。</p>
+
+    <div class="example"><p><code>
+      Order Allow,Deny<br />
+      Allow from apache.org<br />
+      Deny from foo.apache.org
+    </code></p></div>
+
+    <p>一方�上�例� <code class="directive">Order</code> � <code>Deny,Allow</code>
+    �変����れ�����ホスト�アクセス�許��れ��。
+    �れ��設定ファイル中�実際�順番�関�ら��
+    <code>Allow from apache.org</code> �最後�評価�れ��
+    <code>Deny from foo.apache.org</code> を上書��る�ら��。
+    <code>apache.org</code>
+    ドメイン���ホストも�デフォルト�状態� <em>allow</em>
+    �変化�る����アクセスを許��れ��。
+    </p>
+
+    <p><code class="directive">Order</code>
+    ディレクティブ�デフォルト�アクセス�状態�影響を与�る���
+    <code class="directive"><a href="#allow">Allow</a></code> ディレクティブ�
+    <code class="directive"><a href="#deny">Deny</a></code>
+    ディレクティブ�無��も�サー��アクセス�影響を与�る�������。
+    �����</p>
+
+    <div class="example"><p><code>
+      &lt;Directory /www&gt;<br />
+      <span class="indent">
+        Order Allow,Deny<br />
+      </span>
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p>�デフォルト�アクセス状態� <em>deny</em> ��る���
+    <code>/www</code> ディレクトリ������アクセスを拒����。
+    </p>
+
+    <p><code class="directive">Order</code>
+    ディレクティブ�サー��設定処���段階���
+    アクセスディレクティブ�処��順番を変更���。�れ�������
+    <code class="directive">Order</code> ディレクティブ�設定�関�ら��
+    <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> セクション�
+    <code class="directive"><a href="#allow">Allow</a></code> ディレクティブや
+    <code class="directive"><a href="#deny">Deny</a></code> ディレクティブ��
+    <code class="directive"><a href="../mod/core.html#directory">Directory</a></code> セクションや
+    <code>.htaccess</code> ファイル� <code class="directive"><a href="#allow">Allow</a></code>
+    ディレクティブや <code class="directive"><a href="#deny">Deny</a></code>
+    ディレクティブよりも常�後�評価�れる�����を�味���。
+    設定セクション�マージ�詳細������
+    <a href="../sections.html">Directory,Location, Files
+    セクション�動作方法</a> を�照������。</p>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authz_host.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authz_host.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authz_host.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_host.html.ko.euc-kr b/docs/manual/mod/mod_authz_host.html.ko.euc-kr
index ee32b1dc..4cca42c9 100644
--- a/docs/manual/mod/mod_authz_host.html.ko.euc-kr
+++ b/docs/manual/mod/mod_authz_host.html.ko.euc-kr
@@ -305,6 +305,6 @@
 <a href="../ja/mod/mod_authz_host.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authz_host.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_owner.html b/docs/manual/mod/mod_authz_owner.html
index f23a815f..b70f2eab 100644
--- a/docs/manual/mod/mod_authz_owner.html
+++ b/docs/manual/mod/mod_authz_owner.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_authz_owner.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_authz_owner.html.ja.euc-jp
+URI: mod_authz_owner.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_authz_owner.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_authz_owner.html.en b/docs/manual/mod/mod_authz_owner.html.en
index 6954d469..1df4e0c0 100644
--- a/docs/manual/mod/mod_authz_owner.html.en
+++ b/docs/manual/mod/mod_authz_owner.html.en
@@ -180,6 +180,6 @@ modules</td></tr>
 <a href="../ja/mod/mod_authz_owner.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authz_owner.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_owner.html.ja.euc-jp b/docs/manual/mod/mod_authz_owner.html.ja.euc-jp
deleted file mode 100644
index 5b3ee794..00000000
--- a/docs/manual/mod/mod_authz_owner.html.ja.euc-jp
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_authz_owner - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_authz_owner</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authz_owner.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authz_owner.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authz_owner.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë¤Î½êÍ­¼Ô¤Ë´ð¤Å¤¤¤¿¾µÇ§</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>authz_owner_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_authz_owner.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.1 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î
-    ½êÍ­¼Ô¤ä¥°¥ë¡¼¥×¤ò HTTP ǧ¾Ú¤Ë»È¤ï¤ì¤¿¥æ¡¼¥¶ ID (¥¦¥§¥Ö¥æ¡¼¥¶ ID) ¤È
-    Èæ³Ó¤¹¤ë¤³¤È¤Ç¥¢¥¯¥»¥¹¤ò¾µÇ§¤·¤Þ¤¹¡£Ä󶡤µ¤ì¤¿¥æ¡¼¥¶Ì¾¤È¥Ñ¥¹¥ï¡¼¥É¤Ï
-    <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> ¤ä
-    <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code> ¤Î¤è¤¦¤Êǧ¾Ú¥â¥¸¥å¡¼¥ë¤Ç´û¤Ë
-    ŬÀڤ˸¡¾Ú¤µ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£<code class="module"><a href="../mod/mod_authz_owner.html">mod_authz_owner</a></code>
-    ¤Ï°Ê²¼¤Î¤è¤¦¤Ë¡¢<code class="directive"><a href="../mod/core.html#require">Require</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î <code>file-owner</code> ¤È
-    <code>file-group</code> ¤È¤¤¤¦Æó¤Ä¤Î°ú¿ô¤òǧ¼±¤·¤Þ¤¹:</p>
-
-    <dl>
-      <dt><code>file-owner</code></dt>
-      <dd>Ä󶡤µ¤ì¤¿¥¦¥§¥Ö¥æ¡¼¥¶Ì¾¤Ï¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Î½êÍ­¼Ô¤Î
-      ¥·¥¹¥Æ¥à¤Ë¤ª¤±¤ë̾Á°¤È°ìÃפ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°
-      ¥·¥¹¥Æ¥à¤¬¥Õ¥¡¥¤¥ë¤Ï <code>jones</code> ¤Ë¤è¤ê½êÍ­¤µ¤ì¤Æ¤¤¤ë
-      ¤È¸À¤Ã¤¿¤È¤­¤Ï¡¢¥¦¥§¥Ö¤«¤é¤Î¥¢¥¯¥»¥¹¤Ë»È¤ï¤ì¤ë¥æ¡¼¥¶Ì¾¤â
-      <code>jones</code> ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</dd>
-
-      <dt><code>file-group</code></dt>
-      <dd>¥Õ¥¡¥¤¥ë¤ò½êÍ­¤¹¤ë¥·¥¹¥Æ¥à¤Î¥°¥ë¡¼¥×¤Î̾Á°¤¬¡¢Î㤨¤Ð
-      <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> ¤ä <code class="module"><a href="../mod/mod_authz_dbm.html">mod_authz_dbm</a></code>
-      ¤Ë¤è¤êÄ󶡤µ¤ì¤ë¥°¥ë¡¼¥×¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë¸ºß¤·¤Æ¤¤¤Æ¡¢
-      ¥¦¥§¥Ö¥æ¡¼¥¶Ì¾¤¬¤½¤Î¥°¥ë¡¼¥×¤Ë°¤·¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-      Î㤨¤Ð¡¢¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤¬¥Õ¥¡¥¤¥ë¤Ï (¥·¥¹¥Æ¥à¤Î) ¥°¥ë¡¼¥×
-      <code>accounts</code> ¤Ë¤è¤ê½êÍ­¤µ¤ì¤Æ¤¤¤ë¤È¸À¤Ã¤¿¤È¤­¤Ï¡¢
-      <code>accounts</code> ¤¬¥°¥ë¡¼¥×¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë¸ºß¤·¤Æ¡¢
-      ¥ê¥¯¥¨¥¹¥È¤Ë»ÈÍѤµ¤ì¤¿¥¦¥§¥Ö¥æ¡¼¥¶Ì¾¤¬¤½¤Î¥°¥ë¡¼¥×¤Ë°¤·¤Æ¤¤¤ë
-      ɬÍפ¬¤¢¤ê¤Þ¤¹¡£</dd>
-    </dl>
-
-    <div class="note"><h3>Ãí</h3>
-      <p>¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë¼ÂºÝ¤Ë¤Ï¸ºß¤·¤Ê¤¤¥ê¥½¡¼¥¹
-      (<em>¤Ä¤Þ¤ê</em> ¥Ð¡¼¥Á¥ã¥ë¤Ê¥ê¥½¡¼¥¹) ¤Î¾µÇ§¤Ë
-      <code class="module"><a href="../mod/mod_authz_owner.html">mod_authz_owner</a></code> ¤¬»ÈÍѤµ¤ì¤¿¤È¤­¤Ï¡¢
-      ¥¢¥¯¥»¥¹¤ÏµñÈݤµ¤ì¤Þ¤¹¡£</p>
-
-      <p>Æäˡ¢<a href="../content-negotiation.html#multiviews">¥³¥ó¥Æ¥ó¥È
-      ¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤µ¤ì¤¿"MultiViews"</a> ¤Î¥ê¥½¡¼¥¹¤Ï
-      ·è¤·¤Æ¾µÇ§¤·¤Þ¤»¤ó¡£</p>
-    </div>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#authzownerauthoritative">AuthzOwnerAuthoritative</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#examples">ÀßÄêÎã</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="directive"><a href="../mod/core.html#require">Require</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">ÀßÄêÎã</a></h2>
-
-    <h3><a name="examples.file-owner" id="examples.file-owner">Require file-owner</a></h3>
-      <p>Ê£¿ô¥æ¡¼¥¶¤Î¥·¥¹¥Æ¥à¤Ç Apache ¥¦¥§¥Ö¥µ¡¼¥Ð¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤Æ¡¢
-      <code>~/public_html/private</code> ¤Ë³Æ¥æ¡¼¥¶¤¬¥Õ¥¡¥¤¥ë¤òÃÖ¤¤¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£
-      <code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code>
-      ¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬°ì¤Ä¤À¤±¤¢¤ê¡¢¤¹¤Ù¤Æ¤Î¥¦¥§¥Ö¥æ¡¼¥¶Ì¾¤¬Îóµó¤µ¤ì¤Æ¤ª¤ê¡¢
-      ¤³¤Î¥æ¡¼¥¶Ì¾¤¬¥µ¡¼¥Ð¤Ç¼ÂºÝ¤Ë¥Õ¥¡¥¤¥ë¤ò½êÍ­¤·¤Æ¤¤¤ë¥æ¡¼¥¶Ì¾¤È°ìÃפ·¤Æ¤¤¤ë¾ì¹ç¡¢
-      ¼¡¤ÎÀá¤Î¤è¤¦¤ÊÀßÄê¤Ç¡¢¥æ¡¼¥¶¤¬¼«Ê¬¼«¿È¤Î¥Õ¥¡¥¤¥ë¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-      <code>/home/smith/public_html/private</code> ¤ÎÃæ¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢½êÍ­¼Ô¤¬
-      <code>smith</code> ¤ÎÂå¤ï¤ê¤Ë <code>jones</code> ¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤¤¸Â¤ê¡¢
-      <code>jones</code> ¤Ë¤Ï¥¢¥¯¥»¥¹¤Ïµö²Ä¤µ¤ì¤Þ¤»¤ó¡£</p>
-
-      <div class="example"><p><code>
-        &lt;Directory /home/*/public_html/private&gt;<br />
-        <span class="indent">
-          AuthType Basic<br />
-          AuthName MyPrivateFiles<br />
-          AuthBasicProvider dbm<br />
-          AuthDBMUserFile /usr/local/apache2/etc/.htdbm-all<br />
-          Satisfy All<br />
-          Require file-owner<br />
-        </span>
-        &lt;/Directory&gt;
-      </code></p></div>
-    
-
-    <h3><a name="examples.file-group" id="examples.file-group">Require file-group</a></h3>
-      <p>¾åµ­¤Î¤è¤¦¤Ê¥·¥¹¥Æ¥à¤Ç¡¢¿ô¿Í¤Î¥æ¡¼¥¶¤¬¥×¥í¥¸¥§¥¯¥È¤Î¥Õ¥¡¥¤¥ë¤ò
-      <code>~/public_html/project-foo</code> ¤Ç¶¦Í­¤·¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£
-      ¥Õ¥¡¥¤¥ë¤Ï¥·¥¹¥Æ¥à¤Î¥°¥ë¡¼¥× <code>foo</code> ¤Ë½êÍ­¤µ¤ì¤Æ¤¤¤Æ¡¢
-      <code class="directive"><a href="../mod/mod_authz_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></code>
-      ¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬°ì¤Ä¤À¤±¤¢¤ê¡¢¤½¤³¤Ë¤¹¤Ù¤Æ¤Î¥¦¥§¥Ö¥æ¡¼¥¶Ì¾¤È
-      ¥°¥ë¡¼¥×¤Î¥á¥ó¥Ð¤¬Îóµó¤µ¤ì¤Æ¤¤¤ë¡¢<em>¤Ä¤Þ¤ê</em>¡¢¤½¤ì¤é¤Î
-      ¥æ¡¼¥¶¤Ï¾¯¤Ê¤¯¤È¤â <code>foo</code> ¤È¤¤¤¦¥°¥ë¡¼¥×¤Ë°¤·¤Æ¤¤¤ë¡¢¤È¤·¤Þ¤¹¡£
-      <code>jones</code> ¤È<code>smith</code> ¤ÎÆó¿Í¶¦¤¬¥°¥ë¡¼¥×
-      <code>foo</code> ¤Î¥á¥ó¥Ð¤Ç¤¢¤ë¾ì¹ç¡¢¤É¤Á¤é¤Î¿Í¤âξÊý¤Î
-      <code>project-foo</code> ¤Ë¥¢¥¯¥»¥¹¤¬µö²Ä¤µ¤ì¤Þ¤¹¡£</p>
-
-      <div class="example"><p><code>
-        &lt;Directory /home/*/public_html/project-foo&gt;<br />
-        <span class="indent">
-          AuthType Basic<br />
-          AuthName "Project Foo Files"<br />
-          AuthBasicProvider dbm<br />
-          <br />
-          # combined user/group database<br />
-          AuthDBMUserFile  /usr/local/apache2/etc/.htdbm-all<br />
-          AuthDBMGroupFile /usr/local/apache2/etc/.htdbm-all<br />
-          <br />
-          Satisfy All<br />
-          Require file-group<br />
-        </span>
-        &lt;/Directory&gt;
-      </code></p></div>
-    
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthzOwnerAuthoritative" id="AuthzOwnerAuthoritative">AuthzOwnerAuthoritative</a> <a name="authzownerauthoritative" id="authzownerauthoritative">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¾µÇ§¤¬²¼°Ì¾µÇ§¥â¥¸¥å¡¼¥ë¤ËÅϤµ¤ì¤ë¤«¤É¤¦¤«¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AuthzOwnerAuthoritative On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>AuthzOwnerAuthoritative On</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_authz_owner</td></tr>
-</table>
-    <p><code class="directive">AuthzOwnerAuthoritative</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    ÌÀ¼¨Åª¤Ë <code>Off</code> ¤ËÀßÄꤹ¤ë¤È¡¢°Ê²¼¤Î¾ì¹ç¤Ëǧ¾Ú¤¬
-    (<code>modules.c</code> ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë) ²¼°Ì¤Î¥â¥¸¥å¡¼¥ë¤Ë
-    ÅϤµ¤ì¤ë¤è¤¦¤Ë¤·¤Þ¤¹:</p>
-
-    <ul>
-    <li><code>file-owner</code> ¤Î¾ì¹ç¤Ï¡¢Ä󶡤µ¤ì¤¿¥¦¥§¥Ö¥æ¡¼¥¶Ì¾¤Ë
-    ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î½êÍ­¼Ô¤¬°ìÃפ·¤Ê¤¤¤«¡¢½êÍ­¼Ô¤¬¤ï¤«¤é¤Ê¤¤¾ì¹ç¡£</li>
-
-    <li><code>file-group</code> ¤Î¾ì¹ç¤Ï¡¢Ä󶡤µ¤ì¤¿¥¦¥§¥Ö¥æ¡¼¥¶Ì¾¤¬
-    ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥°¥ë¡¼¥×¤Ë¸ºß¤·¤Ê¤¤¤«¡¢¤ï¤«¤é¤Ê¤¤¾ì¹ç¡£</li>
-    </ul>
-
-    <p>Ãͤò <code>Off</code> ¤ËÀßÄꤹ¤ë¤È¡¢<code>file-owner</code> ¤È
-    <code>file-group</code> ¤òÁȤ߹ç¤ï¤»¤ë¤³¤È¤â¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¡¢
-    ¤½¤Î¾ì¹ç¤Ï¤É¤Á¤é¤« (ξÊý¤Ç¤â) ¤Ë¥Þ¥Ã¥Á¤·¤¿¾ì¹ç¤Ë¥¢¥¯¥»¥¹¤òµö²Ä¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>¥Ç¥Õ¥©¥ë¥È¤Ç¤ÏÀ©¸æ¤ÏÅϤµ¤ì¤º¡¢Ì¤ÃΤΥ°¥ë¡¼¥×¤Î¾ì¹ç¤Ï Authentication
-    Required ±þÅú¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢<code>Off</code> ¤ËÀßÄꤷ¤Ê¤¤¤³¤È¤Ç
-    ¥·¥¹¥Æ¥à¤ò°ÂÁ´¤ËÊݤĤ³¤È¤¬¤Ç¤­¡¢NCSA ¸ß´¹¤Î¿¶¤ëÉñ¤¤¤ò¤µ¤»¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authz_owner.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authz_owner.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authz_owner.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_owner.html.ja.utf8 b/docs/manual/mod/mod_authz_owner.html.ja.utf8
new file mode 100644
index 00000000..003fff59
--- /dev/null
+++ b/docs/manual/mod/mod_authz_owner.html.ja.utf8
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_authz_owner - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_authz_owner</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authz_owner.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authz_owner.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authz_owner.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>ファイル�所有者�基���承�</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>authz_owner_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_authz_owner.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>Apache 2.1 以��使用�能</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール�リクエスト�れ�ファイル�ファイルシステム�
+    所有者やグループを HTTP �証�使�れ�ユーザ ID (ウェブユーザ ID) �
+    比較�る���アクセスを承����。�供�れ�ユーザ��パスワード�
+    <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code> ã‚„
+    <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code> �よ���証モジュール�既�
+    �切�検証�れ��る必���り��。<code class="module"><a href="../mod/mod_authz_owner.html">mod_authz_owner</a></code>
+    �以下�よ���<code class="directive"><a href="../mod/core.html#require">Require</a></code> ディレクティブ� <code>file-owner</code> �
+    <code>file-group</code> ���二��引数を�識���:</p>
+
+    <dl>
+      <dt><code>file-owner</code></dt>
+      <dd>�供�れ�ウェブユーザ��リクエスト�れ�ファイル�所有者�
+      システム���る���一致�る必���り��。��り�オペレーティング
+      システム�ファイル� <code>jones</code> �より所有�れ��る
+      �言������ウェブ�ら�アクセス�使�れるユーザ�も
+      <code>jones</code> ���れ��り��ん。</dd>
+
+      <dt><code>file-group</code></dt>
+      <dd>ファイルを所有�るシステム�グループ�����例��
+      <code class="module"><a href="../mod/mod_authz_groupfile.html">mod_authz_groupfile</a></code> ã‚„ <code class="module"><a href="../mod/mod_authz_dbm.html">mod_authz_dbm</a></code>
+      �より�供�れるグループデータベース�存在�����
+      ウェブユーザ����グループ�属�����れ��り��ん。
+      例���オペレーティングシステム�ファイル� (システム�) グループ
+      <code>accounts</code> �より所有�れ��る�言������
+      <code>accounts</code> �グループデータベース�存在���
+      リクエスト�使用�れ�ウェブユーザ����グループ�属���る
+      必���り��。</dd>
+    </dl>
+
+    <div class="note"><h3>注</h3>
+      <p>ファイルシステム�実際��存在���リソース
+      (<em>��り</em> �ー�ャル�リソース) �承��
+      <code class="module"><a href="../mod/mod_authz_owner.html">mod_authz_owner</a></code> �使用�れ�����
+      アクセス�拒��れ��。</p>
+
+      <p>特��<a href="../content-negotiation.html#multiviews">コンテント
+      �ゴシエーション�れ�"MultiViews"</a> �リソース�
+      決��承����ん。</p>
+    </div>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#authzownerauthoritative">AuthzOwnerAuthoritative</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#examples">設定例</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/core.html#require">Require</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">設定例</a></h2>
+
+    <h3><a name="examples.file-owner" id="examples.file-owner">Require file-owner</a></h3>
+      <p>複数ユーザ�システム� Apache ウェブサー��実行�れ����
+      <code>~/public_html/private</code> ��ユーザ�ファイルを置���る����。
+      <code class="directive"><a href="../mod/mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile</a></code>
+      データベース�一����り�����ウェブユーザ��列挙�れ��り�
+      ��ユーザ��サー��実際�ファイルを所有���るユーザ��一致���る場��
+      次�節�よ��設定��ユーザ�自分自身�ファイル�アクセス��るよ���り��。
+      <code>/home/smith/public_html/private</code> �中�ファイル��所有者�
+      <code>smith</code> �代�り� <code>jones</code> ��������り�
+      <code>jones</code> ��アクセス�許��れ��ん。</p>
+
+      <div class="example"><p><code>
+        &lt;Directory /home/*/public_html/private&gt;<br />
+        <span class="indent">
+          AuthType Basic<br />
+          AuthName MyPrivateFiles<br />
+          AuthBasicProvider dbm<br />
+          AuthDBMUserFile /usr/local/apache2/etc/.htdbm-all<br />
+          Satisfy All<br />
+          Require file-owner<br />
+        </span>
+        &lt;/Directory&gt;
+      </code></p></div>
+    
+
+    <h3><a name="examples.file-group" id="examples.file-group">Require file-group</a></h3>
+      <p>上記�よ��システム��数人�ユーザ�プロジェクト�ファイルを
+      <code>~/public_html/project-foo</code> �共有���る����。
+      ファイル�システム�グループ <code>foo</code> �所有�れ����
+      <code class="directive"><a href="../mod/mod_authz_dbm.html#authdbmgroupfile">AuthDBMGroupFile</a></code>
+      データベース�一����り��������ウェブユーザ��
+      グループ�メン��列挙�れ��る�<em>��り</em>��れら�
+      ユーザ�少���も <code>foo</code> ���グループ�属���る�����。
+      <code>jones</code> �<code>smith</code> �二人共�グループ
+      <code>foo</code> �メン���る場����ら�人も両方�
+      <code>project-foo</code> �アクセス�許��れ��。</p>
+
+      <div class="example"><p><code>
+        &lt;Directory /home/*/public_html/project-foo&gt;<br />
+        <span class="indent">
+          AuthType Basic<br />
+          AuthName "Project Foo Files"<br />
+          AuthBasicProvider dbm<br />
+          <br />
+          # combined user/group database<br />
+          AuthDBMUserFile  /usr/local/apache2/etc/.htdbm-all<br />
+          AuthDBMGroupFile /usr/local/apache2/etc/.htdbm-all<br />
+          <br />
+          Satisfy All<br />
+          Require file-group<br />
+        </span>
+        &lt;/Directory&gt;
+      </code></p></div>
+    
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthzOwnerAuthoritative" id="AuthzOwnerAuthoritative">AuthzOwnerAuthoritative</a> <a name="authzownerauthoritative" id="authzownerauthoritative">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>承��下�承�モジュール�渡�れる����を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AuthzOwnerAuthoritative On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>AuthzOwnerAuthoritative On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_authz_owner</td></tr>
+</table>
+    <p><code class="directive">AuthzOwnerAuthoritative</code> ディレクティブを
+    明示的� <code>Off</code> �設定�る��以下�場���証�
+    (<code>modules.c</code> �定義�れ��る) 下��モジュール�
+    渡�れるよ�����:</p>
+
+    <ul>
+    <li><code>file-owner</code> �場����供�れ�ウェブユーザ��
+    ファイルシステム�所有者�一致�����所有者���ら��場�。</li>
+
+    <li><code>file-group</code> �場����供�れ�ウェブユーザ��
+    ファイルシステムグループ�存在�������ら��場�。</li>
+    </ul>
+
+    <p>値を <code>Off</code> �設定�る��<code>file-owner</code> �
+    <code>file-group</code> を組����る��も��るよ���り�
+    ��場����ら� (両方�も) �マッ���場��アクセスを許��れ��。</p>
+
+    <p>デフォルト��制御�渡�れ��未知�グループ�場�� Authentication
+    Required 応答�返�れ��。���ら�<code>Off</code> �設定������
+    システムを安全���������NCSA 互��振る舞�を��る����り��。</p>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authz_owner.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authz_owner.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authz_owner.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_owner.html.ko.euc-kr b/docs/manual/mod/mod_authz_owner.html.ko.euc-kr
index 969f99ba..0248e463 100644
--- a/docs/manual/mod/mod_authz_owner.html.ko.euc-kr
+++ b/docs/manual/mod/mod_authz_owner.html.ko.euc-kr
@@ -177,6 +177,6 @@
 <a href="../ja/mod/mod_authz_owner.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authz_owner.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_user.html b/docs/manual/mod/mod_authz_user.html
index bbf7fe11..e0ec3cc6 100644
--- a/docs/manual/mod/mod_authz_user.html
+++ b/docs/manual/mod/mod_authz_user.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_authz_user.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_authz_user.html.ja.euc-jp
+URI: mod_authz_user.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_authz_user.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_authz_user.html.en b/docs/manual/mod/mod_authz_user.html.en
index b177c256..30be3713 100644
--- a/docs/manual/mod/mod_authz_user.html.en
+++ b/docs/manual/mod/mod_authz_user.html.en
@@ -36,7 +36,7 @@
     authenticated users can be allowed or denied access to portions
     of the web site. <code class="module"><a href="../mod/mod_authz_user.html">mod_authz_user</a></code> grants
     access if the authenticated user is listed in a <code>Require user</code>
-    directive. Alternatively <code>require valid-user</code> can be used to
+    directive. Alternatively <code>Require valid-user</code> can be used to
     grant access to all successfully authenticated users.</p>
 </div>
 <div id="quickview"><h3 class="directives">Directives</h3>
@@ -79,6 +79,6 @@ modules</td></tr>
 <a href="../ja/mod/mod_authz_user.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authz_user.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_user.html.ja.euc-jp b/docs/manual/mod/mod_authz_user.html.ja.euc-jp
deleted file mode 100644
index 1ed8956f..00000000
--- a/docs/manual/mod/mod_authz_user.html.ja.euc-jp
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_authz_user - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_authz_user</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authz_user.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authz_user.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authz_user.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥æ¡¼¥¶¾µÇ§</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>authz_user_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_authz_user.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.1 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¡¢Ç§¾Ú¤µ¤ì¤¿¥æ¡¼¥¶¤Ë¥¦¥§¥Ö¥µ¥¤¥È¤Î°ìÉô¤Ø¤Î
-    ¥¢¥¯¥»¥¹¤òµö²Ä¤·¤¿¤êµñÈݤ·¤¿¤ê¤¹¤ë¤¿¤á¤Î¾µÇ§µ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£
-    <code class="module"><a href="../mod/mod_authz_user.html">mod_authz_user</a></code> ¤Ïǧ¾Ú¤µ¤ì¤¿¥æ¡¼¥¶¤¬
-    <code>Require user</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë½ñ¤«¤ì¤Æ¤¤¤ì¤Ð
-    ¥¢¥¯¥»¥¹¤òǧ¤á¤Þ¤¹¡£Ç§¾Ú¤ËÀ®¸ù¤·¤¿¥æ¡¼¥¶¤¹¤Ù¤Æ¤Ë¥¢¥¯¥»¥¹¤ò
-    µö²Ä¤¹¤ë¤Ë¤Ï¡¢Âå¤ï¤ê¤Ë <code>require valid-user</code> ¤ò
-    »È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#authzuserauthoritative">AuthzUserAuthoritative</a></li>
-</ul>
-<h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="directive"><a href="../mod/core.html#require">Require</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code></li>
-</ul></div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AuthzUserAuthoritative" id="AuthzUserAuthoritative">AuthzUserAuthoritative</a> <a name="authzuserauthoritative" id="authzuserauthoritative">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¾µÇ§¤¬²¼°Ì¤Î¥â¥¸¥å¡¼¥ë¤ËÅϤµ¤ì¤ë¤«¤É¤¦¤«¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AuthzUserAuthoritative On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>AuthzUserAuthoritative On</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>AuthConfig</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_authz_user</td></tr>
-</table>
-    <p><code class="directive">AuthzUserAuthoritative</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    ÌÀ¼¨Åª¤Ë <code>Off</code> ¤ËÀßÄꤹ¤ë¤È userID ¤ËÂбþ¤¹¤ë
-    <strong>¥°¥ë¡¼¥×¤¬¤Ê¤¤¾ì¹ç¤Ë</strong>¡¢
-    (<code>module.c</code> ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë) ²¼°Ì¤Î¥â¥¸¥å¡¼¥ë¤Ë¥°¥ë¡¼¥×¾µÇ§¤ò
-    ÅϤ¹¤³¤È¤òµö²Ä¤·¤Þ¤¹¡£</p>
-
-    <p>¥Ç¥Õ¥©¥ë¥È¤Ç¤ÏÀ©¸æ¤ÏÅϤµ¤ì¤º¡¢Ì¤ÃΤΥ°¥ë¡¼¥×¤Î¾ì¹ç¤Ï Authentication
-    Required ±þÅú¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢¤³¤ì¤òÀßÄꤷ¤Ê¤¤¤È
-    ¥·¥¹¥Æ¥à¤ò°ÂÁ´¤ËÊݤĤ³¤È¤¬¤Ç¤­¡¢NCSA ¸ß´¹¤Î¿¶¤ëÉñ¤¤¤ò¤µ¤»¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_authz_user.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_authz_user.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_authz_user.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_user.html.ja.utf8 b/docs/manual/mod/mod_authz_user.html.ja.utf8
new file mode 100644
index 00000000..79ba929b
--- /dev/null
+++ b/docs/manual/mod/mod_authz_user.html.ja.utf8
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_authz_user - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_authz_user</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authz_user.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authz_user.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authz_user.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>ユーザ承�</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>authz_user_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_authz_user.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>Apache 2.1 以��使用�能</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール���証�れ�ユーザ�ウェブサイト�一部��
+    アクセスを許���り拒���り�る���承�機能を�供���。
+    <code class="module"><a href="../mod/mod_authz_user.html">mod_authz_user</a></code> ��証�れ�ユーザ�
+    <code>Require user</code> ディレクティブ�書�れ��れ�
+    アクセスを����。�証��功��ユーザ����アクセスを
+    許��る���代�り� <code>require valid-user</code> を
+    使��������。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#authzuserauthoritative">AuthzUserAuthoritative</a></li>
+</ul>
+<h3>�照</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/core.html#require">Require</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#satisfy">Satisfy</a></code></li>
+</ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AuthzUserAuthoritative" id="AuthzUserAuthoritative">AuthzUserAuthoritative</a> <a name="authzuserauthoritative" id="authzuserauthoritative">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>承��下��モジュール�渡�れる����を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AuthzUserAuthoritative On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>AuthzUserAuthoritative On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_authz_user</td></tr>
+</table>
+    <p><code class="directive">AuthzUserAuthoritative</code> ディレクティブを
+    明示的� <code>Off</code> �設定�る� userID �対応�る
+    <strong>グループ���場��</strong>�
+    (<code>module.c</code> �定義�れ��る) 下��モジュール�グループ承�を
+    渡���を許����。</p>
+
+    <p>デフォルト��制御�渡�れ��未知�グループ�場�� Authentication
+    Required 応答�返�れ��。���ら��れを設定����
+    システムを安全���������NCSA 互��振る舞�を��る����り��。</p>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_authz_user.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_authz_user.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_authz_user.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_authz_user.html.ko.euc-kr b/docs/manual/mod/mod_authz_user.html.ko.euc-kr
index 6af4444c..f7ad38c1 100644
--- a/docs/manual/mod/mod_authz_user.html.ko.euc-kr
+++ b/docs/manual/mod/mod_authz_user.html.ko.euc-kr
@@ -25,6 +25,8 @@
 <a href="../ja/mod/mod_authz_user.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authz_user.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
+<div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
+            ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
 <table class="module"><tr><th><a href="module-dict.html#Description">¼³¸í:</a></th><td>»ç¿ëÀÚ ±ÇÇѺο©</td></tr>
 <tr><th><a href="module-dict.html#Status">»óÅÂ:</a></th><td>Base</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">¸ðµâ¸í:</a></th><td>authz_user_module</td></tr>
@@ -76,6 +78,6 @@
 <a href="../ja/mod/mod_authz_user.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_authz_user.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_autoindex.html b/docs/manual/mod/mod_autoindex.html
index 16baec2f..1684061a 100644
--- a/docs/manual/mod/mod_autoindex.html
+++ b/docs/manual/mod/mod_autoindex.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_autoindex.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_autoindex.html.ja.euc-jp
+URI: mod_autoindex.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_autoindex.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_autoindex.html.en b/docs/manual/mod/mod_autoindex.html.en
index 255dad33..2eb7cc2d 100644
--- a/docs/manual/mod/mod_autoindex.html.en
+++ b/docs/manual/mod/mod_autoindex.html.en
@@ -914,6 +914,6 @@ of the index listing</td></tr>
 <a href="../ja/mod/mod_autoindex.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_autoindex.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_autoindex.html.ja.euc-jp b/docs/manual/mod/mod_autoindex.html.ja.euc-jp
deleted file mode 100644
index f7554976..00000000
--- a/docs/manual/mod/mod_autoindex.html.ja.euc-jp
+++ /dev/null
@@ -1,987 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_autoindex - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_autoindex</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_autoindex.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_autoindex.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_autoindex.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>Unix ¤Î <code>ls</code> ¥³¥Þ¥ó¥É¤ä
-    Win32 ¤Î <code>dir</code> ¥·¥§¥ë¥³¥Þ¥ó¥É¤Ë»÷¤¿
-    ¥Ç¥£¥ì¥¯¥È¥ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤òÀ¸À®¤¹¤ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>autoindex_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_autoindex.c</td></tr></table>
-<h3>³µÍ×</h3>
- 
-      <p>¥Ç¥£¥ì¥¯¥È¥ê¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¤ÏÆó¤Ä¤Î¾ðÊ󸻤Τ¦¤Á¤Î
-      °ì¤Ä¤«¤éÀ¸À®¤Ç¤­¤Þ¤¹:</p>
-
-    <ul>
-      <li>ÉáÄÌ¤Ï <code>index.html</code> ¤È¸Æ¤Ð¤ì¤ë
-      ¥æ¡¼¥¶¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤¿¥Õ¥¡¥¤¥ë¡£
-      <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤³¤Î¥Õ¥¡¥¤¥ë̾¤òÀßÄꤷ¤Þ¤¹¡£
-      ¤³¤ì¤Ï <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code> ¤ÇÀ©¸æ¤µ¤ì¤Þ¤¹¡£</li>
-
-      <li>¤â¤·¤¯¤Ï¡¢¥µ¡¼¥Ð¤Ë¤è¤Ã¤ÆÀ¸À®¤µ¤ì¤¿°ìÍ÷¡£
-      ¤½¤Î¾¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤³¤Î°ìÍ÷¤Î½ñ¼°¤òÀ©¸æ¤·¤Þ¤¹¡£
-      <code class="directive"><a href="#addicon">AddIcon</a></code>, <code class="directive"><a href="#addiconbyencoding">AddIconByEncoding</a></code> ¤È
-      <code class="directive"><a href="#addiconbytype">AddIconByType</a></code>
-      ¤ò»È¤¦¤³¤È¤Ç¡¢ÍÍ¡¹¤Ê¥Õ¥¡¥¤¥ë¥¿¥¤¥×¤ËÂФ·¤Æ¥¢¥¤¥³¥ó°ìÍ÷¤ò
-      ¥»¥Ã¥È¤·¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¥ê¥¹¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ëËè¤Ë¡¢
-      ¥Õ¥¡¥¤¥ë¤Ë¥Þ¥Ã¥Á¤·¤¿°ìÈֺǽé¤Î¥¢¥¤¥³¥ó¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
-      ¤³¤ì¤é¤Ï <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> ¤ÇÀ©¸æ¤µ¤ì¤Þ¤¹¡£</li>
-    </ul>
-    <p>˾¤à¤Ê¤é¤Ð¡¢¼«Æ°¥¤¥ó¥Ç¥Ã¥¯¥¹À¸À®¤ò´°Á´¤Ë½üµî (¤¢¤ë¤¤¤ÏÃÖ´¹)
-    ¤Ç¤­¤ë¤è¤¦¤Ë¡¢¤³¤ÎÆó¤Ä¤Îµ¡Ç½¤ÏʬΥ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p>¼«Æ°¥¤¥ó¥Ç¥Ã¥¯¥¹À¸À®¤Ï <code>Options +Indexes</code>
-    ¤ò»È¤¦¤³¤È¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-    <code class="directive"><a href="../mod/core.html#options">Options</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¤´Í÷²¼¤µ¤¤¡£</p>
-
-    <p>¤â¤· <code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>¥ª¥×¥·¥ç¥ó¤¬
-    <code class="directive"><a href="../mod/autoindex.html#indexoptions">IndexOptions</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ËÍ¿¤¨¤é¤ì¤Æ¤¤¤ë¤Ê¤é¤Ð¡¢
-    Îó¤ÎÀèƬ¤Ïɽ¼¨¤Î½çÈÖ¤òÀ©¸æ¤¹¤ë¥ê¥ó¥¯¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ÀèƬ¤Î¥ê¥ó¥¯¤òÁªÂò¤¹¤ë¤È¡¢°ìÍ÷¤ÏºÆÀ¸À®¤µ¤ì¤Æ
-    ¤½¤ÎÎó¤ÎÃͤǥ½¡¼¥È¤µ¤ì¤Þ¤¹¡£
-    Ʊ¤¸ÀèƬ¤ò³¤±¤ÆÁªÂò¤¹¤ë¤È¡¢¸ò¸ß¤Ë¾º½ç¤È¹ß½ç¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¤³¤ì¤é¤ÎÎó¤ÎÀèƬ¤Î¥ê¥ó¥¯¤Ï¡¢
-    <code class="directive"><a href="#indexoptions">IndexOptions</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-    <code>SuppressColumnSorting</code>
-    ¥ª¥×¥·¥ç¥ó¤Ç¾Ã¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>"Size" ¤Ç¥½¡¼¥È¤·¤¿¾ì¹ç¤Ï¡¢ÍѤ¤¤é¤ì¤ë¤Î¤Ï
-    <em>¼ÂºÝ¤Î</em>¥Õ¥¡¥¤¥ë¤Î¥µ¥¤¥º¤Ç¤¢¤Ã¤Æ¡¢
-    ɽ¼¨¤ÎÃͤǤϤʤ¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤ -
-    ¤¿¤È¤¨Î¾Êý¤È¤â¤¬ "1K" ¤Èɽ¼¨¤µ¤ì¤Æ¤¤¤¿¤È¤·¤Æ¤â¡¢
-    1010 ¥Ð¥¤¥È¤Î¥Õ¥¡¥¤¥ë¤Ïɬ¤º 1011
-    ¥Ð¥¤¥È¤Î¥Õ¥¡¥¤¥ë¤è¤ê¤âÁ° (¾º½ç¤Î¾ì¹ç) ¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#addalt">AddAlt</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#addaltbyencoding">AddAltByEncoding</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#addaltbytype">AddAltByType</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#adddescription">AddDescription</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#addicon">AddIcon</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#addiconbyencoding">AddIconByEncoding</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#addiconbytype">AddIconByType</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#defaulticon">DefaultIcon</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#headername">HeaderName</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#indexignore">IndexIgnore</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#indexoptions">IndexOptions</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#indexorderdefault">IndexOrderDefault</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#indexstylesheet">IndexStyleSheet</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#readmename">ReadmeName</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#query">Autoindex ¥ê¥¯¥¨¥¹¥È¥¯¥¨¥ê¡¼°ú¿ô</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="query" id="query">Autoindex ¥ê¥¯¥¨¥¹¥È¥¯¥¨¥ê¡¼°ú¿ô</a></h2>
-    
-
-    <p>Apache 2.0.23 ¤Ç¡¢
-    ¥³¥é¥à¥½¡¼¥È¤Î¤¿¤á¤Ë¥¯¥¨¥ê¡¼°ú¿ô¤òºÆÊÔÀ®¤·¤Æ¡¢
-    ¿·¤·¤¤¥¯¥¨¥ê¡¼¥ª¥×¥·¥ç¥ó¤Î¥°¥ë¡¼¥×¤òƳÆþ¤·¤Þ¤·¤¿¡£
-    ½ÐÎϤËÂФ¹¤ë¥¯¥é¥¤¥¢¥ó¥È¤Î¤¹¤Ù¤Æ¤ÎÀ©¸æ¤ò¸úΨŪ¤ËËõ¾Ã
-    ¤Ç¤­¤ë¤è¤¦¤Ë¡¢
-    <code><a href="#indexoptions.ignoreclient">IndexOptions
-    IgnoreClient</a></code> ¤¬Æ³Æþ¤µ¤ì¤Þ¤·¤¿¡£</p>
-
-    <p>¥³¥é¥à¥½¡¼¥È¤Î¥Ø¥Ã¥À¤½¤ì¼«ÂΤ¬¡¢
-    ²¼µ­¤Î¥½¡¼¥È¥¯¥¨¥ê¡¼¥ª¥×¥·¥ç¥ó¤òÉղ乤ë
-    ¼«Ê¬¼«¿È¤ò»²¾È¤¹¤ë¥ê¥ó¥¯¤Ç¤¹¡£
-    ²¼µ­¤Î¥ª¥×¥·¥ç¥ó¤Î¤É¤ì¤Ç¤â¡¢
-    ¥Ç¥£¥ì¥¯¥È¥ê¥ê¥½¡¼¥¹¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ë²Ã¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <ul>
-      <li><code>C=N</code> ¤Ï¡¢¥Õ¥¡¥¤¥ë̾¤Ç¥½¡¼¥È¤·¤Þ¤¹¡£</li>
-
-      <li><code>C=M</code> ¤Ï¡¢¹¹¿·Æü»þ¡¢
-      ¥Ç¥£¥ì¥¯¥È¥ê¡¢¥Õ¥¡¥¤¥ë̾¤Î½ç¤Ç¥½¡¼¥È¤·¤Þ¤¹¡£</li>
-
-      <li><code>C=S</code> ¤Ï¡¢¥µ¥¤¥º¡¢
-      ¥Ç¥£¥ì¥¯¥È¥ê¡¢¥Õ¥¡¥¤¥ë̾¤Î½ç¤Ç¥½¡¼¥È¤·¤Þ¤¹¡£</li>
-
-      <li class="separate"><code>C=D</code> ¤Ï¡¢ÀâÌÀ¡¢
-      ¥Ç¥£¥ì¥¯¥È¥ê¡¢¥Õ¥¡¥¤¥ë̾¤Î½ç¤Ç¥½¡¼¥È¤·¤Þ¤¹¡£</li>
-
-      <li><code>O=A</code> ¤Ï¡¢¾º½ç¤Çɽ¤ò¥½¡¼¥È¤·¤Þ¤¹¡£</li>
-
-      <li class="separate"><code>O=D</code> ¤Ï¡¢¹ß½ç¤Çɽ¤ò¥½¡¼¥È¤·¤Þ¤¹¡£</li>
-
-      <li><code>F=0</code> ¤Ï¡¢Ã±½ã¤Êɽ¤Î½ñ¼°¤Ë¤·¤Þ¤¹¡£
-      (FancyIndex ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£)</li>
-
-      <li><code>F=1</code> ¤Ï¡¢FancyIndex 
-      ɽ¼¨¤Îɽ¤Î½ñ¼°¤Ë¤·¤Þ¤¹¡£</li>
-
-      <li><code>F=2</code> ¤Ï¡¢É½¤ò HTML 
-      ¤Î¥Æ¡¼¥Ö¥ë¤ò»È¤Ã¤¿ FancyIndex ¤Î½ñ¼°¤Ë¤·¤Þ¤¹¡£</li>
-
-      <li><code>V=0</code> 
-      ¤Ï¡¢¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤ë¥½¡¼¥È¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£</li>
-
-      <li class="separate"><code>V=1</code> 
-      ¤Ï¡¢¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤ë¥½¡¼¥È¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£</li>
-
-      <li><code>P=<var>pattern</var></code> 
-      ¤Ï¡¢Í¿¤¨¤é¤ì¤¿ <var>pattern</var>
-      ¤ËŬ¹ç¤·¤¿¥Õ¥¡¥¤¥ë¤Î¤ß¤òɽ¼¨¤·¤Þ¤¹¡£</li>
-    </ul>
-
-    <p>"P (¥Ñ¥¿¡¼¥ó¤Î P)" ¥¯¥¨¥ê¡¼°ú¿ô¤Ï¡¢
-    Ä̾ï¤Î <code class="directive"><a href="#indexignore">IndexIgnore</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬½èÍý¤µ¤ì¤¿<em>¸å</em>¤Ë¸¡ºº¤µ¤ì¡¢
-    ¥Õ¥¡¥¤¥ë̾Á´¤Æ¤¬¡¢Â¾¤Î autoindex
-    ¥ê¥¹¥È½èÍý¤ÈƱÍͤÎȽÄê´ð½à²¼¤ËÃÖ¤«¤ì³¤±¤ë
-    ¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> ¤Î¥¯¥¨¥ê¡¼°ú¿ô¥Ñ¡¼¥µ (²òÀÏ) ¤Ï¡¢
-    ǧ¼±ÉÔǽ¤Ê¥ª¥×¥·¥ç¥ó¤Ë¤Ö¤Ä¤«¤ë¤È¨ºÂ¤ËÄä»ß¤·¤Þ¤¹¡£
-    ¥¯¥¨¥ê¡¼°ú¿ô¤Ï¾å¤Îɽ¤Ë½¾¤Ã¤Æ
-    Àµ¤·¤¤·Á¼°¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-
-    <p>²¼¤Îñ½ã¤ÊÎã¤Ï¡¢¤³¤ì¤é¤Î¥¯¥¨¥ê¡¼¥ª¥×¥·¥ç¥ó¤ò
-    ɽ¤·¤Þ¤¹¡£¤³¤ì¤ò¤½¤Î¤Þ¤ÞÀÚ¤ê¼è¤Ã¤Æ HEADER.html 
-    ¥Õ¥¡¥¤¥ë¤ËÊݸ¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-    mod_autoindex ¤¬ X=Go ÆþÎϤˤ֤Ĥ«¤ëÁ°¤Ë
-    °ú¿ô¤¬Á´¤Æ²ò¼á¤µ¤ì¤ë¤è¤¦¤Ë¡¢
-    ̤ÃΤΰú¿ô "X" ¤Ï¥ê¥¹¥È¤ÎºÇ¸å¤ËÃÖ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      &lt;form action="" method="get"&gt;<br />
-      <span class="indent">
-        Show me a &lt;select name="F"&gt;<br />
-        <span class="indent">
-          &lt;option value="0"&gt; Plain list&lt;/option&gt;<br />
-          &lt;option value="1" selected="selected"&gt; Fancy list&lt;/option&gt;<br />
-          &lt;option value="2"&gt; Table list&lt;/option&gt;<br />
-        </span>
-        &lt;/select&gt;<br />
-        Sorted by &lt;select name="C"&gt;<br />
-        <span class="indent">
-          &lt;option value="N" selected="selected"&gt; Name&lt;/option&gt;<br />
-          &lt;option value="M"&gt; Date Modified&lt;/option&gt;<br />
-          &lt;option value="S"&gt; Size&lt;/option&gt;<br />
-          &lt;option value="D"&gt; Description&lt;/option&gt;<br />
-        </span>
-        &lt;/select&gt;<br />
-        &lt;select name="O"&gt;<br />
-        <span class="indent">
-          &lt;option value="A" selected="selected"&gt; Ascending&lt;/option&gt;<br />
-          &lt;option value="D"&gt; Descending&lt;/option&gt;<br />
-        </span>
-        &lt;/select&gt;<br />
-        &lt;select name="V"&gt;<br />
-        <span class="indent">
-          &lt;option value="0" selected="selected"&gt; in Normal order&lt;/option&gt;<br />
-          &lt;option value="1"&gt; in Version order&lt;/option&gt;<br />
-        </span>
-        &lt;/select&gt;<br />
-        Matching &lt;input type="text" name="P" value="*" /&gt;<br />
-        &lt;input type="submit" name="X" value="Go" /&gt;<br />
-      </span>
-      &lt;/form&gt;
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddAlt" id="AddAlt">AddAlt</a> <a name="addalt" id="addalt">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¢¥¤¥³¥ó¤ÎÂå¤ï¤ê¤Ë
-ɽ¼¨¤µ¤ì¤ë¡¢¥Õ¥¡¥¤¥ë̾¤ÇÁªÂò¤µ¤ì¤¿ÂåÂإƥ­¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddAlt <var>string</var> <var>file</var> [<var>file</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_autoindex</td></tr>
-</table>
-    <p><code class="directive">AddAlt</code> ¤Ï¡¢<code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
-    ¤Ë¤ª¤¤¤Æ¡¢¥¢¥¤¥³¥ó¤ÎÂå¤ï¤ê¤Ëɽ¼¨¤¹¤ëÂåÂإƥ­¥¹¥È¤òÄ󶡤·¤Þ¤¹¡£
-    <var>file</var> ¤Ï¡¢ÀâÌÀ¤¹¤ë¥Õ¥¡¥¤¥ë¤Î¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¡¢
-    ¥Õ¥¡¥¤¥ë̾¤Î°ìÉô¡¢¥ï¥¤¥ë¥É¥«¡¼¥Éɽ¸½¡¢´°Á´¤Ê¥Õ¥¡¥¤¥ë̾¤Î
-    ¤É¤ì¤«¤Ë¤Ê¤ê¤Þ¤¹¡£
-    <var>string</var> ¤Ë¶õÇò¤¬¤¢¤ë¾ì¹ç¤Ï°úÍÑÉä  (<code>"</code>
-    ¤« <code>'</code>) ¤Ç°Ï¤àɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤Îʸ»úÎó¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬²èÁü¤òɽ¼¨¤Ç¤­¤Ê¤¤¾ì¹ç¤ä
-    ²èÁü¤Î¥í¡¼¥É¤ò̵¸ú¤Ë¤·¤Æ¤¤¤ë¾ì¹ç¤ä
-    ¥¢¥¤¥³¥ó¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤¿¤È¤­¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      AddAlt "PDF file" *.pdf<br />
-      AddAlt Compressed *.gz *.zip *.Z
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddAltByEncoding" id="AddAltByEncoding">AddAltByEncoding</a> <a name="addaltbyencoding" id="addaltbyencoding">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¢¥¤¥³¥ó¤ÎÂå¤ï¤ê¤Ëɽ¼¨¤µ¤ì¤ë¡¢MIME Éä¹æ²½ÊýË¡¤ÇÁªÂò¤µ¤ì¤¿
-ÂåÂإƥ­¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddAltByEncoding <var>string</var> <var>MIME-encoding</var>
-[<var>MIME-encoding</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_autoindex</td></tr>
-</table>
-    <p><code class="directive">AddAltByEncoding</code> ¤Ï¡¢
-    <code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
-    ¤Ë¤ª¤¤¤Æ¡¢¥¢¥¤¥³¥ó¤ÎÂå¤ï¤ê¤Ëɽ¼¨¤¹¤ëÂåÂØʸ»úÎó¤òÄ󶡤·¤Þ¤¹¡£
-    <var>MIME-encoding</var> ¤ÏÍ­¸ú¤ÊÉä¹æ²½¡¢Î㤨¤Ð
-    <code>x-compress</code>
-    ¤Ç¤¹¡£ 
-    <var>string</var> ¤Ë¶õÇò¤¬¤¢¤ë¤È¤­¤Ï¡¢°úÍÑÉä (<code>"</code> ¤«
-    <code>'</code>) ¤Ç°Ï¤àɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤Îʸ»úÎó¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬²èÁü¤òɽ¼¨¤Ç¤­¤Ê¤¤¾ì¹ç¤ä
-    ²èÁü¤Î¥í¡¼¥É¤ò̵¸ú¤Ë¤·¤Æ¤¤¤ë¾ì¹ç¤ä
-    ¥¢¥¤¥³¥ó¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤¿¤È¤­¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      AddAltByEncoding gzip x-gzip
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddAltByType" id="AddAltByType">AddAltByType</a> <a name="addaltbytype" id="addaltbytype">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¢¥¤¥³¥ó¤ÎÂå¤ï¤ê¤Ë
-ɽ¼¨¤µ¤ì¤ë¡¢MIME ¥¿¥¤¥×¤ÇÁªÂò¤µ¤ì¤¿ÂåÂإƥ­¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddAltByType <var>string</var> <var>MIME-type</var>
-[<var>MIME-type</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_autoindex</td></tr>
-</table>
-    <p><code class="directive">AddAltByType</code> ¤Ï¡¢
-    <code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
-    ¤Ë¤ª¤¤¤Æ¡¢¥¢¥¤¥³¥ó¤ÎÂå¤ï¤ê¤Ëɽ¼¨¤¹¤ëÂåÂØʸ»úÎó¤òÀßÄꤷ¤Þ¤¹¡£
-    <var>MIME-type</var> ¤ÏÍ­¸ú¤Ê¥¿¥¤¥×¡¢Î㤨¤Ð
-    <code>text/html</code>
-    ¤Ç¤¹¡£
-    <var>string</var> ¤Ë¶õÇò¤¬¤¢¤ë¤È¤­¤Ï¡¢°úÍÑÉä (<code>"</code> ¤«
-    <code>'</code>) ¤Ç°Ï¤àɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤Îʸ»úÎó¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬²èÁü¤òɽ¼¨¤Ç¤­¤Ê¤¤¾ì¹ç¤ä
-    ²èÁü¤Î¥í¡¼¥É¤ò̵¸ú¤Ë¤·¤Æ¤¤¤ë¾ì¹ç¤ä
-    ¥¢¥¤¥³¥ó¤Î¼èÆÀ¤Ë¼ºÇÔ¤·¤¿¤È¤­¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      AddAltByType 'plain text' text/plain
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddDescription" id="AddDescription">AddDescription</a> <a name="adddescription" id="adddescription">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æɽ¼¨¤¹¤ëÀâÌÀ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddDescription <var>string</var> <var>file</var> [<var>file</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_autoindex</td></tr>
-</table>
-    <p><code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
-    ¤Ë¤ª¤¤¤Æ¡¢¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æɽ¼¨¤¹¤ëÀâÌÀ¤òÀßÄꤷ¤Þ¤¹¡£
-    <var>file</var> ¤ÏÀâÌÀ¤¹¤ë¥Õ¥¡¥¤¥ë¤Î¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¡¢
-    ¥Õ¥¡¥¤¥ë̾¤Î°ìÉô¡¢¥ï¥¤¥ë¥É¥«¡¼¥Éɽ¸½¡¢´°Á´¤Ê¥Õ¥¡¥¤¥ë̾¤Î
-    ¤É¤ì¤«¤Ë¤Ê¤ê¤Þ¤¹¡£
-    <var>string</var> ¤ÏÆó½Å°úÍÑÉä (<code>"</code>) ¤Ç°Ï¤Þ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      AddDescription "The planet Mars" /web/pics/mars.gif
-    </code></p></div>
-
-    <p>Ä̾ï¤Î¥Ç¥Õ¥©¥ë¥È¤ÎÀâÌÀÎΰè¤Ï 23 ¥Ð¥¤¥È¤ÎÉý¤Ç¤¹¡£
-    <code><a href="#indexoptions.suppressicon">IndexOptions SuppressIcon</a></code>
-    ¥ª¥×¥·¥ç¥ó¤Ç 6 ¥Ð¥¤¥ÈÄɲá¢
-    <code><a href="#indexoptions.suppresssize">IndexOptions SuppressSize</a></code>
-    ¥ª¥×¥·¥ç¥ó¤Ç 7 ¥Ð¥¤¥ÈÄɲá¢
-    <code><a href="#indexoptions.suppresslastmodified">IndexOptions SuppressLastModified</a></code>
-    ¥ª¥×¥·¥ç¥ó¤Ç 19 ¥Ð¥¤¥ÈÄɲ䵤ì¤Þ¤¹¡£
-    ¤Ç¤¹¤«¤é¡¢¥Ç¥Õ¥©¥ë¥È¤ÎÀâÌÀ¥³¥é¥à¤ÎºÇÂçÉý¤Ï
-    55 ¥Ð¥¤¥È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¥³¥é¥à¤ÎÂ礭¤µ¤ò¾å½ñ¤­¤·¤¿¤ê¡¢
-    ÀâÌÀ¤¬ÌµÀ©¸ÂŤǤâ¤è¤¤¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Î¾ÜºÙ¤Ë´Ø¤·¤Æ¤Ï¡¢
-    <a href="#indexoptions.descriptionwidth">DescriptionWidth</a>
-    ¤È¤¤¤¦
-    <code class="directive"><a href="#indexoptions">IndexOptions</a></code> 
-    ¤Î¥­¡¼¥ï¡¼¥É¤ò¤´Í÷²¼¤µ¤¤¡£</p>
-
-    <div class="note"><h3>·Ù¹ð</h3>
-      <p><code class="directive">AddDescription</code> 
-      ¤ÇÄêµÁ¤µ¤ì¤¿ÀâÌÀ¥Æ¥­¥¹¥È¤Ï¡¢¥¿¥°¤äʸ»úÎó¤È¤¤¤Ã¤¿
-      HTML ¥Þ¡¼¥¯¥¢¥Ã¥×¤ò´Þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¤â¤·¡¢ÀâÌÀ¥³¥é¥à¤ÎÉý¤Ë¤è¤Ã¤Æ¥¿¥°ÉÕ¤±¤µ¤ì¤¿Í×ÁǤ¬´Ý¤á¹þ¤Þ¤ì¤¿
-       (ÂÀ»ú¤Î¸ì¶ç¤ÎºÇ¸å¤¬ÀÚ¤ì¤ë¤È¤¤¤Ã¤¿) ¾ì¹ç¡¢
-      ½ÐÎÏ·ë²Ì¤Ï¡¢¥Ç¥£¥ì¥¯¥È¥ê°ìÍ÷¤Î»Ä¤ê¤ÎÉôʬ¤Ë±Æ¶Á¤òÍ¿¤¨¤ë¤Ç¤·¤ç¤¦¡£</p>
-    </div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddIcon" id="AddIcon">AddIcon</a> <a name="addicon" id="addicon">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë¤Ëɽ¼¨¤¹¤ë¥¢¥¤¥³¥ó¤ò̾Á°¤ÇÁªÂò</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddIcon <var>icon</var> <var>name</var>
-[<var>name</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_autoindex</td></tr>
-</table>
-    <p><code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
-    ¤Ë¤ª¤¤¤Æ¡¢
-    <var>name</var> ¤Ç½ª¤ï¤ë¥Õ¥¡¥¤¥ë¤ÎÎÙ¤Ëɽ¼¨¤¹¤ë¥¢¥¤¥³¥ó¤òÀßÄꤷ¤Þ¤¹¡£
-    <var>icon</var> ¤Ï¡¢(% ¤Ç¥¨¥¹¥±¡¼¥×¤µ¤ì¤¿) ¥¢¥¤¥³¥ó¤Ø¤ÎÁêÂÐ URL
-    ¤«¡¢Â¾¤Î½ñ¼° (<var>alttext</var>, <var>url</var>) ¤Ç¤¹¡£
-    ¤³¤³¤Ç <var>alttext</var>
-    ¤Ï¡¢Èó¥°¥é¥Õ¥£¥«¥ë¥Ö¥é¥¦¥¶¸þ¤±¤Ë¥¢¥¤¥³¥ó¤ËÉÕ¤±¤é¤ì¤¿¥Æ¥­¥¹¥È¥¿¥°¤Ç¤¹¡£
-    </p>
-
-    <p><var>name</var> ¤Ï¡¢¥Ç¥£¥ì¥¯¥È¥ê¤ËÂбþ¤¹¤ë <code>^^DIRECTORY^^</code>
-    ¤«¡¢¶õÇò¹Ô¤ËÂбþ¤¹¤ë <code>^^BLANKICON^^</code>  (°ìÍ÷¤¬Àµ¤·¤¯É½¼¨¤µ¤ì¤ë¤¿¤á¤Ë) ¤«¡¢
-    ¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤«¡¢¥ï¥¤¥ë¥É¥«¡¼¥Éɽ¸½¤«¡¢¥Õ¥¡¥¤¥ë̾¤Î°ìÉô¤«
-    ´°Á´¤Ê¥Õ¥¡¥¤¥ë̾¤Ç¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      AddIcon (IMG,/icons/image.xbm) .gif .jpg .xbm<br />
-      AddIcon /icons/dir.xbm ^^DIRECTORY^^<br />
-      AddIcon /icons/backup.xbm *~
-    </code></p></div>
-    
-    <p>¤â¤·²Äǽ¤Ê¤é¡¢
-    <code class="directive">AddIcon</code>
-    ¤è¤ê
-    <code class="directive"><a href="#addiconbytype">AddIconByType</a></code>
-    ¤òÍ¥ÀèŪ¤Ë»È¤¦¤Ù¤­¤Ç¤·¤ç¤¦¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddIconByEncoding" id="AddIconByEncoding">AddIconByEncoding</a> <a name="addiconbyencoding" id="addiconbyencoding">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë¤Ëɽ¼¨¤¹¤ë¥¢¥¤¥³¥ó¤ò MIME 
-Éä¹æ²½ÊýË¡¤ÇÁªÂò</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddIconByEncoding <var>icon</var> <var>MIME-encoding</var>
-[<var>MIME-encoding</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_autoindex</td></tr>
-</table>
-    <p><code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
-    ¤Ë¤ª¤¤¤Æ¡¢¥Õ¥¡¥¤¥ë¤ÎÎÙ¤Ëɽ¼¨¤¹¤ë¥¢¥¤¥³¥ó¤òÀßÄꤷ¤Þ¤¹¡£
-    <var>icon</var> ¤Ï¡¢(% ¤Ç¥¨¥¹¥±¡¼¥×¤µ¤ì¤¿) ¥¢¥¤¥³¥ó¤Ø¤ÎÁêÂÐ URL
-    ¤«¡¢Â¾¤Î½ñ¼° <code>(<var>alttext</var>, <var>url</var>)</code> ¤Ç¤¹¡£
-    ¤³¤³¤Ç <var>alttext</var>
-    ¤Ï¡¢Èó¥°¥é¥Õ¥£¥«¥ë¥Ö¥é¥¦¥¶¸þ¤±¤Ë¥¢¥¤¥³¥ó¤ËÉÕ¤±¤é¤ì¤¿¥Æ¥­¥¹¥È¥¿¥°¤Ç¤¹¡£
-    </p>
-
-    <p><var>MIME-encoding</var> ¤Ï¡¢Í׵ᤵ¤ì¤¿¥¨¥ó¥³¡¼¥É¤Ë³ºÅö¤¹¤ë
-    ¥ï¥¤¥ë¥É¥«¡¼¥Éɽ¸½¤Ç¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      AddIconByEncoding /icons/compress.xbm x-compress
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddIconByType" id="AddIconByType">AddIconByType</a> <a name="addiconbytype" id="addiconbytype">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë¤ÎÎÙ¤Ëɽ¼¨¤¹¤ë¥¢¥¤¥³¥ó¤ò
-MIME ¥¿¥¤¥×¤Ë¤è¤Ã¤ÆÁªÂò</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddIconByType <var>icon</var> <var>MIME-type</var>
-[<var>MIME-type</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_autoindex</td></tr>
-</table>
-    <p><code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
-    ¤Ë¤ª¤¤¤Æ¡¢¥Õ¥¡¥¤¥ë¤ÎÎÙ¤Ëɽ¼¨¤¹¤ë¥¢¥¤¥³¥ó¤òÀßÄꤷ¤Þ¤¹¡£
-    <var>icon</var> ¤Ï¡¢(% ¤Ç¥¨¥¹¥±¡¼¥×¤µ¤ì¤¿) ¥¢¥¤¥³¥ó¤Ø¤ÎÁêÂÐ URL
-    ¤«¡¢Â¾¤Î½ñ¼° <code>(<var>alttext</var>, <var>url</var>)</code> ¤Ç¤¹¡£
-    ¤³¤³¤Ç <var>alttext</var>
-    ¤Ï¡¢Èó¥°¥é¥Õ¥£¥«¥ë¥Ö¥é¥¦¥¶¸þ¤±¤Ë¥¢¥¤¥³¥ó¤ËÉÕ¤±¤é¤ì¤¿¥Æ¥­¥¹¥È¥¿¥°¤Ç¤¹¡£
-    </p>
-
-    <p><var>MIME-type</var> ¤Ï¡¢Í׵ᤵ¤ì¤¿¥¿¥¤¥×¤Ë³ºÅö¤¹¤ë
-    ¥ï¥¤¥ë¥É¥«¡¼¥Éɽ¸½¤Ç¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      AddIconByType (IMG,/icons/image.xbm) image/*
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DefaultIcon" id="DefaultIcon">DefaultIcon</a> <a name="defaulticon" id="defaulticon">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ÆÃÄê¤Î¥¢¥¤¥³¥ó¤¬²¿¤âÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤»þ¤Ë
-¥Õ¥¡¥¤¥ë¤Ëɽ¼¨¤¹¤ë¥¢¥¤¥³¥ó</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>DefaultIcon <var>url-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_autoindex</td></tr>
-</table>
-    <p><code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
-    ¤Ë¤ª¤¤¤Æ¡¢
-    ÆÃÄê¤Î¥¢¥¤¥³¥ó¤¬¤Ê¤¤¾ì¹ç¤Ë¥Õ¥¡¥¤¥ë¤Ëɽ¼¨¤¹¤ë¥¢¥¤¥³¥ó¤òÀßÄꤷ¤Þ¤¹¡£
-    <var>url-path</var> ¤Ï¡¢(% ¤Ç¥¨¥¹¥±¡¼¥×¤µ¤ì¤¿) ¥¢¥¤¥³¥ó¤Ø¤ÎÁêÂÐ URL
-    ¤Ç¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      DefaultIcon /icon/unknown.xbm
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="HeaderName" id="HeaderName">HeaderName</a> <a name="headername" id="headername">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>
-¥¤¥ó¥Ç¥Ã¥¯¥¹°ìÍ÷¤ÎÀèƬ¤ËÁÞÆþ¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤Î̾Á°</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>HeaderName <var>filename</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_autoindex</td></tr>
-</table>
-    <p><code class="directive">HeaderName</code> 
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥¤¥ó¥Ç¥Ã¥¯¥¹°ìÍ÷¤ÎÀèƬ¤ËÁÞÆþ¤¹¤ë¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÀßÄꤷ¤Þ¤¹¡£
-    <var>Filename</var> ¤Ï¼è¤ê¹þ¤à¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ç¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      HeaderName HEADER.html
-    </code></p></div>
-
-    <div class="note">
-      <p>HeaderName ¤â <code class="directive"><a href="#readmename">ReadmeName</a></code> 
-      ¤âξÊý¤È¤â¸½ºß¤Ï¡¢<var>filename</var> 
-      ¤ò¥¤¥ó¥Ç¥Ã¥¯¥¹¤µ¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ËÍѤ¤¤é¤ì¤¿ URI
-      ¤ËÂФ¹¤ëÁêÂÐ URI ¥Ñ¥¹¤È¤·¤Æ°·¤¤¤Þ¤¹¡£
-      <var>filename</var> ¤¬¥¹¥é¥Ã¥·¥å¤Ç»Ï¤Þ¤ë¾ì¹ç¤Ï¡¢
-      <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
-      ¤«¤é¤ÎÁêÂХѥ¹¤È¤Ê¤ê¤Þ¤¹¡£</p>
-
-      <div class="example"><h3>Îã</h3><p><code>
-        HeaderName /include/HEADER.html
-      </code></p></div>
-      
-      <p><var>filename</var> ¤Ï
-      ¥á¥¸¥ã¡¼¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤¬ "<code>text/*</code>" 
-       (<em>Î㤨¤Ð</em>¡¢<code>text/html</code>, 
-      <code>text/plain</code> Åù¤Ç¤¹¡£) 
-      ¤Î¥É¥­¥å¥á¥ó¥È¤È¤·¤Æ²ò·è
-      ¤µ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¤³¤ì¤Ï¤Ä¤Þ¤ê¡¢
-      ¤â¤· CGI ¥¹¥¯¥ê¥×¥È¤Î¼ÂºÝ¤Î¥Õ¥¡¥¤¥ë¥¿¥¤¥×¤¬
-      ¼¡¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¤è¤¦¤Ë¤·¤Æ¼ÂºÝ¤Î½ÐÎϤȤϰۤʤäÆ
-      <code>text/html</code> ¤È¤·¤Æ¥Þ¡¼¥¯¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢
-      <var>filename</var>
-      ¤Ï CGI ¥¹¥¯¥ê¥×¥È¤ò»²¾È¤¹¤ë¤«¤âÃΤì¤Ê¤¤¡¢
-      ¤È¤¤¤¦¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹:</p>
-
-      <div class="example"><p><code>
-        AddType text/html .cgi
-      </code></p></div>
-
-      <p><code class="directive"><a href="../mod/core.html#options">Options</a></code> <code>MultiViews</code> ¤¬
-      Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-      <a href="../content-negotiation.html">¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó</a>
-      ¤¬¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£
-      ¤â¤· <var>filename</var> ¤¬ (CGI ¥¹¥¯¥ê¥×¥È¤Ç¤Ê¤¤) ÀÅŪ¤Ê 
-      <code>text/html</code> ¥É¥­¥å¥á¥ó¥È¤Ç²ò·è¤µ¤ì¡¢
-      <code class="directive"><a href="../mod/core.html#options">options</a></code>
-      <code>Includes</code> ¤« <code>IncludesNOEXEC</code>
-      ¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-      ¥Õ¥¡¥¤¥ë¤Ï¥µ¡¼¥Ð¡¼¥µ¥¤¥É¥¤¥ó¥¯¥ë¡¼¥É¤Ç½èÍý¤µ¤ì¤Þ¤¹
-      (<code class="module"><a href="../mod/mod_include.html">mod_include</a></code> ¥É¥­¥å¥á¥ó¥È¤ò»²¾È¤·¤Æ²¼¤µ¤¤)¡£</p>
-    </div>
-
-    <p>¤â¤· <code class="directive">HeaderName</code> ¤Ç»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤¬
-    HTML ¥É¥­¥å¥á¥ó¥È¤Î³«»ÏÉôʬ (&lt;html&gt;, &lt;head&gt;, 
-    Åù) ¤ò´Þ¤ó¤Ç¤¤¤¿¤é¡¢
-    <a href="#indexoptions.suppresshtmlpreamble"><code>IndexOptions
-    +SuppressHTMLPreamble</code></a>
-    ¤òÀßÄꤷ¤Æ¡¢¤³¤ì¤é¤Î¥¿¥°¤¬·«¤êÊÖ¤µ¤ì¤Ê¤¤¤è¤¦¤Ë¤·¤¿¤¤¤È»×¤¦¤Ç¤·¤ç¤¦¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="IndexIgnore" id="IndexIgnore">IndexIgnore</a> <a name="indexignore" id="indexignore">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê°ìÍ÷¤ò¹Ô¤Ê¤¦ºÝ¤Ë̵»ë¤¹¤Ù¤­
-¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤ËÄɲÃ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>IndexIgnore <var>file</var> [<var>file</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_autoindex</td></tr>
-</table>
-    <p><code class="directive">IndexIgnore</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥Ç¥£¥ì¥¯¥È¥ê¤Î°ìÍ÷¤ò¹Ô¤¦ºÝ¤Ë̵»ë¤¹¤Ù¤­¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤ËÄɲä·¤Þ¤¹¡£
-    <var>file</var> ¤Ï¡¢
-    ¥·¥§¥ë·Á¼°¤Î¥ï¥¤¥ë¥É¥«¡¼¥Éɽ¸½¤«´°Á´¤Ê¥Õ¥¡¥¤¥ë̾¤Ç¤¹¡£
-    IndexIgnore ¤¬Ê£¿ô¤¢¤ë¾ì¹ç¤Ï¡¢Ìµ»ë¤¹¤ë¥ê¥¹¥È¤ËÄɲ䬹Ԥï¤ì¡¢
-    ÃÖ´¹¤Ï¹Ô¤ï¤ì¤Þ¤»¤ó¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥ê¥¹¥È¤Ë¤Ï <code>.</code>
-    (¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê) ¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      IndexIgnore README .htaccess *.bak *~
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="IndexOptions" id="IndexOptions">IndexOptions</a> <a name="indexoptions" id="indexoptions">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤ÎÍÍ¡¹¤ÊÀßÄê¹àÌÜ
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>IndexOptions  [+|-]<var>option</var> [[+|-]<var>option</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_autoindex</td></tr>
-</table>
-    <p><code class="directive">IndexOptions</code> 
-    ¤Ï¡¢¥Ç¥£¥ì¥¯¥È¥ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤ÎµóÆ°¤ò»ØÄꤷ¤Þ¤¹¡£
-    <var>option</var> ¤Ï¼¡¤Î¤É¤ì¤«¤Ç¤¹:</p>
-
-    <dl>
-      <dt><a name="indexoptions.descriptionwidth" id="indexoptions.descriptionwidth">DescriptionWidth=[<var>n</var> | *]</a>
-      (<em>2.0.23 °Ê¹ß</em>)</dt>
-
-      <dd><code>DescriptionWidth</code> 
-      ¥­¡¼¥ï¡¼¥É¤ÏÀâÌÀ¥³¥é¥à¤ÎÉý¤òʸ»ú¿ô¤Ç»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</dd>
-
-      <dd><code>-DescriptionWidth</code> (¤Þ¤¿¤ÏÈóÀßÄê) ¤Ç¡¢
-      <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> ¤¬ºÇŬ¤ÊÉý¤ò·×»»¤¹¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£</dd>
-
-      <dd><code>DescriptionWidth=<var>n</var></code> 
-      ¤Ç¡¢¥³¥é¥àÉý¤ò <var>n</var> ¥Ð¥¤¥È¤Ë¸ÇÄꤷ¤Þ¤¹¡£</dd>
-
-      <dd><code>DescriptionWidth=*</code> 
-      ¤Ï¡¢ºÇŤÎÀâÌÀ¤Ë¹ç¤ï¤»¤ÆɬÍפÊŤµ¤Þ¤Ç¥³¥é¥à¤ò±ä¤Ð¤·¤Þ¤¹¡£</dd>
-
-      <dd><strong>ÀâÌÀ¤ò´Ý¤á¹þ¤ó¤À¾ì¹çÆÃÍ­¤Î´í¸±¤Ë¤Ä¤¤¤Æ¤Ï
-      <code class="directive"><a href="#adddescription">AddDescription</a></code>
-      ¥»¥¯¥·¥ç¥ó¤ò¤ªÆɤ߲¼¤µ¤¤¡£</strong></dd>
-
-      <dt><a name="indexoptions.fancyindexing" id="indexoptions.fancyindexing">FancyIndexing</a></dt>
-
-      <dd>¾þ¤êÉÕ¤­¥¤¥ó¥Ç¥Ã¥¯¥¹¤ò¥ª¥ó¤Ë¤·¤Þ¤¹¡£</dd>
-
-      <dt><a name="indexoptions.foldersfirst" id="indexoptions.foldersfirst">FoldersFirst</a>
-      (<em>2.0.23 °Ê¹ß</em>)</dt>
-
-      <dd>¤³¤Î¥ª¥×¥·¥ç¥ó¤¬Í­¸ú¤Ë¤Ê¤Ã¤¿¾ì¹ç¡¢¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Î°ìÍ÷¤Ï
-      <em>ɬ¤º</em>ºÇ½é¤Ë¸½¤ï¤ì¤Æ¡¢¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ÎÄ̾ï¤Î¥Õ¥¡¥¤¥ë¤Ï
-      ¤½¤Î¸å¤Ë³¤­¤Þ¤¹¡£
-      °ìÍ÷¤Ï´ðËÜŪ¤Ë¤Ï¡¢¥Õ¥¡¥¤¥ë¤È¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆó¤Ä¤ÎÉôʬ¤Ëʬ¤±¤é¤ì¤Æ¡¢
-      ¤½¤ì¤¾¤ì¤ÏÊÌ¡¹¤Ë¥½¡¼¥È¤µ¤ì¡¢¤½¤Î¸å¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤òÀè¤Ë¤·¤Æ
-      ɽ¼¨¤¬¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£Î㤨¤Ð¥½¡¼¥È½ç¤¬Ì¾Á°¤Î¹ß½ç¤Ë¤Ê¤Ã¤Æ¤¤¤Æ¡¢
-      <code>FoldersFirst</code> ¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-      ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê <code>Zed</code> ¤Ï¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê
-      <code>Beta</code> ¤è¤ê¤âÁ°¤Ë¥ê¥¹¥È¤µ¤ì¡¢Ä̾ï¤Î¥Õ¥¡¥¤¥ë
-      <code>Gamma</code> ¤ä <code>Alpha</code>
-      ¤è¤ê¤âÁ°¤Ë¥ê¥¹¥È¤µ¤ì¤Þ¤¹¡£<strong>¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï
-      <a href="#indexoptions.fancyindexing"><code>FancyIndexing</code></a>
-      ¤âÍ­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤È¤­¤Ë¤Î¤ß¡¢¸ú²Ì¤¬¤¢¤ê¤Þ¤¹¡£</strong></dd>
-
-      <dt><a name="indexoptions.htmltable" id="indexoptions.htmltable">HTMLTable</a> <em>(¼Â¸³Åª¡¢
-      Apache 2.0.23 °Ê¹ß)</em></dt>
-
-      <dd>¤³¤Î¼Â¸³Åª¤Ê¥ª¥×¥·¥ç¥ó¤Ï FancyIndexing ¤È¤È¤â¤Ë»ØÄꤹ¤ë¤³¤È¤Ç¡¢
-      ¾þ¤ê¤ÎÉÕ¤¤¤¿¥Ç¥£¥ì¥¯¥È¥ê°ìÍ÷¤Î¤¿¤á¤Ë¥Æ¡¼¥Ö¥ë¤ò»È¤Ã¤¿Ã±½ã¤Êɽ¤òºî¤ê¤Þ¤¹¡£
-      ¤³¤ì¤Ï¸Å¤¤¥Ö¥é¥¦¥¶¤òº®Í𤵤»¤ë¤«¤â¤·¤ì¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-      WinNT ¤ä¤½¤Î¾ utf-8 
-      ¤¬Í­¸ú¤Ê¥×¥é¥Ã¥È¥Û¡¼¥à¤Î¤è¤¦¤Ë¡¢¥Õ¥¡¥¤¥ë̾¤äÀâÌÀ¥Æ¥­¥¹¥È¤¬
-      ±¦Æɤߤˤʤ俤꺸Æɤߤˤʤꤨ¤ë¾ì¹ç¤ÏÆäËɬÍפǤ¹¡£</dd>
-
-      <dt><a name="indexoptions.iconsarelinks" id="indexoptions.iconsarelinks">IconsAreLinks</a></dt>
-
-      <dd>¤³¤ì¤Ï¡¢FancyIndexing ¤Ë¤ª¤¤¤Æ¡¢
-      ¥¢¥¤¥³¥ó¤â¥Õ¥¡¥¤¥ë̾¤Ø¤Î¥ê¥ó¥¯¤Î°ìÉô¤Ë¤·¤Þ¤¹¡£</dd>
-
-      <dt><a name="indexoptions.iconheight" id="indexoptions.iconheight">IconHeight[=<var>pixels</var>]</a></dt>
-
-      <dd>¤³¤Î¥ª¥×¥·¥ç¥ó¤¬¡¢IconWidth ¤È¤È¤â¤Ë»È¤ï¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-      ¥µ¡¼¥Ð¤Ï¥Õ¥¡¥¤¥ë¥¢¥¤¥³¥ó¤Î¤¿¤á¤Î <code>img</code>
-      ¥¿¥°¤Ë <code>height</code> ¤È <code>width</code>
-      °À­¤ò¼è¤ê¹þ¤à¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-      ¤³¤ì¤Ë¤è¤Ã¤Æ¡¢¥¤¥á¡¼¥¸Á´¤Æ¤ò¥í¡¼¥É¤·½ª¤ï¤ë¤Þ¤ÇÂÔ¤¿¤Ê¤¯¤Æ¤â¡¢
-      ¥Ö¥é¥¦¥¶¤Ï¥Ú¡¼¥¸¥ì¥¤¥¢¥¦¥È¤ò¤¢¤é¤«¤¸¤á·×»»¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ë²¿¤âÃͤ¬Í¿¤¨¤é¤ì¤Ê¤±¤ì¤Ð¡¢Apache
-      ¥½¥Õ¥È¥¦¥§¥¢¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë¥¢¥¤¥³¥ó¤Îɸ½à¤Î¹â¤µ¤¬
-      ¥Ç¥Õ¥©¥ë¥È¤Ê¤ê¤Þ¤¹¡£</dd>
-
-      <dt><a name="indexoptions.iconwidth" id="indexoptions.iconwidth">IconWidth[=<var>pixels</var>]</a></dt>
-
-      <dd>¤³¤Î¥ª¥×¥·¥ç¥ó¤¬¡¢<code>IconHeight</code> ¤È¤È¤â¤Ë»È¤ï¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-      ¥µ¡¼¥Ð¤Ï¥Õ¥¡¥¤¥ë¥¢¥¤¥³¥ó¤Î¤¿¤á¤Î <code>img</code>
-      ¥¿¥°¤Ë <code>height</code> ¤È <code>width</code>
-      °À­¤ò¼è¤ê¹þ¤à¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-      ¤³¤ì¤Ë¤è¤Ã¤Æ¡¢¥¤¥á¡¼¥¸Á´¤Æ¤ò¥í¡¼¥É¤·½ª¤ï¤ë¤Þ¤ÇÂÔ¤¿¤Ê¤¯¤Æ¤â¡¢
-      ¥Ö¥é¥¦¥¶¤Ï¥Ú¡¼¥¸¥ì¥¤¥¢¥¦¥È¤ò¤¢¤é¤«¤¸¤á·×»»¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ë²¿¤âÃͤ¬Í¿¤¨¤é¤ì¤Ê¤±¤ì¤Ð¡¢Apache
-      ¥½¥Õ¥È¥¦¥§¥¢¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë¥¢¥¤¥³¥ó¤Îɸ½à¤Î¹â¤µ¤¬
-      ¥Ç¥Õ¥©¥ë¥È¤Ê¤ê¤Þ¤¹¡£</dd>
-
-      <dt><a name="indexoptions.ignorecase" id="indexoptions.ignorecase">IgnoreCase</a></dt>
-
-      <dd>¤³¤Î¥ª¥×¥·¥ç¥ó¤¬Í­¸ú¤Ç¤¢¤ë¤È¡¢¥Õ¥¡¥¤¥ë̾¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤»¤º¤Ë¥½¡¼¥È¤µ¤ì¤Þ¤¹¡£
-      Î㤨¤Ð¥Õ¥¡¥¤¥ë̾¤¬¾º½ç¤Ç¥½¡¼¥È¤µ¤ì¡¢IgnoreCase ¤¬Í­¸ú¤Ç¤¢¤ì¤Ð¡¢
-      Zeta ¤Ï alfa ¤Î¸å¤Ë¥ê¥¹¥È¤µ¤ì¤Þ¤¹
-      (Ãí°Õ: GAMMA ¤Ï¾ï¤Ë gamma ¤ÎÁ°¤Ë¤Ê¤ê¤Þ¤¹)¡£</dd>
-
-      <dt><a name="indexoptions.ignoreclient" id="indexoptions.ignoreclient">IgnoreClient</a></dt>
-
-      <dd>¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> ¤Ï¡¢
-      ¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤ÎÁ´¤Æ¤Î¥¯¥¨¥ê¡¼ÊÑ¿ô¤ò̵»ë¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-      ¤³¤ì¤Ï¥½¡¼¥È½ç¤â´Þ¤ß¤Þ¤¹¡£
-      (¤Ä¤Þ¤ê <code><a href="#indexoptions.suppresscolumnsorting">SuppressColumnSorting</a></code>
-      ¤ò°Å¤Ë°ÕÌ£¤·¤Þ¤¹¡£)</dd>
-
-      <dt><a name="indexoptions.namewidth" id="indexoptions.namewidth">NameWidth=[<var>n</var> 
-	       | *]</a></dt>
-
-      <dd><code>NameWidth</code> ¥­¡¼¥ï¡¼¥É¤Ç¥Õ¥¡¥¤¥ë̾¥³¥é¥à¤ÎÉý¤ò¥Ð¥¤¥È¿ô¤Ç
-      »ØÄê¤Ç¤­¤Þ¤¹¡£</dd>
-
-      <dd><code>-NameWidth</code> (¤Þ¤¿¤ÏÈóÀßÄê) ¤Ç¡¢
-      <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> ¤¬ºÇŬ¤ÊÉý¤ò·×»»¤¹¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£</dd>
-
-      <dd><code>NameWidth=<var>n</var></code> 
-      ¤Ç¡¢¥³¥é¥àÉý¤ò <var>n</var> ¥Ð¥¤¥È¤Ë¸ÇÄꤷ¤Þ¤¹¡£</dd>
-
-      <dd><code>NameWidth=*</code>
-      ¤Ï¡¢É¬ÍפÊŤµ¤Þ¤Ç¥³¥é¥à¤ò±ä¤Ð¤·¤Þ¤¹¡£</dd>
-
-      <dt><a name="indexoptions.scanhtmltitles" id="indexoptions.scanhtmltitles">ScanHTMLTitles</a></dt>
-
-      <dd>FancyIndexing ¤Î¤¿¤á¤Ë¡¢
-       HTML ¥É¥­¥å¥á¥ó¥È¤«¤é¥¿¥¤¥È¥ë¤ò¼è¤ê½Ð¤¹¤³¤È¤ò²Äǽ¤Ë¤·¤Þ¤¹¡£
-      ¤â¤·¥Õ¥¡¥¤¥ë¤Ë
-      <code class="directive"><a href="#adddescription">AddDescription</a></code>
-      ¤ÇÀâÌÀ¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢
-      httpd ¤Ï <code>title</code> ¥¿¥°¤ÎÃͤòÆɤि¤á¤Ë¥É¥­¥å¥á¥ó¥È¤òÆɤ߻Ϥá¤Þ¤¹¡£
-      ¤³¤ì¤Ï CPU ¤ä disk ¤ËÉé²Ù¤ò¤«¤±¤Þ¤¹¡£</dd>
-
-      <dt><a name="indexoptions.showforbidden" id="indexoptions.showforbidden">ShowForbidden</a></dt>
-
-      <dd>»ØÄꤷ¤¿¾ì¹ç¤Ç¤¢¤Ã¤Æ¤â¡¢¥µ¥Ö¥ê¥¯¥¨¥¹¥È¤Î·ë²Ì¤¬ HTTP_UNAUTHORIZED ¤ä
-      HTTP_FORBIDDEN ¤Î¥Õ¥¡¥¤¥ë¤ÏÄ̾ïÄ̤걣¤µ¤ì¤¿¾õÂ֤Τޤޡ¢
-      ¥Õ¥¡¥¤¥ë°ìÍ÷¤¬À¸À®¤µ¤ì¤Þ¤¹¡£</dd>
-
-      <dt><a name="indexoptions.suppresscolumnsorting" id="indexoptions.suppresscolumnsorting">SuppressColumnSorting</a></dt>
-
-      <dd>¤â¤·»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢Apache ¤Ï
-      FancyIndexing ¤Çɽ¼¨¤µ¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê°ìÍ÷¤Ç¤Î
-      ¥³¥é¥à¤ÎÀèƬ¤ò¡¢¥½¡¼¥È¤Î¤¿¤á¤Î¥ê¥ó¥¯¤Ë¤·¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£
-      ¥Ç¥Õ¥©¥ë¥È¤ÎµóÆ°¤Ï¡¢¥ê¥ó¥¯¤È¤·¤Þ¤¹¡£
-      ¥³¥é¥à¤ÎÀèƬ¤òÁª¤Ö¤È¥³¥é¥à¤ÎÃͤ˽¾¤Ã¤Æ¥Ç¥£¥ì¥¯¥È¥ê¥ê¥¹¥È¤ò
-      ¥½¡¼¥È¤·¤Þ¤¹¡£
-      <strong>Apache 2.0.23 °ÊÁ°¤Ç¤Ï¡¢¤³¤ì¤ÏƱ»þ¤Ë
-      ¥½¡¼¥Èʸ»úÎó¤Î¤¿¤á¤Î¥¯¥¨¥ê¡¼°ú¿ô¤Î²òÀϤâ̵¸ú¤Ë¤·¤Þ¤¹¡£
-      </strong>
-      ¤³¤ÎµóÆ°¤Ï Apache 2.0.23 ¤Ç¤Ï
-      <a href="#indexoptions.ignoreclient">IndexOptions
-      IgnoreClient</a> ¤ÇÀ©¸æ¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</dd>
-
-      <dt><a name="indexoptions.suppressdescription" id="indexoptions.suppressdescription">SuppressDescription</a></dt>
-
-      <dd>¤³¤ì¤Ï FancyIndexing ¤Ë¤ª¤±¤ë¥Õ¥¡¥¤¥ë¤ÎÀâÌÀ¤ò¾Ãµî¤·¤Þ¤¹¡£
-      ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢ÀâÌÀ¤ÏÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢
-      ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»È¤¦¤È¾¤Î¤¿¤á¤Ë 23
-      ʸ»ú¤Î¶õÇò¤ò²Ô¤°¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ ¥Õ¥¡¥¤¥ë¤ÎÀâÌÀ¤Ë´Ø¤¹¤ë¾ðÊó¤Ï¡¢
-      <code class="directive"><a href="#adddescription">AddDescription</a></code> 
-      ¤ò¤´Í÷²¼¤µ¤¤¡£¤Þ¤¿¡¢ÀâÌÀ¤Î¥³¥é¥à¥µ¥¤¥º¤òÀ©¸Â¤¹¤ë
-      <code><a href="#indexoptions.descriptionwidth">DescriptionWidth</a></code>
-      ¥¤¥ó¥Ç¥Ã¥¯¥¹¥ª¥×¥·¥ç¥ó¤â¤´Í÷²¼¤µ¤¤¡£</dd>
-
-      <dt><a name="indexoptions.suppresshtmlpreamble" id="indexoptions.suppresshtmlpreamble">SuppressHTMLPreamble</a></dt>
-
-      <dd>Ä̾
-      <code class="directive"><a href="#headername">HeaderName</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤ò
-      ¥Ç¥£¥ì¥¯¥È¥ê¤¬¼ÂºÝ¤Ë´Þ¤ó¤Ç¤¤¤ì¤Ð¡¢É¸½àŪ¤Ê HTML ¥×¥ê¥¢¥ó¥Ö¥ë
-      (<code>&lt;html&gt;</code>, <code>&lt;head&gt;</code>, <em>Åù</em>) ¤Î¸å¤Ë¡¢
-      ¥â¥¸¥å¡¼¥ë¤Ï¥Õ¥¡¥¤¥ë¤ÎÃæ¿È¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤Þ¤¹¡£
-      <code>SuppressHTMLPreamble</code> ¥ª¥×¥·¥ç¥ó¤Ï¡¢
-      ¤³¤ÎµóÆ°¤ò̵¸ú¤Ë¤Ç¤­¤Æ¡¢
-      ¥â¥¸¥å¡¼¥ë¤¬¥Ø¥Ã¥À¡¼¥Õ¥¡¥¤¥ë¤ÎÃæ¿È¤«¤éɽ¼¨¤ò»Ï¤á¤Þ¤¹¡£
-      ¤³¤Î¾ì¹ç¡¢¥Ø¥Ã¥À¡¼¥Õ¥¡¥¤¥ë¤ÏÀµ¤·¤¤ HTML
-      Ì¿Îá¤ò´Þ¤ó¤Ç¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-      ¥Ø¥Ã¥À¡¼¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Ê¤¤¾ì¹ç¤Ï¡¢¥×¥ê¥¢¥ó¥Ö¥ë¤ÏÄ̾ïÄ̤ê
-      À¸À®¤µ¤ì¤Þ¤¹¡£</dd>
-
-      <dt><a name="indexoptions.suppressicon" id="indexoptions.suppressicon">SuppressIcon</a> (<em>Apache
-      2.0.23 °Ê¹ß</em>)</dt>
-
-      <dd>
-      ¤³¤ì¤Ï FancyIndexing ¤Î°ìÍ÷¤«¤é¥¢¥¤¥³¥ó¤ò¾Ãµî¤·¤Þ¤¹¡£
-      <code>SuppressIcon</code> ¤È <code>SuppressRules</code>
-      ¤ÈÁȹç¤ï¤»¤ë¤³¤È¤Ë¤è¤Ã¤ÆÀµ¤·¤¤ HTML 3.2 ¤Î½ÐÎϤ¬ÆÀ¤é¤ì¤Þ¤¹¡£
-      Àµ¤·¤¤ HTML 3.2 ½ÐÎϤϡ¢ºÇ½ªµ¬³Ê¤Ë¤ª¤¤¤Æ <code>img</code> ¤È <code>hr</code>
-      ¤¬ <code>pre</code> ¥Ö¥í¥Ã¥¯¤ËÆþ¤ë (FancyIndexing °ìÍ÷¤Ç½ñ¼°¤Ë»È¤ï¤ì¤Æ¤¤¤Þ¤¹) 
-      ¤³¤È¤ò¶Ø»ß¤·¤Æ¤¤¤Þ¤¹¡£</dd>
-
-      <dt><a name="indexoptions.suppresslastmodified" id="indexoptions.suppresslastmodified">SuppressLastModified</a></dt>
-
-      <dd>FancyIndexing °ìÍ÷¤Ë¤ª¤¤¤ÆºÇ½ª¹¹¿·Æü»þ¤Îɽ¼¨¤ò¾Ãµî¤·¤Þ¤¹¡£</dd>
-
-      <dt><a name="indexoptions.suppressrules" id="indexoptions.suppressrules">SuppressRules</a>
-       (<em>Apache 2.0.23 °Ê¹ß</em>) </dt>
-
-      <dd>¥Ç¥£¥ì¥¯¥È¥ê°ìÍ÷¤Ë¤ª¤¤¤Æ¿åÊ¿¶èÀÚ¤êÀþ (<code>hr</code> ¥¿¥°) ¤ò¾Ãµî¤·¤Þ¤¹¡£
-      <code>SuppressIcon</code> ¤È <code>SuppressRules</code>
-      ¤ÈÁȹç¤ï¤»¤ë¤³¤È¤Ë¤è¤Ã¤ÆÀµ¤·¤¤ HTML 3.2 ¤Î½ÐÎϤ¬ÆÀ¤é¤ì¤Þ¤¹¡£
-      Àµ¤·¤¤ HTML 3.2 ½ÐÎϤϡ¢ºÇ½ªµ¬³Ê¤Ë¤ª¤¤¤Æ <code>img</code> ¤È <code>hr</code>
-      ¤¬ <code>pre</code> ¥Ö¥í¥Ã¥¯¤ËÆþ¤ë (FancyIndexing °ìÍ÷¤Ç½ñ¼°¤Ë»È¤ï¤ì¤Æ¤¤¤Þ¤¹) 
-      ¤³¤È¤ò¶Ø»ß¤·¤Æ¤¤¤Þ¤¹¡£</dd>
-
-      <dt><a name="indexoptions.suppresssize" id="indexoptions.suppresssize">SuppressSize</a></dt>
-
-      <dd>FancyIndexing °ìÍ÷¤Ë¤ª¤¤¤Æ¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤Îɽ¼¨¤ò¾Ãµî¤·¤Þ¤¹¡£</dd>
-
-      <dt><a name="indexoptions.trackmodified" id="indexoptions.trackmodified">TrackModified</a>
-	       (<em>Apache 2.0.23 °Ê¹ß</em>)</dt>
-
-      <dd>¤³¤ì¤Ï HTTP ¥Ø¥Ã¥ÀÃæ¤Ë¡¢
-      ¥ê¥¹¥È¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤ÎºÇ½ª¹¹¿·Æü¤ä ETag Ãͤò´Þ¤á¤Þ¤¹¡£
-      ¤³¤ì¤Ï¡¢¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ä¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤¬
-      ŬÀÚ¤Ê stat() ¤ÎÊÖ¤êÃͤòÊÖ¤¹¾ì¹ç¤Ë¤Î¤ßÍ­¸ú¤Ç¤¹¡£
-      ¤¤¤¯¤Ä¤«¤Î UNIX ¥·¥¹¥Æ¥à¡¢OS2 ¤Î JFS ¤ä Win32 ¤Î NTFS
-      ¥Ü¥ê¥å¡¼¥à¤Ï¤½¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-      Î㤨¤Ð¡¢OS2 ¤È Win32 FAT ¥Ü¥ê¥å¡¼¥à¤Ï¤½¤¦¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-      ¤³¤Îµ¡Ç½¤¬Í­¸ú¤Ë¤Ê¤ë¤È¡¢¥¯¥é¥¤¥¢¥ó¥È¤ä¥×¥í¥­¥·¤Ï
-      <code>HEAD</code> ¥ê¥¯¥¨¥¹¥È¤ò¹Ô¤¦¤³¤È¤Ë¤è¤Ã¤Æ¡¢
-      ¥Õ¥¡¥¤¥ë°ìÍ÷¤ÎÊѲ½¤òÄÉÀפ¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-      ¤¤¤¯¤Ä¤«¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ï¡¢¿·µ¬¥Õ¥¡¥¤¥ë¤ä
-      °ÜÆ°¥Õ¥¡¥¤¥ë¤ÏÀµ¤·¤¯ÄÉÀפ¹¤ë¤±¤ì¤É¤â¡¢
-      ¥Ç¥£¥ì¥¯¥È¥êÃæ¤Î¥Õ¥¡¥¤¥ë¤Î¥µ¥¤¥º¤äÆüÉÕ¤ÏÄÉÀפ·¤Ê¤¤¤È¤¤¤¦¤³¤È¤Ë
-      Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-      <strong>´û¤Ë¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤Î¥µ¥¤¥º¤äÆüÉդΥ¹¥¿¥ó¥×¤¬ÊѲ½¤·¤Æ¤â¡¢
-      Á´¤Æ¤Î Unix ¥×¥é¥Ã¥È¥Û¡¼¥à¤Ç¤Ï¡¢
-      ºÇ½ª¹¹¿·Æü¥Ø¥Ã¥À¡¼¤ò¹¹¿·¤·¤Þ¤»¤ó¡£</strong>
-      ¤â¤·¤³¤ì¤¬½ÅÍפǤ¢¤ì¤Ð¡¢
-      ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò̵¸ú¤Î¤Þ¤Þ¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</dd>
-
-      <dt><a name="indexoptions.versionsort" id="indexoptions.versionsort">VersionSort</a>
-      (<em>Apache 2.0a3 °Ê¹ß</em>)</dt>
-
-      <dd><code>VersionSort</code> ¥­¡¼¥ï¡¼¥É¤Ï¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò´Þ¤ó¤À¥Õ¥¡¥¤¥ë¤¬
-      ¼«Á³¤ÊÊýË¡¤Ç¥½¡¼¥È¤µ¤ì¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
-      ʸ»úÎó¤ÏÄ̾ïÄ̤꥽¡¼¥È¤µ¤ì¡¢
-      ¤½¤ì°Ê³°¤Î¡¢ÀâÌÀ¤ä̾Á°Ãæ¤Î¿ô¤È¤Ê¤ëÉôʬʸ»úÎó¤Ï
-      ¤½¤Î¿ôÃͤÇÈæ³Ó¤µ¤ì¤Þ¤¹¡£
-
-      <div class="example"><h3>Îã:</h3><p><code>
-        foo-1.7<br />
-        foo-1.7.2<br />
-        foo-1.7.12<br />
-        foo-1.8.2<br />
-        foo-1.8.2a<br />
-        foo-1.12
-      </code></p></div>
-
-      <p>Èֹ椬 0 ¤«¤é»Ï¤Þ¤ë¾ì¹ç¤Ï¡¢Ã¼¿ô¤È¹Í¤¨¤é¤ì¤Þ¤¹</p>
-
-      <div class="example"><p><code>
-        foo-1.001<br />
-        foo-1.002<br />
-        foo-1.030<br />
-        foo-1.04
-      </code></p></div>
-      </dd>
-
-      <dt><a name="indexoptions.xhtml" id="indexoptions.xhtml">XHTML</a>
-      (<em>Apache 2.0.49 °Ê¹ß</em>)</dt>
-
-      <dd><code>XHTML</code> ¥­¡¼¥ï¡¼¥É¤ò»ØÄꤹ¤ë¤È¡¢<code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code>
-      ¤Ï HTML 3.2 ¤ÎÂå¤ï¤ê¤Ë XHTML 1.0 ¤Î¥³¡¼¥É¤ò½ÐÎϤ¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</dd>
-    </dl>
-
-   
-   <dl><dt>Áý¸º»ØÄê¤Ç¤­¤ë IndexOptions</dt>
-   <dd>
-     <p>Apache 1.3.3 ¤Ç¤Ï¡¢
-     <code class="directive">IndexOptions</code> 
-     ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î°·¤¤¤Ç´ö¤Ä¤«¤ÎÂ礭¤ÊÊѲ½¤¬Æ³Æþ¤µ¤ì¤Þ¤·¤¿¡£
-     Æäˡ¢</p>
-
-     <ul>
-     <li>°ì¤Ä¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÂФ¹¤ëÊ£¿ô¤Î
-     <code class="directive">IndexOptions</code> 
-     ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¸½ºß¤Ç¤Ï°ì¤Ä¤Ë¥Þ¡¼¥¸¤µ¤ì¤Þ¤¹¡£
-     ¾å¤ÎÎã¤Î·ë²Ì¤Ï¡¢
-
-     <div class="example"><p><code>
-       &lt;Directory /foo&gt;
-       <span class="indent">
-         IndexOptions HTMLTable<br />
-         IndexOptions SuppressColumnsorting
-       </span>
-       &lt;/Directory&gt;
-     </code></p></div>
-
-     <p>¤ÈƱ°ì¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-     <div class="example"><p><code>
-       IndexOptions HTMLTable SuppressColumnsorting
-     </code></p></div>
-     </li>
-
-     <li>Áý¸º¹½Ê¸
-     (<em>¤¹¤Ê¤ï¤Á</em>¡¢'+' ¤ä '-'
-     ¤ÎÀÜƬ¼­¤¬ÉÕ¤¯¥­¡¼¥ï¡¼¥É) ¤ÎÄɲá£</li>
-     </ul>
-
-     <p>'+' ¤ä '-' ÀÜƬ¼­¤ÎÉÕ¤¤¤¿¥­¡¼¥ï¡¼¥É¤Ë½Ð²ñ¤¦¤È¤½¤ì¤Ï¡¢
-     ¤½¤Î»þÅÀ¤Ç¤Î <code class="directive">IndexOptions</code>
-     ¤ÎÀßÄê (¤³¤ì¤Ï¾åή¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¼õ¤±·Ñ¤®¤Þ¤¹) 
-     ¤ËÂФ·¤ÆŬ±þ¤µ¤ì¤Þ¤¹¡£
-     ¤·¤«¤·¤Ê¤¬¤é¡¢ÀÜƬ¼­¤ÎÉÕ¤«¤Ê¤¤¥­¡¼¥ï¡¼¥É¤¬½èÍý¤µ¤ì¤¿¾ì¹ç¤Ï¡¢
-     ¼õ¤±·Ñ¤¤¤À¥ª¥×¥·¥ç¥óÁ´¤Æ¤È¤½¤ì¤Þ¤Ç½Ð²ñ¤Ã¤¿Áý¸ºÀßÄêÁ´¤Æ¤¬
-     ¾Ãµî¤µ¤ì¤Þ¤¹¡£¼¡¤ÎÎã¤ò¹Í¤¨¤Æ¤ß¤Æ¤¯¤À¤µ¤¤:</p>
-
-     <div class="example"><p><code>
-       IndexOptions +ScanHTMLTitles -IconsAreLinks FancyIndexing<br />
-       IndexOptions +SuppressSize
-     </code></p></div>
-
-     <p>Ãæ¿È¤Î¸ú²Ì¤Ï
-     <code>IndexOptions&nbsp;FancyIndexing&nbsp;+SuppressSize</code>
-     ¤ÈƱ°ì¤Ç¤¹¡£
-     ÀÜƬ¼­¤ÎÉÕ¤«¤Ê¤¤ <code>FancyIndexing</code>
-     ¤Ç¤½¤ì°ÊÁ°¤ÎÁý¸º¥­¡¼¥ï¡¼¥É¤ò̵¸ú¤Ë¤µ¤ì¤Æ¡¢
-     ¤½¤Î¸å¤ÎÎßÀѤ¬»Ï¤Þ¤ë¤«¤é¤Ç¤¹¡£</p>
-
-     <p>̵¾ò·ï¤Ë <code class="directive">IndexOptions</code>
-     ¤ò¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ÇÀßÄꤹ¤ë¤³¤È¤Ë¤è¤Ã¤Æ
-     ·Ñ¾µ¤·¤¿ÀßÄê¤ò¾Ãµî¤·¤Æ¡¢<code>+</code> ¤ä <code>-</code>
-     ÀÜƬ¼­¤ÎÉÕ¤«¤Ê¤¤¥­¡¼¥ï¡¼¥É¤ÇÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</p>
-   </dd>
-   </dl>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="IndexOrderDefault" id="IndexOrderDefault">IndexOrderDefault</a> <a name="indexorderdefault" id="indexorderdefault">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>
-¥Ç¥£¥ì¥¯¥È¥ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤Îɸ½à¤Î½çÈÖÉÕ¤±¤òÀßÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>IndexOrderDefault Ascending|Descending
-Name|Date|Size|Description</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>IndexOrderDefault Ascending Name</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_autoindex</td></tr>
-</table>
-    <p><code class="directive">IndexOrderDefault</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    <code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
-    ¥¤¥ó¥Ç¥Ã¥¯¥¹¥ª¥×¥·¥ç¥ó¤ÈÊ»¤»¤ÆÍѤ¤¤ì¤ì¤Þ¤¹¡£
-    ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢FancyIndexing 
-    ¤Î¥Ç¥£¥ì¥¯¥È¥ê°ìÍ÷¤Ï¥Õ¥¡¥¤¥ë̾¤Î¾º½ç¤Çɽ¼¨¤µ¤ì¤Þ¤¹¡£
-    <code class="directive">IndexOrderDefault</code>
-    ¤Ç¡¢½é´ü¾õÂÖ¤Îɽ¼¨½çÈÖ¤òÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p><code class="directive">IndexOrderDefault</code>
-    ¤ÏÆó¤Ä¤Î°ú¿ô¤ò¤È¤ê¤Þ¤¹¡£°ì¤ÄÌܤϥ½¡¼¥È¤ÎÊý¸þ¤ò»Ø¼¨¤¹¤ë
-    <code>Ascending</code> ¤« <code>Descending</code> ¤Î¤¤¤º¤ì¤«¤Ç¤¹¡£
-    Æó¤ÄÌܤΰú¿ô¤Ï <code>Name</code>, <code>Date</code>,
-    <code>Size</code> ¤« <code>Description</code> 
-    ¤Î¤¤¤º¤ì¤«°ì¤Ä¤Î¥­¡¼¥ï¡¼¥É¤Ç¤¢¤Ã¤Æ¡¢¥×¥é¥¤¥Þ¥ê¥­¡¼¤ò»ØÄꤷ¤Þ¤¹¡£
-    Æó¤ÄÌܤΥ­¡¼¤Ï<em>¾ï¤Ë</em>¥Õ¥¡¥¤¥ë̾¤Î¾º½ç¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È <code><a href="#indexoptions.suppresscolumnsorting">SuppressColumnSorting</a></code>
-    ¥¤¥ó¥Ç¥Ã¥¯¥¹¥ª¥×¥·¥ç¥ó¤È¤òÁȤ߹ç¤ï¤»¤ë¤³¤È¤Ç¡¢
-    ¥Ç¥£¥ì¥¯¥È¥ê°ìÍ÷¤ò¤¢¤ëÆÃÄê¤Î½çÈ֤ǤΤßɽ¼¨¤¹¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£
-    ¤³¤ì¤Ï¡¢
-    ¥¯¥é¥¤¥¢¥ó¥È¤¬Ê̤νçÈ֤ǥǥ£¥ì¥¯¥È¥ê°ìÍ÷¤ò¥ê¥¯¥¨¥¹¥È¤¹¤ë¤³¤È¤òËɤ®¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="IndexStyleSheet" id="IndexStyleSheet">IndexStyleSheet</a> <a name="indexstylesheet" id="indexstylesheet">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ë CSS ¥¹¥¿¥¤¥ë¥·¡¼¥È¤òÄɲ乤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>IndexStyleSheet <var>url-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_autoindex</td></tr>
-</table>
-    <p><code class="directive">IndexStyleSheet</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¥¤¥ó¥Ç¥Ã¥¯¥¹É½¼¨¤Ë»ÈÍѤµ¤ì¤ë CSS ¤Î¥Õ¥¡¥¤¥ë̾¤òÀßÄꤷ¤Þ¤¹¡£
-    </p>
-    <div class="example"><h3>Îã</h3><p><code>
-      
-      IndexStyleSheet "/css/style.css"
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ReadmeName" id="ReadmeName">ReadmeName</a> <a name="readmename" id="readmename">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¤¥ó¥Ç¥Ã¥¯¥¹°ìÍ÷¤ÎºÇ¸å¤ËÁÞÆþ¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤Î̾Á°</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ReadmeName <var>filename</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_autoindex</td></tr>
-</table>
-    <p><code class="directive">ReadmeName</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥¤¥ó¥Ç¥Ã¥¯¥¹¤Î½ª¤ï¤ê¤ËÉÕ¤±²Ã¤¨¤é¤ì¤ë¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÀßÄꤷ¤Þ¤¹¡£
-    <var>filename</var> ¤ÏÁÞÆþ¤¹¤ë¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ç¡¢
-    °ìÍ÷¤Î¹Ô¤ï¤ì¤Æ¤¤¤ë°ÌÃÖ¤«¤éÁêÂÐŪ¤Ê¤â¤Î¤È¤·¤Æ²ò¼á¤µ¤ì¤Þ¤¹¡£
-    <var>filename</var> ¤¬¥¹¥é¥Ã¥·¥å¤Ç»Ï¤Þ¤ë¾ì¹ç¤Ï¡¢
-    <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
-    ¤«¤é¤ÎÁêÂХѥ¹¤È¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      ReadmeName FOOTER.html
-    </code></p></div>
-
-    <div class="example"><h3>Îã 2</h3><p><code>
-    ReadmeName /include/FOOTER.html
-    </code></p></div>
-
-    <p>¤è¤ê¾ÜºÙ¤Ë¤Þ¤Ç¤³¤ÎµóÆ°¤Ë¤Ä¤¤¤Æµ­½Ò¤·¤Æ¤¤¤ë <code class="directive"><a href="#headername">HeaderName</a></code>
-    ¤â¤´Í÷²¼¤µ¤¤¡£</p>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_autoindex.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_autoindex.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_autoindex.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_autoindex.html.ja.utf8 b/docs/manual/mod/mod_autoindex.html.ja.utf8
new file mode 100644
index 00000000..a852ea85
--- /dev/null
+++ b/docs/manual/mod/mod_autoindex.html.ja.utf8
@@ -0,0 +1,987 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_autoindex - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_autoindex</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_autoindex.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_autoindex.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_autoindex.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>Unix � <code>ls</code> コマンドや
+    Win32 � <code>dir</code> シェルコマンド�似�
+    ディレクトリインデックスを生��る</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>autoindex_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_autoindex.c</td></tr></table>
+<h3>概�</h3>
+ 
+      <p>ディレクトリ�インデックス�二��情報�����
+      一��ら生�����:</p>
+
+    <ul>
+      <li>普通� <code>index.html</code> �呼�れる
+      ユーザ�よ��書�れ�ファイル。
+      <code class="directive"><a href="../mod/mod_dir.html#directoryindex">DirectoryIndex</a></code>
+      ディレクティブ���ファイル�を設定���。
+      �れ� <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code> �制御�れ��。</li>
+
+      <li>も����サー��よ��生��れ�一覧。
+      ��他�ディレクティブ���一覧�書�を制御���。
+      <code class="directive"><a href="#addicon">AddIcon</a></code>, <code class="directive"><a href="#addiconbyencoding">AddIconByEncoding</a></code> �
+      <code class="directive"><a href="#addiconbytype">AddIconByType</a></code>
+      を使�����様々�ファイルタイプ�対��アイコン一覧を
+      セット���。��り�リスト�れ�ファイル毎��
+      ファイル�マッ���一番最��アイコン�表示�れ��。
+      �れら� <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> �制御�れ��。</li>
+    </ul>
+    <p>望む�ら��自動インデックス生�を完全�除去 (�る��置�)
+    ��るよ�����二��機能�分離�れ����。</p>
+
+    <p>自動インデックス生�� <code>Options +Indexes</code>
+    を使����有効��り��。詳細������
+    <code class="directive"><a href="../mod/core.html#options">Options</a></code>
+    ディレクティブを�覧下��。</p>
+
+    <p>も� <code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>オプション�
+    <code class="directive"><a href="../mod/autoindex.html#indexoptions">IndexOptions</a></code>
+    ディレクティブ�与�られ��る�ら��
+    列�先頭�表示�順番を制御�るリンク��り��。
+    先頭�リンクを�択�る��一覧��生��れ�
+    ��列�値�ソート�れ��。
+    ��先頭を続���択�る��交互�昇順��順���り��。
+    �れら�列�先頭�リンク��
+    <code class="directive"><a href="#indexoptions">IndexOptions</a></code>
+    ディレクティブ�
+    <code>SuppressColumnSorting</code>
+    オプション�消��������。</p>
+
+    <p>"Size" �ソート��場���用�られる��
+    <em>実際�</em>ファイル�サイズ�����
+    表示�値�������注������� -
+    ���両方�も� "1K" �表示�れ������も�
+    1010 �イト�ファイル�必� 1011
+    �イト�ファイルよりも� (昇順�場�) �表示�れ��。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#addalt">AddAlt</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#addaltbyencoding">AddAltByEncoding</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#addaltbytype">AddAltByType</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#adddescription">AddDescription</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#addicon">AddIcon</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#addiconbyencoding">AddIconByEncoding</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#addiconbytype">AddIconByType</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#defaulticon">DefaultIcon</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#headername">HeaderName</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#indexignore">IndexIgnore</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#indexoptions">IndexOptions</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#indexorderdefault">IndexOrderDefault</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#indexstylesheet">IndexStyleSheet</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#readmename">ReadmeName</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#query">Autoindex リクエストクエリー引数</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="query" id="query">Autoindex リクエストクエリー引数</a></h2>
+    
+
+    <p>Apache 2.0.23 ��
+    コラムソート����クエリー引数を�編����
+    新��クエリーオプション�グループを導入����。
+    出力�対�るクライアント�����制御を効率的�抹消
+    ��るよ���
+    <code><a href="#indexoptions.ignoreclient">IndexOptions
+    IgnoreClient</a></code> �導入�れ���。</p>
+
+    <p>コラムソート�ヘッダ�れ自体��
+    下記�ソートクエリーオプションを付加�る
+    自分自身を�照�るリンク��。
+    下記�オプション��れ�も�
+    ディレクトリリソース��リクエスト�加�る�������。</p>
+
+    <ul>
+      <li><code>C=N</code> ��ファイル��ソート���。</li>
+
+      <li><code>C=M</code> ��更新日時�
+      ディレクトリ�ファイル��順�ソート���。</li>
+
+      <li><code>C=S</code> ��サイズ�
+      ディレクトリ�ファイル��順�ソート���。</li>
+
+      <li class="separate"><code>C=D</code> ��説明�
+      ディレクトリ�ファイル��順�ソート���。</li>
+
+      <li><code>O=A</code> ��昇順�表をソート���。</li>
+
+      <li class="separate"><code>O=D</code> ���順�表をソート���。</li>
+
+      <li><code>F=0</code> ���純�表�書�����。
+      (FancyIndex ���り��ん。)</li>
+
+      <li><code>F=1</code> ��FancyIndex 
+      表示�表�書�����。</li>
+
+      <li><code>F=2</code> ��表を HTML 
+      �テーブルを使�� FancyIndex �書�����。</li>
+
+      <li><code>V=0</code> 
+      ���ージョン�よるソートを無効����。</li>
+
+      <li class="separate"><code>V=1</code> 
+      ���ージョン�よるソートを有効����。</li>
+
+      <li><code>P=<var>pattern</var></code> 
+      ��与�られ� <var>pattern</var>
+      �����ファイル��を表示���。</li>
+    </ul>
+
+    <p>"P (パターン� P)" クエリー引数��
+    通常� <code class="directive"><a href="#indexignore">IndexIgnore</a></code>
+    ディレクティブ�処��れ�<em>後</em>�検査�れ�
+    ファイル�全���他� autoindex
+    リスト処���様�判定基準下�置�れ続�る
+    ���注�������。
+    <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> �クエリー引数パーサ (解�) ��
+    �識�能�オプション����る��座��止���。
+    クエリー引数�上�表�従��
+    正��形��������れ��り��ん。</p>
+
+    <p>下��純�例���れら�クエリーオプションを
+    表���。�れを����切り��� HEADER.html 
+    ファイル��存�る��も����。
+    mod_autoindex � X=Go 入力����る��
+    引数�全�解釈�れるよ���
+    未知�引数 "X" �リスト�最後�置�れ����。</p>
+
+    <div class="example"><p><code>
+      &lt;form action="" method="get"&gt;<br />
+      <span class="indent">
+        Show me a &lt;select name="F"&gt;<br />
+        <span class="indent">
+          &lt;option value="0"&gt; Plain list&lt;/option&gt;<br />
+          &lt;option value="1" selected="selected"&gt; Fancy list&lt;/option&gt;<br />
+          &lt;option value="2"&gt; Table list&lt;/option&gt;<br />
+        </span>
+        &lt;/select&gt;<br />
+        Sorted by &lt;select name="C"&gt;<br />
+        <span class="indent">
+          &lt;option value="N" selected="selected"&gt; Name&lt;/option&gt;<br />
+          &lt;option value="M"&gt; Date Modified&lt;/option&gt;<br />
+          &lt;option value="S"&gt; Size&lt;/option&gt;<br />
+          &lt;option value="D"&gt; Description&lt;/option&gt;<br />
+        </span>
+        &lt;/select&gt;<br />
+        &lt;select name="O"&gt;<br />
+        <span class="indent">
+          &lt;option value="A" selected="selected"&gt; Ascending&lt;/option&gt;<br />
+          &lt;option value="D"&gt; Descending&lt;/option&gt;<br />
+        </span>
+        &lt;/select&gt;<br />
+        &lt;select name="V"&gt;<br />
+        <span class="indent">
+          &lt;option value="0" selected="selected"&gt; in Normal order&lt;/option&gt;<br />
+          &lt;option value="1"&gt; in Version order&lt;/option&gt;<br />
+        </span>
+        &lt;/select&gt;<br />
+        Matching &lt;input type="text" name="P" value="*" /&gt;<br />
+        &lt;input type="submit" name="X" value="Go" /&gt;<br />
+      </span>
+      &lt;/form&gt;
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddAlt" id="AddAlt">AddAlt</a> <a name="addalt" id="addalt">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>アイコン�代�り�
+表示�れる�ファイル���択�れ�代替テキスト</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddAlt <var>string</var> <var>file</var> [<var>file</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_autoindex</td></tr>
+</table>
+    <p><code class="directive">AddAlt</code> ��<code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
+    �����アイコン�代�り�表示�る代替テキストを�供���。
+    <var>file</var> ��説明�るファイル�ファイル拡張��
+    ファイル��一部�ワイルドカード表��完全�ファイル��
+    �れ���り��。
+    <var>string</var> �空白��る場��引用符  (<code>"</code>
+    � <code>'</code>) �囲む必���り��。
+    ��文字列��クライアント�画�を表示����場�や
+    画��ロードを無効����る場�や
+    アイコン��得�失敗�����表示�れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      AddAlt "PDF file" *.pdf<br />
+      AddAlt Compressed *.gz *.zip *.Z
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddAltByEncoding" id="AddAltByEncoding">AddAltByEncoding</a> <a name="addaltbyencoding" id="addaltbyencoding">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>アイコン�代�り�表示�れる�MIME 符�化方法��択�れ�
+代替テキスト</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddAltByEncoding <var>string</var> <var>MIME-encoding</var>
+[<var>MIME-encoding</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_autoindex</td></tr>
+</table>
+    <p><code class="directive">AddAltByEncoding</code> ��
+    <code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
+    �����アイコン�代�り�表示�る代替文字列を�供���。
+    <var>MIME-encoding</var> �有効�符�化�例��
+    <code>x-compress</code>
+    ��。 
+    <var>string</var> �空白��る����引用符 (<code>"</code> �
+    <code>'</code>) �囲む必���り��。
+    ��文字列��クライアント�画�を表示����場�や
+    画��ロードを無効����る場�や
+    アイコン��得�失敗�����表示�れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      AddAltByEncoding gzip x-gzip
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddAltByType" id="AddAltByType">AddAltByType</a> <a name="addaltbytype" id="addaltbytype">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>アイコン�代�り�
+表示�れる�MIME タイプ��択�れ�代替テキスト</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddAltByType <var>string</var> <var>MIME-type</var>
+[<var>MIME-type</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_autoindex</td></tr>
+</table>
+    <p><code class="directive">AddAltByType</code> ��
+    <code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
+    �����アイコン�代�り�表示�る代替文字列を設定���。
+    <var>MIME-type</var> �有効�タイプ�例��
+    <code>text/html</code>
+    ��。
+    <var>string</var> �空白��る����引用符 (<code>"</code> �
+    <code>'</code>) �囲む必���り��。
+    ��文字列��クライアント�画�を表示����場�や
+    画��ロードを無効����る場�や
+    アイコン��得�失敗�����表示�れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      AddAltByType 'plain text' text/plain
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddDescription" id="AddDescription">AddDescription</a> <a name="adddescription" id="adddescription">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル�対��表示�る説明</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddDescription <var>string</var> <var>file</var> [<var>file</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_autoindex</td></tr>
+</table>
+    <p><code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
+    �����ファイル�対��表示�る説明を設定���。
+    <var>file</var> �説明�るファイル�ファイル拡張��
+    ファイル��一部�ワイルドカード表��完全�ファイル��
+    �れ���り��。
+    <var>string</var> �二�引用符 (<code>"</code>) �囲�れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      AddDescription "The planet Mars" /web/pics/mars.gif
+    </code></p></div>
+
+    <p>通常�デフォルト�説明領域� 23 �イト�幅��。
+    <code><a href="#indexoptions.suppressicon">IndexOptions SuppressIcon</a></code>
+    オプション� 6 �イト追加�
+    <code><a href="#indexoptions.suppresssize">IndexOptions SuppressSize</a></code>
+    オプション� 7 �イト追加�
+    <code><a href="#indexoptions.suppresslastmodified">IndexOptions SuppressLastModified</a></code>
+    オプション� 19 �イト追加�れ��。
+    ���ら�デフォルト�説明コラム�最大幅�
+    55 �イト��り��。</p>
+
+    <p>��コラム�大��を上書���り�
+    説明�無制�長�もよ�よ���る���詳細�関����
+    <a href="#indexoptions.descriptionwidth">DescriptionWidth</a>
+    ���
+    <code class="directive"><a href="#indexoptions">IndexOptions</a></code> 
+    �キーワードを�覧下��。</p>
+
+    <div class="note"><h3>警告</h3>
+      <p><code class="directive">AddDescription</code> 
+      �定義�れ�説明テキスト��タグや文字列����
+      HTML マークアップを�む�������。
+      も��説明コラム�幅�よ��タグ付��れ��素�丸�込�れ�
+       (太字�語��最後�切れる����) 場��
+      出力�果��ディレクトリ一覧�残り�部分�影響を与�る��ょ�。</p>
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddIcon" id="AddIcon">AddIcon</a> <a name="addicon" id="addicon">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル�表示�るアイコンを����択</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddIcon <var>icon</var> <var>name</var>
+[<var>name</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_autoindex</td></tr>
+</table>
+    <p><code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
+    �����
+    <var>name</var> �終�るファイル�隣�表示�るアイコンを設定���。
+    <var>icon</var> ��(% �エスケープ�れ�) アイコン��相対 URL
+    ��他�書� (<var>alttext</var>, <var>url</var>) ��。
+    ��� <var>alttext</var>
+    ���グラフィカルブラウザ���アイコン�付�られ�テキストタグ��。
+    </p>
+
+    <p><var>name</var> ��ディレクトリ�対応�る <code>^^DIRECTORY^^</code>
+    ��空白行�対応�る <code>^^BLANKICON^^</code>  (一覧�正��表示�れる���) ��
+    ファイル拡張���ワイルドカード表���ファイル��一部�
+    完全�ファイル���。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      AddIcon (IMG,/icons/image.xbm) .gif .jpg .xbm<br />
+      AddIcon /icons/dir.xbm ^^DIRECTORY^^<br />
+      AddIcon /icons/backup.xbm *~
+    </code></p></div>
+    
+    <p>も��能�ら�
+    <code class="directive">AddIcon</code>
+    より
+    <code class="directive"><a href="#addiconbytype">AddIconByType</a></code>
+    を優先的�使�����ょ�。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddIconByEncoding" id="AddIconByEncoding">AddIconByEncoding</a> <a name="addiconbyencoding" id="addiconbyencoding">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル�表示�るアイコンを MIME 
+符�化方法��択</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddIconByEncoding <var>icon</var> <var>MIME-encoding</var>
+[<var>MIME-encoding</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_autoindex</td></tr>
+</table>
+    <p><code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
+    �����ファイル�隣�表示�るアイコンを設定���。
+    <var>icon</var> ��(% �エスケープ�れ�) アイコン��相対 URL
+    ��他�書� <code>(<var>alttext</var>, <var>url</var>)</code> ��。
+    ��� <var>alttext</var>
+    ���グラフィカルブラウザ���アイコン�付�られ�テキストタグ��。
+    </p>
+
+    <p><var>MIME-encoding</var> ���求�れ�エンコード�該当�る
+    ワイルドカード表���。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      AddIconByEncoding /icons/compress.xbm x-compress
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddIconByType" id="AddIconByType">AddIconByType</a> <a name="addiconbytype" id="addiconbytype">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル�隣�表示�るアイコンを
+MIME タイプ�よ���択</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddIconByType <var>icon</var> <var>MIME-type</var>
+[<var>MIME-type</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_autoindex</td></tr>
+</table>
+    <p><code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
+    �����ファイル�隣�表示�るアイコンを設定���。
+    <var>icon</var> ��(% �エスケープ�れ�) アイコン��相対 URL
+    ��他�書� <code>(<var>alttext</var>, <var>url</var>)</code> ��。
+    ��� <var>alttext</var>
+    ���グラフィカルブラウザ���アイコン�付�られ�テキストタグ��。
+    </p>
+
+    <p><var>MIME-type</var> ���求�れ�タイプ�該当�る
+    ワイルドカード表���。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      AddIconByType (IMG,/icons/image.xbm) image/*
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DefaultIcon" id="DefaultIcon">DefaultIcon</a> <a name="defaulticon" id="defaulticon">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>特定�アイコン�何も設定�れ����時�
+ファイル�表示�るアイコン</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DefaultIcon <var>url-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_autoindex</td></tr>
+</table>
+    <p><code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
+    �����
+    特定�アイコン���場��ファイル�表示�るアイコンを設定���。
+    <var>url-path</var> ��(% �エスケープ�れ�) アイコン��相対 URL
+    ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      DefaultIcon /icon/unknown.xbm
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="HeaderName" id="HeaderName">HeaderName</a> <a name="headername" id="headername">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>
+インデックス一覧�先頭�挿入�れるファイル���</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>HeaderName <var>filename</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_autoindex</td></tr>
+</table>
+    <p><code class="directive">HeaderName</code> 
+    ディレクティブ��
+    インデックス一覧�先頭�挿入�るファイル���を設定���。
+    <var>Filename</var> ��り込むファイル�����。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      HeaderName HEADER.html
+    </code></p></div>
+
+    <div class="note">
+      <p>HeaderName ã‚‚ <code class="directive"><a href="#readmename">ReadmeName</a></code> 
+      も両方�も�在��<var>filename</var> 
+      をインデックス�れ��るディレクトリ�用�られ� URI
+      �対�る相対 URI パス���扱���。
+      <var>filename</var> �スラッシュ�始�る場���
+      <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
+      �ら�相対パス��り��。</p>
+
+      <div class="example"><h3>例</h3><p><code>
+        HeaderName /include/HEADER.html
+      </code></p></div>
+      
+      <p><var>filename</var> �
+      メジャーコンテントタイプ� "<code>text/*</code>" 
+       (<em>例��</em>�<code>text/html</code>, 
+      <code>text/plain</code> 等��。) 
+      �ドキュメント���解決
+      �れ��れ��り��ん。�れ���り�
+      も� CGI スクリプト�実際�ファイルタイプ�
+      次�ディレクティブ�よ����実際�出力��異���
+      <code>text/html</code> ���マーク�れ��る場��
+      <var>filename</var>
+      � CGI スクリプトを�照�る�も知れ���
+      �����を�味���:</p>
+
+      <div class="example"><p><code>
+        AddType text/html .cgi
+      </code></p></div>
+
+      <p><code class="directive"><a href="../mod/core.html#options">Options</a></code> <code>MultiViews</code> �
+      有効�����る場���
+      <a href="../content-negotiation.html">コンテント�ゴシエーション</a>
+      �行��れ��。
+      も� <var>filename</var> � (CGI スクリプト���) �的� 
+      <code>text/html</code> ドキュメント�解決�れ�
+      <code class="directive"><a href="../mod/core.html#options">options</a></code>
+      <code>Includes</code> � <code>IncludesNOEXEC</code>
+      �有効�����る場���
+      ファイル�サー�ーサイドインクルード�処��れ��
+      (<code class="module"><a href="../mod/mod_include.html">mod_include</a></code> ドキュメントを�照��下��)。</p>
+    </div>
+
+    <p>も� <code class="directive">HeaderName</code> �指定�れ�ファイル�
+    HTML ドキュメント�開始部分 (&lt;html&gt;, &lt;head&gt;, 
+    等) を�ん���ら�
+    <a href="#indexoptions.suppresshtmlpreamble"><code>IndexOptions
+    +SuppressHTMLPreamble</code></a>
+    を設定����れら�タグ�繰り返�れ��よ����������ょ�。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IndexIgnore" id="IndexIgnore">IndexIgnore</a> <a name="indexignore" id="indexignore">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ディレクトリ一覧を行��際�無視���
+ファイルリスト�追加</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>IndexIgnore <var>file</var> [<var>file</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_autoindex</td></tr>
+</table>
+    <p><code class="directive">IndexIgnore</code> ディレクティブ��
+    ディレクトリ�一覧を行�際�無視���ファイルリスト�追加���。
+    <var>file</var> ��
+    シェル形��ワイルドカード表��完全�ファイル���。
+    IndexIgnore �複数�る場���無視�るリスト�追加�行�れ�
+    置��行�れ��ん。デフォルト��リスト�� <code>.</code>
+    (カレントディレクトリ) ���れ����。</p>
+
+    <div class="example"><p><code>
+      IndexIgnore README .htaccess *.bak *~
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IndexOptions" id="IndexOptions">IndexOptions</a> <a name="indexoptions" id="indexoptions">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ディレクトリインデックス�様々�設定項目
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>IndexOptions  [+|-]<var>option</var> [[+|-]<var>option</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_autoindex</td></tr>
+</table>
+    <p><code class="directive">IndexOptions</code> 
+    ��ディレクトリインデックス�挙動を指定���。
+    <var>option</var> �次��れ���:</p>
+
+    <dl>
+      <dt><a name="indexoptions.descriptionwidth" id="indexoptions.descriptionwidth">DescriptionWidth=[<var>n</var> | *]</a>
+      (<em>2.0.23 以�</em>)</dt>
+
+      <dd><code>DescriptionWidth</code> 
+      キーワード�説明コラム�幅を文字数�指定�る�������。</dd>
+
+      <dd><code>-DescriptionWidth</code> (����設定) ��
+      <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> �最��幅を計算�るよ������。</dd>
+
+      <dd><code>DescriptionWidth=<var>n</var></code> 
+      ��コラム幅を <var>n</var> �イト�固定���。</dd>
+
+      <dd><code>DescriptionWidth=*</code> 
+      ��最長�説明�����必��長���コラムを延����。</dd>
+
+      <dd><strong>説明を丸�込ん�場�特有��険�����
+      <code class="directive"><a href="#adddescription">AddDescription</a></code>
+      セクションを�読�下��。</strong></dd>
+
+      <dt><a name="indexoptions.fancyindexing" id="indexoptions.fancyindexing">FancyIndexing</a></dt>
+
+      <dd>飾り付�インデックスをオン����。</dd>
+
+      <dt><a name="indexoptions.foldersfirst" id="indexoptions.foldersfirst">FoldersFirst</a>
+      (<em>2.0.23 以�</em>)</dt>
+
+      <dd>��オプション�有効����場��サブディレクトリ�一覧�
+      <em>必�</em>最����れ����ディレクトリ�通常�ファイル�
+      ��後�続���。
+      一覧�基本的���ファイル�ディレクトリ�二��部分�分�られ��
+      �れ�れ�別々�ソート�れ���後サブディレクトリを先���
+      表示�行��れ��。例��ソート順�����順�������
+      <code>FoldersFirst</code> �有効�����る場���
+      サブディレクトリ <code>Zed</code> �サブディレクトリ
+      <code>Beta</code> よりも��リスト�れ�通常�ファイル
+      <code>Gamma</code> ã‚„ <code>Alpha</code>
+      よりも��リスト�れ��。<strong>��オプション�
+      <a href="#indexoptions.fancyindexing"><code>FancyIndexing</code></a>
+      も有効�����る������効果��り��。</strong></dd>
+
+      <dt><a name="indexoptions.htmltable" id="indexoptions.htmltable">HTMLTable</a> <em>(実験的�
+      Apache 2.0.23 以�)</em></dt>
+
+      <dd>��実験的�オプション� FancyIndexing ��も�指定�る����
+      飾り�付��ディレクトリ一覧����テーブルを使���純�表を作り��。
+      �れ���ブラウザを混乱��る�も�れ�����注�������。
+      WinNT や��他 utf-8 
+      �有効�プラットホーム�よ���ファイル�や説明テキスト�
+      �読�����り左読���り�る場��特�必���。</dd>
+
+      <dt><a name="indexoptions.iconsarelinks" id="indexoptions.iconsarelinks">IconsAreLinks</a></dt>
+
+      <dd>�れ��FancyIndexing �����
+      アイコンもファイル���リンク�一部����。</dd>
+
+      <dt><a name="indexoptions.iconheight" id="indexoptions.iconheight">IconHeight[=<var>pixels</var>]</a></dt>
+
+      <dd>��オプション��IconWidth ��も�使�れ��る場���
+      サー��ファイルアイコン���� <code>img</code>
+      タグ� <code>height</code> � <code>width</code>
+      属性を�り込むよ���り��。
+      �れ�よ���イメージ全�をロード�終�る��待����も�
+      ブラウザ�ページレイアウトを�ら���計算�る�������。
+      ��オプション�何も値�与�られ��れ��Apache
+      ソフトウェア��供�れ��るアイコン�標準�高��
+      デフォルト�り��。</dd>
+
+      <dt><a name="indexoptions.iconwidth" id="indexoptions.iconwidth">IconWidth[=<var>pixels</var>]</a></dt>
+
+      <dd>��オプション��<code>IconHeight</code> ��も�使�れ��る場���
+      サー��ファイルアイコン���� <code>img</code>
+      タグ� <code>height</code> � <code>width</code>
+      属性を�り込むよ���り��。
+      �れ�よ���イメージ全�をロード�終�る��待����も�
+      ブラウザ�ページレイアウトを�ら���計算�る�������。
+      ��オプション�何も値�与�られ��れ��Apache
+      ソフトウェア��供�れ��るアイコン�標準�高��
+      デフォルト�り��。</dd>
+
+      <dt><a name="indexoptions.ignorecase" id="indexoptions.ignorecase">IgnoreCase</a></dt>
+
+      <dd>��オプション�有効��る��ファイル��大文字�文字を区別���ソート�れ��。
+      例��ファイル��昇順�ソート�れ�IgnoreCase �有効��れ��
+      Zeta � alfa �後�リスト�れ��
+      (注�: GAMMA �常� gamma ����り��)。</dd>
+
+      <dt><a name="indexoptions.ignoreclient" id="indexoptions.ignoreclient">IgnoreClient</a></dt>
+
+      <dd>��オプション� <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> ��
+      クライアント�ら�全��クエリー変数を無視�るよ���り��。
+      �れ�ソート順も����。
+      (��り <code><a href="#indexoptions.suppresscolumnsorting">SuppressColumnSorting</a></code>
+      を暗��味���。)</dd>
+
+      <dt><a name="indexoptions.namewidth" id="indexoptions.namewidth">NameWidth=[<var>n</var> 
+	       | *]</a></dt>
+
+      <dd><code>NameWidth</code> キーワード�ファイル�コラム�幅を�イト数�
+      指定����。</dd>
+
+      <dd><code>-NameWidth</code> (����設定) ��
+      <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> �最��幅を計算�るよ������。</dd>
+
+      <dd><code>NameWidth=<var>n</var></code> 
+      ��コラム幅を <var>n</var> �イト�固定���。</dd>
+
+      <dd><code>NameWidth=*</code>
+      ��必��長���コラムを延����。</dd>
+
+      <dt><a name="indexoptions.scanhtmltitles" id="indexoptions.scanhtmltitles">ScanHTMLTitles</a></dt>
+
+      <dd>FancyIndexing �����
+       HTML ドキュメント�らタイトルを�り出���を�能����。
+      も�ファイル�
+      <code class="directive"><a href="#adddescription">AddDescription</a></code>
+      �説明�与�られ����れ��
+      httpd � <code>title</code> タグ�値を読む���ドキュメントを読�始���。
+      �れ� CPU や disk �負�を����。</dd>
+
+      <dt><a name="indexoptions.showforbidden" id="indexoptions.showforbidden">ShowForbidden</a></dt>
+
+      <dd>指定��場�����も�サブリクエスト��果� HTTP_UNAUTHORIZED や
+      HTTP_FORBIDDEN �ファイル�通常通り隠�れ�状態����
+      ファイル一覧�生��れ��。</dd>
+
+      <dt><a name="indexoptions.suppresscolumnsorting" id="indexoptions.suppresscolumnsorting">SuppressColumnSorting</a></dt>
+
+      <dd>も�指定�れ��れ��Apache �
+      FancyIndexing �表示�れ��るディレクトリ一覧��
+      コラム�先頭を�ソート����リンク�����り��。
+      デフォルト�挙動��リンク����。
+      コラム�先頭を���コラム�値�従��ディレクトリリストを
+      ソート���。
+      <strong>Apache 2.0.23 以�����れ��時�
+      ソート文字列����クエリー引数�解�も無効����。
+      </strong>
+      ��挙動� Apache 2.0.23 ��
+      <a href="#indexoptions.ignoreclient">IndexOptions
+      IgnoreClient</a> �制御�れるよ��������。</dd>
+
+      <dt><a name="indexoptions.suppressdescription" id="indexoptions.suppressdescription">SuppressDescription</a></dt>
+
+      <dd>�れ� FancyIndexing ���るファイル�説明を消去���。
+      デフォルト���説明�定義�れ��ら��
+      ��オプションを使��他���� 23
+      文字�空白を稼��������。 ファイル�説明�関�る情報��
+      <code class="directive"><a href="#adddescription">AddDescription</a></code> 
+      を�覧下��。���説明�コラムサイズを制��る
+      <code><a href="#indexoptions.descriptionwidth">DescriptionWidth</a></code>
+      インデックスオプションも�覧下��。</dd>
+
+      <dt><a name="indexoptions.suppresshtmlpreamble" id="indexoptions.suppresshtmlpreamble">SuppressHTMLPreamble</a></dt>
+
+      <dd>通常�
+      <code class="directive"><a href="#headername">HeaderName</a></code>
+      ディレクティブ�指定��ファイルを
+      ディレクトリ�実際��ん��れ��標準的� HTML プリアンブル
+      (<code>&lt;html&gt;</code>, <code>&lt;head&gt;</code>, <em>等</em>) �後��
+      モジュール�ファイル�中身をインクルード���。
+      <code>SuppressHTMLPreamble</code> オプション��
+      ��挙動を無効�����
+      モジュール�ヘッダーファイル�中身�ら表示を始���。
+      ��場��ヘッダーファイル�正�� HTML
+      命令を�ん����れ��り��ん。
+      ヘッダーファイル�存在���場���プリアンブル�通常通り
+      生��れ��。</dd>
+
+      <dt><a name="indexoptions.suppressicon" id="indexoptions.suppressicon">SuppressIcon</a> (<em>Apache
+      2.0.23 以�</em>)</dt>
+
+      <dd>
+      �れ� FancyIndexing �一覧�らアイコンを消去���。
+      <code>SuppressIcon</code> � <code>SuppressRules</code>
+      �組���る���よ��正�� HTML 3.2 �出力�得られ��。
+      正�� HTML 3.2 出力��最終�格���� <code>img</code> � <code>hr</code>
+      � <code>pre</code> ブロック�入る (FancyIndexing 一覧�書��使�れ����) 
+      ��を�止�����。</dd>
+
+      <dt><a name="indexoptions.suppresslastmodified" id="indexoptions.suppresslastmodified">SuppressLastModified</a></dt>
+
+      <dd>FancyIndexing 一覧����最終更新日時�表示を消去���。</dd>
+
+      <dt><a name="indexoptions.suppressrules" id="indexoptions.suppressrules">SuppressRules</a>
+       (<em>Apache 2.0.23 以�</em>) </dt>
+
+      <dd>ディレクトリ一覧����水平区切り線 (<code>hr</code> タグ) を消去���。
+      <code>SuppressIcon</code> � <code>SuppressRules</code>
+      �組���る���よ��正�� HTML 3.2 �出力�得られ��。
+      正�� HTML 3.2 出力��最終�格���� <code>img</code> � <code>hr</code>
+      � <code>pre</code> ブロック�入る (FancyIndexing 一覧�書��使�れ����) 
+      ��を�止�����。</dd>
+
+      <dt><a name="indexoptions.suppresssize" id="indexoptions.suppresssize">SuppressSize</a></dt>
+
+      <dd>FancyIndexing 一覧����ファイルサイズ�表示を消去���。</dd>
+
+      <dt><a name="indexoptions.trackmodified" id="indexoptions.trackmodified">TrackModified</a>
+	       (<em>Apache 2.0.23 以�</em>)</dt>
+
+      <dd>�れ� HTTP ヘッダ中��
+      リスト�れ�ディレクトリ�最終更新日や ETag 値を����。
+      �れ��オペレーティングシステムやファイルシステム�
+      �切� stat() �返り値を返�場����有効��。
+      ����� UNIX システム�OS2 � JFS や Win32 � NTFS
+      ボリューム���������。
+      例���OS2 � Win32 FAT ボリューム������り��ん。
+      ��機能�有効��る��クライアントやプロキシ�
+      <code>HEAD</code> リクエストを行����よ���
+      ファイル一覧�変化を追跡�る�����るよ���り��。
+      �����オペレーティングシステム��新�ファイルや
+      移動ファイル�正��追跡�る�れ�も�
+      ディレクトリ中�ファイル�サイズや日付�追跡���������
+      注�������。
+      <strong>既�存在�るファイル�サイズや日付�スタンプ�変化��も�
+      全�� Unix プラットホーム���
+      最終更新日ヘッダーを更新���ん。</strong>
+      も��れ�����れ��
+      ��オプションを無効����������。</dd>
+
+      <dt><a name="indexoptions.versionsort" id="indexoptions.versionsort">VersionSort</a>
+      (<em>Apache 2.0a3 以�</em>)</dt>
+
+      <dd><code>VersionSort</code> キーワード��ージョン番�を�ん�ファイル�
+      自然�方法�ソート�れるよ�����。
+      文字列�通常通りソート�れ�
+      �れ以外��説明や��中�数��る部分文字列�
+      ��数値�比較�れ��。
+
+      <div class="example"><h3>例:</h3><p><code>
+        foo-1.7<br />
+        foo-1.7.2<br />
+        foo-1.7.12<br />
+        foo-1.8.2<br />
+        foo-1.8.2a<br />
+        foo-1.12
+      </code></p></div>
+
+      <p>番�� 0 �ら始�る場���端数�考�られ��</p>
+
+      <div class="example"><p><code>
+        foo-1.001<br />
+        foo-1.002<br />
+        foo-1.030<br />
+        foo-1.04
+      </code></p></div>
+      </dd>
+
+      <dt><a name="indexoptions.xhtml" id="indexoptions.xhtml">XHTML</a>
+      (<em>Apache 2.0.49 以�</em>)</dt>
+
+      <dd><code>XHTML</code> キーワードを指定�る��<code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code>
+      � HTML 3.2 �代�り� XHTML 1.0 �コードを出力�るよ���り��。</dd>
+    </dl>
+
+   
+   <dl><dt>増減指定��る IndexOptions</dt>
+   <dd>
+     <p>Apache 1.3.3 ���
+     <code class="directive">IndexOptions</code> 
+     ディレクティブ�扱��幾���大��変化�導入�れ���。
+     特��</p>
+
+     <ul>
+     <li>一��ディレクトリ�対�る複数�
+     <code class="directive">IndexOptions</code> 
+     ディレクティブ���在��一��マージ�れ��。
+     上�例��果��
+
+     <div class="example"><p><code>
+       &lt;Directory /foo&gt;
+       <span class="indent">
+         IndexOptions HTMLTable<br />
+         IndexOptions SuppressColumnsorting
+       </span>
+       &lt;/Directory&gt;
+     </code></p></div>
+
+     <p>��一��り��。</p>
+
+     <div class="example"><p><code>
+       IndexOptions HTMLTable SuppressColumnsorting
+     </code></p></div>
+     </li>
+
+     <li>増減構文
+     (<em>����</em>�'+' や '-'
+     �接頭辞�付�キーワード) �追加。</li>
+     </ul>
+
+     <p>'+' や '-' 接頭辞�付��キーワード�出会���れ��
+     ��時点�� <code class="directive">IndexOptions</code>
+     �設定 (�れ�上��ディレクトリを��継���) 
+     �対���応�れ��。
+     �����ら�接頭辞�付���キーワード�処��れ�場���
+     ��継��オプション全���れ��出会��増減設定全��
+     消去�れ��。次�例を考��������:</p>
+
+     <div class="example"><p><code>
+       IndexOptions +ScanHTMLTitles -IconsAreLinks FancyIndexing<br />
+       IndexOptions +SuppressSize
+     </code></p></div>
+
+     <p>中身�効果�
+     <code>IndexOptions&nbsp;FancyIndexing&nbsp;+SuppressSize</code>
+     ��一��。
+     接頭辞�付��� <code>FancyIndexing</code>
+     ��れ以��増減キーワードを無効��れ��
+     ��後�累��始�る�ら��。</p>
+
+     <p>無�件� <code class="directive">IndexOptions</code>
+     を�るディレクトリ�設定�る���よ��
+     継承��設定を消去���<code>+</code> や <code>-</code>
+     接頭辞�付���キーワード�設定������。</p>
+   </dd>
+   </dl>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IndexOrderDefault" id="IndexOrderDefault">IndexOrderDefault</a> <a name="indexorderdefault" id="indexorderdefault">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>
+ディレクトリインデックス�標準�順番付�を設定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>IndexOrderDefault Ascending|Descending
+Name|Date|Size|Description</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>IndexOrderDefault Ascending Name</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_autoindex</td></tr>
+</table>
+    <p><code class="directive">IndexOrderDefault</code> ディレクティブ�
+    <code><a href="#indexoptions.fancyindexing">FancyIndexing</a></code>
+    インデックスオプション�併��用�れれ��。
+    デフォルト���FancyIndexing 
+    �ディレクトリ一覧�ファイル��昇順�表示�れ��。
+    <code class="directive">IndexOrderDefault</code>
+    ���期状態�表示順番を変�る�������。</p>
+
+    <p><code class="directive">IndexOrderDefault</code>
+    �二��引数を�り��。一�目�ソート�方�を指示�る
+    <code>Ascending</code> � <code>Descending</code> ���れ���。
+    二�目�引数� <code>Name</code>, <code>Date</code>,
+    <code>Size</code> � <code>Description</code> 
+    ���れ�一��キーワード�����プライマリキーを指定���。
+    二�目�キー�<em>常�</em>ファイル��昇順��り��。</p>
+
+    <p>��ディレクティブ� <code><a href="#indexoptions.suppresscolumnsorting">SuppressColumnSorting</a></code>
+    インデックスオプション�を組����る����
+    ディレクトリ一覧を�る特定�順番���表示�るよ������。
+    �れ��
+    クライアント�別�順番�ディレクトリ一覧をリクエスト�る��を防���。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IndexStyleSheet" id="IndexStyleSheet">IndexStyleSheet</a> <a name="indexstylesheet" id="indexstylesheet">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ディレクトリインデックス� CSS スタイルシートを追加�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>IndexStyleSheet <var>url-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_autoindex</td></tr>
+</table>
+    <p><code class="directive">IndexStyleSheet</code> ディレクティブ�
+    インデックス表示�使用�れる CSS �ファイル�を設定���。
+    </p>
+    <div class="example"><h3>例</h3><p><code>
+      
+      IndexStyleSheet "/css/style.css"
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ReadmeName" id="ReadmeName">ReadmeName</a> <a name="readmename" id="readmename">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>インデックス一覧�最後�挿入�れるファイル���</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ReadmeName <var>filename</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_autoindex</td></tr>
+</table>
+    <p><code class="directive">ReadmeName</code> ディレクティブ��
+    インデックス�終�り�付�加�られるファイル���を設定���。
+    <var>filename</var> �挿入�るファイル�����
+    一覧�行�れ��る�置�ら相対的�も����解釈�れ��。
+    <var>filename</var> �スラッシュ�始�る場���
+    <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
+    �ら�相対パス��り��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      ReadmeName FOOTER.html
+    </code></p></div>
+
+    <div class="example"><h3>例 2</h3><p><code>
+    ReadmeName /include/FOOTER.html
+    </code></p></div>
+
+    <p>より詳細�����挙動����記述���る <code class="directive"><a href="#headername">HeaderName</a></code>
+    も�覧下��。</p>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_autoindex.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_autoindex.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_autoindex.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_autoindex.html.ko.euc-kr b/docs/manual/mod/mod_autoindex.html.ko.euc-kr
index ca3934e1..07405940 100644
--- a/docs/manual/mod/mod_autoindex.html.ko.euc-kr
+++ b/docs/manual/mod/mod_autoindex.html.ko.euc-kr
@@ -830,6 +830,6 @@ Name|Date|Size|Description</code></td></tr>
 <a href="../ja/mod/mod_autoindex.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_autoindex.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cache.html b/docs/manual/mod/mod_cache.html
index cba0697e..b7b4aa25 100644
--- a/docs/manual/mod/mod_cache.html
+++ b/docs/manual/mod/mod_cache.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_cache.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_cache.html.ja.euc-jp
+URI: mod_cache.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_cache.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_cache.html.en b/docs/manual/mod/mod_cache.html.en
index 97d607ea..89f38c9b 100644
--- a/docs/manual/mod/mod_cache.html.en
+++ b/docs/manual/mod/mod_cache.html.en
@@ -485,6 +485,6 @@ LastModified date.</td></tr>
 <a href="../ja/mod/mod_cache.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cache.html.ja.euc-jp b/docs/manual/mod/mod_cache.html.ja.euc-jp
deleted file mode 100644
index 73f1a1fb..00000000
--- a/docs/manual/mod/mod_cache.html.ja.euc-jp
+++ /dev/null
@@ -1,443 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_cache - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_cache</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_cache.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>URI ¤ò¥­¡¼¤Ë¤·¤¿¥³¥ó¥Æ¥ó¥Ä¤Î¥­¥ã¥Ã¥·¥å</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>cache_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_cache.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <div class="warning">
-      ¤³¤ì¤Ï¼Â¸³Åª¤Ê¥â¥¸¥å¡¼¥ë¤Ç¤¹¡£Ê¸½ñ¤â¤Þ¤À³«È¯Ãæ¤Ç¤¹...
-    </div>
-
-    <p><code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> ¤Ï¥í¡¼¥«¥ë¤Î¥³¥ó¥Æ¥ó¥Ä¤ä¥×¥í¥­¥·¤µ¤ì¤¿
-    ¥³¥ó¥Æ¥ó¥Ä¤ò¥­¥ã¥Ã¥·¥å¤¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤ë <a href="http://www.ietf.org/rfc/rfc2616.txt">RFC 2616</a> ½àµò¤Î
-    HTTP ¥³¥ó¥Æ¥ó¥Ä¥­¥ã¥Ã¥·¥å¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£<code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>
-    ¤ÎÆ°ºî¤Ë¤Ï¥¹¥È¥ì¡¼¥¸¤ò´ÉÍý¤¹¤ë¥â¥¸¥å¡¼¥ë¤¬É¬ÍפǤ¹¡£É¸½à
-    Apache ÇÛÉۤˤÏÆó¤Ä¥¹¥È¥ì¡¼¥¸´ÉÍý¥â¥¸¥å¡¼¥ë¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹:</p>
-    
-    <dl>
-    <dt><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code></dt>
-    <dd>¥Ç¥£¥¹¥¯¤ò»ÈÍѤ·¤¿¥¹¥È¥ì¡¼¥¸´ÉÍýµ¡¹½¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£</dd>
-
-    <dt><code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code></dt>
-    <dd>¥á¥â¥ê¤ò»ÈÍѤ·¤¿¥¹¥È¥ì¡¼¥¸´ÉÍýµ¡¹½¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£
-    <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> ¤Ï¼¡¤ÎÆó¤Ä¤Î¥â¡¼¥É¤Î¤É¤Á¤é¤«¤ÇÆ°ºî¤¹¤ë
-    ¤è¤¦¤ËÀßÄê¤Ç¤­¤Þ¤¹: ¥ª¡¼¥×¥ó¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤ò¥­¥ã¥Ã¥·¥å¤¹¤ë¥â¡¼¥É¤«¡¢
-    ¥Ò¡¼¥×¾å¤Ç¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Î¼«ÂΤò¥­¥ã¥Ã¥·¥å¤ò¤¹¤ë¥â¡¼¥É¤Ç¤¹¡£
-    <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> ¤Ï¥í¡¼¥«¥ë¤ÇÀ¸À®¤µ¤ì¤ë¥³¥ó¥Æ¥ó¥Ä¤ä¡¢
-    <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ¤¬
-    <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code> ¤ò»È¤Ã¤ÆÀßÄꤵ¤ì¤Æ¤¤¤ë
-    ¤È¤­¤Î (¤Ä¤Þ¤ê<dfn>¥ê¥Ð¡¼¥¹¥×¥í¥­¥·</dfn> ¤Ç¤Î) ¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤Î
-    ¥³¥ó¥Æ¥ó¥Ä¤ò¥­¥ã¥Ã¥·¥å¤¹¤ë¤Î¤Ë»È¤¨¤Þ¤¹¡£</dd>
-    </dl>
-
-    <p>¥³¥ó¥Æ¥ó¥Ä¤Î¥­¥ã¥Ã¥·¥å¤Ø¤ÎÊݸ¤È¼èÆÀ¤Ï URI ¤Ë´ð¤Å¤¤¤¿¥­¡¼¤¬»È¤ï¤ì¤Þ¤¹¡£
-    ¥¢¥¯¥»¥¹Êݸî¤Î¤«¤±¤é¤ì¤Æ¤¤¤ë¥³¥ó¥Æ¥ó¥Ä¤Ï¥­¥ã¥Ã¥·¥å¤µ¤ì¤Þ¤»¤ó¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#cachedefaultexpire">CacheDefaultExpire</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cachedisable">CacheDisable</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cacheenable">CacheEnable</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cacheignorecachecontrol">CacheIgnoreCacheControl</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cacheignoreheaders">CacheIgnoreHeaders</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cacheignorenolastmod">CacheIgnoreNoLastMod</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cachelastmodifiedfactor">CacheLastModifiedFactor</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cachemaxexpire">CacheMaxExpire</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cachestorenostore">CacheStoreNoStore</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cachestoreprivate">CacheStorePrivate</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#related">´ØÏ¢¥â¥¸¥å¡¼¥ë¤È¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#sampleconf">¥µ¥ó¥×¥ëÀßÄê</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="related" id="related">´ØÏ¢¥â¥¸¥å¡¼¥ë¤È¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code></li><li><code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_disk_cache.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachesize">CacheSize</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachesize">MCacheSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer</a></code></li></ul></td></tr></table>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="sampleconf" id="sampleconf">¥µ¥ó¥×¥ëÀßÄê</a></h2>
-    <div class="example"><h3>Sample httpd.conf</h3><p><code>
-      #<br />
-      # Sample Cache Configuration<br />
-      #<br />
-      LoadModule cache_module modules/mod_cache.so<br />
-      <br />
-      &lt;IfModule mod_cache.c&gt;<br />
-      <span class="indent">
-        #LoadModule disk_cache_module modules/mod_disk_cache.so<br />
-        # If you want to use mod_disk_cache instead of mod_mem_cache,
-        # uncomment the line above and comment out the LoadModule line below.
-        &lt;IfModule mod_disk_cache.c&gt;<br />
-        <span class="indent">
-          CacheRoot c:/cacheroot<br />
-          CacheEnable disk  /<br />
-          CacheDirLevels 5<br />
-          CacheDirLength 3<br />
-        </span>
-        &lt;/IfModule&gt; <br />
-        <br />
-        LoadModule mem_cache_module modules/mod_mem_cache.so<br />
-        &lt;IfModule mod_mem_cache.c&gt;<br />
-        <span class="indent">
-          CacheEnable mem  /<br />
-          MCacheSize 4096<br />
-          MCacheMaxObjectCount 100<br />
-          MCacheMinObjectSize 1<br />
-          MCacheMaxObjectSize 2048<br />
-        </span>
-        &lt;/IfModule&gt;<br />
-      </span>
-      &lt;/IfModule&gt;
-    </code></p></div>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CacheDefaultExpire" id="CacheDefaultExpire">CacheDefaultExpire</a> <a name="cachedefaultexpire" id="cachedefaultexpire">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>´üÆü¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Ë¥É¥­¥å¥á¥ó¥È¤ò¥­¥ã¥Ã¥·¥å¤¹¤ë¥Ç¥Õ¥©¥ë¥È¤Î´ü´Ö</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CacheDefaultExpire <var>seconds</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>CacheDefaultExpire 3600 (1»þ´Ö)</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_cache</td></tr>
-</table>
-    <p><code class="directive">CacheDefaultExpire</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥É¥­¥å¥á¥ó¥È¤Ë
-    Í­¸ú´ü¸Â (expiry) ¤äºÇ½ª½¤Àµ»þ¹ï (last-modified) ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Î
-    ¥Ç¥Õ¥©¥ë¥È¤Î»þ´Ö¤ò»ØÄꤷ¤Þ¤¹¡£<code class="directive">CacheMaxExpire</code> 
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤵ¤ì¤¿ÃͤϤ³¤ÎÀßÄê¤ò¾å½ñ¤­<em>¤·¤Þ¤»¤ó</em>¡£</p>
-
-    <div class="example"><p><code>
-      CacheDefaultExpire 86400
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CacheDisable" id="CacheDisable">CacheDisable</a> <a name="cachedisable" id="cachedisable">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ÆÃÄê¤Î URL ¤ò¥­¥ã¥Ã¥·¥å¤·¤Ê¤¤</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CacheDisable <var> url-string</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_cache</td></tr>
-</table>
-    <p><code class="directive">CacheDisable</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç
-    <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> ¥â¥¸¥å¡¼¥ë¤¬ <var>url-string</var> °Ê²¼¤Î
-    URL ¤ò¥­¥ã¥Ã¥·¥å<em>¤·¤Ê¤¤</em>¤è¤¦¤Ë¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      CacheDisable /local_files
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CacheEnable" id="CacheEnable">CacheEnable</a> <a name="cacheenable" id="cacheenable">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>»ØÄꤷ¤¿¥¹¥È¥ì¡¼¥¸´ÉÍýÊý¼°¤ò»È¤Ã¤Æ¤Î¥­¥ã¥Ã¥·¥å¤òÍ­¸ú¤Ë¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CacheEnable <var>cache_type</var> <var>url-string</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_cache</td></tr>
-</table>
-    <p><code class="directive">CacheEnable</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> 
-    ¥â¥¸¥å¡¼¥ë¤¬ <var>url-string</var> °Ê²¼¤Î URL ¤ò¥­¥ã¥Ã¥·¥å¤¹¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
-    ¥­¥ã¥Ã¥·¥å¥¹¥È¥ì¡¼¥¸´ÉÍýÊý¼°¤Ï <var>cache_type</var> °ú¿ô¤Ç»ØÄꤷ¤Þ¤¹¡£
-    <var>cache_type</var> <code> mem</code> ¤Ç¡¢
-    <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> ¤Ç¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¥á¥â¥ê¤ò»È¤Ã¤¿¥¹¥È¥ì¡¼¥¸
-    ´ÉÍýÊý¼°¤ò»È¤¦¤è¤¦¤Ë <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> ¤Ë»Ø¼¨¤·¤Þ¤¹¡£
-    <var>cache_type</var> <code>disk</code> ¤Ç¡¢
-    <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> ¤Ç¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¥Ç¥£¥¹¥¯¤ò»È¤Ã¤¿¥¹¥È¥ì¡¼¥¸
-    ´ÉÍý¤ò»È¤¦¤è¤¦¤Ë <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> ¤Ë»Ø¼¨¤·¤Þ¤¹¡£
-    <var>cache_type</var> <code>fd</code> ¤Ï <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> ¤Ë
-    <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> ¤Ë¤è¤ê¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Î
-    ¥­¥ã¥Ã¥·¥å¤ò»È¤¦¤è¤¦¤Ë»Ø¼¨¤·¤Þ¤¹¡£</p>
-
-    <p>(²¼¤ÎÎã¤Î¤è¤¦¤Ë) <code class="directive">CacheEnable</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-    URL ¶õ´Ö¤¬½ÅÊ£¤·¤Æ¤¤¤ë¤È¤­¤Ï¡¢³ºÅö¤¹¤ë¥¹¥È¥ì¡¼¥¸Êý¼°¤ò½ç¤Ë»î¤·¤Æ¡¢
-    ¼ÂºÝ¤Ë¥ê¥¯¥¨¥¹¥È¤Î½èÍý¤¬¤Ç¤­¤ë¤È¡¢¤½¤ÎÊý¼°¤Ç½èÍý¤·¤Þ¤¹¡£
-    ¥¹¥È¥ì¡¼¥¸´ÉÍýÊý¼°¤¬¼Â¹Ô¤µ¤ì¤ë½çÈÖ¤ÏÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Î
-    <code class="directive">CacheEnable</code> ¤Î½çÈ֤ˤè¤ê·èÄꤵ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      CacheEnable  mem   /manual<br />
-      CacheEnable  fd    /images<br />
-      CacheEnable  disk  /<br />
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CacheIgnoreCacheControl" id="CacheIgnoreCacheControl">CacheIgnoreCacheControl</a> <a name="cacheignorecachecontrol" id="cacheignorecachecontrol">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥­¥ã¥Ã¥·¥å¤µ¤ì¤Æ¤¤¤ë¥³¥ó¥Æ¥ó¥Ä¤òÊÖ¤µ¤Ê¤¤¤è¤¦¤Ë¥¯¥é¥¤¥¢¥ó¥È¤«¤é
-¥ê¥¯¥¨¥¹¥È¤µ¤ì¤Æ¤â̵»ë¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CacheIgnoreCacheControl On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>CacheIgnoreCacheControl Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_cache</td></tr>
-</table>
-    <p>Cache-Control: no-cache ¥Ø¥Ã¥À¤ä Pragma: no-store ¥Ø¥Ã¥À¤Î¤¢¤ë¥ê¥¯¥¨¥¹¥È¤Ë
-    ÂФ·¤Æ¤Ï¡¢Ä̾省¥ã¥Ã¥·¥å¤ò»È¤¤¤Þ¤»¤ó¡£<code class="directive">CacheIgnoreCacheControl</code> 
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¦¤È¡¢¤³¤ÎÆ°ºî¤ò¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£
-    <code class="directive">CacheIgnoreCacheControl</code> On ¤È¤¹¤ë¤È¡¢
-    ¥ê¥¯¥¨¥¹¥È¤Ë no-cache ¤È¤¤¤¦Ãͤ¬¤¢¤Ã¤Æ¤â¡¢¥­¥ã¥Ã¥·¥å¤ò»È¤Ã¤Æ¥É¥­¥å¥á¥ó¥È¤ò
-    ÊÖ¤¹¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£Ç§¾Ú¤òɬÍפȤ¹¤ë¥É¥­¥å¥á¥ó¥È¤Ï<em>·è¤·¤Æ</em>
-    ¥­¥ã¥Ã¥·¥å¤µ¤ì¤Þ¤»¤ó¡£</p>
-
-    <div class="example"><p><code>
-      CacheIgnoreCacheControl On
-    </code></p></div>
-
-    <div class="warning"><h3>·Ù¹ð</h3>
-       ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¦¤È¡¢¥É¥­¥å¥á¥ó¥È¼èÆÀ»þ¤Ë¥­¥ã¥Ã¥·¥å¤ò»È¤ï¤Ê¤¤¤è¤¦¤Ë
-       ¥¯¥é¥¤¥¢¥ó¥È¤¬¥ê¥¯¥¨¥¹¥È¤·¤Æ¤¤¤ë¤Ë¤â¤«¤«¤ï¤é¤º¡¢¥­¥ã¥Ã¥·¥å¤ò
-       »È¤¦¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤Î·ë²Ì¡¢
-       ¸Å¤¤¥³¥ó¥Æ¥ó¥Ä¤¬Á÷¤é¤ì³¤±¤ë¤³¤È¤Ë¤Ê¤Ã¤Æ¤·¤Þ¤¦¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-    </div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#cachestoreprivate">CacheStorePrivate</a></code></li>
-<li><code class="directive"><a href="#cachestorenostore">CacheStoreNoStore</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CacheIgnoreHeaders" id="CacheIgnoreHeaders">CacheIgnoreHeaders</a> <a name="cacheignoreheaders" id="cacheignoreheaders">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>»ØÄꤵ¤ì¤¿ HTTP ¥Ø¥Ã¥À¤ò¥­¥ã¥Ã¥·¥å¤ËÊݸ¤·¤Ê¤¤¡£
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CacheIgnoreHeaders <var>header-string</var> [<var>header-string</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>CacheIgnoreHeaders None</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_cache</td></tr>
-</table>
-    <p>RFC 2616 ¤Ë¤è¤ë¤È¡¢hop-by-hop HTTP ¥Ø¥Ã¥À¤Ï¥­¥ã¥Ã¥·¥å¤Ë¤ÏÊݴɤµ¤ì¤Þ¤»¤ó¡£
-    °Ê²¼¤Î¥Ø¥Ã¥À¤Ï hop-by-hop ¥Ø¥Ã¥À¤Ë³ºÅö¤·¤Þ¤¹¤Î¤Ç¡¢
-    <code class="directive">CacheIgnoreHeaders</code>
-    ¤ÎÀßÄê¤Ë<em>´Ø·¸¤Ê¤¯</em>¥­¥ã¥Ã¥·¥å¤Ë¤ÏÊݴɤµ¤ì¤Þ¤»¤ó:</p>
-    <ul>
-      <li><code>Connection</code></li>
-      <li><code>Keep-Alive</code></li>
-      <li><code>Proxy-Authenticate</code></li>
-      <li><code>Proxy-Authorization</code></li>
-      <li><code>TE</code></li>
-      <li><code>Trailers</code></li>
-      <li><code>Transfer-Encoding</code></li>
-      <li><code>Upgrade</code></li>
-    </ul>
-
-    <p><code class="directive">CacheIgnoreHeaders</code> ¤Ç
-    ¥­¥ã¥Ã¥·¥å¤ËÊݴɤ·¤Ê¤¤ÄɲäΠHTTP ¥Ø¥Ã¥À¤ò»ØÄꤷ¤Þ¤¹¡£
-    Î㤨¤Ð¡¢¥¯¥Ã¥­¡¼¤ò¥­¥ã¥Ã¥·¥å¤ËÊݴɤ·¤Ê¤¤¤è¤¦¤Ë¤·¤¿Êý¤¬¤è¤¤¾ì¹ç¤â
-    ¤¢¤ë¤Ç¤·¤ç¤¦¡£</p>
-
-    <p><code class="directive">CacheIgnoreHeaders</code> ¤Î°ú¿ô¤Ï¡¢
-    ¥­¥ã¥Ã¥·¥å¤ËÊݴɤ·¤Ê¤¤ HTTP ¥Ø¥Ã¥À¤ò¶õÇò¶èÀÚ¤ê¤Ë¤·¤¿¥ê¥¹¥È·Á¼°¤Ç¤¹¡£
-    ¥­¥ã¥Ã¥·¥å¤ËÊݴɤ·¤Ê¤¤¥Ø¥Ã¥À¤¬ hop-by-hop ¥Ø¥Ã¥À¤À¤±¤Î¾ì¹ç
-    (RFC 2616 ½àµò¤ÎÆ°ºî¤Î¤È¤­) ¤Ï¡¢
-    <code class="directive">CacheIgnoreHeaders</code> ¤ò <code>None</code>
-    ¤ËÀßÄê¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã 1</h3><p><code>
-      CacheIgnoreHeaders Set-Cookie
-    </code></p></div>
-
-    <div class="example"><h3>Îã 2</h3><p><code>
-      CacheIgnoreHeaders None
-    </code></p></div>
-
-    <div class="warning"><h3>·Ù¹ð:</h3>
-      <code>Expires</code> ¤Î¤è¤¦¤ÊŬÀڤΥ­¥ã¥Ã¥·¥å´ÉÍý¤Î¤¿¤á¤ËɬÍפÊ
-      ¥Ø¥Ã¥À¤¬ <code class="directive">CacheIgnoreHeaders</code> ¤ÎÀßÄê¤Ë¤è¤ê
-      Êݴɤµ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Ï¡¢mod_cache ¤ÎÆ°ºî¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
-    </div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CacheIgnoreNoLastMod" id="CacheIgnoreNoLastMod">CacheIgnoreNoLastMod</a> <a name="cacheignorenolastmod" id="cacheignorenolastmod">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>±þÅú¤Ë Last Modified ¤¬Ìµ¤¯¤Æ¤âµ¤¤Ë¤·¤Ê¤¤¤è¤¦¤Ë¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CacheIgnoreNoLastMod On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>CacheIgnoreNoLastMod Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_cache</td></tr>
-</table>
-    <p>Ä̾Last-Modified ¤Ë¤è¤ëºÇ½ª½¤Àµ»þ¹ï¤Î̵¤¤¥É¥­¥å¥á¥ó¥È¤Ï¥­¥ã¥Ã¥·¥å
-    ¤µ¤ì¤Þ¤»¤ó¡£(Î㤨¤Ð <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> ¤Ë¤è¤ë½èÍý¤Î¤È¤­¤Ê¤É¤Ë)
-    Last-Modified »þ¹ï¤¬¾Ãµî¤µ¤ì¤¿¤ê¡¢¤½¤â¤½¤âºÇ½é¤«¤éÄ󶡤µ¤ì¤Æ¤¤¤Ê¤¤
-    ¾õ¶·¤¬¤¢¤ê¤Þ¤¹¡£<code class="directive">CacheIgnoreNoLastMod</code> 
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¦¤È¡¢Last-Modified Æü»þ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤
-    ¥É¥­¥å¥á¥ó¥È¤Ç¤â¥­¥ã¥Ã¥·¥å¤¹¤ë¤è¤¦¤Ë»ØÄê¤Ç¤­¤Þ¤¹¡£¥É¥­¥å¥á¥ó¥È¤Ë
-    ºÇ½ª½¤Àµ»þ¹ï (Last-Modified) Í­¸ú´ü¸Â (expiry) ¤¬¤Ê¤¤¾ì¹ç¤Ï¡¢Í­¸ú´ü¸Â¤Î
-    À¸À®¤Ë <code class="directive">CacheDefaultExpire</code> ¤¬»È¤ï¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      CacheIgnoreNoLastMod On
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CacheLastModifiedFactor" id="CacheLastModifiedFactor">CacheLastModifiedFactor</a> <a name="cachelastmodifiedfactor" id="cachelastmodifiedfactor">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>LastModified ¤ÎÆüÉդ˴ð¤Å¤¤¤ÆÍ­¸ú´ü¸Â (expiry) 
-¤ò·×»»¤¹¤ë¤¿¤á¤Î½Å¤ß¤ò»ØÄꤹ¤ë
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CacheLastModifiedFactor <var>float</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>CacheLastModifiedFactor 0.1</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_cache</td></tr>
-</table>
-    <p>¥É¥­¥å¥á¥ó¥È¤Ë Last-Modified ¤ÎÆüÉÕ¤¬Ìµ¤¤¤±¤ì¤É¤âÍ­¸ú´ü¸Â (expiry) 
-    ¤ÎÆüÉÕ¤¬¤¢¤ë¤È¤¤¤¦¤È¤­¤Ë¡¢Í­¸ú´ü¸Â¤òºÇ½ª½¤Àµ»þ¹ï¤«¤é¤Î·Ð²á»þ´Ö¤È¤·¤Æ
-    ·×»»¤¹¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£Í­¸ú´ü¸Â¤ò¼¡¤Î·×»»¼°¤Ë½¾¤Ã¤ÆÀ¸À®¤¹¤ë¤Î¤Ç¤¹¤¬¡¢
-    ¤½¤Î¤È¤­¤Ë»È¤ï¤ì¤ë <var>factor</var> ¤ò
-    <code class="directive">CacheLastModifiedFactor</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤷ¤Þ¤¹¡£
-    </p>
-
-    <p><code>expiry-period = time-since-last-modified-date * <var>factor</var>
-    expiry-date = current-date + expiry-period</code></p>
-
-    <p>Î㤨¤Ð¡¢¥É¥­¥å¥á¥ó¥È¤¬ 10 »þ´ÖÁ°¤ËºÇ¸å¤Ë½¤Àµ¤µ¤ì¤Æ¤¤¤Æ¡¢
-    <var>factor</var> ¤¬ 0.1 ¤Ç¤¢¤ì¤Ð¡¢´üÆü¤Ï 10*0.1 = 1 »þ´Ö¤Ë
-    ÀßÄꤵ¤ì¤Þ¤¹¡£¸½ºß»þ¹ï¤¬ 3:00pm ¤Ç¤¢¤ì¤Ð¡¢·×»»¤µ¤ì¤¿´üÆü¤Ï
-    3:00pm + 1hour = 4:00pm ¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p>´üÆü¤¬ <code class="directive">CacheMaxExpire</code> ¤ÇÀßÄꤵ¤ì¤Æ¤¤¤ëÃÍ
-    ¤è¤êÂ礭¤¯¤Ê¤Ã¤Æ¤·¤Þ¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢<code class="directive">CacheMaxExpire</code>
-    ¤ÎÀßÄêÃͤ¬Í¥À褵¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      CacheLastModifiedFactor 0.5
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CacheMaxExpire" id="CacheMaxExpire">CacheMaxExpire</a> <a name="cachemaxexpire" id="cachemaxexpire">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥É¥­¥å¥á¥ó¥È¤ò¥­¥ã¥Ã¥·¥å¤¹¤ëºÇÂç»þ´Ö¤òÉÿô¤Ç¸½¤·¤¿¤â¤Î</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CacheMaxExpire <var>seconds</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>CacheMaxExpire 86400 (°ìÆü)</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_cache</td></tr>
-</table>
-    <p><code class="directive">CacheMaxExpire</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥­¥ã¥Ã¥·¥å¤¹¤ë HTTP ¥É¥­¥å¥á¥ó¥È¤ò¡¢¸µ¤Î¥µ¡¼¥Ð¤ËÌ䤤¹ç¤ï¤»¤Ê¤¤¤Þ¤ÞºÇÂ粿ÉÃ
-    ÊÝ»ý¤·¤Æ¤â¤è¤¤¤«¤ò»ØÄꤷ¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¥É¥­¥å¥á¥ó¥È¤ÏºÇÂç¤Ç¤³¤ÎÉÿô´Ö¤Ö¤ó¸Å¤¯
-    ¤Ê¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤ÎºÇÂçÃͤϡ¢(ÌõÃí:¥ì¥¹¥Ý¥ó¥¹Ãæ¤Ç)¥É¥­¥å¥á¥ó¥È¤È¶¦¤Ë
-    ¥É¥­¥å¥á¥ó¥È¤Î´üÆü¤¬Ä󶡤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ç¤âŬÍѤµ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      CacheMaxExpire 604800
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CacheStoreNoStore" id="CacheStoreNoStore">CacheStoreNoStore</a> <a name="cachestorenostore" id="cachestorenostore">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>no-store ¤È»ØÄꤵ¤ì¤Æ¤¤¤ë¥ì¥¹¥Ý¥ó¥¹¤Î¥­¥ã¥Ã¥·¥å¤ò»î¤ß¤ë¡£</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CacheStoreNoStore On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>CacheStoreNoStore Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_cache</td></tr>
-</table>
-    <p>Ä̾ï Cache-Control: no-store ¥Ø¥Ã¥À¤Î¤Ä¤¤¤Æ¤¤¤ë¥ì¥¹¥Ý¥ó¥¹¤Ï
-       ¥­¥ã¥Ã¥·¥å¤µ¤ì¤Þ¤»¤ó¡£<code class="directive">CacheStoreNoCache</code> 
-       ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤³¤ÎµóÆ°¤ò¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£
-       <code class="directive">CacheStoreNoCache</code> On ¤Ç no-store ¥Ø¥Ã¥À¤Î¤Ä¤¤¤Æ¤¤¤ë
-       ¥ê¥½¡¼¥¹¤ËÂФ·¤Æ¤â¥­¥ã¥Ã¥·¥å¤ò»î¤ß¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-       ¤¿¤À¤·Ç§¾Ú¤Îµá¤á¤é¤ì¤ë¥ê¥½¡¼¥¹¤Ï <em>·è¤·¤Æ</em> ¥­¥ã¥Ã¥·¥å¤µ¤ì¤Þ¤»¤ó¡£</p>
-
-    <div class="example"><p><code>
-      CacheStoreNoStore On
-    </code></p></div>
-
-    <div class="warning"><h3>·Ù¹ð:</h3>
-       RFC 2616 ¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë no-store ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-       "ÉÔÃí°Õ¤Ë¤è¤ëµ¡Ì©¾ðÊó¤Îϳ±Ì¤ä»Äα (¥Ð¥Ã¥¯¥¢¥Ã¥×¥Æ¡¼¥×Åù) ¤òËɤ°"
-       ÌÜŪ¤Ç»È¤ï¤ì¤Þ¤¹¤¬¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤òÍ­¸ú¤Ë¤¹¤ë¤È¡¢
-       µ¡Ì©¾ðÊó¤òÊÝ»ý¤¹¤ë¤³¤È¤Ë¤Ê¤Ã¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
-       ¤Ç¤¹¤Î¤Ç¡¢¤³¤³¤Ç·Ù¹ð¤·¤Æ¤ª¤­¤Þ¤¹¡£
-    </div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#cacheignorecachecontrol">CacheIgnoreCacheControl</a></code></li>
-<li><code class="directive"><a href="#cachestoreprivate">CacheStorePrivate</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CacheStorePrivate" id="CacheStorePrivate">CacheStorePrivate</a> <a name="cachestoreprivate" id="cachestoreprivate">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>private ¤È»ØÄꤵ¤ì¤Æ¤¤¤ë¥ì¥¹¥Ý¥ó¥¹¤Î¥­¥ã¥Ã¥·¥å¤ò»î¤ß¤ë¡£</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CacheStorePrivate On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>CacheStorePrivate Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_cache</td></tr>
-</table>
-    <p>Ä̾ï Cache-Control: private ¥Ø¥Ã¥À¤Î¤Ä¤¤¤Æ¤¤¤ë¥ì¥¹¥Ý¥ó¥¹¤Ï
-       ¥­¥ã¥Ã¥·¥å¤µ¤ì¤Þ¤»¤ó¡£<code class="directive">CacheStorePrivate</code> 
-       ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤³¤ÎµóÆ°¤ò¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£
-       <code class="directive">CacheStorePrivate</code> On ¤Ç private ¥Ø¥Ã¥À¤Î¤Ä¤¤¤Æ¤¤¤ë
-       ¥ê¥½¡¼¥¹¤ËÂФ·¤Æ¤â¥­¥ã¥Ã¥·¥å¤ò»î¤ß¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-       ¤¿¤À¤·Ç§¾Ú¤Îµá¤á¤é¤ì¤ë¥ê¥½¡¼¥¹¤Ï <em>·è¤·¤Æ</em> ¥­¥ã¥Ã¥·¥å¤µ¤ì¤Þ¤»¤ó¡£</p>
-
-    <div class="example"><p><code>
-      CacheStorePrivate On
-    </code></p></div>
-
-    <div class="warning"><h3>·Ù¹ð:</h3>
-       ¾åή¥µ¡¼¥Ð¤¬¥­¥ã¥Ã¥·¥å¤·¤Ê¤¤¤è¤¦¤Ë»ØÄꤷ¤Æ¤­¤Æ¤â¡¢
-       ¤½¤ì¤ò̵»ë¤·¤Æ¥­¥ã¥Ã¥·¥å¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-       ˾¤Þ¤·¤¤µóÆ°¤Ë¤Ê¤ë¤Î¤Ï¡¢ËÜÅö¤Ë 'private' ¤Ê¥­¥ã¥Ã¥·¥å¤Ë¤Ä¤¤¤Æ¤Î¤ß¤Ç¤·¤ç¤¦¡£
-    </div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#cacheignorecachecontrol">CacheIgnoreCacheControl</a></code></li>
-<li><code class="directive"><a href="#cachestorenostore">CacheStoreNoStore</a></code></li>
-</ul>
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_cache.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cache.html.ja.utf8 b/docs/manual/mod/mod_cache.html.ja.utf8
new file mode 100644
index 00000000..3e1b4a31
--- /dev/null
+++ b/docs/manual/mod/mod_cache.html.ja.utf8
@@ -0,0 +1,469 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_cache - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_cache</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_cache.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>URI をキー���コンテンツ�キャッシュ</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>cache_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_cache.c</td></tr></table>
+<h3>概�</h3>
+
+    <div class="warning">使用方法�����注��る必���り�
+    <code class="directive"><a href="../mod/mod_authz_host.html#allow">Allow</a></code> ã‚„
+    <code class="directive"><a href="../mod/mod_authz_host.html#deny">Deny</a></code> 
+    ディレクティブを迂回�る設定も��������。
+    ホスト�やアドレスや環境変数�基���クライアント�ら�
+    アクセスを制����場���キャッシュ機能を有効������
+    �り��ん。</div>
+
+    <p><code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> �ローカル�コンテンツやプロキシ�れ�
+    コンテンツをキャッシュ�る���使�れる <a href="http://www.ietf.org/rfc/rfc2616.txt">RFC 2616</a> 準拠�
+    HTTP コンテンツキャッシュを実装�����。<code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>
+    �動作��ストレージを管��るモジュール�必���。標準
+    Apache �布��二�ストレージ管�モジュール���れ����:</p>
+    
+    <dl>
+    <dt><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code></dt>
+    <dd>ディスクを使用��ストレージ管�機構を実装�����。</dd>
+
+    <dt><code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code></dt>
+    <dd>メモリを使用��ストレージ管�機構を実装�����。
+    <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> �次�二��モード���ら��動作�る
+    よ��設定����: オープン�れ��るファイル記述�をキャッシュ�るモード��
+    ヒープ上��オブジェクト�自体をキャッシュを�るモード��。
+    <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> �ローカル�生��れるコンテンツや�
+    <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> �
+    <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code> を使��設定�れ��る
+    ��� (��り<dfn>リ�ースプロキシ</dfn> ��) �ックエンドサー��
+    コンテンツをキャッシュ�る��使���。</dd>
+    </dl>
+
+    <p>コンテンツ�キャッシュ���存��得� URI �基���キー�使�れ��。
+    アクセス�護���られ��るコンテンツ�キャッシュ�れ��ん。</p>
+    <p>詳細や解説�例�����
+    <a href="../caching.html">Caching Guide</a> を�照��下��。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#cachedefaultexpire">CacheDefaultExpire</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachedisable">CacheDisable</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cacheenable">CacheEnable</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cacheignorecachecontrol">CacheIgnoreCacheControl</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cacheignoreheaders">CacheIgnoreHeaders</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cacheignorenolastmod">CacheIgnoreNoLastMod</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachelastmodifiedfactor">CacheLastModifiedFactor</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachemaxexpire">CacheMaxExpire</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachestorenostore">CacheStoreNoStore</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachestoreprivate">CacheStorePrivate</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#related">関連モジュール�ディレクティブ</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#sampleconf">サンプル設定</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><a href="../caching.html">Caching Guide</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="related" id="related">関連モジュール�ディレクティブ</a></h2>
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code></li><li><code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_disk_cache.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachesize">MCacheSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></code></li><li><code class="directive"><a href="../mod/mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer</a></code></li></ul></td></tr></table>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="sampleconf" id="sampleconf">サンプル設定</a></h2>
+    <div class="example"><h3>Sample httpd.conf</h3><p><code>
+      #<br />
+      # Sample Cache Configuration<br />
+      #<br />
+      LoadModule cache_module modules/mod_cache.so<br />
+      <br />
+      &lt;IfModule mod_cache.c&gt;<br />
+      <span class="indent">
+        #LoadModule disk_cache_module modules/mod_disk_cache.so<br />
+        # If you want to use mod_disk_cache instead of mod_mem_cache,<br />
+        # uncomment the line above and comment out the LoadModule line below.<br />
+        &lt;IfModule mod_disk_cache.c&gt;<br />
+        <span class="indent">
+          CacheRoot c:/cacheroot<br />
+          CacheEnable disk  /<br />
+          CacheDirLevels 5<br />
+          CacheDirLength 3<br />
+        </span>
+        &lt;/IfModule&gt; <br />
+        <br />
+        LoadModule mem_cache_module modules/mod_mem_cache.so<br />
+        &lt;IfModule mod_mem_cache.c&gt;<br />
+        <span class="indent">
+          CacheEnable mem  /<br />
+          MCacheSize 4096<br />
+          MCacheMaxObjectCount 100<br />
+          MCacheMinObjectSize 1<br />
+          MCacheMaxObjectSize 2048<br />
+        </span>
+        &lt;/IfModule&gt;<br />
+        <br />
+        # When acting as a proxy, don't cache the list of security updates<br />
+        CacheDisable http://security.update.server/update-list/<br />
+      </span>
+      &lt;/IfModule&gt;
+    </code></p></div>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheDefaultExpire" id="CacheDefaultExpire">CacheDefaultExpire</a> <a name="cachedefaultexpire" id="cachedefaultexpire">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>期日�指定�れ�������ドキュメントをキャッシュ�るデフォルト�期間</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheDefaultExpire <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>CacheDefaultExpire 3600 (1時間)</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_cache</td></tr>
+</table>
+    <p><code class="directive">CacheDefaultExpire</code> ディレクティブ��ドキュメント�
+    有効期� (expiry) や最終修正時刻 (last-modified) �指定�れ����場��
+    デフォルト�時間を指定���。<code class="directive">CacheMaxExpire</code> 
+    ディレクティブ�指定�れ�値���設定を上書�<em>���ん</em>。</p>
+
+    <div class="example"><p><code>
+      CacheDefaultExpire 86400
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheDisable" id="CacheDisable">CacheDisable</a> <a name="cachedisable" id="cachedisable">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>特定� URL をキャッシュ���</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheDisable <var> url-string</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_cache</td></tr>
+</table>
+    <p><code class="directive">CacheDisable</code> ディレクティブ�
+    <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> モジュール� <var>url-string</var> 以下�
+    URL をキャッシュ<em>���</em>よ�����。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      CacheDisable /local_files
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheEnable" id="CacheEnable">CacheEnable</a> <a name="cacheenable" id="cacheenable">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>指定��ストレージ管�方�を使���キャッシュを有効��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheEnable <var>cache_type</var> <var>url-string</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_cache</td></tr>
+</table>
+    <p><code class="directive">CacheEnable</code> ディレクティブ� <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> 
+    モジュール� <var>url-string</var> 以下� URL をキャッシュ�るよ�����。
+    キャッシュストレージ管�方�� <var>cache_type</var> 引数�指定���。
+    <var>cache_type</var> <code> mem</code> ��
+    <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> �実装�れ��るメモリを使��ストレージ
+    管�方�を使�よ�� <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> �指示���。
+    <var>cache_type</var> <code>disk</code> ��
+    <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> �実装�れ��るディスクを使��ストレージ
+    管�を使�よ�� <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> �指示���。
+    <var>cache_type</var> <code>fd</code> � <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> �
+    <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> �より実装�れ��るファイル記述��
+    キャッシュを使�よ��指示���。</p>
+
+    <p>(下�例�よ��) <code class="directive">CacheEnable</code> ディレクティブ�
+    URL 空間��複���る����該当�るストレージ方�を順�試���
+    実際�リクエスト�処����る����方��処����。
+    ストレージ管�方��実行�れる順番�設定ファイル中�
+    <code class="directive">CacheEnable</code> �順番�より決定�れ��。</p>
+
+    <div class="example"><p><code>
+      CacheEnable  mem   /manual<br />
+      CacheEnable  fd    /images<br />
+      CacheEnable  disk  /<br />
+    </code></p></div>
+
+    <p>フォワードプロクシサー����動作��る場���
+    <var>url-string</var> �リモートサイト�プロクシ�るプロトコルを
+    指定���何�対��キャッシュを有効��る�指定�る��も����。</p>
+ 
+    <div class="example"><p><code>
+      # Cache proxied url's<br />
+      CacheEnable  disk  /<br /><br />
+      # Cache FTP-proxied url's<br />
+      CacheEnable  disk  ftp://<br /><br />
+      # Cache content from www.apache.org<br />
+      CacheEnable  disk  http://www.apache.org/<br />
+    </code></p></div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheIgnoreCacheControl" id="CacheIgnoreCacheControl">CacheIgnoreCacheControl</a> <a name="cacheignorecachecontrol" id="cacheignorecachecontrol">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>キャッシュ�れ��るコンテンツを返���よ��クライアント�ら
+リクエスト�れ�も無視�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheIgnoreCacheControl On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>CacheIgnoreCacheControl Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_cache</td></tr>
+</table>
+    <p>Cache-Control: no-cache ヘッダや Pragma: no-store ヘッダ��るリクエスト�
+    対����通常キャッシュを使���ん。<code class="directive">CacheIgnoreCacheControl</code> 
+    ディレクティブを使�����動作を上書�����。
+    <code class="directive">CacheIgnoreCacheControl</code> On ��る��
+    リクエスト� no-cache ���値����も�キャッシュを使��ドキュメントを
+    返�よ���り��。�証を必���るドキュメント�<em>決��</em>
+    キャッシュ�れ��ん。</p>
+
+    <div class="example"><p><code>
+      CacheIgnoreCacheControl On
+    </code></p></div>
+
+    <div class="warning"><h3>警告</h3>
+       ��ディレクティブを使���ドキュメント�得時�キャッシュを使���よ��
+       クライアント�リクエスト���る�も���ら��キャッシュを
+       使�よ���り��。���果�
+       ��コンテンツ��られ続�る����������も�れ��ん。
+    </div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#cachestoreprivate">CacheStorePrivate</a></code></li>
+<li><code class="directive"><a href="#cachestorenostore">CacheStoreNoStore</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheIgnoreHeaders" id="CacheIgnoreHeaders">CacheIgnoreHeaders</a> <a name="cacheignoreheaders" id="cacheignoreheaders">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>指定�れ� HTTP ヘッダをキャッシュ��存���。
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheIgnoreHeaders <var>header-string</var> [<var>header-string</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>CacheIgnoreHeaders None</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_cache</td></tr>
+</table>
+    <p>RFC 2616 �よる��hop-by-hop HTTP ヘッダ�キャッシュ���管�れ��ん。
+    以下�ヘッダ� hop-by-hop ヘッダ�該当������
+    <code class="directive">CacheIgnoreHeaders</code>
+    �設定�<em>関係��</em>キャッシュ���管�れ��ん:</p>
+    <ul>
+      <li><code>Connection</code></li>
+      <li><code>Keep-Alive</code></li>
+      <li><code>Proxy-Authenticate</code></li>
+      <li><code>Proxy-Authorization</code></li>
+      <li><code>TE</code></li>
+      <li><code>Trailers</code></li>
+      <li><code>Transfer-Encoding</code></li>
+      <li><code>Upgrade</code></li>
+    </ul>
+
+    <p><code class="directive">CacheIgnoreHeaders</code> �
+    キャッシュ��管���追加� HTTP ヘッダを指定���。
+    例���クッキーをキャッシュ��管���よ����方�よ�場�も
+    �る��ょ�。</p>
+
+    <p><code class="directive">CacheIgnoreHeaders</code> �引数��
+    キャッシュ��管��� HTTP ヘッダを空白区切り���リスト形���。
+    キャッシュ��管���ヘッダ� hop-by-hop ヘッダ���場�
+    (RFC 2616 準拠�動作���) ��
+    <code class="directive">CacheIgnoreHeaders</code> ã‚’ <code>None</code>
+    �設定����。</p>
+
+    <div class="example"><h3>例 1</h3><p><code>
+      CacheIgnoreHeaders Set-Cookie
+    </code></p></div>
+
+    <div class="example"><h3>例 2</h3><p><code>
+      CacheIgnoreHeaders None
+    </code></p></div>
+
+    <div class="warning"><h3>警告:</h3>
+      <code>Expires</code> �よ���切�キャッシュ管�����必��
+      ヘッダ� <code class="directive">CacheIgnoreHeaders</code> �設定�より
+      �管�れ��������mod_cache �動作�定義�れ����ん。
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheIgnoreNoLastMod" id="CacheIgnoreNoLastMod">CacheIgnoreNoLastMod</a> <a name="cacheignorenolastmod" id="cacheignorenolastmod">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>応答� Last Modified �無��も気����よ���る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheIgnoreNoLastMod On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>CacheIgnoreNoLastMod Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_cache</td></tr>
+</table>
+    <p>通常�Last-Modified �よる最終修正時刻�無�ドキュメント�キャッシュ
+    �れ��ん。(例�� <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> �よる処�������)
+    Last-Modified 時刻�消去�れ�り��も�も最��ら�供�れ����
+    状���り��。<code class="directive">CacheIgnoreNoLastMod</code> 
+    ディレクティブを使���Last-Modified 日時�指定�れ����
+    ドキュメント�もキャッシュ�るよ��指定����。ドキュメント�
+    最終修正時刻 (Last-Modified) 有効期� (expiry) ���場���有効期��
+    生�� <code class="directive">CacheDefaultExpire</code> �使�れ��。</p>
+
+    <div class="example"><p><code>
+      CacheIgnoreNoLastMod On
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheLastModifiedFactor" id="CacheLastModifiedFactor">CacheLastModifiedFactor</a> <a name="cachelastmodifiedfactor" id="cachelastmodifiedfactor">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>LastModified �日付�基���有効期� (expiry) 
+を計算�る�����を指定�る
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheLastModifiedFactor <var>float</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>CacheLastModifiedFactor 0.1</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_cache</td></tr>
+</table>
+    <p>ドキュメント� Last-Modified �日付�無��れ�も有効期� (expiry) 
+    �日付��る�������有効期�を最終修正時刻�ら�経�時間���
+    計算�るよ������。有効期�を次�計算��従��生��る�����
+    �����使�れる <var>factor</var> を
+    <code class="directive">CacheLastModifiedFactor</code> ディレクティブ�指定���。
+    </p>
+
+    <p><code>expiry-period = time-since-last-modified-date * <var>factor</var>
+    expiry-date = current-date + expiry-period</code></p>
+
+    <p>例���ドキュメント� 10 時間��最後�修正�れ����
+    <var>factor</var> � 0.1 ��れ��期日� 10*0.1 = 1 時間�
+    設定�れ��。�在時刻� 3:00pm ��れ��計算�れ�期日�
+    3:00pm + 1hour = 4:00pm ��り��。</p>
+
+    <p>期日� <code class="directive">CacheMaxExpire</code> �設定�れ��る値
+    より大����������る場���<code class="directive">CacheMaxExpire</code>
+    �設定値�優先�れ��。</p>
+
+    <div class="example"><p><code>
+      CacheLastModifiedFactor 0.5
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheMaxExpire" id="CacheMaxExpire">CacheMaxExpire</a> <a name="cachemaxexpire" id="cachemaxexpire">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ドキュメントをキャッシュ�る最大時間を秒数�表��も�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheMaxExpire <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>CacheMaxExpire 86400 (一日)</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_cache</td></tr>
+</table>
+    <p><code class="directive">CacheMaxExpire</code> ディレクティブ��
+    キャッシュ�る HTTP ドキュメントを�元�サー�����������最大何秒
+    ����もよ��を指定���。��り�ドキュメント�最大���秒数間�ん��
+    �る����り��。��最大値��(訳注:レス�ンス中�)ドキュメント�共�
+    ドキュメント�期日��供�れ��る場��も�用�れ��。</p>
+
+    <div class="example"><p><code>
+      CacheMaxExpire 604800
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheStoreNoStore" id="CacheStoreNoStore">CacheStoreNoStore</a> <a name="cachestorenostore" id="cachestorenostore">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>no-store �指定�れ��るレス�ンス�キャッシュを試�る。</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheStoreNoStore On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>CacheStoreNoStore Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_cache</td></tr>
+</table>
+    <p>通常 Cache-Control: no-store ヘッダ�����るレス�ンス�
+       キャッシュ�れ��ん。<code class="directive">CacheStoreNoCache</code> 
+       ディレクティブ���挙動を上書�����。
+       <code class="directive">CacheStoreNoCache</code> On � no-store ヘッダ�����る
+       リソース�対��もキャッシュを試�るよ���り��。
+       ����証�求�られるリソース� <em>決��</em> キャッシュ�れ��ん。</p>
+
+    <div class="example"><p><code>
+      CacheStoreNoStore On
+    </code></p></div>
+
+    <div class="warning"><h3>警告:</h3>
+       RFC 2616 �記載�れ��るよ�� no-store ディレクティブ��
+       "�注��よる機密情報��洩や残留 (�ックアップテープ等) を防�"
+       目的�使�れ������オプションを有効��る��
+       機密情報を���る�����������。
+       ��������警告������。
+    </div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#cacheignorecachecontrol">CacheIgnoreCacheControl</a></code></li>
+<li><code class="directive"><a href="#cachestoreprivate">CacheStorePrivate</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheStorePrivate" id="CacheStorePrivate">CacheStorePrivate</a> <a name="cachestoreprivate" id="cachestoreprivate">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>private �指定�れ��るレス�ンス�キャッシュを試�る。</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheStorePrivate On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>CacheStorePrivate Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_cache</td></tr>
+</table>
+    <p>通常 Cache-Control: private ヘッダ�����るレス�ンス�
+       キャッシュ�れ��ん。<code class="directive">CacheStorePrivate</code> 
+       ディレクティブ���挙動を上書�����。
+       <code class="directive">CacheStorePrivate</code> On � private ヘッダ�����る
+       リソース�対��もキャッシュを試�るよ���り��。
+       ����証�求�られるリソース� <em>決��</em> キャッシュ�れ��ん。</p>
+
+    <div class="example"><p><code>
+      CacheStorePrivate On
+    </code></p></div>
+
+    <div class="warning"><h3>警告:</h3>
+       上�サー��キャッシュ���よ��指定����も�
+       �れを無視��キャッシュ�るよ���り��。
+       望���挙動��る���本当� 'private' �キャッシュ��������ょ�。
+    </div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#cacheignorecachecontrol">CacheIgnoreCacheControl</a></code></li>
+<li><code class="directive"><a href="#cachestorenostore">CacheStoreNoStore</a></code></li>
+</ul>
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_cache.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cache.html.ko.euc-kr b/docs/manual/mod/mod_cache.html.ko.euc-kr
index 3bee9cfc..0ba9b13d 100644
--- a/docs/manual/mod/mod_cache.html.ko.euc-kr
+++ b/docs/manual/mod/mod_cache.html.ko.euc-kr
@@ -342,6 +342,6 @@
 <a href="../ja/mod/mod_cache.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_cache.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cern_meta.html b/docs/manual/mod/mod_cern_meta.html
index a0a4d49c..65878639 100644
--- a/docs/manual/mod/mod_cern_meta.html
+++ b/docs/manual/mod/mod_cern_meta.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_cern_meta.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_cern_meta.html.en b/docs/manual/mod/mod_cern_meta.html.en
index 5a102dab..c0fc0a4c 100644
--- a/docs/manual/mod/mod_cern_meta.html.en
+++ b/docs/manual/mod/mod_cern_meta.html.en
@@ -123,6 +123,6 @@ meta information</td></tr>
 <p><span>Available Languages: </span><a href="../en/mod/mod_cern_meta.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_cern_meta.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cern_meta.html.ko.euc-kr b/docs/manual/mod/mod_cern_meta.html.ko.euc-kr
index fac88855..4120b161 100644
--- a/docs/manual/mod/mod_cern_meta.html.ko.euc-kr
+++ b/docs/manual/mod/mod_cern_meta.html.ko.euc-kr
@@ -115,6 +115,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/mod_cern_meta.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_cern_meta.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cgi.html b/docs/manual/mod/mod_cgi.html
index 7970a36c..f57e574b 100644
--- a/docs/manual/mod/mod_cgi.html
+++ b/docs/manual/mod/mod_cgi.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_cgi.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_cgi.html.ja.euc-jp
+URI: mod_cgi.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_cgi.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_cgi.html.en b/docs/manual/mod/mod_cgi.html.en
index a2696776..a5e9b510 100644
--- a/docs/manual/mod/mod_cgi.html.en
+++ b/docs/manual/mod/mod_cgi.html.en
@@ -239,6 +239,6 @@ in the scriptlog</td></tr>
 <a href="../ja/mod/mod_cgi.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_cgi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cgi.html.ja.euc-jp b/docs/manual/mod/mod_cgi.html.ja.euc-jp
deleted file mode 100644
index 583a312f..00000000
--- a/docs/manual/mod/mod_cgi.html.ja.euc-jp
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_cgi - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_cgi</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_cgi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_cgi.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_cgi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>CGI ¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>cgi_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_cgi.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    
-
-    <p>Mime ¥¿¥¤¥×¤¬ <code>application/x-httpd-cgi</code> 
-    ¤Ç¤¢¤ë¤«¡¢¥Ï¥ó¥É¥é <code>cgi-script</code> (Apache 1.1 °Ê¹ß)
-    ¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Ï CGI ¥¹¥¯¥ê¥×¥È¤È¤·¤Æ°·¤ï¤ì¡¢
-    ¥µ¡¼¥Ð¤Ë¤è¤ê¼Â¹Ô¤µ¤ì¡¢¤½¤Î½ÐÎϤ¬¥¯¥é¥¤¥¢¥ó¥È¤ËÊÖ¤µ¤ì¤Þ¤¹¡£
-    ¥Õ¥¡¥¤¥ë¤Ï¡¢<code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë»ØÄꤵ¤ì¤¿ ³ÈÄ¥»Ò¤ò̾Á°¤Ë´Þ¤à¤«¡¢
-    <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
-    ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¸ºß¤¹¤ë¤³¤È¤Ë¤è¤ê¤³¤Î¥¿¥¤¥×¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p>¥µ¡¼¥Ð¤¬ CGI ¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤¹¤ë¤È¤­¤Ë¤Ï¡¢
-    <code>DOCUMENT_ROOT</code>
-    ¤È¸Æ¤Ð¤ì¤ëÊÑ¿ô¤ò´Ä¶­¤ËÄɲä·¤Þ¤¹¡£¤³¤ÎÊÑ¿ô¤Ï
-    <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
-    ¤ÎÃͤòÊÝ»ý¤·¤Þ¤¹¡£</p>
-
-    <p>Apache ¤Ç CGI ¥¹¥¯¥ê¥×¥È¤ò»ÈÍѤ¹¤ë¤¿¤á¤Î¥¤¥ó¥È¥í¥À¥¯¥·¥ç¥ó¤Ï¡¢
-    <a href="../howto/cgi.html">CGI ¤Ë¤è¤ëưŪ¥³¥ó¥Æ¥ó¥Ä</a>
-    ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>Unix ¤Ç¥Þ¥ë¥Á¥¹¥ì¥Ã¥É¤Î MPM ¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤³¤Î¥â¥¸¥å¡¼¥ë¤Î
-    Âå¤ï¤ê¤Ë <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code> ¤ò»È¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
-    ¥æ¡¼¥¶¥ì¥Ù¥ë¤Ç¤Ï¤³¤ÎÆó¤Ä¤Î¥â¥¸¥å¡¼¥ë¤ÏËܼÁŪ¤Ë¤ÏƱ°ì¤Ç¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#scriptlog">ScriptLog</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#scriptlogbuffer">ScriptLogBuffer</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#scriptloglength">ScriptLogLength</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#env">CGI ´Ä¶­ÊÑ¿ô</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cgi-debug">CGI ¤Î¥Ç¥Ð¥Ã¥°</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li>
-<li><code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li>
-<li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li>
-<li><a href="../suexec.html">CGI ¥×¥í¥°¥é¥à¤òÊ̤Υ桼¥¶ ID ¤Ç¼Â¹Ô¤¹¤ë</a></li>
-<li><a href="http://hoohoo.ncsa.uiuc.edu/cgi/">CGI µ¬³Ê½ñ</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="env" id="env">CGI ´Ä¶­ÊÑ¿ô</a></h2>
-    <p>¥µ¡¼¥Ð¤Ï <a href="http://hoohoo.ncsa.uiuc.edu/cgi/">CGI
-    µ¬³Ê</a> ¤Ç·è¤á¤é¤ì¤Æ¤¤¤ë CGI
-    ´Ä¶­ÊÑ¿ô¤òÀßÄꤷ¤Þ¤¹¡£°Ê²¼¤Î¤â¤Î¤Ï¡¢¾ò·ïÉÕ¤­¤ÇÀßÄꤵ¤ì¤Þ¤¹¡£</p>
-
-    <dl>
-      <dt>PATH_INFO</dt>
-
-      <dd>¤³¤ì¤Ï <code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬ÌÀ¼¨Åª¤Ë <code>off</code>
-      ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤ÏÀßÄꤵ¤ì¤Þ¤»¤ó¡£¥Ç¥Õ¥©¥ë¥È¤Î¡¢
-      <code class="directive">AcceptPathInfo</code> ¤¬
-      »ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Î¿¶¤ëÉñ¤¤¤Ç¤Ï¡¢<code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> ¤Ï¥Ñ¥¹¾ðÊó
-      (URI ¤Î¥¹¥¯¥ê¥×¥È¤Î¥Õ¥¡¥¤¥ë̾¤Î¸å¤Ë³¤¯ <code>/more/path/info</code>) ¤ò
-      ¼õ¤±ÉÕ¤±¤Þ¤¹¤¬¡¢¥³¥¢¤Ï¥µ¡¼¥Ð¤Ï¥Ñ¥¹¾ðÊó¤Î¤¢¤ë¥ê¥¯¥¨¥¹¥È¤Ë
-      ÂФ·¤Æ 404 NOT FOUND ¥¨¥é¡¼¤òÊÖ¤·¤Þ¤¹¡£<code class="directive">AcceptPathInfo</code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-      ¾Êά¤¹¤ë¤È¡¢<code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> ¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ
-      <code>On</code> ¤ò
-      ÀßÄꤷ¤¿¤Î¤ÈƱ¤¸¸ú²Ì¤Ë¤Ê¤ê¤Þ¤¹¡£</dd>
-
-      <dt>REMOTE_HOST</dt>
-
-      <dd><code class="directive"><a href="../mod/core.html#hostnamelookups">HostnameLookups</a></code>
-      ¤¬ <code>on</code> (¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï off ¤Ç¤¹)
-      ¤Ç¡¢¥¢¥¯¥»¥¹¤·¤Æ¤¤¤ë¥Û¥¹¥È¤Î¥¢¥É¥ì¥¹¤Î DNS
-      ¤ÎµÕ°ú¤­¤¬¼ÂºÝ¤Ë¥Û¥¹¥È̾¤ò¸«¤Ä¤±¤¿¤È¤­¤Ë¤Î¤ßÀßÄꤵ¤ì¤Þ¤¹¡£</dd>
-
-      <dt>REMOTE_IDENT</dt>
-
-      <dd><code class="directive"><a href="../mod/core.html#identitycheck">IdentityCheck</a></code>
-      ¤¬ <code>on</code> ¤ËÀßÄꤵ¤ì¤Æ¤¤¤Æ¡¢¥¢¥¯¥»¥¹¤·¤Æ¤¤¤ë¥Û¥¹¥È¤¬
-      ident ¥×¥í¥È¥³¥ë¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤È¤­¤Ë¤Î¤ßÀßÄꤵ¤ì¤Þ¤¹¡£
-      ¤³¤ì¤Ï´Êñ¤Ëµ¶¤ë¤³¤È¤¬¤Ç¤­¡¢¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð¤Î´Ö¤Ë
-      ¥×¥í¥­¥·¤¬¤¢¤ì¤Ð¤Þ¤Ã¤¿¤¯Ìò¤ËΩ¤¿¤Ê¤¤¤Î¤Ç¡¢
-      ¤³¤ÎÊÑ¿ô¤ÎÃͤϿ®ÍѤǤ­¤Ê¤¤¤È¤¤¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-      </dd>
-
-      <dt>REMOTE_USER</dt>
-
-      <dd>CGI
-      ¥¹¥¯¥ê¥×¥È¤Ëǧ¾Ú¤¬É¬ÍפʤȤ­¤Ë¤Î¤ßÀßÄꤵ¤ì¤Þ¤¹¡£</dd>
-    </dl>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="cgi-debug" id="cgi-debug">CGI ¤Î¥Ç¥Ð¥Ã¥°</a></h2>
-    <p>CGI ¥¹¥¯¥ê¥×¥È¤Î¥Ç¥Ð¥Ã¥°¤Ï¡¢Àµ¤·¤¯Æ°ºî¤·¤Æ¤¤¤Ê¤¤¥¹¥¯¥ê¥×¥È¤Î½ÐÎÏ
-    (ɸ½à½ÐÎϤȥ¨¥é¡¼)
-    ¤òÄ´¤Ù¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¤¤¿¤á¤Ë¡¢Æñ¤·¤¤¾õÂÖ¤¬Â³¤¤¤Æ¤¤¤Þ¤·¤¿¡£
-    ¤³¤ì¤é¤Î Apache 1.2 °Ê¹ß¤Ë¤¢¤ë
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤è¤ê¾ÜºÙ¤Ê¥¨¥é¡¼¤Î¥í¥°¼ý½¸¤òÄ󶡤·¤Þ¤¹¡£</p>
-
-    <h3>CGI ¥í¥°¥Õ¥¡¥¤¥ë¤Î½ñ¼°</h3>
-	<p>ÀßÄꤵ¤ì¤Æ¤¤¤ë¤È¤­¤Ë¤Ï¡¢CGI ¥¨¥é¡¼¥í¥°¤ÏŬÀÚ¤ËÆ°ºî¤·¤Ê¤¤¤¹¤Ù¤Æ¤Î
-	CGI ¤ò¥í¥°¼ý½¸¤·¤Þ¤¹¡£¤½¤ì¤¾¤ì¤ÎÀµ¤·¤¯Æ°ºî¤·¤Ê¤¤ CGI
-	¥¹¥¯¥ê¥×¥È¤Ï Ê£¿ô¤Î¹Ô¤Ë¤ï¤¿¤ë¾ðÊó¤¬¥í¥°¼ý½¸¤µ¤ì¤Þ¤¹¡£ºÇ½é¤Î
-	2 ¹Ô¤Ï¾ï¤Ë°Ê²¼¤Î½ñ¼°¤Ç¤¹:</p>
-
-      <div class="example"><p><code>
-        %% [<var>time</var>] <var>request-line</var><br />
-        %% <var>HTTP-status</var> <var>CGI-script-filename</var>
-      </code></p></div>
-
-      <p>¥¨¥é¡¼¤¬¡¢CGI ¥¹¥¯¥ê¥×¥È¤¬¼Â¹Ô¤Ç¤­¤Ê¤¤¤È¤¤¤¦¤â¤Î¤Ç¤¢¤ë¾ì¹ç¤Ï¡¢
-      ¥í¥°¥Õ¥¡¥¤¥ë¤Ï¤µ¤é¤Ë¤â¤¦ 2 ¹Ô½ñ¤«¤ì¤Þ¤¹:</p>
-
-      <div class="example"><p><code>
-        %%error<br />
-        <var>error-message</var>
-      </code></p></div>
-
-      <p>¤½¤¦¤Ç¤Ï¤Ê¤¯¡¢¥¨¥é¡¼¤¬Àµ¤·¤¯¤Ê¤¤¥Ø¥Ã¥À¾ðÊó¤òÊÖ¤¹·ë²Ì¤Ç¤¢¤ë¾ì¹ç
-      (¥¹¥¯¥ê¥×¥È¤Î¥Ð¥°¤Ç¤¢¤ë¤³¤È¤¬¤è¤¯¤¢¤ê¤Þ¤¹)¡¢
-      °Ê²¼¤Î¾ðÊó¤¬¥í¥°¼ý½¸¤µ¤ì¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      %request<br />
-      <var>¼õ¤±¼è¤Ã¤¿¤¹¤Ù¤Æ¤Î HTTP ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À</var><br />
-      <var>(¤â¤·¤¢¤ì¤Ð) POST ¤ä PUT ¤ÎÃæ¿È</var><br />
-      %response<br />
-      <var>CGI ¥¹¥¯¥ê¥×¥È¤Ë¤è¤ê½ÐÎϤµ¤ì¤¿¤¹¤Ù¤Æ¤Î¥Ø¥Ã¥À</var><br />
-      %stdout<br />
-      <var>CGI ɸ½à½ÐÎÏ</var><br />
-      %stderr<br />
-      <var>CGI ɸ½à¥¨¥é¡¼</var><br />
-    </code></p></div>
-
-    <p>(¥¹¥¯¥ê¥×¥È¤¬É¸½à½ÐÎϤäɸ½à¥¨¥é¡¼¤Ë²¿¤â½ÐÎϤ·¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢
-    %stdout ¤ä %stderr ¤Ï¤¢¤ê¤Þ¤»¤ó)¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ScriptLog" id="ScriptLog">ScriptLog</a> <a name="scriptlog" id="scriptlog">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>CGI ¥¹¥¯¥ê¥×¥È¤Î¥¨¥é¡¼¥í¥°¥Õ¥¡¥¤¥ë¤Î¾ì½ê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ScriptLog <var>file-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
-</table>
-    <p><code class="directive">ScriptLog</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï CGI ¥¹¥¯¥ê¥×¥È¤Î
-    ¥¨¥é¡¼¥í¥°¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£<code class="directive">ScriptLog</code> ¤¬
-    ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Ï¡¢
-    ¥¨¥é¡¼¥í¥°¤ÏºîÀ®¤µ¤ì¤Þ¤»¤ó¡£ÀßÄꤵ¤ì¤Æ¤¤¤ë¤È¤­¤Ï¡¢CGI
-    ¤Î¥¨¥é¡¼¤Ï¤¹¤Ù¤Æ°ú¿ô¤È¤·¤ÆÍ¿¤¨¤é¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë̾¤Ë¥í¥°¤µ¤ì¤Þ¤¹¡£
-    ÁêÂХѥ¹¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ë¤È¤­¤Ï¡¢
-    <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>¤«¤é¤ÎÁêÂХѥ¹¤È¤·¤Æ
-    °·¤ï¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      ScriptLog logs/cgi_log
-    </code></p></div>
-
-    <p>¤³¤Î¥í¥°¤Ï»Ò¥×¥í¥»¥¹¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¥æ¡¼¥¶¤È¤·¤Æ¥ª¡¼¥×¥ó¤µ¤ì¤Þ¤¹¡£
-    <em>¤¹¤Ê¤ï¤Á</em>¡¢<code class="directive"><a href="../mod/mpm_commmon.html#user">User</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤵ¤ì¤¿
-    ¥æ¡¼¥¶¤Ç¤¹¡£¤³¤ì¤Ï¡¢¥¹¥¯¥ê¥×¥È¥í¥°¤¬½ñ¤«¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê¤¬¤½¤Î¥æ¡¼¥¶¤Ç
-    ½ñ¤­¹þ¤ß²Äǽ¤«¡¢¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤¬¼êÆ°¤ÇºîÀ®¤µ¤ì¡¢¤½¤Î¥æ¡¼¥¶¤Ç
-    ½ñ¤­¹þ¤ß²Äǽ¤Ë¤Ê¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ë¤È¤¤¤¦¤³¤È¤Ç¤¹¡£¥¹¥¯¥ê¥×¥È¥í¥°¤ò
-    ¥¢¥¯¥»¥¹¥í¥°¤Ê¤É¤Î¤¿¤á¤Î¥í¥°¥Ç¥£¥ì¥¯¥È¥ê¤Ë½ñ¤«¤ì¤ë¤è¤¦¤Ë¤·¤¿¤È¤­¤Ï¡¢
-    ¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò»Ò¥×¥í¥»¥¹¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¥æ¡¼¥¶¤Î¸¢¸Â¤Ç
-    ½ñ¤­¹þ¤ß²Äǽ¤Ë¤Ï<strong>¤·¤Ê¤¤</strong>¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>¥¹¥¯¥ê¥×¥È¤Î¥í¥°¼ý½¸¤Ï CGI ¥¹¥¯¥ê¥×¥È¤ò½ñ¤¯¤È¤­¤Î
-    ¥Ç¥Ð¥Ã¥°ÍѤε¡Ç½¤È¤·¤Æ°Õ¿Þ¤µ¤ì¤Æ¤¤¤Æ¡¢Ä̾ï¤Î¥µ¡¼¥Ð¤Ç
-    ¾ï¤Ë»ÈÍѤµ¤ì¤ë¤è¤¦¤Ë¤Ï°Õ¿Þ¤µ¤ì¤Æ¤¤¤Ê¤¤¤È¤¤¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ®ÅÙ¤ä¸úΨ¤ÏºÇŬ²½¤µ¤ì¤Æ¤ª¤é¤º¡¢À߷פµ¤ì¤¿°Ê³°¤ÎÊýË¡¤Ç»ÈÍѤµ¤ì¤ë¤È
-    ¥»¥­¥å¥ê¥Æ¥£¤ÎÌäÂ꤬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ScriptLogBuffer" id="ScriptLogBuffer">ScriptLogBuffer</a> <a name="scriptlogbuffer" id="scriptlogbuffer">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¹¥¯¥ê¥×¥È¥í¥°¤Ëµ­Ï¿¤µ¤ì¤ë PUT ¤ä POST ¥ê¥¯¥¨¥¹¥È¤ÎÆâÍƤξå¸Â</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ScriptLogBuffer <em>bytes</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ScriptLogBuffer 1024</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
-</table>
-    <p>Â礭¤ÊËÜÂΤò¼õ¤±¼è¤Ã¤¿¤È¤­¤Ë¥í¥°¥Õ¥¡¥¤¥ë¤¬¤¹¤°¤ËÂ礭¤¯¤Ê¤ê¤¹¤®¤ë
-    ÌäÂê¤òÈò¤±¤ë¤¿¤á¤Ë¡¢¥Õ¥¡¥¤¥ë¤Ë¥í¥°¼ý½¸¤µ¤ì¤ë PUT ¤È POST
-    ¤ÎËÜÂΤÎÂ礭¤µ¤ÏÀ©¸Â¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢1024
-    ¥Ð¥¤¥È¤Þ¤Ç¤¬¥í¥°¼ý½¸¤µ¤ì¤Þ¤¹¤¬¡¢
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤½¤ì¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ 
-    </p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ScriptLogLength" id="ScriptLogLength">ScriptLogLength</a> <a name="scriptloglength" id="scriptloglength">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>CGI ¥¹¥¯¥ê¥×¥È¤Î¥í¥°¥Õ¥¡¥¤¥ë¤ÎÂ礭¤µ¤Î¾å¸Â</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ScriptLogLength <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ScriptLogLength 10385760</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
-</table>
-    <p><code class="directive">ScriptLogLength</code> ¤Ï CGI ¥¹¥¯¥ê¥×¥È¤Î¥í¥°¥Õ¥¡¥¤¥ë
-    ¤ÎÂ礭¤µ¤òÀ©¸Â¤¹¤ë¤¿¤á¤Ë»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥í¥°¥Õ¥¡¥¤¥ë¤Ï
-    CGI ¤Î¥¨¥é¡¼Ëè¤ËÂçÎ̤ξðÊó (¥ê¥¯¥¨¥¹¥È¤Î¤¹¤Ù¤Æ¤Î¥Ø¥Ã¥À¡¢
-    ¤¹¤Ù¤Æ¤Î½ÐÎÏ)¤ò¥í¥°¤·¤Þ¤¹¤Î¤Ç¡¢¤¹¤°¤ËÂ礭¤Ê¥Õ¥¡¥¤¥ë¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¤³¤ÎÂ礭¤µ¤ÎÀ©¸Â¤¬¤Ê¤¤¤³¤È¤Ë¤è¤ëÌäÂê¤òËɤ°¤¿¤á¤Ë¡¢
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ CGI ¤Î¥í¥°¥Õ¥¡¥¤¥ë¤Î
-    ºÇÂç¤Î¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¥Õ¥¡¥¤¥ë¤¬¤³¤ÎÂ礭¤µ¤òĶ¤¨¤¿¾ì¹ç¤Ï¡¢¤½¤ì°Ê¾å¤Ï½ñ¤­¹þ¤Þ¤ì¤Þ¤»¤ó¡£</p>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_cgi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_cgi.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_cgi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cgi.html.ja.utf8 b/docs/manual/mod/mod_cgi.html.ja.utf8
new file mode 100644
index 00000000..09a5762d
--- /dev/null
+++ b/docs/manual/mod/mod_cgi.html.ja.utf8
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_cgi - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_cgi</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_cgi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_cgi.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_cgi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>CGI スクリプト�実行</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>cgi_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_cgi.c</td></tr></table>
+<h3>概�</h3>
+
+    
+
+    <p>Mime タイプ� <code>application/x-httpd-cgi</code> 
+    ��る���ンドラ <code>cgi-script</code> (Apache 1.1 以�)
+    �指定�れ��るファイル� CGI スクリプト���扱�れ�
+    サー��より実行�れ���出力�クライアント�返�れ��。
+    ファイル��<code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code>
+    ディレクティブ�指定�れ� 拡張�を����む��
+    <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
+    ディレクトリ�存在�る���より��タイプ��り��。</p>
+
+    <p>サー�� CGI スクリプトを実行�る�����
+    <code>DOCUMENT_ROOT</code>
+    �呼�れる変数を環境�追加���。��変数�
+    <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
+    �値を�����。</p>
+
+    <p>Apache � CGI スクリプトを使用�る���イントロダクション��
+    <a href="../howto/cgi.html">CGI �よる動的コンテンツ</a>
+    を�照������。</p>
+
+    <p>Unix �マル�スレッド� MPM を使���る場�����モジュール�
+    代�り� <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code> を使�必���り��。
+    ユーザレベル����二��モジュール�本質的���一��。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#scriptlog">ScriptLog</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#scriptlogbuffer">ScriptLogBuffer</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#scriptloglength">ScriptLogLength</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#env">CGI 環境変数</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cgi-debug">CGI �デ�ッグ</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li>
+<li><code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li>
+<li><code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code></li>
+<li><a href="../suexec.html">CGI プログラムを別�ユーザ ID �実行�る</a></li>
+<li><a href="http://hoohoo.ncsa.uiuc.edu/cgi/">CGI �格書</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="env" id="env">CGI 環境変数</a></h2>
+    <p>サー�� <a href="http://hoohoo.ncsa.uiuc.edu/cgi/">CGI
+    �格</a> �決�られ��る CGI
+    環境変数を設定���。以下�も����件付��設定�れ��。</p>
+
+    <dl>
+      <dt>PATH_INFO</dt>
+
+      <dd>�れ� <code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code> ディレクティブ�明示的� <code>off</code>
+      �設定�れ��る場��設定�れ��ん。デフォルト��
+      <code class="directive">AcceptPathInfo</code> �
+      指定�れ�������振る舞����<code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> �パス情報
+      (URI �スクリプト�ファイル��後�続� <code>/more/path/info</code>) を
+      ��付�����コア�サー��パス情報��るリクエスト�
+      対�� 404 NOT FOUND エラーを返���。<code class="directive">AcceptPathInfo</code>
+      ディレクティブを
+      �略�る��<code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> ��リクエスト�対��
+      <code>On</code> ã‚’
+      設定������効果��り��。</dd>
+
+      <dt>REMOTE_HOST</dt>
+
+      <dd><code class="directive"><a href="../mod/core.html#hostnamelookups">HostnameLookups</a></code>
+      � <code>on</code> (デフォルト�� off ��)
+      ��アクセス���るホスト�アドレス� DNS
+      �逆引��実際�ホスト�を見��������設定�れ��。</dd>
+
+      <dt>REMOTE_IDENT</dt>
+
+      <dd><code class="directive"><a href="../mod/core.html#identitycheck">IdentityCheck</a></code>
+      � <code>on</code> �設定�れ����アクセス���るホスト�
+      ident プロトコルをサ�ート���る�����設定�れ��。
+      �れ�簡���る������クライアント�サー��間�
+      プロキシ��れ�����役�立������
+      ��変数�値�信用����������注�������。
+      </dd>
+
+      <dt>REMOTE_USER</dt>
+
+      <dd>CGI
+      スクリプト��証�必�������設定�れ��。</dd>
+    </dl>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="cgi-debug" id="cgi-debug">CGI �デ�ッグ</a></h2>
+    <p>CGI スクリプト�デ�ッグ��正��動作�����スクリプト�出力
+    (標準出力�エラー)
+    を調�る�����������難��状態�続������。
+    �れら� Apache 1.2 以���る
+    ディレクティブ�より詳細�エラー�ログ�集を�供���。</p>
+
+    <h3>CGI ログファイル�書�</h3>
+	<p>設定�れ��る�����CGI エラーログ��切�動作�������
+	CGI をログ�集���。�れ�れ�正��動作��� CGI
+	スクリプト� 複数�行���る情報�ログ�集�れ��。最��
+	2 行�常�以下�書���:</p>
+
+      <div class="example"><p><code>
+        %% [<var>time</var>] <var>request-line</var><br />
+        %% <var>HTTP-status</var> <var>CGI-script-filename</var>
+      </code></p></div>
+
+      <p>エラー��CGI スクリプト�実行�������も���る場���
+      ログファイル��ら�も� 2 行書�れ��:</p>
+
+      <div class="example"><p><code>
+        %%error<br />
+        <var>error-message</var>
+      </code></p></div>
+
+      <p>�������エラー�正����ヘッダ情報を返��果��る場�
+      (スクリプト��グ��る���よ��り��)�
+      以下�情報�ログ�集�れ��:</p>
+
+    <div class="example"><p><code>
+      %request<br />
+      <var>��������� HTTP リクエストヘッダ</var><br />
+      <var>(も��れ�) POST や PUT �中身</var><br />
+      %response<br />
+      <var>CGI スクリプト�より出力�れ�����ヘッダ</var><br />
+      %stdout<br />
+      <var>CGI 標準出力</var><br />
+      %stderr<br />
+      <var>CGI 標準エラー</var><br />
+    </code></p></div>
+
+    <p>(スクリプト�標準出力や標準エラー�何も出力�����場���
+    %stdout や %stderr ��り��ん)。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScriptLog" id="ScriptLog">ScriptLog</a> <a name="scriptlog" id="scriptlog">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>CGI スクリプト�エラーログファイル�場所</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ScriptLog <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
+</table>
+    <p><code class="directive">ScriptLog</code> ディレクティブ� CGI スクリプト�
+    エラーログファイルを設定���。<code class="directive">ScriptLog</code> �
+    設定�れ��������
+    エラーログ�作��れ��ん。設定�れ��る����CGI
+    �エラー����引数���与�られ��るファイル��ログ�れ��。
+    相対パス�指定�れ��る����
+    <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>�ら�相対パス���
+    扱�れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      ScriptLog logs/cgi_log
+    </code></p></div>
+
+    <p>��ログ��プロセス�実行�れ��るユーザ���オープン�れ��。
+    <em>����</em>�<code class="directive"><a href="../mod/mpm_commmon.html#user">User</a></code> ディレクティブ�指定�れ�
+    ユーザ��。�れ��スクリプトログ�書�れるディレクトリ���ユーザ�
+    書�込��能��スクリプトファイル�手動�作��れ���ユーザ�
+    書�込��能�����る必���る�������。スクリプトログを
+    アクセスログ������ログディレクトリ�書�れるよ��������
+    ��ディレクトリを�プロセスを実行���るユーザ�権��
+    書�込��能��<strong>���</strong>よ��������。</p>
+
+    <p>スクリプト�ログ�集� CGI スクリプトを書����
+    デ�ッグ用�機能����図�れ����通常�サー��
+    常�使用�れるよ����図�れ����������注�������。
+    速度や効率�最�化�れ��ら��設計�れ�以外�方法�使用�れる�
+    セキュリティ��題��る�も�れ��ん。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScriptLogBuffer" id="ScriptLogBuffer">ScriptLogBuffer</a> <a name="scriptlogbuffer" id="scriptlogbuffer">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>スクリプトログ�記録�れる PUT や POST リクエスト�内容�上�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ScriptLogBuffer <em>bytes</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ScriptLogBuffer 1024</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
+</table>
+    <p>大��本体を��������ログファイル����大���り��る
+    �題を��る����ファイル�ログ�集�れる PUT � POST
+    �本体�大���制��れ����。デフォルト���1024
+    �イト���ログ�集�れ����
+    ��ディレクティブ��れを変更�る�������。 
+    </p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScriptLogLength" id="ScriptLogLength">ScriptLogLength</a> <a name="scriptloglength" id="scriptloglength">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>CGI スクリプト�ログファイル�大���上�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ScriptLogLength <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ScriptLogLength 10385760</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>, <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code></td></tr>
+</table>
+    <p><code class="directive">ScriptLogLength</code> � CGI スクリプト�ログファイル
+    �大��を制��る���使用�る�������。ログファイル�
+    CGI �エラー毎�大��情報 (リクエスト�����ヘッダ�
+    ����出力)をログ���������大��ファイル��り��。
+    ��大���制�������よる�題を防�����
+    ��ディレクティブを使�� CGI �ログファイル�
+    最大�ファイルサイズを設定�る�������。
+    ファイル���大��を超��場����れ以上�書�込�れ��ん。</p>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_cgi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_cgi.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_cgi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cgi.html.ko.euc-kr b/docs/manual/mod/mod_cgi.html.ko.euc-kr
index 8068fddb..1a8a1560 100644
--- a/docs/manual/mod/mod_cgi.html.ko.euc-kr
+++ b/docs/manual/mod/mod_cgi.html.ko.euc-kr
@@ -229,6 +229,6 @@
 <a href="../ja/mod/mod_cgi.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_cgi.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cgid.html b/docs/manual/mod/mod_cgid.html
index f89ee3c7..33fcb349 100644
--- a/docs/manual/mod/mod_cgid.html
+++ b/docs/manual/mod/mod_cgid.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_cgid.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_cgid.html.ja.euc-jp
+URI: mod_cgid.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_cgid.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_cgid.html.en b/docs/manual/mod/mod_cgid.html.en
index eaecf772..80b39123 100644
--- a/docs/manual/mod/mod_cgid.html.en
+++ b/docs/manual/mod/mod_cgid.html.en
@@ -101,6 +101,6 @@ the cgi daemon</td></tr>
 <a href="../ja/mod/mod_cgid.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_cgid.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cgid.html.ja.euc-jp b/docs/manual/mod/mod_cgid.html.ja.euc-jp
deleted file mode 100644
index 1e32655e..00000000
--- a/docs/manual/mod/mod_cgid.html.ja.euc-jp
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_cgid - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_cgid</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_cgid.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_cgid.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_cgid.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>³°Éô CGI ¥Ç¡¼¥â¥ó¤ò»È¤Ã¤¿ CGI ¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>cgid_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_cgid.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Unix ¤Î¥¹¥ì¥Ã¥É MPM ¤Î¤ß</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>ºÇŬ²½¤¬»Ü¤µ¤ì¤Æ¤¤¤ë¤³¤È¤È¡¢°Ê²¼¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ëÄɲäΠ<code class="directive"><a href="#scriptsock">ScriptSock</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò½ü¤¤¤Æ¤Ï¡¢
-    <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code> ¤Ï <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> ¤ÈƱÍͤÎ
-    Æ°ºî¤ò¤·¤Þ¤¹¡£<strong>Apache ¤È CGI ¤Ë´Ø¤¹¤ë¾ÜºÙ¤Ï
-    <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> ¤Î³µÍפòÆɤó¤Ç¤¯¤À¤µ¤¤¡£</strong></p>
-
-    <p>Unix ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ÎÃæ¤Ë¤Ï¡¢¥Þ¥ë¥Á¥¹¥ì¥Ã¥É¤Î¥µ¡¼¥Ð¤«¤é
-    ¥×¥í¥»¥¹¤ò fork ¤¹¤ë¤Î¤¬Èó¾ï¤Ë¥³¥¹¥È¤Î¹â¤¤Æ°ºî¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£
-    Íýͳ¤Ï¡¢¿·¤·¤¤¥×¥í¥»¥¹¤¬¿Æ¥×¥í¥»¥¹¤Î¥¹¥ì¥Ã¥É¤¹¤Ù¤Æ¤òÊ£À½¤¹¤ë¤«¤é¤Ç¤¹¡£
-    ³Æ CGI µ¯Æ°»þ¤Ë¤³¤Î¥³¥¹¥È¤¬¤«¤«¤ë¤Î¤òËɤ°¤¿¤á¤Ë¡¢<code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code>
-    ¤Ï»Ò¥×¥í¥»¥¹¤ò fork ¤·¤Æ CGI ¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤Î
-    ³°Éô¥Ç¡¼¥â¥ó¤ò¼Â¹Ô¤·¤Þ¤¹¡£
-    ¼ç¥µ¡¼¥Ð¤Ï unix ¥É¥á¥¤¥ó¥½¥±¥Ã¥È¤ò»È¤Ã¤Æ¤³¤Î¥Ç¡¼¥â¥ó¤ÈÄÌ¿®¤·¤Þ¤¹¡£</p>
-
-    <p>¥³¥ó¥Ñ¥¤¥ë»þ¤Ë¥Þ¥ë¥Á¥¹¥ì¥Ã¥É MPM ¤¬Áª¤Ð¤ì¤¿¤È¤­¤Ï
-    <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> ¤ÎÂå¤ï¤ê¤Ëɬ¤º¤³¤Î¥â¥¸¥å¡¼¥ë¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
-    ¥æ¡¼¥¶¤Î¥ì¥Ù¥ë¤Ç¤Ï¤³¤Î¥â¥¸¥å¡¼¥ë¤ÎÀßÄê¤ÈÆ°ºî¤Ï <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>
-    ¤È¤Þ¤Ã¤¿¤¯Æ±¤¸¤Ç¤¹¡£Í£°ì¤ÎÎã³°¤Ï <code>ScriptSock</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-    Äɲäǡ¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï CGI ¥Ç¡¼¥â¥ó¤È¤ÎÄÌ¿®ÍѤΥ½¥±¥Ã¥È¤Î̾Á°¤ò
-    »ØÄꤷ¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/right.gif" /> <a href="mod_cgi.html#scriptlog">ScriptLog</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mod_cgi.html#scriptloglength">ScriptLogLength</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#scriptsock">ScriptSock</a></li>
-</ul>
-<h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li>
-<li><a href="../suexec.html">CGI ¥×¥í¥°¥é¥à¤ò°ã¤¦¥æ¡¼¥¶ ID ¤Ç¼Â¹Ô¤¹¤ë</a></li>
-</ul></div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ScriptSock" id="ScriptSock">ScriptSock</a> <a name="scriptsock" id="scriptsock">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>CGI ¥Ç¡¼¥â¥ó¤È¤ÎÄÌ¿®¤Ë»È¤ï¤ì¤ë¥½¥±¥Ã¥È¤Î¥Õ¥¡¥¤¥ë̾¤ÎÀÜƬ¼­</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ScriptSock <var>file-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ScriptSock logs/cgisock</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_cgid</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï CGI ¥Ç¡¼¥â¥ó¤È¤ÎÄÌ¿®¤Ë»È¤ï¤ì¤ë¥½¥±¥Ã¥È¤Î
-    ¥Õ¥¡¥¤¥ë̾¤ÎÀÜƬ¼­¤òÀßÄꤷ¤Þ¤¹¡£¤Þ¤¿¡¢¥Õ¥¡¥¤¥ë̾¤Ë¤Ï¥µ¡¼¥Ð¤Î¥×¥í¥»¥¹ID¤¬
-    Äɲ䵤ì¤Þ¤¹¡£¥½¥±¥Ã¥È¤Ï Apache ¤¬µ¯Æ°¤µ¤ì¤¿¥æ¡¼¥¶ (Ä̾ï root) ¤Î
-    ¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤òÍѤ¤¤Æ¥ª¡¼¥×¥ó¤µ¤ì¤Þ¤¹¡£CGI ¥¹¥¯¥ê¥×¥È¤È¤ÎÄÌ¿®¤Î
-    ¥»¥­¥å¥ê¥Æ¥£¤òÊݤĤ¿¤á¤Ë¡¢¥½¥±¥Ã¥È¤Î¸ºß¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ë
-    ¾¤Î¥æ¡¼¥¶¤¬½ñ¤­¹þ¤ß¸¢¸Â¤ò»ý¤Ã¤Æ¤¤¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤³¤È¤¬½ÅÍפǤ¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      ScriptSock /var/run/cgid.sock
-    </code></p></div>
-
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_cgid.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_cgid.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_cgid.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cgid.html.ja.utf8 b/docs/manual/mod/mod_cgid.html.ja.utf8
new file mode 100644
index 00000000..0b8cfe25
--- /dev/null
+++ b/docs/manual/mod/mod_cgid.html.ja.utf8
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_cgid - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_cgid</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_cgid.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_cgid.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_cgid.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>外部 CGI デーモンを使�� CGI スクリプト�実行</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>cgid_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_cgid.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>Unix �スレッド MPM ��</td></tr></table>
+<h3>概�</h3>
+
+    <p>最�化�施�れ��る����以下�説明�れ��る追加� <code class="directive"><a href="#scriptsock">ScriptSock</a></code> ディレクティブを除����
+    <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code> � <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> ��様�
+    動作を���。<strong>Apache � CGI �関�る詳細�
+    <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> �概�を読ん�����。</strong></p>
+
+    <p>Unix オペレーティングシステム�中���マル�スレッド�サー��ら
+    プロセスを fork �る���常�コスト�高�動作�����るも���り��。
+    �由��新��プロセス�親プロセス�スレッド���を複製�る�ら��。
+    � CGI 起動時���コスト���る�を防�����<code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code>
+    ��プロセスを fork �� CGI スクリプトを実行�る���
+    外部デーモンを実行���。
+    主サー�� unix ドメインソケットを使����デーモン�通信���。</p>
+
+    <p>コンパイル時�マル�スレッド MPM ���れ����
+    <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> �代�り�必���モジュール�使用�れ��。
+    ユーザ�レベル����モジュール�設定�動作� <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code>
+    ���������。唯一�例外� <code>ScriptSock</code> ディレクティブ�
+    追加����ディレクティブ� CGI デーモン��通信用�ソケット���を
+    指定���。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/right.gif" /> <a href="mod_cgi.html#scriptlog">ScriptLog</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mod_cgi.html#scriptloglength">ScriptLogLength</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#scriptsock">ScriptSock</a></li>
+</ul>
+<h3>�照</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code></li>
+<li><a href="../suexec.html">CGI プログラムを��ユーザ ID �実行�る</a></li>
+</ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScriptSock" id="ScriptSock">ScriptSock</a> <a name="scriptsock" id="scriptsock">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>CGI デーモン��通信�使�れるソケット�ファイル��接頭辞</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ScriptSock <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ScriptSock logs/cgisock</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_cgid</td></tr>
+</table>
+    <p>��ディレクティブ� CGI デーモン��通信�使�れるソケット�
+    ファイル��接頭辞を設定���。���ファイル���サー��プロセスID�
+    追加�れ��。ソケット� Apache �起動�れ�ユーザ (通常 root) �
+    パーミッションを用��オープン�れ��。CGI スクリプト��通信�
+    セキュリティを������ソケット�存在�るディレクトリ�
+    他�ユーザ�書�込�権�を������よ���る�������。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      ScriptSock /var/run/cgid.sock
+    </code></p></div>
+
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_cgid.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_cgid.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_cgid.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_cgid.html.ko.euc-kr b/docs/manual/mod/mod_cgid.html.ko.euc-kr
index 61c8d5f8..7132e8f8 100644
--- a/docs/manual/mod/mod_cgid.html.ko.euc-kr
+++ b/docs/manual/mod/mod_cgid.html.ko.euc-kr
@@ -94,6 +94,6 @@
 <a href="../ja/mod/mod_cgid.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_cgid.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_charset_lite.html b/docs/manual/mod/mod_charset_lite.html
index 1592ea01..626fcac8 100644
--- a/docs/manual/mod/mod_charset_lite.html
+++ b/docs/manual/mod/mod_charset_lite.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_charset_lite.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_charset_lite.html.en b/docs/manual/mod/mod_charset_lite.html.en
index 26fef53a..75db57b2 100644
--- a/docs/manual/mod/mod_charset_lite.html.en
+++ b/docs/manual/mod/mod_charset_lite.html.en
@@ -166,6 +166,14 @@
       explicitly configured using the <code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code> directive, <code>NoImplicitAdd</code>
       should be specified so that <code class="module"><a href="../mod/mod_charset_lite.html">mod_charset_lite</a></code>
       doesn't add its filter.</dd>
+
+      <dt><code>TranslateAllMimeTypes | NoTranslateAllMimeTypes</code></dt>
+      <dd>Normally, <code class="module"><a href="../mod/mod_charset_lite.html">mod_charset_lite</a></code> will only perform
+      translation on a small subset of possible mimetypes.  When the
+      <code>TranslateAllMimeTypes</code> keyword is specified for a given
+      configuration section, translation is performed without regard for
+      mimetype.</dd>
+
     </dl>
 
 </div>
@@ -205,6 +213,6 @@
 <p><span>Available Languages: </span><a href="../en/mod/mod_charset_lite.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_charset_lite.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_charset_lite.html.ko.euc-kr b/docs/manual/mod/mod_charset_lite.html.ko.euc-kr
index f2316af1..2517a94d 100644
--- a/docs/manual/mod/mod_charset_lite.html.ko.euc-kr
+++ b/docs/manual/mod/mod_charset_lite.html.ko.euc-kr
@@ -193,6 +193,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/mod_charset_lite.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_charset_lite.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dav.html b/docs/manual/mod/mod_dav.html
index 347f8cf2..5cdb02d8 100644
--- a/docs/manual/mod/mod_dav.html
+++ b/docs/manual/mod/mod_dav.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_dav.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_dav.html.ja.euc-jp
+URI: mod_dav.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_dav.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_dav.html.en b/docs/manual/mod/mod_dav.html.en
index 250255d8..57ba3741 100644
--- a/docs/manual/mod/mod_dav.html.en
+++ b/docs/manual/mod/mod_dav.html.en
@@ -104,7 +104,7 @@
          <br />
          &lt;LimitExcept GET OPTIONS&gt;<br />
          <span class="indent">
-           require user admin<br />
+           Require user admin<br />
          </span>
          &lt;/LimitExcept&gt;<br />
        </span>
@@ -265,6 +265,6 @@ a DAV resource</td></tr>
 <a href="../ja/mod/mod_dav.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_dav.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dav.html.ja.euc-jp b/docs/manual/mod/mod_dav.html.ja.euc-jp
deleted file mode 100644
index 796a47a8..00000000
--- a/docs/manual/mod/mod_dav.html.ja.euc-jp
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_dav - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_dav</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_dav.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_dav.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_dav.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>ʬ»¶¥ª¡¼¥µ¥ê¥ó¥°¤È¥Ð¡¼¥¸¥ç¥ó´ÉÍý
-(<a href="http://www.webdav.org/">WebDAV</a>) µ¡Ç½</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>dav_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_dav.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¥¯¥é¥¹ 1 ¤È¥¯¥é¥¹ 2 ¤Î
-    <a href="http://www.webdav.org">WebDAV</a>
-    ('¥¦¥§¥Ö¥Ù¡¼¥¹¤Îʬ»¶¥ª¡¼¥µ¥ê¥ó¥°¤È¥Ð¡¼¥¸¥ç¥ó´ÉÍý')
-    µ¡Ç½¤ò Apache ¤ËÄ󶡤·¤Þ¤¹¡£
-    ¤³¤Î HTTP ¥×¥í¥È¥³¥ë¤Î³ÈÄ¥¤Ë¤è¤ê¡¢¥ê¥â¡¼¥È¤Î¥¦¥§¥Ö¥µ¡¼¥Ð¾å¤Ë¤¢¤ë
-    ¥ê¥½¡¼¥¹¤ä¥³¥ì¥¯¥·¥ç¥ó¤ò
-    ºîÀ®¡¢°ÜÆ°¡¢Ê£À½¡¢ºï½ü¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#dav">Dav</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#davdepthinfinity">DavDepthInfinity</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#davmintimeout">DavMinTimeout</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#example">Enabling WebDAV</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#security">¥»¥­¥å¥ê¥Æ¥£¤ÎÌäÂê</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#complex">Ê£»¨¤ÊÀßÄê</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="directive"><a href="../mod/mod_dav_fs.html#davlockdb">DavLockDB</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#limitxmlrequestbody">LimitXMLRequestBody</a></code></li>
-<li><a href="http://www.webdav.org">WebDAV Resources</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="example" id="example">Enabling WebDAV</a></h2>
-    <p>mod_dav ¤òÍ­¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢<code>httpd.conf</code>
-    ¥Õ¥¡¥¤¥ëÃæ¤Î¥³¥ó¥Æ¥Ê¤Ë¼¡¤ò²Ã¤¨¤Þ¤¹:</p>
-
-    <div class="example"><p><code>Dav On</code></p></div>
-
-    <p>¤³¤ì¤Ï DAV ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥×¥í¥Ð¥¤¥À¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£DAV
-    ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥×¥í¥Ð¥¤¥À¤Ï <code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code>
-    ¥â¥¸¥å¡¼¥ë¤Ç¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¥³¥ó¥Ñ¥¤¥ë»þ¤Ë
-    ¥µ¡¼¥Ð¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ë¤«¡¢¤¢¤ë¤¤¤Ï
-    <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code>
-    ¤ò»ÈÍѤ·¤Æ¼Â¹Ô»þ¤Ë¥í¡¼¥É¤µ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-    
-    <p>¤µ¤é¤Ë¡¢DAV ¥í¥Ã¥¯¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¾ì½ê¤¬
-    <code class="directive"><a href="../mod/mod_dav_fs.html#davlockdb">DavLockDB</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ
-    <code>httd.conf</code> ¥Õ¥¡¥¤¥ë¤Î¥°¥í¡¼¥Ð¥ë¥»¥¯¥·¥ç¥ó¤Ë»ØÄꤵ¤ì¤Æ¤¤¤ë
-    ɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      DavLockDB /usr/local/apache2/var/DavLock
-    </code></p></div>
-
-    <p>¥í¥Ã¥¯¥Ç¡¼¥¿¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ï Apache ¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë
-    <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> ¤È <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> ¤Ë½ñ¤­¹þ¤ß¸¢¸Â¤¬¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p><code class="directive"><a href="../mod/core.html#limit">&lt;Limit&gt;</a></code>
-    Àá¤ò <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥ÖÆâÉô¤ËÄɲ䷤ơ¢DAV ¤¬Í­¸ú¤Ê¾ì½ê¤Ø¤Î
-    ¥¢¥¯¥»¥¹¤òÀ©¸Â¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£DAV ¥¯¥é¥¤¥¢¥ó¥È¤¬
-    °ìÅ٤Υꥯ¥¨¥¹¥È¤ÇÁ÷¿®¤Ç¤­¤ëºÇÂç¥Ð¥¤¥È¿ô¤ò»ØÄꤷ¤¿¤¤¤È¤­¤Ï¡¢
-    <code class="directive"><a href="../mod/core.html#limitxmlrequestbody">LimitXMLRequestBody</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¡ÖÄ̾ï¤Î¡×
-    <code class="directive"><a href="../mod/core.html#limitrequestbody">LimitRequestBody</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï DAV ¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ¤Ï¸úÎϤò»ý¤Á¤Þ¤»¤ó¡£</p>
-
-    <div class="example"><h3>´°Á´¤ÊÎã</h3><p><code>
-      DavLockDB /usr/local/apache2/var/DavLock<br />
-      <br />
-       &lt;Location /foo&gt;<br />
-       <span class="indent">
-         Dav On<br />
-         <br />
-         AuthType Basic<br />
-         AuthName DAV<br />
-         AuthUserFile user.passwd<br />
-         <br />
-         &lt;LimitExcept GET OPTIONS&gt;<br />
-         <span class="indent">
-           require user admin<br />
-         </span>
-         &lt;/LimitExcept&gt;<br />
-       </span>
-       &lt;/Location&gt;<br />
-    </code></p></div>
-
-    <p><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> ¤Ï Greg Stein ¤µ¤ó¤Î <a href="http://www.webdav.org/mod_dav/">Apache 1.3 ÍѤΠmod_dav</a> ¤Ë
-    ͳÍ褹¤ë¤â¤Î¤Ç¤¹¡£¤½¤Î¥µ¥¤¥È¤«¤é¤è¤ê¿¤¯¤Î¾ðÊó¤ò¼ê¤ËÆþ¤ì¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="security" id="security">¥»¥­¥å¥ê¥Æ¥£¤ÎÌäÂê</a></h2>
-
-    <p>DAV ¤Î¥¢¥¯¥»¥¹¥á¥½¥Ã¥É¤Ï±ó³Ö¥¯¥é¥¤¥¢¥ó¥È¤¬¥µ¡¼¥Ð¤Î¥Õ¥¡¥¤¥ë¤ò
-    Áàºî¤¹¤ë¤³¤È¤ò²Äǽ¤Ë¤·¤Þ¤¹¤Î¤Ç¡¢ <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> ¤ò»ÈÍѤ¹¤ë
-    Á°¤Ë¡¢¥µ¡¼¥Ð¤¬°ÂÁ´¤Ç¤¢¤ë¤³¤È¤òÆäËÃí°Õ¤·¤Æ³Îǧ¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-
-    <p>¥µ¡¼¥Ð¾å¤Î DAV ¤¬»ÈÍѲÄǽ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¾ì½ê¤Ï¤¹¤Ù¤Æǧ¾Ú¤ÇÊݸ¤Æ¤¯¤À¤µ¤¤¡£
-    HTTP ´ðËÜǧ¾Ú¤Î»ÈÍѤϿ侩¤Ç¤­¤Þ¤»¤ó¡£¾¯¤Ê¤¯¤È¤â 
-    <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code> ¥â¥¸¥å¡¼¥ë¤ÇÄ󶡤µ¤ì¤ë HTTP 
-    ¥À¥¤¥¸¥§¥¹¥Èǧ¾Ú¤òÍѤ¤¤ë¤Ù¤­¤Ç¤¹¡£WebDAV ¥¯¥é¥¤¥¢¥ó¥È¤Î¤Û¤È¤ó¤É¤Ï
-    ¤³¤Îǧ¾ÚÊýË¡¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£Âå¤ï¤ê¤Ë¡¢<a href="../ssl/">SSL</a> ¤¬
-    Í­¸ú¤Ê¥³¥Í¥¯¥·¥ç¥ó¤òÄ̤·¤¿´ðËÜǧ¾Ú¤ò»È¤¦¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> ¤¬¥Õ¥¡¥¤¥ë¤òÁàºî¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë¤Ï¡¢
-    ´ÉÍý²¼¤Î¥Ç¥£¥ì¥¯¥È¥ê¤È¥Õ¥¡¥¤¥ë¤È¤Ë Apache ¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> ¤È <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> ¤Ç½ñ¤­¹þ¤ß²Äǽ¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¿·¤·¤¯ºîÀ®¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤â¤³¤Î <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code>
-    ¤È <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> ¤Ë½êÍ­¤µ¤ì¤ë
-    ¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤ÎÍýͳ¤«¤é¡¢¤½¤Î¥¢¥«¥¦¥ó¥È¤Ø¤Î¥¢¥¯¥»¥¹¤òÀ©¸æ¤¹¤ë¤³¤È¤Ï
-    ½ÅÍפǤ¹¡£DAV ¥ê¥Ý¥¸¥È¥ê¤Ï Apache ÀìÍѤΤâ¤Î¤À¤È¤ß¤Ê¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-    Apache °Ê³°¤ÎÊýË¡¤Ç¥Õ¥¡¥¤¥ë¤ò½¤Àµ¤¹¤ë¤³¤È (Î㤨¤Ð FTP ¤ä¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à
-    ÍѤΥġ¼¥ë¤Ê¤É¤ò»È¤Ã¤Æ) ¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£</p>
-
-    <p><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> ¤Ï¤¤¤í¤¤¤í¤Ê¼ïÎà¤Î¥µ¡¼¥Ó¥¹µñÈݹ¶·â¤Ë¤µ¤é¤µ¤ì¤ë
-    ¤«¤â¤·¤ì¤Þ¤»¤ó¡£<code class="directive"><a href="../mod/core.html#limitxmlrequestbody">LimitXMLRequestBody</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¦¤È
-    Â礭¤Ê DAV ¥ê¥¯¥¨¥¹¥È¤ò²òÀϤ¹¤ë¤È¤­¤Ë¾ÃÈñ¤µ¤ì¤ë¥á¥â¥ê¤ÎÎ̤òÀ©¸Â¤¹¤ë¤³¤È¤¬
-    ¤Ç¤­¤Þ¤¹¡£<code class="directive"><a href="#davdepthinfinity">DavDepthInfinity</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    <code>PROPFIND</code> ¥ê¥¯¥¨¥¹¥È¤¬µðÂç¥ê¥Ý¥¸¥È¥ê¤ÇÂçÎ̤Υá¥â¥ê¤ò¾ÃÈñ¤¹¤ë¤Î¤ò
-    Ëɤ°¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Â¾¤Î¥µ¡¼¥Ó¥¹µñÈݹ¶·â¤Ë¤Ïñ½ã¤Ë»ÈÍѲÄǽ¤Ê¥Ç¥£¥¹¥¯Îΰè¤ò
-    ¿¤¯¤ÎÂ礭¤Ê¥Õ¥¡¥¤¥ë¤ÇËä¤á¤Æ¤·¤Þ¤¦¤ó¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤òľÀÜËɤ°ÊýË¡¤Ï
-    Apache ¤Ë¤Ï¤¢¤ê¤Þ¤»¤ó¤Î¤Ç¡¢¿®ÍѤǤ­¤Ê¤¤¥æ¡¼¥¶¤Ë DAV ¥¢¥¯¥»¥¹¤òÄ󶡤¹¤ë¤Î¤Ï
-    Èò¤±¤¿Êý¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="complex" id="complex">Ê£»¨¤ÊÀßÄê</a></h2>
-
-    <p>¤è¤¯¤¢¤ëÍ×µá¤Ë¡¢<code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> ¤ò»È¤Ã¤ÆưŪ¤Ê¥Õ¥¡¥¤¥ë
-    (PHP ¥¹¥¯¥ê¥×¥È¡¢CGI ¥¹¥¯¥ê¥×¥È¤Ê¤É) ¤òÁàºî¤·¤¿¤¤¤È¤¤¤¦¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤ì¤Î¼Â¸½¤Ï¡¢<code>GET</code> ¥ê¥¯¥¨¥¹¥È¤Ï¥¹¥¯¥ê¥×¥È¤ÎÆâÍƤò¥À¥¦¥ó¥í¡¼¥É¤µ¤»¤ë
-    Âå¤ï¤ê¤Ë¡¢¥¹¥¯¥ê¥×¥È¤ò¾ï¤Ë¼Â¹Ô¤µ¤»¤Æ¤·¤Þ¤¦¤Î¤ÇÆñ¤·¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-    ¤³¤ì¤ò²óÈò¤¹¤ëÊýË¡¤Ë¤Ï¡¢Æó¤Ä¤Î°ã¤¦ URL ¤òƱ¤¸¥³¥ó¥Æ¥ó¥Ä¤Ë¥Þ¥Ã¥×¤·¡¢
-    °ì¤Ä¤Ï¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤µ¤»¡¢¤â¤¦°ì¤Ä¤Ï¥À¥¦¥ó¥í¡¼¥É¤µ¤»¤¿¤ê¡¢DAV ¤«¤é
-    Áàºî¤µ¤ì¤¿¤ê¤¹¤ë¤è¤¦¤ËÀßÄꤹ¤ë¤È¤¤¤¦¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>
-Alias /phparea /home/gstein/php_files<br />
-Alias /php-source /home/gstein/php_files<br />
-&lt;Location /php-source&gt;
-<span class="indent">
-    DAV On<br />
-    ForceType text/plain<br />
-</span>
-&lt;/Location&gt;
-</code></p></div>
-
-    <p>¤³¤ÎÀßÄê¤Ë¤è¤ê¡¢<code>http://example.com/phparea</code> ¤ò PHP ¥¹¥¯¥ê¥×¥È¤Î
-    ½ÐÎϤò¥¢¥¯¥»¥¹¤¹¤ë¤¿¤á¤Ë»È¤¦¤³¤È¤¬¤Ç¤­¡¢
-    <code>http://example.com/php-source</code> ¤ò DAV ¥¯¥é¥¤¥¢¥ó¥È¤Ë¤è¤ë
-    ¤¬Áàºî¤Î¤¿¤á¤Ë»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Dav" id="Dav">Dav</a> <a name="dav" id="dav">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>WebDAV HTTP ¥á¥½¥Ã¥É¤òÍ­¸ú¤Ë¤·¤Þ¤¹</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Dav On|Off|<var>provider-name</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>Dav Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_dav</td></tr>
-</table>
-    <p>Í¿¤¨¤é¤ì¤¿¥³¥ó¥Æ¥Ê¤Ç WebDAV HTTP ¥á¥½¥Ã¥É¤¬»È¤¨¤ë¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï
-    ¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      &lt;Location /foo&gt;<br />
-      <span class="indent">
-        Dav On<br />
-      </span>
-      &lt;/Location&gt;
-    </code></p></div>
-
-    <p><code>On</code> ¤È¤¤¤¦»ØÄê¤Ï¼ÂºÝ¤Ë¤Ï <code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code>
-    ¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë¥Ç¥Õ¥©¥ë¥È¤Î¥×¥í¥Ð¥¤¥À¡¢<code>filesystem</code>
-    ¤Ø¤Î¥¨¥¤¥ê¥¢¥¹¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£°ìÅÙ¤¢¤ë¥í¥±¡¼¥·¥ç¥ó¤Ç DAV 
-    ¤òÍ­¸ú¤Ë¤·¤¿¸å¤Ï¡¢¤½¤Î¥µ¥Ö¥í¥±¡¼¥·¥ç¥ó¤Ç<em>̵¸ú²½¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Ê¤¤</em>
-    ¤È¤¤¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£´°Á´¤ÊÀßÄêÎã¤Ï<a href="#example">¾åµ­¤Î¥»¥¯¥·¥ç¥ó</a> ¤ò¤´Í÷²¼¤µ¤¤¡£</p>
-
-    <div class="warning">
-      ¥µ¡¼¥Ð¤Î¥»¥­¥å¥ê¥Æ¥£¤¬³ÎÊݤǤ­¤ë¤Þ¤Ç WebDAV ¤òÍ­¸ú¤Ë¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-      ¤½¤¦¤·¤Ê¤±¤ì¤Ðï¤Ç¤â¤½¤Î¥µ¡¼¥Ð¤Ç¥Õ¥¡¥¤¥ë¤òÇÛÉÛ¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë
-      ¤Ê¤Ã¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
-    </div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DavDepthInfinity" id="DavDepthInfinity">DavDepthInfinity</a> <a name="davdepthinfinity" id="davdepthinfinity">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>PROPFIND, Depth: Infinity ¥ê¥¯¥¨¥¹¥È¤òµö²Ä¤·¤Þ¤¹</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>DavDepthInfinity on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>DavDepthInfinity off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_dav</td></tr>
-</table>
-    <p>'Depth: Infinity' ¤ò´Þ¤ó¤Ç¤¤¤ë
-    <code>PROPFIND</code> ¥ê¥¯¥¨¥¹¥È¤ò½èÍý¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï¡¢
-    <code class="directive">DavDepthInfinity</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¤¤Þ¤¹¡£¤³¤Î¥¿¥¤¥×¤Î¥ê¥¯¥¨¥¹¥È¤Ï
-    denial-of-service ¥¢¥¿¥Ã¥¯¤È¤Ê¤ê¤¦¤ë¤Î¤Ç¡¢
-    ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ïµö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DavMinTimeout" id="DavMinTimeout">DavMinTimeout</a> <a name="davmintimeout" id="davmintimeout">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤¬ DAV ¥ê¥½¡¼¥¹¤Î¥í¥Ã¥¯¤ò°Ý»ý¤¹¤ëºÇ¾®»þ´Ö¤Ç¤¹¡£
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>DavMinTimeout <var>seconds</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>DavMinTimeout 0</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_dav</td></tr>
-</table>
-    <p>¥¯¥é¥¤¥¢¥ó¥È¤¬ DAV ¥ê¥½¡¼¥¹¥í¥Ã¥¯¤òÍ׵ᤷ¤¿¾ì¹ç¡¢
-    ¥í¥Ã¥¯¤¬¥µ¡¼¥Ð¤Ë¤è¤Ã¤Æ¼«Æ°Åª¤Ë²ò½ü¤µ¤ì¤ë¤Þ¤Ç¤Î»þ´Ö¤ò
-    Ʊ»þ¤Ë»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤ÎÃͤÏñ¤Ê¤ë¥ê¥¯¥¨¥¹¥È¤Ç¤¢¤Ã¤Æ¡¢
-    ¥µ¡¼¥Ð¤Ï¤³¤ì¤ò̵»ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¤·¡¢
-    Ǥ°Õ¤ÎÃͤò¥¯¥é¥¤¥¢¥ó¥È¤ËÄÌÃΤ¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¥¯¥é¥¤¥¢¥ó¥È¤ËÌ᤹¥í¥Ã¥¯¥¿¥¤¥à¥¢¥¦¥È¤ÎºÇ¾®»þ´Ö¤ò¡¢
-    Éäǡ¢»ØÄꤹ¤ë¤¿¤á¤Ë <code class="directive">DavMinTimeout</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¤¤Þ¤¹¡£
-    ¥Þ¥¤¥¯¥í¥½¥Õ¥È¤Î¥¦¥§¥Ö¥Õ¥©¥ë¥À¤Î¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï 120 ÉäǤ¹¤¬¡¨
-    ¥Í¥Ã¥È¥ï¡¼¥¯¤ÎÃÙ±ä¤Î¤»¤¤¤Ç¥¯¥é¥¤¥¢¥ó¥È¤¬¥í¥Ã¥¯¤ò¼º¤¦¤Î¤ò¸º¤é¤¹¤¿¤á¤Ë¡¢
-    <code class="directive">DavMinTimeout</code> ¤ò»È¤Ã¤Æ
-    ¤³¤ì¤ò¤â¤Ã¤ÈÂ礭¤ÊÃÍ (Î㤨¤Ð 600 ÉÃ) ¤Ë¾å½ñ¤­¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      &lt;Location /MSWord&gt;<br />
-      <span class="indent">
-        DavMinTimeout 600<br />
-      </span>
-      &lt;/Location&gt;
-    </code></p></div>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_dav.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_dav.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_dav.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dav.html.ja.utf8 b/docs/manual/mod/mod_dav.html.ja.utf8
new file mode 100644
index 00000000..e6663fd6
--- /dev/null
+++ b/docs/manual/mod/mod_dav.html.ja.utf8
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_dav - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_dav</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_dav.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_dav.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_dav.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>分散オーサリング��ージョン管�
+(<a href="http://www.webdav.org/">WebDAV</a>) 機能</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>dav_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_dav.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール�クラス 1 �クラス 2 �
+    <a href="http://www.webdav.org">WebDAV</a>
+    ('ウェブベース�分散オーサリング��ージョン管�')
+    機能を Apache ��供���。
+    �� HTTP プロトコル�拡張�より�リモート�ウェブサー�上��る
+    リソースやコレクションを
+    作��移動�複製�削除��るよ���り��。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#dav">Dav</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#davdepthinfinity">DavDepthInfinity</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#davmintimeout">DavMinTimeout</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#example">Enabling WebDAV</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#security">セキュリティ��題</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#complex">複雑�設定</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/mod_dav_fs.html#davlockdb">DavLockDB</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#limitxmlrequestbody">LimitXMLRequestBody</a></code></li>
+<li><a href="http://www.webdav.org">WebDAV Resources</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="example" id="example">Enabling WebDAV</a></h2>
+    <p>mod_dav を有効��る���<code>httpd.conf</code>
+    ファイル中�コンテナ�次を加���:</p>
+
+    <div class="example"><p><code>Dav On</code></p></div>
+
+    <p>�れ� DAV ファイルシステムプロ�イダを有効����。DAV
+    ファイルシステムプロ�イダ� <code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code>
+    モジュール�実装�れ����。���ら���モジュール�コンパイル時�
+    サー��組�込�れ��る���る��
+    <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code>
+    を使用��実行時�ロード�れ��る必���り��。</p>
+    
+    <p>�ら��DAV ロックデータベース�場所�
+    <code class="directive"><a href="../mod/mod_dav_fs.html#davlockdb">DavLockDB</a></code> ディレクティブを使��
+    <code>httd.conf</code> ファイル�グロー�ルセクション�指定�れ��る
+    必���り��。</p>
+
+    <div class="example"><p><code>
+      DavLockDB /usr/local/apache2/var/DavLock
+    </code></p></div>
+
+    <p>ロックデータベースファイル��るディレクトリ� Apache �実行�れ��る
+    <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> � <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> �書�込�権���る必���り��。</p>
+
+    <p><code class="directive"><a href="../mod/core.html#limit">&lt;Limit&gt;</a></code>
+    節を <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
+    ディレクティブ内部�追加���DAV �有効�場所��
+    アクセスを制��る��も����。DAV クライアント�
+    一度�リクエスト��信��る最大�イト数を指定�������
+    <code class="directive"><a href="../mod/core.html#limitxmlrequestbody">LimitXMLRequestBody</a></code>
+    ディレクティブを使用�る必���り��。「通常��
+    <code class="directive"><a href="../mod/core.html#limitrequestbody">LimitRequestBody</a></code>
+    ディレクティブ� DAV リクエスト�対���効力を����ん。</p>
+
+    <div class="example"><h3>完全�例</h3><p><code>
+      DavLockDB /usr/local/apache2/var/DavLock<br />
+      <br />
+       &lt;Location /foo&gt;<br />
+       <span class="indent">
+         Order Allow,Deny<br />
+         Allow from all<br />
+         Dav On<br />
+         <br />
+         AuthType Basic<br />
+         AuthName DAV<br />
+         AuthUserFile user.passwd<br />
+         <br />
+         &lt;LimitExcept GET OPTIONS&gt;<br />
+         <span class="indent">
+           require user admin<br />
+         </span>
+         &lt;/LimitExcept&gt;<br />
+       </span>
+       &lt;/Location&gt;<br />
+    </code></p></div>
+
+    <p><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> � Greg Stein �ん� <a href="http://www.webdav.org/mod_dav/">Apache 1.3 用� mod_dav</a> �
+    由��るも���。��サイト�らより多��情報を手�入れる�������。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="security" id="security">セキュリティ��題</a></h2>
+
+    <p>DAV �アクセスメソッド��隔クライアント�サー��ファイルを
+    �作�る��を�能������� <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> を使用�る
+    ���サー��安全��る��を特�注���確����れ��り��ん。</p>
+
+    <p>サー�上� DAV �使用�能�����る場所�����証��護������。
+    HTTP 基本�証�使用�推奨����ん。少���も 
+    <code class="module"><a href="../mod/mod_auth_digest.html">mod_auth_digest</a></code> モジュール��供�れる HTTP 
+    ダイジェスト�証を用�る����。WebDAV クライアント���ん��
+    ���証方法�対応�����。代�り��<a href="../ssl/">SSL</a> �
+    有効�コ�クションを通��基本�証を使���も����。</p>
+
+    <p><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> �ファイルを�作��るよ���る�����
+    管�下�ディレクトリ�ファイル�� Apache �実行�れ��る <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> � <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> �書�込��能��る必���り��。
+    新��作��れるファイルも�� <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code>
+    � <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> �所有�れる
+    ����り��。���由�ら���アカウント��アクセスを制御�る���
+    ����。DAV リ�ジトリ� Apache 専用�も������れ����。
+    Apache 以外�方法�ファイルを修正�る�� (例�� FTP やファイルシステム
+    用�ツール��を使��) �許��れ����ん。</p>
+
+    <p><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> ������種類�サービス拒�攻撃��ら�れる
+    �も�れ��ん。<code class="directive"><a href="../mod/core.html#limitxmlrequestbody">LimitXMLRequestBody</a></code> ディレクティブを使��
+    大�� DAV リクエストを解��る���消費�れるメモリ��を制��る���
+    ����。<code class="directive"><a href="#davdepthinfinity">DavDepthInfinity</a></code> ディレクティブ�
+    <code>PROPFIND</code> リクエスト�巨大リ�ジトリ�大��メモリを消費�る�を
+    防��������。他�サービス拒�攻撃���純�使用�能�ディスク領域を
+    多��大��ファイル�埋�����んも���り��。�れを直接防�方法�
+    Apache ���り��ん���信用����ユーザ� DAV アクセスを�供�る��
+    ���方�良���ょ�。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="complex" id="complex">複雑�設定</a></h2>
+
+    <p>よ��る�求��<code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> を使��動的�ファイル
+    (PHP スクリプト�CGI スクリプト��) を�作������も���り��。
+    �れ�実���<code>GET</code> リクエスト�スクリプト�内容をダウンロード��る
+    代�り��スクリプトを常�実行��������難��������。
+    �れを回��る方法���二���� URL を��コンテンツ�マップ��
+    一��スクリプトを実行���も�一��ダウンロード���り�DAV �ら
+    �作�れ�り�るよ��設定�る���も���り��。</p>
+
+<div class="example"><p><code>
+Alias /phparea /home/gstein/php_files<br />
+Alias /php-source /home/gstein/php_files<br />
+&lt;Location /php-source&gt;
+<span class="indent">
+    DAV On<br />
+    ForceType text/plain<br />
+</span>
+&lt;/Location&gt;
+</code></p></div>
+
+    <p>��設定�より�<code>http://example.com/phparea</code> を PHP スクリプト�
+    出力をアクセス�る���使�������
+    <code>http://example.com/php-source</code> を DAV クライアント�よる
+    ��作����使��������。</p>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Dav" id="Dav">Dav</a> <a name="dav" id="dav">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>WebDAV HTTP メソッドを有効����</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Dav On|Off|<var>provider-name</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>Dav Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_dav</td></tr>
+</table>
+    <p>与�られ�コンテナ� WebDAV HTTP メソッド�使�るよ���る��
+    次�よ�����。</p>
+
+    <div class="example"><p><code>
+      &lt;Location /foo&gt;<br />
+      <span class="indent">
+        Dav On<br />
+      </span>
+      &lt;/Location&gt;
+    </code></p></div>
+
+    <p><code>On</code> ���指定�実際�� <code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code>
+    ��供�れ��るデフォルト�プロ�イダ�<code>filesystem</code>
+    ��エイリアス�������。一度�るロケーション� DAV 
+    を有効���後����サブロケーション�<em>無効化�る�������</em>
+    ������注�������。完全�設定例�<a href="#example">上記�セクション</a> を�覧下��。</p>
+
+    <div class="warning">
+      サー��セキュリティ�確���る�� WebDAV を有効���������。
+      �����れ�誰�も��サー��ファイルを�布�る�����るよ��
+      ��������。
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DavDepthInfinity" id="DavDepthInfinity">DavDepthInfinity</a> <a name="davdepthinfinity" id="davdepthinfinity">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>PROPFIND, Depth: Infinity リクエストを許����</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DavDepthInfinity on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DavDepthInfinity off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_dav</td></tr>
+</table>
+    <p>'Depth: Infinity' を�ん��る
+    <code>PROPFIND</code> リクエストを処���るよ���る���
+    <code class="directive">DavDepthInfinity</code>
+    ディレクティブを使���。��タイプ�リクエスト�
+    denial-of-service アタック��り�る���
+    デフォルト��許��れ����ん。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DavMinTimeout" id="DavMinTimeout">DavMinTimeout</a> <a name="davmintimeout" id="davmintimeout">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>サー�� DAV リソース�ロックを維��る最�時間��。
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DavMinTimeout <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DavMinTimeout 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_dav</td></tr>
+</table>
+    <p>クライアント� DAV リソースロックを�求��場��
+    ロック�サー��よ��自動的�解除�れる���時間を
+    �時�指定�る�������。��値���るリクエスト�����
+    サー���れを無視�る��も������
+    任��値をクライアント�通知�る��も����。</p>
+
+    <p>クライアント�戻�ロックタイムアウト�最�時間を�
+    秒��指定�る��� <code class="directive">DavMinTimeout</code>
+    ディレクティブを使���。
+    マイクロソフト�ウェブフォルダ�デフォルト�� 120 秒���；
+    �ットワーク��延����クライアント�ロックを失��を減ら�����
+    <code class="directive">DavMinTimeout</code> を使��
+    �れをも��大��値 (例�� 600 秒) �上書�����。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      &lt;Location /MSWord&gt;<br />
+      <span class="indent">
+        DavMinTimeout 600<br />
+      </span>
+      &lt;/Location&gt;
+    </code></p></div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_dav.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_dav.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_dav.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dav.html.ko.euc-kr b/docs/manual/mod/mod_dav.html.ko.euc-kr
index 733288bd..cec6e5f2 100644
--- a/docs/manual/mod/mod_dav.html.ko.euc-kr
+++ b/docs/manual/mod/mod_dav.html.ko.euc-kr
@@ -260,6 +260,6 @@ Alias /php-source /home/gstein/php_files<br />
 <a href="../ja/mod/mod_dav.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_dav.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dav_fs.html b/docs/manual/mod/mod_dav_fs.html
index 44954c4d..08525a40 100644
--- a/docs/manual/mod/mod_dav_fs.html
+++ b/docs/manual/mod/mod_dav_fs.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_dav_fs.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_dav_fs.html.ja.euc-jp
+URI: mod_dav_fs.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_dav_fs.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_dav_fs.html.en b/docs/manual/mod/mod_dav_fs.html.en
index add6684b..c0c57df3 100644
--- a/docs/manual/mod/mod_dav_fs.html.en
+++ b/docs/manual/mod/mod_dav_fs.html.en
@@ -92,6 +92,6 @@
 <a href="../ja/mod/mod_dav_fs.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_dav_fs.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dav_fs.html.ja.euc-jp b/docs/manual/mod/mod_dav_fs.html.ja.euc-jp
deleted file mode 100644
index dd7a5fea..00000000
--- a/docs/manual/mod/mod_dav_fs.html.ja.euc-jp
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_dav_fs - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_dav_fs</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_dav_fs.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_dav_fs.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_dav_fs.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> ¤Î¤¿¤á¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥×¥í¥Ð¥¤¥À</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>dav_fs_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_dav_fs.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code>
-    ¤Î¥µ¡¼¥Ó¥¹¤ò<em>ɬÍפȤ·¤Þ¤¹</em>¡£<code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code>
-    ¤Î¥µ¥Ý¡¼¥È¥â¥¸¥å¡¼¥ë¤È¤·¤ÆÆ°ºî¤·¡¢¥µ¡¼¥Ð¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Ë
-    °ÌÃÖ¤¹¤ë¥ê¥½¡¼¥¹¤Ø¤Î¥¢¥¯¥»¥¹¤òÄ󶡤·¤Þ¤¹¡£¤³¤Î¥×¥í¥Ð¥¤¥À¤ÎÀµ¼°¤Ê̾Á°¤Ï
-    <code>filesystem</code> ¤Ç¤¹¡£<code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code>
-    ¥Ð¥Ã¥¯¥¨¥ó¥É¥×¥í¥Ð¥¤¥À¤Ï <code class="directive"><a href="../mod/mod_dav.html#dav">Dav</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ·¤Æµ¯Æ°¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      Dav filesystem
-    </code></p></div>
-
-    <p><code>filesystem</code> ¤Ï <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code>
-    ¤Î¥Ç¥Õ¥©¥ë¥È¥×¥í¥Ð¥¤¥À¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¤«¤é¡¢Âå¤ï¤ê¤Ëñ¤Ë
-    <code>On</code> ¤È»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#davlockdb">DavLockDB</a></li>
-</ul>
-<h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></li>
-</ul></div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DavLockDB" id="DavLockDB">DavLockDB</a> <a name="davlockdb" id="davlockdb">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>DAV ¥í¥Ã¥¯¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î°ÌÃÖ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>DavLockDB <var>file-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_dav_fs</td></tr>
-</table>
-    <p>¥í¥Ã¥¯¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ø¤Î¥Õ¥ë¥Ñ¥¹¤ò¡¢³ÈÄ¥»Ò¤ò½ü¤¤¤¿·Á¤Ç
-    »ØÄꤹ¤ë¤Ë¤Ï¡¢<code class="directive">DavLockDB</code>
-    ¤ò»È¤¤¤Þ¤¹¡£¥Ñ¥¹¤¬ÀäÂХѥ¹¤Ç¤Ê¤±¤ì¤Ð¡¢<code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> ¤«¤é¤ÎÁêÂХѥ¹¤È²ò¼á¤µ¤ì¤Þ¤¹¡£
-    <code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code> ¼ÂÁõ¤Ç¤Ï¡¢¥æ¡¼¥¶¥í¥Ã¥¯¤ò
-    ÄÉÀפ¹¤ë¤¿¤á¤Ë SDBM ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò»È¤¤¤Þ¤¹¡£</p>
-
-    
-
-    <div class="example"><h3>Îã</h3><p><code>
-      DavLockDB logs/DavLock
-    </code></p></div>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_dav_fs.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_dav_fs.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_dav_fs.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dav_fs.html.ja.utf8 b/docs/manual/mod/mod_dav_fs.html.ja.utf8
new file mode 100644
index 00000000..651cb350
--- /dev/null
+++ b/docs/manual/mod/mod_dav_fs.html.ja.utf8
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_dav_fs - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_dav_fs</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_dav_fs.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_dav_fs.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_dav_fs.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> ����ファイルシステムプロ�イダ</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>dav_fs_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_dav_fs.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール� <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code>
+    �サービスを<em>必�����</em>。<code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code>
+    �サ�ートモジュール���動作��サー�ファイルシステム上�
+    �置�るリソース��アクセスを�供���。��プロ�イダ�正�����
+    <code>filesystem</code> ��。<code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code>
+    �ックエンドプロ�イダ� <code class="directive"><a href="../mod/mod_dav.html#dav">Dav</a></code>
+    ディレクティブを使用��起動�れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      Dav filesystem
+    </code></p></div>
+
+    <p><code>filesystem</code> � <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code>
+    �デフォルトプロ�イダ��������ら�代�り���
+    <code>On</code> �指定�る��も����。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#davlockdb">DavLockDB</a></li>
+</ul>
+<h3>�照</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></li>
+</ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DavLockDB" id="DavLockDB">DavLockDB</a> <a name="davlockdb" id="davlockdb">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>DAV ロックデータベース��置</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DavLockDB <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_dav_fs</td></tr>
+</table>
+    <p>ロックデータベース��フルパスを�拡張�を除��形�
+    指定�る���<code class="directive">DavLockDB</code>
+    を使���。パス�絶対パス���れ��<code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> �ら�相対パス�解釈�れ��。
+    <code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code> 実装���ユーザロックを
+    追跡�る��� SDBM データベースを使���。</p>
+
+    
+
+    <div class="example"><h3>例</h3><p><code>
+      DavLockDB logs/DavLock
+    </code></p></div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_dav_fs.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_dav_fs.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_dav_fs.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dav_fs.html.ko.euc-kr b/docs/manual/mod/mod_dav_fs.html.ko.euc-kr
index 4d0b17fd..4c07253d 100644
--- a/docs/manual/mod/mod_dav_fs.html.ko.euc-kr
+++ b/docs/manual/mod/mod_dav_fs.html.ko.euc-kr
@@ -91,6 +91,6 @@
 <a href="../ja/mod/mod_dav_fs.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_dav_fs.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dav_lock.html b/docs/manual/mod/mod_dav_lock.html
index 495493ea..9c5bb17f 100644
--- a/docs/manual/mod/mod_dav_lock.html
+++ b/docs/manual/mod/mod_dav_lock.html
@@ -1,7 +1,9 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_dav_lock.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_dav_lock.html.ja.euc-jp
+URI: mod_dav_lock.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/mod_dav_lock.html.en b/docs/manual/mod/mod_dav_lock.html.en
index 041b8448..e288039c 100644
--- a/docs/manual/mod/mod_dav_lock.html.en
+++ b/docs/manual/mod/mod_dav_lock.html.en
@@ -36,10 +36,10 @@
     the service of <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code>. But without a backend provider
     which makes use of it, it's useless and should not be loaded into the
     server. A sample backend module which actually utilizes
-    <code class="module"><a href="../mod/mod_dav_lock.html">mod_dav_lock</a></code>, is <a href="http://subversion.tigris.org/">mod_dav_svn</a>, the subversion provider module.</p>
+    <code class="module"><a href="../mod/mod_dav_lock.html">mod_dav_lock</a></code> is <a href="http://subversion.tigris.org/">mod_dav_svn</a>, the subversion provider module.</p>
 
     <p>Note that <code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code> does <em>not</em> need this
-    generic locking module, because it uses it's own more specialized
+    generic locking module, because it uses its own more specialized
     version.</p>
 
     <p>In order to make <code class="module"><a href="../mod/mod_dav_lock.html">mod_dav_lock</a></code> functional, you just have
@@ -49,7 +49,7 @@
     <div class="note"><h3>Developer's Note</h3>
       <p>In order to retrieve the pointer to the locking provider function, you
       have to use the <code>ap_lookup_provider</code> API with the arguments
-      <code>dav-lock</code>, <code>generic</code> and <code>0</code>.</p>
+      <code>dav-lock</code>, <code>generic</code>, and <code>0</code>.</p>
     </div>
 </div>
 <div id="quickview"><h3 class="directives">Directives</h3>
@@ -72,7 +72,7 @@
 </table>
     <p>Use the <code class="directive">DavGenericLockDB</code> directive to specify
     the full path to the lock database, excluding an extension. If
-    the path is not absolute, it will be taken relative to <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>. The implementation of
+    the path is not absolute, it will be interpreted relative to <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>. The implementation of
     <code class="module"><a href="../mod/mod_dav_lock.html">mod_dav_lock</a></code> uses a SDBM database to track user
     locks.</p>
 
@@ -87,7 +87,7 @@
     directory for this purpose rather than changing the permissions on
     an existing directory.  In the above example, Apache will create
     files in the <code>var/</code> directory under the <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> with the base filename
-    <code>DavLock</code> and extension name chosen by the server.</p>
+    <code>DavLock</code> and an extension added by the server.</p>
 
 
 </div>
@@ -96,6 +96,6 @@
 <p><span>Available Languages: </span><a href="../en/mod/mod_dav_lock.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_dav_lock.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dav_lock.html.ja.euc-jp b/docs/manual/mod/mod_dav_lock.html.ja.euc-jp
deleted file mode 100644
index 6b664ce3..00000000
--- a/docs/manual/mod/mod_dav_lock.html.ja.euc-jp
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_dav_lock - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_dav_lock</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_dav_lock.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_dav_lock.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> ÍѤÎÈÆÍÑ¥í¥Ã¥¯¥â¥¸¥å¡¼¥ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>dav_lock_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_dav_lock.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>¥Ð¡¼¥¸¥ç¥ó 2.1 °Ê¹ß</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> ¤Î¤É¤Î¥Ð¥Ã¥¯¥¨¥ó¥É
-    ¤«¤é¤Ç¤â»È¤¨¤ëÈÆÍÑ¥í¥Ã¥¯ API ¤òÄ󶡤·¤Þ¤¹¡£
-    »ÈÍѤˤϺÇÄã¸Â <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code>
-    ¤òɬÍפȤ·¤Þ¤¹¤¬¡¢¤³¤ì¤òÍøÍѤ¹¤ë¥Ð¥Ã¥¯¥¨¥ó¥É¤¬Â¸ºß¤·¤Ê¤¤¤ÈÌò¤ËΩ¤¿¤Ê¤¤¤Î¤Ç¡¢
-    ¤½¤Î¤è¤¦¤Ê¾ì¹ç¤Ï¥µ¡¼¥Ð¤ËÆɤ߹þ¤à¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-    <code class="module"><a href="../mod/mod_dav_lock.html">mod_dav_lock</a></code>
-    ¤ò¼ÂºÝ¤ËÍøÍѤ¹¤ë¥Ð¥Ã¥¯¥¨¥ó¥É¥â¥¸¥å¡¼¥ë¤ÎÎã¤È¤·¤Æ¤Ï subversion
-    ¥×¥í¥Ð¥¤¥À¥â¥¸¥å¡¼¥ë¤Î <a href="http://subversion.tigris.org/">mod_dav_svn</a> ¤¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p><code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code> ¤ÏÆò½¤µ¤ì¤¿ÀìÍѤΥС¼¥¸¥ç¥ó¤ò
-    »È¤¦¤¿¤á¡¢¤³¤ÎÈÆÍѥ⥸¥å¡¼¥ë¤Ï<em>ɬÍפʤ¤</em>¤³¤È¤ËÃí°Õ¤·¤Æ
-    ¤¯¤À¤µ¤¤¡£</p>
-
-    <p><code class="module"><a href="../mod/mod_dav_lock.html">mod_dav_lock</a></code> ¤òµ¡Ç½¤µ¤»¤ë¤Ë¤Ï¡¢
-    °Ê²¼¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë <code class="directive"><a href="#davgenericlockdb">DavGenericLockDB</a></code> ¤ò»È¤Ã¤Æ
-    ¥í¥Ã¥¯¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¾ì½ê¤ò»ØÄꤹ¤ë¤À¤±¤Ç¤¹¡£</p>
-
-    <div class="note"><h3>³«È¯¼Ô¸þ¤±¤Î¥á¥â</h3>
-      <p>¥í¥Ã¥¯¤òÄ󶡤·¤Æ¤¤¤ë´Ø¿ô¤Ø¤Î¥Ý¥¤¥ó¥¿¤ò¼èÆÀ¤¹¤ë¤¿¤á¤Ë¤Ï¡¢
-      <code>ap_lookup_provider</code> API ¤ò¡¢°ú¿ô <code>dav-lock</code>,
-      <code>generic</code>, <code>0</code> ¤ò»ØÄꤷ¤Æ»È¤¦É¬Íפ¬
-      ¤¢¤ê¤Þ¤¹¡£</p>
-    </div>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#davgenericlockdb">DavGenericLockDB</a></li>
-</ul>
-<h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></li>
-</ul></div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DavGenericLockDB" id="DavGenericLockDB">DavGenericLockDB</a> <a name="davgenericlockdb" id="davgenericlockdb">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>DAV ¥í¥Ã¥¯¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¾ì½ê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>DavGenericLockDB <var>file-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_dav_lock</td></tr>
-</table>
-    <p><code class="directive">DavGenericLockDB</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    »È¤Ã¤Æ¡¢³ÈÄ¥»Ò¤ò½ü¤¤¤¿¥í¥Ã¥¯¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ø¤Î¥Õ¥ë¥Ñ¥¹¤ò
-    »ØÄꤷ¤Þ¤¹¡£ÀäÂХѥ¹¤Ç¤Ê¤¤¤È¤­¤Ï <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> ¤«¤é¤ÎÁêÂХѥ¹¤È¤·¤Æ
-    °·¤ï¤ì¤Þ¤¹¡£<code class="module"><a href="../mod/mod_dav_lock.html">mod_dav_lock</a></code> ¤Î¼ÂÁõ¤Ç¤Ï¥æ¡¼¥¶¤Î
-    ¥í¥Ã¥¯¤òÄÉÀפ¹¤ë¤Î¤Ë SDBM ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò»È¤¤¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      DavGenericLockDB var/DavLock
-    </code></p></div>
-
-    <p>¥í¥Ã¥¯¥Ç¡¼¥¿¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ï
-    Apache ¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code>
-    ¤È <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> ¤Ë¤è¤Ã¤Æ
-    ½ñ¤­¹þ¤ß²Äǽ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¥»¥­¥å¥ê¥Æ¥£¾å¤ÎÍýͳ¤«¤é¡¢
-    ´û¸¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤òÊѹ¹¤¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢
-    ÀìÍѤΥǥ£¥ì¥¯¥È¥ê¤òºî¤ë¤Î¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£¾å¤ÎÎã¤Ç¤Ï¡¢
-    Apache ¤Ï <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> ¤Î²¼¤Î <code>var/</code>
-    ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¡¢¥Õ¥¡¥¤¥ë̾¤ÎËÜÂΤ¬ <code>DavLock</code> ¤Ç
-    ¥µ¡¼¥Ð¤¬ÁªÂò¤·¤¿³ÈÄ¥»Ò¤ò»ý¤Ä¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹¡£</p>
-
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_dav_lock.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_dav_lock.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dav_lock.html.ja.utf8 b/docs/manual/mod/mod_dav_lock.html.ja.utf8
new file mode 100644
index 00000000..dcef73af
--- /dev/null
+++ b/docs/manual/mod/mod_dav_lock.html.ja.utf8
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_dav_lock - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_dav_lock</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_dav_lock.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_dav_lock.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> 用�汎用ロックモジュール</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>dav_lock_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_dav_lock.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>�ージョン 2.1 以�</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール� <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code> ����ックエンド
+    �ら�も使�る汎用ロック API を�供���。
+    使用��最低� <code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code>
+    を必��������れを利用�る�ックエンド�存在����役�立������
+    ��よ��場��サー��読�込む�����り��ん。
+    <code class="module"><a href="../mod/mod_dav_lock.html">mod_dav_lock</a></code>
+    を実際�利用�る�ックエンドモジュール�例���� subversion
+    プロ�イダモジュール� <a href="http://subversion.tigris.org/">mod_dav_svn</a> ��り��。</p>
+
+    <p><code class="module"><a href="../mod/mod_dav_fs.html">mod_dav_fs</a></code> �特化�れ�専用��ージョンを
+    使������汎用モジュール�<em>必���</em>���注���
+    ����。</p>
+
+    <p><code class="module"><a href="../mod/mod_dav_lock.html">mod_dav_lock</a></code> を機能��る���
+    以下�説明�れ��る <code class="directive"><a href="#davgenericlockdb">DavGenericLockDB</a></code> を使��
+    ロックデータベース�場所を指定�る����。</p>
+
+    <div class="note"><h3>開発者���メモ</h3>
+      <p>ロックを�供���る関数���インタを�得�る�����
+      <code>ap_lookup_provider</code> API を�引数 <code>dav-lock</code>,
+      <code>generic</code>, <code>0</code> を指定��使�必��
+      �り��。</p>
+    </div>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#davgenericlockdb">DavGenericLockDB</a></li>
+</ul>
+<h3>�照</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_dav.html">mod_dav</a></code></li>
+</ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DavGenericLockDB" id="DavGenericLockDB">DavGenericLockDB</a> <a name="davgenericlockdb" id="davgenericlockdb">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>DAV ロックデータベース�場所</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DavGenericLockDB <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_dav_lock</td></tr>
+</table>
+    <p><code class="directive">DavGenericLockDB</code> ディレクティブを
+    使���拡張�を除��ロックデータベース��フルパスを
+    指定���。絶対パス������ <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> �ら�相対パス���
+    扱�れ��。<code class="module"><a href="../mod/mod_dav_lock.html">mod_dav_lock</a></code> �実装��ユーザ�
+    ロックを追跡�る�� SDBM データベースを使���。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      DavGenericLockDB var/DavLock
+    </code></p></div>
+
+    <p>ロックデータベースファイル��るディレクトリ�
+    Apache �実行�れ��る <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code>
+    � <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> �よ��
+    書�込��能���れ��り��ん。セキュリティ上��由�ら�
+    既存�ディレクトリ�パーミッションを変更�る������
+    専用�ディレクトリを作る��良���ょ�。上�例���
+    Apache � <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> �下� <code>var/</code>
+    ディレクトリ��ファイル��本体� <code>DavLock</code> �
+    サー���択��拡張�を��ファイルを作����。</p>
+
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_dav_lock.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_dav_lock.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dbd.html b/docs/manual/mod/mod_dbd.html
index 53de34db..3315b15b 100644
--- a/docs/manual/mod/mod_dbd.html
+++ b/docs/manual/mod/mod_dbd.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_dbd.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_dbd.html.en b/docs/manual/mod/mod_dbd.html.en
index c6060b72..e45e8adf 100644
--- a/docs/manual/mod/mod_dbd.html.en
+++ b/docs/manual/mod/mod_dbd.html.en
@@ -31,11 +31,14 @@
 <h3>Summary</h3>
 
     <p><code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> manages SQL database connections using
-    <a href="http://people.apache.org/~niq/dbd.html">apr_dbd</a>.
-    It provides database connections on request to modules
-    requiring SQL database functions, and takes care of
+    <a class="glossarylink" href="../glossary.html#apr" title="see glossary">APR</a>.  It provides database connections on request
+    to modules requiring SQL database functions, and takes care of
     managing databases with optimal efficiency and scalability
-    for both threaded and non-threaded MPMs.</p>
+    for both threaded and non-threaded MPMs.  For details, see the
+    <a href="http://apr.apache.org/">APR</a> website and this overview of the
+    <a href="http://people.apache.org/~niq/dbd.html">Apache DBD Framework</a>
+    by its original developer.
+</p>
 </div>
 <div id="quickview"><h3 class="directives">Directives</h3>
 <ul id="toc">
@@ -66,8 +69,9 @@
     classic LAMP (Linux, Apache, Mysql, Perl/PHP/Python).
     On threaded platform, it provides an altogether more
     scalable and efficient <em>connection pool</em>, as
-    described in <a href="http://www.apachetutor.org/dev/reslist">this article at ApacheTutor</a>. <code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> supersedes
-    the modules presented in that article.</p>
+    described in <a href="http://www.apachetutor.org/dev/reslist">this
+    article at ApacheTutor</a>.  Note that <code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code>
+    supersedes the modules presented in that article.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="API" id="API">Apache DBD API</a></h2>
@@ -131,6 +135,7 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Keepalive time for idle connections</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DBDExptime <var>time-in-seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>DBDExptime 300</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_dbd</td></tr>
@@ -145,6 +150,7 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum sustained number of connections</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DBDKeep <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>DBDKeep 2</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_dbd</td></tr>
@@ -159,6 +165,7 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum number of connections</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DBDMax <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>DBDMax 10</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_dbd</td></tr>
@@ -172,6 +179,7 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Minimum number of connections</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DBDMin <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>DBDMin 1</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_dbd</td></tr>
@@ -265,6 +273,6 @@ APR_DECLARE_OPTIONAL_FN(void, ap_dbd_prepare, (server_rec*, const char*, const c
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_dbd.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_deflate.html b/docs/manual/mod/mod_deflate.html
index dd4e6dce..9bb00b5f 100644
--- a/docs/manual/mod/mod_deflate.html
+++ b/docs/manual/mod/mod_deflate.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_deflate.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_deflate.html.ja.euc-jp
+URI: mod_deflate.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_deflate.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_deflate.html.en b/docs/manual/mod/mod_deflate.html.en
index b984450d..c58f9363 100644
--- a/docs/manual/mod/mod_deflate.html.en
+++ b/docs/manual/mod/mod_deflate.html.en
@@ -371,6 +371,6 @@ client</td></tr>
 <a href="../ja/mod/mod_deflate.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_deflate.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_deflate.html.ja.euc-jp b/docs/manual/mod/mod_deflate.html.ja.euc-jp
deleted file mode 100644
index adb59866..00000000
--- a/docs/manual/mod/mod_deflate.html.ja.euc-jp
+++ /dev/null
@@ -1,385 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_deflate - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_deflate</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_deflate.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_deflate.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_deflate.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥¯¥é¥¤¥¢¥ó¥È¤ØÁ÷¤é¤ì¤ëÁ°¤Ë¥³¥ó¥Æ¥ó¥Ä¤ò°µ½Ì¤¹¤ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>deflate_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_deflate.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p><code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> ¥â¥¸¥å¡¼¥ë¤Ï <code>DEFLATE</code>
-    ½ÐÎÏ¥Õ¥£¥ë¥¿¤òÄ󶡤·¤Þ¤¹¡£¤³¤ì¤Ï¥µ¡¼¥Ð¤«¤é¤Î½ÐÎϤò¡¢¥Í¥Ã¥È¥ï¡¼¥¯¤ò
-    Ä̤·¤Æ¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤ëÁ°¤Ë°µ½Ì¤¹¤ë¤³¤È¤ò²Äǽ¤Ë¤·¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#deflatebuffersize">DeflateBufferSize</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#deflatecompressionlevel">DeflateCompressionLevel</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#deflatefilternote">DeflateFilterNote</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#deflatememlevel">DeflateMemLevel</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#deflatewindowsize">DeflateWindowSize</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#recommended">¥µ¥ó¥×¥ëÀßÄê</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#enable">°µ½Ì¤òÍ­¸ú¤Ë¤¹¤ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxies">Proxy ¥µ¡¼¥Ð¤Ç¤Î°·¤¤</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><a href="../filter.html">Filters</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="recommended" id="recommended">¥µ¥ó¥×¥ëÀßÄê</a></h2>
-    <p>²¼¤Ë¤»¤Ã¤«¤Á¤Ê¿Í¸þ¤±¤Î´Êñ¤ÊÀßÄêÎã¤ò¼¨¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>¿ô¥¿¥¤¥×¤Î¤ß°µ½Ì¤¹¤ë</h3><p><code>
-      AddOutputFilterByType DEFLATE text/html text/plain text/xml
-    </code></p></div>
-
-    <p>°Ê²¼¤ÎÀßÄê¤Ï¥³¥ó¥Æ¥ó¥Ä¤ò¤è¤ê°µ½Ì¤·¤Þ¤¹¤¬¡¢¤º¤Ã¤ÈÊ£»¨¤ÊÀßÄê¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ÀßÄê¤Î¶ù¡¹¤Þ¤Ç¤è¤¯Íý²ò¤·¤Ê¤¤¤Ç»È¤ï¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</p>
-
-    <div class="example"><h3>²èÁü°Ê³°Á´¤Æ°µ½Ì¤¹¤ë</h3><p><code>
-      &lt;Location /&gt;<br />
-      <span class="indent">
-        # Insert filter<br />
-        SetOutputFilter DEFLATE<br />
-        <br />
-        # Netscape 4.x has some problems...<br />
-        BrowserMatch ^Mozilla/4         gzip-only-text/html<br />
-        <br />
-        # Netscape 4.06-4.08 have some more problems<br />
-        BrowserMatch ^Mozilla/4\.0[678] no-gzip<br />
-        <br />
-        # MSIE masquerades as Netscape, but it is fine<br />
-        # BrowserMatch \bMSIE             !no-gzip !gzip-only-text/html<br />
-        <br />
-        # NOTE: Due to a bug in mod_setenvif up to Apache 2.0.48<br />
-        # the above regex won't work. You can use the following<br />
-        # workaround to get the desired effect:<br />
-        BrowserMatch \bMSI[E]           !no-gzip !gzip-only-text/html<br />
-        <br />
-        # Don't compress images<br />
-        SetEnvIfNoCase Request_URI \<br />
-        <span class="indent">
-          \.(?:gif|jpe?g|png)$ no-gzip dont-vary<br />
-        </span>
-        <br />
-        # Make sure proxies don't deliver the wrong content<br />
-        Header append Vary User-Agent env=!dont-vary<br />
-      </span>
-      &lt;/Location&gt;
-    </code></p></div>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="enable" id="enable">°µ½Ì¤òÍ­¸ú¤Ë¤¹¤ë</a></h2>
-
-    <h3><a name="output" id="output">Output Compression</a></h3>
-      <p>°µ½Ìµ¡Ç½¤Ï <code>DEFLATE</code> <a href="../filter.html">¥Õ¥£¥ë¥¿</a>
-      ¤Ë¤è¤ê¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£°Ê²¼¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤½¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¤¢¤ë
-      ¥³¥ó¥Æ¥ÊÃæ¤Î¥É¥­¥å¥á¥ó¥È¤ò°µ½Ì¤¹¤ë¤è¤¦¤Ë¤·¤Þ¤¹:</p>
-      
-      <div class="example"><p><code>
-        SetOutputFilter DEFLATE
-      </code></p></div>
-
-      <p>¤è¤¯»È¤ï¤ì¤Æ¤¤¤ë¥Ö¥é¥¦¥¶¤Ç¤Ï¡¢¤¹¤Ù¤Æ¤Î¥³¥ó¥Æ¥ó¥Ä¤ËÂФ¹¤ë
-      °µ½Ì¤ò°·¤¨¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤Ç¤¹¤«¤é¡¢<code>gzip-only-text/html</code> 
-      ¥Î¡¼¥È¤ò <code>1</code> ¤Ë¤·¤Æ¡¢html ¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¤Î¤ß
-      °µ½Ì¤¬Æ¯¤¯¤è¤¦¤Ë¤·¤¿Êý¤¬¤è¤¤¤«¤â¤·¤ì¤Þ¤»¤ó (°Ê²¼»²¾È)
-      ¤³¤ÎÃͤò <em><code>1</code> °Ê³°¤ÎÃÍ</em>¤ËÀßÄꤷ¤¿¾ì¹ç¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£</p>
-      
-      <p>Ä̾ÆÃÄê¤ÎMIME¥¿¥¤¥×¤Ë¤Ä¤¤¤Æ¤Î¤ß°µ½Ì¤·¤¿¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
-      <code class="directive"><a href="../mod/core.html#addoutputfilterbytype">AddOutputFilterByType</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ·¤Þ¤¹¡£¼¡¤Ë Apache ¤Î¥É¥­¥å¥á¥ó¥È¤Î html
-      ¥Õ¥¡¥¤¥ë¤Î¤ß¤Î°µ½Ì¤òÍ­¸ú¤Ë¤¹¤ëÎã¤ò¼¨¤·¤Þ¤¹¡£</p>
-
-      <div class="example"><p><code>
-        &lt;Directory "/your-server-root/manual"&gt;<br />
-        <span class="indent">
-          AddOutputFilterByType DEFLATE text/html<br />
-        </span>
-        &lt;/Directory&gt;
-      </code></p></div>
-
-      <p>Á´¤Æ¤Î¥Õ¥¡¥¤¥ë¥¿¥¤¥×¤Ç¤Î°µ½Ì¤ËÌäÂê¤òÊú¤¨¤Æ¤¤¤ë¥Ö¥é¥¦¥¶¤ËÂФ·¤Æ¤Ï¡¢
-      <code class="directive"><a href="../mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ·¤Æ¡¢ÆÃÄê¤Î¥Ö¥é¥¦¥¶¤Ë <code>no-gzip</code>
-      ¥Î¡¼¥È¤ò¥»¥Ã¥È¤·¡¢°µ½Ì¤¬¹Ô¤Ê¤ï¤ì¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£
-      <code>no-gzip</code> ¤È <code>gzip-only-text/html</code>
-      ¤òÁȤ߹ç¤ï¤»¤ë¤³¤È¤Ç¾å¼ê¤¯Âнè¤Ç¤­¤Þ¤¹¡£
-      ¤³¤Î¾ì¹ç¡¢Á°¼Ô¤¬¸å¼Ô¤ò¥ª¡¼¥Ð¡¼¥é¥¤¥É¤·¤Þ¤¹¡£
-      ¾åµ­¤Î<a href="#recommended">ÀßÄêÎã</a>¤ÎÈ´¿è¤ò
-      ¼¡¤Ë¼¨¤·¤Þ¤¹¤Î¤Ç¤´Í÷²¼¤µ¤¤¡£</p>
-
-      <div class="example"><p><code>
-        BrowserMatch ^Mozilla/4         gzip-only-text/html<br />
-        BrowserMatch ^Mozilla/4\.0[678] no-gzip<br />
-        BrowserMatch \bMSIE             !no-gzip !gzip-only-text/html
-      </code></p></div>
-
-      <p>¤Þ¤º»Ï¤á¤Ë <code>User-Agent</code> ʸ»úÎ󤫤é Netscape Navigator
-      4.x ¤Ç¤¢¤ë¤«¤É¤¦¤«¤òÄ´¤Ù¤Þ¤¹¡£¤³¤ì¤é¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¢
-      <code>text/html</code> °Ê³°¤Î¥¿¥¤¥×¤Î°µ½Ì¤ò°·¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£
-      4.06, 4.07, 4.08 ¤Ï html ¥Õ¥¡¥¤¥ë¤Î¿­Ä¥¤Ë¤âÌäÂê¤òÊú¤¨¤Æ¤¤¤Þ¤¹¡£
-      ¤Ç¤¹¤«¤é¤³¤ì¤é¤ËÂФ·¤Æ¤Ï¡¢´°Á´¤Ë deflate ¥Õ¥£¥ë¥¿¤ò¥ª¥Õ¤Ë¤·¤Þ¤¹¡£</p>
-
-      <p>3 ÈÖÌܤΠ<code class="directive"><a href="../mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¡¢¿ä¬¤·¤¿¥æ¡¼¥¶¡¼¥¨¡¼¥¸¥§¥ó¥È¤ò½¤Àµ¤·¤Þ¤¹¡£
-      ¤Ê¤¼¤Ê¤é Microsoft Internet Explorer ¤â "Mozilla/4" ¤ÈÆÃÄꤵ¤ì¤Þ¤¹¤¬¡¢
-      ¤³¤ì¤é¤Ï¼ÂºÝ¤Ë¤Ï°µ½Ì¤ò°·¤¦¤³¤È¤¬¤Ç¤­¤ë¤«¤é¤Ç¤¹¡£
-      <code>User-Agent</code> ¥Ø¥Ã¥À¤ò "MSIE"
-      (<code>\b</code> ¤Ï¡Öñ¸ì¤Î¶­³¦¡×¤ò°ÕÌ£¤·¤Þ¤¹) ¤ÎÄɲÃʸ»ú¤Ç¸¡ºº¤·¤Æ¡¢
-      ¤³¤ì°ÊÁ°¤ËÀßÄꤷ¤¿À©¸Â¤òºÆ¤Ó²ò½ü¤·¤Þ¤¹¡£</p>
-
-      <div class="note"><h3>Ãí</h3>
-        <code>DEFLATE</code> ¥Õ¥£¥ë¥¿¤Ïɬ¤º¡¢PHP ¤ä SSI ¤È¤¤¤Ã¤¿ RESOURCE
-        ¥Õ¥£¥ë¥¿¤Î¸å¤Ë¤Ê¤ê¤Þ¤¹¡£
-        DEFLATE ¥Õ¥£¥ë¥¿¤ÏÆâÉôŪ¤Ê¥µ¥Ö¥ê¥¯¥¨¥¹¥È¤ò´ØÃΤ·¤Þ¤»¤ó¡£
-      </div>
-      <div class="note"><h3>Ãí</h3>
-        <code class="directive"><a href="../mod/core.html#setenv">SetEnv</a></code> ¤ÇÀßÄꤵ¤ì¤ë
-        <code>force-gzip</code> ´Ä¶­ÊÑ¿ô¤¬¤¢¤ê¤Þ¤¹¤¬¡¢¤³¤ì¤Ï
-        ¥Ö¥é¥¦¥¶¤Î accept-encoding ÀßÄê¤ò̵»ë¤·¡¢°µ½Ì¤·¤¿½ÐÎϤò¤·¤Þ¤¹¡£
-      </div>
-
-    
-    <h3><a name="inflate" id="inflate">½ÐÎϤο­Ä¹</a></h3>
-      <p><code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> ¥â¥¸¥å¡¼¥ë¤Ï¡¢gzip °µ½Ì¤µ¤ì¤¿¥ì¥¹¥Ý¥ó¥¹
-      ËÜʸ¤ò inflate/uncompress ¤¹¤ë¥Õ¥£¥ë¥¿¤âÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
-      ¤³¤Îµ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢<code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code>
-      ¤ä <code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code> ¤ò»È¤Ã¤Æ¡¢
-      <code>INFLATE</code> ¥Õ¥£¥ë¥¿¤ò½ÐÎÏ¥Õ¥£¥ë¥¿¥Á¥§¥¤¥ó¤ËÁÞÆþ¤·¤Þ¤¹¡£
-      Î㤨¤Ð¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</p>
-
-      <div class="example"><p><code>
-        &lt;Location /dav-area&gt;<br />
-        <span class="indent">
-          ProxyPass http://example.com/<br />
-          SetOutputFilter INFLATE<br />
-        </span>
-        &lt;/Location&gt;
-      </code></p></div>
-
-      <p>¤³¤ÎÎã¤Ç¤Ï¡¢example.com ¤«¤é¤Î gzip °µ½Ì¤µ¤ì¤¿½ÐÎϤò¿­Ä¹¤·¡¢
-      ¤½¤Î¾¤Î¥Õ¥£¥ë¥¿¤¬¤µ¤é¤Ë¤½¤Î½ÐÎϤò½èÍý¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
-      </p>
-      
-    
-    <h3><a name="input" id="input">ÆþÎϤο­Ä¥</a></h3>
-      <p><code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> ¥â¥¸¥å¡¼¥ë¤Ï¡¢gzip
-      ¤Ç°µ½Ì¤µ¤ì¤¿¥ê¥¯¥¨¥¹¥ÈËÜÂΤò¿­Ä¥¤¹¤ë¥Õ¥£¥ë¥¿¤âÄ󶡤·¤Æ¤¤¤Þ¤¹¡£
-      ¤³¤Îµ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢<code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code>
-      ¤« <code class="directive"><a href="../mod/mod_mime.html#addinputfilter">AddInputFilter</a></code> ¤ò»ÈÍѤ·¤Æ¡¢
-      <code>DEFLATE</code> ¥Õ¥£¥ë¥¿¤òÆþÎÏ¥Õ¥£¥ë¥¿¥Á¥§¥¤¥ó¤ËÁȤ߹þ¤ß¤Þ¤¹¡£
-      Î㤨¤Ð¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-      <div class="example"><p><code>
-        &lt;Location /dav-area&gt;<br />
-        <span class="indent">
-          SetInputFilter DEFLATE<br />
-        </span>
-        &lt;/Location&gt;
-      </code></p></div>
-      
-      <p>¤³¤ÎÀßÄê¤Ç¤¢¤ì¤Ð¡¢<code>Content-Encoding: gzip</code>
-      ¥Ø¥Ã¥À¤ò´Þ¤à¥ê¥¯¥¨¥¹¥È¤¬Íè¤ë¤È¡¢ËÜÂΤϼ«Æ°Åª¤Ë¿­Ä¥¤µ¤ì¤Þ¤¹¡£
-      gzip ¥ê¥¯¥¨¥¹¥ÈËÜÂΤòÁ÷¿®¤¹¤ë¥Ö¥é¥¦¥¶¤Ï¤¢¤Þ¤ê¤¢¤ê¤Þ¤»¤ó¡£
-      ¤·¤«¤·¡¢Î㤨¤Ð <a href="http://www.webdav.org">WebDAV</a>
-      ¥¯¥é¥¤¥¢¥ó¥È¤Î´ö¤Ä¤«¤Ê¤É¡¢ÆÃÊ̤ʥ¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¥ê¥¯¥¨¥¹¥È¤Î
-      °µ½Ì¤ò¼ÂºÝ¤Ë¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤â¤Î¤â¤¢¤ê¤Þ¤¹¡£</p>
-
-      <div class="warning"><h3>Content-Length ¤Ë´Ø¤¹¤ëÃí°Õ</h3>
-        <p>¥ê¥¯¥¨¥¹¥ÈËÜÂΤ½¤ì¼«ÂΤòɾ²Á¤¹¤ë¾ì¹ç¤Ï¡¢<em><code>Content-Length</code>
-        ¥Ø¥Ã¥À¤ò¿®ÍѤ·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤</em>¡£Content-Length ¥Ø¥Ã¥À¤Ï¡¢
-        ¥¯¥é¥¤¥¢¥ó¥È¤«¤éÁ÷¿®¤µ¤ì¤ë¥Ç¡¼¥¿¤ÎŤµ¤òÈ¿±Ç¤·¤Æ¤¤¤ë¤Î¤Ç¤¢¤Ã¤Æ¡¢
-        ¿­Ä¥¤µ¤ì¤¿¥Ç¡¼¥¿¥¹¥È¥ê¡¼¥à¤Î<em>¥Ð¥¤¥È¥«¥¦¥ó¥È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó</em>¡£</p>
-      </div>
-    
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="proxies" id="proxies">Proxy ¥µ¡¼¥Ð¤Ç¤Î°·¤¤</a></h2>
-
-    <p><code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> ¥â¥¸¥å¡¼¥ë¤Ï <code>Vary: Accept-Encoding</code>
-    HTTP ±þÅú¥Ø¥Ã¥À¤òÁ÷¿®¤·¤Æ¡¢Å¬ÀÚ¤Ê <code>Accept-Encoding</code>
-    ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤òÁ÷¿®¤¹¤ë¥¯¥é¥¤¥¢¥ó¥È¤ËÂФ·¤Æ¤Î¤ß¡¢
-    ¥×¥í¥¯¥·¥µ¡¼¥Ð¤¬¥­¥ã¥Ã¥·¥å¤·¤¿±þÅú¤òÁ÷¿®¤¹¤ë¤è¤¦¤ËÃí°Õ¤ò´­µ¯¤·¤Þ¤¹¡£
-    ¤³¤Î¤è¤¦¤Ë¤·¤Æ¡¢°µ½Ì¤ò°·¤¦¤³¤È¤Î¤Ç¤­¤Ê¤¤¥¯¥é¥¤¥¢¥ó¥È¤Ë
-    °µ½Ì¤µ¤ì¤¿ÆâÍƤ¬Á÷¤é¤ì¤ë¤³¤È¤Î¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£</p>
-
-    <p>¤â¤·ÆÃÊ̤˲¿¤«¤Ë°Í¸¤·¤Æ½ü³°¤·¤¿¤¤¾ì¹ç¡¢Î㤨¤Ð <code>User-Agent</code>
-    ¥Ø¥Ã¥À¤Ê¤É¤Ë°Í¸¤·¤Æ¤¤¤ë¾ì¹ç¡¢¼êÆ°¤Ç <code>Vary</code> ¥Ø¥Ã¥À¤òÀßÄꤷ¤Æ¡¢
-    ÄɲäÎÀ©¸Â¤Ë¤Ä¤¤¤Æ¥×¥í¥¯¥·¥µ¡¼¥Ð¤ËÃí°Õ¤ò¹Ô¤Ê¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
-    Î㤨¤Ð <code>User-Agent</code> ¤Ë°Í¸¤·¤Æ <code>DEFLATE</code>
-    ¤òÄɲ乤ëŵ·¿Åª¤ÊÀßÄê¤Ç¤Ï¡¢¼¡¤Î¤è¤¦¤ËÄɲ乤뤳¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      Header append Vary User-Agent
-    </code></p></div>
-    
-    <p>¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À°Ê³°¤Î¾ðÊó (<em>Î㤨¤Ð</em> HTTP ¥Ð¡¼¥¸¥ç¥ó)
-    ¤Ë°Í¸¤·¤Æ°µ½Ì¤¹¤ë¤«¤É¤¦¤«·è¤á¤ë¾ì¹ç¡¢
-    <code>Vary</code> ¥Ø¥Ã¥À¤ò <code>*</code> ¤ËÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤Î¤è¤¦¤Ë¤¹¤ë¤È¡¢»ÅÍͤ˽àµò¤·¤¿¥×¥í¥¯¥·¤Ï¥­¥ã¥Ã¥·¥å¤òÁ´¤¯¹Ô¤Ê¤ï¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      Header set Vary *
-    </code></p></div>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DeflateBufferSize" id="DeflateBufferSize">DeflateBufferSize</a> <a name="deflatebuffersize" id="deflatebuffersize">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>zlib ¤¬°ìÅ٤˰µ½Ì¤¹¤ë²ô¤ÎÂ礭¤µ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>DeflateBufferSize <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>DeflateBufferSize 8096</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_deflate</td></tr>
-</table>
-    <p><code class="directive">DeflateBufferSize</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    zlib ¤¬°ìÅ٤˰µ½Ì¤¹¤ë²ô¤ÎÂ礭¤µ¤ò¥Ð¥¤¥Èñ°Ì¤Ç»ØÄꤷ¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DeflateCompressionLevel" id="DeflateCompressionLevel">DeflateCompressionLevel</a> <a name="deflatecompressionlevel" id="deflatecompressionlevel">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>½ÐÎϤËÂФ·¤Æ¹Ô¤Ê¤¦°µ½Ì¤ÎÄøÅÙ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>DeflateCompressionLevel <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>Zlib ¤Î¥Ç¥Õ¥©¥ë¥È</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_deflate</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>This directive is available since Apache 2.0.45</td></tr>
-</table>
-     <p><code class="directive">DeflateCompressionLevel</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-         °µ½Ì¤ÎÄøÅÙ¤òÀßÄꤷ¤Þ¤¹¡£Â礭¤ÊÃͤǤϡ¢¤è¤ê°µ½Ì¤¬¹Ô¤Ê¤ï¤ì¤Þ¤¹¤¬¡¢
-         CPU »ñ¸»¤ò¾ÃÈñ¤·¤Þ¤¹¡£</p>
-    <p>ÃÍ¤Ï 1 (Äã°µ½Ì) ¤«¤é 9 (¹â°µ½Ì) ¤Ç¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DeflateFilterNote" id="DeflateFilterNote">DeflateFilterNote</a> <a name="deflatefilternote" id="deflatefilternote">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥í¥®¥ó¥°ÍѤ˰µ½ÌÈæ¤ò¥á¥â¤ËÄɲÃ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>DeflateFilterNote [<var>type</var>] <var>notename</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_deflate</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td><var>type</var> is available since Apache 2.0.45</td></tr>
-</table>
-    <p><code class="directive">DeflateFilterNote</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    °µ½ÌÈæ¤Ë´Ø¤¹¤ë¥á¥â¤¬¥ê¥¯¥¨¥¹¥È¤ËÉղ䵤ì¤ë¤³¤È¤ò»ØÄꤷ¤Þ¤¹¡£
-    ¥á¥â (note) ¤Î̾Á°¤Ï¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë»ØÄꤵ¤ì¤¿ÃͤǤ¹¡£
-    ¥á¥â¤Ï<a href="../logs.html#accesslog">¥¢¥¯¥»¥¹¥í¥°</a>¤Ë
-    Ãͤòµ­Ï¿¤·¡¢Åý·×¤ò¼è¤ëÌÜŪ¤Ë¤â»È¤¨¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      DeflateFilterNote ratio<br />
-      <br />
-      LogFormat '"%r" %b (%{ratio}n) "%{User-agent}i"' deflate<br />
-      CustomLog logs/deflate_log deflate
-    </code></p></div>
-
-    <p>¥í¥°¤«¤é¤â¤Ã¤ÈÀºÌ©¤ÊÃͤòÃê½Ð¤·¤¿¤¤¾ì¹ç¤Ï¡¢<var>type</var>
-    °ú¿ô¤ò»ÈÍѤ·¤Æ¡¢¥Ç¡¼¥¿¥¿¥¤¥×¤ò¥í¥°¤Î¥á¥â¤È¤·¤Æ»Ä¤¹¤è¤¦¤Ë»ØÄê¤Ç¤­¤Þ¤¹¡£
-    <var>type</var> ¤Ï¼¡¤Î¤¦¤Á¤Î°ì¤Ä¤Ç¤¹¡£</p>
-
-    <dl>
-      <dt><code>Input</code></dt>
-      <dd>¥Õ¥£¥ë¥¿¤ÎÆþÎÏ¥¹¥È¥ê¡¼¥à¤Î¥Ð¥¤¥È¥«¥¦¥ó¥È¤ò¥á¥â¤ËÊݸ¤¹¤ë¡£</dd>
-
-      <dt><code>Output</code></dt>
-      <dd>¥Õ¥£¥ë¥¿¤Î½ÐÎÏ¥¹¥È¥ê¡¼¥à¤Î¥Ð¥¤¥È¥«¥¦¥ó¥È¤ò¥á¥â¤ËÊݸ¤¹¤ë¡£</dd>
-
-      <dt><code>Ratio</code></dt>
-      <dd>°µ½ÌΨ (<code>½ÐÎÏ / ÆþÎÏ * 100</code>) ¤ò¥á¥â¤ËÊݸ¤¹¤ë¡£
-      <var>type</var> °ú¿ô¤ò¾Êά¤·¤¿¾ì¹ç¤Ï¡¢¤³¤ì¤¬¥Ç¥Õ¥©¥ë¥È¤È¤Ê¤ê¤Þ¤¹¡£</dd>
-    </dl>
-
-    <p>¤Þ¤È¤á¤ë¤È¡¢¼¡¤Î¤è¤¦¤Ë¥í¥°¤ò¼è¤ë¤³¤È¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£</p>
-
-    <div class="example"><h3>ÀºÌ©¤Ê¥í¥°ºÎ¼è</h3><p><code>
-      DeflateFilterNote Input instream<br />
-      DeflateFilterNote Output outstream<br />
-      DeflateFilterNote Ratio ratio<br />
-      <br />
-      LogFormat '"%r" %{outstream}n/%{instream}n (%{ratio}n%%)' deflate<br />
-      CustomLog logs/deflate_log deflate
-    </code></p></div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DeflateMemLevel" id="DeflateMemLevel">DeflateMemLevel</a> <a name="deflatememlevel" id="deflatememlevel">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>zlib ¤¬°µ½Ì¤Ë»È¤¦¥á¥â¥ê¤Î¥ì¥Ù¥ë¤ò»ØÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>DeflateMemLevel <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>DeflateMemLevel 9</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_deflate</td></tr>
-</table>
-    <p><code class="directive">DeflateMemLevel</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    zlib ¤¬°µ½Ì¤Ë»È¤¦¥á¥â¥ê¤Î¥ì¥Ù¥ë¤òÀßÄꤷ¤Þ¤¹ (1 ¤«¤é 9 ¤Î´Ö¤ÎÃÍ)¡£
-    (ÌõÃí: 2 ¤òÄì¤È¤¹¤ëÂпô¤ÎÃͤˤʤê¤Þ¤¹¡£
-    8 ÄøÅÙ¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£)</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DeflateWindowSize" id="DeflateWindowSize">DeflateWindowSize</a> <a name="deflatewindowsize" id="deflatewindowsize">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>Zlib ¤Î°µ½ÌÍÑ¥¦¥£¥ó¥É¥¦¤ÎÂ礭¤µ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>DeflateWindowSize <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>DeflateWindowSize 15</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_deflate</td></tr>
-</table>
-    <p><code class="directive">DeflateWindowSize</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    zlib ¤Î°µ½ÌÍÑ¥¦¥£¥ó¥É¥¦ (ÌõÃí: zlib ¤Ç»ÈÍѤµ¤ì¤ëÍúÎò¥Ð¥Ã¥Õ¥¡) 
-    ¤ÎÂ礭¤µ¤ò»ØÄꤷ¤Þ¤¹ (1 ¤«¤é 15 ¤Î´Ö¤ÎÃÍ)¡£
-    °ìÈÌŪ¤ËÂ礭¤Ê¥¦¥£¥ó¥É¥¦¥µ¥¤¥º¤ò»ÈÍѤ¹¤ë¤È°µ½ÌΨ¤¬¸þ¾å¤·¤Þ¤¹¡£
-    (ÌõÃí: 2 ¤òÄì¤È¤¹¤ëÂпô¤ÎÃͤˤʤê¤Þ¤¹¡£
-    8 ¤«¤é 15 ¤Ë¤¹¤ë¤Î¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£)</p>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_deflate.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_deflate.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_deflate.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_deflate.html.ja.utf8 b/docs/manual/mod/mod_deflate.html.ja.utf8
new file mode 100644
index 00000000..ddcfa19c
--- /dev/null
+++ b/docs/manual/mod/mod_deflate.html.ja.utf8
@@ -0,0 +1,377 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_deflate - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_deflate</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_deflate.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_deflate.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_deflate.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>クライアント��られる��コンテンツを圧縮�る</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>deflate_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_deflate.c</td></tr></table>
+<h3>概�</h3>
+
+    <p><code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> モジュール� <code>DEFLATE</code>
+    出力フィルタを�供���。�れ�サー��ら�出力を��ットワークを
+    通��クライアント��る��圧縮�る��を�能����。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#deflatebuffersize">DeflateBufferSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#deflatecompressionlevel">DeflateCompressionLevel</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#deflatefilternote">DeflateFilterNote</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#deflatememlevel">DeflateMemLevel</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#deflatewindowsize">DeflateWindowSize</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#recommended">サンプル設定</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#enable">圧縮を有効��る</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxies">Proxy サー���扱�</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><a href="../filter.html">Filters</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="recommended" id="recommended">サンプル設定</a></h2>
+    <p>下������人���簡��設定例を示���。</p>
+
+    <div class="example"><h3>数タイプ��圧縮�る</h3><p><code>
+      AddOutputFilterByType DEFLATE text/html text/plain text/xml
+    </code></p></div>
+
+    <p>以下�設定�コンテンツをより圧縮��������複雑�設定��り��。
+    設定�隅々��よ��解����使��������。</p>
+
+    <div class="example"><h3>画�以外全�圧縮�る</h3><p><code>
+      &lt;Location /&gt;<br />
+      <span class="indent">
+        # Insert filter<br />
+        SetOutputFilter DEFLATE<br />
+        <br />
+        # Netscape 4.x has some problems...<br />
+        BrowserMatch ^Mozilla/4         gzip-only-text/html<br />
+        <br />
+        # Netscape 4.06-4.08 have some more problems<br />
+        BrowserMatch ^Mozilla/4\.0[678] no-gzip<br />
+        <br />
+        # MSIE masquerades as Netscape, but it is fine<br />
+        BrowserMatch \bMSIE             !no-gzip !gzip-only-text/html<br />
+        # Don't compress images<br />
+        SetEnvIfNoCase Request_URI \<br />
+        <span class="indent">
+          \.(?:gif|jpe?g|png)$ no-gzip dont-vary<br />
+        </span>
+        <br />
+        # Make sure proxies don't deliver the wrong content<br />
+        Header append Vary User-Agent env=!dont-vary<br />
+      </span>
+      &lt;/Location&gt;
+    </code></p></div>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="enable" id="enable">圧縮を有効��る</a></h2>
+
+    <h3><a name="output" id="output">Output Compression</a></h3>
+      <p>圧縮機能� <code>DEFLATE</code> <a href="../filter.html">フィルタ</a>
+      �より実装�れ����。以下�ディレクティブ���ディレクティブ��る
+      コンテナ中�ドキュメントを圧縮�るよ�����:</p>
+      
+      <div class="example"><p><code>
+        SetOutputFilter DEFLATE
+      </code></p></div>
+
+      <p>よ�使�れ��るブラウザ�������コンテンツ�対�る
+      圧縮を扱�る�����り��ん。���ら�<code>gzip-only-text/html</code> 
+      ノートを <code>1</code> ����html ファイル�対����
+      圧縮���よ����方�よ��も�れ��ん (以下�照)
+      ��値を <em><code>1</code> 以外�値</em>�設定��場��無視�れ��。</p>
+      
+      <p>通常�特定�MIMEタイプ������圧縮������れ��
+      <code class="directive"><a href="../mod/core.html#addoutputfilterbytype">AddOutputFilterByType</a></code>
+      ディレクティブを使用���。次� Apache �ドキュメント� html
+      ファイル���圧縮を有効��る例を示���。</p>
+
+      <div class="example"><p><code>
+        &lt;Directory "/your-server-root/manual"&gt;<br />
+        <span class="indent">
+          AddOutputFilterByType DEFLATE text/html<br />
+        </span>
+        &lt;/Directory&gt;
+      </code></p></div>
+
+      <p>全��ファイルタイプ��圧縮��題を抱���るブラウザ�対����
+      <code class="directive"><a href="../mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code>
+      ディレクティブを使用���特定�ブラウザ� <code>no-gzip</code>
+      ノートをセット��圧縮�行��れ��よ�����。
+      <code>no-gzip</code> � <code>gzip-only-text/html</code>
+      を組����る���上手�対処����。
+      ��場���者�後者をオー�ーライド���。
+      上記�<a href="#recommended">設定例</a>�抜粋を
+      次�示������覧下��。</p>
+
+      <div class="example"><p><code>
+        BrowserMatch ^Mozilla/4         gzip-only-text/html<br />
+        BrowserMatch ^Mozilla/4\.0[678] no-gzip<br />
+        BrowserMatch \bMSIE             !no-gzip !gzip-only-text/html
+      </code></p></div>
+
+      <p>��始�� <code>User-Agent</code> 文字列�ら Netscape Navigator
+      4.x ��る����を調���。�れら��ージョン���
+      <code>text/html</code> 以外�タイプ�圧縮を扱��������ん。
+      4.06, 4.07, 4.08 � html ファイル�伸張�も�題を抱�����。
+      ���ら�れら�対����完全� deflate フィルタをオフ����。</p>
+
+      <p>3 番目� <code class="directive"><a href="../mod/mod_setenvif.html#browsermatch">BrowserMatch</a></code>
+      ディレクティブ��推測��ユーザーエージェントを修正���。
+      ���ら Microsoft Internet Explorer も "Mozilla/4" �特定�れ����
+      �れら�実際��圧縮を扱������る�ら��。
+      <code>User-Agent</code> ヘッダを "MSIE"
+      (<code>\b</code> �「�語�境界�を�味���) �追加文字�検査���
+      �れ以��設定��制�を��解除���。</p>
+
+      <div class="note"><h3>注</h3>
+        <code>DEFLATE</code> フィルタ�必��PHP や SSI ���� RESOURCE
+        フィルタ�後��り��。
+        DEFLATE フィルタ�内部的�サブリクエストを関知���ん。
+      </div>
+      <div class="note"><h3>注</h3>
+        <code class="directive"><a href="../mod/core.html#setenv">SetEnv</a></code> �設定�れる
+        <code>force-gzip</code> 環境変数��り�����れ�
+        ブラウザ� accept-encoding 設定を無視��圧縮��出力を���。
+      </div>
+
+    
+    <h3><a name="inflate" id="inflate">出力�伸長</a></h3>
+      <p><code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> モジュール��gzip 圧縮�れ�レス�ンス
+      本文を inflate/uncompress �るフィルタも�供�����。
+      ��機能を有効��る���<code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code>
+      や <code class="directive"><a href="../mod/mod_mime.html#addoutputfilter">AddOutputFilter</a></code> を使���
+      <code>INFLATE</code> フィルタを出力フィルタ�ェイン�挿入���。
+      例��次�よ�����。</p>
+
+      <div class="example"><p><code>
+        &lt;Location /dav-area&gt;<br />
+        <span class="indent">
+          ProxyPass http://example.com/<br />
+          SetOutputFilter INFLATE<br />
+        </span>
+        &lt;/Location&gt;
+      </code></p></div>
+
+      <p>��例���example.com �ら� gzip 圧縮�れ�出力を伸長��
+      ��他�フィルタ��ら���出力を処���るよ�����。
+      </p>
+      
+    
+    <h3><a name="input" id="input">入力�伸張</a></h3>
+      <p><code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> モジュール��gzip
+      �圧縮�れ�リクエスト本体を伸張�るフィルタも�供�����。
+      ��機能を有効��る���<code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code>
+      � <code class="directive"><a href="../mod/mod_mime.html#addinputfilter">AddInputFilter</a></code> を使用���
+      <code>DEFLATE</code> フィルタを入力フィルタ�ェイン�組�込���。
+      例��次�よ���り��。</p>
+
+      <div class="example"><p><code>
+        &lt;Location /dav-area&gt;<br />
+        <span class="indent">
+          SetInputFilter DEFLATE<br />
+        </span>
+        &lt;/Location&gt;
+      </code></p></div>
+      
+      <p>��設定��れ��<code>Content-Encoding: gzip</code>
+      ヘッダを�むリクエスト��る��本体�自動的�伸張�れ��。
+      gzip リクエスト本体を�信�るブラウザ���り�り��ん。
+      ����例�� <a href="http://www.webdav.org">WebDAV</a>
+      クライアント�幾�����特別�アプリケーション�リクエスト�
+      圧縮を実際�サ�ート���るも�も�り��。</p>
+
+      <div class="warning"><h3>Content-Length �関�る注�</h3>
+        <p>リクエスト本体�れ自体を評価�る場���<em><code>Content-Length</code>
+        ヘッダを信用��������</em>。Content-Length ヘッダ��
+        クライアント�ら�信�れるデータ�長�を�映���る������
+        伸張�れ�データストリーム�<em>�イトカウント���り��ん</em>。</p>
+      </div>
+    
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="proxies" id="proxies">Proxy サー���扱�</a></h2>
+
+    <p><code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> モジュール� <code>Vary: Accept-Encoding</code>
+    HTTP 応答ヘッダを�信����切� <code>Accept-Encoding</code>
+    リクエストヘッダを�信�るクライアント�対�����
+    プロクシサー��キャッシュ��応答を�信�るよ��注�を喚起���。
+    ��よ�����圧縮を扱��������クライアント�
+    圧縮�れ�内容��られる�����よ�����。</p>
+
+    <p>も�特別�何���存��除外���場��例�� <code>User-Agent</code>
+    ヘッダ����存���る場��手動� <code>Vary</code> ヘッダを設定���
+    追加�制�����プロクシサー��注�を行��必���り��。
+    例�� <code>User-Agent</code> ��存�� <code>DEFLATE</code>
+    を追加�る典型的�設定���次�よ��追加�る����り��。</p>
+
+    <div class="example"><p><code>
+      Header append Vary User-Agent
+    </code></p></div>
+    
+    <p>リクエストヘッダ以外�情報 (<em>例��</em> HTTP �ージョン)
+    ��存��圧縮�る����決�る場��
+    <code>Vary</code> ヘッダを <code>*</code> �設定�る必���り��。
+    ��よ���る��仕様�準拠��プロクシ�キャッシュを全�行�����り��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      Header set Vary *
+    </code></p></div>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DeflateBufferSize" id="DeflateBufferSize">DeflateBufferSize</a> <a name="deflatebuffersize" id="deflatebuffersize">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>zlib �一度�圧縮�る塊�大��</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateBufferSize <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DeflateBufferSize 8096</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
+</table>
+    <p><code class="directive">DeflateBufferSize</code> ディレクティブ�
+    zlib �一度�圧縮�る塊�大��を�イト���指定���。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DeflateCompressionLevel" id="DeflateCompressionLevel">DeflateCompressionLevel</a> <a name="deflatecompressionlevel" id="deflatecompressionlevel">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>出力�対��行��圧縮�程度</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateCompressionLevel <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>Zlib �デフォルト</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>This directive is available since Apache 2.0.45</td></tr>
+</table>
+     <p><code class="directive">DeflateCompressionLevel</code> ディレクティブ�
+         圧縮�程度を設定���。大��値���より圧縮�行��れ����
+         CPU 資�を消費���。</p>
+    <p>値� 1 (低圧縮) �ら 9 (高圧縮) ��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DeflateFilterNote" id="DeflateFilterNote">DeflateFilterNote</a> <a name="deflatefilternote" id="deflatefilternote">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ロギング用�圧縮比をメモ�追加</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateFilterNote [<var>type</var>] <var>notename</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td><var>type</var> is available since Apache 2.0.45</td></tr>
+</table>
+    <p><code class="directive">DeflateFilterNote</code> ディレクティブ�
+    圧縮比�関�るメモ�リクエスト�付加�れる��を指定���。
+    メモ (note) ����ディレクティブ�指定�れ�値��。
+    メモ�<a href="../logs.html#accesslog">アクセスログ</a>�
+    値を記録��統計を�る目的�も使���。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      DeflateFilterNote ratio<br />
+      <br />
+      LogFormat '"%r" %b (%{ratio}n) "%{User-agent}i"' deflate<br />
+      CustomLog logs/deflate_log deflate
+    </code></p></div>
+
+    <p>ログ�らも��精密�値を抽出���場���<var>type</var>
+    引数を使用���データタイプをログ�メモ���残�よ��指定����。
+    <var>type</var> �次����一���。</p>
+
+    <dl>
+      <dt><code>Input</code></dt>
+      <dd>フィルタ�入力ストリーム��イトカウントをメモ��存�る。</dd>
+
+      <dt><code>Output</code></dt>
+      <dd>フィルタ�出力ストリーム��イトカウントをメモ��存�る。</dd>
+
+      <dt><code>Ratio</code></dt>
+      <dd>圧縮率 (<code>出力 / 入力 * 100</code>) をメモ��存�る。
+      <var>type</var> 引数を�略��場����れ�デフォルト��り��。</dd>
+    </dl>
+
+    <p>���る��次�よ��ログを�る����る��ょ�。</p>
+
+    <div class="example"><h3>精密�ログ採�</h3><p><code>
+      DeflateFilterNote Input instream<br />
+      DeflateFilterNote Output outstream<br />
+      DeflateFilterNote Ratio ratio<br />
+      <br />
+      LogFormat '"%r" %{outstream}n/%{instream}n (%{ratio}n%%)' deflate<br />
+      CustomLog logs/deflate_log deflate
+    </code></p></div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DeflateMemLevel" id="DeflateMemLevel">DeflateMemLevel</a> <a name="deflatememlevel" id="deflatememlevel">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>zlib �圧縮�使�メモリ�レベルを指定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateMemLevel <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DeflateMemLevel 9</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
+</table>
+    <p><code class="directive">DeflateMemLevel</code> ディレクティブ�
+    zlib �圧縮�使�メモリ�レベルを設定��� (1 �ら 9 �間�値)。
+    (訳注: 2 を底��る対数�値��り��。
+    8 程度�良���ょ�。)</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DeflateWindowSize" id="DeflateWindowSize">DeflateWindowSize</a> <a name="deflatewindowsize" id="deflatewindowsize">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Zlib �圧縮用ウィンドウ�大��</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateWindowSize <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DeflateWindowSize 15</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_deflate</td></tr>
+</table>
+    <p><code class="directive">DeflateWindowSize</code> ディレクティブ�
+    zlib �圧縮用ウィンドウ (訳注: zlib �使用�れる履歴�ッファ) 
+    �大��を指定��� (1 �ら 15 �間�値)。
+    一般的�大��ウィンドウサイズを使用�る�圧縮率��上���。
+    (訳注: 2 を底��る対数�値��り��。
+    8 �ら 15 ��る��良���ょ�。)</p>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_deflate.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_deflate.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_deflate.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_deflate.html.ko.euc-kr b/docs/manual/mod/mod_deflate.html.ko.euc-kr
index e197bfeb..2572b9f4 100644
--- a/docs/manual/mod/mod_deflate.html.ko.euc-kr
+++ b/docs/manual/mod/mod_deflate.html.ko.euc-kr
@@ -363,6 +363,6 @@
 <a href="../ja/mod/mod_deflate.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_deflate.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dir.html b/docs/manual/mod/mod_dir.html
index be6c14c8..50c36c88 100644
--- a/docs/manual/mod/mod_dir.html
+++ b/docs/manual/mod/mod_dir.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_dir.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_dir.html.ja.euc-jp
+URI: mod_dir.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_dir.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_dir.html.en b/docs/manual/mod/mod_dir.html.en
index 15ed89c1..581fa17a 100644
--- a/docs/manual/mod/mod_dir.html.en
+++ b/docs/manual/mod/mod_dir.html.en
@@ -164,6 +164,6 @@ a directory</td></tr>
 <a href="../ja/mod/mod_dir.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_dir.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dir.html.ja.euc-jp b/docs/manual/mod/mod_dir.html.ja.euc-jp
deleted file mode 100644
index e24e9c15..00000000
--- a/docs/manual/mod/mod_dir.html.ja.euc-jp
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_dir - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_dir</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_dir.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_dir.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_dir.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¡ÖºÇ¸å¤Î¥¹¥é¥Ã¥·¥å¡×¤Î¥ê¥À¥¤¥ì¥¯¥È¤È¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Î
-¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤ò°·¤¦µ¡Ç½¤òÄ󶡤¹¤ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>dir_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_dir.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¥Ç¥£¥ì¥¯¥È¥ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ï¡¢¼¡¤ÎÆó¤Ä¤Î¤¦¤Á¤É¤Á¤é¤«¤¬ÍøÍѤµ¤ì¤Þ¤¹:</p>
-
-    <ul>
-      <li>°ì¤ÄÌܤϡ¢¥æ¡¼¥¶¤¬ºîÀ®¤·¤¿¥Õ¥¡¥¤¥ë¤òÍѤ¤¤ë¤â¤Î¤Ç¡¢Ä̾ï
-      <code>index.html</code> ¤È¤¤¤¦¥Õ¥¡¥¤¥ë̾¤ò»È¤¤¤Þ¤¹¡£¤³¤Î¥Õ¥¡¥¤¥ë̾¤Ï¡¢
-      <code class="directive"><a href="#directoryindex">DirectoryIndex</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç
-      »ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Îµ¡Ç½¤Ï <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code>
-      ¥â¥¸¥å¡¼¥ë¤ÇÄ󶡤µ¤ì¤Þ¤¹¡£</li>
-
-      <li>¤â¤¦°ì¤Ä¤ÎÊýË¡¤Ï¡¢
-      ¥µ¡¼¥Ð¤Ë¤è¤Ã¤Æ¼«Æ°Åª¤ËÀ¸À®¤µ¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê¥ê¥¹¥È¤òÍѤ¤¤ë¾ì¹ç¤Ç¤¹¡£
-      ¤³¤Îµ¡Ç½¤Ï¡¢<code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code>
-      ¥â¥¸¥å¡¼¥ë¤Ë¤è¤êÄ󶡤µ¤ì¤Þ¤¹¡£</li>
-    </ul>
-
-    <p>¼«Æ°Åª¤Ê¥¤¥ó¥Ç¥Ã¥¯¥¹À¸À®µ¡Ç½¤òºï½ü (¤â¤·¤¯¤Ï¸ò´¹)
-    ¤Ç¤­¤ë¤è¤¦¤Ë¡¢¤³¤ÎÆó¤Ä¤Îµ¡Ç½¤ÏʬΥ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p>¤Ê¤ª <code>http://servername/foo/dirname</code> ¤È¤¤¤¦ URL
-    ¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤¬¤¢¤Ã¤¿ºÝ¤Ë¡¢<code>dirname</code>
-    ¤È¤¤¤¦¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¢¤ì¤Ð¡¢¡ÖºÇ¸å¤Ë¥¹¥é¥Ã¥·¥å¤ò¤Ä¤±¤¿·Á¡×¤Î URL
-    ¤Ø¤Î¥ê¥À¥¤¥ì¥¯¥È¤òÁ÷½Ð¤·¤Þ¤¹¡£
-    ¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î¥¢¥¯¥»¥¹¤Ï¥¹¥é¥Ã¥·¥å¤Ç½ª¤ï¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¡¢
-    <code>mod_dir</code> ¤Ï¡¢<code>http://servername/foo/dirname/</code>
-    ¤Ø¤Î¥ê¥À¥¤¥ì¥¯¥È¤òÁ÷½Ð¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#directoryindex">DirectoryIndex</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#directoryslash">DirectorySlash</a></li>
-</ul>
-</div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DirectoryIndex" id="DirectoryIndex">DirectoryIndex</a> <a name="directoryindex" id="directoryindex">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¯¥é¥¤¥¢¥ó¥È¤¬¥Ç¥£¥ì¥¯¥È¥ê¤ò¥ê¥¯¥¨¥¹¥È¤·¤¿¤È¤­¤ËÄ´¤Ù¤ë
-¥ê¥½¡¼¥¹¤Î¥ê¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>DirectoryIndex
-    <var>local-url</var> [<var>local-url</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>DirectoryIndex index.html</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_dir</td></tr>
-</table>
-    <p>
-    ¥¯¥é¥¤¥¢¥ó¥È¤¬¡¢¥Ç¥£¥ì¥¯¥È¥ê̾¤ÎºÇ¸å¤Ë¡Ö/¡×
-    ¤ò»ØÄꤷ¤Æ¥Ç¥£¥ì¥¯¥È¥ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤òÍ׵᤹¤ë¾ì¹ç¤Ëõ¤¹¥ê¥½¡¼¥¹¤Î¥ê¥¹¥È¤ò
-    <code class="directive">DirectoryIndex</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÀßÄꤷ¤Þ¤¹¡£
-    <var>Local-url</var>
-    ¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤ËÂбþ¤¹¤ë¡¢¥µ¡¼¥Ð¾å¤Î¥É¥­¥å¥á¥ó¥È¤Î
-    (% ¥¨¥ó¥³¡¼¥É¤µ¤ì¤¿) URL ¤Ç¡¢ÉáÄ̤ϥǥ£¥ì¥¯¥È¥êÃæ¤Î¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ç¤¹¡£
-    Ê£¿ô¤Î URL ¤¬ÀßÄꤵ¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢ºÇ½é¤Ë¸«¤Ä¤«¤Ã¤¿¤â¤Î¤òÊÖ¤·¤Þ¤¹¡£
-    ¤½¤ì¤é¤¬¸«¤Ä¤«¤é¤º¡¢<code>Indexes</code>
-    ¥ª¥×¥·¥ç¥ó¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È¤òÀ¸À®¤·¤Þ¤¹¡£
-    </p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      DirectoryIndex index.html
-    </code></p></div>
-
-    <p><code>http://myserver/docs/</code> ¤Ø¤Î¥¢¥¯¥»¥¹¤¬¤¢¤ê¡¢
-    <code>http://myserver/docs/index.html</code>
-    ¤¬Â¸ºß¤¹¤ì¤Ð¡¢¤³¤Î URL ¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
-    ¤â¤·Â¸ºß¤·¤Ê¤±¤ì¤Ð¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>Ãí: ¥É¥­¥å¥á¥ó¥È¤¬Æ±¤¸¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë¸ºß¤¹¤ë¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£
-    </p>
-
-    <div class="example"><p><code>
-      DirectoryIndex index.html index.txt  /cgi-bin/index.pl
-    </code></p></div>
-
-    <p>¤È¤·¤¿¾ì¹ç¡¢<code>index.html</code> ¤È <code>index.txt</code>
-    ¤Î¤É¤Á¤é¤â¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë¸ºß¤·¤Ê¤¤¾ì¹ç¡¢CGI ¥¹¥¯¥ê¥×¥È
-    <code>/cgi-bin/index.pl</code> ¤¬¼Â¹Ô¤µ¤ì¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DirectorySlash" id="DirectorySlash">DirectorySlash</a> <a name="directoryslash" id="directoryslash">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Ñ¥¹ËöÈø¤Î¥¹¥é¥Ã¥·¥å¤Ç¥ê¥À¥¤¥ì¥¯¥È¤¹¤ë¤«¤É¤¦¤«¤Î¥ª¥ó¥ª¥Õ¤ò¥È¥°¥ë¤µ¤»¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>DirectorySlash On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>DirectorySlash On</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_dir</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.0.51 °Ê¹ß</td></tr>
-</table>
-    <p>Í×µá¤Î¤¢¤Ã¤¿ URL ¤¬¥Ç¥£¥ì¥¯¥È¥ê¤ò»Ø¤¹¤«¤É¤¦¤«¤ò¡¢
-    <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code> ¤¬Ä´À°¤¹¤ë¤Ù¤­¤«¤É¤¦¤«¤ò
-    <code class="directive">DirectorySlash</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÀßÄꤷ¤Þ¤¹¡£</p>
-
-    <p>ŵ·¿Åª¤Ë¤Ï¡¢¥æ¡¼¥¶¤¬ËöÈø¤Î¥¹¥é¥Ã¥·¥å̵¤·¤Ç¥ê¥½¡¼¥¹¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤òȯ¹Ô¤·¡¢
-    ¤½¤·¤Æ¡¢¤½¤Î¥ê¥½¡¼¥¹¤¬¥Ç¥£¥ì¥¯¥È¥ê¤ò»Ø¤·¤Æ¤¤¤¿¾ì¹ç¡¢<code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code>
-    ¤Ï¡¢ËöÈø¤Ë¥¹¥é¥Ã¥·¥å¤ò<em>ÉÕ²Ã</em>¤·¤¿¾å¤ÇƱ¤¸¥ê¥½¡¼¥¹¤Ë¥ê¥À¥¤¥ì¥¯¥È¤µ¤»¤Þ¤¹¡£
-    ¤³¤ÎµóÆ°¤Ë¤Ï´ö¤Ä¤«Íýͳ¤¬¤¢¤ê¤Þ¤¹:</p>
-
-    <ul>
-    <li>¥æ¡¼¥¶¤Ï¡¢ºÇ½ªÅª¤Ë¤Ï¥ê¥½¡¼¥¹¤ÎÊÌ̾ URL ¤ò¥ê¥¯¥¨¥¹¥È¤¹¤ë¤³¤È¤Ë¤Ê¤ë¡£</li>
-    <li><code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> ¤¬´üÂÔÄ̤ê¤ËÆ°¤¯¡£<code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> 
-    ¤ÎÀ¸À®¤¹¤ë¥ê¥ó¥¯¤Ï¥Ñ¥¹¤ò½ÐÎϤ·¤Þ¤»¤ó¤Î¤Ç¡¢¥¹¥é¥Ã¥·¥å¤¬¤Ê¤¤¾ì¹ç¤Ï´Ö°ã¤Ã¤¿¥Ñ¥¹¤ò
-    »Ø¤·¤Æ¤·¤Þ¤¦¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</li>
-    <li><code class="directive"><a href="#directoryindex">DirectoryIndex</a></code> ¤Ï¡¢
-    ËöÈø¤Ë¥¹¥é¥Ã¥·¥å¤¬¤Ä¤¤¤Æ¤¤¤ë¥ê¥¯¥¨¥¹¥È¤Ë¤Ä¤¤¤Æ<em>¤Î¤ß</em>ɾ²Á¤µ¤ì¤ë¡£</li>
-    <li>HTML ¥Ú¡¼¥¸¤ÎÁêÂÐ URL »²¾È¤¬Àµ¤·¤¯Æ°ºî¤¹¤ë¡£</li>
-    </ul>
-
-    <p>¤È¤Ï¤¤¤¨¡¢¤â¤·¤³¤¦¤¤¤Ã¤¿¸ú²Ì¤ò˾¤Þ¤Ê¤¤¡¢¤«¤Ä¡¢
-    ¾åµ­¤Î¤è¤¦¤ÊÍýͳ¤¬Åö¤Æ¤Ï¤Þ¤é¤Ê¤¤¾ì¹ç¤Ï¡¢¥ê¥À¥¤¥ì¥¯¥È¤ò¼¡¤Î¤è¤¦¤Ë¤·¤Æ¥ª¥Õ¤Ë¤Ç¤­¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-        # see security warning below!<br />
-        &lt;Location /some/path&gt;<br />
-        <span class="indent">
-            DirectorySlash Off<br />
-            SetHandler some-handler<br />
-        </span>
-        &lt;/Location&gt;
-    </code></p></div>
-
-    <div class="warning"><h3>¥»¥­¥å¥ê¥Æ¥£·Ù¹ð</h3>
-    <p>ËöÈø¤Î¥¹¥é¥Ã¥·¥å¤Ç¤Î¥ê¥À¥¤¥ì¥¯¥È¤ò¥ª¥Õ¤Ë¤¹¤ë¤È¡¢·ë²ÌŪ¤Ë¾ðÊóϳ±Ì¤ò
-    ¾·¤¯¤³¤È¤Ë¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-    <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> ¤¬Í­¸ú (<code>Options +Indexes</code>) ¤Ç¡¢
-    <code class="directive"><a href="#directoryindex">DirectoryIndex</a></code> ¤¬Í­¸ú¤Ê¥ê¥½¡¼¥¹ (Î㤨¤Ð
-    <code>index.html</code>) ¤ò»Ø¤·¤Æ¤¤¤Æ¡¢¤Þ¤¿¡¢Í×µá¤Î¤¢¤Ã¤¿ URL ¤ËÆÃÊ̤Ê
-    ¥Ï¥ó¥É¥é¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤ò¹Í¤¨¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£
-    ¤³¤Î¾ì¹çËöÈø¤Ë¥¹¥é¥Ã¥·¥å¤Î¤Ä¤¤¤Æ¤¤¤ë¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ¤Ï <code>index.html</code>
-    ¥Õ¥¡¥¤¥ë¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£<strong>¤·¤«¤·¥¹¥é¥Ã¥·¥å¤Î¤Ê¤¤¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ¤Ï¡¢
-    ¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆâÍÆ°ìÍ÷¤òÊÖ¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¡£</strong></p>
-    </div>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_dir.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_dir.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_dir.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dir.html.ja.utf8 b/docs/manual/mod/mod_dir.html.ja.utf8
new file mode 100644
index 00000000..0916746a
--- /dev/null
+++ b/docs/manual/mod/mod_dir.html.ja.utf8
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_dir - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_dir</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_dir.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_dir.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_dir.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>「最後�スラッシュ��リダイレクト��ディレクトリ�
+インデックスファイルを扱�機能を�供�る</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>dir_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_dir.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>ディレクトリインデックス��次�二������ら��利用�れ��:</p>
+
+    <ul>
+      <li>一�目��ユーザ�作���ファイルを用�るも���通常
+      <code>index.html</code> ���ファイル�を使���。��ファイル���
+      <code class="directive"><a href="#directoryindex">DirectoryIndex</a></code> ディレクティブ�
+      指定�る�������。��機能� <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code>
+      モジュール��供�れ��。</li>
+
+      <li>も�一��方法��
+      サー��よ��自動的�生��れるディレクトリリストを用�る場���。
+      ��機能��<code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code>
+      モジュール�より�供�れ��。</li>
+    </ul>
+
+    <p>自動的�インデックス生�機能を削除 (も���交�)
+    ��るよ�����二��機能�分離�れ����。</p>
+
+    <p>�� <code>http://servername/foo/dirname</code> ��� URL
+    ��リクエスト����際��<code>dirname</code>
+    ���ディレクトリ��れ��「最後�スラッシュを���形�� URL
+    ��リダイレクトを�出���。
+    ディレクトリ��アクセス�スラッシュ�終����る必���り�
+    <code>mod_dir</code> ��<code>http://servername/foo/dirname/</code>
+    ��リダイレクトを�出�る����り��。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#directoryindex">DirectoryIndex</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#directoryslash">DirectorySlash</a></li>
+</ul>
+</div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DirectoryIndex" id="DirectoryIndex">DirectoryIndex</a> <a name="directoryindex" id="directoryindex">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>クライアント�ディレクトリをリクエスト�����調�る
+リソース�リスト</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DirectoryIndex
+    <var>local-url</var> [<var>local-url</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DirectoryIndex index.html</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_dir</td></tr>
+</table>
+    <p>
+    クライアント��ディレクトリ��最後�「/�
+    を指定��ディレクトリインデックスを�求�る場��探�リソース�リストを
+    <code class="directive">DirectoryIndex</code> ディレクティブ�設定���。
+    <var>Local-url</var>
+    ��リクエスト�れ�ディレクトリ�対応�る�サー�上�ドキュメント�
+    (% エンコード�れ�) URL ��普通�ディレクトリ中�ファイル�����。
+    複数� URL �設定�れ�場����最��見����も�を返���。
+    �れら�見��ら��<code>Indexes</code>
+    オプション�セット�れ��る場��ディレクトリ�リストを生����。
+    </p>
+
+    <div class="example"><h3>例</h3><p><code>
+      DirectoryIndex index.html
+    </code></p></div>
+
+    <p><code>http://myserver/docs/</code> ��アクセス��り�
+    <code>http://myserver/docs/index.html</code>
+    �存在�れ���� URL �返�れ��。
+    も�存在���れ��ディレクトリ�リスト�返�れ��。</p>
+
+    <p>注: ドキュメント���ディレクトリ内�存在�る�必��り��ん。
+    </p>
+
+    <div class="example"><p><code>
+      DirectoryIndex index.html index.txt  /cgi-bin/index.pl
+    </code></p></div>
+
+    <p>���場��<code>index.html</code> � <code>index.txt</code>
+    ���らもディレクトリ内�存在���場��CGI スクリプト
+    <code>/cgi-bin/index.pl</code> �実行�れ��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DirectorySlash" id="DirectorySlash">DirectorySlash</a> <a name="directoryslash" id="directoryslash">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>パス末尾�スラッシュ�リダイレクト�る�����オンオフをトグル��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DirectorySlash On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DirectorySlash On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_dir</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.0.51 以�</td></tr>
+</table>
+    <p>�求���� URL �ディレクトリを指�����を�
+    <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code> �調整�る������を
+    <code class="directive">DirectorySlash</code>
+    ディレクティブ�設定���。</p>
+
+    <p>典型的���ユーザ�末尾�スラッシュ無��リソース��リクエストを発行��
+    ������リソース�ディレクトリを指����場��<code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code>
+    ��末尾�スラッシュを<em>付加</em>��上���リソース�リダイレクト����。
+    ��挙動��幾���由��り��:</p>
+
+    <ul>
+    <li>ユーザ��最終的��リソース�別� URL をリクエスト�る����る。</li>
+    <li><code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> �期待通り�動�。<code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> 
+    �生��るリンク�パスを出力���ん���スラッシュ���場��間���パスを
+    指���������り��。</li>
+    <li><code class="directive"><a href="#directoryindex">DirectoryIndex</a></code> ��
+    末尾�スラッシュ�����るリクエスト����<em>��</em>評価�れる。</li>
+    <li>HTML ページ�相対 URL �照�正��動作�る。</li>
+    </ul>
+
+    <p>�����も������効果を望�������
+    上記�よ���由�当���ら��場���リダイレクトを次�よ����オフ�����:</p>
+
+    <div class="example"><p><code>
+        # see security warning below!<br />
+        &lt;Location /some/path&gt;<br />
+        <span class="indent">
+            DirectorySlash Off<br />
+            SetHandler some-handler<br />
+        </span>
+        &lt;/Location&gt;
+    </code></p></div>
+
+    <div class="warning"><h3>セキュリティ警告</h3>
+    <p>末尾�スラッシュ��リダイレクトをオフ��る���果的�情報�洩を
+    招�����る�も�れ��ん。
+    <code class="module"><a href="../mod/mod_autoindex.html">mod_autoindex</a></code> �有効 (<code>Options +Indexes</code>) ��
+    <code class="directive"><a href="#directoryindex">DirectoryIndex</a></code> �有効�リソース (例��
+    <code>index.html</code>) を指���������求���� URL �特別�
+    �ンドラ�設定�れ����場�を考��������。
+    ��場�末尾�スラッシュ�����るリクエスト�対��� <code>index.html</code>
+    ファイル�返�れ��。<strong>���スラッシュ���リクエスト�対����
+    ディレクトリ�内容一覧を返�������。</strong></p>
+    </div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_dir.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_dir.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_dir.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dir.html.ko.euc-kr b/docs/manual/mod/mod_dir.html.ko.euc-kr
index 1585d3af..8eb829cb 100644
--- a/docs/manual/mod/mod_dir.html.ko.euc-kr
+++ b/docs/manual/mod/mod_dir.html.ko.euc-kr
@@ -164,6 +164,6 @@ index ÆÄÀÏÀ» ¼­ºñ½ºÇÑ´Ù</td></tr>
 <a href="../ja/mod/mod_dir.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_dir.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_disk_cache.html b/docs/manual/mod/mod_disk_cache.html
index 84207ada..614907d5 100644
--- a/docs/manual/mod/mod_disk_cache.html
+++ b/docs/manual/mod/mod_disk_cache.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_disk_cache.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_disk_cache.html.ja.euc-jp
+URI: mod_disk_cache.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_disk_cache.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_disk_cache.html.en b/docs/manual/mod/mod_disk_cache.html.en
index b7852db8..8c577c21 100644
--- a/docs/manual/mod/mod_disk_cache.html.en
+++ b/docs/manual/mod/mod_disk_cache.html.en
@@ -173,6 +173,6 @@ stored</td></tr>
 <a href="../ja/mod/mod_disk_cache.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_disk_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_disk_cache.html.ja.euc-jp b/docs/manual/mod/mod_disk_cache.html.ja.euc-jp
deleted file mode 100644
index 87e97fb4..00000000
--- a/docs/manual/mod/mod_disk_cache.html.ja.euc-jp
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_disk_cache - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_disk_cache</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_disk_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_disk_cache.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_disk_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>URI ¤ò¥­¡¼¤Ë¤·¤¿¥³¥ó¥Æ¥ó¥Ä¥­¥ã¥Ã¥·¥å¥¹¥È¥ì¡¼¥¸´ÉÍý</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>disk_cache_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_disk_cache.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> ¤Ï¥Ç¥£¥¹¥¯¤ò»ÈÍѤ·¤¿¥¹¥È¥ì¡¼¥¸
-    ´ÉÍýµ¡¹½¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£¼ç¤Ë
-    <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> ¤ÈÁȤ߹ç¤ï¤»¤Æ»È¤ï¤ì¤Þ¤¹¡£</p>
-
-    <p>¥³¥ó¥Æ¥ó¥Ä¤Î¥­¥ã¥Ã¥·¥å¤Ø¤ÎÊݸ¤È¼èÆÀ¤Ï URI ¤Ë´ð¤Å¤¤¤¿¥­¡¼¤¬»È¤ï¤ì¤Þ¤¹¡£
-    ¥¢¥¯¥»¥¹Êݸî¤Î¤«¤±¤é¤ì¤Æ¤¤¤ë¥³¥ó¥Æ¥ó¥Ä¤Ï¥­¥ã¥Ã¥·¥å¤µ¤ì¤Þ¤»¤ó¡£</p>
-
-    <p>¥­¥ã¥Ã¥·¥å¤ÎÂ礭¤µ¤òºÇÂç¥ì¥Ù¥ë¤Ç°Ý»ý¤¹¤ë¤¿¤á¤Ë
-    <code class="program"><a href="../programs/htcacheclean.html">htcacheclean</a></code> ¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>Ãí:</h3>
-      <p><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> ¤Ï
-      <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> ¤òɬÍפȤ·¤Þ¤¹</p>
-    </div>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#cachedirlength">CacheDirLength</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cachedirlevels">CacheDirLevels</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cachemaxfilesize">CacheMaxFileSize</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cacheminfilesize">CacheMinFileSize</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cacheroot">CacheRoot</a></li>
-</ul>
-</div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CacheDirLength" id="CacheDirLength">CacheDirLength</a> <a name="cachedirlength" id="cachedirlength">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê̾¤Îʸ»ú¿ô</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CacheDirLength <var>length</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>CacheDirLength 2</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_disk_cache</td></tr>
-</table>
-    <p><code class="directive">CacheDirLength</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥­¥ã¥Ã¥·¥å
-    ³¬Áؤγƥµ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Îʸ»ú¿ô¤òÀßÄꤷ¤Þ¤¹¡£</p>
-
-    <div class="note">
-      <p><code class="directive">CacheDirLevels</code>*
-      <code class="directive"><a href="#cachedirlength">CacheDirLength</a></code> ¤Î
-      ·ë²Ì¤Ï 20 °ÊÆâ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-    </div>
-
-    <div class="example"><p><code>
-      CacheDirLength  4
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CacheDirLevels" id="CacheDirLevels">CacheDirLevels</a> <a name="cachedirlevels" id="cachedirlevels">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥­¥ã¥Ã¥·¥å¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Î¿¼¤µ¤Î¿ô</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CacheDirLevels <var>levels</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>CacheDirLevels 3</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_disk_cache</td></tr>
-</table>
-    <p><code class="directive">CacheDirLevels</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥­¥ã¥Ã¥·¥å¤Î
-    ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Î¿¼¤µ¤òÀßÄꤷ¤Þ¤¹¡£¥­¥ã¥Ã¥·¥å¥Ç¡¼¥¿¤Ï <code class="directive"><a href="#cacheroot">CacheRoot</a></code> ¥Ç¥£¥ì¥¯¥È¥ê¤«¤é
-    ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î¿¼¤µÊ¬²¼¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÊݸ¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="note">
-      <p><code class="directive">CacheDirLevels</code>*
-      <code class="directive"><a href="#cachedirlength">CacheDirLength</a></code> ¤Î
-      ·ë²Ì¤Ï 20 °ÊÆâ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-    </div>
-
-    <div class="example"><p><code>
-      CacheDirLevels  5
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CacheMaxFileSize" id="CacheMaxFileSize">CacheMaxFileSize</a> <a name="cachemaxfilesize" id="cachemaxfilesize">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥­¥ã¥Ã¥·¥å¤ËÊݴɤµ¤ì¤ë¥É¥­¥å¥á¥ó¥È¤ÎºÇÂç¤Î (¥Ð¥¤¥È¤Ç¤Î) ¥µ¥¤¥º</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CacheMaxFileSize <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>CacheMaxFileSize 1000000</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_disk_cache</td></tr>
-</table>
-    <p><code class="directive">CacheMaxFileSize</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥É¥­¥å¥á¥ó¥È¤ò
-    ¥­¥ã¥Ã¥·¥å¤¹¤ë¤«¤É¤¦¤«¤òȽÄꤹ¤ë¡¢ºÇÂç¤Î¥µ¥¤¥º¤ò¥Ð¥¤¥È¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      CacheMaxFileSize 64000
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CacheMinFileSize" id="CacheMinFileSize">CacheMinFileSize</a> <a name="cacheminfilesize" id="cacheminfilesize">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥­¥ã¥Ã¥·¥å¤ËÊݴɤµ¤ì¤ë¥É¥­¥å¥á¥ó¥È¤ÎºÇ¾®¸Â¤Î (¥Ð¥¤¥È¤Ç¤Î) Â礭¤µ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CacheMinFileSize <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>CacheMinFileSize 1</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_disk_cache</td></tr>
-</table>
-    <p><code class="directive">CacheMinFileSize</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥É¥­¥å¥á¥ó¥È¤ò
-    ¥­¥ã¥Ã¥·¥å¤¹¤ë¤«¤É¤¦¤«¤òȽÄꤹ¤ë¡¢ºÇ¾®¤Î¥µ¥¤¥º¤ò¥Ð¥¤¥È¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      CacheMinFileSize 64
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CacheRoot" id="CacheRoot">CacheRoot</a> <a name="cacheroot" id="cacheroot">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥­¥ã¥Ã¥·¥å¥Õ¥¡¥¤¥ë¤¬Êݴɤµ¤ì¤ë¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CacheRoot <var>directory</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_disk_cache</td></tr>
-</table>
-    <p><code class="directive">CacheRoot</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥­¥ã¥Ã¥·¥å¥Õ¥¡¥¤¥ë¤ò
-    Êݴɤ¹¤ë¤¿¤á¤Î¥Ç¥£¥¹¥¯¾å¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤷ¤Þ¤¹¡£<code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> ¥â¥¸¥å¡¼¥ë¤¬ Apache ¥µ¡¼¥Ð¤Ë¥í¡¼¥É¤µ¤ì¤Æ
-    ¤¤¤ë¤«¡¢ÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ì¤Ð¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï<em>ɬ¤º</em>
-    ÄêµÁ¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-    <code class="directive">CacheRoot</code> ¤ÎÃͤò»ØÄꤷ¤Ê¤±¤ì¤Ð¡¢
-    ÀßÄê¥Õ¥¡¥¤¥ë¤Î½èÍý¤Ç¥¨¥é¡¼¤Ë¤Ê¤ê¤Þ¤¹¡£<code class="directive"><a href="#cachedirlevels">CacheDirLevels</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È <code class="directive"><a href="#cachedirlength">CacheDirLength</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬
-    »ØÄꤵ¤ì¤¿¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê²¼¤Î¥Ç¥£¥ì¥¯¥È¥ê¹½À®¤òÄêµÁ¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      CacheRoot c:/cacheroot
-    </code></p></div>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_disk_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_disk_cache.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_disk_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_disk_cache.html.ja.utf8 b/docs/manual/mod/mod_disk_cache.html.ja.utf8
new file mode 100644
index 00000000..f40f871f
--- /dev/null
+++ b/docs/manual/mod/mod_disk_cache.html.ja.utf8
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_disk_cache - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_disk_cache</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_disk_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_disk_cache.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_disk_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>URI をキー���コンテンツキャッシュストレージ管�</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>disk_cache_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_disk_cache.c</td></tr></table>
+<h3>概�</h3>
+
+    <p><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> �ディスクを使用��ストレージ
+    管�機構を実装�����。主�
+    <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> �組�����使�れ��。</p>
+
+    <p>コンテンツ�キャッシュ���存��得� URI �基���キー�使�れ��。
+    アクセス�護���られ��るコンテンツ�キャッシュ�れ��ん。</p>
+
+    <p>キャッシュ�大��を最大レベル�維��る���
+    <code class="program"><a href="../programs/htcacheclean.html">htcacheclean</a></code> を使��������。</p>
+
+    <div class="note"><h3>注:</h3>
+      <p><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> �
+      <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> を必�����</p>
+    </div>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#cachedirlength">CacheDirLength</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachedirlevels">CacheDirLevels</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachemaxfilesize">CacheMaxFileSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cacheminfilesize">CacheMinFileSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cacheroot">CacheRoot</a></li>
+</ul>
+</div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheDirLength" id="CacheDirLength">CacheDirLength</a> <a name="cachedirlength" id="cachedirlength">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>サブディレクトリ��文字数</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheDirLength <var>length</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>CacheDirLength 2</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_disk_cache</td></tr>
+</table>
+    <p><code class="directive">CacheDirLength</code> ディレクティブ�キャッシュ
+    階層��サブディレクトリ�文字数を設定���。</p>
+
+    <div class="note">
+      <p><code class="directive">CacheDirLevels</code>*
+      <code class="directive"><a href="#cachedirlength">CacheDirLength</a></code> �
+      �果� 20 以内���れ��り��ん。</p>
+    </div>
+
+    <div class="example"><p><code>
+      CacheDirLength  4
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheDirLevels" id="CacheDirLevels">CacheDirLevels</a> <a name="cachedirlevels" id="cachedirlevels">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>キャッシュ�サブディレクトリ�深��数</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheDirLevels <var>levels</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>CacheDirLevels 3</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_disk_cache</td></tr>
+</table>
+    <p><code class="directive">CacheDirLevels</code> ディレクティブ�キャッシュ�
+    サブディレクトリ�深�を設定���。キャッシュデータ� <code class="directive"><a href="#cacheroot">CacheRoot</a></code> ディレクトリ�ら
+    ��ディレクトリ�深�分下�ディレクトリ��存�れ��。</p>
+
+    <div class="note">
+      <p><code class="directive">CacheDirLevels</code>*
+      <code class="directive"><a href="#cachedirlength">CacheDirLength</a></code> �
+      �果� 20 以内���れ��り��ん。</p>
+    </div>
+
+    <div class="example"><p><code>
+      CacheDirLevels  5
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheMaxFileSize" id="CacheMaxFileSize">CacheMaxFileSize</a> <a name="cachemaxfilesize" id="cachemaxfilesize">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>キャッシュ��管�れるドキュメント�最大� (�イト��) サイズ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheMaxFileSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>CacheMaxFileSize 1000000</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_disk_cache</td></tr>
+</table>
+    <p><code class="directive">CacheMaxFileSize</code> ディレクティブ��ドキュメントを
+    キャッシュ�る����を判定�る�最大�サイズを�イト数�設定���。</p>
+
+    <div class="example"><p><code>
+      CacheMaxFileSize 64000
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheMinFileSize" id="CacheMinFileSize">CacheMinFileSize</a> <a name="cacheminfilesize" id="cacheminfilesize">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>キャッシュ��管�れるドキュメント�最��� (�イト��) 大��</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheMinFileSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>CacheMinFileSize 1</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_disk_cache</td></tr>
+</table>
+    <p><code class="directive">CacheMinFileSize</code> ディレクティブ��ドキュメントを
+    キャッシュ�る����を判定�る�最��サイズを�イト数�設定���。</p>
+
+    <div class="example"><p><code>
+      CacheMinFileSize 64
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheRoot" id="CacheRoot">CacheRoot</a> <a name="cacheroot" id="cacheroot">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>キャッシュファイル��管�れるルートディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheRoot <var>directory</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_disk_cache</td></tr>
+</table>
+    <p><code class="directive">CacheRoot</code> ディレクティブ�キャッシュファイルを
+    �管�る���ディスク上�ディレクトリを指定���。<code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code> モジュール� Apache サー��ロード�れ�
+    �る��組�込�れ��れ����ディレクティブ�<em>必�</em>
+    定義���れ��り��ん。
+    <code class="directive">CacheRoot</code> �値を指定���れ��
+    設定ファイル�処��エラー��り��。<code class="directive"><a href="#cachedirlevels">CacheDirLevels</a></code> ディレクティブ� <code class="directive"><a href="#cachedirlength">CacheDirLength</a></code> ディレクティブ�
+    指定�れ�ルートディレクトリ下�ディレクトリ構�を定義���。</p>
+
+    <div class="example"><p><code>
+      CacheRoot c:/cacheroot
+    </code></p></div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_disk_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_disk_cache.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_disk_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_disk_cache.html.ko.euc-kr b/docs/manual/mod/mod_disk_cache.html.ko.euc-kr
index 3f7bc73d..c7c7689d 100644
--- a/docs/manual/mod/mod_disk_cache.html.ko.euc-kr
+++ b/docs/manual/mod/mod_disk_cache.html.ko.euc-kr
@@ -170,6 +170,6 @@
 <a href="../ja/mod/mod_disk_cache.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_disk_cache.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dumpio.html b/docs/manual/mod/mod_dumpio.html
index 2548737a..20eaeafe 100644
--- a/docs/manual/mod/mod_dumpio.html
+++ b/docs/manual/mod/mod_dumpio.html
@@ -1,7 +1,9 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_dumpio.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_dumpio.html.ja.euc-jp
+URI: mod_dumpio.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/mod_dumpio.html.en b/docs/manual/mod/mod_dumpio.html.en
index d528b884..6571c96e 100644
--- a/docs/manual/mod/mod_dumpio.html.en
+++ b/docs/manual/mod/mod_dumpio.html.en
@@ -124,6 +124,6 @@ later.</td></tr>
 <p><span>Available Languages: </span><a href="../en/mod/mod_dumpio.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_dumpio.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dumpio.html.ja.euc-jp b/docs/manual/mod/mod_dumpio.html.ja.euc-jp
deleted file mode 100644
index f5ca7e2a..00000000
--- a/docs/manual/mod/mod_dumpio.html.ja.euc-jp
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_dumpio - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_dumpio</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_dumpio.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_dumpio.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>˾¤à¤è¤¦¤Ë¤¹¤Ù¤Æ¤Î I/O ¤ò¥¨¥é¡¼¥í¥°¤Ë¥À¥ó¥×¤¹¤ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>dumpio_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_dumpio.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p><code>mod_dumpio</code> ¤ò»È¤¦¤È¡¢Apache ¤¬¼õ¤±¼è¤Ã¤¿¤¹¤Ù¤Æ¤ÎÆþÎϤÈ
-    Apache ¤Ë¤è¤êÁ÷¤é¤ì¤¿¤¹¤Ù¤Æ¤Î½ÐÎϤȤΡ¢Î¾Êý¤â¤·¤¯¤Ï¤É¤Á¤é¤«°ìÊý¤ò¡¢
-    ¥¨¥é¡¼¥í¥°¥Õ¥¡¥¤¥ë¤Ë¥í¥°¼ý½¸ <span class="transnote">(<em>ÌõÃí:</em> ¥À¥ó¥× dump)</span>
-    ¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¥Ç¡¼¥¿¤Î¥í¥®¥ó¥°¤Ï¡¢SSL Éü¹æ²½¤Îľ¸å (ÆþÎÏ) ¤È SSL
-    °Å¹æ²½¤ÎľÁ° (½ÐÎÏ) ¤Ë¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£¤´ÁÛÁü¤ÎÄ̤ꡢ
-    ¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¤È¤Æ¤Ä¤â¤Ê¤¤¥Ç¡¼¥¿Î̤ò½ÐÎϤ·¤Þ¤¹¤Î¤Ç¡¢
-    ÌäÂê¤ò¥Ç¥Ð¥Ã¥°¤·¤Æ¤¤¤ë¤È¤­¤Ë¤Î¤ß»ÈÍѤ¹¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#dumpioinput">DumpIOInput</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#dumpiooutput">DumpIOOutput</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#enable">dumpio ¥µ¥Ý¡¼¥È¤òÍ­¸ú¤Ë¤¹¤ë</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="enable" id="enable">dumpio ¥µ¥Ý¡¼¥È¤òÍ­¸ú¤Ë¤¹¤ë</a></h2>
-    
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤òÍ­¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢¥â¥¸¥å¡¼¥ë¤¬¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤Æ¡¢
-    ¼Â¹Ô¤¹¤ë Apache ¤ÎÀßÄê¤Ç¥µ¡¼¥Ð¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¥í¥®¥ó¥°µ¡Ç½¤Ï¡¢°Ê²¼¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤ÆÍ­¸ú¤Ë¤·¤¿¤ê
-    ̵¸ú¤Ë¤·¤¿¤ê¤Ç¤­¤Þ¤¹¡£</p>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DumpIOInput" id="DumpIOInput">DumpIOInput</a> <a name="dumpioinput" id="dumpioinput">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¨¥é¡¼¥í¥°¤Ë¤¹¤Ù¤Æ¤ÎÆþÎϥǡ¼¥¿¤ò¥À¥ó¥×</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>DumpIOInput On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>DumpIOInput Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_dumpio</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>DumpIOInput ¤Ï Apache 2.1.3 °Ê¹ß¤Î¤ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p>¤¹¤Ù¤Æ¤ÎÆþÎϤΥÀ¥ó¥×¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      DumpIOInput On
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DumpIOOutput" id="DumpIOOutput">DumpIOOutput</a> <a name="dumpiooutput" id="dumpiooutput">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¨¥é¡¼¥í¥°¤Ë¤¹¤Ù¤Æ¤Î½ÐÎϥǡ¼¥¿¤ò¥À¥ó¥×</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>DumpIOOutput On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>DumpIOOutput Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_dumpio</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>DumpIOOutput ¤Ï Apache 2.1.3 °Ê¹ß¤Ç¤Î¤ß»ÈÍѲÄǽ</td></tr>
-</table>
-    <p>¤¹¤Ù¤Æ¤Î½ÐÎϤΥÀ¥ó¥×¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      DumpIOOutput On
-    </code></p></div>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_dumpio.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_dumpio.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_dumpio.html.ja.utf8 b/docs/manual/mod/mod_dumpio.html.ja.utf8
new file mode 100644
index 00000000..8993af58
--- /dev/null
+++ b/docs/manual/mod/mod_dumpio.html.ja.utf8
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_dumpio - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_dumpio</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_dumpio.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_dumpio.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>望むよ������ I/O をエラーログ�ダンプ�る</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>dumpio_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_dumpio.c</td></tr></table>
+<h3>概�</h3>
+
+    <p><code>mod_dumpio</code> を使���Apache ����������入力�
+    Apache �より�られ�����出力���両方も�����ら�一方を�
+    エラーログファイル�ログ�集 <span class="transnote">(<em>訳注:</em> ダンプ dump)</span>
+    ����。</p>
+
+    <p>データ�ロギング��SSL 復�化�直後 (入力) � SSL
+    暗�化�直� (出力) �行��れ��。�想��通り�
+    ��モジュール����も��データ�を出力������
+    �題をデ�ッグ���る�����使用�るよ��������。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#dumpioinput">DumpIOInput</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#dumpiooutput">DumpIOOutput</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#enable">dumpio サ�ートを有効��る</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="enable" id="enable">dumpio サ�ートを有効��る</a></h2>
+    
+
+    <p>��モジュールを有効��る���モジュール�コンパイル�れ����
+    実行�る Apache �設定�サー��組�込�れ��る必���り��。
+    ロギング機能��以下�ディレクティブを使��有効���り
+    無効���り����。</p>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DumpIOInput" id="DumpIOInput">DumpIOInput</a> <a name="dumpioinput" id="dumpioinput">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>エラーログ�����入力データをダンプ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DumpIOInput On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DumpIOInput Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_dumpio</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>DumpIOInput � Apache 2.1.3 以����使用�能</td></tr>
+</table>
+    <p>����入力�ダンプを有効����。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      DumpIOInput On
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DumpIOOutput" id="DumpIOOutput">DumpIOOutput</a> <a name="dumpiooutput" id="dumpiooutput">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>エラーログ�����出力データをダンプ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DumpIOOutput On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>DumpIOOutput Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_dumpio</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>DumpIOOutput � Apache 2.1.3 以����使用�能</td></tr>
+</table>
+    <p>����出力�ダンプを有効����。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      DumpIOOutput On
+    </code></p></div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_dumpio.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_dumpio.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_echo.html b/docs/manual/mod/mod_echo.html
index f4db4ba0..fb021cc7 100644
--- a/docs/manual/mod/mod_echo.html
+++ b/docs/manual/mod/mod_echo.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_echo.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_echo.html.ja.euc-jp
+URI: mod_echo.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_echo.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_echo.html.en b/docs/manual/mod/mod_echo.html.en
index 06ad891a..5d25fa5e 100644
--- a/docs/manual/mod/mod_echo.html.en
+++ b/docs/manual/mod/mod_echo.html.en
@@ -48,6 +48,7 @@ modules</td></tr>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Turn the echo server on or off</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProtocolEcho On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProtocolEcho Off</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_echo</td></tr>
@@ -68,6 +69,6 @@ later.</td></tr>
 <a href="../ja/mod/mod_echo.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_echo.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_echo.html.ja.euc-jp b/docs/manual/mod/mod_echo.html.ja.euc-jp
deleted file mode 100644
index fb1555ec..00000000
--- a/docs/manual/mod/mod_echo.html.ja.euc-jp
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_echo - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_echo</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_echo.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_echo.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_echo.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥×¥í¥È¥³¥ë¥â¥¸¥å¡¼¥ë¤Î³µÍפò¼¨¤¹¤¿¤á¤Îñ½ã¤Ê¥¨¥³¡¼¥µ¡¼¥Ð
-</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Experimental</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>echo_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_echo.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0 °Ê¹ß</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>Ëܥ⥸¥å¡¼¥ë¤Ï¥³¥ó¥»¥×¥È¤òÅÁ¤¨¤ë¤¿¤á¤Î¥×¥í¥È¥³¥ë¥â¥¸¥å¡¼¥ë¤Î
-    ¼ÂÁõÎã¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£Ã±½ã¤Ê¥¨¥³¡¼¥µ¡¼¥Ð¤òÄ󶡤·¤Þ¤¹¡£
-    Telnet ¤ÇÀܳ¤·¡¢Ê¸»úÎó¤òÁ÷¿®¤¹¤ë¤È¡¢¥¨¥³¡¼¤òÊÖ¤·¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#protocolecho">ProtocolEcho</a></li>
-</ul>
-</div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProtocolEcho" id="ProtocolEcho">ProtocolEcho</a> <a name="protocolecho" id="protocolecho">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¨¥³¡¼¥µ¡¼¥Ð¤ÎÍ­¸ú̵¸ú¤òÀßÄꤷ¤Þ¤¹¡£</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProtocolEcho On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Experimental</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_echo</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0 °Ê¹ß</td></tr>
-</table>
-    <p><code class="directive">ProtocolEcho</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç
-    ¥¨¥³¡¼¥µ¡¼¥Ð¤ÎÍ­¸ú̵¸ú¤òÀßÄꤷ¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      ProtocolEcho On
-    </code></p></div>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_echo.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_echo.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_echo.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_echo.html.ja.utf8 b/docs/manual/mod/mod_echo.html.ja.utf8
new file mode 100644
index 00000000..f0f2ba48
--- /dev/null
+++ b/docs/manual/mod/mod_echo.html.ja.utf8
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_echo - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_echo</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_echo.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_echo.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_echo.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>プロトコルモジュール�概�を示�����純�エコーサー�
+</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Experimental</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>echo_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_echo.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0 以�</td></tr></table>
+<h3>概�</h3>
+
+    <p>本モジュール�コンセプトを��る���プロトコルモジュール�
+    実装例�������。�純�エコーサー�を�供���。
+    Telnet �接続��文字列を�信�る��エコーを返���。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#protocolecho">ProtocolEcho</a></li>
+</ul>
+</div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProtocolEcho" id="ProtocolEcho">ProtocolEcho</a> <a name="protocolecho" id="protocolecho">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>エコーサー��有効無効を設定���。</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProtocolEcho On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_echo</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0 以�</td></tr>
+</table>
+    <p><code class="directive">ProtocolEcho</code> ディレクティブ�
+    エコーサー��有効無効を設定���。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      ProtocolEcho On
+    </code></p></div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_echo.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_echo.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_echo.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_echo.html.ko.euc-kr b/docs/manual/mod/mod_echo.html.ko.euc-kr
index 16380d57..b8d332c1 100644
--- a/docs/manual/mod/mod_echo.html.ko.euc-kr
+++ b/docs/manual/mod/mod_echo.html.ko.euc-kr
@@ -25,6 +25,8 @@
 <a href="../ja/mod/mod_echo.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_echo.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
+<div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
+            ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
 <table class="module"><tr><th><a href="module-dict.html#Description">¼³¸í:</a></th><td>ÇÁ·ÎÅäÄÝ ¸ðµâÀ» ¼³¸íÇϱâÀ§ÇÑ °£´ÜÇÑ echo ¼­¹ö</td></tr>
 <tr><th><a href="module-dict.html#Status">»óÅÂ:</a></th><td>Experimental</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">¸ðµâ¸í:</a></th><td>echo_module</td></tr>
@@ -66,6 +68,6 @@
 <a href="../ja/mod/mod_echo.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_echo.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_env.html b/docs/manual/mod/mod_env.html
index 00d518a7..83a77f74 100644
--- a/docs/manual/mod/mod_env.html
+++ b/docs/manual/mod/mod_env.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_env.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_env.html.ja.euc-jp
+URI: mod_env.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_env.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_env.html.en b/docs/manual/mod/mod_env.html.en
index 31500abc..beeff5b9 100644
--- a/docs/manual/mod/mod_env.html.en
+++ b/docs/manual/mod/mod_env.html.en
@@ -112,6 +112,6 @@ SSI pages</td></tr>
 <a href="../ja/mod/mod_env.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_env.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_env.html.ja.euc-jp b/docs/manual/mod/mod_env.html.ja.euc-jp
deleted file mode 100644
index 78bd77a6..00000000
--- a/docs/manual/mod/mod_env.html.ja.euc-jp
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_env - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_env</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_env.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_env.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_env.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>CGI ¥¹¥¯¥ê¥×¥ÈµÚ¤Ó SSI
-¥Ú¡¼¥¸¤ËÅϤµ¤ì¤ë´Ä¶­ÊÑ¿ô¤òÊѹ¹¤¹¤ëµ¡Ç½¤òÄ󶡤¹¤ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>env_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_env.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ë¤è¤ê CGI ¥¹¥¯¥ê¥×¥È¤È SSI
-    ¥Ú¡¼¥¸¤ËŬÍѤµ¤ì¤ë´Ä¶­ÊÑ¿ô¤òÀ©¸æ¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ´Ä¶­ÊÑ¿ô¤Ï <code class="program"><a href="../programs/httpd.html">httpd</a></code> ¥×¥í¥»¥¹¤òµ¯Æ°¤·¤¿¥·¥§¥ë¤«¤éÅϤµ¤ì¤Þ¤¹¡£¤Þ¤¿¡¢
-    ÀßÄê¥Õ¥¡¥¤¥ë¤Ç´Ä¶­ÊÑ¿ô¤òÀßÄꤷ¤¿¤ê¡¢ºï½ü¤·¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    </p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#passenv">PassEnv</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#setenv">SetEnv</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#unsetenv">UnsetEnv</a></li>
-</ul>
-<h3>»²¾È</h3>
-<ul class="seealso">
-<li><a href="../env.html">´Ä¶­ÊÑ¿ô</a></li>
-</ul></div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="PassEnv" id="PassEnv">PassEnv</a> <a name="passenv" id="passenv">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥·¥§¥ë¤«¤é¤Î´Ä¶­ÊÑ¿ô¤òÅϤ¹</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>PassEnv <var>env-variable</var> [<var>env-variable</var>]
-...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_env</td></tr>
-</table>
-
-    <p><code class="program"><a href="../programs/httpd.html">httpd</a></code> ¥×¥í¥»¥¹¤òµ¯Æ°¤·¤¿¥·¥§¥ë¤Î´Ä¶­¤«¤é CGI ¥¹¥¯¥ê¥×¥È¤È
-    SSI ¥Ú¡¼¥¸¤ËÅϤ¹´Ä¶­ÊÑ¿ô¤ò°ì¤Ä°Ê¾å»ØÄꤷ¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      PassEnv LD_LIBRARY_PATH
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SetEnv" id="SetEnv">SetEnv</a> <a name="setenv" id="setenv">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>SetEnv <var>env-variable</var> <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_env</td></tr>
-</table>
-    <p>´Ä¶­ÊÑ¿ô¤òÀßÄꤷ¡¢¤½¤ì¤ò CGI ¥¹¥¯¥ê¥×¥È¤È SSI
-    ¥Ú¡¼¥¸¤ËÅϤ¹¤è¤¦¤Ë¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      SetEnv SPECIAL_PATH /foo/bin
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="UnsetEnv" id="UnsetEnv">UnsetEnv</a> <a name="unsetenv" id="unsetenv">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>´Ä¶­¤«¤éÊÑ¿ô¤ò¼è¤ê½ü¤¯</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>UnsetEnv <var>env-variable</var> [<var>env-variable</var>]
-...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_env</td></tr>
-</table>
-    <p>CGI ¥¹¥¯¥ê¥×¥È¤È SSI
-    ¥Ú¡¼¥¸¤ËÅϤµ¤ì¤ë´Ä¶­ÊÑ¿ô¤«¤é»ØÄꤵ¤ì¤¿´Ä¶­ÊÑ¿ô¤ò¼è¤ê½ü¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      UnsetEnv LD_LIBRARY_PATH
-    </code></p></div>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_env.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_env.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_env.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_env.html.ja.utf8 b/docs/manual/mod/mod_env.html.ja.utf8
new file mode 100644
index 00000000..5f1f14f2
--- /dev/null
+++ b/docs/manual/mod/mod_env.html.ja.utf8
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_env - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_env</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_env.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_env.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_env.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>CGI スクリプト�� SSI
+ページ�渡�れる環境変数を変更�る機能を�供�る</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>env_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_env.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール�より CGI スクリプト� SSI
+    ページ��用�れる環境変数を制御�る�����るよ���り��。
+    環境変数� <code class="program"><a href="../programs/httpd.html">httpd</a></code> プロセスを起動��シェル�ら渡�れ��。���
+    設定ファイル�環境変数を設定��り�削除��り�る�������。
+    </p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#passenv">PassEnv</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#setenv">SetEnv</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#unsetenv">UnsetEnv</a></li>
+</ul>
+<h3>�照</h3>
+<ul class="seealso">
+<li><a href="../env.html">環境変数</a></li>
+</ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="PassEnv" id="PassEnv">PassEnv</a> <a name="passenv" id="passenv">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>シェル�ら�環境変数を渡�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>PassEnv <var>env-variable</var> [<var>env-variable</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_env</td></tr>
+</table>
+
+    <p><code class="program"><a href="../programs/httpd.html">httpd</a></code> プロセスを起動��シェル�環境�ら CGI スクリプト�
+    SSI ページ�渡�環境変数を一�以上指定���。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      PassEnv LD_LIBRARY_PATH
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SetEnv" id="SetEnv">SetEnv</a> <a name="setenv" id="setenv">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>環境変数を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SetEnv <var>env-variable</var> <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_env</td></tr>
+</table>
+    <p>環境変数を設定���れを CGI スクリプト� SSI
+    ページ�渡�よ�����。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      SetEnv SPECIAL_PATH /foo/bin
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="UnsetEnv" id="UnsetEnv">UnsetEnv</a> <a name="unsetenv" id="unsetenv">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>環境�ら変数を�り除�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>UnsetEnv <var>env-variable</var> [<var>env-variable</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_env</td></tr>
+</table>
+    <p>CGI スクリプト� SSI
+    ページ�渡�れる環境変数�ら指定�れ�環境変数を�り除���。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      UnsetEnv LD_LIBRARY_PATH
+    </code></p></div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_env.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_env.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_env.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_env.html.ko.euc-kr b/docs/manual/mod/mod_env.html.ko.euc-kr
index 2b1a4211..82b1037e 100644
--- a/docs/manual/mod/mod_env.html.ko.euc-kr
+++ b/docs/manual/mod/mod_env.html.ko.euc-kr
@@ -109,6 +109,6 @@
 <a href="../ja/mod/mod_env.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_env.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_example.html b/docs/manual/mod/mod_example.html
index 41b1d56e..6da80488 100644
--- a/docs/manual/mod/mod_example.html
+++ b/docs/manual/mod/mod_example.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_example.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_example.html.en b/docs/manual/mod/mod_example.html.en
index 00491c06..9b846e4b 100644
--- a/docs/manual/mod/mod_example.html.en
+++ b/docs/manual/mod/mod_example.html.en
@@ -151,6 +151,6 @@ API</td></tr>
 <p><span>Available Languages: </span><a href="../en/mod/mod_example.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_example.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_example.html.ko.euc-kr b/docs/manual/mod/mod_example.html.ko.euc-kr
index 5bae0683..c5948561 100644
--- a/docs/manual/mod/mod_example.html.ko.euc-kr
+++ b/docs/manual/mod/mod_example.html.ko.euc-kr
@@ -150,6 +150,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/mod_example.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_example.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_expires.html b/docs/manual/mod/mod_expires.html
index c3692c25..77b906ef 100644
--- a/docs/manual/mod/mod_expires.html
+++ b/docs/manual/mod/mod_expires.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_expires.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_expires.html.ja.euc-jp
+URI: mod_expires.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_expires.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_expires.html.en b/docs/manual/mod/mod_expires.html.en
index ec5c501c..051c5919 100644
--- a/docs/manual/mod/mod_expires.html.en
+++ b/docs/manual/mod/mod_expires.html.en
@@ -242,6 +242,6 @@ by MIME type</td></tr>
 <a href="../ja/mod/mod_expires.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_expires.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_expires.html.ja.euc-jp b/docs/manual/mod/mod_expires.html.ja.euc-jp
deleted file mode 100644
index 58dfe370..00000000
--- a/docs/manual/mod/mod_expires.html.ja.euc-jp
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_expires - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_expires</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_expires.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_expires.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_expires.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥æ¡¼¥¶¤Î»ØÄꤷ¤¿´ð½à¤Ë´ð¤Å¤¤¤¿ <code>Expires</code> ¤È
-<code>Cache-Control</code> HTTP ¥Ø¥Ã¥À¤ÎÀ¸À®</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>expires_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_expires.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¥µ¡¼¥Ð±þÅú¤Î <code>Expires</code> HTTP ¥Ø¥Ã¥À
-    ¤È <code>Cache-Control</code> ¥Ø¥Ã¥À¤Î <code>max-age</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-    ÀßÄê¤òÀ©¸æ¤·¤Þ¤¹¡£¸µ¤Î¥Õ¥¡¥¤¥ë¤¬ºîÀ®¤µ¤ì¤¿»þ¹ï¤Þ¤¿¤Ï
-    ¥¯¥é¥¤¥¢¥ó¥È¤Î¥¢¥¯¥»¥¹»þ¹ï¤Î¤É¤Á¤é¤«¤Ë´ð¤Å¤¤¤Æ´ü¸ÂÀÚ¤ìÆü¤ò
-    ÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¤³¤ì¤é¤Î¥Ø¥Ã¥À¤Ï¥¯¥é¥¤¥¢¥ó¥È¤Ëʸ½ñ¤Î
-    Í­¸úÀ­¤È·Ñ³À­¤ò»Ø¼¨¤·¤Þ¤¹¡£Ê¸½ñ¤¬¥­¥ã¥Ã¥·¥å¤µ¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢
-    »ØÄê»þ¹ï¤Ë㤹¤ë¤Þ¤Ç¤Ï¡¢¸µ¤Î¾ì½ê¤«¤é¼èÆÀ¤¹¤ëÂå¤ï¤ê¤Ë
-    ¥­¥ã¥Ã¥·¥å¤µ¤ì¤Æ¤¤¤ë¤â¤Î¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤½¤Î¸å¤Ï¡¢
-    ¥­¥ã¥Ã¥·¥å¤Ë¤¢¤ë¥³¥Ô¡¼¤Ï´ü¸ÂÀÚ¤ì (expired) ¤Ç̵¸ú¤Ç¤¢¤ë¤È¤µ¤ì¡¢
-    ¸µ¤Î¾ì½ê¤«¤é¿·¤·¤¤¤â¤Î¤ò¼èÆÀ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p><code>max-age</code> °Ê³° (<a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9">RFC
-    2616 section 14.9</a> »²¾È) ¤Î <code>Cache-Control</code> ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    Áàºî¤¹¤ë¤Ë¤Ï <code class="directive"><a href="../mod/mod_headers.html#header">Header</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    »È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p></div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#expiresactive">ExpiresActive</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#expiresbytype">ExpiresByType</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#expiresdefault">ExpiresDefault</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#AltSyn">ÂåÂØ´ü´Ö»ØÄ깽ʸ</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="AltSyn" id="AltSyn">ÂåÂØ´ü´Ö»ØÄ깽ʸ</a></h2>
-   
-    <p><code class="directive"><a href="#expiresdefault">ExpiresDefault</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    <code class="directive"><a href="#expiresbytype">ExpiresByType</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    °Ê²¼¤Î¤è¤êÆɤ߰פ¤¹½Ê¸¤ò»È¤Ã¤ÆÄêµÁ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      ExpiresDefault "&lt;base&gt; [plus] {&lt;num&gt;
-      &lt;type&gt;}*"<br />
-      ExpiresByType type/encoding "&lt;base&gt; [plus]
-      {&lt;num&gt; &lt;type&gt;}*"
-    </code></p></div>
-
-    <p>&lt;base&gt; ¤Ï°Ê²¼¤Î¤É¤ì¤«¤Ç¤¹:</p>
-
-    <ul>
-      <li><code>access</code></li>
-
-      <li><code>now</code> ('<code>access</code>' ¤ÈÅù²Á)</li>
-
-      <li><code>modification</code></li>
-    </ul>
-
-    <p><code>plus</code> ¥­¡¼¥ï¡¼¥É¤Ï¾Êά²Äǽ¤Ç¤¹¡£&lt;num&gt;
-    ¤Ï (<code>atoi()</code> ¤¬¼õ¤±ÉÕ¤±¤ë) À°¿ôÃÍ¡¢
-    &lt;type&gt; ¤Ï°Ê²¼¤Î¤É¤ì¤«¤Ç¤¹:</p>
-
-    <ul>
-      <li><code>years</code></li>
-      <li><code>months</code></li>
-      <li><code>weeks</code></li>
-      <li><code>days</code></li>
-      <li><code>hours</code></li>
-      <li><code>minutes</code></li>
-      <li><code>seconds</code></li>
-    </ul>
-
-    <p>Î㤨¤Ð¡¢°Ê²¼¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤É¤ì¤â¥Ç¥Õ¥©¥ë¥È¤Çʸ½ñ¤¬¥¢¥¯¥»¥¹¤Î 1 ¥ö·î¸å¤Ë
-    ´ü¸Â¤¬ÀÚ¤ì¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë»È¤¨¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      ExpiresDefault "access plus 1 month"<br />
-      ExpiresDefault "access plus 4 weeks"<br />
-      ExpiresDefault "access plus 30 days"
-    </code></p></div>
-
-    <p>´ü¸ÂÀÚ¤ì»þ¹ï¤Ï¤¤¤¯¤Ä¤«
-    '&lt;num&gt; &lt;type&gt;' Àá¤òÄɲ乤뤳¤È¤Ç¤è¤êºÙ¤«¤¯
-    À©¸æ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      ExpiresByType text/html "access plus 1 month 15
-      days 2 hours"<br />
-      ExpiresByType image/gif "modification plus 5 hours 3
-      minutes"
-    </code></p></div>
-
-    <p>½¤Àµ»þ¹ï¤Ë´ð¤Å¤¤¤¿ÀßÄê¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¡¢Expires ¥Ø¥Ã¥À¤Ï
-    ¥Ç¥£¥¹¥¯¤Î¥Õ¥¡¥¤¥ë°Ê³°¤Î¥³¥ó¥Æ¥ó¥Ä¤Ë¤Ï<strong>Äɲ䵤ì¤Ê¤¤</strong>¤³¤È¤ËÃí°Õ
-    ¤·¤Æ¤¯¤À¤µ¤¤¡£¤½¤Î¤è¤¦¤Ê¥³¥ó¥Æ¥ó¥Ä¤Ë¤Ï½¤Àµ»þ¹ï¤Ï¸ºß¤·¤Ê¤¤¤«¤é¤Ç¤¹¡£</p>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ExpiresActive" id="ExpiresActive">ExpiresActive</a> <a name="expiresactive" id="expiresactive">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td><code>Expires</code> ¥Ø¥Ã¥À¤ÎÀ¸À®¤òÍ­¸ú¤Ë¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ExpiresActive On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_expires</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÂбþ¤¹¤ë¥É¥­¥å¥á¥ó¥È¤ÎÎΰè¤Ç
-    <code>Expires</code> ¤È <code>Cache-Control</code>¥Ø¥Ã¥À¤ò
-    Í­¸ú¤Ë¤¹¤ë¤«Ìµ¸ú¤Ë¤¹¤ë¤«¤ò·è¤á¤Þ¤¹¡£
-    (Î㤨¤Ð¡¢<code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ç¤Ï¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î
-    ʸ½ñ¤Î¤ß¤ËŬÍѤµ¤ì¤ë¤È¤¤¤¦¤³¤È¤Ç¤¹¡£) <code>Off</code> ¤Ë
-    ÀßÄꤵ¤ì¤¿¾ì¹ç¤ÏÂбþÎΰè¤Ç¤½¤ì¤é¤Î¥Ø¥Ã¥À¤Ï
-    À¸À®¤µ¤ì¤Þ¤»¤ó (<code>.htaccess</code> ¤¬¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë¤ÎÀßÄê¤ò
-    ¾å½ñ¤­¤¹¤ë¡¢¤È¤¤¤¦¤è¤¦¤Ê²¼°Ì¥ì¥Ù¥ë¤Ç¤Î¾å½ñ¤­¤¬¤µ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð)¡£
-    <code>On</code> ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢¥Ø¥Ã¥À¤Ï <code class="directive"><a href="#expiresbytype">ExpiresByType</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    <code class="directive"><a href="#expiresdefault">ExpiresDefault</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö
-    ¤Î´ð½à¤Ë½¾¤Ã¤Æʸ½ñ¤Ë¥Ø¥Ã¥À¤òÄɲä·¤Þ¤¹ (³Æ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö»²¾È)¡£</p>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code>Expires</code> ¤È
-    <code>Cache-Control</code> ¥Ø¥Ã¥À¤Î¸ºß¤ò
-    Êݾڤ¹¤ë¤ï¤±¤Ç¤Ï¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£´ð½à¤¬Ëþ¤¿¤µ¤ì¤Æ
-    ¤¤¤Ê¤¤¾ì¹ç¤Ï¥Ø¥Ã¥À¤ÏÄɲ䵤줺¡¢·ë²Ì¤È¤·¤Æ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬
-    »ØÄꤵ¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿¤«¤Î¤è¤¦¤Ë¤µ¤¨¸«¤¨¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ExpiresByType" id="ExpiresByType">ExpiresByType</a> <a name="expiresbytype" id="expiresbytype">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>MIME ¥¿¥¤¥×¤Ë¤è¤Ã¤ÆÀßÄꤵ¤ì¤ë <code>Expires</code> ¥Ø¥Ã¥À¤ÎÃÍ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ExpiresByType <var>MIME-type</var>
-<var>&lt;code&gt;seconds</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_expires</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï»ØÄꤵ¤ì¤¿¥¿¥¤¥×¤Î¥É¥­¥å¥á¥ó¥È
-    (<em>Î㤨¤Ð</em> <code>text/html</code>)
-    ¤ËÂФ·¤ÆÀ¸À®¤µ¤ì¤ë <code>Expires</code> ¥Ø¥Ã¥À¤È <code>Cache-Control</code>
-    ¥Ø¥Ã¥À¤Î <code>max-age</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÃͤòÄêµÁ¤·¤Þ¤¹¡£
-    Æó¤ÄÌܤΰú¿ô¤Ï´ü¸ÂÀÚ¤ì¤ÎÆü»þ¤òÀ¸À®¤¹¤ë¤¿¤á¤Î´ð½à»þ¹ï¤ËÄɲ䵤ì¤ë
-    Éÿô¤òÀßÄꤷ¤Þ¤¹¡£<code>Cache-Control:
-    max-age</code> ¤Ï´ü¸ÂÀÚ¤ì¤Î»þ¹ï¤«¤é¥ê¥¯¥¨¥¹¥È»þ¹ï¤ò°ú¤¤¤¿¤â¤Î¤òÉäÇ
-    ɽ¤¹¤³¤È¤ÇÀ¸À®¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>´ð½à»þ¹ï¤Ï¥Õ¥¡¥¤¥ë¤ÎºÇ½ª½¤Àµ»þ¹ï¤«¡¢¥¯¥é¥¤¥¢¥ó¥È¤Î¥É¥­¥å¥á¥ó¥È¤Ø¤Î
-    ¥¢¥¯¥»¥¹»þ¹ï¤Ç¤¹¡£¤É¤Á¤é¤ò»È¤¦¤Ù¤­¤«¤Ï <code><var>&lt;code&gt;</var></code>
-    ¤Ë¤è¤Ã¤Æ»ØÄꤷ¤Þ¤¹¡£<code>M</code> ¤Ï´ð½à»þ¹ï¤È¤·¤Æ
-    ¥Õ¥¡¥¤¥ë¤ÎºÇ½ª½¤Àµ»þ¹ï¤ò¤È¤¤¤¦°ÕÌ£¤Ç¡¢<code>A</code> ¤Ï¥¯¥é¥¤¥¢¥ó¥È¤Î
-    ¥¢¥¯¥»¥¹»þ¹ï¤ò»È¤¦¤È¤¤¤¦°ÕÌ£¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p>¸ú²Ì¤Ë¤ÏÈù̯¤Ê°ã¤¤¤¬¤¢¤ê¤Þ¤¹¡£<code>M</code> ¤¬»ÈÍѤµ¤ì¤¿¾ì¹ç¤Ï¡¢
-    ¤¹¤Ù¤Æ¤Î¥­¥ã¥Ã¥·¥å¤Ë¤¢¤ë¸½ºß¤Î¥É¥­¥å¥á¥ó¥È¥­¥ã¥Ã¥·¥å¤ÏƱ»þ¤Ë´ü¸Â¤¬
-    ÀÚ¤ì¤Þ¤¹¡£¤³¤ì¤ÏƱ¤¸ URL ¤ËËè½µ¾ï¤ËÃÖ¤«¤ì¤ëÊ󤻤Τ褦¤Ê¤â¤Î¤Ë¤Ï
-    Èó¾ï¤ËÍ­¸ú¤Ç¤¹¡£<code>A</code> ¤¬»ÈÍѤµ¤ì¤¿¾ì¹ç¤Ï¡¢´ü¸ÂÀÚ¤ì¤Î
-    »þ´Ö¤Ï³Æ¥¯¥é¥¤¥¢¥ó¥È¤Ë¤è¤Ã¤Æ°Û¤Ê¤ê¤Þ¤¹¡£¤³¤ì¤Ï¤¢¤Þ¤êÊѹ¹¤µ¤ì¤Ê¤¤
-    ²èÁü¥Õ¥¡¥¤¥ë¤Ê¤É¡¢Æä˴ØÏ¢¤¹¤ë¥É¥­¥å¥á¥ó¥È·²¤¬¤¹¤Ù¤ÆƱ¤¸²èÁü¤ò
-    »²¾È¤¹¤ë¤È¤­ (<em>¤¹¤Ê¤ï¤Á</em>²èÁü¤¬Èæ³ÓŪû¤¤´ü´ÖÆâ¤Ë·«¤êÊÖ¤·
-    ¥¢¥¯¥»¥¹¤µ¤ì¤ë¤È¤­) ¤ËÍ­¸ú¤Ç¤¹¡£</p>
-
-    <div class="example"><h3>Îã:</h3><p><code>
-      # enable expirations<br />
-      ExpiresActive On<br />
-      # expire GIF images after a month in the client's cache<br />
-      ExpiresByType image/gif A2592000<br />
-      # HTML documents are good for a week from the<br />
-      # time they were changed<br />
-      ExpiresByType text/html M604800
-    </code></p></div>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code>ExpiresActive On</code> ¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë
-    ¤È¤­¤Î¤ßÍ­¸ú¤Ç¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤ì¤Ï¡¢
-    »ØÄꤵ¤ì¤¿ MIME ¥¿¥¤¥×¤ËÂФ·¤Æ<em>¤Î¤ß</em> <code class="directive"><a href="#expiresdefault">ExpiresDefault</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç
-    ÀßÄꤵ¤ì¤¿´ü¸ÂÀÚ¤ì´üÆü¤ò¾å½ñ¤­¤·¤Þ¤¹¡£</p>
-
-    <p>¤³¤Îʸ½ñ¤ÎÁ°¤ÎÊý¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë<a href="#AltSyn">ÂåÂع½Ê¸</a>¤ò
-    »È¤Ã¤Æ´ü¸ÂÀÚ¤ì´üÆü¤Î·×»»ÊýË¡¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ExpiresDefault" id="ExpiresDefault">ExpiresDefault</a> <a name="expiresdefault" id="expiresdefault">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>´ü¸ÂÀÚ¤ì´üÆü¤ò·×»»¤¹¤ë¥Ç¥Õ¥©¥ë¥È¥¢¥ë¥´¥ê¥º¥à</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ExpiresDefault <var>&lt;code&gt;seconds</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Indexes</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_expires</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÂбþ¤¹¤ëÈϰϤΤ¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥È¤ËÂФ·¤Æ
-    ¥Ç¥Õ¥©¥ë¥È¤Î´ü¸ÂÀÚ¤ì´üÆü¤Î·×»»¥¢¥ë¥´¥ê¥º¥à¤òÀßÄꤷ¤Þ¤¹¡£<code class="directive"><a href="#expiresbytype">ExpiresByType</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤Ã¤Æ
-    ¥¿¥¤¥×Ëè¤Ë¾å½ñ¤­¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£°ú¿ô¤Î¹½Ê¸¤Ï¤½¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-    ÀâÌÀ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£¤Þ¤¿¡¢<a href="#AltSyn">ÂåÂع½Ê¸</a>¤â
-    »²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_expires.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_expires.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_expires.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_expires.html.ja.utf8 b/docs/manual/mod/mod_expires.html.ja.utf8
new file mode 100644
index 00000000..8102950e
--- /dev/null
+++ b/docs/manual/mod/mod_expires.html.ja.utf8
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_expires - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_expires</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_expires.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_expires.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_expires.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>ユーザ�指定��基準�基��� <code>Expires</code> �
+<code>Cache-Control</code> HTTP ヘッダ�生�</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>expires_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_expires.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール�サー�応答� <code>Expires</code> HTTP ヘッダ
+    � <code>Cache-Control</code> ヘッダ� <code>max-age</code> ディレクティブ�
+    設定を制御���。元�ファイル�作��れ�時刻���
+    クライアント�アクセス時刻���ら��基���期�切れ日を
+    設定�る�������。</p>
+
+    <p>�れら�ヘッダ�クライアント�文書�
+    有効性�継続性を指示���。文書�キャッシュ�れ�場����
+    指定時刻���る����元�場所�ら�得�る代�り�
+    キャッシュ�れ��るも�を使��������。��後��
+    キャッシュ��るコピー�期�切れ (expired) �無効��る��れ�
+    元�場所�ら新��も�を�得�る必���り��。</p>
+
+    <p><code>max-age</code> 以外 (<a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9">RFC
+    2616 section 14.9</a> �照) � <code>Cache-Control</code> �ディレクティブを
+    �作�る�� <code class="directive"><a href="../mod/mod_headers.html#header">Header</a></code> ディレクティブを
+    使��������。</p></div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#expiresactive">ExpiresActive</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#expiresbytype">ExpiresByType</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#expiresdefault">ExpiresDefault</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#AltSyn">代替期間指定構文</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="AltSyn" id="AltSyn">代替期間指定構文</a></h2>
+   
+    <p><code class="directive"><a href="#expiresdefault">ExpiresDefault</a></code> ディレクティブ�
+    <code class="directive"><a href="#expiresbytype">ExpiresByType</a></code> ディレクティブ�
+    以下�より読�易�構文を使��定義�る�������:</p>
+
+    <div class="example"><p><code>
+      ExpiresDefault "&lt;base&gt; [plus] {&lt;num&gt;
+      &lt;type&gt;}*"<br />
+      ExpiresByType type/encoding "&lt;base&gt; [plus]
+      {&lt;num&gt; &lt;type&gt;}*"
+    </code></p></div>
+
+    <p>&lt;base&gt; �以下��れ���:</p>
+
+    <ul>
+      <li><code>access</code></li>
+
+      <li><code>now</code> ('<code>access</code>' �等価)</li>
+
+      <li><code>modification</code></li>
+    </ul>
+
+    <p><code>plus</code> キーワード��略�能��。&lt;num&gt;
+    � (<code>atoi()</code> ���付�る) 整数値�
+    &lt;type&gt; �以下��れ���:</p>
+
+    <ul>
+      <li><code>years</code></li>
+      <li><code>months</code></li>
+      <li><code>weeks</code></li>
+      <li><code>days</code></li>
+      <li><code>hours</code></li>
+      <li><code>minutes</code></li>
+      <li><code>seconds</code></li>
+    </ul>
+
+    <p>例���以下�ディレクティブ��れもデフォルト�文書�アクセス� 1 ヶ月後�
+    期��切れるよ���る���使���:</p>
+
+    <div class="example"><p><code>
+      ExpiresDefault "access plus 1 month"<br />
+      ExpiresDefault "access plus 4 weeks"<br />
+      ExpiresDefault "access plus 30 days"
+    </code></p></div>
+
+    <p>期�切れ時刻�����
+    '&lt;num&gt; &lt;type&gt;' 節を追加�る���より細��
+    制御�る�������:</p>
+
+    <div class="example"><p><code>
+      ExpiresByType text/html "access plus 1 month 15
+      days 2 hours"<br />
+      ExpiresByType image/gif "modification plus 5 hours 3
+      minutes"
+    </code></p></div>
+
+    <p>修正時刻�基���設定を使用���る場��Expires ヘッダ�
+    ディスク�ファイル以外�コンテンツ��<strong>追加�れ��</strong>���注�
+    ������。��よ��コンテンツ��修正時刻�存在����ら��。</p>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ExpiresActive" id="ExpiresActive">ExpiresActive</a> <a name="expiresactive" id="expiresactive">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td><code>Expires</code> ヘッダ�生�を有効��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ExpiresActive On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_expires</td></tr>
+</table>
+    <p>��ディレクティブ�対応�るドキュメント�領域�
+    <code>Expires</code> � <code>Cache-Control</code>ヘッダを
+    有効��る�無効��る�を決���。
+    (例���<code>.htaccess</code> ファイル����ディレクトリ�
+    文書����用�れる�������。) <code>Off</code> �
+    設定�れ�場��対応領域��れら�ヘッダ�
+    生��れ��ん (<code>.htaccess</code> �サー�設定ファイル�設定を
+    上書��る����よ��下�レベル��上書���れ����れ�)。
+    <code>On</code> �設定�れ��れ��ヘッダ� <code class="directive"><a href="#expiresbytype">ExpiresByType</a></code> ディレクティブ�
+    <code class="directive"><a href="#expiresdefault">ExpiresDefault</a></code> ディレクティブ
+    �基準�従��文書�ヘッダを追加��� (�ディレクティブ�照)。</p>
+
+    <p>��ディレクティブ� <code>Expires</code> �
+    <code>Cache-Control</code> ヘッダ�存在を
+    �証�る���������注�������。基準�満��れ�
+    ���場��ヘッダ�追加�れ���果�����ディレクティブ�
+    指定�れ��������よ����見�る����り��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ExpiresByType" id="ExpiresByType">ExpiresByType</a> <a name="expiresbytype" id="expiresbytype">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>MIME タイプ�よ��設定�れる <code>Expires</code> ヘッダ�値</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ExpiresByType <var>MIME-type</var>
+<var>&lt;code&gt;seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_expires</td></tr>
+</table>
+    <p>��ディレクティブ�指定�れ�タイプ�ドキュメント
+    (<em>例��</em> <code>text/html</code>)
+    �対��生��れる <code>Expires</code> ヘッダ� <code>Cache-Control</code>
+    ヘッダ� <code>max-age</code> ディレクティブ�値を定義���。
+    二�目�引数�期�切れ�日時を生��る���基準時刻�追加�れる
+    秒数を設定���。<code>Cache-Control:
+    max-age</code> �期�切れ�時刻�らリクエスト時刻を引��も�を秒�
+    表����生��れ��。</p>
+
+    <p>基準時刻�ファイル�最終修正時刻��クライアント�ドキュメント��
+    アクセス時刻��。��らを使����� <code><var>&lt;code&gt;</var></code>
+    �よ��指定���。<code>M</code> �基準時刻���
+    ファイル�最終修正時刻を����味��<code>A</code> �クライアント�
+    アクセス時刻を使�����味��り��。</p>
+
+    <p>効果��微妙�����り��。<code>M</code> �使用�れ�場���
+    ����キャッシュ��る�在�ドキュメントキャッシュ��時�期��
+    切れ��。�れ��� URL �毎週常�置�れる報��よ��も���
+    �常�有効��。<code>A</code> �使用�れ�場���期�切れ�
+    時間��クライアント�よ��異�り��。�れ���り変更�れ��
+    画�ファイル���特�関連�るドキュメント群������画�を
+    �照�る�� (<em>����</em>画��比較的短�期間内�繰り返�
+    アクセス�れる��) �有効��。</p>
+
+    <div class="example"><h3>例:</h3><p><code>
+      # enable expirations<br />
+      ExpiresActive On<br />
+      # expire GIF images after a month in the client's cache<br />
+      ExpiresByType image/gif A2592000<br />
+      # HTML documents are good for a week from the<br />
+      # time they were changed<br />
+      ExpiresByType text/html M604800
+    </code></p></div>
+
+    <p>��ディレクティブ� <code>ExpiresActive On</code> �指定�れ��る
+    ����有効��る���注�������。�れ��
+    指定�れ� MIME タイプ�対��<em>��</em> <code class="directive"><a href="#expiresdefault">ExpiresDefault</a></code> ディレクティブ�
+    設定�れ�期�切れ期日を上書����。</p>
+
+    <p>��文書���方�説明�れ��る<a href="#AltSyn">代替構文</a>を
+    使��期�切れ期日�計算方法を指定�る��も����。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ExpiresDefault" id="ExpiresDefault">ExpiresDefault</a> <a name="expiresdefault" id="expiresdefault">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>期�切れ期日を計算�るデフォルトアルゴリズム</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ExpiresDefault <var>&lt;code&gt;seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Indexes</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_expires</td></tr>
+</table>
+    <p>��ディレクティブ�対応�る範囲�����ドキュメント�対��
+    デフォルト�期�切れ期日�計算アルゴリズムを設定���。<code class="directive"><a href="#expiresbytype">ExpiresByType</a></code> ディレクティブ�よ��
+    タイプ毎�上書��る�������。引数�構文���ディレクティブ�
+    説明を�照������。���<a href="#AltSyn">代替構文</a>も
+    �照������。</p>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_expires.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_expires.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_expires.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_expires.html.ko.euc-kr b/docs/manual/mod/mod_expires.html.ko.euc-kr
index a95abc3a..066f370a 100644
--- a/docs/manual/mod/mod_expires.html.ko.euc-kr
+++ b/docs/manual/mod/mod_expires.html.ko.euc-kr
@@ -220,6 +220,6 @@
 <a href="../ja/mod/mod_expires.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_expires.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_ext_filter.html b/docs/manual/mod/mod_ext_filter.html
index aacf8a65..a4474fe0 100644
--- a/docs/manual/mod/mod_ext_filter.html
+++ b/docs/manual/mod/mod_ext_filter.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_ext_filter.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_ext_filter.html.ja.euc-jp
+URI: mod_ext_filter.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_ext_filter.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_ext_filter.html.en b/docs/manual/mod/mod_ext_filter.html.en
index 6ebe6309..8fa58201 100644
--- a/docs/manual/mod/mod_ext_filter.html.en
+++ b/docs/manual/mod/mod_ext_filter.html.en
@@ -371,6 +371,6 @@ delivery to the client</td></tr>
 <a href="../ja/mod/mod_ext_filter.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_ext_filter.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_ext_filter.html.ja.euc-jp b/docs/manual/mod/mod_ext_filter.html.ja.euc-jp
deleted file mode 100644
index a75a0278..00000000
--- a/docs/manual/mod/mod_ext_filter.html.ja.euc-jp
+++ /dev/null
@@ -1,369 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_ext_filter - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_ext_filter</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_ext_filter.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_ext_filter.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_ext_filter.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥ì¥¹¥Ý¥ó¥¹¤Î¥Ü¥Ç¥£¤ò¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤ëÁ°¤Ë³°Éô¥×¥í¥°¥é¥à¤Ç½èÍý¤¹¤ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>ext_filter_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_ext_filter.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p><code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> ¤Ç¤Ï <a href="../filter.html">¥Õ¥£¥ë¥¿</a>
-    ¤Î´·¤ì¿Æ¤·¤ó¤Àñ½ã¤Ê¥×¥í¥°¥é¥ß¥ó¥°¥â¥Ç¥ë¤¬Ä󶡤µ¤ì¤Þ¤¹¡£¤³¤Î¥â¥¸¥å¡¼¥ë¤ò
-    »È¤¨¤Ð¡¢É¸½àÆþÎϤ«¤éÆɤ߹þ¤ó¤Ç¡¢É¸½à½ÐÎϤ˽ñ¤­½Ð¤¹¥×¥í¥°¥é¥à
-    (¤¹¤Ê¤ï¤Á Unix ·Á¼°¤Î¥Õ¥£¥ë¥¿¥³¥Þ¥ó¥É) ¤ò Apache ¤Î¥Õ¥£¥ë¥¿¤Ë¤¹¤ë¤³¤È¤¬
-    ¤Ç¤­¤Þ¤¹¡£¤³¤Î¥Õ¥£¥ë¥¿¤Îµ¡¹½¤Ï¡¢Apache API ¸þ¤±¤Ë½ñ¤«¤ì¤¿ Apache
-    ¥µ¡¼¥Ð¥×¥í¥»¥¹Æâ¤Ç¼Â¹Ô¤µ¤ì¤ëÀìÍѤΥե£¥ë¥¿¤è¤ê¤â¤º¤Ã¤ÈÃÙ¤¤¤Ç¤¹¤¬¡¢
-    °Ê²¼¤Î¤è¤¦¤ÊÍøÅÀ¤â¤¢¤ê¤Þ¤¹¡£</p>
-
-    <ul>
-      <li>¤º¤Ã¤È¥·¥ó¥×¥ë¤Ê¥×¥í¥°¥é¥ß¥ó¥°¥â¥Ç¥ë</li>
-
-      <li>¥×¥í¥°¥é¥à¤¬É¸½àÆþÎϤ«¤éÆɤó¤Çɸ½à½ÐÎϤ˽ñ¤¯¤â¤Î¤Ç¤¢¤ë¸Â¤ê¡¢
-      ¤É¤ó¤Ê¥×¥í¥°¥é¥à¸À¸ì¤ä¥¹¥¯¥ê¥×¥È¸À¸ì¤Ç¤â»È¤¦¤³¤È¤¬¤Ç¤­¤ë</li>
-
-      <li>´û¸¤Î¥×¥í¥°¥é¥à¤òÊѹ¹¤¹¤ë¤³¤È¤Ê¤¯ Apache ¤Î¥Õ¥£¥ë¥¿¤È¤·¤Æ
-      »È¤¦¤³¤È¤¬¤Ç¤­¤ë</li>
-    </ul>
-
-    <p>À­Ç½¤ÎÌäÂê¤Ë¤è¤ê¼Â±¿ÍѤËŬ¤µ¤Ê¤¤¤È¤·¤Æ¤â¡¢¥Õ¥£¥ë¥¿¤Î¥×¥í¥È¥¿¥¤¥×ÍѤÎ
-    ´Ä¶­¤È¤·¤Æ¤Ï <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> ¤Ï»È¤¨¤Þ¤¹¡£</p>
-
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#extfilterdefine">ExtFilterDefine</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#extfilteroptions">ExtFilterOptions</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#examples">Îã</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><a href="../filter.html">¥Õ¥£¥ë¥¿</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Îã</a></h2>
-
-    <h3>¾¤Î¥¿¥¤¥×¤Î¥ì¥¹¥Ý¥ó¥¹¤«¤é HTML ¤òÀ¸À®¤¹¤ë</h3>
-      <div class="example"><p><code>
-        # mod_ext_filter directive to define a filter<br />
-        # to HTML-ize text/c files using the external<br />
-        # program /usr/bin/enscript, with the type of<br />
-        # the result set to text/html<br />
-        ExtFilterDefine c-to-html mode=output \<br />
-        <span class="indent">
-          intype=text/c outtype=text/html \<br />
-          cmd="/usr/bin/enscript --color -W html -Ec -o - -"<br />
-        </span>
-        <br />
-        &lt;Directory "/export/home/trawick/apacheinst/htdocs/c"&gt;<br />
-        <span class="indent">
-          # core directive to cause the new filter to<br />
-          # be run on output<br />
-          SetOutputFilter c-to-html<br />
-          <br />
-          # mod_mime directive to set the type of .c<br />
-          # files to text/c<br />
-          AddType text/c .c<br />
-          <br />
-          # mod_ext_filter directive to set the debug<br />
-          # level just high enough to see a log message<br />
-          # per request showing the configuration in force<br />
-          ExtFilterOptions DebugLevel=1<br />
-        </span>
-        &lt;/Directory&gt;
-      </code></p></div>
-    
-
-    <h3>¥³¥ó¥Æ¥ó¥È¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î¥Õ¥£¥ë¥¿¤ò¼ÂÁõ¤¹¤ë</h3>
-      <p>Ãí: ¤³¤Î gzip ¤ÎÎã¤Ï¥Ç¥âÍѤǤ¹¡£¼ÂÍÑŪ¤Ê¼ÂÁõ¤Ï
-      <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-      <div class="example"><p><code>
-        # mod_ext_filter directive to define the external filter<br />
-        ExtFilterDefine gzip mode=output cmd=/bin/gzip<br />
-        <br />
-        &lt;Location /gzipped&gt;<br />
-        <span class="indent">
-          # core directive to cause the gzip filter to be<br />
-          # run on output<br />
-          SetOutputFilter gzip<br />
-          <br />
-          # mod_header directive to add<br />
-          # "Content-Encoding: gzip" header field<br />
-          Header set Content-Encoding gzip<br />
-        </span>
-        &lt;/Location&gt;
-      </code></p></div>
-    
-
-    <h3>¥µ¡¼¥Ð¤òÃÙ¤¯¤¹¤ë</h3>
-      <div class="example"><p><code>
-        # mod_ext_filter directive to define a filter<br />
-        # which runs everything through cat; cat doesn't<br />
-        # modify anything; it just introduces extra pathlength<br />
-        # and consumes more resources<br />
-        ExtFilterDefine slowdown mode=output cmd=/bin/cat \<br />
-        <span class="indent">
-          preservescontentlength<br />
-        </span>
-        <br />
-        &lt;Location /&gt;<br />
-        <span class="indent">
-          # core directive to cause the slowdown filter to<br />
-          # be run several times on output<br />
-          #<br />
-          SetOutputFilter slowdown;slowdown;slowdown<br />
-        </span>
-        &lt;/Location&gt;
-      </code></p></div>
-    
-
-    <h3>sed ¤ò»È¤Ã¤Æ±þÅúÃæ¤Î¥Æ¥­¥¹¥È¤òÃÖ´¹¤¹¤ë</h3>
-      <div class="example"><p><code>
-        # mod_ext_filter directive to define a filter which<br />
-        # replaces text in the response<br />
-        #<br />
-        ExtFilterDefine fixtext mode=output intype=text/html \<br />
-        <span class="indent">
-          cmd="/bin/sed s/verdana/arial/g"<br />
-        </span>
-        <br />
-        &lt;Location /&gt;<br />
-        <span class="indent">
-          # core directive to cause the fixtext filter to<br />
-          # be run on output<br />
-          SetOutputFilter fixtext<br />
-        </span>
-        &lt;/Location&gt;
-      </code></p></div>
-    
-
-    <h3>Ê̤Υե£¥ë¥¿¤Î¥È¥ì¡¼¥¹</h3>
-      <div class="example"><p><code>
-        # Trace the data read and written by mod_deflate<br />
-        # for a particular client (IP 192.168.1.31)<br />
-        # experiencing compression problems.<br />
-        # This filter will trace what goes into mod_deflate.<br />
-        ExtFilterDefine tracebefore \<br />
-        <span class="indent">
-          cmd="/bin/tracefilter.pl /tmp/tracebefore" \<br />
-          EnableEnv=trace_this_client<br />
-        </span>
-        <br />
-        # This filter will trace what goes after mod_deflate.<br />
-        # Note that without the ftype parameter, the default<br />
-        # filter type of AP_FTYPE_RESOURCE would cause the<br />
-        # filter to be placed *before* mod_deflate in the filter<br />
-        # chain.  Giving it a numeric value slightly higher than<br />
-        # AP_FTYPE_CONTENT_SET will ensure that it is placed<br />
-        # after mod_deflate.<br />
-        ExtFilterDefine traceafter \<br />
-        <span class="indent">
-          cmd="/bin/tracefilter.pl /tmp/traceafter" \<br />
-          EnableEnv=trace_this_client ftype=21<br />
-        </span>
-        <br />
-        &lt;Directory /usr/local/docs&gt;<br />
-        <span class="indent">
-          SetEnvIf Remote_Addr 192.168.1.31 trace_this_client<br />
-          SetOutputFilter tracebefore;deflate;traceafter<br />
-        </span>
-        &lt;/Directory&gt;
-      </code></p></div>
-
-      <div class="example"><h3>¥Ç¡¼¥¿¤ò¥È¥ì¡¼¥¹¤¹¤ë¥Õ¥£¥ë¥¿:</h3><p><code>
-        #!/usr/local/bin/perl -w<br />
-        use strict;<br />
-        <br />
-        open(SAVE, "&gt;$ARGV[0]")<br />
-        <span class="indent">
-          or die "can't open $ARGV[0]: $?";<br />
-        </span>
-        <br />
-        while (&lt;STDIN&gt;) {<br />
-        <span class="indent">
-          print SAVE $_;<br />
-          print $_;<br />
-        </span>
-        }<br />
-        <br />
-        close(SAVE);
-      </code></p></div>
-    
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ExtFilterDefine" id="ExtFilterDefine">ExtFilterDefine</a> <a name="extfilterdefine" id="extfilterdefine">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>³°Éô¥Õ¥£¥ë¥¿¤òÄêµÁ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ExtFilterDefine <var>filtername</var> <var>parameters</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_ext_filter</td></tr>
-</table>
-    <p><code class="directive">ExtFilterDefine</code> ¤Ï¡¢¼Â¹Ô¤¹¤ë¥×¥í¥°¥é¥à¤ä
-    °ú¿ô¤Ê¤É¡¢³°Éô¥Õ¥£¥ë¥¿¤ÎÆÃÀ­¤òÄêµÁ¤·¤Þ¤¹¡£</p>
-
-    <p><var>filtername</var> ¤ÏÄêµÁ¤¹¤ë¥Õ¥£¥ë¥¿¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£
-    ¤³¤Î̾Á°¤Ï¸å¤Ç <code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£Ì¾Á°¤ÏÅÐÏ¿¤µ¤ì¤ë¤¹¤Ù¤Æ¤Î¥Õ¥£¥ë¥¿¤Ç
-    °ì°Õ¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£<em>¸½»þÅÀ¤Ç¤Ï¡¢¥Õ¥£¥ë¥¿¤ÎÅÐÏ¿ API ¤«¤é¤Ï
-    ¥¨¥é¡¼¤ÏÊó¹ð¤µ¤ì¤Þ¤»¤ó¡£¤Ç¤¹¤«¤é¡¢½ÅÊ£¤¹¤ë̾Á°¤ò»È¤Ã¤Æ¤·¤Þ¤Ã¤¿¤È¤­¤Ç¤â
-    ¥æ¡¼¥¶¤Ë¤Ï¤½¤Î¤³¤È¤ÏÊó¹ð¤µ¤ì¤Þ¤»¤ó¡£</em></p>
-
-    <p>³¤¯¥Ñ¥é¥á¡¼¥¿¤Î½çÈ֤ϴط¸Ìµ¤¯¡¢¤½¤ì¤é¤Ï¼Â¹Ô¤¹¤ë³°Éô¥³¥Þ¥ó¥É¤È¡¢
-    ¾¤ÎÆÃÀ­¤òÄêµÁ¤·¤Þ¤¹¡£<code>cmd=</code> ¤À¤±¤¬É¬¿Ü¤Î¥Ñ¥é¥á¡¼¥¿¤Ç¤¹¡£
-    »ØÄê²Äǽ¤Ê¥Ñ¥é¥á¡¼¥¿¤Ï:</p>
-
-    <dl>
-      <dt><code>cmd=<var>cmdline</var></code></dt>
-
-      <dd><code>cmd=</code> ¥­¡¼¥ï¡¼¥É¤Ï¼Â¹Ô¤¹¤ë³°Éô¥³¥Þ¥ó¥É¤ò»ØÄꤷ¤Þ¤¹¡£
-      ¥×¥í¥°¥é¥à̾¤Î¸å¤Ë°ú¿ô¤¬¤¢¤ë¾ì¹ç¤Ï¡¢¥³¥Þ¥ó¥É¹Ô¤Ï°úÍÑÉä¤Ç°Ï¤à
-      ɬÍפ¬¤¢¤ê¤Þ¤¹ (<em>Î㤨¤Ð</em>¡¢<code>cmd="<var>/bin/mypgm</var>
-      <var>arg1</var> <var>arg2</var>"</code> ¤Î¤è¤¦¤Ë)¡£¥×¥í¥°¥é¥à¤Ï
-      ¥·¥§¥ë·Ðͳ¤Ç¤Ê¤¯¡¢Ä¾Àܼ¹Ԥµ¤ì¤Þ¤¹¤Î¤Ç¡¢Ä̾ï¤Î¥·¥§¥ëÍѤÎ
-      ¥¨¥¹¥±¡¼¥×¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£¥×¥í¥°¥é¥à¤Î°ú¿ô¤Ï¶õÇò¤Ç¶èÀÚ¤é¤ì¤Þ¤¹¡£
-      ¥×¥í¥°¥é¥à¤Î°ú¿ô¤Î°ìÉô¤È¤Ê¤ëɬÍפΤ¢¤ë¶õÇò¤Ï¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹¤Ç¥¨¥¹¥±¡¼¥×
-      ¤Ç¤­¤Þ¤¹¡£°ú¿ô¤Î°ìÉô¤Ë¤Ê¤ë¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤Ï¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤Ç
-      ¥¨¥¹¥±¡¼¥×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£É¸½à¤Î CGI ´Ä¶­ÊÑ¿ô¤Ë²Ã¤¨¤Æ¡¢
-      ´Ä¶­ÊÑ¿ô DOCUMENT_URI, DOCUMENT_PATH_INFO, and 
-      QUERY_STRING_UNESCAPED ¤¬¥×¥í¥°¥é¥à¤Î¤¿¤á¤ËÀßÄꤵ¤ì¤Þ¤¹¡£</dd>
-
-      <dt><code>mode=<var>mode</var></code></dt>
-
-      <dd>±þÅú¤ò½èÍý¤¹¤ë¥Õ¥£¥ë¥¿¤Ë¤Ï <code>mode=output</code> (¥Ç¥Õ¥©¥ë¥È)
-      ¤ò»È¤¤¤Þ¤¹¡£¥ê¥¯¥¨¥¹¥È¤ò½èÍý¤¹¤ë¥Õ¥£¥ë¥¿¤Ë¤Ï <code>mode=input</code>
-      ¤ò»È¤¤¤Þ¤¹¡£<code>mode=input</code> ¤Ï Apache 2.1 ¤«¤é¤Î¿·¤·¤¤µ¡Ç½¤Ç¤¹¡£</dd>
-
-      <dt><code>intype=<var>imt</var></code></dt>
-
-      <dd>¤³¤Î¥Ñ¥é¥á¡¼¥¿¤Ï¥Õ¥£¥ë¥¿¤µ¤ì¤ë¤Ù¤­¥É¥­¥å¥á¥ó¥È¤Î
-      ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥á¥Ç¥£¥¢¥¿¥¤¥× (<em>¤¹¤Ê¤ï¤Á</em>¡¢MIME ¥¿¥¤¥×) ¤ò
-      »ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¤¹¤Ù¤Æ¤Î¥É¥­¥å¥á¥ó¥È¤¬¥Õ¥£¥ë¥¿¤µ¤ì¤Þ¤¹¡£
-      <code>intype=</code> ¤¬»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢¥Õ¥£¥ë¥¿¤Ï»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤
-      ¥É¥­¥å¥á¥ó¥È¤Ë¤ÏŬÍѤµ¤ì¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£</dd>
-
-      <dt><code>outtype=<var>imt</var></code></dt>
-
-      <dd>¤³¤Î¥Ñ¥é¥á¡¼¥¿¤Ï¥Õ¥£¥ë¥¿¤µ¤ì¤¿¥É¥­¥å¥á¥ó¥È¤Î
-      ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥á¥Ç¥£¥¢¥¿¥¤¥× (<em>¤¹¤Ê¤ï¤Á</em>¡¢MIME ¥¿¥¤¥×) ¤ò
-      »ØÄꤷ¤Þ¤¹¡£¥Õ¥£¥ë¥¿Æ°ºî¤Ë¤È¤â¤Ê¤Ã¤Æ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥á¥Ç¥£¥¢¥¿¥¤¥×¤¬
-      ÊѤï¤ë¾ì¹ç¤ËÍ­ÍѤǤ¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥á¥Ç¥£¥¢¥¿¥¤¥×¤Ï
-      Êѹ¹¤µ¤ì¤Þ¤»¤ó¡£</dd>
-
-      <dt><code>PreservesContentLength</code></dt>
-
-      <dd><code>PreservesContentLength</code> ¥­¡¼¥ï¡¼¥É¤Ï¥Õ¥£¥ë¥¿¤¬
-      content length <span class="transnote">(<em>ÌõÃí:</em> ¥³¥ó¥Æ¥ó¥È¤ÎŤµ)</span>
-      ¤òÊѹ¹¤·¤Ê¤¤¤È¤¤¤¦¤³¤È¤ò»ØÄꤷ¤Þ¤¹¡£¤Û¤È¤ó¤É¤Î¥Õ¥£¥ë¥¿¤Ï
-      content length ¤òÊѹ¹¤¹¤ë¤¿¤á¡¢¤³¤ì¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-      ¥Õ¥£¥ë¥¿¤¬Ä¹¤µ¤òÊѤ¨¤Ê¤¤¤È¤­¤Ï¡¢¤³¤Î¥­¡¼¥ï¡¼¥É¤ò»ØÄꤹ¤ë¤È
-      ¤è¤¤¤Ç¤·¤ç¤¦¡£</dd>
-
-      <dt><code>ftype=<var>filtertype</var></code></dt>
-
-      <dd>¤³¤Î¥Ñ¥é¥á¡¼¥¿¤Ï¥Õ¥£¥ë¥¿¤¬ÅÐÏ¿¤µ¤ì¤ë¤Ù¤­¥Õ¥£¥ë¥¿¥¿¥¤¥×¤Î
-      ¿ôÃͤò»ØÄꤷ¤Þ¤¹¡£¤Û¤È¤ó¤É¤Î¾ì¹ç¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Î AP_FTYPE_RESOURCE ¤Ç
-      ½½Ê¬¤Ç¤¹¡£¥Õ¥£¥ë¥¿¤¬¥Õ¥£¥ë¥¿¥Á¥§¡¼¥ó¤ÎÊ̤ξì½ê¤ÇÆ°ºî¤¹¤ëɬÍפ¬¤¢¤ë
-      ¾ì¹ç¤Ï¡¢¤³¤Î¥Ñ¥é¥á¡¼¥¿¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£»ØÄê²Äǽ¤ÊÃͤÏ
-      util_filter.h ¤Î AP_FTYPE_foo ÄêµÁ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</dd>
-
-      <dt><code>disableenv=<var>env</var></code></dt>
-
-      <dd>ÀßÄꤵ¤ì¤Æ¤¤¤¿¾ì¹ç¤Ë¥Õ¥£¥ë¥¿¤ò̵¸ú¤Ë¤¹¤ë¤¿¤á¤Î´Ä¶­ÊÑ¿ô¤ò
-      »ØÄꤷ¤Þ¤¹¡£</dd>
-
-      <dt><code>enableenv=<var>env</var></code></dt>
-
-      <dd>¤³¤Î¥Ñ¥é¥á¡¼¥¿¤Ï¥Õ¥£¥ë¥¿¤¬Í­¸ú¤Ë¤Ê¤ë¤¿¤á¤ËÀßÄꤵ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð
-      ¤Ê¤é¤Ê¤¤´Ä¶­ÊÑ¿ô¤ò»ØÄꤷ¤Þ¤¹¡£</dd>
-    </dl>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ExtFilterOptions" id="ExtFilterOptions">ExtFilterOptions</a> <a name="extfilteroptions" id="extfilteroptions">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td><code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> ¤Î¥ª¥×¥·¥ç¥ó¤òÀßÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ExtFilterOptions <var>option</var> [<var>option</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ExtFilterOptions DebugLevel=0 NoLogStderr</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_ext_filter</td></tr>
-</table>
-    <p><code class="directive">ExtFilterOptions</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> ¤ÎÆÃÊ̤ʽèÍýÍѤΥª¥×¥·¥ç¥ó¤ò
-    »ØÄꤷ¤Þ¤¹¡£<var>Option</var> ¤Ë¤Ï°Ê²¼¤Î¤É¤ì¤«¤ò»ØÄꤷ¤Þ¤¹¡£</p>
-
-    <dl>
-      <dt><code>DebugLevel=<var>n</var></code></dt>
-
-      <dd>
-        <code>DebugLevel</code> ¤Ç <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> 
-        ¤ÎÀ¸À®¤¹¤ë¥Ç¥Ð¥Ã¥°¥á¥Ã¥»¡¼¥¸¤Î¥ì¥Ù¥ë¤òÀßÄê¤Ç¤­¤Þ¤¹¡£
-        ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥Ç¥Ð¥Ã¥°¥á¥Ã¥»¡¼¥¸¤ÏÀ¸À®¤µ¤ì¤Þ¤»¤ó¡£
-        ¤³¤ì¤Ï <code>DebugLevel=0</code> ¤ÈÀßÄꤹ¤ë¤Î¤ÈƱ¤¸¤Ç¤¹¡£
-        ¿ô»ú¤¬Â礭¤¯¤Ê¤ì¤Ð¤Ê¤ë¤Û¤É¡¢¤è¤ê¿¤¯¤Î¥Ç¥Ð¥Ã¥°¥á¥Ã¥»¡¼¥¸¤¬
-        À¸À®¤µ¤ì¡¢¥µ¡¼¥Ð¤ÎÀ­Ç½¤ÏÍî¤Á¤Þ¤¹¡£¿ôÃͤμºݤΰÕÌ£¤Ï
-        <code>mod_ext_filter.c</code> ¤ÎÀèƬ¶á¤¯¤Î DBGLVL_ Äê¿ô¤Î
-        ÄêµÁ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-
-        <p>Ãí: ¥Ç¥Ð¥Ã¥°¥á¥Ã¥»¡¼¥¸¤ò Apache ¤Î¥¨¥é¡¼¥í¥°¤Ë
-        Êݸ¤¹¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë¤Ï¡¢core ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö 
-        <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code> 
-        ¤ò»È¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</p>
-      </dd>
-
-      <dt><code>LogStderr | NoLogStderr</code></dt>
-
-      <dd><code>LogStderr</code> ¥­¡¼¥ï¡¼¥É¤Ï³°Éô¥Õ¥£¥ë¥¿¥×¥í¥°¥é¥à¤Ë¤è¤ê
-      ɸ½à¥¨¥é¡¼ <span class="transnote">(<em>ÌõÃí:</em> stderr)</span> ¤Ë½ñ¤«¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò
-      Apache ¤Î¥¨¥é¡¼¥í¥°¤ËÊݸ¤¹¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£<code>NoLogStderr</code> ¤Ï
-      µÕ¤ËÊݸ¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£</dd>
-    </dl>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      ExtFilterOptions LogStderr DebugLevel=0
-    </code></p></div>
-
-    <p>¤³¤ÎÎã¤Ç¤Ï¡¢¥Õ¥£¥ë¥¿¤Îɸ½à½ÐÎϤ˽ñ¤«¤ì¤¿¥á¥Ã¥»¡¼¥¸¤Ï
-    Apache ¤Î¥¨¥é¡¼¥í¥°¤ËÊݸ¤µ¤ì¤Þ¤¹¡£<code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> ¤«¤é¤Ï
-    ¥Ç¥Ð¥Ã¥°¥á¥Ã¥»¡¼¥¸¤ÏÀ¸À®¤µ¤ì¤Þ¤»¤ó¡£</p>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_ext_filter.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_ext_filter.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_ext_filter.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_ext_filter.html.ja.utf8 b/docs/manual/mod/mod_ext_filter.html.ja.utf8
new file mode 100644
index 00000000..4ef8123a
--- /dev/null
+++ b/docs/manual/mod/mod_ext_filter.html.ja.utf8
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_ext_filter - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_ext_filter</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_ext_filter.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_ext_filter.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_ext_filter.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>レス�ンス�ボディをクライアント��る��外部プログラム�処��る</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>ext_filter_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_ext_filter.c</td></tr></table>
+<h3>概�</h3>
+
+    <p><code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> �� <a href="../filter.html">フィルタ</a>
+    �慣れ親�ん��純�プログラミングモデル��供�れ��。��モジュールを
+    使���標準入力�ら読�込ん��標準出力�書�出�プログラム
+    (���� Unix 形��フィルタコマンド) を Apache �フィルタ��る���
+    ����。��フィルタ�機構��Apache API ���書�れ� Apache
+    サー�プロセス内�実行�れる専用�フィルタよりも���������
+    以下�よ��利点も�り��。</p>
+
+    <ul>
+      <li>���シンプル�プログラミングモデル</li>
+
+      <li>プログラム�標準入力�ら読ん�標準出力�書�も���る�り�
+      �ん�プログラム言語やスクリプト言語�も使������る</li>
+
+      <li>既存�プログラムを変更�る���� Apache �フィルタ���
+      使������る</li>
+    </ul>
+
+    <p>性能��題�より実�用��������も�フィルタ�プロトタイプ用�
+    環境���� <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> �使���。</p>
+
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#extfilterdefine">ExtFilterDefine</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#extfilteroptions">ExtFilterOptions</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#examples">例</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><a href="../filter.html">フィルタ</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">例</a></h2>
+
+    <h3>他�タイプ�レス�ンス�ら HTML を生��る</h3>
+      <div class="example"><p><code>
+        # mod_ext_filter directive to define a filter<br />
+        # to HTML-ize text/c files using the external<br />
+        # program /usr/bin/enscript, with the type of<br />
+        # the result set to text/html<br />
+        ExtFilterDefine c-to-html mode=output \<br />
+        <span class="indent">
+          intype=text/c outtype=text/html \<br />
+          cmd="/usr/bin/enscript --color -W html -Ec -o - -"<br />
+        </span>
+        <br />
+        &lt;Directory "/export/home/trawick/apacheinst/htdocs/c"&gt;<br />
+        <span class="indent">
+          # core directive to cause the new filter to<br />
+          # be run on output<br />
+          SetOutputFilter c-to-html<br />
+          <br />
+          # mod_mime directive to set the type of .c<br />
+          # files to text/c<br />
+          AddType text/c .c<br />
+          <br />
+          # mod_ext_filter directive to set the debug<br />
+          # level just high enough to see a log message<br />
+          # per request showing the configuration in force<br />
+          ExtFilterOptions DebugLevel=1<br />
+        </span>
+        &lt;/Directory&gt;
+      </code></p></div>
+    
+
+    <h3>コンテントエンコーディング�フィルタを実装�る</h3>
+      <p>注: �� gzip �例�デモ用��。実用的�実装�
+      <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> を�照������。</p>
+
+      <div class="example"><p><code>
+        # mod_ext_filter directive to define the external filter<br />
+        ExtFilterDefine gzip mode=output cmd=/bin/gzip<br />
+        <br />
+        &lt;Location /gzipped&gt;<br />
+        <span class="indent">
+          # core directive to cause the gzip filter to be<br />
+          # run on output<br />
+          SetOutputFilter gzip<br />
+          <br />
+          # mod_header directive to add<br />
+          # "Content-Encoding: gzip" header field<br />
+          Header set Content-Encoding gzip<br />
+        </span>
+        &lt;/Location&gt;
+      </code></p></div>
+    
+
+    <h3>サー�を���る</h3>
+      <div class="example"><p><code>
+        # mod_ext_filter directive to define a filter<br />
+        # which runs everything through cat; cat doesn't<br />
+        # modify anything; it just introduces extra pathlength<br />
+        # and consumes more resources<br />
+        ExtFilterDefine slowdown mode=output cmd=/bin/cat \<br />
+        <span class="indent">
+          preservescontentlength<br />
+        </span>
+        <br />
+        &lt;Location /&gt;<br />
+        <span class="indent">
+          # core directive to cause the slowdown filter to<br />
+          # be run several times on output<br />
+          #<br />
+          SetOutputFilter slowdown;slowdown;slowdown<br />
+        </span>
+        &lt;/Location&gt;
+      </code></p></div>
+    
+
+    <h3>sed を使��応答中�テキストを置��る</h3>
+      <div class="example"><p><code>
+        # mod_ext_filter directive to define a filter which<br />
+        # replaces text in the response<br />
+        #<br />
+        ExtFilterDefine fixtext mode=output intype=text/html \<br />
+        <span class="indent">
+          cmd="/bin/sed s/verdana/arial/g"<br />
+        </span>
+        <br />
+        &lt;Location /&gt;<br />
+        <span class="indent">
+          # core directive to cause the fixtext filter to<br />
+          # be run on output<br />
+          SetOutputFilter fixtext<br />
+        </span>
+        &lt;/Location&gt;
+      </code></p></div>
+    
+
+    <h3>別�フィルタ�トレース</h3>
+      <div class="example"><p><code>
+        # Trace the data read and written by mod_deflate<br />
+        # for a particular client (IP 192.168.1.31)<br />
+        # experiencing compression problems.<br />
+        # This filter will trace what goes into mod_deflate.<br />
+        ExtFilterDefine tracebefore \<br />
+        <span class="indent">
+          cmd="/bin/tracefilter.pl /tmp/tracebefore" \<br />
+          EnableEnv=trace_this_client<br />
+        </span>
+        <br />
+        # This filter will trace what goes after mod_deflate.<br />
+        # Note that without the ftype parameter, the default<br />
+        # filter type of AP_FTYPE_RESOURCE would cause the<br />
+        # filter to be placed *before* mod_deflate in the filter<br />
+        # chain.  Giving it a numeric value slightly higher than<br />
+        # AP_FTYPE_CONTENT_SET will ensure that it is placed<br />
+        # after mod_deflate.<br />
+        ExtFilterDefine traceafter \<br />
+        <span class="indent">
+          cmd="/bin/tracefilter.pl /tmp/traceafter" \<br />
+          EnableEnv=trace_this_client ftype=21<br />
+        </span>
+        <br />
+        &lt;Directory /usr/local/docs&gt;<br />
+        <span class="indent">
+          SetEnvIf Remote_Addr 192.168.1.31 trace_this_client<br />
+          SetOutputFilter tracebefore;deflate;traceafter<br />
+        </span>
+        &lt;/Directory&gt;
+      </code></p></div>
+
+      <div class="example"><h3>データをトレース�るフィルタ:</h3><p><code>
+        #!/usr/local/bin/perl -w<br />
+        use strict;<br />
+        <br />
+        open(SAVE, "&gt;$ARGV[0]")<br />
+        <span class="indent">
+          or die "can't open $ARGV[0]: $?";<br />
+        </span>
+        <br />
+        while (&lt;STDIN&gt;) {<br />
+        <span class="indent">
+          print SAVE $_;<br />
+          print $_;<br />
+        </span>
+        }<br />
+        <br />
+        close(SAVE);
+      </code></p></div>
+    
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ExtFilterDefine" id="ExtFilterDefine">ExtFilterDefine</a> <a name="extfilterdefine" id="extfilterdefine">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>外部フィルタを定義</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ExtFilterDefine <var>filtername</var> <var>parameters</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_ext_filter</td></tr>
+</table>
+    <p><code class="directive">ExtFilterDefine</code> ��実行�るプログラムや
+    引数���外部フィルタ�特性を定義���。</p>
+
+    <p><var>filtername</var> �定義�るフィルタ���を指定���。
+    �����後� <code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code>
+    ディレクティブ�指定����。���登録�れる����フィルタ�
+    一�������り��ん。<em>�時点���フィルタ�登録 API �ら�
+    エラー�報告�れ��ん。���ら��複�る��を使���������も
+    ユーザ�������報告�れ��ん。</em></p>
+
+    <p>続�パラメータ�順番�関係無���れら�実行�る外部コマンド��
+    他�特性を定義���。<code>cmd=</code> ���必須�パラメータ��。
+    指定�能�パラメータ�:</p>
+
+    <dl>
+      <dt><code>cmd=<var>cmdline</var></code></dt>
+
+      <dd><code>cmd=</code> キーワード�実行�る外部コマンドを指定���。
+      プログラム��後�引数��る場���コマンド行�引用符�囲む
+      必���り�� (<em>例��</em>�<code>cmd="<var>/bin/mypgm</var>
+      <var>arg1</var> <var>arg2</var>"</code> �よ��)。プログラム�
+      シェル経由����直接実行�れ�����通常�シェル用�
+      エスケープ�必��り��ん。プログラム�引数�空白�区切られ��。
+      プログラム�引数�一部��る必���る空白��ックスペース�エスケープ
+      ����。引数�一部��る�ックスラッシュ��ックスラッシュ�
+      エスケープ�る必���り��。標準� CGI 環境変数�加���
+      環境変数 DOCUMENT_URI, DOCUMENT_PATH_INFO, and 
+      QUERY_STRING_UNESCAPED �プログラム����設定�れ��。</dd>
+
+      <dt><code>mode=<var>mode</var></code></dt>
+
+      <dd>応答を処��るフィルタ�� <code>mode=output</code> (デフォルト)
+      を使���。リクエストを処��るフィルタ�� <code>mode=input</code>
+      を使���。<code>mode=input</code> � Apache 2.1 以��使用����。</dd>
+
+      <dt><code>intype=<var>imt</var></code></dt>
+
+      <dd>��パラメータ�フィルタ�れる��ドキュメント�
+      インター�ットメディアタイプ (<em>����</em>�MIME タイプ) を
+      指定���。デフォルト������ドキュメント�フィルタ�れ��。
+      <code>intype=</code> �指定�れ��れ��フィルタ�指定�れ����
+      ドキュメント���用�れ���り��。</dd>
+
+      <dt><code>outtype=<var>imt</var></code></dt>
+
+      <dd>��パラメータ�フィルタ�れ�ドキュメント�
+      インター�ットメディアタイプ (<em>����</em>�MIME タイプ) を
+      指定���。フィルタ動作��も���インター�ットメディアタイプ�
+      変�る場��有用��。デフォルト��インター�ットメディアタイプ�
+      変更�れ��ん。</dd>
+
+      <dt><code>PreservesContentLength</code></dt>
+
+      <dd><code>PreservesContentLength</code> キーワード�フィルタ�
+      content length <span class="transnote">(<em>訳注:</em> コンテント�長�)</span>
+      を変更��������を指定���。��ん��フィルタ�
+      content length を変更�る����れ�デフォルト���り��ん。
+      フィルタ�長�を変���������キーワードを指定�る�
+      よ���ょ�。</dd>
+
+      <dt><code>ftype=<var>filtertype</var></code></dt>
+
+      <dd>��パラメータ�フィルタ�登録�れる��フィルタタイプ�
+      数値を指定���。��ん��場���デフォルト� AP_FTYPE_RESOURCE �
+      �分��。フィルタ�フィルタ�ェーン�別�場所�動作�る必���る
+      場�����パラメータを指定�る必���り��。指定�能�値�
+      util_filter.h � AP_FTYPE_foo 定義を�照������。</dd>
+
+      <dt><code>disableenv=<var>env</var></code></dt>
+
+      <dd>設定�れ���場��フィルタを無効��る���環境変数を
+      指定���。</dd>
+
+      <dt><code>enableenv=<var>env</var></code></dt>
+
+      <dd>��パラメータ�フィルタ�有効��る���設定�れ����れ�
+      �ら��環境変数を指定���。</dd>
+    </dl>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ExtFilterOptions" id="ExtFilterOptions">ExtFilterOptions</a> <a name="extfilteroptions" id="extfilteroptions">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td><code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> �オプションを設定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ExtFilterOptions <var>option</var> [<var>option</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ExtFilterOptions DebugLevel=0 NoLogStderr</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_ext_filter</td></tr>
+</table>
+    <p><code class="directive">ExtFilterOptions</code> ディレクティブ�
+    <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> �特別�処�用�オプションを
+    指定���。<var>Option</var> ��以下��れ�を指定���。</p>
+
+    <dl>
+      <dt><code>DebugLevel=<var>n</var></code></dt>
+
+      <dd>
+        <code>DebugLevel</code> � <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> 
+        �生��るデ�ッグメッセージ�レベルを設定����。
+        デフォルト���デ�ッグメッセージ�生��れ��ん。
+        �れ� <code>DebugLevel=0</code> �設定�る������。
+        数字�大���れ��る���より多��デ�ッグメッセージ�
+        生��れ�サー��性能�����。数値�実際��味�
+        <code>mod_ext_filter.c</code> �先頭近�� DBGLVL_ 定数�
+        定義�説明�れ����。
+
+        <p>注: デ�ッグメッセージを Apache �エラーログ�
+        �存�るよ���る�����core �ディレクティブ 
+        <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code> 
+        を使�必���り��。</p>
+      </dd>
+
+      <dt><code>LogStderr | NoLogStderr</code></dt>
+
+      <dd><code>LogStderr</code> キーワード�外部フィルタプログラム�より
+      標準エラー <span class="transnote">(<em>訳注:</em> stderr)</span> �書�れ�メッセージを
+      Apache �エラーログ��存�るよ�����。<code>NoLogStderr</code> �
+      逆��存���よ�����。</dd>
+    </dl>
+
+    <div class="example"><h3>例</h3><p><code>
+      ExtFilterOptions LogStderr DebugLevel=0
+    </code></p></div>
+
+    <p>��例���フィルタ�標準出力�書�れ�メッセージ�
+    Apache �エラーログ��存�れ��。<code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> �ら�
+    デ�ッグメッセージ�生��れ��ん。</p>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_ext_filter.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_ext_filter.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_ext_filter.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_ext_filter.html.ko.euc-kr b/docs/manual/mod/mod_ext_filter.html.ko.euc-kr
index fa20e2f6..97943c16 100644
--- a/docs/manual/mod/mod_ext_filter.html.ko.euc-kr
+++ b/docs/manual/mod/mod_ext_filter.html.ko.euc-kr
@@ -349,6 +349,6 @@
 <a href="../ja/mod/mod_ext_filter.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_ext_filter.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_file_cache.html b/docs/manual/mod/mod_file_cache.html
index 1fc51cd7..e9da936d 100644
--- a/docs/manual/mod/mod_file_cache.html
+++ b/docs/manual/mod/mod_file_cache.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_file_cache.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_file_cache.html.en b/docs/manual/mod/mod_file_cache.html.en
index 6dfd390d..9aed79ee 100644
--- a/docs/manual/mod/mod_file_cache.html.en
+++ b/docs/manual/mod/mod_file_cache.html.en
@@ -207,6 +207,6 @@
 <p><span>Available Languages: </span><a href="../en/mod/mod_file_cache.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_file_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_file_cache.html.ko.euc-kr b/docs/manual/mod/mod_file_cache.html.ko.euc-kr
index 1b942228..2eae9b8d 100644
--- a/docs/manual/mod/mod_file_cache.html.ko.euc-kr
+++ b/docs/manual/mod/mod_file_cache.html.ko.euc-kr
@@ -195,6 +195,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/mod_file_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_file_cache.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_filter.html b/docs/manual/mod/mod_filter.html
index 522140ca..19725c63 100644
--- a/docs/manual/mod/mod_filter.html
+++ b/docs/manual/mod/mod_filter.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_filter.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_filter.html.en b/docs/manual/mod/mod_filter.html.en
index f980429f..783c5c63 100644
--- a/docs/manual/mod/mod_filter.html.en
+++ b/docs/manual/mod/mod_filter.html.en
@@ -438,6 +438,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_filter.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_headers.html b/docs/manual/mod/mod_headers.html
index 3729f8da..3deae9de 100644
--- a/docs/manual/mod/mod_headers.html
+++ b/docs/manual/mod/mod_headers.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_headers.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_headers.html.ja.euc-jp
+URI: mod_headers.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_headers.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en
index 28a9c6ca..9e4cb8cd 100644
--- a/docs/manual/mod/mod_headers.html.en
+++ b/docs/manual/mod/mod_headers.html.en
@@ -29,9 +29,7 @@
 headers</td></tr>
 <tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>headers_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_headers.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td><code class="directive"><a href="#requestheader">RequestHeader</a></code>
-is available only in Apache 2.0</td></tr></table>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_headers.c</td></tr></table>
 <h3>Summary</h3>
 
     <p>This module provides directives to control and modify HTTP
@@ -167,18 +165,49 @@ is available only in Apache 2.0</td></tr></table>
           RequestHeader edit Destination ^https: http: early
         </code></p></div>
       </li>
+
+      <li>
+        Set the same header value under multiple non-exclusive conditions,
+        but do not duplicate the value in the final header.
+        If all of the following conditions applied to a request (i.e.,
+        if the <code>CGI</code>, <code>NO_CACHE</code> and
+        <code>NO_STORE</code> environment variables all existed for the
+        request):
+
+        <div class="example"><p><code>
+          Header merge Cache-Control no-cache env=CGI<br />
+          Header merge Cache-Control no-cache env=NO_CACHE<br />
+          Header merge Cache-Control no-store env=NO_STORE
+        </code></p></div>
+
+        <p>then the response would contain the following header:</p>
+
+        <div class="example"><p><code>
+          Cache-Control: no-cache, no-store
+        </code></p></div>
+
+        <p>If <code>append</code> was used instead of <code>merge</code>,
+        then the response would contain the following header:</p>
+
+        <div class="example"><p><code>
+          Cache-Control: no-cache, no-cache, no-store
+        </code></p></div>
+      </li>
     </ol>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="Header" id="Header">Header</a> <a name="header" id="header">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure HTTP response headers</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Header [<var>condition</var>] set|append|add|unset|echo|edit
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Header [<var>condition</var>] set|append|merge|add|unset|echo|edit
 <var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_headers</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The <code>merge</code> argument is available in version
+2.2.9 and later. The <code>edit</code> argument is available in version
+2.2.4 and later.</td></tr>
 </table>
     <p>This directive can replace, merge or remove HTTP response
     headers. The header is modified just after the content handler
@@ -206,12 +235,23 @@ is available only in Apache 2.0</td></tr></table>
     header it is separated from the existing header with a comma.
     This is the HTTP standard way of giving a header multiple values.</dd>
 
+    <dt><code>merge</code></dt>
+    <dd>The response header is appended to any existing header of
+    the same name, unless the value to be appended already appears in the
+    header's comma-delimited list of values.  When a new value is merged onto
+    an existing header it is separated from the existing header with a comma.
+    This is the HTTP standard way of giving a header multiple values.
+    Values are compared in a case sensitive manner, and after
+    all format specifiers have been processed.  Values in double quotes
+    are considered different from otherwise identical unquoted values.
+    <em>Available in version 2.2.9 and later.</em></dd>
+
     <dt><code>add</code></dt>
     <dd>The response header is added to the existing set of headers,
     even if this header already exists. This can result in two
     (or more) headers having the same name. This can lead to
-    unforeseen consequences, and in general <code>set</code> or
-    <code>append</code> should be used instead.</dd>
+    unforeseen consequences, and in general <code>set</code>,
+    <code>append</code> or <code>merge</code> should be used instead.</dd>
 
     <dt><code>unset</code></dt>
     <dd>The response header of this name is removed, if it exists.
@@ -225,22 +265,26 @@ is available only in Apache 2.0</td></tr></table>
     <var>value</var> must be omitted.</dd>
 
     <dt><code>edit</code></dt>
-    <dd>If this request header exists, its value is transformed according
-    to a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>
-    search-and-replace.  The <var>value</var> argument is a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>, and the <var>replacement</var>
-    is a replacement string, which may contain backreferences.</dd>
+    <dd>If this request header exists, its value is transformed
+    according to a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>
+    search-and-replace.  The <var>value</var> argument is
+    a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>, and
+    the <var>replacement</var> is a replacement string, which may
+    contain backreferences. <em>Available in version 2.2.4 and
+    later.</em></dd>
     </dl>
 
     <p>This argument is followed by a <var>header</var> name, which
     can include the final colon, but it is not required. Case is
-    ignored for <code>set</code>, <code>append</code>, <code>add</code>,
-    <code>unset</code>, and <code>edit</code>.
+    ignored for <code>set</code>, <code>append</code>, <code>merge</code>,
+    <code>add</code>, <code>unset</code> and <code>edit</code>.
     The <var>header</var> name for <code>echo</code>
     is case sensitive and may be a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular
     expression</a>.</p>
 
-    <p>For <code>set</code>, <code>append</code> and <code>add</code> a
-    <var>value</var> is specified as the third argument. If <var>value</var>
+    <p>For <code>set</code>, <code>append</code>, <code>merge</code> and
+    <code>add</code> a <var>value</var> is specified as the third argument.
+    If <var>value</var>
     contains spaces, it should be surrounded by double quotes.
     <var>value</var> may be a character string, a string containing format
     specifiers or a combination of both. The following format specifiers
@@ -300,12 +344,15 @@ is available only in Apache 2.0</td></tr></table>
 <div class="directive-section"><h2><a name="RequestHeader" id="RequestHeader">RequestHeader</a> <a name="requestheader" id="requestheader">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure HTTP request headers</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RequestHeader set|append|add|unset|edit <var>header</var>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RequestHeader set|append|merge|add|unset|edit <var>header</var>
 [<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_headers</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The <code>merge</code> argument is available in version
+2.2.9 and later. The <code>edit</code> argument is available in version
+2.2.4 and later.</td></tr>
 </table>
     <p>This directive can replace, merge, change or remove HTTP request
     headers. The header is modified just before the content handler
@@ -325,12 +372,23 @@ is available only in Apache 2.0</td></tr></table>
     is the HTTP standard way of giving a header multiple
     values.</dd>
 
+    <dt><code>merge</code></dt>
+    <dd>The response header is appended to any existing header of
+    the same name, unless the value to be appended already appears in the
+    existing header's comma-delimited list of values.  When a new value is
+    merged onto an existing header it is separated from the existing header
+    with a comma.  This is the HTTP standard way of giving a header multiple
+    values.  Values are compared in a case sensitive manner, and after
+    all format specifiers have been processed.  Values in double quotes
+    are considered different from otherwise identical unquoted values.
+    <em>Available in version 2.2.9 and later.</em></dd>
+
     <dt><code>add</code></dt>
     <dd>The request header is added to the existing set of headers,
     even if this header already exists. This can result in two
     (or more) headers having the same name. This can lead to
-    unforeseen consequences, and in general <code>set</code> or
-    <code>append</code> should be used instead.</dd>
+    unforeseen consequences, and in general <code>set</code>,
+    <code>append</code> or <code>merge</code> should be used instead.</dd>
 
     <dt><code>unset</code></dt>
     <dd>The request header of this name is removed, if it exists. If
@@ -338,15 +396,18 @@ is available only in Apache 2.0</td></tr></table>
     <var>value</var> must be omitted.</dd>
 
     <dt><code>edit</code></dt>
-    <dd>If this request header exists, its value is transformed according
-    to a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>
-    search-and-replace.  The <var>value</var> argument is a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>, and the <var>replacement</var>
-    is a replacement string, which may contain backreferences.</dd>
+    <dd>If this request header exists, its value is transformed
+    according to a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>
+    search-and-replace.  The <var>value</var> argument is
+    a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>, and
+    the <var>replacement</var> is a replacement string, which may
+    contain backreferences. <em>Available in version 2.2.4 and
+    later</em>.</dd>
     </dl>
 
     <p>This argument is followed by a header name, which can
     include the final colon, but it is not required. Case is
-    ignored. For <code>set</code>, <code>append</code> and
+    ignored. For <code>set</code>, <code>append</code>, <code>merge</code> and
     <code>add</code> a <var>value</var> is given as the third argument. If a
     <var>value</var> contains spaces, it should be surrounded by double
     quotes. For <code>unset</code>, no <var>value</var> should be given.
@@ -382,6 +443,6 @@ is available only in Apache 2.0</td></tr></table>
 <a href="../ja/mod/mod_headers.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_headers.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_headers.html.ja.euc-jp b/docs/manual/mod/mod_headers.html.ja.euc-jp
deleted file mode 100644
index 3598e73b..00000000
--- a/docs/manual/mod/mod_headers.html.ja.euc-jp
+++ /dev/null
@@ -1,349 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_headers - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_headers</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_headers.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_headers.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_headers.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>HTTP ¥ê¥¯¥¨¥¹¥È¤Î¥Ø¥Ã¥À¤È±þÅú¤Î¥Ø¥Ã¥À¤Î¥«¥¹¥¿¥Þ¥¤¥º</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>headers_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_headers.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td><code class="directive"><a href="#requestheader">RequestHeader</a></code> 
-¤Ï Apache 2.0 °Ê¹ß¤Î¤ß¤Ç»ÈÍѲÄǽ</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï HTTP ¤Î¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤È±þÅú¥Ø¥Ã¥À¤òÀ©¸æ¤·¡¢
-    Êѹ¹¤¹¤ë¤¿¤á¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÄ󶡤·¤Þ¤¹¡£¥Ø¥Ã¥À¤òÄɲä·¤¿¤ê¡¢
-    ÃÖ¤­´¹¤¨¤¿¤ê¡¢ºï½ü¤·¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#header">Header</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#requestheader">RequestHeader</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#order">½èÍý¤Î½çÈÖ</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#early">Áá´ü½èÍý¡¢¸å´ü½èÍý</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#examples">Îã</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="order" id="order">½èÍý¤Î½çÈÖ</a></h2>
-
-    <p><code class="module"><a href="../mod/mod_header.html">mod_header</a></code> ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥µ¡¼¥ÐÀßÄê¤Î¤Û¤Ü¤É¤³¤Ë¤Ç¤â
-    ½ñ¤¯¤³¤È¤¬¤Ç¤­¡¢±Æ¶Á¤¹¤ëÈϰϤò<a href="../sections.html">ÀßÄêÍÑ¥»¥¯¥·¥ç¥ó</a>¤Ç°Ï¤à¤³¤È¤Ç¸ÂÄꤹ¤ë
-    ¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>½èÍý¤Î½çÈ֤ϽÅÍפǡ¢ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Î½çÈ֤ȡ¢<a href="../sections.html">ÀßÄêÍÑ¥»¥¯¥·¥ç¥ó</a>Æâ¤Î°ÌÃ֤ȤÎξÊý¤Ë
-    ±Æ¶Á¤µ¤ì¤Þ¤¹¡£°Ê²¼¤ÎÆó¤Ä¤Î¥Ø¥Ã¥À¤Ï½çÈÖ¤¬µÕ¤Ë¤Ê¤ë¤È
-    °ã¤¦·ë²Ì¤Ë¤Ê¤ê¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      RequestHeader append MirrorID "mirror 12"<br />
-      RequestHeader unset MirrorID
-    </code></p></div>
-
-    <p>¤³¤Î½çÈ֤ξì¹ç¤Ï¡¢<code>MirrorID</code> ¥Ø¥Ã¥À¤ÏÀßÄꤵ¤ì¤Þ¤»¤ó¡£
-    µÕ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤È¡¢MirrorID ¥Ø¥Ã¥À¤Ï "mirror 12" ¤ËÀßÄꤵ¤ì¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="early" id="early">Áá´ü½èÍý¡¢¸å´ü½èÍý</a></h2>
-    <p><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> ¤Ç¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤ÎÁá´ü¤«¸å´ü¤«¤Î
-    ¤É¤Á¤é¤ÇŬÍѤ¹¤ë¤«¤òÁª¤Ù¤Þ¤¹¡£Ä̾ï¤Ï¸å´ü¥â¡¼¥É¤Ç¡¢
-    ¥³¥ó¥Æ¥ó¥ÄÀ¸À®¤¬¼Â¹Ô¤µ¤ì¤ëľÁ°¤Ë¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤¬¥»¥Ã¥È¤µ¤ì¡¢
-    ¥ì¥¹¥Ý¥ó¥¹¤È¤·¤ÆÁ÷½Ð¤µ¤ì¤ëľÁ°¤Ë¥ì¥¹¥Ý¥ó¥¹¥Ø¥Ã¥À¤¬¥»¥Ã¥È¤µ¤ì¤Þ¤¹¡£
-    ±¿ÍÑÃæ¤Î¥µ¡¼¥Ð¤Ç¤Ïɬ¤º¸å´ü¥â¡¼¥É¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>Áá´ü¥â¡¼¥É¤Ï³«È¯¼Ô¸þ¤±¤Î¥Æ¥¹¥È/¥Ç¥Ð¥Ã¥°ÍѤËÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£
-    <code>early</code> ¥­¡¼¥ï¡¼¥É»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤Ã¤Æ¡¢
-    ¥ê¥¯¥¨¥¹¥È½èÍý¤Î³«»ÏÃÏÅÀ¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¤Ä¤Þ¤ê¡¢°Û¤Ê¤ë¥ê¥¯¥¨¥¹¥È¤ò»î¤·¤¿¤ê¥Æ¥¹¥È¥±¡¼¥¹¤ò¥»¥Ã¥È¥¢¥Ã¥×¤¹¤ë¤Î¤Ë
-    ³èÍѤǤ­¤ë°ìÊý¤Ç¡¢¥ì¥¹¥Ý¥ó¥¹¤òÀ¸À®¤¹¤ëÁ°¤Ë¾¤Î¥â¥¸¥å¡¼¥ë¤Ë¤è¤Ã¤Æ
-    ¥Ø¥Ã¥À¤¬½ñ¤­´¹¤¨¤é¤ì¤Æ¤·¤Þ¤¦¤«¤â¤·¤ì¤Ê¤¤¤È¤¤¤¦¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£</p>
-
-    <p>early ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤Ï¥ê¥¯¥¨¥¹¥È¥Ñ¥¹¤ÎÀßÄ꤬²ò·è¤µ¤ì¤ëÁ°¤Ë
-    ½èÍý¤µ¤ì¤ë¤Î¤Ç¡¢¥á¥¤¥ó¥µ¡¼¥Ð¤«¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¥³¥ó¥Æ¥­¥¹¥È¤Ç¤Î¤ß¡¢
-    Áá´ü¥Ø¥Ã¥À¤ò¥»¥Ã¥È¤Ç¤­¤Þ¤¹¡£early ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥ê¥¯¥¨¥¹¥È¥Ñ¥¹¤Ë
-    °Í¸¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¤Î¤Ç¡¢<code>&lt;Directory&gt;</code> ¤ä
-    <code>&lt;Location&gt;</code> ¤È¤¤¤Ã¤¿¥³¥ó¥Æ¥­¥¹¥ÈÆâ¤Ç¤Ï»ÈÍÑ
-    ¤Ç¤­¤Þ¤»¤ó¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">Îã</a></h2>
-
-    <ol>
-      <li>¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥ÀÃæ¤Î "TS" ¤Ç»Ï¤Þ¤ë¥Õ¥£¡¼¥ë¥É¤ò¤¹¤Ù¤Æ±þÅú¥Ø¥Ã¥À¤Ë
-        ¥³¥Ô¡¼¤·¤Þ¤¹:
-        <div class="example"><p><code>
-          Header echo ^TS
-        </code></p></div>
-      </li>
-
-      <li>
-        ¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±ÉÕ¤±¤¿»þ¹ï¤È¥ê¥¯¥¨¥¹¥È¤ò½èÍý¤·¤¿»þ´Ö¤òÆþ¤ì¤¿¥Ø¥Ã¥À¡¢
-        <code>MyHeader</code> ¤ò±þÅú¤ËÄɲä·¤Þ¤¹¡£¤³¤Î¥Ø¥Ã¥À¤Ï¥¯¥é¥¤¥¢¥ó¥È¤¬
-        ¥µ¡¼¥Ð¤ÎÉé²Ù¤òľ´ÑŪ¤ËÃΤ뤿¤á¤ä¡¢¥¯¥é¥¤¥¢¥ó¥È-¥µ¡¼¥Ð´Ö¤Î
-        ¥Ü¥È¥ë¥Í¥Ã¥¯¤òÄ´¤Ù¤ë¤¿¤á¤Ë»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-
-        <div class="example"><p><code>
-           Header add MyHeader "%D %t"
-        </code></p></div>
-
-        <p>¾åµ­¤ÎÀßÄê¤Ç¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ê¥Ø¥Ã¥À¤¬±þÅú¤ËÄɲ䵤ì¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹:</p>
-
-        <div class="example"><p><code>
-           MyHeader: D=3775428 t=991424704447256
-        </code></p></div>
-      </li>
-
-      <li>
-        Joe ¤Ë¤¢¤¤¤µ¤Ä¤ò¤·¤Þ¤¹:
-
-        <div class="example"><p><code>
-           Header add MyHeader "Hello Joe. It took %D microseconds for Apache to serve this request."
-        </code></p></div>
-
-        <p>°Ê²¼¤Î¤è¤¦¤Ê¥Ø¥Ã¥À¤¬±þÅú¤ËÄɲ䵤ì¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹</p>
-
-        <div class="example"><p><code>
-           MyHeader: Hello Joe. It took D=3775428 microseconds for Apache to serve this request.
-        </code></p></div>
-      </li>
-
-      <li>¥ê¥¯¥¨¥¹¥È¤Ë "MyRequestHeader" ¤¬¤¢¤ë¤È¤­¤Ë¸Â¤ê <code>MyHeader</code> ¤ò±þÅú¤Ë
-      ÉÕ¤±¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤ÎÍ×µá¤Ë±þ¤¨¤Æ¥Ø¥Ã¥À¤òºîÀ®¤¹¤ë¤È¤­¤Ë
-      Ìò¤ËΩ¤Á¤Þ¤¹¡£¤³¤ÎÎã¤Ç¤Ï <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> ¥â¥¸¥å¡¼¥ë¤¬É¬Íפʤ³¤È¤Ë
-      Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-
-        <div class="example"><p><code>
-           SetEnvIf MyRequestHeader value HAVE_MyRequestHeader<br />
-           Header add MyHeader "%D %t mytext" env=HAVE_MyRequestHeader
-        </code></p></div>
-
-        <p>¤â¤· HTTP ¥ê¥¯¥¨¥¹¥È¤Ë <code>MyRequestHeader: value</code> ¥Ø¥Ã¥À¤¬
-        ¤¢¤ë¤È¡¢±þÅú¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤Ê¥Ø¥Ã¥À¤¬Éղ䵤ì¤Þ¤¹¡£</p>
-
-        <div class="example"><p><code>
-           MyHeader: D=3775428 t=991424704447256 mytext
-        </code></p></div>
-      </li>
-    </ol>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Header" id="Header">Header</a> <a name="header" id="header">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>HTTP ±þÅú¥Ø¥Ã¥À¤ÎÀßÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Header [<var>condition</var>] set|append|add|unset|echo
-<var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_headers</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï HTTP ±þÅú¥Ø¥Ã¥À¤òÃÖ´¹¡¢Äɲᢺï½ü¤Ç¤­¤Þ¤¹¡£
-    ¥Ø¥Ã¥À¤Ï¥³¥ó¥Æ¥ó¥È¥Ï¥ó¥É¥é¤ä½ÐÎÏ¥Õ¥£¥ë¥¿¤¬¼Â¹Ô¤µ¤ì¤¿Ä¾¸å¤Ë¼Â¹Ô¤µ¤ì¡¢
-    ½Ð¤Æ¹Ô¤¯¥Ø¥Ã¥À¤òÊѹ¹¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p>¥ª¥×¥·¥ç¥ó¤Î <var>condition</var> ¤Ï <code>onsuccess</code> ¤«
-    <code>always</code> ¤Î¤É¤Á¤é¤«¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£¤³¤ì¤ÏÆâÉô¥Ø¥Ã¥À¥Æ¡¼¥Ö¥ë¤Î¤É¤ì¤ò
-    Áàºî¤¹¤ë¤«¤ò·èÄꤷ¤Þ¤¹¡£<code>onsuccess</code> ¤Ï <code>2<var>xx</var></code>
-    ¥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É¤Î¡¢<code>always</code> ¤ÏÁ´¤Æ¤Î¥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É
-    (<code>2<var>xx</var></code> ¤ò´Þ¤à) ¤Î°ÕÌ£¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¤¢¤ë¥â¥¸¥å¡¼¥ë¤Ç¥»¥Ã¥È¤µ¤ì¤ë¥Ø¥Ã¥À¤ò¥¢¥ó¥»¥Ã¥È¤·¤¿¤¤¾ì¹ç¤ÏÆäˡ¢
-    ¤É¤Î¥Æ¡¼¥Ö¥ë¤¬±Æ¶Á¤ò¼õ¤±¤ë¤«¤ò¼ÂºÝ¤Ë»î¤·¤¿¤Û¤¦¤¬¤è¤¤¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>¹Ô¤Ê¤¦½èÍý¤ÏÆóÈÖÌܤΤΰú¿ô¤Ç·è¤Þ¤ê¤Þ¤¹¡£
-    ¤³¤Î°ú¿ô¤Ë¤Ï¼¡¤ÎÃͤò»ØÄê¤Ç¤­¤Þ¤¹:</p>
-
-    <dl>
-    <dt><code>set</code></dt>
-    <dd>±þÅú¥Ø¥Ã¥À¤òÀßÄꤷ¤Þ¤¹¡£Æ±¤¸Ì¾Á°¤Î¥Ø¥Ã¥À¤¬Â¸ºß¤¹¤ë¾ì¹ç¤Ï¤½¤ì¤ò
-    ÃÖ¤­´¹¤¨¤Þ¤¹¡£<em>value</em> ¤Ë¤Ï¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤ò
-    »ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</dd>
-
-    <dt><code>append</code></dt>
-    <dd>±þÅú¥Ø¥Ã¥À¤ò´û¤Ë¸ºß¤¹¤ëƱ¤¸Ì¾Á°¤Î¥Ø¥Ã¥À¤ËÄɲä·¤Þ¤¹¡£
-    ¿·¤·¤¤Ãͤ¬´û¸¤Î¥Ø¥Ã¥À¤ËÄɲ䵤ì¤ë¤È¤­¤Ë¤Ï¡¢´û¸¤Î¥Ø¥Ã¥À¤Î
-    ¸å¤Ë¥³¥ó¥Þ¤Ç¶èÀÚ¤é¤ì¤ÆÄɲ䵤ì¤Þ¤¹¡£¤³¤ì¤Ï¥Ø¥Ã¥À¤ËÊ£¿ô¤ÎÃͤò
-    »ØÄꤹ¤ë¤È¤­¤Î HTTP ¤Îɸ½à¤ÎÊýË¡¤Ç¤¹¡£</dd>
-
-    <dt><code>add</code></dt>
-    <dd>¥Ø¥Ã¥À¤¬´û¤Ë¸ºß¤·¤Æ¤¤¤ë¤È¤­¤Ç¤µ¤¨¤â¡¢±þÅú¥Ø¥Ã¥À¤ò
-    ´û¸¤Î¥Ø¥Ã¥À¤ËÄɲä·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢Æó¤Ä (¤«¤½¤ì°Ê¾å) ¤Î
-    ¥Ø¥Ã¥À¤Î̾Á°¤¬Æ±¤¸¤Ë¤Ê¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤½¤Î·ë²Ì¡¢ÁÛÄê¤Ç¤­¤Ê¤¤
-    ¤³¤È¤¬µ¯¤³¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¤Î¤Ç¡¢°ìÈÌŪ¤Ë¤Ï <code>append</code> ¤ÎÊý¤ò
-    »È¤¦Êý¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£</dd>
-
-    <dt><code>unset</code></dt>
-    <dd>¤â¤·»ØÄꤵ¤ì¤¿Ì¾Á°¤Î±þÅú¥Ø¥Ã¥À¤¬Â¸ºß¤·¤Æ¤¤¤ì¤Ð¡¢ºï½ü¤µ¤ì¤Þ¤¹¡£
-    Ʊ¤¸Ì¾Á°¤Î¥Ø¥Ã¥À¤¬Ê£¿ô¤¢¤ë¤È¤­¤Ï¡¢¤¹¤Ù¤Æºï½ü¤µ¤ì¤Þ¤¹¡£
-    <var>value</var> ¤ò¤Ä¤±¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£</dd>
-
-    <dt><code>echo</code></dt>
-    <dd>»ØÄꤵ¤ì¤¿¤â¤Î¤ÈƱ¤¸Ì¾Á°¤Î¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤ò±þÅú¥Ø¥Ã¥À¤Ç
-    ¤½¤Î¤Þ¤ÞÊÖ¤·¤Þ¤¹¡£<var>header</var> ¤Ë¤ÏÀµµ¬É½¸½¤â»ØÄê¤Ç¤­¤Þ¤¹¡£
-    <var>value</var> ¤ò¤Ä¤±¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£</dd>
-    </dl>
-
-    <p>¤³¤Î°ú¿ô¤Î¸å¤Ë¤Ï¥Ø¥Ã¥À̾ (<var>header</var>) ¤¬Â³¤­¤Þ¤¹¡£
-    ¥Ø¥Ã¥À̾¤Ë¤ÏºÇ¸å¤Ë¥³¥í¥ó¤ò´Þ¤á¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¤¬¡¢Ìµ¤¯¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£
-    <code>set</code>, <code>append</code>, <code>add</code>,
-    <code>unset</code> ¤Ç¤ÏÂçʸ»ú¾®Ê¸»ú¤Ï
-    ¶èÊ̤µ¤ì¤Þ¤»¤ó¡£echo ¤Î <em>header</em> ̾¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¡¢
-    Àµµ¬É½¸½¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p><code>add</code>, <code>append</code>,
-    <code>set</code> ¤Ç¤Ï <var>value</var> ¤ò»°¤ÄÌܤÎ
-    °ú¿ô¤È¤·¤Æ»ØÄꤷ¤Þ¤¹¡£<var>value</var> ¤Ë¶õÇò¤¬¤¢¤ë¾ì¹ç¤ÏÆó½Å°úÍÑÉä¤Ç
-    °Ï¤àɬÍפ¬¤¢¤ê¤Þ¤¹¡£<var>value</var> ¤Ïʸ»ú¤Î¤ß¤«¤é¤Ê¤ëʸ»úÎó¡¢
-    ¥Õ¥©¡¼¥Þ¥Ã¥È»Ø¼¨»Ò¤ò´Þ¤àʸ»úÎ󡢤⤷¤¯¤ÏξÊý¤«¤é¤Ê¤ëʸ»úÎó¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
-    <var>value</var> ¤Ï°Ê²¼¤Î¥Õ¥©¡¼¥Þ¥Ã¥È»Ø¼¨»Ò¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹:</p>
-
-    <table class="bordered"><tr class="header"><th>¥Õ¥©¡¼¥Þ¥Ã¥È</th><th>²òÀâ</th></tr>
-<tr><td><code>%%</code></td>
-        <td>¥Ñ¡¼¥»¥ó¥Èµ­¹æ</td></tr>
-<tr class="odd"><td><code>%t</code></td>
-        <td>¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¼è¤Ã¤¿»þ¹ï¤ò¡¢
-        Universal Coordinated Time ¤Ç¤Î»Ï¤Þ¤ê¤Î»þ¹ï (Jan. 1, 1970) ¤«¤é·Ð²á¤·¤¿
-        »þ´Ö¤ò¥Þ¥¤¥¯¥íÉäȤ·¤Æ¸½¤·¤¿¤â¤Î¡£Ãͤκǽé¤Ë¤Ï 
-        <code>t=</code> ¤¬Éղ䵤ì¤Þ¤¹¡£</td></tr>
-<tr><td><code>%D</code></td>
-        <td>¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¼è¤Ã¤¿»þ¹ï¤È¡¢¥Ø¥Ã¥À¤òÁ÷¤ê½Ð¤·¤¿
-        »þ´Ö¤È¤Îº¹¡£¤³¤ì¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤¬Â¸ºß¤·¤Æ¤¤¤¿´ü´Ö¤ò¸½¤·¤Þ¤¹¡£
-        Ãͤκǽé¤Ë¤Ï <code>D=</code> ¤¬Éղ䵤ì¤Þ¤¹¡£</td></tr>
-<tr class="odd"><td><code>%{FOOBAR}e</code></td>
-        <td><a href="../env.html">´Ä¶­ÊÑ¿ô</a>
-        <code>FOOBAR</code> ¤ÎÃͤǤ¹¡£</td></tr>
-<tr><td><code>%{FOOBAR}s</code></td>
-        <td><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> ¤¬Í­¸ú¤Ê¾ì¹ç¡¢
-        <a href="mod_ssl.html#envvars">SSL ´Ä¶­ÊÑ¿ô</a> <code>FOOBAR</code>
-        ¤ÎÆâÍÆ</td></tr>
-</table>
-
-    <div class="note"><h3>Ãí</h3>
-      <p><code>%s</code> ¥Õ¥©¡¼¥Þ¥Ã¥È»ØÄê»Ò¤Ï 2.1 °Ê¹ß¤Ç¤Î¤ßÍøÍѤǤ­¤Þ¤¹¡£
-      <code>SSLOptions +StdEnvVars</code> ¤òÍ­¸ú¤Ë¤¹¤ë¤³¤È¤Ë¤è¤ë¥ª¡¼¥Ð¡¼¥Ø¥Ã¥É¤ò
-      Èò¤±¤ë¤¿¤á¡¢<code>%e</code> ¤ÎÂå¤ï¤ê¤È¤·¤Æ»È¤¨¤Þ¤¹¡£
-      ¾¤ÎÍýͳ¤Ê¤É¤¬¤¢¤Ã¤Æ¡¢¤É¤¦¤·¤Æ¤â <code>SSLOptions +StdEnvVars</code> 
-      ¤òÍ­¸ú¤Ë¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¾ì¹ç¤Ï¡¢<code>%e</code> ¤Î¤Û¤¦¤¬
-      <code>%s</code> ¤è¤ê¤â½èÍý¸úΨ¤ÏÎɤ¤¤Ç¤¹¡£</p>
-    </div> 
-
-    <p><code class="directive">Header</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤ÏÄɲäΰú¿ô¤ò»ý¤¿¤»¤ë¤³¤È¤¬
-    ¤Ç¤­¤Æ¡¢¤É¤¦¤¤¤Ã¤¿¥¢¥¯¥·¥ç¥ó¤¬¹Ô¤ï¤ì¤¿¤«¤Î¾ò·ï¤ò»ØÄꤷ¤¿¤ê¡¢
-    <a href="#early">Áá´ü½èÍý</a> ¤ò»ØÄꤹ¤ë <code>early</code> ¥­¡¼¥ï¡¼¥É¤ò
-    »ØÄê¤Ç¤­¤Þ¤¹¡£
-    <code>env=...</code> °ú¿ô¤Ç»ØÄꤵ¤ì¤¿ <a href="../env.html">´Ä¶­ÊÑ¿ô</a> ¤¬Â¸ºß¤¹¤ë (¤â¤·¤¯¤Ï <code>env=!...</code>
-    ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Æ´Ä¶­ÊÑ¿ô¤¬Â¸ºß¤·¤Ê¤¤) ¾ì¹ç¤Ï¡¢<code class="directive">Header</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤵ¤ì¤¿Æ°ºî¤¬¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤½¤Î¥ê¥¯¥¨¥¹¥È¤Ë¤Ï²¿¤â¤·¤Þ¤»¤ó¡£</p>
-
-    <p><a href="#early">Áá´ü½èÍý</a>¥â¡¼¥É¤Î¾ì¹ç°Ê³°¤Ç¤Ï¡¢
-    <code class="directive">Header</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï±þÅú¤¬¥Í¥Ã¥È¥ï¡¼¥¯¤ËÁ÷¤é¤ì¤ëľÁ°¤Ë
-    ½èÍý¤µ¤ì¤Þ¤¹¡£¤³¤ì¤Ï¡¢¥Ø¥Ã¥À¥Õ¥£¥ë¥¿¤Ë¤è¤êÄɲ䵤ì¤ë¥Ø¥Ã¥À¤ò
-    ½ü¤­¡¢¤Û¤È¤ó¤É¤Î¥Ø¥Ã¥À¤òÀßÄꤷ¤¿¤ê¾å½ñ¤­¤·¤¿¤ê¤¹¤ë¤³¤È¤¬
-    ²Äǽ¡¢¤È¤¤¤¦¤³¤È¤Ç¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="RequestHeader" id="RequestHeader">RequestHeader</a> <a name="requestheader" id="requestheader">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>HTTP ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤ÎÀßÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>RequestHeader set|append|add|unset <var>header</var>
-[<var>value</var>] [early|env=[!]<var>variable</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_headers</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï HTTP ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤òÃÖ´¹¡¢Äɲᢺï½ü¤Ç¤­¤Þ¤¹¡£
-    ¥Ø¥Ã¥À¤Ï¥³¥ó¥Æ¥ó¥È¥Ï¥ó¥É¥é¤¬¼Â¹Ô¤µ¤ì¤ëľÁ°¤Ë¼Â¹Ô¤µ¤ì¡¢
-    Æþ¤Ã¤ÆÍè¤ë¥Ø¥Ã¥À¤òÊѹ¹¤¹¤ë¤³¤È¤¬²Äǽ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-    ¹Ô¤Ê¤¦½èÍý¤ÏÂè 1 °ú¿ô¤Ë¤è¤ê·è¤Þ¤ê¤Þ¤¹¡£¤³¤ì¤Ë¤Ï°Ê²¼¤ÎÃͤò»ØÄê
-    ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-    <dl>
-    <dt><code>set</code></dt>
-    <dd>¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤òÀßÄꤷ¤Þ¤¹¡£Æ±¤¸Ì¾Á°¤Î¥Ø¥Ã¥À¤¬Â¸ºß¤·¤Æ¤¤¤ë¤È¡¢
-    ¤½¤ì¤òÃÖ¤­´¹¤¨¤Þ¤¹¡£</dd>
-
-    <dt><code>append</code></dt>
-    <dd>¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤Ï¡¢´û¤Ë¸ºß¤¹¤ëƱ¤¸Ì¾Á°¤Î¥Ø¥Ã¥À¤ËÄɲ䵤ì¤Þ¤¹¡£
-    ¿·¤·¤¤Ãͤ¬´û¸¤Î¥Ø¥Ã¥À¤ËÄɲ䵤ì¤ë¤È¤­¤Ë¤Ï¡¢´û¸¤Î¥Ø¥Ã¥À¤Î
-    ¸å¤Ë¥³¥ó¥Þ¤Ç¶èÀÚ¤é¤ì¤ÆÄɲ䵤ì¤Þ¤¹¡£¤³¤ì¤Ï¥Ø¥Ã¥À¤ËÊ£¿ô¤ÎÃͤò
-    »ØÄꤹ¤ë¤È¤­¤Î HTTP ¤Îɸ½à¤ÎÊýË¡¤Ç¤¹¡£</dd>
-
-    <dt><code>add</code></dt>
-    <dd>¥Ø¥Ã¥À¤¬´û¤Ë¸ºß¤·¤Æ¤¤¤ë¤È¤­¤Ç¤µ¤¨¤â¡¢¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤ò
-    ´û¸¤Î¥Ø¥Ã¥À¤ËÄɲä·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢Æó¤Ä (¤«¤½¤ì°Ê¾å) ¤Î
-    ¥Ø¥Ã¥À¤Î̾Á°¤¬Æ±¤¸¤Ë¤Ê¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤½¤Î·ë²Ì¡¢ÁÛÄê¤Ç¤­¤Ê¤¤
-    ¤³¤È¤¬µ¯¤³¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¤Î¤Ç¡¢°ìÈÌŪ¤Ë¤Ï <code>append</code> ¤ÎÊý¤ò
-    »È¤¦Êý¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£</dd>
-
-    <dt><code>unset</code></dt>
-    <dd>¤â¤·»ØÄꤵ¤ì¤¿Ì¾Á°¤Î¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤¬Â¸ºß¤·¤Æ¤¤¤ì¤Ð¡¢ºï½ü¤µ¤ì¤Þ¤¹¡£
-    Ʊ¤¸Ì¾Á°¤ÎÊ£¿ô¤Î¥Ø¥Ã¥À¤¬¤¢¤ë¤È¤­¤Ï¡¢¤¹¤Ù¤Æºï½ü¤µ¤ì¤Þ¤¹¡£
-    <var>value</var> ¤ò¤Ä¤±¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£</dd>
-    </dl>
-
-    <p>¤³¤Î°ú¿ô¤Î¸å¤Ë¤Ï¥Ø¥Ã¥À̾ (<em>header</em>) ¤¬Â³¤­¤Þ¤¹¡£
-    ¥Ø¥Ã¥À̾¤Ë¤ÏºÇ¸å¤Ë¥³¥í¥ó¤ò´Þ¤á¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¤¬¡¢Ìµ¤¯¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£
-    Âçʸ»ú¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Þ¤»¤ó¡£<code>add</code>,
-    <code>append</code>, <code>set</code> ¤Î¾ì¹ç¤Ï¡¢<em>value</em> ¤¬»°¤ÄÌܤÎ
-    °ú¿ô¤È¤·¤Æ»ØÄꤵ¤ì¤Þ¤¹¡£<em>value</em> ¤Ë¶õÇò¤¬¤¢¤ë¾ì¹ç¤ÏÆó½Å°úÍÑÉä¤Ç
-    °Ï¤àɬÍפ¬¤¢¤ê¤Þ¤¹¡£unset ¤Î¾ì¹ç¤Ï¡¢<em>value</em> ¤Ï»ØÄꤷ¤Þ¤»¤ó¡£
-    <var>value</var> ¤Ïʸ»úÎó¡¢¥Õ¥©¡¼¥Þ¥Ã¥È»ØÄê»Ò¡¢¤¢¤ë¤¤¤Ï¡¢¤½¤Îº®¹ç¤Ç¤¹¡£
-    »È¤¦¤³¤È¤Î¤Ç¤­¤ë¥Õ¥©¡¼¥Þ¥Ã¥È»ØÄê»Ò¤Ï¡¢<code class="directive"><a href="#header">Header</a></code> ¤ÈƱ¤¸¤Ç¤¹¤Î¤Ç¡¢
-    ¾ÜºÙ¤Ï¤½¤Á¤é¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</p>
-
-    <p><code class="directive">RequestHeader</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¤É¤¦¤¤¤Ã¤¿¾ò·ï²¼¤Ç¥¢¥¯¥·¥ç¥ó¤ò¹Ô¤¦¤«¤ò»ØÄꤹ¤ëÄɲðú¿ô
-    ¤¢¤ë¤¤¤Ï¡¢<a href="#early">Áá´ü½èÍý</a> ¤ò»ØÄꤹ¤ë <code>early</code> 
-    ¥­¡¼¥ï¡¼¥É¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    <code>env=<var>...</var></code> ¤Î°ú¿ô¤ÇÀßÄꤵ¤ì¤Æ¤¤¤ë
-    <a href="../env.html">´Ä¶­ÊÑ¿ô</a> ¤¬Â¸ºß¤·¤Æ¤¤¤ë
-    (¤¢¤ë¤¤¤Ï <code>env=!<var>...</var></code> ¤Ç»ØÄꤵ¤ì¤¿´Ä¶­ÊÑ¿ô¤¬
-    ¸ºß¤·¤Ê¤¤) ¾ì¹ç¡¢<code class="directive">RequestHeader</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    Í­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¾ì¹ç¡¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¸úÎϤò»ý¤Á¤Þ¤»¤ó¡£</p>
-
-    <p><a href="#early">early</a> ¥â¡¼¥É¤Ç¤Ê¤¤¾ì¹ç¤Ë¸Â¤ê¡¢
-    <code class="directive">RequestHeader</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    fixup ¥Õ¥§¡¼¥º¤Ç¥ê¥¯¥¨¥¹¥È¤¬¥Ï¥ó¥É¥é¤Ë°·¤ï¤ì¤ëľÁ°¤Ë
-    ½èÍý¤µ¤ì¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢¥Ö¥é¥¦¥¶¤ä Apache ¤ÎÆþÎÏ¥Õ¥£¥ë¥¿¤Ë¤è¤ê
-    À¸À®¤µ¤ì¤¿¥Ø¥Ã¥À¤ò¾å½ñ¤­¤·¤¿¤ê½¤Àµ¤·¤¿¤ê¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_headers.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_headers.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_headers.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_headers.html.ja.utf8 b/docs/manual/mod/mod_headers.html.ja.utf8
new file mode 100644
index 00000000..54b38f4f
--- /dev/null
+++ b/docs/manual/mod/mod_headers.html.ja.utf8
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_headers - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_headers</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_headers.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_headers.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_headers.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>HTTP リクエスト�ヘッダ�応答�ヘッダ�カスタマイズ</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>headers_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_headers.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール� HTTP �リクエストヘッダ�応答ヘッダを制御��
+    変更�る���ディレクティブを�供���。ヘッダを追加��り�
+    置����り�削除��り�る�������。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#header">Header</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#requestheader">RequestHeader</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#order">処��順番</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#early">早期処��後期処�</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#examples">例</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="order" id="order">処��順番</a></h2>
+
+    <p><code class="module"><a href="../mod/mod_header.html">mod_header</a></code> �ディレクティブ�サー�設定�������も
+    書�������影響�る範囲を<a href="../sections.html">設定用セクション</a>�囲む����定�る
+    �������。</p>
+
+    <p>処��順番�����設定ファイル中�順番��<a href="../sections.html">設定用セクション</a>内��置��両方�
+    影響�れ��。以下�二��ヘッダ�順番�逆��る�
+    ���果��り��:</p>
+
+    <div class="example"><p><code>
+      RequestHeader append MirrorID "mirror 12"<br />
+      RequestHeader unset MirrorID
+    </code></p></div>
+
+    <p>��順番�場���<code>MirrorID</code> ヘッダ�設定�れ��ん。
+    逆�����る��MirrorID ヘッダ� "mirror 12" �設定�れ��。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="early" id="early">早期処��後期処�</a></h2>
+    <p><code class="module"><a href="../mod/mod_headers.html">mod_headers</a></code> ���リクエスト�早期�後期��
+    ��ら��用�る�を����。通常�後期モード��
+    コンテンツ生��実行�れる直��リクエストヘッダ�セット�れ�
+    レス�ンス����出�れる直��レス�ンスヘッダ�セット�れ��。
+    �用中�サー���必�後期モードを使������。</p>
+
+    <p>早期モード�開発者���テスト/デ�ッグ用�設計�れ����。
+    <code>early</code> キーワード指定�れ�ディレクティブ�よ���
+    リクエスト処��開始地点��り��。
+    ��り�異�るリクエストを試��りテストケースをセットアップ�る��
+    活用��る一方��レス�ンスを生��る��他�モジュール�よ��
+    ヘッダ�書���られ�����も�れ�������を�味���。</p>
+
+    <p>early ディレクティブ��リクエストパス�設定�解決�れる��
+    処��れる���メインサー���ー�ャルホストコンテキスト����
+    早期ヘッダをセット����。early ディレクティブ�リクエストパス�
+    �存�る�������ん���<code>&lt;Directory&gt;</code> や
+    <code>&lt;Location&gt;</code> ����コンテキスト内��使用
+    ����ん。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">例</a></h2>
+
+    <ol>
+      <li>リクエストヘッダ中� "TS" �始�るフィールドを���応答ヘッダ�
+        コピー���:
+        <div class="example"><p><code>
+          Header echo ^TS
+        </code></p></div>
+      </li>
+
+      <li>
+        リクエストを��付��時刻�リクエストを処���時間を入れ�ヘッダ�
+        <code>MyHeader</code> を応答�追加���。��ヘッダ�クライアント�
+        サー��負�を直観的�知る��や�クライアント-サー�間�
+        ボトル�ックを調�る���使��������。
+
+        <div class="example"><p><code>
+           Header add MyHeader "%D %t"
+        </code></p></div>
+
+        <p>上記�設定���以下�よ��ヘッダ�応答�追加�れる����り��:</p>
+
+        <div class="example"><p><code>
+           MyHeader: D=3775428 t=991424704447256
+        </code></p></div>
+      </li>
+
+      <li>
+        Joe �����を���:
+
+        <div class="example"><p><code>
+           Header add MyHeader "Hello Joe. It took %D microseconds for Apache to serve this request."
+        </code></p></div>
+
+        <p>以下�よ��ヘッダ�応答�追加�れる����り��</p>
+
+        <div class="example"><p><code>
+           MyHeader: Hello Joe. It took D=3775428 microseconds for Apache to serve this request.
+        </code></p></div>
+      </li>
+
+      <li>リクエスト� "MyRequestHeader" ��る����り <code>MyHeader</code> を応答�
+      付���。�れ��クライアント��求�応��ヘッダを作��る���
+      役�立���。��例�� <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> モジュール�必�����
+      注�������。
+
+        <div class="example"><p><code>
+           SetEnvIf MyRequestHeader value HAVE_MyRequestHeader<br />
+           Header add MyHeader "%D %t mytext" env=HAVE_MyRequestHeader
+        </code></p></div>
+
+        <p>も� HTTP リクエスト� <code>MyRequestHeader: value</code> ヘッダ�
+        �る��応答��以下�よ��ヘッダ�付加�れ��。</p>
+
+        <div class="example"><p><code>
+           MyHeader: D=3775428 t=991424704447256 mytext
+        </code></p></div>
+      </li>
+    </ol>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Header" id="Header">Header</a> <a name="header" id="header">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>HTTP 応答ヘッダ�設定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Header [<var>condition</var>] set|append|add|unset|echo
+<var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_headers</td></tr>
+</table>
+    <p>��ディレクティブ� HTTP 応答ヘッダを置��追加�削除����。
+    ヘッダ�コンテント�ンドラや出力フィルタ�実行�れ�直後�実行�れ�
+    出�行�ヘッダを変更��るよ��������。</p>
+
+    <p>オプション� <var>condition</var> � <code>onsuccess</code> �
+    <code>always</code> ���ら�を指定����。�れ�内部ヘッダテーブル��れを
+    �作�る�を決定���。<code>onsuccess</code> � <code>2<var>xx</var></code>
+    ステータスコード��<code>always</code> �全��ステータスコード
+    (<code>2<var>xx</var></code> を�む) ��味��り��。
+    �るモジュール�セット�れるヘッダをアンセット���場��特��
+    ��テーブル�影響を��る�を実際�試�����よ���ょ�。</p>
+
+    <p>行��処��二番目��引数�決�り��。
+    ��引数��次�値を指定����:</p>
+
+    <dl>
+    <dt><code>set</code></dt>
+    <dd>応答ヘッダを設定���。�����ヘッダ�存在�る場���れを
+    置�����。<em>value</em> ��フォーマット文字列を
+    指定�る��も����。</dd>
+
+    <dt><code>append</code></dt>
+    <dd>応答ヘッダを既�存在�る�����ヘッダ�追加���。
+    新��値�既存�ヘッダ�追加�れる�����既存�ヘッダ�
+    後�コンマ�区切られ�追加�れ��。�れ�ヘッダ�複数�値を
+    指定�る��� HTTP �標準�方法��。</dd>
+
+    <dt><code>add</code></dt>
+    <dd>ヘッダ�既�存在���る�����も�応答ヘッダを
+    既存�ヘッダ�追加���。�れ�より�二� (��れ以上) �
+    ヘッダ��������る����り��。���果�想定����
+    ���起�る�能性��り�����一般的�� <code>append</code> �方を
+    使�方�良���ょ�。</dd>
+
+    <dt><code>unset</code></dt>
+    <dd>も�指定�れ����応答ヘッダ�存在���れ��削除�れ��。
+    �����ヘッダ�複数�る�������削除�れ��。
+    <var>value</var> を��������ん。</dd>
+
+    <dt><code>echo</code></dt>
+    <dd>指定�れ�も�������リクエストヘッダを応答ヘッダ�
+    ����返���。<var>header</var> ��<a class="glossarylink" href="../glossary.html#regex" title="用語集を�照">正�表�</a>も指定����。
+    <var>value</var> を��������ん。</dd>
+    </dl>
+
+    <p>��引数�後��ヘッダ� (<var>header</var>) �続���。
+    ヘッダ���最後�コロンを��る��も������無��も構���ん。
+    <code>set</code>, <code>append</code>, <code>add</code>,
+    <code>unset</code> ��大文字�文字�
+    区別�れ��ん。echo � <em>header</em> ��大文字�文字を区別��
+    <a class="glossarylink" href="../glossary.html#regex" title="用語集を�照">正�表�</a>を指定�る��も����。</p>
+
+    <p><code>add</code>, <code>append</code>,
+    <code>set</code> �� <var>value</var> を三�目�
+    引数���指定���。<var>value</var> �空白��る場��二�引用符�
+    囲む必���り��。<var>value</var> �文字���ら�る文字列�
+    フォーマット指示�を�む文字列�も���両方�ら�る文字列を指定����。
+    <var>value</var> �以下�フォーマット指示�をサ�ート���:</p>
+
+    <table class="bordered"><tr class="header"><th>フォーマット</th><th>解説</th></tr>
+<tr><td><code>%%</code></td>
+        <td>パーセント記�</td></tr>
+<tr class="odd"><td><code>%t</code></td>
+        <td>リクエストを�����時刻を�
+        Universal Coordinated Time ��始�り�時刻 (Jan. 1, 1970) �ら経���
+        時間をマイクロ秒���表��も�。値�最��� 
+        <code>t=</code> �付加�れ��。</td></tr>
+<tr><td><code>%D</code></td>
+        <td>リクエストを�����時刻��ヘッダを�り出��
+        時間��差。�れ��リクエスト�存在����期間を表���。
+        値�最��� <code>D=</code> �付加�れ��。</td></tr>
+<tr class="odd"><td><code>%{FOOBAR}e</code></td>
+        <td><a href="../env.html">環境変数</a>
+        <code>FOOBAR</code> �値��。</td></tr>
+<tr><td><code>%{FOOBAR}s</code></td>
+        <td><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> �有効�場��
+        <a href="mod_ssl.html#envvars">SSL 環境変数</a> <code>FOOBAR</code>
+        �内容</td></tr>
+</table>
+
+    <div class="note"><h3>注</h3>
+      <p><code>%s</code> フォーマット指定�� 2.1 以����利用����。
+      <code>SSLOptions +StdEnvVars</code> を有効��る���よるオー�ーヘッドを
+      ��る���<code>%e</code> �代�り���使���。
+      他��由�����������も <code>SSLOptions +StdEnvVars</code> 
+      を有効����れ��ら��場���<code>%e</code> ����
+      <code>%s</code> よりも処�効率�良���。</p>
+    </div> 
+
+    <p><code class="directive">Header</code> ディレクティブ��追加�引数を���る���
+    ���������アクション�行�れ����件を指定��り�
+    <a href="#early">早期処�</a> を指定�る <code>early</code> キーワードを
+    指定����。
+    <code>env=...</code> 引数�指定�れ� <a href="../env.html">環境変数</a> �存在�る (も��� <code>env=!...</code>
+    �指定�れ���環境変数�存在���) 場���<code class="directive">Header</code>
+    ディレクティブ�指定�れ�動作�行��れ��。�����場���
+    ディレクティブ���リクエスト��何も���ん。</p>
+
+    <p><a href="#early">早期処�</a>モード�場�以外���
+    <code class="directive">Header</code>
+    ディレクティブ�応答��ットワーク��られる直��
+    処��れ��。�れ��ヘッダフィルタ�より追加�れるヘッダを
+    除����ん��ヘッダを設定��り上書���り�る���
+    �能��������。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RequestHeader" id="RequestHeader">RequestHeader</a> <a name="requestheader" id="requestheader">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>HTTP リクエストヘッダ�設定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>RequestHeader set|append|add|unset <var>header</var>
+[<var>value</var>] [early|env=[!]<var>variable</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_headers</td></tr>
+</table>
+    <p>��ディレクティブ� HTTP リクエストヘッダを置��追加�削除����。
+    ヘッダ�コンテント�ンドラ�実行�れる直��実行�れ�
+    入���るヘッダを変更�る����能�������。
+    行��処��第 1 引数�より決�り��。�れ��以下�値を指定
+    �る�������:</p>
+
+    <dl>
+    <dt><code>set</code></dt>
+    <dd>リクエストヘッダを設定���。�����ヘッダ�存在���る��
+    �れを置�����。</dd>
+
+    <dt><code>append</code></dt>
+    <dd>リクエストヘッダ��既�存在�る�����ヘッダ�追加�れ��。
+    新��値�既存�ヘッダ�追加�れる�����既存�ヘッダ�
+    後�コンマ�区切られ�追加�れ��。�れ�ヘッダ�複数�値を
+    指定�る��� HTTP �標準�方法��。</dd>
+
+    <dt><code>add</code></dt>
+    <dd>ヘッダ�既�存在���る�����も�リクエストヘッダを
+    既存�ヘッダ�追加���。�れ�より�二� (��れ以上) �
+    ヘッダ��������る����り��。���果�想定����
+    ���起�る�能性��り�����一般的�� <code>append</code> �方を
+    使�方�良���ょ�。</dd>
+
+    <dt><code>unset</code></dt>
+    <dd>も�指定�れ����リクエストヘッダ�存在���れ��削除�れ��。
+    �����複数�ヘッダ��る�������削除�れ��。
+    <var>value</var> を��������ん。</dd>
+    </dl>
+
+    <p>��引数�後��ヘッダ� (<em>header</em>) �続���。
+    ヘッダ���最後�コロンを��る��も������無��も構���ん。
+    大文字�文字�区別�れ��ん。<code>add</code>,
+    <code>append</code>, <code>set</code> �場���<em>value</em> �三�目�
+    引数���指定�れ��。<em>value</em> �空白��る場��二�引用符�
+    囲む必���り��。unset �場���<em>value</em> �指定���ん。
+    <var>value</var> �文字列�フォーマット指定���る�����混���。
+    使������るフォーマット指定���<code class="directive"><a href="#header">Header</a></code> ��������
+    詳細���らを�覧����。</p>
+
+    <p><code class="directive">RequestHeader</code> ディレクティブ��
+    ������件下�アクションを行��を指定�る追加引数
+    �る���<a href="#early">早期処�</a> を指定�る <code>early</code> 
+    キーワードを設定�る�������。
+    <code>env=<var>...</var></code> �引数�設定�れ��る
+    <a href="../env.html">環境変数</a> �存在���る
+    (�る�� <code>env=!<var>...</var></code> �指定�れ�環境変数�
+    存在���) 場��<code class="directive">RequestHeader</code> ディレクティブ�
+    有効��り��。�れ以外�場��ディレクティブ�効力を����ん。</p>
+
+    <p><a href="#early">early</a> モード���場���り�
+    <code class="directive">RequestHeader</code> ディレクティブ�
+    fixup フェーズ�リクエスト��ンドラ�扱�れる直��
+    処��れ��。�れ�より�ブラウザや Apache �入力フィルタ�より
+    生��れ�ヘッダを上書���り修正��り��るよ��������。</p>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_headers.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_headers.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_headers.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_headers.html.ko.euc-kr b/docs/manual/mod/mod_headers.html.ko.euc-kr
index a1a9e888..a7b8a853 100644
--- a/docs/manual/mod/mod_headers.html.ko.euc-kr
+++ b/docs/manual/mod/mod_headers.html.ko.euc-kr
@@ -30,9 +30,7 @@
 <table class="module"><tr><th><a href="module-dict.html#Description">¼³¸í:</a></th><td>HTTP ¿äû Çì´õ¿Í ÀÀ´ä Çì´õ ¼öÁ¤</td></tr>
 <tr><th><a href="module-dict.html#Status">»óÅÂ:</a></th><td>Extension</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">¸ðµâ¸í:</a></th><td>headers_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¼Ò½ºÆÄÀÏ:</a></th><td>mod_headers.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">Áö¿ø:</a></th><td><code class="directive"><a href="#requestheader">RequestHeader</a></code>´Â ¾ÆÆÄÄ¡ 2.0¿¡¸¸
-ÀÖ´Ù</td></tr></table>
+<tr><th><a href="module-dict.html#SourceFile">¼Ò½ºÆÄÀÏ:</a></th><td>mod_headers.c</td></tr></table>
 <h3>¿ä¾à</h3>
 
     <p>ÀÌ ¸ðµâÀº HTTP ¿äû Çì´õ¿Í ÀÀ´ä Çì´õ¸¦ Á¶ÀýÇÏ°í ¼öÁ¤ÇÏ´Â
@@ -334,6 +332,6 @@
 <a href="../ja/mod/mod_headers.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_headers.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_ident.html b/docs/manual/mod/mod_ident.html
index 35282bad..ed28d2ac 100644
--- a/docs/manual/mod/mod_ident.html
+++ b/docs/manual/mod/mod_ident.html
@@ -1,7 +1,13 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_ident.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
+URI: mod_ident.html.ja.utf8
+Content-Language: ja
+Content-type: text/html; charset=UTF-8
+
 URI: mod_ident.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
diff --git a/docs/manual/mod/mod_ident.html.en b/docs/manual/mod/mod_ident.html.en
index 8f1ab790..e395c4bb 100644
--- a/docs/manual/mod/mod_ident.html.en
+++ b/docs/manual/mod/mod_ident.html.en
@@ -22,6 +22,7 @@
 <div id="preamble"><h1>Apache Module mod_ident</h1>
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_ident.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_ident.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_ident.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>RFC 1413 ident lookups</td></tr>
@@ -94,8 +95,9 @@ user</td></tr>
 </div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_ident.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_ident.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_ident.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_ident.html.ja.utf8 b/docs/manual/mod/mod_ident.html.ja.utf8
new file mode 100644
index 00000000..9c16491b
--- /dev/null
+++ b/docs/manual/mod/mod_ident.html.ja.utf8
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_ident - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_ident</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_ident.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_ident.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_ident.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>RFC 1413 ident lookups</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>ident_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_ident.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>Apache 2.1 �使用�能</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール�リモートホスト� <a href="http://www.ietf.org/rfc/rfc1413.txt">RFC 1413</a> 互�デーモン
+    �コ�クション�所有者を訊���。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#identitycheck">IdentityCheck</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#identitychecktimeout">IdentityCheckTimeout</a></li>
+</ul>
+<h3>�照</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
+</ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IdentityCheck" id="IdentityCheck">IdentityCheck</a> <a name="identitycheck" id="identitycheck">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>リモートユーザ� RFC 1413 �よるアイデンティティ�ロギングを
+有効��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>IdentityCheck On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>IdentityCheck Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_ident</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 2.1 � core �ら移動</td></tr>
+</table>
+    <p>��ディレクティブ��クライアントマシン上�
+    identd や�れ�類似��デーモン�動作���る����
+    �れ�れ�接続�対�� <a href="http://www.ietf.org/rfc/rfc1413.txt">RFC 1413</a> �準処��リモートユーザ�
+    ���ロギングを行��よ�����。
+    ��情報��<code>%...l</code> <a href="mod_log_config.html#formats">フォーマット文字列</a>を使��アクセスログ��集�れ��。</p>
+
+    <div class="note">
+      ���得られ�情報�簡��ユーザ追跡�使�以外��
+      ����信頼�る�����り��ん。</div>
+
+    <p>����リクエスト�対��ルックアップ�行��れ�����
+    深刻��延��題を起���も�れ�����注�������。
+    (訳注: 例��クライアント��) ファイアウォールやプロキシサー���る��
+    ルックアップ�失敗���リクエスト� <code class="directive"><a href="#identitychecktimeout">IdentityCheckTimeout</a></code>�定義�れ��る�延�加�る���
+    �る�能性��り��。
+    従���一般的��インター�ット�らアクセス�能�パブリック�サー��
+    有益�も����り��ん。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IdentityCheckTimeout" id="IdentityCheckTimeout">IdentityCheckTimeout</a> <a name="identitychecktimeout" id="identitychecktimeout">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Ident リクエスト�タイムアウト�る���期間を決�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>IdentityCheckTimeout <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>IdentityCheckTimeout 30</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_ident</td></tr>
+</table>
+    <p>��ディレクティブ� ident リクエスト�タイムアウト時間を決���。
+    デフォルト�値��る 30 秒��主��ットワーク�延�考慮���� <a href="http://www.ietf.org/rfc/rfc1413.txt">RFC 1413</a> �より
+    推奨�れ����。������ら�ローカル�ットワーク�速度�
+    ����タイムアウト値を調節�る��よ���ょ�。</p>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_ident.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_ident.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_ident.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_ident.html.ko.euc-kr b/docs/manual/mod/mod_ident.html.ko.euc-kr
index 88c6c2c9..6d613c79 100644
--- a/docs/manual/mod/mod_ident.html.ko.euc-kr
+++ b/docs/manual/mod/mod_ident.html.ko.euc-kr
@@ -22,6 +22,7 @@
 <div id="preamble"><h1>¾ÆÆÄÄ¡ ¸ðµâ mod_ident</h1>
 <div class="toplang">
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/mod_ident.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_ident.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_ident.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
 <table class="module"><tr><th><a href="module-dict.html#Description">¼³¸í:</a></th><td>RFC 1413 ident °Ë»ö</td></tr>
@@ -91,8 +92,9 @@
 </div>
 <div class="bottomlang">
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/mod_ident.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_ident.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_ident.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_imagemap.html b/docs/manual/mod/mod_imagemap.html
index b571be95..0436d500 100644
--- a/docs/manual/mod/mod_imagemap.html
+++ b/docs/manual/mod/mod_imagemap.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_imagemap.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_imagemap.html.en b/docs/manual/mod/mod_imagemap.html.en
index 945bae1b..8f2a4484 100644
--- a/docs/manual/mod/mod_imagemap.html.en
+++ b/docs/manual/mod/mod_imagemap.html.en
@@ -232,14 +232,14 @@
       generated:</p>
 
       <div class="example"><p><code>
-        &lt;a href="http://foo.com/"&gt;<var>Menu text</var>&lt;/a&gt;
+        &lt;a href="http://example.com/"&gt;<var>Menu text</var>&lt;/a&gt;
       </code></p></div>
 
       <p>If no quoted text is present, the name of the link will be
       used as the text:</p>
 
       <div class="example"><p><code>
-        &lt;a href="http://foo.com/"&gt;http://foo.com&lt;/a&gt;
+        &lt;a href="http://example.com/"&gt;http://example.com&lt;/a&gt;
       </code></p></div>
 
       <p>If you want to use double quotes within this text, you have to
@@ -257,11 +257,11 @@
       base referer<br />
       poly map "Could I have a menu, please?" 0,0 0,10 10,10 10,0<br />
       rect .. 0,0 77,27 "the directory of the referer"<br />
-      circle http://www.inetnebr.com/lincoln/feedback/ 195,0 305,27<br />
+      circle http://www.inetnebr.example.com/lincoln/feedback/ 195,0 305,27<br />
       rect another_file "in same directory as referer" 306,0 419,27<br />
-      point http://www.zyzzyva.com/ 100,100<br />
-      point http://www.tripod.com/ 200,200<br />
-      rect mailto:nate@tripod.com 100,150 200,0 "Bugs?"<br />
+      point http://www.zyzzyva.example.com/ 100,100<br />
+      point http://www.tripod.example.com/ 200,200<br />
+      rect mailto:nate@tripod.example.com 100,150 200,0 "Bugs?"<br />
     </code></p></div>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -377,6 +377,6 @@ an imagemap</td></tr>
 <p><span>Available Languages: </span><a href="../en/mod/mod_imagemap.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_imagemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_imagemap.html.ko.euc-kr b/docs/manual/mod/mod_imagemap.html.ko.euc-kr
index 866f72ef..76983cab 100644
--- a/docs/manual/mod/mod_imagemap.html.ko.euc-kr
+++ b/docs/manual/mod/mod_imagemap.html.ko.euc-kr
@@ -358,6 +358,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/mod_imagemap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_imagemap.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_include.html b/docs/manual/mod/mod_include.html
index b45a07fc..db272ac7 100644
--- a/docs/manual/mod/mod_include.html
+++ b/docs/manual/mod/mod_include.html
@@ -1,7 +1,9 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_include.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_include.html.ja.euc-jp
+URI: mod_include.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/mod_include.html.en b/docs/manual/mod/mod_include.html.en
index f4127334..333223cf 100644
--- a/docs/manual/mod/mod_include.html.en
+++ b/docs/manual/mod/mod_include.html.en
@@ -635,6 +635,11 @@
       parsed expression tokenizer information, the parse tree and how it is
       evaluated into the output sent to the client.</p>
     </div>
+
+    <div class="note"><h3>Escaping slashes in regex strings</h3>
+     <p>All slashes which are not intended to act as delimiters in your regex must
+     be escaped.  This is regardless of their meaning to the regex engine.</p>
+    </div>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="SSIEnableAccess" id="SSIEnableAccess">SSIEnableAccess</a> <a name="ssienableaccess" id="ssienableaccess">Directive</a></h2>
@@ -850,6 +855,6 @@ set</td></tr>
 <p><span>Available Languages: </span><a href="../en/mod/mod_include.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_include.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_include.html.ja.euc-jp b/docs/manual/mod/mod_include.html.ja.euc-jp
deleted file mode 100644
index 91c3041b..00000000
--- a/docs/manual/mod/mod_include.html.ja.euc-jp
+++ /dev/null
@@ -1,791 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_include - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_include</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_include.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_include.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤¬¥Ñ¡¼¥¹¤¹¤ë html ¥É¥­¥å¥á¥ó¥È (Server Side Includes)</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>include_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_include.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0 ¤«¤é½ÐÎÏ¥Õ¥£¥ë¥¿¤È¤·¤Æ¼ÂÁõ¤µ¤ì¤Þ¤·¤¿¡£</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¥Õ¥¡¥¤¥ë¤¬¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤é¤ì¤ëÁ°¤Ë½èÍý¤¹¤ë¥Õ¥£¥ë¥¿¤ò
-    Ä󶡤·¤Þ¤¹¡£½èÍý¤ÎÆâÍƤÏ<dfn>Í×ÁÇ</dfn>¤È¸Æ¤Ð¤ì¤ëÆÃÊ̤ʷÁ¼°¤Î SGML ¥³¥á¥ó¥È¤Ë¤è¤ê
-    À©¸æ¤µ¤ì¤Þ¤¹¡£¤³¤ì¤é¤ÎÍ×ÁǤϾò·ïʬ´ô¤ä¡¢Â¾¤Î¥Õ¥¡¥¤¥ë¤ä
-    ¥×¥í¥°¥é¥à¤Î½ÐÎϤμè¤ê¹þ¤ß¡¢´Ä¶­ÊÑ¿ô¤ÎÀßÄê¤äɽ¼¨¤ò¹Ô¤Ê¤¦¤³¤È¤¬
-    ¤Ç¤­¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#ssiendtag">SSIEndTag</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#ssierrormsg">SSIErrorMsg</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#ssistarttag">SSIStartTag</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#ssitimeformat">SSITimeFormat</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#ssiundefinedecho">SSIUndefinedEcho</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#xbithack">XBitHack</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#enabling">Server-Side Includes ¤òÍ­¸ú¤Ë¤¹¤ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#pathinfo">¥µ¡¼¥Ð¥µ¥¤¥É¥¤¥ó¥¯¥ë¡¼¥É (SSI) ¤Ç¤Î PATH_INFO</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#elements">´ðËÜÍ×ÁÇ</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#includevars">Include ÊÑ¿ô</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#substitution">ÊÑ¿ôÃÖ´¹</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#flowctrl">¥Õ¥í¡¼À©¸æÍ×ÁÇ</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code></li>
-<li><a href="../filter.html">¥Õ¥£¥ë¥¿</a></li>
-<li><a href="../howto/ssi.html">SSI ¥Á¥å¡¼¥È¥ê¥¢¥ë</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="enabling" id="enabling">Server-Side Includes ¤òÍ­¸ú¤Ë¤¹¤ë</a></h2>
-    
-
-    <p>Server Side Includes ¤Ï <code>INCLUDES</code>
-    <a href="../filter.html">¥Õ¥£¥ë¥¿</a> ¤Ë¤è¤ê¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-    Server-side include ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò´Þ¤à¥É¥­¥å¥á¥ó¥È¤Î³ÈÄ¥»Ò¤¬
-    .shtml ¤Î¾ì¹ç¡¢°Ê²¼¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤Ï Apache ¤¬¤½¤ì¤é¤ò
-    ¥Ñ¡¼¥¹¤·¤Æ¡¢¤½¤Î·ë²Ì¤Ç¤­¤ë¥É¥­¥å¥á¥ó¥È¤Ë <code>text/html</code> ¤Î
-    MIME ¥¿¥¤¥×¤ò³ä¤êÅö¤Æ¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      AddType text/html .shtml<br />
-      AddOutputFilter INCLUDES .shtml
-    </code></p></div>
-
-    <p>°Ê²¼¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï shtml ¥Õ¥¡¥¤¥ë¤Î¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ë
-    ɬÍפ¬¤¢¤ê¤Þ¤¹ (Ä̾ï¤Ï <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤Ç»ØÄꤷ¤Þ¤¹¤¬¡¢
-    <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> <code>Options</code>
-    ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¤È¡¢<code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ë½ñ¤¯¤³¤È¤â¤Ç¤­¤Þ¤¹):</p>
-
-    <div class="example"><p><code>
-      Options +Includes
-    </code></p></div>
-
-    <p>¸ß´¹À­¤òÊݤĤ¿¤á¤Ë¡¢<code>server-parsed</code>
-    <a href="../handler.html">¥Ï¥ó¥É¥é</a> ¤â INCLUDES ¥Õ¥£¥ë¥¿¤ò
-    Í­¸ú¤Ë¤·¤Þ¤¹¡£MIME ¥¿¥¤¥× <code>text/x-server-parsed-html</code> ¤ä
-    <code>text/x-server-parsed-html3</code> ¤Î¥É¥­¥å¥á¥ó¥È¤ËÂФ·¤Æ¤â
-    Apache ¤Ï INCLUDES ¥Õ¥£¥ë¥¿¤òÍ­¸ú¤Ë¤·¤Þ¤¹ (½ÐÎϤµ¤ì¤ë¤â¤Î¤Ï
-    MIME ¥¿¥¤¥× <code>text/html</code> ¤Ë¤Ê¤ê¤Þ¤¹)¡£</p>
-
-    <p>¾Ü¤·¤¤¾ðÊó¤Ï <a href="../howto/ssi.html">Tutorial on Server Side Includes</a>.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="pathinfo" id="pathinfo">¥µ¡¼¥Ð¥µ¥¤¥É¥¤¥ó¥¯¥ë¡¼¥É (SSI) ¤Ç¤Î PATH_INFO</a></h2>
-    
-
-    <p>SSI ¤Ç½èÍý¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï <code>PATH_INFO</code>
-    (¸å³¤Î¥Ñ¥¹Ì¾¾ðÊó)
-    ÉÕ¤­¤Î¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±Æþ¤ì¤Ê¤¯¤Ê¤ê¤Þ¤·¤¿¡£<code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç
-    <code>PATH_INFO</code> ÉÕ¤­¤Î¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±Æþ¤ì¤ë¤è¤¦¤Ë¥µ¡¼¥Ð¤ò
-    ÀßÄê¤Ç¤­¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="elements" id="elements">´ðËÜÍ×ÁÇ</a></h2>
-    <p>¥É¥­¥å¥á¥ó¥È¤Ï¡¢SGML ¤Î¥³¥á¥ó¥È¤È¤·¤ÆÆÃÊ̤ʥ³¥Þ¥ó¥É¤¬Ëä¤á¹þ¤Þ¤ì¤¿
-    HTML ¥É¥­¥å¥á¥ó¥È¤È¤·¤Æ¥Ñ¡¼¥¹¤µ¤ì¤Þ¤¹¡£¥³¥Þ¥ó¥É¤Î¹½Ê¸¤Ï¼¡¤Î¤è¤¦¤Ë
-    ¤Ê¤Ã¤Æ¤¤¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      &lt;!--#<var>element</var> <var>attribute</var>=<var>value</var>
-      <var>attribute</var>=<var>value</var> ... --&gt;
-    </code></p></div>
-
-    <p>ÃÍ (ÌõÃí: value) ¤ÏÆó½Å°úÍÑÉä¤Ç°Ï¤à¤Î¤¬°ìÈÌŪ¤Ç¤¹¤¬¡¢
-    ¥·¥ó¥°¥ë¥¯¥ª¡¼¥È (') ¤È¥Ð¥Ã¥¯¥¯¥ª¡¼¥È (`) ¤â»ÈÍѤǤ­¤Þ¤¹¡£
-    ¿¤¯¤Î¥³¥Þ¥ó¥É¤Ï°À­-ÃÍ (ÌõÃí: attribute-value) ¤ÎÁȤò°ì¤Ä¤À¤±»ØÄê¤Ç¤­¤Þ¤¹¡£
-    ¥³¥á¥ó¥È¤Î½ª¤ï¤ê (<code>--&gt;</code>)
-    ¤ÎÁ°¤Ë¤Ï¡¢SSI ¤Î¶ç¤Î°ìÉô¤À¤È²ò¼á¤µ¤ì¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë¶õÇò¤ò
-    Æþ¤ì¤Æ¤¯¤À¤µ¤¤¡£ºÇ½é¤Î <code>&lt;!--#</code> ¤Ï¤Þ¤È¤á¤Æ<em>°ì¤Ä</em>¤Î
-    ¶ç¤Ç¡¢¶õÇò¤ò¤Õ¤¯¤ó¤Ç¤Ï¤¤¤±¤Ê¤¤¤³¤ÈÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>Í×ÁÇ (ÌõÃí: element) ¤ò°Ê²¼¤Îɽ¤Ë¼¨¤·¤Þ¤¹¡£</p>
-
-    <table class="bordered">
-    <tr><th>Í×ÁÇ</th><th>ÀâÌÀ</th></tr>
-    <tr><td><code><a href="#element.config">config</a></code></td>
-        <td>configure output formats</td></tr>
-    <tr><td><code><a href="#element.echo">echo</a></code></td>
-        <td>print variables</td></tr>
-    <tr><td><code><a href="#element.exec">exec</a></code></td>
-        <td>execute external programs</td></tr>
-    <tr><td><code><a href="#element.fsize">fsize</a></code></td>
-        <td>print size of a file</td></tr>
-    <tr><td><code><a href="#element.flastmod">flastmod</a></code></td>
-        <td>print last modification time of a file</td></tr>
-    <tr><td><code><a href="#element.include">include</a></code></td>
-        <td>include a file</td></tr>
-    <tr><td><code><a href="#element.printenv">printenv</a></code></td>
-        <td>print all available variables</td></tr>
-    <tr><td><code><a href="#element.set">set</a></code></td>
-        <td>set a value of a variable</td></tr>
-    </table>
-
-    <p>SSI Í×ÁÇ¤Ï <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> °Ê³°¤Î¥â¥¸¥å¡¼¥ë¤Ç
-    ÄêµÁ¤µ¤ì¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¡£¼ÂºÝ¡¢
-    <code><a href="#element.exec">exec</a></code> Í×ÁǤÏ
-    <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> ¤ÇÄ󶡤µ¤ì¤Æ¤¤¤Æ¡¢¤³¤Î¥â¥¸¥å¡¼¥ë¤¬
-    ¥í¡¼¥É¤µ¤ì¤ë¾ì¹ç¤Ë¤Î¤ßÍøÍѲÄǽ¤È¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <h3><a name="element.config" id="element.config">config Í×ÁÇ</a></h3>
-      <p>¼¡¤Î¥³¥Þ¥ó¥É¤Ï²òÀϤÎÍÍ¡¹¤Ê¦Ì̤òÀ©¸æ¤·¤Þ¤¹¡£Â°À­¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹¡£</p>
-
-      <dl>
-      <dt><code>echomsg</code> (<em>Apache 2.1 °Ê¹ß</em>)</dt>
-      <dd>»ØÄꤵ¤ì¤ëÃͤϡ¢<code><a href="#element.echo">echo</a></code>
-      Í×ÁǤ¬Ì¤ÄêµÁ¤ÎÊÑ¿ô¤ò¥¨¥³¡¼¤·¤è¤¦¤È¤·¤¿ºÝ¤Ë¡¢
-      ¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤é¤ì¤ë¥á¥Ã¥»¡¼¥¸¤Ë¤Ê¤ê¤Þ¤¹¡£
-      <code class="directive"><a href="#ssiundefinedecho">SSIUndefinedEcho</a></code> 
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¾å½ñ¤­¤·¤Þ¤¹¡£</dd>
-
-      <dt><code>errmsg</code></dt>
-      <dd>¤³¤ÎÃͤ¬¡¢¥É¥­¥å¥á¥ó¥È¤Î²òÀÏÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤¿»þ¤Ë
-      ¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¿®¤µ¤ì¤ë¥á¥Ã¥»¡¼¥¸¤Ë¤Ê¤ê¤Þ¤¹¡£
-      <code class="directive"><a href="#ssierrormsg">SSIErrorMsg</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¾å½ñ¤­¤·¤Þ¤¹¡£</dd>
-
-      <dt><code>sizefmt</code></dt>
-      <dd>¤³¤ÎÃͤϡ¢¥Õ¥¡¥¤¥ë¤Î¥µ¥¤¥º¤òɽ¼¨¤¹¤ëºÝ¤Ë»ÈÍѤ¹¤ë
-      ¥Õ¥©¡¼¥Þ¥Ã¥È¤òÀßÄꤷ¤Þ¤¹¡£ÃÍ¤Ï ¥Ð¥¤¥È¥«¥¦¥ó¥È¤Î
-      <code>bytes</code>¤«¡¢Kb ¤ä Mb ¤òÍ¥ÀèŪ¤Ë»ÈÍѤ¹¤ë
-      <code>abbrec</code> (Î㤨¤Ð 1024 ¥Ð¥¤¥È¤Ï "1K" ¤Èɽ¼¨¤µ¤ì¤Þ¤¹)
-      ¤Ç¤¹¡£</dd>
-
-      <dt><code>timefmt</code></dt>
-      <dd>¤³¤ÎÃÍ¤Ï <code>strftime(3)</code> ¥é¥¤¥Ö¥é¥ê¥ë¡¼¥Á¥ó¤¬
-      Æü»þ¤ò¥×¥ê¥ó¥È¤¹¤ëºÝ¤ËÍѤ¤¤é¤ì¤Þ¤¹¡£</dd>
-      </dl>
-     
-
-    <h3><a name="element.echo" id="element.echo">echo Í×ÁÇ</a></h3>
-      <p>¤³¤Î¥³¥Þ¥ó¥É¤Ï°Ê²¼¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë <a href="#includevars">include
-      ÊÑ¿ô</a> ¤òɽ¼¨¤·¤Þ¤¹¡£ÊÑ¿ô¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï <code class="directive"><a href="#ssiundefinedecho">SSIUndefinedEcho</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç
-      ·èÄꤵ¤ì¤ë·ë²Ì¤È¤Ê¤ê¤Þ¤¹¡£ÆüÉդϤ½¤Î»þÅÀ¤Ç¤Î <code>timefmt</code> ¤Ë½¾¤Ã¤Æ
-      ɽ¼¨¤µ¤ì¤Þ¤¹¡£Â°À­¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹¡£</p>
-
-      <dl>
-      <dt><code>var</code></dt>
-      <dd>ÃͤÏɽ¼¨¤¹¤ëÊÑ¿ô¤Î̾Á°¤Ç¤¹¡£</dd>
-
-      <dt><code>encoding</code></dt>
-      <dd><p>ÊÑ¿ô¤ò½ÐÎϤ¹¤ëÁ°¤Ë¡¢ÊÑ¿ôÃæ¤ÎÆÃÊÌʸ»ú¤ò¤É¤Î¤è¤¦¤Ë¥¨¥ó¥³¡¼¥É¤¹¤ë¤«¤ò
-      »ØÄꤷ¤Þ¤¹¡£<code>none</code> ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¤È¡¢¥¨¥ó¥³¡¼¥É¤Ï¹Ô¤Ê¤ï¤ì¤Þ¤»¤ó¡£
-      <code>url</code> ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¤È¡¢URL ¥¨¥ó¥³¡¼¥É (%-¥¨¥ó¥³¡¼¥É¤È¤â
-      ¸Æ¤Ð¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï¥ê¥ó¥¯Åù¤Î URL ¤Î»ÈÍѤËŬÀڤǤ¹) ¤¬
-      ¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£<code>echo</code> Í×ÁǤγ«»Ï»þ¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ï
-      <code>entity</code> ¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï¥¨¥ó¥Æ¥£¥Æ¥£¥¨¥ó¥³¡¼¥É
-      (ÃÊÍî¤ä¥Æ¥­¥¹¥È¤Ê¤É¤Î¥Ö¥í¥Ã¥¯¥ì¥Ù¥ë¤Î HTML ¥¨¥ì¥á¥ó¥È¤Î¥³¥ó¥Æ¥­¥¹¥È¤Ë
-      Ŭ¤·¤Æ¤¤¤Þ¤¹) ¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£¤³¤ì¤Ï <code>encoding</code> °À­
-      ¤ò²Ã¤¨¤ë¤³¤È¤ÇÊѹ¹¤Ç¤­¤Þ¤¹¡£Êѹ¹¤Ï¼¡¤Î <code>encoding</code> °À­¤«¡¢
-      Í×ÁǤνªÎ»¤Þ¤Ç¸úÎϤò»ý¤Á¤Þ¤¹¡£</p>
-
-      <p><code>encoding</code> °À­¤Ï¥¨¥ó¥³¡¼¥É¤ÎÊѹ¹¤ò¤·¤¿¤¤ <code>var</code> 
-      ¤Î<em>Á°¤Ë</em> ¤¢¤ëɬÍפ¬¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-      ¤Þ¤¿¡¢ISO-8859-1 ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ç
-      ÄêµÁ¤µ¤ì¤Æ¤¤¤ëÆÃÊ̤Êʸ»ú¤À¤±¤¬¥¨¥ó¥³¡¼¥É¤µ¤ì¤Þ¤¹¡£
-      Ê̤Îʸ»ú¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î¾ì¹ç¤Ï¡¢¤³¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ï
-      ˾¤ß¤Î·ë²Ì¤Ë¤Ê¤é¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>
-
-      <div class="warning">
-        ¥¯¥í¥¹¥µ¥¤¥È¥¹¥¯¥ê¥×¥Æ¥£¥ó¥°¤ÎÌäÂê¤òÈò¤±¤ë¤¿¤á¤Ë¡¢
-        <em>¾ï¤Ë</em>¥æ¡¼¥¶¤«¤é¤Î¥Ç¡¼¥¿¤ò¥¨¥ó¥³¡¼¥É¤¹¤Ù¤­¤Ç¤¹¡£
-      </div>
-      </dd>
-      </dl>
-     
-
-    <h3><a name="element.exec" id="element.exec">exec Í×ÁÇ</a></h3>
-      <p><code>exec</code> ¥³¥Þ¥ó¥É¤Ï»ØÄꤵ¤ì¤¿¥·¥§¥ë¥³¥Þ¥ó¥É¤ä CGI ¥¹¥¯¥ê¥×¥È¤ò
-      ¼Â¹Ô¤·¤Þ¤¹¡£<code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> ¤¬¥µ¡¼¥Ð¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ë¤¤¤Ê¤±¤ì¤Ð
-      ¤Ê¤ê¤Þ¤»¤ó¡£<code class="directive"><a href="../mod/core.html#option">Option</a></code> 
-      <code>IncludesNOEXEC</code> ¤Ï¤³¤Î¥³¥Þ¥ó¥É¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£
-      »ÈÍѲÄǽ¤Ê°À­¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹¡£</p>
-
-      <dl>
-      <dt><code>cgi</code></dt>
-      <dd><p>ÃÍ¤Ï (%-¥¨¥ó¥³¡¼¥É¤µ¤ì¤¿) URL ¤ò»ØÄꤷ¤Þ¤¹¡£¥Ñ¥¹¤¬
-      ¥¹¥é¥Ã¥·¥å (/) ¤Ç»Ï¤Þ¤é¤Ê¤¤¤È¤­¤Ï¡¢¥É¥­¥å¥á¥ó¥È¤«¤é¤Î
-      ÁêÂХѥ¹¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£¤³¤Î¥Ñ¥¹¤Ç»²¾È¤µ¤ì¤Æ¤¤¤ë¥É¥­¥å¥á¥ó¥È¤Ï
-      ¥µ¡¼¥Ð¤¬ CGI ¥¹¥¯¥ê¥×¥È¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Ê¤¯¤Æ¤â CGI ¥¹¥¯¥ê¥×¥È¤È¤·¤Æ
-      µ¯Æ°¤µ¤ì¤Þ¤¹¡£¤¿¤À¤·¡¢¥¹¥¯¥ê¥×¥È¤Î¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï
-      (<code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
-      ¤ä <code class="directive"><a href="../mod/core.html#option">Option</a></code> <code>ExecCGI</code>
-      ¤Ë¤è¤Ã¤Æ) CGI ¥¹¥¯¥ê¥×¥È¤Î»ÈÍѤ¬µö²Ä¤µ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-      <p>CGI ¥¹¥¯¥ê¥×¥È¤Ë¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î¸µ¡¹¤Î¥ê¥¯¥¨¥¹¥È¤Î
-      <code>PATH_INFO</code> ¤È¥¯¥¨¥ê¡¼Ê¸»úÎó (<code>QUERY_STRING</code>) ¤¬ÅϤµ¤ì¤Þ¤¹¡£
-      ¤³¤ì¤é¤Ï URL ¥Ñ¥¹¤È¤·¤ÆÆÃÄê<em>¤Ç¤­¤Ê¤¤</em>¤â¤Î¤Ç¤¹¡£
-      ¥¹¥¯¥ê¥×¥È¤Ïɸ½à <a href="mod_cgi.html">CGI</a> ´Ä¶­¤Ë²Ã¤¨¤Æ¡¢include ÊÑ¿ô¤ò
-      »ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-      <div class="example"><h3>Îã</h3><p><code>
-        &lt;!--#exec cgi="/cgi-bin/example.cgi" --&gt;
-      </code></p></div>
-
-      <p>¥¹¥¯¥ê¥×¥È¤¬¡¢½ÐÎϤÎÂå¤ï¤ê¤Ë <code>Location:</code> ¥Ø¥Ã¥À¤òÊÖ¤¹¤È¡¢
-      HTML ¤Î¥¢¥ó¥«¡¼ (ÌõÃí¡§¥ê¥ó¥¯) ¤ËÊÑ´¹¤µ¤ì¤Þ¤¹¡£</p>
-
-      <p><code>exec cgi</code> ¤è¤ê¤â¡¢
-      <code><a href="#includevirtual">include virtual</a></code>
-      ¤ÎÊý¤ò»È¤¦¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£Æäˡ¢CGI ¤Ø¤ÎÄɲäΰú¿ô¤ò
-      ¥¯¥¨¥ê¡¼Ê¸»úÎó¤ò»È¤Ã¤ÆÅϤ¹¤³¤È¤Ï <code>exec cgi</code> ¤Ï
-      ¤Ç¤­¤Þ¤»¤ó¤¬¡¢<code>include virtual</code> ¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ
-      ²Äǽ¤Ç¤¹¡£</p>
-
-      <div class="example"><p><code>
-        &lt;!--#include virtual="/cgi-bin/example.cgi?argument=value" --&gt;
-      </code></p></div>
-      </dd>
-
-      <dt><code>cmd</code></dt>
-      <dd><p>¥µ¡¼¥Ð¤Ï»ØÄꤵ¤ì¤¿Ê¸»úÎó¤ò <code>/bin/sh</code> ¤ò»È¤Ã¤Æ
-      ¼Â¹Ô¤·¤Þ¤¹¡£¥³¥Þ¥ó¥É¤ÏÄ̾ï¤Î CGI ÊÑ¿ô¤Ë²Ã¤¨¤Æ <a href="#includevars">include ÊÑ¿ô</a>¤â»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-      <p>¤Û¤È¤ó¤É¤Î¾ì¹ç¡¢<code><a href="#includevirtual">#include 
-      virtual</a></code> ¤ò»È¤¦Êý¤¬ <code>#exec cgi</code> ¤ä <code>#exec
-      cmd</code> ¤ò»È¤¦¤è¤ê¤âÎɤ¤¤Ç¤¹¡£Á°¼Ô (<code>#include virtual</code>)
-      ¤Ïɸ½à¤Î Apache ¤Î¥µ¥Ö¥ê¥¯¥¨¥¹¥Èµ¡¹½¤ò»È¤Ã¤Æ¥Õ¥¡¥¤¥ë¤ä¥¹¥¯¥ê¥×¥È¤Î
-      ½ÐÎϤò¼è¤ê¹þ¤ß¤Þ¤¹¡£
-      ¤³¤Á¤é¤ÎÊý¤¬¤è¤¯¥Æ¥¹¥È¤µ¤ì¥á¥ó¥Æ¥Ê¥ó¥¹¤µ¤ì¤¿ÊýË¡¤Ç¤¹¡£</p>
-
-      <p>¤µ¤é¤Ë¡¢Win32 ¤Î¤è¤¦¤Ê¤¤¤¯¤Ä¤«¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤ä¡¢<a href="../suexec.html">suexec</a> ¤ò»È¤Ã¤Æ¤¤¤ë unix ¤Ç¤Ï¡¢
-      <code>exec</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¥³¥Þ¥ó¥É¤Ë
-      °ú¿ô¤òÅϤ·¤¿¤ê¡¢¥³¥Þ¥ó¥É¤Ë¶õÇò¤òÆþ¤ì¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
-      ¤Ç¤¹¤«¤é¡¢°Ê²¼¤Î¤â¤Î¤Ï unix ¤Î suexec ¤Ç¤Ê¤¤ÀßÄê¤Ç¤ÏÆ°ºî¤·¤Þ¤¹¤¬¡¢
-      Win32 ¤ä suexec ¤ò»È¤Ã¤Æ¤¤¤ë unix ¤Ç¤Ï´üÂÔ¤·¤¿·ë²Ì¤Ë¤Ï¤Ê¤ê¤Þ¤»¤ó:</p>
-
-      <div class="example"><p><code>
-        &lt;!--#exec cmd="perl /path/to/perlscript arg1 arg2" --&gt;
-      </code></p></div>
-      </dd>
-      </dl>
-     
-
-    <h3><a name="element.fsize" id="element.fsize">fsize Í×ÁÇ</a></h3>
-      <p>¤³¤Î¥³¥Þ¥ó¥É¤Ï»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤ÎÂ礭¤µ¤ò <code>sizefmt</code> ¤Î
-      ½ñ¼°»ØÄê¤Ë´ð¤Å¤¤¤Æ½ÐÎϤ·¤Þ¤¹¡£Â°À­¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹¡£</p>
-
-      <dl>
-      <dt><code>file</code></dt>
-      <dd>ÃͤϲòÀϤµ¤ì¤Æ¤¤¤ë¥É¥­¥å¥á¥ó¥È¤Î¸ºß¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤Î
-      ÁêÂХѥ¹¤Ç¤¹¡£</dd>
-
-      <dt><code>virtual</code></dt>
-      <dd> ÃÍ¤Ï (% ¥¨¥ó¥³¡¼¥É¤µ¤ì¤¿) URL-path ¤Ç¤¹¡£¥¹¥é¥Ã¥·¥å (/) ¤Ç
-      »Ï¤Þ¤é¤Ê¤¤¤È¤­¤Ï¥É¥­¥å¥á¥ó¥È¤«¤é¤ÎÁêÂХѥ¹¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
-      CGI ¤Î½ÐÎϤΥµ¥¤¥º¤Ï¥×¥ê¥ó¥È<em>¤µ¤ì¤Þ¤»¤ó</em>¡£CGI
-      ¥¹¥¯¥ê¥×¥È¼«ÂΤΥµ¥¤¥º¤¬¥×¥ê¥ó¥È¤µ¤ì¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</dd>
-      </dl>
-     
-
-    <h3><a name="element.flastmod" id="element.flastmod">flastmod Í×ÁÇ</a></h3>
-      <p>¤³¤Î¥³¥Þ¥ó¥É¤Ï»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤ÎºÇ½ª½¤Àµ»þ¹ï¤ò
-      <code>timefmt</code> ½ñ¼°»ØÄê¤Ë½¾¤Ã¤Æɽ¼¨¤·¤Þ¤¹¡£
-      »ØÄê²Äǽ¤Ê°À­¤Ï <code>fsize</code> ¥³¥Þ¥ó¥É¤ÈƱ¤¸¤Ç¤¹¡£</p>
-     
-
-    <h3><a name="element.include" id="element.include">include Í×ÁÇ</a></h3>
-      <p>¤³¤Î¥³¥Þ¥ó¥É¤ÏÊ̤Îʸ½ñ¤ä¥Õ¥¡¥¤¥ë¤Î¥Æ¥­¥¹¥È¤ò²òÀϤ·¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Ë
-      ÁÞÆþ¤·¤Þ¤¹¡£ÁÞÆþ¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤Ï¥¢¥¯¥»¥¹À©¸æ¤Î´ÉÍý²¼¤Ë¤¢¤ê¤Þ¤¹¡£
-      ²òÀϤ·¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î¸ºß¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ë
-      <a href="core.html#options">Option</a> <code>IncludesNOEXEC</code>
-      ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢text MIME ¥¿¥¤¥× (<code>text/plain</code>,
-      <code>text/html</code> Åù) ¤Î¥É¥­¥å¥á¥ó¥È¤Î¤ß¥¤¥ó¥¯¥ë¡¼¥É¤¬¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£
-      ¤½¤Î¾¤Î¾ì¹ç¤Ï¡¢¥¯¥¨¥ê¡¼Ê¸»úÎó¤â´Þ¤á¡¢¥³¥Þ¥ó¥É¤Ç»ØÄꤵ¤ì¤¿
-      ´°Á´¤Ê URL ¤ò»È¤Ã¤ÆÉáÄÌ¤Ë CGI ¥¹¥¯¥ê¥×¥È¤¬¸Æ¤Ó½Ð¤µ¤ì¤Þ¤¹¡£</p>
-
-      <p>°À­¤¬Ê¸½ñ¤Î°ÌÃÖ¤ò»ØÄꤷ¤Þ¤¹¡£include ¥³¥Þ¥ó¥É¤ËÍ¿¤¨¤é¤ì¤¿¤½¤ì¤¾¤ì¤Î
-      °À­¤ËÂФ·¤ÆÁÞÆþºî¶È¤¬¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£Í­¸ú¤Ê°À­¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹¡£</p>
-
-      <dl>
-      <dt><code>file</code></dt>
-      <dd>ÃͤϲòÀϤµ¤ì¤Æ¤¤¤ë¥É¥­¥å¥á¥ó¥È¤Î¸ºß¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤Î
-      ÁêÂХѥ¹¤Ç¤¹¡£
-      <code>../</code> ¤ò´Þ¤ó¤Ç¤¤¤¿¤ê¡¢ÀäÂХѥ¹¤ò»ØÄꤷ¤¿¤ê¤Ï¤Ç¤­¤Þ¤»¤ó¡£
-      ¤Ç¤¹¤«¤é¡¢¥É¥­¥å¥á¥ó¥È¥ë¡¼¥È¤Î³°¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤ä¡¢¥Ç¥£¥ì¥¯¥È¥ê¹½Â¤¤Ç
-      ¾å°Ì¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤òÁÞÆþ¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
-      ¾ï¤Ë¤³¤Î°À­¤è¤ê¤Ï¡¢<code>virtual</code> °À­¤ò»È¤¦¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-      </dd>
-
-      <dt><code><a id="includevirtual" name="includevirtual">virtual</a></code></dt>
-      <dd><p>ÃͤϲòÀϤµ¤ì¤Æ¤¤¤ë¥É¥­¥å¥á¥ó¥È¤«¤é¤Î (% ¥¨¥ó¥³¡¼¥É¤µ¤ì¤¿) URL
-      ¤Ç¤¹¡£URL ¤Ë¤Ï¥¹¥­¡¼¥à¤ä¥Û¥¹¥È̾¤ò´Þ¤á¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¥Ñ¥¹¤È¡¢
-      ¤â¤·¤¢¤ì¤Ð¥¯¥¨¥ê¡¼Ê¸»úÎó¤ò»ØÄê¤Ç¤­¤ë¤À¤±¤Ç¤¹¡£¥¹¥é¥Ã¥·¥å (/) ¤«¤é
-      »Ï¤Þ¤é¤Ê¤¤¾ì¹ç¤Ï¡¢¥É¥­¥å¥á¥ó¥È¤«¤é¤ÎÁêÂХѥ¹¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£</p>
-
-      <p>URL ¤Ï°À­¤«¤éºî¤é¤ì¡¢¤½¤Î URL ¤ò¥¯¥é¥¤¥¢¥ó¥È¤¬¥¢¥¯¥»¥¹¤·¤¿¤È¤­¤Ë
-      ½ÐÎϤµ¤ì¤ëÆâÍƤ¬²òÀϸå¤Î½ÐÎϤ˴ޤá¤é¤ì¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢ÁÞÆþ¤µ¤ì¤ë
-      ¥Õ¥¡¥¤¥ë¤ÏÆþ¤ì»Ò¹½Â¤¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-      <p>»ØÄꤵ¤ì¤¿ URL ¤¬ CGI ¥×¥í¥°¥é¥à¤Ç¤¢¤Ã¤¿¾ì¹ç¤Ï¡¢
-      ¥×¥í¥°¥é¥à¤¬¼Â¹Ô¤µ¤ì¡¢¤½¤Î½ÐÎϤ¬²òÀϤ·¤Æ¤¤¤ë¥Õ¥¡¥¤¥ëÃæ¤Î
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬¤¢¤Ã¤¿°ÌÃÖ¤ËÁÞÆþ¤µ¤ì¤Þ¤¹¡£CGI ¤Î url ¤Ë
-      ¥¯¥¨¥ê¡¼ URL ¤òÆþ¤ì¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-
-      <div class="example"><p><code>
-        &lt;!--#include virtual="/cgi-bin/example.cgi?argument=value" --&gt;
-      </code></p></div>
-
-      <p>HTML ¥É¥­¥å¥á¥ó¥È¤Ë CGI ¥×¥í¥°¥é¥à¤Î½ÐÎϤò´Þ¤á¤ëÊýË¡¤È¤·¤Æ¤Ï¡¢
-      <code>include virtual</code> ¤ÎÊý¤¬ <code>exec cgi</code> ¤è¤ê¤â
-      ¹¥¤Þ¤·¤¤ÊýË¡¤Ç¤¹¡£</p>
-      </dd>
-      </dl>
-     
-
-    <h3><a name="element.printenv" id="element.printenv">printenv Í×ÁÇ</a></h3>
-      <p>¤³¤ì¤Ï¡¢Â¸ºß¤¹¤ë¤¹¤Ù¤Æ¤ÎÊÑ¿ô¤È¤½¤ÎÃͤòɽ¼¨¤·¤Þ¤¹¡£Apache 1.3.12 ¤«¤é¡¢
-      ÆÃÊ̤Êʸ»ú¤Ï½ÐÎϤµ¤ì¤ëÁ°¤Ë¥¨¥ó¥Æ¥£¥Æ¥£¥¨¥ó¥³¡¼¥É (¾ÜºÙ¤Ï <a href="#element.echo"><code>echo</code></a> Í×ÁǤò»²¾È)
-      ¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£Â°À­¤Ï¤¢¤ê¤Þ¤»¤ó¡£</p>
-
-      <div class="example"><h3>Îã</h3><p><code>
-        &lt;!--#printenv --&gt;
-      </code></p></div>
-     
-
-    <h3><a name="element.set" id="element.set">set Í×ÁÇ</a></h3>
-      <p>¤³¤ì¤ÏÊÑ¿ô¤ÎÃͤòÀßÄꤷ¤Þ¤¹¡£Â°À­¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹¡£</p>
-
-      <dl>
-      <dt><code>var</code></dt>
-      <dd>ÀßÄꤹ¤ëÊÑ¿ô¤Î̾Á°¡£</dd>
-
-      <dt><code>value</code></dt>      
-      <dd>ÊÑ¿ô¤ËÀßÄꤹ¤ëÃÍ¡£</dd>
-      </dl>
-
-      <div class="example"><h3>Îã</h3><p><code>
-        &lt;!--#set var="category" value="help" --&gt;
-      </code></p></div>
-     
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="includevars" id="includevars">Include ÊÑ¿ô</a></h2>
-    
-
-    <p>ɸ½à CGI ´Ä¶­¤ÎÊÑ¿ô¤Ë²Ã¤¨¤Æ¡¢<code>echo</code> ¥³¥Þ¥ó¥É¤ä¡¢
-    <code>if</code> ¤ä <code>elif</code>, ¤½¤ì¤Ë¥É¥­¥å¥á¥ó¥È¤«¤é¸Æ¤Ó½Ð¤µ¤ì¤ë
-    ¤¹¤Ù¤Æ¤Î¥×¥í¥°¥é¥à¤«¤é»ÈÍѤǤ­¤ëÊÑ¿ô¤¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <dl>
-      <dt><code>DATE_GMT</code></dt>
-      <dd>¥°¥ê¥Ë¥Ã¥¸É¸½à»þ¤Ë¤è¤ë¸½ºß»þ¹ï¡£</dd>
-
-      <dt><code>DATE_LOCAL</code></dt>
-      <dd>¥í¡¼¥«¥ë¤Îɸ½à»þ¤Ë¤è¤ë¸½ºß»þ¹ï¡£</dd>
-
-      <dt><code>DOCUMENT_NAME</code></dt>
-      <dd>¥æ¡¼¥¶¤¬¥ê¥¯¥¨¥¹¥È¤·¤¿ (¥Ç¥£¥ì¥¯¥È¥ê¤ò½ü¤¤¤¿) ¥Õ¥¡¥¤¥ë̾¡£</dd>
-
-      <dt><code>DOCUMENT_URI</code></dt>
-      <dd>¥æ¡¼¥¶¤¬¥ê¥¯¥¨¥¹¥È¤·¤¿ (% ¥¨¥ó¥³¡¼¥É¤µ¤ì¤¿) URL-path¡£
-      ÁÞÆþ¥Õ¥¡¥¤¥ë¤¬Æþ¤ì»Ò¤Ë¤Ê¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢²òÀϤµ¤ì¤Æ¤¤¤ë
-     ¥É¥­¥å¥á¥ó¥È¤Î URL ¤Ç¤Ï<em>¤Ê¤¤</em>¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</dd>
-
-      <dt><code>LAST_MODIFIED</code></dt>
-      <dd>¥æ¡¼¥¶¤¬¥ê¥¯¥¨¥¹¥È¤·¤¿¥É¥­¥å¥á¥ó¥È¤ÎºÇ½ª½¤Àµ»þ¹ï¡£</dd>
-
-      <dt><code>QUERY_STRING_UNESCAPED</code></dt>
-      <dd>¥¯¥¨¥ê¡¼Ê¸»úÎ󤬤¢¤ë¾ì¹ç¡¢¤³¤ÎÊÑ¿ô¤Ë¤Ï (%-¥Ç¥³¡¼¥É¤µ¤ì¤¿)
-      ¥¯¥¨¥ê¡¼Ê¸»úÎó¤¬ÂåÆþ¤µ¤ì¤Æ¤¤¤Æ¡¢shell ¤Ç»ÈÍѤǤ­¤ë¤è¤¦¤Ë
-      <em>¥¨¥¹¥±¡¼¥×</em>¤µ¤ì¤Æ¤¤¤Þ¤¹ (<code>&amp;</code>
-      ¤È¤¤¤Ã¤¿Æüìʸ»ú¤Ë¤Ï¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤¬Ä¾Á°¤ËÃÖ¤«¤ì¤Þ¤¹)¡£</dd>
-    </dl>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="substitution" id="substitution">ÊÑ¿ôÃÖ´¹</a></h2>
-
-    <p>ÊÑ¿ôÃÖ´¹¤Ï¤¿¤¤¤Æ¤¤¤Î¾ì¹ç SSI ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î°ú¿ô¤È¤·¤ÆÂÅÅö¤Ê¾ì½ê¤Ë¤¢¤ë
-    °úÍÑÉä¤Ç°Ï¤Þ¤ì¤¿Ê¸»úÎóÃæ¤Ç¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£¤³¤ì¤Ë³ºÅö¤¹¤ë¤â¤Î¤Ë¤Ï¡¢
-    <code>config</code>,
-    <code>exec</code>, <code>flastmod</code>, <code>fsize</code>,
-    <code>include</code>, <code>echo</code>, <code>set</code> ¤Î
-    ³Æ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È¡¢¾ò·ïʬ´ôÍѤΥª¥Ú¥ì¡¼¥¿¤Ø¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤¹¡£
-    ¥É¥ëµ­¹æ¤Ï¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤ò»È¤¦¤³¤È¤Ç»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      &lt;!--#if expr="$a = \$test" --&gt;
-    </code></p></div>
-
-    <p>ÊÑ¿ô̾¤È¤·¤Æ¤ß¤Ê¤µ¤ì¤ëʸ»úÎó¤ÎÃæ¤ÇÊÑ¿ô¤Ø¤Î»²¾È¤òÃÖ´¹¤¹¤ëɬÍפ¬¤¢¤ë¤È¤­¤Ï¡¢
-    ¥·¥§¥ë¤Ç¤ÎÊÑ¿ôÃÖ´¹¤Î¤è¤¦¤Ë¡¢Ãæ³ç¸Ì¤Ç³ç¤ë¤³¤È¤Ç¶èÊ̤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      &lt;!--#set var="Zed" value="${REMOTE_HOST}_${REQUEST_METHOD}" --&gt;
-    </code></p></div>
-
-    <p>¤³¤ÎÎã¤Ç¤Ï¡¢<code>REMOTE_HOST</code> ¤¬
-    "<code>X</code>" ¤Ç <code>REQUEST_METHOD</code> ¤¬
-    "<code>Y</code>" ¤Î¤È¤­¤ËÊÑ¿ô <code>Zed</code> ¤ò "<code>X_Y</code>"
-    ¤ËÀßÄꤷ¤Þ¤¹¡£</p>
-
-    <p>°Ê²¼¤ÎÎã¤Ç¤Ï¡¢<code>DOCUMENT_URI</code> ¤¬ <code>/foo/file.html</code>
-    ¤Î¤È¤­¤Ë "in foo" ¤ò¡¢<code>/bar/file.html</code> ¤Î¤È¤­¤Ë "in bar" ¤ò¡¢
-    ¤É¤Á¤é¤Ç¤â¤Ê¤¤¤È¤­¤Ë¤Ï "in neither" ¤òɽ¼¨¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      &lt;!--#if expr='"$DOCUMENT_URI" = "/foo/file.html"' --&gt;<br />
-      <span class="indent">
-        in foo<br />
-      </span>
-      &lt;!--#elif expr='"$DOCUMENT_URI" = "/bar/file.html"' --&gt;<br />
-      <span class="indent">
-        in bar<br />
-      </span>
-      &lt;!--#else --&gt;<br />
-      <span class="indent">
-        in neither<br />
-      </span>
-      &lt;!--#endif --&gt;
-    </code></p></div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="flowctrl" id="flowctrl">¥Õ¥í¡¼À©¸æÍ×ÁÇ</a></h2>
-    
-
-    <p>´ðËÜŪ¤Ê¥Õ¥í¡¼¥³¥ó¥È¥í¡¼¥ëÍ×ÁǤϼ¡¤ÎÄ̤ê¤Ç¤¹¡£</p>
-
-    <div class="example"><p><code>
-      &lt;!--#if expr="<var>test_condition</var>" --&gt;<br />
-      &lt;!--#elif expr="<var>test_condition</var>" --&gt;<br />
-      &lt;!--#else --&gt;<br />
-      &lt;!--#endif --&gt;
-    </code></p></div>
-
-    <p><code>if</code> Í×ÁÇ¤Ï¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Î
-    if ʸ¤ÈƱ¤¸¤è¤¦¤ËÆ°ºî¤·¤Þ¤¹¡£¾ò·ï¤¬É¾²Á¤µ¤ì¡¢·ë²Ì¤¬¿¿¤Ç¤¢¤ì¤Ð¼¡¤Î
-    <code>elif</code> ¤« <code>else</code> ¤« <code>endif</code>
-    Í×ÁǤޤǤÎʸ»úÎ󤬽ÐÎϤËÁÞÆþ¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p><code>elif</code> ¤ä <code>else</code> ʸ¤Ï <var>test_condition</var> 
-    ¤¬µ¶¤Î¤È¤­¤Ë¥Æ¥­¥¹¥È¤ò½ÐÎϤËÁÞÆþ¤¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£
-    ¤³¤ì¤é¤ÎÍ×ÁǤϤ¢¤Ã¤Æ¤â¤Ê¤¯¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£</p>
-
-    <p><code>endif</code> Í×ÁÇ¤Ï <code>if</code>
-    Í×ÁǤò½ªÎ»¤µ¤»¤Þ¤¹¡£¤³¤ÎÍ×ÁǤÏɬ¿Ü¤Ç¤¹¡£</p>
-
-    <p><var>test_condition</var> ¤Ï°Ê²¼¤Î¤É¤ì¤«¤Ç¤¹:</p>
-
-    <dl>
-      <dt><code><var>string</var></code></dt>
-      <dd><var>string</var> ¤¬¶õ¤Ç¤Ê¤¤¾ì¹ç¤Ë¿¿¤Ç¤¹</dd>
-
-      <dt><code><var>string1</var> = <var>string2</var><br />
-      <var>string1</var> == <var>string2</var><br />
-      <var>string1</var> != <var>string2</var></code></dt>
-
-      <dd><p><var>string1</var> ¤È <var>string2</var> ¤òÈæ³Ó¤·¤Þ¤¹¡£
-      <var>string2</var> ¤¬ <code>/<var>string</var>/</code>
-      ¤È¤¤¤¦·Á¼°¤Ç¤¢¤ì¤Ð¡¢Àµµ¬É½¸½¤È¤·¤ÆÈæ³Ó¤µ¤ì¤Þ¤¹¡£Àµµ¬É½¸½¤Ï
-      <a href="http://www.pcre.org">PCRE</a> ¥¨¥ó¥¸¥ó¤Ç¼ÂÁõ¤µ¤ì¤Æ¤¤¤Æ¡¢
-      <a href="http://www.perl.com">perl 5</a> ¤ÈƱ¤¸¹½Ê¸¤ò»ÈÍѤ·¤Þ¤¹¡£
-      <code>==</code> ¤Ïñ¤Ë <code>=</code> ¤ÎÊÌ̾¤Ç¡¢¤Þ¤Ã¤¿¤¯Æ±¤¸Æ°ºî¤ò
-      ¤·¤Þ¤¹¡£</p>
-
-      <p>Àµ¤Î¥Þ¥Ã¥Á¥ó¥° (<code>=</code> ¤Þ¤¿¤Ï <code>==</code>) ¤Î¾ì¹ç¤Ï¡¢
-      Àµµ¬É½¸½¤Ç¥°¥ë¡¼¥×ʬ¤±¤µ¤ì¤¿¥Ñ¡¼¥Ä¤ò¥­¥ã¥×¥Á¥ã¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¥­¥ã¥×¥Á¥ã¤µ¤ì¤¿Éôʬ¤ÏÆüìÊÑ¿ô <code>$1</code> .. <code>$9</code>
-      ¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£</p>
-
-      <div class="example"><h3>Îã</h3><p><code>
-        &lt;!--#if expr="$QUERY_STRING = /^sid=([a-zA-Z0-9]+)/" --&gt;<br />
-        <span class="indent">
-          &lt;!--#set var="session" value="$1" --&gt;<br />
-        </span>
-        &lt;!--#endif --&gt;
-      </code></p></div>
-      </dd>
-
-      <dt><code><var>string1</var> &lt; <var>string2</var><br />
-       <var>string1</var> &lt;= <var>string2</var><br />
-       <var>string1</var> &gt; <var>string2</var><br />
-       <var>string1</var> &gt;= <var>string2</var></code></dt>
-
-      <dd><var>string1</var> ¤È <var>string2</var> ¤òÈæ³Ó¤·¤Þ¤¹¡£
-      <em>ʸ»úÎó¤È¤·¤Æ</em>Èæ³Ó¤µ¤ì¤ë (<code>strcmp(3)</code> ¤ò»ÈÍÑ)
-      ¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¤Ç¤¹¤«¤é¡¢Ê¸»úÎó "100" ¤Ï "20" 
-      ¤è¤ê¤â¾®¤µ¤¤¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</dd>
-
-      <dt><code>( <var>test_condition</var> )</code></dt>
-      <dd><var>test_condition</var> ¤¬¿¿¤Î¤È¤­¡¢¿¿</dd>
-
-      <dt><code>! <var>test_condition</var></code></dt>
-      <dd><var>test_condition</var> ¤¬µ¶¤Î¤È¤­¡¢¿¿</dd>
-
-      <dt><code><var>test_condition1</var> &amp;&amp;
-        <var>test_condition2</var></code></dt>
-      <dd><var>test_condition1</var> ¤«¤Ä
-      <var>test_condition2</var> ¤¬¿¿¤Î¤È¤­¡¢¿¿</dd>
-
-      <dt><code><var>test_condition1</var> ||
-        <var>test_condition2</var></code></dt>
-      <dd><var>test_condition1</var> ¤Þ¤¿¤Ï
-      <var>test_condition2</var> ¤¬¿¿¤Î¤È¤­¡¢¿¿</dd>
-    </dl>
-
-    <p>"<em>=</em>" ¤È "<em>!=</em>" ¤ÎÊý¤¬ "<em>&amp;&amp;</em>" ¤è¤ê
-    ¤­¤Ä¤¯Â«Çû¤·¤Þ¤¹¡£"<em>!</em>" ¤Î«Çû¤¬°ìÈÖ¤­¤Ä¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-    ¤Ç¤¹¤«¤é°Ê²¼¤ÎÆó¤Ä¤ÏÅù²Á¤Ç¤¹:</p>
-
-    <div class="example"><p><code>
-      &lt;!--#if expr="$a = test1 &amp;&amp; $b = test2" --&gt;<br />
-      &lt;!--#if expr="($a = test1) &amp;&amp; ($b = test2)" --&gt;
-    </code></p></div>
-
-    <p>¿¿µ¶ÃÍ¥ª¥Ú¥ì¡¼¥¿ <code>&amp;&amp;</code> ¤È <code>||</code>
-    ¤ÏƱ¤¸Í¥ÀèÅ٤Ǥ¹¡£
-    ¤³¤ì¤é¤Î¥ª¥Ú¥ì¡¼¥¿¤Ç°ìÊý¤Ë¤è¤ê¶¯¤¤Í¥ÀèÅÙ¤ò¤Ä¤±¤¿¤¤¾ì¹ç¤Ë¤Ï¡¢
-    ³ç¸Ì¤ò»È¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>ÊÑ¿ô¤ä¥ª¥Ú¥ì¡¼¥¿¤È¤·¤Æǧ¼±¤µ¤ì¤Ê¤¤¤â¤Î¤Ï¤¹¤Ù¤Æʸ»úÎó¤È¤·¤Æ
-    °·¤ï¤ì¤Þ¤¹¡£Ê¸»úÎó¤Ï°úÍÑÉä¤Ç°Ï¤à¤³¤È¤â¤Ç¤­¤Þ¤¹: <code>'string'</code>
-    ¤Î¤è¤¦¤Ë¡£°úÍÑÉä¤Ç°Ï¤Þ¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎó¤Ë¤Ï¶õÇò (¥¹¥Ú¡¼¥¹¤È¥¿¥Ö)
-    ¤ò´Þ¤á¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¤½¤ì¤é¤ÏÊÑ¿ô¤Ê¤É¤Î¶ç¤òʬΥ¤¹¤ë¤¿¤á¤Ë
-    »È¤ï¤ì¤Æ¤¤¤ë¤«¤é¤Ç¤¹¡£Ê£¿ô¤Îʸ»úÎó¤¬Â³¤¤¤Æ¤¤¤ë¤È¤­¤Ï¡¢
-    ¶õÇò¤ò´Ö¤ËÆþ¤ì¤Æ°ì¤Ä¤Ë¤¯¤Ã¤Ä¤±¤é¤ì¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢</p>
-
-    <div class="example"><p><code><var>string1</var>&nbsp;&nbsp;&nbsp;&nbsp;<var>string2</var></code> ¤Ï <code><var>string1</var>&nbsp;<var>string2</var></code> ¤Ë¤Ê¤ê¤Þ¤¹¡£<br />
-      <br />
-      ¤Þ¤¿¡¢<br />
-      <br />
-      <code>'<var>string1</var>&nbsp;&nbsp;&nbsp;&nbsp;<var>string2</var>'</code> ¤Ï <code><var>string1</var>&nbsp;&nbsp;&nbsp;&nbsp;<var>string2</var></code>
-      ¤Ë¤Ê¤ê¤Þ¤¹¡£</p></div>
-
-    <div class="note"><h3>¿¿µ¶ÃÍɽ¸½¤ÎºÇŬ²½</h3>
-      <p>¼°¤¬¤â¤Ã¤ÈÊ£»¨¤Ë¤Ê¤ê¡¢½èÍý¤Î®ÅÙÄã²¼¤¬¸²Ãø¤Ë¤Ê¤Ã¤¿¾ì¹ç¤Ï¡¢
-      ɾ²Á¥ë¡¼¥ë¤Ë½¾¤Ã¤ÆºÇŬ²½¤·¤Æ¤ß¤ë¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£</p>
-      <ul>
-      <li>ɾ²Á¤Ïº¸¤«¤é±¦¤Ë¸þ¤«¤Ã¤Æ¹Ô¤ï¤ì¤Þ¤¹¡£</li>
-      <li>ÆóÃÍ¿¿µ¶ÃÍ¥ª¥Ú¥ì¡¼¥¿ (<code>&amp;&amp;</code> ¤È <code>||</code>)
-          ¤Ï¡¢½ÐÍè¤ë¸Â¤êûÍíɾ²Á¤µ¤ì¤Þ¤¹¡£¤Ä¤Þ¤ê·ë²Ì¤È¤·¤Æ¾åµ­¤Î¥ë¡¼¥ë¤Ï¡¢
-          <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> ¤¬º¸¤Îɾ²Á¼°¤òɾ²Á¤·¤Þ¤¹¡£
-          º¸Â¦¤Ç·ë²Ì¤ò½½Ê¬·èÄê¤Ç¤­¤ë¾ì¹ç¤Ï¡¢É¾²Á¤Ï¤½¤³¤ÇÄä»ß¤·¤Þ¤¹¡£
-          ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï±¦Â¦¤òɾ²Á¤·¤Æ¡¢º¸¤È±¦¤ÎξÊý¤«¤é·ë²Ì¤ò·×»»¤·¤Þ¤¹¡£</li>
-      <li>ûÍíɾ²Á¤Ïɾ²Á¤ÎÂоݤËÀµµ¬É½¸½¤¬´Þ¤Þ¤ì¤ë¾ì¹ç¡¢¥ª¥Õ¤Ë¤Ê¤ê¤Þ¤¹¡£
-          ¸åÊý»²¾È¤¹¤ëÊÑ¿ô (<code>$1</code> .. <code>$9</code>) 
-          ¤òËä¤á¤ë¤¿¤á¤Ë¡¢¼ÂºÝ¤Ëɾ²Á¤¹¤ëɬÍפ¬¤¢¤ë¤«¤é¤Ç¤¹¡£</li>
-      </ul>
-      <p>ÆÃÄê¤Î¼°¤¬¤É¤Î¤è¤¦¤Ë°·¤ï¤ì¤ë¤«¤òÃΤꤿ¤¤¾ì¹ç¤Ï¡¢
-      <code>-DDEBUG_INCLUDE</code> ¥³¥ó¥Ñ¥¤¥é¥ª¥×¥·¥ç¥ó¤òÉÕ¤±¤Æ
-      <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> ¤ò¥ê¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£
-      ¤³¤ì¤Ë¤è¤ê¡¢Á´¤Æ¤Î¥Ñ¡¼¥¹¤µ¤ì¤¿¼°¤ËÂФ·¤Æ¡¢»ú¶ç²òÀϾðÊó¡¢
-      ¥Ñ¡¼¥¹¥Ä¥ê¡¼¤È¡¢
-      ¤½¤ì¤¬¤É¤Î¤è¤¦¤Ë¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤é¤ì¤¿½ÐÎϤޤÇɾ²Á¤µ¤ì¤¿¤«¤ò
-      ÁÞÆþ¤·¤Þ¤¹¡£</p>
-    </div>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SSIEndTag" id="SSIEndTag">SSIEndTag</a> <a name="ssiendtag" id="ssiendtag">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>include Í×ÁǤò½ªÎ»¤µ¤»¤ëʸ»úÎó</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>SSIEndTag <var>tag</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>SSIEndTag "--&gt;"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.0.30 °Ê¹ß¤ÇÍøÍѲÄǽ</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> ¤¬Ãµ¤¹¡¢
-    include Í×ÁǤνªÎ»¤ò¼¨¤¹Ê¸»úÎó¤òÊѹ¹¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      SSIEndTag "%&gt;"
-    </code></p></div>
-
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#ssistarttag">SSIStartTag</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SSIErrorMsg" id="SSIErrorMsg">SSIErrorMsg</a> <a name="ssierrormsg" id="ssierrormsg">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>SSI ¤Î¥¨¥é¡¼¤¬¤¢¤Ã¤¿¤È¤­¤Ëɽ¼¨¤µ¤ì¤ë¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>SSIErrorMsg <var>message</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>SSIErrorMsg "[an error occurred while processing this
-directive]"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>¥Ð¡¼¥¸¥ç¥ó 2.0.30 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p><code class="directive">SSIErrorMsg</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
-    ¤¬¥¨¥é¡¼¤¬µ¯¤³¤Ã¤¿¤È¤­¤Ëɽ¼¨¤¹¤ë¥á¥Ã¥»¡¼¥¸¤òÊѹ¹¤·¤Þ¤¹¡£¥×¥í¥À¥¯¥·¥ç¥ó¥µ¡¼¥Ð¤Ç¤Ï
-    ¥á¥Ã¥»¡¼¥¸¤¬¥æ¡¼¥¶¤Ëɽ¼¨¤µ¤ì¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë
-    ¥Ç¥Õ¥©¥ë¥È¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤ò <code>"&lt;!-- Error --&gt;"</code>
-    ¤ËÊѤ¨¤ë¤È¤¤¤¦¤è¤¦¤Ê¤³¤È¤ò¹Í¤¨¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code>&lt;!--#config
-    errmsg=<var>message</var> --&gt;</code> Í×ÁǤÈƱ¤¸¸ú²Ì¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      SSIErrorMsg "&lt;!-- Error --&gt;"
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SSIStartTag" id="SSIStartTag">SSIStartTag</a> <a name="ssistarttag" id="ssistarttag">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>include Í×ÁǤò³«»Ï¤¹¤ëʸ»úÎó</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>SSIStartTag <var>tag</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>SSIStartTag "&lt;!--#"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>¥Ð¡¼¥¸¥ç¥ó 2.0.30 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> ¤¬Ãµ¤¹¡¢include
-    Í×ÁǤγ«»Ï¤ò¼¨¤¹Ê¸»úÎó¤òÊѹ¹¤·¤Þ¤¹¡£</p>
-
-    <p>Æó¤Ä¤Î¥µ¡¼¥Ð¤Ç (¤â¤·¤«¤¹¤ë¤ÈÊÌ¡¹¤ÎÃʳ¬¤Ç) ¥Õ¥¡¥¤¥ë¤Î½ÐÎϤò²òÀϤ·¤Æ¤¤¤Æ¡¢
-    ¤½¤ì¤¾¤ì¤Ë°ã¤¦¥³¥Þ¥ó¥É¤ò½èÍý¤µ¤»¤¿¤¤¡¢
-    ¤È¤¤¤¦¤è¤¦¤Ê¤È¤­¤Ë¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»È¤¤¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      SSIStartTag "&lt;%"<br />
-      SSIEndTag   "%&gt;"
-    </code></p></div>
-
-    <p>¾å¤ÎÎã¤Î¤è¤¦¤ËÂбþ¤¹¤ë
-    <code class="directive"><a href="#ssiendtag">SSIEndTag</a></code> ¤òÊ»¤»¤Æ»È¤¦¤È¡¢
-    ²¼¤Ë¼¨¤¹Îã¤Î¤è¤¦¤Ë SSI ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¨¤Þ¤¹:</p>
-
-    <div class="example"><h3>°ã¤¦³«»Ï¤È½ªÎ»¤Î¥¿¥°¤ò»È¤Ã¤¿ SSI ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3><p><code>
-      &lt;%printenv %&gt;
-    </code></p></div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#ssiendtag">SSIEndTag</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SSITimeFormat" id="SSITimeFormat">SSITimeFormat</a> <a name="ssitimeformat" id="ssitimeformat">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ÆüÉÕ¤±¤ò¸½¤¹Ê¸»úÎó¤Î½ñ¼°¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>SSITimeFormat <var>formatstring</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>SSITimeFormat "%A, %d-%b-%Y %H:%M:%S %Z"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.0.30 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-<p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code>DATE</code> ´Ä¶­ÊÑ¿ô¤ò echo ¤·¤ÆÆüÉÕ¤ò¸½¤¹Ê¸»úÎó¤¬
-    ɽ¼¨¤µ¤ì¤ë¤È¤­¤Î½ñ¼°¤òÊѹ¹¤·¤Þ¤¹¡£<var>formatstring</var> ¤Ï
-    C ɸ½à¥é¥¤¥Ö¥é¥ê¤Î <code>strftime(3)</code> ¤ÈƱ¤¸·Á¼°¤Ç¤¹¡£</p>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code>&lt;!--#config
-    timefmt=<var>formatstring</var> --&gt;</code> Í×ÁǤÈƱ¤¸¸ú²Ì¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      SSITimeFormat "%R, %B %d, %Y"
-    </code></p></div>
-
-    <p>¾å¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤Ï¡¢ÆüÉÕ¤Ï "22:26, June 14, 2002" ¤È¤¤¤¦
-    ·Á¼°¤Çɽ¼¨¤µ¤ì¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SSIUndefinedEcho" id="SSIUndefinedEcho">SSIUndefinedEcho</a> <a name="ssiundefinedecho" id="ssiundefinedecho">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>̤ÄêµÁ¤ÎÊÑ¿ô¤¬ echo ¤µ¤ì¤¿¤È¤­¤Ëɽ¼¨¤µ¤ì¤ëʸ»úÎó</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>SSIUndefinedEcho <var>string</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>SSIUndefinedEcho "(none)"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_include</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.0.34 °Ê¹ß¤ÇÍøÍѲÄǽ</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÊÑ¿ô¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¤Ë¤â´Ø¤ï¤é¤º
-    "echo" ¤µ¤ì¤¿¤È¤­¤Ë <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
-    ¤¬É½¼¨¤¹¤ëʸ»úÎó¤òÊѹ¹¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      SSIUndefinedEcho "&lt;!-- undef --&gt;"
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="XBitHack" id="XBitHack">XBitHack</a> <a name="xbithack" id="xbithack">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¼Â¹Ô¥Ó¥Ã¥È¤¬ÀßÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤Î SSI ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-²òÀϤ¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>XBitHack on|off|full</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>XBitHack off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Options</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_include</td></tr>
-</table>
-    <p><code class="directive">XBitHack</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÄ̾ï¤Î HTML
-    ¥É¥­¥å¥á¥ó¥È¤Î²òÀϤòÀ©¸æ¤·¤Þ¤¹¡£¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï MIME ¥¿¥¤¥×
-    <code>text/html</code> ¤È´ØÏ¢ÉÕ¤±¤é¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Ë¤Î¤ß±Æ¶Á¤·¤Þ¤¹¡£
-    <code class="directive">XBitHack</code> ¤Ï°Ê²¼¤ÎÃͤò¤È¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <dl>
-      <dt><code>off</code></dt>
-      <dd>¼Â¹Ô²Äǽ¥Õ¥¡¥¤¥ë¤ËÂФ·¤ÆÆÃÊ̤ʰ·¤¤¤ò¤·¤Þ¤»¤ó¡£</dd>
-
-      <dt><code>on</code></dt>
-      <dd>¥æ¡¼¥¶¤Î¼Â¹Ô¥Ó¥Ã¥È¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë <code>text/html</code>
-      ¥Õ¥¡¥¤¥ë¤ÏÁ´¤Æ¥µ¡¼¥Ð¤Ç²òÀϤ¹¤ë html ¥É¥­¥å¥á¥ó¥È¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£</dd>
-
-      <dt><code>full</code></dt>
-      <dd><code>on</code> ¤ÈƱÍͤǤ¹¤¬¡¢¥°¥ë¡¼¥×¼Â¹Ô¥Ó¥Ã¥È¤â¥Æ¥¹¥È¤·¤Þ¤¹¡£
-      ¤â¤·¤½¤ì¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢ÊÖ¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤Î <code>Last-modified</code> ¤Î
-      ÆüÉÕ¤ò¥Õ¥¡¥¤¥ë¤ÎºÇ½ª½¤Àµ»þ¹ï¤Ë¤·¤Þ¤¹¡£¤½¤ì¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Ï¡¢
-      last-modified ¤ÎÆüÉÕ¤ÏÁ÷¤é¤ì¤Þ¤»¤ó¡£¤³¤Î¥Ó¥Ã¥È¤òÀßÄꤹ¤ë¤È¡¢
-      ¥¯¥é¥¤¥¢¥ó¥È¤ä¥×¥í¥­¥·¤¬¥ê¥¯¥¨¥¹¥È¤ò¥­¥ã¥Ã¥·¥å¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-
-      <div class="note"><strong>Ãí°Õ</strong> ¾¤Î CGI ¤ò <code>#include</code>
-      ¤¹¤ë¤«¤â¤·¤ì¤Ê¤¤¤â¤Î¤ä¡¢³Æ¥¢¥¯¥»¥¹¤ËÂФ·¤Æ°ã¤¦½ÐÎϤòÀ¸À®¤¹¤ë
-      (¤â¤·¤¯¤Ï¸å¤Î¥ê¥¯¥¨¥¹¥È¤ÇÊѤï¤ë¤«¤â¤·¤ì¤Ê¤¤¤â¤Î)
-      ¤¹¤Ù¤Æ¤Î SSI ¥¹¥¯¥ê¥×¥È¤ËÂФ·¤Æ¥°¥ë¡¼¥×¼Â¹Ô¥Ó¥Ã¥È¤¬
-      ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢full ¤Ï»È¤ï¤Ê¤¤Êý¤¬Îɤ¤
-      ¤Ç¤·¤ç¤¦¡£</div>
-      </dd>
-    </dl>
-
-    
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_include.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_include.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_include.html.ja.utf8 b/docs/manual/mod/mod_include.html.ja.utf8
new file mode 100644
index 00000000..a74e0474
--- /dev/null
+++ b/docs/manual/mod/mod_include.html.ja.utf8
@@ -0,0 +1,791 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_include - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_include</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_include.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_include.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>サー��パース�る html ドキュメント (Server Side Includes)</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>include_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_include.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0 �ら出力フィルタ���実装�れ���。</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール�ファイル�クライアント��られる��処��るフィルタを
+    �供���。処��内容�<dfn>�素</dfn>�呼�れる特別�形�� SGML コメント�より
+    制御�れ��。�れら��素��件分�や�他�ファイルや
+    プログラム�出力��り込��環境変数�設定や表示を行�����
+    ����。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#ssiendtag">SSIEndTag</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ssierrormsg">SSIErrorMsg</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ssistarttag">SSIStartTag</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ssitimeformat">SSITimeFormat</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ssiundefinedecho">SSIUndefinedEcho</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#xbithack">XBitHack</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#enabling">Server-Side Includes を有効��る</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#pathinfo">サー�サイドインクルード (SSI) �� PATH_INFO</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#elements">基本�素</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#includevars">Include 変数</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#substitution">変数置�</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#flowctrl">フロー制御�素</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code></li>
+<li><a href="../filter.html">フィルタ</a></li>
+<li><a href="../howto/ssi.html">SSI �ュートリアル</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="enabling" id="enabling">Server-Side Includes を有効��る</a></h2>
+    
+
+    <p>Server Side Includes � <code>INCLUDES</code>
+    <a href="../filter.html">フィルタ</a> �より実装�れ����。
+    Server-side include �ディレクティブを�むドキュメント�拡張��
+    .shtml �場��以下�ディレクティブ�� Apache ��れらを
+    パース������果��るドキュメント� <code>text/html</code> �
+    MIME タイプを割り当���:</p>
+
+    <div class="example"><p><code>
+      AddType text/html .shtml<br />
+      AddOutputFilter INCLUDES .shtml
+    </code></p></div>
+
+    <p>以下�ディレクティブ� shtml ファイル��るディレクトリ�指定�れ��る
+    必���り�� (通常� <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> セクション�指定�����
+    <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> <code>Options</code>
+    �設定�れ��る��<code>.htaccess</code> ファイル�書���も����):</p>
+
+    <div class="example"><p><code>
+      Options +Includes
+    </code></p></div>
+
+    <p>互�性を������<code>server-parsed</code>
+    <a href="../handler.html">�ンドラ</a> も INCLUDES フィルタを
+    有効����。MIME タイプ <code>text/x-server-parsed-html</code> や
+    <code>text/x-server-parsed-html3</code> �ドキュメント�対��も
+    Apache � INCLUDES フィルタを有効���� (出力�れるも��
+    MIME タイプ <code>text/html</code> ��り��)。</p>
+
+    <p>詳��情報� <a href="../howto/ssi.html">Server Side Includes �ュートリアル</a>を�照������。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="pathinfo" id="pathinfo">サー�サイドインクルード (SSI) �� PATH_INFO</a></h2>
+    
+
+    <p>SSI �処��れるファイル�デフォルト�� <code>PATH_INFO</code>
+    (後続�パス�情報)
+    付��リクエストを��入れ���り���。<code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code> ディレクティブ�
+    <code>PATH_INFO</code> 付��リクエストを��入れるよ��サー�を
+    設定����。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="elements" id="elements">基本�素</a></h2>
+    <p>ドキュメント��SGML �コメント���特別�コマンド�埋�込�れ�
+    HTML ドキュメント���パース�れ��。コマンド�構文�次�よ��
+    ������:</p>
+
+    <div class="example"><p><code>
+      &lt;!--#<var>element</var> <var>attribute</var>=<var>value</var>
+      <var>attribute</var>=<var>value</var> ... --&gt;
+    </code></p></div>
+
+    <p>値 (訳注: value) �二�引用符�囲む��一般的����
+    シングルクオート (') ��ッククオート (`) も使用����。
+    多��コマンド�属性-値 (訳注: attribute-value) �組を一���指定����。
+    コメント�終�り (<code>--&gt;</code>)
+    �����SSI ���一部��解釈�れ��よ���る���空白を
+    入れ�����。最�� <code>&lt;!--#</code> �����<em>一�</em>�
+    ���空白を��ん��������注�������。</p>
+
+    <p>�素 (訳注: element) を以下�表�示���。</p>
+
+    <table class="bordered">
+    <tr><th>�素</th><th>説明</th></tr>
+    <tr><td><code><a href="#element.config">config</a></code></td>
+        <td>configure output formats</td></tr>
+    <tr><td><code><a href="#element.echo">echo</a></code></td>
+        <td>print variables</td></tr>
+    <tr><td><code><a href="#element.exec">exec</a></code></td>
+        <td>execute external programs</td></tr>
+    <tr><td><code><a href="#element.fsize">fsize</a></code></td>
+        <td>print size of a file</td></tr>
+    <tr><td><code><a href="#element.flastmod">flastmod</a></code></td>
+        <td>print last modification time of a file</td></tr>
+    <tr><td><code><a href="#element.include">include</a></code></td>
+        <td>include a file</td></tr>
+    <tr><td><code><a href="#element.printenv">printenv</a></code></td>
+        <td>print all available variables</td></tr>
+    <tr><td><code><a href="#element.set">set</a></code></td>
+        <td>set a value of a variable</td></tr>
+    </table>
+
+    <p>SSI �素� <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> 以外�モジュール�
+    定義�れる��も�り��。実際�
+    <code><a href="#element.exec">exec</a></code> �素�
+    <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> ��供�れ������モジュール�
+    ロード�れる場����利用�能��り��。</p>
+
+    <h3><a name="element.config" id="element.config">config �素</a></h3>
+      <p>次�コマンド�解��様々���を制御���。属性�次�通り��。</p>
+
+      <dl>
+      <dt><code>echomsg</code> (<em>Apache 2.1 以�</em>)</dt>
+      <dd>指定�れる値��<code><a href="#element.echo">echo</a></code>
+      �素�未定義�変数をエコー�よ����際��
+      クライアント��られるメッセージ��り��。
+      <code class="directive"><a href="#ssiundefinedecho">SSIUndefinedEcho</a></code> 
+      ディレクティブを上書����。</dd>
+
+      <dt><code>errmsg</code></dt>
+      <dd>��値��ドキュメント�解�中�エラー�発生��時�
+      クライアント��信�れるメッセージ��り��。
+      <code class="directive"><a href="#ssierrormsg">SSIErrorMsg</a></code>
+      ディレクティブを上書����。</dd>
+
+      <dt><code>sizefmt</code></dt>
+      <dd>��値��ファイル�サイズを表示�る際�使用�る
+      フォーマットを設定���。値� �イトカウント�
+      <code>bytes</code>��Kb や Mb を優先的�使用�る
+      <code>abbrec</code> (例�� 1024 �イト� "1K" �表示�れ��)
+      ��。</dd>
+
+      <dt><code>timefmt</code></dt>
+      <dd>��値� <code>strftime(3)</code> ライブラリルー�ン�
+      日時をプリント�る際�用�られ��。</dd>
+      </dl>
+     
+
+    <h3><a name="element.echo" id="element.echo">echo �素</a></h3>
+      <p>��コマンド�以下�定義�れ��る <a href="#includevars">include
+      変数</a> を表示���。変数�設定�れ����場�� <code class="directive"><a href="#ssiundefinedecho">SSIUndefinedEcho</a></code> ディレクティブ�
+      決定�れる�果��り��。日付���時点�� <code>timefmt</code> �従��
+      表示�れ��。属性�次�通り��。</p>
+
+      <dl>
+      <dt><code>var</code></dt>
+      <dd>値�表示�る変数�����。</dd>
+
+      <dt><code>encoding</code></dt>
+      <dd><p>変数を出力�る���変数中�特別文字を��よ��エンコード�る�を
+      指定���。<code>none</code> �設定�れ��る��エンコード�行��れ��ん。
+      <code>url</code> �設定�れ��る��URL エンコード (%-エンコード�も
+      呼�れ����。�れ�リンク等� URL �使用��切��) �
+      行��れ��。<code>echo</code> �素�開始時��デフォルト�
+      <code>entity</code> �設定�れ����。�れ�エンティティエンコード
+      (段�やテキスト���ブロックレベル� HTML エレメント�コンテキスト�
+      ������) を行����。�れ� <code>encoding</code> 属性
+      を加�る���変更����。変更�次� <code>encoding</code> 属性��
+      �素�終了��効力を����。</p>
+
+      <p><code>encoding</code> 属性�エンコード�変更を��� <code>var</code> 
+      �<em>��</em> �る必���る���注�������。
+      ���ISO-8859-1 エンコーディング�
+      定義�れ��る特別�文字���エンコード�れ��。
+      別�文字�エンコーディング�場�����エンコーディング�
+      望���果��ら���も�れ��ん。</p>
+
+      <div class="warning">
+        クロスサイトスクリプティング��題を��る����
+        <em>常�</em>ユーザ�ら�データをエンコード�����。
+      </div>
+      </dd>
+      </dl>
+     
+
+    <h3><a name="element.exec" id="element.exec">exec �素</a></h3>
+      <p><code>exec</code> コマンド�指定�れ�シェルコマンドや CGI スクリプトを
+      実行���。<code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> �サー��組�込�れ��る���れ�
+      �り��ん。<code class="directive"><a href="../mod/core.html#options">Options</a></code> 
+      <code>IncludesNOEXEC</code> ���コマンドを無効����。
+      使用�能�属性�次�通り��。</p>
+
+      <dl>
+      <dt><code>cgi</code></dt>
+      <dd><p>値� (%-エンコード�れ�) URL を指定���。パス�
+      スラッシュ (/) �始�ら������ドキュメント�ら�
+      相対パス���扱�れ��。��パス��照�れ��るドキュメント�
+      サー�� CGI スクリプト���扱������も CGI スクリプト���
+      起動�れ��。����スクリプト��るディレクトリ��
+      (<code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code>
+      ã‚„ <code class="directive"><a href="../mod/core.html#options">Options</a></code> <code>ExecCGI</code>
+      �よ��) CGI スクリプト�使用�許��れ��る必���り��。</p>
+
+      <p>CGI スクリプト���クライアント�ら�元々�リクエスト�
+      <code>PATH_INFO</code> �クエリー文字列 (<code>QUERY_STRING</code>) �渡�れ��。
+      �れら� URL パス���特定<em>����</em>も���。
+      スクリプト�標準 <a href="mod_cgi.html">CGI</a> 環境�加���include 変数を
+      使用�る�������。</p>
+
+      <div class="example"><h3>例</h3><p><code>
+        &lt;!--#exec cgi="/cgi-bin/example.cgi" --&gt;
+      </code></p></div>
+
+      <p>スクリプト��出力�代�り� <code>Location:</code> ヘッダを返���
+      HTML �アンカー (訳注：リンク) �変��れ��。</p>
+
+      <p><code>exec cgi</code> よりも�
+      <code><a href="#includevirtual">include virtual</a></code>
+      �方を使�よ��������。特��CGI ��追加�引数を
+      クエリー文字列を使��渡���� <code>exec cgi</code> �
+      ����ん��<code>include virtual</code> �以下�よ����
+      �能��。</p>
+
+      <div class="example"><p><code>
+        &lt;!--#include virtual="/cgi-bin/example.cgi?argument=value" --&gt;
+      </code></p></div>
+      </dd>
+
+      <dt><code>cmd</code></dt>
+      <dd><p>サー��指定�れ�文字列を <code>/bin/sh</code> を使��
+      実行���。コマンド�通常� CGI 変数�加�� <a href="#includevars">include 変数</a>も使��������。</p>
+
+      <p>��ん��場��<code><a href="#includevirtual">#include 
+      virtual</a></code> を使�方� <code>#exec cgi</code> や <code>#exec
+      cmd</code> を使�よりも良���。�者 (<code>#include virtual</code>)
+      �標準� Apache �サブリクエスト機構を使��ファイルやスクリプト�
+      出力を�り込���。
+      ��ら�方�よ�テスト�れメンテナンス�れ�方法��。</p>
+
+      <p>�ら��Win32 �よ�������プラットフォームや�<a href="../suexec.html">suexec</a> を使���る unix ���
+      <code>exec</code> ディレクティブ�コマンド�
+      引数を渡��り�コマンド�空白を入れる�������ん。
+      ���ら�以下�も�� unix � suexec ���設定��動作�����
+      Win32 や suexec を使���る unix ��期待���果���り��ん:</p>
+
+      <div class="example"><p><code>
+        &lt;!--#exec cmd="perl /path/to/perlscript arg1 arg2" --&gt;
+      </code></p></div>
+      </dd>
+      </dl>
+     
+
+    <h3><a name="element.fsize" id="element.fsize">fsize �素</a></h3>
+      <p>��コマンド�指定�れ�ファイル�大��を <code>sizefmt</code> �
+      書�指定�基���出力���。属性�次�通り��。</p>
+
+      <dl>
+      <dt><code>file</code></dt>
+      <dd>値�解��れ��るドキュメント�存在�るディレクトリ�ら�
+      相対パス��。</dd>
+
+      <dt><code>virtual</code></dt>
+      <dd> 値� (% エンコード�れ�) URL-path ��。スラッシュ (/) �
+      始�ら�����ドキュメント�ら�相対パス���扱�れ��。
+      CGI �出力�サイズ�プリント<em>�れ��ん</em>。CGI
+      スクリプト自体�サイズ�プリント�れる���注�������。</dd>
+      </dl>
+     
+
+    <h3><a name="element.flastmod" id="element.flastmod">flastmod �素</a></h3>
+      <p>��コマンド�指定�れ�ファイル�最終修正時刻を
+      <code>timefmt</code> 書�指定�従��表示���。
+      指定�能�属性� <code>fsize</code> コマンド�����。</p>
+     
+
+    <h3><a name="element.include" id="element.include">include �素</a></h3>
+      <p>��コマンド�別�文書やファイル�テキストを解����るファイル�
+      挿入���。挿入�れるファイル�アクセス制御�管�下��り��。
+      解����るファイル�存在�るディレクトリ�
+      <a href="core.html#options">Options</a> <code>IncludesNOEXEC</code>
+      �設定�れ��る場��text MIME タイプ (<code>text/plain</code>,
+      <code>text/html</code> 等) �ドキュメント��インクルード�行��れ��。
+      ��他�場���クエリー文字列も���コマンド�指定�れ�
+      完全� URL を使��普通� CGI スクリプト�呼�出�れ��。</p>
+
+      <p>属性�文書��置を指定���。include コマンド�与�られ��れ�れ�
+      属性�対��挿入作業�行��れ��。有効�属性�次�通り��。</p>
+
+      <dl>
+      <dt><code>file</code></dt>
+      <dd>値�解��れ��るドキュメント�存在�るディレクトリ�ら�
+      相対パス��。
+      <code>../</code> を�ん���り�絶対パスを指定��り�����ん。
+      ���ら�ドキュメントルート�外��るファイルや�ディレクトリ構造�
+      上���るファイルを挿入�る�������ん。
+      常���属性より��<code>virtual</code> 属性を使�よ��������。
+      </dd>
+
+      <dt><code><a id="includevirtual" name="includevirtual">virtual</a></code></dt>
+      <dd><p>値�解��れ��るドキュメント�ら� (% エンコード�れ�) URL
+      ��。URL ��スキームやホスト�を��る�������ん。パス��
+      も��れ�クエリー文字列を指定��る����。スラッシュ (/) �ら
+      始�ら��場���ドキュメント�ら�相対パス���扱�れ��。</p>
+
+      <p>URL �属性�ら作られ��� URL をクライアント�アクセス�����
+      出力�れる内容�解�後�出力���られ��。���ら�挿入�れる
+      ファイル�入れ�構造��る�������。</p>
+
+      <p>指定�れ� URL � CGI プログラム����場���
+      プログラム�実行�れ���出力�解����るファイル中�
+      ディレクティブ�����置�挿入�れ��。CGI � url �
+      クエリー URL を入れる��も����。</p>
+
+      <div class="example"><p><code>
+        &lt;!--#include virtual="/cgi-bin/example.cgi?argument=value" --&gt;
+      </code></p></div>
+
+      <p>HTML ドキュメント� CGI プログラム�出力を��る方法�����
+      <code>include virtual</code> �方� <code>exec cgi</code> よりも
+      好���方法��。</p>
+      </dd>
+      </dl>
+     
+
+    <h3><a name="element.printenv" id="element.printenv">printenv �素</a></h3>
+      <p>�れ��存在�る����変数���値を表示���。Apache 1.3.12 �ら�
+      特別�文字�出力�れる��エンティティエンコード (詳細� <a href="#element.echo"><code>echo</code></a> �素を�照)
+      �れるよ���り���。属性��り��ん。</p>
+
+      <div class="example"><h3>例</h3><p><code>
+        &lt;!--#printenv --&gt;
+      </code></p></div>
+     
+
+    <h3><a name="element.set" id="element.set">set �素</a></h3>
+      <p>�れ�変数�値を設定���。属性�次�通り��。</p>
+
+      <dl>
+      <dt><code>var</code></dt>
+      <dd>設定�る変数���。</dd>
+
+      <dt><code>value</code></dt>      
+      <dd>変数�設定�る値。</dd>
+      </dl>
+
+      <div class="example"><h3>例</h3><p><code>
+        &lt;!--#set var="category" value="help" --&gt;
+      </code></p></div>
+     
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="includevars" id="includevars">Include 変数</a></h2>
+    
+
+    <p>標準 CGI 環境�変数�加���<code>echo</code> コマンドや�
+    <code>if</code> や <code>elif</code>, �れ�ドキュメント�ら呼�出�れる
+    ����プログラム�ら使用��る変数��り��。</p>
+
+    <dl>
+      <dt><code>DATE_GMT</code></dt>
+      <dd>グリニッジ標準時�よる�在時刻。</dd>
+
+      <dt><code>DATE_LOCAL</code></dt>
+      <dd>ローカル�標準時�よる�在時刻。</dd>
+
+      <dt><code>DOCUMENT_NAME</code></dt>
+      <dd>ユーザ�リクエスト�� (ディレクトリを除��) ファイル�。</dd>
+
+      <dt><code>DOCUMENT_URI</code></dt>
+      <dd>ユーザ�リクエスト�� (% エンコード�れ�) URL-path。
+      挿入ファイル�入れ������る場���解��れ��る
+     ドキュメント� URL ��<em>��</em>���注�������。</dd>
+
+      <dt><code>LAST_MODIFIED</code></dt>
+      <dd>ユーザ�リクエスト��ドキュメント�最終修正時刻。</dd>
+
+      <dt><code>QUERY_STRING_UNESCAPED</code></dt>
+      <dd>クエリー文字列��る場����変数�� (%-デコード�れ�)
+      クエリー文字列�代入�れ����shell �使用��るよ��
+      <em>エスケープ</em>�れ���� (<code>&amp;</code>
+      ����特殊文字���ックスラッシュ�直��置�れ��)。</dd>
+    </dl>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="substitution" id="substitution">変数置�</a></h2>
+
+    <p>変数置�������場� SSI ディレクティブ�引数���妥当�場所��る
+    引用符�囲�れ�文字列中�行��れ��。�れ�該当�るも����
+    <code>config</code>,
+    <code>exec</code>, <code>flastmod</code>, <code>fsize</code>,
+    <code>include</code>, <code>echo</code>, <code>set</code> �
+    �ディレクティブ���件分�用�オペレータ��引数��り��。
+    ドル記���ックスラッシュを使����使��������:</p>
+
+    <div class="example"><p><code>
+      &lt;!--#if expr="$a = \$test" --&gt;
+    </code></p></div>
+
+    <p>変数�������れる文字列�中�変数���照を置��る必���る����
+    シェル��変数置��よ���中括弧�括る���区別�る�������:</p>
+
+    <div class="example"><p><code>
+      &lt;!--#set var="Zed" value="${REMOTE_HOST}_${REQUEST_METHOD}" --&gt;
+    </code></p></div>
+
+    <p>��例���<code>REMOTE_HOST</code> �
+    "<code>X</code>" � <code>REQUEST_METHOD</code> �
+    "<code>Y</code>" ����変数 <code>Zed</code> を "<code>X_Y</code>"
+    �設定���。</p>
+
+    <p>以下�例���<code>DOCUMENT_URI</code> � <code>/foo/file.html</code>
+    ���� "in foo" を�<code>/bar/file.html</code> ���� "in bar" を�
+    ��ら�も������ "in neither" を表示���。</p>
+
+    <div class="example"><p><code>
+      &lt;!--#if expr='"$DOCUMENT_URI" = "/foo/file.html"' --&gt;<br />
+      <span class="indent">
+        in foo<br />
+      </span>
+      &lt;!--#elif expr='"$DOCUMENT_URI" = "/bar/file.html"' --&gt;<br />
+      <span class="indent">
+        in bar<br />
+      </span>
+      &lt;!--#else --&gt;<br />
+      <span class="indent">
+        in neither<br />
+      </span>
+      &lt;!--#endif --&gt;
+    </code></p></div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="flowctrl" id="flowctrl">フロー制御�素</a></h2>
+    
+
+    <p>基本的�フローコントロール�素�次�通り��。</p>
+
+    <div class="example"><p><code>
+      &lt;!--#if expr="<var>test_condition</var>" --&gt;<br />
+      &lt;!--#elif expr="<var>test_condition</var>" --&gt;<br />
+      &lt;!--#else --&gt;<br />
+      &lt;!--#endif --&gt;
+    </code></p></div>
+
+    <p><code>if</code> �素�プログラミング言語�
+    if 文���よ��動作���。�件�評価�れ��果�真��れ�次�
+    <code>elif</code> � <code>else</code> � <code>endif</code>
+    �素���文字列�出力�挿入�れ��。</p>
+
+    <p><code>elif</code> や <code>else</code> 文� <var>test_condition</var> 
+    ������テキストを出力�挿入�る���使�れ��。
+    �れら��素����も���も構���ん。</p>
+
+    <p><code>endif</code> �素� <code>if</code>
+    �素を終了����。���素�必須��。</p>
+
+    <p><var>test_condition</var> �以下��れ���:</p>
+
+    <dl>
+      <dt><code><var>string</var></code></dt>
+      <dd><var>string</var> �空���場��真��</dd>
+
+      <dt><code><var>string1</var> = <var>string2</var><br />
+      <var>string1</var> == <var>string2</var><br />
+      <var>string1</var> != <var>string2</var></code></dt>
+
+      <dd><p><var>string1</var> � <var>string2</var> を比較���。
+      <var>string2</var> � <code>/<var>string</var>/</code>
+      ���形���れ��正�表����比較�れ��。正�表��
+      <a href="http://www.pcre.org">PCRE</a> エンジン�実装�れ����
+      <a href="http://www.perl.com">perl 5</a> ���構文を使用���。
+      <code>==</code> ��� <code>=</code> �別���������動作を
+      ���。</p>
+
+      <p>正�マッ�ング (<code>=</code> ��� <code>==</code>) �場���
+      正�表��グループ分��れ�パーツをキャプ�ャ�る�������。
+      キャプ�ャ�れ�部分�特殊変数 <code>$1</code> .. <code>$9</code>
+      �格��れ��。</p>
+
+      <div class="example"><h3>例</h3><p><code>
+        &lt;!--#if expr="$QUERY_STRING = /^sid=([a-zA-Z0-9]+)/" --&gt;<br />
+        <span class="indent">
+          &lt;!--#set var="session" value="$1" --&gt;<br />
+        </span>
+        &lt;!--#endif --&gt;
+      </code></p></div>
+      </dd>
+
+      <dt><code><var>string1</var> &lt; <var>string2</var><br />
+       <var>string1</var> &lt;= <var>string2</var><br />
+       <var>string1</var> &gt; <var>string2</var><br />
+       <var>string1</var> &gt;= <var>string2</var></code></dt>
+
+      <dd><var>string1</var> � <var>string2</var> を比較���。
+      <em>文字列���</em>比較�れる (<code>strcmp(3)</code> を使用)
+      ���注�������。���ら�文字列 "100" � "20" 
+      よりも�������り��。</dd>
+
+      <dt><code>( <var>test_condition</var> )</code></dt>
+      <dd><var>test_condition</var> �真����真</dd>
+
+      <dt><code>! <var>test_condition</var></code></dt>
+      <dd><var>test_condition</var> ������真</dd>
+
+      <dt><code><var>test_condition1</var> &amp;&amp;
+        <var>test_condition2</var></code></dt>
+      <dd><var>test_condition1</var> ��
+      <var>test_condition2</var> �真����真</dd>
+
+      <dt><code><var>test_condition1</var> ||
+        <var>test_condition2</var></code></dt>
+      <dd><var>test_condition1</var> ���
+      <var>test_condition2</var> �真����真</dd>
+    </dl>
+
+    <p>"<em>=</em>" � "<em>!=</em>" �方� "<em>&amp;&amp;</em>" より
+    ����縛���。"<em>!</em>" ��縛�一番���������。
+    ���ら以下�二��等価��:</p>
+
+    <div class="example"><p><code>
+      &lt;!--#if expr="$a = test1 &amp;&amp; $b = test2" --&gt;<br />
+      &lt;!--#if expr="($a = test1) &amp;&amp; ($b = test2)" --&gt;
+    </code></p></div>
+
+    <p>真�値オペレータ <code>&amp;&amp;</code> � <code>||</code>
+    ���優先度��。
+    �れら�オペレータ�一方�より強�優先度を����場����
+    括弧を使�必���り��。</p>
+
+    <p>変数やオペレータ����識�れ��も�����文字列���
+    扱�れ��。文字列�引用符�囲む��も����: <code>'string'</code>
+    �よ��。引用符�囲�れ����文字列��空白 (スペース�タブ)
+    を��る�������ん。�れら�変数����を分離�る���
+    使�れ��る�ら��。複数�文字列�続���る����
+    空白を間�入れ�一������られ��。���ら�</p>
+
+    <div class="example"><p><code><var>string1</var>&nbsp;&nbsp;&nbsp;&nbsp;<var>string2</var></code> � <code><var>string1</var>&nbsp;<var>string2</var></code> ��り��。<br />
+      <br />
+      ���<br />
+      <br />
+      <code>'<var>string1</var>&nbsp;&nbsp;&nbsp;&nbsp;<var>string2</var>'</code> � <code><var>string1</var>&nbsp;&nbsp;&nbsp;&nbsp;<var>string2</var></code>
+      ��り��。</p></div>
+
+    <div class="note"><h3>真�値表��最�化</h3>
+      <p>��も��複雑��り�処��速度低下�顕著����場���
+      評価ルール�従��最�化���る�良���ょ�。</p>
+      <ul>
+      <li>評価�左�ら������行�れ��。</li>
+      <li>二値真�値オペレータ (<code>&amp;&amp;</code> � <code>||</code>)
+          ��出�る�り短絡評価�れ��。��り�果���上記�ルール��
+          <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> �左�評価�を評価���。
+          左���果を�分決定��る場���評価�����止���。
+          �����場����を評価���左���両方�ら�果を計算���。</li>
+      <li>短絡評価�評価�対象�正�表����れる場��オフ��り��。
+          後方�照�る変数 (<code>$1</code> .. <code>$9</code>) 
+          を埋�る����実際�評価�る必���る�ら��。</li>
+      </ul>
+      <p>特定�����よ��扱�れる�を知り��場���
+      <code>-DDEBUG_INCLUDE</code> コンパイラオプションを付��
+      <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> をリコンパイル�る�良���ょ�。
+      �れ�より�全��パース�れ���対���字�解�情報�
+      パースツリー��
+      �れ���よ��クライアント��られ�出力��評価�れ��を
+      挿入���。</p>
+    </div>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSIEndTag" id="SSIEndTag">SSIEndTag</a> <a name="ssiendtag" id="ssiendtag">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>include �素を終了��る文字列</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSIEndTag <var>tag</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSIEndTag "--&gt;"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.0.30 以��利用�能</td></tr>
+</table>
+    <p>��ディレクティブ� <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> �探��
+    include �素�終了を示�文字列を変更���。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      SSIEndTag "%&gt;"
+    </code></p></div>
+
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#ssistarttag">SSIStartTag</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSIErrorMsg" id="SSIErrorMsg">SSIErrorMsg</a> <a name="ssierrormsg" id="ssierrormsg">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>SSI �エラー�������表示�れるエラーメッセージ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSIErrorMsg <var>message</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSIErrorMsg "[an error occurred while processing this
+directive]"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>�ージョン 2.0.30 以��使用�能</td></tr>
+</table>
+    <p><code class="directive">SSIErrorMsg</code> ディレクティブ� <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
+    �エラー�起������表示�るメッセージを変更���。プロダクションサー���
+    メッセージ�ユーザ�表示�れ��よ���る���
+    デフォルトエラーメッセージを <code>"&lt;!-- Error --&gt;"</code>
+    �変�る���よ����を考�る�も�れ��ん。</p>
+
+    <p>��ディレクティブ� <code>&lt;!--#config
+    errmsg=<var>message</var> --&gt;</code> �素���効果��り��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      SSIErrorMsg "&lt;!-- Error --&gt;"
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSIStartTag" id="SSIStartTag">SSIStartTag</a> <a name="ssistarttag" id="ssistarttag">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>include �素を開始�る文字列</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSIStartTag <var>tag</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSIStartTag "&lt;!--#"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>�ージョン 2.0.30 以��使用�能</td></tr>
+</table>
+
+    <p>��ディレクティブ� <code class="module"><a href="../mod/mod_include.html">mod_include</a></code> �探��include
+    �素�開始を示�文字列を変更���。</p>
+
+    <p>二��サー�� (も���る�別々�段階�) ファイル�出力を解������
+    �れ�れ���コマンドを処������
+    ���よ�������オプションを使���。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      SSIStartTag "&lt;%"<br />
+      SSIEndTag   "%&gt;"
+    </code></p></div>
+
+    <p>上�例�よ��対応�る
+    <code class="directive"><a href="#ssiendtag">SSIEndTag</a></code> を併��使���
+    下�示�例�よ�� SSI ディレクティブを使���:</p>
+
+    <div class="example"><h3>��開始�終了�タグを使�� SSI ディレクティブ</h3><p><code>
+      &lt;%printenv %&gt;
+    </code></p></div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#ssiendtag">SSIEndTag</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSITimeFormat" id="SSITimeFormat">SSITimeFormat</a> <a name="ssitimeformat" id="ssitimeformat">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>日付�を表�文字列�書�を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSITimeFormat <var>formatstring</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSITimeFormat "%A, %d-%b-%Y %H:%M:%S %Z"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.0.30 以��使用�能</td></tr>
+</table>
+<p>��ディレクティブ� <code>DATE</code> 環境変数を echo ��日付を表�文字列�
+    表示�れる���書�を変更���。<var>formatstring</var> �
+    C 標準ライブラリ� <code>strftime(3)</code> ���形���。</p>
+
+    <p>��ディレクティブ� <code>&lt;!--#config
+    timefmt=<var>formatstring</var> --&gt;</code> �素���効果��り��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      SSITimeFormat "%R, %B %d, %Y"
+    </code></p></div>
+
+    <p>上�ディレクティブ���日付� "22:26, June 14, 2002" ���
+    形��表示�れ��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSIUndefinedEcho" id="SSIUndefinedEcho">SSIUndefinedEcho</a> <a name="ssiundefinedecho" id="ssiundefinedecho">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>未定義�変数� echo �れ����表示�れる文字列</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SSIUndefinedEcho <var>string</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SSIUndefinedEcho "(none)"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.0.34 以��利用�能</td></tr>
+</table>
+    <p>��ディレクティブ�変数�定義�れ�����も関�ら�
+    "echo" �れ���� <code class="module"><a href="../mod/mod_include.html">mod_include</a></code>
+    �表示�る文字列を変更���。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      SSIUndefinedEcho "&lt;!-- undef --&gt;"
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="XBitHack" id="XBitHack">XBitHack</a> <a name="xbithack" id="xbithack">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>実行ビット�設定�れ�ファイル� SSI ディレクティブを
+解��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>XBitHack on|off|full</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>XBitHack off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Options</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_include</td></tr>
+</table>
+    <p><code class="directive">XBitHack</code> ディレクティブ�通常� HTML
+    ドキュメント�解�を制御���。��ディレクティブ� MIME タイプ
+    <code>text/html</code> �関連付�られ��るファイル���影響���。
+    <code class="directive">XBitHack</code> �以下�値を�る�������。</p>
+
+    <dl>
+      <dt><code>off</code></dt>
+      <dd>実行�能ファイル�対��特別�扱�を���ん。</dd>
+
+      <dt><code>on</code></dt>
+      <dd>ユーザ�実行ビット�設定�れ��る <code>text/html</code>
+      ファイル�全�サー��解��る html ドキュメント���扱�れ��。</dd>
+
+      <dt><code>full</code></dt>
+      <dd><code>on</code> ��様����グループ実行ビットもテスト���。
+      も��れ�設定�れ��れ��返�れるファイル� <code>Last-modified</code> �
+      日付をファイル�最終修正時刻����。�れ�設定�れ��������
+      last-modified �日付��られ��ん。��ビットを設定�る��
+      クライアントやプロキシ�リクエストをキャッシュ��るよ���り��。
+
+      <div class="note"><strong>注�</strong> 他� CGI を <code>#include</code>
+      �る�も�れ��も�や��アクセス�対����出力を生��る
+      (も���後�リクエスト�変�る�も�れ��も�)
+      ���� SSI スクリプト�対��グループ実行ビット�
+      設定�れ������を確�����場���full �使���方�良�
+      ��ょ�。</div>
+      </dd>
+    </dl>
+
+    
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_include.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_include.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_info.html b/docs/manual/mod/mod_info.html
index 84991103..2b70dae6 100644
--- a/docs/manual/mod/mod_info.html
+++ b/docs/manual/mod/mod_info.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_info.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_info.html.ja.euc-jp
+URI: mod_info.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_info.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_info.html.en b/docs/manual/mod/mod_info.html.en
index 79620696..6de57075 100644
--- a/docs/manual/mod/mod_info.html.en
+++ b/docs/manual/mod/mod_info.html.en
@@ -45,7 +45,7 @@ configuration</td></tr>
 
     <p>You may wish to use <code class="module"><a href="../mod/mod_access.html">mod_access</a></code> inside the
     <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
-    directive to limite access to your server configuration
+    directive to limit access to your server configuration
     information:</p>
 
     <div class="example"><p><code>
@@ -189,6 +189,6 @@ information displayed by the server-info handler</td></tr>
 <a href="../ja/mod/mod_info.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_info.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_info.html.ja.euc-jp b/docs/manual/mod/mod_info.html.ja.euc-jp
deleted file mode 100644
index 05d69479..00000000
--- a/docs/manual/mod/mod_info.html.ja.euc-jp
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_info - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_info</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_info.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_info.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_info.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤ÎÀßÄê¤ÎÊñ³çŪ¤Ê³µ´Ñ¤òÄ󶡤¹¤ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>info_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_info.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p><code class="module"><a href="../mod/mod_info.html">mod_info</a></code> ¤òÀßÄꤹ¤ë¤Ë¤Ï¡¢°Ê²¼¤ò <code>httpd.conf</code>
-    ¥Õ¥¡¥¤¥ë¤Ë²Ã¤¨¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      &lt;Location /server-info&gt;<br />
-      <span class="indent">
-        SetHandler server-info<br />
-      </span>
-      &lt;/Location&gt;
-    </code></p></div>
-
-    <p><code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
-    ¤ÎÃæ¤Ç <code class="module"><a href="../mod/mod_access.html">mod_access</a></code> ¤ò»È¤Ã¤Æ¡¢¥µ¡¼¥ÐÀßÄê¾ðÊó¤Ø¤Î
-    ¥¢¥¯¥»¥¹¤òÀ©¸Â¤·¤¿¤¤¤È»×¤¦¤«¤â¤·¤ì¤Þ¤»¤ó :</p>
-
-    <div class="example"><p><code>
-      &lt;Location /server-info&gt;<br />
-      <span class="indent">
-        SetHandler server-info<br />
-        Order deny,allow<br />
-        Deny from all<br />
-        Allow from yourcompany.com<br />
-      </span>
-      &lt;/Location&gt;
-    </code></p></div>
-
-    <p>°ìöÀßÄꤹ¤ë¤È¡¢<code>http://your.host.example.com/server-info</code>
-    ¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤³¤È¤Ç¥µ¡¼¥Ð¤Î¾ðÊó¤òÆÀ¤é¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#addmoduleinfo">AddModuleInfo</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#security">Security Issues</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#queries">ɽ¼¨¤µ¤ì¤ë¾ðÊó¤ÎÁªÂò</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#limitations">´ûÃΤÎÀ©¸Â</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="security" id="security">Security Issues</a></h2>
-    <p>°ìö <code class="module"><a href="../mod/mod_info.html">mod_info</a></code> ¤¬¥µ¡¼¥Ð¤ËÆɤ߹þ¤Þ¤ì¤ë¤È¡¢
-    Ä󶡤·¤Æ¤¤¤ë¥Ï¥ó¥É¥éµ¡Ç½¤Ï¥Ç¥£¥ì¥¯¥È¥êËè¤ÎÀßÄê¥Õ¥¡¥¤¥ë (<em>Î㤨¤Ð</em>
-    .htaccess) ¤ò´Þ¤à <em>¤¹¤Ù¤Æ</em>¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¤³¤Î¥â¥¸¥å¡¼¥ë¤òÍ­¸ú¤Ë¤¹¤ë¤È¤­¤Ï¥»¥­¥å¥ê¥Æ¥£¤ÎÌäÂê¤ò¹Íθ¤¹¤ëɬÍפ¬
-    ¤¢¤ë¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>Æäˡ¢¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¥·¥¹¥Æ¥à¥Ñ¥¹¡¢¥æ¡¼¥¶Ì¾/¥Ñ¥¹¥ï¡¼¥É¡¢
-    ¥Ç¡¼¥¿¥Ù¡¼¥¹Ì¾¤Ê¤É¡¢Â¾¤Î Apache ¥â¥¸¥å¡¼¥ë¤ÎÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤«¤é
-    ¥»¥­¥å¥ê¥Æ¥£¾åÈù̯¤Ê¾ðÊó¤òϳ¤é¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
-    ¤Ç¤¹¤«¤é¡¢¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¤­¤Á¤ó¤È¥¢¥¯¥»¥¹À©¸æ¤µ¤ì¤¿´Ä¶­¤Ç<strong>¤Î¤ß</strong>¡¢
-    Ãí°Õ¤·¤Æ»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>ÀßÄê¾ðÊó¤Ø¤Î¥¢¥¯¥»¥¹¤òÀ©¸Â¤¹¤ë¤¿¤á¤Ë¡¢<code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> ¤ò
-    »È¤¦¤Î¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£</p>
-      
-    <div class="example"><h3>¥¢¥¯¥»¥¹À©¸æ</h3><p><code>
-      &lt;Location /server-info&gt;<br />
-      <span class="indent">
-        SetHandler server-info<br />
-        Order allow,deny<br />
-        # Allow access from server itself<br />
-        Allow from 127.0.0.1<br />
-        # Additionally, allow access from local workstation<br />
-        Allow from 192.168.1.17<br />
-      </span>
-      &lt;/Location&gt;
-    </code></p></div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="queries" id="queries">ɽ¼¨¤µ¤ì¤ë¾ðÊó¤ÎÁªÂò</a></h2>
-    <p>¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥µ¡¼¥Ð¾ðÊó¤Ï¤¹¤Ù¤Æ¤ÎÍ­¸ú¤Ê¥â¥¸¥å¡¼¥ë¤È¡¢
-    ³Æ¥â¥¸¥å¡¼¥ë¤Ë¤Ä¤¤¤Æ¡¢¥â¥¸¥å¡¼¥ë¤¬Íý²ò¤¹¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¡¢
-    ¼ÂÁõ¤·¤Æ¤¤¤ë¡¢¥Õ¥Ã¥¯¡¢¸½»þÅÀ¤Ç¤ÎÀßÄê¤Î´ØÏ¢¤¹¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë
-    ¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p><code>server-info</code> ¥ê¥¯¥¨¥¹¥È¤Ø¥¯¥¨¥ê¡¼¤òÄɲ乤뤳¤È¤Ç¡¢
-    ÀßÄê¾ðÊó¤Î¾¤Îɽ¼¨·Á¼°¤òÁª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Î㤨¤Ð¡¢
-    <code>http://your.host.example.com/server-info?config</code> ¤Ï
-    ¤¹¤Ù¤Æ¤ÎÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òɽ¼¨¤·¤Þ¤¹¡£</p>
-    
-    <dl>
-        <dt><code>?&lt;module-name&gt;</code></dt>
-            <dd>»ØÄꤵ¤ì¤¿¥â¥¸¥å¡¼¥ë¤Ë´ØÏ¢¤¹¤ë¾ðÊó¤Î¤ß</dd>
-        <dt><code>?config</code></dt>
-            <dd>¥â¥¸¥å¡¼¥ë¤Ç¥½¡¼¥È¤»¤º¤Ë¡¢ÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¤ß</dd>
-        <dt><code>?hooks</code></dt>
-            <dd>³Æ¥â¥¸¥å¡¼¥ë¤¬»ÈÍѤ¹¤ë¥Õ¥Ã¥¯¤Î¤ß</dd>
-        <dt><code>?list</code></dt>
-            <dd>Í­¸ú¤Ê¥â¥¸¥å¡¼¥ë¤Î´Êñ¤Ê¥ê¥¹¥È¤Î¤ß</dd>
-        <dt><code>?server</code></dt>
-            <dd>´ðËÜ¥µ¡¼¥Ð¾ðÊó¤Î¤ß</dd>
-    </dl>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="limitations" id="limitations">´ûÃΤÎÀ©¸Â</a></h2>
-    <p><code class="module"><a href="../mod/mod_info.html">mod_info</a></code> ¤Ï¡¢¸µ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤà¤Î¤Ç¤Ï¤Ê¤¯¡¢
-    ´û¤Ë¥Ñ¡¼¥¹¤µ¤ì¤¿ÀßÄê¤òÆɤ߹þ¤à¤³¤È¤Ç¾ðÊó¤òÄ󶡤·¤Þ¤¹¡£½¾¤Ã¤Æ¡¢
-    ¥Ñ¡¼¥¹ºÑ¤ß¤ÎÀßÄê¾ðÊó¤ÎÌÚ¤¬À¸À®¤µ¤ì¤ëÊýË¡¤Ë¤è¤ëÀ©¸Â¤¬¤¤¤¯¤Ä¤«¤¢¤ê¤Þ¤¹:</p>
-    <ul>
-      <li>¥Ñ¡¼¥¹¤µ¤ì¤¿ÀßÄê¤ËÊݸ¤µ¤ì¤º¤Ë¡¢¤¹¤°¤Ë¼Â¹Ô¤µ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-          °ìÍ÷¤Ë¸½¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ë¤Ï
-          <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>,
-          <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code>,
-          <code class="directive"><a href="../mod/mod_so.html#loadfile">LoadFile</a></code> ¤¬¤¢¤ê¤Þ¤¹¡£</li>
-      <li><code class="directive"><a href="../mod/core.html#include">Include</a></code>,
-          <code class="directive"><a href="../mod/core.html#&lt;ifmodule&gt;">&lt;IfModule&gt;</a></code>,
-          <code class="directive"><a href="../mod/core.html#&lt;ifdefine&gt;">&lt;IfDefine&gt;</a></code>,
-          ¤Î¤è¤¦¤ÊÀßÄê¥Õ¥¡¥¤¥ë¼«¿È¤òÀ©¸æ¤¹¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£
-          ¤½¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÃæ¤Ë¤¢¤ê¡¢Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-          ɽ¼¨¤µ¤ì¤Þ¤¹¡£</li>
-      <li>¥³¥á¥ó¥È¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£(¤³¤ì¤Ï»ÅÍͤÀ¤È»×¤Ã¤Æ¤¯¤À¤µ¤¤¡£)</li>
-      <li><code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤ÎÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó
-          (±Êµ×Ū¤Ê¥µ¡¼¥ÐÀßÄê¤Î°ìÉô¤Ç¤Ï¤Ê¤¤¤«¤é¤Ç¤¹)¡£</li>
-      <li><code class="directive"><a href="../mod/core.html#&lt;directory&gt;">&lt;Directory&gt;</a></code>
-          ¤Î¤è¤¦¤Ê¥³¥ó¥Æ¥Ê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÉáÄ̤Ëɽ¼¨¤µ¤ì¤Þ¤¹¤¬¡¢
-          <code class="module"><a href="../mod/mod_info.html">mod_info</a></code> ¤ÏÊĤ¸¥¿¥°¤Î <code class="directive"><a href="../mod/core.html#&lt;/directory&gt;">&lt;/Directory&gt;</a></code> ¤Ê¤É¤Î¿ô¤òÃΤ뤳¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£</li>
-      <li><code class="module"><a href="../mod/mod_perl.html">mod_perl</a></code> ¤Î¤è¤¦¤Ê¥µ¡¼¥É¥Ñ¡¼¥Æ¥£¥â¥¸¥å¡¼¥ë
-           ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ïɽ¼¨¤µ¤ì¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£</li>
-    </ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddModuleInfo" id="AddModuleInfo">AddModuleInfo</a> <a name="addmoduleinfo" id="addmoduleinfo">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>server-info ¥Ï¥ó¥É¥é¤Ë¤è¤êɽ¼¨¤µ¤ì¤ë¥â¥¸¥å¡¼¥ë¤Î¾ðÊó¤Ë
-ÄɲäξðÊó¤òÉÕ¤±²Ã¤¨¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddModuleInfo <var>module-name</var> <var>string</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_info</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 1.3 °Ê¹ß</td></tr>
-</table>
-    <p>¤³¤ì¤Ï¡¢<var>string</var> ¤ÎÆâÍƤ¬¥â¥¸¥å¡¼¥ë <var>module-name</var>
-    ¤Î<strong>ÄɲþðÊó</strong> ¤È¤·¤Æ HTML
-    ¤È¤·¤Æ²ò¼á¤µ¤ì¡¢É½¼¨¤µ¤ì¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£Îã:</p>
-
-    <div class="example"><p><code>
-      AddModuleInfo mod_deflate.c 'See &lt;a \<br />
-      <span class="indent">
-        href="http://www.apache.org/docs/2.2/mod/mod_deflate.html"&gt;\<br />
-        http://www.apache.org/docs/2.2/mod/mod_deflate.html&lt;/a&gt;'
-      </span>
-    </code></p></div>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_info.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_info.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_info.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_info.html.ja.utf8 b/docs/manual/mod/mod_info.html.ja.utf8
new file mode 100644
index 00000000..34388125
--- /dev/null
+++ b/docs/manual/mod/mod_info.html.ja.utf8
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_info - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_info</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_info.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_info.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_info.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>サー��設定�包括的�概観を�供�る</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>info_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_info.c</td></tr></table>
+<h3>概�</h3>
+
+    <p><code class="module"><a href="../mod/mod_info.html">mod_info</a></code> を設定�る���以下を <code>httpd.conf</code>
+    ファイル�加���。</p>
+
+    <div class="example"><p><code>
+      &lt;Location /server-info&gt;<br />
+      <span class="indent">
+        SetHandler server-info<br />
+      </span>
+      &lt;/Location&gt;
+    </code></p></div>
+
+    <p><code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
+    �中� <code class="module"><a href="../mod/mod_access.html">mod_access</a></code> を使���サー�設定情報��
+    アクセスを制��������も�れ��ん :</p>
+
+    <div class="example"><p><code>
+      &lt;Location /server-info&gt;<br />
+      <span class="indent">
+        SetHandler server-info<br />
+        Order deny,allow<br />
+        Deny from all<br />
+        Allow from yourcompany.com<br />
+      </span>
+      &lt;/Location&gt;
+    </code></p></div>
+
+    <p>一旦設定�る��<code>http://your.host.example.com/server-info</code>
+    �アクセス�る���サー��情報を得られるよ���り��。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#addmoduleinfo">AddModuleInfo</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#security">Security Issues</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#queries">表示�れる情報��択</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#limitations">既知�制�</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="security" id="security">Security Issues</a></h2>
+    <p>一旦 <code class="module"><a href="../mod/mod_info.html">mod_info</a></code> �サー��読�込�れる��
+    �供���る�ンドラ機能�ディレクトリ毎�設定ファイル (<em>例��</em>
+    .htaccess) を�む <em>���</em>�設定ファイル�有効��り��。
+    ��モジュールを有効��る���セキュリティ��題を考慮�る必��
+    �る��ょ�。</p>
+
+    <p>特����モジュール�システムパス�ユーザ�/パスワード�
+    データベース����他� Apache モジュール�設定ディレクティブ�ら
+    セキュリティ上微妙�情報を�ら��能性��り��。
+    ���ら���モジュール���ん�アクセス制御�れ�環境�<strong>��</strong>�
+    注���使������。</p>
+
+    <p>設定情報��アクセスを制��る����<code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> を
+    使���良���ょ�。</p>
+      
+    <div class="example"><h3>アクセス制御</h3><p><code>
+      &lt;Location /server-info&gt;<br />
+      <span class="indent">
+        SetHandler server-info<br />
+        Order allow,deny<br />
+        # Allow access from server itself<br />
+        Allow from 127.0.0.1<br />
+        # Additionally, allow access from local workstation<br />
+        Allow from 192.168.1.17<br />
+      </span>
+      &lt;/Location&gt;
+    </code></p></div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="queries" id="queries">表示�れる情報��択</a></h2>
+    <p>デフォルト���サー�情報�����有効�モジュール��
+    �モジュール�����モジュール��解�るディレクティブ�
+    実装���る�フック��時点��設定�関連�るディレクティブ�
+    ������。</p>
+
+    <p><code>server-info</code> リクエスト�クエリーを追加�る����
+    設定情報�他�表示形�を���������。例���
+    <code>http://your.host.example.com/server-info?config</code> �
+    ����設定ディレクティブを表示���。</p>
+    
+    <dl>
+        <dt><code>?&lt;module-name&gt;</code></dt>
+            <dd>指定�れ�モジュール�関連�る情報��</dd>
+        <dt><code>?config</code></dt>
+            <dd>モジュール�ソート����設定ディレクティブ��</dd>
+        <dt><code>?hooks</code></dt>
+            <dd>�モジュール�使用�るフック��</dd>
+        <dt><code>?list</code></dt>
+            <dd>有効�モジュール�簡��リスト��</dd>
+        <dt><code>?server</code></dt>
+            <dd>基本サー�情報��</dd>
+    </dl>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="limitations" id="limitations">既知�制�</a></h2>
+    <p><code class="module"><a href="../mod/mod_info.html">mod_info</a></code> ��元�設定ファイルを読む������
+    既�パース�れ�設定を読�込む���情報を�供���。従���
+    パース済��設定情報�木�生��れる方法�よる制�������り��:</p>
+    <ul>
+      <li>パース�れ�設定��存�れ������実行�れるディレクティブ�
+          一覧��れ��ん。�れ��
+          <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>,
+          <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code>,
+          <code class="directive"><a href="../mod/mod_so.html#loadfile">LoadFile</a></code> ��り��。</li>
+      <li><code class="directive"><a href="../mod/core.html#include">Include</a></code>,
+          <code class="directive"><a href="../mod/core.html#&lt;ifmodule&gt;">&lt;IfModule&gt;</a></code>,
+          <code class="directive"><a href="../mod/core.html#&lt;ifdefine&gt;">&lt;IfDefine&gt;</a></code>,
+          �よ��設定ファイル自身を制御�るディレクティブ�表示�れ��ん。
+          ��ディレクティブ�中��り�有効�����るディレクティブ�
+          表示�れ��。</li>
+      <li>コメント�表示�れ��ん。(�れ�仕様���������。)</li>
+      <li><code>.htaccess</code> ファイル�設定ディレクティブ�表示�れ��ん
+          (永久的�サー�設定�一部�����ら��)。</li>
+      <li><code class="directive"><a href="../mod/core.html#&lt;directory&gt;">&lt;Directory&gt;</a></code>
+          �よ��コンテナディレクティブ�普通�表示�れ����
+          <code class="module"><a href="../mod/mod_info.html">mod_info</a></code> �閉�タグ� <code class="directive"><a href="../mod/core.html#&lt;/directory&gt;">&lt;/Directory&gt;</a></code> ���数を知る�������ん。</li>
+      <li><code class="module"><a href="../mod/mod_perl.html">mod_perl</a></code> �よ��サードパーティモジュール
+           �ディレクティブ�表示�れ���も�れ��ん。</li>
+    </ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddModuleInfo" id="AddModuleInfo">AddModuleInfo</a> <a name="addmoduleinfo" id="addmoduleinfo">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>server-info �ンドラ�より表示�れるモジュール�情報�
+追加�情報を付�加�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddModuleInfo <var>module-name</var> <var>string</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_info</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 1.3 以�</td></tr>
+</table>
+    <p>�れ��<var>string</var> �内容�モジュール <var>module-name</var>
+    �<strong>追加情報</strong> ��� HTML
+    ���解釈�れ�表示�れるよ�����。例:</p>
+
+    <div class="example"><p><code>
+      AddModuleInfo mod_deflate.c 'See &lt;a \<br />
+      <span class="indent">
+        href="http://www.apache.org/docs/2.2/mod/mod_deflate.html"&gt;\<br />
+        http://www.apache.org/docs/2.2/mod/mod_deflate.html&lt;/a&gt;'
+      </span>
+    </code></p></div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_info.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_info.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_info.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_info.html.ko.euc-kr b/docs/manual/mod/mod_info.html.ko.euc-kr
index afc98f0c..749f5997 100644
--- a/docs/manual/mod/mod_info.html.ko.euc-kr
+++ b/docs/manual/mod/mod_info.html.ko.euc-kr
@@ -164,6 +164,6 @@
 <a href="../ja/mod/mod_info.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_info.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_isapi.html b/docs/manual/mod/mod_isapi.html
index 6d92c773..d80ca339 100644
--- a/docs/manual/mod/mod_isapi.html
+++ b/docs/manual/mod/mod_isapi.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_isapi.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_isapi.html.en b/docs/manual/mod/mod_isapi.html.en
index 52cbe5df..5c1d9513 100644
--- a/docs/manual/mod/mod_isapi.html.en
+++ b/docs/manual/mod/mod_isapi.html.en
@@ -338,6 +338,6 @@ extensions</td></tr>
 <p><span>Available Languages: </span><a href="../en/mod/mod_isapi.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_isapi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_isapi.html.ko.euc-kr b/docs/manual/mod/mod_isapi.html.ko.euc-kr
index 25bc1de6..fd47fe40 100644
--- a/docs/manual/mod/mod_isapi.html.ko.euc-kr
+++ b/docs/manual/mod/mod_isapi.html.ko.euc-kr
@@ -314,6 +314,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/mod_isapi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_isapi.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_ldap.html b/docs/manual/mod/mod_ldap.html
index 059ee1a9..5aee964c 100644
--- a/docs/manual/mod/mod_ldap.html
+++ b/docs/manual/mod/mod_ldap.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_ldap.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_ldap.html.en b/docs/manual/mod/mod_ldap.html.en
index 128693cc..8e3e1234 100644
--- a/docs/manual/mod/mod_ldap.html.en
+++ b/docs/manual/mod/mod_ldap.html.en
@@ -622,6 +622,6 @@ Certificate Authority or global client certificates</td></tr>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_ldap.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_log_config.html b/docs/manual/mod/mod_log_config.html
index 34224912..8161b0c4 100644
--- a/docs/manual/mod/mod_log_config.html
+++ b/docs/manual/mod/mod_log_config.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_log_config.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_log_config.html.ja.euc-jp
+URI: mod_log_config.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_log_config.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en
index 6fe194f1..9fac05c2 100644
--- a/docs/manual/mod/mod_log_config.html.en
+++ b/docs/manual/mod/mod_log_config.html.en
@@ -120,42 +120,47 @@
         in the reply.</td></tr>
 <tr><td><code>%p</code></td>
         <td>The canonical port of the server serving the request</td></tr>
-<tr class="odd"><td><code>%P</code></td>
+<tr class="odd"><td><code>%{<var>format</var>}p</code></td>
+        <td>The canonical port of the server serving the request or the
+        server's actual port or the client's actual port.  Valid formats
+        are <code>canonical</code>, <code>local</code>, or <code>remote</code>.
+        </td></tr>
+<tr><td><code>%P</code></td>
         <td>The process ID of the child that serviced the request.</td></tr>
-<tr><td><code>%{<var>format</var>}P</code></td>
+<tr class="odd"><td><code>%{<var>format</var>}P</code></td>
         <td>The process ID or thread id of the child that serviced the 
         request.  Valid formats are <code>pid</code>, <code>tid</code>,
         and <code>hextid</code>.  <code>hextid</code> requires APR 1.2.0 or 
         higher.
         </td></tr>
-<tr class="odd"><td><code>%q</code></td>
+<tr><td><code>%q</code></td>
         <td>The query string (prepended with a <code>?</code> if a query
         string exists, otherwise an empty string)</td></tr>
-<tr><td><code>%r</code></td>
+<tr class="odd"><td><code>%r</code></td>
         <td>First line of request</td></tr>
-<tr class="odd"><td><code>%s</code></td>
+<tr><td><code>%s</code></td>
         <td>Status. For requests that got internally redirected, this is
         the status of the *original* request --- <code>%&gt;s</code>
         for the last.</td></tr>
-<tr><td><code>%t</code></td>
+<tr class="odd"><td><code>%t</code></td>
         <td>Time the request was received (standard english
         format)</td></tr>
-<tr class="odd"><td><code>%{<var>format</var>}t</code></td>
+<tr><td><code>%{<var>format</var>}t</code></td>
         <td>The time, in the form given by format, which should be in
         <code>strftime(3)</code> format. (potentially localized)</td></tr>
-<tr><td><code>%T</code></td>
+<tr class="odd"><td><code>%T</code></td>
         <td>The time taken to serve the request, in seconds.</td></tr>
-<tr class="odd"><td><code>%u</code></td>
+<tr><td><code>%u</code></td>
         <td>Remote user (from auth; may be bogus if return status
         (<code>%s</code>) is 401)</td></tr>
-<tr><td><code>%U</code></td>
+<tr class="odd"><td><code>%U</code></td>
         <td>The URL path requested, not including any query string.</td></tr>
-<tr class="odd"><td><code>%v</code></td>
+<tr><td><code>%v</code></td>
         <td>The canonical <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code>
         of the server serving the request.</td></tr>
-<tr><td><code>%V</code></td>
+<tr class="odd"><td><code>%V</code></td>
         <td>The server name according to the <code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code> setting.</td></tr>
-<tr class="odd"><td><code>%X</code></td>
+<tr><td><code>%X</code></td>
         <td>Connection status when response is completed:
 
         <table>
@@ -173,10 +178,10 @@
         <p>(This directive was <code>%c</code> in late versions of Apache
         1.3, but this conflicted with the historical ssl
         <code>%{<var>var</var>}c</code> syntax.)</p></td></tr>
-<tr><td><code>%I</code></td>
+<tr class="odd"><td><code>%I</code></td>
         <td>Bytes received, including request and headers, cannot be zero.
         You need to enable <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> to use this.</td></tr>
-<tr class="odd"><td><code>%O</code></td>
+<tr><td><code>%O</code></td>
         <td>Bytes sent, including headers, cannot be zero. You need to
         enable <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> to use this.</td></tr>
 </table>
@@ -467,6 +472,6 @@
 <a href="../ja/mod/mod_log_config.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_log_config.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_log_config.html.ja.euc-jp b/docs/manual/mod/mod_log_config.html.ja.euc-jp
deleted file mode 100644
index 3e5e7c41..00000000
--- a/docs/manual/mod/mod_log_config.html.ja.euc-jp
+++ /dev/null
@@ -1,471 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_log_config - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_log_config</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_log_config.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_log_config.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_log_config.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Î¥í¥®¥ó¥°</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>log_config_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_log_config.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>
-    ¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¥¯¥¨¥¹¥È¤ò½ÀÆð¤Ë¥í¥°¼ý½¸¤¹¤ëµ¡Ç½¤ò
-    Ä󶡤·¤Þ¤¹¡£¥í¥°¤Ï¥«¥¹¥¿¥Þ¥¤¥º²Äǽ¤Ê½ñ¼°¤Ç½ñ¤«¤ì¡¢¥Õ¥¡¥¤¥ë¤ËľÀÜ
-    ½ñ¤¤¤¿¤ê¡¢³°Éô¥×¥í¥°¥é¥à¤ËÅϤ·¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¸Ä¡¹¤Î¥ê¥¯¥¨¥¹¥È¤ò
-    ÆÃħ¤Ë±þ¤¸¤Æ¥í¥°¤Ë½ñ¤¤¤¿¤ê½ñ¤«¤Ê¤«¤Ã¤¿¤ê¤Ç¤­¤ë¤è¤¦¤Ë¡¢¾ò·ï¤Ë¤è¤ë
-    ¥í¥°¼ý½¸¤âÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï»°¤Ä¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥ÖÄ󶡤·¤Þ¤¹:
-    ¥í¥°¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë¤¿¤á¤Î <code class="directive"><a href="#transferlog">TransferLog</a></code>,
-    ¿·¤·¤¤½ñ¼°¤ò ÄêµÁ¤¹¤ë <code class="directive"><a href="#logformat">LogFormat</a></code>,
-    ¥í¥°¥Õ¥¡¥¤¥ë¤È ½ñ¼°¤ò°ìÅÙ¤ËÄêµÁ¤¹¤ë <code class="directive"><a href="#customlog">CustomLog</a></code> ¤Ç¤¹¡£
-    ³Æ¥ê¥¯¥¨¥¹¥È¤¬Ê£¿ô²ó¥í¥°¼ý½¸¤µ¤ì¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë
-    <code class="directive">TransferLog</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    <code class="directive">CustomLog</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÊ£¿ô²ó»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#bufferedlogs">BufferedLogs</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#cookielog">CookieLog</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#customlog">CustomLog</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#logformat">LogFormat</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#transferlog">TransferLog</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#formats">¥«¥¹¥¿¥à¥í¥°½ñ¼°</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#security">¥»¥­¥å¥ê¥Æ¥£¤Ë´Ø¤·¤Æ</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><a href="../logs.html">Apache ¥í¥°¥Õ¥¡¥¤¥ë</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="formats" id="formats">¥«¥¹¥¿¥à¥í¥°½ñ¼°</a></h2>
-
-    <p><code class="directive"><a href="#logformat">LogFormat</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    <code class="directive"><a href="#customlog">CustomLog</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î½ñ¼°¤ò»ØÄꤹ¤ë°ú¿ô¤Ïʸ»úÎó¤Ç¤¹¡£¤³¤Îʸ»úÎó¤ò»È¤Ã¤Æ¤½¤ì¤¾¤ì¤Î
-    ¥ê¥¯¥¨¥¹¥È¤¬¥í¥°¥Õ¥¡¥¤¥ë¤Ë¥í¥°¼ý½¸¤µ¤ì¤Þ¤¹¡£¤½¤Îʸ»úÎó¤Ë¤Ï
-    ¥í¥°¥Õ¥¡¥¤¥ë¤Ë¤½¤Î¤Þ¤Þ
-    ½ñ¤«¤ì¤ëʸ»úÎó¤ä¡¢¤½¤ì¤¾¤ì²þ¹Ô¤È¥¿¥Ö¤òɽ¤¹ C ¸À¸ì
-    ·Á¼°¤ÎÀ©¸æʸ»ú "\n" ¤È "\t"
-    ¤È¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤½¤Î¤Þ¤Þ½ÐÎϤµ¤»¤¿¤¤°úÍÑÉä¤È¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤Ï
-    ¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤Ç¥¨¥¹¥±¡¼¥×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>¥ê¥¯¥¨¥¹¥È¤ÎÆÃħ¤½¤Î¤â¤Î¤Ï "<code>%</code>"
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò½ñ¼°¤Îʸ»úÎó¤Ë½ñ¤¯¤³¤È¤Ç
-    ¥í¥°¼ý½¸¤µ¤ì¤Þ¤¹¡£"%"
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥í¥°¥Õ¥¡¥¤¥ëÃæ¤Ç¤Ï°Ê²¼¤Î¤è¤¦¤Ê
-    ÃͤÇÃÖ´¹¤µ¤ì¤Þ¤¹:</p>
-
-    <table class="bordered"><tr class="header"><th>¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó</th>
-        <th>ÀâÌÀ</th></tr>
-<tr><td><code>%%</code></td>
-        <td>¥Ñ¡¼¥»¥ó¥Èµ­¹æ</td></tr>
-<tr class="odd"><td><code>%a</code></td>
-        <td>¥ê¥â¡¼¥È IP ¥¢¥É¥ì¥¹</td></tr>
-<tr><td><code>%A</code></td>
-        <td>¥í¡¼¥«¥ë IP ¥¢¥É¥ì¥¹</td></tr>
-<tr class="odd"><td><code>%B</code></td>
-        <td>¥ì¥¹¥Ý¥ó¥¹¤Î¥Ð¥¤¥È¿ô¡£HTTP ¥Ø¥Ã¥À¤Ï½ü¤¯¡£</td></tr>
-<tr><td><code>%b</code></td>
-        <td>¥ì¥¹¥Ý¥ó¥¹¤Î¥Ð¥¤¥È¿ô¡£HTTP ¥Ø¥Ã¥À¤Ï½ü¤¯¡£CLF ½ñ¼°¡£
-        <em>¤¹¤Ê¤ï¤Á</em>¡¢1 ¥Ð¥¤¥È¤âÁ÷¤é¤ì¤Ê¤«¤Ã¤¿¤È¤­¤Ï 0 ¤Ç¤Ï¤Ê¤¯¡¢
-        '<code>-</code>' ¤Ë¤Ê¤ë</td></tr>
-<tr class="odd"><td><code>%{<var>Foobar</var>}C</code></td>
-        <td>¥µ¡¼¥Ð¤ËÁ÷¤é¤ì¤¿¥ê¥¯¥¨¥¹¥ÈÃæ¤Î¥¯¥Ã¥­¡¼ <var>Foobar</var> ¤ÎÃÍ</td></tr>
-<tr><td><code>%D</code></td>
-        <td>¥ê¥¯¥¨¥¹¥È¤ò½èÍý¤¹¤ë¤Î¤Ë¤«¤«¤Ã¤¿»þ´Ö¡¢¥Þ¥¤¥¯¥íÉÃñ°Ì</td></tr>
-<tr class="odd"><td><code>%{<var>FOOBAR</var>}e</code></td>
-        <td>´Ä¶­ÊÑ¿ô <var>FOOBAR</var> ¤ÎÆâÍÆ</td></tr>
-<tr><td><code>%f</code></td>
-        <td>¥Õ¥¡¥¤¥ë̾</td></tr>
-<tr class="odd"><td><code>%h</code></td>
-        <td>¥ê¥â¡¼¥È¥Û¥¹¥È</td></tr>
-<tr><td><code>%H</code></td>
-        <td>¥ê¥¯¥¨¥¹¥È¥×¥í¥È¥³¥ë</td></tr>
-<tr class="odd"><td><code>%{<var>Foobar</var>}i</code></td>
-        <td>¥µ¡¼¥Ð¤ËÁ÷¤é¤ì¤¿¥ê¥¯¥¨¥¹¥È¤Î <code><var>Foobar</var>:</code>
-        ¥Ø¥Ã¥À¤ÎÆâÍÆ</td></tr>
-<tr><td><code>%l</code></td>
-        <td>(identd ¤«¤é¤â¤·Ä󶡤µ¤ì¤Æ¤¤¤ì¤Ð) ¥ê¥â¡¼¥È¥í¥°Ì¾¡£
-        ¤³¤ì¤Ï <code class="module"><a href="../mod/mod_ident.html">mod_ident</a></code> ¤¬¥µ¡¼¥Ð¤Ë¸ºß¤·¤Æ¡¢
-        <code class="directive"><a href="../mod/mod_ident.html#identitycheck">IdentityCheck</a></code>
-        ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬ <code>On</code> ¤ËÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¸Â¤ê¡¢
-        <code>-</code> ¤Ë¤Ê¤ê¤Þ¤¹¡£</td></tr>
-<tr class="odd"><td><code>%m</code></td>
-        <td>¥ê¥¯¥¨¥¹¥È¥á¥½¥Ã¥É</td></tr>
-<tr><td><code>%{<var>Foobar</var>}n</code></td>
-        <td>¾¤Î¥â¥¸¥å¡¼¥ë¤«¤é¤Î¥á¥â <var>Foobar</var> ¤ÎÆâÍÆ</td></tr>
-<tr class="odd"><td><code>%{<var>Foobar</var>}o</code></td>
-        <td>±þÅú¤Î <code><var>Foobar</var>:</code> ¥Ø¥Ã¥À¤ÎÆâÍÆ</td></tr>
-<tr><td><code>%p</code></td>
-        <td>¥ê¥¯¥¨¥¹¥È¤ò°·¤Ã¤Æ¤¤¤ë¥µ¡¼¥Ð¤ÎÀµ¼°¤Ê¥Ý¡¼¥È</td></tr>
-<tr class="odd"><td><code>%P</code></td>
-        <td>¥ê¥¯¥¨¥¹¥È¤ò°·¤Ã¤¿»Ò¥×¥í¥»¥¹¤Î¥×¥í¥»¥¹ ID</td></tr>
-<tr><td><code>%{<var>format</var>}P</code></td>
-        <td>¥ê¥¯¥¨¥¹¥È¤ò°·¤Ã¤¿¥ï¡¼¥«¡¼¤Î¥×¥í¥»¥¹ ID ¤«¥¹¥ì¥Ã¥É ID¡£
-        <var>format</var> ¤È¤·¤ÆÍ­¸ú¤ÊÃÍ¤Ï <code>pid</code>, <code>tid</code>,
-        <code>hextid</code> ¤Ç¤¹¡£<code>hextid</code> ¤ò»È¤¦¤Ë¤Ï
-        APR 1.2.0 °Ê¹ß¤¬É¬ÍפǤ¹¡£
-        </td></tr>
-<tr class="odd"><td><code>%q</code></td>
-        <td>Ì䤤¹ç¤»Ê¸»úÎó (¸ºß¤¹¤ë¾ì¹ç¤ÏÁ°¤Ë <code>?</code> ¤¬Äɲ䵤ì¤ë¡£
-        ¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¶õʸ»úÎó)</td></tr>
-<tr><td><code>%r</code></td>
-        <td>¥ê¥¯¥¨¥¹¥È¤ÎºÇ½é¤Î¹Ô</td></tr>
-<tr class="odd"><td><code>%s</code></td>
-        <td>¥¹¥Æ¡¼¥¿¥¹¡£ÆâÉô¤Ç¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤¿¥ê¥¯¥¨¥¹¥È¤Ï¡¢¸µ¡¹¤Î
-         ¥ê¥¯¥¨¥¹¥È¤Î¥¹¥Æ¡¼¥¿¥¹ --- ºÇ¸å¤Î¥¹¥Æ¡¼¥¿¥¹¤Ï <code>%&gt;s</code>
-    </td></tr>
-<tr><td><code>%t</code></td>
-        <td>¥ê¥¯¥¨¥¹¥È¤ò¼õÉÕ¤±¤¿»þ¹ï¡£
-        CLF ¤Î»þ¹ï¤Î½ñ¼° (ɸ½à¤Î±Ñ¸ì¤Î½ñ¼°)</td></tr>
-<tr class="odd"><td><code>%{<var>format</var>}t</code></td>
-        <td><var>format</var> ¤ÇÍ¿¤¨¤é¤ì¤¿½ñ¼°¤Ë¤è¤ë»þ¹ï¡£format ¤Ï
-         <code>strftime (3)</code> ¤Î
-         ½ñ¼°¤Ç¤¢¤ëɬÍפ¬¤¢¤ë¡£(ÃÏ°è²½¤µ¤ì¤Æ¤¤¤ë²ÄǽÀ­¤¬¤¢¤ë)</td></tr>
-<tr><td><code>%T</code></td>
-        <td>¥ê¥¯¥¨¥¹¥È¤ò°·¤¦¤Î¤Ë¤«¤«¤Ã¤¿»þ´Ö¡¢ÉÃñ°Ì</td></tr>
-<tr class="odd"><td><code>%u</code></td>
-        <td>¥ê¥â¡¼¥È¥æ¡¼¥¶ (ǧ¾Ú¤Ë¤è¤ë¤â¤Î¡£¥¹¥Æ¡¼¥¿¥¹ (<code>%s</code>) ¤¬
-        401 ¤Î¤È¤­¤Ï°ÕÌ£¤¬¤Ê¤¤¤â¤Î¤Ç¤¢¤ë²ÄǽÀ­¤¬¤¢¤ë)
-    </td></tr>
-<tr><td><code>%U</code></td>
-        <td>¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¥Ñ¥¹¡£¥¯¥¨¥êʸ»úÎó¤Ï´Þ¤Þ¤Ê¤¤</td></tr>
-<tr class="odd"><td><code>%v</code></td>
-        <td>¥ê¥¯¥¨¥¹¥È¤ò°·¤Ã¤Æ¤¤¤ë¥µ¡¼¥Ð¤ÎÀµ¼°¤Ê <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code></td></tr>
-<tr><td><code>%V</code></td>
-        <td><code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code> ¤ÎÀßÄê¤Ë¤è¤ë¥µ¡¼¥Ð̾</td></tr>
-<tr class="odd"><td><code>%X</code></td>
-        <td>±þÅú¤¬´°Î»¤·¤¿¤È¤­¤ÎÀܳ¥¹¥Æ¡¼¥¿¥¹:
-
-        <table>
-        
-        <tr><td><code>X</code> =</td>
-            <td>±þÅú¤¬´°Î»¤¹¤ëÁ°¤ËÀܳ¤¬°Û¾ï½ªÎ»</td></tr>
-        <tr><td><code>+</code> =</td>
-            <td>±þÅú¤¬Á÷¤é¤ì¤¿¸å¤ËÀܳ¤ò»ý³¤¹¤ë¤³¤È¤¬²Äǽ</td></tr>
-        <tr><td><code>-</code> = </td>
-            <td>±þÅú¤¬Á÷¤é¤ì¤¿¸å¤ËÀܳ¤¬ÀÚ¤é¤ì¤ë</td></tr>
-        </table>
-
-        <p>(¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï Apache
-        1.3 ¤Î¸å´ü¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï <code>%c</code> ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Æ
-        ¤¤¤Þ¤·¤¿¤¬¡¢¤³¤ì¤ÏÎò»ËŪ¤Ë ssl ¤¬»ÈÍѤ·¤Æ¤¤¤ë
-        <code>%{<var>var</var>}c</code>
-        ¹½Ê¸¤È¾×Æͤ·¤Æ¤¤¤Þ¤·¤¿¡£)</p></td></tr>
-<tr><td><code>%I</code></td>
-        <td>¥ê¥¯¥¨¥¹¥È¤È¥Ø¥Ã¥À¤ò´Þ¤à¡¢¼õ¤±¼è¤Ã¤¿¥Ð¥¤¥È¿ô¡£
-        0 ¤Ë¤Ï¤Ê¤é¤Ê¤¤¡£
-        ¤³¤ì¤ò»ÈÍѤ¹¤ë¤¿¤á¤Ë¤Ï <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> ¤¬É¬Í×</td></tr>
-<tr class="odd"><td><code>%O</code></td>
-        <td>¥Ø¥Ã¥À¤ò´Þ¤à¡¢Á÷¿®¤·¤¿¥Ð¥¤¥È¿ô¡£0 ¤Ë¤Ï¤Ê¤é¤Ê¤¤¡£
-        ¤³¤ì¤ò»ÈÍѤ¹¤ë¤¿¤á¤Ë¤Ï <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> ¤¬É¬Í×</td></tr>
-</table>
-
-    <h3><a name="modifiers" id="modifiers">½¤¾þ»Ò</a></h3>
-
-      <p>ÆÃÄê¤ÎÍ×ÁÇ¤Ï "%" ¤Îľ¸å¤Ë HTTP ¥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É¤ò¥«¥ó¥Þ¶èÀÚ¤ê¤Ç
-      »ØÄꤹ¤ë¤³¤È¤Ç¡¢É½¼¨¤òÀ©¸Â¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Î㤨¤Ð 
-      <code>"%400,501{User-agent}i"</code> ¤Ç¤Ï¡¢
-      400 ¤È 500 ÈÖ¥¨¥é¡¼¤Ç¤Î¤ß <code>User-agent</code> ¤ò¥í¥°¤·¤Þ¤¹¡£
-      ¾¤Î¥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É¤Ç¤Ï <code>"-"</code> ¤È¤¤¤¦Ê¸»úÎó¤¬
-      ¥í¥°¤µ¤ì¤Þ¤¹¡£¥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É¤Î¥ê¥¹¥È¤Ï "<code>!</code>" 
-      ¤ÇÈÝÄê¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹ :
-      <code>"%!200,304,302{Referer}i"</code> ¤Ï¡¢»ØÄꤵ¤ì¤¿
-      3 ¤Ä¤Î¥³¡¼¥É¤Î<em>¤É¤ì¤Ë¤â³ºÅö¤·¤Ê¤¤</em>¥ê¥¯¥¨¥¹¥ÈÁ´¤Æ¤Ç
-      <code>Referer</code> ¤ò¥í¥°¤·¤Þ¤¹¡£</p>
-
-      <p>½¤¾þ»Ò "&lt;" ¤È "&gt;" ¤ÏÆâÉô¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤¿¥ê¥¯¥¨¥¹¥È¤Î¥í¥°¤Ë
-      ¸µ¤Î¥ê¥¯¥¨¥¹¥È¤«ºÇ½ªÅª¤Ê¥ê¥¯¥¨¥¹¥È¤Î¤É¤Á¤é¤ò»ÈÍѤ¹¤ë¤«¤ò
-      »ØÄꤹ¤ë¤¿¤á¤Ë»È¤¤¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢<code>%</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-      <code>%s, %U, %T, %D, %r</code> ¤Ï¸µ¤Î¥ê¥¯¥¨¥¹¥È¤ò¡¢Â¾¤ÏºÇ½ªÅª¤Ê¥ê¥¯¥¨¥¹¥È¤ò
-      »ÈÍѤ·¤Þ¤¹¡£Î㤨¤Ð¡¢¥ê¥¯¥¨¥¹¥È¤ÎºÇ½ª¥¹¥Æ¡¼¥¿¥¹¤òµ­Ï¿¤¹¤ë¤Ë¤Ï
-      <code>%&gt;s</code> ¤ò¡¢ÆâÉôŪ¤Ëǧ¾Ú¤µ¤ì¤Æ¤¤¤Ê¤¤¥ê¥½¡¼¥¹¤Ø¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤¿
-      ¥ê¥¯¥¨¥¹¥È¤Ç¸µ¤Î¥ê¥¯¥¨¥¹¥È¤Çǧ¾Ú¤µ¤ì¤¿¥æ¡¼¥¶¤òµ­Ï¿¤¹¤ë¤¿¤á¤Ë¤Ï
-      <code>%&lt;u</code> ¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    
-
-    <h3><a name="format-notes" id="format-notes">¤½¤Î¾Ãí°ÕÅÀ</a></h3>
-
-      <p>¥»¥­¥å¥ê¥Æ¥£¾å¤ÎÍýͳ¤Ë¤è¤ê 2.0.46 ¤è¤ê¡¢
-      <code>%r</code>, <code>%i</code>, <code>%o</code> ¤ËÆþ¤Ã¤Æ¤¤¤ë¡¢
-      °õ»úÉÔ²Äǽ¤Êʸ»ú¤È¾¤ÎÆÃÊ̤Êʸ»ú¤Ï¡¢<code>\x<var>hh</var></code> 
-      ¤È¤¤¤¦·Á¼°¤Îʸ»úÎó¤Ç¥¨¥¹¥±¡¼¥×¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£<var>hh</var> ¤Ï
-      ¤½¤Î¤Þ¤Þ¤Î¥Ð¥¤¥È¤ÎÃͤΠ16 ¿Ê¤Ç¤ÎÃͤǤ¹¡£¤³¤Îµ¬Â§¤ÎÎã³°¤Ë¤Ï¡¢
-      ¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤ò»È¤Ã¤Æ¥¨¥¹¥±¡¼¥×¤µ¤ì¤ë <code>"</code> ¤È <code>\</code> ¤È¡¢
-      C ·Á¼°¤Îɽµ­Ë¡¤¬»È¤ï¤ì¤ë¶õÇòʸ»ú (<code>\n</code>, <code>\t</code> ¤Ê¤É)
-      ¤¬¤¢¤ê¤Þ¤¹¡£2.0.46 °ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¥¨¥¹¥±¡¼¥×½èÍý¤Ï¹Ô¤ï¤ì¤Þ¤»¤ó¤Î¤Ç¡¢
-      À¸¥í¥°¥Õ¥¡¥¤¥ë¤ò°·¤¦ºÝ¤ËÃí°Õ¤¬É¬ÍפǤ¹¡£</p>
-
-      <p>httpd 2.0 ¤Ç¤Ï 1.3 ¤È¤Ï°Û¤Ê¤ê¡¢<code>%b</code> ¤È <code>%B</code>
-      ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ï¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¿®¤µ¤ì¤¿¥Ð¥¤¥È¿ô¤½¤Î¤â¤Î¤Ç¤Ï¤Ê¤¯¡¢
-      HTTP ¥ì¥¹¥Ý¥ó¥¹¤Î¥Ð¥¤¥È¿ô¤Ç¤¹ (¤³¤ì¤é¤Ï°Û¤Ê¤ë¤â¤Î¤Ç¡¢¤¿¤È¤¨¤Ð¡¢
-      ¥³¥Í¥¯¥·¥ç¥ó¤¬ÅÓÃæ¤ÇÇË´þ¤µ¤ì¤¿¾ì¹ç¤ä¡¢SSL »ÈÍÑ»þ¤Ë°ìÃפ·¤Þ¤»¤ó) ¡£
-      <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> ¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë <code>%O</code>
-      ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ç¡¢¥Í¥Ã¥È¥ï¡¼¥¯·Ðͳ¤Ç¼ÂºÝ¤ËžÁ÷¤µ¤ì¤¿¥Ð¥¤¥È¿ô¤ò
-      µ­Ï¿¤Ç¤­¤Þ¤¹¡£</p>
-
-    
-
-    <h3><a name="examples" id="examples">Îã</a></h3>
-
-      <p>¤è¤¯»È¤ï¤ì¤ë¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ï:</p>
-
-      <dl>
-        <dt>Common Log Format (CLF)</dt>
-        <dd><code>"%h %l %u %t \"%r\" %&gt;s %b"</code></dd>
-
-        <dt>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥ÈÉÕ¤­ Common Log Format</dt>
-        <dd><code>"%v %h %l %u %t \"%r\" %&gt;s %b"</code></dd>
-
-        <dt>NCSA extended/combined ¥í¥°½ñ¼°</dt>
-        <dd><code>"%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\"
-        \"%{User-agent}i\""</code></dd>
-
-        <dt>Referer ¥í¥°½ñ¼°</dt>
-        <dd><code>"%{Referer}i -&gt; %U"</code></dd>
-
-        <dt>Agent (¥Ö¥é¥¦¥¶) ¥í¥°½ñ¼°</dt>
-        <dd><code>"%{User-agent}i"</code></dd>
-      </dl>
-    
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="security" id="security">¥»¥­¥å¥ê¥Æ¥£¤Ë´Ø¤·¤Æ</a></h2>
-    <p>¥í¥°¥Õ¥¡¥¤¥ë¤¬Êݸ¤µ¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê¤¬¥µ¡¼¥Ð¤òµ¯Æ°¤·¤¿°Ê³°¤Î¥æ¡¼¥¶¤Ç
-    ½ñ¤­¹þ¤ß²Äǽ¤Ê¤È¤­¤Ë¥»¥­¥å¥ê¥Æ¥£¤ÎÌäÂ꤬ȯÀ¸¤¹¤ëÍýͳ¤Î¾ÜºÙ¤Ï<a href="../misc/security_tips.html#serverroot">¥»¥­¥å¥ê¥Æ¥£¤Î¤³¤Ä</a>
-    ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="BufferedLogs" id="BufferedLogs">BufferedLogs</a> <a name="bufferedlogs" id="bufferedlogs">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Ç¥£¥¹¥¯¤Ë½ñ¤­½Ð¤¹Á°¤Ë¥á¥â¥ê¤Ë¥í¥°¥¨¥ó¥È¥ê¤ò¥Ð¥Ã¥Õ¥¡¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>BufferedLogs On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>BufferedLogs Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_log_config</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.0.41 °Ê¹ß</td></tr>
-</table>
-    <p><code class="directive">BufferedLogs</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¦¤È
-    <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> ¤ÎµóÆ°¤¬ÊѲ½¤·¤Æ¡¢
-    Ê£¿ô¤Î¥í¥°¤ò½ñ¤­½Ð¤¹ºÝ¤Ë¡¢¤½¤ì¤¾¤ì¤Î¥ê¥¯¥¨¥¹¥È½èÍý¸åËè¤Ë
-    ½ñ¤­½Ð¤¹¤Î¤Ç¤Ï¤Ê¤¯¡¢¤¤¤Ã¤¿¤ó¥á¥â¥ê¤ËÃߤ¨¤Æ¤«¤é¡¢
-    ¤Þ¤È¤á¤Æ¥Ç¥£¥¹¥¯¤Ë½ñ¤­½Ð¤¹¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¤³¤Î·ë²Ì¥Ç¥£¥¹¥¯¥¢¥¯¥»¥¹¤¬¤è¤ê¸úΨŪ¤Ë¤Ê¤ê¡¢
-    ¹â¤¤¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤ÎÆÀ¤é¤ì¤ë¥·¥¹¥Æ¥à¤â¤¢¤ë¤Ç¤·¤ç¤¦¡£
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥µ¡¼¥ÐÁ´ÂΤǰìÅÙ¤À¤±ÀßÄê¤Ç¤­¤Þ¤¹; 
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤´¤È¤ËÀßÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£</p>
-
-    <div class="note">¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¼Â¸³Åª¤Ê¤â¤Î¤Ç¤¹¤Î¤Ç¡¢
-    »ÈÍѤ¹¤ëºÝ¤ÏÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CookieLog" id="CookieLog">CookieLog</a> <a name="cookielog" id="cookielog">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¯¥Ã¥­¥ó¥°¤Î¥í¥®¥ó¥°¤Î¤¿¤á¤Î¥Õ¥¡¥¤¥ë̾¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CookieLog <var>filename</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_log_config</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÈó¿ä¾©</td></tr>
-</table>
-    <p><code class="directive">CookieLog</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥¯¥Ã¥­¡¼¤Î¥í¥®¥ó¥°¤Î¤¿¤á¤Î¥Õ¥¡¥¤¥ë̾¤ò
-    ÀßÄꤷ¤Þ¤¹¡£filename ¤Ï <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
-    ¤«¤é¤ÎÁêÂХѥ¹¤Ç¤¹¡£¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code>mod_cookies</code> ¤È¤Î¸ß´¹À­¤Î¤¿¤á¤À¤±¤Ë
-    ¸ºß¤·¡¢»ÈÍѤϿ侩¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CustomLog" id="CustomLog">CustomLog</a> <a name="customlog" id="customlog">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥í¥°¥Õ¥¡¥¤¥ë¤Î̾Á°¤È½ñ¼°¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CustomLog  <var>file</var>|<var>pipe</var>
-<var>format</var>|<var>nickname</var>
-[env=[!]<var>environment-variable</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_log_config</td></tr>
-</table>
-    <p><code class="directive">CustomLog</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥µ¡¼¥Ð¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ò
-    ¥í¥°¼ý½¸¤¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£¥í¥°¤Î½ñ¼°¤¬»ØÄꤵ¤ì¡¢
-    ´Ä¶­ÊÑ¿ô¤ò»È¤Ã¤Æ¥í¥®¥ó¥°¤¬¾ò·ï¤Ë±þ¤¸¤Æ¹Ô¤Ê¤ï¤ì¤ë¤è¤¦¤Ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¥í¥°¤¬½ñ¤«¤ì¤ë¾ì½ê¤ò»ØÄꤹ¤ëºÇ½é¤Î°ú¿ô¤Ï°Ê²¼¤ÎÆó¤Ä¤Î·Á¼°¤ÎÃͤò
-    ¤È¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-    <dl>
-      <dt><var>file</var></dt>
-      <dd><code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
-      ¤«¤é¤ÎÁêÂХѥ¹¤Çɽ¤µ¤ì¤ë¥Õ¥¡¥¤¥ë̾¡£</dd>
-
-      <dt><var>pipe</var></dt>
-      <dd>¥Ñ¥¤¥×ʸ»ú "<code>|</code>" ¤È¡¢¤½¤Î¸å¤Ëɸ½àÆþÎϤ«¤é¥í¥°¤Î
-      ¾ðÊó¤ò¼õ¤±¤È¤ë¥×¥í¥°¥é¥à¤Ø¤Î¥Ñ¥¹¤¬Â³¤¤¤¿¤â¤Î¡£
-
-      <div class="warning"><h3>¥»¥­¥å¥ê¥Æ¥£</h3>
-      <p>¤â¤·¥×¥í¥°¥é¥à¤¬»ÈÍѤµ¤ì¤¿¾ì¹ç¡¢
-      <code class="program"><a href="../programs/httpd.html">httpd</a></code> ¤¬µ¯Æ°¤µ¤ì¤¿¥æ¡¼¥¶¤È¤·¤Æ¼Â¹Ô¤µ¤ì¤Þ¤¹¡£¤³¤ì¤Ï¥µ¡¼¥Ð¤¬
-      root ¤Ë¤è¤Ã¤Æµ¯Æ°¤µ¤ì¤¿¾ì¹ç¤Ï root ¤Ë¤Ê¤ê¤Þ¤¹¡£¥×¥í¥°¥é¥à¤¬
-      °ÂÁ´¤Ç¤¢¤ë¤è¤¦¤Ëα°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-      </div>
-      <div class="warning"><h3>Ãí</h3>
-        <p>Unix ¤Ç¤Ê¤¤¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¤òÆþÎϤ·¤Æ¤¤¤ë¤È¤­¤Ï¡¢
-        »ÈÍѤ·¤Æ¤¤¤ë¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤¬¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤Î»ÈÍѤòµö²Ä¤·¤Æ¤¤¤¿
-        ¤È¤·¤Æ¡¢Ä̾ï¤Î¥¹¥é¥Ã¥·¥å¤À¤±¤ò»È¤¦¤è¤¦¤Ëµ¤¤ò¤Ä¤±¤Æ¤¯¤À¤µ¤¤¡£
-        °ìÈÌŪ¤Ë¡¢ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Ç¤Ï¾ï¤ËÉáÄ̤Υ¹¥é¥Ã¥·¥å¤Î¤ß¤ò»È¤¦¤è¤¦¤Ë¤¹¤ë
-        Êý¤¬Îɤ¤¤Ç¤¹¡£</p>
-      </div></dd>
-    </dl>
-
-    <p>Æó¤Ä¤á¤Î°ú¿ô¤Ï¥í¥°¥Õ¥¡¥¤¥ë¤Ë²¿¤¬½ñ¤«¤ì¤ë¤«¤ò»ØÄꤷ¤Þ¤¹¡£
-    Á°¤Ë¤¢¤ë <code class="directive"><a href="#logformat">LogFormat</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê
-    ÄêµÁ¤µ¤ì¤¿ <var>nickname</var> ¤«¡¢<a href="#formats">¥í¥°¤Î½ñ¼°</a>
-    ¤Î¤È¤³¤í¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¡¢ÌÀ¼¨Åª¤Ê <var>format</var> ʸ»úÎó¤Î
-    ¤É¤Á¤é¤«¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>Î㤨¤Ð¡¢°Ê²¼¤ÎÆó¤Ä¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö·²¤ÏÁ´¤¯Æ±¤¸¸ú²Ì¤ò¤â¤¿¤é¤·¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      # CustomLog with format nickname<br />
-      LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common<br />
-      CustomLog logs/access_log common<br />
-      <br />
-      # CustomLog with explicit format string<br />
-      CustomLog logs/access_log "%h %l %u %t \"%r\" %&gt;s %b"
-    </code></p></div>
-
-    <p>»°¤ÄÌܤΰú¿ô¤Ï¾Êά²Äǽ¤Ç¡¢¥µ¡¼¥Ð¤Î´Ä¶­¤Ë¤¢¤ëÊÑ¿ô¤¬¤¢¤ë¤«¤Ê¤¤¤«¤Ë
-    ±þ¤¸¤Æ¥ê¥¯¥¨¥¹¥È¤ò¥í¥°¼ý½¸¤¹¤ë¤«¤É¤¦¤«¤òÀ©¸æ¤¹¤ë¤¿¤á¤Ë»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    »ØÄꤵ¤ì¤¿<a href="../env.html">´Ä¶­ÊÑ¿ô</a>¤¬¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ
-    ÀßÄꤵ¤ì¤Æ¤¤¤¿¾ì¹ç ('<code>env=!<var>name</var></code>' ʸ¤¬»È¤ï¤ì¤¿¤È¤­¤Ï
-    ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç)¡¢¥ê¥¯¥¨¥¹¥È¤¬¥í¥°¼ý½¸¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>´Ä¶­ÊÑ¿ô¤Ï <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> ¥â¥¸¥å¡¼¥ë¤È
-    <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> ¥â¥¸¥å¡¼¥ë¤ÎξÊý¤â¤·¤¯¤Ï
-    ÊÒÊý¤òÍѤ¤¤Æ¥ê¥¯¥¨¥¹¥È¤´¤È¤ËÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    Î㤨¤Ð¡¢¥µ¡¼¥Ð¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î GIF ²èÁü¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤òÊÌ¤Î¥í¥°¥Õ¥¡¥¤¥ë
-    ¤Ë¤Ïµ­Ï¿¤·¤¿¤¤¤±¤ì¤É¡¢¥á¥¤¥ó¥í¥°¤Ë¤Ïµ­Ï¿¤·¤¿¤¯¤Ê¤¤¡¢¤È¤¤¤¦¤È¤­¤Ï
-    °Ê²¼¤Î¤â¤Î¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-    
-    <div class="example"><p><code>
-      SetEnvIf Request_URI \.gif$ gif-image<br />
-      CustomLog gif-requests.log common env=gif-image<br />
-      CustomLog nongif-requests.log common env=!gif-image
-    </code></p></div>
-
-    <p>¸Å¤¤ RefererIgnore ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÈƱ¤¸µóÆ°¤ò¤µ¤»¤¿¤¤¾ì¹ç¤Ï¡¢
-    ¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-    SetEnvIf Referer example\.com localreferer<br />
-    CustomLog referer.log referer env=!localreferer
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="LogFormat" id="LogFormat">LogFormat</a> <a name="logformat" id="logformat">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥í¥°¥Õ¥¡¥¤¥ë¤Ç»ÈÍѤ¹¤ë½ñ¼°¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>LogFormat <var>format</var>|<var>nickname</var>
-[<var>nickname</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>LogFormat "%h %l %u %t \"%r\" %&gt;s %b"</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_log_config</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥¢¥¯¥»¥¹¥í¥°¥Õ¥¡¥¤¥ë¤Î½ñ¼°¤ò»ØÄꤷ¤Þ¤¹¡£</p>
-
-    <p><code class="directive">LogFormat</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÆó¤Ä¤Î·Á¼°¤Î¤É¤Á¤é¤«¤ò
-    ¤È¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ºÇ½é¤Î·Á¼°¤Ç¤Ï°ì¤Ä¤Î°ú¿ô¤Î¤ß¤¬»ØÄꤵ¤ì¡¢
-    ³¤¯ <code class="directive">TransferLog</code>
-    ¤Ç»ØÄꤵ¤ì¤¿¥í¥°¤Ç»È¤ï¤ì¤ë¥í¥°¤Î½ñ¼°¤òÀßÄꤷ¤Þ¤¹¡£¤³¤ÎñÆȤΰú¿ô¤Ç¤Ï
-    ¾å¤Î<a href="#formats">¥«¥¹¥¿¥à¥í¥°½ñ¼°</a>¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë
-    <var>format</var> ¤òÌÀ¼¨Åª¤Ë»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤â¤·¤¯¤Ï¡¢²¼¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤ËÁ°¤Ë <code class="directive">LogFormat</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÄêµÁ¤µ¤ì¤¿¥í¥°¤Î½ñ¼°¤ò <var>nickname</var>¤ò»È¤Ã¤Æ
-    »²¾È¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p><code class="directive">LogFormat</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÆó¤Ä¤á¤Î·Á¼°¤Ï
-    <var>format</var> ¤Ë <var>nickname</var> ¤òÍ¿¤¨¤Þ¤¹¡£
-    ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎóÁ´ÂΤòºÆ¤Ó½ñ¤¯¤«¤ï¤ê¤Ë¡¢
-    ¤³¤Î <var>nickname</var> ¤ò³¤­¤Î <code class="directive">LogFormat</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ä
-    <code class="directive">CustomLog</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    Nickname ¤òÄêµÁ¤¹¤ë <code class="directive">LogFormat</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    <strong>¾¤Ë¤Ï²¿¤â¤·¤Þ¤»¤ó</strong> -- ¤¹¤Ê¤ï¤Á¡¢¥Ë¥Ã¥¯¥Í¡¼¥à¤òÄêµÁ
-    ¤¹¤ë<em>¤À¤±</em>¤Ç¡¢¼ÂºÝ¤Ë½ñ¼°¤òŬÍѤ·¤Æ¥Ç¥Õ¥©¥ë¥È¤Ë¤¹¤ë¤È¤¤¤¦¤³¤È¤Ï¹Ô¤Ê¤¤¤Þ¤»¤ó¡£
-    ¤Ç¤¹¤«¤é¡¢¤³¤ì¤Ï³¤¯ <code class="directive"><a href="#transferlog">TransferLog</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤Ï±Æ¶Á¤òÍ¿¤¨¤Þ¤»¤ó¡£
-    ¤µ¤é¤Ë¡¢<code class="directive">LogFormat</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï´û¸¤Î nickname ¤ò
-    »È¤Ã¤ÆÊ̤Πnickname ¤òÄêµÁ¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£Nickname ¤Ë¤Ï
-    ¥Ñ¡¼¥»¥ó¥Èµ­¹æ (<code>%</code>) ¤¬´Þ¤Þ¤ì¤Æ¤¤¤Æ¤Ï¤¤¤±¤Ê¤¤¤³¤È¤Ë¤âÃí°Õ
-    ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost_common
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="TransferLog" id="TransferLog">TransferLog</a> <a name="transferlog" id="transferlog">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥í¥°¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤ò»ØÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>TransferLog <var>file</var>|<var>pipe</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_log_config</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥í¥°½ñ¼°¤òľÀÜ»ØÄê¤Ç¤­¤Ê¤¤¤³¤È¤È¡¢
-    ¾ò·ïÉÕ¤­¥í¥®¥ó¥°¤¬Ìµ¤¤¤³¤È¤ò½ü¤¯¤È¡¢<code class="directive"><a href="#customlog">CustomLog</a></code> ¤ÈÁ´¤¯Æ±¤¸°ú¿ô¤È¸ú²Ì¤¬¤¢¤ê¤Þ¤¹¡£
-    ľÀÜ¥í¥°½ñ¼°¤ò»ØÄꤹ¤ëÂå¤ï¤ê¤Ë¡¢¥í¥°¤Î½ñ¼°¤Ï¤½¤³¤Þ¤Ç¤Ç°ìÈֺǸå¤Ë»ØÄꤵ¤ì¤¿
-    ¥Ë¥Ã¥¯¥Í¡¼¥à¤òÄêµÁ¤·¤Ê¤¤
-    <code class="directive"><a href="#logformat">LogFormat</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö
-	¤ÇÄêµÁ¤µ¤ì¤¿¤â¤Î¤ò»È¤¤¤Þ¤¹¡£
-    ¤â¤·Â¾¤Î½ñ¼°¤¬Á´¤¯»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Ï Common Log Format
-    ¤¬»È¤ï¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\""<br />
-      TransferLog logs/access_log
-    </code></p></div>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_log_config.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_log_config.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_log_config.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_log_config.html.ja.utf8 b/docs/manual/mod/mod_log_config.html.ja.utf8
new file mode 100644
index 00000000..26971a5d
--- /dev/null
+++ b/docs/manual/mod/mod_log_config.html.ja.utf8
@@ -0,0 +1,473 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_log_config - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_log_config</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_log_config.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_log_config.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_log_config.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>サー���リクエスト�ロギング</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>log_config_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_log_config.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>
+    ��モジュール�クライアント�リクエストを柔軟�ログ�集�る機能を
+    �供���。ログ�カスタマイズ�能�書��書�れ�ファイル�直接
+    書��り�外部プログラム�渡��り�る�������。個々�リクエストを
+    特徴�応��ログ�書��り書�����り��るよ����件�よる
+    ログ�集も�供�れ����。</p>
+
+    <p>��モジュール�三��ディレクティブ�供���:
+    ログファイルを作��る��� <code class="directive"><a href="#transferlog">TransferLog</a></code>,
+    新��書�を 定義�る <code class="directive"><a href="#logformat">LogFormat</a></code>,
+    ログファイル� 書�を一度�定義�る <code class="directive"><a href="#customlog">CustomLog</a></code> ��。
+    �リクエスト�複数回ログ�集�れるよ���る���
+    <code class="directive">TransferLog</code> ディレクティブ�
+    <code class="directive">CustomLog</code>
+    ディレクティブ�複数回使用�る�������。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#bufferedlogs">BufferedLogs</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cookielog">CookieLog</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#customlog">CustomLog</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#logformat">LogFormat</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#transferlog">TransferLog</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#formats">カスタムログ書�</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#security">セキュリティ�関��</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><a href="../logs.html">Apache ログファイル</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="formats" id="formats">カスタムログ書�</a></h2>
+
+    <p><code class="directive"><a href="#logformat">LogFormat</a></code> ディレクティブ�
+    <code class="directive"><a href="#customlog">CustomLog</a></code>
+    ディレクティブ�書�を指定�る引数�文字列��。��文字列を使���れ�れ�
+    リクエスト�ログファイル�ログ�集�れ��。��文字列��
+    ログファイル�����
+    書�れる文字列や��れ�れ改行�タブを表� C 言語
+    形��制御文字 "\n" � "\t"
+    �を��る�������。����出力����引用符��ックスラッシュ�
+    �ックスラッシュ�エスケープ�る必���り��。</p>
+
+    <p>リクエスト�特徴��も�� "<code>%</code>"
+    ディレクティブを書��文字列�書����
+    ログ�集�れ��。"%"
+    ディレクティブ�ログファイル中��以下�よ��
+    値�置��れ��:</p>
+
+    <table class="bordered"><tr class="header"><th>フォーマット文字列</th>
+        <th>説明</th></tr>
+<tr><td><code>%%</code></td>
+        <td>パーセント記�</td></tr>
+<tr class="odd"><td><code>%a</code></td>
+        <td>リモート IP アドレス</td></tr>
+<tr><td><code>%A</code></td>
+        <td>ローカル IP アドレス</td></tr>
+<tr class="odd"><td><code>%B</code></td>
+        <td>レス�ンス��イト数。HTTP ヘッダ�除�。</td></tr>
+<tr><td><code>%b</code></td>
+        <td>レス�ンス��イト数。HTTP ヘッダ�除�。CLF 書�。
+        <em>����</em>�1 �イトも�られ������� 0 �����
+        '<code>-</code>' ��る</td></tr>
+<tr class="odd"><td><code>%{<var>Foobar</var>}C</code></td>
+        <td>サー���られ�リクエスト中�クッキー <var>Foobar</var> �値</td></tr>
+<tr><td><code>%D</code></td>
+        <td>リクエストを処��る������時間�マイクロ秒��</td></tr>
+<tr class="odd"><td><code>%{<var>FOOBAR</var>}e</code></td>
+        <td>環境変数 <var>FOOBAR</var> �内容</td></tr>
+<tr><td><code>%f</code></td>
+        <td>ファイル�</td></tr>
+<tr class="odd"><td><code>%h</code></td>
+        <td>リモートホスト</td></tr>
+<tr><td><code>%H</code></td>
+        <td>リクエストプロトコル</td></tr>
+<tr class="odd"><td><code>%{<var>Foobar</var>}i</code></td>
+        <td>サー���られ�リクエスト� <code><var>Foobar</var>:</code>
+        ヘッダ�内容</td></tr>
+<tr><td><code>%l</code></td>
+        <td>(identd �らも��供�れ��れ�) リモートログ�。
+        �れ� <code class="module"><a href="../mod/mod_ident.html">mod_ident</a></code> �サー��存在���
+        <code class="directive"><a href="../mod/mod_ident.html#identitycheck">IdentityCheck</a></code>
+        ディレクティブ� <code>On</code> �設定�れ�����り�
+        <code>-</code> ��り��。</td></tr>
+<tr class="odd"><td><code>%m</code></td>
+        <td>リクエストメソッド</td></tr>
+<tr><td><code>%{<var>Foobar</var>}n</code></td>
+        <td>他�モジュール�ら�メモ <var>Foobar</var> �内容</td></tr>
+<tr class="odd"><td><code>%{<var>Foobar</var>}o</code></td>
+        <td>応答� <code><var>Foobar</var>:</code> ヘッダ�内容</td></tr>
+<tr><td><code>%p</code></td>
+        <td>リクエストを扱���るサー��正���ート</td></tr>
+<tr class="odd"><td><code>%P</code></td>
+        <td>リクエストを扱���プロセス�プロセス ID</td></tr>
+<tr><td><code>%{<var>format</var>}P</code></td>
+        <td>リクエストを扱��ワーカー�プロセス ID �スレッド ID。
+        <var>format</var> ���有効�値� <code>pid</code>, <code>tid</code>,
+        <code>hextid</code> ��。<code>hextid</code> を使���
+        APR 1.2.0 以��必���。
+        </td></tr>
+<tr class="odd"><td><code>%q</code></td>
+        <td>����文字列 (存在�る場���� <code>?</code> �追加�れる。
+        �����場��空文字列)</td></tr>
+<tr><td><code>%r</code></td>
+        <td>リクエスト�最��行</td></tr>
+<tr class="odd"><td><code>%s</code></td>
+        <td>ステータス。内部�リダイレクト�れ�リクエスト��元々�
+         リクエスト�ステータス --- 最後�ステータス� <code>%&gt;s</code>
+    </td></tr>
+<tr><td><code>%t</code></td>
+        <td>リクエストを�付��時刻。
+        CLF �時刻�書� (標準�英語�書�)</td></tr>
+<tr class="odd"><td><code>%{<var>format</var>}t</code></td>
+        <td><var>format</var> �与�られ�書��よる時刻。format �
+         <code>strftime (3)</code> �
+         書���る必���る。(地域化�れ��る�能性��る)</td></tr>
+<tr><td><code>%T</code></td>
+        <td>リクエストを扱�������時間�秒��</td></tr>
+<tr class="odd"><td><code>%u</code></td>
+        <td>リモートユーザ (�証�よるも�。ステータス (<code>%s</code>) �
+        401 �����味���も���る�能性��る)
+    </td></tr>
+<tr><td><code>%U</code></td>
+        <td>リクエスト�れ� URL パス。クエリ文字列�����</td></tr>
+<tr class="odd"><td><code>%v</code></td>
+        <td>リクエストを扱���るサー��正�� <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code></td></tr>
+<tr><td><code>%V</code></td>
+        <td><code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code> �設定�よるサー��</td></tr>
+<tr class="odd"><td><code>%X</code></td>
+        <td>応答�完了�����接続ステータス:
+
+        <table>
+        
+        <tr><td><code>X</code> =</td>
+            <td>応答�完了�る��接続�異常終了</td></tr>
+        <tr><td><code>+</code> =</td>
+            <td>応答��られ�後�接続を�続�る����能</td></tr>
+        <tr><td><code>-</code> = </td>
+            <td>応答��られ�後�接続�切られる</td></tr>
+        </table>
+
+        <p>(��ディレクティブ� Apache
+        1.3 �後期��ージョン�� <code>%c</code> �割り当�られ�
+        �������れ�歴�的� ssl �使用���る
+        <code>%{<var>var</var>}c</code>
+        構文���������。)</p></td></tr>
+<tr><td><code>%I</code></td>
+        <td>リクエスト�ヘッダを�む�������イト数。
+        0 ���ら��。
+        �れを使用�る���� <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> �必�</td></tr>
+<tr class="odd"><td><code>%O</code></td>
+        <td>ヘッダを�む��信���イト数。0 ���ら��。
+        �れを使用�る���� <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> �必�</td></tr>
+</table>
+
+    <h3><a name="modifiers" id="modifiers">修飾�</a></h3>
+
+      <p>特定��素� "%" �直後� HTTP ステータスコードをカンマ区切り�
+      指定�る����表示を制��る�������。例�� 
+      <code>"%400,501{User-agent}i"</code> ���
+      400 � 500 番エラー��� <code>User-agent</code> をログ���。
+      他�ステータスコード�� <code>"-"</code> ���文字列�
+      ログ�れ��。ステータスコード�リスト� "<code>!</code>" 
+      ��定を指定�る������� :
+      <code>"%!200,304,302{Referer}i"</code> ��指定�れ�
+      3 ��コード�<em>�れ�も該当���</em>リクエスト全��
+      <code>Referer</code> をログ���。</p>
+
+      <p>修飾� "&lt;" � "&gt;" �内部リダイレクト�れ�リクエスト�ログ�
+      元�リクエスト�最終的�リクエスト���らを使用�る�を
+      指定�る���使���。デフォルト���<code>%</code> ディレクティブ�
+      <code>%s, %U, %T, %D, %r</code> �元�リクエストを�他�最終的�リクエストを
+      使用���。例���リクエスト�最終ステータスを記録�る��
+      <code>%&gt;s</code> を�内部的��証�れ����リソース�リダイレクト�れ�
+      リクエスト�元�リクエスト��証�れ�ユーザを記録�る����
+      <code>%&lt;u</code> を使��������。</p>
+
+    
+
+    <h3><a name="format-notes" id="format-notes">��他注�点</a></h3>
+
+      <p>セキュリティ上��由�より 2.0.46 より�
+      <code>%r</code>, <code>%i</code>, <code>%o</code> �入���る�
+      �字��能�文字�他�特別�文字��<code>\x<var>hh</var></code> 
+      ���形��文字列�エスケープ�れるよ���り���。<var>hh</var> �
+      ������イト�値� 16 進��値��。���則�例外���
+      �ックスラッシュを使��エスケープ�れる <code>"</code> � <code>\</code> ��
+      C 形��表記法�使�れる空白文字 (<code>\n</code>, <code>\t</code> ��)
+      ��り��。2.0.46 以���ージョン��エスケープ処��行�れ��ん���
+      生ログファイルを扱�際�注��必���。</p>
+
+      <p>httpd 2.0 �� 1.3 ��異�り�<code>%b</code> � <code>%B</code>
+      フォーマット文字列�クライアント��信�れ��イト数��も������
+      HTTP レス�ンス��イト数�� (�れら�異�るも��������
+      コ�クション�途中�破棄�れ�場�や�SSL 使用時�一致���ん) 。
+      <code class="module"><a href="../mod/mod_logio.html">mod_logio</a></code> ��供�れ��る <code>%O</code>
+      フォーマット文字列���ットワーク経由�実際�転��れ��イト数を
+      記録����。</p>
+
+    
+
+    <h3><a name="examples" id="examples">例</a></h3>
+
+      <p>よ�使�れるフォーマット文字列�:</p>
+
+      <dl>
+        <dt>Common Log Format (CLF)</dt>
+        <dd><code>"%h %l %u %t \"%r\" %&gt;s %b"</code></dd>
+
+        <dt>�ー�ャルホスト付� Common Log Format</dt>
+        <dd><code>"%v %h %l %u %t \"%r\" %&gt;s %b"</code></dd>
+
+        <dt>NCSA extended/combined ログ書�</dt>
+        <dd><code>"%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\"
+        \"%{User-agent}i\""</code></dd>
+
+        <dt>Referer ログ書�</dt>
+        <dd><code>"%{Referer}i -&gt; %U"</code></dd>
+
+        <dt>Agent (ブラウザ) ログ書�</dt>
+        <dd><code>"%{User-agent}i"</code></dd>
+      </dl>
+    
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="security" id="security">セキュリティ�関��</a></h2>
+    <p>ログファイル��存�れ��るディレクトリ�サー�を起動��以外�ユーザ�
+    書�込��能����セキュリティ��題�発生�る�由�詳細�<a href="../misc/security_tips.html#serverroot">セキュリティ���</a>
+    を�照������。</p>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="BufferedLogs" id="BufferedLogs">BufferedLogs</a> <a name="bufferedlogs" id="bufferedlogs">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ディスク�書�出���メモリ�ログエントリを�ッファ�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>BufferedLogs On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>BufferedLogs Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_log_config</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.0.41 以�</td></tr>
+</table>
+    <p><code class="directive">BufferedLogs</code> ディレクティブを使��
+    <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> �挙動�変化���
+    複数�ログを書�出�際���れ�れ�リクエスト処�後毎�
+    書�出����������んメモリ�蓄���ら�
+    ����ディスク�書�出�よ���り��。
+    ���果ディスクアクセス�より効率的��り�
+    高�パフォーマンス�得られるシステムも�る��ょ�。
+    ��ディレクティブ�サー�全体�一度��設定����; 
+    �ー�ャルホスト���設定�る�������ん。</p>
+
+    <div class="note">��ディレクティブ�実験的�も������
+    使用�る際�注�������。</div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CookieLog" id="CookieLog">CookieLog</a> <a name="cookielog" id="cookielog">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>クッキング�ロギング����ファイル�を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CookieLog <var>filename</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_log_config</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>��ディレクティブ��推奨</td></tr>
+</table>
+    <p><code class="directive">CookieLog</code>
+    ディレクティブ�クッキー�ロギング����ファイル�を
+    設定���。filename � <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
+    �ら�相対パス��。��ディレクティブ� <code>mod_cookies</code> ��互�性������
+    存在��使用�推奨�れ����ん。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CustomLog" id="CustomLog">CustomLog</a> <a name="customlog" id="customlog">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ログファイル����書�を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CustomLog  <var>file</var>|<var>pipe</var>
+<var>format</var>|<var>nickname</var>
+[env=[!]<var>environment-variable</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_log_config</td></tr>
+</table>
+    <p><code class="directive">CustomLog</code> ディレクティブ�サー���リクエストを
+    ログ�集�る���使�れ��。ログ�書��指定�れ�
+    環境変数を使��ロギング��件�応��行��れるよ���る��も����。</p>
+
+    <p>ログ�書�れる場所を指定�る最��引数�以下�二��形��値を
+    �る�������:</p>
+
+    <dl>
+      <dt><var>file</var></dt>
+      <dd><code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
+      �ら�相対パス�表�れるファイル�。</dd>
+
+      <dt><var>pipe</var></dt>
+      <dd>パイプ文字 "<code>|</code>" ����後�標準入力�らログ�
+      情報を���るプログラム��パス�続��も�。
+
+      <div class="warning"><h3>セキュリティ</h3>
+      <p>も�プログラム�使用�れ�場��
+      <code class="program"><a href="../programs/httpd.html">httpd</a></code> �起動�れ�ユーザ���実行�れ��。�れ�サー��
+      root �よ��起動�れ�場�� root ��り��。プログラム�
+      安全��るよ��留�������。</p>
+      </div>
+      <div class="warning"><h3>注</h3>
+        <p>Unix ���プラットフォーム�ファイル�パスを入力���る����
+        使用���るプラットフォーム��ックスラッシュ�使用を許�����
+        ����通常�スラッシュ��を使�よ��気を�������。
+        一般的��設定ファイル中��常�普通�スラッシュ��を使�よ���る
+        方�良���。</p>
+      </div></dd>
+    </dl>
+
+    <p>二���引数�ログファイル�何�書�れる�を指定���。
+    ���る <code class="directive"><a href="#logformat">LogFormat</a></code> ディレクティブ�より
+    定義�れ� <var>nickname</var> ��<a href="#formats">ログ�書�</a>
+    �����説明�れ��る�明示的� <var>format</var> 文字列�
+    ��ら�を指定�る�������。</p>
+
+    <p>例���以下�二��ディレクティブ群�全���効果をも�ら���:</p>
+
+    <div class="example"><p><code>
+      # CustomLog with format nickname<br />
+      LogFormat "%h %l %u %t \"%r\" %&gt;s %b" common<br />
+      CustomLog logs/access_log common<br />
+      <br />
+      # CustomLog with explicit format string<br />
+      CustomLog logs/access_log "%h %l %u %t \"%r\" %&gt;s %b"
+    </code></p></div>
+
+    <p>三�目�引数��略�能��サー��環境��る変数��る�����
+    応��リクエストをログ�集�る����を制御�る���使��������。
+    指定�れ�<a href="../env.html">環境変数</a>�リクエスト�対��
+    設定�れ���場� ('<code>env=!<var>name</var></code>' 文�使�れ����
+    設定�れ����場�)�リクエスト�ログ�集�れ��。</p>
+
+    <p>環境変数� <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code> モジュール�
+    <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> モジュール�両方も���
+    片方を用��リクエスト���設定�る�������。
+    例���サー���る���� GIF 画���リクエストを別�ログファイル
+    ��記録����れ��メインログ��記録������������
+    以下�も�を使��������:</p>
+    
+    <div class="example"><p><code>
+      SetEnvIf Request_URI \.gif$ gif-image<br />
+      CustomLog gif-requests.log common env=gif-image<br />
+      CustomLog nongif-requests.log common env=!gif-image
+    </code></p></div>
+
+    <p>�� RefererIgnore ディレクティブ���挙動を����場���
+    次�よ�����:</p>
+
+    <div class="example"><p><code>
+    SetEnvIf Referer example\.com localreferer<br />
+    CustomLog referer.log referer env=!localreferer
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LogFormat" id="LogFormat">LogFormat</a> <a name="logformat" id="logformat">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ログファイル�使用�る書�を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LogFormat <var>format</var>|<var>nickname</var>
+[<var>nickname</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>LogFormat "%h %l %u %t \"%r\" %&gt;s %b"</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_log_config</td></tr>
+</table>
+    <p>��ディレクティブ�アクセスログファイル�書�を指定���。</p>
+
+    <p><code class="directive">LogFormat</code> ディレクティブ�二��形����ら�を
+    �る�������。最��形���一��引数���指定�れ�
+    続� <code class="directive">TransferLog</code>
+    �指定�れ�ログ�使�れるログ�書�を設定���。���独�引数��
+    上�<a href="#formats">カスタムログ書�</a>�説明�れ��るよ��
+    <var>format</var> を明示的�指定�る�������。
+    も����下�説明�れ��るよ���� <code class="directive">LogFormat</code>
+    ディレクティブ�定義�れ�ログ�書�を <var>nickname</var>を使��
+    �照�る��も����。</p>
+
+    <p><code class="directive">LogFormat</code> ディレクティブ�二���形��
+    <var>format</var> � <var>nickname</var> を与���。
+    フォーマット文字列全体を��書���り��
+    �� <var>nickname</var> を続�� <code class="directive">LogFormat</code> ディレクティブや
+    <code class="directive">CustomLog</code> ディレクティブ�使��������。
+    Nickname を定義�る <code class="directive">LogFormat</code> ディレクティブ�
+    <strong>他��何も���ん</strong> -- �����ニック�ームを定義
+    �る<em>��</em>��実際�書�を�用��デフォルト��る������行����ん。
+    ���ら��れ�続� <code class="directive"><a href="#transferlog">TransferLog</a></code>
+    ディレクティブ��影響を与���ん。
+    �ら��<code class="directive">LogFormat</code> ディレクティブ�既存� nickname を
+    使��別� nickname を定義�る�������ん。Nickname ��
+    パーセント記� (<code>%</code>) ���れ�����������も注�
+    ������。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost_common
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="TransferLog" id="TransferLog">TransferLog</a> <a name="transferlog" id="transferlog">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ログファイル��置を指定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>TransferLog <var>file</var>|<var>pipe</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_log_config</td></tr>
+</table>
+    <p>��ディレクティブ��ログ書�を直接指定��������
+    �件付�ロギング�無���を除���<code class="directive"><a href="#customlog">CustomLog</a></code> �全���引数�効果��り��。
+    直接ログ書�を指定�る代�り��ログ�書�������一番最後�指定�れ�
+    ニック�ームを定義���
+    <code class="directive"><a href="#logformat">LogFormat</a></code> ディレクティブ
+	�定義�れ�も�を使���。
+    も�他�書��全�指定�れ������� Common Log Format
+    �使�れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      LogFormat "%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\" \"%{User-agent}i\""<br />
+      TransferLog logs/access_log
+    </code></p></div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_log_config.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_log_config.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_log_config.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_log_config.html.ko.euc-kr b/docs/manual/mod/mod_log_config.html.ko.euc-kr
index 09f9bb9a..5252e944 100644
--- a/docs/manual/mod/mod_log_config.html.ko.euc-kr
+++ b/docs/manual/mod/mod_log_config.html.ko.euc-kr
@@ -396,6 +396,6 @@
 <a href="../ja/mod/mod_log_config.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_log_config.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_log_forensic.html b/docs/manual/mod/mod_log_forensic.html
index ede26709..6b27250e 100644
--- a/docs/manual/mod/mod_log_forensic.html
+++ b/docs/manual/mod/mod_log_forensic.html
@@ -1,7 +1,9 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_log_forensic.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_log_forensic.html.ja.euc-jp
+URI: mod_log_forensic.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/mod_log_forensic.html.en b/docs/manual/mod/mod_log_forensic.html.en
index 0065619f..b88dabc8 100644
--- a/docs/manual/mod/mod_log_forensic.html.en
+++ b/docs/manual/mod/mod_log_forensic.html.en
@@ -157,6 +157,6 @@ version 2.1</td></tr></table>
 <p><span>Available Languages: </span><a href="../en/mod/mod_log_forensic.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_log_forensic.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_log_forensic.html.ja.euc-jp b/docs/manual/mod/mod_log_forensic.html.ja.euc-jp
deleted file mode 100644
index 4c937621..00000000
--- a/docs/manual/mod/mod_log_forensic.html.ja.euc-jp
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_log_forensic - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_log_forensic</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_log_forensic.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_log_forensic.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤ËÁ÷¤é¤ì¤¿¥ê¥¯¥¨¥¹¥È¤Î forensic ¥í¥®¥ó¥°</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>log_forensic_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_log_forensic.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td><code class="module"><a href="../mod/mod_unique_id.html">mod_unique_id</a></code> ¤Ï¥Ð¡¼¥¸¥ç¥ó 2.1 ¤«¤é¤Ïɬ¿Ü¤Ç¤Ï
-¤Ê¤¯¤Ê¤Ã¤¿</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¥¯¥é¥¤¥¢¥ó¥È¥ê¥¯¥¨¥¹¥È¤Î forensic ¥í¥®¥ó¥°¤ò
-    ¹Ô¤Ê¤¤¤Þ¤¹¡£¥í¥°¼ý½¸¤Ï¥ê¥¯¥¨¥¹¥È¤Î½èÍý¤ÎÁ°¤È¸å¤Ë¹Ô¤Ê¤ï¤ì¤Þ¤¹¤Î¤Ç¡¢
-    forensic ¥í¥°¤Ï³Æ¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤ÆÆó¹Ô¥í¥°¼ý½¸¤·¤Þ¤¹¡£
-    Forensic ¥í¥¬¡¼¤ÏÈó¾ï¤Ë¸·Ì©¤Ç¤¹¡£¤³¤ì¤Ï°Ê²¼¤Î¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹:</p>
-
-    <ul>
-    <li>¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï¸ÇÄê¤Ç¤¹¡£¼Â¹Ô»þ¤Ë¥í¥®¥ó¥°¥Õ¥©¡¼¥Þ¥Ã¥È¤òÊѹ¹¤¹¤ë¤³¤È¤Ï
-    ¤Ç¤­¤Þ¤»¤ó¡£</li>
-    <li>¥Ç¡¼¥¿¤ò½ñ¤±¤Ê¤¤¾ì¹ç¤Ï»Ò¥×¥í¥»¥¹¤Ï¤½¤Î¾ì¤Ç½ªÎ»¤·¡¢¤µ¤é¤Ë¥³¥¢¤ò
-    ¥À¥ó¥×¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó (<code class="directive"><a href="../mod/mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÀßÄê¤Ë°Í¤ê¤Þ¤¹)¡£</li>
-    </ul>
-
-    <p>Forensic ¥í¥°¤Î½ÐÎϤò¸¡ºº¤¹¤ë¤¿¤á¤Ë¤Ï¡¢
-    ÇÛÉÛʪ¤Î support ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë <code>check_forensic</code> 
-    ¥¹¥¯¥ê¥×¥È¤¬Ìò¤ËΩ¤Ä¤Ç¤·¤ç¤¦¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#forensiclog">ForensicLog</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#formats">Forensic ¥í¥°¥Õ¥©¡¼¥Þ¥Ã¥È</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#security">¥»¥­¥å¥ê¥Æ¥£¤ÎÌäÂê</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><a href="../logs.html">Apache ¥í¥°¥Õ¥¡¥¤¥ë</a></li>
-<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="formats" id="formats">Forensic ¥í¥°¥Õ¥©¡¼¥Þ¥Ã¥È</a></h2>
-    <p>³Æ¥ê¥¯¥¨¥¹¥È¤Ï2²ó¥í¥°¼ý½¸¤µ¤ì¤Þ¤¹¡£ºÇ½é¤Ï¥ê¥¯¥¨¥¹¥È¤¬½èÍý¤µ¤ì¤ë
-    <em>Á°</em> (¤Ä¤Þ¤ê¡¢¥Ø¥Ã¥À¤ò¼õ¤±¼è¤Ã¤¿¸å) ¤Ç¤¹¡£2ÅÙÌÜ¤Î¥í¥°¤Ï
-    ¥ê¥¯¥¨¥¹¥È¤¬½èÍý¤µ¤ì¤¿<em>¸å</em>¡¢Ä̾ï¤Î¥í¥°¼ý½¸¤ÈƱ¤¸¤È¤­¤Ë
-    ¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£</p>
-
-    <p>³Æ¥ê¥¯¥¨¥¹¥È¤ò¼±Ê̤¹¤ë¤¿¤á¤Ë¡¢¥ê¥¯¥¨¥¹¥È¤Ë¤Ï
-    °ì°Õ¤Ê¥ê¥¯¥¨¥¹¥È ID ¤¬³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹¡£¤³¤Î forensic ID ¤Ï
-    ¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó <code>%{forensic-id}n</code> ¤ò»È¤¦¤³¤È¤Ç
-    Ä̾ï¤Î transfer ¥í¥°¤Ë¥í¥°¼ý½¸¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-    <code class="module"><a href="../mod/mod_unique_id.html">mod_unique_id</a></code> ¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¤½¤ì¤¬À¸À®¤¹¤ë
-    ID ¤¬»È¤ï¤ì¤Þ¤¹¡£</p>
-
-    <p>ºÇ½é¤Î¹Ô¤Ï forensic ID¡¢¥ê¥¯¥¨¥¹¥È¹Ô¤È¼õ¤±¼è¤Ã¤¿¤¹¤Ù¤Æ¤Î¥Ø¥Ã¥À¤ò
-    ¥Ñ¥¤¥×ʸ»ú (<code>|</code>) ¤ÇʬΥ¤·¤Æ¥í¥°¼ý½¸¤·¤Þ¤¹¡£
-    Î㤨¤Ð°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹ (¼ÂºÝ¤Ï¤¹¤Ù¤ÆƱ¤¸¹Ô¤Ë¤Ê¤ê¤Þ¤¹):</p>
-
-    <div class="example"><p><code>
-        +yQtJf8CoAB4AAFNXBIEAAAAA|GET /manual/de/images/down.gif
-        HTTP/1.1|Host:localhost%3a8080|User-Agent:Mozilla/5.0 (X11;
-        U; Linux i686; en-US; rv%3a1.6) Gecko/20040216
-        Firefox/0.8|Accept:image/png, <var>etc...</var>
-    </code></p></div>
-
-    <p>ºÇ½é¤Î¥×¥é¥¹Ê¸»ú¤¬¤³¤Î¥í¥°¤ÏºÇ½é¤Î¥í¥°¤Ç¤¢¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£
-    ÆóÈÖÌܤιԤϥޥ¤¥Ê¥¹Ê¸»ú¤È ID ¤Î¤ß¤Ç¤¹:</p>
-
-    <div class="example"><p><code>
-      -yQtJf8CoAB4AAFNXBIEAAAAA
-    </code></p></div>
-
-    <p><code>check_forensic</code> ¥¹¥¯¥ê¥×¥È¤Ï°ú¿ô¤È¤·¤Æ¥í¥°¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò
-    ¼è¤ê¤Þ¤¹¡£<code>+</code>/<code>-</code> ¤Î ID ¤ÎÁȤòÄ´¤Ù¡¢´°Î»¤·¤Æ¤¤¤Ê¤¤
-    ¥ê¥¯¥¨¥¹¥È¤¬¤¢¤ë¾ì¹ç¤Ï·Ù¹ð¤òȯ¤·¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="security" id="security">¥»¥­¥å¥ê¥Æ¥£¤ÎÌäÂê</a></h2>
-    <p>¥í¥°¥Õ¥¡¥¤¥ë¤¬Êݸ¤µ¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê¤¬¥µ¡¼¥Ð¤òµ¯Æ°¤·¤¿¥æ¡¼¥¶
-    °Ê³°¤Ç½ñ¤­¹þ¤ß²Äǽ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤È¤­¤Ë¥»¥­¥å¥ê¥Æ¥£¤¬Çˤé¤ì¤ë²ÄǽÀ­¤¬
-    ¤¢¤ë¤³¤È¤Ë¤Ä¤¤¤Æ¤Î¾ÜºÙ¤Ï<a href="../misc/security_tips.html#serverroot">¥»¥­¥å¥ê¥Æ¥£¤Î¤³¤Ä</a>¤ò
-    »²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ForensicLog" id="ForensicLog">ForensicLog</a> <a name="forensiclog" id="forensiclog">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>Forensic ¥í¥°¤Î¥Õ¥¡¥¤¥ë̾¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ForensicLog <var>filename</var>|<var>pipe</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_log_forensic</td></tr>
-</table>
-    <p><code class="directive">ForensicLog</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï forensic ²òÀϤΤ¿¤á¤Î
-    ¥µ¡¼¥Ð¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ò¥í¥°¼ý½¸¤Ë»È¤¤¤Þ¤¹¡£
-    ³Æ¥í¥°¥¨¥ó¥È¥ê¤Ë¤Ï¡¢ÉáÄ̤Π<code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ¥ê¥¯¥¨¥¹¥È¤È´ØÏ¢ÉÕ¤±¤ë¤³¤È¤Î
-    ¤Ç¤­¤ë
-    °ì°Õ¤Ê ID ¤¬³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹¡£<code class="module"><a href="../mod/mod_log_forensic.html">mod_log_forensic</a></code> ¤Ï
-    <code>forensic-id</code> ¤È¤¤¤¦¥È¡¼¥¯¥ó¤òºîÀ®¤·¡¢¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó
-    <code>%{forensic-id}n</code> ¤ò»È¤¦¤³¤È¤Ç¤½¤Î¥È¡¼¥¯¥ó¤ò transfer ¥í¥°¤Ë
-    Äɲ乤뤳¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>°ú¿ô¤Ï¥í¥°¤¬½ñ¤­½Ð¤µ¤ì¤ë°ÌÃÖ¤ò»ØÄꤷ¡¢°Ê²¼¤Î 2¼ïÎà¤ÎÃͤΤɤÁ¤é¤«¤ò
-    ¼è¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-    <dl>
-      <dt><var>filename</var></dt>
-      <dd><code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> ¤«¤é¤Î
-      ÁêÂÐ¥Õ¥¡¥¤¥ë̾</dd>
-
-      <dt><var>pipe</var></dt>
-      <dd>¥Ñ¥¤¥×ʸ»ú "<code>|</code>" ¤È¡¢¤½¤Î¸å¤Ë¥í¥°¾ðÊó¤òɸ½àÆþÎϤ«¤é
-      ¼õ¤±¼è¤ë¥×¥í¥°¥é¥à¡£¥×¥í¥°¥é¥à̾¤Ï <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> ¤«¤é¤ÎÁêÂХѥ¹¤È¤·¤Æ¤â
-      »ØÄê¤Ç¤­¤Þ¤¹¡£
-
-      <div class="warning"><h3>¥»¥­¥å¥ê¥Æ¥£:</h3>
-      <p>¥×¥í¥°¥é¥à¤ò»È¤¦¾ì¹ç¡¢¤½¤Î¥×¥í¥°¥é¥à¤Ï <code class="program"><a href="../programs/httpd.html">httpd</a></code> ¤òµ¯Æ°¤·¤¿¥æ¡¼¥¶¤Ç
-      ¼Â¹Ô¤µ¤ì¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¥µ¡¼¥Ð¤¬ root ¤Ç¼Â¹Ô¤µ¤ì¤¿¾ì¹ç¤Ï root ¤Ç
-      ¼Â¹Ô¤µ¤ì¤ë¤È¤¤¤¦¤³¤È¤Ç¤¹¡£¥×¥í¥°¥é¥à¤¬°ÂÁ´¤Ç¤¢¤ë¤«¡¢¤è¤ê¸¢¸Â¤Î¾¯¤Ê¤¤
-      ¥æ¡¼¥¶¤ËÀÚ¤êÂؤ¨¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤ò³Î¤«¤á¤Æ¤¯¤À¤µ¤¤¡£</p>
-      </div>
-
-      <div class="note"><h3>Ãí</h3>
-        <p>Unix °Ê³°¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ¹¤ë¤È¤­¤Ï¡¢
-        ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤¬¥Ð¥Ã¥¯¥¹¥é¥Ã¥·¥å¤Î»ÈÍѤòµö²Ä¤·¤Æ¤¤¤ë¾ì¹ç¤Ç¤â¡¢
-        ¥¹¥é¥Ã¥·¥å¤Î¤ß¤¬»È¤ï¤ì¤ë¤è¤¦¤Ëµ¤¤ò¤Ä¤±¤Æ¤¯¤À¤µ¤¤¡£
-        ÉáÄ̤ÏÀßÄê¥Õ¥¡¥¤¥ë¤¹¤Ù¤Æ¤Ë¤ª¤¤¤Æ¡¢¥¹¥é¥Ã¥·¥å¤ÎÊý¤ò»ÈÍѤ¹¤ë¤è¤¦¤Ë
-        ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-      </div></dd>
-    </dl>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_log_forensic.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_log_forensic.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_log_forensic.html.ja.utf8 b/docs/manual/mod/mod_log_forensic.html.ja.utf8
new file mode 100644
index 00000000..5701f095
--- /dev/null
+++ b/docs/manual/mod/mod_log_forensic.html.ja.utf8
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_log_forensic - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_log_forensic</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_log_forensic.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_log_forensic.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>サー���られ�リクエスト� forensic ロギング</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>log_forensic_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_log_forensic.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td><code class="module"><a href="../mod/mod_unique_id.html">mod_unique_id</a></code> ��ージョン 2.1 �ら�必須��
+�����</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール�クライアントリクエスト� forensic ロギングを
+    行����。ログ�集�リクエスト�処����後�行��れ�����
+    forensic ログ��リクエスト�対��二行ログ�集���。
+    Forensic ロガー��常�厳密��。�れ�以下���を�味���:</p>
+
+    <ul>
+    <li>フォーマット�固定��。実行時�ロギングフォーマットを変更�る���
+    ����ん。</li>
+    <li>データを書���場���プロセス���場�終了���ら�コアを
+    ダンプ�る�も�れ��ん (<code class="directive"><a href="../mod/mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></code> ディレクティブ�設定��り��)。</li>
+    </ul>
+
+    <p>Forensic ログ�出力を検査�る�����
+    �布物� support ディレクトリ��る <code>check_forensic</code> 
+    スクリプト�役�立���ょ�。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#forensiclog">ForensicLog</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#formats">Forensic ログフォーマット</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#security">セキュリティ��題</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><a href="../logs.html">Apache ログファイル</a></li>
+<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="formats" id="formats">Forensic ログフォーマット</a></h2>
+    <p>�リクエスト�2回ログ�集�れ��。最��リクエスト�処��れる
+    <em>�</em> (��り�ヘッダを�����後) ��。2度目�ログ�
+    リクエスト�処��れ�<em>後</em>�通常�ログ�集������
+    行��れ��。</p>
+
+    <p>�リクエストを識別�る����リクエスト��
+    一��リクエスト ID �割り当�られ��。�� forensic ID �
+    フォーマット文字列 <code>%{forensic-id}n</code> を使����
+    通常� transfer ログ�ログ�集�る��も����。
+    <code class="module"><a href="../mod/mod_unique_id.html">mod_unique_id</a></code> を使���る場����れ�生��る
+    ID �使�れ��。</p>
+
+    <p>最��行� forensic ID�リクエスト行����������ヘッダを
+    パイプ文字 (<code>|</code>) �分離��ログ�集���。
+    例��以下�よ���り�� (実際������行��り��):</p>
+
+    <div class="example"><p><code>
+        +yQtJf8CoAB4AAFNXBIEAAAAA|GET /manual/de/images/down.gif
+        HTTP/1.1|Host:localhost%3a8080|User-Agent:Mozilla/5.0 (X11;
+        U; Linux i686; en-US; rv%3a1.6) Gecko/20040216
+        Firefox/0.8|Accept:image/png, <var>etc...</var>
+    </code></p></div>
+
+    <p>最��プラス文字���ログ�最��ログ��る��を示���。
+    二番目�行�マイナス文字� ID ����:</p>
+
+    <div class="example"><p><code>
+      -yQtJf8CoAB4AAFNXBIEAAAAA
+    </code></p></div>
+
+    <p><code>check_forensic</code> スクリプト�引数���ログファイル���を
+    �り��。<code>+</code>/<code>-</code> � ID �組を調��完了�����
+    リクエスト��る場��警告を発���。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="security" id="security">セキュリティ��題</a></h2>
+    <p>ログファイル��存�れるディレクトリ�サー�を起動��ユーザ
+    以外�書�込��能�����る���セキュリティ�破られる�能性�
+    �る�������詳細�<a href="../misc/security_tips.html#serverroot">セキュリティ���</a>を
+    �照������。</p>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ForensicLog" id="ForensicLog">ForensicLog</a> <a name="forensiclog" id="forensiclog">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Forensic ログ�ファイル�を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ForensicLog <var>filename</var>|<var>pipe</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_log_forensic</td></tr>
+</table>
+    <p><code class="directive">ForensicLog</code> ディレクティブ� forensic 解�����
+    サー���リクエストをログ�集�使���。
+    �ログエントリ���普通� <code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code> ディレクティブを使��リクエスト�関連付�る���
+    ��る
+    一�� ID �割り当�られ��。<code class="module"><a href="../mod/mod_log_forensic.html">mod_log_forensic</a></code> �
+    <code>forensic-id</code> ���トークンを作���フォーマット文字列
+    <code>%{forensic-id}n</code> を使������トークンを transfer ログ�
+    追加�る�������。</p>
+
+    <p>引数�ログ�書�出�れる�置を指定��以下� 2種類�値���ら�を
+    �る�������:</p>
+
+    <dl>
+      <dt><var>filename</var></dt>
+      <dd><code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> �ら�
+      相対ファイル�</dd>
+
+      <dt><var>pipe</var></dt>
+      <dd>パイプ文字 "<code>|</code>" ����後�ログ情報を標準入力�ら
+      ���るプログラム。プログラム�� <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> �ら�相対パス���も
+      指定����。
+
+      <div class="warning"><h3>セキュリティ:</h3>
+      <p>プログラムを使�場����プログラム� <code class="program"><a href="../programs/httpd.html">httpd</a></code> を起動��ユーザ�
+      実行�れ��。��り�サー�� root �実行�れ�場�� root �
+      実行�れる�������。プログラム�安全��る��より権��少��
+      ユーザ�切り替�るよ������る��を確�������。</p>
+      </div>
+
+      <div class="note"><h3>注</h3>
+        <p>Unix 以外�プラットフォーム�ファイル�を入力�る����
+        プラットフォーム��ックスラッシュ�使用を許����る場��も�
+        スラッシュ���使�れるよ��気を�������。
+        普通�設定ファイル��������スラッシュ�方を使用�るよ��
+        ������。</p>
+      </div></dd>
+    </dl>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_log_forensic.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_log_forensic.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_logio.html b/docs/manual/mod/mod_logio.html
index 225d49bf..c37fd7b3 100644
--- a/docs/manual/mod/mod_logio.html
+++ b/docs/manual/mod/mod_logio.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_logio.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_logio.html.ja.euc-jp
+URI: mod_logio.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_logio.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_logio.html.en b/docs/manual/mod/mod_logio.html.en
index 3d97074a..8b18b52a 100644
--- a/docs/manual/mod/mod_logio.html.en
+++ b/docs/manual/mod/mod_logio.html.en
@@ -41,6 +41,11 @@
 
     <p>This module requires <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code>.</p>
 
+    <div class="note">When KeepAlive connections are used with SSL, the overhead of the SSL
+    handshake is reflected in the byte count of the first request on the
+    connection.  When per-directory SSL renegotiation occurs, the bytes are associated
+    with the request that triggered the renegotiation.</div>
+
 </div>
 <div id="quickview"><h3 class="directives">Directives</h3>
 <p>This module provides no
@@ -86,6 +91,6 @@
 <a href="../ja/mod/mod_logio.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_logio.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_logio.html.ja.euc-jp b/docs/manual/mod/mod_logio.html.ja.euc-jp
deleted file mode 100644
index c37a188e..00000000
--- a/docs/manual/mod/mod_logio.html.ja.euc-jp
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_logio - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_logio</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_logio.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_logio.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_logio.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥ê¥¯¥¨¥¹¥ÈËè¤ËÆþÎϥХ¤¥È¿ô¤È½ÐÎϥХ¤¥È¿ô¤È¤ò¥í¥®¥ó¥°</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>logio_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_logio.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¥ê¥¯¥¨¥¹¥È¤´¤È¤Ë¼õ¤±¼è¤Ã¤¿¥Ð¥¤¥È¿ô¤È
-    Á÷¿®¤·¤¿¥Ð¥¤¥È¿ô¤Î¥í¥®¥ó¥°¤ò¹Ô¤Ê¤¦µ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£
-    µ­Ï¿¤µ¤ì¤ë¿ô»ú¤Ï¥ê¥¯¥¨¥¹¥È¤Î¥Ø¥Ã¥À¤È¥ì¥¹¥Ý¥ó¥¹¤ÎËÜÂΤò
-    È¿±Ç¤·¤¿¡¢¼ÂºÝ¤Ë¥Í¥Ã¥È¥ï¡¼¥¯¤Ç¼õ¤±¼è¤Ã¤¿¥Ð¥¤¥ÈÃͤǤ¹¡£
-    ÆþÎÏ¤Ç¤Ï SSL/TLS ¤ÎÁ°¤Ë¡¢½ÐÎÏ¤Ç¤Ï SSL/TLS ¤Î¸å¤Ë¿ô¤¨¤ë¤Î¤Ç¡¢
-    ¿ô»ú¤Ï°Å¹æ¤Ë¤è¤ëÊѲ½¤âÀµ¤·¤¯È¿±Ç¤·¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Î»ÈÍÑ¤Ë¤Ï <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> ¥â¥¸¥å¡¼¥ë¤¬
-    ɬÍפǤ¹¡£</p>
-
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤¢¤ê¤Þ¤»¤ó¡£</p>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#formats">¥«¥¹¥¿¥à¥í¥°½ñ¼°</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
-<li><a href="../logs.html">Apache ¥í¥°¥Õ¥¡¥¤¥ë</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="formats" id="formats">¥«¥¹¥¿¥à¥í¥°½ñ¼°</a></h2>
-
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¿·¤·¤¤¥í¥®¥ó¥°Íѥǥ£¥ì¥¯¥Æ¥£¥Ö¤ò²Ã¤¨¤Þ¤¹¡£
-    ¥ê¥¯¥¨¥¹¥È¼«¿È¤ÎÆÃħ¤Ï¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ë¡¢°Ê²¼¤ÎÍͤËÃÖ´¹¤µ¤ì¤ë
-     "<code>%</code>" ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    Æþ¤ì¤ë¤³¤È¤Ç¥í¥°¼ý½¸¤µ¤ì¤Þ¤¹:</p>
-
-    <table class="bordered"><tr class="header"><th>¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó</th>
-        <th>ÀâÌÀ</th></tr>
-<tr><td><code>%...I</code></td>
-        <td>¥ê¥¯¥¨¥¹¥È¤È¥Ø¥Ã¥À¤ò´Þ¤à¡¢¼õ¤±¼è¤Ã¤¿¥Ð¥¤¥È¿ô¡£
-        0 ¤Ë¤Ï¤Ê¤é¤Ê¤¤¡£</td></tr>
-<tr class="odd"><td><code>%...O</code></td>
-        <td>¥Ø¥Ã¥À¤ò´Þ¤à¡¢Á÷¿®¤·¤¿¥Ð¥¤¥È¿ô¡£0 ¤Ë¤Ï¤Ê¤é¤Ê¤¤¡£</td></tr>
-</table>
-
-    <p>Ä̾¤³¤Îµ¡Ç½¤Ï°Ê²¼¤ÎÍͤ˻ÈÍѤµ¤ì¤Þ¤¹:</p>
-
-    <dl>
-      <dt>·ë¹ç I/O ¥í¥°½ñ¼°:</dt>
-      <dd><code>"%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\"
-      \"%{User-agent}i\" %I %O"</code></dd>
-    </dl>
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_logio.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_logio.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_logio.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_logio.html.ja.utf8 b/docs/manual/mod/mod_logio.html.ja.utf8
new file mode 100644
index 00000000..7b5534ea
--- /dev/null
+++ b/docs/manual/mod/mod_logio.html.ja.utf8
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_logio - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_logio</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_logio.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_logio.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_logio.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>リクエスト毎�入力�イト数�出力�イト数�をロギング</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>logio_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_logio.c</td></tr></table>
+<h3>概�</h3>
+
+
+    <p>��モジュール�リクエスト���������イト数�
+    �信���イト数�ロギングを行��機能を�供���。
+    記録�れる数字�リクエスト�ヘッダ�レス�ンス�本体を
+    �映���実際��ットワーク�������イト値��。
+    入力�� SSL/TLS ����出力�� SSL/TLS �後�数�る���
+    数字�暗��よる変化も正���映��も���り��。</p>
+
+    <p>��モジュール�使用�� <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> モジュール�
+    必���。</p>
+
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<p>��モジュール�ディレクティブ��り��ん。</p>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#formats">カスタムログ書�</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code></li>
+<li><a href="../logs.html">Apache ログファイル</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="formats" id="formats">カスタムログ書�</a></h2>
+
+
+    <p>��モジュール�新��ロギング用ディレクティブを加���。
+    リクエスト自身�特徴�フォーマット文字列��以下�様�置��れる
+     "<code>%</code>" ディレクティブを
+    入れる���ログ�集�れ��:</p>
+
+    <table class="bordered"><tr class="header"><th>フォーマット文字列</th>
+        <th>説明</th></tr>
+<tr><td><code>%...I</code></td>
+        <td>リクエスト�ヘッダを�む�������イト数。
+        0 ���ら��。</td></tr>
+<tr class="odd"><td><code>%...O</code></td>
+        <td>ヘッダを�む��信���イト数。0 ���ら��。</td></tr>
+</table>
+
+    <p>通常���機能�以下�様�使用�れ��:</p>
+
+    <dl>
+      <dt>�� I/O ログ書�:</dt>
+      <dd><code>"%h %l %u %t \"%r\" %&gt;s %b \"%{Referer}i\"
+      \"%{User-agent}i\" %I %O"</code></dd>
+    </dl>
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_logio.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_logio.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_logio.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_logio.html.ko.euc-kr b/docs/manual/mod/mod_logio.html.ko.euc-kr
index 0f5488b8..c1095d34 100644
--- a/docs/manual/mod/mod_logio.html.ko.euc-kr
+++ b/docs/manual/mod/mod_logio.html.ko.euc-kr
@@ -25,6 +25,8 @@
 <a href="../ja/mod/mod_logio.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_logio.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
+<div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
+            ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
 <table class="module"><tr><th><a href="module-dict.html#Description">¼³¸í:</a></th><td>¿äû´ç ÀÔÃâ·Â ¹ÙÀÌÆ®¼ö¸¦ ±â·Ï</td></tr>
 <tr><th><a href="module-dict.html#Status">»óÅÂ:</a></th><td>Extension</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">¸ðµâ¸í:</a></th><td>logio_module</td></tr>
@@ -87,6 +89,6 @@
 <a href="../ja/mod/mod_logio.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_logio.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_mem_cache.html b/docs/manual/mod/mod_mem_cache.html
index 65ba4978..987152e8 100644
--- a/docs/manual/mod/mod_mem_cache.html
+++ b/docs/manual/mod/mod_mem_cache.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_mem_cache.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_mem_cache.html.ja.euc-jp
+URI: mod_mem_cache.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_mem_cache.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_mem_cache.html.en b/docs/manual/mod/mod_mem_cache.html.en
index 69ec68e2..32d50ff7 100644
--- a/docs/manual/mod/mod_mem_cache.html.en
+++ b/docs/manual/mod/mod_mem_cache.html.en
@@ -41,7 +41,8 @@
     keys. Content with access protection is not cached.</p>
     
     <div class="note"><h3>Note</h3>In most cases <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code>
-    should be the preferred choice. This is explained further in the <a href="../caching.html#inmemory">Caching Guide</a>.</div>
+    should be the preferred choice. This is explained further in the <a href="../caching.html#inmemory">Caching Guide</a>.  In particular,
+    this module's cache is <em>per-process</em>.</div>
 </div>
 <div id="quickview"><h3 class="directives">Directives</h3>
 <ul id="toc">
@@ -234,6 +235,6 @@ KBytes</td></tr>
 <a href="../ja/mod/mod_mem_cache.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_mem_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_mem_cache.html.ja.euc-jp b/docs/manual/mod/mod_mem_cache.html.ja.euc-jp
deleted file mode 100644
index 2fb22f81..00000000
--- a/docs/manual/mod/mod_mem_cache.html.ja.euc-jp
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_mem_cache - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_mem_cache</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_mem_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_mem_cache.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_mem_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>URI ¤ò¥­¡¼¤Ë¤·¤¿¥³¥ó¥Æ¥ó¥Ä¤Î¥­¥ã¥Ã¥·¥å</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>mem_cache_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_mem_cache.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> ¤ò<em>ɬÍפȤ·¤Þ¤¹</em>¡£
-    ¤³¤ì¤Ï <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> ¤Î¥µ¥Ý¡¼¥È¥â¥¸¥å¡¼¥ë¤È¤·¤Æ
-    Æ°ºî¤·¡¢¥á¥â¥ê¤ò»ÈÍѤ·¤¿¥¹¥È¥ì¡¼¥¸´ÉÍýµ¡¹½¤òÄ󶡤·¤Þ¤¹¡£
-    <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> ¤ÏÆó¤Ä¤Î¥â¡¼¥É¤Î¤É¤Á¤é¤«¤ÇÆ°ºî¤¹¤ë¤è¤¦¤Ë
-    ÀßÄê¤Ç¤­¤Þ¤¹: ¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Î¥­¥ã¥Ã¥·¥å¤«¥Ò¡¼¥×Ãæ¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Î
-    ¥­¥ã¥Ã¥·¥å¤Ç¤¹¡£¥í¡¼¥«¥ë¤ÇÀ¸À®¤µ¤ì¤¿¥³¥ó¥Æ¥ó¥Ä¤ËÂФ·¤Æ¥­¥ã¥Ã¥·¥å¤¹¤ë¤È¤­¤ä¡¢
-    <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ¤ò»È¤Ã¤Æ <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code> (¤Ä¤Þ¤ê<dfn>¥ê¥Ð¡¼¥¹¥×¥í¥­¥·</dfn>¸þ¤±) ¤ËÀßÄꤷ¤¿¤È¤­¤Î¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤Î¥³¥ó¥Æ¥ó¥Ä¤ËÂФ·¤Æ
-    ¥­¥ã¥Ã¥·¥å¤ò¤¹¤ë¤È¤­¤Ë¡¢¤¿¤¤¤Ø¤ó¸ú²ÌŪ¤Ç¤¹¡£</p>
-
-    <p>¥³¥ó¥Æ¥ó¥Ä¤Î¥­¥ã¥Ã¥·¥å¤Ø¤ÎÊݸ¤È¼èÆÀ¤Ï URI ¤Ë´ð¤Å¤¤¤¿¥­¡¼¤¬»È¤ï¤ì¤Þ¤¹¡£
-    ¥¢¥¯¥»¥¹Êݸî¤Î¤«¤±¤é¤ì¤Æ¤¤¤ë¥³¥ó¥Æ¥ó¥Ä¤Ï¥­¥ã¥Ã¥·¥å¤µ¤ì¤Þ¤»¤ó¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#mcachemaxobjectcount">MCacheMaxObjectCount</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#mcachemaxobjectsize">MCacheMaxObjectSize</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#mcacheminobjectsize">MCacheMinObjectSize</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#mcachesize">MCacheSize</a></li>
-</ul>
-<h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code></li>
-<li><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code></li>
-</ul></div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="MCacheMaxObjectCount" id="MCacheMaxObjectCount">MCacheMaxObjectCount</a> <a name="mcachemaxobjectcount" id="mcachemaxobjectcount">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥­¥ã¥Ã¥·¥å¤ËÊݴɤµ¤ì¤ë¥ª¥Ö¥¸¥§¥¯¥È¤ÎºÇÂç¿ô</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>MCacheMaxObjectCount <var>value</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>MCacheMaxObjectCount 1009</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mem_cache</td></tr>
-</table>
-    <p><code class="directive">MCacheMaxObjectCount</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¥­¥ã¥Ã¥·¥å¤µ¤ì¤ë¥ª¥Ö¥¸¥§¥¯¥È¤ÎºÇÂç¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
-    ¤³¤ÎÃͤϥϥå·¥å¥Æ¡¼¥Ö¥ë¤òºîÀ®¤¹¤ë¤È¤­¤Ë»È¤ï¤ì¤Þ¤¹¡£
-    ¿·¤·¤¤¥ª¥Ö¥¸¥§¥¯¥È¤òÁÞÆþ¤¹¤ë¤È¤­¤Ë¡¢¥ª¥Ö¥¸¥§¥¯¥È¤ÎºÇÂç¿ô¤Ë
-    㤷¤Æ¤·¤Þ¤Ã¤Æ¤¤¤ë¤È¤­¡¢¿·¤·¤¤¥ª¥Ö¥¸¥§¥¯¥È¤ò¥­¥ã¥Ã¥·¥å¤Ç¤­¤ë¤è¤¦¤Ë¡¢
-    ¥ª¥Ö¥¸¥§¥¯¥È¤ò°ì¤Ä¾Ãµî¤·¤Þ¤¹¡£¥ª¥Ö¥¸¥§¥¯¥È¤Ï
-    <code class="directive"><a href="#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></code>
-    ¤Ç»ØÄꤵ¤ì¤¿¥¢¥ë¥´¥ê¥º¥à¤Ë½¾¤Ã¤Æºï½ü¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      MCacheMaxObjectCount 13001
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="MCacheMaxObjectSize" id="MCacheMaxObjectSize">MCacheMaxObjectSize</a> <a name="mcachemaxobjectsize" id="mcachemaxobjectsize">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥­¥ã¥Ã¥·¥å¤ËÊݴɤǤ­¤ë¥É¥­¥å¥á¥ó¥È¤ÎºÇÂ祵¥¤¥º (¥Ð¥¤¥È)</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>MCacheMaxObjectSize <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>MCacheMaxObjectSize 10000</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mem_cache</td></tr>
-</table>
-    <p><code class="directive">MCacheMaxObjectSize</code> ¤Ï¥É¥­¥å¥á¥ó¥È¤ò
-    ¥­¥ã¥Ã¥·¥å¤¹¤ë¤«¤É¤¦¤«¤òȽÄꤹ¤ë¡¢ºÇÂç¤Î¥µ¥¤¥º¤ò¥Ð¥¤¥È¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      MCacheMaxObjectSize 6400000
-    </code></p></div>
-
-    <div class="note"><h3>Ãí</h3>
-      <p><code class="directive">MCacheMaxObjectSize</code> ¤ÎÃÍ¤Ï <code class="directive"><a href="#mcacheminobjectsize">MCacheMinObjectSize</a></code>
-      ¤Ç»ØÄꤷ¤¿Ãͤè¤ê¤âÂ礭¤¯¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-    </div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="MCacheMaxStreamingBuffer" id="MCacheMaxStreamingBuffer">MCacheMaxStreamingBuffer</a> <a name="mcachemaxstreamingbuffer" id="mcachemaxstreamingbuffer">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¹¥È¥ê¡¼¥à¤µ¤ì¤Æ¤¤¤ë±þÅú¤ò¥­¥ã¥Ã¥·¥åÉÔǽ¤È·èÄꤹ¤ë¤Þ¤Ç¤Ë
-¥á¥â¥ê¤Ë¥Ð¥Ã¥Õ¥¡¤¹¤ëºÇÂçÎÌ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>MCacheMaxStreamingBuffer <var>size_in_bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>MCacheMaxStreamingBuffer of 100000 ¤« MCacheMaxObjectSize ¤Î¾¯¤¤Êý</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mem_cache</td></tr>
-</table>
-    <p><code class="directive">MCacheMaxStreamingBuffer</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥µ¥¤¥º¤¬Â礭¤¹¤®¤Æ¥­¥ã¥Ã¥·¥å¤Ç¤­¤Ê¤¤¤ÈȽÃǤ¹¤ë¤Þ¤Ç¤Î¡¢
-    ¥¹¥È¥ê¡¼¥à±þÅú¤Î¥Ð¥Ã¥Õ¥¡¤Î¤¿¤á¤ÎºÇÂç¥Ð¥¤¥È¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
-    ¥¹¥È¥ê¡¼¥à±þÅú¤È¤Ï¡¢¥³¥ó¥Æ¥ó¥Ä¤ÎÁ´ÂΤ¬¤¹¤°¤Ë¤ÏÆÀ¤é¤ì¤º¡¢
-    <code>Content-Length</code> ¤¬¤ï¤«¤é¤Ê¤¤±þÅú¤ò»Ø¤·¤Þ¤¹¡£
-    ¥¹¥È¥ê¡¼¥à±þÅú¤ò¹Ô¤Ê¤¦¤è¤¦¤Ê¤â¤Î¤Ë¤Ï¥×¥í¥­¥·¤µ¤ì¤¿±þÅú¤ä¡¢
-    CGI ¥¹¥¯¥ê¥×¥È¤Î½ÐÎϤʤɤ¬¤¢¤ê¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥¹¥È¥ê¡¼¥à¤Î±þÅú¤Ï
-    <code>Content-Length</code> ¤¬¤Ê¤¤¸Â¤ê¥­¥ã¥Ã¥·¥å<em>¤µ¤ì¤Þ¤»¤ó</em>¡£
-    ¤³¤Î¤è¤¦¤ÊÆ°ºî¤Ë¤Ê¤Ã¤Æ¤¤¤ëÍýͳ¤Ï¡¢·ë¶É¥­¥ã¥Ã¥·¥å¤Ë¼ý¤Þ¤ê¤­¤é¤Ê¤¤¤È
-    ȽÃǤ¹¤ë¤³¤È¤Ë¤Ê¤Ã¤Æ¤·¤Þ¤¦¤è¤¦¤Ê¡¢¥µ¥¤¥º¤ÎÂ礭¤Ê±þÅú¤Î¥Ð¥Ã¥Õ¥¡¥ê¥ó¥°¤Ë¡¢
-    ÂçÎ̤Υá¥â¥ê¤¬¾ÃÈñ¤µ¤ì¤ë¤Î¤òÈò¤±¤ë¤¿¤á¤Ç¤¹¡£
-    <code class="directive">MCacheMaxStreamingBuffer</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¦¤È¡¢
-    <code>Content-Length</code> ¤ò´Þ¤Þ¤Ê¤¤±þÅú¤ËÂФ·¤Æ»ØÄꤵ¤ì¤¿ºÇÂçÎ̤ޤÇ
-    ¥Ð¥Ã¥Õ¥¡¤¹¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£¥Ð¥Ã¥Õ¥¡¤ò»È¤¤ÀÚ¤ë¤È¡¢¥Ð¥Ã¥Õ¥¡Ãæ¤Î
-    ¥³¥ó¥Æ¥ó¥Ä¤Ï¼Î¤Æ¤é¤ì¡¢¥­¥ã¥Ã¥·¥åÆ°ºî¤òÃæ»ß¤·¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>Ãí:</h3>
-      <p><code class="directive">MCacheMaxStreamingBuffer</code> ¤ËÈóÎí¤ÎÃͤò
-      »È¤Ã¤Æ¤â¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ø¤Î±þÅú¤ÎžÁ÷¤ËÆäËÃÙ±ä¤ÏȯÀ¸¤·¤Þ¤»¤ó¡£
-      <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> ¤Ï¥¹¥È¥ê¡¼¥à¥³¥ó¥Æ¥ó¥Ä¤ÎÃÇÊÒ¤ò
-      ¥Ð¥Ã¥Õ¥¡¤Ë¥³¥Ô¡¼¤·¤¿¸å¡¢Â¨ºÂ¤Ë¡¢¤½¤ÎÉôʬ¤ò¥¯¥é¥¤¥¢¥ó¥È¤Ø¤ÎÇÛÁ÷¤Î
-      ¼¡ÃʤνÐÎÏ¥Õ¥£¥ë¥¿¤ËÁ÷¤ê¤Þ¤¹¡£</p>
-    </div>
-
-    <div class="example"><p><code>
-      # Enable caching of streamed responses up to 64KB:<br />
-      MCacheMaxStreamingBuffer 65536
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="MCacheMinObjectSize" id="MCacheMinObjectSize">MCacheMinObjectSize</a> <a name="mcacheminobjectsize" id="mcacheminobjectsize">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥­¥ã¥Ã¥·¥å¤ËÊݴɤµ¤ì¤ë¥É¥­¥å¥á¥ó¥È¤ÎºÇ¾®¥µ¥¤¥º (¥Ð¥¤¥È)</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>MCacheMinObjectSize <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>MCacheMinObjectSize 0</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mem_cache</td></tr>
-</table>
-    <p><code class="directive">MCacheMinObjectSize</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥É¥­¥å¥á¥ó¥È¤ò
-    ¥­¥ã¥Ã¥·¥å¤¹¤ë¤«¤É¤¦¤«¤òȽÄꤹ¤ë¡¢ºÇ¾®¤Î¥µ¥¤¥º¤ò¥Ð¥¤¥È¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      MCacheMinObjectSize 10000
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="MCacheRemovalAlgorithm" id="MCacheRemovalAlgorithm">MCacheRemovalAlgorithm</a> <a name="mcacheremovalalgorithm" id="mcacheremovalalgorithm">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥­¥ã¥Ã¥·¥å¤«¤éºï½ü¤¹¤ë¥É¥­¥å¥á¥ó¥È¤òÁª¤Ö¤¿¤á¤Î¥¢¥ë¥´¥ê¥º¥à</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>MCacheRemovalAlgorithm LRU|GDSF</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>MCacheRemovalAlgorithm GDSF</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mem_cache</td></tr>
-</table>
-    <p><code class="directive">MCacheRemovalAlgorithm</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥­¥ã¥Ã¥·¥å¤«¤éºï½ü¤¹¤ë¥É¥­¥å¥á¥ó¥È¤òÁªÂò¤¹¤ë¤¿¤á¤Î¥¢¥ë¥´¥ê¥º¥à¤ò
-    »ØÄꤷ¤Þ¤¹¡£ÁªÂò»è¤ÏÆó¤Ä¤¢¤ê¤Þ¤¹:</p>
-
-    <dl>
-      <dt><code>LRU</code> (Least Recently Used)</dt>
-      <dd><code>LRU</code> °ìÈÖŤ¯¥¢¥¯¥»¥¹¤µ¤ì¤Æ¤¤¤Ê¤¤¥É¥­¥å¥á¥ó¥È¤òºï½ü¤·¤Þ¤¹¡£
-      </dd>
-
-      <dt><code>GDSF</code> (GreadyDual-Size)</dt>
-      <dd><code>GDSF</code> ¤Ï¥­¥ã¥Ã¥·¥å¥ß¥¹¤Î¥³¥¹¥È¤È¥É¥­¥å¥á¥ó¥È¤Î¥µ¥¤¥º¤ò¤â¤È¤Ë¡¢
-      ¥É¥­¥å¥á¥ó¥È¤Î¥­¥ã¥Ã¥·¥å¤ËÂФ·¤ÆÍ¥ÀèÅÙ¤ò¤Ä¤±¤Þ¤¹¡£
-      Í¥ÀèÅ٤ΰìÈÖÄ㤤¥É¥­¥å¥á¥ó¥È¤¬ºÇ½é¤Ëºï½ü¤µ¤ì¤Þ¤¹¡£</dd>
-    </dl>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      MCacheRemovalAlgorithm GDSF<br />
-      MCacheRemovalAlgorithm LRU
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="MCacheSize" id="MCacheSize">MCacheSize</a> <a name="mcachesize" id="mcachesize">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥­¥ã¥Ã¥·¥å¤Ë»È¤ï¤ì¤ë¥á¥â¥ê¤ÎºÇÂçÎ̤ò¥Ð¥¤¥Èñ°Ì¤Ç»ØÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>MCacheSize <var>KBytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>MCacheSize 100</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mem_cache</td></tr>
-</table>
-    <p><code class="directive">MCacheSize</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥­¥ã¥Ã¥·¥å¤Ë
-    »È¤ï¤ì¤ë¥á¥â¥ê¤ÎÂ礭¤µ¤ò¥­¥í¥Ð¥¤¥È (1024 ¥Ð¥¤¥Èñ°Ì) ¤ÇÀßÄꤷ¤Þ¤¹¡£
-    ¿·¤·¤¤¥ª¥Ö¥¸¥§¥¯¥È¤ò¥­¥ã¥Ã¥·¥å¤ËÁÞÆþ¤¹¤ë¤³¤È¤Ë¤Ê¤ê¡¢¥ª¥Ö¥¸¥§¥¯¥È¤Î
-    ¥µ¥¤¥º¤¬»Ä¤ê¤Î¥á¥â¥ê¤è¤êÂ礭¤¤¾ì¹ç¤Ï¡¢¤½¤Î¿·¤·¤¤¥ª¥Ö¥¸¥§¥¯¥È¤ÎÁÞÆþ¤¬
-    ²Äǽ¤Ë¤Ê¤ë¤Þ¤Ç¡¢¸Å¤¤¥ª¥Ö¥¸¥§¥¯¥È¤¬ºï½ü¤µ¤ì¤Æ¤¤¤­¤Þ¤¹¡£
-    ¥ª¥Ö¥¸¥§¥¯¥È¤Ï <code class="directive"><a href="#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></code>
-    ¤Ç»ØÄꤷ¤¿¥¢¥ë¥´¥ê¥º¥à¤Ë½¾¤Ã¤Æºï½ü¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      MCacheSize 700000
-    </code></p></div>
-
-    <div class="note"><h3>Ãí</h3>
-      <p><code class="directive">MCacheSize</code> ¤ÎÃÍ¤Ï <code class="directive"><a href="#mcachemaxobjectsize">MCacheMaxObjectSize</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤷ¤¿Ãͤè¤ê
-      Â礭¤¯¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-    </div>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_mem_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_mem_cache.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_mem_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_mem_cache.html.ja.utf8 b/docs/manual/mod/mod_mem_cache.html.ja.utf8
new file mode 100644
index 00000000..00a09247
--- /dev/null
+++ b/docs/manual/mod/mod_mem_cache.html.ja.utf8
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_mem_cache - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_mem_cache</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_mem_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_mem_cache.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_mem_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>URI をキー���コンテンツ�キャッシュ</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>mem_cache_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_mem_cache.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール� <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> を<em>必�����</em>。
+    �れ� <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> �サ�ートモジュール���
+    動作��メモリを使用��ストレージ管�機構を�供���。
+    <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> �二��モード���ら��動作�るよ��
+    設定����: ファイル記述��キャッシュ�ヒープ中�オブジェクト�
+    キャッシュ��。ローカル�生��れ�コンテンツ�対��キャッシュ�る��や�
+    <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> を使�� <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code> (��り<dfn>リ�ースプロキシ</dfn>��) �設定������ックエンドサー��コンテンツ�対��
+    キャッシュを�る�������ん効果的��。</p>
+
+    <p>コンテンツ�キャッシュ���存��得� URI �基���キー�使�れ��。
+    アクセス�護���られ��るコンテンツ�キャッシュ�れ��ん。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#mcachemaxobjectcount">MCacheMaxObjectCount</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#mcachemaxobjectsize">MCacheMaxObjectSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#mcacheminobjectsize">MCacheMinObjectSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#mcachesize">MCacheSize</a></li>
+</ul>
+<h3>�照</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code></li>
+<li><code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code></li>
+</ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MCacheMaxObjectCount" id="MCacheMaxObjectCount">MCacheMaxObjectCount</a> <a name="mcachemaxobjectcount" id="mcachemaxobjectcount">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>キャッシュ��管�れるオブジェクト�最大数</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>MCacheMaxObjectCount <var>value</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>MCacheMaxObjectCount 1009</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mem_cache</td></tr>
+</table>
+    <p><code class="directive">MCacheMaxObjectCount</code> ディレクティブ�
+    キャッシュ�れるオブジェクト�最大数を指定���。
+    ��値��ッシュテーブルを作��る���使�れ��。
+    新��オブジェクトを挿入�る����オブジェクト�最大数�
+    ��������る���新��オブジェクトをキャッシュ��るよ���
+    オブジェクトを一�消去���。オブジェクト�
+    <code class="directive"><a href="#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></code>
+    �指定�れ�アルゴリズム�従��削除�れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      MCacheMaxObjectCount 13001
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MCacheMaxObjectSize" id="MCacheMaxObjectSize">MCacheMaxObjectSize</a> <a name="mcachemaxobjectsize" id="mcachemaxobjectsize">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>キャッシュ��管��るドキュメント�最大サイズ (�イト)</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>MCacheMaxObjectSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>MCacheMaxObjectSize 10000</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mem_cache</td></tr>
+</table>
+    <p><code class="directive">MCacheMaxObjectSize</code> �ドキュメントを
+    キャッシュ�る����を判定�る�最大�サイズを�イト数�設定���。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      MCacheMaxObjectSize 6400000
+    </code></p></div>
+
+    <div class="note"><h3>注</h3>
+      <p><code class="directive">MCacheMaxObjectSize</code> �値� <code class="directive"><a href="#mcacheminobjectsize">MCacheMinObjectSize</a></code>
+      �指定��値よりも大����れ��り��ん。</p>
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MCacheMaxStreamingBuffer" id="MCacheMaxStreamingBuffer">MCacheMaxStreamingBuffer</a> <a name="mcachemaxstreamingbuffer" id="mcachemaxstreamingbuffer">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ストリーム�れ��る応答をキャッシュ�能�決定�る���
+メモリ��ッファ�る最大�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>MCacheMaxStreamingBuffer <var>size_in_bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>MCacheMaxStreamingBuffer of 100000 � MCacheMaxObjectSize �少�方</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mem_cache</td></tr>
+</table>
+    <p><code class="directive">MCacheMaxStreamingBuffer</code> ディレクティブ��
+    サイズ�大����キャッシュ�����判断�る����
+    ストリーム応答��ッファ����最大�イト数を指定���。
+    ストリーム応答���コンテンツ�全体�����得られ��
+    <code>Content-Length</code> ���ら��応答を指���。
+    ストリーム応答を行��よ��も���プロキシ�れ�応答や�
+    CGI スクリプト�出力����り��。デフォルト��ストリーム�応答�
+    <code>Content-Length</code> ����りキャッシュ<em>�れ��ん</em>。
+    ��よ��動作�����る�由���局キャッシュ���り�ら���
+    判断�る���������よ���サイズ�大��応答��ッファリング��
+    大��メモリ�消費�れる�を��る����。
+    <code class="directive">MCacheMaxStreamingBuffer</code> ディレクティブを使���
+    <code>Content-Length</code> を����応答�対��指定�れ�最大���
+    �ッファ�るよ������。�ッファを使�切る���ッファ中�
+    コンテンツ���られ�キャッシュ動作を中止���。</p>
+
+    <div class="note"><h3>注:</h3>
+      <p><code class="directive">MCacheMaxStreamingBuffer</code> ��零�値を
+      使��も�クライアント��応答�転��特��延�発生���ん。
+      <code class="module"><a href="../mod/mod_mem_cache.html">mod_mem_cache</a></code> �ストリームコンテンツ�断片を
+      �ッファ�コピー��後��座����部分をクライアント�����
+      次段�出力フィルタ��り��。</p>
+    </div>
+
+    <div class="example"><p><code>
+      # Enable caching of streamed responses up to 64KB:<br />
+      MCacheMaxStreamingBuffer 65536
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MCacheMinObjectSize" id="MCacheMinObjectSize">MCacheMinObjectSize</a> <a name="mcacheminobjectsize" id="mcacheminobjectsize">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>キャッシュ��管�れるドキュメント�最�サイズ (�イト)</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>MCacheMinObjectSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>MCacheMinObjectSize 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mem_cache</td></tr>
+</table>
+    <p><code class="directive">MCacheMinObjectSize</code> ディレクティブ��ドキュメントを
+    キャッシュ�る����を判定�る�最��サイズを�イト数�設定���。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      MCacheMinObjectSize 10000
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MCacheRemovalAlgorithm" id="MCacheRemovalAlgorithm">MCacheRemovalAlgorithm</a> <a name="mcacheremovalalgorithm" id="mcacheremovalalgorithm">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>キャッシュ�ら削除�るドキュメントを�����アルゴリズム</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>MCacheRemovalAlgorithm LRU|GDSF</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>MCacheRemovalAlgorithm GDSF</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mem_cache</td></tr>
+</table>
+    <p><code class="directive">MCacheRemovalAlgorithm</code> ディレクティブ��
+    キャッシュ�ら削除�るドキュメントを�択�る���アルゴリズムを
+    指定���。�択肢�二��り��:</p>
+
+    <dl>
+      <dt><code>LRU</code> (Least Recently Used)</dt>
+      <dd><code>LRU</code> 一番長�アクセス�れ����ドキュメントを削除���。
+      </dd>
+
+      <dt><code>GDSF</code> (GreadyDual-Size)</dt>
+      <dd><code>GDSF</code> �キャッシュミス�コスト�ドキュメント�サイズをも���
+      ドキュメント�キャッシュ�対��優先度を����。
+      優先度�一番低�ドキュメント�最��削除�れ��。</dd>
+    </dl>
+
+    <div class="example"><h3>例</h3><p><code>
+      MCacheRemovalAlgorithm GDSF<br />
+      MCacheRemovalAlgorithm LRU
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MCacheSize" id="MCacheSize">MCacheSize</a> <a name="mcachesize" id="mcachesize">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>キャッシュ�使�れるメモリ�最大�を�イト���指定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>MCacheSize <var>KBytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>MCacheSize 100</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mem_cache</td></tr>
+</table>
+    <p><code class="directive">MCacheSize</code> ディレクティブ�キャッシュ�
+    使�れるメモリ�大��をキロ�イト (1024 �イト��) �設定���。
+    新��オブジェクトをキャッシュ�挿入�る����り�オブジェクト�
+    サイズ�残り�メモリより大��場�����新��オブジェクト�挿入�
+    �能��る�����オブジェクト�削除�れ�����。
+    オブジェクト� <code class="directive"><a href="#mcacheremovalalgorithm">MCacheRemovalAlgorithm</a></code>
+    �指定��アルゴリズム�従��削除�れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      MCacheSize 700000
+    </code></p></div>
+
+    <div class="note"><h3>注</h3>
+      <p><code class="directive">MCacheSize</code> �値� <code class="directive"><a href="#mcachemaxobjectsize">MCacheMaxObjectSize</a></code> ディレクティブ�指定��値より
+      大����れ��り��ん。</p>
+    </div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_mem_cache.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_mem_cache.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_mem_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_mem_cache.html.ko.euc-kr b/docs/manual/mod/mod_mem_cache.html.ko.euc-kr
index 112414f1..98bea331 100644
--- a/docs/manual/mod/mod_mem_cache.html.ko.euc-kr
+++ b/docs/manual/mod/mod_mem_cache.html.ko.euc-kr
@@ -232,6 +232,6 @@
 <a href="../ja/mod/mod_mem_cache.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_mem_cache.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_mime.html b/docs/manual/mod/mod_mime.html
index 09e9184e..942dc58a 100644
--- a/docs/manual/mod/mod_mime.html
+++ b/docs/manual/mod/mod_mime.html
@@ -1,7 +1,9 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_mime.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_mime.html.ja.euc-jp
+URI: mod_mime.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/mod_mime.html.en b/docs/manual/mod/mod_mime.html.en
index aa34d91f..08bf24dd 100644
--- a/docs/manual/mod/mod_mime.html.en
+++ b/docs/manual/mod/mod_mime.html.en
@@ -974,6 +974,6 @@ extensions</td></tr>
 <p><span>Available Languages: </span><a href="../en/mod/mod_mime.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_mime.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_mime.html.ja.euc-jp b/docs/manual/mod/mod_mime.html.ja.euc-jp
deleted file mode 100644
index ea5e7680..00000000
--- a/docs/manual/mod/mod_mime.html.ja.euc-jp
+++ /dev/null
@@ -1,939 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_mime - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_mime</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_mime.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_mime.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤È¥Õ¥¡¥¤¥ë¤Î¿¶¤ëÉñ¤¤
-    (¥Ï¥ó¥É¥é¤È¥Õ¥£¥ë¥¿)¡¢ÆâÍÆ (MIME ¥¿¥¤¥×¡¢¸À¸ì¡¢Ê¸»ú¥»¥Ã¥È¡¢¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°)
-    ¤È¤ò´ØÏ¢ÉÕ¤±¤ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>mime_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_mime.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï³ÈÄ¥»Ò¤ò»È¤Ã¤Æ¤¤¤í¤¤¤í¤Ê¡Ö¥á¥¿¾ðÊó¡×¤ò¥Õ¥¡¥¤¥ë¤Ë
-    ´ØÏ¢ÉÕ¤±¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£¤³¤Î¾ðÊó¤Ï¥É¥­¥å¥á¥ó¥È¤Î¥Õ¥¡¥¤¥ë̾¤È
-    MIME ¥¿¥¤¥×¡¢¸À¸ì¡¢Ê¸»ú¥»¥Ã¥È¡¢¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤È¤ò´ØÏ¢ÉÕ¤±¤Þ¤¹¡£
-    ¤³¤Î¾ðÊó¤Ï¥Ö¥é¥¦¥¶¤ËÁ÷¤é¤ì¤Þ¤¹¤·¡¢Ê£¿ô¤Î¥Õ¥¡¥¤¥ë¤ÎÃ椫¤é¥æ¡¼¥¶¤Î¹¥¤ß¤Î
-    ¤â¤Î¤¬Áª¤Ð¤ì¤ë¤è¤¦¤Ë¡¢¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤Ç¤â»È¤ï¤ì¤Þ¤¹¡£
-    <a href="../content-negotiation.html">¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó</a>
-    ¤Ë´Ø¤¹¤ë¾Ü¤·¤¤¾ðÊó¤Ï <code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code>
-    ¤ò¤´Í÷²¼¤µ¤¤¡£</p>
-
-    <p><code class="directive"><a href="#addcharset">AddCharset</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¡¢
-    <code class="directive"><a href="#addencoding">AddEncoding</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¡¢
-    <code class="directive"><a href="#addhandler">AddHandler</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¡¢
-    <code class="directive"><a href="#addlanguage">AddLanguage</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¡¢
-    <code class="directive"><a href="#addtype">AddType</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤¹¤Ù¤Æ¡¢
-    ¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤ò¥á¥¿¾ðÊó¤Ë¥Þ¥Ã¥×¤¹¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£
-    ¤½¤ì¤¾¤ì¡¢¥É¥­¥å¥á¥ó¥È¤Îʸ»ú¥»¥Ã¥È (ÌõÃí: charset)¡¢content-encoding,
-    content-language, MIME ¥¿¥¤¥× (content-type) ¤òÀßÄꤷ¤Þ¤¹¡£
-    <code class="directive"><a href="#typesconfig">TypesConfig</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï³ÈÄ¥»Ò¤ò
-    MIME ¥¿¥¤¥×¤Ë¥Þ¥Ã¥×¤¹¤ë¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£</p>
-
-    <p>¤µ¤é¤Ë¡¢<code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> ¤Ï¥³¥ó¥Æ¥ó¥Ä¤òºîÀ®¡¢½èÍý¤¹¤ë
-    <a href="../handler.html">¥Ï¥ó¥É¥é</a> ¤È <a href="../filter.html">¥Õ¥£¥ë¥¿</a>
-    ¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£<code class="directive"><a href="#addhandler">AddHandler</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¡¢<code class="directive"><a href="#addoutputfilter">AddOutputFilter</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¡¢<code class="directive"><a href="#addinputfilter">AddInputFilter</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¥É¥­¥å¥á¥ó¥È¤ò°·¤¦¥â¥¸¥å¡¼¥ë¤ä¥¹¥¯¥ê¥×¥È¤òÀ©¸æ¤·¤Þ¤¹¡£
-    <code class="directive"><a href="#multiviewsmatch">MultiviewsMatch</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¤³¤ì¤é¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤ò
-    <code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code> ¤¬ Multiviews ¤Î¥Þ¥Ã¥Á¤ò¤È¤ë¤È¤­¤Ë
-    ¹Íθ¤¹¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p><code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> ¤Ï¥á¥¿¾ðÊó¤ò¥Õ¥¡¥¤¥ë̾¤È´ØÏ¢ÉÕ¤±¤Þ¤¹¤¬¡¢
-    <code class="module"><a href="../mod/core.html">core</a></code> ¥µ¡¼¥Ð¤Ë¤Ï¤¢¤ë¥³¥ó¥Æ¥Ê
-    (<em>¤¿¤È¤¨¤Ð</em>, <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>, <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>) ¤ÎÃæ¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤òÆÃÄê¤Î
-    ¥á¥¿¾ðÊó¤È´ØÏ¢ÉÕ¤±¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤é¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤Ï
-    <code class="directive"><a href="../mod/core.html#forcetype">ForceType</a></code>, <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code>, <code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code>, <code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code> ¤¬¤¢¤ê¤Þ¤¹¡£
-    ¥³¥¢¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> ¤Ë¤è¤êÄêµÁ¤µ¤ì¤¿
-    ¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤Î¥Þ¥Ã¥Ô¥ó¥°¤¹¤Ù¤Æ¤ò¾å½ñ¤­¤·¤Þ¤¹¡£</p>
-
-    <p>¥Õ¥¡¥¤¥ë¤Î¥á¥¿¾ðÊó¤òÊѤ¨¤Æ¤â <code>Last-Modified</code>
-    ¥Ø¥Ã¥À¤ÎÃͤÏÊѤï¤é¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¤Ç¤¹¤«¤é¡¢
-    ¤½¤ì¤é¤òÊѹ¹¤·¤¿¾ì¹ç¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤ä¥×¥í¥­¥·¤Ç°ÊÁ°¤Ë¥­¥ã¥Ã¥·¥å¤µ¤ì¤¿
-    ¥³¥Ô¡¼¤¬¤½¤Î¤È¤­¤Î¥Ø¥Ã¥À¤È¤È¤â¤Ë»È¤ï¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
-    ¥á¥¿¾ðÊó (¸À¸ì¡¢¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¡¢Ê¸»ú¥»¥Ã¥È¡¢¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°) ¤ò
-    Êѹ¹¤·¤¿¤È¤­¤Ï¡¢¤¹¤Ù¤Æ¤ÎˬÌä¼Ô¤¬Àµ¤·¤¤¥³¥ó¥Æ¥ó¥È¥Ø¥Ã¥À¤ò
-    ¼õ¤±¼è¤ë¤è¤¦¤Ë¡¢±Æ¶Á¤ò¼õ¤±¤ë¥Õ¥¡¥¤¥ë¤Ë 'touch' ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë
-    (ºÇ½ª¹¹¿·Æü¤ò¹¹¿·¤¹¤ë) ɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#addcharset">AddCharset</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#addencoding">AddEncoding</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#addhandler">AddHandler</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#addinputfilter">AddInputFilter</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#addlanguage">AddLanguage</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#addoutputfilter">AddOutputFilter</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#addtype">AddType</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#defaultlanguage">DefaultLanguage</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#modmimeusepathinfo">ModMimeUsePathInfo</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#multiviewsmatch">MultiviewsMatch</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#removecharset">RemoveCharset</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#removeencoding">RemoveEncoding</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#removehandler">RemoveHandler</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#removeinputfilter">RemoveInputFilter</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#removelanguage">RemoveLanguage</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#removeoutputfilter">RemoveOutputFilter</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#removetype">RemoveType</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#typesconfig">TypesConfig</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#multipleext">Ê£¿ô¤Î³ÈÄ¥»Ò¤Î¤¢¤ë¥Õ¥¡¥¤¥ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#contentencoding">¥³¥ó¥Æ¥ó¥È¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#charset-lang">ʸ»ú¥»¥Ã¥È¤È¸À¸ì</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="directive"><a href="../mod/mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#adddefaultcharset">AddDefaultCharset</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#forcetype">ForceType</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#defaulttype">DefaultType</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="multipleext" id="multipleext">Ê£¿ô¤Î³ÈÄ¥»Ò¤Î¤¢¤ë¥Õ¥¡¥¤¥ë</a></h2>
-    <p>¥Õ¥¡¥¤¥ë¤ÏÊ£¿ô¤Î³ÈÄ¥»Ò¤ò»ý¤Ä¤³¤È¤¬¤Ç¤­¡¢³ÈÄ¥»Ò¤Î½çÈÖ¤Ï<em>Ä̾ï¤Ï</em>´Ø·¸¤¢¤ê¤Þ¤»¤ó¡£Î㤨¤Ð¡¢¥Õ¥¡¥¤¥ë <code>welcome.html.fr</code>
-    ¤¬¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤Ï <code>text/html</code>
-    ¤Ë¡¢¸À¸ì¤Ï¥Õ¥é¥ó¥¹¸ì¤Ë¥Þ¥Ã¥×¤µ¤ì¤ë¾ì¹ç¡¢<code>welcome.fr.html</code>
-    ¤â¤Þ¤Ã¤¿¤¯Æ±¤¸¾ðÊó¤Ë¥Þ¥Ã¥×¤µ¤ì¤Þ¤¹¡£
-    Ʊ¤¸¥á¥¿¾ðÊó¤Ë¥Þ¥Ã¥×¤µ¤ì¤ë³ÈÄ¥»Ò¤¬Ê£¿ô¤¢¤ë¤È¤­¤Ë¤Ï¡¢¸À¸ì¤È
-    ¥³¥ó¥Æ¥ó¥È¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò½ü¤¤¤Æ¡¢
-    ±¦Â¦¤Ë¤¢¤ë¤â¤Î¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢<code>.gif</code> ¤¬ MIME
-    ¥¿¥¤¥× <code>image/gif</code> ¤Ë¥Þ¥Ã¥×¤µ¤ì¡¢<code>.html</code>
-    ¤¬ MIME ¥¿¥¤¥× <code>text/html</code>
-    ¤Ë¥Þ¥Ã¥×¤µ¤ì¤ë¾ì¹ç¤Ï¡¢¥Õ¥¡¥¤¥ë <code>welcome.gif.html</code> ¤Ï
-    MIME ¥¿¥¤¥× <code>text/html</code> ¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤Þ¤¹¡£</p>
-
-    <p>¥ê¥½¡¼¥¹¤ËÊ£¿ô¤Î¸À¸ì¤ä¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò´ØÏ¢ÉÕ¤±¤ë¤³¤È
-    ¤¬¤Ç¤­¤ë¤¿¤á¡¢
-    <a href="#charset-lang">¸À¸ì</a>¤È<a href="#contentencoding">¥³¥ó¥Æ¥ó¥È¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°</a>¤ÏÁ°¤Î¤â¤Î¤ËÄɲ䵤ì¤Æ¤¤¤­¤Þ¤¹¡£
-    ¤¿¤È¤¨¤Ð¡¢¥Õ¥¡¥¤¥ë <code>welcome.html.en.de</code> ¤Ï
-    <code>Content-Language: en, de</code> ¤È <code>Content-Type:
-    text/html</code> ¤È¤·¤ÆÁ÷¿®¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>Ê£¿ô¤Î³ÈÄ¥»Ò¤Î¤¢¤ë¥Õ¥¡¥¤¥ë¤¬ MIME
-    ¥¿¥¤¥×¤È¥Ï¥ó¥É¥é¤ÎξÊý¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤Æ¤¤¤ë¤È¤­¤ÏÃí°Õ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤½¤Î¾ì¹ç¡¢ÉáÄ̤ϥꥯ¥¨¥¹¥È¤¬¥Ï¥ó¥É¥é¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿
-    ¥â¥¸¥å¡¼¥ë¤Ë¤è¤Ã¤Æ°·¤ï¤ì¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢³ÈÄ¥»Ò
-    <code>.imap</code> ¤¬ (<code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code> ¤Î) <code>imap-file</code>
-    ¤Ë¥Þ¥Ã¥×¤µ¤ì¤Æ¤¤¤Æ¡¢<code>.html</code> ¤¬ MIME ¥¿¥¤¥× <code>text/html</code>
-    ¤Ë¥Þ¥Ã¥×¤µ¤ì¤Æ¤¤¤ë¤È¤­¤Ï¡¢¥Õ¥¡¥¤¥ë <code>world.imap.html</code> ¤Ï
-    <code>imap-file</code> ¥Ï¥ó¥É¥é¤È <code>text/html</code> MIME
-    ¥¿¥¤¥×¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤¬½èÍý¤µ¤ì¤ë¤È¤­¤Ï <code>imap-file</code>
-    ¥Ï¥ó¥É¥é¤¬»ÈÍѤµ¤ì¤Þ¤¹¤Î¤Ç¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤Ï <code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code>
-    ¤Î¥¤¥á¡¼¥¸¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤È¤·¤Æ°·¤ï¤ì¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="contentencoding" id="contentencoding">¥³¥ó¥Æ¥ó¥È¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°</a></h2>
-    <p>ÆÃÄê¤Î MIME ¥¿¥¤¥×¤Î¥Õ¥¡¥¤¥ë¤Ï¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Ç¤ÎžÁ÷¤ò´Êñ¤Ë¤¹¤ë¤¿¤á¤Ë¡¢
-    ¤µ¤é¤ËÉä¹æ²½¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤ì¤ÏÄ̾ï¤Ï <code>gzip</code> ¤Î
-    ¤è¤¦¤Ê°µ½Ì¤Î¤³¤È¤ò»Ø¤·¤Þ¤¹¤¬¡¢<code>pgp</code> ¤Î¤è¤¦¤Ê°Å¹æ²½¤ä¡¢
-    ¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤ò ASCII (¥Æ¥­¥¹¥È) ·Á¼°¤ÇÁ÷¤ë¤¿¤á¤Ë¹Í°Æ¤µ¤ì¤¿
-    UUencoding ¤Î¤³¤È¤ò»Ø¤¹¤³¤È¤â¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p><a href="http://www.ietf.org/rfc/rfc2616.txt">HTTP/1.1 RFC</a> 
-    14.11 Àá¤Ç¤Ï¼¡¤Î¤è¤¦¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <blockquote cite="http://www.ietf.org/rfc/rfc2616.txt">
-      <p>Content-Encoding ¥¨¥ó¥Æ¥£¥Æ¥£¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¤Ï¥á¥Ç¥£¥¢¥¿¥¤¥×¤Î
-      ½¤¾þ»Ò¤È¤·¤Æ»È¤ï¤ì¤Þ¤¹¡£¤½¤ì¤¬Â¸ºß¤·¤Æ¤¤¤ì¤Ð¡¢Ãͤϥ¨¥ó¥Æ¥£¥Æ¥£¥Ü¥Ç¥£¤Ë
-      ¤É¤ÎÄɲäÎÉä¹æ²½¤¬Å¬ÍѤµ¤ì¤¿¤«¤ò¼¨¤·¡¢Content-Type ¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¤Ë
-      ½ñ¤«¤ì¤Æ¤¤¤ë¥á¥Ç¥£¥¢¥¿¥¤¥×¤òÆÀ¤ë¤¿¤á¤Ë¤É¤ÎÉü¹æµ¡¹½¤òŬÍѤ¹¤Ù¤­¤«¡¢¤â
-      ¼¨¤·¤Æ¤¤¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£Content-Encoding ¤Ï¼ç¤Ë¡¢¸µ¤Î¥á¥Ç¥£¥¢¥¿¥¤¥×¤Î
-      Ʊ°ìÀ­¤ò¼º¤¦¤³¤È¤Ê¤¯¥É¥­¥å¥á¥ó¥È¤ò°µ½Ì¤¹¤ë¤³¤È¤ò²Äǽ¤Ë¤¹¤ë¤¿¤á¤Ë
-      »ÈÍѤµ¤ì¤Þ¤¹¡£</p>
-    </blockquote>
-
-    <p>Ê£¿ô¤Î¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò (Ê£¿ô¤Î³ÈÄ¥»Ò¤Ë¤Ä¤¤¤Æ¤Ï <a href="#multipleext">¾å¤ÎÀá</a> ¤ò»²¾È) »È¤¦¤³¤È¤Ç¡¢
-    ¥Õ¥¡¥¤¥ë¤Î<em>¥¿¥¤¥×</em>¤ä<em>¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°</em>¤ò»ØÄꤹ¤ë¤³¤È¤¬
-    ¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¤¿¤È¤¨¤Ð¡¢Microsoft Word ¤Î¥É¥­¥å¥á¥ó¥È¤¬¤¢¤ê¡¢¥µ¥¤¥º¤ò¾®¤µ¤¯¤¹¤ë¤¿¤á¤Ë
-    pkzip ¤µ¤ì¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£<code>.doc</code> ³ÈÄ¥»Ò¤¬ Microsoft Word ¤Î
-    ¥Õ¥¡¥¤¥ë¥¿¥¤¥×¤È´ØÏ¢ÉÕ¤±¤é¤ì¤Æ¤¤¤Æ¡¢<code>.zip</code> ³ÈÄ¥»Ò¤¬
-    pkzip ¥Õ¥¡¥¤¥ë¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤È´ØÏ¢ÉÕ¤±¤é¤ì¤Æ¤¤¤ë¤È¡¢¥Õ¥¡¥¤¥ë
-    <code>Resume.doc.zip</code> ¤Ï pkzip ¤µ¤ì¤¿ Word ¥É¥­¥å¥á¥ó¥È¤Ç¤¢¤ë
-    ¤È¤¤¤¦¤³¤È¤¬¤ï¤«¤ê¤Þ¤¹¡£</p>
-
-    <p>¥¯¥é¥¤¥¢¥ó¥È¤Î¥Ö¥é¥¦¥¶¤Ë¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°ÊýË¡¤òÃΤ餻¤ë¤¿¤á¤Ë¡¢
-    Apache ¤Ï¥ê¥½¡¼¥¹¤È¶¦¤Ë <code>Content-Encoding</code> ¥Ø¥Ã¥À¤ò
-    Á÷¤ê¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>Content-encoding: pkzip</code></p></div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="charset-lang" id="charset-lang">ʸ»ú¥»¥Ã¥È¤È¸À¸ì</a></h2>
-    <p>¥Õ¥¡¥¤¥ë¥¿¥¤¥×¤È¥Õ¥¡¥¤¥ë¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î¾¤Ë½ÅÍפʾðÊó¤Ï
-    ¥É¥­¥å¥á¥ó¥È¤Î½ñ¤«¤ì¤Æ¤¤¤ë¸À¸ì¤È¡¢¤É¤Îʸ»ú¥»¥Ã¥È¤Ç¥Õ¥¡¥¤¥ë¤¬É½¼¨
-    ¤µ¤ì¤ë¤Ù¤­¤«¡¢¤È¤¤¤¦¤â¤Î¤Ç¤¹¡£¤¿¤È¤¨¤Ð¡¢¥É¥­¥å¥á¥ó¥È¤Ï¥Ù¥È¥Ê¥à¤Î
-    ¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤ä¥­¥ê¥ëʸ»ú¤Ç½ñ¤«¤ì¤Æ¤¤¤Æ¡¢¤½¤Î¤è¤¦¤Ëɽ¼¨¤µ¤ì¤ë
-    ɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤³¤Î¾ðÊó¤â¤Þ¤¿¡¢HTTP ¥Ø¥Ã¥À¤Ç
-    Á÷¿®¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>ʸ»ú¥»¥Ã¥È¡¢¸À¸ì¡¢¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¡¢mime ¥¿¥¤¥×¤Ï¤¹¤Ù¤Æ
-    ¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó (<code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code> »²¾È)
-    ¤ÎºÇÃæ¤Ë¡¢Ê£¿ô¤Îʸ»ú¥»¥Ã¥È¡¢¸À¸ì¡¢¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¡¢MIME ¥¿¥¤¥×¤«¤é¤Ê¤ë
-    ÂåÂØʪ¤¬¤¢¤ë¤È¤­¤Ë¤É¤Î¥É¥­¥å¥á¥ó¥È¤ò¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤ë¤Î¤«¤ò
-    ·èÄꤹ¤ë¤È¤­¤Ë»È¤ï¤ì¤Þ¤¹¡£<code class="directive"><a href="#addcharset">AddCharset</a></code>,
-    <code class="directive"><a href="#addencoding">AddEncoding</a></code>, <code class="directive"><a href="#addlanguage">AddLanguage</a></code>,
-    <code class="directive"><a href="#addtype">AddType</a></code> ¤Î³Æ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇºîÀ®¤µ¤ì¤¿
-    ³ÈÄ¥»Ò¤Î´ØÏ¢ÉÕ¤± (¤È <code class="directive"><a href="../mod/mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></code> ¤Ç¥ê¥¹¥È¤µ¤ì¤Æ¤¤¤ë
-    ³ÈÄ¥»Ò) ¤¬¤³¤ÎÁªÂò¤Ë»²²Ã¤·¤Þ¤¹¡£<code class="directive"><a href="#addhandler">AddHandler</a></code>,
-    <code class="directive"><a href="#addinputfilter">AddInputFilter</a></code>,
-    <code class="directive"><a href="#addoutputfilter">AddOutputFilter</a></code> ¤Î
-    ³Æ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤Î¤ß´ØÏ¢ÉÕ¤±¤é¤ì¤Æ¤¤¤ë³ÈÄ¥»Ò¤Ï
-    <code class="directive"><a href="#multiviewsmatch">MultiviewsMatch</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    »È¤¦¤³¤È¤Ç¥Þ¥Ã¥Á¤Î
-    ½èÍý¤Ë´Þ¤á¤ë¤³¤È¤â³°¤¹¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-
-    <h3><a name="charset" id="charset">Charset</a></h3>
-      <p>¤µ¤é¤Ë¾ðÊó¤òÅÁ¤¨¤ë¤¿¤á¤Ë¡¢Apache ¤Ïʸ½ñ¤Î¸À¸ì¤ò
-      <code>Content-Language</code> ¥Ø¥Ã¥À¤ÇÁ÷¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¡£
-      ¤Þ¤¿¡¢¾ðÊó¤òÀµ¤·¤¯É½¼¨¤¹¤ë¤¿¤á¤Ë»ÈÍѤ¹¤Ù¤­Ê¸»ú¥»¥Ã¥È¤ò¼¨¤¹¤¿¤á¤Ë
-      <code>Conten-Type</code> ¥Ø¥Ã¥À¤Ë¾ðÊó¤òÄɲ乤뤳¤È¤â¤¢¤ê¤Þ¤¹¡£</p>
-
-      <div class="example"><p><code>
-        Content-Language: en, fr<br />
-	Content-Type: text/plain; charset=ISO-8859-1
-      </code></p></div>
-
-      <p>¸À¸ì¤Î»ØÄê¤ÏÆóʸ»ú¤Îû½Ì·Á¤Ç¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£<code>charset</code> ¤¬
-      »ÈÍѤ¹¤Ù¤­Ê¸»ú¥»¥Ã¥È¤Î̾Á°¤Ç¤¹¡£</p>
-    
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddCharset" id="AddCharset">AddCharset</a> <a name="addcharset" id="addcharset">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤ò»ØÄꤵ¤ì¤¿Ê¸»ú¥»¥Ã¥È¤Ë¥Þ¥Ã¥×¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddCharset <var>charset</var> <var>extension</var>
-[<var>extension</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-</table>
-    <p><code class="directive">AddCharset</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    Í¿¤¨¤é¤ì¤¿³ÈÄ¥»Ò¤ò»ØÄꤵ¤ì¤¿ charset ¤Ë¥Þ¥Ã¥×¤·¤Þ¤¹¡£<var>charset</var> 
-    ¤Ï¡¢³ÈÄ¥»Ò <var>extension</var> ¤ò´Þ¤ó¤Ç¤¤¤ë¥Õ¥¡¥¤¥ë̾¤Î 
-    <a href="http://www.iana.org/assignments/character-sets">MIME charset
-    ¥Ñ¥é¥á¡¼¥¿</a>¤Ç¤¹¡£¿·¤·¤¤¥Þ¥Ã¥Ô¥ó¥°¤Ï´û¤Ë¤¢¤ë¾¤Î¥Þ¥Ã¥Ô¥ó¥°¤ËÄɲ䵤졢Ʊ¤¸³ÈÄ¥»Ò
-    <var>extension</var> ¤Î¤¿¤á¤Î¥Þ¥Ã¥Ô¥ó¥°¤ò¾å½ñ¤­¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      AddLanguage ja .ja<br />
-      AddCharset EUC-JP .euc<br />
-      AddCharset ISO-2022-JP .jis<br />
-      AddCharset SHIFT_JIS .sjis
-    </code></p></div>
-
-    <p>¤³¤Î¾ì¹ç¡¢¥É¥­¥å¥á¥ó¥È <code>xxxx.ja.jis</code> ¤Ï charset ¤¬
-    <code>ISO-2022-JP</code> ¤ÎÆüËܸì¤Î¥É¥­¥å¥á¥ó¥È¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹
-    (<code>xxxx.jis.ja</code> ¤âƱÍÍ)¡£<code class="directive">AddCharset</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥É¥­¥å¥á¥ó¥È¤¬Å¬Àڤ˲ò¼á¤µ¤ìɽ¼¨¤µ¤ì¤ë¤è¤¦¤Ë¡¢
-    ¥É¥­¥å¥á¥ó¥È¤Î charset ¤Î¾ðÊó¤ò¥¯¥é¥¤¥¢¥ó¥È¤Ë¶µ¤¨¤ë¤¿¤á¤ËÌò¤ËΩ¤Á¤Þ¤¹¡£
-    ¤Þ¤¿¡¢¥µ¡¼¥Ð¤¬¥¯¥é¥¤¥¢¥ó¥È¤Î charset
-    ¤ÎÍ¥ÀèÅ٤˴ð¤Å¤¤¤ÆÊ£¿ô¤Î¥É¥­¥å¥á¥ó¥È¤ÎÃ椫¤é¥É¥­¥å¥á¥ó¥È¤òÁª¤Ö<a href="../content-negotiation.html">¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó</a>¤Î¤¿¤á¤Ë¤âÌò¤ËΩ¤Á¤Þ¤¹¡£</p>
-
-    <p>°ú¿ô <var>extension</var>¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤»¤º¡¢
-    ºÇ½é¤Î¥É¥Ã¥È¤Ï¤¢¤Ã¤Æ¤â¤Ê¤¯¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#adddefaultcharset">AddDefaultCharset</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddEncoding" id="AddEncoding">AddEncoding</a> <a name="addencoding" id="addencoding">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤ò»ØÄꤵ¤ì¤¿¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°
-¤Ë¥Þ¥Ã¥×¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddEncoding <var>MIME-enc</var> <var>extension</var>
-[<var>extension</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-</table>
-    <p><code class="directive">AddEncoding</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    Í¿¤¨¤é¤ì¤¿³ÈÄ¥»Ò¤ò»ØÄꤵ¤ì¤¿¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ë¥Þ¥Ã¥×¤·¤Þ¤¹¡£
-    <var>MIME-enc</var> ¤Ï¡¢³ÈÄ¥»Ò <var>extension</var>
-    ¤ò´Þ¤ó¤À¥É¥­¥å¥á¥ó¥È¤Ë»ÈÍѤ¹¤ë MIME ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ç¤¹¡£
-    ¤³¤Î¿·¤·¤¤¥Þ¥Ã¥Ô¥ó¥°¤Ï´û¤Ë¤¢¤ë¾¤Î¥Þ¥Ã¥Ô¥ó¥°¤ËÄɲ䵤졢
-    Ʊ¤¸³ÈÄ¥»Ò <var>extension</var> ¤Î¤¿¤á¤Î¥Þ¥Ã¥Ô¥ó¥°¤ò¾å½ñ¤­¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      <code>AddEncoding x-gzip .gz<br />
-       AddEncoding x-compress .Z</code>
-    </code></p></div>
-
-    <p>¤³¤ì¤Ï¡¢³ÈÄ¥»Ò <code>.gz</code> ¤ò´Þ¤à¥Õ¥¡¥¤¥ë̾¤¬ <code>x-gzip</code>
-    ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò»È¤Ã¤Æ¥¨¥ó¥³¡¼¥É¤µ¤ì¤Æ¤¤¤ë¤³¤È¤È¡¢³ÈÄ¥»Ò <code>.Z</code>
-    ¤ò´Þ¤à¥Õ¥¡¥¤¥ë̾¤¬ <code>x-compress</code>
-    ¤Ç¥¨¥ó¥³¡¼¥É¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò»ØÄꤷ¤Þ¤¹¡£</p>
-
-    <p>¸Å¤¤¥¯¥é¥¤¥¢¥ó¥È¤Ï <code>x-zip</code> ¤È <code>x-compress</code>
-    ¤¬Ê֤äƤ¯¤ë¤³¤È¤ò´üÂÔ¤·¤Þ¤¹¤¬¡¢É¸½àµ¬³Ê¤Ç¤Ï¤½¤ì¤¾¤ì
-    <code>gzip</code> ¤È <code>compress</code>
-    ¤ÈÅù²Á¤Ç¤¢¤ë¤³¤È¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£Apache
-    ¤Ï¡¢¥³¥ó¥Æ¥ó¥È¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ÎÈæ³Ó¤ò¤¹¤ë¤È¤­¤Ë¤Ï¡¢ÀèƬ¤Ë¤¢¤ë
-    <code>x-</code> ¤ò̵»ë¤·¤Þ¤¹¡£Apache
-    ¤¬¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°ÉÕ¤­¤Ç±þÅú¤òÊÖ¤¹¤È¤­¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬Í׵ᤷ¤¿·Á¼°
-    (<em>¤¹¤Ê¤ï¤Á</em>¡¢<code>x-foo</code> ¤ä <code>foo</code>)
-    ¤ò»ÈÍѤ·¤Þ¤¹¡£Íפ¹¤ë¤Ë¡¢¤³¤ÎÆó¤Ä¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î¾ì¹ç¤Ï¾ï¤Ë
-    <code>x-gzip</code> ¤È <code>x-compress</code>
-    ¤ò»È¤¦¤Ù¤­¤Ç¤¢¤ë¡¢¤È¤¤¤¦¤³¤È¤Ç¤¹¡£<code>deflate</code>
-    ¤Î¤è¤¦¤Ê¤è¤ê¿·¤·¤¤¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ç¤Ï¡¢<code>x-</code>
-    ¤Ê¤·¤Ç»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
-    </p>
-
-    <p>°ú¿ô <var>extension</var> ¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤»¤º¡¢
-    ºÇ½é¤Î¥É¥Ã¥È¤Ï¤¢¤Ã¤Æ¤â¤Ê¤¯¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddHandler" id="AddHandler">AddHandler</a> <a name="addhandler" id="addhandler">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤ò»ØÄꤵ¤ì¤¿¥Ï¥ó¥É¥é¤Ë¥Þ¥Ã¥×¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddHandler <var>handler-name</var> <var>extension</var>
-[<var>extension</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-</table>
-    <p>³ÈÄ¥»Ò <var>extension</var> ¤¬Ì¾Á°¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤Ï»ØÄꤵ¤ì¤¿ <a href="../handler.html">handler-name</a> ¤Ë°·¤ï¤ì¤Þ¤¹¡£
-    ¤³¤Î¿·¤·¤¤¥Þ¥Ã¥Ô¥ó¥°¤Ï´û¤Ë¤¢¤ë¾¤Î¥Þ¥Ã¥Ô¥ó¥°¤ËÄɲ䵤졢
-    Ʊ¤¸³ÈÄ¥»Ò <var>extension</var>
-    ¤Î¤¿¤á¤Î¥Þ¥Ã¥Ô¥ó¥°¤ò¾å½ñ¤­¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢³ÈÄ¥»Ò
-    "<code>.cgi</code>" ¤Ç½ª¤ï¤ë¥Õ¥¡¥¤¥ë¤ò CGI
-    ¥¹¥¯¥ê¥×¥È¤È¤·¤Æ°·¤¤¤¿¤¤¤È¤­¤Ï¡¢°Ê²¼¤ÎÀßÄê¤ò¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      AddHandler cgi-script .cgi
-    </code></p></div>
-
-    <p>¤³¤ì¤ò httpd.conf ¥Õ¥¡¥¤¥ë¤Ëµ­½Ò¤¹¤ë¤³¤È¤Ç¡¢³ÈÄ¥»Ò
-    "<code>.cgi</code>" ¤Î¥Õ¥¡¥¤¥ë¤Ï CGI ¥×¥í¥°¥é¥à¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
-    </p>
-
-    <p>°ú¿ô <var>extension</var> ¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤»¤º¡¢
-    ºÇ½é¤Î¥É¥Ã¥È¤Ï¤¢¤Ã¤Æ¤â¤Ê¤¯¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddInputFilter" id="AddInputFilter">AddInputFilter</a> <a name="addinputfilter" id="addinputfilter">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤ò¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¥¯¥¨¥¹¥È¤ò½èÍý¤¹¤ë
-    ¥Õ¥£¥ë¥¿¤Ë¥Þ¥Ã¥×¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddInputFilter <var>filter</var>[;<var>filter</var>...]
-<var>extension</var> [<var>extension</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.0.26 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p><code class="directive">AddInputFilter</code> ¤Ï¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò
-    <var>extension</var> ¤ò¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¥¯¥¨¥¹¥È¤ä POST ¤¬¥µ¡¼¥Ð¤ËÍ褿¤È¤­¤Ë
-    ½èÍý¤ò¤¹¤ë<a href="../filter.html">¥Õ¥£¥ë¥¿</a>¤Ë¥Þ¥Ã¥×¤·¤Þ¤¹¡£
-    ¤³¤ì¤Ï¡¢<code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤â
-    ´Þ¤á¡¢Â¾¤Î¾ì½ê¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¥Õ¥£¥ë¥¿¤Ë²Ã¤¨¤é¤ì¤Þ¤¹¡£
-    ¤³¤Î¥Þ¥Ã¥Ô¥ó¥°¤Ï¤¹¤Ç¤Ë¤¢¤ë¤â¤Î¤è¤êÍ¥À褵¤ì¤Æ¥Þ¡¼¥¸¤µ¤ì¡¢
-    Ʊ¤¸ <var>extension</var> ¤ËÂФ¹¤ë´û¸¤Î¥Þ¥Ã¥Ô¥ó¥°¤ò¾å½ñ¤­¤·¤Þ¤¹¡£</p>
-
-    <p>Ê£¿ô¤Î¥Õ¥£¥ë¥¿¤ò»ØÄꤹ¤ë¤È¤­¤Ï¡¢¥Ç¡¼¥¿¤ò½èÍý¤¹¤ë½çÈ֤˥»¥ß¥³¥í¥ó¤Ç
-    ·Ò¤¤¤Ç½ñ¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£¥Õ¥£¥ë¥¿¤È <var>extension</var> ¤È¤Î
-    ξÊý¤Î°ú¿ô¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤»¤º¡¢³ÈÄ¥»Ò¤ÎºÇ½é¤Î¥É¥Ã¥È¤Ï
-    ¤¢¤Ã¤Æ¤â¤Ê¤¯¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#removeinputfilter">RemoveInputFilter</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddLanguage" id="AddLanguage">AddLanguage</a> <a name="addlanguage" id="addlanguage">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤵ¤ì¤¿¸À¸ì¤Ë¥Þ¥Ã¥×</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddLanguage <var>MIME-lang</var> <var>extension</var>
-[<var>extension</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-</table>
-    <p><code class="directive">AddLanguage</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢Í¿¤¨¤é¤ì¤¿³ÈÄ¥»Ò¤ò»ØÄꤵ¤ì¤¿
-    content language ¤Ë¥Þ¥Ã¥×¤·¤Þ¤¹¡£<var>MIME-lang</var> ¤Ï¡¢³ÈÄ¥»Ò
-    <var>extension</var> ¤ò´Þ¤ó¤Ç¤¤¤ë¥Õ¥¡¥¤¥ë̾¤Î MIME ¤Ë¤ª¤±¤ë¸À¸ì¤Ç¤¹¡£
-    ¤³¤Î¿·¤·¤¤¥Þ¥Ã¥Ô¥ó¥°¤Ï´û¤Ë¤¢¤ë¥Þ¥Ã¥Ô¥ó¥°¤ËÄɲ䵤졢Ʊ¤¸³ÈÄ¥»Ò
-    <var>extension</var> ¤Î¤¿¤á¤Î¥Þ¥Ã¥Ô¥ó¥°¤ò¾å½ñ¤­¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      AddEncoding x-compress .Z<br />
-      AddLanguage en .en<br />
-      AddLanguage fr .fr
-    </code></p></div>
-
-    <p>¤³¤Î¾ì¹ç¡¢<code>xxxx.en.Z</code> ¥É¥­¥å¥á¥ó¥È¤Ï compress
-    ¤µ¤ì¤¿±Ñ¸ì¤Î¥É¥­¥å¥á¥ó¥È¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹ (<code>xxxx.Z.en</code>
-    ¤âƱÍÍ)¡£content language ¤Ï¥¯¥é¥¤¥¢¥ó¥È¤ËÄÌÃΤµ¤ì¤Þ¤¹¤¬¡¢
-    ¥Ö¥é¥¦¥¶¤¬¤³¤Î¾ðÊó¤ò»È¤¦¤³¤È¤Ï¤ª¤½¤é¤¯¤¢¤ê¤Þ¤»¤ó¡£
-    <code class="directive">AddLanguage</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥µ¡¼¥Ð¤¬¥¯¥é¥¤¥¢¥ó¥È¤Î¸À¸ì¤ÎÍ¥ÀèÅ٤˴ð¤Å¤¤¤ÆÊ£¿ô¤Î
-    ¥É¥­¥å¥á¥ó¥È¤ÎÃ椫¤é¥É¥­¥å¥á¥ó¥È¤òÁª¤Ö<a href="../content-negotiation.html">¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó</a>¤Î¤¿¤á¤Ë¤è¤êÌò¤ËΩ¤Á¤Þ¤¹¡£</p>
-
-    <p>Ê£¿ô¤Î¸À¸ì¤¬Æ±¤¸³ÈÄ¥»Ò¤Ë³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤ë¤È¤­¤Ï¡¢
-    ºÇ¸å¤Î¤â¤Î¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£¤¹¤Ê¤ï¤Á¡¢¼¡¤Î¤è¤¦¤Ê¾ì¹ç¡¢</p>
-
-    <div class="example"><p><code>
-      AddLanguage en .en<br />
-      AddLanguage en-gb .en<br />
-      AddLanguage en-us .en
-    </code></p></div>
-
-    <p>³ÈÄ¥»Ò <code>.en</code> ¤Î¤¢¤ë¥É¥­¥å¥á¥ó¥È¤Ï
-    <code>en-us</code> ¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£</p>
-
-    <p>°ú¿ô <var>extension</var> ¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤»¤º¡¢
-    ºÇ½é¤Î¥É¥Ã¥È¤Ï¤¢¤Ã¤Æ¤â¤Ê¤¯¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddOutputFilter" id="AddOutputFilter">AddOutputFilter</a> <a name="addoutputfilter" id="addoutputfilter">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤ò¥µ¡¼¥Ð¤«¤é¤Î±þÅú¤ò½èÍý¤¹¤ë¥Õ¥£¥ë¥¿¤Ë
-    ¥Þ¥Ã¥×¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddOutputFilter <var>filter</var>[;<var>filter</var>...]
-<var>extension</var> [<var>extension</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.0.26 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p><code class="directive">AddOutputFilter</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ³ÈÄ¥»Ò <var>extension</var> ¤ò¥µ¡¼¥Ð¤Î±þÅú¤¬¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤é¤ì¤ë
-    Á°¤Ë½èÍý¤¹¤ë<a href="../filter.html">¥Õ¥£¥ë¥¿</a>¤òÄêµÁ¤·¤Þ¤¹¡£
-    ¤³¤ì¤Ï <code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È <code class="directive"><a href="../mod/core.html#addoutputfilterbytype">AddOutputFilterByType</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö
-    ¤ò´Þ¤á¡¢Â¾¤Î¾ì½ê¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¥Õ¥£¥ë¥¿¤Ë²Ã¤¨¤é¤ì¤Þ¤¹¡£
-    ¤³¤Î¿·¤·¤¤¥Þ¥Ã¥Ô¥ó¥°¤Ï´û¤Ë¤¢¤ë¥Þ¥Ã¥Ô¥ó¥°¤ËÄɲ䵤졢Ʊ¤¸³ÈÄ¥»Ò
-    <var>extension</var> ¤Î¤¿¤á¤Î¥Þ¥Ã¥Ô¥ó¥°¤ò¾å½ñ¤­¤·¤Þ¤¹¡£</p>
-
-    <p>Î㤨¤Ð¡¢°Ê²¼¤ÎÀßÄê¤Ï¤¹¤Ù¤Æ¤Î <code>.shtml</code> ¥Õ¥¡¥¤¥ë¤ò SSI ¤Ç½èÍý¤·¡¢
-    ¤½¤Î½ÐÎϤò <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> ¤ò»È¤Ã¤Æ°µ½Ì¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      AddOutputFilter INCLUDES;DEFLATE shtml
-    </code></p></div>
-
-    <p>Ê£¿ô¤Î¥Õ¥£¥ë¥¿¤ò»ØÄꤹ¤ë¤È¤­¤Ï¡¢¥Ç¡¼¥¿¤ò½èÍý¤¹¤ë½çÈ֤˥»¥ß¥³¥í¥ó¤Ç
-    ·Ò¤¤¤Ç½ñ¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£<var>filter</var> ¤È <var>extension</var> ¤Î
-    ξ°ú¿ô¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤»¤º¡¢³ÈÄ¥»Ò¤ÎºÇ½é¤Î¥É¥Ã¥È¤Ï
-    ¤¢¤Ã¤Æ¤â¤Ê¤¯¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#removeoutputfilter">RemoveOutputFilter</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AddType" id="AddType">AddType</a> <a name="addtype" id="addtype">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤ò»ØÄꤵ¤ì¤¿¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤Ë¥Þ¥Ã¥×</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AddType <var>MIME-type</var> <var>extension</var>
-[<var>extension</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-</table>
-    <p><code class="directive">AddType</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    Í¿¤¨¤é¤ì¤¿³ÈÄ¥»Ò¤ò»ØÄꤵ¤ì¤¿¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤Ë¥Þ¥Ã¥×¤·¤Þ¤¹¡£
-    <var>MIME-type</var> ¤Ï³ÈÄ¥»Ò <var>extension</var>
-    ¤ò´Þ¤ó¤À¥É¥­¥å¥á¥ó¥È¤Ë»ÈÍѤ¹¤ë MIME ¥¿¥¤¥×¤Ç¤¹¡£
-    ¤³¤Î¿·¤·¤¤¥Þ¥Ã¥Ô¥ó¥°¤Ï´û¤Ë¤¢¤ë¥Þ¥Ã¥Ô¥ó¥°¤ËÄɲ䵤졢Ʊ¤¸³ÈÄ¥»Ò
-    <var>extension</var> ¤Î¤¿¤á¤Î¥Þ¥Ã¥Ô¥ó¥°¤ò¾å½ñ¤­¤·¤Þ¤¹¡£
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï MIME ¥¿¥¤¥×¥Õ¥¡¥¤¥ë (<code class="directive"><a href="#typesconfig">TypesConfig</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»²¾È)
-    ¤Ë̵¤¤¥Þ¥Ã¥Ô¥ó¥°¤òÄɲ乤뤿¤á¤Ë»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      AddType image/gif .gif
-    </code></p></div>
-
-    <div class="note">
-      ¿·¤·¤¤ MIME ¥¿¥¤¥×¤Ï¡¢<code class="directive"><a href="#typesconfig">TypesConfig</a></code>
-      ¥Õ¥¡¥¤¥ë¤òÊѹ¹¤¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢<code class="directive">AddType</code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤ÆÄɲ乤뤳¤È¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-    </div>
-
-    <p>°ú¿ô <var>extension</var> ¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤»¤º¡¢
-    ºÇ½é¤Î¥É¥Ã¥È¤Ï¤¢¤Ã¤Æ¤â¤Ê¤¯¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="../mod/core.html#defaulttype">DefaultType</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#forcetype">ForceType</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="DefaultLanguage" id="DefaultLanguage">DefaultLanguage</a> <a name="defaultlanguage" id="defaultlanguage">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¤¢¤ë¥¹¥³¡¼¥×¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤵ¤ì¤¿¸À¸ì¤Ë
-ÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>DefaultLanguage <var>MIME-lang</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-</table>
-    <p><code class="directive">DefaultLanguage</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢Apache
-    ¤¬¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¥¹¥³¡¼¥× (<em>Î㤨¤Ð</em>¡¢¤½¤Î»þÅÀ¤Î
-    <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
-    ¤ÎÈÏ°Ï) ¤Ë¤¢¤ë¡¢ÌÀ¼¨Åª¤Ê¸À¸ì³ÈÄ¥»Ò
-    (<code class="directive"><a href="#addlanguage">AddLanguage</a></code> ¤ÇÀßÄꤵ¤ì¤ë
-    <code>.fr</code> ¤ä <code>.de</code>) ¤Î¤Ê¤¤Á´¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¡¢»ØÄꤵ¤ì¤¿
-    <var>MIME-lang</var> ¸À¸ì¤Ç¤¢¤ë¤È¤ß¤Ê¤¹¤è¤¦¤Ë¤·¤Þ¤¹¡£
-    ¤³¤ì¤Ë¤è¤ê¡¢¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë̾¤òÊѤ¨¤ë¤³¤È¤Ê¤¯¡¢
-    ¥Ç¥£¥ì¥¯¥È¥ê¤¬¥ª¥é¥ó¥À¸ì¤Î¥³¥ó¥Æ¥ó¥È¤ò´Þ¤ó¤Ç¤¤¤ë¡¢
-    ¤È¤¤¤¦¤è¤¦¤Ê¤³¤È¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ³ÈÄ¥»Ò¤ò»ÈÍѤ·¤Æ¸À¸ì¤ò»ØÄꤹ¤ëÊýË¡¤È°ã¤¤¡¢
-    <code class="directive">DefaultLanguage</code>
-    ¤Ï°ì¤Ä¤Î¸À¸ì¤·¤«»ØÄê¤Ç¤­¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p><code class="directive">DefaultLanguage</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Í­¸ú¤Ç¤Ê¤¯¡¢¥Õ¥¡¥¤¥ë¤Ë
-    <code class="directive"><a href="#addlanguage">AddLanguage</a></code>
-    ¤ÇÀßÄꤵ¤ì¤¿¸À¸ì¤Î³ÈÄ¥»Ò¤¬¤Ê¤¤¤È¤­¤Ï¡¢
-    ¥Õ¥¡¥¤¥ë¤Ë¤Ï¸À¸ì°À­¤¬¤Ê¤¤¤È¤ß¤Ê¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      DefaultLanguage en
-    </code></p></div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ModMimeUsePathInfo" id="ModMimeUsePathInfo">ModMimeUsePathInfo</a> <a name="modmimeusepathinfo" id="modmimeusepathinfo">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td><code>path_info</code> ¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ò¥Õ¥¡¥¤¥ë̾¤Î°ìÉô¤È¤·¤Æ°·¤¦¤è¤¦¤Ë
-<code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> ¤ËÄÌÃΤ¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ModMimeUsePathInfo On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ModMimeUsePathInfo Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0.41 °Ê¹ß</td></tr>
-</table>
-    <p><code class="directive">ModMimeUsePathInfo</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> ¤Î»ý¤Ä¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    ¥ê¥¯¥¨¥¹¥È¤ËŬÍѤµ¤»¤ë¤¿¤á¤Ë¡¢¥Õ¥¡¥¤¥ë̾¤È <code>path_info</code> URL 
-    ¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ò·ë¹ç¤µ¤»¤ë¤¿¤á¤Ë»ÈÍѤ·¤Þ¤¹¡£
-    ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡Ö <code>Off</code> ¡×¤Ç¡¢<code>path_info</code>
-    ¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥Ð¡¼¥Á¥ã¥ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò»ÈÍѤ·¤Æ¤¤¤ëºÝ¤Ë
-    ¿ä¾©¤µ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      ModMimeUsePathInfo On
-    </code></p></div>
-
-    <p><code>/bar</code> ¤¬Â¸ºß¤·¤Æ (foo.shtml ¤Ï¸ºß¤·¤Ê¤¤)
-    <code class="directive">ModMimeUsePathInfo</code> ¤¬ <code>On</code> ¤Ç¤¢¤ë¤È¤·¤Æ¡¢
-    <code>/bar/foo.shtml</code> ¤ËÂФ¹¤ë¥ê¥¯¥¨¥¹¥È¤òȯ¹Ô¤·¤¿¾ì¹ç¡¢
-    <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> ¤ÏÆþ¤Ã¤Æ¤­¤¿¥ê¥¯¥¨¥¹¥È¤ò
-    <code>/bar/foo.shtml</code> ¤È¤·¤Æ°·¤¤¡¢
-    <code>AddOutputFileter INCLUDES .shtml</code> ¤Î¤è¤¦¤Ê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    <code>INCLUDES</code> ¥Õ¥£¥ë¥¿¤ò¥ê¥¯¥¨¥¹¥È¤ËÉղ䵤»¤Þ¤¹¡£
-    <code class="directive">ModMimeUsePathInfo</code> ¤¬ÀßÄꤵ¤ì¤Ê¤±¤ì¤Ð¡¢
-    <code>INCLUDES</code> ¥Õ¥£¥ë¥¿¤ÏÉղ䵤ì¤Þ¤»¤ó¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="MultiviewsMatch" id="MultiviewsMatch">MultiviewsMatch</a> <a name="multiviewsmatch" id="multiviewsmatch">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>MultiViews ¤Ç¤Î¥Þ¥Ã¥Á¥ó¥°¤Î¸¡º÷¤Ë´Þ¤Þ¤»¤ë
-¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥×¤ò»ØÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>MultiviewsMatch Any|NegotiatedOnly|Filters|Handlers
-[Handlers|Filters]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>MultiviewsMatch NegotiatedOnly</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.0.26 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p><code class="directive">MultiviewsMatch</code> ¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢
-    <a href="mod_negotiation.html">mod_negotiation</a> ¤Î
-    Multiviews ¤Ë 3 ¼ïÎà¤Î°Û¤Ê¤ëµóÆ°¤ò¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    Multiviews ¤ò»ÈÍѤ¹¤ë¤È¡¢¥Õ¥¡¥¤¥ë (Îã <code>index.html</code>)
-    ¤ËÂФ¹¤ë¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ¡¢¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤¹¤ë³ÈÄ¥»Ò¤¬¥Ù¡¼¥¹¤ËÉÕ¤¤¤¿¤â¤Î
-    (<code>index.html.en</code>, <code>index.html.fr</code> ¤ä
-    <code>index.html.gz</code>)
-    ¤ò¥Þ¥Ã¥Á¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p><code>NegotiatedOnly</code> ¥ª¥×¥·¥ç¥ó¤Ç¤Ï¡¢¥Ù¡¼¥¹Ì¾¤Ë³¤¯³ÈÄ¥»ÒÁ´¤Æ¤¬
-    ¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤Ç <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code>
-    ¤¬Ç§¼±¤¹¤ë³ÈÄ¥»Ò (<em>Îã</em> ʸ»ú¥»¥Ã¥È¡¢¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¡¢¸À¸ì¤ä¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°)
-    ¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¤³¤ì¤ÏÉûºîÍѤκǤ⾯¤Ê¤¤
-    ºÇ¤âŪ³Î¤Ê¼ÂÁõ¤Ç¡¢¥Ç¥Õ¥©¥ë¥È¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p>¥Ï¥ó¥É¥é¤È¥Õ¥£¥ë¥¿¤ÎξÊý¤â¤·¤¯¤ÏÊÒÊý¤È´ØÏ¢ÉÕ¤±¤é¤ì¤¿³ÈÄ¥»Ò¤ò´Þ¤á¤ë¤Ë¤Ï¡¢
-    <code class="directive">MultiviewsMatch</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë <code>Handlers</code>,
-    <code>Filters</code> ¤Þ¤¿¤Ï¤½¤ÎξÊý¤Î¥ª¥×¥·¥ç¥ó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£
-    ¤â¤·Â¾¤Î¾ò·ï¤¬Æ±¤¸¤Ç¤¢¤ì¤Ð¡¢ºÇ¤â¾®¤µ¤¤¥Õ¥¡¥¤¥ë¤¬Á÷¿®¤µ¤ì¤Þ¤¹¡£
-    Î㤨¤Ð¡¢500 ʸ»ú¤Î <code>index.html.cgi</code> ¤È 1000 ¥Ð¥¤¥È¤Î 
-    <code>index.html.pl</code> ¤Ç¤¢¤ì¤Ð¡¢<code>.cgi</code> 
-    ¤Î¥Õ¥¡¥¤¥ë¤¬Í¥À褵¤ì¤Þ¤¹¡£<code>.asis</code> ¥Õ¥¡¥¤¥ë¤òÍøÍѤ·¤Æ¤¤¤ë¥æ¡¼¥¶¤Ï¡¢
-    <code>.asis</code> ¥Õ¥¡¥¤¥ë¤¬ <code>asis-handler</code> ¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤Æ¤¤¤ë¤È¤­¤Ë¤Ï¡¢
-    ¥Ï¥ó¥É¥é¥ª¥×¥·¥ç¥ó¤Î»ÈÍѤò¹¥¤à¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>ºÇ¸å¤Ë¡¢<code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> ¤¬Ç§¼±¤·¤Ê¤¤³ÈÄ¥»Ò¤Ç¤¢¤í¤¦¤È¤â¡¢
-    ¤É¤ó¤Ê³ÈÄ¥»Ò¤Ç¤â¥Þ¥Ã¥Á¤µ¤»¤ë <code>Any</code> ¤¬»ÈÍѤǤ­¤Þ¤¹¡£
-    ¤³¤ÎµóÆ°¤Ï Apache 1.3 ¤Î¤È¤­¤ÈƱ¤¸¤â¤Î¤Ç¡¢Í½´ü¤·¤Ê¤¤Æ°ºî¡¢Î㤨¤Ð <code>.old</code> ¤ä
-    <code>.bak</code> ¥Õ¥¡¥¤¥ë¤È¤¤¤Ã¤¿¥¦¥§¥Ö¥Þ¥¹¥¿¤¬Á÷¿®¤ò°Õ¿Þ¤·¤Æ¤¤¤Ê¤¤
-    ¥Õ¥¡¥¤¥ë¤òÁ÷¿®¤¹¤ë¡¢¤È¤¤¤Ã¤¿Æ°ºî¤ò¹Ô¤Ê¤¦²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>Î㤨¤Ð¼¡¤ÎÀßÄê¤Ç¤Ï¡¢¥Ï¥ó¥É¥é¤ä¥Õ¥£¥ë¥¿¤¬ Multiviews ¤Ë»²²Ã¤¹¤ë¤³¤È¤¬
-    ¤Ç¤­¤Þ¤¹¤·¡¢Ì¤ÃΤΥե¡¥¤¥ë¤Ï½ü³°¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      MultiviewsMatch Handlers Filters
-    </code></p></div>
-
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li>
-<li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="RemoveCharset" id="RemoveCharset">RemoveCharset</a> <a name="removecharset" id="removecharset">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¤¹¤Ù¤Æ¤Îʸ»ú¥»¥Ã¥È
-¤ò²ò½ü¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>RemoveCharset <var>extension</var> [<var>extension</var>]
-...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.0.24 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p><code class="directive">RemoveCharset</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö
-    ¤ÏÍ¿¤¨¤é¤ì¤¿³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿Ê¸»ú¥»¥Ã¥È¤ò¼è¤ê¾Ã¤·¤Þ¤¹¡£
-    ¤³¤ì¤Ë¤è¤ê¡¢¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë <code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ë¤¬¿Æ¥Ç¥£¥ì¥¯¥È¥ê¤ä¥µ¡¼¥Ð¤ÎÀßÄê¥Õ¥¡¥¤¥ë
-    ¤«¤é·Ñ¾µ¤·¤¿´ØÏ¢ÉÕ¤±¤ò¼è¤ê¾Ã¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Î㤨¤Ð:</p>
-
-    <p><var>extension</var> ¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Þ¤»¤ó¡£
-    ¤Þ¤¿¡¢ºÇ½é¤Î¥É¥Ã¥È¤Ï¤¢¤Ã¤Æ¤â¤Ê¤¯¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      RemoveCharset .html .shtml
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="RemoveEncoding" id="RemoveEncoding">RemoveEncoding</a> <a name="removeencoding" id="removeencoding">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¤¹¤Ù¤Æ¤Î¥³¥ó¥Æ¥ó¥È¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°
-¤ò²ò½ü¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>RemoveEncoding <var>extension</var> [<var>extension</var>]
-...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-</table>
-    <p><code class="directive">RemoveEncoding</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    Í¿¤¨¤é¤ì¤¿³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ò¼è¤ê¾Ã¤·¤Þ¤¹¡£
-    ¤³¤ì¤Ë¤è¤ê¡¢¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë <code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ë¤¬¿Æ¥Ç¥£¥ì¥¯¥È¥ê¤ä¥µ¡¼¥Ð¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤«¤é·Ñ¾µ¤·¤¿´ØÏ¢ÉÕ¤±¤ò
-    ¼è¤ê¾Ã¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>/foo/.htaccess:</h3><p><code>
-      AddEncoding x-gzip .gz<br />
-      AddType text/plain .asc<br />
-      &lt;Files *.gz.asc&gt;<br />
-      <span class="indent">
-        RemoveEncoding .gz<br />
-      </span>
-      &lt;/Files&gt;
-    </code></p></div>
-
-    <p>¤³¤ì¤Ï¡¢<code>foo.gz</code> ¤Ï gzip
-    ¤Ç¥¨¥ó¥³¡¼¥É¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò»ØÄꤷ¤Þ¤¹¤¬¡¢<code>foo.gz.asc</code>
-    ¤Ï¥¨¥ó¥³¡¼¥É¤µ¤ì¤Æ¤¤¤Ê¤¤¥×¥ì¡¼¥ó¥Æ¥­¥¹¥È¤Î
-    ¥Õ¥¡¥¤¥ë¤Ç¤¢¤ë¤È¤¤¤¦¤³¤È¤ò»ØÄꤷ¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>Ãí°Õ</h3>
-      <p><code class="directive">RemoveEncoding</code> ¤Ï
-      <code class="directive"><a href="#addencoding">AddEncoding</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î<em>¸å</em>¤Ç½èÍý¤µ¤ì¤Þ¤¹¤Î¤Ç¡¢
-      Ʊ¤¸¥Ç¥£¥ì¥¯¥È¥ê¤ÎÀßÄêÃæ¤ËξÊý¤¬¸½¤ì¤ë¤È¡¢
-      ¸å¼Ô¤Î¸ú²Ì¤¬ÂǤÁ¾Ã¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£</p>
-    </div>
-
-    <p><var>extension</var> ¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Þ¤»¤ó¡£
-    ¤Þ¤¿¡¢ºÇ½é¤Î¥É¥Ã¥È¤Ï¤¢¤Ã¤Æ¤â¤Ê¤¯¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="RemoveHandler" id="RemoveHandler">RemoveHandler</a> <a name="removehandler" id="removehandler">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¤¹¤Ù¤Æ¤Î¥Ï¥ó¥É¥é¤ò
-²ò½ü¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>RemoveHandler <var>extension</var> [<var>extension</var>]
-...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-</table>
-    <p><code class="directive">RemoveHandler</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö
-    ¤ÏÍ¿¤¨¤é¤ì¤¿³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¥Ï¥ó¥É¥é¤ò¼è¤ê¾Ã¤·¤Þ¤¹¡£
-    ¤³¤ì¤Ë¤è¤ê¡¢¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë <code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ë¤¬¿Æ¥Ç¥£¥ì¥¯¥È¥ê¤ä¥µ¡¼¥Ð¤ÎÀßÄê¥Õ¥¡¥¤¥ë
-    ¤«¤é·Ñ¾µ¤·¤¿´ØÏ¢ÉÕ¤±¤ò¼è¤ê¾Ã¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤È¤¨¤Ð:</p>
-
-    <div class="example"><h3>/foo/.htaccess:</h3><p><code>
-      AddHandler server-parsed .html
-    </code></p></div>
-
-    <div class="example"><h3>/foo/bar/.htaccess:</h3><p><code>
-      RemoveHandler .html
-    </code></p></div>
-
-    <p>¤³¤ì¤Ï¡¢<code>/foo/bar</code> ¥Ç¥£¥ì¥¯¥È¥ê¤Î <code>.html</code>
-    ¥Õ¥¡¥¤¥ë¤Ï SSI (<code class="module"><a href="../mod/mod_include.html">mod_include</a></code> ¥â¥¸¥å¡¼¥ë»²¾È) ¤Ç¤Ï¤Ê¤¯¡¢
-    ÉáÄ̤Υե¡¥¤¥ë¤È¤·¤Æ°·¤ï¤ì¤ë¤è¤¦¤Ë¤¹¤ë¸ú²Ì¤¬¤¢¤ê¤Þ¤¹¡£
-    </p>
-
-    <p><var>extension</var> ¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Þ¤»¤ó¡£
-    ¤Þ¤¿¡¢ºÇ½é¤Î¥É¥Ã¥È¤Ï¤¢¤Ã¤Æ¤â¤Ê¤¯¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="RemoveInputFilter" id="RemoveInputFilter">RemoveInputFilter</a> <a name="removeinputfilter" id="removeinputfilter">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿ÆþÎÏ¥Õ¥£¥ë¥¿¤ò²ò½ü¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>RemoveInputFilter <var>extension</var> [<var>extension</var>]
-...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.0.26 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p><code class="directive">RemoveInputFilter</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    »ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿ÆþÎÏ¥Õ¥£¥ë¥¿¤ò²ò½ü¤·¤Þ¤¹¡£
-    ¤³¤ì¤òÍøÍѤ¹¤ë¤³¤È¤Ç¡¢¿Æ¥Ç¥£¥ì¥¯¥È¥ê¤ä¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë¤«¤é
-    ·Ñ¾µ¤·¤¿´ØÏ¢ÉÕ¤±¤ò ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë¤ª¤¤¤Æ
-    <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ç¼è¤ê¾Ã¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p><var>extension</var> °ú¿ô¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Þ¤»¤ó¡£¤Þ¤¿¡¢
-    ºÇ½é¤Î¥É¥Ã¥È¤Ï¤¢¤Ã¤Æ¤â¤Ê¤¯¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#addinputfilter">AddInputFilter</a></code></li>
-<li><code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="RemoveLanguage" id="RemoveLanguage">RemoveLanguage</a> <a name="removelanguage" id="removelanguage">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¸À¸ì¤ò²ò½ü¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>RemoveLanguage <var>extension</var> [<var>extension</var>]
-...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.0.24 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p><code class="directive">RemoveLanguage</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    »ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¸À¸ì¤ò²ò½ü¤·¤Þ¤¹¡£
-    ¤³¤ì¤òÍøÍѤ¹¤ë¤³¤È¤Ç¡¢¿Æ¥Ç¥£¥ì¥¯¥È¥ê¤ä¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë¤«¤é
-    ·Ñ¾µ¤·¤¿´ØÏ¢ÉÕ¤±¤ò ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë¤ª¤¤¤Æ
-    <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ç¼è¤ê¾Ã¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p><var>extension</var> °ú¿ô¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Þ¤»¤ó¡£¤Þ¤¿¡¢
-    ºÇ½é¤Î¥É¥Ã¥È¤Ï¤Ä¤¤¤Æ¤â¤Ä¤«¤Ê¤¯¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="RemoveOutputFilter" id="RemoveOutputFilter">RemoveOutputFilter</a> <a name="removeoutputfilter" id="removeoutputfilter">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿½ÐÎÏ¥Õ¥£¥ë¥¿¤ò²ò½ü¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>RemoveOutputFilter <var>extension</var> [<var>extension</var>]
-...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.0.26 °Ê¹ß¤Ç¤Î¤ß»ÈÍѲÄǽ</td></tr>
-</table>
-    <p><code class="directive">RemoveOutputFilter</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    »ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿½ÐÎÏ¥Õ¥£¥ë¥¿¤ò²ò½ü¤·¤Þ¤¹¡£
-    ¤³¤ì¤òÍøÍѤ¹¤ë¤³¤È¤Ç¡¢¿Æ¥Ç¥£¥ì¥¯¥È¥ê¤ä¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë¤«¤é
-    ·Ñ¾µ¤·¤¿´ØÏ¢ÉÕ¤±¤ò ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë¤ª¤¤¤Æ
-    <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ç¼è¤ê¾Ã¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p><var>extension</var> ¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Þ¤»¤ó¡£
-    ¤Þ¤¿¡¢ºÇ½é¤Î¥É¥Ã¥È¤Ï¤¢¤Ã¤Æ¤â¤Ê¤¯¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      RemoveOutputFilter shtml
-    </code></p></div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#addoutputfilter">AddOutputFilter</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="RemoveType" id="RemoveType">RemoveType</a> <a name="removetype" id="removetype">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤È´ØÏ¢ÉÕ¤±¤é¤ì¤¿¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤ò
-²ò½ü¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>RemoveType <var>extension</var> [<var>extension</var>]
-...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-</table>
-    <p><code class="directive">RemoveType</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÍ¿¤¨¤é¤ì¤¿³ÈÄ¥»Ò¤Î
-    MIME ¥¿¥¤¥×¤Î´ØÏ¢ÉÕ¤±¤ò¼è¤ê¾Ã¤·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢
-    ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë <code>.htaccess</code>
-    ¥Õ¥¡¥¤¥ë¤¬¿Æ¥Ç¥£¥ì¥¯¥È¥ê¤ä¥µ¡¼¥Ð¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤«¤é·Ñ¾µ¤·¤¿
-    ´ØÏ¢ÉÕ¤±¤ò¼è¤ê¾Ã¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤È¤¨¤Ð:</p>
-
-    <div class="example"><h3>/foo/.htaccess:</h3><p><code>
-      RemoveType .cgi
-    </code></p></div>
-
-    <p>¤³¤ì¤Ï <code>/foo/</code> ¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤Î <code>.cgi</code>
-    ¥Õ¥¡¥¤¥ë¤ÎÆÃÊ̤ʰ·¤¤¤ò¼è¤ê¾Ã¤·¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¤Ï <code class="directive"><a href="../mod/core.html#defaulttype">DefaultType</a></code> ¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>Ãí°Õ</h3>
-      <p><code class="directive">RemoveType</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-      <code class="directive"><a href="#addtype">AddType</a></code> 
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î<em>¸å</em>¤Ë½èÍý¤µ¤ì¤Þ¤¹¤Î¤Ç¡¢
-      ξÊý¤¬Æ±¤¸¥Ç¥£¥ì¥¯¥È¥ê¤ÎÀßÄêÃæ¤Ë¸½¤ì¤¿¾ì¹ç¡¢
-      ¸å¼Ô¤Î¸ú²Ì¤¬ÂǤÁ¾Ã¤µ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£</p>
-    </div>
-
-    <p><var>extension</var> ¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Þ¤»¤ó¡£
-    ¤Þ¤¿¡¢ºÇ½é¤Î¥É¥Ã¥È¤Ï¤¢¤Ã¤Æ¤â¤Ê¤¯¤Æ¤â¹½¤¤¤Þ¤»¤ó¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="TypesConfig" id="TypesConfig">TypesConfig</a> <a name="typesconfig" id="typesconfig">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td><code>mime.types</code> ¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>TypesConfig <var>file-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>TypesConfig conf/mime.types</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>¥Ù¡¼¥¹</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_mime</td></tr>
-</table>
-    <p><code class="directive">TypesConfig</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢MIME
-    ¥¿¥¤¥×ÀßÄê¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÀßÄꤷ¤Þ¤¹¡£<var>filename</var> ¤Ï
-    <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> ¤«¤é¤ÎÁêÂХѥ¹¤Ç¤¹¡£
-    ¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤«¤é¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤Ø¤Î
-    ¥Ç¥Õ¥©¥ë¥È¤Î¥Þ¥Ã¥Ô¥ó¥°¤òÀßÄꤷ¤Þ¤¹¡£
-    ¤Û¤È¤ó¤É¤Î´ÉÍý¼Ô¤Ï¡¢¤è¤¯»È¤ï¤ì¤ë¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤ò
-    IANA ¤ËÅÐÏ¿¤µ¤ì¤¿¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤Ë´ØÏ¢ÉÕ¤±¤Æ¤¤¤ë¡¢
-    Apache ¤Î <code>mime.types</code> ¥Õ¥¡¥¤¥ë¤ò»È¤¤¤Þ¤¹¡£
-    ¸½ºß¤Î°ìÍ÷¤Ï <a href="http://www.iana.org/assignments/media-types/index.html">http://www.iana.org/assignments/media-types/index.html</a>
-    ¤Ç´ÉÍý¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï¡¢¼çÍפʥá¥Ç¥£¥¢¥¿¥¤¥×¤ÎÄêµÁ¤òÄ󶡤·¤Æ¡¢
-    ɬÍפȤ³¤í¤ò <code class="directive"><a href="#addtype">AddType</a></code> ¤Ç
-    ¾å½ñ¤­¤¹¤ë¡¢¤È¤¤¤¦ÊýË¡¤Ç <code>httpd.conf</code> ¤ò´Êά¤Ë¤·¤Þ¤¹¡£
-    <code>mime.types</code> ¤Ï¥µ¡¼¥Ð¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤¿¤È¤­¤Ë
-    ÃÖ¤­´¹¤¨¤é¤ì¤ë¤«¤â¤·¤ì¤Ê¤¤¤Î¤Ç¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤òľÀÜ
-    ÊÔ½¸¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</p>
-
-    <p>¥Õ¥¡¥¤¥ë¤Ï¡¢<code class="directive"><a href="#addtype">AddType</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î°ú¿ô¤ÈƱ¤¸·Á¼°¤Î¹Ô¤Ç¹½À®¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      <var>MIME-type</var> [<var>extension</var>] ...
-    </code></p></div>
-
-    <p>³ÈÄ¥»Ò¤ÎÂçʸ»ú¾®Ê¸»ú¤Ï¶èÊ̤µ¤ì¤Þ¤»¤ó¡£¶õ¹Ô¤ä¥Ï¥Ã¥·¥å (`#') 
-    ¤Ç»Ï¤Þ¤ë¹Ô¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="note">
-      (1) IANA ¤Ë´û¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¡¢¤¢¤ë¤¤¤Ï (2)
-      ¹­¤¯¼õ¤±Æþ¤ì¤é¤ì¤Æ¤¤¤Æ¥×¥é¥Ã¥È¥Û¡¼¥à´Ö¤Ç¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Ë¾×Æͤ¬¤Ê¤¤¡¢
-      ¤È¤¤¤¦¾ì¹ç¤Ç¤Ê¤±¤ì¤Ð¡¢ÇÛÉÛÃæ¤Î <code>mime.types</code>
-      ¥Õ¥¡¥¤¥ë¤Ë¿·¤¿¤Ê¤â¤Î¤òÅÐÏ¿¤¹¤ë¤è¤¦¤Ë
-      Apache HTTP Server Project ¤Ë¥ê¥¯¥¨¥¹¥È¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-      <code>category/x-subtype</code> ¤Î¥ê¥¯¥¨¥¹¥È¤Ï¼«Æ°Åª¤ËµÑ²¼¤µ¤ì¤Þ¤¹¤·¡¢
-      ¸À¸ì¤äʸ»ú¥»¥Ã¥È¤Î̾Á°¶õ´Ö¤Ç´û¤Ë»ÈÍѤµ¤ì¤Æ¤¤¤Æ¡¢¾×ÆͤβÄǽÀ­¤Î¤¢¤ë
-      2 ʸ»ú¤Î³ÈÄ¥»Ò¤âµÑ²¼¤µ¤ì¤Þ¤¹¡£
-    </div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="module"><a href="../mod/mod_mime_magic.html">mod_mime_magic</a></code></li>
-</ul>
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_mime.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_mime.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_mime.html.ja.utf8 b/docs/manual/mod/mod_mime.html.ja.utf8
new file mode 100644
index 00000000..f9a26afc
--- /dev/null
+++ b/docs/manual/mod/mod_mime.html.ja.utf8
@@ -0,0 +1,939 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_mime - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_mime</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_mime.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_mime.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>リクエスト�れ�ファイル�拡張��ファイル�振る舞�
+    (�ンドラ�フィルタ)�内容 (MIME タイプ�言語�文字セット�エンコーディング)
+    �を関連付�る</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>mime_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_mime.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール�拡張�を使�������「メタ情報�をファイル�
+    関連付�る���使用�れ��。��情報�ドキュメント�ファイル��
+    MIME タイプ�言語�文字セット�エンコーディング�を関連付���。
+    ��情報�ブラウザ��られ����複数�ファイル�中�らユーザ�好��
+    も����れるよ���コンテント�ゴシエーション�も使�れ��。
+    <a href="../content-negotiation.html">コンテント�ゴシエーション</a>
+    �関�る詳��情報� <code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code>
+    を�覧下��。</p>
+
+    <p><code class="directive"><a href="#addcharset">AddCharset</a></code> ディレクティブ�
+    <code class="directive"><a href="#addencoding">AddEncoding</a></code> ディレクティブ�
+    <code class="directive"><a href="#addhandler">AddHandler</a></code> ディレクティブ�
+    <code class="directive"><a href="#addlanguage">AddLanguage</a></code> ディレクティブ�
+    <code class="directive"><a href="#addtype">AddType</a></code> ディレクティブ�����
+    ファイル�拡張�をメタ情報�マップ�る���使用�れ��。
+    �れ�れ�ドキュメント�文字セット (訳注: charset)�content-encoding,
+    content-language, MIME タイプ (content-type) を設定���。
+    <code class="directive"><a href="#typesconfig">TypesConfig</a></code> ディレクティブ�拡張�を
+    MIME タイプ�マップ�るファイルを指定�る���使用�れ��。</p>
+
+    <p>�ら��<code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> �コンテンツを作��処��る
+    <a href="../handler.html">�ンドラ</a> � <a href="../filter.html">フィルタ</a>
+    を設定�る�������。<code class="directive"><a href="#addhandler">AddHandler</a></code> ディレクティブ�<code class="directive"><a href="#addoutputfilter">AddOutputFilter</a></code> ディレクティブ�<code class="directive"><a href="#addinputfilter">AddInputFilter</a></code> ディレクティブ�
+    ドキュメントを扱�モジュールやスクリプトを制御���。
+    <code class="directive"><a href="#multiviewsmatch">MultiviewsMatch</a></code> ディレクティブ�
+    �れら�ディレクティブ�指定��ファイル�拡張�を
+    <code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code> � Multiviews �マッ�を�る���
+    考慮�るよ������。</p>
+
+    <p><code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> �メタ情報をファイル��関連付�����
+    <code class="module"><a href="../mod/core.html">core</a></code> サー����るコンテナ
+    (<em>����</em>, <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>, <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>, <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code>) �中�����ファイルを特定�
+    メタ情報�関連付�るディレクティブ��り��。�れら�ディレクティブ��
+    <code class="directive"><a href="../mod/core.html#forcetype">ForceType</a></code>, <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code>, <code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code>, <code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code> ��り��。
+    コア�ディレクティブ� <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> �より定義�れ�
+    ファイル��拡張��マッピング���を上書����。</p>
+
+    <p>ファイル�メタ情報を変��も <code>Last-Modified</code>
+    ヘッダ�値�変�ら�����注�������。���ら�
+    �れらを変更��場���クライアントやプロキシ�以��キャッシュ�れ�
+    コピー������ヘッダ��も�使�れる�能性��り��。
+    メタ情報 (言語�コンテントタイプ�文字セット�エンコーディング) を
+    変更����������訪�者�正��コンテントヘッダを
+    ���るよ���影響を��るファイル� 'touch' コマンドを実行�る
+    (最終更新日を更新�る) 必���る�も�れ��ん。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#addcharset">AddCharset</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#addencoding">AddEncoding</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#addhandler">AddHandler</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#addinputfilter">AddInputFilter</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#addlanguage">AddLanguage</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#addoutputfilter">AddOutputFilter</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#addtype">AddType</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#defaultlanguage">DefaultLanguage</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#modmimeusepathinfo">ModMimeUsePathInfo</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#multiviewsmatch">MultiviewsMatch</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#removecharset">RemoveCharset</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#removeencoding">RemoveEncoding</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#removehandler">RemoveHandler</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#removeinputfilter">RemoveInputFilter</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#removelanguage">RemoveLanguage</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#removeoutputfilter">RemoveOutputFilter</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#removetype">RemoveType</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#typesconfig">TypesConfig</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#multipleext">複数�拡張���るファイル</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#contentencoding">コンテントエンコーディング</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#charset-lang">文字セット�言語</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#adddefaultcharset">AddDefaultCharset</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#forcetype">ForceType</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#defaulttype">DefaultType</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="multipleext" id="multipleext">複数�拡張���るファイル</a></h2>
+    <p>ファイル�複数�拡張�を��������拡張��順番�<em>通常�</em>関係�り��ん。例���ファイル <code>welcome.html.fr</code>
+    �コンテントタイプ� <code>text/html</code>
+    ��言語�フランス語�マップ�れる場��<code>welcome.fr.html</code>
+    も������情報�マップ�れ��。
+    ��メタ情報�マップ�れる拡張��複数�る�����言語�
+    コンテントエンコーディングを除���
+    ����るも��使用�れ��。�����<code>.gif</code> � MIME
+    タイプ <code>image/gif</code> �マップ�れ�<code>.html</code>
+    � MIME タイプ <code>text/html</code>
+    �マップ�れる場���ファイル <code>welcome.gif.html</code> �
+    MIME タイプ <code>text/html</code> �関連付�られ��。</p>
+
+    <p>リソース�複数�言語やエンコーディングを関連付�る��
+    ���る���
+    <a href="#charset-lang">言語</a>�<a href="#contentencoding">コンテントエンコーディング</a>���も��追加�れ�����。
+    �����ファイル <code>welcome.html.en.de</code> �
+    <code>Content-Language: en, de</code> � <code>Content-Type:
+    text/html</code> ����信�れ��。</p>
+
+    <p>複数�拡張���るファイル� MIME
+    タイプ��ンドラ�両方�関連付�られ��る���注��る必���り��。
+    ��場��普通�リクエスト��ンドラ�関連付�られ�
+    モジュール�よ��扱�れる����り��。�����拡張�
+    <code>.imap</code> � (<code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code> �) <code>imap-file</code>
+    �マップ�れ����<code>.html</code> � MIME タイプ <code>text/html</code>
+    �マップ�れ��る����ファイル <code>world.imap.html</code> �
+    <code>imap-file</code> �ンドラ� <code>text/html</code> MIME
+    タイプ�関連付�られ��。ファイル�処��れる��� <code>imap-file</code>
+    �ンドラ�使用�れ�������ファイル� <code class="module"><a href="../mod/mod_imagemap.html">mod_imagemap</a></code>
+    �イメージマップファイル���扱�れる����り��。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="contentencoding" id="contentencoding">コンテントエンコーディング</a></h2>
+    <p>特定� MIME タイプ�ファイル�インター�ット��転�を簡���る����
+    �ら�符�化�る�������。�れ�通常� <code>gzip</code> �
+    よ��圧縮���を指�����<code>pgp</code> �よ��暗�化や�
+    �イナリファイルを ASCII (テキスト) 形���る���考案�れ�
+    UUencoding ���を指���も�り��。</p>
+
+    <p><a href="http://www.ietf.org/rfc/rfc2616.txt">HTTP/1.1 RFC</a> 
+    14.11 節��次�よ��記述�れ����。</p>
+
+    <blockquote cite="http://www.ietf.org/rfc/rfc2616.txt">
+      <p>Content-Encoding エンティティヘッダフィールド�メディアタイプ�
+      修飾����使�れ��。�れ�存在���れ��値�エンティティボディ�
+      ��追加�符�化��用�れ��を示��Content-Type ヘッダフィールド�
+      書�れ��るメディアタイプを得る�����復�機構を�用�����も
+      示���る����り��。Content-Encoding �主��元�メディアタイプ�
+      �一性を失�����ドキュメントを圧縮�る��を�能��る���
+      使用�れ��。</p>
+    </blockquote>
+
+    <p>複数�ファイル拡張� (複数�拡張������ <a href="#multipleext">上�節</a> を�照) 使�����
+    ファイル�<em>タイプ</em>や<em>エンコーディング</em>を指定�る���
+    ����。</p>
+
+    <p>�����Microsoft Word �ドキュメント��り�サイズを����る���
+    pkzip �れ��る����。<code>.doc</code> 拡張�� Microsoft Word �
+    ファイルタイプ�関連付�られ����<code>.zip</code> 拡張��
+    pkzip ファイルエンコーディング�関連付�られ��る��ファイル
+    <code>Resume.doc.zip</code> � pkzip �れ� Word ドキュメント��る
+    ��������り��。</p>
+
+    <p>クライアント�ブラウザ�エンコーディング方法を知ら�る����
+    Apache �リソース�共� <code>Content-Encoding</code> ヘッダを
+    �り��。</p>
+
+    <div class="example"><p><code>Content-encoding: pkzip</code></p></div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="charset-lang" id="charset-lang">文字セット�言語</a></h2>
+    <p>ファイルタイプ�ファイルエンコーディング�他����情報�
+    ドキュメント�書�れ��る言語����文字セット�ファイル�表示
+    �れる�������も���。�����ドキュメント�ベトナム�
+    アルファベットやキリル文字�書�れ������よ��表示�れる
+    必���る�も�れ��ん。��情報も���HTTP ヘッダ�
+    �信�れ��。</p>
+
+    <p>文字セット�言語�エンコーディング�mime タイプ����
+    コンテント�ゴシエーション (<code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code> �照)
+    �最中��複数�文字セット�言語�エンコーディング�MIME タイプ�ら�る
+    代替物��る�����ドキュメントをクライアント��る��を
+    決定�る���使�れ��。<code class="directive"><a href="#addcharset">AddCharset</a></code>,
+    <code class="directive"><a href="#addencoding">AddEncoding</a></code>, <code class="directive"><a href="#addlanguage">AddLanguage</a></code>,
+    <code class="directive"><a href="#addtype">AddType</a></code> ��ディレクティブ�作��れ�
+    拡張��関連付� (� <code class="directive"><a href="../mod/mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></code> �リスト�れ��る
+    拡張�) ����択��加���。<code class="directive"><a href="#addhandler">AddHandler</a></code>,
+    <code class="directive"><a href="#addinputfilter">AddInputFilter</a></code>,
+    <code class="directive"><a href="#addoutputfilter">AddOutputFilter</a></code> �
+    �ディレクティブ���関連付�られ��る拡張��
+    <code class="directive"><a href="#multiviewsmatch">MultiviewsMatch</a></code> ディレクティブを
+    使����マッ��
+    処����る��も外���も����。</p>
+
+    <h3><a name="charset" id="charset">Charset</a></h3>
+      <p>�ら�情報を��る����Apache �文書�言語を
+      <code>Content-Language</code> ヘッダ��る��も�り��。
+      ���情報を正��表示�る���使用���文字セットを示����
+      <code>Conten-Type</code> ヘッダ�情報を追加�る��も�り��。</p>
+
+      <div class="example"><p><code>
+        Content-Language: en, fr<br />
+	Content-Type: text/plain; charset=ISO-8859-1
+      </code></p></div>
+
+      <p>言語�指定�二文字�短縮形�行��れ��。<code>charset</code> �
+      使用���文字セット�����。</p>
+    
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddCharset" id="AddCharset">AddCharset</a> <a name="addcharset" id="addcharset">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル��拡張�を指定�れ�文字セット�マップ�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddCharset <var>charset</var> <var>extension</var>
+[<var>extension</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+</table>
+    <p><code class="directive">AddCharset</code> ディレクティブ��
+    与�られ�拡張�を指定�れ� charset �マップ���。<var>charset</var> 
+    ��拡張� <var>extension</var> を�ん��るファイル�� 
+    <a href="http://www.iana.org/assignments/character-sets">MIME charset
+    パラメータ</a>��。新��マッピング�既��る他�マッピング�追加�れ���拡張�
+    <var>extension</var> ����マッピングを上書����。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      AddLanguage ja .ja<br />
+      AddCharset EUC-JP .euc<br />
+      AddCharset ISO-2022-JP .jis<br />
+      AddCharset SHIFT_JIS .sjis
+    </code></p></div>
+
+    <p>��場��ドキュメント <code>xxxx.ja.jis</code> � charset �
+    <code>ISO-2022-JP</code> �日本語�ドキュメント���扱�れ��
+    (<code>xxxx.jis.ja</code> も�様)。<code class="directive">AddCharset</code>
+    ディレクティブ��ドキュメント��切�解釈�れ表示�れるよ���
+    ドキュメント� charset �情報をクライアント�教�る���役�立���。
+    ���サー��クライアント� charset
+    �優先度�基���複数�ドキュメント�中�らドキュメントを��<a href="../content-negotiation.html">コンテント�ゴシエーション</a>����も役�立���。</p>
+
+    <p>引数 <var>extension</var>�大文字�文字を区別���
+    最��ドット����も���も構���ん。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#adddefaultcharset">AddDefaultCharset</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddEncoding" id="AddEncoding">AddEncoding</a> <a name="addencoding" id="addencoding">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル��拡張�を指定�れ�エンコーディング
+�マップ�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddEncoding <var>MIME-enc</var> <var>extension</var>
+[<var>extension</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+</table>
+    <p><code class="directive">AddEncoding</code> ディレクティブ��
+    与�られ�拡張�を指定�れ�エンコーディング�マップ���。
+    <var>MIME-enc</var> ��拡張� <var>extension</var>
+    を�ん�ドキュメント�使用�る MIME エンコーディング��。
+    ��新��マッピング�既��る他�マッピング�追加�れ�
+    ��拡張� <var>extension</var> ����マッピングを上書����。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      <code>AddEncoding x-gzip .gz<br />
+       AddEncoding x-compress .Z</code>
+    </code></p></div>
+
+    <p>�れ��拡張� <code>.gz</code> を�むファイル�� <code>x-gzip</code>
+    エンコーディングを使��エンコード�れ��る����拡張� <code>.Z</code>
+    を�むファイル�� <code>x-compress</code>
+    �エンコード�れ��る��を指定���。</p>
+
+    <p>��クライアント� <code>x-zip</code> � <code>x-compress</code>
+    �返���る��を期待�����標準�格���れ�れ
+    <code>gzip</code> � <code>compress</code>
+    �等価��る���������。Apache
+    ��コンテントエンコーディング�比較を�る�����先頭��る
+    <code>x-</code> を無視���。Apache
+    �エンコーディング付��応答を返�����クライアント��求��形�
+    (<em>����</em>�<code>x-foo</code> や <code>foo</code>)
+    を使用���。��る����二��エンコーディング�場��常�
+    <code>x-gzip</code> � <code>x-compress</code>
+    を使�����る��������。<code>deflate</code>
+    �よ��より新��エンコーディング���<code>x-</code>
+    ���指定������。
+    </p>
+
+    <p>引数 <var>extension</var> �大文字�文字を区別���
+    最��ドット����も���も構���ん。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddHandler" id="AddHandler">AddHandler</a> <a name="addhandler" id="addhandler">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル��拡張�を指定�れ��ンドラ�マップ�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddHandler <var>handler-name</var> <var>extension</var>
+[<var>extension</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+</table>
+    <p>拡張� <var>extension</var> �����るファイル�指定�れ� <a href="../handler.html">handler-name</a> �扱�れ��。
+    ��新��マッピング�既��る他�マッピング�追加�れ�
+    ��拡張� <var>extension</var>
+    ����マッピングを上書����。�����拡張�
+    "<code>.cgi</code>" �終�るファイルを CGI
+    スクリプト���扱�������以下�設定を���。</p>
+
+    <div class="example"><p><code>
+      AddHandler cgi-script .cgi
+    </code></p></div>
+
+    <p>�れを httpd.conf ファイル�記述�る����拡張�
+    "<code>.cgi</code>" �ファイル� CGI プログラム���扱�れ��。
+    </p>
+
+    <p>引数 <var>extension</var> �大文字�文字を区別���
+    最��ドット����も���も構���ん。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddInputFilter" id="AddInputFilter">AddInputFilter</a> <a name="addinputfilter" id="addinputfilter">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル�拡張�をクライアント�リクエストを処��る
+    フィルタ�マップ�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddInputFilter <var>filter</var>[;<var>filter</var>...]
+<var>extension</var> [<var>extension</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.0.26 以��使用�能</td></tr>
+</table>
+    <p><code class="directive">AddInputFilter</code> �ファイル�拡張�
+    <var>extension</var> をクライアント�リクエストや POST �サー�������
+    処�を�る<a href="../filter.html">フィルタ</a>�マップ���。
+    �れ��<code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code> ディレクティブも
+    ���他�場所�定義�れ��るフィルタ�加�られ��。
+    ��マッピング�����るも�より優先�れ�マージ�れ�
+    �� <var>extension</var> �対�る既存�マッピングを上書����。</p>
+
+    <p>複数�フィルタを指定�る����データを処��る順番�セミコロン�
+    繋��書�必���り��。フィルタ� <var>extension</var> ��
+    両方�引数�大文字�文字を区別���拡張��最��ドット�
+    ���も���も構���ん。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#removeinputfilter">RemoveInputFilter</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddLanguage" id="AddLanguage">AddLanguage</a> <a name="addlanguage" id="addlanguage">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル�を指定�れ�言語�マップ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddLanguage <var>MIME-lang</var> <var>extension</var>
+[<var>extension</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+</table>
+    <p><code class="directive">AddLanguage</code> ディレクティブ��与�られ�拡張�を指定�れ�
+    content language �マップ���。<var>MIME-lang</var> ��拡張�
+    <var>extension</var> を�ん��るファイル�� MIME ���る言語��。
+    ��新��マッピング�既��るマッピング�追加�れ���拡張�
+    <var>extension</var> ����マッピングを上書����。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      AddEncoding x-compress .Z<br />
+      AddLanguage en .en<br />
+      AddLanguage fr .fr
+    </code></p></div>
+
+    <p>��場��<code>xxxx.en.Z</code> ドキュメント� compress
+    �れ�英語�ドキュメント���扱�れ�� (<code>xxxx.Z.en</code>
+    も�様)。content language �クライアント�通知�れ����
+    ブラウザ���情報を使������ら��り��ん。
+    <code class="directive">AddLanguage</code>
+    ディレクティブ��サー��クライアント�言語�優先度�基���複数�
+    ドキュメント�中�らドキュメントを��<a href="../content-negotiation.html">コンテント�ゴシエーション</a>����より役�立���。</p>
+
+    <p>複数�言語���拡張��割り当�られ��る����
+    最後�も��使用�れ��。�����次�よ��場��</p>
+
+    <div class="example"><p><code>
+      AddLanguage en .en<br />
+      AddLanguage en-gb .en<br />
+      AddLanguage en-us .en
+    </code></p></div>
+
+    <p>拡張� <code>.en</code> ��るドキュメント�
+    <code>en-us</code> ���扱�れ��。</p>
+
+    <p>引数 <var>extension</var> �大文字�文字を区別���
+    最��ドット����も���も構���ん。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddOutputFilter" id="AddOutputFilter">AddOutputFilter</a> <a name="addoutputfilter" id="addoutputfilter">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル��拡張�をサー��ら�応答を処��るフィルタ�
+    マップ�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddOutputFilter <var>filter</var>[;<var>filter</var>...]
+<var>extension</var> [<var>extension</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.0.26 以��使用�能</td></tr>
+</table>
+    <p><code class="directive">AddOutputFilter</code> ディレクティブ�
+    拡張� <var>extension</var> をサー��応答�クライアント��られる
+    ��処��る<a href="../filter.html">フィルタ</a>を定義���。
+    �れ� <code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code>
+    ディレクティブ� <code class="directive"><a href="../mod/core.html#addoutputfilterbytype">AddOutputFilterByType</a></code> ディレクティブ
+    を���他�場所�定義�れ��るフィルタ�加�られ��。
+    ��新��マッピング�既��るマッピング�追加�れ���拡張�
+    <var>extension</var> ����マッピングを上書����。</p>
+
+    <p>例���以下�設定����� <code>.shtml</code> ファイルを SSI �処���
+    ��出力を <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> を使��圧縮���。</p>
+
+    <div class="example"><p><code>
+      AddOutputFilter INCLUDES;DEFLATE shtml
+    </code></p></div>
+
+    <p>複数�フィルタを指定�る����データを処��る順番�セミコロン�
+    繋��書�必���り��。<var>filter</var> � <var>extension</var> �
+    両引数�大文字�文字を区別���拡張��最��ドット�
+    ���も���も構���ん。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#removeoutputfilter">RemoveOutputFilter</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#setoutputfilter">SetOutputFilter</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AddType" id="AddType">AddType</a> <a name="addtype" id="addtype">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル��拡張�を指定�れ�コンテントタイプ�マップ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AddType <var>MIME-type</var> <var>extension</var>
+[<var>extension</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+</table>
+    <p><code class="directive">AddType</code> ディレクティブ��
+    与�られ�拡張�を指定�れ�コンテントタイプ�マップ���。
+    <var>MIME-type</var> �拡張� <var>extension</var>
+    を�ん�ドキュメント�使用�る MIME タイプ��。
+    ��新��マッピング�既��るマッピング�追加�れ���拡張�
+    <var>extension</var> ����マッピングを上書����。
+    ��ディレクティブ� MIME タイプファイル (<code class="directive"><a href="#typesconfig">TypesConfig</a></code> ディレクティブを�照)
+    �無�マッピングを追加�る���使用�る�������。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      AddType image/gif .gif
+    </code></p></div>
+
+    <div class="note">
+      新�� MIME タイプ��<code class="directive"><a href="#typesconfig">TypesConfig</a></code>
+      ファイルを変更�る������<code class="directive">AddType</code>
+      ディレクティブを使��追加�る���推奨�れ����。
+    </div>
+
+    <p>引数 <var>extension</var> �大文字�文字を区別���
+    最��ドット����も���も構���ん。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="../mod/core.html#defaulttype">DefaultType</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#forcetype">ForceType</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="DefaultLanguage" id="DefaultLanguage">DefaultLanguage</a> <a name="defaultlanguage" id="defaultlanguage">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�るスコープ�����ファイルを指定�れ�言語�
+設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DefaultLanguage <var>MIME-lang</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+</table>
+    <p><code class="directive">DefaultLanguage</code> ディレクティブ��Apache
+    �ディレクティブ�スコープ (<em>例��</em>���時点�
+    <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
+    �範囲) ��る�明示的�言語拡張�
+    (<code class="directive"><a href="#addlanguage">AddLanguage</a></code> �設定�れる
+    <code>.fr</code> や <code>.de</code>) ���全��ファイルを�指定�れ�
+    <var>MIME-lang</var> 言語��る����よ�����。
+    �れ�より�����ファイル�を変�る�����
+    ディレクトリ�オランダ語�コンテントを�ん��る�
+    ���よ����を指定�る�������。
+    拡張�を使用��言語を指定�る方法����
+    <code class="directive">DefaultLanguage</code>
+    �一��言語��指定�������注�������。</p>
+
+    <p><code class="directive">DefaultLanguage</code>
+    ディレクティブ�有効����ファイル�
+    <code class="directive"><a href="#addlanguage">AddLanguage</a></code>
+    �設定�れ�言語�拡張��������
+    ファイル��言語属性�������れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      DefaultLanguage en
+    </code></p></div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ModMimeUsePathInfo" id="ModMimeUsePathInfo">ModMimeUsePathInfo</a> <a name="modmimeusepathinfo" id="modmimeusepathinfo">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td><code>path_info</code> コン�ー�ントをファイル��一部���扱�よ��
+<code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> �通知�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ModMimeUsePathInfo On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ModMimeUsePathInfo Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0.41 以�</td></tr>
+</table>
+    <p><code class="directive">ModMimeUsePathInfo</code> ディレクティブ��
+    <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> ���ディレクティブを
+    リクエスト��用��る����ファイル�� <code>path_info</code> URL 
+    コン�ー�ントを����る���使用���。
+    デフォルト��「 <code>Off</code> ���<code>path_info</code>
+    コン�ー�ント�無視�れ��。</p>
+
+    <p>��ディレクティブ���ー�ャルファイルシステムを使用���る際�
+    推奨�れるディレクティブ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      ModMimeUsePathInfo On
+    </code></p></div>
+
+    <p><code>/bar</code> �存在�� (foo.shtml �存在���)
+    <code class="directive">ModMimeUsePathInfo</code> � <code>On</code> ��る����
+    <code>/bar/foo.shtml</code> �対�るリクエストを発行��場��
+    <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> �入����リクエストを
+    <code>/bar/foo.shtml</code> ���扱��
+    <code>AddOutputFileter INCLUDES .shtml</code> �よ��ディレクティブ�
+    <code>INCLUDES</code> フィルタをリクエスト�付加����。
+    <code class="directive">ModMimeUsePathInfo</code> �設定�れ��れ��
+    <code>INCLUDES</code> フィルタ�付加�れ��ん。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MultiviewsMatch" id="MultiviewsMatch">MultiviewsMatch</a> <a name="multiviewsmatch" id="multiviewsmatch">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>MultiViews ��マッ�ング�検索����る
+ファイル�タイプを指定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>MultiviewsMatch Any|NegotiatedOnly|Filters|Handlers
+[Handlers|Filters]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>MultiviewsMatch NegotiatedOnly</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.0.26 以��使用�能</td></tr>
+</table>
+    <p><code class="directive">MultiviewsMatch</code> を使用�る����
+    <a href="mod_negotiation.html">mod_negotiation</a> �
+    Multiviews � 3 種類�異�る挙動を��る�������。
+    Multiviews を使用�る��ファイル (例 <code>index.html</code>)
+    �対�るリクエスト�対����ゴシエーション�る拡張��ベース�付��も�
+    (<code>index.html.en</code>, <code>index.html.fr</code> ã‚„
+    <code>index.html.gz</code>)
+    をマッ���る�������。</p>
+
+    <p><code>NegotiatedOnly</code> オプション���ベース��続�拡張�全��
+    コンテント�ゴシエーション� <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code>
+    ��識�る拡張� (<em>例</em> 文字セット�コンテントタイプ�言語やエンコーディング)
+    �関連付�られ����れ��り��ん。�れ�副作用�最も少��
+    最も的確�実装��デフォルト�������。</p>
+
+    <p>�ンドラ�フィルタ�両方も���片方�関連付�られ�拡張�を��る���
+    <code class="directive">MultiviewsMatch</code> ディレクティブ� <code>Handlers</code>,
+    <code>Filters</code> �����両方�オプションをセット���。
+    も�他��件�����れ��最も���ファイル��信�れ��。
+    例���500 文字� <code>index.html.cgi</code> � 1000 �イト� 
+    <code>index.html.pl</code> ��れ��<code>.cgi</code> 
+    �ファイル�優先�れ��。<code>.asis</code> ファイルを利用���るユーザ��
+    <code>.asis</code> ファイル� <code>asis-handler</code> �関連付�られ��る�����
+    �ンドラオプション�使用を好む��ょ�。</p>
+
+    <p>最後��<code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> ��識���拡張������も�
+    �ん�拡張��もマッ���る <code>Any</code> �使用����。
+    ��挙動� Apache 1.3 ������も���予期���動作�例�� <code>.old</code> や
+    <code>.bak</code> ファイル����ウェブマスタ��信を�図�����
+    ファイルを�信�る�����動作を行���能性��り��。</p>
+
+    <p>例��次�設定����ンドラやフィルタ� Multiviews ��加�る���
+    ������未知�ファイル�除外�る�������。</p>
+
+    <div class="example"><p><code>
+      MultiviewsMatch Handlers Filters
+    </code></p></div>
+
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li>
+<li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RemoveCharset" id="RemoveCharset">RemoveCharset</a> <a name="removecharset" id="removecharset">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル�拡張��関連付�られ�����文字セット
+を解除�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>RemoveCharset <var>extension</var> [<var>extension</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>�ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.0.24 以��使用�能</td></tr>
+</table>
+    <p><code class="directive">RemoveCharset</code> ディレクティブ
+    �与�られ�拡張��関連付�られ�文字セットを�り消���。
+    �れ�より�サブディレクトリ��る <code>.htaccess</code>
+    ファイル�親ディレクトリやサー��設定ファイル
+    �ら継承��関連付�を�り消��������。例��:</p>
+
+    <p><var>extension</var> �大文字�文字を区別���ん。
+    ���最��ドット����も���も構���ん。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      RemoveCharset .html .shtml
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RemoveEncoding" id="RemoveEncoding">RemoveEncoding</a> <a name="removeencoding" id="removeencoding">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル�拡張��関連付�られ�����コンテントエンコーディング
+を解除�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>RemoveEncoding <var>extension</var> [<var>extension</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>�ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+</table>
+    <p><code class="directive">RemoveEncoding</code> ディレクティブ��
+    与�られ�拡張��関連付�られ�エンコーディングを�り消���。
+    �れ�より�サブディレクトリ��る <code>.htaccess</code>
+    ファイル�親ディレクトリやサー��設定ファイル�ら継承��関連付�を
+    �り消��������。</p>
+
+    <div class="example"><h3>/foo/.htaccess:</h3><p><code>
+      AddEncoding x-gzip .gz<br />
+      AddType text/plain .asc<br />
+      &lt;Files *.gz.asc&gt;<br />
+      <span class="indent">
+        RemoveEncoding .gz<br />
+      </span>
+      &lt;/Files&gt;
+    </code></p></div>
+
+    <p>�れ��<code>foo.gz</code> � gzip
+    �エンコード�れ��る��を指定�����<code>foo.gz.asc</code>
+    �エンコード�れ����プレーンテキスト�
+    ファイル��る�����を指定���。</p>
+
+    <div class="note"><h3>注�</h3>
+      <p><code class="directive">RemoveEncoding</code> �
+      <code class="directive"><a href="#addencoding">AddEncoding</a></code>
+      ディレクティブ�<em>後</em>�処��れ�����
+      ��ディレクトリ�設定中�両方��れる��
+      後者�効果�打�消�れる�能性��り��。</p>
+    </div>
+
+    <p><var>extension</var> �大文字�文字を区別���ん。
+    ���最��ドット����も���も構���ん。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RemoveHandler" id="RemoveHandler">RemoveHandler</a> <a name="removehandler" id="removehandler">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル�拡張��関連付�られ������ンドラを
+解除�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>RemoveHandler <var>extension</var> [<var>extension</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>�ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+</table>
+    <p><code class="directive">RemoveHandler</code> ディレクティブ
+    �与�られ�拡張��関連付�られ��ンドラを�り消���。
+    �れ�より�サブディレクトリ��る <code>.htaccess</code>
+    ファイル�親ディレクトリやサー��設定ファイル
+    �ら継承��関連付�を�り消��������。����:</p>
+
+    <div class="example"><h3>/foo/.htaccess:</h3><p><code>
+      AddHandler server-parsed .html
+    </code></p></div>
+
+    <div class="example"><h3>/foo/bar/.htaccess:</h3><p><code>
+      RemoveHandler .html
+    </code></p></div>
+
+    <p>�れ��<code>/foo/bar</code> ディレクトリ� <code>.html</code>
+    ファイル� SSI (<code class="module"><a href="../mod/mod_include.html">mod_include</a></code> モジュール�照) �����
+    普通�ファイル���扱�れるよ���る効果��り��。
+    </p>
+
+    <p><var>extension</var> �大文字�文字を区別���ん。
+    ���最��ドット����も���も構���ん。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RemoveInputFilter" id="RemoveInputFilter">RemoveInputFilter</a> <a name="removeinputfilter" id="removeinputfilter">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル拡張��関連付�られ�入力フィルタを解除�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>RemoveInputFilter <var>extension</var> [<var>extension</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>�ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.0.26 以��使用�能</td></tr>
+</table>
+    <p><code class="directive">RemoveInputFilter</code> ディレクティブ�
+    指定�れ�ファイル拡張��関連付�られ�入力フィルタを解除���。
+    �れを利用�る����親ディレクトリやサー�設定ファイル�ら
+    継承��関連付�を サブディレクトリ内����
+    <code>.htaccess</code> ファイル��り消��������。</p>
+
+    <p><var>extension</var> 引数�大文字�文字を区別���ん。���
+    最��ドット����も���も構���ん。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#addinputfilter">AddInputFilter</a></code></li>
+<li><code class="directive"><a href="../mod/core.html#setinputfilter">SetInputFilter</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RemoveLanguage" id="RemoveLanguage">RemoveLanguage</a> <a name="removelanguage" id="removelanguage">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル拡張��関連付�られ�言語を解除�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>RemoveLanguage <var>extension</var> [<var>extension</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>�ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.0.24 以��使用�能</td></tr>
+</table>
+    <p><code class="directive">RemoveLanguage</code> ディレクティブ�
+    指定�れ�ファイル拡張��関連付�られ�言語を解除���。
+    �れを利用�る����親ディレクトリやサー�設定ファイル�ら
+    継承��関連付�を サブディレクトリ内����
+    <code>.htaccess</code> ファイル��り消��������。</p>
+
+    <p><var>extension</var> 引数�大文字�文字を区別���ん。���
+    最��ドット����も�����も構���ん。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RemoveOutputFilter" id="RemoveOutputFilter">RemoveOutputFilter</a> <a name="removeoutputfilter" id="removeoutputfilter">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル拡張��関連付�られ�出力フィルタを解除�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>RemoveOutputFilter <var>extension</var> [<var>extension</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>�ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.0.26 以����使用�能</td></tr>
+</table>
+    <p><code class="directive">RemoveOutputFilter</code> ディレクティブ�
+    指定�れ�ファイル拡張��関連付�られ�出力フィルタを解除���。
+    �れを利用�る����親ディレクトリやサー�設定ファイル�ら
+    継承��関連付�を サブディレクトリ内����
+    <code>.htaccess</code> ファイル��り消��������。</p>
+
+    <p><var>extension</var> �大文字�文字を区別���ん。
+    ���最��ドット����も���も構���ん。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      RemoveOutputFilter shtml
+    </code></p></div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#addoutputfilter">AddOutputFilter</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="RemoveType" id="RemoveType">RemoveType</a> <a name="removetype" id="removetype">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ファイル�拡張��関連付�られ�コンテントタイプを
+解除�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>RemoveType <var>extension</var> [<var>extension</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>�ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+</table>
+    <p><code class="directive">RemoveType</code> ディレクティブ�与�られ�拡張��
+    MIME タイプ�関連付�を�り消���。�れ�より�
+    サブディレクトリ��る <code>.htaccess</code>
+    ファイル�親ディレクトリやサー��設定ファイル�ら継承��
+    関連付�を�り消��������。����:</p>
+
+    <div class="example"><h3>/foo/.htaccess:</h3><p><code>
+      RemoveType .cgi
+    </code></p></div>
+
+    <p>�れ� <code>/foo/</code> ディレクトリ以下� <code>.cgi</code>
+    ファイル�特別�扱�を�り消���。ファイル� <code class="directive"><a href="../mod/core.html#defaulttype">DefaultType</a></code> ���扱�れ��。</p>
+
+    <div class="note"><h3>注�</h3>
+      <p><code class="directive">RemoveType</code> ディレクティブ�
+      <code class="directive"><a href="#addtype">AddType</a></code> 
+      ディレクティブ�<em>後</em>�処��れ�����
+      両方���ディレクトリ�設定中��れ�場��
+      後者�効果�打�消�れる�能性��り��。</p>
+    </div>
+
+    <p><var>extension</var> �大文字�文字を区別���ん。
+    ���最��ドット����も���も構���ん。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="TypesConfig" id="TypesConfig">TypesConfig</a> <a name="typesconfig" id="typesconfig">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td><code>mime.types</code> ファイル��置</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>TypesConfig <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>TypesConfig conf/mime.types</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_mime</td></tr>
+</table>
+    <p><code class="directive">TypesConfig</code> ディレクティブ��MIME
+    タイプ設定ファイル��置を設定���。<var>filename</var> �
+    <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> �ら�相対パス��。
+    ��ファイル�ファイル�拡張��らコンテントタイプ��
+    デフォルト�マッピングを設定���。
+    ��ん��管�者��よ�使�れるファイル��拡張�を
+    IANA �登録�れ�コンテントタイプ�関連付���る�
+    Apache � <code>mime.types</code> ファイルを使���。
+    �在�一覧� <a href="http://www.iana.org/assignments/media-types/index.html">http://www.iana.org/assignments/media-types/index.html</a>
+    �管��れ����。�れ��主��メディアタイプ�定義を�供���
+    必����を <code class="directive"><a href="#addtype">AddType</a></code> �
+    上書��る����方法� <code>httpd.conf</code> を簡略����。
+    <code>mime.types</code> �サー�をアップグレード�����
+    置���られる�も�れ�������ファイルを直接
+    編集��������。</p>
+
+    <p>ファイル��<code class="directive"><a href="#addtype">AddType</a></code>
+    ディレクティブ�引数���形��行�構��れ��。</p>
+
+    <div class="example"><p><code>
+      <var>MIME-type</var> [<var>extension</var>] ...
+    </code></p></div>
+
+    <p>拡張��大文字�文字�区別�れ��ん。空行や�ッシュ (`#') 
+    �始�る行�無視�れ��。</p>
+
+    <div class="note">
+      (1) IANA �既�登録�れ��る��る�� (2)
+      広���入れられ���プラットホーム間�ファイル拡張��������
+      ���場����れ���布中� <code>mime.types</code>
+      ファイル�新��も�を登録�るよ��
+      Apache HTTP Server Project �リクエスト��������。
+      <code>category/x-subtype</code> �リクエスト�自動的��下�れ����
+      言語や文字セット���空間�既�使用�れ��������能性��る
+      2 文字�拡張�も�下�れ��。
+    </div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="module"><a href="../mod/mod_mime_magic.html">mod_mime_magic</a></code></li>
+</ul>
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_mime.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_mime.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_mime_magic.html b/docs/manual/mod/mod_mime_magic.html
index f413ffe9..fd1bb722 100644
--- a/docs/manual/mod/mod_mime_magic.html
+++ b/docs/manual/mod/mod_mime_magic.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_mime_magic.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_mime_magic.html.en b/docs/manual/mod/mod_mime_magic.html.en
index 44a17981..167f2c2e 100644
--- a/docs/manual/mod/mod_mime_magic.html.en
+++ b/docs/manual/mod/mod_mime_magic.html.en
@@ -270,6 +270,6 @@ using the specified magic file</td></tr>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_mime_magic.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_negotiation.html b/docs/manual/mod/mod_negotiation.html
index c4e86d3a..dbedc3d0 100644
--- a/docs/manual/mod/mod_negotiation.html
+++ b/docs/manual/mod/mod_negotiation.html
@@ -1,7 +1,9 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_negotiation.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_negotiation.html.ja.euc-jp
+URI: mod_negotiation.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/mod_negotiation.html.en b/docs/manual/mod/mod_negotiation.html.en
index d256b9c9..d707095c 100644
--- a/docs/manual/mod/mod_negotiation.html.en
+++ b/docs/manual/mod/mod_negotiation.html.en
@@ -302,6 +302,6 @@ the client does not express a preference</td></tr>
 <p><span>Available Languages: </span><a href="../en/mod/mod_negotiation.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_negotiation.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_negotiation.html.ja.euc-jp b/docs/manual/mod/mod_negotiation.html.ja.euc-jp
deleted file mode 100644
index 90be67c1..00000000
--- a/docs/manual/mod/mod_negotiation.html.ja.euc-jp
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_negotiation - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_negotiation</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_negotiation.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_negotiation.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td><a href="../content-negotiation.html">¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó</a>
-  µ¡Ç½¤òÄ󶡤¹¤ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>negotiation_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_negotiation.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¡¢¤è¤êÀµ³Î¤Ë¤Ï¥³¥ó¥Æ¥ó¥Ä¤ÎÁªÂòµ¡Ç½¤Ï¡¢
-    Ê£¿ôÍÑ°Õ¤µ¤ì¤Æ¤¤¤ë¥É¥­¥å¥á¥ó¥È¤«¤é¡¢¥¯¥é¥¤¥¢¥ó¥È¤ÎǽÎϤ˰ìÈÖ¹ç¤Ã¤¿
-    ¥É¥­¥å¥á¥ó¥È¤òÁªÂò¤¹¤ëµ¡Ç½¤Ç¤¹¡£¤³¤Î¼ÂÁõ¤ÏÆó¤Ä¤¢¤ê¤Þ¤¹¡£</p>
-
-    <ul>
-      <li>¥¿¥¤¥×¥Þ¥Ã¥× (<code>type-map</code>
-      ¥Ï¥ó¥É¥é¤Ç°·¤ï¤ì¤ë¥Õ¥¡¥¤¥ë)¡£¤³¤ì¤Ï variants
-      ¤ò´Þ¤ó¤Ç¤¤¤ë¥Õ¥¡¥¤¥ë¤òÌÀ¼¨Åª¤Ë»ØÄꤷ¤Þ¤¹¡£</li>
-
-      <li>MultiViews ¤Îõº÷ (<code>MultiViews</code> <code class="directive"><a href="../mod/core.html#option">Option</a></code> ¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹)¡£
-      ¥µ¡¼¥Ð¤¬°ÅÌÛ¤ÎÆâ¤Ë¥Õ¥¡¥¤¥ë̾¤Î¥Ñ¥¿¡¼¥ó¥Þ¥Ã¥Á¤ò¹Ô¤Ê¤¤¡¢
-      ¤½¤Î·ë²Ì¤«¤éÁªÂò¤·¤Þ¤¹¡£</li>
-    </ul>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#forcelanguagepriority">ForceLanguagePriority</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#languagepriority">LanguagePriority</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#typemaps">¥¿¥¤¥×¥Þ¥Ã¥×</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#multiviews">MultiViews</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li>
-<li><code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code></li>
-<li><a href="../content-negotiation.html">¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó</a></li>
-<li><a href="../env.html">´Ä¶­ÊÑ¿ô</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="typemaps" id="typemaps">¥¿¥¤¥×¥Þ¥Ã¥×</a></h2>
-    <p>¥¿¥¤¥×¥Þ¥Ã¥×¤Ï RFC 822 ¤Î¥á¡¼¥ë¥Ø¥Ã¥À¤ËÎà»÷¤·¤¿½ñ¼°¤Ç¤¹¡£
-    ¥É¥­¥å¥á¥ó¥È¤Îµ­½Ò¤¬¶õ¹Ô¤ÇʬΥ¤µ¤ì¤Æ½ñ¤«¤ì¤Æ¤¤¤Æ¡¢¥Ï¥Ã¥·¥åʸ»ú
-    ('#') ¤Ç»Ï¤Þ¤ë¹Ô¤Ï¥³¥á¥ó¥È¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
-    ¥É¥­¥å¥á¥ó¥È¤ÎÀâÌÀ¤ÏÊ£¿ô¤Î¥Ø¥Ã¥À¥ì¥³¡¼¥É¤«¤é¹½À®¤µ¤ì¤Þ¤¹¡£
-    ¥ì¥³¡¼¥É¤Ï¡¢Â³¤­¤Î¹Ô¤¬¶õÇò¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ë¤ÈÊ£¿ô¤Î¹Ô¤Ë¤Þ¤¿¤¬¤ê¤Þ¤¹¡£
-    ºÇ½é¤Î¶õÇò¤¬¾Ãµî¤µ¤ì¤Æ¡¢Á°¤Î¹Ô¤È¤Ä¤Ê¤²¤Æ 1 ¹Ô¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
-    ¥Ø¥Ã¥À¥ì¥³¡¼¥É¤Ï¥­¡¼¥ï¡¼¥É̾¤Î¸å¤ËÃͤ¬Â³¤¯¤È¤¤¤¦·Á¼°¤Ç¡¢
-    ¥­¡¼¥ï¡¼¥É̾¤Ï¾ï¤Ë¥³¥í¥ó¤Ç½ª¤ï¤ê¤Þ¤¹¡£¶õÇò¤Ï¥Ø¥Ã¥À̾¤ÈÃͤδ֡¢
-    ÃͤΥȡ¼¥¯¥ó¤Î´Ö¤ËÆþ¤ì¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    »ÈÍѲÄǽ¤Ê¥Ø¥Ã¥À¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹:</p>
-
-    <dl>
-      <dt><code>Content-Encoding:</code></dt>
-      <dd>¥Õ¥¡¥¤¥ë¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¡£Apache ¤Ï <code class="directive"><a href="../mod/mod_mime.html#addencoding">AddEncoding</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö
-      ¤ÇÄêµÁ¤µ¤ì¤¿¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤À¤±¤òǧ¼±¤·¤Þ¤¹¡£Ä̾ï compress
-      ¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Î¤¿¤á¤Î <code>x-compress</code> ¤È gzip
-      ¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Î¤¿¤á¤Î <code>x-gzip</code> ¤ò´Þ¤ß¤Þ¤¹¡£
-      ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ÎÈæ³Ó¤ò¤¹¤ë¤È¤­¤Ï¡¢ÀÜƬ¼­ <code>x-</code>
-      ¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£</dd>
-
-      <dt><code>Content-Language:</code></dt>
-      <dd>¥¤¥ó¥¿¡¼¥Í¥Ã¥Èɸ½à¤Î¸À¸ì¥¿¥° 
-      (<a href="http://www.ietf.org/rfc/rfc1766.txt">RFC 1766</a>)
-      ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¸À¸ì¤Î¼ïÎà¡£Î㤨¤Ð¡¢<code>en</code>
-      ¤Ï±Ñ¸ì¤òɽ¤·¤Þ¤¹¡£
-      Ê£¿ô¤Î¸À¸ì¤¬³ÊǼ¤µ¤ì¤ë¾ì¹ç¤Ï¥³¥ó¥Þ¤Ç¶èÀÚ¤é¤ì¤Þ¤¹¡£</dd>
-
-      <dt><code>Content-Length:</code></dt>
-      <dd>¥Õ¥¡¥¤¥ë¤ÎŤµ (¥Ð¥¤¥È¿ô)¡£
-      ¤³¤Î¥Ø¥Ã¥À¤¬¤Ê¤¤¾ì¹ç¡¢¥Õ¥¡¥¤¥ë¤Î¼ÂºÝ¤ÎŤµ¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£</dd>
-
-      <dt><code>Content-Type:</code></dt>
-      <dd>¥É¥­¥å¥á¥ó¥È¤Î MIME
-      ¥á¥Ç¥£¥¢¥¿¥¤¥×¡¢¥ª¥×¥·¥ç¥Ê¥ë¤Ê¥Ñ¥é¥á¡¼¥¿ÉÕ¤­¡£¥Ñ¥é¥á¡¼¥¿¤Î¹½Ê¸¤Ï
-      <code>name=value</code>
-      ¤Ç¡¢¥á¥Ç¥£¥¢¥¿¥¤¥×¤ä¾¤Î¥Ñ¥é¥á¡¼¥¿¤È¤Ï¥»¥ß¥³¥í¥ó¤ÇʬΥ¤µ¤ì¤Þ¤¹¡£
-      ¶¦Ä̤Υѥé¥á¡¼¥¿¤Ï°Ê²¼¤Î¤È¤ª¤ê:
-
-        <dl>
-          <dt><code>level</code></dt>
-          <dd>¥á¥Ç¥£¥¢¥¿¥¤¥×¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¼¨¤¹À°¿ô¡£
-          <code>text/html</code> ¤Ç¤Ï 2 ¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¡¢¤½¤Î¾¤Î¾ì¹ç¤Ï
-          0 ¤¬¥Ç¥Õ¥©¥ë¥È¤Ç¤¹¡£</dd>
-
-          <dt><code>qs</code></dt>
-          <dd>¥¯¥é¥¤¥¢¥ó¥È¤ÎǽÎϤ˴ط¸¤Ê¤¯¡¢variant
-          ¤ò¾¤ÈÈæ³Ó¤·¤¿¤È¤­¤ÎÁêÂÐŪ¤Ê¡ÖÉʼÁ¡×¤Ç¡¢0.0 ¤«¤é 1.0
-          ¤ÎÈϰϤÎÉâÆ°ÅÀ¾®¿ô¡£
-          Î㤨¤Ð¡¢¼Ì¿¿¤òɽ¸½¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤È¤­¤ÏÉáÄÌ¤Ï JPEG
-          ¥Õ¥¡¥¤¥ë¤ÎÊý¤¬ ASCII ¥Õ¥¡¥¤¥ë¤è¤ê¤â¹â¤¤ÉʼÁ¤Ë¤Ê¤ê¤Þ¤¹¡£
-          ¤·¤«¤·¡¢¥ê¥½¡¼¥¹¤¬ ASCII ¥¢¡¼¥È¤Çɽ¸½¤µ¤ì¤Æ¤¤¤ë¤È¤­¤Ï¡¢ASCII
-          ¥Õ¥¡¥¤¥ë¤ÎÊý¤¬ JPEG
-          ¥Õ¥¡¥¤¥ë¤è¤ê¤â¹â¤¤ÉʼÁ¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤Î¤è¤¦¤Ë¡¢<code>qs</code>
-          ¤Ï¥ê¥½¡¼¥¹Ëè¤ËÆÃÍ­¤ÎÃͤò¼è¤ê¤Þ¤¹¡£
-          </dd>
-        </dl>
-
-        <div class="example"><h3>Îã</h3><p><code>
-          Content-Type: image/jpeg; qs=0.8
-        </code></p></div>
-      </dd>
-
-      <dt><code>URI:</code></dt>
-      <dd>(»ØÄê¤Î¥á¥Ç¥£¥¢¥¿¥¤¥×¡¢¥³¥ó¥Æ¥ó¥È¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î) variant ¤Î
-      ¥Õ¥¡¥¤¥ë¤Î uri.  ¤³¤ì¤Ï¡¢¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤«¤é¤ÎÁêÂÐ URL ¤È¤·¤Æ
-      ²ò¼á¤µ¤ì¤Þ¤¹¡£Æ±¤¸¥µ¡¼¥Ð¤Ë¸ºß¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤º¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬
-      ľÀܥꥯ¥¨¥¹¥È¤·¤¿¤È¤­¤Ë¥¢¥¯¥»¥¹¤òµö²Ä¤µ¤ì¤ë¤â¤Î¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</dd>
-
-      <dt><code>Body:</code></dt>
-      <dd>Apache 2.0 ¤Ç¿·Àߤµ¤ì¤¿¤³¤Î Body ¥Ø¥Ã¥À¤ò»È¤Ã¤Æ¡¢
-      ¥ê¥½¡¼¥¹¤Î¼ÂºÝ¤ÎÆâÍƤò¥¿¥¤¥×¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤Ë½ñ¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¤³¤Î¥Ø¥Ã¥À¤ÏËÜʸ¤ÎÆâÍƤζèÀÚ¤ê¤È¤Ê¤ëʸ»úÎó¤Ç»Ï¤Þ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-      ¥¿¥¤¥×¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¤Î³¤¯¹Ô¤Ï¡¢¶èÀÚ¤êʸ»úÎ󤬸«¤Ä¤«¤ë¤Þ¤Ç¡¢
-      ¥ê¥½¡¼¥¹¤ÎËÜʸ¤Ë¤Ê¤ê¤Þ¤¹¡£
-
-      <div class="example"><h3>Example:</h3><p><code>
-        Body:----xyz----<br />
-        &lt;html&gt;<br />
-        &lt;body&gt;<br />
-        &lt;p&gt;Content of the page.&lt;/p&gt;<br />
-        &lt;/body&gt;<br />
-        &lt;/html&gt;<br />
-        ----xyz----
-      </code></p></div>
-      </dd>
-    </dl>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="multiviews" id="multiviews">MultiViews</a></h2>
-    <p>MultiViews õº÷¤Ï¡¢<code>Multiviews</code> <code class="directive"><a href="../mod/core.html#options">Options</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤êÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¥µ¡¼¥Ð¤¬ <code>/some/dir/foo</code>
-    ¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¼è¤ê¡¢<code>/some/dir/foo</code> ¤¬Â¸ºß
-    <em>¤·¤Ê¤¤</em>¾ì¹ç¡¢¥µ¡¼¥Ð¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤òÆɤó¤Ç¡¢
-    <code>foo.*</code> ¤Ë¤¢¤Æ¤Ï¤Þ¤ëÁ´¤Æ¤Î¥Õ¥¡¥¤¥ë¤òõ¤·¡¢
-    »ö¼Â¾å¤½¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤¹¤ë¥¿¥¤¥×¥Þ¥Ã¥×¤òºî¤ê¤Þ¤¹¡£
-    ¤½¤Î¤È¤­¡¢¥á¥Ç¥£¥¢¥¿¥¤¥×¤È¥³¥ó¥Æ¥ó¥È¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Ï¡¢
-    ¤½¤Î¥Õ¥¡¥¤¥ë̾¤òľÀÜ»ØÄꤷ¤¿¤È¤­¤ÈƱ¤¸¤â¤Î¤¬³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹¡£
-    ¤½¤ì¤«¤é¥¯¥é¥¤¥¢¥ó¥È¤ÎÍ×µá¤Ë°ìÈֹ礦¤â¤Î¤òÁª¤Ó¡¢
-    ¤½¤Î¥É¥­¥å¥á¥ó¥È¤òÊÖ¤·¤Þ¤¹¡£</p>
-
-    <p>¥Õ¥¡¥¤¥ë¤òÁªÂò¤¹¤ëºÝ¤Ë¡¢´ØÏ¢¤¹¤ë¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤Î
-    ¥á¥¿¾ðÊó¤ò»ý¤¿¤Ê¤¤¥Õ¥¡¥¤¥ë¤Ë¤Ä¤¤¤Æ¡¢È½Äê¤ò¹Ô¤¦¤«¤É¤¦¤«¤ò
-    <code class="directive"><a href="../mod/mod_mime.html#multiviewsmatch">MultiViewsMatch</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÀßÄꤷ¤Þ¤¹¡£</p>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CacheNegotiatedDocs" id="CacheNegotiatedDocs">CacheNegotiatedDocs</a> <a name="cachenegotiateddocs" id="cachenegotiateddocs">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤µ¤ì¤¿¥É¥­¥å¥á¥ó¥È¤ò¥×¥í¥­¥·¥µ¡¼¥Ð¤¬
-¥­¥ã¥Ã¥·¥å¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CacheNegotiatedDocs On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>CacheNegotiatedDocs Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_negotiation</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>¥Ð¡¼¥¸¥ç¥ó 2.0¤Ç¹½Ê¸¤¬ÊѤï¤ê¤Þ¤·¤¿</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¤È¡¢¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó
-    ¤ò¤·¤¿·ë²Ì¤Î¥É¥­¥å¥á¥ó¥È¤Î¥­¥ã¥Ã¥·¥å¤òµö²Ä¤·¤Þ¤¹¡£
-    ¤³¤ì¤Ï¡¢¥×¥í¥­¥·¤Î¸å¤í¤Ë¤¤¤ë¥¯¥é¥¤¥¢¥ó¥È¤¬Ç½ÎϤ˰ìÈÖ¹ç¤Ã¤¿
-    ¥É¥­¥å¥á¥ó¥È¤Ç¤Ï¤Ê¤¯¡¢
-    ¥­¥ã¥Ã¥·¥å¤ò¤è¤ê¸ú²ÌŪ¤Ë¤¹¤ë¤â¤Î¤òÆÀ¤ë²ÄǽÀ­¤¬¤¢¤ë¤È¤¤¤¦¤³¤È¤Ç¤¹¡£</p>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï HTTP/1.0 ¥Ö¥é¥¦¥¶¤«¤é¤Î¥ê¥¯¥¨¥¹¥È
-    ¤Î¤ß¤ËŬÍѤµ¤ì¤Þ¤¹¡£HTTP/1.1 ¤Ï¡¢
-    ¸ò¾Ä¤µ¤ì¤¿¥É¥­¥å¥á¥ó¥È¤Î¥­¥ã¥Ã¥·¥å¤ËÂФ·¤Æ¤º¤Ã¤È¤è¤¤À©¸æ¤¬²Äǽ¤Ê¤Î¤Ç¡¢
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï HTTP/1.1 ¤Î¥ê¥¯¥¨¥¹¥È¤Ë¤Ï±Æ¶Á¤·¤Þ¤»¤ó¡£</p>
-    <p>2.0 ¤è¤êÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¢
-    <code class="directive">CacheNegotiatedDocs</code> ¤Ï°ú¿ô¤ò¼è¤é¤º¡¢
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Â¸ºß¤¹¤ë¤³¤È¤Ç on ¤ÎÆ°ºî¤ò¤·¤Æ¤¤¤Þ¤·¤¿¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ForceLanguagePriority" id="ForceLanguagePriority">ForceLanguagePriority</a> <a name="forcelanguagepriority" id="forcelanguagepriority">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>Í×µá¤Ë¹ç¤¦Ã±ÆȤΥɥ­¥å¥á¥ó¥È¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¤È¤­¤Ë¹Ô¤Ê¤¦¤³¤È¤ò»ØÄê
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ForceLanguagePriority Prefer</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_negotiation</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>¥Ð¡¼¥¸¥ç¥ó 2.0.30 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p><code class="directive">ForceLanguagePriority</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    Í×µá¤Ë¹ç¤¦¥É¥­¥å¥á¥ó¥È¤ò°ì¤Ä¤À¤±ÊÖ¤¹¤³¤È¤¬¤Ç¤­¤Ê¤¤¤È¤­¤Ë¡¢
-    <code class="directive"><a href="#languagepriority">LanguagePriority</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤Î·ë²Ì¤òÊÖ¤·¤Þ¤¹¡£</p>
-
-    <p><code>ForceLanguagePriority Prefer</code> ¤Ï¡¢Æ±Åù¤ÎÁªÂò»è¤¬
-    ¤¤¤¯¤Ä¤«¤¢¤ë¤È¤­¤Ë¡¢HTTP ¤Î 300 (MULTIPLE CHOICES) ¤òÊÖ¤¹Âå¤ï¤ê¤Ë¡¢
-    <code>LanguagePriority</code> ¤ò»È¤Ã¤Æ°ì¤Ä¤À¤±¥É¥­¥å¥á¥ó¥È¤òÊÖ¤¹¤è¤¦¤Ë
-    ¤·¤Þ¤¹¡£°Ê²¼¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬»ØÄꤵ¤ì¤Æ¤¤¤Æ¡¢¥æ¡¼¥¶¤Î <code>Accept-Language</code>
-    ¥Ø¥Ã¥À¤Ç¤Ï <code>en</code> ¤È <code>de</code> ¤ÎÉʼÁ¤¬¶¦¤Ë
-    <code>.500</code> (Ʊ¤¸¤¯¤é¤¤µöÍÆ) ¤Ç¤¢¤ë¤È¤­¤Ï¡¢
-    ºÇ½é¤Ë¥Þ¥Ã¥Á¤¹¤ë variant ¤Î <code>en</code> ¤¬Á÷¤é¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      LanguagePriority en fr de<br />
-      ForceLanguagePriority Prefer
-    </code></p></div>
-
-    <p><code>ForceLanguagePriority Fallback</code> ¤Ç¤Ï¡¢HTTP 406
-    (NOT ACCEPTABLE) ¤òÁ÷¿®¤¹¤ëÂå¤ï¤ê¤Ë¡¢
-    <code class="directive"><a href="#languagepriority">LanguagePriority</a></code>
-    ¤¬Àµ¤·¤¤·ë²Ì¤òÁ÷¤ê¤Þ¤¹¡£
-    °Ê²¼¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬»ØÄꤵ¤ì¤Æ¤¤¤Æ¡¢¥æ¡¼¥¶¤Î <code>Accept-Language</code>
-    ¤¬ <code>es</code> ¸À¸ì¤Î¤ß¤òµö²Ä¤·¤Æ¤¤¤Æ¡¢¤µ¤é¤Ë¤½¤Î¤è¤¦¤Ê variant ¤¬¤Ê¤¤¤È¤­¤Ë¤Ï¡¢
-    °Ê²¼¤Î <code class="directive"><a href="#languagepriority">LanguagePriority</a></code>
-    ¤Î¥ê¥¹¥È¤ÎºÇ½é¤Î variant ¤¬Á÷¤ì¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      LanguagePriority en fr de<br />
-      ForceLanguagePriority Fallback
-    </code></p></div>
-
-    <p><code>Prefer</code> ¤È <code>Fallback</code> ¤ÎξÊý¤Î¥ª¥×¥·¥ç¥ó¤ò
-    Ʊ»þ¤Ë»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤Ç¤¹¤«¤é¡¢Ê£¿ô¤Î variant ¤¬¤¢¤ë¤È¤­¤Ï
-    <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> ¤ÎºÇ½é¤Î
-    variant ¤¬Á÷¤é¤ì¡¢¥¯¥é¥¤¥¢¥ó¥È¤ÎµöÍƸÀ¸ì¤Ë¹ç¤¦ vaiant ¤¬¤Ê¤¤¤È¤­¤Ï
-    ¸ºß¤¹¤ë¥É¥­¥å¥á¥ó¥È¤ÇºÇ½é¤Î¤â¤Î¤¬Á÷¤é¤ì¤ë¡¢¤È¤¤¤¦Íͤˤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="../mod/mod_mime.html#addlanguage">AddLanguage</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="LanguagePriority" id="LanguagePriority">LanguagePriority</a> <a name="languagepriority" id="languagepriority">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¯¥é¥¤¥¢¥ó¥È¤¬Í¥ÀèÅÙ¤ò¼¨¤µ¤Ê¤«¤Ã¤¿¤È¤­¤Î¸À¸ì¤Î variant ¤ÎÍ¥ÀèÅÙ¤ò
-»ØÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>LanguagePriority <var>MIME-lang</var> [<var>MIME-lang</var>]
-...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_negotiation</td></tr>
-</table>
-    <p><code class="directive">LanguagePriority</code> ¤Ï¡¢MultiViews
-    ¥ê¥¯¥¨¥¹¥È¤ò°·¤¦¤È¤­¤Ë¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬Í¥Àè½ç°Ì¤òÄ󶡤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Î
-    ¸À¸ì¤ÎÍ¥Àè½ç°Ì¤òÀßÄꤷ¤Þ¤¹¡£<var>MIME-lang</var>
-    ¤Î¥ê¥¹¥È¤¬Í¥ÀèÅ٤ι߽ç¤ËʤӤޤ¹¡£</p>
-
-    <div class="example"><h3>Example:</h3><p><code>
-      LanguagePriority en fr de
-    </code></p></div>
-
-    <p><code>foo.html</code> ¤¬¥ê¥¯¥¨¥¹¥È¤µ¤ì¡¢<code>foo.html.fr</code>
-    ¤È <code>foo.html.de</code> ¤¬Î¾Êý¸ºß¤·¡¢
-    ¥Ö¥é¥¦¥¶¤¬¸À¸ì¤ÎÍ¥Àè½ç°Ì¤òÄ󶡤·¤Æ¤Ê¤¤¾ì¹ç¤Ï
-    <code>foo.html.fr</code> ¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¾¤ÎÊýË¡¤Ç¡ÖºÇÁ±¡×
-    ¤Î¸À¸ì¤¬·èÄê¤Ç¤­¤Ê¤¤¤È¤­¤«¡¢<code class="directive"><a href="#forcelanguagepriority">ForceLanguagePriority</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬
-    <code>None</code> °Ê³°¤Î¤È¤­¤Ë¤Î¤ß¸ú²Ì¤¬¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    °ìÈÌŪ¤Ë¤Ï¡¢¥µ¡¼¥Ð¦¤Ç¤Ï¤Ê¤¯¥¯¥é¥¤¥¢¥ó¥È¦¤Ç¹¥¤ß¤Î¸À¸ì¤ò·èÄꤷ¤Þ¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="../mod/mod_mime.html#addlanguage">AddLanguage</a></code></li>
-</ul>
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_negotiation.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_negotiation.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_negotiation.html.ja.utf8 b/docs/manual/mod/mod_negotiation.html.ja.utf8
new file mode 100644
index 00000000..aee3e71b
--- /dev/null
+++ b/docs/manual/mod/mod_negotiation.html.ja.utf8
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_negotiation - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_negotiation</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_negotiation.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_negotiation.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td><a href="../content-negotiation.html">コンテント�ゴシエーション</a>
+  機能を�供�る</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>negotiation_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_negotiation.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>コンテント�ゴシエーション�より正確��コンテンツ��択機能��
+    複数用��れ��るドキュメント�ら�クライアント�能力�一番���
+    ドキュメントを�択�る機能��。��実装�二��り��。</p>
+
+    <ul>
+      <li>タイプマップ (<code>type-map</code>
+      �ンドラ�扱�れるファイル)。�れ� variants
+      を�ん��るファイルを明示的�指定���。</li>
+
+      <li>MultiViews �探索 (<code>MultiViews</code> <code class="directive"><a href="../mod/core.html#option">Option</a></code> �有効��り��)。
+      サー��暗黙�内�ファイル��パターンマッ�を行���
+      ���果�ら�択���。</li>
+    </ul>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#cachenegotiateddocs">CacheNegotiatedDocs</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#forcelanguagepriority">ForceLanguagePriority</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#languagepriority">LanguagePriority</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#typemaps">タイプマップ</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#multiviews">MultiViews</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/core.html#options">Options</a></code></li>
+<li><code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code></li>
+<li><a href="../content-negotiation.html">コンテント�ゴシエーション</a></li>
+<li><a href="../env.html">環境変数</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="typemaps" id="typemaps">タイプマップ</a></h2>
+    <p>タイプマップ� RFC 822 �メールヘッダ�類似��書���。
+    ドキュメント�記述�空行�分離�れ�書�れ�����ッシュ文字
+    ('#') �始�る行�コメント���扱�れ��。
+    ドキュメント�説明�複数�ヘッダレコード�ら構��れ��。
+    レコード��続��行�空白�始����る�複数�行����り��。
+    最��空白�消去�れ����行����� 1 行���扱�れ��。
+    ヘッダレコード�キーワード��後�値�続����形���
+    キーワード��常�コロン�終�り��。空白�ヘッダ��値�間�
+    値�トークン�間�入れる�������。
+    使用�能�ヘッダ�以下���り��:</p>
+
+    <dl>
+      <dt><code>Content-Encoding:</code></dt>
+      <dd>ファイル�エンコーディング。Apache � <code class="directive"><a href="../mod/mod_mime.html#addencoding">AddEncoding</a></code> ディレクティブ
+      �定義�れ�エンコーディング��を�識���。通常 compress
+      �れ�ファイル���� <code>x-compress</code> � gzip
+      �れ�ファイル���� <code>x-gzip</code> を����。
+      エンコーディング�比較を�る����接頭辞 <code>x-</code>
+      �無視�れ��。</dd>
+
+      <dt><code>Content-Language:</code></dt>
+      <dd>インター�ット標準�言語タグ 
+      (<a href="http://www.ietf.org/rfc/rfc1766.txt">RFC 1766</a>)
+      �定義�れ��る言語�種類。例���<code>en</code>
+      �英語を表���。
+      複数�言語�格��れる場��コンマ�区切られ��。</dd>
+
+      <dt><code>Content-Length:</code></dt>
+      <dd>ファイル�長� (�イト数)。
+      ��ヘッダ���場��ファイル�実際�長��使用�れ��。</dd>
+
+      <dt><code>Content-Type:</code></dt>
+      <dd>ドキュメント� MIME
+      メディアタイプ�オプショナル�パラメータ付�。パラメータ�構文�
+      <code>name=value</code>
+      ��メディアタイプや他�パラメータ��セミコロン�分離�れ��。
+      共通�パラメータ�以下���り:
+
+        <dl>
+          <dt><code>level</code></dt>
+          <dd>メディアタイプ��ージョンを示�整数。
+          <code>text/html</code> �� 2 �デフォルト����他�場��
+          0 �デフォルト��。</dd>
+
+          <dt><code>qs</code></dt>
+          <dd>クライアント�能力�関係���variant
+          を他�比較�����相対的�「�質���0.0 �ら 1.0
+          �範囲�浮動点�数。
+          例���写真を表��よ�����る���普通� JPEG
+          ファイル�方� ASCII ファイルよりも高��質��り��。
+          ����リソース� ASCII アート�表��れ��る����ASCII
+          ファイル�方� JPEG
+          ファイルよりも高��質��り��。��よ���<code>qs</code>
+          �リソース毎�特有�値を�り��。
+          </dd>
+        </dl>
+
+        <div class="example"><h3>例</h3><p><code>
+          Content-Type: image/jpeg; qs=0.8
+        </code></p></div>
+      </dd>
+
+      <dt><code>URI:</code></dt>
+      <dd>(指定�メディアタイプ�コンテントエンコーディング�) variant �
+      ファイル� uri.  �れ��マップファイル�ら�相対 URL ���
+      解釈�れ��。��サー��存在���れ��ら��クライアント�
+      直接リクエスト�����アクセスを許��れるも����れ��り��ん。</dd>
+
+      <dt><code>Body:</code></dt>
+      <dd>Apache 2.0 �新設�れ��� Body ヘッダを使���
+      リソース�実際�内容をタイプマップファイル�書��������。
+      ��ヘッダ�本文�内容�区切り��る文字列�始�る必���り��。
+      タイプマップファイル�続�行��区切り文字列�見��る���
+      リソース�本文��り��。
+
+      <div class="example"><h3>Example:</h3><p><code>
+        Body:----xyz----<br />
+        &lt;html&gt;<br />
+        &lt;body&gt;<br />
+        &lt;p&gt;Content of the page.&lt;/p&gt;<br />
+        &lt;/body&gt;<br />
+        &lt;/html&gt;<br />
+        ----xyz----
+      </code></p></div>
+      </dd>
+    </dl>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="multiviews" id="multiviews">MultiViews</a></h2>
+    <p>MultiViews 探索��<code>Multiviews</code> <code class="directive"><a href="../mod/core.html#options">Options</a></code> ディレクティブ�より有効��り��。
+    サー�� <code>/some/dir/foo</code>
+    ��リクエストを���り�<code>/some/dir/foo</code> �存在
+    <em>���</em>場��サー��ディレクトリを読ん��
+    <code>foo.*</code> �����る全��ファイルを探��
+    事実上�れら�ファイルをマップ�るタイプマップを作り��。
+    �����メディアタイプ�コンテントエンコーディング��
+    ��ファイル�を直接指定�������も��割り当�られ��。
+    �れ�らクライアント��求�一番��も�を���
+    ��ドキュメントを返���。</p>
+
+    <p>ファイルを�択�る際��関連�るコンテント�ゴシエーション�
+    メタ情報を����ファイル�����判定を行�����を
+    <code class="directive"><a href="../mod/mod_mime.html#multiviewsmatch">MultiViewsMatch</a></code>
+    ディレクティブ�設定���。</p>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheNegotiatedDocs" id="CacheNegotiatedDocs">CacheNegotiatedDocs</a> <a name="cachenegotiateddocs" id="cachenegotiateddocs">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>コンテント�ゴシエーション�れ�ドキュメントをプロキシサー��
+キャッシュ��るよ���る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CacheNegotiatedDocs On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>CacheNegotiatedDocs Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_negotiation</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>�ージョン 2.0�構文�変�り���</td></tr>
+</table>
+    <p>��ディレクティブ�設定�れ��る��コンテント�ゴシエーション
+    を���果�ドキュメント�キャッシュを許����。
+    �れ��プロキシ�後���るクライアント�能力�一番���
+    ドキュメント�����
+    キャッシュをより効果的��るも�を得る�能性��る�������。</p>
+
+    <p>��ディレクティブ� HTTP/1.0 ブラウザ�ら�リクエスト
+    ����用�れ��。HTTP/1.1 ��
+    交渉�れ�ドキュメント�キャッシュ�対�����よ�制御��能����
+    ��ディレクティブ� HTTP/1.1 �リクエスト��影響���ん。</p>
+    <p>2.0 より���ージョン���
+    <code class="directive">CacheNegotiatedDocs</code> �引数を�ら��
+    ディレクティブ�存在�る��� on �動作を������。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ForceLanguagePriority" id="ForceLanguagePriority">ForceLanguagePriority</a> <a name="forcelanguagepriority" id="forcelanguagepriority">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�求����独�ドキュメント�見��ら�������行����を指定
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ForceLanguagePriority Prefer</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_negotiation</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>�ージョン 2.0.30 以��使用�能</td></tr>
+</table>
+    <p><code class="directive">ForceLanguagePriority</code> ディレクティブ�
+    �求���ドキュメントを一���返������������
+    <code class="directive"><a href="#languagepriority">LanguagePriority</a></code>
+    ディレクティブを使���ゴシエーション��果を返���。</p>
+
+    <p><code>ForceLanguagePriority Prefer</code> ���等��択肢�
+    �����る����HTTP � 300 (MULTIPLE CHOICES) を返�代�り��
+    <code>LanguagePriority</code> を使��一���ドキュメントを返�よ��
+    ���。以下�ディレクティブ�指定�れ����ユーザ� <code>Accept-Language</code>
+    ヘッダ�� <code>en</code> � <code>de</code> ��質�共�
+    <code>.500</code> (���ら�許容) ��る����
+    最��マッ��る variant � <code>en</code> ��られ��。</p>
+
+    <div class="example"><p><code>
+      LanguagePriority en fr de<br />
+      ForceLanguagePriority Prefer
+    </code></p></div>
+
+    <p><code>ForceLanguagePriority Fallback</code> ���HTTP 406
+    (NOT ACCEPTABLE) を�信�る代�り��
+    <code class="directive"><a href="#languagepriority">LanguagePriority</a></code>
+    �正���果を�り��。
+    以下�ディレクティブ�指定�れ����ユーザ� <code>Accept-Language</code>
+    � <code>es</code> 言語��を許�������ら���よ�� variant ��������
+    以下� <code class="directive"><a href="#languagepriority">LanguagePriority</a></code>
+    �リスト�最�� variant ��れれ��。</p>
+
+    <div class="example"><p><code>
+      LanguagePriority en fr de<br />
+      ForceLanguagePriority Fallback
+    </code></p></div>
+
+    <p><code>Prefer</code> � <code>Fallback</code> �両方�オプションを
+    �時�指定�る�������。
+    ���ら�複数� variant ��る���
+    <code class="directive"><a href="#languagepriority">LanguagePriority</a></code> �最��
+    variant ��られ�クライアント�許容言語��� vaiant ������
+    存在�るドキュメント�最��も���られる����様��る�������。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addlanguage">AddLanguage</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LanguagePriority" id="LanguagePriority">LanguagePriority</a> <a name="languagepriority" id="languagepriority">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>クライアント�優先度を示��������言語� variant �優先度を
+指定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LanguagePriority <var>MIME-lang</var> [<var>MIME-lang</var>]
+...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_negotiation</td></tr>
+</table>
+    <p><code class="directive">LanguagePriority</code> ��MultiViews
+    リクエストを扱�����クライアント�優先順�を�供�����場��
+    言語�優先順�を設定���。<var>MIME-lang</var>
+    �リスト�優先度��順�並���。</p>
+
+    <div class="example"><h3>Example:</h3><p><code>
+      LanguagePriority en fr de
+    </code></p></div>
+
+    <p><code>foo.html</code> �リクエスト�れ�<code>foo.html.fr</code>
+    � <code>foo.html.de</code> �両方存在��
+    ブラウザ�言語�優先順�を�供����場��
+    <code>foo.html.fr</code> �返�れ��。</p>
+
+    <p>��ディレクティブ�他�方法�「最善�
+    �言語�決定��������<code class="directive"><a href="#forcelanguagepriority">ForceLanguagePriority</a></code> ディレクティブ�
+    <code>None</code> 以外������効果��る���注�������。
+    一般的���サー������クライアント��好��言語を決定���。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="../mod/mod_mime.html#addlanguage">AddLanguage</a></code></li>
+</ul>
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_negotiation.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_negotiation.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_nw_ssl.html b/docs/manual/mod/mod_nw_ssl.html
index 24adb0f8..c1342c07 100644
--- a/docs/manual/mod/mod_nw_ssl.html
+++ b/docs/manual/mod/mod_nw_ssl.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_nw_ssl.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_nw_ssl.html.en b/docs/manual/mod/mod_nw_ssl.html.en
index aabc3e4d..65a60a8b 100644
--- a/docs/manual/mod/mod_nw_ssl.html.en
+++ b/docs/manual/mod/mod_nw_ssl.html.en
@@ -92,6 +92,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_nw_ssl.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy.html b/docs/manual/mod/mod_proxy.html
index 2e413ab6..8c05a7a6 100644
--- a/docs/manual/mod/mod_proxy.html
+++ b/docs/manual/mod/mod_proxy.html
@@ -1,7 +1,9 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_proxy.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_proxy.html.ja.euc-jp
+URI: mod_proxy.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 1e598e45..2e560b8c 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -75,6 +75,7 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#proxymatch">&lt;ProxyMatch&gt;</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxymaxforwards">ProxyMaxForwards</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxypass">ProxyPass</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxypassinterpolateenv">ProxyPassInterpolateEnv</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxypassmatch">ProxyPassMatch</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxypassreverse">ProxyPassReverse</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxypassreversecookiedomain">ProxyPassReverseCookieDomain</a></li>
@@ -91,7 +92,8 @@
 </ul>
 <h3>Topics</h3>
 <ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#forwardreverse">Forward and Reverse Proxies</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#forwardreverse">Forward Proxies and Reverse 
+       Proxies/Gateways</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#examples">Basic Examples</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#access">Controlling access to your proxy</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#startup">Slow Startup</a></li>
@@ -110,9 +112,10 @@
 </ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="forwardreverse" id="forwardreverse">Forward and Reverse Proxies</a></h2>
+<h2><a name="forwardreverse" id="forwardreverse">Forward Proxies and Reverse 
+       Proxies/Gateways</a></h2>
       <p>Apache can be configured in both a <dfn>forward</dfn> and
-      <dfn>reverse</dfn> proxy mode.</p>
+      <dfn>reverse</dfn> proxy (also known as <dfn>gateway</dfn>) mode.</p>
 
       <p>An ordinary <dfn>forward proxy</dfn> is an intermediate
       server that sits between the client and the <em>origin
@@ -135,13 +138,13 @@
       authorized clients can access the proxy before activating a
       forward proxy.</p>
 
-      <p>A <dfn>reverse proxy</dfn>, by contrast, appears to the
-      client just like an ordinary web server.  No special
-      configuration on the client is necessary.  The client makes
-      ordinary requests for content in the name-space of the reverse
-      proxy.  The reverse proxy then decides where to send those
-      requests, and returns the content as if it was itself the
-      origin.</p>
+      <p>A <dfn>reverse proxy</dfn> (or <dfn>gateway</dfn>), by
+      contrast, appears to the client just like an ordinary web
+      server.  No special configuration on the client is necessary.
+      The client makes ordinary requests for content in the name-space
+      of the reverse proxy.  The reverse proxy then decides where to
+      send those requests, and returns the content as if it was itself
+      the origin.</p>
 
       <p>A typical usage of a reverse proxy is to provide Internet
       users access to a server that is behind a firewall.  Reverse
@@ -381,8 +384,8 @@ directly</td></tr>
     <code class="directive"><a href="#proxyremote">ProxyRemote</a></code> proxy server(s).</p>
 
     <div class="example"><h3>Example</h3><p><code>
-      ProxyRemote  *  http://firewall.mycompany.com:81<br />
-      NoProxy         .mycompany.com 192.168.112.0/21
+      ProxyRemote  *  http://firewall.example.com:81<br />
+      NoProxy         .example.com 192.168.112.0/21
     </code></p></div>
 
     <p>The <var>host</var> arguments to the <code class="directive">NoProxy</code>
@@ -408,8 +411,8 @@ directly</td></tr>
     <div class="note"><h3>Note</h3>
       <p>Domain name comparisons are done without regard to the case, and
       <var>Domain</var>s are always assumed to be anchored in the root of the
-      DNS tree, therefore two domains <code>.MyDomain.com</code> and
-      <code>.mydomain.com.</code> (note the trailing period) are considered
+      DNS tree, therefore two domains <code>.ExAmple.com</code> and
+      <code>.example.com.</code> (note the trailing period) are considered
       equal. Since a domain comparison does not involve a DNS lookup, it is much
       more efficient than subnet comparison.</p>
     </div></dd>
@@ -466,7 +469,7 @@ directly</td></tr>
     of hosts with different <var><a href="#ipaddr">IPAddr</a></var>s).</p>
 
     <div class="example"><h3>Examples</h3><p><code>
-      prep.ai.mit.edu<br />
+      prep.ai.example.com<br />
       www.apache.org
     </code></p></div>
 
@@ -477,8 +480,8 @@ directly</td></tr>
       link.</p>
       <p><var>Hostname</var> comparisons are done without regard to the case,
       and <var>Hostname</var>s are always assumed to be anchored in the root
-      of the DNS tree, therefore two hosts <code>WWW.MyDomain.com</code>
-      and <code>www.mydomain.com.</code> (note the trailing period) are
+      of the DNS tree, therefore two hosts <code>WWW.ExAmple.com</code>
+      and <code>www.example.com.</code> (note the trailing period) are
       considered equal.</p>
      </div></dd>
     </dl>
@@ -616,9 +619,9 @@ proxied</td></tr>
     will be generated.</p>
 
     <div class="example"><h3>Example</h3><p><code>
-      ProxyRemote  *  http://firewall.mycompany.com:81<br />
-      NoProxy         .mycompany.com 192.168.112.0/21<br />
-      ProxyDomain     .mycompany.com
+      ProxyRemote  *  http://firewall.example.com:81<br />
+      NoProxy         .example.com 192.168.112.0/21<br />
+      ProxyDomain     .example.com
     </code></p></div>
 
 </div>
@@ -728,17 +731,19 @@ through</td></tr>
 <div class="directive-section"><h2><a name="ProxyPass" id="ProxyPass">ProxyPass</a> <a name="proxypass" id="proxypass">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maps remote servers into the local server URL-space</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var> <var>key=value</var> ...]] [nocanon]</code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var>
+<var>key=value</var> ...]] [nocanon] [interpolate]</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
 </table>
-    <p>This directive allows remote servers to be mapped into the space of
-    the local server; the local server does not act as a proxy in the
-    conventional sense, but appears to be a mirror of the remote
-    server. <var>path</var> is the name of a local virtual path; <var>url</var>
-    is a partial URL for the remote server and cannot include a query
-    string.</p>
+    <p>This directive allows remote servers to be mapped into the
+    space of the local server; the local server does not act as a
+    proxy in the conventional sense, but appears to be a mirror of the
+    remote server. The local server is often called a <dfn>reverse
+    proxy</dfn> or <dfn>gateway</dfn>. The <var>path</var> is the name of
+    a local virtual path; <var>url</var> is a partial URL for the
+    remote server and cannot include a query string.</p>
 
     <div class="warning">The <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> directive should
     usually be set <strong>off</strong> when using
@@ -755,6 +760,14 @@ through</td></tr>
     <code>http://example.com/mirror/foo/bar</code> to be internally converted
     into a proxy request to <code>http://backend.example.com/bar</code>.</p>
 
+    <div class="warning">
+    <p>If the first argument ends with a trailing <strong>/</strong>, the second
+       argument should also end with a trailing <strong>/</strong> and vice
+       versa. Otherwise the resulting requests to the backend may miss some
+       needed slashes and do not deliver the expected results.
+    </p>
+    </div>
+
     <p>The <code>!</code> directive is useful in situations where you don't want
     to reverse-proxy a subdirectory, <em>e.g.</em></p>
 
@@ -797,7 +810,7 @@ through</td></tr>
         <th>Description</th></tr>
     <tr><td>min</td>
         <td>0</td>
-        <td>Minumum number of connections that will always
+        <td>Minimum number of connections that will always
             be open to the backend server.</td></tr>
     <tr><td>max</td>
         <td>1...n</td>
@@ -817,9 +830,20 @@ through</td></tr>
     <tr><td>acquire</td>
         <td>-</td>
         <td>If set this will be the maximum time to wait for a free
-    connection in the connection pool. If there are no free connections
-    in the pool the Apache will return <code>SERVER_BUSY</code> status to
-    the client.
+    connection in the connection pool, in milliseconds. If there are no free
+    connections in the pool the Apache will return <code>SERVER_BUSY</code>
+    status to the client.
+    </td></tr>
+    <tr><td>disablereuse</td>
+        <td>Off</td>
+        <td>This parameter should be used when you want to force mod_proxy
+    to immediately close a connection to the backend after being used, and
+    thus, disable its persistent connection and pool for that backend.
+    This helps in various situations where a firewall between Apache and
+    the backend server (regardless of protocol) tends to silently
+    drop connections or when backends themselves may be under round-
+    robin DNS. To disable connection pooling reuse,
+    set this property value to <code>On</code>. 
     </td></tr>
     <tr><td>flushpackets</td>
         <td>off</td>
@@ -966,7 +990,7 @@ through</td></tr>
     <p>A sample balancer setup</p>
     <div class="example"><p><code>
       ProxyPass /special-area http://special.example.com/ smax=5 max=10<br />
-      ProxyPass / balancer://mycluster stickysession=JSESSIONID|jsessionid nofailover=On<br />
+      ProxyPass / balancer://mycluster/ stickysession=JSESSIONID|jsessionid nofailover=On<br />
       &lt;Proxy balancer://mycluster&gt;<br />
       <span class="indent">
         BalancerMember http://1.2.3.4:8009<br />
@@ -1000,6 +1024,15 @@ through</td></tr>
     removes the normal limited protection against URL-based attacks
     provided by the proxy.</p>
 
+    <p>The optional <var>interpolate</var> keyword (available in
+    httpd 2.2.9 and later), in combination with
+    <code class="directive">ProxyPassInterpolateEnv</code> causes the ProxyPass
+    to interpolate environment variables, using the syntax
+    <var>${VARNAME}</var>.  Note that many of the standard CGI-derived
+    environment variables will not exist when this interpolation happens,
+    so you may still have to resort to <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
+    for complex rules.</p>
+
     <p>When used inside a <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> section, the first argument is omitted and the local
     directory is obtained from the <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>.</p>
 
@@ -1009,6 +1042,34 @@ through</td></tr>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyPassInterpolateEnv" id="ProxyPassInterpolateEnv">ProxyPassInterpolateEnv</a> <a name="proxypassinterpolateenv" id="proxypassinterpolateenv">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable Environment Variable interpolation in Reverse Proxy configurations</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyPassInterpolateEnv On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyPassInterpolateEnv Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in httpd 2.2.9 and later</td></tr>
+</table>
+    <p>This directive, together with the <var>interpolate</var> argument to
+    <code class="directive">ProxyPass</code>, <code class="directive">ProxyPassReverse</code>,
+    <code class="directive">ProxyPassReverseCookieDomain</code> and
+    <code class="directive">ProxyPassReverseCookiePath</code>
+    enables reverse proxies to be dynamically
+    configured using environment variables, which may be set by
+    another module such as <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.
+    It affects the <code class="directive">ProxyPass</code>,
+    <code class="directive">ProxyPassReverse</code>,
+    <code class="directive">ProxyPassReverseCookieDomain</code>, and
+    <code class="directive">ProxyPassReverseCookiePath</code> directives,
+    and causes them to substitute the value of an environment
+    variable <code>varname</code> for the string <code>${varname}</code>
+    in configuration directives.</p>
+    <p>Keep this turned off (for server performance) unless you need it!</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="ProxyPassMatch" id="ProxyPassMatch">ProxyPassMatch</a> <a name="proxypassmatch" id="proxypassmatch">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maps remote servers into the local server URL-space using regular expressions</td></tr>
@@ -1045,16 +1106,18 @@ through</td></tr>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Adjusts the URL in HTTP response headers sent from a reverse
 proxied server</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyPassReverse [<var>path</var>] <var>url</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyPassReverse [<var>path</var>] <var>url</var>
+[<var>interpolate</var>]</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
 </table>
     <p>This directive lets Apache adjust the URL in the <code>Location</code>,
-    <code>Content-Location</code> and <code>URI</code> headers on HTTP redirect
-    responses. This is essential when Apache is used as a reverse proxy to avoid
-    by-passing the reverse proxy because of HTTP redirects on the backend
-    servers which stay behind the reverse proxy.</p>
+    <code>Content-Location</code> and <code>URI</code> headers on HTTP
+    redirect responses. This is essential when Apache is used as a
+    reverse proxy (or gateway) to avoid by-passing the reverse proxy
+    because of HTTP redirects on the backend servers which stay behind
+    the reverse proxy.</p>
 
     <p>Only the HTTP response headers specifically mentioned above
     will be rewritten.  Apache will not rewrite other response
@@ -1094,6 +1157,12 @@ proxied server</td></tr>
     (<code>RewriteRule ...  [P]</code>) from <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
     because it doesn't depend on a corresponding <code class="directive"><a href="#proxypass">ProxyPass</a></code> directive.</p>
 
+    <p>The optional <var>interpolate</var> keyword (available in
+    httpd 2.2.9 and later), used together with
+    <code class="directive">ProxyPassInterpolateEnv</code>, enables interpolation
+    of environment variables specified using the format <var>${VARNAME}</var>.
+    </p>
+
     <p>When used inside a <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> section, the first argument is omitted and the local
     directory is obtained from the <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>.</p>
 
@@ -1103,7 +1172,8 @@ proxied server</td></tr>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Adjusts the Domain string in Set-Cookie headers from a reverse-
 proxied server</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyPassReverseCookieDomain <var>internal-domain</var> <var>public-domain</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyPassReverseCookieDomain <var>internal-domain</var>
+<var>public-domain</var> [<var>interpolate</var>]</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
@@ -1119,7 +1189,8 @@ string in <code>Set-Cookie</code> headers.</p>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Adjusts the Path string in Set-Cookie headers from a reverse-
 proxied server</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyPassReverseCookiePath <var>internal-path</var> <var>public-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyPassReverseCookiePath <var>internal-path</var>
+<var>public-path</var> [<var>interpolate</var>]</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
@@ -1199,9 +1270,9 @@ connections</td></tr>
     this module.</p>
 
     <div class="example"><h3>Example</h3><p><code>
-      ProxyRemote http://goodguys.com/ http://mirrorguys.com:8000<br />
-      ProxyRemote * http://cleversite.com<br />
-      ProxyRemote ftp http://ftpproxy.mydomain.com:8080
+      ProxyRemote http://goodguys.example.com/ http://mirrorguys.example.com:8000<br />
+      ProxyRemote * http://cleverproxy.localdomain<br />
+      ProxyRemote ftp http://ftpproxy.mydomain:8080
     </code></p></div>
 
     <p>In the last example, the proxy will forward FTP requests, encapsulated
@@ -1243,7 +1314,8 @@ expressions</td></tr>
     server. (Setting ProxyRequests to <code>Off</code> does not disable use of
     the <code class="directive"><a href="#proxypass">ProxyPass</a></code> directive.)</p>
 
-    <p>In a typical reverse proxy configuration, this option should be set to
+    <p>In a typical reverse proxy or gateway configuration, this
+    option should be set to
     <code>Off</code>.</p>
 
     <p>In order to get the functionality of proxying HTTP or FTP sites, you
@@ -1255,6 +1327,10 @@ expressions</td></tr>
       both to your network and to the Internet at large.</p>
     </div>
 
+<h3>See also</h3>
+<ul>
+<li><a href="#forwardreverse">Forward and Reverse Proxies/Gateways</a></li>
+</ul>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="ProxySet" id="ProxySet">ProxySet</a> <a name="proxyset" id="proxyset">Directive</a></h2>
@@ -1387,6 +1463,6 @@ header for proxied requests</td></tr>
 <p><span>Available Languages: </span><a href="../en/mod/mod_proxy.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_proxy.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy.html.ja.euc-jp b/docs/manual/mod/mod_proxy.html.ja.euc-jp
deleted file mode 100644
index 0c0b6b8a..00000000
--- a/docs/manual/mod/mod_proxy.html.ja.euc-jp
+++ /dev/null
@@ -1,1204 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_proxy - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_proxy</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_proxy.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_proxy.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>HTTP/1.1 ¥×¥í¥­¥·/¥²¡¼¥È¥¦¥§¥¤¥µ¡¼¥Ð</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>proxy_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_proxy.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <div class="warning"><h3>·Ù¹ð</h3>
-      <p><a href="#access">¥µ¡¼¥Ð¤ò°ÂÁ´¤Ë¤¹¤ë</a>¤Þ¤Ç <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> ¤ÏÍ­¸ú¤Ë¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-      ¥ª¡¼¥×¥ó¥×¥í¥­¥·¥µ¡¼¥Ð¤Ï¤¢¤Ê¤¿¼«¿È¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤Ë¤È¤Ã¤Æ¤â¡¢
-      ¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÁ´ÂΤˤȤäƤâ´í¸±¤Ç¤¹¡£</p>
-    </div>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï Apache ¤Î¥×¥í¥­¥·/¥²¡¼¥È¥¦¥§¥¤µ¡Ç½¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£
-    <code>AJP13</code> (Apache JServe Protocol version 1.3),
-    <code>FTP</code>, <code>CONNECT</code> (SSL ÍÑ),
-    <code>HTTP/0.9</code>, <code>HTTP/1.0</code>, <code>HTTP/1.1</code>
-    ¤Î¥×¥í¥­¥·µ¡Ç½¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤é¤Î¥×¥í¥È¥³¥ë¤ä¤½¤Î¾¤Î¥×¥í¥È¥³¥ëÍѤÎ
-    ¥×¥í¥­¥·µ¡Ç½¤ò»ý¤Ã¤¿¡¢Â¾¤Î¥â¥¸¥å¡¼¥ë¤ËÀܳ¤¹¤ë¤è¤¦¤Ë¤âÀßÄê¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>Apache ¤Î¥×¥í¥­¥·µ¡Ç½¤Ï <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ¤Î¾¤Ë¡¢
-    ¤¤¤¯¤Ä¤«¤Î¥â¥¸¥å¡¼¥ë¤Ëʬ³ä¤µ¤ì¤Æ¤¤¤Þ¤¹:
-    <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>, <code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code>,
-    <code class="module"><a href="../mod/mod_proxy_ajp.html">mod_proxy_ajp</a></code>, <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code>, 
-    <code class="module"><a href="../mod/mod_proxy_connect.html">mod_proxy_connect</a></code> ¤Ç¤¹¡£¤Ç¤¹¤«¤é¡¢
-    ÆÃÄê¤Î¥×¥í¥­¥·¤Îµ¡Ç½¤ò»È¤¤¤¿¤¤¾ì¹ç¤Ï¡¢<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> <em>¤È</em>
-    ³ºÅö¤¹¤ë¥â¥¸¥å¡¼¥ë¤ò¥µ¡¼¥Ð¤Ë (¥³¥ó¥Ñ¥¤¥ë»þ¤ËÀÅŪ¤Ë¹Ô¤Ê¤¦¤«
-    <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code> ¤ÇưŪ¤ËÆɤ߹þ¤à¤«¤·¤Æ) 
-    ÁȤ߹þ¤àɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>¤³¤ì¤Ë²Ã¤¨¤Æ¡¢Â¾¤Î¥â¥¸¥å¡¼¥ë¤Ë¤è¤Ã¤Æ³ÈÄ¥µ¡Ç½¤¬Ä󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¥­¥ã¥Ã¥·¥å¤Ï <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> ¤È´ØÏ¢¥â¥¸¥å¡¼¥ë¤Ç
-    Ä󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£SSL/TLS ¤Ç±ó³Ö¥µ¡¼¥Ð¤ËÀܳ¤¹¤ëµ¡Ç½¤Ï
-    <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> ¤Î <code>SSLProxy*</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç
-    Ä󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤é¤Îµ¡Ç½¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¤Ï¡¢³ºÅö¤¹¤ë¥â¥¸¥å¡¼¥ë¤ò
-    ÁȤ߹þ¤ó¤ÇÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#allowconnect">AllowCONNECT</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#noproxy">NoProxy</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxy">&lt;Proxy&gt;</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxybadheader">ProxyBadHeader</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxyblock">ProxyBlock</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxydomain">ProxyDomain</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxyerroroverride">ProxyErrorOverride</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxyiobuffersize">ProxyIOBufferSize</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxymatch">&lt;ProxyMatch&gt;</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxymaxforwards">ProxyMaxForwards</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxypass">ProxyPass</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxypassreverse">ProxyPassReverse</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxypassreversecookiedomain">ProxyPassReverseCookieDomain</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxypassreversecookiepath">ProxyPassReverseCookiePath</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxypreservehost">ProxyPreserveHost</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxyreceivebuffersize">ProxyReceiveBufferSize</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxyremote">ProxyRemote</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxyremotematch">ProxyRemoteMatch</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxyrequests">ProxyRequests</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxytimeout">ProxyTimeout</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxyvia">ProxyVia</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#forwardreverse">¥Õ¥©¥ï¡¼¥É¥×¥í¥­¥·¤È¥ê¥Ð¡¼¥¹¥×¥í¥­¥·</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#examples">´ðËܤÎÎã</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#access">¥×¥í¥­¥·¤Ø¤Î¥¢¥¯¥»¥¹À©¸æ</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#ftp-proxy">FTP ¥×¥í¥­¥·</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#startup">ÃÙ¤¤µ¯Æ°</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#intranet">¥¤¥ó¥È¥é¥Í¥Ã¥È¥×¥í¥­¥·</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#envsettings">¥×¥í¥È¥³¥ë¤ÎÄ´À°</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code></li>
-<li><code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code></li>
-<li><code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code></li>
-<li><code class="module"><a href="../mod/mod_proxy_connect.html">mod_proxy_connect</a></code></li>
-<li><code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></li>
-<li><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="forwardreverse" id="forwardreverse">¥Õ¥©¥ï¡¼¥É¥×¥í¥­¥·¤È¥ê¥Ð¡¼¥¹¥×¥í¥­¥·</a></h2>
-      <p>Apache ¤Ï<dfn>¥Õ¥©¥ï¡¼¥É</dfn>¥×¥í¥­¥·¤È¤·¤Æ¤â¡¢
-      <dfn>¥ê¥Ð¡¼¥¹</dfn>¥×¥í¥­¥·¤È¤·¤Æ¤âÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-      <p>Ä̾ï¤Î<dfn>¥Õ¥©¥ï¡¼¥É¥×¥í¥­¥·</dfn>¤Ï¥¯¥é¥¤¥¢¥ó¥È¤È
-      <em>¥ª¥ê¥¸¥ó¥µ¡¼¥Ð</em> <span class="transnote">(<em>ÌõÃí:</em> ¥³¥ó¥Æ¥ó¥ÄÀ¸À®¸µ¤Î¥µ¡¼¥Ð)</span>
-      ¤Î´Ö¤Ë°ÌÃÖ¤¹¤ëÃæ´Ö¥µ¡¼¥Ð¤Ç¤¹¡£
-      ¥ª¥ê¥¸¥ó¥µ¡¼¥Ð¤«¤é¥³¥ó¥Æ¥ó¥Ä¤ò¼èÆÀ¤¹¤ë²áÄø¤Ç¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ï
-      ¹Ô¤­Àè¤È¤·¤Æ¥ª¥ê¥¸¥ó¥µ¡¼¥Ð¤ò»ØÄꤷ¤Ä¤Ä¥×¥í¥­¥·¤Ë¥ê¥¯¥¨¥¹¥È¤òÁ÷¤ê¡¢
-      ¥×¥í¥­¥·¤Ï¥ª¥ê¥¸¥ó¥µ¡¼¥Ð¤«¤é¥³¥ó¥Æ¥ó¥Ä¼èÆÀ¤Î¥ê¥¯¥¨¥¹¥È¤òÁ÷¤ê¡¢
-      ¥³¥ó¥Æ¥ó¥Ä¤¬¼èÆÀ¤Ç¤­¤ì¤Ð¤½¤ì¤ò¥¯¥é¥¤¥¢¥ó¥È¤ËÊÖ¤·¤Þ¤¹¡£
-      ¥¯¥é¥¤¥¢¥ó¥È¤¬Â¾¤Î¥µ¥¤¥È¤Ë¥Õ¥©¥ï¡¼¥É¥×¥í¥¯¥··Ðͳ¤Ç¥¢¥¯¥»¥¹¤¹¤ë¤Ë¤Ï¡¢
-      ÆÃÊ̤ˤ½¤ìÍѤÎÀßÄê¤ò¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-
-      <p>¥Õ¥©¥ï¡¼¥É¥×¥í¥­¥·¤Î°ìÈÌŪ¤Ê»ÈÍÑÊýË¡¤Ï¡¢¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤Ë¤è¤Ã¤Æ
-      À©¸Â¤µ¤ì¤Æ¤¤¤ëÆâÉô¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ë¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Ø¤Î¥¢¥¯¥»¥¹¤ò
-      Ä󶡤¹¤ë¤â¤Î¤Ç¤¹¡£¥Õ¥©¥ï¡¼¥É¥×¥í¥­¥·¤Ï¥Í¥Ã¥È¥ï¡¼¥¯¤Î»ÈÍÑÎ̤ò
-      ¸º¤é¤¹¤¿¤á¤Ë (<code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> ¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë) 
-      ¥­¥ã¥Ã¥·¥åµ¡Ç½¤òÍѤ¤¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-
-      <p>¥Õ¥©¥ï¡¼¥É¥×¥í¥­¥·¤Ï <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç
-      Í­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£¥Õ¥©¥ï¡¼¥É¥×¥í¥­¥·¤Ç¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤ÏËÜÅö¤Î¿È¸µ¤ò
-      ±£¤·¤ÆǤ°Õ¤Î¥µ¥¤¥È¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ë¤¿¤á¡¢¥Õ¥©¥ï¡¼¥É¥×¥í¥­¥·¤ò
-      Í­¸ú¤Ë¤¹¤ëÁ°¤Ë¡¢¾µÇ§¤µ¤ì¤¿¥¯¥é¥¤¥¢¥ó¥È¤Î¤ß¤¬¥×¥í¥­¥·¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤ë¤è¤¦¤Ë
-      <a href="#access">¥µ¡¼¥Ð¤ò°ÂÁ´¤Ë¤¹¤ë</a>¤³¤È¤¬½ÅÍפǤ¹¡£</p>
-
-      <p>°ìÊý<dfn>¥ê¥Ð¡¼¥¹¥×¥í¥­¥·</dfn>¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ë¤ÏÉáÄ̤Î
-      ¥¦¥§¥Ö¥µ¡¼¥Ð¤Î¤è¤¦¤Ë¸«¤¨¤Þ¤¹¡£¥¯¥é¥¤¥¢¥ó¥È¦¤ËÆÃÊ̤ÊÀßÄê¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£
-      ¥¯¥é¥¤¥¢¥ó¥È¤Ï¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤Î̾Á°¶õ´Ö¤ËÂФ·¤ÆÄ̾ï¤Î¥³¥ó¥Æ¥ó¥Ä¤Ø¤Î
-      ¥ê¥¯¥¨¥¹¥È¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£¥×¥í¥­¥·¤Ï¥ê¥¯¥¨¥¹¥È¤ò¤É¤³¤ËÁ÷¤ì¤ÐÎɤ¤¤«¤òȽÄꤷ¡¢
-      ¤¢¤¿¤«¤â¼«Ê¬¼«¿È¤¬¥ª¥ê¥¸¥ó¥µ¡¼¥Ð¤Ç¤¢¤Ã¤¿¤«¤Î¤è¤¦¤Ë¥¯¥é¥¤¥¢¥ó¥È¤Ë
-      ¥³¥ó¥Æ¥ó¥Ä¤òÊÖ¤·¤Þ¤¹¡£</p>
-
-      <p>¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤Î¤è¤¯¤¢¤ëÍøÍÑÊýË¡¤Ï¡¢¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥æ¡¼¥¶¤Ë
-      ¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤ÎÃæ¤Ë¤¢¤ë¥µ¡¼¥Ð¤Ë¥¢¥¯¥»¥¹¤òÍ¿¤¨¤ë¤È¤¤¤¦¤â¤Î¤Ç¤¹¡£
-      ¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤ÏÊ£¿ô¤Î¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤ØÉé²Ùʬ»¶¤ò¤¹¤ë¤¿¤á¤Ë
-      »È¤Ã¤¿¤ê¡¢ÃÙ¤¤¥Ð¥Ã¥¯¥¨¥ó¥É¥¨¥ó¥É¥µ¡¼¥Ð¤Î¤¿¤á¤Ë¥­¥ã¥Ã¥·¥åµ¡Ç½¤òÄ󶡤·¤¿¤ê
-      ¤¹¤ë¤¿¤á¤Ë»È¤¨¤Þ¤¹¡£¤Þ¤¿¡¢¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤ÏÊ£¿ô¤Î¥µ¡¼¥Ð¤ò
-      Ʊ¤¸ URL ¶õ´Ö¤Ë¤Þ¤È¤á¤ë¤¿¤á¤Ë»È¤¦¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-
-      <p>¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤Ï <code class="directive"><a href="#proxypass">ProxyPass</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ä
-      <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-      <code>[P]</code> ¥Õ¥é¥°¤ò»È¤¦¤³¤È¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤Î
-      ÀßÄê¤Î¤¿¤á¤Ë <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> ¤òÀßÄꤹ¤ëɬÍפÏ
-      <em>¤¢¤ê¤Þ¤»¤ó</em>¡£</p>
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="examples" id="examples">´ðËܤÎÎã</a></h2>
-
-    <p>°Ê²¼¤ÎÎã¤Ï¼ê»Ï¤á¤Î´Êñ¤ÊÎã¤Ç¤¹¡£¸Ä¡¹¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î°ÕÌ£¤Ï
-    ¤½¤ì¤¾¤ì¤ÎÀâÌÀ¤ò¤ªÆɤߤ¯¤À¤µ¤¤¡£</p>
-
-    <p>¤Þ¤¿¥­¥ã¥Ã¥·¥åµ¡Ç½¤òÍ­¸ú¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢<code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> 
-    ¤ÎÀâÌÀ¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£</p>
-
-    <div class="example"><h3>¥Õ¥©¥ï¡¼¥É¥×¥í¥­¥·</h3><p><code>
-    ProxyRequests On<br />
-    ProxyVia On<br />
-    <br />
-    &lt;Proxy *&gt;<br />
-    <span class="indent">
-      Order deny,allow<br />
-      Deny from all<br />
-      Allow from internal.example.com<br />
-    </span>
-    &lt;/Proxy&gt;
-    </code></p></div>
-
-    <div class="example"><h3>¥ê¥Ð¡¼¥¹¥×¥í¥­¥·</h3><p><code>
-    ProxyRequests Off<br />
-    <br />
-    &lt;Proxy *&gt;<br />
-    <span class="indent">
-      Order deny,allow<br />
-      Allow from all<br />
-    </span>
-    &lt;/Proxy&gt;<br />
-    <br />
-    ProxyPass /foo http://foo.example.com/bar<br />
-    ProxyPassReverse /foo http://foo.example.com/bar
-    </code></p></div>
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="access" id="access">¥×¥í¥­¥·¤Ø¤Î¥¢¥¯¥»¥¹À©¸æ</a></h2>
-      <p>¥×¥í¥­¥·¤Î¥¢¥¯¥»¥¹¤Ï°Ê²¼¤Î¤è¤¦¤Ë <code class="directive"><a href="#proxy">&lt;Proxy&gt;</a></code> ¥³¥ó¥Æ¥Ê¤ÎÃæ¤Ë
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò½ñ¤¯¤³¤È¤ÇÀ©¸æ¤Ç¤­¤Þ¤¹:</p>
-
-      <div class="example"><p><code>
-        &lt;Proxy *&gt;<br />
-        <span class="indent">
-          Order Deny,Allow<br />
-          Deny from all<br />
-          Allow from 192.168.0<br />
-        </span>
-        &lt;/Proxy&gt;
-      </code></p></div>
-
-      <p>¥¢¥¯¥»¥¹À©¸æ¤Î¤¿¤á¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï
-      <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> ¤ò¤ªÆɤߤ¯¤À¤µ¤¤¡£</p>
-
-      <p>(<code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-      »È¤Ã¤Æ) ¥Õ¥©¥ï¡¼¥É¥×¥í¥­¥·¤òÀßÄꤷ¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¸·¤·¤¯¥¢¥¯¥»¥¹
-      À©¸Â¤ò¹Ô¤Ê¤¦¤³¤È¤¬Èó¾ï¤ËÂçÀڤǤ¹¡£¤½¤¦¤·¤Ê¤¤¤È¡¢Ç¤°Õ¤Î¥¯¥é¥¤¥¢¥ó¥È¤¬
-      ¿È¸µ¤òÌÀ¤«¤¹¤³¤È¤Ê¤¯Ç¤°Õ¤Î¥Û¥¹¥È¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤¿¤á¤Ë¥µ¡¼¥Ð¤ò»È¤¦¤³¤È¤¬
-      ¤Ç¤­¤Æ¤·¤Þ¤¤¤Þ¤¹¡£¤³¤ì¤Ï¤¢¤Ê¤¿¼«¿È¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤Ë¤È¤Ã¤Æ¤â¡¢¥¤¥ó¥¿¡¼¥Í¥Ã¥È
-      Á´ÂΤˤȤäƤâ´í¸±¤Ê¤³¤È¤Ç¤¹¡£(<code>ProxyRequests Off</code> ¤Ë¤·¤Æ
-      <code class="directive"><a href="#proxypass">ProxyPass</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ)
-      ¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ï¤¢¤Ê¤¿¤¬ÌÀ¼¨Åª¤Ë
-      ÀßÄꤷ¤¿¥Û¥¹¥È¤Ë¤·¤«¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¤¿¤á¡¢¥Õ¥©¥ï¡¼¥É¥×¥í¥­¥·¤Î¤È¤­
-      ¤Û¤É¥¢¥¯¥»¥¹À©¸æ¤ËÎϤòÃí¤¬¤Ê¤¯¤Æ¤âÂç¾æÉפǤ¹¡£</p>
-
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="ftp-proxy" id="ftp-proxy">FTP ¥×¥í¥­¥·</a></h2>
-
-
-    <h3><a name="mimetypes" id="mimetypes">¤É¤¦¤·¤Æ¥Õ¥¡¥¤¥ë¥¿¥¤¥×¤¬ <var>xxx</var>
-    ¤Î¥Õ¥¡¥¤¥ë¤ò FTP ¤Ç¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Ê¤¤¤Î?</a></h3>
-      <p>¤ª¤½¤é¤¯¡¢¥×¥í¥­¥·¤Î mime.types ÀßÄê¥Õ¥¡¥¤¥ë¤Ç¤½¤Î¥Õ¥¡¥¤¥ë¥¿¥¤¥×¤¬
-      <code>application/octet-stream</code> ¤Ç¤¢¤ë¤ÈÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¤Î¤Ç¤·¤ç¤¦¡£
-      °Ê²¼¤Î¤è¤¦¤Ê¤â¤Î¤¬Ìò¤ËΩ¤Ä¤«¤â¤·¤ì¤Þ¤»¤ó:</p>
-
-      <div class="example"><pre>application/octet-stream   bin dms lha lzh exe class tgz taz</pre></div>
-        <p>Ê̤ÎÊýË¡¤È¤·¤Æ¡¢¤¹¤Ù¤Æ¤Î¥Ç¥Õ¥©¥ë¥È¤ò¥Ð¥¤¥Ê¥ê¤Ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹:</p>
-      <div class="example"><pre>DefaultType application/octet-stream</pre></div>
-     
-
-    <h3><a name="type" id="type">¥Õ¥¡¥¤¥ë <var>xxx</var> ¤ò FTP ¤Î ASCII ¥À¥¦¥ó¥í¡¼¥É
-    ¤Ë¤µ¤»¤ë¤Î¤Ï¤É¤¦¤¹¤ì¤Ð¤è¤¤¤Î?</a></h3>
-      <p>¤Þ¤ì¤Ë¡¢(¥Ç¥Õ¥©¥ë¥È¤ÎžÁ÷¤Ï <code>binary</code> ¥â¡¼¥É¤Ç) ÆÃÄê¤Î
-      ¥Õ¥¡¥¤¥ë¤Î¤ß FTP ¤Î <code>ASCII</code> žÁ÷ÊýË¡¤ò»È¤ï¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤
-      ¾ì¹ç¤Ë¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤ÎºÇ¸å¤Ë <code>;type=a</code> ¤òÉÕ¤±¤ë¤³¤È¤Ç
-      <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ¤Ë ASCII žÁ÷¤ò¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      (¤¿¤À¤·¡¢FTP ¤Î¥Ç¥£¥ì¥¯¥È¥ê°ìÍ÷¤Ï¾ï¤Ë ASCII ¥â¡¼¥É¤Ç¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£)</p>
-     
-
-    <h3><a name="ftpnonget" id="ftpnonget">FTP ¤Î¥¢¥Ã¥×¥í¡¼¥É¤Ï¤É¤¦¤¹¤ì¤Ð¤è¤¤¤Î?</a></h3>
-      <p>¸½»þÅÀ¤Ç¤Ï¡¢mod_proxy ¤Î FTP ¥µ¥Ý¡¼¥È¤Ï GET ¤Î¤ß¤Ç¤¹¡£¤â¤Á¤í¤ó
-      Apache ¤Î ¥×¥í¥­¥·¤ò»È¤Ã¤Æ HTTP ¤Î¥¢¥Ã¥×¥í¡¼¥É (POST ¤ä PUT) ¤ò
-      ¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤¹¡£</p>
-    
-
-    <h3><a name="percent2fhck" id="percent2fhck">¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Î³°¤Î FTP ¥Õ¥¡¥¤¥ë¤Ë
-      ¥¢¥¯¥»¥¹¤¹¤ë¤Ë¤Ï¤É¤¦¤¹¤ì¤Ð¤è¤¤¤Î?</a></h3>
-      <p>FTP URI ¤Ï¥í¥°¥¤¥ó¤·¤Æ¤¤¤ë¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤Î
-      ÁêÂХѥ¹¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£»ÄÇ°¤Ê¤³¤È¤Ë¡¢/../ ¤Ï¥Ö¥é¥¦¥¶¤Ë¤è¤ê²ò¼á¤µ¤ì¡¢
-      ¼ÂºÝ¤Ë FTP ¥µ¡¼¥Ð¤Ë¤ÏÁ÷¤é¤ì¤Ê¤¤¤¿¤á¡¢/../ ¤ò»È¤Ã¤Æ¾å°Ì¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë
-      Åþ㤹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¤³¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤Ë¡¢¤¤¤ï¤æ¤ë
-      <dfn>Squid %2f ¥Ï¥Ã¥¯</dfn> ¤ò Apache ¤Î FTP ¥×¥í¥­¥·¤Ï¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£
-      ¤³¤ì¤Ï <a href="http://www.squid-cache.org/">Squid Proxy ¥­¥ã¥Ã¥·¥å</a> ¤Î¤è¤¦¤Ê
-      ¾¤Î¤è¤¯»È¤ï¤ì¤Æ¤¤¤ë¥×¥í¥­¥·¥µ¡¼¥Ð¤Ç¤â¼è¤é¤ì¤Æ¤¤¤ëÊýË¡¤Ç¤¹¡£
-      ¥ê¥¯¥¨¥¹¥È¤Î¥Ñ¥¹¤ÎÀèƬ¤Ë <code>/%2f</code> ¤òÉÕ¤±¤ë¤³¤È¤Ç¡¢¥×¥í¥­¥·¤Ë
-      FTP ¤Î³«»Ï¥Ç¥£¥ì¥¯¥È¥ê¤ò (¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤ÎÂå¤ï¤ê¤Ë) <code>/</code>
-      ¤ËÊѤ¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Î㤨¤Ð¡¢<code>/etc/motd</code> ¤ò¼èÆÀ¤¹¤ë¤¿¤á¤Ë¤Ï
-      ¼¡¤Î URL ¤ò»È¤¤¤Þ¤¹:</p>
-
-      <div class="example"><p><code>
-        ftp://<var>user</var>@<var>host</var>/%2f/etc/motd
-      </code></p></div>
-     
-
-    <h3><a name="ftppass" id="ftppass">¥Ö¥é¥¦¥¶¤Î URL ɽ¼¨¤Ç FTP ¤Îʿʸ¥Ñ¥¹¥ï¡¼¥É¤ò
-    ±£¤¹¤Ë¤Ï¤É¤¦¤¹¤ì¤Ð¤è¤¤¤Î?</a></h3>
-      <p>FTP ¥µ¡¼¥Ð¤Ë¥æ¡¼¥¶Ì¾¤È¥Ñ¥¹¥ï¡¼¥É¤ò»È¤Ã¤Æ¥í¥°¥¤¥ó¤¹¤ë¤¿¤á¤Ë¡¢
-      Apache ¤Ï°Û¤Ê¤ëÊýË¡¤ò»È¤¤¤Þ¤¹¡£URL ¤Ë¥æ¡¼¥¶Ì¾¤È¥Ñ¥¹¥ï¡¼¥É¤¬¤Þ¤Ã¤¿¤¯
-      ¤Ê¤¤¾ì¹ç¤Ï¡¢Apache ¤Ï FTP ¥µ¡¼¥Ð¤Ë anonymous ¥í¥°¥¤¥ó¤òÁ÷¤ê¤Þ¤¹¡£
-      <em>¤Ä¤Þ¤ê</em>¡¢</p>
-
-      <div class="example"><p><code>
-        user: anonymous<br />
-        password: apache_proxy@
-      </code></p></div>
-
-      <p>¤³¤ì¤Ï anonymous ¥¢¥¯¥»¥¹¤¬ÀßÄꤵ¤ì¤¿
-      ¤¹¤Ù¤Æ¤Î FTP ¥µ¡¼¥Ð¤ËÂФ·¤ÆÆ°ºî¤·¤Þ¤¹¡£</p>
-
-      <p>¥æ¡¼¥¶Ì¾¤ò»È¤Ã¤¿¸Ä¿ÍÊÌ¤Î¥í¥°¥¤¥ó¤Ë¤Ï¡¢URL ¤Ë¥æ¡¼¥¶Ì¾¤òÆþ¤ì¤ë¤³¤È¤¬
-      ¤Ç¤­¤Þ¤¹:</p>
-
-      <div class="example"><p><code>
-        ftp://<var>username</var>@<var>host</var>/myfile
-      </code></p></div>
-
-      <p>¤³¤Î¥æ¡¼¥¶Ì¾¤¬Í¿¤¨¤é¤ì¤¿¤È¤­¤Ë¡¢FTP ¥µ¡¼¥Ð¤¬¥Ñ¥¹¥ï¡¼¥É¤òÍ׵᤹¤ì¤Ð
-      (¤â¤Á¤í¤ó¤½¤¦¤¹¤Ù¤­¤Ê¤Î¤Ç¤¹¤¬)¡¢Apache ¤Ï <code>401</code>
-      (Authorization required) ¤òÊÖ¤·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢¥Ö¥é¥¦¥¶¤Ï¥æ¡¼¥¶Ì¾
-      ¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎÏ¥À¥¤¥¢¥í¥°¤òɽ¼¨¤·¤Þ¤¹¡£¥Ñ¥¹¥ï¡¼¥É¤¬ÆþÎϤµ¤ì¤¿¸å¡¢
-      ºÆ¤ÓÀܳ¤ò»î¤ß¡¢À®¸ù¤¹¤ì¤Ð¥ê¥¯¥¨¥¹¥È¤·¤¿¥ê¥½¡¼¥¹¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
-      ¤³¤ÎÊýË¡¤ÎÍøÅÀ¤Ï¥Ö¥é¥¦¥¶¤¬¥Ñ¥¹¥ï¡¼¥É¤òʿʸ¤Çɽ¼¨¤·¤Ê¤¤¤³¤È¤Ç¤¹¡£
-      (¤â¤·ºÇ½é¤«¤é</p>
-
-      <div class="example"><p><code>
-        ftp://<var>username</var>:<var>password</var>@<var>host</var>/myfile
-      </code></p></div>
-
-      <p>¤ÈÆþÎϤ·¤¿¾ì¹ç¤Ë¤Ïɽ¼¨¤µ¤ì¤Æ¤·¤Þ¤¤¤Þ¤¹¡£)</p>
-
-      <div class="note"><h3>Ãí</h3>
-        <p>Á÷¿®¤µ¤ì¤ë¥Ñ¥¹¥ï¡¼¥É¤Ï¡¢°Å¹æ²½¤µ¤ì¤ÆÁ÷¤é¤ì¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-        ¥Ö¥é¥¦¥¶¤È Apache ¥×¥í¥­¥·¥µ¡¼¥Ð¤Ï base64 ¤ÇÉä¹æ²½¤µ¤ì¤¿
-        ʸ»úÎó¤È¤·¤Æ¡¢Apache ¥×¥í¥­¥·¤È FTP ¥µ¡¼¥Ð¤Î´Ö¤Ïʿʸ¤È¤·¤ÆÁ÷¤é¤ì¤Þ¤¹¡£
-        ¤Ç¤¹¤«¤é¡¢HTTP ¤ò»È¤Ã¤Æ HTTP ¤ò¥¢¥¯¥»¥¹¤¹¤ëÁ° (¤â¤·¤¯¤Ï¡¢¤½¤â¤½¤â
-        ¸Ä¿ÍŪ¤Ê¥Õ¥¡¥¤¥ë¤ò FTP ¤Ç¥¢¥¯¥»¥¹¤¹¤ëÁ°) ¤Ë¤è¤¯¹Í¤¨¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-        °ÂÁ´¤Ç¤Ê¤¤ÄÌ¿®Ï©¤ò»È¤Ã¤¿¾ì¹ç¤Ï¡¢ÅðÄ°¼Ô¤ËÅÓÃæ¤Ç¥Ñ¥¹¥ï¡¼¥É¤òÅð¤Þ¤ì¤ë
-        ²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£</p>
-      </div>
-     
-   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="startup" id="startup">ÃÙ¤¤µ¯Æ°</a></h2>
-      <p><code class="directive"><a href="#proxyblock">ProxyBlock</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¡¢
-      ¸å¤Î¥Æ¥¹¥È¤Î¤¿¤á¤Ëµ¯Æ°»þ¤Ë¥Û¥¹¥È¤Î
-      IP ¥¢¥É¥ì¥¹¤¬Ä´¤Ù¤é¤ì¤Æ¥­¥ã¥Ã¥·¥å¤µ¤ì¤Þ¤¹¡£¥Û¥¹¥È̾¤Î¥ë¥Ã¥¯¥¢¥Ã¥×¤Î
-      ®¤µ¤Ë¤è¤Ã¤Æ¤Ï¡¢¿ôÉà (¤«¤½¤ì°Ê¾å) ¤«¤«¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="intranet" id="intranet">¥¤¥ó¥È¥é¥Í¥Ã¥È¥×¥í¥­¥·</a></h2>
-      <p>¥¤¥ó¥È¥é¥Í¥Ã¥È¤Ë¤¢¤ë Apache ¥×¥í¥­¥·¥µ¡¼¥Ð¤Ï³°Éô¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ò
-      ²ñ¼Ò¤Î¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤òÄ̤·¤ÆÁ÷¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£(¤³¤Î¤¿¤á¤Ë¤Ï
-      ¸Ä¡¹¤Î <var>scheme</var> ¤Ë¤Ä¤¤¤Æ¤½¤ì¤¾¤ì¡¢¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤Î
-      ¥×¥í¥­¥·¤Ë¥Õ¥©¥ï¡¼¥É¤µ¤ì¤ë¤è¤¦¤Ë
-      <code class="directive"><a href="#proxyremote">ProxyRemote</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-      ÀßÄꤷ¤Æ¤¯¤À¤µ¤¤)¡£¤·¤«¤·¥¤¥ó¥È¥é¥Í¥Ã¥ÈÆâ¤Î¥ê¥½¡¼¥¹¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤È¤­¤Ï¡¢
-      ¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤òÄ̤µ¤Ê¤¤¤Ç¤â¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¡£
-      ¤É¤Î¥Û¥¹¥È¤¬¥¤¥ó¥È¥é¥Í¥Ã¥È¤Ë°¤·¡¢Ä¾ÀÜ¥¢¥¯¥»¥¹¤¹¤Ù¤­¤«¤ò»ØÄꤹ¤ë¤Ë¤Ï¡¢
-      <code class="directive"><a href="#noproxy">NoProxy</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬
-      Ìò¤ËΩ¤Á¤Þ¤¹¡£</p>
-
-      <p>¥¤¥ó¥È¥é¥Í¥Ã¥ÈÆâ¤Î¥æ¡¼¥¶¤Ï WWW ¤Î¥ê¥¯¥¨¥¹¥È¤Ç¥í¡¼¥«¥ë¥É¥á¥¤¥ó¤ò
-      ¾Êά¤¹¤ë¤³¤È¤¬¤è¤¯¤¢¤ê¤Þ¤¹¡£<code>http://somehost.example.com/</code> 
-      ¤È¤¤¤¦¥ê¥¯¥¨¥¹¥È¤ÎÂå¤ï¤ê¤Ë "http://somehost/" ¤ò¥ê¥¯¥¨¥¹¥È¤·¤¿¤ê¤·¤Þ¤¹¡£
-      ¤³¤Î¤è¤¦¤Ê¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±ÉÕ¤±¡¢¥µ¡¼¥Ð¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¥í¡¼¥«¥ë¥É¥á¥¤¥ó¤¬
-      °ÅÌۤΤ¦¤Á¤Ë»È¤ï¤ì¤Æ¤¤¤ë¤È²ò¼á¤·¤Æ¡¢Ã±½ã¤Ë¥ê¥¯¥¨¥¹¥È¤ò½èÍý¤¹¤ë¤â¤Î¤â
-      ¾¦ÍÑ¥×¥í¥­¥·¥µ¡¼¥Ð¤ÎÃæ¤Ë¤Ï¤¢¤ê¤Þ¤¹¡£
-      ¥µ¡¼¥Ð¤¬ <a href="#proxyrequests">¥×¥í¥­¥·¤Î¥µ¡¼¥Ó¥¹ÍѤËÀßÄꤵ¤ì¤Æ¤¤¤Æ</a>
-      <code class="directive"><a href="#proxydomain">ProxyDomain</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬
-      »ÈÍѤµ¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢Apache ¤Ï¥¯¥é¥¤¥¢¥ó¥È¤Ë¥ê¥À¥¤¥ì¥¯¥È±þÅú¤òÁ÷¤Ã¤Æ¡¢
-      Àµ¤·¤¤¡¢´°Á´¤Ê (<span class="transnote">(<em>ÌõÃí:</em> fully qualified)</span>) 
-      ¥µ¡¼¥Ð¤Î¥¢¥É¥ì¥¹¤ËÁ÷¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Î¤è¤¦¤Ë
-      ¥ê¥À¥¤¥ì¥¯¥È¤¹¤ë¤È¡¢¥æ¡¼¥¶¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯¤¬Àµ¤·¤¤´°Á´¤Ê¥Û¥¹¥È̾¤ò´Þ¤à
-      ¤³¤È¤Ë¤â¤Ê¤ë¤¿¤á¡¢¤è¤ê¹¥¤Þ¤·¤¤ÊýË¡¤È¸À¤¨¤ë¤Ç¤·¤ç¤¦¡£</p>
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="envsettings" id="envsettings">¥×¥í¥È¥³¥ë¤ÎÄ´À°</a></h2>
-      <p>Keepalive ¤ä HTTP/1.1 ¤òŬÀڤ˼ÂÁõ¤·¤Æ¤¤¤Ê¤¤¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥µ¡¼¥Ð¤¬
-      ¤¢¤ë¾õ¶·¤Ç¡¢HTTP/1.0 ¤Ç keepalive ¤ò̵¤·¤Ë¤·¤Æ¥ê¥¯¥¨¥¹¥È¤òÁ÷¤ë¤¿¤á¤Î
-      ´Ä¶­ÊÑ¿ô¤¬Æó¤Ä¤¢¤ê¤Þ¤¹¡£¤³¤ì¤é¤Ï <code class="directive"><a href="../mod/mod_env.html#setenv">SetEnv</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÀßÄꤷ¤Þ¤¹¡£</p>
-
-      <p><code>force-proxy-request-1.0</code> ¤È <code>proxy-nokeepalive</code>
-      ¤¬¤½¤Î´Ä¶­ÊÑ¿ô¤Ç¤¹¡£</p>
-
-      <div class="example"><p><code>
-        &lt;Location /buggyappserver/&gt;<br />
-        <span class="indent">
-          ProxyPass http://buggyappserver:7001/foo/<br />
-          SetEnv force-proxy-request-1.0 1<br />
-          SetEnv proxy-nokeepalive 1<br />
-        </span>
-        &lt;/Location&gt;
-      </code></p></div>
-    </div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AllowCONNECT" id="AllowCONNECT">AllowCONNECT</a> <a name="allowconnect" id="allowconnect">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥×¥í¥­¥·¤ò·Ðͳ¤·¤Æ¡¢¤É¤Î¥Ý¡¼¥È¤Ë <code>CONNECT</code>
-¤Ç¤­¤ë¤«¤ò»ØÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AllowCONNECT <var>port</var> [<var>port</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>AllowCONNECT 443 563</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-</table>
-    <p><code class="directive">AllowCONNECT</code> ¤Ï¥×¥í¥­¥·¤Î <code>CONNECT</code>
-    ¥á¥½¥Ã¥É¤¬Àܳ¤òµö²Ä¤¹¤ë¥Ý¡¼¥ÈÈÖ¹æ¤Î¥ê¥¹¥È¤ò»ØÄꤷ¤Þ¤¹¡£
-    º£Æü¤Î¥Ö¥é¥¦¥¶¤Ï¡¢<code>https</code> ¥³¥Í¥¯¥·¥ç¥ó¤¬Í׵ᤵ¤ì¤Æ¤¤¤Æ¡¢
-    HTTP ¾å¤Ç¤Î¥×¥í¥­¥·¤Ë¤è¤ë¥È¥ó¥Í¥ê¥ó¥°¤¬¤Ç¤­¤ë¤È¤­¤Ë¡¢
-    ¤³¤Î¥á¥½¥Ã¥É¤ò»È¤¤¤Þ¤¹¡£</p>
-
-    <p>¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤Ç¤Ï¡¢https ¤Î¥Ç¥Õ¥©¥ë¥È¥Ý¡¼¥È (<code>443</code>) ¤È
-    ¥Ç¥Õ¥©¥ë¥È¤Î snews ¥Ý¡¼¥È (<code>563</code>) ¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-    ¤³¤Î¥Ç¥Õ¥©¥ë¥È¤ò¾å½ñ¤­¤·¤Æ¡¢¥ê¥¹¥È¤Ëµ­ºÜ¤·¤¿¥Ý¡¼¥È¤Ë¤Î¤ßÀܳ¤òµö²Ä¤·¤¿¤¤¾ì¹ç¡¢
-    <code class="directive">AllowCONNECT</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ·¤Þ¤¹¡£</p>
-
-    <p><code>CONNECT</code> ¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢<code class="module"><a href="../mod/mod_proxy_connect.html">mod_proxy_connect</a></code> 
-    ¤¬¥µ¡¼¥Ð¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="NoProxy" id="NoProxy">NoProxy</a> <a name="noproxy" id="noproxy">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ľÀÜÀܳ¤¹¤ë ¥Û¥¹¥È¡¢¥É¥á¥¤¥ó¡¢¥Í¥Ã¥È¥ï¡¼¥¯</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>NoProxy <var>host</var> [<var>host</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥¤¥ó¥È¥é¥Í¥Ã¥ÈÃæ¤Î Apache ¥×¥í¥­¥·¥µ¡¼¥Ð¤Ë¤Î¤ß
-    Í­ÍѤǤ¹¡£<code class="directive">NoProxy</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¶õÇò¶èÀÚ¤ê¤Ç¡¢
-    ¥µ¥Ö¥Í¥Ã¥È¡¢IP ¥¢¥É¥ì¥¹¡¢¥Û¥¹¥È¡¢¥É¥á¥¤¥ó¤Î¥ê¥¹¥È¤ò»ØÄꤷ¤Þ¤¹¡£
-    ¤³¤ì¤é¤Î¤É¤ì¤«¤Ë¥Þ¥Ã¥Á¤¹¤ë¥Û¥¹¥È¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ï <code class="directive"><a href="#proxyremote">ProxyRemote</a></code> ¤ÇÀßÄꤵ¤ì¤¿¥×¥í¥­¥·¥µ¡¼¥Ð¤Ë
-    ¥Õ¥©¥ï¡¼¥É¤µ¤ì¤º¡¢Ä¾ÀܽèÍý¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      ProxyRemote  *  http://firewall.mycompany.com:81<br />
-      NoProxy         .mycompany.com 192.168.112.0/21
-    </code></p></div>
-
-    <p><code class="directive">NoProxy</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î <var>host</var> °ú¿ô¤Ï
-    °Ê²¼¤Î¼ïÎà¤Î¤É¤ì¤«¤Ç¤¹:</p>
-
-    <dl>
-    
-    <dt><var><a name="domain" id="domain">Domain</a></var></dt>
-    <dd>
-    <p><dfn>Domain</dfn> ¤ÏÀèƬ¤Ë¥Ô¥ê¥ª¥É¤ÎÃ夤¤¿Éôʬ DNS ¥É¥á¥¤¥ó̾¤Ç¤¹¡£
-    Ʊ°ì DNS ¥É¥á¥¤¥óµÚ¤Ó¥¾¡¼¥ó (<em>¤¹¤Ê¤ï¤Á</em>¡¢¥Û¥¹¥È̾¤ÎËöÈø¤¬¤¹¤Ù¤Æ
-    <var>Domain</var> ¤Ç½ª¤ï¤Ã¤Æ¤¤¤ë¤È¤¤¤¦¤³¤È) ¤Ë°¤¹¤ë¥Û¥¹¥È¤Î¥ê¥¹¥È¤ò
-    ɽ¤·¤Þ¤¹)¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      .com .apache.org.
-    </code></p></div>
-
-    <p><var>Domain</var> ¤ò <a href="#hostname">Hostname</a> ¤È¶èÊ̤¹¤ë¤¿¤á¤Ë (°Ọ̃Ū¤Ë¤â¹½Ê¸Åª¤Ë¤â¡£DNS ¥É¥á¥¤¥ó¤â
-    DNS ¤Î A ¥ì¥³¡¼¥É¤ò»ý¤Ä¤³¤È¤¬¤Ç¤­¤ë¤Î¤Ç¤¹!)¡¢<var>Domain</var> ¤Ï
-    ¾ï¤Ë¥Ô¥ê¥ª¥É¤Ç»Ï¤Þ¤ê¤Þ¤¹¡£</p>
-    
-    <div class="note"><h3>Ãí</h3>
-      <p>¥É¥á¥¤¥ó̾¤ÎÈæ³Ó¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤»¤º¤Ë¹Ô¤Ê¤ï¤ì¡¢<var>Domain</var>
-      ¤Ï¾ï¤Ë DNS ¥Ä¥ê¡¼¤Î¥ë¡¼¥È¤«¤é»Ï¤Þ¤ë¤â¤Î¤È¤ß¤Ê¤µ¤ì¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢
-      ¼¡¤ÎÆó¤Ä¤Î¥É¥á¥¤¥ó <code>.MyDomain.com</code> ¤È
-      <code>.mydomain.com.</code> (ºÇ¸å¤Î¥Ô¥ê¥ª¥É¤ËÃíÌÜ) ¤ÏƱ°ì¤Ç¤¢¤ë¤È
-      ¤ß¤Ê¤µ¤ì¤Þ¤¹¡£¥É¥á¥¤¥ó¤ÎÈæ³Ó¤Ï DNS ¥ë¥Ã¥¯¥¢¥Ã¥×¤Ê¤·¤Ç¹Ô¤Ê¤ï¤ì¤ë¤¿¤á¡¢
-      ¥µ¥Ö¥Í¥Ã¥È¤ÎÈæ³Ó¤è¤ê¤â¤º¤Ã¤È¸úΨŪ¤Ç¤¹¡£</p>
-    </div></dd>
-
-    
-    <dt><var><a name="subnet" id="subnet">SubNet</a></var></dt>
-    <dd>
-    <p><dfn>SubNet</dfn> ¤Ï¿ôÃÍ·Á¼° (¥É¥Ã¥È¤Ç¶èÀÚ¤é¤ì¤¿»Í¤Ä¤Î¿ô»ú) ¤Î
-    Éôʬ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥¢¥É¥ì¥¹¤Ç¤¹¡£¸å¤Ë¥¹¥é¥Ã¥·¥å¤È <var>Subnet</var>
-    ¤Î°ÕÌ£¤Î¤¢¤ë¥Ó¥Ã¥È¿ô¤ò»ØÄꤹ¤ë¥Í¥Ã¥È¥Þ¥¹¥¯¤È¤ò³¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¶¦Ä̤Υͥåȥ¥¯¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò»È¤Ã¤ÆÅþ㤹¤ë¤³¤È¤Î¤Ç¤­¤ë¥µ¥Ö¥Í¥Ã¥È¤ò
-    ɽ¤¹¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£ÌÀ¼¨Åª¤Ë¥Í¥Ã¥È¥Þ¥¹¥¯¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¤Ï
-    ºÇ¸å¤Î¾Êά¤µ¤ì¤¿ (¤â¤·¤¯¤ÏÃͤ¬ 0 ¤Î) ¿ô»ú¤¬¥Þ¥¹¥¯¤ò»ØÄꤷ¤Þ¤¹¡£
-    (¤³¤Î¾ì¹ç¤Ï¡¢¥Í¥Ã¥È¥Þ¥¹¥¯¤Ï 8 ¥Ó¥Ã¥Èñ°Ì¤Ç¤·¤«»ØÄê¤Ç¤­¤Þ¤»¤ó¡£)
-    Îã:</p>
-
-    <dl>
-    <dt><code>192.168</code> ¤â¤·¤¯¤Ï <code>192.168.0.0</code></dt>
-    <dd>¥µ¥Ö¥Í¥Ã¥È 192.168.0.0 ¤È°ÅÌۤΠ16 ¥Ó¥Ã¥ÈÍ­¸ú¤Ê¥Í¥Ã¥È¥Þ¥¹¥¯
-    (<code>255.255.0.0</code> ¤È¤¤¤¦¥Í¥Ã¥È¥Þ¥¹¥¯¤Î·Á¼°¤Ç»È¤ï¤ì¤ë¤³¤È¤â
-    ¤¢¤ê¤Þ¤¹)</dd>
-    <dt><code>192.168.112.0/21</code></dt>
-    <dd>¥µ¥Ö¥Í¥Ã¥È<code>192.168.112.0/21</code> ¤È 21 ¥Ó¥Ã¥ÈÍ­¸ú¤Ê
-    ¥Í¥Ã¥È¥Þ¥¹¥¯ (<code>255.255.248.0</code> ¤È¤¤¤¦·Á¼°¤Ç»È¤ï¤ì¤ë¤³¤È¤â
-    ¤¢¤ê¤Þ¤¹)</dd>
-    </dl>
-
-    <p>ÆÃÊ̤ʾì¹ç¤Ë¡¢32 ¥Ó¥Ã¥ÈÍ­¸ú¤Ê <em>SubNet</em> ¤Ï
-    <var><a href="#ipadr">IPAddr</a></var> ¤ÈƱÅù¤Ç¡¢
-    0 ¥Ó¥Ã¥ÈÍ­¸ú¤Ê <var>SubNet</var> (<em>Î㤨¤Ð</em>¡¢0.0.0.0/0) ¤Ï
-    ¤¹¤Ù¤Æ¤Î IP ¥¢¥É¥ì¥¹¤Ë¥Þ¥Ã¥Á¤¹¤ëÄê¿ô <var>_Default_</var> ¤ÈƱ¤¸¤Ç¤¹¡£</p>
-    </dd>
-
-    
-    <dt><var><a name="ipaddr" id="ipaddr">IPAddr</a></var></dt>
-    <dd>
-    <p><dfn>IPAddr</dfn> ¤Ï¿ôÃÍ·Á¼° (¥É¥Ã¥È¤Ç¶èÀÚ¤é¤ì¤¿»Í¤Ä¤Î¿ô»ú) ¤Î
-    ´°Á´¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥¢¥É¥ì¥¹¤Ç¤¹¡£Ä̾ï¤Ï¤³¤Î¥¢¥É¥ì¥¹¤Ï¥Û¥¹¥È¤ò
-    ɽ¤·¤Þ¤¹¤¬¡¢É¬¤º¤·¤â¥¢¥É¥ì¥¹¤ËÂбþ¤¹¤ë DNS ¥É¥á¥¤¥ó̾¤¬¤¢¤ë¤ï¤±¤Ç¤Ï
-    ¤¢¤ê¤Þ¤»¤ó¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      192.168.123.7
-    </code></p></div>
-    
-    <div class="note"><h3>Ãí</h3>
-      <p><var>IPAddr</var> ¤Ï DNS ¥·¥¹¥Æ¥à¤Ë¤è¤ê²ò·è¤µ¤ì¤ëɬÍפ¬¤Ê¤¤¤Î¤Ç¡¢
-      apache ¤ÎÀ­Ç½¤¬¸þ¾å¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>
-    </div></dd>
-
-    
-    <dt><var><a name="hostname" id="hostname">Hostname</a></var></dt>
-    <dd>
-    <p><dfn>Hostname</dfn> ¤Ï DNS ¥É¥á¥¤¥ó¥µ¡¼¥Ó¥¹¤Ë¤è¤ê°ì¤Ä¤â¤·¤¯¤Ï
-    Ê£¿ô¤Î <var><a href="#ipaddr">IPAddr</a></var> ¤Ë²ò·è²Äǽ¤Ê
-    ´°Á´¤Ê DNS ¥É¥á¥¤¥ó̾¤Ç¤¹¡£¤³¤ì¤Ï (<var><a href="#domain">Domain</a></var>
-    ¤È°ã¤Ã¤Æ¡¢ÀâÌÀ¤Ï¾åµ­¤ò»²¾È) ÏÀÍýŪ¤Ê¥Û¥¹¥È¤òɽ¤·¡¢¾¯¤¯¤È¤â°ì¤Ä¤Î
-    <var><a href="#ipaddr">IPAddr</a></var> (¤â¤·¤¯¤Ï°ã¤¦
-    <var><a href="#ipaddr">IPAddr</a></var> ¤Î¥Û¥¹¥È¤Î¥ê¥¹¥È) ¤Ë²ò·è
-    ¤µ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó)¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      prep.ai.mit.edu<br />
-      www.apache.org
-    </code></p></div>
-
-    <div class="note"><h3>Ãí</h3>
-      <p>¿¤¯¤Î¾ì¹ç¡¢<var>Hostname</var> ¤ÎÂå¤ï¤ê¤Ë <var><a href="#ipaddr">IPAddr</a></var> ¤ò»ØÄꤷ¤¿Êý¤¬¡¢DNS ¥ë¥Ã¥¯¥¢¥Ã¥×¤ò
-      Èò¤±¤ë¤³¤È¤¬¤Ç¤­¤ë¤¿¤á¡¢¸úΨ¤¬Îɤ¯¤Ê¤ê¤Þ¤¹¡£Apache ¤Î̾Á°²ò·è¤Ï
-      ¥Í¡¼¥à¥µ¡¼¥Ð¤Ø¤ÎÀܳ¤¬ÃÙ¤¤ PPP ¾å¤Î¾ì¹ç¤Ê¤É¤Ë¤«¤Ê¤ê»þ´Ö¤ò¼è¤é¤ì¤ë
-      ¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</p>
-      <p><var>Hostname</var> ¤ÎÈæ³Ó¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤»¤º¤Ë¹Ô¤Ê¤ï¤ì¡¢
-      <var>Hostname</var> ¤Ï¾ï¤Ë DNS ¥Ä¥ê¡¼¤Î¥ë¡¼¥È¤«¤é»Ï¤Þ¤ë¤â¤Î¤È¤ß¤Ê¤µ¤ì¤Þ¤¹¡£
-      ¤Ç¤¹¤«¤é¡¢Æó¤Ä¤Î¥É¥á¥¤¥ó <code>WWW.MyDomain.com</code> ¤È
-      <code>www.mydomain.com.</code> (ºÇ¸å¤Î¥Ô¥ê¥ª¥É¤ËÃíÌÜ) ¤ÏƱ°ì¤Ç¤¢¤ë¤È
-      ¤ß¤Ê¤µ¤ì¤Þ¤¹¡£</p>
-     </div></dd>
-    </dl>
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../dns-caveats.html">DNS ¤Ë´Ø¤¹¤ëÌäÂê</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Proxy" id="Proxy">&lt;Proxy&gt;</a> <a name="proxy" id="proxy">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥×¥í¥­¥·¤µ¤ì¤ë¥ê¥½¡¼¥¹¤ËŬÍѤµ¤ì¤ë¥³¥ó¥Æ¥Ê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>&lt;Proxy <var>wildcard-url</var>&gt; ...&lt;/Proxy&gt;</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-</table>
-    <p><code class="directive">&lt;Proxy&gt;</code> ¥»¥¯¥·¥ç¥óÃæ¤Î
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥Þ¥Ã¥Á¤¹¤ë¥×¥í¥­¥·¤µ¤ì¤ë¥³¥ó¥Æ¥ó¥Ä¤Ë¤Î¤ßŬÍѤµ¤ì¤Þ¤¹¡£
-    ¥·¥§¥ë·Á¼°¤Î¥ï¥¤¥ë¥É¥«¡¼¥É¤¬»È¤¨¤Þ¤¹¡£</p>
-
-    <p>Î㤨¤Ð¡¢¼¡¤ÎÀßÄê¤Ï <code>yournetwork.example.com</code> ¤Î
-    ¥Û¥¹¥È¤Ë¤Î¤ß¥×¥í¥­¥·¥µ¡¼¥Ð¤ò·Ðͳ¤·¤¿¥¢¥¯¥»¥¹¤òµö²Ä¤·¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      &lt;Proxy *&gt;<br />
-      <span class="indent">
-        Order Deny,Allow<br />
-        Deny from all<br />
-        Allow from yournetwork.example.com<br />
-      </span>
-      &lt;/Proxy&gt;
-    </code></p></div>
-
-    <p>¼¡¤ÎÎã¤Ï <code>example.com</code> ¤Î <code>foo</code> ¥Ç¥£¥ì¥¯¥È¥ê¤Î
-    ¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¡¢¥×¥í¥­¥·¥µ¡¼¥Ð¤òÄ̤·¤ÆÁ÷¤é¤ì¤¿¤È¤­¤Ë¤Ï
-    <code>INCLUDES</code> ¥Õ¥£¥ë¥¿¤òÄ̤·¤ÆÁ÷¤ë¤è¤¦¤ËÀßÄꤷ¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      &lt;Proxy http://example.com/foo/*&gt;<br />
-      <span class="indent">
-        SetOutputFilter INCLUDES<br />
-      </span>
-      &lt;/Proxy&gt;
-    </code></p></div>
-
-    
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyBadHeader" id="ProxyBadHeader">ProxyBadHeader</a> <a name="proxybadheader" id="proxybadheader">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>±þÅú¤Ë¤ª¤«¤·¤Ê¥Ø¥Ã¥À¤¬¤¢¤ë¾ì¹ç¤Î°·¤¤Êý¤ò·è¤á¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProxyBadHeader IsError|Ignore|StartBody</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ProxyBadHeader IsError</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.0.44 °Ê¹ß</td></tr>
-</table>
-    <p><code class="directive">ProxyBadHeader</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¹½Ê¸Åª¤Ë
-    ´Ö°ã¤Ã¤¿¥Ø¥Ã¥À (<em>¤Ä¤Þ¤ê</em> ¥³¥í¥ó¤ò´Þ¤Þ¤Ê¤¤¤â¤Î) ¤ò¼õ¤±¼è¤Ã¤¿¤È¤­¤Ë
-    <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ¤¬¤É¤¦¿¶¤ëÉñ¤¦¤«¤ò·è¤á¤Þ¤¹¡£°Ê²¼¤Î°ú¿ô¤ò
-    ¼è¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-    <dl>
-    <dt><code>IsError</code></dt>
-    <dd>¥ê¥¯¥¨¥¹¥È¤òÃæ»ß¤·¤Æ 502 (Bad Gateway) ±þÅú¤òÊÖ¤¹¡£
-    ¤³¤ì¤¬¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤Ç¤¹¡£</dd>
-
-    <dt><code>Ignore</code></dt>
-    <dd>´Ö°ã¤Ã¤¿¥Ø¥Ã¥À¹Ô¤ò¤½¤â¤½¤â¸ºß¤·¤Ê¤«¤Ã¤¿¤â¤Î¤È¤·¤Æ°·¤¦¡£</dd>
-
-    <dt><code>StartBody</code></dt>
-    <dd>´Ö°ã¤Ã¤¿¥Ø¥Ã¥À¹Ô¤ò¼õ¤±¼è¤Ã¤¿¤é¡¢¥Ø¥Ã¥À¤ÎÆɤ߹þ¤ß¤ò½ªÎ»¤·¤Æ¡¢
-    ¤½¤ì°Ê¹ß¤Î»Ä¤ê¤ò¥Ü¥Ç¥£¤È¤·¤Æ°·¤¦¡£¤³¤ì¤Ï¥Ø¥Ã¥À¤È¥Ü¥Ç¥£¤Î´Ö¤Ë¶õ¹Ô¤òÆþ¤ì˺¤ì¤Æ
-    ¤·¤Þ¤Ã¤Æ¤¤¤ë¤è¤¦¤Ê¡¢¤­¤Á¤ó¤ÈÆ°ºî¤·¤Æ¤¤¤Ê¤¤¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤¬¤¢¤ë¤È¤­¤Ë¡¢
-    ÌäÂê¤ò²óÈò¤¹¤ë¤Î¤ËÌò¤ËΩ¤Á¤Þ¤¹¡£</dd>
-    </dl>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyBlock" id="ProxyBlock">ProxyBlock</a> <a name="proxyblock" id="proxyblock">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥×¥í¥­¥·Àܳ¤ò¶Ø»ß¤¹¤ë¸ì¶ç¡¢¥Û¥¹¥È̾¡¢¥É¥á¥¤¥ó¤ò»ØÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProxyBlock *|<var>word</var>|<var>host</var>|<var>domain</var>
-[<var>word</var>|<var>host</var>|<var>domain</var>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-</table>
-    <p><code class="directive">ProxyBlock</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¶õÇò¤Ç¶èÀÚ¤é¤ì¤¿
-    ¸ì¶ç¡¢¥Û¥¹¥È̾¡¢¥É¥á¥¤¥ó¤Î¥ê¥¹¥È¤ò»ØÄꤷ¤Þ¤¹¡£¥µ¥¤¥È̾¤Ë¤½¤Î¸ì¶ç¡¢¥Û¥¹¥È̾¡¢
-    ¥É¥á¥¤¥ó¤ò´Þ¤à¥µ¥¤¥È¤Ø¤Î HTTP¡¢HTTPS¡¢FTP ¤Ë¤è¤ë¥É¥­¥å¥á¥ó¥È¤Î¥ê¥¯¥¨¥¹¥È¤Ï
-    ¥×¥í¥­¥·¥µ¡¼¥Ð¤Ë¤è¤ê<em>¥Ö¥í¥Ã¥¯¤µ¤ì¤Þ¤¹</em>¡£¥×¥í¥­¥·¥â¥¸¥å¡¼¥ë¤Ï
-    µ¯Æ°»þ¤Ë¥Û¥¹¥È̾¤È»×¤·¤­¹àÌܤΠIP ¥¢¥É¥ì¥¹¤òÄ´¤Ù¡¢¸å¤Î¥Æ¥¹¥È¤Î¤¿¤á¤Ë
-    ¥­¥ã¥Ã¥·¥å¤·¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¡¢¥µ¡¼¥Ð¤Îµ¯Æ°¤¬¾¯¤·ÃÙ¤¯¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>
-
-    <div class="example"><h3>Example</h3><p><code>
-      ProxyBlock joes-garage.com some-host.co.uk rocky.wotsamattau.edu
-    </code></p></div>
-
-    <p><code>rocky.wotsamattau.edu</code> ¤¬ IP ¥¢¥É¥ì¥¹¤Ç»²¾È¤µ¤ì¤¿¤È¤­¤Ç¤â
-    ¥Þ¥Ã¥Á¤·¤Þ¤¹¡£</p>
-
-    <p><code>wotsamattau.edu</code> ¤Î¥Þ¥Ã¥Á¤Ë¤Ï <code>wotsamattau</code>
-    ¤À¤±¤Ç¤â½½Ê¬¤Ç¤¹¡£</p>
-
-    <div class="example"><p><code>
-      ProxyBlock *
-    </code></p></div>
-
-    <p>¤Ï¤¹¤Ù¤Æ¤Î¥µ¥¤¥È¤Ø¤ÎÀܳ¤ò¥Ö¥í¥Ã¥¯¤¹¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyDomain" id="ProxyDomain">ProxyDomain</a> <a name="proxydomain" id="proxydomain">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥×¥í¥­¥·¤µ¤ì¤¿¥ê¥¯¥¨¥¹¥È¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥É¥á¥¤¥ó̾</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProxyDomain <var>Domain</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥¤¥ó¥È¥é¥Í¥Ã¥ÈÆâ¤Î Apache ¥×¥í¥­¥·¥µ¡¼¥Ð¤Ë¤Î¤ß
-    Í­ÍѤǤ¹¡£<code class="directive">ProxyDomain</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    apache ¥×¥í¥­¥·¥µ¡¼¥Ð¤¬Â°¤¹¤ë¥Ç¥Õ¥©¥ë¥È¤Î¥É¥á¥¤¥ó¤ò»ØÄꤷ¤Þ¤¹¡£
-    ¥É¥á¥¤¥ó̾¤Î̵¤¤¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¤¿¾ì¹ç¡¢ÀßÄꤵ¤ì¤¿ <var>Domain</var>
-    ¤¬Äɲ䵤줿Ʊ¤¸¥Û¥¹¥È¤Ø¤Î¥ê¥À¥¤¥ì¥¯¥È±þÅú¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      ProxyRemote  *  http://firewall.mycompany.com:81<br />
-      NoProxy         .mycompany.com 192.168.112.0/21<br />
-      ProxyDomain     .mycompany.com
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyErrorOverride" id="ProxyErrorOverride">ProxyErrorOverride</a> <a name="proxyerroroverride" id="proxyerroroverride">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥×¥í¥­¥·¤µ¤ì¤¿¥³¥ó¥Æ¥ó¥Ä¤Î¥¨¥é¡¼¥Ú¡¼¥¸¤ò¾å½ñ¤­¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProxyErrorOverride On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ProxyErrorOverride Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>¥Ð¡¼¥¸¥ç¥ó 2.0 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤ò»ÈÍѤ·¤Æ¤¤¤Æ¡¢
-    ¥¨¥ó¥É¥æ¡¼¥¶¤ËÁ÷¤é¤ì¤ë¥¨¥é¡¼¥Ú¡¼¥¸¤Î³°¸«¤ò¶¦Ä̤Τâ¤Î¤Ë¤·¤¿¤¤¤È¤­¤Ë
-    Í­ÍѤǤ¹¡£¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï (<code class="module"><a href="../mod/mod_include.html">mod_include</a></code> ¤Î SSI ¤Ë¤è¤Ã¤Æ)
-    ¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤¬¥¨¥é¡¼¥³¡¼¥É¤ò¼èÆÀ¤·¤Æ¡¢Àµ¤·¤¯Æ°ºî¤ò
-    ¤¹¤ë¤è¤¦¤Ë¤â¤·¤Þ¤¹ (¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤Ï¡¢¥×¥í¥­¥·¤µ¤ì¤¿¥µ¡¼¥Ð¤Î
-    ¥¨¥é¡¼¥Ú¡¼¥¸¤Îɽ¼¨¤Ç¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÍ­¸ú¤Ë¤¹¤ë¤È SSI ¤Î¥¨¥é¡¼
-    ¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¤Þ¤¹)¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyIOBufferSize" id="ProxyIOBufferSize">ProxyIOBufferSize</a> <a name="proxyiobuffersize" id="proxyiobuffersize">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ÆâÉô¥Ç¡¼¥¿¥¹¥ë¡¼¥×¥Ã¥È¥Ð¥Ã¥Õ¥¡¤Î¥µ¥¤¥º¤ò·èÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProxyIOBufferSize <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ProxyIOBufferSize 8192</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-</table>
-    <p><code class="directive">ProxyIOBufferSize</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÆþÎϤÈ
-    ½ÐÎÏÍѤΰì»þ¥á¥â¥ê¤È¤·¤Æ»È¤ï¤ì¤ëÆâÉô¥Ð¥Ã¥Õ¥¡¤Î¥µ¥¤¥º¤òÄ´À°¤·¤Þ¤¹¡£
-    ¥µ¥¤¥º¤Ï <code>8192</code> °Ê²¼¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-
-    <p>¤Û¤È¤ó¤É¤¹¤Ù¤Æ¤Î¾ì¹ç¡¢¤³¤ÎÃͤòÊѹ¹¤¹¤ëÍýͳ¤Ï¤¢¤ê¤Þ¤»¤ó¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyMatch" id="ProxyMatch">&lt;ProxyMatch&gt;</a> <a name="proxymatch" id="proxymatch">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>Àµµ¬É½¸½¤Ç¤Î¥Þ¥Ã¥Á¤Ë¤è¤ë¥×¥í¥­¥·¥ê¥½¡¼¥¹ÍѤΥǥ£¥ì¥¯¥Æ¥£¥Ö¥³¥ó¥Æ¥Ê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>&lt;ProxyMatch <var>regex</var>&gt; ...&lt;/ProxyMatch&gt;</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-</table>
-    <p><code class="directive">&lt;ProxyMatch&gt;</code> ¤Ï URL ¤Î¥Þ¥Ã¥Á¤Ë
-    Àµµ¬É½¸½¤òÍѤ¤¤ë¤³¤È¤ò½ü¤¤¤Æ <code class="directive">&lt;Proxy&gt;</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÈƱ¤¸¤Ç¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyMaxForwards" id="ProxyMaxForwards">ProxyMaxForwards</a> <a name="proxymaxforwards" id="proxymaxforwards">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥ê¥¯¥¨¥¹¥È¤¬¥Õ¥©¥ï¡¼¥É¤µ¤ì¤ë¥×¥í¥­¥·¤ÎºÇÂç¿ô</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProxyMaxForwards <var>number</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ProxyMaxForwards 10</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p><code class="directive">ProxyMaxForwards</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¥ê¥¯¥¨¥¹¥È¤Ë <code>Max-Forwards</code> ¥Ø¥Ã¥À¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë
-    ¥ê¥¯¥¨¥¹¥È¤¬Ä̲á²Äǽ¤Ê¥×¥í¥­¥·¤ÎºÇÂç¿ô¤òÀßÄꤷ¤Þ¤¹¡£¤³¤ì¤Ï
-    ¥×¥í¥­¥·¤Î̵¸Â¥ë¡¼¥×¤ä DoS ¹¶·â¤òËɤ°¤¿¤á¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      ProxyMaxForwards 15
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyPass" id="ProxyPass">ProxyPass</a> <a name="proxypass" id="proxypass">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥ê¥â¡¼¥È¥µ¡¼¥Ð¤ò¥í¡¼¥«¥ë¥µ¡¼¥Ð¤Î URL ¶õ´Ö¤Ë¥Þ¥Ã¥×¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var> <var>key=value</var> ...]]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥ê¥â¡¼¥È¥µ¡¼¥Ð¤ò¥í¡¼¥«¥ë¥µ¡¼¥Ð¤Î̾Á°¶õ´Ö¤Ë
-    ¥Þ¥Ã¥×¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£¥í¡¼¥«¥ë¥µ¡¼¥Ð¤ÏÄ̾ï¤Î°ÕÌ£¤Ç¤Î¥×¥í¥­¥·¤È
-    ¤·¤Æ¤ÏÆ°ºî¤»¤º¡¢¥ê¥â¡¼¥È¥µ¡¼¥Ð¤Î¥ß¥é¡¼¤È¤·¤Æ¿¶¤ëÉñ¤¤¤Þ¤¹¡£
-    <var>path</var> ¤Ï¥í¡¼¥«¥ë¤Î²¾Áۥѥ¹¤Î̾Á°¤Ç¤¹¡£<var>url</var> ¤Ï
-    ¥ê¥â¡¼¥È¥µ¡¼¥Ð¤ÎÉôʬ URL ¤Ë¤Ê¤ê¡¢¥¯¥¨¥ê¡¼Ê¸»úÎó¤ò´Þ¤à¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£</p>
-
-    <div class="warning"><code class="directive">ProxyPass</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    »È¤Ã¤Æ¤¤¤ë¤È¤­¤Ï <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÄ̾ï¤Ï
-    <strong>off</strong> ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¤Ù¤­¤Ç¤¹¡£</div>
-
-    <p>¥í¡¼¥«¥ë¥µ¡¼¥Ð¤Î¥¢¥É¥ì¥¹¤¬ <code>http://example.com/</code> ¤Ç¤¢¤ë¤È
-    ¤·¤Þ¤¹¡£¤¹¤ë¤È¡¢</p>
-
-    <div class="example"><p><code>
-      ProxyPass /mirror/foo/ http://backend.example.com/
-    </code></p></div>
-
-    <p>¤ÈÀßÄꤹ¤ë¤È <code>http://example.com/mirror/foo/bar</code> ¤Ø¤Î
-    ¥ê¥¯¥¨¥¹¥È¤¬ÆâÉôŪ¤Ë <code>http://backend.example.com/bar</code> ¤Ø¤Î
-    ¥×¥í¥­¥·¥ê¥¯¥¨¥¹¥È¤ËÊÑ´¹¤µ¤ì¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p>¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤·¤¿¤¯¤Ê¤¤¤È¤­¤Ë <code>!</code> ¤Ï
-    Ìò¤ËΩ¤Á¤Þ¤¹¡£<em>Î㤨¤Ð</em>¡¢</p>
-
-    <div class="example"><p><code>
-      ProxyPass /mirror/foo/i !<br />
-      ProxyPass /mirror/foo http://backend.example.com
-    </code></p></div>
-
-    <p>¤Ï <code>/mirror/foo/i</code> ¤ò<em>½ü¤¯</em>
-    <code>/mirror/foo</code> ¤Ø¤Î¤¹¤Ù¤Æ¤Î¥ê¥¯¥¨¥¹¥È¤ò
-    <code>backend.example.com</code> ¤Ë¥×¥í¥­¥·¤·¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>Ãí</h3>
-      <p>½çÈ֤ϽÅÍפǤ¹¡£°ìÈÌŪ¤Ê <code class="directive">ProxyPass</code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î<em>Á°¤Ë</em>
-      ½ü³°¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÃÖ¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</p>
-    </div>
-
-    <p>2.1 ¤Î¿·µ¡Ç½¤Ç¡¢¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤È¤ÎÀܳ¤Ë¥×¡¼¥ë¤µ¤ì¤¿¥³¥Í¥¯¥·¥ç¥ó¤ò
-    »È¤¨¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£<code>key=value</code> ·Á¼°¤Î¥Ñ¥é¥á¡¼¥¿¤Ç
-    ¤³¤Î¥³¥Í¥¯¥·¥ç¥ó¥×¡¼¥ê¥ó¥°¤ÎÄ´À°¤¬¤Ç¤­¤Þ¤¹¡£<code>Hard Maximum</code> 
-    ¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤϡ¢Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë MPM ¤Ç¤Î¥×¥í¥»¥¹Åö¤¿¤ê¤Î¥¹¥ì¥Ã¥É¿ô¤È
-    Ʊ¤¸¿ô¤Î¥³¥Í¥¯¥·¥ç¥ó¿ô¤Ç¤¹¡£prefork MPM ¤Ç¤ÏÄ̾ï¤Ï 1 ¤Ç¡¢worker MPM ¤Ç¤Ï
-    <code class="directive">ThreadsPerChild</code> ¤ÇÄ´À°¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p><code>min</code> ¤ÎÀßÄê¤Ç¡¢¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤È¤Î´Ö¤Ë²¿ËܤΥ³¥Í¥¯¥·¥ç¥ó¤ò
-    ¾ï»þ³«¤¯¤«¤¬·è¤Þ¤ê¤Þ¤¹¡£Soft Maximum <code>smax</code> ¤Î¿ô¤Ë
-    㤹¤ë¤Þ¤ÇɬÍפ˱þ¤¸¤Æ¥³¥Í¥¯¥·¥ç¥ó¤ÏÀ¸À®¤µ¤ì¤Þ¤¹¡£<code>smax</code>
-    ¤òĶ¤¨¤¿¿ô¤Î¥³¥Í¥¯¥·¥ç¥ó¤Ï¡¢À¸Â¸»þ´Ö <code>ttl</code> ¤ÇÀÚÃǤµ¤ì¤Þ¤¹¡£
-    ¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤È Hard Maximum <code>max</code> ¤Î¿ô°Ê¾å¤Î¥³¥Í¥¯¥·¥ç¥ó¤ò
-    À¸À®¤¹¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£</p>
-
-    <div class="example"><p><code>
-        ProxyPass /example http://backend.example.com smax=5 max=20 ttl=120 retry=300
-    </code></p></div>
-
-    <table>
-    <tr><th>¥Ñ¥é¥á¡¼¥¿</th>
-        <th>¥Ç¥Õ¥©¥ë¥ÈÃÍ</th>
-        <th>ÀâÌÀ</th></tr>
-    <tr><td>min</td>
-        <td>0</td>
-        <td>¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤È¤ÎÀܳ¤Ç
-            ¾ï¤Ë³«¤¤¤Æ¤¤¤ë¥³¥Í¥¯¥·¥ç¥ó¿ô¤ÎºÇ¾®ÃÍ</td></tr>
-    <tr><td>max</td>
-        <td>1...n</td>
-        <td>¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤È¤ÎÀܳ¿ô¤Î Hard Maximum
-        <span class="transnote">(<em>ÌõÃí:</em> ¥Ï¡¼¥É¥ê¥ß¥Ã¥È)</span>¡£
-        ¥Ç¥Õ¥©¥ë¥ÈÃͤϡ¢»ÈÍѤ·¤Æ¤¤¤ë MPM ¤Î¥×¥í¥»¥¹¤¢¤¿¤ê¤Î¥¹¥ì¥Ã¥É¿ô¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-        Prefork MPM ¤Ç¤Ï¾ï¤Ë 1 ¤Ç¡¢Worker MPM ¤Ç¤Ï <code class="directive">ThreadsPerChild</code>
-        ¤ÇÄ´Àá¤Ç¤­¤Þ¤¹¡£Hard Maximum °Ê¾å¤Ë¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤È¤Î¥³¥Í¥¯¥·¥ç¥ó¤ò
-        À¸À®¤¹¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£</td></tr>
-    <tr><td>smax</td>
-        <td>max</td>
-        <td>Àܳ¿ô¤Î Soft Maximum <span class="transnote">(<em>ÌõÃí:</em> ¥½¥Õ¥È¥ê¥ß¥Ã¥È)</span>¤Þ¤Ç¡¢
-        ¥³¥Í¥¯¥·¥ç¥ó¤ÏɬÍפ˱þ¤¸¤ÆÀ¸À®¤µ¤ì¤Þ¤¹¡£
-        <code>smax</code> ¤òĶ¤¨¤¿¿ô¤Î¥³¥Í¥¯¥·¥ç¥ó¤ÏÀ¸Â¸»þ´Ö <code>ttl</code>
-        ¤ÇÀÚÃǤµ¤ì¤Þ¤¹¡£
-    </td></tr>
-    <tr><td>ttl</td>
-        <td>-</td>
-        <td><code>smax</code> ¿ô¤òĶ¤¨¤¿Èó³èÆ°¾õÂ֤Υ³¥Í¥¯¥·¥ç¥ó¤ÎÀ¸Â¸»þ´Ö¤ò¡¢
-        ÉäǻØÄꤷ¤Þ¤¹¡£¤³¤Î´ü´ÖÆâ¤Ë»ÈÍѤµ¤ì¤Ê¤«¤Ã¤¿¥³¥Í¥¯¥·¥ç¥ó¤Ï¡¢
-        Á´¤ÆÊĤ¸¤é¤ì¤Þ¤¹¡£
-    </td></tr>
-    <tr><td>timeout</td>
-        <td><code class="directive">Timeout</code></td>
-        <td>¥³¥Í¥¯¥·¥ç¥ó¥¿¥¤¥à¥¢¥¦¥È¤òÉäǻØÄꤷ¤Þ¤¹¡£Æä˻ØÄꤵ¤ì¤Ê¤±¤ì¤Ð¡¢
-        ¥Õ¥ê¡¼¤Ê¥³¥Í¥¯¥·¥ç¥ó¤ò¼èÆÀ¤Ç¤­¤ë¤Þ¤ÇÂÔ¤Á¤Þ¤¹¡£¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-        <code>max</code> ¥Ñ¥é¥á¡¼¥¿¤È¹ç¤ï¤»¤Æ»È¤¦¤³¤È¤Ç¡¢¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤È¤Î
-        Àܳ¿ô¤òÀ©¸æ¤¹¤ë¤Î¤Ë»È¤¤¤Þ¤¹¡£
-    </td></tr>
-    <tr><td>acquire</td>
-        <td>-</td>
-        <td>ÀßÄꤹ¤ë¤È¡¢¥³¥Í¥¯¥·¥ç¥ó¥×¡¼¥ë¤«¤é¥Õ¥ê¡¼¤Î¥³¥Í¥¯¥·¥ç¥ó¤ò¼èÆÀ¤¹¤ë¤¿¤á¤Ë
-        ÂÔµ¡¤¹¤ëÂÔ¤Á»þ´Ö¤ÎºÇÂçÃͤˤʤê¤Þ¤¹¡£¥Õ¥ê¡¼¤Î¥³¥Í¥¯¥·¥ç¥ó¤¬¥×¡¼¥ë¤Ë¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¡¢
-        <code>SERVER_BUSY</code> ¥¹¥Æ¡¼¥¿¥¹¤¬¥¯¥é¥¤¥¢¥ó¥È¤ËÊÖ¤µ¤ì¤Þ¤¹¡£
-    </td></tr>
-    <tr><td>keepalive</td>
-        <td>Off</td>
-        <td>¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤È Apache ¤Î´Ö¤Ë¥Õ¥¡¥¤¥¢¡¼¥¦¥©¡¼¥ë¤¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢
-        ¤³¤Î¥Ñ¥é¥á¡¼¥¿¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤Ï±ý¡¹¤Ë¤·¤Æ¡¢
-        Èó³èÆ°¾õÂ֤Υ³¥Í¥¯¥·¥ç¥ó¤òÍî¤È¤½¤¦¤È¤·¤Þ¤¹¡£
-        ¤³¤Î¥Õ¥é¥°¤Ï OS ¤Ë»Ø¼¨¤·¤Æ¡¢<code>KEEP_ALIVE</code> ¥á¥Ã¥»¡¼¥¸¤òÈó³èÆ°¾õÂÖ¤Î
-        ¥³¥Í¥¯¥·¥ç¥ó¤Ç¤âÁ÷¤ë¤è¤¦¤Ë¤·¤Þ¤¹ (´Ö³Ö¤Ï OS ¤Î¥°¥í¡¼¥Ð¥ëÀßÄê¤Ë°Í¸¤·¡¢
-        Ä̾ï¤Ï 120ms ´Ö³Ö) ¡£¤³¤ì¤Ë¤è¤Ã¤Æ¥Õ¥¡¥¤¥¢¥¦¥©¡¼¥ë¤Ë¤è¤Ã¤Æ¥³¥Í¥¯¥·¥ç¥ó¤¬
-        Íî¤È¤µ¤ì¤ë¤³¤È¤òËɤ²¤Þ¤¹¡£keepalive ¤òÍ­¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢¤³¤Î¥×¥í¥Ñ¥Æ¥£¤ò
-        <code>On</code> ¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-    </td></tr>
-    <tr><td>retry</td>
-        <td>60</td>
-        <td>¥³¥Í¥¯¥·¥ç¥ó¤ò¥×¡¼¥ê¥ó¥°¤¹¤ë¤¿¤á¤Î¡¢¥ê¥È¥é¥¤¤Î¥¿¥¤¥à¥¢¥¦¥È¤òÉäÇ
-        »ØÄꤷ¤Þ¤¹¡£¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤Ø¤Î¥³¥Í¥¯¥·¥ç¥ó¥×¡¼¥ê¥ó¥°¤¬¼ºÇÔ¤·¤¿¾ì¹ç¤Ï¡¢
-        ¥¿¥¤¥à¥¢¥¦¥È¤Î´ü´Ö¤¬²á¤®¤ë¤Þ¤Ç¡¢¤½¤Î¥µ¡¼¥Ð¤Ë¥ê¥¯¥¨¥¹¥È¤ò¥Õ¥©¥ï¡¼¥É¤·¤Þ¤»¤ó¡£
-        ¤³¤Îµ¡Ç½¤ò»È¤¦¤È¡¢¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤ò¥á¥ó¥Æ¥Ê¥ó¥¹¤Î¤¿¤á¤Ë¥·¥ã¥Ã¥È¥À¥¦¥ó¤·¡¢
-        ¸å¤Ç¥ª¥ó¥é¥¤¥ó¤ËÉüµ¢¤µ¤»¤ë¤È¤¤¤Ã¤¿¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    </td></tr>
-    <tr><td>loadfactor</td>
-        <td>1</td>
-        <td>¥ï¡¼¥«¡¼¤¢¤¿¤ê¤ÎÉé²Ù·¸¿ô¤Ç¤¹¡£BalancerMember ¤Ç»È¤¤¤Þ¤¹¡£
-        1 ¤«¤é 100 ¤Þ¤Ç¤Î¿ô»ú¤Ç¤½¤Î¥ï¡¼¥«¡¼¤ËÂФ¹¤ëÀµµ¬²½¤µ¤ì¤¿Éé²ÙΨ¤ò»ØÄꤷ¤Þ¤¹¡£
-    </td></tr>
-    <tr><td>route</td>
-        <td>-</td>
-        <td>¥í¡¼¥É¥Ð¥é¥ó¥µ¤Ç»È¤Ã¤¿¾ì¹ç¡¢¥ï¡¼¥«¡¼¤Î¥ë¡¼¥Æ¥£¥ó¥°¤ò¤·¤Þ¤¹¡£
-        ¥ë¡¼¥È¤Ï¥»¥Ã¥·¥ç¥ó ID ¤ËÉղ䵤줿Ãͤˤʤê¤Þ¤¹¡£
-    </td></tr>
-    <tr><td>redirect</td>
-        <td>-</td>
-        <td>¥ï¡¼¥«¡¼¤Î¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó·ÐÏ©¤Ç¤¹¡£¤³¤ÎÃͤÏÄ̾ï¤Ï¡¢
-        °ÂÁ´¤Ë¥¯¥é¥¹¥¿¤«¤é¥Î¡¼¥É¤ò¼è¤êµî¤ëÀßÄê¤òưŪ¤ËÆþ¤ì¤ë¤¿¤á¤Ë»È¤¤¤Þ¤¹¡£
-        ¥»¥Ã¥·¥ç¥ó ID ¤Î̵¤¤¥ê¥¯¥¨¥¹¥ÈÁ´¤Æ¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢
-        ¤³¤ÎÃͤÈƱ¤¸¥ë¡¼¥Æ¥£¥ó¥°¥Ñ¥é¥á¡¼¥¿¤ò»ý¤Ä 
-        BalancerMember ¤Ë¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤Þ¤¹¡£
-    </td></tr>
-
-    </table>
-
-    <p>Proxy ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¥¹¥­¡¼¥à¤¬ <code>balancer://</code> ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-    ¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤È¼ÂºÝ¤Ë¤ÏÄÌ¿®¤·¤Ê¤¤²¾Áۥ¥«¡¼¤¬À¸À®¤µ¤ì¤Þ¤¹¡£
-    ¤³¤Î¥ï¡¼¥«¡¼¤Ï´ö¤Ä¤«¤Î "ËÜʪ¤Î" ¥ï¡¼¥«¡¼¤Î´ÉÍý¤ò¤Ä¤«¤µ¤É¤ê¤Þ¤¹¡£
-    ¤³¤Î¾ì¹ç¥Ñ¥é¥á¡¼¥¿¤Ï¡¢¤³¤Î²¾Áۥ¥«¡¼¤ËÂФ·¤ÆÀßÄꤵ¤ì¤Þ¤¹¡£
-    </p>
-    <table>
-    <tr><th>¥Ñ¥é¥á¡¼¥¿</th>
-        <th>¥Ç¥Õ¥©¥ë¥ÈÃÍ</th>
-        <th>ÀâÌÀ</th></tr>
-    <tr><td>lbmethod</td>
-        <td>-</td>
-        <td>Balancer ¤Î¥í¡¼¥É¥Ð¥é¥ó¥¹ÊýË¡¡£»ÈÍѤ¹¤ë¥í¡¼¥É¥Ð¥é¥ó¥¹¤Î
-        ¥¹¥±¥¸¥å¡¼¥ê¥ó¥°ÊýË¡¤òÁª¤Ó¤Þ¤¹¡£½èÍý¤·¤¿¥ê¥¯¥¨¥¹¥È¤Î¿ô¤Ç½Å¤ßÉÕ¤±¤¹¤ë
-        <code>byrequests</code> ¤«¡¢Å¾Á÷Î̤ΥХ¤¥È¿ô¤Ç½Å¤ßÉÕ¤±¤¹¤ë
-        <code>bytraffic</code> ¤òÀßÄê¤Ç¤­¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ï
-        <code>byrequests</code> ¤Ç¤¹¡£
-    </td></tr>
-    <tr><td>stickysession</td>
-        <td>-</td>
-        <td>¥Ð¥é¥ó¥µ¡¼¤Î¥¹¥Æ¥£¥Ã¥­¡¼¥»¥Ã¥·¥ç¥ó̾¤Ç¤¹¡£Ä̾ï¤Ï¤³¤ÎÃÍ¤Ï <code>JSESSIONID</code>
-        ¤ä <code>PHPSESSIONID</code> ¤È¤¤¤Ã¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¤¬¡¢¤³¤ÎÃͤÏ
-        ¥Ð¥Ã¥¯¥¨¥ó¥É¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥µ¥Ý¡¼¥È¤¹¤ë¥»¥Ã¥·¥ç¥ó¤Ë°Í¸¤·¤Þ¤¹¡£
-    </td></tr>
-    <tr><td>nofailover</td>
-        <td>Off</td>
-        <td><code>On</code> ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤È¡¢¥ï¡¼¥«¡¼¤¬¥¨¥é¡¼¤òµ¯¤³¤·¤¿¤ê
-        ̵¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¥»¥Ã¥·¥ç¥ó¤¬ÀÚ¤ì¤Þ¤¹¡£
-        ¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤¬¥»¥Ã¥·¥ç¥ó¥ì¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢
-        On ¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-    </td></tr>
-    <tr><td>timeout</td>
-        <td>0</td>
-        <td>¥Ð¥é¥ó¥µ¡¼¤Î¥¿¥¤¥à¥¢¥¦¥È¤òÉäǻØÄꤷ¤Þ¤¹¡£
-        ¤³¤ÎÃͤòÀßÄꤹ¤ë¤È¡¢¥Õ¥ê¡¼¤Î¥ï¡¼¥«¡¼¤ò¼èÆÀ¤¹¤ë¤Þ¤Ç¤ÎºÇÂçÂÔµ¡»þ´Ö¤Ë¤Ê¤ê¤Þ¤¹¡£
-        ¥Ç¥Õ¥©¥ë¥È¤Ç¤ÏÂÔµ¡¤·¤Þ¤»¤ó¡£
-    </td></tr>
-    <tr><td>maxattempts</td>
-        <td>1</td>
-        <td>¥Õ¥§¥¤¥ë¥ª¡¼¥Ð¡¼¤ò»î¤ß¤ëºÇÂç¤Î²ó¿ô¤ò»ØÄꤷ¤Þ¤¹¡£
-    </td></tr>
-    
-    </table>
-    <div class="example"><p><code>
-      ProxyPass /special-area http://special.example.com/ smax=5 max=10<br />
-      ProxyPass / balancer://mycluster stickysession=jsessionid nofailover=On<br />
-      &lt;Proxy balancer://mycluster&gt;<br />
-      <span class="indent">
-        BalancerMember http://1.2.3.4:8009<br />
-        BalancerMember http://1.2.3.5:8009 smax=10<br />
-        # Less powerful server, don't send as many requests there<br />
-        BalancerMember http://1.2.3.6:8009 smax=1 loadfactor=20<br />
-      </span>
-      &lt;/Proxy&gt;
-    </code></p></div>
-
-    <p><code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤ÎÃæ¤Ç»È¤ï¤ì¤¿¾ì¹ç¡¢ºÇ½é¤Î°ú¿ô¤Ï
-    ¾Êά¤µ¤ì¡¢¥í¡¼¥«¥ë¥Ç¥£¥ì¥¯¥È¥ê¤Ï <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> ¤«¤é¼èÆÀ¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>¤è¤ê½ÀÆð¤Ê¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤ÎÀßÄ꤬ɬÍפʾì¹ç¤Ï¡¢<code>[P]</code>
-    ¥Õ¥é¥°ÉÕ¤­¤Î <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyPassReverse" id="ProxyPassReverse">ProxyPassReverse</a> <a name="proxypassreverse" id="proxypassreverse">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤µ¤ì¤¿¥µ¡¼¥Ð¤«¤éÁ÷¤é¤ì¤¿ HTTP ±þÅú¥Ø¥Ã¥À¤Î
-URL ¤òÄ´À°¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProxyPassReverse [<var>path</var>] <var>url</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï Apache ¤Ë HTTP ¥ê¥À¥¤¥ì¥¯¥È±þÅú¤Î
-    <code>Location</code>, <code>Content-Location</code>, <code>URI</code>
-    ¥Ø¥Ã¥À¤ÎÄ´À°¤ò¤µ¤»¤Þ¤¹¡£¤³¤ì¤Ï¡¢Apache ¤¬¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤È¤·¤Æ»È¤ï¤ì¤Æ¤¤¤ë
-    ¤È¤­¤Ë¡¢¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤òÄ̤µ¤Ê¤¤¤Ç¥¢¥¯¥»¥¹¤¹¤ë¤³¤È¤òËɤ°¤¿¤á¤Ë
-    ½ÅÍפǤ¹¡£¤³¤ì¤Ë¤è¤ê¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤Î HTTP ¥ê¥À¥¤¥ì¥¯¥È¤¬
-    ¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤È¥Ð¥Ã¥¯¥¨¥ó¥É¤Î´Ö¤Ç°·¤ï¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p>¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÌÀ¼¨¤µ¤ì¤Æ¤¤¤ë HTTP ±þÅú¥Ø¥Ã¥À¤Î¤ß¤¬½ñ¤­´¹¤¨¤é¤ì¤Þ¤¹¡£
-    Apache ¤Ï¾¤Î±þÅú¥Ø¥Ã¥À¤ò½ñ¤­´¹¤¨¤¿¤ê¡¢HTML ¥Ú¡¼¥¸¤ÎÃæ¤Î URL »²¾È¤ò
-    ½ñ¤­´¹¤¨¤¿¤ê¤¹¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£HTML ¤ÎÃæ¤ò¸«¤Æ¡¢URL »²¾È¤ò½ñ¤­´¹¤¨¤ë
-    ¥â¥¸¥å¡¼¥ë¤Ë Nick Kew ¤µ¤ó¤Î <a href="http://apache.webthing.com/mod_proxy_html/">mod_proxy_html</a> ¤¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p><var>path</var> ¤Ï¥í¡¼¥«¥ë²¾Áۥѥ¹¤Î̾Á°¤Ç¤¹¡£<var>url</var> ¤Ï
-    ¥ê¥â¡¼¥È¥µ¡¼¥Ð¤ÎÉôʬ URL ¤Ç¤¹¡£¤³¤ì¤é¤Ï <code class="directive"><a href="#proxypass">ProxyPass</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÈƱÍͤǤ¹¡£</p>
-
-    <p>Î㤨¤Ð¡¢¥í¡¼¥«¥ë¥µ¡¼¥Ð¤Î¥¢¥É¥ì¥¹¤¬ <code>http://example.com/</code>
-    ¤À¤È¤·¤Þ¤¹¡£¤¹¤ë¤È</p>
-
-    <div class="example"><p><code>
-      ProxyPass         /mirror/foo/ http://backend.example.com/<br />
-      ProxyPassReverse  /mirror/foo/ http://backend.example.com/<br />
-      ProxyPassReverseCookieDomain  backend.example.com  public.example.com<br />
-      ProxyPassReverseCookiePath  /  /mirror/foo/
-    </code></p></div>
-
-    <p>¤È¤¤¤¦ÀßÄê¤ò¤¹¤ë¤È¡¢<code>http://example.com/mirror/foo/bar</code>
-    ¤Ø¤Î¥í¡¼¥«¥ë¥ê¥¯¥¨¥¹¥È¤¬ <code>http://backend.example.com/bar</code>
-    ¤Ø¤Î¥×¥í¥­¥·¥ê¥¯¥¨¥¹¥È¤ËÆâÉô¤Ç¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤ë¤À¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó
-    (¤³¤ì¤Ï <code>ProxyPass</code> ¤Îµ¡Ç½¤Ç¤¹)¡£<code>backend.example.com</code>
-    ¤¬Á÷¤ë¥ê¥À¥¤¥ì¥¯¥È¤ÎÌÌÅݤâ¤ß¤Þ¤¹¡£<code>http://backend.example.com/bar</code>
-    ¤¬ <code>http://backend.example.com/quux</code> ¤Ë¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤¿¤È¤­¡¢
-    Apache ¤Ï HTTP ¥ê¥À¥¤¥ì¥¯¥È±þÅú¤ò¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤ëÁ°¤Ë¡¢
-    <code>http://example.com/mirror/foo/quux</code> ¤ËÊѹ¹¤·¤Þ¤¹¡£
-    URL ¤ò¹½À®¤¹¤ë¤Î¤Ë»È¤ï¤ì¤ë¥Û¥¹¥È̾¤Ï <code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code> ¤ÎÀßÄê¤Ë±þ¤¸¤ÆÁªÂò¤µ¤ì¤ë¤³¤È¤Ë
-    Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p><code class="directive">ProxyPassReverse</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    Âбþ¤¹¤ë <code class="directive"><a href="#proxypass">ProxyPass</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤Ï°Í¸¤·¤Ê¤¤¤¿¤á¡¢
-    <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> ¤Î¥×¥í¥­¥·Ä̲ᵡǽ
-    (<code>RewriteRule ...  [P]</code>) ¤ÈÊ»¤»¤Æ»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p><code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤ÎÃæ¤Ç»È¤ï¤ì¤¿¾ì¹ç¤Ï¡¢
-    ºÇ½é¤Î°ú¿ô¤Ï¾Êά¤µ¤ì¡¢¥í¡¼¥«¥ë¥Ç¥£¥ì¥¯¥È¥ê¤Ï <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> ¤«¤é¼èÆÀ¤µ¤ì¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyPassReverseCookieDomain" id="ProxyPassReverseCookieDomain">ProxyPassReverseCookieDomain</a> <a name="proxypassreversecookiedomain" id="proxypassreversecookiedomain">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¥µ¡¼¥Ð¤«¤é¤Î Set-Cookie ¥Ø¥Ã¥À¤Î Domain ʸ»úÎó¤ò
-Ä´À°¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProxyPassReverseCookieDomain <var>internal-domain</var> <var>public-domain</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-</table>
-<p>»ÈÍÑË¡¤Ï´ðËÜŪ¤Ë
-<code class="directive"><a href="#proxypassreverse">ProxyPassReverse</a></code> ¤ÈƱ¤¸¤Ç¤¹¤¬¡¢
-¥Ø¥Ã¥À¤Î URL ¤ÎÂå¤ï¤ê¤Ë <code>Set-Cookie</code> ¥Ø¥Ã¥À¤Î
-<code>domain</code> ʸ»úÎó¤ò½ñ¤­´¹¤¨¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyPassReverseCookiePath" id="ProxyPassReverseCookiePath">ProxyPassReverseCookiePath</a> <a name="proxypassreversecookiepath" id="proxypassreversecookiepath">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>Reverse ¥×¥í¥­¥·¥µ¡¼¥Ð¤«¤é¤Î Set-Cookie ¥Ø¥Ã¥À¤Î Path ʸ»úÎó¤ò
-Ä´À°¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProxyPassReverseCookiePath <var>internal-path</var> <var>public-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-</table>
-<p>»ÈÍÑË¡¤Ï´ðËÜŪ¤Ë
-<code class="directive"><a href="#proxypassreverse">ProxyPassReverse</a></code> ¤ÈƱ¤¸¤Ç¤¹¤¬¡¢
-¥Ø¥Ã¥À¤Î URL ¤ÎÂå¤ï¤ê¤Ë <code>Set-Cookie</code> ¥Ø¥Ã¥À¤Î
-<code>path</code> ʸ»úÎó¤ò½ñ¤­´¹¤¨¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyPreserveHost" id="ProxyPreserveHost">ProxyPreserveHost</a> <a name="proxypreservehost" id="proxypreservehost">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥×¥í¥­¥·¥ê¥¯¥¨¥¹¥È¤Ë¡¢¼õ¤±ÉÕ¤±¤¿ Host HTTP ¥Ø¥Ã¥À¤ò»È¤¦</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProxyPreserveHost On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ProxyPreserveHost Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0.31 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p>¤³¤Î¥ª¥×¥·¥ç¥ó¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¾ì¹ç¡¢<code class="directive">ProxyPass</code>
-    ¤Ç»ØÄꤷ¤¿¥Û¥¹¥È̾¤ÎÂå¤ï¤ê¤Ë¡¢¼õ¤±ÉÕ¤±¤¿¥ê¥¯¥¨¥¹¥È¤Î Host: ¹Ô¤ò
-    ¥×¥í¥­¥·Àè¤Î¥Û¥¹¥È¤ËÁ÷¤ê¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¥ª¥×¥·¥ç¥ó¤ÏÄ̾ï¤Ï <code>Off</code> ¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
-    ¤Û¤È¤ó¤É¤Î¾ì¹ç¡¢¤³¤ì¤ÏÂçÎ̤Î̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥Æ¥£¥ó¥°¤ò¹Ô¤Ê¤Ã¤Æ¤¤¤Æ¡¢
-    ¸µ¡¹¤Î Host ¥Ø¥Ã¥À¤ò¥Ð¥Ã¥¯¥¨¥ó¥É¥µ¡¼¥Ð¤¬²ò¼á¤¹¤ëɬÍפΤ¢¤ë¤È¤­¤Î¤è¤¦¤Ê¡¢
-    ÆÃÊ̤ÊÀßÄ꤬ɬÍפʾì¹ç¤Ë¤Î¤ßÍ­ÍѤǤ¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyReceiveBufferSize" id="ProxyReceiveBufferSize">ProxyReceiveBufferSize</a> <a name="proxyreceivebuffersize" id="proxyreceivebuffersize">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥×¥í¥­¥·¤µ¤ì¤ë HTTP ¤È FTP Àܳ¤Î¤¿¤á¤Î¥Í¥Ã¥È¥ï¡¼¥¯¥Ð¥Ã¥Õ¥¡¥µ¥¤¥º</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProxyReceiveBufferSize <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ProxyReceiveBufferSize 0</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-</table>
-    <p><code class="directive">ProxyReceiveBufferSize</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¥¹¥ë¡¼¥×¥Ã¥È¤ò¾å¤²¤ë¤¿¤á¤ËÌÀ¼¨Åª¤Ë (TCP/IP) ¥Í¥Ã¥È¥ï¡¼¥¯¥Ð¥Ã¥Õ¥¡¤Î¥µ¥¤¥º¤ò
-    ÀßÄꤷ¤Þ¤¹¡£ÃÍ¤Ï <code>512</code> °Ê¾å¤«¡¢¥·¥¹¥Æ¥à¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥Ð¥Ã¥Õ¥¡
-    ¥µ¥¤¥º¤ò°ÕÌ£¤¹¤ë <code>0</code> ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      ProxyReceiveBufferSize 2048
-    </code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyRemote" id="ProxyRemote">ProxyRemote</a> <a name="proxyremote" id="proxyremote">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ÆÃÄê¤Î¥ê¥¯¥¨¥¹¥È¤ò°·¤¦»þ¤Ë»È¤ï¤ì¤ë¥ê¥â¡¼¥È¥×¥í¥­¥·¤ò»ØÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProxyRemote <var>match</var> <var>remote-server</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤³¤Î¥×¥í¥­¥·¤ËÂФ¹¤ë¥ê¥â¡¼¥È¥×¥í¥­¥·¤òÄêµÁ¤·¤Þ¤¹¡£
-    <var>match</var> ¤Ï¥ê¥â¡¼¥È¥µ¡¼¥Ð¤¬¥µ¥Ý¡¼¥È¤¹¤ë URL ¥¹¥­¡¼¥à¡¢
-    ¥ê¥â¡¼¥È¥µ¡¼¥Ð¤¬»È¤¦¤Ï¤º¤Î URL ¤Î°ìÉôʬ¡¢¥µ¡¼¥Ð¤¬¤¹¤Ù¤Æ¤Î
-    ¥ê¥¯¥¨¥¹¥È¤Ë»È¤ï¤ì¤ë¤³¤È¤ò¼¨¤¹ <code>*</code> ¤Î¤É¤ì¤«¤Ë¤Ê¤ê¤Þ¤¹¡£
-    <var>remote-server</var> ¤Ï¥ê¥â¡¼¥È¥µ¡¼¥Ð¤ÎÉôʬ URL ¤Ç¤¹¡£¹½Ê¸:</p>
-
-    <div class="example"><p><code>
-      <dfn>remote-server</dfn> =
-          <var>scheme</var>://<var>hostname</var>[:<var>port</var>]
-    </code></p></div>
-
-    <p><var>scheme</var> ¤Ï¼ÂºÝ¾å¥ê¥â¡¼¥È¥µ¡¼¥Ð¤È¤ÎÄÌ¿®¤Ë»È¤ï¤ì¤ë¥×¥í¥È¥³¥ë¤ò
-    ·èÄꤷ¤Þ¤¹¡£¤³¤Î¥â¥¸¥å¡¼¥ë¤Ç¤Ï <code>http</code> ¤À¤±¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ
-    ¤¤¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      ProxyRemote http://goodguys.com/ http://mirrorguys.com:8000<br />
-      ProxyRemote * http://cleversite.com<br />
-      ProxyRemote ftp http://ftpproxy.mydomain.com:8080
-    </code></p></div>
-
-    <p>¤³¤ÎÎã¤Ç¤Ï¡¢¥×¥í¥­¥·¤Ï FTP ¥ê¥¯¥¨¥¹¥È¤òÊ̤ΠHTTP ¥ê¥¯¥¨¥¹¥È¤ÇÊñ¤ó¤Ç
-    ¤½¤Î¤è¤¦¤Ê¥ê¥¯¥¨¥¹¥È¤ò°·¤¨¤ëÊÌ¤Î¥×¥í¥­¥·¤ËžÁ÷¤·¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤ÎÀßÄê¤â¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£
-    ¥µ¡¼¥Ð¤¬Ê̤Υե©¥ï¡¼¥É¥×¥í¥­¥·¤Î¸å¤í¤Ë±£¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ç¤â
-    ¥Ð¥Ã¥¯¥¨¥ó¥É¥¦¥§¥Ö¥µ¡¼¥Ð¤ò¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î URL ¶õ´Ö¤ËÆþ¤ì¤ë¤³¤È¤¬
-    ¤Ç¤­¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyRemoteMatch" id="ProxyRemoteMatch">ProxyRemoteMatch</a> <a name="proxyremotematch" id="proxyremotematch">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>Àµµ¬É½¸½¤Ç¤Î¥Þ¥Ã¥Á¤Ë¤è¤ë¥ê¥¯¥¨¥¹¥È¤ò°·¤¦¥ê¥â¡¼¥È¥×¥í¥­¥·¤Î»ØÄê</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProxyRemoteMatch <var>regex</var> <var>remote-server</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-</table>
-    <p><code class="directive">ProxyRemoteMatch</code> ¤ÏºÇ½é¤Î°ú¿ô¤¬¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿
-    URL ¤Ë¥Þ¥Ã¥Á¤¹¤ëÀµµ¬É½¸½¤Ç¤¢¤ë¤³¤È¤ò½ü¤±¤Ð <code class="directive"><a href="#proxyremote">ProxyRemote</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÈƱ¤¸¤Ç¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyRequests" id="ProxyRequests">ProxyRequests</a> <a name="proxyrequests" id="proxyrequests">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Õ¥©¥ï¡¼¥É (ɸ½à¤Î) ¥×¥í¥­¥·¥ê¥¯¥¨¥¹¥È¤òÍ­¸ú¤Ë¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProxyRequests On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ProxyRequests Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-</table>
-    <p>¤³¤ì¤Ï Apache ¤Î¥Õ¥©¥ï¡¼¥É¥×¥í¥­¥·¥µ¡¼¥Ð¤È¤·¤Æ¤ÎÆ°ºî¤ò
-    Í­¸ú¤â¤·¤¯¤Ï̵¸ú¤Ë¤·¤Þ¤¹¡£(ProxyRequests ¤ò <code>Off</code> ¤Ë
-    ÀßÄꤷ¤Æ¤â¡¢<code class="directive"><a href="#proxypass">ProxyPass</a></code> 
-    ¤ÎÀßÄê¤Ï̵¸ú¤Ë¤Ê¤ê¤Þ¤»¤ó¡£)</p>
-
-    <p>Ä̾ï¤Î¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤ÎÀßÄê¤Ç¤Ï¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï <code>Off</code>
-    ¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>HTTP ¤ä FTP ¥µ¥¤¥È¤Ø¤Î¥×¥í¥­¥·¤Îµ¡Ç½¤òÍ­¸ú¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢
-    <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> ¤ä <code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code> ¤¬
-    ¥µ¡¼¥Ð¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-
-    <div class="warning"><h3>·Ù¹ð</h3>
-      <p><a href="#access">¥µ¡¼¥Ð¤ò°ÂÁ´¤Ë¤¹¤ë</a>¤Þ¤Ç <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> ¤ÏÍ­¸ú¤Ë¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-      ¥ª¡¼¥×¥ó¥×¥í¥­¥·¥µ¡¼¥Ð¤Ï¤¢¤Ê¤¿¼«¿È¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤Ë¤È¤Ã¤Æ¤â¡¢
-      ¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÁ´ÂΤˤȤäƤâ´í¸±¤Ç¤¹¡£</p>
-    </div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyTimeout" id="ProxyTimeout">ProxyTimeout</a> <a name="proxytimeout" id="proxytimeout">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥×¥í¥­¥·¤µ¤ì¤¿¥ê¥¯¥¨¥¹¥È¤Î¥Í¥Ã¥È¥ï¡¼¥¯¥¿¥¤¥à¥¢¥¦¥È</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProxyTimeout <var>seconds</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ProxyTimeout 300</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0.31 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥æ¡¼¥¶¤¬¥×¥í¥­¥·¥ê¥¯¥¨¥¹¥È¤Î¥¿¥¤¥à¥¢¥¦¥È¤ò
-    »ØÄê¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£¤³¤ì¤Ï¥Ï¥ó¥°¤·¤Æ¤·¤Þ¤¦ÃÙ¤¤¡¢¤â¤·¤¯¤ÏµóÆ°¤Î
-    ²ø¤·¤¤¥µ¡¼¥Ð¤¬¤¢¤ê¡¢¥µ¡¼¥Ð¤¬¥Ç¡¼¥¿¤òÊÖ¤¹¤Þ¤Ç¤Ò¤¿¤¹¤éÂÔ¤Á³¤±¤ë¤è¤ê¤â
-    ¥¿¥¤¥à¥¢¥¦¥È¤òÊÖ¤·¤Æ¤è¤ê´Ë¤ä¤«¤Ë<span class="transnote">(<em>ÌõÃí:</em> graceful ¤Ë)</span>
-    ¼ºÇÔ¤µ¤»¤¿¤¤¾ì¹ç¤ËÌò¤ËΩ¤Á¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ProxyVia" id="ProxyVia">ProxyVia</a> <a name="proxyvia" id="proxyvia">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥×¥í¥­¥·¤µ¤ì¤¿¥ê¥¯¥¨¥¹¥È¤Î <code>Via</code> HTTP ±þÅú¥Ø¥Ã¥À
-¤Ë¤è¤êÄ󶡤µ¤ì¤ë¾ðÊó</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ProxyVia On|Off|Full|Block</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ProxyVia Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_proxy</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥×¥í¥­¥·¤Î <code>Via:</code> HTTP ¥Ø¥Ã¥À¤Î»ÈÍѤò
-    À©¸æ¤·¤Þ¤¹¡£ÁÛÄꤵ¤ì¤Æ¤¤¤ë»È¤¤Êý¤Ï¡¢¥×¥í¥­¥·¥µ¡¼¥Ð¤¬¤¤¤¯¤Ä¤â·Ò¤¬¤Ã¤Æ¤¤¤ë¤È¤­¤Ë
-    ¥×¥í¥­¥·¥ê¥¯¥¨¥¹¥È¤Îή¤ì¤òÀ©¸æ¤¹¤ë¤³¤È¤Ç¤¹¡£<code>Via:</code> ¥Ø¥Ã¥À¹Ô¤Î
-    ÀâÌÀ¤Ï <a href="http://www.ietf.org/rfc/rfc2616.txt">RFC 2616</a> (HTTP/1.1)
-    ¤Î 14.45 Àá¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£</p>
-
-    <ul>
-    <li>¥Ç¥Õ¥©¥ë¥È¤Î <code>Off</code> ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¤È¡¢ÆÃÊ̤ʽèÍý¤Ï
-    ¹Ô¤Ê¤ï¤ì¤Þ¤»¤ó¡£¥ê¥¯¥¨¥¹¥È¤ä¥ê¥×¥é¥¤¤Ë <code>Via:</code> ¥Ø¥Ã¥À¤¬¤¢¤ì¤Ð¡¢
-    Êѹ¹¤µ¤ì¤º¤Ë¤½¤Î¤Þ¤ÞÅϤ·¤Þ¤¹¡£</li>
-
-    <li><code>On</code> ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢³Æ¥ê¥¯¥¨¥¹¥È¤È¥ê¥×¥é¥¤¤Ë
-    <code>Via:</code> ¹Ô¤¬Äɲ䵤ì¤Þ¤¹¡£</li>
-
-    <li><code>Full</code> ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢<code>Via:</code> ¥Ø¥Ã¥À¤Ï
-    ¥³¥á¥ó¥ÈÉôʬ¤Ë Apache ¥µ¡¼¥Ð¤Î¥Ð¡¼¥¸¥ç¥ó¤â´Þ¤à¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</li>
-
-    <li><code>Block</code> ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢¤¹¤Ù¤Æ¤Î¥×¥í¥­¥·¥ê¥¯¥¨¥¹¥È¤«¤é
-    <code>Via:</code> ¥Ø¥Ã¥À¤¬¼è¤ê½ü¤«¤ì¤Þ¤¹¡£¿·¤¿¤Ë <code>Via:</code> ¤¬
-    À¸À®¤µ¤ì¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£</li>
-    </ul>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_proxy.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_proxy.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy.html.ja.utf8 b/docs/manual/mod/mod_proxy.html.ja.utf8
new file mode 100644
index 00000000..add89ba2
--- /dev/null
+++ b/docs/manual/mod/mod_proxy.html.ja.utf8
@@ -0,0 +1,1131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_proxy - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_proxy</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_proxy.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_proxy.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>HTTP/1.1 プロキシ/ゲートウェイサー�</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>proxy_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_proxy.c</td></tr></table>
+<h3>概�</h3>
+
+    <div class="warning"><h3>警告</h3>
+      <p><a href="#access">サー�を安全��る</a>�� <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> �有効���������。
+      オープンプロキシサー�����自身��ットワーク����も�
+      インター�ット全体����も�険��。</p>
+    </div>
+
+    <p>��モジュール� Apache �プロキシ/ゲートウェイ機能を実装�����。
+    <code>AJP13</code> (Apache JServe Protocol version 1.3),
+    <code>FTP</code>, <code>CONNECT</code> (SSL 用),
+    <code>HTTP/0.9</code>, <code>HTTP/1.0</code>, <code>HTTP/1.1</code>
+    �プロキシ機能を実装�����。�れら�プロトコルや��他�プロトコル用�
+    プロキシ機能を����他�モジュール�接続�るよ��も設定����。</p>
+
+    <p>Apache �プロキシ機能� <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> �他��
+    �����モジュール�分割�れ����:
+    <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>, <code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code>,
+    <code class="module"><a href="../mod/mod_proxy_ajp.html">mod_proxy_ajp</a></code>, <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code>, 
+    <code class="module"><a href="../mod/mod_proxy_connect.html">mod_proxy_connect</a></code> ��。���ら�
+    特定�プロキシ�機能を使���場���<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> <em>�</em>
+    該当�るモジュールをサー�� (コンパイル時��的�行���
+    <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code> �動的�読�込む���) 
+    組�込む必���り��。</p>
+
+    <p>�れ�加���他�モジュール�よ��拡張機能��供�れ����。
+    キャッシュ� <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> �関連モジュール�
+    �供�れ����。SSL/TLS ��隔サー��接続�る機能�
+    <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> � <code>SSLProxy*</code> ディレクティブ�
+    �供�れ����。�れら�機能を利用�る�����該当�るモジュールを
+    組�込ん�設定���れ��り��ん。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#allowconnect">AllowCONNECT</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#noproxy">NoProxy</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxy">&lt;Proxy&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxybadheader">ProxyBadHeader</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxyblock">ProxyBlock</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxydomain">ProxyDomain</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxyerroroverride">ProxyErrorOverride</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxyiobuffersize">ProxyIOBufferSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxymatch">&lt;ProxyMatch&gt;</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxymaxforwards">ProxyMaxForwards</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxypass">ProxyPass</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxypassreverse">ProxyPassReverse</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxypassreversecookiedomain">ProxyPassReverseCookieDomain</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxypassreversecookiepath">ProxyPassReverseCookiePath</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxypreservehost">ProxyPreserveHost</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxyreceivebuffersize">ProxyReceiveBufferSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxyremote">ProxyRemote</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxyremotematch">ProxyRemoteMatch</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxyrequests">ProxyRequests</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxytimeout">ProxyTimeout</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxyvia">ProxyVia</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#forwardreverse">フォワードプロキシ�リ�ースプロキシ</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#examples">基本�例</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#access">プロキシ��アクセス制御</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#startup">��起動</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#intranet">イントラ�ットプロキシ</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#envsettings">プロトコル�調整</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#request-bodies">リクエストボディ</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code></li>
+<li><code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code></li>
+<li><code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code></li>
+<li><code class="module"><a href="../mod/mod_proxy_connect.html">mod_proxy_connect</a></code></li>
+<li><code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></li>
+<li><code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="forwardreverse" id="forwardreverse">フォワードプロキシ�リ�ースプロキシ</a></h2>
+      <p>Apache �<dfn>フォワード</dfn>プロキシ���も�
+      <dfn>リ�ース</dfn>プロキシ���も設定�る�������。</p>
+
+      <p>通常�<dfn>フォワードプロキシ</dfn>�クライアント�
+      <em>オリジンサー�</em> <span class="transnote">(<em>訳注:</em> コンテンツ生�元�サー�)</span>
+      �間��置�る中間サー���。
+      オリジンサー��らコンテンツを�得�る�程���クライアント�
+      行�先���オリジンサー�を指定���プロキシ�リクエストを�り�
+      プロキシ�オリジンサー��らコンテンツ�得�リクエストを�り�
+      コンテンツ��得��れ��れをクライアント�返���。
+      クライアント�他�サイト�フォワードプロクシ経由�アクセス�る���
+      特別��れ用�設定を���れ��り��ん。</p>
+
+      <p>フォワードプロキシ�一般的�使用方法��ファイアウォール�よ��
+      制��れ��る内部�クライアント�インター�ット��アクセスを
+      �供�るも���。フォワードプロキシ��ットワーク�使用�を
+      減ら���� (<code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> ��供�れ��る) 
+      キャッシュ機能を用�る��も����。</p>
+
+      <p>フォワードプロキシ� <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> ディレクティブ�
+      有効��り��。フォワードプロキシ���クライアント�本当�身元を
+      隠��任��サイト�アクセス��るよ���る���フォワードプロキシを
+      有効��る���承��れ�クライアント���プロキシ�アクセス��るよ��
+      <a href="#access">サー�を安全��る</a>�������。</p>
+
+      <p>一方<dfn>リ�ースプロキシ</dfn>��クライアント��普通�
+      ウェブサー��よ��見���。クライアント��特別�設定�必��り��ん。
+      クライアント�リ�ースプロキシ���空間�対��通常�コンテンツ��
+      リクエストを行����。プロキシ�リクエストを����れ�良��を判定��
+      ���も自分自身�オリジンサー�������よ��クライアント�
+      コンテンツを返���。</p>
+
+      <p>リ�ースプロキシ�よ��る利用方法��インター�ットユーザ�
+      ファイアウォール�中��るサー��アクセスを与�る���も���。
+      リ�ースプロキシ�複数��ックエンドサー��負�分散を�る���
+      使��り����ックエンドエンドサー�����キャッシュ機能を�供��り
+      �る���使���。���リ�ースプロキシ�複数�サー�を
+      �� URL 空間����る���使���も����。</p>
+
+      <p>リ�ースプロキシ� <code class="directive"><a href="#proxypass">ProxyPass</a></code> ディレクティブや
+      <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> ディレクティブ�
+      <code>[P]</code> フラグを使����有効��り��。リ�ースプロキシ�
+      設定���� <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> を設定�る必��
+      <em>�り��ん</em>。</p>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="examples" id="examples">基本�例</a></h2>
+
+    <p>以下�例�手始��簡��例��。個々�ディレクティブ��味�
+    �れ�れ�説明を�読�����。</p>
+
+    <p>��キャッシュ機能を有効����場���<code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> 
+    �説明を読ん�����。</p>
+
+    <div class="example"><h3>フォワードプロキシ</h3><p><code>
+    ProxyRequests On<br />
+    ProxyVia On<br />
+    <br />
+    &lt;Proxy *&gt;<br />
+    <span class="indent">
+      Order deny,allow<br />
+      Deny from all<br />
+      Allow from internal.example.com<br />
+    </span>
+    &lt;/Proxy&gt;
+    </code></p></div>
+
+    <div class="example"><h3>リ�ースプロキシ</h3><p><code>
+    ProxyRequests Off<br />
+    <br />
+    &lt;Proxy *&gt;<br />
+    <span class="indent">
+      Order deny,allow<br />
+      Allow from all<br />
+    </span>
+    &lt;/Proxy&gt;<br />
+    <br />
+    ProxyPass /foo http://foo.example.com/bar<br />
+    ProxyPassReverse /foo http://foo.example.com/bar
+    </code></p></div>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="access" id="access">プロキシ��アクセス制御</a></h2>
+      <p>プロキシ�アクセス�以下�よ�� <code class="directive"><a href="#proxy">&lt;Proxy&gt;</a></code> コンテナ�中�
+      ディレクティブを書����制御����:</p>
+
+      <div class="example"><p><code>
+        &lt;Proxy *&gt;<br />
+        <span class="indent">
+          Order Deny,Allow<br />
+          Deny from all<br />
+          Allow from 192.168.0<br />
+        </span>
+        &lt;/Proxy&gt;
+      </code></p></div>
+
+      <p>アクセス制御����ディレクティブ�より詳��情報�
+      <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code> を�読�����。</p>
+
+      <p>(<code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> ディレクティブを
+      使��) フォワードプロキシを設定���る場���厳��アクセス
+      制�を行������常�大切��。�������任��クライアント�
+      身元を明������任��ホスト�アクセス�る���サー�を使����
+      ��������。�れ����自身��ットワーク����も�インター�ット
+      全体����も�険�����。(<code>ProxyRequests Off</code> ���
+      <code class="directive"><a href="#proxypass">ProxyPass</a></code> ディレクティブを使��)
+      リ�ースプロキシを使���る場����クライアント�����明示的�
+      設定��ホスト���アクセス�������フォワードプロキシ���
+      ��アクセス制御�力を注����も大丈夫��。</p>
+
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="startup" id="startup">��起動</a></h2>
+      <p><code class="directive"><a href="#proxyblock">ProxyBlock</a></code> ディレクティブを使���る場��
+      後�テスト����起動時�ホスト�
+      IP アドレス�調�られ�キャッシュ�れ��。ホスト��ルックアップ�
+      速��よ����数秒 (��れ以上) ��る�も�れ��ん。</p>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="intranet" id="intranet">イントラ�ットプロキシ</a></h2>
+      <p>イントラ�ット��る Apache プロキシサー��外部��リクエストを
+      会社�ファイアウォールを通���ら��れ��り��ん。(������
+      個々� <var>scheme</var> �����れ�れ�ファイアウォール�
+      プロキシ�フォワード�れるよ��
+      <code class="directive"><a href="#proxyremote">ProxyRemote</a></code> ディレクティブを
+      設定������)。���イントラ�ット内�リソース�アクセス�る����
+      ファイアウォールを通����もアクセス����。
+      ��ホスト�イントラ�ット�属��直接アクセス����を指定�る���
+      <code class="directive"><a href="#noproxy">NoProxy</a></code> ディレクティブ�
+      役�立���。</p>
+
+      <p>イントラ�ット内�ユーザ� WWW �リクエスト�ローカルドメインを
+      �略�る���よ��り��。<code>http://somehost.example.com/</code> 
+      ���リクエスト�代�り� "http://somehost/" をリクエスト��り���。
+      ��よ��リクエストを��付��サー��設定�れ��るローカルドメイン�
+      暗黙����使�れ��る�解釈����純�リクエストを処��るも�も
+      商用プロキシサー��中���り��。
+      サー�� <a href="#proxyrequests">プロキシ�サービス用�設定�れ���</a>
+      <code class="directive"><a href="#proxydomain">ProxyDomain</a></code> ディレクティブ�
+      使用�れ�場����Apache �クライアント�リダイレクト応答を����
+      正���完全� (<span class="transnote">(<em>訳注:</em> fully qualified)</span>) 
+      サー��アドレス��る�������。��よ��
+      リダイレクト�る��ユーザ�ブックマーク�正��完全�ホスト�を�む
+      ���も�る���より好���方法�言�る��ょ�。</p>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="envsettings" id="envsettings">プロトコル�調整</a></h2>
+      <p>Keepalive や HTTP/1.1 を�切�実装�����アプリケーションサー��対��
+      <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> �リクエストを�信�る場��
+      HTTP/1.0 を使�� keepalive を無����リクエストを�るよ���る
+      環境変数�二��り��。�れら� <code class="directive"><a href="../mod/mod_env.html#setenv">SetEnv</a></code> ディレクティブ�設定���。</p>
+
+      <p><code>force-proxy-request-1.0</code> � <code>proxy-nokeepalive</code>
+      ���環境変数��。</p>
+
+      <div class="example"><p><code>
+        &lt;Location /buggyappserver/&gt;<br />
+        <span class="indent">
+          ProxyPass http://buggyappserver:7001/foo/<br />
+          SetEnv force-proxy-request-1.0 1<br />
+          SetEnv proxy-nokeepalive 1<br />
+        </span>
+        &lt;/Location&gt;
+      </code></p></div>
+
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="request-bodies" id="request-bodies">リクエストボディ</a></h2>
+
+    <p>POST メソッド���リクエスト���リクエストボディ��り��。
+    HTTP プロトコル仕様�よる��ボディ��るリクエスト� chunked 
+    転�を使���<code>Content-Length</code>
+    ヘッダを�信���れ��り��ん。
+    ��よ��リクエストをオリジンサー���信�る場��
+    <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> �常� <code>Content-Length</code>
+    を����試���。���。ボディ�大���オリジナル�リクエスト�
+    chunked 転��使�れ��る場��上���リクエスト�
+    chunked 転�も使�れ��。
+    ��挙動� <a href="../env.html">環境変数</a>�制御����。
+    <code>proxy-sendcl</code> を設定�る���能��り常� 
+    <code>Content-Length</code> を付与���
+    上�サー���信�るよ���り��。
+    逆� <code>proxy-sendchunked</code> を設定�る��リソース消費を抑��
+    chnked エンコードを使���信�るよ���り��。</p>
+
+    </div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AllowCONNECT" id="AllowCONNECT">AllowCONNECT</a> <a name="allowconnect" id="allowconnect">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>プロキシを経由������ート� <code>CONNECT</code>
+��る�を指定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AllowCONNECT <var>port</var> [<var>port</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>AllowCONNECT 443 563</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+</table>
+    <p><code class="directive">AllowCONNECT</code> �プロキシ� <code>CONNECT</code>
+    メソッド�接続を許��る�ート番��リストを指定���。
+    今日�ブラウザ��<code>https</code> コ�クション��求�れ����
+    HTTP 上��プロキシ�よるトン�リング���る����
+    ��メソッドを使���。</p>
+
+    <p>デフォルト�設定���https �デフォルト�ート (<code>443</code>) �
+    デフォルト� snews �ート (<code>563</code>) �有効�������。
+    ��デフォルトを上書����リスト�記載���ート���接続を許����場��
+    <code class="directive">AllowCONNECT</code> ディレクティブを使用���。</p>
+
+    <p><code>CONNECT</code> を使用�る���<code class="module"><a href="../mod/mod_proxy_connect.html">mod_proxy_connect</a></code> 
+    �サー��組�込�れ����れ��ら�����注�������。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="NoProxy" id="NoProxy">NoProxy</a> <a name="noproxy" id="noproxy">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>直接接続�る ホスト�ドメイン��ットワーク</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>NoProxy <var>host</var> [<var>host</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+</table>
+    <p>��ディレクティブ�イントラ�ット中� Apache プロキシサー����
+    有用��。<code class="directive">NoProxy</code> ディレクティブ�空白区切り��
+    サブ�ット�IP アドレス�ホスト�ドメイン�リストを指定���。
+    �れら��れ��マッ��るホスト��リクエスト� <code class="directive"><a href="#proxyremote">ProxyRemote</a></code> �設定�れ�プロキシサー��
+    フォワード�れ��直接処��れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      ProxyRemote  *  http://firewall.mycompany.com:81<br />
+      NoProxy         .mycompany.com 192.168.112.0/21
+    </code></p></div>
+
+    <p><code class="directive">NoProxy</code> ディレクティブ� <var>host</var> 引数�
+    以下�種類��れ���:</p>
+
+    <dl>
+    
+    <dt><var><a name="domain" id="domain">Domain</a></var></dt>
+    <dd>
+    <p><dfn>Domain</dfn> �先頭�ピリオド����部分 DNS ドメイン���。
+    �一 DNS ドメイン��ゾーン (<em>����</em>�ホスト��末尾����
+    <var>Domain</var> �終����る�����) �属�るホスト�リストを
+    表���)。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      .com .apache.org.
+    </code></p></div>
+
+    <p><var>Domain</var> を <a href="#hostname">Hostname</a> �区別�る��� (�味的�も構文的�も。DNS ドメインも
+    DNS � A レコードを�������る���!)�<var>Domain</var> �
+    常�ピリオド�始�り��。</p>
+    
+    <div class="note"><h3>注</h3>
+      <p>ドメイン��比較�大文字�文字を区別���行��れ�<var>Domain</var>
+      �常� DNS ツリー�ルート�ら始�るも�����れ��。���ら�
+      次�二��ドメイン <code>.MyDomain.com</code> �
+      <code>.mydomain.com.</code> (最後�ピリオド�注目) ��一��る�
+      ���れ��。ドメイン�比較� DNS ルックアップ���行��れる���
+      サブ�ット�比較よりも���効率的��。</p>
+    </div></dd>
+
+    
+    <dt><var><a name="subnet" id="subnet">SubNet</a></var></dt>
+    <dd>
+    <p><dfn>SubNet</dfn> �数値形� (ドット�区切られ�四��数字) �
+    部分インター�ットアドレス��。後�スラッシュ� <var>Subnet</var>
+    ��味��るビット数を指定�る�ットマスク�を続�る�������。
+    共通��ットワークインタフェースを使��到��る�����るサブ�ットを
+    表����使�れ��。明示的��ットマスクを指定���場��
+    最後��略�れ� (も���値� 0 �) 数字�マスクを指定���。
+    (��場����ットマスク� 8 ビット�����指定����ん。)
+    例:</p>
+
+    <dl>
+    <dt><code>192.168</code> も��� <code>192.168.0.0</code></dt>
+    <dd>サブ�ット 192.168.0.0 �暗黙� 16 ビット有効��ットマスク
+    (<code>255.255.0.0</code> ����ットマスク�形��使�れる��も
+    �り��)</dd>
+    <dt><code>192.168.112.0/21</code></dt>
+    <dd>サブ�ット<code>192.168.112.0/21</code> � 21 ビット有効�
+    �ットマスク (<code>255.255.248.0</code> ���形��使�れる��も
+    �り��)</dd>
+    </dl>
+
+    <p>特別�場���32 ビット有効� <em>SubNet</em> �
+    <var><a href="#ipadr">IPAddr</a></var> ��等��
+    0 ビット有効� <var>SubNet</var> (<em>例��</em>�0.0.0.0/0) �
+    ���� IP アドレス�マッ��る定数 <var>_Default_</var> �����。</p>
+    </dd>
+
+    
+    <dt><var><a name="ipaddr" id="ipaddr">IPAddr</a></var></dt>
+    <dd>
+    <p><dfn>IPAddr</dfn> �数値形� (ドット�区切られ�四��数字) �
+    完全インター�ットアドレス��。通常���アドレス�ホストを
+    表�����必��もアドレス�対応�る DNS ドメイン���る����
+    �り��ん。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      192.168.123.7
+    </code></p></div>
+    
+    <div class="note"><h3>注</h3>
+      <p><var>IPAddr</var> � DNS システム�より解決�れる必�������
+      apache �性能��上�る�も�れ��ん。</p>
+    </div></dd>
+
+    
+    <dt><var><a name="hostname" id="hostname">Hostname</a></var></dt>
+    <dd>
+    <p><dfn>Hostname</dfn> � DNS ドメインサービス�より一�も���
+    複数� <var><a href="#ipaddr">IPAddr</a></var> �解決�能�
+    完全� DNS ドメイン���。�れ� (<var><a href="#domain">Domain</a></var>
+    �����説明�上記を�照) 論�的�ホストを表��少��も一��
+    <var><a href="#ipaddr">IPAddr</a></var> (も�����
+    <var><a href="#ipaddr">IPAddr</a></var> �ホスト�リスト) �解決
+    �れ��れ��り��ん)。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      prep.ai.mit.edu<br />
+      www.apache.org
+    </code></p></div>
+
+    <div class="note"><h3>注</h3>
+      <p>多��場��<var>Hostname</var> �代�り� <var><a href="#ipaddr">IPAddr</a></var> を指定��方��DNS ルックアップを
+      ��る�����る���効率�良��り��。Apache ���解決�
+      �ームサー���接続��� PPP 上�場������り時間を�られる
+      ����り��。</p>
+      <p><var>Hostname</var> �比較�大文字�文字を区別���行��れ�
+      <var>Hostname</var> �常� DNS ツリー�ルート�ら始�るも�����れ��。
+      ���ら�二��ドメイン <code>WWW.MyDomain.com</code> �
+      <code>www.mydomain.com.</code> (最後�ピリオド�注目) ��一��る�
+      ���れ��。</p>
+     </div></dd>
+    </dl>
+
+<h3>�照</h3>
+<ul>
+<li><a href="../dns-caveats.html">DNS �関�る�題</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Proxy" id="Proxy">&lt;Proxy&gt;</a> <a name="proxy" id="proxy">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>プロキシ�れるリソース��用�れるコンテナ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>&lt;Proxy <var>wildcard-url</var>&gt; ...&lt;/Proxy&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+</table>
+    <p><code class="directive">&lt;Proxy&gt;</code> セクション中�
+    ディレクティブ�マッ��るプロキシ�れるコンテンツ����用�れ��。
+    シェル形��ワイルドカード�使���。</p>
+
+    <p>例���次�設定� <code>yournetwork.example.com</code> �
+    ホスト���プロキシサー�を経由��アクセスを許����:</p>
+
+    <div class="example"><p><code>
+      &lt;Proxy *&gt;<br />
+      <span class="indent">
+        Order Deny,Allow<br />
+        Deny from all<br />
+        Allow from yournetwork.example.com<br />
+      </span>
+      &lt;/Proxy&gt;
+    </code></p></div>
+
+    <p>次�例� <code>example.com</code> � <code>foo</code> ディレクトリ�
+    ����ファイル�対���プロキシサー�を通���られ�����
+    <code>INCLUDES</code> フィルタを通���るよ��設定���:</p>
+
+    <div class="example"><p><code>
+      &lt;Proxy http://example.com/foo/*&gt;<br />
+      <span class="indent">
+        SetOutputFilter INCLUDES<br />
+      </span>
+      &lt;/Proxy&gt;
+    </code></p></div>
+
+    
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyBadHeader" id="ProxyBadHeader">ProxyBadHeader</a> <a name="proxybadheader" id="proxybadheader">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>応答�����ヘッダ��る場��扱�方を決�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyBadHeader IsError|Ignore|StartBody</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ProxyBadHeader IsError</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.0.44 以�</td></tr>
+</table>
+    <p><code class="directive">ProxyBadHeader</code> ディレクティブ�構文的�
+    間���ヘッダ (<em>��り</em> コロンを����も�) を��������
+    <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ���振る舞��を決���。以下�引数を
+    �る�������:</p>
+
+    <dl>
+    <dt><code>IsError</code></dt>
+    <dd>リクエストを中止�� 502 (Bad Gateway) 応答を返�。
+    �れ�デフォルト�動作��。</dd>
+
+    <dt><code>Ignore</code></dt>
+    <dd>間���ヘッダ行を�も�も存在�����も����扱�。</dd>
+
+    <dt><code>StartBody</code></dt>
+    <dd>間���ヘッダ行を�����ら�ヘッダ�読�込�を終了���
+    �れ以��残りをボディ���扱�。�れ�ヘッダ�ボディ�間�空行を入れ忘れ�
+    �����るよ�����ん�動作������ックエンドサー���る����
+    �題を回��る��役�立���。</dd>
+    </dl>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyBlock" id="ProxyBlock">ProxyBlock</a> <a name="proxyblock" id="proxyblock">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>プロキシ接続を�止�る語��ホスト��ドメインを指定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyBlock *|<var>word</var>|<var>host</var>|<var>domain</var>
+[<var>word</var>|<var>host</var>|<var>domain</var>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+</table>
+    <p><code class="directive">ProxyBlock</code> ディレクティブ�空白�区切られ�
+    語��ホスト��ドメイン�リストを指定���。サイト����語��ホスト��
+    ドメインを�むサイト�� HTTP�HTTPS�FTP �よるドキュメント�リクエスト�
+    プロキシサー��より<em>ブロック�れ��</em>。プロキシモジュール�
+    起動時�ホスト�����項目� IP アドレスを調��後�テスト����
+    キャッシュ���。�れ�より�サー��起動�少����る�も�れ��ん。</p>
+
+    <div class="example"><h3>Example</h3><p><code>
+      ProxyBlock joes-garage.com some-host.co.uk rocky.wotsamattau.edu
+    </code></p></div>
+
+    <p><code>rocky.wotsamattau.edu</code> � IP アドレス��照�れ����も
+    マッ����。</p>
+
+    <p><code>wotsamattau.edu</code> �マッ��� <code>wotsamattau</code>
+    ���も�分��。</p>
+
+    <div class="example"><p><code>
+      ProxyBlock *
+    </code></p></div>
+
+    <p>�����サイト��接続をブロック�る���注�������。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyDomain" id="ProxyDomain">ProxyDomain</a> <a name="proxydomain" id="proxydomain">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>プロキシ�れ�リクエスト�デフォルト�ドメイン�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyDomain <var>Domain</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+</table>
+    <p>��ディレクティブ�イントラ�ット内� Apache プロキシサー����
+    有用��。<code class="directive">ProxyDomain</code> ディレクティブ�
+    apache プロキシサー��属�るデフォルト�ドメインを指定���。
+    ドメイン��無�リクエストを���場��設定�れ� <var>Domain</var>
+    �追加�れ���ホスト��リダイレクト応答�返�れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      ProxyRemote  *  http://firewall.mycompany.com:81<br />
+      NoProxy         .mycompany.com 192.168.112.0/21<br />
+      ProxyDomain     .mycompany.com
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyErrorOverride" id="ProxyErrorOverride">ProxyErrorOverride</a> <a name="proxyerroroverride" id="proxyerroroverride">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>プロキシ�れ�コンテンツ�エラーページを上書��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyErrorOverride On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ProxyErrorOverride Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>�ージョン 2.0 以��使用�能</td></tr>
+</table>
+    <p>��ディレクティブ�リ�ースプロキシを使用�����
+    エンドユーザ��られるエラーページ�外見を共通�も��������
+    有用��。��ディレクティブ� (<code class="module"><a href="../mod/mod_include.html">mod_include</a></code> � SSI �よ��)
+    インクルード�れ�ファイル�エラーコードを�得���正��動作を
+    �るよ��も��� (デフォルト�動作��プロキシ�れ�サー��
+    エラーページ�表示����ディレクティブを有効��る� SSI �エラー
+    メッセージを表示���)。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyIOBufferSize" id="ProxyIOBufferSize">ProxyIOBufferSize</a> <a name="proxyiobuffersize" id="proxyiobuffersize">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>内部データスループット�ッファ�サイズを決定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyIOBufferSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ProxyIOBufferSize 8192</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+</table>
+    <p><code class="directive">ProxyIOBufferSize</code> ディレクティブ�入力�
+    出力用�一時メモリ���使�れる内部�ッファ�サイズを調整���。
+    サイズ� <code>8192</code> 以下���れ��り��ん。</p>
+
+    <p>��ん�����場����値を変更�る�由��り��ん。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyMatch" id="ProxyMatch">&lt;ProxyMatch&gt;</a> <a name="proxymatch" id="proxymatch">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>正�表���マッ��よるプロキシリソース用�ディレクティブコンテナ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>&lt;ProxyMatch <var>regex</var>&gt; ...&lt;/ProxyMatch&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+</table>
+    <p><code class="directive">&lt;ProxyMatch&gt;</code> � URL �マッ��
+    <a class="glossarylink" href="../glossary.html#regex" title="用語集を�照">正�表�</a> を用�る��を除��
+    <code class="directive">&lt;Proxy&gt;</code> ディレクティブ�����。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyMaxForwards" id="ProxyMaxForwards">ProxyMaxForwards</a> <a name="proxymaxforwards" id="proxymaxforwards">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>リクエスト�フォワード�れるプロキシ�最大数</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyMaxForwards <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ProxyMaxForwards 10</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0 以��使用�能</td></tr>
+</table>
+    <p><code class="directive">ProxyMaxForwards</code> ディレクティブ�
+    リクエスト� <code>Max-Forwards</code> ヘッダ�指定�れ����場��
+    リクエスト�通��能�プロキシ�最大数を設定���。�れ�
+    プロキシ�無�ループや DoS 攻撃を防����設定�れ����。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      ProxyMaxForwards 15
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyPass" id="ProxyPass">ProxyPass</a> <a name="proxypass" id="proxypass">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>リモートサー�をローカルサー�� URL 空間�マップ�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var> <var>key=value</var> ...]]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+</table>
+    <p>��ディレクティブ�リモートサー�をローカルサー����空間�
+    マップ��るよ�����。ローカルサー��通常��味��プロキシ�
+    ���動作���リモートサー��ミラー���振る舞���。
+    <var>path</var> �ローカル�仮想パス�����。<var>url</var> �
+    リモートサー��部分 URL ��り�クエリー文字列を�む�������ん。</p>
+
+    <div class="warning"><code class="directive">ProxyPass</code> ディレクティブを
+    使���る��� <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> ディレクティブ�通常�
+    <strong>off</strong> �設定�れ��る����。</div>
+
+    <p>ローカルサー��アドレス� <code>http://example.com/</code> ��る�
+    ���。�る��</p>
+
+    <div class="example"><p><code>
+      ProxyPass /mirror/foo/ http://backend.example.com/
+    </code></p></div>
+
+    <p>�設定�る� <code>http://example.com/mirror/foo/bar</code> ��
+    リクエスト�内部的� <code>http://backend.example.com/bar</code> ��
+    プロキシリクエスト�変��れる����り��。</p>
+
+    <p>サブディレクトリをリ�ースプロキシ�������� <code>!</code> �
+    役�立���。<em>例��</em>�</p>
+
+    <div class="example"><p><code>
+      ProxyPass /mirror/foo/i !<br />
+      ProxyPass /mirror/foo http://backend.example.com
+    </code></p></div>
+
+    <p>� <code>/mirror/foo/i</code> を<em>除�</em>
+    <code>/mirror/foo</code> ������リクエストを
+    <code>backend.example.com</code> �プロキシ���。</p>
+
+    <div class="note"><h3>注</h3>
+      <p>順番�����。一般的� <code class="directive">ProxyPass</code>
+      ディレクティブ�<em>��</em>
+      除外ディレクティブを置�必���り��。</p>
+    </div>
+
+    <p>2.1 �機能���ックエンドサー���接続�プール�れ�コ�クションを
+    使�るよ���り���。<code>key=value</code> 形��パラメータ�
+    ��コ�クションプーリング�調整�����。<code>Hard Maximum</code> 
+    �デフォルト値��有効�����る MPM ��プロセス当�り�スレッド数�
+    ��数�コ�クション数��。prefork MPM ��通常� 1 ��worker MPM ��
+    <code class="directive">ThreadsPerChild</code> �調整�れ��。</p>
+
+    <p><code>min</code> �設定���ックエンドサー���間�何本�コ�クションを
+    常時開���決�り��。Soft Maximum <code>smax</code> �数�
+    ��る��必��応��コ�クション�生��れ��。<code>smax</code>
+    を超��数�コ�クション��生存時間 <code>ttl</code> �切断�れ��。
+    �ックエンドサー�� Hard Maximum <code>max</code> �数以上�コ�クションを
+    生��る����り��ん。</p>
+
+    <div class="example"><p><code>
+        ProxyPass /example http://backend.example.com smax=5 max=20 ttl=120 retry=300
+    </code></p></div>
+
+    <table>
+    <tr><th>パラメータ</th>
+        <th>デフォルト値</th>
+        <th>説明</th></tr>
+    <tr><td>min</td>
+        <td>0</td>
+        <td>�ックエンドサー���接続�
+            常�開���るコ�クション数�最�値</td></tr>
+    <tr><td>max</td>
+        <td>1...n</td>
+        <td>�ックエンドサー���接続数� Hard Maximum
+        <span class="transnote">(<em>訳注:</em> �ードリミット)</span>。
+        デフォルト値��使用���る MPM �プロセス��り�スレッド数�������。
+        Prefork MPM ��常� 1 ��Worker MPM �� <code class="directive">ThreadsPerChild</code>
+        �調節����。Hard Maximum 以上��ックエンドサー���コ�クションを
+        生��る����り��ん。</td></tr>
+    <tr><td>smax</td>
+        <td>max</td>
+        <td>接続数� Soft Maximum <span class="transnote">(<em>訳注:</em> ソフトリミット)</span>���
+        コ�クション�必��応��生��れ��。
+        <code>smax</code> を超��数�コ�クション�生存時間 <code>ttl</code>
+        �切断�れ��。
+    </td></tr>
+    <tr><td>ttl</td>
+        <td>-</td>
+        <td><code>smax</code> 数を超���活動状態�コ�クション�生存時間を�
+        秒�指定���。��期間内�使用�れ����コ�クション��
+        全�閉�られ��。
+    </td></tr>
+    <tr><td>timeout</td>
+        <td><code class="directive">Timeout</code></td>
+        <td>コ�クションタイムアウトを秒�指定���。特�指定�れ��れ��
+        フリー�コ�クションを�得��る��待���。��ディレクティブ�
+        <code>max</code> パラメータ�����使������ックエンドサー���
+        接続数を制御�る��使���。
+    </td></tr>
+    <tr><td>acquire</td>
+        <td>-</td>
+        <td>設定�る��コ�クションプール�らフリー�コ�クションを�得�る���
+        待機�る待�時間�最大値��り��。フリー�コ�クション�プール�����場���
+        <code>SERVER_BUSY</code> ステータス�クライアント�返�れ��。
+    </td></tr>
+    <tr><td>keepalive</td>
+        <td>Off</td>
+        <td>�ックエンドサー�� Apache �間�ファイアーウォール��る場����
+        ��パラメータを使������。ファイアウォール�往々����
+        �活動状態�コ�クションを��������。
+        ��フラグ� OS �指示���<code>KEEP_ALIVE</code> メッセージを�活動状態�
+        コ�クション�も�るよ����� (間隔� OS �グロー�ル設定��存��
+        通常� 120ms 間隔) 。�れ�よ��ファイアウォール�よ��コ�クション�
+        ���れる��を防���。keepalive を有効��る�����プロパティを
+        <code>On</code> �������。
+    </td></tr>
+    <tr><td>retry</td>
+        <td>60</td>
+        <td>コ�クションをプーリング�る����リトライ�タイムアウトを秒�
+        指定���。�ックエンドサー���コ�クションプーリング�失敗��場���
+        タイムアウト�期間���る�����サー��リクエストをフォワード���ん。
+        ��機能を使����ックエンドサー�をメンテナンス����シャットダウン��
+        後�オンライン�復帰��る�����������。
+    </td></tr>
+    <tr><td>loadfactor</td>
+        <td>1</td>
+        <td>ワーカー��り�負�係数��。BalancerMember �使���。
+        1 �ら 100 ���数字���ワーカー�対�る正�化�れ�負�率を指定���。
+    </td></tr>
+    <tr><td>route</td>
+        <td>-</td>
+        <td>ロード�ランサ�使��場��ワーカー�ルーティングを���。
+        ルート�セッション ID �付加�れ�値��り��。
+    </td></tr>
+    <tr><td>redirect</td>
+        <td>-</td>
+        <td>ワーカー�リダイレクション経路��。��値�通常��
+        安全�クラスタ�らノードを�り去る設定を動的�入れる���使���。
+        セッション ID �無�リクエスト全�を指定��場���
+        ��値���ルーティングパラメータを�� 
+        BalancerMember �リダイレクト�れ��。
+    </td></tr>
+
+    </table>
+
+    <p>Proxy ディレクティブ�スキーム� <code>balancer://</code> �����る場���
+    �ックエンドサー��実際��通信���仮想ワーカー�生��れ��。
+    ��ワーカー�幾��� "本物�" ワーカー�管�を����り��。
+    ��場�パラメータ����仮想ワーカー�対��設定�れ��。
+    </p>
+    <table>
+    <tr><th>パラメータ</th>
+        <th>デフォルト値</th>
+        <th>説明</th></tr>
+    <tr><td>lbmethod</td>
+        <td>-</td>
+        <td>Balancer �ロード�ランス方法。使用�るロード�ランス�
+        スケジューリング方法を����。処���リクエスト�数���付��る
+        <code>byrequests</code> ��転����イト数���付��る
+        <code>bytraffic</code> を設定����。デフォルト�
+        <code>byrequests</code> ��。
+    </td></tr>
+    <tr><td>stickysession</td>
+        <td>-</td>
+        <td>�ランサー�スティッキーセッション���。通常���値� <code>JSESSIONID</code>
+        や <code>PHPSESSIONID</code> ����も���り������値�
+        �ックエンドアプリケーション�サ�ート�るセッション��存���。
+    </td></tr>
+    <tr><td>nofailover</td>
+        <td>Off</td>
+        <td><code>On</code> �����る��ワーカー�エラーを起���り
+        無効�����る場��セッション�切れ��。
+        �ックエンドサー��セッションレプリケーションをサ�ート�����場���
+        On �������。
+    </td></tr>
+    <tr><td>timeout</td>
+        <td>0</td>
+        <td>�ランサー�タイムアウトを秒�指定���。
+        ��値を設定�る��フリー�ワーカーを�得�る���最大待機時間��り��。
+        デフォルト��待機���ん。
+    </td></tr>
+    <tr><td>maxattempts</td>
+        <td>1</td>
+        <td>フェイルオー�ーを試�る最大�回数を指定���。
+    </td></tr>
+    
+    </table>
+    <div class="example"><p><code>
+      ProxyPass /special-area http://special.example.com/ smax=5 max=10<br />
+      ProxyPass / balancer://mycluster stickysession=jsessionid nofailover=On<br />
+      &lt;Proxy balancer://mycluster&gt;<br />
+      <span class="indent">
+        BalancerMember http://1.2.3.4:8009<br />
+        BalancerMember http://1.2.3.5:8009 smax=10<br />
+        # Less powerful server, don't send as many requests there<br />
+        BalancerMember http://1.2.3.6:8009 smax=1 loadfactor=20<br />
+      </span>
+      &lt;/Proxy&gt;
+    </code></p></div>
+
+    <p><code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> セクション�中�使�れ�場��最��引数�
+    �略�れ�ローカルディレクトリ� <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> �ら�得�れ��。</p>
+
+    <p>より柔軟�リ�ースプロキシ�設定�必��場���<code>[P]</code>
+    フラグ付�� <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>
+    ディレクティブを�照������。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyPassReverse" id="ProxyPassReverse">ProxyPassReverse</a> <a name="proxypassreverse" id="proxypassreverse">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>リ�ースプロキシ�れ�サー��ら�られ� HTTP 応答ヘッダ�
+URL を調整�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyPassReverse [<var>path</var>] <var>url</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+</table>
+    <p>��ディレクティブ� Apache � HTTP リダイレクト応答�
+    <code>Location</code>, <code>Content-Location</code>, <code>URI</code>
+    ヘッダ�調整を����。�れ��Apache �リ�ースプロキシ���使�れ��る
+    ����リ�ースプロキシを通����アクセス�る��を防����
+    ����。�れ�より�ックエンドサー�� HTTP リダイレクト�
+    リ�ースプロキシ��ックエンド�間�扱�れるよ���り��。</p>
+
+    <p>ディレクティブ�明示�れ��る HTTP 応答ヘッダ���書���られ��。
+    Apache �他�応答ヘッダを書����り�HTML ページ�中� URL �照を
+    書����り�る����り��ん。HTML �中を見��URL �照を書���る
+    モジュール� Nick Kew �ん� <a href="http://apache.webthing.com/mod_proxy_html/">mod_proxy_html</a> ��り��。</p>
+
+    <p><var>path</var> �ローカル仮想パス�����。<var>url</var> �
+    リモートサー��部分 URL ��。�れら� <code class="directive"><a href="#proxypass">ProxyPass</a></code> ディレクティブ��様��。</p>
+
+    <p>例���ローカルサー��アドレス� <code>http://example.com/</code>
+    �����。�る�</p>
+
+    <div class="example"><p><code>
+      ProxyPass         /mirror/foo/ http://backend.example.com/<br />
+      ProxyPassReverse  /mirror/foo/ http://backend.example.com/<br />
+      ProxyPassReverseCookieDomain  backend.example.com  public.example.com<br />
+      ProxyPassReverseCookiePath  /  /mirror/foo/
+    </code></p></div>
+
+    <p>���設定を�る��<code>http://example.com/mirror/foo/bar</code>
+    ��ローカルリクエスト� <code>http://backend.example.com/bar</code>
+    ��プロキシリクエスト�内部�リダイレクト�れる�����り��ん
+    (�れ� <code>ProxyPass</code> �機能��)。<code>backend.example.com</code>
+    ��るリダイレクト��倒も���。<code>http://backend.example.com/bar</code>
+    � <code>http://backend.example.com/quux</code> �リダイレクト�れ����
+    Apache � HTTP リダイレクト応答をクライアント��る���
+    <code>http://example.com/mirror/foo/quux</code> �変更���。
+    URL を構��る��使�れるホスト�� <code class="directive"><a href="../mod/core.html#usecanonicalname">UseCanonicalName</a></code> �設定�応���択�れる���
+    注�������。</p>
+
+    <p><code class="directive">ProxyPassReverse</code> ディレクティブ�
+    対応�る <code class="directive"><a href="#proxypass">ProxyPass</a></code> ディレクティブ���存������
+    <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> �プロキシ通�機能
+    (<code>RewriteRule ...  [P]</code>) �併��使用�る�������。</p>
+
+    <p><code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> セクション�中�使�れ�場���
+    最��引数��略�れ�ローカルディレクトリ� <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> �ら�得�れ��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyPassReverseCookieDomain" id="ProxyPassReverseCookieDomain">ProxyPassReverseCookieDomain</a> <a name="proxypassreversecookiedomain" id="proxypassreversecookiedomain">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>リ�ースプロキシサー��ら� Set-Cookie ヘッダ� Domain 文字列を
+調整�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyPassReverseCookieDomain <var>internal-domain</var> <var>public-domain</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+</table>
+<p>使用法�基本的�
+<code class="directive"><a href="#proxypassreverse">ProxyPassReverse</a></code> �������
+ヘッダ� URL �代�り� <code>Set-Cookie</code> ヘッダ�
+<code>domain</code> 文字列を書�����。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyPassReverseCookiePath" id="ProxyPassReverseCookiePath">ProxyPassReverseCookiePath</a> <a name="proxypassreversecookiepath" id="proxypassreversecookiepath">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Reverse プロキシサー��ら� Set-Cookie ヘッダ� Path 文字列を
+調整�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyPassReverseCookiePath <var>internal-path</var> <var>public-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+</table>
+<p>使用法�基本的�
+<code class="directive"><a href="#proxypassreverse">ProxyPassReverse</a></code> �������
+ヘッダ� URL �代�り� <code>Set-Cookie</code> ヘッダ�
+<code>path</code> 文字列を書�����。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyPreserveHost" id="ProxyPreserveHost">ProxyPreserveHost</a> <a name="proxypreservehost" id="proxypreservehost">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>プロキシリクエスト����付�� Host HTTP ヘッダを使�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyPreserveHost On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ProxyPreserveHost Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0.31 以��使用�能</td></tr>
+</table>
+    <p>��オプション�有効�����る場��<code class="directive">ProxyPass</code>
+    �指定��ホスト��代�り����付��リクエスト� Host: 行を
+    プロキシ先�ホスト��り��。</p>
+
+    <p>��オプション�通常� <code>Off</code> �設定������。
+    ��ん��場���れ�大����ベース��ー�ャルホスティングを行������
+    元々� Host ヘッダを�ックエンドサー��解釈�る必���る���よ���
+    特別�設定�必��場����有用��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyReceiveBufferSize" id="ProxyReceiveBufferSize">ProxyReceiveBufferSize</a> <a name="proxyreceivebuffersize" id="proxyreceivebuffersize">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>プロキシ�れる HTTP � FTP 接続�����ットワーク�ッファサイズ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyReceiveBufferSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ProxyReceiveBufferSize 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+</table>
+    <p><code class="directive">ProxyReceiveBufferSize</code> ディレクティブ�
+    スループットを上�る���明示的� (TCP/IP) �ットワーク�ッファ�サイズを
+    設定���。値� <code>512</code> 以上��システム�デフォルト��ッファ
+    サイズを�味�る <code>0</code> ���れ��り��ん。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      ProxyReceiveBufferSize 2048
+    </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyRemote" id="ProxyRemote">ProxyRemote</a> <a name="proxyremote" id="proxyremote">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>特定�リクエストを扱�時�使�れるリモートプロキシを指定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyRemote <var>match</var> <var>remote-server</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+</table>
+    <p>��ディレクティブ���プロキシ�対�るリモートプロキシを定義���。
+    <var>match</var> �リモートサー��サ�ート�る URL スキーム�
+    リモートサー��使���� URL �一部分�サー������
+    リクエスト�使�れる��を示� <code>*</code> ��れ���り��。
+    <var>remote-server</var> �リモートサー��部分 URL ��。構文:</p>
+
+    <div class="example"><p><code>
+      <dfn>remote-server</dfn> =
+          <var>scheme</var>://<var>hostname</var>[:<var>port</var>]
+    </code></p></div>
+
+    <p><var>scheme</var> �実際上リモートサー���通信�使�れるプロトコルを
+    決定���。��モジュール�� <code>http</code> ���サ�ート�れ�
+    ���。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      ProxyRemote http://goodguys.com/ http://mirrorguys.com:8000<br />
+      ProxyRemote * http://cleversite.com<br />
+      ProxyRemote ftp http://ftpproxy.mydomain.com:8080
+    </code></p></div>
+
+    <p>��例���プロキシ� FTP リクエストを別� HTTP リクエスト�包ん�
+    ��よ��リクエストを扱�る別�プロキシ�転����。</p>
+
+    <p>��オプション�リ�ースプロキシ�設定もサ�ート���。
+    サー��別�フォワードプロキシ�後��隠�れ��る場��も
+    �ックエンドウェブサー�を�ー�ャルホスト� URL 空間�入れる���
+    ����。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyRemoteMatch" id="ProxyRemoteMatch">ProxyRemoteMatch</a> <a name="proxyremotematch" id="proxyremotematch">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>正�表���マッ��よるリクエストを扱�リモートプロキシ�指定</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyRemoteMatch <var>regex</var> <var>remote-server</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+</table>
+    <p><code class="directive">ProxyRemoteMatch</code> �最��引数�リクエスト�れ�
+    URL �マッ��る<a class="glossarylink" href="../glossary.html#regex" title="用語集を�照">正�表�</a>��る��を除�� <code class="directive"><a href="#proxyremote">ProxyRemote</a></code> ディレクティブ�����。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyRequests" id="ProxyRequests">ProxyRequests</a> <a name="proxyrequests" id="proxyrequests">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>フォワード (標準�) プロキシリクエストを有効��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyRequests On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ProxyRequests Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+</table>
+    <p>�れ� Apache �フォワードプロキシサー�����動作を
+    有効も���無効����。(ProxyRequests を <code>Off</code> �
+    設定��も�<code class="directive"><a href="#proxypass">ProxyPass</a></code> 
+    �設定�無効��り��ん。)</p>
+
+    <p>通常�リ�ースプロキシ�設定�����オプション� <code>Off</code>
+    �設定������。</p>
+
+    <p>HTTP や FTP サイト��プロキシ�機能を有効����場���
+    <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> や <code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code> �
+    サー��組�込�れ����れ��り��ん。</p>
+
+    <div class="warning"><h3>警告</h3>
+      <p><a href="#access">サー�を安全��る</a>�� <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> �有効���������。
+      オープンプロキシサー�����自身��ットワーク����も�
+      インター�ット全体����も�険��。</p>
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyTimeout" id="ProxyTimeout">ProxyTimeout</a> <a name="proxytimeout" id="proxytimeout">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>プロキシ�れ�リクエスト��ットワークタイムアウト</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyTimeout <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ProxyTimeout 300</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0.31 以��使用�能</td></tr>
+</table>
+    <p>��ディレクティブ�ユーザ�プロキシリクエスト�タイムアウトを
+    指定��るよ�����。�れ��ング��������も���挙動�
+    怪��サー���り�サー��データを返������ら待�続�るよりも
+    タイムアウトを返��より緩や��<span class="transnote">(<em>訳注:</em> graceful �)</span>
+    失敗����場��役�立���。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyVia" id="ProxyVia">ProxyVia</a> <a name="proxyvia" id="proxyvia">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>プロキシ�れ�リクエスト� <code>Via</code> HTTP 応答ヘッダ
+�より�供�れる情報</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ProxyVia On|Off|Full|Block</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ProxyVia Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_proxy</td></tr>
+</table>
+    <p>��ディレクティブ�プロキシ� <code>Via:</code> HTTP ヘッダ�使用を
+    制御���。想定�れ��る使�方��プロキシサー�����も繋����る���
+    プロキシリクエスト��れを制御�る����。<code>Via:</code> ヘッダ行�
+    説明� <a href="http://www.ietf.org/rfc/rfc2616.txt">RFC 2616</a> (HTTP/1.1)
+    � 14.45 節を読ん�����。</p>
+
+    <ul>
+    <li>デフォルト� <code>Off</code> �設定�れ��る��特別�処��
+    行��れ��ん。リクエストやリプライ� <code>Via:</code> ヘッダ��れ��
+    変更�れ������渡���。</li>
+
+    <li><code>On</code> �設定�れ��れ���リクエスト�リプライ�
+    <code>Via:</code> 行�追加�れ��。</li>
+
+    <li><code>Full</code> �設定�れ��れ��<code>Via:</code> ヘッダ�
+    コメント部分� Apache サー���ージョンも�むよ���り��。</li>
+
+    <li><code>Block</code> �設定�れ��れ������プロキシリクエスト�ら
+    <code>Via:</code> ヘッダ��り除�れ��。新�� <code>Via:</code> �
+    生��れる����り��ん。</li>
+    </ul>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_proxy.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_proxy.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy_ajp.html b/docs/manual/mod/mod_proxy_ajp.html
index 2e2bf126..676c8714 100644
--- a/docs/manual/mod/mod_proxy_ajp.html
+++ b/docs/manual/mod/mod_proxy_ajp.html
@@ -1,7 +1,9 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_proxy_ajp.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_proxy_ajp.html.ja.euc-jp
+URI: mod_proxy_ajp.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/mod_proxy_ajp.html.en b/docs/manual/mod/mod_proxy_ajp.html.en
index e48f313b..87886d45 100644
--- a/docs/manual/mod/mod_proxy_ajp.html.en
+++ b/docs/manual/mod/mod_proxy_ajp.html.en
@@ -551,6 +551,6 @@ AJP13_GET_BODY_CHUNK :=
 <p><span>Available Languages: </span><a href="../en/mod/mod_proxy_ajp.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_proxy_ajp.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy_ajp.html.ja.euc-jp b/docs/manual/mod/mod_proxy_ajp.html.ja.euc-jp
deleted file mode 100644
index f742d592..00000000
--- a/docs/manual/mod/mod_proxy_ajp.html.ja.euc-jp
+++ /dev/null
@@ -1,544 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_proxy_ajp - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_proxy_ajp</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_ajp.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_proxy_ajp.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ¤Ç AJP 
-¤ò¥µ¥Ý¡¼¥È¤¹¤ë¤¿¤á¤Î¥â¥¸¥å¡¼¥ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>proxy_ajp_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>proxy_ajp.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>Ëܥ⥸¥å¡¼¥ë¤Ë¤Ï <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ¤¬<em>ɬÍפǤ¹</em>¡£
-    <code>Apache JServ Protocol version 1.3</code> (°Ê¹ß <em>AJP13</em>)
-    ¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£</p>
-
-    <p><code>AJP13</code> ¥×¥í¥È¥³¥ë¤ò°·¤¨¤ë¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï
-    <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ¤È <code class="module"><a href="../mod/mod_proxy_ajp.html">mod_proxy_ajp</a></code>
-    ¤ò¥µ¡¼¥Ð¤ËÁȤ߹þ¤àɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <div class="warning"><h3>·Ù¹ð</h3>
-      <p><a href="#access">°ÂÁ´¤Ê¥µ¡¼¥Ð¤Ë¤¹¤ë</a>¤Þ¤Ç¥×¥í¥¯¥·µ¡Ç½¤ÏÍ­¸ú¤Ë¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-      ¥ª¡¼¥×¥ó¥×¥í¥­¥·¥µ¡¼¥Ð¤Ï¤¢¤Ê¤¿¼«¿È¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤Ë¤È¤Ã¤Æ¤â¡¢
-      ¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÁ´ÂΤˤȤäƤâ´í¸±¤Ç¤¹¡£</p>
-    </div>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤¢¤ê¤Þ¤»¤ó¡£</p>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#overviewprotocol">¥×¥í¥È¥³¥ë¤Î³µÍ×</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#basppacketstruct">´ðËܥѥ±¥Ã¥È¹½Â¤</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#rpacetstruct">¥ê¥¯¥¨¥¹¥È¥Ñ¥±¥Ã¥È¹½Â¤</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#resppacketstruct">¥ì¥¹¥Ý¥ó¥¹¥Ñ¥±¥Ã¥È¹½Â¤</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="overviewprotocol" id="overviewprotocol">¥×¥í¥È¥³¥ë¤Î³µÍ×</a></h2>
-    <p><code>AJP13</code> ¥×¥í¥È¥³¥ë¤Ï¥Ñ¥±¥Ã¥È»Ø¸þ¤Ç¤¹¡£
-    ²ÄÆɤʥץ졼¥ó¥Æ¥­¥¹¥È·Á¼°¤Ç¤Ï¤Ê¤¯¥Ð¥¤¥Ê¥ê·Á¼°¤Ë¤Ê¤Ã¤¿¤Î¤Ï¡¢
-    ¤ª¤½¤é¤¯¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¾å¤ÎÍýͳ¤Ë¤è¤ê¤Þ¤¹¡£
-    ¥¦¥§¥Ö¥µ¡¼¥Ð¤Ï¥µ¡¼¥Ö¥ì¥Ã¥È¥³¥ó¥Æ¥Ê¤È TCP ¥³¥Í¥¯¥·¥ç¥ó¤ÇÄÌ¿®¤·¤Þ¤¹¡£
-    ¥½¥±¥Ã¥ÈÀ¸À®¤Ï½Å¤¤½èÍý¤Ê¤Î¤Ç¡¢Éé²Ù¤ò¸º¤é¤¹¤¿¤á¤Ë¡¢¥µ¡¼¥Ö¥ì¥Ã¥È¥³¥ó¥Æ¥Ê¤È¤Î
-    TCP Àܳ¤ò°Ý»ý¤·¡¢Ê£¿ô¤Î¥ê¥¯¥¨¥¹¥È¡¦¥ì¥¹¥Ý¥ó¥¹½èÍý¥µ¥¤¥¯¥ë¤ËÂФ·¤Æ°ì¤Ä¤Î
-    ¥³¥Í¥¯¥·¥ç¥ó¤ò»È¤¤¤Þ¤ï¤¹¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
-    <p>¤¢¤ë¥ê¥¯¥¨¥¹¥È¤Ë¥³¥Í¥¯¥·¥ç¥ó¤¬³ä¤êÅö¤Æ¤é¤ì¤ë¤È¡¢¤½¤Î½èÍý¥µ¥¤¥¯¥ë¤¬
-    ´°Î»¤¹¤ë¤Þ¤Ç¾¤Î¤â¤Î¤Ë»È¤ï¤ì¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-    ¤Ä¤Þ¤ê¥³¥Í¥¯¥·¥ç¥ó¾å¤Ç¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤ÎƱ»þ½èÍý¤Ï¹Ô¤ï¤ì¤Þ¤»¤ó¡£
-    ¤³¤Î¤¿¤á¡¢¥³¥Í¥¯¥·¥ç¥óξü¤Ç¤Î¼Â¹Ô¤¹¤ë¥³¡¼¥É¤ò´Ê·é¤Ë¤Ç¤­¤ë°ìÊý¤Ç¡¢
-    Ʊ»þ¤Ë³«¤¯¥³¥Í¥¯¥·¥ç¥ó¤Ï¿¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
-    <p>¥µ¡¼¥Ö¥ì¥Ã¥È¥³¥ó¥Æ¥Ê¤Ø¤Î¥³¥Í¥¯¥·¥ç¥ó¤ò³«¤¤¤¿¸å¤Ï¡¢¥³¥Í¥¯¥·¥ç¥ó¤Î¾õÂÖ¤Ï
-    ¼¡¤Î¤É¤ì¤«¤Ë¤Ê¤ê¤Þ¤¹:</p>
-    <ul>
-    <li> Idle <br />¥³¥Í¥¯¥·¥ç¥ó¾å¤Ç½èÍý¤µ¤ì¤Æ¤¤¤ë¥ê¥¯¥¨¥¹¥È¤Ï¤¢¤ê¤Þ¤»¤ó¡£</li>
-    <li> Assigned <br />¥³¥Í¥¯¥·¥ç¥ó¤Ï¥ê¥¯¥¨¥¹¥È¤ò½èÍýÃæ¤Ç¤¹¡£</li>
-    </ul>
-    <p>¥³¥Í¥¯¥·¥ç¥ó¤¬ÆÃÄê¤Î¥ê¥¯¥¨¥¹¥È¤Ë¥¢¥µ¥¤¥ó¤µ¤ì¤ë¤È¡¢´ðËÜŪ¤Ê¾ðÊó (Î㤨¤Ð
-    HTTP ¥Ø¥Ã¥ÀÅù) ¤¬°µ½Ì¤µ¤ì¤¿·Á (Î㤨¤ÐÄ̾ï¤Îʸ»úÎó¤ÏÀ°¿ô¤Ë¥¨¥ó¥³¡¼¥É¤µ¤ì¤Þ¤¹)
-    ¤ÇžÁ÷¤µ¤ì¤Þ¤¹¡£¾ÜºÙ¤Ï²¼µ­¤Î¡Ö¥ê¥¯¥¨¥¹¥È¥Ñ¥±¥Ã¥È¤Î¹½Â¤¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ¥ê¥¯¥¨¥¹¥È¤Ë¥Ü¥Ç¥£¤¬Â¸ºß <code>(content-length &gt; 0)</code> ¤¹¤ì¤Ð¡¢
-    ´ðËÜŪ¤Ê¾ðÊó¤Îľ¸å¤ËÊ̥ѥ±¥Ã¥È¤ÇžÁ÷¤µ¤ì¤Þ¤¹¡£</p>
-    <p>¤³¤Î»þÅÀ¤Ç¤ª¤½¤é¤¯¡¢¥µ¡¼¥Ö¥ì¥Ã¥È¥³¥ó¥Æ¥Ê¤Ï½èÍý¤ò³«»Ï¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¤Ç¤¹¤Î¤Ç¡¢¼¡¤Î¥á¥Ã¥»¡¼¥¸¤ò¥¦¥§¥Ö¥µ¡¼¥Ð¤ËÌᤷ¤ÆÃΤ餻¤é¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-    <ul>
-    <li>SEND_HEADERS <br />¥Ö¥é¥¦¥¶¤Ë¥Ø¥Ã¥À¤òÁ÷¿®¤·¤Þ¤¹¡£</li>
-    <li>SEND_BODY_CHUNK <br />¥Ö¥é¥¦¥¶¤Ë¥Ü¥Ç¥£¥Ç¡¼¥¿¤Î¥Á¥ã¥ó¥¯¤òÁ÷¤ê¤Þ¤¹¡£
-    </li>
-    <li>GET_BODY_CHUNK <br />¥ê¥¯¥¨¥¹¥È¤Î¥Ç¡¼¥¿¤òÁ´¤Æ¼õ¤±¼è¤ê½ª¤ï¤Ã¤Æ¤¤¤Ê¤¤¤È¤­¤Ë¡¢
-    »Ä¤Ã¤Æ¤¤¤ë¥Ç¡¼¥¿¤ò¼õ¤±¼è¤ê¤Þ¤¹¡£¥Ñ¥±¥Ã¥È¤Ë¤¢¤ëÄê¤Þ¤Ã¤¿ºÇÂ獬¤¢¤ê¡¢Ç¤°Õ¤Î
-    Â礭¤µ¤Î¥Ç¡¼¥¿¤¬¥ê¥¯¥¨¥¹¥È¤Î¥Ü¥Ç¥£¤È¤·¤Æ´Þ¤Þ¤ì¤¦¤ë¾ì¹ç 
-    (Î㤨¤Ð¥Õ¥¡¥¤¥ë¤Î¥¢¥Ã¥×¥í¡¼¥É¤Î¾ì¹ç) ¤ËɬÍפȤʤê¤Þ¤¹¡£
-    (Ãí: HTTP ¤Î¥Á¥ã¥ó¥¯Å¾Á÷¤È¤Ï´ØÏ¢¤¢¤ê¤Þ¤»¤ó¡£)</li>
-    <li>END_RESPONSE <br />¥ê¥¯¥¨¥¹¥È½èÍý¥µ¥¤¥¯¥ë¤ò½ªÎ»¤·¤Þ¤¹¡£</li>
-    </ul>
-    <p>¸Ä¡¹¤Î¥á¥Ã¥»¡¼¥¸¤Ï¤½¤ì¤¾¤ì°Û¤Ê¤ë¥Ç¡¼¥¿¥Ñ¥±¥Ã¥È·Á¼°¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-    ¸å½Ò¤Î¡Ö¥ì¥¹¥Ý¥ó¥¹¥Ñ¥±¥Ã¥È¤Î¹½Â¤¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="basppacketstruct" id="basppacketstruct">´ðËܥѥ±¥Ã¥È¹½Â¤</a></h2>
-    <p>¤³¤Î¥×¥í¥È¥³¥ë¤Ë¤Ï XDR ¤«¤é¼õ¤±·Ñ¤¤¤ÀÉôʬ¤¬¾¯¤·¤¢¤ê¤Þ¤¹¤¬¡¢Â¿¤¯¤ÎÅÀ¤Ç
-    °Û¤Ê¤ê¤Þ¤¹ (Î㤨¤Ð 4 ¥Ð¥¤¥È¥¢¥é¥¤¥á¥ó¥È¤Ç¤Ê¤¤¤³¤È¤Ê¤É) ¡£</p>
-    <p>¥Ð¥¤¥È¥ª¡¼¥À¡¼: ¸Ä¡¹¤Î¥Ð¥¤¥È¤Î¥¨¥ó¥Ç¥£¥¢¥ó¤¬¤É¤¦¤Ê¤Ã¤Æ¤¤¤ë¤«¤Ï¡¢
-    »ä¤Ï¾Ü¤·¤¯¤Ê¤¤¤Î¤Ç¤¹¤¬¡¢¥ê¥È¥ë¥¨¥ó¥Ç¥£¥¢¥ó¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤È»×¤¤¤Þ¤¹¡£
-    XDR »ÅÍͤǤ½¤¦¤Ê¤Ã¤Æ¤¤¤ë¤Î¤È¡¢ÁÇÀ²¤é¤·¤¤¤³¤È¤Ë sys/socket ¥é¥¤¥Ö¥é¥ê¤¬
-    (C ¤Ç) ¤½¤¦¤¤¤¦É÷¤Ë¤Ç¤­¤Æ¤¤¤ë¤Î¤Ç¤½¤¦¤Ê¤Î¤À¤È»×¤¤¤Þ¤·¤¿¡£
-    ¥½¥±¥Ã¥È¸Æ¤Ó½Ð¤·¤ÎÆâÉô¤Ë¤Ä¤¤¤Æ¤è¤ê¾Ü¤·¤¤Êý¤¬¤¤¤é¤Ã¤·¤ã¤¤¤Þ¤·¤¿¤é¡¢
-    ¤´¶µ¼ø¤¯¤À¤µ¤¤¡£</p>
-    <p>¥×¥í¥È¥³¥ë¤Ë¤Ï 4 ¤Ä¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤¬¤¢¤ê¤Þ¤¹: byte, boolean, 
-    integer, string ¤Ç¤¹¡£</p>
-    <dl>
-    <dt><strong>Byte</strong></dt><dd>¥Ð¥¤¥È°ì¤Ä¤Ç¤¹¡£</dd>
-    <dt><strong>Boolean</strong></dt>
-      <dd>¥Ð¥¤¥È°ì¤Ä¤Ç¡¢<code>1 = true</code>, <code>0 = false</code> ¤Ç¤¹¡£
-      (C ¤Î¤è¤¦¤Ë) ÈóÎí¤ò¿¿¤È¤·¤Æ°·¤Ã¤Æ¤·¤Þ¤¦¤È¡¢¤¢¤ë¾ì¹ç¤ÏÆ°¤¯¤«¤â¤·¤ì¤Þ¤»¤ó¤·¡¢
-      Æ°¤«¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£</dd>
-    <dt><strong>Integer</strong></dt>
-      <dd><code>0 ¤«¤é 2^16 (32768)</code> ¤ÎÈϰϤοô»ú¡£¹â¼¡¤Î 2 ¥Ð¥¤¥È¤¬
-      Àè¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£</dd>
-    <dt><strong>String</strong></dt>
-      <dd>²ÄÊÑŤÎʸ»úÎó (2^16 ¤¬Ä¹¤µ¤Î¾å¸Â) ¡£Ä¹¤µ¾ðÊó¤Î¥Ñ¥±¥Ã¥È 2 ¥Ð¥¤¥È¤Î¸å¤Ë
-      ʸ»úÎó (½ªÃ¼Ê¸»ú '\0' ¤ò´Þ¤à) ¤¬Â³¤¯·Á¼°¤Ç¥¨¥ó¥³¡¼¥É¤µ¤ì¤Þ¤¹¡£
-      ¥¨¥ó¥³¡¼¥É¤µ¤ì¤Æ¤¤¤ëŤµ¾ðÊó¤ÏºÇ¸å¤Î '\0' ¤ò<strong>¥«¥¦¥ó¥È¤·¤Ê¤¤</strong>
-      ¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡½¡½¤³¤ì¤Ï <code>strlen</code> ¤ÈƱÍͤǤ¹¡£
-      ¤³¤ì¤é¤Î½ªÃ¼Ê¸»ú¤ò¥¹¥­¥Ã¥×¤¹¤ë¤¿¤á¤Ë¡¢¤¢¤Þ¤ê°ÕÌ£¤Î̵¤¤¥¤¥ó¥¯¥ê¥á¥ó¥Èʸ
-      ¤ò¤¿¤¯¤µ¤ó½ñ¤«¤Ê¤¤¤È¤¤¤±¤Ê¤¤¤Î¤Ï¡¢
-      Java ¤Î¦¤«¤é¸«¤ë¤È¾¯¤·Ê¶¤é¤ï¤·¤¯´¶¤¸¤é¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-      ¤³¤¦¤Ê¤Ã¤¿Íýͳ¤Ï¤ª¤½¤é¤¯¡¢Servlet ¥³¥ó¥Æ¥Ê¤«¤éÊÖ¤µ¤ì¤ëʸ»úÎó¤òÆɤ߽Ф¹»þ¤Ë¡¢
-      ¸úΨ¤è¤¯ C ¤Î¥³¡¼¥É¤ò½ñ¤±¤ë¤è¤¦¤Ë¤¹¤ë¡½¡½¥µ¡¼¥Ö¥ì¥Ã¥È¤«¤éÊÖ¤µ¤ì¤ë
-      ʸ»úÎó¤Ï \0 ʸ»ú¤Ç½ªÃ¼¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢C ¤Î¥³¡¼¥É¤Ç¤Ï¤ï¤¶¤ï¤¶¥³¥Ô¡¼¤ò¤»¤º¤Ë¡¢
-      °ì¤Ä¤Î¥Ð¥Ã¥Õ¥¡¤Ø¤Î¥ê¥Õ¥¡¥ì¥ó¥¹¤ò¼è¤ê²ó¤¹¤è¤¦¤Ë½ñ¤¯¤³¤È¤¬¤Ç¤­¤ë¡½¡½
-      ¤¿¤á¤À¤È»×¤ï¤ì¤Þ¤¹¡£
-      '\0' ʸ»ú¤¬¤Ê¤¤¾ì¹ç¤Ï¡¢C ¤Ç¤Ïʸ»úÎó¤Îµ¬Â§¤Ë¹ç¤¦¤è¤¦¤Ë¥³¥Ô¡¼¤·¤Ê¤±¤ì¤Ð
-      ¤¤¤±¤Ê¤¯¤Ê¤Ã¤Æ¤·¤Þ¤¤¤Þ¤¹¡£</dd>
-    </dl>
-
-  <h3>¥Ñ¥±¥Ã¥È¥µ¥¤¥º</h3>
-    <p>¿¤¯¤Î¥³¡¼¥É¤Ç¤½¤¦¤Ê¤Ã¤Æ¤¤¤ë¤Î¤Ç¤¹¤¬¡¢¥Ñ¥±¥Ã¥È¥µ¥¤¥º¤ÎºÇÂ祵¥¤¥º¤Ï
-    <code>8 * 1024 (8K)</code> ¤Ç¤¹¡£¥Ñ¥±¥Ã¥È¤Î¼ÂºÝ¤ÎŤµ¤Ï¥Ø¥Ã¥À¤Ë
-    ¥¨¥ó¥³¡¼¥É¤µ¤ì¤ÆÆþ¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
-  
-  <h3>¥Ñ¥±¥Ã¥È¥Ø¥Ã¥À</h3>
-    <p>¥µ¡¼¥Ð¤«¤é¥³¥ó¥Æ¥Ê¤ËÁ÷½Ð¤µ¤ì¤ë¥Ñ¥±¥Ã¥È¤Ï <code>0x1234</code> ¤Ç»Ï¤Þ¤ê¤Þ¤¹¡£
-    ¥³¥ó¥Æ¥Ê¤«¤é¥µ¡¼¥Ð¤ËÁ÷¤é¤ì¤ë¥Ñ¥±¥Ã¥È¤Ï <code>AB</code> (ASCII ¥³¡¼¥É A ¤È
-    ASCII ¥³¡¼¥É B) ¤Ç»Ï¤Þ¤ê¤Þ¤¹¡£¤³¤ÎÆó¥Ð¥¤¥È¤Î¸å¤Ë¡¢¥Ú¥¤¥í¡¼¥ÉŤ¬ (¾åµ­¤Î·Á¼°¤Ç) 
-    ³¤­¤Þ¤¹¡£¤³¤Î¤¿¤á¡¢¥Ú¥¤¥í¡¼¥ÉĹ¤ÎºÇÂçÃÍ¤Ï 2^16 ¤Ë¤Ç¤­¤ë¤è¤¦¤Ë»×¤¨¤Þ¤¹¤¬¡¢
-    ¼ÂºÝ¤Ë¤Ï¥³¡¼¥É¤Ç¤ÏºÇÂçÃÍ¤Ï 8K ¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-    <table>
-      <tr>
-        <td colspan="6"><em>¥Ñ¥±¥Ã¥È·Á¼° (Server-&gt;Container)</em></td>
-      </tr>
-      <tr>
-        <td>Byte</td>
-        <td>0</td>
-        <td>1</td>
-        <td>2</td>
-        <td>3</td>
-        <td>4...(n+3)</td>
-      </tr>
-      <tr>
-        <td>Contents</td>
-        <td>0x12</td>
-        <td>0x34</td>
-        <td colspan="2">¥Ç¡¼¥¿Ä¹ (n)</td>
-        <td>Data</td>
-      </tr>
-    </table>
-    <table>
-      <tr>
-        <td colspan="6"><em>¥Ñ¥±¥Ã¥È·Á¼° (Container-&gt;Server)</em></td>
-      </tr>
-      <tr>
-        <td>Byte</td>
-        <td>0</td>
-        <td>1</td>
-        <td>2</td>
-        <td>3</td>
-        <td>4...(n+3)</td>
-      </tr>
-      <tr>
-        <td>Contents</td>
-        <td>A</td>
-        <td>B</td>
-        <td colspan="2">¥Ç¡¼¥¿Ä¹ (n)</td>
-        <td>Data</td>
-      </tr>
-    </table>
-    <p>¤Û¤È¤ó¤É¤Î¥Ñ¥±¥Ã¥È¤Ç¡¢¥Ú¥¤¥í¡¼¥É¤ÎºÇ½é¤Î¥Ð¥¤¥È¤¬¥á¥Ã¥»¡¼¥¸¤Î·¿¤ò¥¨¥ó¥³¡¼¥É
-     ¤·¤Æ¤¤¤Þ¤¹¡£Îã³°¤Ï¥µ¡¼¥Ð¤«¤é¥³¥ó¥Æ¥Ê¤ËÁ÷¤é¤ì¤ë¥ê¥¯¥¨¥¹¥È¥Ü¥Ç¥£¥Ñ¥±¥Ã¥È¤Ç¤¹
-     ¡½¡½¤³¤ì¤é¤Ïɸ½àŪ¤Ê¥Ñ¥±¥Ã¥È·Á¼° (<code>0x1234</code> ¤È¥Ñ¥±¥Ã¥ÈĹ)
-     ¤Ç¤¹¤¬¡¢¤½¤Î¸å¤Ë³¤¯¥×¥ì¥Õ¥£¥Ã¥¯¥¹¥³¡¼¥É¤¬¤¢¤ê¤Þ¤»¤ó¡£</p>
-     <p>¥¦¥§¥Ö¥µ¡¼¥Ð¤Ï¼¡¤Î¥á¥Ã¥»¡¼¥¸¤ò¥µ¡¼¥Ö¥ì¥Ã¥È¥³¥ó¥Æ¥Ê¤ËÁ÷½Ð¤Ç¤­¤Þ¤¹¡£</p>
-    <table>
-      <tr>
-        <td>¥³¡¼¥É</td>
-        <td>¥Ñ¥±¥Ã¥È¤Î·¿</td>
-        <td>°ÕÌ£</td>
-      </tr>
-      <tr>
-        <td>2</td>
-        <td>Forward Request</td>
-        <td>¥ê¥¯¥¨¥¹¥È½èÍý¥µ¥¤¥¯¥ë¤ò¸å³¤Î¥Ç¡¼¥¿¤È¤È¤â¤Ë³«»Ï¤¹¤ë¡£</td>
-      </tr>
-      <tr>
-        <td>7</td>
-        <td>Shutdown</td>
-        <td>¥¦¥§¥Ö¥µ¡¼¥Ð¤¬¥³¥ó¥Æ¥Ê¤Ë¡¢¥³¥ó¥Æ¥Ê¤ò½ªÎ»¤¹¤ë¤è¤¦¤ËÅÁ¤¨¤ë¡£</td>
-      </tr>
-      <tr>
-        <td>8</td>
-        <td>Ping</td>
-        <td>¥¦¥§¥Ö¥µ¡¼¥Ð¤¬¥³¥ó¥Æ¥Ê¤ËÀ©¸æ¤ò¼õ¤±»ý¤Ä¤è¤¦¤ËÅÁ¤¨¤ë 
-        (¥»¥­¥å¥¢¥í¥°¥¤¥ó¥Õ¥§¡¼¥º) ¡£</td>
-      </tr>
-      <tr>
-        <td>10</td>
-        <td>CPing</td>
-        <td>¥¦¥§¥Ö¥µ¡¼¥Ð¤¬¥³¥ó¥Æ¥Ê¤Ë CPong ¤Ç¨ºÂ¤Ë±þÅú¤¹¤ë¤è¤¦¤ËÅÁ¤¨¤ë¡£</td>
-      </tr>
-      <tr>
-        <td>none</td>
-        <td>Data</td>
-        <td>¥µ¥¤¥º (2 ¥Ð¥¤¥È) ¤È¤½¤ì¤Ë³¤¯¥Ü¥Ç¥£¥Ç¡¼¥¿¡£</td>
-      </tr>
-    </table>
-    <p>´ðËÜŪ¤Ê¥»¥­¥å¥ê¥Æ¥£¤ò³ÎÊݤ¹¤ë¤¿¤á¡¢¥Û¥¹¥È¤µ¤ì¤Æ¤¤¤ë¥Þ¥·¥ó¤ÈƱ°ì¤Î
-    ¥Þ¥·¥ó¤«¤é¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ¤Î¤ß¡¢¥³¥ó¥Æ¥Ê¤Ï¼ÂºÝ¤Ë <code>Shutdown</code>
-    ¤ò¼Â¹Ô¤·¤Þ¤¹¡£</p>
-    <p>ºÇ½é¤Î <code>Data</code> ¥Ñ¥±¥Ã¥È¤Ï¡¢<code>Forward Request</code> 
-    ¤Îľ¸å¤Ë¥¦¥§¥Ö¥µ¡¼¥Ð¤«¤éÁ÷¤é¤ì¤Þ¤¹¡£</p>
-    <p>¥µ¡¼¥Ö¥ì¥Ã¥È¥³¥ó¥Æ¥Ê¤Ï¥¦¥§¥Ö¥µ¡¼¥Ð¤Ë¡¢¼¡¤Î¥¿¥¤¥×¤Î¥á¥Ã¥»¡¼¥¸¤òÁ÷¤ë¤³¤È¤¬
-    ¤Ç¤­¤Þ¤¹ :</p>
-    <table>
-      <tr>
-        <td>¥³¡¼¥É</td>
-        <td>¥Ñ¥±¥Ã¥È¤Î·¿</td>
-        <td>°ÕÌ£</td>
-      </tr>
-      <tr>
-        <td>3</td>
-        <td>Send Body Chunk</td>
-        <td>¥µ¡¼¥Ö¥ì¥Ã¥È¥³¥ó¥Æ¥Ê¤«¤é¥¦¥§¥Ö¥µ¡¼¥Ð¤Ë
-        (¤½¤·¤Æ¤ª¤½¤é¤¯¤½¤Î¤Þ¤Þ¥Ö¥é¥¦¥¶¤Ë)¡¢¥Ü¥Ç¥£¤Î¥Á¥ã¥ó¥¯¤òÁ÷¤ë¡£</td>
-      </tr>
-      <tr>
-        <td>4</td>
-        <td>Send Headers</td>
-        <td>¥µ¡¼¥Ö¥ì¥Ã¥È¥³¥ó¥Æ¥Ê¤«¤é¥¦¥§¥Ö¥µ¡¼¥Ð¤Ë (¤½¤·¤Æ¤ª¤½¤é¤¯¤½¤Î¤Þ¤Þ¥Ö¥é¥¦¥¶¤Ë)
-        ¥ì¥¹¥Ý¥ó¥¹¥Ø¥Ã¥À¤òÁ÷¤ë¡£</td>
-      </tr>
-      <tr>
-        <td>5</td>
-        <td>End Response</td>
-        <td>¥ì¥¹¥Ý¥ó¥¹ (¤Ä¤Þ¤ê¥ê¥¯¥¨¥¹¥È½èÍý¥µ¥¤¥¯¥ë) ½ªÎ»¤ÎÌÜ°õ¤òÁ÷¤ë¡£
-        </td>
-      </tr>
-      <tr>
-        <td>6</td>
-        <td>Get Body Chunk</td>
-        <td>¤Þ¤ÀÁ´¤ÆžÁ÷¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢»Ä¤Ã¤Æ¤¤¤ë¥ê¥¯¥¨¥¹¥È¤Î¥Ç¡¼¥¿¤ò¼õ¤±¼è¤ë¡£
-        </td>
-      </tr>
-      <tr>
-        <td>9</td>
-        <td>CPong ±þÅú</td>
-        <td>CPing ¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤¹¤ë¡£</td>
-      </tr>
-    </table>
-    <p>¾åµ­¥á¥Ã¥»¡¼¥¸¤Ï¡¢¤½¤ì¤¾¤ìÆâÉô¹½Â¤¤¬°Û¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¾ÜºÙ¤Ï²¼µ­¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
-    </p>
-  
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="rpacetstruct" id="rpacetstruct">¥ê¥¯¥¨¥¹¥È¥Ñ¥±¥Ã¥È¹½Â¤</a></h2>
-    <p>¥µ¡¼¥Ð¤«¤é¥³¥ó¥Æ¥Ê¤ØÁ÷¤é¤ì¤ë¥á¥Ã¥»¡¼¥¸¤¬
-    <em>Forward Request</em> ·¿¤Î¾ì¹ç :</p>
-    <div class="example"><pre>
-AJP13_FORWARD_REQUEST :=
-    prefix_code      (byte) 0x02 = JK_AJP13_FORWARD_REQUEST
-    method           (byte)
-    protocol         (string)
-    req_uri          (string)
-    remote_addr      (string)
-    remote_host      (string)
-    server_name      (string)
-    server_port      (integer)
-    is_ssl           (boolean)
-    num_headers      (integer)
-    request_headers *(req_header_name req_header_value)
-    attributes      *(attribut_name attribute_value)
-    request_terminator (byte) OxFF
-    </pre></div>
-    <p><code>request_headers</code> ¤Ï¼¡¤Î¤è¤¦¤Ê¹½Â¤¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹ :
-    </p><div class="example"><pre>
-req_header_name := 
-    sc_req_header_name | (string)  [see below for how this is parsed]
-
-sc_req_header_name := 0xA0xx (integer)
-
-req_header_value := (string)
-</pre></div>
-    <p><code>°À­</code> ¤Ï¥ª¥×¥·¥ç¥ó¤Ç¡¢¼¡¤Î¤è¤¦¤Ê¹½Â¤¤ò¤·¤Æ¤¤¤Þ¤¹ :</p>
-    <div class="example"><pre>
-attribute_name := sc_a_name | (sc_a_req_attribute string)
-
-attribute_value := (string)
-
-    </pre></div>
-    <p>¤â¤Ã¤È¤â½ÅÍפʥإåÀ¤Ï <code>content-length</code> ¤À¤È¤¤¤¦¤³¤È¤Ë
-    Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¥³¥ó¥Æ¥Ê¤Ï¼¡¤Î¥Ñ¥±¥Ã¥È¤òõ¤¹¤«¤É¤¦¤«¤ò¡¢
-    ¤½¤ì¤ò¸«¤Æ·è¤á¤ë¤«¤é¤Ç¤¹¡£</p>
-  <h3>Forward Request Í×ÁǤξܺ٤ÊÀâÌÀ
-  </h3>
-  <h3>Request prefix</h3>
-    <p>¥ê¥¯¥¨¥¹¥È¤Ë¤Ä¤¤¤Æ¤ÏÁ´¤Æ¡¢¤³¤ÎÃÍ¤Ï 2 ¤Ë¤Ê¤ê¤Þ¤¹¡£Â¾¤Î Prefix ¥³¡¼¥É¤Î¾ÜºÙ¤Ï
-    ¾åµ­¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</p>
-  
-  <h3>Method</h3>
-    <p>HTTP ¥á¥½¥Ã¥É¤Ï 1 ¥Ð¥¤¥È¤Ë¥¨¥ó¥³¡¼¥É¤µ¤ì¤Þ¤¹ :</p>
-    <table>
-      <tr><td>Command Name</td><td>Code</td></tr>
-      <tr><td>OPTIONS</td><td>1</td></tr>
-      <tr><td>GET</td><td>2</td></tr>
-      <tr><td>HEAD</td><td>3</td></tr>
-      <tr><td>POST</td><td>4</td></tr>
-      <tr><td>PUT</td><td>5</td></tr>
-      <tr><td>DELETE</td><td>6</td></tr>
-      <tr><td>TRACE</td><td>7</td></tr>
-      <tr><td>PROPFIND</td><td>8</td></tr>
-      <tr><td>PROPPATCH</td><td>9</td></tr>
-      <tr><td>MKCOL</td><td>10</td></tr>
-      <tr><td>COPY</td><td>11</td></tr>
-      <tr><td>MOVE</td><td>12</td></tr>
-      <tr><td>LOCK</td><td>13</td></tr>
-      <tr><td>UNLOCK</td><td>14</td></tr>
-      <tr><td>ACL</td><td>15</td></tr>
-      <tr><td>REPORT</td><td>16</td></tr>
-      <tr><td>VERSION-CONTROL</td><td>17</td></tr>
-      <tr><td>CHECKIN</td><td>18</td></tr>
-      <tr><td>CHECKOUT</td><td>19</td></tr>
-      <tr><td>UNCHECKOUT</td><td>20</td></tr>
-      <tr><td>SEARCH</td><td>21</td></tr>
-      <tr><td>MKWORKSPACE</td><td>22</td></tr>
-      <tr><td>UPDATE</td><td>23</td></tr>
-      <tr><td>LABEL</td><td>24</td></tr>
-      <tr><td>MERGE</td><td>25</td></tr>
-      <tr><td>BASELINE_CONTROL</td><td>26</td></tr>
-      <tr><td>MKACTIVITY</td><td>27</td></tr>
-    </table>
-    <p>º£¸å¤Î ajp13 ¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¢¤³¤Î°ìÍ÷¤Ë¤Ê¤¤¡¢º£¸åÄɲ䵤ì¤ë¥á¥½¥Ã¥É¤ò
-    Á÷¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>
-  
-  <h3>protocol, req_uri, remote_addr, remote_host, server_name,
-  server_port, is_ssl</h3>
-    <p>¤³¤ì¤é¤Ï¤Þ¤µ¤Ëʸ»úÄ̤ê¤Î¤â¤Î¤Ç¤¹¡£¤É¤ì¤âɬÍפǡ¢¥ê¥¯¥¨¥¹¥È¤ÎËè²ó¤Ë¤Ä¤­
-    Á÷¤é¤ì¤Þ¤¹¡£</p>
-  
-  <h3>Headers</h3>
-    <p><code>request_headers</code> ¤Î¹½Â¤¤Ï¼¡¤Î¤è¤¦¤Ê¤â¤Î¤Ç¤¹ :
-    ¤Þ¤º¥Ø¥Ã¥À¤Î¿ô <code>num_headers</code> ¤¬¥¨¥ó¥³¡¼¥É¤µ¤ì¤Þ¤¹¡£
-    ¼¡¤Ë¥Ø¥Ã¥À̾ <code>req_header_name</code> / ÃÍ <code>req_header_value</code>
-    ¤ÎÁȤ¬Â³¤­¤Þ¤¹¡£¸úΨ¤Î¤¿¤á¡¢°ìÈÌŪ¤Ê¥Ø¥Ã¥À¤ÏÀ°¿ô¤Ç¥¨¥ó¥³¡¼¥É¤·¤ÆžÁ÷¤·¤Þ¤¹¡£
-    ¥Ø¥Ã¥À̾¤¬´ðËܥإåÀ¤Î°ìÍ÷¤Ë̵¤¤¾ì¹ç¤Ï¡¢Ä̾ïÄ̤ê (ʸ»úÎó¤È¤·¤Æ¡¢Ä¹¤µ
-    ¥×¥ì¥Õ¥£¥Ã¥¯¥¹ÉÕ¤­¤Ç) žÁ÷¤µ¤ì¤Þ¤¹¡£°ìÈÌŪ¤Ê¥Ø¥Ã¥À 
-    <code>sc_req_header_name</code> ¤Î°ìÍ÷¤È¤½¤Î¥³¡¼¥É¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹ 
-    (¤É¤ì¤âÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Þ¤¹) :</p>
-    <table>
-      <tr><td>̾Á°</td><td>¥³¡¼¥É¤ÎÃÍ</td><td>¥³¡¼¥É̾</td></tr>
-      <tr><td>accept</td><td>0xA001</td><td>SC_REQ_ACCEPT</td></tr>
-      <tr><td>accept-charset</td><td>0xA002</td><td>SC_REQ_ACCEPT_CHARSET
-      </td></tr>
-      <tr><td>accept-encoding</td><td>0xA003</td><td>SC_REQ_ACCEPT_ENCODING
-      </td></tr>
-      <tr><td>accept-language</td><td>0xA004</td><td>SC_REQ_ACCEPT_LANGUAGE
-      </td></tr>
-      <tr><td>authorization</td><td>0xA005</td><td>SC_REQ_AUTHORIZATION</td>
-      </tr>
-      <tr><td>connection</td><td>0xA006</td><td>SC_REQ_CONNECTION</td></tr>
-      <tr><td>content-type</td><td>0xA007</td><td>SC_REQ_CONTENT_TYPE</td>
-      </tr>
-      <tr><td>content-length</td><td>0xA008</td><td>SC_REQ_CONTENT_LENGTH</td>
-      </tr>
-      <tr><td>cookie</td><td>0xA009</td><td>SC_REQ_COOKIE</td></tr>
-      <tr><td>cookie2</td><td>0xA00A</td><td>SC_REQ_COOKIE2</td></tr>
-      <tr><td>host</td><td>0xA00B</td><td>SC_REQ_HOST</td></tr>
-      <tr><td>pragma</td><td>0xA00C</td><td>SC_REQ_PRAGMA</td></tr>
-      <tr><td>referer</td><td>0xA00D</td><td>SC_REQ_REFERER</td></tr>
-      <tr><td>user-agent</td><td>0xA00E</td><td>SC_REQ_USER_AGENT</td></tr>
-    </table>
-    <p>¤³¤ì¤òÆɤ߹þ¤à Java ¤Î¥³¡¼¥É¤Ç¤Ï¡¢ºÇ½é¤Î 2 ¥Ð¥¤¥ÈÀ°¿ô¤ò¼è¤ê¹þ¤ß¡¢
-    ÌÜ°õ¤Ë¤Ê¤ë¥Ð¥¤¥È <code>'0xA0'</code> ¤Ç¤¢¤ì¤Ð¡¢¥Ø¥Ã¥À̾¤ÎÇÛÎó¤Î
-    ¥¤¥ó¥Ç¥Ã¥¯¥¹¤ò»È¤¤¤Þ¤¹¡£ÀèƬ¥Ð¥¤¥È¤¬ <code>0xA0</code> ¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢
-    ÀèƬ 2 ¥Ð¥¤¥È¤Ïʸ»úÎóŤòɽ¤¹À°¿ô¤Ç¤¢¤ë¤È²ò¼á¤·¡¢Æɤ߹þ¤ß¤Ï¤¸¤á¤Þ¤¹¡£</p>
-    <p>¥Ø¥Ã¥À̾¤ÎŤµ¤Ï <code>0x9999 (==0xA000 -1)</code> °Ê¾å¤Ë¤Ê¤é¤Ê¤¤¤È¤¤¤¦
-    ²¾Äê¤Î²¼¤ËÆ°¤¤¤Æ¤¤¤Æ¡¢¾¯¤·¤¢¤¤¤Þ¤¤¤Ç¤¹¤¬¹çÍýŪ¤ÊµóÆ°¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
-    <div class="note"><h3>Ãí:</h3>
-    <code>content-length</code> ¥Ø¥Ã¥À¤Ï¤È¤Æ¤â½ÅÍפǤ¹¡£
-    ¸ºß¤·¤Æ¤¤¤ÆÈó¥¼¥í¤Ç¤¢¤ì¤Ð¡¢¥ê¥¯¥¨¥¹¥È¤Ë¤Ï¥Ü¥Ç¥£¤¬¤¢¤ë (Î㤨¤Ð POST 
-    ¥ê¥¯¥¨¥¹¥È) ¤È¿ä¬¤·¡¢¤½¤Î¥Ü¥Ç¥£¤ò¼è¤ê¹þ¤à¤¿¤á¤Ë
-    ľ¸å¤Î¥Ñ¥±¥Ã¥È¤òÆþÎÏ¥¹¥È¥ê¡¼¥à¤«¤éÆɤ߹þ¤ß¤Ï¤¸¤á¤Þ¤¹¡£
-    </div>
-  
-  <h3>°À­</h3>
-    <p><code>?</code> ¥×¥ì¥Õ¥£¥Ã¥¯¥¹¤Ç»Ï¤Þ¤ë°À­ (Îã <code>?context</code>)
-    ¤Ï¡£¾Êά²Äǽ¤Ç¤¹¡£¤½¤ì¤¾¤ì°À­¤Î·¿¤ò¼¨¤¹ 1 ¥Ð¥¤¥È¤Î¥³¡¼¥É¤È¡¢
-    ÃͤÎʸ»úÎó¤¬Â³¤­¤Þ¤¹¡£
-    ¤³¤ì¤é¤Ï½çÉÔƱ¤ÇÁ÷¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹ (C ¤Î¥³¡¼¥É¤Ï¾ï¤Ë²¼¤Î°ìÍ÷½ç¤Ë
-    Á÷¤ë¤è¤¦¤Ç¤¹¤¬) ¡£
-    ¥ª¥×¥·¥ç¥ó¤Î°À­¤Î¥ê¥¹¥È¤ÎºÇ¸å¤Ë¤Ï¡¢ÆÃÊ̤ʽªÎ»¥³¡¼¥É¤¬Á÷¤é¤ì¤Þ¤¹¡£
-    ¥³¡¼¥É¤Î°ìÍ÷¤Ï : </p>
-    <table>
-      <tr><td>Information</td><td>Code Value</td><td>Note</td></tr>
-      <tr><td>?context</td><td>0x01</td><td>̤¼ÂÁõ
-      </td></tr>
-      <tr><td>?servlet_path</td><td>0x02</td><td>̤¼ÂÁõ
-      </td></tr>
-      <tr><td>?remote_user</td><td>0x03</td><td /></tr>
-      <tr><td>?auth_type</td><td>0x04</td><td /></tr>
-      <tr><td>?query_string</td><td>0x05</td><td /></tr>
-      <tr><td>?jvm_route</td><td>0x06</td><td /></tr>
-      <tr><td>?ssl_cert</td><td>0x07</td><td /></tr>
-      <tr><td>?ssl_cipher</td><td>0x08</td><td /></tr>
-      <tr><td>?ssl_session</td><td>0x09</td><td /></tr>
-      <tr><td>?req_attribute</td><td>0x0A</td><td>Name (the name of the
-      attribute follows)</td></tr>
-      <tr><td>?ssl_key_size</td><td>0x0B</td><td /></tr>
-      <tr><td>are_done</td><td>0xFF</td><td>request_terminator</td></tr>
-    </table>
-    <p><code>context</code> ¤È <code>servlet_path</code> ¤Ï¸½ºß¤Î C ¤Î
-    ¥³¡¼¥É¤Ç¤Ï¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£¤Þ¤¿¡¢¤Û¤È¤ó¤É¤Î Java ¤Î¥³¡¼¥É¤Ç¤â¡¢
-    ¤³¤Î¥Õ¥£¡¼¥ë¥É¤Ç²¿¤¬Á÷¤é¤ì¤Æ¤â̵»ë¤µ¤ì¤Þ¤¹ (¤³¤ì¤é¤Î¥³¡¼¥É¤Î¸å¤Ëʸ»úÎó¤¬
-    Á÷¤é¤ì¤ë¤È²õ¤ì¤ë¤â¤Î¤â¤¢¤ê¤Þ¤¹)¡£
-    ¤³¤ì¤¬¥Ð¥°¤Ê¤Î¤«¡¢Ã±¤Ë̤¼ÂÁõ¤Ê¤Î¤«¡¢Îò»ËŪ·Ð°Þ¤Ç»Ä¤Ã¤Æ¤¤¤ë¥³¡¼¥É¤Ê¤Î¤«
-    ʬ¤«¤ê¤Þ¤»¤ó¤¬¡¢¥³¥Í¥¯¥·¥ç¥ó¤Îξ¦¤È¤â¤Ç¸«Åö¤¿¤ê¤Þ¤»¤ó¡£</p>
-    <p><code>remote_user</code> ¤È <code>auth_type</code> ¤Ï¤ª¤½¤é¤¯
-    HTTP ¥ì¥Ù¥ë¤Îǧ¾Ú¤ò»²¾È¤·¤Æ¤¤¤Æ¡¢¥ê¥â¡¼¥È¥æ¡¼¥¶¤Î¥æ¡¼¥¶Ì¾¤Èǧ¾Ú¤Ë»ÈÍѤ·¤¿
-    ¥¿¥¤¥× (Îã Basic, Digest) ¤Ë¤Ä¤¤¤Æ¤ä¤ê¼è¤ê¤·¤Þ¤¹¡£</p>
-    <p><code>query_string</code>, <code>ssl_cert</code>, 
-    <code>ssl_cipher</code>, <code>ssl_session</code> 
-    ¤Ï HTTP ¤È HTTPS ¤ÎÂбþ¤¹¤ëÉôʬ¤ò»²¾È¤·¤Þ¤¹¡£</p>
-    <p><code>jvm_route</code> ¤Ï¥¹¥Æ¥£¥Ã¥­¡¼¥»¥Ã¥·¥ç¥ó¤Î¥µ¥Ý¡¼¥È¡½¡½
-    ¥í¡¼¥É¥Ð¥é¥ó¥¹¤·¤Æ¤¤¤ëÊ£¿ô¤Î¥µ¡¼¥ÐÃæ¤ÎÆÃÄê¤Î Tomcat ¥¤¥ó¥¹¥¿¥ó¥¹¤È¡¢
-    ¥æ¡¼¥¶¤Î¥»¥Ã¥·¥ç¥ó¤È¤òɳÉÕ¤±¤ëµ¡Ç½¡½¡½¤Ë»È¤ï¤ì¤Þ¤¹¡£</p>
-    <p>¤³¤Î´ðËÜ°À­°ìÍ÷¤Ë̵¤¤¤â¤Î¤Ë¤Ä¤¤¤Æ¤Ï¡¢<code>req_attribute</code>
-    ¥³¡¼¥É <code>0x0A</code> ·Ðͳ¤Ç°À­¤ò²¿¸Ä¤Ç¤âÁ÷¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    °À­¤Î̾Á°¤ÈÃͤÎʸ»úÎó¤ÎÁȤò¡¢¤½¤ì¤¾¤ì¤³¤Î¥³¡¼¥É¤Îľ¸å¤ËÁ÷¤ê¤Þ¤¹¡£
-    ´Ä¶­ÊÑ¿ô¤Ï¤³¤ÎÊýË¡¤ÇÅÁ¤¨¤é¤ì¤Þ¤¹¡£</p>
-    <p>ºÇ¸å¤Ë°À­¤¬Á´¤ÆÁ÷¿®¤µ¤ì¤¿¸å¤Ë¡¢Â°À­¤Î½ªÃ¼¤ò¼¨¤¹ <code>0xFF</code> 
-    ¤¬Á÷½Ð¤µ¤ì¤Þ¤¹¡£¤³¤Î¿®¹æ¤Ï°À­¤Î°ìÍ÷¤Î½ª¤ï¤ê¤ò¼¨¤¹¤ÈƱ»þ¤Ë¡¢¥ê¥¯¥¨¥¹¥È
-    ¥Ñ¥±¥Ã¥È¤Î½ªÃ¼¤ò¤â¼¨¤·¤Æ¤¤¤Þ¤¹¡£</p>
-  
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="resppacketstruct" id="resppacketstruct">¥ì¥¹¥Ý¥ó¥¹¥Ñ¥±¥Ã¥È¹½Â¤</a></h2>
-    <p>¥³¥ó¥Æ¥Ê¤¬¥µ¡¼¥Ð¤ËÁ÷¤êÊÖ¤¹¤³¤È¤Î¤Ç¤­¤ë¥á¥Ã¥»¡¼¥¸:</p>
-    <div class="example"><pre>
-AJP13_SEND_BODY_CHUNK :=
-  prefix_code   3
-  chunk_length  (integer)
-  chunk        *(byte)
-
-
-AJP13_SEND_HEADERS :=
-  prefix_code       4
-  http_status_code  (integer)
-  http_status_msg   (string)
-  num_headers       (integer)
-  response_headers *(res_header_name header_value)
-
-res_header_name :=
-    sc_res_header_name | (string)   [see below for how this is parsed]
-
-sc_res_header_name := 0xA0 (byte)
-
-header_value := (string)
-
-AJP13_END_RESPONSE :=
-  prefix_code       5
-  reuse             (boolean)
-
-
-AJP13_GET_BODY_CHUNK :=
-  prefix_code       6
-  requested_length  (integer)
-    </pre></div>
-  <h3>¾ÜºÙ :</h3>
-  <h3>Send Body Chunk</h3>
-    <p>¥Á¥ã¥ó¥¯¤Ï´ðËÜŪ¤Ë¤Ï¥Ð¥¤¥Ê¥ê¥Ç¡¼¥¿¤Ç¡¢¥Ö¥é¥¦¥¶¤ËľÀÜÁ÷¤é¤ì¤Þ¤¹¡£</p>
-  
-  <h3>Send Headers</h3>
-    <p>¥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É¤È¥á¥Ã¥»¡¼¥¸¤¬Ä̾ï¤Î HTTP ¤ÎÄÌ¿®¤Ë¤Ï¤¢¤ê¤Þ¤¹ (Îã 
-    <code>200</code> ¤È <code>OK</code>)¡£¥ì¥¹¥Ý¥ó¥¹¥Ø¥Ã¥À̾¤Ï¡¢
-    ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À̾¤ÈƱÍͤÎÊýË¡¤Ç¥¨¥ó¥³¡¼¥É¤µ¤ì¤Þ¤¹¡£
-    ¥³¡¼¥É¤Èʸ»úÎó¤ÎȽÊÌÊýË¡¤Î¾ÜºÙ¤Ë´Ø¤·¤Æ¤Ï¡¢¾åµ­¤Î header_encoding 
-    ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-    °ìÈÌŪ¤Ê¥Ø¥Ã¥À¤Î¥³¡¼¥É¤Ï :</p>
-    <table>
-      <tr><td>̾Á°</td><td>¥³¡¼¥É¤ÎÃÍ</td></tr>
-      <tr><td>Content-Type</td><td>0xA001</td></tr>
-      <tr><td>Content-Language</td><td>0xA002</td></tr>
-      <tr><td>Content-Length</td><td>0xA003</td></tr>
-      <tr><td>Date</td><td>0xA004</td></tr>
-      <tr><td>Last-Modified</td><td>0xA005</td></tr>
-      <tr><td>Location</td><td>0xA006</td></tr>
-      <tr><td>Set-Cookie</td><td>0xA007</td></tr>
-      <tr><td>Set-Cookie2</td><td>0xA008</td></tr>
-      <tr><td>Servlet-Engine</td><td>0xA009</td></tr>
-      <tr><td>Status</td><td>0xA00A</td></tr>
-      <tr><td>WWW-Authenticate</td><td>0xA00B</td></tr>
-    </table>
-    <p>¥³¡¼¥É¤«¥Ø¥Ã¥Àʸ»úÎó¤Îľ¸å¤Ë¤Ï¡¢¥Ø¥Ã¥À¤ÎÃͤ¬¥¨¥ó¥³¡¼¥É¤µ¤ì¤Þ¤¹¡£</p>
-  
-  <h3>End Response</h3>
-    <p>¥ê¥¯¥¨¥¹¥È½èÍý¥µ¥¤¥¯¥ë¤Î½ªÎ»¤òÃΤ餻¤Þ¤¹¡£<code>reuse</code> ¥Õ¥é¥°¤¬¿¿
-    <code>(==1)</code> ¤Î¾ì¹ç¡¢¸½ºß»ÈÍѤ·¤Æ¤¤¤ë TCP ¥³¥Í¥¯¥·¥ç¥ó¤Ï¼¡¤Î¿·¤·¤¤
-    ¥ê¥¯¥¨¥¹¥È¤Ë»È¤¨¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£<code>reuse</code> ¤¬µ¶ (C ¤Î¥³¡¼¥É¤Ç¤Ï
-    1 °Ê³°¤ÎÁ´¤Æ) ¤Î¾ì¹ç¤Ï¡¢¥³¥Í¥¯¥·¥ç¥ó¤òÊĤ¸¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-  
-  <h3>Get Body Chunk</h3>
-    <p>(¥Ü¥Ç¥£¤Î¥µ¥¤¥º¤¬Â礭¤¹¤®¤ÆºÇ½é¤Î¥Ñ¥±¥Ã¥È¤Ë¼ý¤Þ¤é¤Ê¤¤¾ì¹ç¤ä¡¢
-    ¥ê¥¯¥¨¥¹¥È¤¬¥Á¥ã¥ó¥¯Å¾Á÷¤µ¤ì¤¿¾ì¹ç¤Ê¤É¤Ë¤Ï¡¢) ¥³¥ó¥Æ¥Ê¤Ï¥ê¥¯¥¨¥¹¥È¤«¤é¤Î
-    ¥Ç¡¼¥¿Æɤ߹þ¤ßÍ×µá¤ò¤·¤Þ¤¹¡£¥µ¡¼¥Ð¦¤Ï¤½¤ì¤ËÂФ·¤Æ¡¢ºÇ¾® 
-    <code>request_length</code> ºÇÂç <code>(8186 (8 Kbytes - 6))</code> 
-    ¤ÎÈϰϤǡ¢Ì¤Å¾Á÷¤Ç»Ä¤Ã¤Æ¤¤¤ë¥ê¥¯¥¨¥¹¥È¥Ü¥Ç¥£¤ÎÂ礭¤µ¤Î¥Ç¡¼¥¿¤ò
-    Á÷¤êÊÖ¤·¤Þ¤¹¡£<br />
-    ¥Ü¥Ç¥£¤Ë¤½¤ì°Ê¾å¥Ç¡¼¥¿¤¬»Ä¤Ã¤Æ¤¤¤Ê¤¤¾ì¹ç (¤Ä¤Þ¤ê¥µ¡¼¥Ö¥ì¥Ã¥È¤¬
-    ¥Ü¥Ç¥£¤ÎºÇ¸å¤òĶ¤¨¤ÆÆɤ߹þ¤â¤¦¤È¤·¤¿¾ì¹ç) ¡¢¥µ¡¼¥Ð¤Ï
-    ¥Ú¥¤¥í¡¼¥ÉĹ 0 ¤Î<em>¶õ¥Ñ¥±¥Ã¥È</em><code>(0x12,0x34,0x00,0x00)</code>
-    ¤òÁ÷¤êÊÖ¤·¤Þ¤¹¡£</p>
-  
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_ajp.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_proxy_ajp.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy_ajp.html.ja.utf8 b/docs/manual/mod/mod_proxy_ajp.html.ja.utf8
new file mode 100644
index 00000000..ac09a45a
--- /dev/null
+++ b/docs/manual/mod/mod_proxy_ajp.html.ja.utf8
@@ -0,0 +1,544 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_proxy_ajp - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_proxy_ajp</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_ajp.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_proxy_ajp.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> � AJP 
+をサ�ート�る���モジュール</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>proxy_ajp_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>proxy_ajp.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>本モジュール�� <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> �<em>必���</em>。
+    <code>Apache JServ Protocol version 1.3</code> (以� <em>AJP13</em>)
+    をサ�ート���。</p>
+
+    <p><code>AJP13</code> プロトコルを扱�るよ���る��
+    <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> � <code class="module"><a href="../mod/mod_proxy_ajp.html">mod_proxy_ajp</a></code>
+    をサー��組�込む必���り��。</p>
+
+    <div class="warning"><h3>警告</h3>
+      <p><a href="#access">安全�サー���る</a>��プロクシ機能�有効���������。
+      オープンプロキシサー�����自身��ットワーク����も�
+      インター�ット全体����も�険��。</p>
+    </div>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<p>��モジュール�ディレクティブ��り��ん。</p>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#overviewprotocol">プロトコル�概�</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#basppacketstruct">基本パケット構造</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#rpacetstruct">リクエストパケット構造</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#resppacketstruct">レス�ンスパケット構造</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="overviewprotocol" id="overviewprotocol">プロトコル�概�</a></h2>
+    <p><code>AJP13</code> プロトコル�パケット指���。
+    �読�プレーンテキスト形������イナリ形��������
+    ��ら�パフォーマンス上��由�より��。
+    ウェブサー��サーブレットコンテナ� TCP コ�クション�通信���。
+    ソケット生����処�����負�を減ら�����サーブレットコンテナ��
+    TCP 接続を維���複数�リクエスト・レス�ンス処�サイクル�対��一��
+    コ�クションを使����よ��������。</p>
+    <p>�るリクエスト�コ�クション�割り当�られる����処�サイクル�
+    完了�る��他�も��使�れる����り��ん。
+    ��りコ�クション上���リクエスト��時処��行�れ��ん。
+    �����コ�クション両端��実行�るコードを簡潔���る一方��
+    �時�開�コ�クション�多�������。</p>
+    <p>サーブレットコンテナ��コ�クションを開��後��コ�クション�状態�
+    次��れ���り��:</p>
+    <ul>
+    <li> Idle <br />コ�クション上�処��れ��るリクエスト��り��ん。</li>
+    <li> Assigned <br />コ�クション�リクエストを処�中��。</li>
+    </ul>
+    <p>コ�クション�特定�リクエスト�アサイン�れる��基本的�情報 (例��
+    HTTP ヘッダ等) �圧縮�れ�形 (例��通常�文字列�整数�エンコード�れ��)
+    �転��れ��。詳細�下記�「リクエストパケット�構造�を�照������。
+    リクエスト�ボディ�存在 <code>(content-length &gt; 0)</code> �れ��
+    基本的�情報�直後�別パケット�転��れ��。</p>
+    <p>��時点���ら��サーブレットコンテナ�処�を開始��るよ���り��。
+    �����次�メッセージをウェブサー��戻��知ら�られるよ���り��。</p>
+    <ul>
+    <li>SEND_HEADERS <br />ブラウザ�ヘッダを�信���。</li>
+    <li>SEND_BODY_CHUNK <br />ブラウザ�ボディデータ��ャンクを�り��。
+    </li>
+    <li>GET_BODY_CHUNK <br />リクエスト�データを全����り終����������
+    残���るデータを���り��。パケット��る定���最大長��り�任��
+    大���データ�リクエスト�ボディ�����れ�る場� 
+    (例��ファイル�アップロード�場�) �必���り��。
+    (注: HTTP ��ャンク転���関連�り��ん。)</li>
+    <li>END_RESPONSE <br />リクエスト処�サイクルを終了���。</li>
+    </ul>
+    <p>個々�メッセージ��れ�れ異�るデータパケット形��������。
+    後述�「レス�ンスパケット�構造�を�照������。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="basppacketstruct" id="basppacketstruct">基本パケット構造</a></h2>
+    <p>��プロトコル�� XDR �ら��継��部分�少��り����多��点�
+    異�り�� (例�� 4 �イトアライメント�������) 。</p>
+    <p>�イトオーダー: 個々��イト�エンディアン�������る���
+    ��詳���������リトルエンディアン�����る�����。
+    XDR 仕様�������る���素晴ら����� sys/socket ライブラリ�
+    (C �) ����風�����る�������������。
+    ソケット呼�出��内部����より詳��方��ら��ゃ����ら�
+    �教授����。</p>
+    <p>プロトコル�� 4 ��データタイプ��り��: byte, boolean, 
+    integer, string ��。</p>
+    <dl>
+    <dt><strong>Byte</strong></dt><dd>�イト一���。</dd>
+    <dt><strong>Boolean</strong></dt>
+      <dd>�イト一���<code>1 = true</code>, <code>0 = false</code> ��。
+      (C �よ��) �零を真���扱��������る場��動��も�れ��ん��
+      動����も�れ��ん。</dd>
+    <dt><strong>Integer</strong></dt>
+      <dd><code>0 �ら 2^16 (32768)</code> �範囲�数字。高次� 2 �イト�
+      先�格��れ��。</dd>
+    <dt><strong>String</strong></dt>
+      <dd>�変長�文字列 (2^16 �長��上�) 。長�情報�パケット 2 �イト�後�
+      文字列 (終端文字 '\0' を�む) �続�形��エンコード�れ��。
+      エンコード�れ��る長�情報�最後� '\0' を<strong>カウント���</strong>
+      ���注�������――�れ� <code>strlen</code> ��様��。
+      �れら�終端文字をスキップ�る������り�味�無�インクリメント文
+      を���ん書�����������
+      Java ���ら見る�少�紛ら���感�られる�も�れ��ん。
+      ������由���ら��Servlet コンテナ�ら返�れる文字列を読�出�時��
+      効率よ� C �コードを書�るよ���る――サーブレット�ら返�れる
+      文字列� \0 文字�終端�れ��る���C �コード������コピーを����
+      一���ッファ��リファレンスを�り回�よ��書������る――
+      ������れ��。
+      '\0' 文字���場���C ��文字列��則���よ��コピー���れ�
+      ������������。</dd>
+    </dl>
+
+  <h3>パケットサイズ</h3>
+    <p>多��コード�������る�����パケットサイズ�最大サイズ�
+    <code>8 * 1024 (8K)</code> ��。パケット�実際�長��ヘッダ�
+    エンコード�れ�入�����。</p>
+  
+  <h3>パケットヘッダ</h3>
+    <p>サー��らコンテナ��出�れるパケット� <code>0x1234</code> �始�り��。
+    コンテナ�らサー���られるパケット� <code>AB</code> (ASCII コード A �
+    ASCII コード B) �始�り��。��二�イト�後��ペイロード長� (上記�形��) 
+    続���。�����ペイロード長�最大値� 2^16 ���るよ��������
+    実際��コード��最大値� 8K �設定�れ����。</p>
+    <table>
+      <tr>
+        <td colspan="6"><em>パケット形� (Server-&gt;Container)</em></td>
+      </tr>
+      <tr>
+        <td>Byte</td>
+        <td>0</td>
+        <td>1</td>
+        <td>2</td>
+        <td>3</td>
+        <td>4...(n+3)</td>
+      </tr>
+      <tr>
+        <td>Contents</td>
+        <td>0x12</td>
+        <td>0x34</td>
+        <td colspan="2">データ長 (n)</td>
+        <td>Data</td>
+      </tr>
+    </table>
+    <table>
+      <tr>
+        <td colspan="6"><em>パケット形� (Container-&gt;Server)</em></td>
+      </tr>
+      <tr>
+        <td>Byte</td>
+        <td>0</td>
+        <td>1</td>
+        <td>2</td>
+        <td>3</td>
+        <td>4...(n+3)</td>
+      </tr>
+      <tr>
+        <td>Contents</td>
+        <td>A</td>
+        <td>B</td>
+        <td colspan="2">データ長 (n)</td>
+        <td>Data</td>
+      </tr>
+    </table>
+    <p>��ん��パケット��ペイロード�最���イト�メッセージ�型をエンコード
+     �����。例外�サー��らコンテナ��られるリクエストボディパケット��
+     ――�れら�標準的�パケット形� (<code>0x1234</code> �パケット長)
+     ������後�続�プレフィックスコード��り��ん。</p>
+     <p>ウェブサー��次�メッセージをサーブレットコンテナ��出����。</p>
+    <table>
+      <tr>
+        <td>コード</td>
+        <td>パケット�型</td>
+        <td>�味</td>
+      </tr>
+      <tr>
+        <td>2</td>
+        <td>Forward Request</td>
+        <td>リクエスト処�サイクルを後続�データ��も�開始�る。</td>
+      </tr>
+      <tr>
+        <td>7</td>
+        <td>Shutdown</td>
+        <td>ウェブサー��コンテナ��コンテナを終了�るよ����る。</td>
+      </tr>
+      <tr>
+        <td>8</td>
+        <td>Ping</td>
+        <td>ウェブサー��コンテナ�制御を����よ����る 
+        (セキュアログインフェーズ) 。</td>
+      </tr>
+      <tr>
+        <td>10</td>
+        <td>CPing</td>
+        <td>ウェブサー��コンテナ� CPong ��座�応答�るよ����る。</td>
+      </tr>
+      <tr>
+        <td>none</td>
+        <td>Data</td>
+        <td>サイズ (2 �イト) ��れ�続�ボディデータ。</td>
+      </tr>
+    </table>
+    <p>基本的�セキュリティを確��る���ホスト�れ��るマシン��一�
+    マシン�ら�リクエスト�対�����コンテナ�実際� <code>Shutdown</code>
+    を実行���。</p>
+    <p>最�� <code>Data</code> パケット��<code>Forward Request</code> 
+    �直後�ウェブサー��ら�られ��。</p>
+    <p>サーブレットコンテナ�ウェブサー���次�タイプ�メッセージを�る���
+    ���� :</p>
+    <table>
+      <tr>
+        <td>コード</td>
+        <td>パケット�型</td>
+        <td>�味</td>
+      </tr>
+      <tr>
+        <td>3</td>
+        <td>Send Body Chunk</td>
+        <td>サーブレットコンテナ�らウェブサー��
+        (�����ら�����ブラウザ�)�ボディ��ャンクを�る。</td>
+      </tr>
+      <tr>
+        <td>4</td>
+        <td>Send Headers</td>
+        <td>サーブレットコンテナ�らウェブサー�� (�����ら�����ブラウザ�)
+        レス�ンスヘッダを�る。</td>
+      </tr>
+      <tr>
+        <td>5</td>
+        <td>End Response</td>
+        <td>レス�ンス (��りリクエスト処�サイクル) 終了�目�を�る。
+        </td>
+      </tr>
+      <tr>
+        <td>6</td>
+        <td>Get Body Chunk</td>
+        <td>��全�転��れ����場��残���るリクエスト�データを���る。
+        </td>
+      </tr>
+      <tr>
+        <td>9</td>
+        <td>CPong 応答</td>
+        <td>CPing リクエスト�応答�る。</td>
+      </tr>
+    </table>
+    <p>上記メッセージ���れ�れ内部構造�異������。詳細�下記を�覧����。
+    </p>
+  
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="rpacetstruct" id="rpacetstruct">リクエストパケット構造</a></h2>
+    <p>サー��らコンテナ��られるメッセージ�
+    <em>Forward Request</em> 型�場� :</p>
+    <div class="example"><pre>
+AJP13_FORWARD_REQUEST :=
+    prefix_code      (byte) 0x02 = JK_AJP13_FORWARD_REQUEST
+    method           (byte)
+    protocol         (string)
+    req_uri          (string)
+    remote_addr      (string)
+    remote_host      (string)
+    server_name      (string)
+    server_port      (integer)
+    is_ssl           (boolean)
+    num_headers      (integer)
+    request_headers *(req_header_name req_header_value)
+    attributes      *(attribut_name attribute_value)
+    request_terminator (byte) OxFF
+    </pre></div>
+    <p><code>request_headers</code> �次�よ��構造������� :
+    </p><div class="example"><pre>
+req_header_name := 
+    sc_req_header_name | (string)  [see below for how this is parsed]
+
+sc_req_header_name := 0xA0xx (integer)
+
+req_header_value := (string)
+</pre></div>
+    <p><code>属性</code> �オプション��次�よ��構造を����� :</p>
+    <div class="example"><pre>
+attribute_name := sc_a_name | (sc_a_req_attribute string)
+
+attribute_value := (string)
+
+    </pre></div>
+    <p>も��も���ヘッダ� <code>content-length</code> �������
+    注�������。コンテナ�次�パケットを探�����を�
+    �れを見�決�る�ら��。</p>
+  <h3>Forward Request �素�詳細�説明
+  </h3>
+  <h3>Request prefix</h3>
+    <p>リクエスト�����全����値� 2 ��り��。他� Prefix コード�詳細�
+    上記を�覧����。</p>
+  
+  <h3>Method</h3>
+    <p>HTTP メソッド� 1 �イト�エンコード�れ�� :</p>
+    <table>
+      <tr><td>Command Name</td><td>Code</td></tr>
+      <tr><td>OPTIONS</td><td>1</td></tr>
+      <tr><td>GET</td><td>2</td></tr>
+      <tr><td>HEAD</td><td>3</td></tr>
+      <tr><td>POST</td><td>4</td></tr>
+      <tr><td>PUT</td><td>5</td></tr>
+      <tr><td>DELETE</td><td>6</td></tr>
+      <tr><td>TRACE</td><td>7</td></tr>
+      <tr><td>PROPFIND</td><td>8</td></tr>
+      <tr><td>PROPPATCH</td><td>9</td></tr>
+      <tr><td>MKCOL</td><td>10</td></tr>
+      <tr><td>COPY</td><td>11</td></tr>
+      <tr><td>MOVE</td><td>12</td></tr>
+      <tr><td>LOCK</td><td>13</td></tr>
+      <tr><td>UNLOCK</td><td>14</td></tr>
+      <tr><td>ACL</td><td>15</td></tr>
+      <tr><td>REPORT</td><td>16</td></tr>
+      <tr><td>VERSION-CONTROL</td><td>17</td></tr>
+      <tr><td>CHECKIN</td><td>18</td></tr>
+      <tr><td>CHECKOUT</td><td>19</td></tr>
+      <tr><td>UNCHECKOUT</td><td>20</td></tr>
+      <tr><td>SEARCH</td><td>21</td></tr>
+      <tr><td>MKWORKSPACE</td><td>22</td></tr>
+      <tr><td>UPDATE</td><td>23</td></tr>
+      <tr><td>LABEL</td><td>24</td></tr>
+      <tr><td>MERGE</td><td>25</td></tr>
+      <tr><td>BASELINE_CONTROL</td><td>26</td></tr>
+      <tr><td>MKACTIVITY</td><td>27</td></tr>
+    </table>
+    <p>今後� ajp13 �ージョン�����一覧����今後追加�れるメソッドを
+    �る�も�れ��ん。</p>
+  
+  <h3>protocol, req_uri, remote_addr, remote_host, server_name,
+  server_port, is_ssl</h3>
+    <p>�れら����文字通り�も���。�れも必���リクエスト�毎回���
+    �られ��。</p>
+  
+  <h3>Headers</h3>
+    <p><code>request_headers</code> �構造�次�よ��も��� :
+    ��ヘッダ�数 <code>num_headers</code> �エンコード�れ��。
+    次�ヘッダ� <code>req_header_name</code> / 値 <code>req_header_value</code>
+    �組�続���。効率����一般的�ヘッダ�整数�エンコード��転����。
+    ヘッダ��基本ヘッダ�一覧�無�場���通常通り (文字列����長�
+    プレフィックス付��) 転��れ��。一般的�ヘッダ 
+    <code>sc_req_header_name</code> �一覧���コード�次�通り�� 
+    (�れも大文字�文字を区別���) :</p>
+    <table>
+      <tr><td>��</td><td>コード�値</td><td>コード�</td></tr>
+      <tr><td>accept</td><td>0xA001</td><td>SC_REQ_ACCEPT</td></tr>
+      <tr><td>accept-charset</td><td>0xA002</td><td>SC_REQ_ACCEPT_CHARSET
+      </td></tr>
+      <tr><td>accept-encoding</td><td>0xA003</td><td>SC_REQ_ACCEPT_ENCODING
+      </td></tr>
+      <tr><td>accept-language</td><td>0xA004</td><td>SC_REQ_ACCEPT_LANGUAGE
+      </td></tr>
+      <tr><td>authorization</td><td>0xA005</td><td>SC_REQ_AUTHORIZATION</td>
+      </tr>
+      <tr><td>connection</td><td>0xA006</td><td>SC_REQ_CONNECTION</td></tr>
+      <tr><td>content-type</td><td>0xA007</td><td>SC_REQ_CONTENT_TYPE</td>
+      </tr>
+      <tr><td>content-length</td><td>0xA008</td><td>SC_REQ_CONTENT_LENGTH</td>
+      </tr>
+      <tr><td>cookie</td><td>0xA009</td><td>SC_REQ_COOKIE</td></tr>
+      <tr><td>cookie2</td><td>0xA00A</td><td>SC_REQ_COOKIE2</td></tr>
+      <tr><td>host</td><td>0xA00B</td><td>SC_REQ_HOST</td></tr>
+      <tr><td>pragma</td><td>0xA00C</td><td>SC_REQ_PRAGMA</td></tr>
+      <tr><td>referer</td><td>0xA00D</td><td>SC_REQ_REFERER</td></tr>
+      <tr><td>user-agent</td><td>0xA00E</td><td>SC_REQ_USER_AGENT</td></tr>
+    </table>
+    <p>�れを読�込む Java �コード���最�� 2 �イト整数を�り込��
+    目���る�イト <code>'0xA0'</code> ��れ��ヘッダ���列�
+    インデックスを使���。先頭�イト� <code>0xA0</code> ���場���
+    先頭 2 �イト�文字列長を表�整数��る�解釈��読�込������。</p>
+    <p>ヘッダ��長�� <code>0x9999 (==0xA000 -1)</code> 以上��ら�����
+    仮定�下�動�����少����������的�挙動�������。</p>
+    <div class="note"><h3>注:</h3>
+    <code>content-length</code> ヘッダ���も����。
+    存在�����ゼロ��れ��リクエスト��ボディ��る (例�� POST 
+    リクエスト) �推測����ボディを�り込む���
+    直後�パケットを入力ストリーム�ら読�込������。
+    </div>
+  
+  <h3>属性</h3>
+    <p><code>?</code> プレフィックス�始�る属性 (例 <code>?context</code>)
+    �。�略�能��。�れ�れ属性�型を示� 1 �イト�コード��
+    値�文字列�続���。
+    �れら�順����る������� (C �コード�常�下�一覧順�
+    �るよ����) 。
+    オプション�属性�リスト�最後���特別�終了コード��られ��。
+    コード�一覧� : </p>
+    <table>
+      <tr><td>Information</td><td>Code Value</td><td>Note</td></tr>
+      <tr><td>?context</td><td>0x01</td><td>未実装
+      </td></tr>
+      <tr><td>?servlet_path</td><td>0x02</td><td>未実装
+      </td></tr>
+      <tr><td>?remote_user</td><td>0x03</td><td /></tr>
+      <tr><td>?auth_type</td><td>0x04</td><td /></tr>
+      <tr><td>?query_string</td><td>0x05</td><td /></tr>
+      <tr><td>?jvm_route</td><td>0x06</td><td /></tr>
+      <tr><td>?ssl_cert</td><td>0x07</td><td /></tr>
+      <tr><td>?ssl_cipher</td><td>0x08</td><td /></tr>
+      <tr><td>?ssl_session</td><td>0x09</td><td /></tr>
+      <tr><td>?req_attribute</td><td>0x0A</td><td>Name (the name of the
+      attribute follows)</td></tr>
+      <tr><td>?ssl_key_size</td><td>0x0B</td><td /></tr>
+      <tr><td>are_done</td><td>0xFF</td><td>request_terminator</td></tr>
+    </table>
+    <p><code>context</code> � <code>servlet_path</code> ��在� C �
+    コード��セット�れ����ん。�����ん�� Java �コード�も�
+    ��フィールド�何��られ�も無視�れ�� (�れら�コード�後�文字列�
+    �られる�壊れるも�も�り��)。
+    �れ��グ������未実装����歴�的経緯�残���るコード���
+    分�り��ん��コ�クション�両��も�見当�り��ん。</p>
+    <p><code>remote_user</code> � <code>auth_type</code> ���ら�
+    HTTP レベル��証を�照�����リモートユーザ�ユーザ���証�使用��
+    タイプ (例 Basic, Digest) ����やり�り���。</p>
+    <p><code>query_string</code>, <code>ssl_cert</code>, 
+    <code>ssl_cipher</code>, <code>ssl_session</code> 
+    � HTTP � HTTPS �対応�る部分を�照���。</p>
+    <p><code>jvm_route</code> �スティッキーセッション�サ�ート――
+    ロード�ランス���る複数�サー�中�特定� Tomcat インスタンス��
+    ユーザ�セッション�を�付�る機能――�使�れ��。</p>
+    <p>��基本属性一覧�無�も�������<code>req_attribute</code>
+    コード <code>0x0A</code> 経由�属性を何個�も�る�������。
+    属性����値�文字列�組を��れ�れ��コード�直後��り��。
+    環境変数���方法���られ��。</p>
+    <p>最後�属性�全��信�れ�後��属性�終端を示� <code>0xFF</code> 
+    ��出�れ��。��信��属性�一覧�終�りを示���時��リクエスト
+    パケット�終端をも示�����。</p>
+  
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="resppacketstruct" id="resppacketstruct">レス�ンスパケット構造</a></h2>
+    <p>コンテナ�サー���り返������るメッセージ:</p>
+    <div class="example"><pre>
+AJP13_SEND_BODY_CHUNK :=
+  prefix_code   3
+  chunk_length  (integer)
+  chunk        *(byte)
+
+
+AJP13_SEND_HEADERS :=
+  prefix_code       4
+  http_status_code  (integer)
+  http_status_msg   (string)
+  num_headers       (integer)
+  response_headers *(res_header_name header_value)
+
+res_header_name :=
+    sc_res_header_name | (string)   [see below for how this is parsed]
+
+sc_res_header_name := 0xA0 (byte)
+
+header_value := (string)
+
+AJP13_END_RESPONSE :=
+  prefix_code       5
+  reuse             (boolean)
+
+
+AJP13_GET_BODY_CHUNK :=
+  prefix_code       6
+  requested_length  (integer)
+    </pre></div>
+  <h3>詳細 :</h3>
+  <h3>Send Body Chunk</h3>
+    <p>�ャンク�基本的���イナリデータ��ブラウザ�直接�られ��。</p>
+  
+  <h3>Send Headers</h3>
+    <p>ステータスコード�メッセージ�通常� HTTP �通信���り�� (例 
+    <code>200</code> � <code>OK</code>)。レス�ンスヘッダ���
+    リクエストヘッダ���様�方法�エンコード�れ��。
+    コード�文字列�判別方法�詳細�関����上記� header_encoding 
+    を�照������。
+    一般的�ヘッダ�コード� :</p>
+    <table>
+      <tr><td>��</td><td>コード�値</td></tr>
+      <tr><td>Content-Type</td><td>0xA001</td></tr>
+      <tr><td>Content-Language</td><td>0xA002</td></tr>
+      <tr><td>Content-Length</td><td>0xA003</td></tr>
+      <tr><td>Date</td><td>0xA004</td></tr>
+      <tr><td>Last-Modified</td><td>0xA005</td></tr>
+      <tr><td>Location</td><td>0xA006</td></tr>
+      <tr><td>Set-Cookie</td><td>0xA007</td></tr>
+      <tr><td>Set-Cookie2</td><td>0xA008</td></tr>
+      <tr><td>Servlet-Engine</td><td>0xA009</td></tr>
+      <tr><td>Status</td><td>0xA00A</td></tr>
+      <tr><td>WWW-Authenticate</td><td>0xA00B</td></tr>
+    </table>
+    <p>コード�ヘッダ文字列�直後���ヘッダ�値�エンコード�れ��。</p>
+  
+  <h3>End Response</h3>
+    <p>リクエスト処�サイクル�終了を知ら���。<code>reuse</code> フラグ�真
+    <code>(==1)</code> �場���在使用���る TCP コ�クション�次�新��
+    リクエスト�使�るよ���り��。<code>reuse</code> �� (C �コード��
+    1 以外�全�) �場���コ�クションを閉�る����り��。</p>
+  
+  <h3>Get Body Chunk</h3>
+    <p>(ボディ�サイズ�大����最��パケット���ら��場�や�
+    リクエスト��ャンク転��れ�場������) コンテナ�リクエスト�ら�
+    データ読�込��求を���。サー����れ�対���最� 
+    <code>request_length</code> 最大 <code>(8186 (8 Kbytes - 6))</code> 
+    �範囲��未転��残���るリクエストボディ�大���データを
+    �り返���。<br />
+    ボディ��れ以上データ�残�����場� (��りサーブレット�
+    ボディ�最後を超��読�込も����場�) �サー��
+    ペイロード長 0 �<em>空パケット</em><code>(0x12,0x34,0x00,0x00)</code>
+    を�り返���。</p>
+  
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_ajp.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_proxy_ajp.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy_balancer.html b/docs/manual/mod/mod_proxy_balancer.html
index bca5d274..8cf8ef65 100644
--- a/docs/manual/mod/mod_proxy_balancer.html
+++ b/docs/manual/mod/mod_proxy_balancer.html
@@ -1,7 +1,9 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_proxy_balancer.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_proxy_balancer.html.ja.euc-jp
+URI: mod_proxy_balancer.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/mod_proxy_balancer.html.en b/docs/manual/mod/mod_proxy_balancer.html.en
index 1fb15f3b..2d7e43f4 100644
--- a/docs/manual/mod/mod_proxy_balancer.html.en
+++ b/docs/manual/mod/mod_proxy_balancer.html.en
@@ -51,6 +51,7 @@
 <h3>Topics</h3>
 <ul id="topics">
 <li><img alt="" src="../images/down.gif" /> <a href="#scheduler">Load balancer scheduler algorithm</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#example">Example of a balancer configuration</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#requests">Request Counting Algorithm</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#traffic">Weighted Traffic Counting Algorithm</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#environment">Exported Environment Variables</a></li>
@@ -71,6 +72,22 @@
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
+<h2><a name="example" id="example">Example of a balancer configuration</a></h2>
+	
+	<p>Before we dive into the technical details, here's an example of
+	how you might use <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code> to provide
+	load balancing between two back-end servers:
+	</p>
+
+	<div class="example"><p><code>
+	&lt;Proxy balancer://mycluster&gt;<br />
+		BalancerMember http://192.168.1.50:80<br />
+		BalancerMember http://192.168.1.51:80<br />
+	&lt;/Proxy&gt;<br />
+	ProxyPass /test balancer://mycluster/
+	</code></p></div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
 <h2><a name="requests" id="requests">Request Counting Algorithm</a></h2>
     
     <p>Enabled via <code>lbmethod=byrequests</code>, the idea behind this
@@ -343,7 +360,7 @@ candidate lbstatus -= total factor</code></pre></div>
     <code class="module"><a href="../mod/mod_status.html">mod_status</a></code> and <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code>
     have to be present in the server.</p>
 
-    <p>To enable load balancer management for browsers from the foo.com
+    <p>To enable load balancer management for browsers from the example.com
     domain add this code to your <code>httpd.conf</code>
     configuration file</p>
 <div class="example"><p><code>
@@ -352,7 +369,7 @@ candidate lbstatus -= total factor</code></pre></div>
 <br />
     Order Deny,Allow<br />
     Deny from all<br />
-    Allow from .foo.com<br />
+    Allow from .example.com<br />
     &lt;/Location&gt;
 </code></p></div>
 
@@ -365,6 +382,6 @@ candidate lbstatus -= total factor</code></pre></div>
 <p><span>Available Languages: </span><a href="../en/mod/mod_proxy_balancer.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_proxy_balancer.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy_balancer.html.ja.euc-jp b/docs/manual/mod/mod_proxy_balancer.html.ja.euc-jp
deleted file mode 100644
index c896c9fb..00000000
--- a/docs/manual/mod/mod_proxy_balancer.html.ja.euc-jp
+++ /dev/null
@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_proxy_balancer - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_proxy_balancer</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_balancer.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_proxy_balancer.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>Éé²Ùʬ»¶¤Î¤¿¤á¤Î <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ³ÈÄ¥</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>proxy_balancer_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>proxy_balancer.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.1 °Ê¹ß</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>Ëܥ⥸¥å¡¼¥ë¤Ë¤Ï <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> ¤¬<em>ɬÍפǤ¹</em>¡£
-    <code>HTTP</code>, <code>FTP</code> ¤È <code>AJP13</code>
-    ¥×¥í¥È¥³¥ë¤Î¥í¡¼¥É¥Ð¥é¥ó¥¹µ¡Ç½¤ò»ý¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p>¤Ç¤¹¤«¤é¡¢ ¥í¡¼¥É¥Ð¥é¥ó¥¹¤òÍ­¸ú¤Ë¤¹¤ë¾ì¹ç <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>
-    ¤È <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code> ¤¬¥µ¡¼¥Ð¤ËÁȤ߹þ¤Þ¤ì¤Æ
-    ¤¤¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó¡£</p>
-
-    <div class="warning"><h3>·Ù¹ð</h3>
-      <p><a href="mod_proxy.html#access">°ÂÁ´¤Ê¥µ¡¼¥Ð¤Ë¤¹¤ë</a>¤Þ¤Ç¥×¥í¥¯¥·µ¡Ç½¤ÏÍ­¸ú¤Ë¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-      ¥ª¡¼¥×¥ó¥×¥í¥­¥·¥µ¡¼¥Ð¤Ï¤¢¤Ê¤¿¼«¿È¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤Ë¤È¤Ã¤Æ¤â¡¢
-      ¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÁ´ÂΤˤȤäƤâ´í¸±¤Ç¤¹¡£</p>
-    </div>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤¢¤ê¤Þ¤»¤ó¡£</p>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#scheduler">¥í¡¼¥É¥Ð¥é¥ó¥µ¤Î¥¹¥±¥¸¥å¡¼¥é¤Î¥¢¥ë¥´¥ê¥º¥à</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#byrequests">Request Counting ¥¢¥ë¥´¥ê¥º¥à</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#bytraffic">Weighted Traffic Counting ¥¢¥ë¥´¥ê¥º¥à</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#enable">¥Ð¥é¥ó¥µ¥Þ¥Í¡¼¥¸¥ã¤Î¥µ¥Ý¡¼¥È¤òÍ­¸ú¤Ë¤¹¤ë</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="scheduler" id="scheduler">¥í¡¼¥É¥Ð¥é¥ó¥µ¤Î¥¹¥±¥¸¥å¡¼¥é¤Î¥¢¥ë¥´¥ê¥º¥à</a></h2>
-    
-    <p>¸½»þÅÀ¤Ç¤Ï 2 ¼ïÎà¤Î¥í¡¼¥É¥Ð¥é¥ó¥µ¥¹¥±¥¸¥å¡¼¥é¥¢¥ë¥´¥ê¥º¥à¤«¤éÁª¤Ù¤Þ¤¹¡£
-    ¥ê¥¯¥¨¥¹¥È²ó¿ô¤Ë¤è¤ë¤â¤Î <span class="transnote">(<em>ÌõÃí:</em> Request Counting)</span>
-    ¤È¡¢¥È¥é¥Õ¥£¥Ã¥¯Î̤ˤè¤ë¤â¤Î <span class="transnote">(<em>ÌõÃí:</em> Weighted Traffic Counting)</span>
-    ¤¬¤¢¤ê¤Þ¤¹¡£¥Ð¥é¥ó¥µ¤ÎÀßÄê <code>lbmethod</code> Ãͤǡ¢¤É¤Á¤é¤ò»È¤¦¤«»ØÄꤷ¤Þ¤¹¡£
-    ¾ÜºÙ¤Ï <code class="directive"><a href="../mod/mod_proxy.html#proxy">Proxy</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    »²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="byrequests" id="byrequests">Request Counting ¥¢¥ë¥´¥ê¥º¥à</a></h2>
-    
-    <p><code>lbmethod=byrequests</code> ¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¤³¤Î¥¹¥±¥¸¥å¡¼¥é¤ÎÇطʤˤ¢¤ë¹Í¤¨Êý¤Ï¡¢ÍÍ¡¹¤Ê¥ï¡¼¥«¡¼¤¬¤½¤ì¤¾¤ì¡¢
-    ÀßÄꤵ¤ì¤Æ¤¤¤ëʬô¥ê¥¯¥¨¥¹¥È¿ô¤ò¤­¤Á¤ó¤È¼õ¤±¼è¤ì¤ë¤è¤¦¤Ë¡¢
-    ¥ê¥¯¥¨¥¹¥È¤ò°·¤¦¤È¤¤¤¦¹Í¤¨Êý¤Ç¤¹¡£¼¡¤Î¤è¤¦¤ËÆ°ºî¤·¤Þ¤¹:</p>
-
-    <p><dfn>lbfactor</dfn> ¤Ï¡¢<em>¤É¤ÎÄøÅ٥¥«¡¼¤Ë»Å»ö¤ò¿¶¤ë¤«</em>
-    ¤Ä¤Þ¤ê<em>¥ï¡¼¥«¡¼¤Î¥¯¥ª¡¼¥¿</em>¤ò»Ø¤·¤Þ¤¹¡£¤³¤ÎÃÍ¤Ï "ʬô" 
-    Î̤òɽ¤¹Àµµ¬²½¤µ¤ì¤¿ÃͤǤ¹¡£</p>
-
-    <p><dfn>lbstatus</dfn> ¤Ï¡¢<em>¥ï¡¼¥«¡¼¤Î¥¯¥ª¡¼¥¿¤òËþ¤¿¤¹¤¿¤á¤Ë
-    ¤É¤Î¤°¤é¤¤µÞ¤®¤ÇƯ¤«¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤«</em>¤ò»Ø¤·¤Þ¤¹¡£</p>
-
-    <p><dfn>¥ï¡¼¥«¡¼</dfn>¤Ï¥í¡¼¥É¥Ð¥é¥ó¥µ¤Î¥á¥ó¥Ð¤Ç¡¢Ä̾ï¤Ï¡¢
-    ¥µ¥Ý¡¼¥È¤µ¤ì¤ë¥×¥í¥È¥³¥ë¤Î¤¦¤Á¤Î°ì¤Ä¤òÄ󶡤·¤Æ¤¤¤ë¥ê¥â¡¼¥È¥Û¥¹¥È¤Ç¤¹¡£
-    </p>
-
-    <p>¤Þ¤º¸Ä¡¹¤Î¥ï¡¼¥«¡¼¤Ë¥ï¡¼¥«¡¼¥¯¥ª¡¼¥¿¤ò³ä¤ê¿¶¤ê¡¢¤É¤Î¥ï¡¼¥«¡¼¤¬ºÇ¤âµÞ¤®¤Ç
-    Ư¤«¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤« (lbstatus ¤¬ºÇÂç¤Î¤â¤Î) ¤òÄ´¤Ù¤Þ¤¹¡£
-    ¼¡¤Ë»Å»ö¤ò¤¹¤ë¤è¤¦¤Ë¤³¤Î¥ï¡¼¥«¡¼¤òÁªÂò¤·¡¢ÁªÂò¤·¤¿¥ï¡¼¥«¡¼¤Î lbstatus 
-    ¤òÁ´ÂΤ˳ä¤ê¿¶¤Ã¤¿¤Ö¤ó¤À¤±º¹¤·°ú¤­¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢lbstatus ¤ÎÁíÎ̤Ï
-    ·ë²ÌŪ¤ËÊѲ½¤·¤Þ¤»¤ó(*)¤·¡¢¥ê¥¯¥¨¥¹¥È¤Ï´üÂÔÄ̤ê¤Ëʬ»¶¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>¤¢¤ë¥ï¡¼¥«¡¼¤¬Ìµ¸ú¤Ë¤Ê¤Ã¤Æ¤â¡¢Â¾¤Î¤â¤Î¤ÏÀµ¾ï¤Ë¥¹¥±¥¸¥å¡¼¥ë¤µ¤ì³¤±¤Þ¤¹¡£
-    </p>
-
-    <div class="example"><pre><code>for each worker in workers
-    worker lbstatus += worker lbfactor
-    total factor    += worker lbfactor
-    if worker lbstatus &gt; candidate lbstatus
-        candidate = worker
-
-candidate lbstatus -= total factor</code></pre></div>
-
-    <p>¥Ð¥é¥ó¥µ¤ò¼¡¤Î¤è¤¦¤ËÀßÄꤷ¤¿¾ì¹ç:</p>
-    
-    <table><tr><th>worker</th>
-        <th class="data">a</th>
-        <th class="data">b</th>
-        <th class="data">c</th>
-        <th class="data">d</th></tr>
-<tr><th>lbfactor</th>
-        <td class="data">25</td>
-        <td class="data">25</td>
-        <td class="data">25</td>
-        <td class="data">25</td></tr>
-<tr><th>lbstatus</th>
-        <td class="data">0</td>
-        <td class="data">0</td>
-        <td class="data">0</td>
-        <td class="data">0</td></tr>
-</table>
-
-    <p>¤½¤·¤Æ <var>b</var> ¤¬Ìµ¸ú¤Ë¤Ê¤Ã¤¿¾ì¹ç¡¢¼¡¤Î¤è¤¦¤Ê¥¹¥±¥¸¥å¡¼¥ë¤¬
-    ¹Ô¤ï¤ì¤Þ¤¹¡£</p>
-
-    <table><tr><th>worker</th>
-        <th class="data">a</th>
-        <th class="data">b</th>
-        <th class="data">c</th>
-        <th class="data">d</th></tr>
-<tr><th>lbstatus</th>
-        <td class="data"><em>-50</em></td>
-        <td class="data">0</td>
-        <td class="data">25</td>
-        <td class="data">25</td></tr>
-<tr><th>lbstatus</th>
-        <td class="data">-25</td>
-        <td class="data">0</td>
-        <td class="data"><em>-25</em></td>
-        <td class="data">50</td></tr>
-<tr><th>lbstatus</th>
-        <td class="data">0</td>
-        <td class="data">0</td>
-        <td class="data">0</td>
-        <td class="data"><em>0</em></td></tr>
-<tr><td class="data" colspan="5">(repeat)</td></tr>
-</table>
-
-    <p>¤Ä¤Þ¤ê¤³¤Î¤è¤¦¤Ë¥¹¥±¥¸¥å¡¼¥ë¤µ¤ì¤Þ¤¹: <var>a</var> <var>c</var>
-    <var>d</var> <var>a</var> <var>c</var> <var>d</var> <var>a</var>
-    <var>c</var> <var>d</var> ... ¼¡¤ÎÅÀ¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤:</p>
-
-    <table><tr><th>worker</th>
-        <th class="data">a</th>
-        <th class="data">b</th>
-        <th class="data">c</th>
-        <th class="data">d</th></tr>
-<tr><th>lbfactor</th>
-        <td class="data">25</td>
-        <td class="data">25</td>
-        <td class="data">25</td>
-        <td class="data">25</td></tr>
-</table>
-
-    <p>¤³¤ÎµóÆ°¤Ï¡¢¼¡¤ÎÀßÄê¤ÈÁ´¤¯Æ±¤¸¤Ë¤Ê¤ê¤Þ¤¹:</p>
-
-    <table><tr><th>worker</th>
-        <th class="data">a</th>
-        <th class="data">b</th>
-        <th class="data">c</th>
-        <th class="data">d</th></tr>
-<tr><th>lbfactor</th>
-        <td class="data">1</td>
-        <td class="data">1</td>
-        <td class="data">1</td>
-        <td class="data">1</td></tr>
-</table>
-
-    <p>This is because all values of <dfn>lbfactor</dfn> are normalized
-    with respect to the others. For:</p>
-    <p><dfn>lbfactor</dfn> ¤ÏÁ´¤ÆÀµµ¬²½¤µ¤ì¤¿¤â¤Î¤Ç¡¢
-    ¾¤È¤ÎÁêÂÐÃͤÀ¤«¤é¤Ç¤¹¡£¼¡¤ÎÀßÄê¤Ç¤Ï:</p>
-
-    <table><tr><th>worker</th>
-        <th class="data">a</th>
-        <th class="data">b</th>
-        <th class="data">c</th></tr>
-<tr><th>lbfactor</th>
-        <td class="data">1</td>
-        <td class="data">4</td>
-        <td class="data">1</td></tr>
-</table>
-
-    <p>¥ï¡¼¥«¡¼ <var>b</var> ¤Ï¡¢Ê¿¶Ñ¤·¤Æ¡¢<var>a</var> ¤È <var>c</var>
-    ¤Î 4 Çܤοô¤Î¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±»ý¤Ä¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p>¼¡¤Î¤è¤¦¤ÊÈóÂоΤÊÀßÄê¤Ç¤Ï¡¢¤³¤¦¤Ê¤ë¤ÈͽÁÛ¤µ¤ì¤ë¤Ç¤·¤ç¤¦:</p>
-
-    <table><tr><th>worker</th>
-        <th class="data">a</th>
-        <th class="data">b</th></tr>
-<tr><th>lbfactor</th>
-        <td class="data">70</td>
-        <td class="data">30</td></tr>
-<tr><td class="data" colspan="2">&nbsp;</td></tr>
-<tr><th>lbstatus</th>
-        <td class="data"><em>-30</em></td>
-        <td class="data">30</td></tr>
-<tr><th>lbstatus</th>
-        <td class="data">40</td>
-        <td class="data"><em>-40</em></td></tr>
-<tr><th>lbstatus</th>
-        <td class="data"><em>10</em></td>
-        <td class="data">-10</td></tr>
-<tr><th>lbstatus</th>
-        <td class="data"><em>-20</em></td>
-        <td class="data">20</td></tr>
-<tr><th>lbstatus</th>
-        <td class="data"><em>-50</em></td>
-        <td class="data">50</td></tr>
-<tr><th>lbstatus</th>
-        <td class="data">20</td>
-        <td class="data"><em>-20</em></td></tr>
-<tr><th>lbstatus</th>
-        <td class="data"><em>-10</em></td>
-        <td class="data">10</td></tr>
-<tr><th>lbstatus</th>
-        <td class="data"><em>-40</em></td>
-        <td class="data">40</td></tr>
-<tr><th>lbstatus</th>
-        <td class="data">30</td>
-        <td class="data"><em>-30</em></td></tr>
-<tr><th>lbstatus</th>
-        <td class="data"><em>0</em></td>
-        <td class="data">0</td></tr>
-<tr><td class="data" colspan="3">(repeat)</td></tr>
-</table>
-
-    <p>¥¹¥±¥¸¥å¡¼¥ë¤Ï 10 ¥¹¥±¥¸¥å¡¼¥ë¸å¤Ë·«¤êÊÖ¤µ¤ì¡¢<var>a</var> 7 ²ó¤È
-    <var>b</var> 3 ²ó¤Ç¤Þ¤Ð¤é¤ËÁª¤Ð¤ì¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="bytraffic" id="bytraffic">Weighted Traffic Counting ¥¢¥ë¥´¥ê¥º¥à</a></h2>
-    
-    <p><code>lbmethod=bytraffic</code> ¤ÇÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¤³¤Î¥¹¥±¥¸¥å¡¼¥é¤ÎÇطʤˤ¢¤ë¹Í¤¨Êý¤Ï¡¢Request Counting 
-    ¤ÈÈó¾ï¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¢¼¡¤Î°ã¤¤¤¬¤¢¤ê¤Þ¤¹:</p>
-
-    <p><dfn>lbfactor</dfn> ¤Ï <em>¤É¤ì¤À¤±¤Î¥Ð¥¤¥È¿ô¤Î¥È¥é¥Õ¥£¥Ã¥¯Î̤ò¡¢
-    ¤³¤Î¥ï¡¼¥«¡¼¤Ë½èÍý¤·¤Æ¤â¤é¤¤¤¿¤¤¤«</em> ¤òɽ¤·¤Þ¤¹¡£
-    ¤³¤ÎÃͤâƱÍͤËÀµµ¬²½¤µ¤ì¤¿Ãͤǡ¢¥ï¡¼¥«¡¼Á´ÂΤΤ¦¤Á¤Ç¤Î "ʬô"
-    Î̤òɽ¸½¤·¤Æ¤¤¤Þ¤¹¡£¥ê¥¯¥¨¥¹¥È¿ô¤òñ½ã¤Ë¿ô¤¨¤ëÂå¤ï¤ê¤Ë¡¢
-    ¤É¤ì¤À¤±¤ÎžÁ÷Î̤ò½èÍý¤·¤¿¤«¤ò¿ô¤¨¤Þ¤¹¡£</p>
-
-    <p>¼¡¤Î¤è¤¦¤Ë¥Ð¥é¥ó¥µ¤òÀßÄꤷ¤¿¾ì¹ç:</p>
-    
-    <table><tr><th>worker</th>
-        <th class="data">a</th>
-        <th class="data">b</th>
-        <th class="data">c</th></tr>
-<tr><th>lbfactor</th>
-        <td class="data">1</td>
-        <td class="data">2</td>
-        <td class="data">1</td></tr>
-</table>
-
-    <p><var>b</var> ¤Ë¤Ï <var>a</var> ¤ä <var>c</var> ¤Î 2 ÇÜ
-    ½èÍý¤·¤Æ¤Û¤·¤¤¤È¤¤¤¦¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
-    <var>b</var> ¤Ï 2 ÇܤΠI/O ¤ò½èÍý¤¹¤ë¤È¤¤¤¦°ÕÌ£¤Ë¤Ê¤ê¡¢
-    2 ÇܤΥꥯ¥¨¥¹¥È¿ô¤ò½èÍý¤¹¤ë¤È¤¤¤¦¤³¤È¤Ë¤Ï¤Ê¤ê¤Þ¤»¤ó¡£
-    ¤Ç¤¹¤«¤é¥ê¥¯¥¨¥¹¥È¤È¥ì¥¹¥Ý¥ó¥¹¤Î¥µ¥¤¥º¤¬¡¢
-    ½Å¤ßÉÕ¤±¤È¿¶¤êʬ¤±¤Î¥¢¥ë¥´¥ê¥º¥à¤Ë¸ú¤¤¤Æ¤¤¤Þ¤¹¡£</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="enable" id="enable">¥Ð¥é¥ó¥µ¥Þ¥Í¡¼¥¸¥ã¤Î¥µ¥Ý¡¼¥È¤òÍ­¸ú¤Ë¤¹¤ë</a></h2>
-    
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï <code class="module"><a href="../mod/mod_status.html">mod_status</a></code> ¤Î¥µ¡¼¥Ó¥¹¤ò
-    <em>ɬÍפȤ·¤Þ¤¹</em>¡£
-    ¥Ð¥é¥ó¥µ¥Þ¥Í¡¼¥¸¥ã¤ò»È¤¦¤È¡¢¥Ð¥é¥ó¥µ¤Î¥á¥ó¥Ð¡¼¤ÎưŪ¤Ê¹¹¿·¤¬
-    ¤Ç¤­¤Þ¤¹¡£¥Ð¥é¥ó¥µ¥Þ¥Í¡¼¥¸¥ã¤ò»È¤Ã¤Æ¡¢¥Ð¥é¥ó¥¹·¸¿ô (lbfactor)
-    ¤òÊѹ¹¤·¤¿¤ê¡¢¥á¥ó¥Ð¡¼¤òÊѹ¹¤·¤¿¤ê¡¢ÆÃÄê¤Î¥á¥ó¥Ð¡¼¤ò
-    ¥ª¥Õ¥é¥¤¥ó¥â¡¼¥É¤Ë¤·¤¿¤ê¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¤Ç¤¹¤«¤é¡¢¥í¡¼¥É¥Ð¥é¥ó¥µ´ÉÍýµ¡Ç½¤ò»È¤¤¤¿¤±¤ì¤Ð¡¢
-    <code class="module"><a href="../mod/mod_status.html">mod_status</a></code> ¤È <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code>
-    ¤ò¥µ¡¼¥Ð¤ËÁȤ߹þ¤Þ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-
-    <p>foo.com ¥É¥á¥¤¥ó¤Î¥Ö¥é¥¦¥¶¤«¤é¥í¡¼¥É¥Ð¥é¥ó¥µ´ÉÍýµ¡Ç½¤ò
-    »È¤¨¤ë¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ê¥³¡¼¥É¤ò <code>httpd.conf</code>
-    ¤ËÄɲä·¤Þ¤¹¡£</p>
-<div class="example"><p><code>
-    &lt;Location /balancer-manager&gt;<br />
-    SetHandler balancer-manager<br />
-<br />
-    Order Deny,Allow<br />
-    Deny from all<br />
-    Allow from .foo.com<br />
-    &lt;/Location&gt;
-</code></p></div>
-
-    <p>¤³¤¦¤¹¤ë¤È¡¢<code>http://your.server.name/balancer-manager</code>
-    ¤Î¥Ú¡¼¥¸·Ðͳ¤Ç¡¢¥¦¥§¥Ö¥Ö¥é¥¦¥¶¤«¤é¥í¡¼¥É¥Ð¥é¥ó¥µ¥Þ¥Í¡¼¥¸¥ã¤Ë
-    ¥¢¥¯¥»¥¹¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_balancer.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_proxy_balancer.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy_balancer.html.ja.utf8 b/docs/manual/mod/mod_proxy_balancer.html.ja.utf8
new file mode 100644
index 00000000..6da9fa09
--- /dev/null
+++ b/docs/manual/mod/mod_proxy_balancer.html.ja.utf8
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_proxy_balancer - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_proxy_balancer</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_balancer.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_proxy_balancer.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>負�分散���� <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> 拡張</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>proxy_balancer_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>proxy_balancer.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>2.1 以�</td></tr></table>
+<h3>概�</h3>
+
+    <p>本モジュール�� <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> �<em>必���</em>。
+    <code>HTTP</code>, <code>FTP</code> � <code>AJP13</code>
+    プロトコル�ロード�ランス機能を������。</p>
+
+    <p>���ら� ロード�ランスを有効��る場� <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>
+    � <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code> �サー��組�込�れ�
+    ���れ�����ん。</p>
+
+    <div class="warning"><h3>警告</h3>
+      <p><a href="mod_proxy.html#access">安全�サー���る</a>��プロクシ機能�有効���������。
+      オープンプロキシサー�����自身��ットワーク����も�
+      インター�ット全体����も�険��。</p>
+    </div>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<p>��モジュール�ディレクティブ��り��ん。</p>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#scheduler">ロード�ランサ�スケジューラ�アルゴリズム</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#byrequests">Request Counting アルゴリズム</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#bytraffic">Weighted Traffic Counting アルゴリズム</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#enable">�ランサマ�ージャ�サ�ートを有効��る</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="scheduler" id="scheduler">ロード�ランサ�スケジューラ�アルゴリズム</a></h2>
+    
+    <p>�時点�� 2 種類�ロード�ランサスケジューラアルゴリズム�ら����。
+    リクエスト回数�よるも� <span class="transnote">(<em>訳注:</em> Request Counting)</span>
+    ��トラフィック��よるも� <span class="transnote">(<em>訳注:</em> Weighted Traffic Counting)</span>
+    ��り��。�ランサ�設定 <code>lbmethod</code> 値����らを使��指定���。
+    詳細� <code class="directive"><a href="../mod/mod_proxy.html#proxy">Proxy</a></code> ディレクティブを
+    �照������。</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="byrequests" id="byrequests">Request Counting アルゴリズム</a></h2>
+    
+    <p><code>lbmethod=byrequests</code> �有効��り��。
+    ��スケジューラ�背景��る考�方��様々�ワーカー��れ�れ�
+    設定�れ��る分担リクエスト数を��ん����れるよ���
+    リクエストを扱����考�方��。次�よ��動作���:</p>
+
+    <p><dfn>lbfactor</dfn> ��<em>��程度ワーカー�仕事を振る�</em>
+    ��り<em>ワーカー�クオータ</em>を指���。��値� "分担" 
+    �を表�正�化�れ�値��。</p>
+
+    <p><dfn>lbstatus</dfn> ��<em>ワーカー�クオータを満�����
+    ���ら�急������れ��ら���</em>を指���。</p>
+
+    <p><dfn>ワーカー</dfn>�ロード�ランサ�メン���通常��
+    サ�ート�れるプロトコル����一�を�供���るリモートホスト��。
+    </p>
+
+    <p>��個々�ワーカー�ワーカークオータを割り振り���ワーカー�最も急��
+    ����れ��ら��� (lbstatus �最大�も�) を調���。
+    次�仕事を�るよ����ワーカーを�択���択��ワーカー� lbstatus 
+    を全体�割り振���ん��差�引���。���ら�lbstatus ����
+    �果的�変化���ん(*)��リクエスト�期待通り�分散�れ��。</p>
+
+    <p>�るワーカー�無効����も�他�も��正常�スケジュール�れ続���。
+    </p>
+
+    <div class="example"><pre><code>for each worker in workers
+    worker lbstatus += worker lbfactor
+    total factor    += worker lbfactor
+    if worker lbstatus &gt; candidate lbstatus
+        candidate = worker
+
+candidate lbstatus -= total factor</code></pre></div>
+
+    <p>�ランサを次�よ��設定��場�:</p>
+    
+    <table><tr><th>worker</th>
+        <th class="data">a</th>
+        <th class="data">b</th>
+        <th class="data">c</th>
+        <th class="data">d</th></tr>
+<tr><th>lbfactor</th>
+        <td class="data">25</td>
+        <td class="data">25</td>
+        <td class="data">25</td>
+        <td class="data">25</td></tr>
+<tr><th>lbstatus</th>
+        <td class="data">0</td>
+        <td class="data">0</td>
+        <td class="data">0</td>
+        <td class="data">0</td></tr>
+</table>
+
+    <p>��� <var>b</var> �無効����場��次�よ��スケジュール�
+    行�れ��。</p>
+
+    <table><tr><th>worker</th>
+        <th class="data">a</th>
+        <th class="data">b</th>
+        <th class="data">c</th>
+        <th class="data">d</th></tr>
+<tr><th>lbstatus</th>
+        <td class="data"><em>-50</em></td>
+        <td class="data">0</td>
+        <td class="data">25</td>
+        <td class="data">25</td></tr>
+<tr><th>lbstatus</th>
+        <td class="data">-25</td>
+        <td class="data">0</td>
+        <td class="data"><em>-25</em></td>
+        <td class="data">50</td></tr>
+<tr><th>lbstatus</th>
+        <td class="data">0</td>
+        <td class="data">0</td>
+        <td class="data">0</td>
+        <td class="data"><em>0</em></td></tr>
+<tr><td class="data" colspan="5">(repeat)</td></tr>
+</table>
+
+    <p>��り��よ��スケジュール�れ��: <var>a</var> <var>c</var>
+    <var>d</var> <var>a</var> <var>c</var> <var>d</var> <var>a</var>
+    <var>c</var> <var>d</var> ... 次�点�注�������:</p>
+
+    <table><tr><th>worker</th>
+        <th class="data">a</th>
+        <th class="data">b</th>
+        <th class="data">c</th>
+        <th class="data">d</th></tr>
+<tr><th>lbfactor</th>
+        <td class="data">25</td>
+        <td class="data">25</td>
+        <td class="data">25</td>
+        <td class="data">25</td></tr>
+</table>
+
+    <p>��挙動��次�設定�全�����り��:</p>
+
+    <table><tr><th>worker</th>
+        <th class="data">a</th>
+        <th class="data">b</th>
+        <th class="data">c</th>
+        <th class="data">d</th></tr>
+<tr><th>lbfactor</th>
+        <td class="data">1</td>
+        <td class="data">1</td>
+        <td class="data">1</td>
+        <td class="data">1</td></tr>
+</table>
+
+    <p>This is because all values of <dfn>lbfactor</dfn> are normalized
+    with respect to the others. For:</p>
+    <p><dfn>lbfactor</dfn> �全�正�化�れ�も���
+    他��相対値��ら��。次�設定��:</p>
+
+    <table><tr><th>worker</th>
+        <th class="data">a</th>
+        <th class="data">b</th>
+        <th class="data">c</th></tr>
+<tr><th>lbfactor</th>
+        <td class="data">1</td>
+        <td class="data">4</td>
+        <td class="data">1</td></tr>
+</table>
+
+    <p>ワーカー <var>b</var> ��平����<var>a</var> � <var>c</var>
+    � 4 ��数�リクエストを��������り��。</p>
+
+    <p>次�よ���対称�設定������る�予想�れる��ょ�:</p>
+
+    <table><tr><th>worker</th>
+        <th class="data">a</th>
+        <th class="data">b</th></tr>
+<tr><th>lbfactor</th>
+        <td class="data">70</td>
+        <td class="data">30</td></tr>
+<tr><td class="data" colspan="2">&nbsp;</td></tr>
+<tr><th>lbstatus</th>
+        <td class="data"><em>-30</em></td>
+        <td class="data">30</td></tr>
+<tr><th>lbstatus</th>
+        <td class="data">40</td>
+        <td class="data"><em>-40</em></td></tr>
+<tr><th>lbstatus</th>
+        <td class="data"><em>10</em></td>
+        <td class="data">-10</td></tr>
+<tr><th>lbstatus</th>
+        <td class="data"><em>-20</em></td>
+        <td class="data">20</td></tr>
+<tr><th>lbstatus</th>
+        <td class="data"><em>-50</em></td>
+        <td class="data">50</td></tr>
+<tr><th>lbstatus</th>
+        <td class="data">20</td>
+        <td class="data"><em>-20</em></td></tr>
+<tr><th>lbstatus</th>
+        <td class="data"><em>-10</em></td>
+        <td class="data">10</td></tr>
+<tr><th>lbstatus</th>
+        <td class="data"><em>-40</em></td>
+        <td class="data">40</td></tr>
+<tr><th>lbstatus</th>
+        <td class="data">30</td>
+        <td class="data"><em>-30</em></td></tr>
+<tr><th>lbstatus</th>
+        <td class="data"><em>0</em></td>
+        <td class="data">0</td></tr>
+<tr><td class="data" colspan="3">(repeat)</td></tr>
+</table>
+
+    <p>スケジュール� 10 スケジュール後�繰り返�れ�<var>a</var> 7 回�
+    <var>b</var> 3 回���ら���れ��。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="bytraffic" id="bytraffic">Weighted Traffic Counting アルゴリズム</a></h2>
+    
+    <p><code>lbmethod=bytraffic</code> �有効��り��。
+    ��スケジューラ�背景��る考�方��Request Counting 
+    ��常�似������次�����り��:</p>
+
+    <p><dfn>lbfactor</dfn> � <em>�れ����イト数�トラフィック�を�
+    ��ワーカー�処���もら����</em> を表���。
+    ��値も�様�正�化�れ�値��ワーカー全体����� "分担"
+    �を表������。リクエスト数を�純�数�る代�り��
+    �れ���転��を処����を数���。</p>
+
+    <p>次�よ���ランサを設定��場�:</p>
+    
+    <table><tr><th>worker</th>
+        <th class="data">a</th>
+        <th class="data">b</th>
+        <th class="data">c</th></tr>
+<tr><th>lbfactor</th>
+        <td class="data">1</td>
+        <td class="data">2</td>
+        <td class="data">1</td></tr>
+</table>
+
+    <p><var>b</var> �� <var>a</var> や <var>c</var> � 2 �
+    処�������������り��。
+    <var>b</var> � 2 �� I/O を処��る����味��り�
+    2 ��リクエスト数を処��る��������り��ん。
+    ���らリクエスト�レス�ンス�サイズ��
+    ��付��振り分��アルゴリズム�効�����。</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="enable" id="enable">�ランサマ�ージャ�サ�ートを有効��る</a></h2>
+    
+    <p>��モジュール� <code class="module"><a href="../mod/mod_status.html">mod_status</a></code> �サービスを
+    <em>必�����</em>。
+    �ランサマ�ージャを使����ランサ�メン�ー�動的�更新�
+    ����。�ランサマ�ージャを使����ランス係数 (lbfactor)
+    を変更��り�メン�ーを変更��り�特定�メン�ーを
+    オフラインモード���り����。</p>
+
+    <p>���ら�ロード�ランサ管�機能を使���れ��
+    <code class="module"><a href="../mod/mod_status.html">mod_status</a></code> � <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code>
+    をサー��組�込���れ��り��ん。</p>
+
+    <p>foo.com ドメイン�ブラウザ�らロード�ランサ管�機能を
+    使�るよ���る���次�よ��コードを <code>httpd.conf</code>
+    �追加���。</p>
+<div class="example"><p><code>
+    &lt;Location /balancer-manager&gt;<br />
+    SetHandler balancer-manager<br />
+<br />
+    Order Deny,Allow<br />
+    Deny from all<br />
+    Allow from .foo.com<br />
+    &lt;/Location&gt;
+</code></p></div>
+
+    <p>���る��<code>http://your.server.name/balancer-manager</code>
+    �ページ経由��ウェブブラウザ�らロード�ランサマ�ージャ�
+    アクセス��るよ���り��。</p>
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_balancer.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_proxy_balancer.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy_connect.html b/docs/manual/mod/mod_proxy_connect.html
index 315f683c..05c12719 100644
--- a/docs/manual/mod/mod_proxy_connect.html
+++ b/docs/manual/mod/mod_proxy_connect.html
@@ -1,3 +1,9 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_proxy_connect.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
+
+URI: mod_proxy_connect.html.ja.utf8
+Content-Language: ja
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/mod_proxy_connect.html.en b/docs/manual/mod/mod_proxy_connect.html.en
index dfd0e1ac..f75e41e9 100644
--- a/docs/manual/mod/mod_proxy_connect.html.en
+++ b/docs/manual/mod/mod_proxy_connect.html.en
@@ -21,7 +21,8 @@
 <div id="page-content">
 <div id="preamble"><h1>Apache Module mod_proxy_connect</h1>
 <div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_connect.html" title="English">&nbsp;en&nbsp;</a></p>
+<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_connect.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_proxy_connect.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension for
 <code>CONNECT</code> request handling</td></tr>
@@ -55,8 +56,9 @@
 
 </div>
 <div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_connect.html" title="English">&nbsp;en&nbsp;</a></p>
+<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_connect.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_proxy_connect.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy_connect.html.ja.utf8 b/docs/manual/mod/mod_proxy_connect.html.ja.utf8
new file mode 100644
index 00000000..24fc60c5
--- /dev/null
+++ b/docs/manual/mod/mod_proxy_connect.html.ja.utf8
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_proxy_connect - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_proxy_connect</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_connect.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_proxy_connect.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td><code>CONNECT</code> リクエストを扱�
+<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> 用�拡張</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>proxy_connect_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>proxy_connect.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>本モジュール�� <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> �<em>必���</em>。
+    <code>CONNECT</code> HTTP メソッドをサ�ート���。
+    ��メソッド�主�プロキシ� SSL リクエストを通�
+    <span class="transnote">(<em>訳注:</em> SSLトン�リング)</span>�使�れ��。</p>
+
+    <p><code>CONNECT</code> リクエストを扱�るよ���る��
+    <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> � <code class="module"><a href="../mod/mod_proxy_connect.html">mod_proxy_connect</a></code>
+    をサー��組�込む必���り��。</p>
+
+    <div class="warning"><h3>警告</h3>
+      <p><a href="mod_proxy.html#access">安全�サー���る</a>��プロキシ機能�有効���������。
+      オープンプロキシサー�����自身��ットワーク����も�
+      インター�ット全体����も�険��。</p>
+    </div>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<p>��モジュール�ディレクティブ��り��ん。</p>
+<h3>�照</h3>
+<ul class="seealso">
+<li><code class="directive"><a href="../mod/mod_proxy.html#allowconnect">AllowCONNECT</a></code></li>
+<li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
+</ul></div>
+
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_connect.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_proxy_connect.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy_ftp.html b/docs/manual/mod/mod_proxy_ftp.html
index a0f912a2..0cdfe603 100644
--- a/docs/manual/mod/mod_proxy_ftp.html
+++ b/docs/manual/mod/mod_proxy_ftp.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_proxy_ftp.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_proxy_ftp.html.en b/docs/manual/mod/mod_proxy_ftp.html.en
index 765ce8ac..fb802202 100644
--- a/docs/manual/mod/mod_proxy_ftp.html.en
+++ b/docs/manual/mod/mod_proxy_ftp.html.en
@@ -158,6 +158,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_proxy_ftp.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy_http.html b/docs/manual/mod/mod_proxy_http.html
index 5be29102..156c5d8b 100644
--- a/docs/manual/mod/mod_proxy_http.html
+++ b/docs/manual/mod/mod_proxy_http.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_proxy_http.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_proxy_http.html.en b/docs/manual/mod/mod_proxy_http.html.en
index ce94fd95..1f3d4d9d 100644
--- a/docs/manual/mod/mod_proxy_http.html.en
+++ b/docs/manual/mod/mod_proxy_http.html.en
@@ -115,6 +115,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_proxy_http.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_rewrite.html b/docs/manual/mod/mod_rewrite.html
index 5b651b93..1a7045b6 100644
--- a/docs/manual/mod/mod_rewrite.html
+++ b/docs/manual/mod/mod_rewrite.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_rewrite.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index b3286afa..3ebfb8e0 100644
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -71,6 +71,9 @@ URLs on the fly</td></tr>
 <li><img alt="" src="../images/down.gif" /> <a href="#EnvVar">Environment Variables</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#vhosts">Rewriting in Virtual Hosts</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#Solutions">Practical Solutions</a></li>
+</ul><h3>See also</h3>
+<ul class="seealso">
+<li><a href="#rewriteflags">Rewrite Flags</a></li>
 </ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -1063,50 +1066,10 @@ later</td></tr>
       <code>%{QUERY_STRING}</code> variables respectively.</p>
 </div>
 
-
-
-      <p>Some hints on the syntax of <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular 
-      expressions</a>:</p>
-
-<div class="note"><pre>
-<strong>Text:</strong>
-  <strong><code>.</code></strong>           Any single character
-  <strong><code>[</code></strong>chars<strong><code>]</code></strong>     Character class: Any character of the class ``chars''
-  <strong><code>[^</code></strong>chars<strong><code>]</code></strong>    Character class: Not a character of the class ``chars''
-  text1<strong><code>|</code></strong>text2 Alternative: text1 or text2
-
-<strong>Quantifiers:</strong>
-  <strong><code>?</code></strong>           0 or 1 occurrences of the preceding text
-  <strong><code>*</code></strong>           0 or N occurrences of the preceding text (N &gt; 0)
-  <strong><code>+</code></strong>           1 or N occurrences of the preceding text (N &gt; 1)
-
-<strong>Grouping:</strong>
-  <strong><code>(</code></strong>text<strong><code>)</code></strong>      Grouping of text
-              (used either to set the borders of an alternative as above, or
-              to make backreferences, where the <strong>N</strong>th group can 
-              be referred to on the RHS of a RewriteRule as <code>$</code><strong>N</strong>)
-
-<strong>Anchors:</strong>
-  <strong><code>^</code></strong>           Start-of-line anchor
-  <strong><code>$</code></strong>           End-of-line anchor
-
-<strong>Escaping:</strong>
-  <strong><code>\</code></strong>char       escape the given char
-              (for instance, to specify the chars "<code>.[]()</code>" <em>etc.</em>)
-</pre></div>
-
-      <p>For more information about regular expressions, have a look at the
-      perl regular expression manpage ("<a href="http://perldoc.perl.org/perlre.html">perldoc
-      perlre</a>"). If you are interested in more detailed
-      information about regular expressions and their variants
-      (POSIX regex etc.) the following book is dedicated to this topic:</p>
-
-      <p class="indent">
-        <em>Mastering Regular Expressions, 2nd Edition</em><br />
-         Jeffrey E.F. Friedl<br />
-         O'Reilly &amp; Associates, Inc. 2002<br />
-         ISBN 0-596-00289-0<br />
-      </p>
+      <p>For some hints on <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular
+      expressions</a>, see
+      the <a href="../rewrite/rewrite_intro.html#regex">mod_rewrite
+      Introduction</a>.</p>
 
       <p>In mod_rewrite, the NOT character	
        ('<code>!</code>') is also available as a possible pattern 
@@ -1231,11 +1194,11 @@ cannot use <code>$N</code> in the substitution string!
         Using the B flag, non-alphanumeric characters in backreferences
         will be escaped.  For example, consider the rule:</p>
         <pre><code> RewriteRule ^(.*)$ index.php?show=$1 </code></pre>
-        <p>This will map <code>/C++</code> to <code>index.php?show=C++</code>.
+        <p>This will map <code>/C++</code> to <code>index.php?show=/C++</code>.
         But it will also map <code>/C%2b%2b</code> to
-        <code>index.php?show=C++</code>, because the <code>%2b</code>
+        <code>index.php?show=/C++</code>, because the <code>%2b</code>
         has been unescaped.  With the B flag, it will instead map to
-        <code>index.php?show=&gt;/C%2b%2b</code>.</p>
+        <code>index.php?show=/C%2b%2b</code>.</p>
         <p>This escaping is particularly necessary in a proxy situation,
         when the backend may break if presented with an unescaped URL.</p>
         </dd>
@@ -1629,6 +1592,6 @@ should never be necessary and is unsupported.</p>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_rewrite.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_setenvif.html b/docs/manual/mod/mod_setenvif.html
index 0a1cf29b..40e3e111 100644
--- a/docs/manual/mod/mod_setenvif.html
+++ b/docs/manual/mod/mod_setenvif.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_setenvif.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_setenvif.html.ja.euc-jp
+URI: mod_setenvif.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_setenvif.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_setenvif.html.en b/docs/manual/mod/mod_setenvif.html.en
index 71a98cea..0df35c38 100644
--- a/docs/manual/mod/mod_setenvif.html.en
+++ b/docs/manual/mod/mod_setenvif.html.en
@@ -173,7 +173,10 @@ respect to case</td></tr>
 
       <li><code>Request_URI</code> - the resource requested on the HTTP
        request line -- generally the portion of the URL
-      following the scheme and host portion without the query string</li>
+      following the scheme and host portion without the query string. See
+      the <code class="directive"><a href="../mod/mod_rewrite.html#rewritecond">RewriteCond</a></code>
+      directive of <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> for extra information on
+      how to match your query string.</li>
     </ul>
 </li>
 
@@ -219,7 +222,7 @@ of</p>
    SetEnvIf Request_URI "\.jpg$" object_is_image=jpg<br />
    SetEnvIf Request_URI "\.xbm$" object_is_image=xbm<br />
         :<br />
-   SetEnvIf Referer www\.mydomain\.com intra_site_referral<br />
+   SetEnvIf Referer www\.mydomain\.example\.com intra_site_referral<br />
         :<br />
    SetEnvIf object_is_image xbm XBIT_PROCESSING=1<br />
         :<br />
@@ -230,7 +233,7 @@ of</p>
     <code>object_is_image</code> if the request was for an image
     file, and the fourth sets <code>intra_site_referral</code> if
     the referring page was somewhere on the
-    <code>www.mydomain.com</code> Web site.</p>
+    <code>www.mydomain.example.com</code> Web site.</p>
 
     <p>The last example will set environment variable
     <code>HAVE_TS</code> if the request contains any headers that
@@ -280,6 +283,6 @@ without respect to case</td></tr>
 <a href="../ja/mod/mod_setenvif.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_setenvif.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_setenvif.html.ja.euc-jp b/docs/manual/mod/mod_setenvif.html.ja.euc-jp
deleted file mode 100644
index ffb03390..00000000
--- a/docs/manual/mod/mod_setenvif.html.ja.euc-jp
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_setenvif - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_setenvif</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_setenvif.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_setenvif.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_setenvif.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥ê¥¯¥¨¥¹¥È¤ÎÆÃħ¤Ë´ð¤Å¤¤¤¿´Ä¶­ÊÑ¿ô¤ÎÀßÄê¤ò²Äǽ¤Ë¤¹¤ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>setenvif_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_setenvif.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-
-    <p><code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>
-    ¥â¥¸¥å¡¼¥ë¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤Î¤¢¤ë¦Ì̤¬»ØÄꤵ¤ì¤¿Àµµ¬É½¸½
-    ¤Ë¹ç¤¦¤«¤É¤¦¤«¤Ë¤è¤Ã¤Æ´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ëµ¡Ç½¤òÄ󶡤·¤Þ¤¹¡£
-    ¤³¤ì¤é¤Î´Ä¶­ÊÑ¿ô¤ò»ÈÍѤ·¤Æ¡¢¥µ¡¼¥Ð¤Î¾¤ÎÉôʬ¤¬¤É¤Î¤è¤¦¤ÊÆ°ºî¤ò¤¹¤ë¤«¤ò
-    ·èÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤¬Ä󶡤¹¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ÀßÄê¥Õ¥¡¥¤¥ë¤Ë¸½¤ì¤ë½çÈÖ¤ËŬÍѤµ¤ì¤Þ¤¹¡£
-    ¤½¤ì¤ò»È¤Ã¤Æ¡¢¼¡¤ÎÎã¤Î¤è¤¦¤Ë¤è¤êÊ£»¨¤ÊÀßÄê¤ò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤³¤ì¤Ï¡¢¥Ö¥é¥¦¥¶¤¬ mozilla ¤Ç¤Ï¤¢¤ë¤±¤ì¤É¡¢MSIE ¤Ç¤Ï¤Ê¤¤¤È¤­¤Ë
-    <code>netscape</code> ¤òÀßÄꤷ¤Þ¤¹¡£</p>
-<div class="example"><p><code>
-  BrowserMatch ^Mozilla netscape<br />
-  BrowserMatch MSIE !netscape<br />
-</code></p></div>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#browsermatch">BrowserMatch</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#browsermatchnocase">BrowserMatchNoCase</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#setenvif">SetEnvIf</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#setenvifnocase">SetEnvIfNoCase</a></li>
-</ul>
-<h3>»²¾È</h3>
-<ul class="seealso">
-<li><a href="../env.html">Apache ¤Î´Ä¶­ÊÑ¿ô</a></li>
-</ul></div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="BrowserMatch" id="BrowserMatch">BrowserMatch</a> <a name="browsermatch" id="browsermatch">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>HTTP User-Agent ¤Ë´ð¤Å¤¤¤Æ´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>BrowserMatch <em>regex [!]env-variable</em>[=<em>value</em>]
-[[!]<em>env-variable</em>[=<em>value</em>]] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_setenvif</td></tr>
-</table>
-  <p><code class="directive">BrowserMatch</code> ¤Ï
-  <code class="directive"><a href="#setenvif">SetEnvIf</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-  ÆÃÎã¤Ç¡¢<code>User-Agent</code> HTTP ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤Ë´ð¤Å¤¤¤Æ
-  ´Ä¶­ÊÑ¿ô¤òÀßÄꤷ¤Þ¤¹¡£°Ê²¼¤Î 2 ¹Ô¤Î¸ú²Ì¤ÏƱ¤¸¤Ë¤Ê¤ê¤Þ¤¹:</p>
-
-<div class="example"><p><code>
-   BrowserMatchNoCase Robot is_a_robot<br /> 
-   SetEnvIfNoCase User-Agent Robot is_a_robot<br /> 
-</code></p></div>
-
-    <p>¤½¤Î¾¤ÎÎã:</p>
-<div class="example"><p><code>
-    BrowserMatch ^Mozilla forms jpeg=yes browser=netscape<br />
-    BrowserMatch "^Mozilla/[2-3]" tables agif frames javascript<br />
-    BrowserMatch MSIE !javascript<br />
-</code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="BrowserMatchNoCase" id="BrowserMatchNoCase">BrowserMatchNoCase</a> <a name="browsermatchnocase" id="browsermatchnocase">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>HTTP User-Agent ¤Ë´ð¤Å¤¤¤ÆÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤»¤º¤Ë
-´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>BrowserMatchNoCase  <em>regex [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_setenvif</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 1.2 °Ê¹ß
-    (Apache 1.2 ¤Ç¤Ï¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤â¤¦ÍѤ¤¤é¤ì¤Æ¤¤¤Ê¤¤
-    mod_browser ¥â¥¸¥å¡¼¥ë¤Ë¤¢¤ê¤Þ¤·¤¿)</td></tr>
-</table>
-
-    <p><code class="directive">BrowserMatchNoCase</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    °Ọ̃Ū¤Ë¤Ï <code class="directive"><a href="#browsermatch">BrowserMatch</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    Ʊ¤¸¤Ç¤¹¡£¤¿¤À¤·¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Ê¤¤
-    ¥Þ¥Ã¥Á¥ó¥°¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£Î㤨¤Ð:</p>
-
-<div class="example"><p><code>
-    BrowserMatchNoCase mac platform=macintosh<br />
-    BrowserMatchNoCase win platform=windows<br />
-</code></p></div>
-
-    <p><code class="directive">BrowserMatch</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    <code class="directive">BrowserMatchNoCase</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    <code class="directive"><a href="#setenvif">SetEnvIf</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    <code class="directive"><a href="#setenvifnocase">SetEnvIfNoCase</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-    ÆÃÎã¤Ç¤¹¡£°Ê²¼¤Î 2 ¹Ô¤Î¸ú²Ì¤ÏƱ¤¸¤Ç¤¹:</p>
-
-<div class="example"><p><code>
-   BrowserMatchNoCase Robot is_a_robot<br />
-   SetEnvIfNoCase User-Agent Robot is_a_robot<br />
-</code></p></div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SetEnvIf" id="SetEnvIf">SetEnvIf</a> <a name="setenvif" id="setenvif">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥ê¥¯¥¨¥¹¥È¤Î°À­¤Ë´ð¤Å¤¤¤Æ´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>SetEnvIf <em>attribute
-    regex [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_setenvif</td></tr>
-</table>
-    <p><code class="directive">SetEnvIf</code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤Î°À­¤Ë´ð¤Å¤¤¤Æ´Ä¶­ÊÑ¿ô¤òÄêµÁ¤·¤Þ¤¹¡£
-    ºÇ½é¤Î°ú¿ô¤Ç»ØÄê¤Ç¤­¤ë <em>attribute</em> ¤Ï°Ê²¼¤Î»°¤Ä¤Î¤É¤ì¤«¤Ç¤¹:</p>
-
-<ol>
-<li>HTTP ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É (¾Ü¤·¤¤¾ðÊó¤Ï <a href="http://www.rfc-editor.org/rfc/rfc2616.txt">RFC 2616</a> ¤ò
-    »²¾È¤·¤Æ¤¯¤À¤µ¤¤)¡£Î㤨¤Ð¡¢<code>Host</code>,
-    <code>User-Agent</code>, <code>Referer</code>, 
-    <code>Accept-Language</code> ¤Ç¤¹¡£¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤Î½¸¹ç¤ò¸½¤¹¤¿¤á¤Ë
-    Àµµ¬É½¸½¤ò»È¤¦¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</li>
-
-<li>°Ê²¼¤Î¥ê¥¯¥¨¥¹¥È¤Î°ìÉôʬ¤Î¤É¤ì¤«:
-
-    <ul>
-      <li><code>Remote_Host</code> -
-      ¥ê¥¯¥¨¥¹¥È¤ò¹Ô¤Ê¤Ã¤Æ¤¤¤ë¥¯¥é¥¤¥¢¥ó¥È¤Î¥Û¥¹¥È̾ (¤â¤·¤¢¤ì¤Ð)</li>
-
-      <li><code>Remote_Addr</code> -
-      ¥ê¥¯¥¨¥¹¥È¤ò¹Ô¤Ê¤Ã¤Æ¤¤¤ë¥¯¥é¥¤¥¢¥ó¥È¤Î IP ¥¢¥É¥ì¥¹</li>
-
-      <li><code>Server_Addr</code> - 
-      ¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¼è¤Ã¤¿¥µ¡¼¥Ð¤Î IP ¥¢¥É¥ì¥¹
-      (2.0.43 °Ê¹ß¤Î¤ß)</li>
-
-      <li><code>Request_Method</code> -
-      »ÈÍѤµ¤ì¤Æ¤¤¤ë¥á¥½¥Ã¥É̾ (<code>GET</code>, <code>POST</code>
-      <em>¤Ê¤É</em>)</li>
-
-      <li><code>Request_Protocol</code> -
-      ¥ê¥¯¥¨¥¹¥È¤¬¹Ô¤Ê¤ï¤ì¤¿¥×¥í¥È¥³¥ë¤Î̾Á°¤È¥Ð¡¼¥¸¥ç¥ó
-      (<em>Î㤨¤Ð</em>¡¢"HTTP/0.9", "HTTP/1.1" <em>¤Ê¤É¡£</em>)</li>
-
-      <li><code>Request_URI</code> -
-      URL ¤Î¥¹¥­¡¼¥à¤È¥Û¥¹¥È¤Î¸å¤ÎÉôʬ</li>
-    </ul>
-</li>
-
-<li>¥ê¥¯¥¨¥¹¥È¤È´ØÏ¢ÉÕ¤±¤é¤ì¤ë´Ä¶­ÊÑ¿ô¤Î¥ê¥¹¥È¡£¤³¤ì¤Ë¤è¤ê
-<code class="directive">SetEnvIf</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬°ÊÁ°¤Î¥Þ¥Ã¥Á¤Î·ë²Ì¤ò
-»È¤¦¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤ÎÊýË¡¤Î¥Æ¥¹¥È¤Ç¤ÏÁ°¤ÎÉôʬ¤Ë¤¢¤ë
-<code>SetEnvIf[NoCase]</code> ¤Î·ë²Ì¤Î¤ß¤ò»ÈÍѲÄǽ¤Ç¤¹¡£¡ÖÁ°¡×¤È¤Ï¡¢
-¤è¤ê¹­¤¤ÈϰϤËÂФ·¤ÆÄêµÁ¤µ¤ì¤Æ¤¤¤ë (¥µ¡¼¥ÐÁ´ÂΤΤ褦¤Ë) ¤«¡¢¸½ºß¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-ÈϰϤǤè¤êÁ°¤ÎÉôʬ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¤«¡¢¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
-´Ä¶­ÊÑ¿ô¤Ç¤¢¤ë²ÄǽÀ­¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤ÎÆÃÀ­¤ËÂФ¹¤ë¥Þ¥Ã¥Á¤¬Â¸ºß¤»¤º¡¢
-<em>attribute</em> ¤ËÀµµ¬É½¸½¤¬»È¤ï¤ì¤Ê¤«¤Ã¤¿¤È¤­¤Ë¤Î¤ß¹Í褵¤ì¤Þ¤¹¡£</li>
-</ol>
-
-<p>Æó¤ÄÌܤΰú¿ô (<em>regex</em>) ¤Ï <a href="http://www.pcre.org/">Perl ¸ß´¹¤ÎÀµµ¬É½¸½</a>¤Ç¤¹¡£
-¤³¤ì¤Ï POSIX.2 ¤Î egrep ·Á¼°¤ÎÀµµ¬É½¸½¤È»÷¤Æ¤¤¤Þ¤¹¡£<em>regex</em> ¤¬
-<em>attribute</em> ¤Ë¥Þ¥Ã¥Á¤¹¤ë¾ì¹ç¤Ï¡¢»Ä¤ê¤Î°ú¿ô¤¬É¾²Á¤µ¤ì¤Þ¤¹¡£</p>
-
-<p>»Ä¤ê¤Î°ú¿ô¤ÏÀßÄꤹ¤ëÊÑ¿ô¤Î̾Á°¤Ç¡¢ÀßÄꤵ¤ì¤ëÃͤò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-¤³¤ì¤Ï¡¢</p>
-
-    <ol>
-      <li><code><em>varname</em></code></li>
-
-      <li><code>!<em>varname</em></code></li>
-
-      <li><code><em>varname</em>=<em>value</em></code></li>
-    </ol>
-
-    <p>¤Î¤É¤ì¤«¤Î·Á¼°¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p>ºÇ½é¤Î·Á¼°¤Ç¤Ï¡¢ÃÍ¤Ï "1" ¤ËÀßÄꤵ¤ì¤Þ¤¹¡£
-    Æó¤ÄÌܤϤ⤷Ãͤ¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ì¤Ð¤½¤ì¤ò¼è¤ê½ü¤­¤Þ¤¹¡£
-    »°¤ÄÌܤÏÊÑ¿ô¤ò <code><em>value</em></code> ¤ÎÍ¿¤¨¤é¤ì¤¿ÃͤËÀßÄꤷ¤Þ¤¹¡£
-    2.0.51 °Ê¹ß¤Ç¤Ï¡¢<var>regex</var> Æâ¤Ë <code>$1</code>..<code>$9</code>
-    ¤¬Â¸ºß¤¹¤ì¤Ð¤½¤ì¤òǧ¼±¤·¡¢<var>regex</var> ¤ÎÂбþ¤¹¤ë´Ý³ç¸Ì¤Ç°Ï¤Þ¤ì¤¿Éôʬ¤Ç
-    ÃÖ´¹¤·¤Þ¤¹¡£</p>
-
-<div class="example"><h3>Îã:</h3><p><code>
-
-   SetEnvIf Request_URI "\.gif$" object_is_image=gif<br />
-   SetEnvIf Request_URI "\.jpg$" object_is_image=jpg<br />
-   SetEnvIf Request_URI "\.xbm$" object_is_image=xbm<br />
-        :<br />
-   SetEnvIf Referer www\.mydomain\.com intra_site_referral<br />
-        :<br />
-   SetEnvIf object_is_image xbm XBIT_PROCESSING=1<br />
-        :<br />
-   SetEnvIf ^TS*  ^[a-z].*  HAVE_TS<br />
-</code></p></div>
-
-    <p>½é¤á¤Î»°¤Ä¤Ï¥ê¥¯¥¨¥¹¥È¤¬²èÁü¤Ç¤¢¤ë¤È¤­¤Ë´Ä¶­ÊÑ¿ô
-    <code>object_is_image</code> ¤òÀßÄꤷ¤Þ¤¹¡£»Í¤ÄÌܤÏ
-    »²¾È¸µ¤Î¥Ú¡¼¥¸¤¬¥¦¥§¥Ö¥µ¥¤¥È <code>www.mydomain.com</code> ¤Ë¤¢¤ë¤È¤­¤Ë
-    <code>intra_site_referral</code> ¤òÀßÄꤷ¤Þ¤¹¡£</p>
-
-    <p>ºÇ¸å¤ÎÎã¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤Ë "TS" ¤Ç»Ï¤Þ¤ê¡¢Ãͤ¬½¸¹ç [a-z] ¤Î¤É¤ì¤«¤Ç
-    »Ï¤Þ¤ë¥Ø¥Ã¥À¤¬¤¢¤ë¤È¤­¤Ë <code>HAVE_TS</code> ¤òÀßÄꤷ¤Þ¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li>¾¤ÎÎã¤Ï¡¢<a href="../env.html">Apache ¤Î´Ä¶­ÊÑ¿ô</a>
-</li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SetEnvIfNoCase" id="SetEnvIfNoCase">SetEnvIfNoCase</a> <a name="setenvifnocase" id="setenvifnocase">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥ê¥¯¥¨¥¹¥È¤Î°À­¤Ë´ð¤Å¤¤¤ÆÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤»¤º¤Ë´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>SetEnvIfNoCase <em>attribute regex 
-        [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>FileInfo</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_setenvif</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 1.3 °Ê¹ß</td></tr>
-</table>
-
-    <p><code class="directive">SetEnvIfNoCase</code> ¤Ï°Ọ̃Ū¤Ë¤Ï
-    <code class="directive"><a href="#setenvif">SetEnvIf</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    Ʊ¤¸¤Ç¤¹¡£°ã¤¤¤Ï¡¢Àµµ¬É½¸½¤Î¥Þ¥Ã¥Á¥ó¥°¤¬Âçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Ê¤¤¤Ç
-    ¹Ô¤Ê¤ï¤ì¤ë¤³¤È¤Ç¤¹¡£Î㤨¤Ð:</p>
-
-<div class="example"><p><code>
-   SetEnvIfNoCase Host Apache\.Org site=apache
-</code></p></div>
-
-    <p>¤³¤ì¤Ï HTTP ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤Ë¥Õ¥£¡¼¥ë¥É <code>Host:</code> ¤¬
-    ¤¢¤ê¡¢¤½¤ÎÃͤ¬ <code>Apache.Org</code> ¤ä <code>apache.org</code>¡¢
-    ¤½¤Î¾¤ÎÂçʸ»ú¾®Ê¸»ú¤ÎÁȤ߹ç¤ï¤»¤Ç¤¢¤Ã¤¿¤È¤­¤Ë <code>site</code>
-    ´Ä¶­ÊÑ¿ô¤ò "<code>apache</code>" ¤ËÀßÄꤷ¤Þ¤¹¡£</p>
-
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_setenvif.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_setenvif.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_setenvif.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_setenvif.html.ja.utf8 b/docs/manual/mod/mod_setenvif.html.ja.utf8
new file mode 100644
index 00000000..296b8710
--- /dev/null
+++ b/docs/manual/mod/mod_setenvif.html.ja.utf8
@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_setenvif - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_setenvif</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_setenvif.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_setenvif.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_setenvif.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>リクエスト�特徴�基���環境変数�設定を�能��る</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>setenvif_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_setenvif.c</td></tr></table>
+<h3>概�</h3>
+
+
+    <p><code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>
+    モジュール��リクエスト��る���指定�れ�正�表�
+    ��������よ��環境変数を設定�る機能を�供���。
+    �れら�環境変数を使用���サー��他�部分���よ��動作を�る�を
+    決定�る�������。</p>
+
+    <p>��モジュール��供�るディレクティブ��
+    設定ファイル��れる順番��用�れ��。
+    �れを使���次�例�よ��より複雑�設定を�る�������。
+    �れ��ブラウザ� mozilla ���る�れ��MSIE �������
+    <code>netscape</code> を設定���。</p>
+<div class="example"><p><code>
+  BrowserMatch ^Mozilla netscape<br />
+  BrowserMatch MSIE !netscape<br />
+</code></p></div>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#browsermatch">BrowserMatch</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#browsermatchnocase">BrowserMatchNoCase</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#setenvif">SetEnvIf</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#setenvifnocase">SetEnvIfNoCase</a></li>
+</ul>
+<h3>�照</h3>
+<ul class="seealso">
+<li><a href="../env.html">Apache �環境変数</a></li>
+</ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="BrowserMatch" id="BrowserMatch">BrowserMatch</a> <a name="browsermatch" id="browsermatch">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>HTTP User-Agent �基���環境変数を設定�る
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>BrowserMatch <em>regex [!]env-variable</em>[=<em>value</em>]
+[[!]<em>env-variable</em>[=<em>value</em>]] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_setenvif</td></tr>
+</table>
+  <p><code class="directive">BrowserMatch</code> �
+  <code class="directive"><a href="#setenvif">SetEnvIf</a></code> ディレクティブ�
+  特例��<code>User-Agent</code> HTTP リクエストヘッダ�基���
+  環境変数を設定���。以下� 2 行�効果�����り��:</p>
+
+<div class="example"><p><code>
+   BrowserMatchNoCase Robot is_a_robot<br /> 
+   SetEnvIfNoCase User-Agent Robot is_a_robot<br /> 
+</code></p></div>
+
+    <p>��他�例:</p>
+<div class="example"><p><code>
+    BrowserMatch ^Mozilla forms jpeg=yes browser=netscape<br />
+    BrowserMatch "^Mozilla/[2-3]" tables agif frames javascript<br />
+    BrowserMatch MSIE !javascript<br />
+</code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="BrowserMatchNoCase" id="BrowserMatchNoCase">BrowserMatchNoCase</a> <a name="browsermatchnocase" id="browsermatchnocase">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>HTTP User-Agent �基���大文字�文字を区別���
+環境変数を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>BrowserMatchNoCase  <em>regex [!]env-variable</em>[=<em>value</em>]
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_setenvif</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 1.2 以�
+    (Apache 1.2 ����ディレクティブ�も�用�られ����
+    mod_browser モジュール��り���)</td></tr>
+</table>
+
+    <p><code class="directive">BrowserMatchNoCase</code> ディレクティブ�
+    �味的�� <code class="directive"><a href="#browsermatch">BrowserMatch</a></code> ディレクティブ�
+    ����。������ディレクティブ�大文字�文字を区別���
+    マッ�ングを行����。例��:</p>
+
+<div class="example"><p><code>
+    BrowserMatchNoCase mac platform=macintosh<br />
+    BrowserMatchNoCase win platform=windows<br />
+</code></p></div>
+
+    <p><code class="directive">BrowserMatch</code> ディレクティブ�
+    <code class="directive">BrowserMatchNoCase</code> ディレクティブ�
+    <code class="directive"><a href="#setenvif">SetEnvIf</a></code> ディレクティブ�
+    <code class="directive"><a href="#setenvifnocase">SetEnvIfNoCase</a></code> ディレクティブ�
+    特例��。以下� 2 行�効果�����:</p>
+
+<div class="example"><p><code>
+   BrowserMatchNoCase Robot is_a_robot<br />
+   SetEnvIfNoCase User-Agent Robot is_a_robot<br />
+</code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SetEnvIf" id="SetEnvIf">SetEnvIf</a> <a name="setenvif" id="setenvif">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>リクエスト�属性�基���環境変数を設定�る
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SetEnvIf <em>attribute
+    regex [!]env-variable</em>[=<em>value</em>]
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_setenvif</td></tr>
+</table>
+    <p><code class="directive">SetEnvIf</code>
+    ディレクティブ��リクエスト�属性�基���環境変数を定義���。
+    最��引数�指定��る <em>attribute</em> �以下�三���れ���:</p>
+
+<ol>
+<li>HTTP リクエストヘッダフィールド (詳��情報� <a href="http://www.rfc-editor.org/rfc/rfc2616.txt">RFC 2616</a> を
+    �照������)。例���<code>Host</code>,
+    <code>User-Agent</code>, <code>Referer</code>, 
+    <code>Accept-Language</code> ��。リクエストヘッダ�集�を表����
+    正�表�を使���も����。</li>
+
+<li>以下�リクエスト�一部分��れ�:
+
+    <ul>
+      <li><code>Remote_Host</code> -
+      リクエストを行����るクライアント�ホスト� (も��れ�)</li>
+
+      <li><code>Remote_Addr</code> -
+      リクエストを行����るクライアント� IP アドレス</li>
+
+      <li><code>Server_Addr</code> - 
+      リクエストを�����サー�� IP アドレス
+      (2.0.43 以���)</li>
+
+      <li><code>Request_Method</code> -
+      使用�れ��るメソッド� (<code>GET</code>, <code>POST</code>
+      <em>��</em>)</li>
+
+      <li><code>Request_Protocol</code> -
+      リクエスト�行��れ�プロトコル�����ージョン
+      (<em>例��</em>�"HTTP/0.9", "HTTP/1.1" <em>��。</em>)</li>
+
+      <li><code>Request_URI</code> -
+      URL �スキーム�ホスト�後�部分</li>
+    </ul>
+</li>
+
+<li>リクエスト�関連付�られる環境変数�リスト。�れ�より
+<code class="directive">SetEnvIf</code> ディレクティブ�以��マッ���果を
+使������るよ���り��。��方法�テスト����部分��る
+<code>SetEnvIf[NoCase]</code> ��果��を使用�能��。「�����
+より広�範囲�対��定義�れ��る (サー�全体�よ��) ���在�ディレクティブ�
+範囲�より��部分�定義�れ��る���������。
+環境変数��る�能性��リクエスト�特性�対�るマッ��存在���
+<em>attribute</em> �正�表��使�れ���������考慮�れ��。</li>
+</ol>
+
+<p>二�目�引数 (<em>regex</em>) � <a class="glossarylink" href="../glossary.html#regex" title="用語集を�照">正�表�</a>��。
+<em>regex</em> � <em>attribute</em> �マッ��る場���
+残り�引数�評価�れ��。</p>
+
+<p>残り�引数�設定�る変数�����設定�れる値を指定�る��も����。
+�れ��</p>
+
+    <ol>
+      <li><code><em>varname</em></code></li>
+
+      <li><code>!<em>varname</em></code></li>
+
+      <li><code><em>varname</em>=<em>value</em></code></li>
+    </ol>
+
+    <p>��れ��形���り��。</p>
+
+    <p>最��形����値� "1" �設定�れ��。
+    二�目�も�値�定義�れ��れ��れを�り除���。
+    三�目�変数を <code><em>value</em></code> �与�られ�値�設定���。
+    2.0.51 以����<var>regex</var> 内� <code>$1</code>..<code>$9</code>
+    �存在�れ��れを�識��<var>regex</var> �対応�る丸括弧�囲�れ�部分�
+    置����。</p>
+
+<div class="example"><h3>例:</h3><p><code>
+
+   SetEnvIf Request_URI "\.gif$" object_is_image=gif<br />
+   SetEnvIf Request_URI "\.jpg$" object_is_image=jpg<br />
+   SetEnvIf Request_URI "\.xbm$" object_is_image=xbm<br />
+        :<br />
+   SetEnvIf Referer www\.mydomain\.com intra_site_referral<br />
+        :<br />
+   SetEnvIf object_is_image xbm XBIT_PROCESSING=1<br />
+        :<br />
+   SetEnvIf ^TS*  ^[a-z].*  HAVE_TS<br />
+</code></p></div>
+
+    <p>���三��リクエスト�画���る���環境変数
+    <code>object_is_image</code> を設定���。四�目�
+    �照元�ページ�ウェブサイト <code>www.mydomain.com</code> ��る���
+    <code>intra_site_referral</code> を設定���。</p>
+
+    <p>最後�例��リクエスト� "TS" �始�り�値�集� [a-z] ��れ��
+    始�るヘッダ��る��� <code>HAVE_TS</code> を設定���。</p>
+
+<h3>�照</h3>
+<ul>
+<li>他�例��<a href="../env.html">Apache �環境変数</a>
+</li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SetEnvIfNoCase" id="SetEnvIfNoCase">SetEnvIfNoCase</a> <a name="setenvifnocase" id="setenvifnocase">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>リクエスト�属性�基���大文字�文字を区別���環境変数を設定�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SetEnvIfNoCase <em>attribute regex 
+        [!]env-variable</em>[=<em>value</em>]
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>FileInfo</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_setenvif</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 1.3 以�</td></tr>
+</table>
+
+    <p><code class="directive">SetEnvIfNoCase</code> ��味的��
+    <code class="directive"><a href="#setenvif">SetEnvIf</a></code> ディレクティブ�
+    ����。����正�表��マッ�ング�大文字�文字を区別����
+    行��れる����。例��:</p>
+
+<div class="example"><p><code>
+   SetEnvIfNoCase Host Apache\.Org site=apache
+</code></p></div>
+
+    <p>�れ� HTTP リクエストヘッダ�フィールド <code>Host:</code> �
+    �り���値� <code>Apache.Org</code> や <code>apache.org</code>�
+    ��他�大文字�文字�組����������� <code>site</code>
+    環境変数を "<code>apache</code>" �設定���。</p>
+
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_setenvif.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_setenvif.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_setenvif.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_setenvif.html.ko.euc-kr b/docs/manual/mod/mod_setenvif.html.ko.euc-kr
index 1f984922..c1ad761b 100644
--- a/docs/manual/mod/mod_setenvif.html.ko.euc-kr
+++ b/docs/manual/mod/mod_setenvif.html.ko.euc-kr
@@ -254,6 +254,6 @@
 <a href="../ja/mod/mod_setenvif.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_setenvif.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_so.html b/docs/manual/mod/mod_so.html
index 1053634f..2d5267bd 100644
--- a/docs/manual/mod/mod_so.html
+++ b/docs/manual/mod/mod_so.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_so.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_so.html.ja.euc-jp
+URI: mod_so.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_so.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_so.html.en b/docs/manual/mod/mod_so.html.en
index 7e4232c5..882105df 100644
--- a/docs/manual/mod/mod_so.html.en
+++ b/docs/manual/mod/mod_so.html.en
@@ -185,6 +185,6 @@ of active modules</td></tr>
 <a href="../ja/mod/mod_so.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_so.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_so.html.ja.euc-jp b/docs/manual/mod/mod_so.html.ja.euc-jp
deleted file mode 100644
index a3f61563..00000000
--- a/docs/manual/mod/mod_so.html.ja.euc-jp
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_so - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_so</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_so.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_so.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_so.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>µ¯Æ°»þ¤äºÆµ¯Æ°»þ¤Ë¼Â¹Ô¥³¡¼¥É¤È¥â¥¸¥å¡¼¥ë¤ò¥µ¡¼¥Ð¤Ë¥í¡¼¥É¤¹¤ë
-</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>so_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_so.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï Window ¤Ç¤Ï (¾ï¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë) Base
-¥â¥¸¥å¡¼¥ë¤Ç¤¹</td></tr></table>
-<h3>³µÍ×</h3>
-
-
-    <p>¤¤¤¯¤Ä¤«¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ç¤Ï¡¢¥µ¡¼¥Ð¤ÎºÆ¥³¥ó¥Ñ¥¤¥ë¤ò¤¹¤ëÂå¤ï¤ê¤Ë¡¢
-    ¤³¤Î¥â¥¸¥å¡¼¥ë¤ò»ÈÍѤ·¤Æ
-    <a href="../dso.html">ưŪ¶¦Í­¥ª¥Ö¥¸¥§¥¯¥È</a>
-    (DSO) µ¡¹½¤Ë¤è¤ê¡¢¼Â¹Ô»þ¤Ë Apache ¤Ë¥â¥¸¥å¡¼¥ë¤òÆɤ߹þ¤Þ¤»¤ë¤³¤È¤¬
-    ¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>Unix ¾å¤Ç¤Ï¡¢Æɤ߹þ¤Þ¤ì¤ë¥³¡¼¥É¤ÏÄ̾ï¤Ï¶¦Í­¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë
-    (ÉáÄÌ <code>.so</code> ¤È¤¤¤¦³ÈÄ¥»Ò¤¬ÉÕ¤¤¤Æ¤¤¤Þ¤¹) ¤«¤é¤Ç¤¹¡£
-    Windows ¾å¤Ç¤Ï¤³¤Î¥â¥¸¥å¡¼¥ë¤Î³ÈÄ¥»Ò¤Ï <code>.so</code> ¤« <code>.dll</code>
-    ¤Ç¤¹¡£</p>
-
-    <div class="warning"><h3>·Ù¹ð</h3>
-    <p>Apache 1.3 ¤Î¥â¥¸¥å¡¼¥ë¤òľÀÜ Apache 2.0 ¤Ç»È¤¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó
-    ¡½ ¥â¥¸¥å¡¼¥ë¤Ï Apache 2.0 ÍѤËưŪ¤Ë¥í¡¼¥É¤µ¤ì¤ë¤«¡¢
-    ľÀÜÁȤ߹þ¤Þ¤ì¤ë¤¿¤á¤Ë½¤Àµ¤µ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-    </div>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#loadfile">LoadFile</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#loadmodule">LoadModule</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> Windows ÍÑ¤Î¥í¡¼¥É²Äǽ¤Ê¥â¥¸¥å¡¼¥ë¤òºîÀ®¤¹¤ë</li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2>Windows ÍÑ¤Î¥í¡¼¥É²Äǽ¤Ê¥â¥¸¥å¡¼¥ë¤òºîÀ®¤¹¤ë</h2>
-
-    <div class="note"><h3>Ãí</h3>
-    <p>Apache 1.3.15 ¤È 2.0 ¤È¤Ç Windows ¤Î¥â¥¸¥å¡¼¥ë̾¤Î·Á¼°¤ÏÊѹ¹¤µ¤ì¤Þ¤·¤¿
-    ¡½ ¥â¥¸¥å¡¼¥ë¤Ï mod_foo.so ¤È¤¤¤¦Ì¾Á°¤Ë¤Ê¤ê¤Þ¤·¤¿¡£</p>
-
-    <p>¤Þ¤À mod_so ¤Ç ApacheModuleFoo.dll ¤È¤¤¤¦Ì¾Á°¤Î¥â¥¸¥å¡¼¥ë¤â
-    ¥í¡¼¥É¤µ¤ì¤Þ¤¹¤¬¡¢¿·¤·¤¤Ì¾Á°¤ÎÉÕ¤±Êý¤ò»È¤¦Êý¤¬¹¥¤Þ¤ì¤Þ¤¹¡£¥â¥¸¥å¡¼¥ë¤ò
-    2.0 ÍѤ˰ܿ¢¤·¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢2.0 ¤Î½¬´·¤Ë¹ç¤¦¤è¤¦¤Ë̾Á°¤ò
-    ½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤¡£</p></div>
-
-    <p>Apache ¤Î¥â¥¸¥å¡¼¥ë API ¤Ï UNIX ¤È Windows ´Ö¤Ç¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
-    ¿¤¯¤Î¥â¥¸¥å¡¼¥ë¤ÏÁ´¤¯Êѹ¹¤Ê¤·¡¢¤â¤·¤¯¤Ï´Êñ¤ÊÊѹ¹¤Ë¤è¤ê Windows 
-    ¤Ç¼Â¹Ô¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£¤¿¤À¤·¡¢¤½¤ì°Ê³°¤Î Windows ¤Ë¤Ï̵¤¤ Unix
-    ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¡¼¤Îµ¡Ç½¤Ë°Í¸¤·¤¿¥â¥¸¥å¡¼¥ë¤ÏÆ°ºî¤·¤Þ¤»¤ó¡£</p>
-
-    <p>¥â¥¸¥å¡¼¥ë¤¬¼ÂºÝ¤ËÆ°ºî¤¹¤ë¤È¤­¤Ï¡¢
-    Æó¤Ä¤ÎÊýË¡¤Î¤É¤Á¤é¤«¤Ç¥µ¡¼¥Ð¤ËÄɲ乤뤳¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤º¡¢Unix
-    ¤ÈƱÍͤ˥µ¡¼¥Ð¤Ë¥³¥ó¥Ñ¥¤¥ë¤·¤ÆÁȤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Windows
-    ÍѤΠApache ¤Ï Unix ÍѤΠApache ¤Ë¤¢¤ë <code>Configure</code>
-    ¥×¥í¥°¥é¥à¤¬¤¢¤ê¤Þ¤»¤ó¤Î¤Ç¡¢¥â¥¸¥å¡¼¥ë¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ò
-    ApacheCore ¥×¥í¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤ËÄɲä·¡¢¥·¥ó¥Ü¥ë¤ò
-    <code>os\win32\modules.c</code> ¥Õ¥¡¥¤¥ë¤ËÄɲ乤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>Æó¤ÄÌܤϥ⥸¥å¡¼¥ë¤ò DLL ¤È¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¤¹¤ëÊýË¡¤Ç¤¹¡£
-    DLL ¤Ï¶¦Í­¥é¥¤¥Ö¥é¥ê¤Ç¡¢¼Â¹Ô»þ¤Ë
-    <code><code class="directive">LoadModule</code></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê¥µ¡¼¥Ð¤ËÆɤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤ì¤é¤Î¥â¥¸¥å¡¼¥ë
-    DLL ¤Ï¤½¤Î¤Þ¤ÞÇÛÉÛ¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¡¢¥µ¡¼¥Ð¤òºÆ¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤³¤È¤Ê¤¯¡¢Windows
-    ÍѤΠApache ¤Î¤¹¤Ù¤Æ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ç¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¥â¥¸¥å¡¼¥ë DLL ¤òºîÀ®¤¹¤ë¤¿¤á¤Ë¤Ï¡¢
-    ¥â¥¸¥å¡¼¥ë¤ÎºîÀ®¤Ë¾®¤µ¤ÊÊѹ¹¤ò¹Ô¤Ê¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤Ä¤Þ¤ê¡¢¥â¥¸¥å¡¼¥ë¤Î¥ì¥³¡¼¥É (¤³¤ì¤Ï¸å¤ÇºîÀ®¤µ¤ì¤Þ¤¹¡£
-    °Ê²¼¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤) ¤¬ DLL ¤«¤é¥¨¥¯¥¹¥Ý¡¼¥È¤µ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-    ¤³¤ì¤ò¹Ô¤Ê¤¦¤Ë¤Ï¡¢<code>AP_MODULE_DECLARE_DATA</code> (Apache
-    ¤Î¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹) ¤ò¥â¥¸¥å¡¼¥ë¤Î¥â¥¸¥å¡¼¥ë¥ì¥³¡¼¥É
-    ÄêµÁ¤ÎÉôʬ¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£¤¿¤È¤¨¤Ð¡¢¥â¥¸¥å¡¼¥ë¤Ë</p>
-<div class="example"><p><code>
-    module foo_module;
-</code></p></div>
-
-    <p>¤¬¤¢¤ë¤È¤¹¤ë¤È¡¢¤½¤ì¤ò¼¡¤Î¤â¤Î¤ÇÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</p>
-<div class="example"><p><code>
-    module AP_MODULE_DECLARE_DATA foo_module;
-</code></p></div>
-
-    <p>Unix ¾å¤Ç¤â¤³¤Î¥â¥¸¥å¡¼¥ë¤ò
-    Êѹ¹Ìµ¤·¤Ç»È¤¤Â³¤±¤é¤ì¤ë¤è¤¦¤Ë¡¢¤³¤Î¥Þ¥¯¥í¤Ï Windows
-    ¾å¤Ç¤Î¤ß¸úÎϤò»ý¤Á¤Þ¤¹¡£<code>.DEF</code>
-    ¥Õ¥¡¥¤¥ë¤ÎÊý¤òÎɤ¯ÃΤäƤ¤¤ë¤È¤¤¤¦¾ì¹ç¤Ï¡¢
-    Âå¤ï¤ê¤Ë¤½¤ì¤ò»È¤Ã¤Æ¥â¥¸¥å¡¼¥ë¥ì¥³¡¼¥É¤ò
-    ¥¨¥¯¥¹¥Ý¡¼¥È¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-    <p>¤µ¤¢¡¢¤¢¤Ê¤¿¤Î¥â¥¸¥å¡¼¥ë¤Î DLL ¤òºîÀ®¤·¤Þ¤·¤ç¤¦¡£¤³¤ì¤ò¡¢
-    libhttpd.lib ¶¦Í­¥é¥¤¥Ö¥é¥ê¤¬¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤¿¤È¤­¤ËºîÀ®¤µ¤ì¤¿
-    ibhttpd.lib ¥¨¥¯¥¹¥Ý¡¼¥È¥é¥¤¥Ö¥é¥ê¤È¥ê¥ó¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£¤³¤Î»þ¤Ë¡¢
-    Apache ¤Î¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë¤¬Àµ¤·¤¤°ÌÃ֤ˤ¢¤ë¤è¤¦¤Ë¡¢
-    ¥³¥ó¥Ñ¥¤¥é¤ÎÀßÄê¤òÊѤ¨¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-    ¤³¤Î¥é¥¤¥Ö¥é¥ê¤Ï¥µ¡¼¥Ð¥ë¡¼¥È¤Î modules ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¤Þ¤¹¡£
-    ¥Ó¥ë¥É´Ä¶­¤¬Àµ¤·¤¯ÀßÄꤵ¤ì¤ë¤è¤¦¤Ë¡¢´û¸¤Î¥â¥¸¥å¡¼¥ëÍѤΠ.dsp ¤ò
-    ¼è¤Ã¤Æ¤¯¤ë¤Î¤¬°ìÈÖÎɤ¤¤Ç¤·¤ç¤¦¡£¤â¤·¤¯¤Ï¡¢¤¢¤Ê¤¿¤Î .dsp ¤È
-    ¥³¥ó¥Ñ¥¤¥é¤È¥ê¥ó¥¯¤Î¥ª¥×¥·¥ç¥ó¤òÈæ³Ó¤¹¤ë¡¢¤È¤¤¤¦¤â¤Î¤Ç¤âÎɤ¤¤Ç¤¹¡£</p>
-
-    <p>¤³¤ì¤Ç DLL ÈǤΥ⥸¥å¡¼¥ë¤¬ºîÀ®¤µ¤ì¤Æ¤¤¤ë¤Ï¤º¤Ç¤¹¡£
-    ¥µ¡¼¥Ð¥ë¡¼¥È¤Î <code>modules</code>
-    ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥â¥¸¥å¡¼¥ë¤òÃÖ¤¤¤Æ¡¢
-    <code><code class="directive">LoadModule</code></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤ÆÆɤ߹þ¤ó¤Ç¤¯¤À¤µ¤¤¡£</p>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="LoadFile" id="LoadFile">LoadFile</a> <a name="loadfile" id="loadfile">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>»ØÄꤵ¤ì¤¿¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤ä¥é¥¤¥Ö¥é¥ê¤ò¥ê¥ó¥¯¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>LoadFile <em>filename</em> [<em>filename</em>] ...</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_so</td></tr>
-</table>
-
-    <p>LoadFile ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥µ¡¼¥Ð¤¬µ¯Æ°¤µ¤ì¤¿¤È¤­¤äºÆµ¯Æ°¤µ¤ì¤¿¤È¤­¤Ë¡¢
-    »ØÄꤵ¤ì¤¿¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤ä¥é¥¤¥Ö¥é¥ê¤ò¥ê¥ó¥¯¤·¤Þ¤¹¡£
-    ¤³¤ì¤Ï¥â¥¸¥å¡¼¥ë¤¬Æ°ºî¤¹¤ë¤¿¤á¤ËɬÍפˤʤ뤫¤â¤·¤ì¤Ê¤¤ÄɲäÎ
-    ¥³¡¼¥É¤òÆɤ߹þ¤à¤¿¤á¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£<em>Filename</em> ¤ÏÀäÂХѥ¹¤«¡¢<a href="core.html#serverroot">ServerRoot</a> ¤«¤é¤ÎÁêÂХѥ¹¤Ç¤¹¡£</p>
-
-    <p>Îã:</p>
-
-    <div class="example"><p><code>LoadFile libexec/libxmlparse.so</code></p></div>
-
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="LoadModule" id="LoadModule">LoadModule</a> <a name="loadmodule" id="loadmodule">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤ä¥é¥¤¥Ö¥é¥ê¤ò¥ê¥ó¥¯¤·¡¢»ÈÍѥ⥸¥å¡¼¥ë¤Î
-¥ê¥¹¥È¤ËÄɲ乤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>LoadModule <em>module filename</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_so</td></tr>
-</table>
-
-    <p>LoadModule ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <em>filename</em>
-    ¤È¤¤¤¦¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤ª¤è¤Ó¥é¥¤¥Ö¥é¥ê¤ò¥ê¥ó¥¯¤·¡¢<em>module</em>
-    ¤È¤¤¤¦Ì¾Á°¤Î¥â¥¸¥å¡¼¥ë¤Î¹½Â¤¤ò¥¢¥¯¥Æ¥£¥Ö¤Ê¥â¥¸¥å¡¼¥ë¤Î¥ê¥¹¥È¤ËÄɲä·¤Þ¤¹¡£
-    <em>Module</em> ¤Ï¥Õ¥¡¥¤¥ëÃæ¤Î <code>module</code>
-    ·¿¤Î³°ÉôÊÑ¿ô¤Î̾Á°¤Ç¡¢¥â¥¸¥å¡¼¥ë¤Î¥É¥­¥å¥á¥ó¥È¤Ë
-    <a href="module-dict.html#moduleidentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò</a>¤È¤·¤Æ½ñ¤«¤ì¤Æ¤¤¤ë¤â¤Î¤Ç¤¹¡£Îã :</p>
-
-    <div class="example"><p><code>
-      LoadModule status_module modules/mod_status.so
-    </code></p></div>
-
-    <p>¤³¤ì¤Ï ServerRoot ¤Î modules ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤«¤é»ØÄꤵ¤ì¤¿Ì¾Á°¤Î
-    ¥â¥¸¥å¡¼¥ë¤ò¥í¡¼¥É¤·¤Þ¤¹¡£</p>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_so.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_so.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_so.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_so.html.ja.utf8 b/docs/manual/mod/mod_so.html.ja.utf8
new file mode 100644
index 00000000..194a4bad
--- /dev/null
+++ b/docs/manual/mod/mod_so.html.ja.utf8
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_so - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_so</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_so.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_so.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_so.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>起動時や�起動時�実行コード�モジュールをサー��ロード�る
+</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>so_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_so.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>��モジュール� Window �� (常���れ��る) Base
+モジュール��</td></tr></table>
+<h3>概�</h3>
+
+
+    <p>�����オペレーティングシステム���サー���コンパイルを�る代�り��
+    ��モジュールを使用��
+    <a href="../dso.html">動的共有オブジェクト</a>
+    (DSO) 機構�より�実行時� Apache �モジュールを読�込��る���
+    ����。</p>
+
+    <p>Unix 上���読�込�れるコード�通常�共有オブジェクトファイル
+    (普通 <code>.so</code> ���拡張��付�����) �ら��。
+    Windows 上����モジュール�拡張�� <code>.so</code> � <code>.dll</code>
+    ��。</p>
+
+    <div class="warning"><h3>警告</h3>
+    <p>Apache 1.3 �モジュールを直接 Apache 2.0 �使��������ん
+    ― モジュール� Apache 2.0 用�動的�ロード�れる��
+    直接組�込�れる���修正�れ��れ��り��ん。</p>
+    </div>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#loadfile">LoadFile</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#loadmodule">LoadModule</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> Windows 用�ロード�能�モジュールを作��る</li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2>Windows 用�ロード�能�モジュールを作��る</h2>
+
+    <div class="note"><h3>注</h3>
+    <p>Apache 1.3.15 � 2.0 �� Windows �モジュール��形��変更�れ���
+    ― モジュール� mod_foo.so �������り���。</p>
+
+    <p>�� mod_so � ApacheModuleFoo.dll ������モジュールも
+    ロード�れ����新�����付�方を使�方�好�れ��。モジュールを
+    2.0 用�移����る���れ��2.0 �習慣���よ����を
+    修正������。</p></div>
+
+    <p>Apache �モジュール API � UNIX � Windows 間��変更�れ����ん。
+    多��モジュール�全�変更���も���簡��変更�より Windows 
+    �実行��るよ���り��。�����れ以外� Windows ��無� Unix
+    アーキテク�ャー�機能��存��モジュール�動作���ん。</p>
+
+    <p>モジュール�実際�動作�る����
+    二��方法���ら��サー��追加�る�������。���Unix
+    ��様�サー��コンパイル��組�込む�������。Windows
+    用� Apache � Unix 用� Apache ��る <code>Configure</code>
+    プログラム��り��ん���モジュール�ソースファイルを
+    ApacheCore プロジェクトファイル�追加��シンボルを
+    <code>os\win32\modules.c</code> ファイル�追加�る必���り��。</p>
+
+    <p>二�目�モジュールを DLL ���コンパイル�る方法��。
+    DLL �共有ライブラリ��実行時�
+    <code><code class="directive">LoadModule</code></code>
+    ディレクティブ�よりサー��読�込む�������。�れら�モジュール
+    DLL ������布�る����能��サー�を�コンパイル�る�����Windows
+    用� Apache �����インストール�実行�る�������。</p>
+
+    <p>モジュール DLL を作��る�����
+    モジュール�作�����変更を行��必���り��。
+    ��り�モジュール�レコード (�れ�後�作��れ��。
+    以下を�照������) � DLL �らエクス�ート�れ��れ��り��ん。
+    �れを行�����<code>AP_MODULE_DECLARE_DATA</code> (Apache
+    �ヘッダファイル�定義�れ����) をモジュール�モジュールレコード
+    定義�部分�追加������。�����モジュール�</p>
+<div class="example"><p><code>
+    module foo_module;
+</code></p></div>
+
+    <p>��る��る���れを次�も��置��������。</p>
+<div class="example"><p><code>
+    module AP_MODULE_DECLARE_DATA foo_module;
+</code></p></div>
+
+    <p>Unix 上�も��モジュールを
+    変更無��使�続�られるよ�����マクロ� Windows
+    上���効力を����。<code>.DEF</code>
+    ファイル�方を良�知���る���場���
+    代�り��れを使��モジュールレコードを
+    エクス�ート�る��も����。</p>
+    <p>�������モジュール� DLL を作����ょ�。�れを�
+    libhttpd.lib 共有ライブラリ�コンパイル�れ����作��れ�
+    ibhttpd.lib エクス�ートライブラリ�リンク������。��時��
+    Apache �ヘッダファイル�正���置��るよ���
+    コンパイラ�設定を変�る必���る�も�れ��ん。
+    ��ライブラリ�サー�ルート� modules ディレクトリ��り��。
+    ビルド環境�正��設定�れるよ���既存�モジュール用� .dsp を
+    ����る��一番良���ょ�。も�������� .dsp �
+    コンパイラ�リンク�オプションを比較�る����も��も良���。</p>
+
+    <p>�れ� DLL 版�モジュール�作��れ��る����。
+    サー�ルート� <code>modules</code>
+    ディレクトリ�モジュールを置���
+    <code><code class="directive">LoadModule</code></code>
+    ディレクティブを使��読�込ん�����。</p>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LoadFile" id="LoadFile">LoadFile</a> <a name="loadfile" id="loadfile">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>指定�れ�オブジェクトファイルやライブラリをリンク�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LoadFile <em>filename</em> [<em>filename</em>] ...</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_so</td></tr>
+</table>
+
+    <p>LoadFile ディレクティブ��サー��起動�れ���や�起動�れ�����
+    指定�れ�オブジェクトファイルやライブラリをリンク���。
+    �れ�モジュール�動作�る���必���る�も�れ��追加�
+    コードを読�込む���使用�れ��。<em>Filename</em> �絶対パス��<a href="core.html#serverroot">ServerRoot</a> �ら�相対パス��。</p>
+
+    <p>例:</p>
+
+    <div class="example"><p><code>LoadFile libexec/libxmlparse.so</code></p></div>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LoadModule" id="LoadModule">LoadModule</a> <a name="loadmodule" id="loadmodule">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>オブジェクトファイルやライブラリをリンク��使用モジュール�
+リスト�追加�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LoadModule <em>module filename</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_so</td></tr>
+</table>
+
+    <p>LoadModule ディレクティブ� <em>filename</em>
+    ���オブジェクトファイル�よ�ライブラリをリンク��<em>module</em>
+    ������モジュール�構造をアクティブ�モジュール�リスト�追加���。
+    <em>Module</em> �ファイル中� <code>module</code>
+    型�外部変数�����モジュール�ドキュメント�
+    <a href="module-dict.html#moduleidentifier">モジュール識別�</a>���書�れ��るも���。例 :</p>
+
+    <div class="example"><p><code>
+      LoadModule status_module modules/mod_status.so
+    </code></p></div>
+
+    <p>�れ� ServerRoot � modules サブディレクトリ�ら指定�れ����
+    モジュールをロード���。</p>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_so.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_so.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_so.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_so.html.ko.euc-kr b/docs/manual/mod/mod_so.html.ko.euc-kr
index f9a492f2..74af0e06 100644
--- a/docs/manual/mod/mod_so.html.ko.euc-kr
+++ b/docs/manual/mod/mod_so.html.ko.euc-kr
@@ -169,6 +169,6 @@
 <a href="../ja/mod/mod_so.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_so.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_speling.html b/docs/manual/mod/mod_speling.html
index bcda93f5..7cc8d4ee 100644
--- a/docs/manual/mod/mod_speling.html
+++ b/docs/manual/mod/mod_speling.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_speling.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_speling.html.ja.euc-jp
+URI: mod_speling.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_speling.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_speling.html.en b/docs/manual/mod/mod_speling.html.en
index cffe5ed1..a1fdc2d5 100644
--- a/docs/manual/mod/mod_speling.html.en
+++ b/docs/manual/mod/mod_speling.html.en
@@ -140,6 +140,6 @@ of Apache 1.3, it is part of the Apache distribution. Prior to Apache
 <a href="../ja/mod/mod_speling.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_speling.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_speling.html.ja.euc-jp b/docs/manual/mod/mod_speling.html.ja.euc-jp
deleted file mode 100644
index 4a94c3c8..00000000
--- a/docs/manual/mod/mod_speling.html.ja.euc-jp
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_speling - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_speling</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_speling.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_speling.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_speling.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥æ¡¼¥¶¤¬ÆþÎϤ·¤¿¤Ç¤¢¤í¤¦´Ö°ã¤Ã¤¿ URL ¤ò¡¢
-Âçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤ò̵»ë¤¹¤ë¤³¤È¤È°ì¤Ä°Ê²¼¤ÎÄÖ¤ê´Ö°ã¤¤¤òµöÍƤ¹¤ë¤³¤È¤Ç
-½¤Àµ¤ò»î¤ß¤ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>speling_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_speling.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-
-    <p>¥ê¥¯¥¨¥¹¥È¤ÎÄ֤꤬´Ö°ã¤Ã¤Æ¤¤¤¿¤ê¡¢
-    Âçʸ»ú¾®Ê¸»ú¤¬°ã¤Ã¤Æ¤¤¤¿¤ê¤¹¤ë¤¿¤á¤Ë¡¢Apache ¤Î¥³¥¢¥µ¡¼¥Ð¤¬
-    ¥É¥­¥å¥á¥ó¥È¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ø¤Î±þÅú¤òÀµ¤·¤¯Ä󶡤Ǥ­¤Ê¤¤¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¡¢Â¾¤Î¤¹¤Ù¤Æ¤Î¥â¥¸¥å¡¼¥ë¤¬¤¢¤­¤é¤á¤¿¸å¤Ç¤¢¤Ã¤¿¤È¤·¤Æ¤â¡¢
-    ¥ê¥¯¥¨¥¹¥È¤Ë¹ç¤¦¥É¥­¥å¥á¥ó¥È¤ò¸«¤Ä¤±¤è¤¦¤È¤¹¤ë¤³¤È¤Ë¤è¤ê¤³¤ÎÌäÂê¤Î
-    ²ò·è¤ò»î¤ß¤Þ¤¹¡£¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë
-    ¤½¤ì¤¾¤ì¤Î¥É¥­¥å¥á¥ó¥È¤Î̾Á°¤È¡¢¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿¥É¥­¥å¥á¥ó¥È¤Î̾Á°¤È¤ò
-    <strong>Âçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤ò̵»ë¤·</strong>¡¢<strong>°ìʸ»ú¤Þ¤Ç¤Î
-    ÄÖ¤ê¤Î´Ö°ã¤¤</strong> (ʸ»ú¤ÎÁÞÆþ/¾Êά/Îٹ礦ʸ»ú¤ÎÃÖ´¹¡¢´Ö°ã¤Ã¤¿Ê¸»ú)
-    ¤òµö²Ä¤·¤ÆÈæ³Ó¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢ÌÜŪ¤òãÀ®¤·¤è¤¦¤È¤·¤Þ¤¹¡£
-    ¤³¤ÎÊýË¡¤Ç¥ê¥¯¥¨¥¹¥È¤Ë¹ç¤¦¥É¥­¥å¥á¥ó¥È¤Î°ìÍ÷¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>¥Ç¥£¥ì¥¯¥È¥ê¤ò¥¹¥­¥ã¥ó¤·¤¿¸å¤Ë¡¢</p>
-
-    <ul>
-      <li>ŬÀڤʥɥ­¥å¥á¥ó¥È¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¾ì¹ç¡¢
-      Apache ¤Ï¤¤¤Ä¤â¤ÈƱ¤¸¤è¤¦¤Ë½èÍý¤ò¤·¡¢
-      ¡Ö¥É¥­¥å¥á¥ó¥È¤¬¸«¤Ä¤«¤é¤Ê¤¤¡×¤È¤¤¤¦¥¨¥é¡¼¤òÊÖ¤·¤Þ¤¹¡£</li>
-
-      <li>¥ê¥¯¥¨¥¹¥È¤Ë¡Ö¤Û¤È¤ó¤É¡×¹ç¤¦¥É¥­¥å¥á¥ó¥È¤¬°ì¤Ä¤À¤±¸«¤Ä¤«¤Ã¤¿¾ì¹ç¡¢
-       ¤½¤ì¤¬¥ê¥À¥¤¥ì¥¯¥È±þÅú¤È¤·¤ÆÊÖ¤µ¤ì¤Þ¤¹¡£</li>
-
-      <li>¤è¤¯»÷¤¿¥É¥­¥å¥á¥ó¥È¤¬Ê£¿ô¸«¤Ä¤«¤Ã¤¿¾ì¹ç¡¢
-      ¤½¤Î¥ê¥¹¥È¤¬¥¯¥é¥¤¥¢¥ó¥È¤ËÊÖ¤µ¤ì¡¢
-      ¥¯¥é¥¤¥¢¥ó¥È¤¬Àµ¤·¤¤¸õÊä¤òÁªÂò¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£</li>
-    </ul>
-
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#checkspelling">CheckSpelling</a></li>
-</ul>
-</div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CheckSpelling" id="CheckSpelling">CheckSpelling</a> <a name="checkspelling" id="checkspelling">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>spelling ¥â¥¸¥å¡¼¥ë¤ò»ÈÍѤ¹¤ë¤è¤¦¤Ë¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CheckSpelling on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>CheckSpelling Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>Options</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_speling</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>CheckSpelling ¤Ï Apache 1.1 ¤Ç¤ÏÊÌÇÛÉۤΥ⥸¥å¡¼¥ë¤Ç¡¢
-Âçʸ»ú¾®Ê¸»ú¤Î´Ö°ã¤¤¤Î¤ß¤Îµ¡Ç½¤Ç¤·¤¿¡£Apache 1.3 ¤Ç Apache ¤ÎÇÛÉÛ¤Ë
-´Þ¤Þ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£Apache 1.3.2 ¤è¤êÁ°¤Ç¤Ï <code>CheckSpelling</code>
-¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡Ö¥µ¡¼¥Ð¡×¤È¡Ö¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¡×¥³¥ó¥Æ¥­¥¹¥È¤Ç¤Î¤ß
-»ÈÍѲÄǽ¤Ç¤·¤¿</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÄÖ¤êÍѤΥ⥸¥å¡¼¥ë¤ò»ÈÍѤ¹¤ë¤«¤É¤¦¤«¤ò
-    ·è¤á¤Þ¤¹¡£»ÈÍÑ»þ¤Ë¤Ï¡¢°Ê²¼¤Î¤³¤È¤ò³Ð¤¨¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤</p>
-
-    <ul>
-      <li>Ʊ»þ¤Ë¤¿¤¯¤µ¤ó¤ÎÄÖ¤ê¤ÎÄûÀµ¤ò¹Ô¤Ê¤ï¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤È¤­¤Ï¡¢
-      ¤½¤Î¤¿¤á¤Ë¹Ô¤Ê¤ï¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î¥¹¥­¥ã¥ó¤¬¥µ¡¼¥Ð¤ÎÀ­Ç½¤Ë
-      ±Æ¶Á¤òÍ¿¤¨¤Þ¤¹¡£</li>
-
-      <li>¥É¥­¥å¥á¥ó¥È¤ÎÃæ¤ËÄÖ¤ê¤Î¡ÖÄûÀµ¡×¤Ë¤è¤ê
-      °Õ¿Þ¤»¤º¹ç¤Ã¤Æ¤·¤Þ¤¦¤è¤¦¤Ê½ÅÍפʥե¡¥¤¥ë¤¬¤Ê¤¤¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-      </li>
-
-      <li>¥â¥¸¥å¡¼¥ë¤Ï¥æ¡¼¥¶Ì¾¤ÎÄÖ¤ê¤Î´Ö°ã¤¤
-      (<code>http://my.host/~apahce/</code> ¤Î¤è¤¦¤Ë)
-      ¤òÄûÀµ¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
-      ÄûÀµ¤Ç¤­¤ë¤Î¤Ï¥Õ¥¡¥¤¥ë̾¤È¥Ç¥£¥ì¥¯¥È¥ê̾¤À¤±¤Ç¤¹¡£</li>
-
-      <li>ÄÖ¤ê¤ÎÄûÀµ¤Ï¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤Ë¸·Ì©¤ËŬÍѤµ¤ì¤Þ¤¹¤Î¤Ç¡¢
-      <code>&lt;Location /status&gt;</code>
-      ¤Ï¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤Î·ë²Ì¤Î¥Õ¥¡¥¤¥ë "<code>/stats.html</code>"
-      ¤È¤·¤Æ´Ö°ã¤Ã¤Æ°·¤ï¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</li>
-    </ul>
-
-    
-    <p><a href="mod_dav.html">DAV</a> ¤¬Í­¸ú¤Ê¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï
-    <code class="module"><a href="../mod/mod_speling.html">mod_speling</a></code> ¤ÏÍ­¸ú¤Ë¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-    ¿·¤·¤¯ºîÀ®¤·¤¿¥ê¥½¡¼¥¹Ì¾¤ò´û¤Ë¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë̾¤Ë¡Ö½¤Àµ¡×¤·¤è¤¦¤È¤¹¤ë¡¢
-    Î㤨¤Ð¡¢¿·µ¬¥É¥­¥å¥á¥ó¥È <code>doc43.html</code> ¤¬´û¤Ë¸ºß¤¹¤ë
-    <code>doc34.html</code> ¤Ë¥ê¥À¥¤¥ì¥¯¥È¤µ¤ì¤Æ¡¢
-    ´üÂԤȤϰ㤦µóÆ°¤Ë¤Ê¤ë¤«¤é¤Ç¤¹¡£</p>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_speling.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_speling.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_speling.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_speling.html.ja.utf8 b/docs/manual/mod/mod_speling.html.ja.utf8
new file mode 100644
index 00000000..3f9b7617
--- /dev/null
+++ b/docs/manual/mod/mod_speling.html.ja.utf8
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_speling - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_speling</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_speling.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_speling.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_speling.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>ユーザ�入力������間��� URL を�
+大文字�文字�区別を無視�る���一�以下�綴り間��を許容�る���
+修正を試�る</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>speling_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_speling.c</td></tr></table>
+<h3>概�</h3>
+
+
+    <p>リクエスト�綴り�間�����り�
+    大文字�文字������り�る����Apache �コアサー��
+    ドキュメント��リクエスト��応答を正���供��������り��。
+    ��モジュール��他�����モジュール���ら��後�������も�
+    リクエスト���ドキュメントを見��よ���る���より���題�
+    解決を試���。��モジュール�リクエスト�れ�ディレクトリ��る
+    �れ�れ�ドキュメント�����リクエスト�れ�ドキュメント����を
+    <strong>大文字�文字�区別を無視�</strong>�<strong>一文字���
+    綴り�間��</strong> (文字�挿入/�略/隣��文字�置��間���文字)
+    を許���比較�る���より�目的を���よ�����。
+    ��方法�リクエスト���ドキュメント�一覧�作��れ��。</p>
+
+    <p>ディレクトリをスキャン��後��</p>
+
+    <ul>
+      <li>�切�ドキュメント�見��ら����場��
+      Apache ���も���よ��処�を��
+      「ドキュメント�見��ら������エラーを返���。</li>
+
+      <li>リクエスト�「��ん����ドキュメント�一���見����場��
+       �れ�リダイレクト応答���返�れ��。</li>
+
+      <li>よ�似�ドキュメント�複数見����場��
+      ��リスト�クライアント�返�れ�
+      クライアント�正��候補を�択��るよ�����。</li>
+    </ul>
+
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#checkspelling">CheckSpelling</a></li>
+</ul>
+</div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CheckSpelling" id="CheckSpelling">CheckSpelling</a> <a name="checkspelling" id="checkspelling">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>spelling モジュールを使用�るよ���る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CheckSpelling on|off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>CheckSpelling Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>Options</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_speling</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>CheckSpelling � Apache 1.1 ��別�布�モジュール��
+大文字�文字�間�����機能���。Apache 1.3 � Apache ��布�
+��れるよ���り���。Apache 1.3.2 より��� <code>CheckSpelling</code>
+ディレクティブ�「サー���「�ー�ャルホスト�コンテキスト���
+使用�能���</td></tr>
+</table>
+    <p>��ディレクティブ�綴り用�モジュールを使用�る����を
+    決���。使用時���以下���を覚���������</p>
+
+    <ul>
+      <li>�時����ん�綴り�訂正を行����れ��ら������
+      �����行��れるディレクトリ�スキャン�サー��性能�
+      影響を与���。</li>
+
+      <li>ドキュメント�中�綴り�「訂正��より
+      �図��������よ�����ファイル���よ��������。
+      </li>
+
+      <li>モジュール�ユーザ��綴り�間��
+      (<code>http://my.host/~apahce/</code> �よ��)
+      を訂正�る�������ん。
+      訂正��る��ファイル��ディレクトリ�����。</li>
+
+      <li>綴り�訂正�存在�るファイル�厳密��用�れ�����
+      <code>&lt;Location /status&gt;</code>
+      ��ゴシエーション��果�ファイル "<code>/stats.html</code>"
+      ���間���扱�れる�も�れ��ん。</li>
+    </ul>
+
+    
+    <p><a href="mod_dav.html">DAV</a> �有効�ディレクトリ��
+    <code class="module"><a href="../mod/mod_speling.html">mod_speling</a></code> �有効���������。
+    新��作���リソース�を既�存在�るファイル��「修正��よ���る�
+    例���新�ドキュメント <code>doc43.html</code> �既�存在�る
+    <code>doc34.html</code> �リダイレクト�れ��
+    期待����挙動��る�ら��。</p>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_speling.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_speling.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_speling.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_speling.html.ko.euc-kr b/docs/manual/mod/mod_speling.html.ko.euc-kr
index 9ea7765b..5998fd8a 100644
--- a/docs/manual/mod/mod_speling.html.ko.euc-kr
+++ b/docs/manual/mod/mod_speling.html.ko.euc-kr
@@ -115,6 +115,6 @@
 <a href="../ja/mod/mod_speling.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_speling.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_ssl.html b/docs/manual/mod/mod_ssl.html
index 1b692ba6..003e7555 100644
--- a/docs/manual/mod/mod_ssl.html
+++ b/docs/manual/mod/mod_ssl.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_ssl.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en
index 329c6938..1d18664e 100644
--- a/docs/manual/mod/mod_ssl.html.en
+++ b/docs/manual/mod/mod_ssl.html.en
@@ -1717,6 +1717,6 @@ SSLVerifyDepth 10
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_ssl.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_status.html b/docs/manual/mod/mod_status.html
index 64e6ac3d..c607c829 100644
--- a/docs/manual/mod/mod_status.html
+++ b/docs/manual/mod/mod_status.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_status.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_status.html.ja.euc-jp
+URI: mod_status.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_status.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_status.html.en b/docs/manual/mod/mod_status.html.en
index 3ff6e5cc..c8c1bac9 100644
--- a/docs/manual/mod/mod_status.html.en
+++ b/docs/manual/mod/mod_status.html.en
@@ -85,7 +85,7 @@ performance</td></tr>
 <h2><a name="enable" id="enable">Enabling Status Support</a></h2>
     
 
-    <p>To enable status reports only for browsers from the foo.com
+    <p>To enable status reports only for browsers from the example.com
     domain add this code to your <code>httpd.conf</code>
     configuration file</p>
 <div class="example"><p><code>
@@ -94,7 +94,7 @@ performance</td></tr>
 <br />
     Order Deny,Allow<br />
     Deny from all<br />
-    Allow from .foo.com<br />
+    Allow from .example.com<br />
     &lt;/Location&gt;
 </code></p></div>
 
@@ -181,6 +181,6 @@ later.</td></tr>
 <a href="../ja/mod/mod_status.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_status.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_status.html.ja.euc-jp b/docs/manual/mod/mod_status.html.ja.euc-jp
deleted file mode 100644
index 9dd0de43..00000000
--- a/docs/manual/mod/mod_status.html.ja.euc-jp
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_status - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_status</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_status.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_status.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_status.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤Î³èÆ°¾õ¶·¤ÈÀ­Ç½¤Ë´Ø¤¹¤ë¾ðÊó¤òÄ󶡤¹¤ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>status_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_status.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î Status ¥â¥¸¥å¡¼¥ë¤Ë¤è¤ê¥µ¡¼¥Ð´ÉÍý¼Ô¤Ï¥µ¡¼¥Ð¤¬¤É¤Î¤¯¤é¤¤
-    ¤ÎÀ­Ç½¤ÇÆ°ºî¤·¤Æ¤¤¤ë¤«¤òÃΤ뤳¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¸½»þÅÀ¤Ç¤Î¥µ¡¼¥Ð¤ÎÅý·×¾ðÊó¤òÆɤߤ䤹¤¤·Á¼°¤Çɽ¤·¤¿ HTML ¥Ú¡¼¥¸¤¬
-    ɽ¼¨¤µ¤ì¤Þ¤¹¡£É¬ÍפǤ¢¤ì¤Ð¡¢¤³¤Î¥Ú¡¼¥¸¤Ï¼«Æ°Åª¤Ë¥ê¥Õ¥ì¥Ã¥·¥å¤µ¤»¤ë
-    ¤³¤È¤â¤Ç¤­¤Þ¤¹ (¸ß´¹À­¤Î¤¢¤ë¥Ö¥é¥¦¥¶¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç)¡£
-    Ê̤ˡ¢¸½»þÅÀ¤Ç¤Î¥µ¡¼¥Ð¤Î¾õÂÖ¤òñ½ã¤Êµ¡³£Æɤ߼è¤ê²Äǽ¤Ê¥ê¥¹¥È¤Ç
-    ɽ¤¹¥Ú¡¼¥¸¤â¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>ɽ¼¨¤µ¤ì¤ë¾ðÊó¤Ï:</p>
-
-    <ul>
-      <li>¥ê¥¯¥¨¥¹¥È¤ò°·¤Ã¤Æ¤¤¤ë¥ï¡¼¥«¡¼¤Î¿ô</li>
-
-      <li>¥¢¥¤¥É¥ë (ÌõÃí: ¥ê¥¯¥¨¥¹¥È¤ò°·¤Ã¤Æ¤¤¤Ê¤¤) ¥ï¡¼¥«¡¼¤Î¿ô</li>
-
-      <li>³Æ¥ï¡¼¥«¡¼¤Î¾õÂÖ¡¢¥ï¡¼¥«¡¼¤¬°·¤Ã¤¿¥ê¥¯¥¨¥¹¥È¤Î¿ô¡¢
-      ¥ï¡¼¥«¡¼¤¬Á÷¤Ã¤¿Áí¥Ð¥¤¥È¿ô (*)</li>
-
-      <li>Áí¥¢¥¯¥»¥¹¿ô¤ÈÁí¥Ð¥¤¥È¿ô (*)</li>
-
-      <li>¥µ¡¼¥Ð¤¬µ¯Æ°¤â¤·¤¯¤ÏºÆµ¯Æ°¤µ¤ì¤¿»þ¹ï¤ÈÆ°ºî¤·¤Æ¤¤¤ë»þ´Ö</li>
-
-      <li>Ê¿¶Ñ¤Î 1 É䢤¿¤ê¤Î¥ê¥¯¥¨¥¹¥È¿ô¡¢1 É䢤¿¤ê¤ÎÁ÷¤é¤ì¤¿¥Ð¥¤¥È¿ô¡¢
-      ¥ê¥¯¥¨¥¹¥È¤¢¤¿¤ê¤Î¥Ð¥¤¥È¿ô (*)</li>
-
-      <li>³Æ¥ï¡¼¥«¡¼¤È Apache Á´ÂΤǻÈÍѤµ¤ì¤Æ¤¤¤ë CPU ¤Î³ä¹ç (*)</li>
-
-      <li>¸½»þÅÀ¤Î¥Û¥¹¥È¤È½èÍý¤µ¤ì¤Æ¤¤¤ë¥ê¥¯¥¨¥¹¥È (*)</li>
-    </ul>
-
-    <p>"(*)" ¤ÎÉÕ¤¤¤Æ¤¤¤ë¾ðÊó¤òɽ¼¨¤¹¤ë¤¿¤á¤Ë¤Ï¥³¥ó¥Ñ¥¤¥ë»þ¤Î¥ª¥×¥·¥ç¥ó
-    ¤ò»ÈÍѤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤é¤ÎÅý·×¾ðÊó¤òÆÀ¤ë¤¿¤á¤ËɬÍפÊ
-    ¥³¡¼¥É¤Ïɸ½à¤Î Apache ¤Ë¤Ï´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#extendedstatus">ExtendedStatus</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#enable">Status ¤ò»ÈÍѲÄǽ¤Ë¤¹¤ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#autoupdate">¼«Æ°¹¹¿·</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#machinereadable">µ¡³£Æɤ߼è¤ê²Äǽ¤Ê¥¹¥Æ¡¼¥¿¥¹¥Õ¥¡¥¤¥ë</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="enable" id="enable">Status ¤ò»ÈÍѲÄǽ¤Ë¤¹¤ë</a></h2>
-    
-
-    <p>foo.com ¥É¥á¥¤¥ó¤«¤é¤Î¥Ö¥é¥¦¥¶¤Î¤ß¤ËÂФ·¤Æ
-    ¥¹¥Æ¡¼¥¿¥¹¤ÎÊó¹ð¤ò»ÈÍѲÄǽ¤Ë¤¹¤ë¤Ë¤Ï
-    °Ê²¼¤Î¥³¡¼¥É¤ò <code>httpd.conf</code> ÀßÄê¥Õ¥¡¥¤¥ë¤ËÄɲä·¤Þ¤¹</p>
-<div class="example"><p><code>
-    &lt;Location /server-status&gt;<br />
-    SetHandler server-status<br />
-<br />
-    Order Deny,Allow<br />
-    Deny from all<br />
-    Allow from .foo.com<br />
-    &lt;/Location&gt;
-</code></p></div>
-
-    <p>¤³¤ì¤Ç¡¢¥µ¡¼¥Ð¤ÎÅý·×¾ðÊó¤ò¥¦¥§¥Ö¥Ö¥é¥¦¥¶¤ò»È¤Ã¤Æ
-    <code>http://your.server.name/server-status</code> ¤ò¥¢¥¯¥»¥¹¤¹¤ë¤³¤È¤Ë¤è¤ê
-    ÃΤ뤳¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="autoupdate" id="autoupdate">¼«Æ°¹¹¿·</a></h2>
-
-    
-    <p>¥Ö¥é¥¦¥¶¤¬¡Ö¥ê¥Õ¥ì¥Ã¥·¥å¡×µ¡Ç½¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ì¤Ð¡¢¥¹¥Æ¡¼¥¿¥¹¥Ú¡¼¥¸¤ò
-    ¼«Æ°Åª¤Ë¹¹¿·¤¹¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£N ÉÃËè¤Ë¹¹¿·¤µ¤»¤ë¤¿¤á¤Ë¤Ï
-    <code>http://your.server.name/server-status?refresh=N</code>
-    ¤È¤¤¤¦¥Ú¡¼¥¸¤ò¥¢¥¯¥»¥¹¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="machinereadable" id="machinereadable">µ¡³£Æɤ߼è¤ê²Äǽ¤Ê¥¹¥Æ¡¼¥¿¥¹¥Õ¥¡¥¤¥ë</a></h2>
-
-    
-    <p><code>http://your.server.name/server-status?auto</code> ¤ò
-    ¥¢¥¯¥»¥¹¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢¥¹¥Æ¡¼¥¿¥¹¥Õ¥¡¥¤¥ë¤Îµ¡³£Æɤ߼è¤ê²Äǽ¤Ê¥Ð¡¼¥¸¥ç¥ó¤ò
-    ÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤ì¤Ï¼«Æ°Åª¤Ë¼Â¹Ô¤µ¤ì¤ë¤È¤­¤ËÊØÍø¤Ç¤¹¡£
-    Apache ¤Î <code>/support</code> ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë
-    Perl ¥×¥í¥°¥é¥à <code>log_server_status</code> ¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <div class="note">
-      <strong><code class="module"><a href="../mod/mod_status.html">mod_status</a></code> ¤¬¥µ¡¼¥Ð¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ë
-      ¾ì¹ç¡¢¥Ï¥ó¥É¥é¤Îµ¡Ç½¤Ï¥Ç¥£¥ì¥¯¥È¥ê<em>Ëè</em>¤Î¥Õ¥¡¥¤¥ë
-      (<em>¤¹¤Ê¤ï¤Á</em>¡¢<code>.htaccess</code>) ¤â´Þ¤à<em>¤¹¤Ù¤Æ</em>¤Î
-      ÀßÄê¥Õ¥¡¥¤¥ë¤Ç»ÈÍѲÄǽ¤Ë¤Ê¤ë¤³¤È¤Ë¤ÏÃí°Õ¤ò¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
-      ¤³¤ì¤Ï¡¢¥µ¥¤¥È¤Ë¤è¤Ã¤Æ¤Ï¥»¥­¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ë˾¤Þ¤·¤¯¤Ê¤¤·ë²Ì¤ò
-      ¤â¤¿¤é¤¹¤³¤È¤¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</strong>
-    </div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ExtendedStatus" id="ExtendedStatus">ExtendedStatus</a> <a name="extendedstatus" id="extendedstatus">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>³Æ¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ³ÈÄ¥¥¹¥Æ¡¼¥¿¥¹¾ðÊó¤òÊݸ¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ExtendedStatus On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ExtendedStatus Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_status</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>ExtendedStatus ¤Ï Apache 1.3.2 °Ê¹ß¤Ç¤Î¤ß»ÈÍѲÄǽ</td></tr>
-</table>
-    <p>¤³¤ÎÀßÄê¤Ï¥µ¡¼¥ÐÁ´ÂΤËÂФ·¤ÆŬÍѤµ¤ì¡¢¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥ÈËè¤Ë
-    Êѹ¹¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£³ÈÄ¥¥¹¥Æ¡¼¥¿¥¹¾ðÊó¤Î¼ý½¸¤Ï¥µ¡¼¥Ð¤Î
-    Æ°ºî¤òÃÙ¤¯¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</p>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_status.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_status.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_status.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_status.html.ja.utf8 b/docs/manual/mod/mod_status.html.ja.utf8
new file mode 100644
index 00000000..9507e1f0
--- /dev/null
+++ b/docs/manual/mod/mod_status.html.ja.utf8
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_status - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_status</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_status.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_status.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_status.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>サー��活動状��性能�関�る情報を�供�る</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>status_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_status.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>�� Status モジュール�よりサー�管�者�サー�����ら�
+    �性能�動作���る�を知る�����るよ���り��。
+    �時点��サー��統計情報を読�や��形��表�� HTML ページ�
+    表示�れ��。必���れ����ページ�自動的�リフレッシュ��る
+    ��も���� (互�性��るブラウザを使用���る場�)。
+    別���時点��サー��状態を�純�機械読��り�能�リスト�
+    表�ページも�り��。</p>
+
+    <p>表示�れる情報�:</p>
+
+    <ul>
+      <li>リクエストを扱���るワーカー�数</li>
+
+      <li>アイドル (訳注: リクエストを扱�����) ワーカー�数</li>
+
+      <li>�ワーカー�状態�ワーカー�扱��リクエスト�数�
+      ワーカー������イト数 (*)</li>
+
+      <li>�アクセス数���イト数 (*)</li>
+
+      <li>サー��起動も����起動�れ�時刻�動作���る時間</li>
+
+      <li>平�� 1 秒��り�リクエスト数�1 秒��り��られ��イト数�
+      リクエスト��り��イト数 (*)</li>
+
+      <li>�ワーカー� Apache 全体�使用�れ��る CPU �割� (*)</li>
+
+      <li>�時点�ホスト�処��れ��るリクエスト (*)</li>
+    </ul>
+
+    <p>"(*)" �付���る情報を表示�る����コンパイル時�オプション
+    を使用�る必���り��。�れら�統計情報を得る���必��
+    コード�標準� Apache ����れ����ん。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#extendedstatus">ExtendedStatus</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#enable">Status を使用�能��る</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#autoupdate">自動更新</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#machinereadable">機械読��り�能�ステータスファイル</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="enable" id="enable">Status を使用�能��る</a></h2>
+    
+
+    <p>foo.com ドメイン�ら�ブラウザ���対��
+    ステータス�報告を使用�能��る��
+    以下�コードを <code>httpd.conf</code> 設定ファイル�追加���</p>
+<div class="example"><p><code>
+    &lt;Location /server-status&gt;<br />
+    SetHandler server-status<br />
+<br />
+    Order Deny,Allow<br />
+    Deny from all<br />
+    Allow from .foo.com<br />
+    &lt;/Location&gt;
+</code></p></div>
+
+    <p>�れ��サー��統計情報をウェブブラウザを使��
+    <code>http://your.server.name/server-status</code> をアクセス�る���より
+    知る�����るよ���り��。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="autoupdate" id="autoupdate">自動更新</a></h2>
+
+    
+    <p>ブラウザ�「リフレッシュ�機能をサ�ート���れ��ステータスページを
+    自動的�更新�るよ������。N 秒毎�更新��る����
+    <code>http://your.server.name/server-status?refresh=N</code>
+    ���ページをアクセス������。</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="machinereadable" id="machinereadable">機械読��り�能�ステータスファイル</a></h2>
+
+    
+    <p><code>http://your.server.name/server-status?auto</code> ã‚’
+    アクセス�る���より�ステータスファイル�機械読��り�能��ージョンを
+    得る�������。�れ�自動的�実行�れる���便利��。
+    Apache � <code>/support</code> ディレクトリ��る
+    Perl プログラム <code>log_server_status</code> を見�����。</p>
+
+    <div class="note">
+      <strong><code class="module"><a href="../mod/mod_status.html">mod_status</a></code> �サー��組�込�れ��る
+      場���ンドラ�機能�ディレクトリ<em>毎</em>�ファイル
+      (<em>����</em>�<code>.htaccess</code>) も�む<em>���</em>�
+      設定ファイル�使用�能��る����注�を����必���り��。
+      �れ��サイト�よ���セキュリティ�関�る望������果を
+      も�ら�����る�も�れ��ん。</strong>
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ExtendedStatus" id="ExtendedStatus">ExtendedStatus</a> <a name="extendedstatus" id="extendedstatus">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�リクエスト�対��拡張ステータス情報を�存�る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ExtendedStatus On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ExtendedStatus Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_status</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>ExtendedStatus � Apache 1.3.2 以����使用�能</td></tr>
+</table>
+    <p>��設定�サー�全体�対���用�れ��ー�ャルホスト毎�
+    変更�る�������ん。拡張ステータス情報��集�サー��
+    動作を���る����り��。</p>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_status.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_status.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_status.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_status.html.ko.euc-kr b/docs/manual/mod/mod_status.html.ko.euc-kr
index d012f335..cefe364d 100644
--- a/docs/manual/mod/mod_status.html.ko.euc-kr
+++ b/docs/manual/mod/mod_status.html.ko.euc-kr
@@ -145,6 +145,6 @@
 <a href="../ja/mod/mod_status.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_status.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_substitute.html b/docs/manual/mod/mod_substitute.html
index 8b031f76..4d0f620a 100644
--- a/docs/manual/mod/mod_substitute.html
+++ b/docs/manual/mod/mod_substitute.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_substitute.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_substitute.html.en b/docs/manual/mod/mod_substitute.html.en
index 5ab9376c..57b91d26 100644
--- a/docs/manual/mod/mod_substitute.html.en
+++ b/docs/manual/mod/mod_substitute.html.en
@@ -26,7 +26,8 @@
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Perform search and replace operations on response bodies</td></tr>
 <tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>substitute_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_substitute.c</td></tr></table>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_substitute.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.2.7 and later</td></tr></table>
 <h3>Summary</h3>
 
     <p><code class="module"><a href="../mod/mod_substitute.html">mod_substitute</a></code> provides a mechanism to perform
@@ -43,7 +44,7 @@
 <div class="directive-section"><h2><a name="Substitute" id="Substitute">Substitute</a> <a name="substitute" id="substitute">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Pattern to filter the response content</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Substitute <var>s/pattern/substitution/[inf]</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Substitute <var>s/pattern/substitution/[infq]</var></code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
@@ -65,7 +66,14 @@
         <dt><code>f</code></dt>
         <dd>The <code>f</code> flag causes mod_substitute to flatten the
         result of a substitution allowing for later substitutions to
-        take place on the boundary of this one.</dd>
+        take place on the boundary of this one. This is the default.</dd>
+        <dt><code>q</code></dt>
+        <dd>The <code>q</code> flag causes mod_substitute to not
+        flatten the buckets after each substitution. This can
+        result in much faster response and a decrease in memory
+        utilization, but should only be used if there is no possibility
+        that the result of one substitution will ever match a pattern
+        or regex of a subsequent one.</dd>
     </dl>
     
     <div class="example"><h3>Example</h3><p><code>
@@ -94,6 +102,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_substitute.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_suexec.html b/docs/manual/mod/mod_suexec.html
index 4be81b75..744f1f18 100644
--- a/docs/manual/mod/mod_suexec.html
+++ b/docs/manual/mod/mod_suexec.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_suexec.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_suexec.html.ja.euc-jp
+URI: mod_suexec.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_suexec.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_suexec.html.en b/docs/manual/mod/mod_suexec.html.en
index ea0e29d1..2a49dc58 100644
--- a/docs/manual/mod/mod_suexec.html.en
+++ b/docs/manual/mod/mod_suexec.html.en
@@ -75,6 +75,6 @@ later.</td></tr>
 <a href="../ja/mod/mod_suexec.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_suexec.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_suexec.html.ja.euc-jp b/docs/manual/mod/mod_suexec.html.ja.euc-jp
deleted file mode 100644
index ed75744f..00000000
--- a/docs/manual/mod/mod_suexec.html.ja.euc-jp
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_suexec - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_suexec</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_suexec.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_suexec.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_suexec.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>»ØÄꤵ¤ì¤¿¥æ¡¼¥¶¤È¥°¥ë¡¼¥×¤Ç CGI ¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô¤¹¤ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>³ÈÄ¥</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>suexec_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_suexec.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0 °Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤È <code class="program"><a href="../programs/suexec.html">suexec</a></code> ¥µ¥Ý¡¼¥È¥×¥í¥°¥é¥à
-    ¤Ë¤è¤ê¡¢CGI ¥¹¥¯¥ê¥×¥È¤¬»ØÄꤵ¤ì¤¿¥æ¡¼¥¶¤È¥°¥ë¡¼¥×¤Ç
-    ¼Â¹Ô¤µ¤ì¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#suexecusergroup">SuexecUserGroup</a></li>
-</ul>
-<h3>»²¾È</h3>
-<ul class="seealso">
-<li><a href="../suexec.html">SuEXEC ¥µ¥Ý¡¼¥È</a></li>
-</ul></div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SuexecUserGroup" id="SuexecUserGroup">SuexecUserGroup</a> <a name="suexecusergroup" id="suexecusergroup">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>CGI ¥×¥í¥°¥é¥à¤Î¥æ¡¼¥¶¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¡¢¥°¥ë¡¼¥×¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>SuexecUserGroup <em>User Group</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>³ÈÄ¥</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_suexec</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>SuexecUserGroup ¤Ï 2.0 °Ê¹ß¤Ç¤Î¤ß»ÈÍѲÄǽ¡£</td></tr>
-</table>
-    <p><code class="directive">SuexecUserGroup</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï CGI ¥×¥í¥°¥é¥à
-    ¤¬¼Â¹Ô¤µ¤ì¤ë¥æ¡¼¥¶¤È¥°¥ë¡¼¥×¤ò»ØÄê¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£CGI °Ê³°¤Î
-    ¥ê¥¯¥¨¥¹¥È¤Ï User ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤵ¤ì¤¿¥æ¡¼¥¶¤Î¤Þ¤Þ¤Ç½èÍý¤µ¤ì¤Þ¤¹¡£
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï Apache 1.3 ¤Ë¤ª¤±¤ë VirtualHosts ¤ÎÃæ¤Ç
-    User ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È Group ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¦ÍÑË¡¤ÎÂå¤ï¤ê¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-    
-    SuexecUserGroup nobody nogroup
-    </code></p></div>
-
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_suexec.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_suexec.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_suexec.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_suexec.html.ja.utf8 b/docs/manual/mod/mod_suexec.html.ja.utf8
new file mode 100644
index 00000000..c2b293ca
--- /dev/null
+++ b/docs/manual/mod/mod_suexec.html.ja.utf8
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_suexec - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_suexec</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_suexec.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_suexec.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_suexec.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>指定�れ�ユーザ�グループ� CGI スクリプトを実行�る</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>suexec_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_suexec.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0 以��使用�能</td></tr></table>
+<h3>概�</h3>
+
+    <p>��モジュール� <code class="program"><a href="../programs/suexec.html">suexec</a></code> サ�ートプログラム
+    �より�CGI スクリプト�指定�れ�ユーザ�グループ�
+    実行�れるよ������。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#suexecusergroup">SuexecUserGroup</a></li>
+</ul>
+<h3>�照</h3>
+<ul class="seealso">
+<li><a href="../suexec.html">SuEXEC サ�ート</a></li>
+</ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SuexecUserGroup" id="SuexecUserGroup">SuexecUserGroup</a> <a name="suexecusergroup" id="suexecusergroup">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>CGI プログラム�ユーザパーミッション�グループパーミッション</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SuexecUserGroup <em>User Group</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_suexec</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>SuexecUserGroup � 2.0 以����使用�能。</td></tr>
+</table>
+    <p><code class="directive">SuexecUserGroup</code> ディレクティブ� CGI プログラム
+    �実行�れるユーザ�グループを指定��るよ�����。CGI 以外�
+    リクエスト� User ディレクティブ�指定�れ�ユーザ����処��れ��。
+    ��ディレクティブ� Apache 1.3 ���る VirtualHosts �中�
+    User ディレクティブ� Group ディレクティブを使�用法�代�り��り��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+    
+    SuexecUserGroup nobody nogroup
+    </code></p></div>
+
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_suexec.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_suexec.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_suexec.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_suexec.html.ko.euc-kr b/docs/manual/mod/mod_suexec.html.ko.euc-kr
index 3f6a91a8..8cdd836f 100644
--- a/docs/manual/mod/mod_suexec.html.ko.euc-kr
+++ b/docs/manual/mod/mod_suexec.html.ko.euc-kr
@@ -76,6 +76,6 @@
 <a href="../ja/mod/mod_suexec.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_suexec.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_unique_id.html b/docs/manual/mod/mod_unique_id.html
index 1dae85cf..b8be353a 100644
--- a/docs/manual/mod/mod_unique_id.html
+++ b/docs/manual/mod/mod_unique_id.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_unique_id.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_unique_id.html.ja.euc-jp
+URI: mod_unique_id.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_unique_id.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_unique_id.html.en b/docs/manual/mod/mod_unique_id.html.en
index 6d6fdaf3..946aea3a 100644
--- a/docs/manual/mod/mod_unique_id.html.en
+++ b/docs/manual/mod/mod_unique_id.html.en
@@ -211,6 +211,6 @@ identifier for each request</td></tr>
 <a href="../ja/mod/mod_unique_id.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_unique_id.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_unique_id.html.ja.euc-jp b/docs/manual/mod/mod_unique_id.html.ja.euc-jp
deleted file mode 100644
index 301654c0..00000000
--- a/docs/manual/mod/mod_unique_id.html.ja.euc-jp
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_unique_id - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_unique_id</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_unique_id.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_unique_id.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_unique_id.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¤½¤ì¤¾¤ì¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ¹¤ë°ì°Õ¤Ê¼±Ê̻ҤÎÆþ¤Ã¤¿´Ä¶­ÊÑ¿ô¤ò
-Ä󶡤¹¤ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>unique_id_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_unique_id.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-
-    <p>¤³¤Î¥â¥¸¥å¡¼¥ë¤ÏÈó¾ï¤ËÀ©¸Â¤µ¤ì¤¿¾ò·ï²¼¤Ç¡¢
-    ¤½¤ì¤¾¤ì¤Î¥ê¥¯¥¨¥¹¥È¤Ë¡Ö¤¹¤Ù¤Æ¡×¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ
-    °ì°Õ¤Ë·è¤Þ¤ë¤³¤È¤¬Êݾڤµ¤ì¤Æ¤¤¤ëËâË¡¤Î¥È¡¼¥¯¥ó¤òÄ󶡤·¤Þ¤¹¡£
-    ¤³¤Î°ì°Õ¤Ê¼±Ê̻Ҥϡ¢Å¬ÀÚ¤ËÀßÄꤵ¤ì¤¿¥¯¥é¥¹¥¿¤Ç¤ÏÊ£¿ô¤Î
-    ¥Þ¥·¥ó¤Î´Ö¤Ç¤µ¤¨¤â°ì°Õ¤Ë¤Ê¤ê¤Þ¤¹¡£¤½¤ì¤¾¤ì¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ´Ä¶­ÊÑ¿ô
-    <code>UNIQUE_ID</code> ¤Ë¼±Ê̻Ҥ¬ÀßÄꤵ¤ì¤Þ¤¹¡£
-    °ì°Õ¤Ê¼±Ê̻Ҥ¬ÊØÍø¤ÊÍýͳ¤Ï¤¤¤í¤¤¤í¤¢¤ê¤Þ¤¹¤¬¡¢
-    ¤³¤Î¥É¥­¥å¥á¥ó¥È¤ÎÌÜŪ¤«¤é¤Ï³°¤ì¤ë¤¿¤á¡¢¤³¤³¤Ç¤ÏÀâÌÀ¤·¤Þ¤»¤ó¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤¢¤ê¤Þ¤»¤ó¡£</p>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#theory">ÍýÏÀ</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="theory" id="theory">ÍýÏÀ</a></h2>
-    
-
-    <p>¤Þ¤º¤Ï¤¸¤á¤Ë¡¢Apache ¥µ¡¼¥Ð¤¬ Unix
-    ¥Þ¥·¥ó¤Ç¤É¤Î¤è¤¦¤ËÆ°ºî¤ò¤¹¤ë¤«¤ò´Êñ¤ËÀâÌÀ¤·¤Þ¤¹¡£
-    ¤³¤Îµ¡Ç½¤Ï¸½»þÅÀ¤Ç¤Ï Windows NT ¤Ç¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
-    Unix ¥Þ¥·¥ó¤Ç¤Ï Apache ¤Ï¤¤¤¯¤Ä¤«¤Î»Ò¥×¥í¥»¥¹¤òºîÀ®¤·¡¢
-    ¤½¤Î»Ò¥×¥í¥»¥¹¤¬°ì¤Ä¤º¤Ä¥ê¥¯¥¨¥¹¥È¤ò½èÍý¤·¤Þ¤¹¡£¤½¤ì¤¾¤ì¤Î»Ò¥×¥í¥»¥¹¤Ï¡¢
-    À¸Â¸´ü´ÖÃæ¤ËÊ£¿ô¤Î¥ê¥¯¥¨¥¹¥È¤ò°·¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤³¤ÎµÄÏÀ¤Ç¤Ï»Ò¥×¥í¥»¥¹´Ö¤Ç¤Ï°ìÀڥǡ¼¥¿¤ò¶¦Í­¤·¤Ê¤¤¤³¤È¤Ë¤·¤Þ¤¹¡£
-    °Ê¸å¡¢¤³¤Î»Ò¥×¥í¥»¥¹¤Î¤³¤È¤ò <dfn>httpd ¥×¥í¥»¥¹</dfn> ¤È¸Æ¤Ó¤Þ¤¹¡£</p>
-
-    <p>¤¢¤Ê¤¿¤Î¥¦¥§¥Ö¥µ¥¤¥È¤Ë¤Ï¤¢¤Ê¤¿¤¬´ÉÍý¤¹¤ë¤¤¤¯¤Ä¤«¤Î¥Þ¥·¥ó¤¬¤¢¤ë¤È¤·¤Þ¤¹¡£
-    ¤½¤ì¤é¤ò¤Þ¤È¤á¤Æ¥¯¥é¥¹¥¿¤È¸Æ¤Ö¤³¤È¤Ë¤·¤Þ¤¹¡£¤½¤ì¤¾¤ì¤Î¥Þ¥·¥ó¤ÏÊ£¿ô¤Î
-    Apache ¤ò¼Â¹Ô¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-    ¤³¤ì¤é¤¹¤Ù¤Æ¤ò¤Þ¤È¤á¤¿¤â¤Î¤¬¡Ö±§Ãè¡×¤Ç¤¢¤ë¤È¹Í¤¨¤é¤ì¤Þ¤¹¡£
-    ¤¤¤¯¤Ä¤«¤Î²¾Äê¤Î²¼¤Ç¡¢¥¯¥é¥¹¥¿¤Î¥Þ¥·¥ó´Ö¤¬¤¿¤¯¤µ¤óÄÌ¿®¤ò¤¹¤ë¤³¤È¤Ê¤¯¡¢
-    ¤³¤Î±§Ãè¤ÎÃæ¤Ç¤½¤ì¤¾¤ì¤Î¥ê¥¯¥¨¥¹¥È¤Ë°ì°Õ¤Ê¼±Ê̻ҤòÀ¸À®¤Ç¤­¤ë¤³¤È¤ò¼¨¤·¤Þ¤¹¡£
-    </p>
-
-    <p>¥¯¥é¥¹¥¿¤Ë¤¢¤ë¥Þ¥·¥ó¤Ï°Ê²¼¤ÎÍ×µá¤ò¸«¤¿¤µ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-    (¥Þ¥·¥ó¤¬°ì¤Ä¤À¤±¤À¤È¤·¤Æ¤â¡¢NTP ¤Ç»þ·×¤ò¹ç¤ï¤»¤ëÊý¤¬Îɤ¤¤Ç¤¹¡£)</p>
-
-    <ul>
-      <li>NTP ¤ä¾¤Î¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Ç»þ´Ö¤ò¹ç¤ï¤»¤ë¥×¥í¥È¥³¥ë¤Ë¤è¤Ã¤Æ
-      ³Æ¥Þ¥·¥ó¤Î»þ´Ö¤ÎƱ´ü¤¬¼è¤é¤ì¤Æ¤¤¤ë¤³¤È¡£</li>
-
-      <li>¥â¥¸¥å¡¼¥ë¤¬¥Û¥¹¥È̾¤ò°ú¤¤¤Æ°ã¤¦ IP
-      ¥¢¥É¥ì¥¹¤ò¼õ¤±¼è¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¡¢
-      ¥¯¥é¥¹¥¿¤Î¤½¤ì¤¾¤ì¤Î¥Þ¥·¥ó¤Î¥Û¥¹¥È̾¤¬°ã¤¦¤³¤È¡£</li>
-    </ul>
-
-    <p>¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ë¤ª¤¤¤Æ¤Ï¡¢pid (¥×¥í¥»¥¹ ID) ¤¬
-    32 ¥Ó¥Ã¥È¤ÎÈÏ°ÏÆâ¤Ç¤¢¤ë¤³¤È¤ò²¾Äꤷ¤Þ¤¹¡£¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î
-    pid ¤¬ 32 ¥Ó¥Ã¥È¤òĶ¤¨¤ë¾ì¹ç¤Ï¡¢´Êñ¤Ê½¤Àµ¤Ç¤Ï¤¢¤ê¤Þ¤¹¤¬¡¢
-    ¥³¡¼¥É¤òÊѹ¹¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>¤³¤ì¤é¤Î²¾Ä꤬Ëþ¤¿¤µ¤ì¤Æ¤¤¤ë¤È¡¢¤¢¤ë»þÅÀ¤Ë¤ª¤¤¤Æ¡¢
-    ¥¯¥é¥¹¥¿Æâ¤Î¤É¤Î¥Þ¥·¥ó¤Î¤É¤Î httpd
-    ¥×¥í¥»¥¹¤Ç¤â¡¢°ì°Õ¤ËƱÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤ì¤Ï¥Þ¥·¥ó¤Î IP
-    ¥¢¥É¥ì¥¹¤È httpd ¥×¥í¥»¥¹¤Î pid ¤Ç½½Ê¬¤Ë¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤Ç¤¹¤«¤é¡¢¥ê¥¯¥¨¥¹¥È¤Ë°ì°Õ¤Ê¼±Ê̻ҤòÀ¸À®¤¹¤ë¤¿¤á¤Ë¤Ï¡¢
-    »þ¹ï¤ò¶èÊ̤¹¤ëɬÍפ¬¤¢¤ë¤À¤±¤Ç¤¹¡£</p>
-
-    <p>»þ¹ï¤ò¶èÊ̤¹¤ë¤¿¤á¤Ë¡¢Unix ¤Î¥¿¥¤¥à¥¹¥¿¥ó¥× (UTC ¤Î 1970 ǯ
-    1 ·î 1 Æü¤«¤é¤ÎÉÿô) ¤È¡¢16 ¥Ó¥Ã¥È¤Î¥«¥¦¥ó¥¿¤ò»È¤¤¤Þ¤¹¡£
-    ¥¿¥¤¥à¥¹¥¿¥ó¥×¤ÎγÅ٤ϰìÉäǤ¹¤Î¤Ç¡¢°ìÉô֤Π65536
-    ¤Þ¤Ç¤ÎÃͤòɽ¸½¤¹¤ë¤¿¤á¤Ë¥«¥¦¥ó¥¿¤ò»ÈÍѤ·¤Þ¤¹¡£»Í¤Ä¤ÎÃÍ
-    <em>( ip_addr, pid, time_stamp, counter )</em> ¤Ç³Æ httpd
-    ¥×¥í¥»¥¹¤Ç°ìÉÃ¤Î´Ö¤Ë 65536 ¥ê¥¯¥¨¥¹¥È¤ò¿ô¤¨¤¢¤²¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    »þ´Ö¤¬·Ð¤Ä¤È pid ¤¬ºÆÍøÍѤµ¤ì¤ë¤È¤¤¤¦ÌäÂ꤬¤¢¤ê¤Þ¤¹¤¬¡¢
-    ¤³¤ÎÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤Ë¥«¥¦¥ó¥¿¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£</p>
-
-    <p>httpd ¤Î»Ò¥×¥í¥»¥¹¤¬ºîÀ®¤µ¤ì¤ë¤È¡¢¥«¥¦¥ó¥¿¤Ï
-    (¤½¤Î»þÅÀ¤Î¥Þ¥¤¥¯¥íÉà ¡à 10) modulo 65536 ¤Ç½é´ü²½¤µ¤ì¤Þ¤¹
-    (¤³¤Î¼°¤Ï¤¤¤¯¤Ä¤«¤Î¥·¥¹¥Æ¥à¤Ë¤¢¤ë¡¢¥Þ¥¤¥¯¥íÉäÎ
-    ¥¿¥¤¥Þ¤Î²¼°Ì¥Ó¥Ã¥È¤¬°Û¤Ê¤ë¤È¤¤¤¦ÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤ËÁª¤Ð¤ì¤Þ¤·¤¿)¡£
-    °ì°Õ¤Ê¼±Ê̻Ҥ¬À¸À®¤µ¤ì¤¿¤È¤­¡¢»ÈÍѤµ¤ì¤ë¥¿¥¤¥à¥¹¥¿¥ó¥×¤Ï
-    ¥¦¥§¥Ö¥µ¡¼¥Ð¤Ë¥ê¥¯¥¨¥¹¥È¤¬ÅþÃ夷¤¿»þ¹ï¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¥«¥¦¥ó¥¿¤Ï¼±Ê̻Ҥ¬À¸À®¤µ¤ì¤ë¤¿¤Ó¤ËÁý²Ã¤·¤Þ¤¹ 
-    (¤¢¤Õ¤ì¤¿¾ì¹ç¤Ï 0 ¤ËÌá¤ê¤Þ¤¹)¡£</p>
-
-    <p>¥«¡¼¥Í¥ë¤Ï¥×¥í¥»¥¹¤ò¥Õ¥©¡¼¥¯¤¹¤ë¤È¡¢¤½¤ì¤¾¤ì¤Î¥×¥í¥»¥¹¤Î¤¿¤á¤Ë
-    pid ¤òÀ¸À®¤·¤Þ¤¹¡£pid ¤Ï·«¤êÊÖ¤µ¤ì¤ë¤³¤È¤¬µö²Ä¤µ¤ì¤Æ¤¤¤Þ¤¹
-    (pid ¤ÎÃͤÏ¿¤¯¤Î Unix ¤Ç¤Ï 16 ¥Ó¥Ã¥È¤Ç¤¹¤¬¡¢¿·¤·¤¤¥·¥¹¥Æ¥à¤Ç¤Ï
-    32 ¥Ó¥Ã¥È¤Ë³ÈÄ¥¤µ¤ì¤Æ¤¤¤Þ¤¹)¡£
-    ¤Ç¤¹¤«¤é¡¢¤¢¤ëÄøÅ٤λþ´Ö¤¬·Ð²á¤¹¤ë¤ÈƱ¤¸ pid ¤¬ºÆ¤Ó»ÈÍѤµ¤ì¤Þ¤¹¡£
-    ¤·¤«¤·¡¢°ìÉÃÆâ¤ËºÆ»ÈÍѤµ¤ì¤Ê¤±¤ì¤Ð¡¢
-    »Í¤Ä¤ÎÃͤΰì°ÕÀ­¤ÏÊݤ¿¤ì¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢²æ¡¹¤Ï¥·¥¹¥Æ¥à¤¬°ìÉôÖ
-    ¤Ë 65536 ¸Ä¤Î¥×¥í¥»¥¹¤òµ¯Æ°¤·¤Ê¤¤¤È²¾Äꤷ¤Æ¤¤¤Þ¤¹ (¤¤¤¯¤Ä¤«¤Î Unix
-    ¤Ç¤Ï 32768 ¥×¥í¥»¥¹¤Ç¤¹¤¬¡¢¤½¤ì¤Ç¤¹¤é¤Û¤È¤ó¤É¤¢¤êÆÀ¤Ê¤¤¤Ç¤·¤ç¤¦)¡£</p>
-
-    <p>²¿¤é¤«¤ÎÍýͳ¤Ç¡¢Æ±¤¸»þ¹ï¤¬·«¤êÊÖ¤µ¤ì¤¿¤È¤·¤Þ¤·¤ç¤¦¡£
-    ¤Ä¤Þ¤ê¡¢¥·¥¹¥Æ¥à¤Î»þ·×¤¬¶¸¤Ã¤Æ¤¤¤Æ¡¢¤â¤¦°ìÅÙ²áµî¤Î»þ¹ï¤Ë¤Ê¤Ã¤Æ¤·¤Þ¤Ã¤¿
-    (¤â¤·¤¯¤Ï¿Ê¤ß¤¹¤®¤Æ¤¤¤¿¤È¤­¤Ë¡¢
-    Àµ¤·¤¤»þ¹ï¤ËÌᤷ¤¿¤¿¤á¤ËºÆ¤Ó¾­Íè¤Î»þ¹ï¤Ë¤Ê¤Ã¤Æ¤·¤Þ¤Ã¤¿) ¤È¤·¤Þ¤¹¡£
-    ¤³¤Î¾ì¹ç¡¢pid ¤È¥¿¥¤¥à¥¹¥¿¥ó¥×¤¬ºÆ»ÈÍѤµ¤ì¤ë¤³¤È¤¬´Êñ¤Ë¼¨¤µ¤ì¤Þ¤¹¡£
-    ¥«¥¦¥ó¥¿½é´ü²½ÍѤδؿô¤Ï¡¢¤³¤ÎÌäÂê¤Î²óÈò¤ò¼ê½õ¤±¤·¤è¤¦¤ÈÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-    ËÜÅö¤Ï¥«¥¦¥ó¥¿¤Î½é´ü²½¤ò¤¹¤ë¤¿¤á¤Ë¥é¥ó¥À¥à¤Ê¿ô»ú¤ò»È¤¤¤¿¤¤¤Î¤Ç¤¹¤¬¡¢
-    ¤Û¤È¤ó¤É¤Î¥·¥¹¥Æ¥à¤Ç¤Ï´Êñ¤Ë»ÈÍѤǤ­¤ë¿ô¤Ï̵¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤
-    (<em>¤¹¤Ê¤ï¤Á</em>¡¢rand ()¤Ï»È¤¨¤Þ¤»¤ó¡£rand () ¤Ë¤Ï seed
-    ¤òÍ¿¤¨¤ëɬÍפ¬¤¢¤ê¡¢seed ¤Ë¤Ï»þ¹ï¤ò»È¤¨¤Þ¤»¤ó¡£°ìÉÃñ°Ì¤Ç¤Ï¡¢
-    ¤½¤Î»þ¹ï¤Ï¤¹¤Ç¤Ë·«¤êÊÖ¤µ¤ì¤Æ¤¤¤ë¤«¤é¤Ç¤¹)¡£
-    ¤³¤ì¤Ï¡¢´°àú¤ÊÂкö¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</p>
-
-    <p>¤³¤ÎÂкö¤Ï¤É¤Î¤¯¤é¤¤¸ú²Ì¤¬¤¢¤ë¤Ç¤·¤ç¤¦¤«?
-    ¤³¤³¤Ç¤Ï¡¢¥Þ¥·¥ó·²¤ÎÃæ¤Î°ì¤Ä¤ÏºÇÂç¤Ç°ìÉÃ¤Ë 500
-    ¥ê¥¯¥¨¥¹¥È¤ò°·¤¦¤È²¾Äꤷ¤Þ¤¹ (¤³¤ì¤ò½ñ¤¤¤Æ¤¤¤ë»þÅÀ¤Ç¤ÏÂÅÅö¤Ê¾å¸Â¤Ç¤¹¡£
-    Ä̾亮¥¹¥Æ¥à¤¬¤¹¤ë¤³¤È¤ÏÀÅŪ¤Ê¥Õ¥¡¥¤¥ë¤ò¼è¤ê¤À¤¹¤À¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤«¤é)¡£
-    ¤½¤ì¤ò¹Ô¤Ê¤¦¤¿¤á¤Ë¡¢¤½¤Î¥Þ¥·¥ó¤ÏʹԤ·¤ÆÍè¤ë¥¯¥é¥¤¥¢¥ó¥È¤Î¿ô¤Ë
-    ±þ¤¸¤¿¿ô¤Î»Ò¥×¥í¥»¥¹¤òÍ׵ᤷ¤Þ¤¹¡£
-    ¤·¤«¤·¤Ê¤¬¤é¡¢Èá´ÑŪ¤Ë¹Í¤¨¤Æ¡¢°ì¤Ä¤Î»Ò¥×¥í¥»¥¹¤¬°ìÉÃ¤Ë 500
-    ¥ê¥¯¥¨¥¹¥È¤ò°·¤¨¤ë¤È¤·¤Þ¤¹¡£¤½¤¦¤¹¤ë¤È¡¢(°ìÉäÎÀºÅ٤ˤª¤¤¤Æ)
-    »þ¹ï¤¬Æ±¤¸»þ¤ò·«¤êÊÖ¤¹¤È¡¢¤³¤Î»Ò¥×¥í¥»¥¹¤¬¥«¥¦¥ó¥¿¤ÎÃͤòºÆ¤Ó»È¤¤¡¢
-    °ì°ÕÀ­¤¬²õ¤ì¤ë²ÄǽÀ­¤¬ 1.5% ¤¢¤ê¤Þ¤¹¡£
-    ¤³¤ì¤ÏÈó¾ï¤ËÈá´ÑŪ¤ÊÎã¤Ç¡¢¼ÂÀ¤³¦¤ÎÃͤǤϡ¢¤Û¤È¤ó¤Éµ¯¤³¤ê¤½¤¦¤Ë¤¢¤ê¤Þ¤»¤ó¡£
-    ¤½¤ì¤Ç¤â¤³¤ì¤¬µ¯¤³¤ë²ÄǽÀ­¤Î¤¢¤ë¤è¤¦¤Ê¥·¥¹¥Æ¥à¤Ê¤é¡¢
-    (¥×¥í¥°¥é¥à¥³¡¼¥É¤òÊÔ½¸¤·¤Æ) 
-    ¥«¥¦¥ó¥¿¤ò 32 ¥Ó¥Ã¥È¤Ë¤¹¤ë¤Î¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£
-    </p>
-
-    <p>¥µ¥Þ¡¼¥¿¥¤¥à¤Ë¤è¤ê»þ·×¤¬¡ÖÌᤵ¤ì¤ë¡×¤³¤È¤òµ¤¤Ë¤·¤Æ¤¤¤ë¿Í¤¬
-    ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤³¤³¤Ç»ÈÍѤµ¤ì¤ë»þ´Ö¤Ï UTC ¤Ç¤¢¤ê¡¢
-    ¤½¤ì¤Ï¡Ö¾ï¤Ë¡×¿Ê¤à¤Î¤Ç¤³¤³¤Ç¤ÏÌäÂê¤Ë¤Ê¤ê¤Þ¤»¤ó¡£x86 ¾å¤Î Unix
-    ¤Ï¤³¤Î¾ò·ï¤òËþ¤¿¤¹¤¿¤á¤ËŬÀÚ¤ÊÀßÄ꤬ɬÍפ«¤â¤·¤ì¤Ê¤¤¤³¤È¤Ë
-    Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¥Þ¥¶¡¼¥Ü¡¼¥É¤Î»þ·×¤Ï UTC ¤Ë¤Ê¤Ã¤Æ¤¤¤Æ¡¢
-    ¾¤Î»þ´Ö¤Ï¤½¤³¤«¤éŬÀÚ¤ËÊäÀµ¤µ¤ì¤ë¤³¤È¤ò²¾Äê¤Ç¤­¤ë¤è¤¦¤Ë
-    ÀßÄꤵ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¤½¤Î¤è¤¦¤Ê¾ì¹ç¤Ç¤µ¤¨¡¢NTP
-    ¤ò»È¤Ã¤Æ¤¤¤ë¤Ê¤é¤Ð¥ê¥Ö¡¼¥È¸å¤Ë¤¹¤°Àµ¤·¤¤ UTC ¤Î»þ´Ö¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£</p>
-
-    <p><code>UNIQUE_ID</code> ´Ä¶­ÊÑ¿ô¤Ï 112 ¥Ó¥Ã¥È (32 ¥Ó¥Ã¥È IP
-    ¥¢¥É¥ì¥¹¡¢32 ¥Ó¥Ã¥È pid, 32 ¥Ó¥Ã¥È¥¿¥¤¥à¥¹¥¿¥ó¥×¡¢16
-    ¥Ó¥Ã¥È¥«¥¦¥ó¥¿¤Î»Í¤Ä¤ÎÁÈ) ¤ò¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È <code>[A-Za-z0-9@-]</code>
-    ¤òÍѤ¤¤Æ MIME ¤Î base64 Éä¹æ²½¤ÈƱÍͤÎÊýË¡¤Ë¤è¤êÉä¹æ²½¤·¡¢19
-    ¤Îʸ»ú¤òÀ¸À®¤¹¤ë¤³¤È¤Ë¤è¤êºîÀ®¤µ¤ì¤Þ¤¹¡£MIME ¤Î base64
-    ¤Î¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤Ï¼ÂºÝ¤Ï <code>[A-Za-z0-9+/]</code> ¤Ç¤¹¤¬¡¢
-    <code>+</code> ¤È <code>/</code> ¤È¤Ï URL
-    ¤Ç¤ÏÆÃÊ̤ÊÉä¹æ²½¤¬É¬ÍפʤΤǡ¢¤¢¤Þ¤ê˾¤Þ¤·¤¯¤¢¤ê¤Þ¤»¤ó¡£
-    Á´¤Æ¤ÎÃͤϥͥåȥ¥¯¥Ð¥¤¥È¥ª¡¼¥À¤ÇÉä¹æ²½¤µ¤ì¤Þ¤¹¤Î¤Ç¡¢
-    Éä¹æ¤Ï°ã¤Ã¤¿¥Ð¥¤¥È¥ª¡¼¥À¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã´Ö¤ÇÈæ³Ó²Äǽ¤Ç¤¹¡£
-    ¼ÂºÝ¤ÎÉä¹æ²½¤Î½çÈÖ¤Ï: ¥¿¥¤¥à¥¹¥¿¥ó¥×¡¢IP ¥¢¥É¥ì¥¹¡¢pid,
-    ¥«¥¦¥ó¥¿¤Ç¤¹¡£¤³¤Î½ç¤Ë¤ÏÌÜŪ¤¬¤¢¤ê¤Þ¤¹¤¬¡¢
-    ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÏÉä¹æ¤ò²òÀϤ¹¤ë¤Ù¤­¤Ç¤Ï¤Ê¤¤¤³¤È¤ò¶¯Ä´¤·¤Æ¤ª¤­¤Þ¤¹¡£
-    ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÏÉä¹æ²½¤µ¤ì¤¿ <code>UNIQUE_ID</code>
-    Á´ÂΤòÆ©²áŪ¤Ê¥È¡¼¥¯¥ó¤È¤·¤Æ°·¤¦¤Ù¤­¤Ç¤¹¡£
-    <code>UNIQUE_ID</code> ¤Ï¾¤Î <code>UNIQUE_ID</code>
-    ¤È¤ÎÅù²ÁÀ­¤òÄ´¤Ù¤ë¤¿¤á¤À¤±¤Ë¤Î¤ß»ÈÍѤǤ­¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î½çÈ֤Ͼ­Íè¡¢´û¸¤Î <code>UNIQUE_ID</code>
-    ¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤È¤Î¾×Æͤò¿´ÇÛ¤¹¤ë¤³¤È¤Ê¤¯Éä¹æ¤òÊѹ¹¤¹¤ë¤³¤È¤¬
-    ²Äǽ¤Ë¤Ê¤ë¤è¤¦¤ËÁªÂò¤·¤Æ¤¤¤Þ¤¹¡£
-    ¿·¤·¤¤Éä¹æ¤Ï¥¿¥¤¥à¥¹¥¿¥ó¥×¤òºÇ½é¤ÎÍ×ÁǤȤ·¤Æ»Ä¤¹¤Î¤¬Ë¾¤Þ¤·¤¯¡¢
-    ¤½¤ì°Ê³°¤ÏƱ¤¸¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤È¥Ó¥Ã¥ÈŤò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¥¿¥¤¥à¥¹¥¿¥ó¥×¤ÏËܼÁŪ¤ËÁý²Ã·ÏÎó¤Ç¤¹¤Î¤Ç¡¢
-    ¥¯¥é¥¹¥¿¤ÎÁ´¤Æ¤Î¥Þ¥·¥ó¤¬¥ê¥¯¥¨¥¹¥È¤È¥µ¡¼¥Ðµ¡Ç½¤òÄä»ß¤·¤Æ¡¢
-    ¸Å¤¤Éä¹æ²½Êý¼°¤ò»ÈÍѤ¹¤ë¤Î¤ò¤ä¤á¤ë<em>¥Õ¥é¥°ÉÃ</em>¤¬¤¢¤ì¤Ð½½Ê¬¤Ç¤¹¡£
-    ¤½¤Î¸å¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤òºÆ³«¤·¡¢
-    ¿·¤·¤¤Éä¹æ¤òȯ¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p>²æ¡¹¤Ï¤³¤ì¤¬¡¢
-    ¤³¤ÎÌäÂê¤ËÂФ¹¤ëÈæ³ÓŪ°Ü¿¢À­¤Î¹â¤¤²ò·èË¡¤À¤È¹Í¤¨¤Æ¤¤¤Þ¤¹¡£
-    Windows NT ¤Î¤è¤¦¤Ê¥Þ¥ë¥Á¥¹¥ì¥Ã¥É¤Î¥·¥¹¥Æ¥à¤Ë³ÈÄ¥¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤·¡¢
-    ¾­ÍèɬÍפˤʤì¤Ð¤µ¤é¤ËÁý¤ä¤¹¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-    ID ¤ÏɬÍפ˱þ¤¸¤ÆŤ¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤Î¤Ç¡¢À¸À®¤µ¤ì¤¿ ID
-    ¤Ï¼Â¼Á¾å¡¢Ìµ¸Â¤ËÍ­¸ú¤Ç¤¹¡£¤Þ¤¿¡¢¥¯¥é¥¹¥¿¤Î¥Þ¥·¥ó´Ö¤ÎÄÌ¿®¤â»ö¼Â¾åɬÍפʤ¯
-    (NTP ¤Ë¤è¤ëƱ´ü¤Î¤ß¤¬É¬Íפǡ¢¤³¤ì¤Ï¥ª¡¼¥Ð¥Ø¥Ã¥É¤Ï¤¢¤Þ¤ê¤¢¤ê¤Þ¤»¤ó)¡¢httpd
-    ¥×¥í¥»¥¹´Ö¤ÎÄÌ¿®¤âɬÍפ¢¤ê¤Þ¤»¤ó (ÄÌ¿®¤Ï¥«¡¼¥Í¥ë¤Ë¤è¤ê³ä¤êÅö¤Æ¤é¤ì¤¿
-    pid ¤ÎÃͤˤè¤ê°ÅÌÛ¤ÎÆâ¤Ë¹Ô¤Ê¤ï¤Æ¤¤¤Þ¤¹)¡£
-    ¤µ¤é¤Ë¸Â¤é¤ì¤¿¾õ¶·²¼¤Ç¤Ï¡¢ID ¤Ï¤µ¤é¤Ëû¤¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢
-    ¤è¤ê¿¤¯¤Î¾ðÊó¤ò²¾Äꤹ¤ëɬÍפ¬¤Ç¤Æ¤­¤Þ¤¹ (Î㤨¤Ð¡¢32 ¥Ó¥Ã¥È
-    IP ¥¢¥É¥ì¥¹¤Ï¤É¤Î¥µ¥¤¥È¤Ë¤ª¤¤¤Æ¤â²á¾ê¤Ê¾ðÊó¤Ç¤¹¤¬¡¢
-    ¤½¤ì¤ÎÂå¤ï¤ê¤Ë¤Ê¤ë°Ü¿¢À­¤Î¤¢¤ë¤â¤Î¤Ï¤¢¤ê¤Þ¤»¤ó)¡£</p>
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_unique_id.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_unique_id.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_unique_id.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_unique_id.html.ja.utf8 b/docs/manual/mod/mod_unique_id.html.ja.utf8
new file mode 100644
index 00000000..e862b878
--- /dev/null
+++ b/docs/manual/mod/mod_unique_id.html.ja.utf8
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_unique_id - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_unique_id</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_unique_id.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_unique_id.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_unique_id.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>�れ�れ�リクエスト�対�る一��識別��入��環境変数を
+�供�る</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>unique_id_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_unique_id.c</td></tr></table>
+<h3>概�</h3>
+
+
+    <p>��モジュール��常�制��れ��件下��
+    �れ�れ�リクエスト�「�����リクエスト�対��
+    一��決�る����証�れ��る魔法�トークンを�供���。
+    ��一��識別����切�設定�れ�クラスタ��複数�
+    マシン�間���も一���り��。�れ�れ�リクエスト�対��環境変数
+    <code>UNIQUE_ID</code> �識別��設定�れ��。
+    一��識別��便利��由������り����
+    ��ドキュメント�目的�ら�外れる�������説明���ん。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<p>��モジュール�ディレクティブ��り��ん。</p>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#theory">�論</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="theory" id="theory">�論</a></h2>
+    
+
+    <p>�������Apache サー�� Unix
+    マシン���よ��動作を�る�を簡��説明���。
+    ��機能��時点�� Windows NT ��サ�ート�れ����ん。
+    Unix マシン�� Apache �������プロセスを作���
+    ���プロセス�一���リクエストを処����。�れ�れ��プロセス��
+    生存期間中�複数�リクエストを扱��������。
+    ��議論���プロセス間��一切データを共有���������。
+    以後����プロセス���を <dfn>httpd プロセス</dfn> �呼���。</p>
+
+    <p>����ウェブサイト������管��る�����マシン��る����。
+    �れらを����クラスタ�呼�������。�れ�れ�マシン�複数�
+    Apache を実行�る��も����。
+    �れら���を����も��「宇宙���る�考�られ��。
+    �����仮定�下��クラスタ�マシン間����ん通信を�る�����
+    ��宇宙�中��れ�れ�リクエスト�一��識別�を生���る��を示���。
+    </p>
+
+    <p>クラスタ��るマシン�以下��求を見����れ��り��ん。
+    (マシン�一�������も�NTP �時計を���る方�良���。)</p>
+
+    <ul>
+      <li>NTP や他��ットワーク上�時間を���るプロトコル�よ��
+      �マシン�時間��期��られ��る��。</li>
+
+      <li>モジュール�ホスト�を引���� IP
+      アドレスを���る�����るよ���
+      クラスタ��れ�れ�マシン�ホスト������。</li>
+    </ul>
+
+    <p>オペレーティングシステム������pid (プロセス ID) �
+    32 ビット�範囲内��る��を仮定���。オペレーティングシステム�
+    pid � 32 ビットを超�る場���簡��修正���り����
+    コードを変更�る必���り��。</p>
+
+    <p>�れら�仮定�満��れ��る���る時点�����
+    クラスタ内���マシン��� httpd
+    プロセス�も�一���定�る�������。�れ�マシン� IP
+    アドレス� httpd プロセス� pid ��分�行���������。
+    ���ら�リクエスト�一��識別�を生��る�����
+    時刻を区別�る必���る����。</p>
+
+    <p>時刻を区別�る����Unix �タイムスタンプ (UTC � 1970 年
+    1 月 1 日�ら�秒数) ��16 ビット�カウンタを使���。
+    タイムスタンプ�粒度�一秒�����一秒間� 65536
+    ���値を表��る���カウンタを使用���。四��値
+    <em>( ip_addr, pid, time_stamp, counter )</em> �� httpd
+    プロセス�一秒�間� 65536 リクエストを数���る�������。
+    時間�経�� pid ��利用�れる����題��り����
+    ���題を解決�る���カウンタ�使用�れ��。</p>
+
+    <p>httpd ��プロセス�作��れる��カウンタ�
+    (��時点�マイクロ秒 ÷ 10) modulo 65536 ��期化�れ��
+    (���������システム��る�マイクロ秒�
+    タイマ�下�ビット�異�る����題を解決�る�����れ���)。
+    一��識別��生��れ����使用�れるタイムスタンプ�
+    ウェブサー��リクエスト�到���時刻��り��。
+    カウンタ�識別��生��れる���増加��� 
+    (��れ�場�� 0 �戻り��)。</p>
+
+    <p>カー�ル�プロセスをフォーク�る���れ�れ�プロセス����
+    pid を生����。pid �繰り返�れる���許��れ����
+    (pid �値�多�� Unix �� 16 ビット����新��システム��
+    32 ビット�拡張�れ����)。
+    ���ら��る程度�時間�経��る��� pid ���使用�れ��。
+    ����一秒内��使用�れ��れ��
+    四��値�一�性���れ��。��り�我々�システム�一秒間
+    � 65536 個�プロセスを起動����仮定����� (����� Unix
+    �� 32768 プロセス�����れ��ら��ん��り得����ょ�)。</p>
+
+    <p>何ら���由����時刻�繰り返�れ�����ょ�。
+    ��り�システム�時計�狂�����も�一度�去�時刻��������
+    (も���進����������
+    正��時刻�戻�������将��時刻��������) ����。
+    ��場��pid �タイムスタンプ��使用�れる���簡��示�れ��。
+    カウンタ�期化用�関数�����題�回�を手助��よ���択�れ����。
+    本当�カウンタ��期化を�る���ランダム�数字を使��������
+    ��ん��システム��簡��使用��る数�無����注�������
+    (<em>����</em>�rand ()�使���ん。rand () �� seed
+    を与�る必���り�seed ��時刻を使���ん。一秒�����
+    ��時刻����繰り返�れ��る�ら��)。
+    �れ��完璧�対策���り��ん。</p>
+
+    <p>��対策����ら�効果��る��ょ��?
+    �����マシン群�中�一��最大�一秒� 500
+    リクエストを扱��仮定��� (�れを書���る時点��妥当�上���。
+    通常システム��る����的�ファイルを�り�������り��ん�ら)。
+    �れを行��������マシン�並行���るクライアント�数�
+    応��数��プロセスを�求���。
+    �����ら�悲観的�考���一���プロセス�一秒� 500
+    リクエストを扱�る����。���る��(一秒�精度����)
+    時刻���時を繰り返������プロセス�カウンタ�値を��使��
+    一�性�壊れる�能性� 1.5% �り��。
+    �れ��常�悲観的�例��実世界�値�����ん�起�り����り��ん。
+    �れ�も�れ�起�る�能性��るよ��システム�ら�
+    (プログラムコードを編集��) 
+    カウンタを 32 ビット��る��良���ょ�。
+    </p>
+
+    <p>サマータイム�より時計�「戻�れる���を気����る人�
+    �る�も�れ��ん。���使用�れる時間� UTC ��り�
+    �れ�「常��進む�������題��り��ん。x86 上� Unix
+    ����件を満������切�設定�必��も�れ�����
+    注�������。マザーボード�時計� UTC �������
+    他�時間����ら�切�補正�れる��を仮定��るよ��
+    設定�れ��れ��り��ん。��よ��場�����NTP
+    を使���る�ら�リブート後���正�� UTC �時間��る��ょ�。</p>
+
+    <p><code>UNIQUE_ID</code> 環境変数� 112 ビット (32 ビット IP
+    アドレス�32 ビット pid, 32 ビットタイムスタンプ�16
+    ビットカウンタ�四��組) をアルファベット <code>[A-Za-z0-9@-]</code>
+    を用�� MIME � base64 符�化��様�方法�より符�化��19
+    �文字を生��る���より作��れ��。MIME � base64
+    �アルファベット�実際� <code>[A-Za-z0-9+/]</code> ����
+    <code>+</code> � <code>/</code> �� URL
+    ��特別�符�化�必�������り望����り��ん。
+    全��値��ットワーク�イトオーダ�符�化�れ�����
+    符������イトオーダ�アーキテク�ャ間�比較�能��。
+    実際�符�化�順番�: タイムスタンプ�IP アドレス�pid,
+    カウンタ��。��順��目的��り����
+    アプリケーション�符�を解��る��������を強調������。
+    アプリケーション�符�化�れ� <code>UNIQUE_ID</code>
+    全体を��的�トークン���扱�����。
+    <code>UNIQUE_ID</code> �他� <code>UNIQUE_ID</code>
+    ��等価性を調�る�������使用����。</p>
+
+    <p>��順番�将��既存� <code>UNIQUE_ID</code>
+    �データベース����を心��る����符�を変更�る���
+    �能��るよ���択�����。
+    新��符��タイムスタンプを最���素���残���望����
+    �れ以外���アルファベット�ビット長を使��������。
+    タイムスタンプ�本質的�増加系列�����
+    クラスタ�全��マシン�リクエスト�サー�機能を�止���
+    ��符�化方�を使用�る�をや�る<em>フラグ秒</em>��れ��分��。
+    ��後��リクエストを�開��
+    新��符�を発行�る�����るよ���り��。</p>
+
+    <p>我々��れ��
+    ���題�対�る比較的移�性�高�解決法��考�����。
+    Windows NT �よ��マル�スレッド�システム�拡張�る���������
+    将�必���れ��ら�増や���も����。
+    ID �必��応��長��る����������生��れ� ID
+    �実質上�無��有効��。���クラスタ�マシン間�通信も事実上必���
+    (NTP �よる�期���必����れ�オー�ヘッド���り�り��ん)�httpd
+    プロセス間�通信も必��り��ん (通信�カー�ル�より割り当�られ�
+    pid �値�より暗黙�内�行������)。
+    �ら��られ�状�下���ID ��ら�短��る���������
+    より多��情報を仮定�る必������� (例���32 ビット
+    IP アドレス���サイト����も�剰�情報����
+    �れ�代�り��る移�性��るも���り��ん)。</p>
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_unique_id.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_unique_id.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_unique_id.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_unique_id.html.ko.euc-kr b/docs/manual/mod/mod_unique_id.html.ko.euc-kr
index 59d94345..90029d00 100644
--- a/docs/manual/mod/mod_unique_id.html.ko.euc-kr
+++ b/docs/manual/mod/mod_unique_id.html.ko.euc-kr
@@ -186,6 +186,6 @@
 <a href="../ja/mod/mod_unique_id.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_unique_id.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_userdir.html b/docs/manual/mod/mod_userdir.html
index 897ef832..adf37aa2 100644
--- a/docs/manual/mod/mod_userdir.html
+++ b/docs/manual/mod/mod_userdir.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_userdir.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_userdir.html.ja.euc-jp
+URI: mod_userdir.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_userdir.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_userdir.html.en b/docs/manual/mod/mod_userdir.html.en
index 9a3b4893..d8107437 100644
--- a/docs/manual/mod/mod_userdir.html.en
+++ b/docs/manual/mod/mod_userdir.html.en
@@ -50,7 +50,8 @@ tutorial</a></li>
 <div class="directive-section"><h2><a name="UserDir" id="UserDir">UserDir</a> <a name="userdir" id="userdir">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Location of the user-specific directories</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>UserDir <em>directory-filename</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>UserDir <em>directory-filename</em> [<em>directory-filename</em>] ...
+</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_userdir</td></tr>
@@ -88,7 +89,7 @@ tutorial</a></li>
     <code>Userdir</code> directive, the argument is treated as a
     filename pattern, and is used to turn the name into a directory
     specification. A request for
-    <code>http://www.foo.com/~bob/one/two.html</code> will be
+    <code>http://www.example.com/~bob/one/two.html</code> will be
     translated to:</p>
 
 <table>
@@ -104,11 +105,11 @@ tutorial</a></li>
 <table>
 <tr><th>UserDir directive used</th>
 <th>Translated path</th></tr>
-<tr><td>UserDir http://www.foo.com/users</td><td>http://www.foo.com/users/bob/one/two.html</td></tr>
+<tr><td>UserDir http://www.example.com/users</td><td>http://www.example.com/users/bob/one/two.html</td></tr>
 <tr><td>UserDir
-http://www.foo.com/*/usr</td><td>http://www.foo.com/bob/usr/one/two.html</td></tr>
+http://www.example.com/*/usr</td><td>http://www.example.com/bob/usr/one/two.html</td></tr>
 <tr><td>UserDir
-http://www.foo.com/~*/</td><td>http://www.foo.com/~bob/one/two.html</td></tr>
+http://www.example.com/~*/</td><td>http://www.example.com/~bob/one/two.html</td></tr>
 </table> 
 
 <div class="note">
@@ -141,12 +142,12 @@ UserDir disabled user4 user5 user6
 <p>It is also possible to specify alternative user directories.
 If you use a command like:</p>
 <div class="example"><p><code>
-Userdir public_html /usr/web http://www.foo.com/
+Userdir public_html /usr/web http://www.example.com/
 </code></p></div>
-<p>With a request for http://www.foo.com/~bob/one/two.html, will try to 
+<p>With a request for http://www.example.com/~bob/one/two.html, will try to 
 find the page at ~bob/public_html/one/two.html first, then
 /usr/web/bob/one/two.html, and finally it will send a redirect
-to http://www.foo.com/bob/one/two.html.</p>
+to http://www.example.com/bob/one/two.html.</p>
 <p>If you add a redirect, it must be the last alternative in the list.
 Apache cannot determine if the redirect succeeded or not, so if you have
 the redirect earlier in the list, that will always be the alternative
@@ -170,6 +171,6 @@ tutorial</a></li>
 <a href="../ja/mod/mod_userdir.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_userdir.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_userdir.html.ja.euc-jp b/docs/manual/mod/mod_userdir.html.ja.euc-jp
deleted file mode 100644
index fe6e1caa..00000000
--- a/docs/manual/mod/mod_userdir.html.ja.euc-jp
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_userdir - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_userdir</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_userdir.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_userdir.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_userdir.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥æ¡¼¥¶ÀìÍѤΥǥ£¥ì¥¯¥È¥ê¤òÄó¶¡
-  </td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>userdir_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_userdir.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-<p>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¡¢
-<code>http://example.com/~user/</code>
-¹½Ê¸¤ò»È¤Ã¤Æ¥æ¡¼¥¶ÀìÍѥǥ£¥ì¥¯¥È¥ê¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#userdir">UserDir</a></li>
-</ul>
-<h3>»²¾È</h3>
-<ul class="seealso">
-<li><a href="../urlmapping.html">URL ¤«¤é
-¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ø¤Î¥Þ¥Ã¥Ô¥ó¥°</a></li>
-<li><a href="../howto/public_html.html">public_html
-¥Á¥å¡¼¥È¥ê¥¢¥ë</a></li>
-</ul></div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="UserDir" id="UserDir">UserDir</a> <a name="userdir" id="userdir">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥æ¡¼¥¶ÀìÍѥǥ£¥ì¥¯¥È¥ê¤Î°ÌÃÖ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>UserDir <em>directory-filename</em></code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Base</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_userdir</td></tr>
-</table>
-
-    <p><code class="directive">UserDir</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥æ¡¼¥¶¤Î¥É¥­¥å¥á¥ó¥È¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¤¿»þ¤Ë»È¤¦
-    ¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥êÃæ¤Î¡¢¼ÂºÝ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò
-    ÀßÄꤷ¤Þ¤¹¡£
-    <em>directory-filename</em> ¤Ë¤Ï¼¡¤Î¤É¤ì¤«¤ò»ØÄꤷ¤Þ¤¹:</p>
-
-    <ul>
-      <li>¥Ç¥£¥ì¥¯¥È¥ê̾¤«²¼¤Ë¼¨¤¹¤è¤¦¤Ê¥Ñ¥¿¡¼¥ó¡£</li>
-
-      <li><code>disabled</code> ¥­¡¼¥ï¡¼¥É¡£
-      <code>enabled</code> ¥­¡¼¥ï¡¼¥É (²¼µ­»²¾È) ¤ÇÌÀ¼¨Åª¤Ë
-      »ØÄꤵ¤ì¤¿¥æ¡¼¥¶°Ê³°¤Î
-      <em>Á´¤Æ¤Î</em>¥æ¡¼¥¶Ì¾-¥Ç¥£¥ì¥¯¥È¥êÊÑ´¹¤ò
-      ¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£</li>
-
-      <li><code>disabled</code> ¥­¡¼¥ï¡¼¥É¤È¡¢¥¹¥Ú¡¼¥¹¶èÀÚ¤ê¤Î¥æ¡¼¥¶Ì¾¥ê¥¹¥È¡£
-      ¤³¤Î¥ê¥¹¥ÈÃæ¤Ë´Þ¤Þ¤ì¤ë¥æ¡¼¥¶Ì¾¤ËÂФ·¤Æ¤Ï¡¢¤¿¤È¤¨
-      <code>enabled</code> Àá¤Ë¤¢¤Ã¤¿¤È¤·¤Æ¤â¡¢
-      <em>·è¤·¤Æ</em>¥Ç¥£¥ì¥¯¥È¥êÊÑ´¹¤Ï¹Ô¤ï¤ì¤Þ¤»¤ó¡£</li>
-
-      <li><code>enebled</code> ¥­¡¼¥ï¡¼¥É¤È¥¹¥Ú¡¼¥¹¶èÀÚ¤ê¤Î¥æ¡¼¥¶Ì¾¥ê¥¹¥È¡£
-      Á´ÂΤǤÏÊÑ´¹¤¬Ìµ¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤¿¤È¤·¤Æ¤â¡¢
-      ¤³¤ì¤é¤Î¥æ¡¼¥¶Ì¾¤Ë¤Ï¥Ç¥£¥ì¥¯¥È¥êÊÑ´¹¤¬¹Ô¤ï¤ì¤Þ¤¹¡£
-      ¤¿¤À¤·¡¢<code>disabled</code> Àá¤Ë¤â¤¢¤ì¤ÐÊÑ´¹¤Ï¤µ¤ì¤Þ¤»¤ó¡£
-      </li>
-    </ul>
-
-    <p>¤â¤· <code>enabled</code> ¤â <code>disabled</code>
-    ¥­¡¼¥ï¡¼¥É¤â <code>UserDir</code> ¤Ë¸½¤ï¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢
-    °ú¿ô¤Ï¥Õ¥¡¥¤¥ë̾¥Ñ¥¿¡¼¥ó¤È¤·¤Æ°·¤ï¤ì¡¢
-    ̾Á°¤«¤é¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤ÎÊÑ´¹¤Î»ØÄê¤ò¹Ô¤Ê¤¦»þ¤Ë»È¤ï¤ì¤Þ¤¹¡£
-    <code>http://www.foo.com/~bob/one/two.html</code>
-    ¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ï¼¡¤Î¤è¤¦¤ËÊÑ´¹¤µ¤ì¤Þ¤¹:</p>
-
-<table>
-<tr><th>UserDir ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th>
-<th>ÊÑ´¹¸å¤Î¥Ñ¥¹</th></tr>
-<tr><td>UserDir public_html</td><td>~bob/public_html/one/two.html</td></tr>
-<tr><td>UserDir /usr/web</td><td>/usr/web/bob/one/two.html</td></tr>
-<tr><td>UserDir /home/*/www</td><td>/home/bob/www/one/two.html</td></tr>
-</table>
-
-    <p>¼¡¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥¯¥é¥¤¥¢¥ó¥È¤ËÂФ·¤Æ¥ê¥À¥¤¥ì¥¯¥È¤ò
-    Á÷¿®¤·¤Þ¤¹:</p>
-
-<table>
-<tr><th>UserDir ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th>
-<th>ÊÑ´¹¸å¤Î¥Ñ¥¹</th></tr>
-<tr><td>UserDir http://www.foo.com/users</td><td>http://www.foo.com/users/bob/one/two.html</td></tr>
-<tr><td>UserDir
-http://www.foo.com/*/usr</td><td>http://www.foo.com/bob/usr/one/two.html</td></tr>
-<tr><td>UserDir
-http://www.foo.com/~*/</td><td>http://www.foo.com/~bob/one/two.html</td></tr>
-</table> 
-
-<div class="note">
-      <strong>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¦¤È¤­¤ÏÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤;
-      "<code>UserDir ./</code>" ¤Ï
-      "<code>/~root</code>" ¤«¤é "<code>/</code>" ¤Ø¥Þ¥Ã¥×¤·¤Þ¤¹¤¬¡¢
-      ¤³¤ì¤Ï˾¤Þ¤·¤¤Æ°ºî¤Ç¤Ï¤Ê¤¤¤Ç¤·¤ç¤¦¡£
-      "<code>UserDir disabled root</code>" Àë¸À¤ò
-      ÀßÄê¤ÎÃæ¤Ë´Þ¤á¤Æ¤ª¤¯¤³¤È¤ò¶¯¤¯¤ªÁ¦¤á¤·¤Þ¤¹¡£
-      ÄɲþðÊó¤Ë <code class="directive"><a href="../mod/core.html#directory">Directory</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ä
-      <a href="../misc/security_tips.html">¥»¥­¥å¥ê¥Æ¥£
-      Tips</a> ¤Î¥Ú¡¼¥¸¤â¤´Í÷²¼¤µ¤¤¡£</strong>
-</div>
-
-<p>ÄɲäÎÎã:</p>
-
-<p>¾¯¿ô¤Î¥æ¡¼¥¶¤Î¤ß¤¬ <code>UserDir</code>
-¥Ç¥£¥ì¥¯¥È¥ê¤òÍøÍѤ·¡¢¤½¤ì°Ê³°¤Ë¤ÏÍøÍѤµ¤»¤¿¤¯¤Ê¤¤¾ì¹ç¤Ï
-¼¡¤ò»È¤¤¤Þ¤·¤ç¤¦:</p>
-
-<div class="example"><p><code>
-UserDir disabled<br />
-UserDir enabled user1 user2 user3
-</code></p></div>
-
-<p>ÂçÉôʬ¤Î¥æ¡¼¥¶¤Ï <code>UserDir</code> ¥Ç¥£¥ì¥¯¥È¥ê¤òÍøÍѤ¹¤ë¤±¤ì¤É¡¢
-¾¯¿ô¤Î¿Í¤ÏÉÔµö²Ä¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢¼¡¤ò»È¤¤¤Þ¤·¤ç¤¦:</p>
-
-<div class="example"><p><code>
-UserDir enabled<br />
-UserDir disabled user4 user5 user6
-</code></p></div>
-
-<p>¾¤Î¥æ¡¼¥¶¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-¼¡¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¤ò»È¤¦¤È:</p>
-
-<div class="example"><p><code>
-Userdir public_html /usr/web http://www.foo.com/
-</code></p></div>
-
-<p>http://www.foo.com/~bob/one/two.html ¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ï¤Þ¤º
-~bob/public_html/one/two.html ¤Î¥Ú¡¼¥¸¤òÄ´¤Ù¡¢¤½¤Î¼¡¤Ë
-/usr/web/bob/one/two.html ¤òÄ´¤Ù¡¢ºÇ¸å¤Ë http://www.foo.com/bob/one/two.html
-¤Ø¤Î¥ê¥À¥¤¥ì¥¯¥È¤òÁ÷¤ê¤Þ¤¹¡£</p>
-
-<p>¥ê¥À¥¤¥ì¥¯¥È¤ò²Ã¤¨¤ë¾ì¹ç¤Ï¡¢¥ê¥¹¥È¤ÎºÇ¸å¤ÎÁªÂò»è¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-Apache ¤Ï¥ê¥À¥¤¥ì¥¯¥È¤¬À®¸ù¤¹¤ë¤«¤É¤¦¤«¤ò·è¤á¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¤Î¤Ç¡¢
-¥ê¥¹¥È¤ÎÁ°¤ÎÊý¤Ë¥ê¥À¥¤¥ì¥¯¥È¤ò½ñ¤¯¤È¡¢¤½¤ì¤¬É¬¤º»ÈÍѤµ¤ì¤ëÁªÂò»è¤Ë
-¤Ê¤Ã¤Æ¤·¤Þ¤¤¤Þ¤¹¡£</p>
-
-<p>2.1.4 °Ê¹ß¤Ç¤Ï¡¢¥æ¡¼¥¶¥Ç¥£¥ì¥¯¥È¥êÃÖ´¹µ¡Ç½¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤Ïµ¯Æ°¤·¤Þ¤»¤ó¡£
-¤½¤ì°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¡¢<code class="directive"><a href="#userdir">UserDir</a></code>
-¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Â¸ºß¤·¤Ê¤±¤ì¤Ð¡¢<code>UserDir public_html</code> 
-¤Ç¤¢¤ë¤È²¾Äꤵ¤ì¤Æ¤¤¤Þ¤·¤¿¡£</p>
-
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../howto/public_html.html">public_html
-¥Á¥å¡¼¥È¥ê¥¢¥ë</a></li>
-</ul>
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_userdir.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_userdir.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_userdir.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_userdir.html.ja.utf8 b/docs/manual/mod/mod_userdir.html.ja.utf8
new file mode 100644
index 00000000..daeaeadd
--- /dev/null
+++ b/docs/manual/mod/mod_userdir.html.ja.utf8
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_userdir - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_userdir</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_userdir.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_userdir.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_userdir.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>ユーザ専用�ディレクトリを�供
+  </td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>userdir_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_userdir.c</td></tr></table>
+<h3>概�</h3>
+
+<p>��モジュール��
+<code>http://example.com/~user/</code>
+構文を使��ユーザ専用ディレクトリ�アクセス��るよ�����。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#userdir">UserDir</a></li>
+</ul>
+<h3>�照</h3>
+<ul class="seealso">
+<li><a href="../urlmapping.html">URL �ら
+ファイルシステム��マッピング</a></li>
+<li><a href="../howto/public_html.html">public_html
+�ュートリアル</a></li>
+</ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="UserDir" id="UserDir">UserDir</a> <a name="userdir" id="userdir">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>ユーザ専用ディレクトリ��置</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>UserDir <em>directory-filename</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_userdir</td></tr>
+</table>
+
+    <p><code class="directive">UserDir</code> ディレクティブ��
+    ユーザ�ドキュメント��リクエストを���時�使�
+    ユーザ�ホームディレクトリ中��実際�ディレクトリを
+    設定���。
+    <em>directory-filename</em> ��次��れ�を指定���:</p>
+
+    <ul>
+      <li>ディレクトリ��下�示�よ��パターン。</li>
+
+      <li><code>disabled</code> キーワード。
+      <code>enabled</code> キーワード (下記�照) �明示的�
+      指定�れ�ユーザ以外�
+      <em>全��</em>ユーザ�-ディレクトリ変�を
+      ���よ�����。</li>
+
+      <li><code>disabled</code> キーワード��スペース区切り�ユーザ�リスト。
+      ��リスト中���れるユーザ��対�������
+      <code>enabled</code> 節�������も�
+      <em>決��</em>ディレクトリ変��行�れ��ん。</li>
+
+      <li><code>enebled</code> キーワード�スペース区切り�ユーザ�リスト。
+      全体��変��無効���������も�
+      �れら�ユーザ���ディレクトリ変��行�れ��。
+      ����<code>disabled</code> 節�も�れ�変���れ��ん。
+      </li>
+    </ul>
+
+    <p>も� <code>enabled</code> も <code>disabled</code>
+    キーワードも <code>UserDir</code> ���れ����れ��
+    引数�ファイル�パターン���扱�れ�
+    ���らディレクトリ��変��指定を行��時�使�れ��。
+    <code>http://www.foo.com/~bob/one/two.html</code>
+    ��リクエスト�次�よ��変��れ��:</p>
+
+<table>
+<tr><th>UserDir ディレクティブ</th>
+<th>変�後�パス</th></tr>
+<tr><td>UserDir public_html</td><td>~bob/public_html/one/two.html</td></tr>
+<tr><td>UserDir /usr/web</td><td>/usr/web/bob/one/two.html</td></tr>
+<tr><td>UserDir /home/*/www</td><td>/home/bob/www/one/two.html</td></tr>
+</table>
+
+    <p>次�ディレクティブ�クライアント�対��リダイレクトを
+    �信���:</p>
+
+<table>
+<tr><th>UserDir ディレクティブ</th>
+<th>変�後�パス</th></tr>
+<tr><td>UserDir http://www.foo.com/users</td><td>http://www.foo.com/users/bob/one/two.html</td></tr>
+<tr><td>UserDir
+http://www.foo.com/*/usr</td><td>http://www.foo.com/bob/usr/one/two.html</td></tr>
+<tr><td>UserDir
+http://www.foo.com/~*/</td><td>http://www.foo.com/~bob/one/two.html</td></tr>
+</table> 
+
+<div class="note">
+      <strong>��ディレクティブを使����注�������;
+      "<code>UserDir ./</code>" �
+      "<code>/~root</code>" �ら "<code>/</code>" �マップ�����
+      �れ�望���動作������ょ�。
+      "<code>UserDir disabled root</code>" 宣言を
+      設定�中��������を強��薦����。
+      追加情報� <code class="directive"><a href="../mod/core.html#directory">Directory</a></code>
+      ディレクティブや
+      <a href="../misc/security_tips.html">セキュリティ
+      Tips</a> �ページも�覧下��。</strong>
+</div>
+
+<p>追加�例:</p>
+
+<p>少数�ユーザ��� <code>UserDir</code>
+ディレクトリを利用���れ以外��利用������場��
+次を使���ょ�:</p>
+
+<div class="example"><p><code>
+UserDir disabled<br />
+UserDir enabled user1 user2 user3
+</code></p></div>
+
+<p>大部分�ユーザ� <code>UserDir</code> ディレクトリを利用�る�れ��
+少数�人��許�����場���次を使���ょ�:</p>
+
+<div class="example"><p><code>
+UserDir enabled<br />
+UserDir disabled user4 user5 user6
+</code></p></div>
+
+<p>他�ユーザディレクトリを指定�る��も����。
+次�よ��コマンドを使��:</p>
+
+<div class="example"><p><code>
+Userdir public_html /usr/web http://www.foo.com/
+</code></p></div>
+
+<p>http://www.foo.com/~bob/one/two.html ��リクエスト���
+~bob/public_html/one/two.html �ページを調����次�
+/usr/web/bob/one/two.html を調��最後� http://www.foo.com/bob/one/two.html
+��リダイレクトを�り��。</p>
+
+<p>リダイレクトを加�る場���リスト�最後��択肢���れ��り��ん。
+Apache �リダイレクト��功�る����を決�る�������ん���
+リスト���方�リダイレクトを書����れ�必�使用�れる�択肢�
+��������。</p>
+
+<p>2.1.4 以����ユーザディレクトリ置�機能�デフォルト��起動���ん。
+�れ以���ージョン���<code class="directive"><a href="#userdir">UserDir</a></code>
+ディレクティブ�存在���れ��<code>UserDir public_html</code> 
+��る�仮定�れ�����。</p>
+
+
+<h3>�照</h3>
+<ul>
+<li><a href="../howto/public_html.html">public_html
+�ュートリアル</a></li>
+</ul>
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_userdir.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_userdir.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_userdir.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_userdir.html.ko.euc-kr b/docs/manual/mod/mod_userdir.html.ko.euc-kr
index 64dad735..8ff2ceda 100644
--- a/docs/manual/mod/mod_userdir.html.ko.euc-kr
+++ b/docs/manual/mod/mod_userdir.html.ko.euc-kr
@@ -156,6 +156,6 @@ http://www.foo.com/bob/one/two.htmlÀ¸·Î ¸®´ÙÀÌ·º¼ÇÀ» º¸³½´Ù.</p>
 <a href="../ja/mod/mod_userdir.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_userdir.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_usertrack.html b/docs/manual/mod/mod_usertrack.html
index 0d24c8e0..63ee8b40 100644
--- a/docs/manual/mod/mod_usertrack.html
+++ b/docs/manual/mod/mod_usertrack.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_usertrack.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_usertrack.html.en b/docs/manual/mod/mod_usertrack.html.en
index 73315a33..bc7ac475 100644
--- a/docs/manual/mod/mod_usertrack.html.en
+++ b/docs/manual/mod/mod_usertrack.html.en
@@ -130,7 +130,7 @@ time late in the year "37".
 
     <p>The domain string <strong>must</strong> begin with a dot, and
     <strong>must</strong> include at least one embedded dot. That is,
-    <code>.foo.com</code> is legal, but <code>foo.bar.com</code> and
+    <code>.example.com</code> is legal, but <code>foo.example.com</code> and 
     <code>.com</code> are not.</p>
 
     <div class="note">Most browsers in use today will not allow cookies to be set
@@ -247,6 +247,6 @@ time late in the year "37".
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_usertrack.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_version.html b/docs/manual/mod/mod_version.html
index ee3abd15..03cb2547 100644
--- a/docs/manual/mod/mod_version.html
+++ b/docs/manual/mod/mod_version.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_version.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_version.html.ja.euc-jp
+URI: mod_version.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_version.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/mod/mod_version.html.en b/docs/manual/mod/mod_version.html.en
index 55dbcdf4..8a3b9e47 100644
--- a/docs/manual/mod/mod_version.html.en
+++ b/docs/manual/mod/mod_version.html.en
@@ -146,6 +146,6 @@
 <a href="../ja/mod/mod_version.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_version.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_version.html.ja.euc-jp b/docs/manual/mod/mod_version.html.ja.euc-jp
deleted file mode 100644
index 894e4be6..00000000
--- a/docs/manual/mod/mod_version.html.ja.euc-jp
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_version - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë mod_version</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_version.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_version.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_version.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥Ð¡¼¥¸¥ç¥ó°Í¸¤ÎÀßÄê</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>version_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mod_version.c</td></tr>
-<tr><th><a href="module-dict.html#Compatibility">¸ß´¹À­:</a></th><td>¥Ð¡¼¥¸¥ç¥ó 2.1 °Ê¹ß</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>ÍÍ¡¹¤Ê¥Ð¡¼¥¸¥ç¥ó¤Î httpd ¤Î°Û¤Ê¤ëÀßÄê¤ò°·¤¦¤³¤È¤Ë¤Ê¤ë¡¢
-    ¥Æ¥¹¥È¥¹¥¤¡¼¥È¤äÂ絬Ìϥͥåȥ¥¯¤Ç¤Î»ÈÍѤΤ¿¤á¤ËÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¿·¤·¤¤¥³¥ó¥Æ¥Ê ¡½ <code class="directive"><a href="#ifversion">&lt;IfVersion&gt;</a></code> ¤ò
-    Ä󶡤·¤Þ¤¹¡£¤³¤ì¤ò»È¤¦¤È¡¢¿ô»ú¤ÎÈæ³Ó¤äÀµµ¬É½¸½¤Ë¤è¤ë½ÀÆð¤Ê
-    ¥Ð¡¼¥¸¥ç¥ó¥Á¥§¥Ã¥¯¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      &lt;IfVersion 2.1.0&gt;<br />
-      <span class="indent">
-        # current httpd version is exactly 2.1.0<br />
-      </span>
-      &lt;/IfVersion&gt;<br />
-      <br />
-      &lt;IfVersion &gt;= 2.2&gt;<br />
-      <span class="indent">
-        # use really new features :-)<br />
-      </span>
-      &lt;/IfVersion&gt;
-    </code></p></div>
-
-    <p>¾ÜºÙ¤Ï°Ê²¼¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#ifversion">&lt;IfVersion&gt;</a></li>
-</ul>
-</div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="IfVersion" id="IfVersion">&lt;IfVersion&gt;</a> <a name="ifversion" id="ifversion">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Ð¡¼¥¸¥ç¥ó°Í¸¤ÎÀßÄê¤òÆþ¤ì¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>&lt;IfVersion [[!]<var>operator</var>] <var>version</var>&gt; ...
-&lt;/IfVersion&gt;</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë, ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È, ¥Ç¥£¥ì¥¯¥È¥ê, .htaccess</td></tr>
-<tr><th><a href="directive-dict.html#Override">¾å½ñ¤­:</a></th><td>All</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>Extension</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mod_version</td></tr>
-</table>
-    <p><code class="directive">&lt;IfVersion&gt;</code> ¤Ï <code class="program"><a href="../programs/httpd.html">httpd</a></code> ¤Î¥Ð¡¼¥¸¥ç¥ó
-    ¤¬´ð½à¤òËþ¤¿¤·¤¿¤È¤­¤Ë¤Î¤ß¼Â¹Ô¤µ¤»¤¿¤¤¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò°Ï¤ß¤Þ¤¹¡£
-    Ä̾ï¤Î (¿ôÃÍ) Èæ³Ó¤Î¤È¤­¤Ï <var>version</var> °ú¿ô¤Ï
-    <code><var>major</var>[.<var>minor</var>[.<var>patch</var>]]</code> ¤È¤¤¤¦
-    ·Á¼°¡¢Î㤨¤Ð¡¢<code>2.1.0</code> ¤ä <code>2.2</code> ¤È¤Ê¤ê¤Þ¤¹¡£
-    <var>minor</var> ¤È <var>patch</var> ¤Ï¾Êά²Äǽ¤Ç¤¹¡£¾Êά¤µ¤ì¤¿¾ì¹ç¤Ï¡¢
-    0 ¤ò»ØÄꤷ¤¿¤â¤Î¤È¤ß¤Ê¤µ¤ì¤Þ¤¹¡£Èæ³Ó¤Ë¤Ï¼¡¤Î¿ôÃÍ <var>operator</var> ¤ò
-    »ØÄê¤Ç¤­¤Þ¤¹:</p>
-
-    <table class="bordered"><tr class="header"><th><var>operator</var></th><th>ÀâÌÀ</th></tr>
-<tr><td><code>=</code> ¤È <code>==</code></td>
-        <td>Ʊ¤¸ httpd ¥Ð¡¼¥¸¥ç¥ó</td></tr>
-<tr class="odd"><td><code>&gt;</code></td>
-        <td>¤è¤êÂ礭¤¤ httpd ¥Ð¡¼¥¸¥ç¥ó</td></tr>
-<tr><td><code>&gt;=</code></td>
-        <td>»ØÄê°Ê¾å¤Î httpd ¥Ð¡¼¥¸¥ç¥ó</td></tr>
-<tr class="odd"><td><code>&lt;</code></td>
-        <td>»ØÄê̤Ëþ¤Î httpd ¥Ð¡¼¥¸¥ç¥ó</td></tr>
-<tr><td><code>&lt;=</code></td>
-        <td>»ØÄê°Ê²¼¤Î httpd ¥Ð¡¼¥¸¥ç¥ó</td></tr>
-</table>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      &lt;IfVersion &gt;= 2.1&gt;<br />
-      <span class="indent">
-        # this happens only in versions greater or<br />
-        # equal 2.1.0.<br />
-      </span>
-      &lt;/IfVersion&gt;
-    </code></p></div>
-
-    <p>¿ôÃÍÈæ³Ó¤Ë²Ã¤¨¤Æ¡¢http ¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ËÂФ·¤ÆÀµµ¬É½¸½¤Ë¤è¤ë
-    ¥Þ¥Ã¥Á¥ó¥°¤¬¤Ç¤­¤Þ¤¹¡£Æó¼ïÎà¤Î½ñ¤­Êý¤¬¤¢¤ê¤Þ¤¹:</p>
-
-    <table class="bordered"><tr class="header"><th><var>operator</var></th><th>ÀâÌÀ</th></tr>
-<tr><td><code>=</code> or <code>==</code></td>
-        <td><var>version</var> ¤Ï
-            <code>/<var>regex</var>/</code> ·Á¼°</td></tr>
-<tr class="odd"><td><code>~</code></td>
-        <td><var>version</var> ¤Ï
-            <code><var>regex</var></code> ·Á¼°</td></tr>
-</table>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      &lt;IfVersion = /^2.1.[01234]$/&gt;<br />
-      <span class="indent">
-        # e.g. workaround for buggy versions
-      </span>
-      &lt;/IfVersion&gt;
-    </code></p></div>
-
-    <p>¥Þ¥Ã¥Á¥ó¥°¤ÎÈÝÄê¤òɽ¸½¤¹¤ë¤¿¤á¤Ë¡¢¤¹¤Ù¤Æ¤Î¥ª¥Ú¥ì¡¼¥¿¤ÏÁ°¤Ë
-    ´¶Ã²Éä (<code>!</code>)¤òÉÕ¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-      &lt;IfVersion !~ ^2.1.[01234]$&gt;<br />
-      <span class="indent">
-        # not for those versions<br />
-      </span>
-      &lt;/IfVersion&gt;
-    </code></p></div>
-
-    <p><var>operator</var> ¤¬¾Êά¤µ¤ì¤¿¤È¤­¤Ï <code>=</code> ¤È
-    ¤ß¤Ê¤µ¤ì¤Þ¤¹¡£</p>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_version.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mod_version.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/mod_version.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_version.html.ja.utf8 b/docs/manual/mod/mod_version.html.ja.utf8
new file mode 100644
index 00000000..813667e5
--- /dev/null
+++ b/docs/manual/mod/mod_version.html.ja.utf8
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mod_version - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache モジュール mod_version</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_version.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_version.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_version.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>�ージョン�存�設定</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>version_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mod_version.c</td></tr>
+<tr><th><a href="module-dict.html#Compatibility">互�性:</a></th><td>�ージョン 2.1 以�</td></tr></table>
+<h3>概�</h3>
+
+    <p>様々��ージョン� httpd �異�る設定を扱�����る�
+    テストスイートや大�模�ットワーク��使用����設計�れ����。
+    ��モジュール�新��コンテナ ― <code class="directive"><a href="#ifversion">&lt;IfVersion&gt;</a></code> を
+    �供���。�れを使���数字�比較や正�表��よる柔軟�
+    �ージョン�ェック���るよ���り��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      &lt;IfVersion 2.1.0&gt;<br />
+      <span class="indent">
+        # current httpd version is exactly 2.1.0<br />
+      </span>
+      &lt;/IfVersion&gt;<br />
+      <br />
+      &lt;IfVersion &gt;= 2.2&gt;<br />
+      <span class="indent">
+        # use really new features :-)<br />
+      </span>
+      &lt;/IfVersion&gt;
+    </code></p></div>
+
+    <p>詳細�以下を読ん�����。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#ifversion">&lt;IfVersion&gt;</a></li>
+</ul>
+</div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IfVersion" id="IfVersion">&lt;IfVersion&gt;</a> <a name="ifversion" id="ifversion">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�ージョン�存�設定を入れる</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>&lt;IfVersion [[!]<var>operator</var>] <var>version</var>&gt; ...
+&lt;/IfVersion&gt;</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル, �ー�ャルホスト, ディレクトリ, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">上書�:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mod_version</td></tr>
+</table>
+    <p><code class="directive">&lt;IfVersion&gt;</code> � <code class="program"><a href="../programs/httpd.html">httpd</a></code> ��ージョン
+    �基準を満��������実行����ディレクティブを囲���。
+    通常� (数値) 比較���� <var>version</var> 引数�
+    <code><var>major</var>[.<var>minor</var>[.<var>patch</var>]]</code> ���
+    形��例���<code>2.1.0</code> や <code>2.2</code> ��り��。
+    <var>minor</var> � <var>patch</var> ��略�能��。�略�れ�場���
+    0 を指定��も�����れ��。比較��次�数値 <var>operator</var> を
+    指定����:</p>
+
+    <table class="bordered"><tr class="header"><th><var>operator</var></th><th>説明</th></tr>
+<tr><td><code>=</code> � <code>==</code></td>
+        <td>�� httpd �ージョン</td></tr>
+<tr class="odd"><td><code>&gt;</code></td>
+        <td>より大�� httpd �ージョン</td></tr>
+<tr><td><code>&gt;=</code></td>
+        <td>指定以上� httpd �ージョン</td></tr>
+<tr class="odd"><td><code>&lt;</code></td>
+        <td>指定未満� httpd �ージョン</td></tr>
+<tr><td><code>&lt;=</code></td>
+        <td>指定以下� httpd �ージョン</td></tr>
+</table>
+
+    <div class="example"><h3>例</h3><p><code>
+      &lt;IfVersion &gt;= 2.1&gt;<br />
+      <span class="indent">
+        # this happens only in versions greater or<br />
+        # equal 2.1.0.<br />
+      </span>
+      &lt;/IfVersion&gt;
+    </code></p></div>
+
+    <p>数値比較�加���http ��ージョン番��対��正�表��よる
+    マッ�ング�����。二種類�書�方��り��:</p>
+
+    <table class="bordered"><tr class="header"><th><var>operator</var></th><th>説明</th></tr>
+<tr><td><code>=</code> or <code>==</code></td>
+        <td><var>version</var> �
+            <code>/<var>regex</var>/</code> 形�</td></tr>
+<tr class="odd"><td><code>~</code></td>
+        <td><var>version</var> �
+            <code><var>regex</var></code> 形�</td></tr>
+</table>
+
+    <div class="example"><h3>例</h3><p><code>
+      &lt;IfVersion = /^2.1.[01234]$/&gt;<br />
+      <span class="indent">
+        # e.g. workaround for buggy versions
+      </span>
+      &lt;/IfVersion&gt;
+    </code></p></div>
+
+    <p>マッ�ング��定を表��る��������オペレータ���
+    感嘆符 (<code>!</code>)を付�る�������:</p>
+
+    <div class="example"><p><code>
+      &lt;IfVersion !~ ^2.1.[01234]$&gt;<br />
+      <span class="indent">
+        # not for those versions<br />
+      </span>
+      &lt;/IfVersion&gt;
+    </code></p></div>
+
+    <p><var>operator</var> ��略�れ���� <code>=</code> �
+    ���れ��。</p>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_version.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mod_version.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/mod_version.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_version.html.ko.euc-kr b/docs/manual/mod/mod_version.html.ko.euc-kr
index 7b6aafc8..64d0d802 100644
--- a/docs/manual/mod/mod_version.html.ko.euc-kr
+++ b/docs/manual/mod/mod_version.html.ko.euc-kr
@@ -145,6 +145,6 @@
 <a href="../ja/mod/mod_version.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_version.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_vhost_alias.html b/docs/manual/mod/mod_vhost_alias.html
index 75b54925..e61daa47 100644
--- a/docs/manual/mod/mod_vhost_alias.html
+++ b/docs/manual/mod/mod_vhost_alias.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mod_vhost_alias.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_vhost_alias.html.en b/docs/manual/mod/mod_vhost_alias.html.en
index 37d4ea0f..f2658f9c 100644
--- a/docs/manual/mod/mod_vhost_alias.html.en
+++ b/docs/manual/mod/mod_vhost_alias.html.en
@@ -307,6 +307,6 @@ a given virtual host</td></tr>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_vhost_alias.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/module-dict.html b/docs/manual/mod/module-dict.html
index 61d6c0f9..d00e7b58 100644
--- a/docs/manual/mod/module-dict.html
+++ b/docs/manual/mod/module-dict.html
@@ -1,11 +1,17 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: module-dict.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: module-dict.html.ja.euc-jp
+URI: module-dict.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: module-dict.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: module-dict.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/module-dict.html.en b/docs/manual/mod/module-dict.html.en
index cc8ac666..d1025145 100644
--- a/docs/manual/mod/module-dict.html.en
+++ b/docs/manual/mod/module-dict.html.en
@@ -20,7 +20,8 @@
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../en/mod/module-dict.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/module-dict.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/module-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/mod/module-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/module-dict.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
    <p>This document describes the terms that are used to describe
@@ -110,8 +111,9 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/module-dict.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/module-dict.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/module-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/mod/module-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/module-dict.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/module-dict.html.ja.euc-jp b/docs/manual/mod/module-dict.html.ja.euc-jp
deleted file mode 100644
index 4fc2f758..00000000
--- a/docs/manual/mod/module-dict.html.ja.euc-jp
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>Apache ¥â¥¸¥å¡¼¥ë¤Î²òÀâ¤Ç»ÈÍѤ¹¤ëÍѸì - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache ¥â¥¸¥å¡¼¥ë¤Î²òÀâ¤Ç»ÈÍѤ¹¤ëÍѸì</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/module-dict.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/module-dict.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/module-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-
-    <p>¤³¤Îʸ½ñ¤Ï Apache ¤Î³Æ <a href="./">¥â¥¸¥å¡¼¥ë</a> ¤òÀâÌÀ¤¹¤ë¤¿¤á¤Ë
-    »È¤ï¤ì¤Æ¤¤¤ëÍѸì¤òÀâÌÀ¤·¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#Description">ÀâÌÀ</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#Status">¥¹¥Æ¡¼¥¿¥¹</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#Compatibility">¸ß´¹À­</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="Description" id="Description">ÀâÌÀ</a></h2>
-
-<p>¥â¥¸¥å¡¼¥ë¤ÎÌÜŪ¤Îû¤¤ÀâÌÀ¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="Status" id="Status">¥¹¥Æ¡¼¥¿¥¹</a></h2>
-
-    <p>¤³¤ì¤Ï¡¢¤½¤Î¥â¥¸¥å¡¼¥ë¤¬ Apache
-    ¥¦¥§¥Ö¥µ¡¼¥Ð¤Ë¤É¤ì¤¯¤é¤¤Ì©ÀܤËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ë¤«¤ò¼¨¤·¤Þ¤¹¡£
-    ¸À¤¤´¹¤¨¤ì¤Ð¡¢¥â¥¸¥å¡¼¥ë¤òÁȤ߹þ¤ß¡¢¤½¤Îµ¡Ç½¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¡¢
-    ¥µ¡¼¥Ð¤òºÆ¥³¥ó¥Ñ¥¤¥ë¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Ê¤¤¤È¤¤¤¦¤³¤È¤ò¼¨¤·¤Þ¤¹¡£
-    ¤³¤Î°À­¤¬¼è¤êÆÀ¤ëÃͤϰʲ¼¤Î¤â¤Î¤Ç¤¹:</p>
-    <dl>
-      <dt>MPM</dt>
-
-      <dd>¥¹¥Æ¡¼¥¿¥¹¤¬ "MPM" ¤Î¥â¥¸¥å¡¼¥ë¤Ï<a href="../mpm.html">¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë</a>¤Ç¤¹¡£
-      ¾¤Î¼ïÎà¤Î¥â¥¸¥å¡¼¥ë¤È¤Ï°ã¤Ã¤Æ¡¢Apache ¤Ï¾ï¤Ë MPM ¤ò°ì¤Ä¤À¤±
-      »ÈÍѤ·Â³¤±¤Þ¤¹¡£¤³¤Î¼ïÎà¤Î¥â¥¸¥å¡¼¥ë¤Ï´ðËÜŪ¤Ê¥ê¥¯¥¨¥¹¥È¤Î°·¤¤¤È
-      ¥Ç¥£¥¹¥Ñ¥Ã¥Á¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£</dd>
-
-      <dt>Base</dt>
-
-      <dd>¥¹¥Æ¡¼¥¿¥¹¤¬ "Base"
-      ¤Î¥â¥¸¥å¡¼¥ë¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤ï¤¶¤ï¤¶ÀßÄ꤫¤é
-      ¥â¥¸¥å¡¼¥ë¤òºï½ü¤·¤Æ¤¤¤Ê¤¤¸Â¤ê¡¢Ä̾ï¤ÏÍøÍѲÄǽ¤Ç¤¹¡£
-      </dd>
-
-      <dt>Extension</dt>
-
-      <dd>¥¹¥Æ¡¼¥¿¥¹¤¬ "Extension" ¤Î¥â¥¸¥å¡¼¥ë¤Ï¡¢
-      ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤º¡¢¥µ¡¼¥Ð¤Ë¤âÆɤ߹þ¤Þ¤ì¤Þ¤»¤ó¡£
-      ¤½¤Î¥â¥¸¥å¡¼¥ë¤È¤½¤Îµ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë¤Ë¤Ï¡¢
-      ¥µ¡¼¥Ð¤ò¥Ó¥ë¥É¤¹¤ë¤¿¤á¤ÎÀßÄê¤òÊѹ¹¤·¤Æ¡¢Apache
-      ¤òºÆ¥³¥ó¥Ñ¥¤¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</dd>
-      <dt>Experimental</dt>
-
-      <dd>¥¹¥Æ¡¼¥¿¥¹¤¬ "Experimental" ¤Î¥â¥¸¥å¡¼¥ë¤Ï¡¢
-      Apache ÇÛÉÛʪ¤ËƱº­¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢
-      »ÈÍѤ¹¤ë¾ì¹ç¤Ï¼«¸ÊÀÕǤ¤Ç¹Ô¤Ê¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡£
-      ¤½¤Î¥â¥¸¥å¡¼¥ë¤Ï¡¢¥É¥­¥å¥á¥ó¥È¤â´°À®¤Ë¸þ¤±¤ÆºîÀ®Ãæ¤Ç¤¹¤·¡¢
-      ¥µ¥Ý¡¼¥È¤µ¤ì¤ë¤Æ¤¤¤ë¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£</dd>
-      <dt>External</dt>
-
-      <dd>¥¹¥Æ¡¼¥¿¥¹¤¬ "External" ¤Î¥â¥¸¥å¡¼¥ë¤Ï¡¢´ðËÜ Apache
-      ÇÛÉÛ¤ËƱº­¤µ¤ì¤Þ¤»¤ó ("¥µ¡¼¥É¥Ñ¡¼¥Æ¥£¡¼¥â¥¸¥å¡¼¥ë")¡£
-      ¤½¤Î¤¿¤á¡¢²æ¡¹¤ËÀÕǤ¤Ï¤¢¤ê¤Þ¤»¤ó¤·¡¢
-      ¤½¤Î¥â¥¸¥å¡¼¥ë¤Î¥µ¥Ý¡¼¥È¤â¤·¤Æ¤¤¤Þ¤»¤ó¡£</dd>
-    </dl>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="SourceFile" id="SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë</a></h2>
-
-    <p>¤³¤ì¤Ïñ½ã¤Ë¡¢
-    ¤½¤Î¥â¥¸¥å¡¼¥ë¤ËɬÍפʥ³¡¼¥É¤ò´Þ¤à¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÎóµó¤·¤¿¤â¤Î¤Ç¤¹¡£
-    ¤³¤ì¤Ï¡¢<code class="directive"><a href="../mod/core.html#ifmodule">&lt;IfModule&gt;</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ÈÍѤµ¤ì¤ë̾Á°¤Ç¤â¤¢¤ê¤Þ¤¹¡£
-    </p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="ModuleIdentifier" id="ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò</a></h2>
-
-    <p>¤³¤Îʸ»úÎó¤Ï¡¢¥â¥¸¥å¡¼¥ë¤ÎưŪÆɤ߹þ¤ß¤ò¹Ô¤Ê¤¦¤È¤­¤Ë»ÈÍѤ¹¤ë <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤ª¤¤¤Æ»ÈÍѤµ¤ì¤ë¥â¥¸¥å¡¼¥ë¤Î¼±Ê̻ҤǤ¹¡£
-    ¾Ü¤·¤¯½ñ¤¯¤È¡¢¥½¡¼¥¹¥Õ¥¡¥¤¥ëÆâ¤Î module ¥¿¥¤¥×¤Î³°ÉôÊÑ¿ô¤Î̾Á°¤Ç¤¹¡£
-    </p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="Compatibility" id="Compatibility">¸ß´¹À­</a></h2>
-
-    <p>¤¢¤ë¥â¥¸¥å¡¼¥ë¤¬ Apache ¥Ð¡¼¥¸¥ç¥ó 2
-    ¤ÎÇÛÉۤ˴ޤޤì¤Æ¤¤¤Ê¤«¤Ã¤¿¾ì¹ç¡¢
-    ¤½¤Î¥â¥¸¥å¡¼¥ë¤¬Æ³Æþ¤µ¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤¬¤³¤³¤Ë½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¤Þ¤¿¡¢¥â¥¸¥å¡¼¥ë¤¬ÆÃÄê¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ë¤Î¤ß¸ºß¤¹¤ë¤È¤­¤â
-    ¾ÜºÙ¤Ï¤³¤³¤Ë½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/module-dict.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/module-dict.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/module-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/module-dict.html.ja.utf8 b/docs/manual/mod/module-dict.html.ja.utf8
new file mode 100644
index 00000000..bcfdbb24
--- /dev/null
+++ b/docs/manual/mod/module-dict.html.ja.utf8
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Apache モジュール�解説�使用�る用語 - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache モジュール�解説�使用�る用語</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/module-dict.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/module-dict.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/module-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/module-dict.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+    <p>��文書� Apache �� <a href="./">モジュール</a> を説明�る���
+    使�れ��る用語を説明���。</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#Description">説明</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Status">ステータス</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#SourceFile">ソースファイル</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ModuleIdentifier">モジュール識別�</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Compatibility">互�性</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Description" id="Description">説明</a></h2>
+
+<p>モジュール�目的�短�説明。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Status" id="Status">ステータス</a></h2>
+
+    <p>�れ����モジュール� Apache
+    ウェブサー���れ�ら�密接�組�込�れ��る�を示���。
+    言���れ��モジュールを組�込����機能を利用�る����
+    サー�を�コンパイル�る必���る�も�れ�������を示���。
+    ��属性��り得る値�以下�も���:</p>
+    <dl>
+      <dt>MPM</dt>
+
+      <dd>ステータス� "MPM" �モジュール�<a href="../mpm.html">マル�プロセッシングモジュール</a>��。
+      他�種類�モジュール������Apache �常� MPM を一���
+      使用�続���。��種類�モジュール�基本的�リクエスト�扱��
+      ディスパッ�を行����。</dd>
+
+      <dt>Base</dt>
+
+      <dd>ステータス� "Base"
+      �モジュール��デフォルト�コンパイル�れ�����設定�ら
+      モジュールを削除������り�通常�利用�能��。
+      </dd>
+
+      <dt>Extension</dt>
+
+      <dd>ステータス� "Extension" �モジュール��
+      デフォルト��コンパイル�れ��サー��も読�込�れ��ん。
+      ��モジュール���機能を有効��る���
+      サー�をビルド�る���設定を変更���Apache
+      を�コンパイル�る必���り��。</dd>
+      <dt>Experimental</dt>
+
+      <dd>ステータス� "Experimental" �モジュール��
+      Apache �布物��梱�れ������
+      使用�る場��自己責任�行��必���り��。
+      ��モジュール��ドキュメントも完�����作�中����
+      サ�ート�れる��る���り��ん。</dd>
+      <dt>External</dt>
+
+      <dd>ステータス� "External" �モジュール��基本 Apache
+      �布��梱�れ��ん ("サードパーティーモジュール")。
+      �����我々�責任��り��ん��
+      ��モジュール�サ�ートも�����ん。</dd>
+    </dl>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="SourceFile" id="SourceFile">ソースファイル</a></h2>
+
+    <p>�れ��純��
+    ��モジュール�必��コードを�むソースファイル���を列挙��も���。
+    �れ��<code class="directive"><a href="../mod/core.html#ifmodule">&lt;IfModule&gt;</a></code>
+    ディレクティブ�使用�れる���も�り��。
+    </p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ModuleIdentifier" id="ModuleIdentifier">モジュール識別�</a></h2>
+
+    <p>��文字列��モジュール�動的読�込�を行�����使用�る <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code>
+    ディレクティブ����使用�れるモジュール�識別���。
+    詳��書���ソースファイル内� module タイプ�外部変数�����。
+    </p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Compatibility" id="Compatibility">互�性</a></h2>
+
+    <p>�るモジュール� Apache �ージョン 2
+    ��布���れ������場��
+    ��モジュール�導入�れ��ージョン����書�れ����。
+    ���モジュール�特定�プラットフォーム���存在�る��も
+    詳細����書�れ����。</p>
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/module-dict.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/module-dict.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/module-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/module-dict.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/module-dict.html.ko.euc-kr b/docs/manual/mod/module-dict.html.ko.euc-kr
index 4082dfff..7dc1a7ea 100644
--- a/docs/manual/mod/module-dict.html.ko.euc-kr
+++ b/docs/manual/mod/module-dict.html.ko.euc-kr
@@ -20,7 +20,8 @@
 <div class="toplang">
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/module-dict.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/module-dict.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/module-dict.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/mod/module-dict.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/module-dict.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 
    <p>ÀÌ ¹®¼­´Â ¾ÆÆÄÄ¡ <a href="./">¸ðµâ</a>À» ¼³¸íÇϱâÀ§ÇØ
@@ -102,8 +103,9 @@
 <div class="bottomlang">
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/mod/module-dict.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/module-dict.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/mod/module-dict.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/mod/module-dict.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/module-dict.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/module-dict.html.tr.utf8 b/docs/manual/mod/module-dict.html.tr.utf8
new file mode 100644
index 00000000..d000aa20
--- /dev/null
+++ b/docs/manual/mod/module-dict.html.tr.utf8
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Modülleri Tanımlamakta Kullanılan Terimler - Apache HTTP Sunucusu</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="../">Sürüm 2.2</a></div><div id="page-content"><div id="preamble"><h1>Modülleri Tanımlamakta Kullanılan Terimler</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="../en/mod/module-dict.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/module-dict.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/module-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/module-dict.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+   <p>Bu belgede Apache <a href="./">modül</a>lerini tanımlarken kullanılan terimler açıklanmıştır.</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#Description">Açıklama</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Status">Durum</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#SourceFile">Kaynak Dosyası</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ModuleIdentifier">Modül Betimleyici</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#Compatibility">Uyumluluk</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Description" id="Description">Açıklama</a></h2>
+
+<p>Modülün kullanım amacının kısa bir açıklaması.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Status" id="Status">Durum</a></h2>
+
+    <p>Modülün Apache HTTP sunucusuna ne kadar sıkı bağlı olduğunu belirtir. Başka bir deyişle, modüle ve işlevselliğine erişim kazanmak için sunucuyu yeniden derlemek gerekip gerekmediği ile ilgili durumu belirtir. Bu özniteliğin olası değerleri şunlardır:</p>
+
+    <dl>
+      <dt>MPM</dt>
+
+      <dd>“MPM� durumlu bir modül bir <a href="../mpm.html">Çok Süreçlilik Modülü</a>dür. Diğer modül türlerinin aksine, sunucunun kullandığı MPM modülü sayısı birden fazla olamaz. Bu modül türü temelde sunucuya gelen isteklerin ele alınmasından ve öldürülmesinden sorumludur.</dd>
+
+      <dt>Temel</dt>
+
+      <dd>“Temel� durumuyla etiketlenmiş bir modül öntanımlı olarak olarak derlenir ve sunucuya öntanımlı olarak yüklenir. Bu bakımdan derleme öncesi paket yapılandırması sırasında modülün derlenmemesi özellikle istenmedikçe bu modül derlenecek ve sunucuya yüklenecektir.</dd>
+
+      <dt>Eklenti</dt>
+
+      <dd>“Eklenti� durumundaki bir modül normal olarak derlenmez ve sunucuya yüklenmez. Modülü ve işlevselliğini etkin kılmak için sunucunun derleme öncesi paket yapılandırması sırasında modülün derleneceğini açıkça belirttikten sonra gerekirse yeniden derlemeniz gerekir.</dd>
+
+      <dt>Deneysel</dt>
+
+      <dd>“Deneysel� durumu modülün Apache sunucusunun bir parçası olarak kabul edildiğini ancak modülü denemenin tamamen sizin insiyatifinize bırakıldığı anlamına gelir. Böyle bir modül her şeyiyle belgelenmiştir fakat gerektiği gibi desteklenmemiştir.</dd>
+
+      <dt>Harici</dt>
+
+      <dd>“Harici� durumu temel Apache dağıtımında bulunmayan (“üçüncü parti�) modüller için kullanılır. Böyle modüller için sorumluluk kabul etmediğimiz gibi bunları desteklemiyoruz.</dd>
+    </dl>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="SourceFile" id="SourceFile">Kaynak Dosyası</a></h2>
+
+    <p>Karşısına modül kodunu içeren kaynak dosyasının ismi yazılır. Bu isim ayrıca <code class="directive"><a href="../mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> yönergesi tarafından da kullanılır.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ModuleIdentifier" id="ModuleIdentifier">Modül Betimleyici</a></h2>
+
+    <p>Modüller devingen olarak yüklenirken <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code> yönergesinde kullanmak için modülü betimleyen dizgedir. Aslında, kaynak dosyasında <code>module</code> türündeki harici değişkenin ismidir.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="Compatibility" id="Compatibility">Uyumluluk</a></h2>
+
+    <p>Eğer modül Apache’nin 2. sürüm dağıtımının özgün parçası değilse söz  konusu sürüm burada belirtilir. Ayrıca, modülün kullanımı belli platformlarla sınırlıysa bunun ayrıntıları da burada belirtilir.</p>
+</div></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="../en/mod/module-dict.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/module-dict.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/module-dict.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/mod/module-dict.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mpm_common.html b/docs/manual/mod/mpm_common.html
index f76c5828..059c2662 100644
--- a/docs/manual/mod/mpm_common.html
+++ b/docs/manual/mod/mpm_common.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mpm_common.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -6,6 +8,10 @@ URI: mpm_common.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mpm_common.html.ja.euc-jp
+URI: mpm_common.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
+
+URI: mpm_common.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/mpm_common.html.de b/docs/manual/mod/mpm_common.html.de
index 66975d08..38a44a4c 100644
--- a/docs/manual/mod/mpm_common.html.de
+++ b/docs/manual/mod/mpm_common.html.de
@@ -23,7 +23,8 @@
 <div class="toplang">
 <p><span>Verfügbare Sprachen: </span><a href="../de/mod/mpm_common.html" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/mpm_common.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mpm_common.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
+<a href="../ja/mod/mpm_common.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../tr/mod/mpm_common.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">Diese Übersetzung ist möglicherweise
             nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
@@ -981,8 +982,9 @@ gültig</td></tr>
 <div class="bottomlang">
 <p><span>Verfügbare Sprachen: </span><a href="../de/mod/mpm_common.html" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/mpm_common.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mpm_common.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
+<a href="../ja/mod/mpm_common.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../tr/mod/mpm_common.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en
index dcdba4e2..916c53e2 100644
--- a/docs/manual/mod/mpm_common.html.en
+++ b/docs/manual/mod/mpm_common.html.en
@@ -23,7 +23,8 @@
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../de/mod/mpm_common.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/mpm_common.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mpm_common.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
+<a href="../ja/mod/mpm_common.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../tr/mod/mpm_common.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>A collection of directives that are implemented by
 more than one multi-processing module (MPM)</td></tr>
@@ -457,15 +458,8 @@ will handle during its life</td></tr>
     </div>
 
     <p>Setting <code class="directive">MaxRequestsPerChild</code> to a
-    non-zero limit has two beneficial effects:</p>
-
-    <ul>
-      <li>it limits the amount of memory that process can consume
-      by (accidental) memory leakage;</li>
-
-      <li>by giving processes a finite lifetime, it helps reduce
-      the number of processes when the server load reduces.</li>
-    </ul>
+    non-zero value limits the amount of memory that process can consume
+    by (accidental) memory leakage.</p>
 
     <div class="note"><h3>Note</h3>
       <p>For <code class="directive"><a href="../mod/core.html#keepalive">KeepAlive</a></code> requests, only
@@ -934,8 +928,9 @@ requests</td></tr>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../de/mod/mpm_common.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/mpm_common.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mpm_common.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
+<a href="../ja/mod/mpm_common.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../tr/mod/mpm_common.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mpm_common.html.ja.euc-jp b/docs/manual/mod/mpm_common.html.ja.euc-jp
deleted file mode 100644
index 5b01af1b..00000000
--- a/docs/manual/mod/mpm_common.html.ja.euc-jp
+++ /dev/null
@@ -1,992 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mpm_common - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache MPM ¶¦Ḁ̈ǥ£¥ì¥¯¥Æ¥£¥Ö</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../de/mod/mpm_common.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="../en/mod/mpm_common.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mpm_common.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>Æó¤Ä°Ê¾å¤Î¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë (MPM)
-¤Ç¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¥³¥ì¥¯¥·¥ç¥ó</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr></table>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#acceptmutex">AcceptMutex</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#coredumpdirectory">CoreDumpDirectory</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#enableexceptionhook">EnableExceptionHook</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#gracefulshutdowntimeout">GracefulShutdownTimeout</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#group">Group</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#listen">Listen</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#listenbacklog">ListenBackLog</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#lockfile">LockFile</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#maxclients">MaxClients</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#maxmemfree">MaxMemFree</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#maxrequestsperchild">MaxRequestsPerChild</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#maxsparethreads">MaxSpareThreads</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#minsparethreads">MinSpareThreads</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#pidfile">PidFile</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#receivebuffersize">ReceiveBufferSize</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#scoreboardfile">ScoreBoardFile</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#sendbuffersize">SendBufferSize</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#serverlimit">ServerLimit</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#startservers">StartServers</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#startthreads">StartThreads</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#threadlimit">ThreadLimit</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#threadsperchild">ThreadsPerChild</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#threadstacksize">ThreadStackSize</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#user">User</a></li>
-</ul>
-</div>
-
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="AcceptMutex" id="AcceptMutex">AcceptMutex</a> <a name="acceptmutex" id="acceptmutex">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>Ê£¿ô¤Î»Ò¥×¥í¥»¥¹¤¬¥Í¥Ã¥È¥ï¡¼¥¯¥½¥±¥Ã¥È¤Ç¥ê¥¯¥¨¥¹¥È¤ò
-accept ¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤È¤­¤Ë¡¢Apache ¤¬¤½¤ì¤é¤Î»Ò¥×¥í¥»¥¹¤òľÎ󲽤¹¤ë¤¿¤á¤Ë
-»È¤¦ÊýË¡</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>AcceptMutex default|<var>method</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>AcceptMutex default</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-</table>
-    <p><code class="directive">AcceptMutex</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¥Í¥Ã¥È¥ï¡¼¥¯¥½¥±¥Ã¥È¤Î¥ê¥¯¥¨¥¹¥È¤ò accept ¤·¤è¤¦¤È¤·¤Æ¤¤¤ëÊ£¿ô¤Î»Ò¥×¥í¥»¥¹¤ò
-    Apache ¤¬Ä¾Î󲽤¹¤ë¤¿¤á¤Ë»È¤¦ÊýË¡¤òÀßÄꤷ¤Þ¤¹¡£
-    Apache 2.0 °ÊÁ°¤Ï¡¢¤³¤Î¥á¥½¥Ã¥É¤Ï¥³¥ó¥Ñ¥¤¥ë»þ¤Ë¤Î¤ßÁªÂò¤Ç¤­¤Þ¤·¤¿¡£
-    ºÇŬ¤ÊÊýË¡¤Ï¡¢¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤ä¥×¥é¥Ã¥È¥Û¡¼¥à¤ËÂ礭¤¯°Í¸¤·¤Þ¤¹¡£
-    ¾ÜºÙ¤Ë´Ø¤·¤Æ¤Ï¡¢<a href="../misc/perf-tuning.html">À­Ç½¤Î¥Á¥å¡¼¥Ë¥ó¥°</a>
-    ¥É¥­¥å¥á¥ó¥È¤ò¤´Í÷²¼¤µ¤¤¡£</p>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬ <code>Default</code>
-    ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢¥³¥ó¥Ñ¥¤¥ë»þ¤ËÁªÂò¤µ¤ì¤¿¥Ç¥Õ¥©¥ë¥ÈÃͤ¬»È¤ï¤ì¤Þ¤¹¡£
-    ¾¤Î»ÈÍѲÄǽ¤Ê¥á¥½¥Ã¥É¤Î°ìÍ÷¤Ï²¼¤Ë¤¢¤ê¤Þ¤¹¡£
-    Á´¤Æ¤Î¥á¥½¥Ã¥É¤¬Á´¤Æ¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤Ç»ÈÍѲÄǽ¤Ç¤¢¤ë¤ï¤±¤Ç¤Ï¤Ê¤¤¡¢
-    ¤È¤¤¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    »ÈÍѲÄǽ¤Ç¤Ê¤¤¥á¥½¥Ã¥É¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¤Ï¡¢
-    »ÈÍѲÄǽ¤Ê¥á¥½¥Ã¥É¤Î°ìÍ÷¤ò´Þ¤ó¤À¥á¥Ã¥»¡¼¥¸¤¬
-    ¥¨¥é¡¼¥í¥°¤Ë½ÐÎϤµ¤ì¤Þ¤¹¡£</p>
-
-    <dl>
-      <dt><code>flock</code></dt>
-      <dd><code class="directive"><a href="#lockfile">LockFile</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÄêµÁ¤·¤¿¥Õ¥¡¥¤¥ë¤Î¥í¥Ã¥¯¤Ë¡¢
-      <code>flock(2)</code> ¥·¥¹¥Æ¥à¥³¡¼¥ë¤ò»È¤¤¤Þ¤¹¡£</dd>
-
-      <dt><code>fcntl</code></dt>
-      <dd><code class="directive"><a href="#lockfile">LockFile</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÄêµÁ¤·¤¿¥Õ¥¡¥¤¥ë¤Î¥í¥Ã¥¯¤Ë¡¢
-      <code>fcntl(2)</code> ¥·¥¹¥Æ¥à¥³¡¼¥ë¤ò»È¤¤¤Þ¤¹¡£</dd>
-
-      <dt><code>posixsem</code></dt>
-      <dd>ÇÓ¾½èÍý¤Î¼ÂÁõ¤Ë POSIX ¸ß´¹¥»¥Þ¥Õ¥©¤ò»ÈÍѤ·¤Þ¤¹</dd>
-
-      <dt><code>pthread</code></dt>
-      <dd>POSIX Threads (PThreads) µ¬³Ê¤Ç¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë
-      POSIX ÇÓ¾½èÍý¤ò»È¤¤¤Þ¤¹¡£</dd>
-
-      <dt><code>sysvsem</code></dt>
-      <dd>ÇÓ¾½èÍý¤Î¼ÂÁõ¤Ë SySV ·Á¼°¤Î¥»¥Þ¥Õ¥©¤ò»È¤¤¤Þ¤¹¡£</dd>
-    </dl>
-
-    <p>¥³¥ó¥Ñ¥¤¥ë»þ¤Ë¥·¥¹¥Æ¥à¤Î¥Ç¥Õ¥©¥ë¥È¤ËÁª¤Ð¤ì¤¿¤â¤Î¤¬²¿¤«¤ò¸«¤¿¤¤¾ì¹ç¤Ï¡¢
-    <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code> ¤ò <code>debug</code>
-    ¤ËÀßÄꤹ¤ë¤È¤è¤¤¤Ç¤·¤ç¤¦¡£¥Ç¥Õ¥©¥ë¥È¤Î <code class="directive">AcceptMutex</code>
-    ¤¬ <code class="directive"><a href="../mod/core.html#errorlog">ErrorLog</a></code> ¤Ë½ñ¤­¹þ¤Þ¤ì¤Þ¤¹¡£</p>
-
-  <div class="warning"><h3>·Ù¹ð</h3>
-     <p>¤Û¤È¤ó¤É¤Î¥·¥¹¥Æ¥à¤Ë¤ª¤¤¤Æ¤Ï¡¢<code>pthread</code> ¥ª¥×¥·¥ç¥ó¤¬
-     Áª¤Ð¤ì¤Æ¤¤¤ë¤È¡¢»Ò¥×¥í¥»¥¹¤¬ <code>AcceptCntl</code> mutex ¤ò
-     ÊÝ»ý¤·¤Æ¤¤¤ë¤È¤­¤Ë°Û¾ï½ªÎ»¤·¤¿¾ì¹ç¡¢¥µ¡¼¥Ð¤Ï¥ê¥¯¥¨¥¹¥È¤Ø¤Î±þÅú¤ò
-     Ää»ß¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¡£¤³¤ì¤¬È¯À¸¤·¤¿¾ì¹ç¤Ï¡¢¥µ¡¼¥Ð¤òÉüµì¤µ¤»¤ë¤¿¤á¤Ë¤Ï
-     ¼êÆ°¤ÇºÆµ¯Æ°¤µ¤»¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-     <p>Solaris ¤ÏÎã³°¤Ç¡¢Apache ¤â»ÈÍѤ·¤Æ¤¤¤ë¡¢»Ò¥×¥í¥»¥¹¤¬ mutex ¤ò
-     ÊÝ»ý¤·¤Æ°Û¾ï½ªÎ»¤·¤¿¸å¤Ë mutex ¤òÉüµì¤µ¤»¤ë¤¿¤á¤Îµ¡¹½¤òÄ󶡤ò¤·¤Æ¤¤¤Þ¤¹¡£</p>
-     <p>¸æ»ÈÍѤΥ·¥¹¥Æ¥à¤¬ <code>pthread_mutexattr_setrobust_np()</code> ´Ø¿ô¤ò
-     ¼ÂÁõ¤·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢<code>pthread</code> ¥ª¥×¥·¥ç¥ó¤ò°ÂÁ´¤Ë»ÈÍѤǤ­¤ë
-     ²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£</p>
-  </div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="CoreDumpDirectory" id="CoreDumpDirectory">CoreDumpDirectory</a> <a name="coredumpdirectory" id="coredumpdirectory">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>Apache ¤¬¥³¥¢¥À¥ó¥×¤¹¤ëÁ°¤Ë°ÜÆ°¤ò»î¤ß¤ë¥Ç¥£¥ì¥¯¥È¥ê
-</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>CoreDumpDirectory <var>directory</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤ÏÀâÌÀʸ¤òÆɤó¤Ç¤¯¤À¤µ¤¤</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-</table>
-    <p>Apache ¤¬¥³¥¢¥À¥ó¥×¤¹¤ëÁ°¤Ë°ÜÆ°¤ò»î¤ß¤ë¥Ç¥£¥ì¥¯¥È¥ê¤òÀ©¸æ¤·¤Þ¤¹¡£
-    ¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
-    ¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¹¤¬¡¢¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ï¥µ¡¼¥Ð¤Î¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¥æ¡¼¥¶¸¢¸Â¤Ç
-    ½ñ¤­¹þ¤ß²Äǽ¤Ç¤¢¤ë¤Ù¤­¤Ç¤Ï¤Ê¤¤¤Î¤Ç¡¢Ä̾ï¤Ï¥³¥¢¥À¥ó¥×¤Ï½ñ¤­¹þ¤Þ¤ì¤Þ¤»¤ó¡£
-    ¥Ç¥Ð¥Ã¥°¤Î¤¿¤á¤Ë¥³¥¢¥À¥ó¥×¤¬É¬ÍפǤ¢¤ì¤Ð¡¢
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ¾¤Î°ÌÃ֤˥³¥¢¥À¥ó¥×¤ò½ñ¤­½Ð¤¹¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>Linux ¤Ç¤Î¥³¥¢¥À¥ó¥×</h3>
-      <p>Apache ¤¬ root ¤È¤·¤Æµ¯Æ°¤µ¤ì¤Æ¡¢Ê̤Υ桼¥¶¤Î¸¢¸Â¤Ë°Ê¹ß¤·¤¿¾ì¹ç¤Ï
-      Linux ¤Î¥«¡¼¥Í¥ë¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤¬¥×¥í¥»¥¹¤Î¸¢¸Â¤Ç½ñ¤­¹þ¤ß²Äǽ¤Ê¾ì¹ç¤Ç¤µ¤¨¤â
-      ¥³¥¢¥À¥ó¥×¤ò<em>̵¸ú</em>¤Ë¤·¤Þ¤¹¡£Apache (2.0.46 °Ê¹ß) ¤Ï
-      Linux 2.4 °Ê¹ß¤Ç¤Ï¥³¥¢¥À¥ó¥×¤ò¹Ô¤Ê¤¦¤è¤¦¤ËºÆ»ØÄꤷ¤Þ¤¹¤¬¡¢¤½¤ì¤Ï
-      <code class="directive">CoreDumpDirectory</code> ¤òÌÀ¼¨Åª¤ËÀßÄꤷ¤¿¤È¤­¤Ë
-      ¸Â¤ê¤Þ¤¹¡£</p>
-    </div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="EnableExceptionHook" id="EnableExceptionHook">EnableExceptionHook</a> <a name="enableexceptionhook" id="enableexceptionhook">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¯¥é¥Ã¥·¥å¤Î¸å¤ËÎã³°¥Ï¥ó¥É¥é¤ò¼Â¹Ô¤¹¤ë¥Õ¥Ã¥¯¤òÍ­¸ú¤Ë¤¹¤ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>EnableExceptionHook On|Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>EnableExceptionHook Off</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.0.49 °Ê¹ß</td></tr>
-</table>
-    <p>°ÂÁ´¾å¤ÎÍýͳ¤«¤é¡¢<code>--enable-exception-hook</code> configure
-    ¥ª¥×¥·¥ç¥ó¤òÍ­¸ú¤Ë¤·¤¿¾ì¹ç¤Ë¤Î¤ß¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÍøÍѤǤ­¤Þ¤¹¡£
-    ³°Éô¥â¥¸¥å¡¼¥ë¤ò¥×¥é¥°¥¤¥ó¤·¤Æ¡¢»Ò¤¬¥¯¥é¥Ã¥·¥å¤·¤¿¸å¤Ë²¿¤«¼Â¹Ô¤Ç¤­¤ë¤è¤¦¤Ê
-    ¥Õ¥Ã¥¯¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£</p>
-    
-    <p>¤³¤Î¤è¤¦¤Ê³°Éô¥â¥¸¥å¡¼¥ë¤Ï¡¢´û¤ËÆó¤Ä¸ºß¤·¤Æ¤¤¤Æ¡¢
-    <code>mod_whatkilledus</code> ¤È <code>mod_backtrace</code>
-    ¤¬¤³¤Î¥Õ¥Ã¥¯¤ò³èÍѤ·¤Þ¤¹¡£¤³¤ì¤é¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï Jeff Trawick 
-    ¤µ¤ó¤Î <a href="http://www.apache.org/~trawick/exception_hook.html">EnableExceptionHook site</a> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="GracefulShutdownTimeout" id="GracefulShutdownTimeout">GracefulShutdownTimeout</a> <a name="gracefulshutdowntimeout" id="gracefulshutdowntimeout">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>²º¤ä¤«¤ÊÄä»ß¤ò¤«¤±¤¿¸å¡¢½ªÎ»¤¹¤ë¤Þ¤ÇÂԤĻþ´Ö</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>GracefulShutDownTimeout <var>seconds</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>GracefulShutDownTimeout 0</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/event.html">event</a></code></td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.2 °Ê¹ß</td></tr>
-</table>
-    <p><code class="directive">GracefulShutdownTimeout</code> ¤Ë¤Ï
-    ¥µ¡¼¥Ð¡¼¤¬ "graceful-stop" ¥·¥°¥Ê¥ë¤ò¼õ¤±¼è¤Ã¤Æ¤«¤é¸½ºß¤Î
-    ¥ê¥¯¥¨¥¹¥È¤Î½èÍý¤òºÇÂç¤Ç²¿ÉôÖ³¤±¤ë¤«¤ò»ØÄꤷ¤Þ¤¹¡£</p>
-
-    <p>¤³¤ÎÃͤò¥¼¥í¤ËÀßÄꤹ¤ë¤È¡¢½èÍýÃæ¤È¤·¤Æ»Ä¤Ã¤Æ¤¤¤ë¥ê¥¯¥¨¥¹¥È¤¬
-    Á´¤Æ´°Î»¤¹¤ë¤Þ¤Ç¥µ¡¼¥Ð¡¼¤Ï½ªÎ»¤·¤Þ¤»¤ó¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Group" id="Group">Group</a> <a name="group" id="group">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤¹¤ëºÝ¤Ë½ê°¤¹¤ë¥°¥ë¡¼¥×</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Group <var>unix-group</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>Group #-1</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0 °Ê¹ß¤Ç¡¢¥°¥í¡¼¥Ð¥ëÀßÄê¤Ç¤Î¤ßÍ­¸ú¤Ç¤¹¡£</td></tr>
-</table>
-    <p><code class="directive">Group</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¡¢
-    ¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤¹¤ëºÝ¤Ë½ê°¤·¤Æ¤ª¤¯¥°¥ë¡¼¥×¤òÀßÄꤷ¤Þ¤¹¡£
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ¹¤ë¤¿¤á¤Ë¤Ï¡¢
-    ¥µ¡¼¥Ð¤ÏºÇ½é¤Ë <code>root</code> ¸¢¸Â¤Çµ¯Æ°¤µ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    Èó root ¥æ¡¼¥¶¤Ç¥µ¡¼¥Ð¤òµ¯Æ°¤·¤¿¾ì¹ç¤Ï¡¢»ØÄꤷ¤¿¥°¥ë¡¼¥×¤ËÊѲ½¤Ç¤­¤º¤Ë¡¢
-    ·ë²ÌŪ¤Ëµ¯Æ°¤·¤¿¥æ¡¼¥¶¤Î°¤¹¤ë¥°¥ë¡¼¥×¤Ç¼Â¹Ô¤µ¤ì¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
-    <var>unix-group</var> ¤Ï¼¡¤Î¤¦¤Á¤Î¤¤¤º¤ì¤«¤Ç¤¹:</p>
-
-    <dl>
-      <dt>¥°¥ë¡¼¥×̾</dt>
-      <dd>¥°¥ë¡¼¥×¤ò̾Á°¤Ç»²¾È¤·¤Þ¤¹</dd>
-
-      <dt><code>#</code> ¤Ë³¤¤¤Æ¥°¥ë¡¼¥×ÈÖ¹æ</dt>
-      <dd>¥°¥ë¡¼¥×¤òÈÖ¹æ¤Ç»²¾È¤·¤Þ¤¹¡£</dd>
-    </dl>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      Group www-group
-    </code></p></div>
-
-    <p>¥µ¡¼¥Ð¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤ËÆÃÄê¤Î¿·¤·¤¤¥°¥ë¡¼¥×¤òÀßÄꤹ¤ë¤³¤È¤ò
-    ¤ªÁ¦¤á¤·¤Þ¤¹¡£<code>nobody</code> ¤ò»ÈÍѤ¹¤ë´ÉÍý¼Ô¤â¤¤¤Þ¤¹¤¬¡¢
-    ²Äǽ¤Ç¤¢¤Ã¤¿¤ê˾¤Þ¤·¤¤Ìõ¤Ç¤Ïɬ¤º¤·¤â¤¢¤ê¤Þ¤»¤ó¡£</p>
-
-    <div class="warning"><h3>¥»¥­¥å¥ê¥Æ¥£</h3>
-      <p>Àµ³Î¤Ë¤É¤ó¤Ê¤³¤È¤ò¤ä¤Ã¤Æ¤¤¤ë¤Î¤«¡¢¤½¤Î´í¸±À­¤òÃΤé¤Ê¤¤¤Ç¡¢
-      <code class="directive">Group</code> (¤ä <code class="directive"><a href="#user">User</a></code>) ¤ò
-      <code>root</code> ¤Ë ÀßÄꤷ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</p>
-    </div>
-
-    <p>Æõ­»ö¹à: ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-    ¤Ç»ÈÍѤ¹¤ë¤³¤È¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Ê¤¯¤Ê¤ê¤Þ¤·¤¿¡£Apache 2.0 ¤Ç
-    <code class="program"><a href="../programs/suexec.html">suexec</a></code> ¤òÀßÄꤷ¤¿¤¤¾ì¹ç¤Ï¡¢
-    <code class="directive"><a href="../mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code>
-    ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <div class="note"><h3>Ãí°Õ</h3>
-      <p><code class="directive">Group</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-      <code class="module"><a href="../mod/beos.html">beos</a></code> ¤È <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> MPM
-      ¤Ë¤â¸ºß¤·¤Þ¤¹¤¬¡¢¼Â¼ÁŪ¤Ë̵¸ú¤Ç¡¢¸ß´¹À­¤Î¤¿¤á¤À¤±¤Ë¸ºß¤·¤Þ¤¹¡£</p>
-    </div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Listen" id="Listen">Listen</a> <a name="listen" id="listen">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥µ¡¼¥Ð¤¬ listen ¤¹¤ëIP ¥¢¥É¥ì¥¹¤È¥Ý¡¼¥ÈÈÖ¹æ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Listen [<var>IP-address</var>:]<var>portnumber</var> [<var>protocol</var>]</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/event.html">event</a></code></td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0 ¤«¤éɬ¿Ü¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¡£<var>protocol</var>
-°ú¿ô¤Ï 2.1.5 ¤ÇÄɲá£</td></tr>
-</table>
-    <p><code class="directive">Listen</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï Apache
-    ¤¬ÆÃÄê¤Î IP ¥¢¥É¥ì¥¹¤ä¥Ý¡¼¥ÈÈÖ¹æ¤À¤±¤ò listen ¤¹¤ë¤è¤¦¤Ë»ØÄꤷ¤Þ¤¹¡£
-    ¥Ç¥Õ¥©¥ë¥È¤Ç¤ÏÁ´¤Æ¤Î IP ¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤Î¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤·¤Þ¤¹¡£
-    <code class="directive">Listen</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¸½ºß¤Ïɬ¿Ü¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È¤Ê¤ê¤Þ¤·¤¿¡£
-    ¤â¤·ÀßÄê¥Õ¥¡¥¤¥ë¤Ë¤Ê¤±¤ì¤Ð¡¢¥µ¡¼¥Ð¤Ïµ¯Æ°¤Ë¼ºÇÔ¤·¤Þ¤¹¡£
-    ¤³¤ì¤Ï°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Î Apache ¤«¤éÊѹ¹¤Î¤¢¤Ã¤¿Éôʬ¤Ç¤¹¡£</p>
-
-    <p><code class="directive">Listen</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤Ï¡¢ÆÃÄê¤Î¥Ý¡¼¥È¤¢¤ë¤¤¤Ï
-    ¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤ÎÁȤ߹ç¤ï¤»¤«¤éÆþ¤Ã¤Æ¤¯¤ë¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ
-    ±þÅú¤¹¤ë¤è¤¦¤Ë»ØÄꤷ¤Þ¤¹¡£
-    ¤â¤·¥Ý¡¼¥ÈÈÖ¹æ¤À¤±¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¤Ï¡¢¥µ¡¼¥Ð¤ÏÁ´¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤Î
-    »ØÄꤵ¤ì¤¿¥Ý¡¼¥ÈÈÖ¹æ¤ËÂФ·¤Æ listen ¤·¤Þ¤¹¡£
-    IP ¥¢¥É¥ì¥¹¤¬¥Ý¡¼¥È¤È¤È¤â¤Ë»ØÄꤵ¤ì¤¿¾ì¹ç¤Ï¡¢
-    ¥µ¡¼¥Ð¤Ï»ØÄꤵ¤ì¤¿¥Ý¡¼¥È¤È¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤ËÂФ·¤Æ listen 
-    ¤·¤Þ¤¹¡£</p>
-
-    <p>Ê£¿ô¤Î¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤ËÂФ·¤Æ listen ¤¹¤ë¤è¤¦¤Ë¡¢
-    Ê£¿ô¤Î <code class="directive">Listen</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¦¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-    ¥µ¡¼¥Ð¤ÏÎóµó¤µ¤ì¤¿¥¢¥É¥ì¥¹¤È¥Ý¡¼¥ÈÁ´¤Æ¤«¤é¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ
-    ±þÅú¤·¤Þ¤¹¡£</p>
-
-    <p>Î㤨¤Ð¡¢¥µ¡¼¥Ð¤¬ 80 È֥ݡ¼¥È¤È 8000 È֥ݡ¼¥È¤ÎξÊý¤Î
-    ¥³¥Í¥¯¥·¥ç¥ó¤ò¼õ¤±Æþ¤ì¤ë¾ì¹ç¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-       Listen 80<br />
-       Listen 8000
-    </code></p></div>
-
-    <p>Æó¤Ä¤ÎÆÃÄê¤Î¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤È¥Ý¡¼¥ÈÈֹ椫¤é¤Î¥³¥Í¥¯¥·¥ç¥ó¤ò
-    ¼õ¤±Æþ¤ì¤ë¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-       Listen 192.170.2.1:80<br />
-       Listen 192.170.2.5:8000
-    </code></p></div>
-
-    <p>IPv6 ¥¢¥É¥ì¥¹¤Ï³Ñ³ç¸Ì¤Ç°Ï¤Þ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-    Î㤨¤Ð¼¡¤ÎÎã¤Î¤è¤¦¤Ë¤Ç¤¹¡£</p>
-
-    <div class="example"><p><code>
-      Listen [2001:db8::a00:20ff:fea7:ccea]:80
-    </code></p></div>
-
-    <p><var>protocol</var> ¥ª¥×¥·¥ç¥ó°ú¿ô¤ÏÄ̾ï¤ÎÀßÄê¤Ç¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£
-       ̵»ØÄê¤Î¾ì¹ç¡¢443 È֥ݡ¼¥È¤Ë¤Ï <code>https</code> ¤¬¡¢Â¾¤Î¥Ý¡¼¥È¤Ë¤Ï
-       <code>http</code> ¤¬¥Ç¥Õ¥©¥ë¥ÈÃͤȤ·¤Æ»ÈÍѤµ¤ì¤Þ¤¹¡£
-       protocol »ØÄê¤Ï¡¢¤É¤Î¥â¥¸¥å¡¼¥ë¤¬¥ê¥¯¥¨¥¹¥È¤ò½èÍý¤¹¤ë¤«¤ò·èÄꤷ¡¢
-       <code class="directive"><a href="../mod/core.html#acceptfilter">AcceptFilter</a></code> 
-       ¤Ë¤è¤ë¥×¥í¥È¥³¥ëÆÃÍ­¤ÎºÇŬ²½¤ò¹Ô¤¦¤è¤¦¤Ë¤·¤Þ¤¹¡£</p>
-
-    <p>Èóɸ½à¤Ê¥Ý¡¼¥È¤Ç±¿ÍѤ·¤Æ¤¤¤ëºÝ¤Ë¤Î¤ß protocol »ØÄ꤬ɬÍפˤʤê¤Þ¤¹¡£
-       ¤¿¤È¤¨¤Ð <code>https</code> ¤Ê¥µ¥¤¥È¤ò 8443 È֥ݡ¼¥È¤Ç±¿ÍѤ·¤Æ¤¤¤ë¾ì¹ç :</p>
-
-    <div class="example"><p><code>
-      Listen 192.170.2.1:8443 https
-    </code></p></div>
-
-    <div class="note"><h3>¥¨¥é¡¼¾ò·ï</h3>
-      Ʊ°ì IP ¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤ÎÁȤˡ¢Ê£¿ô¤Î <code class="directive">Listen</code> 
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ØÄꤷ¤Æ¤·¤Þ¤¦¤È¡¢<code>Address already in use</code> 
-      ¤È¤¤¤¦¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤ò¼õ¤±¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
-    </div>
-
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../dns-caveats.html">DNS ¤ÎÌäÂê</a></li>
-<li><a href="../bind.html">Apache
-¤¬»ÈÍѤ¹¤ë¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤ÎÀßÄê</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ListenBackLog" id="ListenBackLog">ListenBackLog</a> <a name="listenbacklog" id="listenbacklog">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ÊÝα¾õÂ֤Υ³¥Í¥¯¥·¥ç¥ó¤Î¥­¥å¡¼¤ÎºÇÂçĹ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ListenBacklog <var>backlog</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ListenBacklog 511</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-</table>
-    <p>ÊÝα¾õÂ֤Υ³¥Í¥¯¥·¥ç¥ó¤Î¥­¥å¡¼¤ÎºÇÂçŤǤ¹¡£
-    °ìÈÌŪ¤Ë¤ÏÄ´À°¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¤·¡¢Ä´À°¤Ï˾¤Þ¤·¤¯¤¢¤ê¤Þ¤»¤ó¡£
-    ¤·¤«¤·¡¢TCP SYN ¥Õ¥é¥Ã¥É¥¢¥¿¥Ã¥¯¤Î¾õ¶·²¼¤Ë¤ª¤«¤ì¤ë¾ì¹ç¤Ë¡¢
-    Áý¤ä¤·¤¿Êý¤¬Ë¾¤Þ¤·¤¤¥·¥¹¥Æ¥à¤â¤¢¤ê¤Þ¤¹¡£
-    <code>listen(2)</code> ¥·¥¹¥Æ¥à¥³¡¼¥ë¤Î¥Ð¥Ã¥¯¥í¥°¥Ñ¥é¥á¡¼¥¿¤ò
-    ¤´Í÷²¼¤µ¤¤¡£</p>
-
-    <p>¤³¤ÎÃÍ¤Ï OS ¤Ë¤è¤ê¡¢¾®¤µ¤Ê¿ô¤ËÍÞ¤¨¤é¤ì¤Þ¤¹¡£
-    ÃÍ¤Ï OS Ëè¤Ë°Û¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿Â¿¤¯¤Î OS ¤Ç¤Ï¡¢
-    ¥Ð¥Ã¥¯¥í¥°¤È¤·¤Æ»ØÄꤵ¤ì¤Æ¤¤¤ëÃͤÁ¤ç¤¦¤É¤Þ¤Ç»È¤Ã¤Æ¤¤¤ë¤ï¤±¤Ç¤Ï¤Ê¤¯¡¢
-    ÀßÄꤵ¤ì¤Æ¤¤¤ëÃͤ˴ð¤Å¤¤¤Æ (Ä̾ï¤ÏÀßÄêÃͤè¤ê¤âÂ礭¤ÊÃͤò)
-    »È¤Ã¤Æ¤¤¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="LockFile" id="LockFile">LockFile</a> <a name="lockfile" id="lockfile">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¼õÉÕ¤òľÎ󲽤¹¤ë¤¿¤á¤Î¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>LockFile <var>filename</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>LockFile logs/accept.lock</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-</table>
-    <p><code class="directive"><a href="#acceptmutex">AcceptMutex</a></code>
-    ¤¬ <code>fcntl</code> ¤ä <code>flock</code>
-    ¤ËÀßÄꤵ¤ì¤Æ»ÈÍѤµ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¡¢»ÈÍѤµ¤ì¤ë¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤Ø¤Î¥Ñ¥¹¤ò
-    <code class="directive">LockFile</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÀßÄꤷ¤Þ¤¹¡£
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÄ̾ï¤Ï¤½¤Î¤Þ¤Þ¤Ë¤·¤Æ¤ª¤­¤Þ¤¹¡£
-    ¼ç¤Ë <code>logs</code> ¥Ç¥£¥ì¥¯¥È¥ê¤¬ NFS
-    ¤Ç¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ê¤É¤ËÃͤòÊѤ¨¤Þ¤¹¡£
-    ¤Ê¤¼¤Ê¤é<strong>¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤Ï¥í¡¼¥«¥ë¥Ç¥£¥¹¥¯¤Ë
-    Êݸ¤µ¤ì¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤</strong>¤«¤é¤Ç¤¹¡£
-    ¥á¥¤¥ó¥µ¡¼¥Ð¥×¥í¥»¥¹¤Î PID ¤¬¥Õ¥¡¥¤¥ë̾¤Ë¼«Æ°Åª¤ËÉղ䵤ì¤Þ¤¹¡£</p>
-
-    <div class="warning"><h3>¥»¥­¥å¥ê¥Æ¥£</h3>
-      <p><code>/var/tmp</code>
-      ¤È¤¤¤Ã¤¿¡¢Ã¯¤Ç¤â½ñ¤­¹þ¤á¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥Õ¥¡¥¤¥ë¤ò
-      <em>ÃÖ¤«¤Ê¤¤</em>Êý¤¬¤è¤¤¤Ç¤¹¡£¤Ê¤¼¤Ê¤é¡¢¥µ¡¼¥Ð¤¬µ¯Æ°»þ¤ËºîÀ®¤¹¤ë
-      ¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤ÎºîÀ®¼«ÂΤò˸³²¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢
-      ï¤Ç¤â¥µ¡¼¥Ó¥¹µñÈÝ¥¢¥¿¥Ã¥¯¤ò°ú¤­µ¯¤³¤¹¤³¤È¤¬¤Ç¤­¤ë¤«¤é¤Ç¤¹¡£</p>
-    </div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#acceptmutex">AcceptMutex</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="MaxClients" id="MaxClients">MaxClients</a> <a name="maxclients" id="maxclients">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤¹¤ë¤¿¤á¤ËºîÀ®¤µ¤ì¤ë
-»Ò¥×¥í¥»¥¹¤ÎºÇÂç¸Ä¿ô</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>MaxClients <var>number</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>¾ÜºÙ¤Ï»ÈÍÑË¡¤ò¤´Í÷²¼¤µ¤¤¡£</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-</table>
-    <p><code class="directive">MaxClients</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ±þÅú¤¹¤ë¤³¤È¤Î¤Ç¤­¤ëƱ»þ¥ê¥¯¥¨¥¹¥È¿ô¤òÀßÄꤷ¤Þ¤¹¡£
-    <code class="directive">MaxClients</code> À©¸Â¿ô¤ò±Û¤¨¤ë¥³¥Í¥¯¥·¥ç¥ó¤ÏÄ̾
-    <code class="directive"><a href="#listenbacklog">ListenBacklog</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÀßÄꤷ¤¿¿ô¤Þ¤Ç¥­¥å¡¼¤ËÆþ¤ê¤Þ¤¹¡£
-    ¾¤Î¥ê¥¯¥¨¥¹¥È¤ÎºÇ¸å¤Þ¤Ç㤷¤Æ»Ò¥×¥í¥»¥¹¤¬¶õ¤¯¤È¡¢
-    ¼¡¤Î¥³¥Í¥¯¥·¥ç¥ó¤Ë±þÅú¤·¤Þ¤¹¡£</p>
-
-    <p>¥¹¥ì¥Ã¥É¤òÍѤ¤¤Ê¤¤¥µ¡¼¥Ð (<em>¤¹¤Ê¤ï¤Á</em> <code class="module"><a href="../mod/prefork.html">prefork</a></code>)
-    ¤Ç¤Ï¡¢<code class="directive">MaxClients</code>
-    ¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤¹¤ë¤¿¤á¤Ëµ¯Æ°¤µ¤ì¤ë
-    »Ò¥×¥í¥»¥¹¤ÎºÇÂç¿ô¤È¤Ê¤ê¤Þ¤¹¡£
-    ¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï <code>256</code> ¤Ç¡¢¤³¤ì¤òÁý²Ã¤µ¤»¤¿¤¤¾ì¹ç¤Ï¡¢
-    <code class="directive"><a href="#serverlimit">ServerLimit</a></code>
-    ¤ÎÃͤâÁý²Ã¤µ¤»¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>¥¹¥ì¥Ã¥É¤òÍѤ¤¤ë¥µ¡¼¥Ð¤ä¡¢¥Ï¥¤¥Ö¥ê¥Ã¥É¥µ¡¼¥Ð (<em>¤¹¤Ê¤ï¤Á</em>
-    <code class="module"><a href="../mod/beos.html">beos</a></code> <code class="module"><a href="../mod/worker.html">worker</a></code>)
-    ¤Ç¤Ï¡¢<code class="directive">MaxClients</code> 
-    ¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ë±þÅú¤Ç¤­¤ë¥¹¥ì¥Ã¥É¤ÎÁí¿ô¤òÀ©¸Â¤·¤Þ¤¹¡£
-    <code class="module"><a href="../mod/beos.html">beos</a></code> ¤Ç¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï <code>50</code> ¤Ç¤¹¡£
-    ¥Ï¥¤¥Ö¥ê¥Ã¥É MPM ¤Ç¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï <code>16</code>
-    <code class="directive"><a href="#serverlimit">ServerLimit</a></code>
-    ¤Î <code>25</code> ÇÜ (<code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>) ¤Ç¤¹¡£
-    <code class="directive">MaxClients</code>
-    ¤ò 16 ¥×¥í¥»¥¹°Ê¾åɬÍפÊÃͤޤÇÁý²Ã¤µ¤»¤¿¤¤¾ì¹ç¤Ï¡¢
-    <code class="directive"><a href="#serverlimit">ServerLimit</a></code>
-    ¤âÁý²Ã¤µ¤»¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="MaxMemFree" id="MaxMemFree">MaxMemFree</a> <a name="maxmemfree" id="maxmemfree">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td><code>free()</code> ¤¬¸Æ¤Ð¤ì¤Ê¤¤¸Â¤ê¡¢
-¼ç¥á¥â¥ê¥¢¥í¥±¡¼¥¿¤¬ÊÝ»ý¤·Â³¤±¤é¤ì¤ë¥á¥â¥ê¤ÎºÇÂçÎÌ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>MaxMemFree <var>KBytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>MaxMemFree 0</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr>
-</table>
-    <p><code class="directive">MaxMemFree</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    <code>free()</code> ¤¬¸Æ¤Ð¤ì¤Ê¤¤¸Â¤ê¡¢
-    ¼ç¥¢¥í¥±¡¼¥¿¤¬ÊÝ»ý¤Ç¤­¤ë¶õ¤Î¥á¥â¥ê¤ÎºÇÂçÃͤò¥­¥í¥Ð¥¤¥Èñ°Ì¤ÇÀßÄꤷ¤Þ¤¹¡£
-    ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤«¡¢Îí¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¤È¤­¤Ï¡¢ÌµÀ©¸Â¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="MaxRequestsPerChild" id="MaxRequestsPerChild">MaxRequestsPerChild</a> <a name="maxrequestsperchild" id="maxrequestsperchild">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¸Ä¡¹¤Î»Ò¥µ¡¼¥Ð¤¬²ÔƯÃæ¤Ë°·¤¦¥ê¥¯¥¨¥¹¥È¿ô¤Î¾å¸Â</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>MaxRequestsPerChild <var>number</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>MaxRequestsPerChild 10000</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-</table>
-    <p><code class="directive">MaxRequestsPerChild</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    ¸Ä¡¹¤Î»Ò¥µ¡¼¥Ð¥×¥í¥»¥¹¤¬°·¤¦¤³¤È¤Î¤Ç¤­¤ë¥ê¥¯¥¨¥¹¥È¤ÎÀ©¸Â¿ô¤ò
-    ÀßÄꤷ¤Þ¤¹¡£<code class="directive">MaxRequestsPerChild</code>
-    ¸Ä¤Î¥ê¥¯¥¨¥¹¥È¤Î¸å¤Ë¡¢»Ò¥×¥í¥»¥¹¤Ï½ªÎ»¤·¤Þ¤¹¡£
-    <code class="directive">MaxRequestsPerChild</code> ¤¬ <code>0</code>
-    ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¥×¥í¥»¥¹¤Ï´ü¸ÂÀÚ¤ì¤Ë¤è¤ê½ªÎ»¤¹¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£</p>
-
-    <div class="note"><h3>¤½¤Î¾¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ</h3>
-      <p><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> ¤È <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>
-      ¤Ç¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï <code>0</code> ¤Ç¤¹¡£</p>
-    </div>
-
-    <p><code class="directive">MaxRequestsPerChild</code>
-    ¤òÈó¥¼¥í¤ËÀ©¸Â¤¹¤ë¤³¤È¤Ë¤Ï¡¢Æó¤Ä¤ÎÍøÅÀ¤¬¤¢¤ê¤Þ¤¹:</p>
-
-    <ul>
-      <li>(¶öȯŪ¤Ê) ¥á¥â¥ê¡¼¥ê¡¼¥¯¤¬µ¯¤³¤Ã¤¿¾ì¹ç¤Ë
-      ¥×¥í¥»¥¹¤¬¾ÃÈñ¤¹¤ë¥á¥â¥ê¤ÎÁíÎ̤òÀ©¸Â¤Ç¤­¤ë</li>
-
-      <li>¥×¥í¥»¥¹¤ËÍ­¸Â¤Î¥é¥¤¥Õ¥¿¥¤¥à¤òÀßÄꤹ¤ë¤³¤È¤Ç¡¢
-      ¥µ¡¼¥ÐÉé²Ù¤¬²¼¤¬¤Ã¤¿»þ¤Ë¥×¥í¥»¥¹¿ô¤ò¾¯¤Ê¤¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤ë</li>
-    </ul>
-
-    <div class="note"><h3>Ãí</h3>
-      <p><code class="directive"><a href="../mod/core.html#keepalive">KeepAlive</a></code> ¥ê¥¯¥¨¥¹¥È¤Î¾ì¹ç¤Ï¡¢
-      °ì¤ÄÌܤΥꥯ¥¨¥¹¥È¤À¤±¤¬¤³¤ÎÀ©¸Â¤Ë³ºÅö¤·¤Þ¤¹¡£
-      ¼Â¸úŪ¤Ë¤Ï¡¢°ì¤Ä¤Î»Ò¥×¥í¥»¥¹¤¢¤¿¤ê¤Î<em>¥³¥Í¥¯¥·¥ç¥ó</em>¿ô¤ò
-      À©¸Â¤¹¤ë¤è¤¦¤ËµóÆ°¤¬ÊѲ½¤·¤Þ¤¹¡£</p>
-    </div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="MaxSpareThreads" id="MaxSpareThreads">MaxSpareThreads</a> <a name="maxsparethreads" id="maxsparethreads">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¢¥¤¥É¥ë¥¹¥ì¥Ã¥É¤ÎºÇÂç¿ô</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>MaxSpareThreads <var>number</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>¾ÜºÙ¤Ï»ÈÍÑË¡¤ò¤´Í÷²¼¤µ¤¤¡£</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-</table>
-    <p>¥¢¥¤¥É¥ë¤Ê¥¹¥ì¥Ã¥É¤ÎºÇÂç¿ô¤Ç¤¹¡£°Û¤Ê¤ë MPM ¤Ç¤Ï¤½¤ì¤¾¤ì¡¢
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï°Û¤Ê¤ë¼è¤ê°·¤ï¤ìÊý¤ò¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p><code class="module"><a href="../mod/worker.html">worker</a></code> ¤Ç¤Ï¡¢
-    ¥Ç¥Õ¥©¥ë¥È¤Ï <code>MaxSpareThreads 250</code> ¤Ç¤¹¡£
-    ¤³¤Î MPM ¤Ï¥¢¥¤¥É¥ë¥¹¥ì¥Ã¥É¿ô¤ò¥µ¡¼¥ÐÁ´ÂΤǴƻ뤷¤Þ¤¹¡£
-    ¥µ¡¼¥Ð¤Ç¥¢¥¤¥É¥ë¥¹¥ì¥Ã¥É¿ô¤¬Â¿¤¹¤®¤ë¾ì¹ç¤Ï¡¢
-    ¤³¤Î¿ô»ú¤è¤ê¤â¾¯¤Ê¤¤¿ô¤Ë¤Ê¤ë¤Þ¤Ç»Ò¥×¥í¥»¥¹¤ò½ªÎ»¤·¤Þ¤¹¡£</p>
-
-    <p><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> ¤Ç¤Ï¡¢
-    ¥Ç¥Õ¥©¥ë¥È¤Ï <code>MaxSpareThreads 100</code> ¤Ç¤¹¡£
-    ¤³¤Î MPM ¤Ï¥·¥ó¥°¥ë¥×¥í¥»¥¹¤Ç¼Â¹Ô¤µ¤ì¤Þ¤¹¤Î¤Ç¡¢
-    ¥¹¥Ú¥¢¥¹¥ì¥Ã¥É¿ô¤â¥µ¡¼¥ÐÁ´ÂΤǴªÄꤷ¤Þ¤¹¡£</p>
-
-    <p><code class="module"><a href="../mod/beos.html">beos</a></code> ¤È <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> ¤Ï
-    <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> ¤È»÷¤¿µóÆ°¤ò¤·¤Þ¤¹¡£
-    <code class="module"><a href="../mod/beos.html">beos</a></code> ¤Ç¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï <code>MaxSpareThreads 50</code>
-    ¤Ç¤¹¡£<code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> ¤Ç¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï <code>10</code>
-    ¤Ç¤¹¡£</p>
-
-    <div class="note"><h3>À©¸Â»ö¹à</h3>
-      <p><code class="directive">MaxSpareThreads</code> ¤Î¼è¤ëÃͤˤÏÀ©¸Â¤¬¤¢¤ê¤Þ¤¹¡£
-      Apache ¤Ï¼¡¤Îµ¬Â§¤Ë½¾¤Ã¤Æ¼«Æ°Åª¤ËÊäÀµ¤·¤Þ¤¹¡£</p>
-      <ul>
-
-        <li><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> ¤Ï
-        <code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code>
-        ¤è¤ê¤âÂ礭¤¤É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</li>
-
-        <li>
-        <code class="module"><a href="../mod/worker.html">worker</a></code> ¤Ç¤Ï¡¢
-        <code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code> ¤È
-        <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
-        ¤Ç·è¤Þ¤ëÁíϤÈÅù¤·¤¤¤«Â礭¤¤É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</li>
-      </ul>
-    </div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code></li>
-<li><code class="directive"><a href="#startservers">StartServers</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="MinSpareThreads" id="MinSpareThreads">MinSpareThreads</a> <a name="minsparethreads" id="minsparethreads">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤¹¤ë¤³¤È¤Î¤Ç¤­¤ë
-¥¢¥¤¥É¥ë¥¹¥ì¥Ã¥É¿ô¤ÎºÇ¾®¿ô</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>MinSpareThreads <var>number</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>¾ÜºÙ¤Ï»ÈÍÑÊýË¡¤ò¤´Í÷²¼¤µ¤¤¡£</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-</table>
-    <p>¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤¹¤ë¥¹¥ì¥Ã¥É¿ô¤ÎºÇ¾®ÃͤǤ¹¡£
-    °Û¤Ê¤ë MPM ¤Ç¤Ï¤½¤ì¤¾¤ì¡¢
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï°Û¤Ê¤ë¼è¤ê°·¤ï¤ìÊý¤ò¤·¤Þ¤¹¡£</p>
-
-    <p><code class="module"><a href="../mod/worker.html">worker</a></code> ¤Ç¤Ï¡¢
-    ¥Ç¥Õ¥©¥ë¥È¤Ï <code>MinSpareThreads 75</code> ¤Ç¡¢
-    ¥¢¥¤¥É¥ë¥¹¥ì¥Ã¥É¿ô¤ò¥µ¡¼¥ÐÁ´ÂΤǴƻ뤷¤Þ¤¹¡£
-    ¤â¤·¥µ¡¼¥Ð¤Ë½½Ê¬¤Ê¿ô¤Î¥¢¥¤¥É¥ë¥¹¥ì¥Ã¥É¤¬¤Ê¤±¤ì¤Ð¡¢
-    ¥¢¥¤¥É¥ë¥¹¥ì¥Ã¥É¿ô¤¬¤³¤Î¿ô¤è¤ê¤âÂ礭¤¯¤Ê¤ë¤Þ¤Ç
-    ¿·¤·¤¤»Ò¥×¥í¥»¥¹¤¬À¸À®¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> ¤Ç¤Ï¡¢
-    ¥Ç¥Õ¥©¥ë¥È¤Ï <code>MinSpareThreads 10</code> ¤Ç¡¢
-    ¥·¥ó¥°¥ë¥×¥í¥»¥¹ MPM ¤Ç¤¹¤Î¤Ç¡¢¥µ¡¼¥ÐÁ´ÂΤǴÉÍý¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p><code class="module"><a href="../mod/beos.html">beos</a></code> ¤È <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> ¤Ï¡¢
-    <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>¤Ë¤è¤¯»÷¤Æ¤¤¤Þ¤¹¡£
-    <code class="module"><a href="../mod/beos.html">beos</a></code> ¤Ç¤Î¥Ç¥Õ¥©¥ë¥È¤Ï <code>MinSpareThreads 1</code>
-    ¤Ç¤¹¡£<code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> ¤Ç¤Î¥Ç¥Õ¥©¥ë¥È¤Ï
-    <code>5</code> ¤Ç¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#maxsparethreads">MaxSpareThreads</a></code></li>
-<li><code class="directive"><a href="#startservers">StartServers</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="PidFile" id="PidFile">PidFile</a> <a name="pidfile" id="pidfile">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Ç¡¼¥â¥ó¤Î¥×¥í¥»¥¹ ID
-¤ò¥µ¡¼¥Ð¤¬µ­Ï¿¤¹¤ë¤¿¤á¤Î¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>PidFile <var>filename</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>PidFile logs/httpd.pid</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-</table>
-    <p><code class="directive">PidFile</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¡¢
-    ¥Ç¡¼¥â¥ó¤Î¥×¥í¥»¥¹ ID ¤ò¥µ¡¼¥Ð¤¬µ­Ï¿¤¹¤ë¥Õ¥¡¥¤¥ë¤òÀßÄꤷ¤Þ¤¹¡£
-    ¥Õ¥¡¥¤¥ë̾¤¬ÀäÂХѥ¹¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢
-    <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
-    ¤«¤é¤ÎÁêÂÐŪ¤Ê¤â¤Î¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-    PidFile /var/run/apache.pid
-    </code></p></div>
-
-    <p>¥µ¡¼¥Ð¤¬ <code class="directive"><a href="../mod/core.html#errorlog">ErrorLog</a></code>
-    ¤ä <code class="directive"><a href="../mod/mod_log_config.html#transferlog">TransferLog</a></code>
-    ¤òÊĤ¸¤Æ³«¤­Ä¾¤·¤¿¤ê¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤ò
-    ºÆÆɹþ¤·¤¿¤ê¤µ¤»¤ë¤¿¤á¤Ë¡¢¥µ¡¼¥Ð¤Ë¥·¥°¥Ê¥ë¤òÁ÷¤ë¤³¤È¤¬¤Ç¤­¤ë¤È
-    ÊØÍø¤Ê¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤ì¤Ï SIGHUP (kill -1) ¥·¥°¥Ê¥ë¤ò <code class="directive">PidFile</code>
-    ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¥×¥í¥»¥¹ ID ¤ËÁ÷¤ë¤³¤È¤Ç¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p><code class="directive">PidFile</code> ¤Ë¤Ï¡¢¥í¥°¥Õ¥¡¥¤¥ë¤ÎÀßÃÖ°ÌÃÖ¤ä
-    <a href="../misc/security_tips.html#serverroot">¥»¥­¥å¥ê¥Æ¥£</a>
-    ¤ÈÁ´¤¯Æ±¤¸Ãí°ÕÅÀ¤¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>Ãí°Õ</h3>
-      <p>Apache 2 ¤Ç¤Ï¡¢
-      <code class="program"><a href="../programs/apachectl.html">apachectl</a></code>
-      ¥¹¥¯¥ê¥×¥È¤Î¤ß¤ò»ÈÍѤ·¤Æ¥µ¡¼¥Ð¤Î (ºÆ) µ¯Æ°¤äÄä»ß¤ò
-      ¹Ô¤Ê¤¦¤³¤È¤ò¿ä¾©¤·¤Æ¤¤¤Þ¤¹¡£</p>
-    </div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ReceiveBufferSize" id="ReceiveBufferSize">ReceiveBufferSize</a> <a name="receivebuffersize" id="receivebuffersize">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>TCP ¼õ¿®¥Ð¥Ã¥Õ¥¡¥µ¥¤¥º</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ReceiveBufferSize <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ReceiveBufferSize 0</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-</table>
-    <p>¥µ¡¼¥Ð¤Ï TCP ¼õ¿®¥Ð¥Ã¥Õ¥¡¥µ¥¤¥º¤ò»ØÄꤵ¤ì¤¿¥Ð¥¤¥È¿ô¤ËÀßÄꤷ¤Þ¤¹¡£</p>
-
-    <p><code>0</code>¤Ë¤·¤¿¾ì¹ç¡¢OS ¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤ¬»ÈÍѤµ¤ì¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ScoreBoardFile" id="ScoreBoardFile">ScoreBoardFile</a> <a name="scoreboardfile" id="scoreboardfile">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>»Ò¥×¥í¥»¥¹¤ÈÏ¢·È¤¹¤ë¤¿¤á¤Î¥Ç¡¼¥¿¤òÊݸ¤¹¤ë
-¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ScoreBoardFile <var>file-path</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>ScoreBoardFile logs/apache_status</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-</table>
-    <p>Apache ¤Ï¿Æ¥×¥í¥»¥¹¤È»Ò¥×¥í¥»¥¹´Ö¤ÎÄÌ¿®¤Ë¥¹¥³¥¢¥Ü¡¼¥É¤òÍѤ¤¤Þ¤¹¡£
-    ¤³¤ÎÄÌ¿®µ¡Ç½¤Ë¥Õ¥¡¥¤¥ë¤òɬÍפȤ¹¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤â¤¢¤ê¤Þ¤¹¡£
-    ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢Apache ¤Ï¤Þ¤º¥á¥â¥ê¾å
-    (ƿ̾¶¦Í­¥á¥â¥ê) ¤Ë¥¹¥³¥¢¥Ü¡¼¥É¤òºî¤í¤¦¤È¤·¡¢¤½¤ì¤¬¼ºÇÔ¤¹¤ë¤È
-    ¥Ç¥£¥¹¥¯¾å¤Ë¥Õ¥¡¥¤¥ë (¥Õ¥¡¥¤¥ë¥Ù¡¼¥¹¤Î¶¦Í­¥á¥â¥ê) ¤òºî¤í¤¦¤È¤·¤Þ¤¹¡£
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ØÄꤹ¤ë¤È¡¢Apache
-    ¤Ïɬ¤º¥Ç¥£¥¹¥¯¤Ë¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>Îã</h3><p><code>
-      ScoreBoardFile /var/run/apache_status
-    </code></p></div>
-
-    <p>¥Õ¥¡¥¤¥ë¥Ù¡¼¥¹¤Î¶¦Í­¥á¥â¥ê¤Ï¡¢¥µ¡¼¥É¥Ñ¡¼¥Æ¥£¡¼À½¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç
-    ¥¹¥³¥¢¥Ü¡¼¥É¤ËľÀÜ¥¢¥¯¥»¥¹¤¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤ËÌò¤ËΩ¤Á¤Þ¤¹¡£</p>
-
-    <p><code class="directive">ScoreBoardFile</code> ¤ò»È¤¦¾ì¹ç¡¢
-    RAM ¥Ç¥£¥¹¥¯¾å¤ËÃÖ¤¯¤È¥¹¥Ô¡¼¥É¤¬¸þ¾å¤¹¤ë¤Ç¤·¤ç¤¦¡£
-    ¤·¤«¤·¡¢¥í¥°¥Õ¥¡¥¤¥ë¤ÎÀßÃÖ°ÌÃÖ¤ä
-    <a href="../misc/security_tips.html">¥»¥­¥å¥ê¥Æ¥£</a>
-    ¤ÈƱÍͤÎÃí°ÕÅÀ¤¬¤¢¤ë¤Î¤Ç¡¢Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../stopping.html">Apache ¤ÎÄä»ß¤ÈºÆµ¯Æ°</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="SendBufferSize" id="SendBufferSize">SendBufferSize</a> <a name="sendbuffersize" id="sendbuffersize">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>TCP ¥Ð¥Ã¥Õ¥¡¥µ¥¤¥º</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>SendBufferSize <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>SendBufferSize 0</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-</table>
-    <p>¥µ¡¼¥Ð¤Ï TCP Á÷¿®¥Ð¥Ã¥Õ¥¡¥µ¥¤¥º¤ò»ØÄꤵ¤ì¤¿¥Ð¥¤¥È¿ô¤ËÀßÄꤷ¤Þ¤¹¡£
-    ¹â®¤Ç¹â¥ì¥¤¥Æ¥ó¥·¤Ê´Ä¶­¤Ç
-    (<em>Îã</em> 100ms ÄøÅÙ¡¢ÂçΦ²£Ãǹâ®ÄÌ¿®Ï©¤Ê¤É)
-    ¸Å¤¤°ìÈÌŪ¤Ê OS ¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤòÁý¤ä¤¹¤Î¤ËÈó¾ï¤ËÊØÍø¤Ç¤¹¡£</p>
-
-    <p><code>0</code>¤Ë¤·¤¿¾ì¹ç¡¢OS ¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤ¬»ÈÍѤµ¤ì¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ServerLimit" id="ServerLimit">ServerLimit</a> <a name="serverlimit" id="serverlimit">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ÀßÄê²Äǽ¤Ê¥µ¡¼¥Ð¥×¥í¥»¥¹¿ô¤Î¾å¸Â</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ServerLimit <var>number</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>¾ÜºÙ¤Ï»ÈÍÑË¡¤ò»²¾È</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-</table>
-    <p><code class="module"><a href="../mod/prefork.html">prefork</a></code> MPM ¤Î¾ì¹ç¤Ï¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    Apache ¥×¥í¥»¥¹²ÔƯÃæ¤Ë¤ª¤±¤ë
-    <code class="directive"><a href="#maxclients">MaxClients</a></code>
-    ¤ËÀßÄê²Äǽ¤Ê¾å¸ÂÃͤòÀßÄꤹ¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹
-    (ÌõÃí: prefork ¤Î¾ì¹ç¤ÏƱ»þ¥¯¥é¥¤¥¢¥ó¥È¿ô = ¥µ¡¼¥Ð¥×¥í¥»¥¹¿ô¤Ê¤Î¤Ç) ¡£
-    <code class="module"><a href="../mod/worker.html">worker</a></code> MPM ¤Î¾ì¹ç¤Ë¤Ï¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    <code class="directive"><a href="#threadlimit">ThreadLimit</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÈÁȤ߹ç¤ï¤»¤Æ¡¢
-    Apache ¥×¥í¥»¥¹²ÔƯÃæ¤Ë¤ª¤±¤ë
-    <code class="directive"><a href="#maxclients">MaxClients</a></code>
-    ¤ËÀßÄê²Äǽ¤Ê¾å¸ÂÃͤòÀßÄꤹ¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ºÆµ¯Æ°Ãæ¤Ë¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÊѹ¹¤·¤Æ¤â̵»ë¤µ¤ì¤Þ¤¹¤¬¡¢
-    <code class="directive"><a href="#maxclients">MaxClients</a></code>
-    ¤ÏºÆµ¯Æ°Ãæ¤Ë½¤Àµ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ¹¤ëºÝ¤ÏÆäËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    <code class="directive">ServerLimit</code> ¤¬É¬Íװʾå¤ËÂ礭¤ÊÃͤË
-    ÀßÄꤵ¤ì¤¿¾ì¹ç¤Ï¡¢Í¾·×¤Ê̤»ÈÍѶ¦Í­¥á¥â¥ê¤¬³ä¤êÅö¤Æ¤é¤ì¤Þ¤¹¡£
-    <code class="directive">ServerLimit</code> ¤È
-    <code class="directive"><a href="#maxclients">MaxClients</a></code>
-    ¤¬¥·¥¹¥Æ¥à¤Î°·¤¨¤ëÈϰϤò±Û¤¨¤¿ÀßÄêÃͤˤʤäƤ¤¤ë¤È¡¢
-    Apache ¤Ïµ¯Æ°¤·¤Ê¤¤¤«¡¢µ¯Æ°¤·¤Æ¤âÉÔ°ÂÄê¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£</p>
-
-    <p><code class="module"><a href="../mod/prefork.html">prefork</a></code> MPM ¤Ç¤Ï¡¢
-    <code class="directive"><a href="#maxclients">MaxClients</a></code>
-    ¤ò 256 (¥Ç¥Õ¥©¥ë¥È) ¤è¤ê¤âÂ礭¤ÊÃͤËÀßÄꤹ¤ëɬÍפ¬¤¢¤ë»þ¤Ë¤À¤±»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
-    ´õ˾¤Î <code class="directive"><a href="#maxclients">MaxClients</a></code>
-    ¿ô¤È¤¯¤é¤Ù¤Æ¡¢É¬Íװʾå¤ËÂ礭¤ÊÃͤò»ØÄꤹ¤ë¤³¤È¤ÏÈò¤±¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p><code class="module"><a href="../mod/worker.html">worker</a></code> MPM ¤Ç¤Ï¡¢
-    <code class="directive"><a href="#maxclients">MaxClients</a></code> ¤È
-    <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
-    ¤ÎÀßÄê¤Ç 16 ¥µ¡¼¥Ð¥×¥í¥»¥¹ (¥Ç¥Õ¥©¥ë¥È) 
-    °Ê¾åɬÍפˤʤë¾ì¹ç¤Ë¤Î¤ß»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£´õ˾¤Î
-    <code class="directive"><a href="#maxclients ">MaxClients </a></code> ¤È
-    <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
-    ¤È¤¯¤é¤Ù¤Æ¡¢É¬ÍפȤʤ륵¡¼¥Ð¥×¥í¥»¥¹¿ô°Ê¾å¤ËÂ礭¤ÊÃͤò
-    ÀßÄꤹ¤ë¤³¤È¤ÏÈò¤±¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <div class="note"><h3>Ãí°Õ</h3>
-      <p><code>ServerLimit 20000</code> ¤È¤¤¤¦À©¸ÂÉÕ¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹
-      (<code class="module"><a href="../mod/prefork.html">prefork</a></code> MPM ¤Ç¤Ï <code>200000</code>) ¡£
-      ¤³¤ì¤Ï¥¹¥Ú¥ë¥ß¥¹¤Ë¤è¤Ã¤Æ¸í¤Ã¤Æ¹ó¤¤¾õ¶·¤Ë¤Ê¤ë¤Î¤ò¡¢
-      ²óÈò¤¹¤ë¤¿¤á¤Î½èÃ֤Ǥ¹¡£</p>
-    </div>
-
-<h3>»²¾È</h3>
-<ul>
-<li><a href="../stopping.html">Apache ¤ÎÄä»ß¤ÈºÆµ¯Æ°</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="StartServers" id="StartServers">StartServers</a> <a name="startservers" id="startservers">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>µ¯Æ°»þ¤ËÀ¸À®¤µ¤ì¤ë»Ò¥µ¡¼¥Ð¥×¥í¥»¥¹¤Î¿ô</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>StartServers <var>number</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>¾ÜºÙ¤Ï»ÈÍÑÊýË¡¤ò»²¾È</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-</table>
-    <p><code class="directive">StartServers</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    µ¯Æ°»þ¤ËÀ¸À®¤µ¤ì¤ë»Ò¥µ¡¼¥Ð¥×¥í¥»¥¹¤Î¿ô¤òÀßÄꤷ¤Þ¤¹¡£
-    ¥×¥í¥»¥¹¿ô¤ÏÉé²Ù¤Ë±þ¤¸¤ÆưŪ¤ËÀ©¸æ¤µ¤ì¤Þ¤¹¤Î¤Ç¡¢
-    Ä̾ï¤Ï¤³¤ÎÃͤòÄ´À°¤¹¤ëÍýͳ¤Ï¤¢¤Þ¤ê¤Ê¤¤¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï MPM ¤´¤È¤Ë°Û¤Ê¤ê¤Þ¤¹¡£
-    <code class="module"><a href="../mod/worker.html">worker</a></code> ¤Ï <code>StartServers 3</code> ¤Ç¤¹¡£
-    <code class="module"><a href="../mod/prefork.html">prefork</a></code> ¤Ï <code>5</code> ¤Ç¡¢
-    <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> ¤Ï <code>2</code> ¤Ç¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="StartThreads" id="StartThreads">StartThreads</a> <a name="startthreads" id="startthreads">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>µ¯Æ°»þ¤ËÀ¸À®¤µ¤ì¤ë¥¹¥ì¥Ã¥É¤Î¿ô</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>StartThreads <var>number</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>¾ÜºÙ¤Ï»ÈÍÑÊýË¡¤ò»²¾È</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code></td></tr>
-</table>
-    <p>µ¯Æ°»þ¤ËÀ¸À®¤µ¤ì¤ë¥¹¥ì¥Ã¥É¤Î¿ô¤Ç¤¹¡£
-    ¥¹¥ì¥Ã¥É¿ô¤ÏÉé²Ù¤Ë±þ¤¸¤ÆưŪ¤ËÀ©¸æ¤µ¤ì¤Þ¤¹¤Î¤Ç¡¢
-    Ä̾ï¤Ï¤³¤ÎÃͤòÄ´À°¤¹¤ëÍýͳ¤Ï¤¢¤Þ¤ê¤Ê¤¤¤Ç¤·¤ç¤¦¡£</p>
-
-    <p><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> ¤Ç¤Î¥Ç¥Õ¥©¥ë¥È¤Ï
-    <code>StartThreads 50</code> ¤Ç¡¢
-    ¤³¤Î¾ì¹ç¥×¥í¥»¥¹¤Ï°ì¤Ä¤·¤«¤Ê¤¤¤Î¤Ç¡¢
-    µ¯Æ°»þ¤Ë¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤¹¤ë¥¹¥ì¥Ã¥É¤ÎÁí¿ô¤È¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p><code class="module"><a href="../mod/beos.html">beos</a></code> ¤Ç¤Î¥Ç¥Õ¥©¥ë¥È¤Ï <code>StartThreads
-    10</code> ¤Ç¤¹¡£
-    ¤Þ¤¿¡¢µ¯Æ°»þ¤ËÀ¸À®¤µ¤ì¤ë¥¹¥ì¥Ã¥É¤ÎÁí¿ô¤Ë¤âÈ¿±Ç¤µ¤ì¤Þ¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ThreadLimit" id="ThreadLimit">ThreadLimit</a> <a name="threadlimit" id="threadlimit">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>ÀßÄê²Äǽ¤Ê»Ò¥×¥í¥»¥¹Ëè¤Î¥¹¥ì¥Ã¥É¿ô¤Î¾å¸Â¤ò
-ÀßÄꤷ¤Þ¤¹</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ThreadLimit <var>number</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>¾ÜºÙ¤Ï»ÈÍÑÊýË¡¤ò»²¾È</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0.41 ¤È¤½¤ì°Ê¹ß¤Î <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code> 
-¤ÇÍøÍѲÄǽ</td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    Apache ¥×¥í¥»¥¹²ÔƯÃæ¤Ë¤ª¤±¤ë
-    <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
-    ¤ËÀßÄê²Äǽ¤Ê¾å¸ÂÃͤòÀßÄꤷ¤Þ¤¹¡£ºÆµ¯Æ°»þ¤Ë¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÃͤò
-    Êѹ¹¤·¤Æ¤â̵»ë¤µ¤ì¤Þ¤¹¤¬¡¢
-    <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
-    ¤ÏºÆµ¯Æ°Ãæ¤Ë¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤵ¤ì¤¿¾å¸ÂÃͤޤÇ
-    Êѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ¹¤ëºÝ¤ÏÆäËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    <code class="directive">ThreadLimit</code> ¤¬
-    <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
-    ¤è¤ê¤â¤º¤Ã¤ÈÂ礭¤ÊÃͤËÀßÄꤵ¤ì¤¿¾ì¹ç¤Ï¡¢
-    ;·×¤Ê̤»ÈÍѶ¦Í­¥á¥â¥ê¤¬³ä¤êÅö¤Æ¤é¤ì¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
-    <code class="directive">ThreadLimit</code> ¤¬
-    <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
-    ¤ÎξÊý¤¬¥·¥¹¥Æ¥à¤Î°·¤¨¤ëÈϰϤòĶ¤¨¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-    Apache ¤Ïµ¯Æ°¤·¤Ê¤¤¤«¡¢µ¯Æ°¤·¤¿¤È¤·¤Æ¤âÉÔ°ÂÄê¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÃͤϺ£»ÈÍѤ·¤Æ¤¤¤ë Apache ¤Î <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code> ¤ÎͽÁÛ¾å¸ÂÃͤò
-    Ķ¤¨¤¿ÃͤˤÏÀßÄꤷ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£
-    </p>
-
-    <p><code class="directive">ThreadLimit</code> ¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤÏ
-    <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code> ¤Î¤È¤­¤Ï <code>1920</code> ¤Ç¡¢
-    ¾¤Î¾ì¹ç¤Ï <code>64</code> ¤Ç¤¹¡£</p>
-
-    <div class="note"><h3>Ãí°Õ</h3>
-      <p><code>ThreadLimit 20000</code> (<code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>
-      ¤Î¾ì¹ç¤Ï <code>ThreadLimit 15000</code> )
-      ¤È¤¤¤¦À©¸ÂÉÕ¤­¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-      ¤³¤ì¤Ï¥¹¥Ú¥ë¥ß¥¹¤Ë¤è¤Ã¤Æ¸í¤Ã¤Æ¹ó¤¤¾õ¶·¤Ë¤Ê¤ë¤Î¤ò¡¢
-      ²óÈò¤¹¤ë¤¿¤á¤Î½èÃ֤Ǥ¹¡£</p>
-    </div>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ThreadsPerChild" id="ThreadsPerChild">ThreadsPerChild</a> <a name="threadsperchild" id="threadsperchild">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>»Ò¥×¥í¥»¥¹¤½¤ì¤¾¤ì¤ËÀ¸À®¤µ¤ì¤ë¥¹¥ì¥Ã¥É¿ô</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ThreadsPerChild <var>number</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>¾ÜºÙ¤Ï»ÈÍÑÊýË¡¤ò»²¾È</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-</table>
-    <p>¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¤½¤ì¤¾¤ì¤Î»Ò¥×¥í¥»¥¹¤ÇÀ¸À®¤µ¤ì¤ë
-    ¥¹¥ì¥Ã¥É¿ô¤òÀßÄꤷ¤Þ¤¹¡£
-    »Ò¥×¥í¥»¥¹¤Ï³«»Ï»þ¤Ë¤³¤ì¤é¤Î¥¹¥ì¥Ã¥É¤òÀ¸À®¤·¤Æ¡¢
-    ¤½¤Î¸å¤ÏÀ¸À®¤·¤Þ¤»¤ó¡£<code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code> ¤Î¤è¤¦¤Ê¡¢
-    »Ò¥×¥í¥»¥¹¤¬°ì¤Ä¤·¤«¤Ê¤¤¤è¤¦¤Ê MPM ¤òÍøÍѤ·¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
-    ¤³¤ÎÃͤϥµ¡¼¥Ð¤ÎÉé²ÙÁ´ÂΤò½½Ê¬¼è¤ê°·¤¨¤ëÄøÅ٤ˡ¢
-    Â礭¤¯¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£<code class="module"><a href="../mod/worker.html">worker</a></code> ¤Î¤è¤¦¤Ê¡¢
-    »Ò¥×¥í¥»¥¹¤¬Ê£¿ô¤¢¤ë¤è¤¦¤Ê MPM ¤òÍøÍѤ·¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
-    ¥µ¡¼¥Ð¤ÎÄ̾ïÉé²Ù¤ò½½Ê¬°·¤¨¤ëÄøÅ٤ˡ¢
-    <em>¥¹¥ì¥Ã¥ÉÁí¿ô</em>¤¬Â¿¤¯¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-
-    <p><code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>¤Ç¤Î <code class="directive">ThreadsPerChild</code>
-    ¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï <code>64</code> ¤Ç¡¢Â¾¤Î¾ì¹ç¤Ï
-    <code>25</code> ¤Ç¤¹¡£</p>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="ThreadStackSize" id="ThreadStackSize">ThreadStackSize</a> <a name="threadstacksize" id="threadstacksize">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¯¥é¥¤¥¢¥ó¥È¤Î¥³¥Í¥¯¥·¥ç¥ó¤ò¼õ¤±»ý¤Ä¥¹¥ì¥Ã¥É¤¬»ÈÍѤ¹¤ë
-¥¹¥¿¥Ã¥¯¤Î¥Ð¥¤¥È¿ô</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>ThreadStackSize <var>size</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>NetWare ¤Ç¤Ï 65536¡£Â¾¤Î OS ¤Ç¤Ï°ã¤Ã¤¿ÃÍ</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.1 °Ê¹ß</td></tr>
-</table>
-    <p>¥¯¥é¥¤¥¢¥ó¥È¥³¥Í¥¯¥·¥ç¥ó¤ò¼õ¤±»ý¤Á¡¢¥³¥Í¥¯¥·¥ç¥ó½èÍý¤ËɬÍפʥ⥸¥å¡¼¥ë¤Î
-    ¸Æ¤Ó½Ð¤·¤ò¹Ô¤Ê¤Ã¤Æ¤¤¤ë¥¹¥ì¥Ã¥É¤Î¡¢(¼«Æ°ÊÑ¿ôÍѤÎ) ¥¹¥¿¥Ã¥¯¥µ¥¤¥º¤Ï
-    <code class="directive">ThreadStackSize</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤷ¤Þ¤¹¡£
-    ÂçÄñ¤Î¾ì¹ç OS ¤Î»ØÄꤷ¤Æ¤¤¤ë¥¹¥¿¥Ã¥¯¥µ¥¤¥º¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤÏ
-    ŬÀڤʤâ¤Î¤Ç¤¹¤¬¡¢Ä´À°¤¬É¬Íפˤʤë¾ì¹ç¤â¤¢¤ê¤Þ¤¹:</p>
-
-    <ul>
-      <li>¥¹¥ì¥Ã¥É¥¹¥¿¥Ã¥¯¥µ¥¤¥º¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤ¬Èæ³ÓŪ¾®¤µ¤¯ÀßÄꤵ¤ì¤Æ¤¤¤ë
-      ¥×¥é¥Ã¥È¥Û¡¼¥à (Î㤨¤Ð HP-UX) ¤Ç¤Ï¡¢¼«Æ°ÊÑ¿ôÍѤÎÎΰè¤ÇÂ礭¤ÊÍÆÎ̤ò
-      »ÈÍѤ¹¤ë¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥â¥¸¥å¡¼¥ë¤Î¤¿¤á¤Ë Apache ¤¬¥¯¥é¥Ã¥·¥å¤¹¤ë
-      ¾ì¹ç¤â¤¢¤ê¤Þ¤¹¡£¤½¤Î¥â¥¸¥å¡¼¥ë¤Ï¾¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤Ç¤Ï
-      ¥¹¥¿¥Ã¥¯¥µ¥¤¥º¤¬Â礭¤¤¤¿¤á¤Ë¡¢²÷Ä´¤ËÆ°ºî¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-      ¤³¤Î¥¿¥¤¥×¤Î¥¯¥é¥Ã¥·¥å¤Ï¡¢<code class="directive">ThreadStackSize</code>
-      ¤Ç OS ¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤè¤êÂ礭¤ÊÃͤò»ØÄꤹ¤ë¤³¤È¤Ç²ò·è¤·¤Þ¤¹¡£
-      ¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥â¥¸¥å¡¼¥ë¤Ç¤³¤Î½èÃÖ¤¬É¬ÍפǤ¢¤ë¤Èµ­ºÜ¤µ¤ì¤Æ¤¤¤ë
-      ¾ì¹ç¤«¡¢Apache ¤Î½ÐÎϤ¹¤ë¥á¥Ã¥»¡¼¥¸¤Ç¥¹¥ì¥Ã¥É¥¹¥¿¥Ã¥¯¥µ¥¤¥º¤¬
-      ¾®¤µ¤¹¤®¤ë¤È»ØŦ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¤Î¤ß¡¢¤³¤ÎÄ´À°¤ò¤·¤Æ¤¯¤À¤µ¤¤¡£</li>
-
-      <li>¥Ç¥Õ¥©¥ë¥È¥¹¥ì¥Ã¥É¥¹¥¿¥Ã¥¯¥µ¥¤¥º¤¬¡¢Web ¥µ¡¼¥ÐÍÑÅÓ¤ËɬÍפÊÎ̤è¤ê¤â
-      ÌÀ¤é¤«¤ËÂ礭¤¹¤®¤ë¾ì¹ç¡¢<code class="directive">ThreadStackSize</code> 
-      ¤ò OS ¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤè¤ê¤â¾®¤µ¤ÊÃͤˤ¹¤ë¤³¤È¤Ç¡¢»Ò¥×¥í¥»¥¹¤¢¤¿¤ê¤Î
-      ¥¹¥ì¥Ã¥É¿ô¤ò¤è¤ê¿¤¯»ý¤¿¤»¤é¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-      ¤³¤Î¥¿¥¤¥×¤ÎÄ´À°¤Ï¡¢¥Æ¥¹¥È´Ä¶­¤Ç¥¦¥§¥Ö¥µ¡¼¥Ð¤ò´°Á´¤Ë
-      ¥Æ¥¹¥È¤Ç¤­¤ë¾ì¹ç¤Ë¸Â¤Ã¤Æ¹Ô¤Ê¤¦¤Ù¤­¤Ç¤¹¡£
-      ¤Þ¤ì¤Ë¿¿ô¤Î¥¹¥¿¥Ã¥¯¤¬Í׵ᤵ¤ì¤ë¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¤ë¤³¤È¤¬¤¢¤ë¤«¤â
-      ¤·¤ì¤Ê¤¤¤«¤é¤Ç¤¹¡£
-      Web ¥µ¡¼¥Ð¤ÎÀßÄê¤òÊѹ¹¤¹¤ë¤È¡¢¸½ºß¤Î <code class="directive">ThreadStackSize</code> 
-      ¤ÎÀßÄ꤬¼è¤ê¾Ã¤µ¤ì¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£</li>
-    </ul>
-
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="User" id="User">User</a> <a name="user" id="user">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤¹¤ëºÝ¤ËÍѤ¤¤ë¥æ¡¼¥¶ ID</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>User <var>unix-userid</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>User #-1</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>Apache 2.0 °Ê¹ß¤Ç¡¢¥°¥í¡¼¥Ð¥ëÀßÄê¤Ç¤Î¤ßÍ­¸ú¤Ç¤¹¡£
-</td></tr>
-</table>
-    <p><code class="directive">User</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¥µ¡¼¥Ð¤¬¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤¹¤ëºÝ¤ËÍѤ¤¤ë¥æ¡¼¥¶ ID ¤òÀßÄꤷ¤Þ¤¹¡£
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ¹¤ë¤¿¤á¤Ë¤Ï¡¢¥¹¥¿¥ó¥É¥¢¥í¥ó·¿¤Î
-    ¥µ¡¼¥Ð¤ÏºÇ½é¤Ë <code>root</code> ¸¢¸Â¤Çµ¯Æ°¤µ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    Èó root ¥æ¡¼¥¶¤Ç¥µ¡¼¥Ð¤òµ¯Æ°¤·¤¿¾ì¹ç¤Ï¡¢
-    ¸¢¸Â¤ÎÄ㤤¥æ¡¼¥¶¤Ø¤ÈÊѤï¤ë¤³¤È¤¬¤Ç¤­¤º¡¢
-    ·ë¶É¸µ¤Î¥æ¡¼¥¶¤Î¥×¥í¥»¥¹¤È¤·¤Æ¼Â¹Ô¤µ¤ì³¤±¤Þ¤¹¡£
-    <code>root</code> ¤Çµ¯Æ°¤·¤¿¾ì¹ç¤Ë¿Æ¥×¥í¥»¥¹¤¬ root
-    ¤È¤·¤Æ¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¤Î¤ÏÀµ¾ï¤ÊÆ°ºî¤Ç¤¹¡£
-    <var>Unix-userid</var> ¤Ï¼¡¤Î¤É¤ì¤«¤Ç¤¹¡£</p>
-
-    <dl>
-      <dt>¥æ¡¼¥¶Ì¾</dt>
-      <dd>¥æ¡¼¥¶¤ò̾Á°¤Ç»²¾È¤·¤Þ¤¹¡£</dd>
-
-      <dt># ¤Ë³¤¤¤Æ¥æ¡¼¥¶ÈÖ¹æ</dt>
-      <dd>¥æ¡¼¥¶¤òÈÖ¹æ¤Ç»²¾È¤·¤Þ¤¹¡£</dd>
-    </dl>
-
-    <p>¤³¤Î¥æ¡¼¥¶¤Ï¡¢³°Éô¤Ë¸«¤»¤ë¤è¤¦¤Ë°Õ¿Þ¤·¤Æ¤¤¤Ê¤¤¥Õ¥¡¥¤¥ë¤Ë¡¢
-    ¥¢¥¯¥»¥¹²Äǽ¤Ë¤Ê¤Ã¤Æ¤·¤Þ¤¦¤è¤¦¤Ê¸¢¸Â¤ò»ý¤Ä¤Ù¤­¤Ç¤Ï¤Ê¤¤¤Ç¤¹¤·¡¢
-    ƱÍÍ¤Ë HTTP ¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ±þÅú¤¹¤ë¤è¤¦¤Ë°Õ¿Þ¤·¤Æ¤¤¤Ê¤¤
-    ¼Â¹Ô¥³¡¼¥É¤ò¡¢¼Â¹Ô¤Ç¤­¤ë¤è¤¦¤Ê¸¢¸Â¤ò»ý¤Ä¤Ù¤­¤Ç¤Ï¤Ê¤¤¤Ç¤¹¡£
-    ¥µ¡¼¥Ð¤ò¼Â¹Ô¤¹¤ë¤¿¤á¤ËÆÃÄê¤Î¿·¤·¤¤¥æ¡¼¥¶¤È¥°¥ë¡¼¥×¤ò
-    ÀßÄꤹ¤ë¤³¤È¤ò¤ªÁ¦¤á¤¤¤¿¤·¤Þ¤¹¡£
-    <code>nobody</code> ¥æ¡¼¥¶¤ò»ÈÍѤ¹¤ë´ÉÍý¼Ô¤â¤¤¤Þ¤¹¤¬¡¢
-    ¤³¤ì¤¬¾ï¤Ë˾¤Þ¤·¤¤¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-    ¤Ê¤¼¤Ê¤é <code>nobody</code> ¥æ¡¼¥¶¤Ï¡¢¥·¥¹¥Æ¥à¤Ç
-    ¾¤ÎÌò³ä¤òô¤Ã¤Æ¤¤¤ë¤«¤âÃΤì¤Ê¤¤¤«¤é¤Ç¤¹¡£</p>
-
-    <div class="warning"><h3>¥»¥­¥å¥ê¥Æ¥£</h3>
-      <p>Àµ³Î¤Ë¤É¤ó¤Ê¤³¤È¤ò¤ä¤Ã¤Æ¤¤¤ë¤Î¤«¡¢¤½¤Î´í¸±À­¤òÃΤé¤Ê¤¤¤Ç¡¢
-      <code class="directive">User</code> (¤ä <code class="directive"><a href="#group">Group</a></code>) ¤ò <code>root</code> ¤Ë
-      ÀßÄꤷ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</p>
-    </div>
-
-    <p>Æõ­»ö¹à: ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-    ¤Ç»ÈÍѤ¹¤ë¤³¤È¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Ê¤¯¤Ê¤ê¤Þ¤·¤¿¡£
-    <code class="program"><a href="../programs/suexec.html">suexec</a></code> ¸þ¤±¤Ë¥µ¡¼¥Ð¤òÀßÄꤹ¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
-    <code class="directive"><a href="../mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code>
-    ¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <div class="note"><h3>Ãí°Õ</h3>
-      <p><code class="directive">User</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-      <code class="module"><a href="../mod/beos.html">beos</a></code> ¤È <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> MPM
-      ¤Ë¤â¸ºß¤·¤Þ¤¹¤¬¡¢¼Â¼ÁŪ¤Ë̵¸ú¤Ç¡¢¸ß´¹À­¤Î¤¿¤á¤À¤±¤Ë¸ºß¤·¤Þ¤¹¡£</p>
-    </div>
-
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../de/mod/mpm_common.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="../en/mod/mpm_common.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/mpm_common.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mpm_common.html.ja.utf8 b/docs/manual/mod/mpm_common.html.ja.utf8
new file mode 100644
index 00000000..d6b84432
--- /dev/null
+++ b/docs/manual/mod/mpm_common.html.ja.utf8
@@ -0,0 +1,996 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mpm_common - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache MPM 共通ディレクティブ</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../de/mod/mpm_common.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/mpm_common.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mpm_common.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../tr/mod/mpm_common.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>二�以上�マル�プロセッシングモジュール (MPM)
+�実装�れ��るディレクティブ�コレクション</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>MPM</td></tr></table>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#acceptmutex">AcceptMutex</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#coredumpdirectory">CoreDumpDirectory</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#enableexceptionhook">EnableExceptionHook</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#gracefulshutdowntimeout">GracefulShutdownTimeout</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#group">Group</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#listen">Listen</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#listenbacklog">ListenBackLog</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#lockfile">LockFile</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxclients">MaxClients</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxmemfree">MaxMemFree</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxrequestsperchild">MaxRequestsPerChild</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxsparethreads">MaxSpareThreads</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#minsparethreads">MinSpareThreads</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#pidfile">PidFile</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#receivebuffersize">ReceiveBufferSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#scoreboardfile">ScoreBoardFile</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#sendbuffersize">SendBufferSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#serverlimit">ServerLimit</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#startservers">StartServers</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#startthreads">StartThreads</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#threadlimit">ThreadLimit</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#threadsperchild">ThreadsPerChild</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#threadstacksize">ThreadStackSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#user">User</a></li>
+</ul>
+</div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AcceptMutex" id="AcceptMutex">AcceptMutex</a> <a name="acceptmutex" id="acceptmutex">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>複数��プロセス��ットワークソケット�リクエストを
+accept �よ�����る����Apache ��れら��プロセスを直列化�る���
+使�方法</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>AcceptMutex default|<var>method</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>AcceptMutex default</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p><code class="directive">AcceptMutex</code> ディレクティブ��
+    �ットワークソケット�リクエストを accept �よ�����る複数��プロセスを
+    Apache �直列化�る���使�方法を設定���。
+    Apache 2.0 以�����メソッド�コンパイル時����択�����。
+    最��方法��アーキテク�ャやプラットホーム�大���存���。
+    詳細�関����<a href="../misc/perf-tuning.html">性能��ューニング</a>
+    ドキュメントを�覧下��。</p>
+
+    <p>��ディレクティブ� <code>Default</code>
+    �設定�れ��れ��コンパイル時��択�れ�デフォルト値�使�れ��。
+    他�使用�能�メソッド�一覧�下��り��。
+    全��メソッド�全��プラットホーム�使用�能��る�������
+    ������注�������。
+    使用�能���メソッド�指定�れ�場���
+    使用�能�メソッド�一覧を�ん�メッセージ�
+    エラーログ�出力�れ��。</p>
+
+    <dl>
+      <dt><code>flock</code></dt>
+      <dd><code class="directive"><a href="#lockfile">LockFile</a></code>
+      ディレクティブ�定義��ファイル�ロック��
+      <code>flock(2)</code> システムコールを使���。</dd>
+
+      <dt><code>fcntl</code></dt>
+      <dd><code class="directive"><a href="#lockfile">LockFile</a></code>
+      ディレクティブ�定義��ファイル�ロック��
+      <code>fcntl(2)</code> システムコールを使���。</dd>
+
+      <dt><code>posixsem</code></dt>
+      <dd>排他処��実装� POSIX 互�セマフォを使用���</dd>
+
+      <dt><code>pthread</code></dt>
+      <dd>POSIX Threads (PThreads) �格�実装�れ��る
+      POSIX 排他処�を使���。</dd>
+
+      <dt><code>sysvsem</code></dt>
+      <dd>排他処��実装� SySV 形��セマフォを使���。</dd>
+    </dl>
+
+    <p>コンパイル時�システム�デフォルト���れ�も��何�を見��場���
+    <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code> ã‚’ <code>debug</code>
+    �設定�る�よ���ょ�。デフォルト� <code class="directive">AcceptMutex</code>
+    � <code class="directive"><a href="../mod/core.html#errorlog">ErrorLog</a></code> �書�込�れ��。</p>
+
+  <div class="warning"><h3>警告</h3>
+     <p>��ん��システム������<code>pthread</code> オプション�
+     ��れ��る���プロセス� <code>AcceptCntl</code> mutex を
+     �����る���異常終了��場��サー��リクエスト��応答を
+     �止�������。�れ�発生��場���サー�を復旧��る����
+     手動��起動��る必���り��。</p>
+
+     <p>Solaris �例外��Apache も使用���る��プロセス� mutex を
+     ����異常終了��後� mutex を復旧��る���機構を�供を�����。</p>
+     <p>御使用�システム� <code>pthread_mutexattr_setrobust_np()</code> 関数を
+     実装���る場���<code>pthread</code> オプションを安全�使用��る
+     �能性��り��。</p>
+  </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CoreDumpDirectory" id="CoreDumpDirectory">CoreDumpDirectory</a> <a name="coredumpdirectory" id="coredumpdirectory">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Apache �コアダンプ�る��移動を試�るディレクトリ
+</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>CoreDumpDirectory <var>directory</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>デフォルト�設定�説明文を読ん�����</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p>Apache �コアダンプ�る��移動を試�るディレクトリを制御���。
+    デフォルト値� <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
+    ディレクトリ������ディレクトリ�サー��実行�れ��るユーザ権��
+    書�込��能��る���������通常�コアダンプ�書�込�れ��ん。
+    デ�ッグ����コアダンプ�必���れ��
+    ��ディレクティブを使��他��置�コアダンプを書�出�よ������。</p>
+
+    <div class="note"><h3>Linux ��コアダンプ</h3>
+      <p>Apache � root ���起動�れ��別�ユーザ�権��以���場��
+      Linux �カー�ル�ディレクトリ�プロセス�権��書�込��能�場����も
+      コアダンプを<em>無効</em>����。Apache (2.0.46 以�) �
+      Linux 2.4 以���コアダンプを行��よ���指定������れ�
+      <code class="directive">CoreDumpDirectory</code> を明示的�設定�����
+      �り��。</p>
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="EnableExceptionHook" id="EnableExceptionHook">EnableExceptionHook</a> <a name="enableexceptionhook" id="enableexceptionhook">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>クラッシュ�後�例外�ンドラを実行�るフックを有効��る</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>EnableExceptionHook On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>EnableExceptionHook Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.0.49 以�</td></tr>
+</table>
+    <p>安全上��由�ら�<code>--enable-exception-hook</code> configure
+    オプションを有効���場�������ディレクティブを利用����。
+    外部モジュールをプラグイン�����クラッシュ��後�何�実行��るよ��
+    フックを有効����。</p>
+    
+    <p>��よ��外部モジュール��既�二�存在�����
+    <code>mod_whatkilledus</code> � <code>mod_backtrace</code>
+    ���フックを活用���。�れら�詳細����� Jeff Trawick 
+    �ん� <a href="http://www.apache.org/~trawick/exception_hook.html">EnableExceptionHook site</a> を�照������。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="GracefulShutdownTimeout" id="GracefulShutdownTimeout">GracefulShutdownTimeout</a> <a name="gracefulshutdowntimeout" id="gracefulshutdowntimeout">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�や���止を���後�終了�る��待�時間</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>GracefulShutDownTimeout <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>GracefulShutDownTimeout 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/event.html">event</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.2 以�</td></tr>
+</table>
+    <p><code class="directive">GracefulShutdownTimeout</code> ��
+    サー�ー� "graceful-stop" シグナルを������ら�在�
+    リクエスト�処�を最大�何秒間続�る�を指定���。</p>
+
+    <p>��値をゼロ�設定�る��処�中���残���るリクエスト�
+    全�完了�る��サー�ー�終了���ん。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Group" id="Group">Group</a> <a name="group" id="group">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>リクエスト�応答�る際�所属�るグループ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Group <var>unix-group</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>Group #-1</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0 以���グロー�ル設定���有効��。</td></tr>
+</table>
+    <p><code class="directive">Group</code> ディレクティブ��
+    リクエスト�応答�る際�所属����グループを設定���。
+    ��ディレクティブを使用�る�����
+    サー��最�� <code>root</code> 権��起動�れ��る必���り��。
+    � root ユーザ�サー�を起動��場���指定��グループ�変化�����
+    �果的�起動��ユーザ�属�るグループ�実行�れる����り��。
+    <var>unix-group</var> �次������れ���:</p>
+
+    <dl>
+      <dt>グループ�</dt>
+      <dd>グループを����照���</dd>
+
+      <dt><code>#</code> �続��グループ番�</dt>
+      <dd>グループを番���照���。</dd>
+    </dl>
+
+    <div class="example"><h3>例</h3><p><code>
+      Group www-group
+    </code></p></div>
+
+    <p>サー�を実行�る���特定�新��グループを設定�る��を
+    �薦����。<code>nobody</code> を使用�る管�者も�����
+    �能����り望���訳��必��も�り��ん。</p>
+
+    <div class="warning"><h3>セキュリティ</h3>
+      <p>正確��ん���をや���る������険性を知ら����
+      <code class="directive">Group</code> (ã‚„ <code class="directive"><a href="#user">User</a></code>) ã‚’
+      <code>root</code> � 設定��������。</p>
+    </div>
+
+    <p>特記事項: ��ディレクティブを
+    <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+    �使用�る���サ�ート�れ���り���。Apache 2.0 �
+    <code class="program"><a href="../programs/suexec.html">suexec</a></code> を設定���場���
+    <code class="directive"><a href="../mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code>
+    を使用������。</p>
+
+    <div class="note"><h3>注�</h3>
+      <p><code class="directive">Group</code> ディレクティブ�
+      <code class="module"><a href="../mod/beos.html">beos</a></code> � <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> MPM
+      �も存在�����実質的�無効��互�性������存在���。</p>
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Listen" id="Listen">Listen</a> <a name="listen" id="listen">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>サー�� listen �るIP アドレス��ート番�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Listen [<var>IP-address</var>:]<var>portnumber</var> [<var>protocol</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/event.html">event</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0 �ら必須ディレクティブ。<var>protocol</var>
+引数� 2.1.5 �追加。</td></tr>
+</table>
+    <p><code class="directive">Listen</code> ディレクティブ� Apache
+    �特定� IP アドレスや�ート番���を listen �るよ��指定���。
+    デフォルト��全�� IP インターフェース�リクエスト�応答���。
+    <code class="directive">Listen</code> ディレクティブ�
+    �在�必須�ディレクティブ��り���。
+    も�設定ファイル���れ��サー��起動�失敗���。
+    �れ�以���ージョン� Apache �ら変更����部分��。</p>
+
+    <p><code class="directive">Listen</code> ディレクティブ���特定��ート�る��
+    アドレス��ート�組�����ら入���るリクエスト�対��
+    応答�るよ��指定���。
+    も��ート番����指定�れ�場���サー��全インターフェース�
+    指定�れ��ート番��対�� listen ���。
+    IP アドレス��ート��も�指定�れ�場���
+    サー��指定�れ��ート�インターフェース�対�� listen 
+    ���。</p>
+
+    <p>複数�アドレス��ート�対�� listen �るよ���
+    複数� <code class="directive">Listen</code> ディレクティブを使���も����。
+    サー��列挙�れ�アドレス��ート全��ら�リクエスト�対��
+    応答���。</p>
+
+    <p>例���サー�� 80 番�ート� 8000 番�ート�両方�
+    コ�クションを��入れる場���次�よ�����。</p>
+
+    <div class="example"><p><code>
+       Listen 80<br />
+       Listen 8000
+    </code></p></div>
+
+    <p>二��特定�インターフェース��ート番��ら�コ�クションを
+    ��入れるよ���る���次�よ�����。</p>
+
+    <div class="example"><p><code>
+       Listen 192.170.2.1:80<br />
+       Listen 192.170.2.5:8000
+    </code></p></div>
+
+    <p>IPv6 アドレス�角括弧�囲���れ��り��ん。
+    例��次�例�よ����。</p>
+
+    <div class="example"><p><code>
+      Listen [2001:db8::a00:20ff:fea7:ccea]:80
+    </code></p></div>
+
+    <p><var>protocol</var> オプション引数�通常�設定��必��り��ん。
+       無指定�場��443 番�ート�� <code>https</code> ��他��ート��
+       <code>http</code> �デフォルト値���使用�れ��。
+       protocol 指定����モジュール�リクエストを処��る�を決定��
+       <code class="directive"><a href="../mod/core.html#acceptfilter">AcceptFilter</a></code> 
+       �よるプロトコル特有�最�化を行�よ�����。</p>
+
+    <p>�標準��ート��用���る際��� protocol 指定�必���り��。
+       ���� <code>https</code> �サイトを 8443 番�ート��用���る場� :</p>
+
+    <div class="example"><p><code>
+      Listen 192.170.2.1:8443 https
+    </code></p></div>
+
+    <div class="note"><h3>エラー�件</h3>
+      �一 IP アドレス��ート�組��複数� <code class="directive">Listen</code> 
+      ディレクティブを指定�������<code>Address already in use</code> 
+      ���エラーメッセージを��る����り��。
+    </div>
+
+
+<h3>�照</h3>
+<ul>
+<li><a href="../dns-caveats.html">DNS ��題</a></li>
+<li><a href="../bind.html">Apache
+�使用�るアドレス��ート�設定</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ListenBackLog" id="ListenBackLog">ListenBackLog</a> <a name="listenbacklog" id="listenbacklog">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�留状態�コ�クション�キュー�最大長</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ListenBacklog <var>backlog</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ListenBacklog 511</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p>�留状態�コ�クション�キュー�最大長��。
+    一般的��調整�る必���り��ん��調整�望����り��ん。
+    ����TCP SYN フラッドアタック�状�下���れる場���
+    増や��方�望���システムも�り��。
+    <code>listen(2)</code> システムコール��ックログパラメータを
+    �覧下��。</p>
+
+    <p>��値� OS �より����数�抑�られ��。
+    値� OS 毎�異������。��多�� OS ���
+    �ックログ���指定�れ��る値�ょ����使���る�������
+    設定�れ��る値�基��� (通常�設定値よりも大��値を)
+    使���る���注�������。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LockFile" id="LockFile">LockFile</a> <a name="lockfile" id="lockfile">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�付を直列化�る���ロックファイル��置</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>LockFile <var>filename</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>LockFile logs/accept.lock</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p><code class="directive"><a href="#acceptmutex">AcceptMutex</a></code>
+    � <code>fcntl</code> や <code>flock</code>
+    �設定�れ�使用�れ��る場���使用�れるロックファイル��パスを
+    <code class="directive">LockFile</code> ディレクティブ�設定���。
+    ��ディレクティブ�通常������������。
+    主� <code>logs</code> ディレクトリ� NFS
+    �マウント�れ��る場����値を変���。
+    ���ら<strong>ロックファイル�ローカルディスク�
+    �存�れ��れ��ら��</strong>�ら��。
+    メインサー�プロセス� PID �ファイル��自動的�付加�れ��。</p>
+
+    <div class="warning"><h3>セキュリティ</h3>
+      <p><code>/var/tmp</code>
+      �����誰�も書�込�るディレクトリ�ファイルを
+      <em>置���</em>方�よ���。���ら�サー��起動時�作��る
+      ロックファイル�作�自体を妨害�る���よ���
+      誰�もサービス拒�アタックを引�起�������る�ら��。</p>
+    </div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#acceptmutex">AcceptMutex</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxClients" id="MaxClients">MaxClients</a> <a name="maxclients" id="maxclients">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>リクエスト�応答�る���作��れる
+�プロセス�最大個数</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>MaxClients <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>詳細�使用法を�覧下��。</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p><code class="directive">MaxClients</code> ディレクティブ��
+    応答�る�����る�時リクエスト数を設定���。
+    <code class="directive">MaxClients</code> 制�数を越�るコ�クション�通常�
+    <code class="directive"><a href="#listenbacklog">ListenBacklog</a></code>
+    ディレクティブ�設定��数��キュー�入り��。
+    他�リクエスト�最後������プロセス�空���
+    次�コ�クション�応答���。</p>
+
+    <p>スレッドを用���サー� (<em>����</em> <code class="module"><a href="../mod/prefork.html">prefork</a></code>)
+    ���<code class="directive">MaxClients</code>
+    ��リクエスト�応答�る���起動�れる
+    �プロセス�最大数��り��。
+    デフォルト値� <code>256</code> ���れを増加����場���
+    <code class="directive"><a href="#serverlimit">ServerLimit</a></code>
+    �値も増加��る必���り��。</p>
+
+    <p>スレッドを用�るサー�や��イブリッドサー� (<em>����</em>
+    <code class="module"><a href="../mod/beos.html">beos</a></code> <code class="module"><a href="../mod/worker.html">worker</a></code>)
+    ���<code class="directive">MaxClients</code> 
+    ��クライアント�応答��るスレッド��数を制����。
+    <code class="module"><a href="../mod/beos.html">beos</a></code> ��デフォルト値� <code>50</code> ��。
+    �イブリッド MPM ��デフォルト値� <code>16</code>
+    <code class="directive"><a href="#serverlimit">ServerLimit</a></code>
+    � <code>25</code> � (<code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>) ��。
+    <code class="directive">MaxClients</code>
+    を 16 プロセス以上必��値��増加����場���
+    <code class="directive"><a href="#serverlimit">ServerLimit</a></code>
+    も増加��る必���り��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxMemFree" id="MaxMemFree">MaxMemFree</a> <a name="maxmemfree" id="maxmemfree">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td><code>free()</code> �呼�れ���り�
+主メモリアロケータ����続�られるメモリ�最大�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>MaxMemFree <var>KBytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>MaxMemFree 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr>
+</table>
+    <p><code class="directive">MaxMemFree</code> ディレクティブ�
+    <code>free()</code> �呼�れ���り�
+    主アロケータ�����る空�メモリ�最大値をキロ�イト���設定���。
+    設定�れ������零�設定�れ��る����無制���り��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxRequestsPerChild" id="MaxRequestsPerChild">MaxRequestsPerChild</a> <a name="maxrequestsperchild" id="maxrequestsperchild">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>個々��サー��稼�中�扱�リクエスト数�上�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>MaxRequestsPerChild <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>MaxRequestsPerChild 10000</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p><code class="directive">MaxRequestsPerChild</code> ディレクティブ��
+    個々��サー�プロセス�扱������るリクエスト�制�数を
+    設定���。<code class="directive">MaxRequestsPerChild</code>
+    個�リクエスト�後���プロセス�終了���。
+    <code class="directive">MaxRequestsPerChild</code> � <code>0</code>
+    �設定�れ��る場���プロセス�期�切れ�より終了�る����り��ん。</p>
+
+    <div class="note"><h3>��他�デフォルト値</h3>
+      <p><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> � <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>
+      ��デフォルト値� <code>0</code> ��。</p>
+    </div>
+
+    <p><code class="directive">MaxRequestsPerChild</code>
+    を�ゼロ�制��る�����二��利点��り��:</p>
+
+    <ul>
+      <li>(�発的�) メモリーリーク�起���場��
+      プロセス�消費�るメモリ���を制���る</li>
+
+      <li>プロセス�有��ライフタイムを設定�る����
+      サー�負��下���時�プロセス数を少���る�����る</li>
+    </ul>
+
+    <div class="note"><h3>注</h3>
+      <p><code class="directive"><a href="../mod/core.html#keepalive">KeepAlive</a></code> リクエスト�場���
+      一�目�リクエスト�����制��該当���。
+      実効的���一���プロセス��り�<em>コ�クション</em>数を
+      制��るよ��挙動�変化���。</p>
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxSpareThreads" id="MaxSpareThreads">MaxSpareThreads</a> <a name="maxsparethreads" id="maxsparethreads">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>アイドルスレッド�最大数</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>MaxSpareThreads <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>詳細�使用法を�覧下��。</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p>アイドル�スレッド�最大数��。異�る MPM ���れ�れ�
+    ��ディレクティブ�異�る�り扱�れ方を�れ��。</p>
+
+    <p><code class="module"><a href="../mod/worker.html">worker</a></code> ���
+    デフォルト� <code>MaxSpareThreads 250</code> ��。
+    �� MPM �アイドルスレッド数をサー�全体�監視���。
+    サー��アイドルスレッド数�多��る場���
+    ��数字よりも少��数��る���プロセスを終了���。</p>
+
+    <p><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> ���
+    デフォルト� <code>MaxSpareThreads 100</code> ��。
+    �� MPM �シングルプロセス�実行�れ�����
+    スペアスレッド数もサー�全体�勘定���。</p>
+
+    <p><code class="module"><a href="../mod/beos.html">beos</a></code> � <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> �
+    <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> �似�挙動を���。
+    <code class="module"><a href="../mod/beos.html">beos</a></code> ��デフォルト値� <code>MaxSpareThreads 50</code>
+    ��。<code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> ��デフォルト値� <code>10</code>
+    ��。</p>
+
+    <div class="note"><h3>制�事項</h3>
+      <p><code class="directive">MaxSpareThreads</code> ��る値��制���り��。
+      Apache �次��則�従��自動的�補正���。</p>
+      <ul>
+
+        <li><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> �
+        <code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code>
+        よりも大��必���り��。</li>
+
+        <li>
+        <code class="module"><a href="../mod/worker.html">worker</a></code> ���
+        <code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code> �
+        <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
+        �決�る�和�等���大��必���り��。</li>
+      </ul>
+    </div>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code></li>
+<li><code class="directive"><a href="#startservers">StartServers</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MinSpareThreads" id="MinSpareThreads">MinSpareThreads</a> <a name="minsparethreads" id="minsparethreads">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>リクエスト�応答�る�����る
+アイドルスレッド数�最�数</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>MinSpareThreads <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>詳細�使用方法を�覧下��。</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p>リクエスト�応答�るスレッド数�最�値��。
+    異�る MPM ���れ�れ�
+    ��ディレクティブ�異�る�り扱�れ方を���。</p>
+
+    <p><code class="module"><a href="../mod/worker.html">worker</a></code> ���
+    デフォルト� <code>MinSpareThreads 75</code> ��
+    アイドルスレッド数をサー�全体�監視���。
+    も�サー���分�数�アイドルスレッド���れ��
+    アイドルスレッド数���数よりも大���る��
+    新���プロセス�生��れ��。</p>
+
+    <p><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> ���
+    デフォルト� <code>MinSpareThreads 10</code> ��
+    シングルプロセス MPM �����サー�全体�管��れ��。</p>
+
+    <p><code class="module"><a href="../mod/beos.html">beos</a></code> � <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> ��
+    <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>�よ�似����。
+    <code class="module"><a href="../mod/beos.html">beos</a></code> ��デフォルト� <code>MinSpareThreads 1</code>
+    ��。<code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> ��デフォルト�
+    <code>5</code> ��。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#maxsparethreads">MaxSpareThreads</a></code></li>
+<li><code class="directive"><a href="#startservers">StartServers</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="PidFile" id="PidFile">PidFile</a> <a name="pidfile" id="pidfile">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>デーモン�プロセス ID
+をサー��記録�る���ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>PidFile <var>filename</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>PidFile logs/httpd.pid</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p><code class="directive">PidFile</code> ディレクティブ��
+    デーモン�プロセス ID をサー��記録�るファイルを設定���。
+    ファイル��絶対パス���場���
+    <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code>
+    �ら�相対的�も����扱�れ��。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+    PidFile /var/run/apache.pid
+    </code></p></div>
+
+    <p>サー�� <code class="directive"><a href="../mod/core.html#errorlog">ErrorLog</a></code>
+    ã‚„ <code class="directive"><a href="../mod/mod_log_config.html#transferlog">TransferLog</a></code>
+    を閉��開�直��り�設定ファイルを
+    �読込��り��る����サー��シグナルを�る�����る�
+    便利�����り��。
+    �れ� SIGHUP (kill -1) シグナルを <code class="directive">PidFile</code>
+    �書�れ��るプロセス ID ��る�������。</p>
+
+    <p><code class="directive">PidFile</code> ���ログファイル�設置�置や
+    <a href="../misc/security_tips.html#serverroot">セキュリティ</a>
+    �全���注�点��り��。</p>
+
+    <div class="note"><h3>注�</h3>
+      <p>Apache 2 ���
+      <code class="program"><a href="../programs/apachectl.html">apachectl</a></code>
+      スクリプト��を使用��サー�� (�) 起動や�止を
+      行����を推奨�����。</p>
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ReceiveBufferSize" id="ReceiveBufferSize">ReceiveBufferSize</a> <a name="receivebuffersize" id="receivebuffersize">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>TCP �信�ッファサイズ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ReceiveBufferSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ReceiveBufferSize 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p>サー�� TCP �信�ッファサイズを指定�れ��イト数�設定���。</p>
+
+    <p><code>0</code>���場��OS �デフォルト値�使用�れ��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScoreBoardFile" id="ScoreBoardFile">ScoreBoardFile</a> <a name="scoreboardfile" id="scoreboardfile">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�プロセス�連��る���データを�存�る
+ファイル��置</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ScoreBoardFile <var>file-path</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>ScoreBoardFile logs/apache_status</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p>Apache �親プロセス��プロセス間�通信�スコアボードを用���。
+    ��通信機能�ファイルを必���るアーキテク�ャも�り��。
+    ファイル�指定�れ����れ��Apache ���メモリ上
+    (匿�共有メモリ) �スコアボードを作������れ�失敗�る�
+    ディスク上�ファイル (ファイルベース�共有メモリ) を作������。
+    ��ディレクティブを指定�る��Apache
+    �必�ディスク�ファイルを生����。</p>
+
+    <div class="example"><h3>例</h3><p><code>
+      ScoreBoardFile /var/run/apache_status
+    </code></p></div>
+
+    <p>ファイルベース�共有メモリ��サードパーティー製�アプリケーション�
+    スコアボード�直接アクセス�る必���る場��役�立���。</p>
+
+    <p><code class="directive">ScoreBoardFile</code> を使�場��
+    RAM ディスク上�置��スピード��上�る��ょ�。
+    ����ログファイル�設置�置や
+    <a href="../misc/security_tips.html">セキュリティ</a>
+    ��様�注�点��る���注�������。</p>
+
+<h3>�照</h3>
+<ul>
+<li><a href="../stopping.html">Apache ��止��起動</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SendBufferSize" id="SendBufferSize">SendBufferSize</a> <a name="sendbuffersize" id="sendbuffersize">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>TCP �ッファサイズ</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>SendBufferSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>SendBufferSize 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p>サー�� TCP �信�ッファサイズを指定�れ��イト数�設定���。
+    高速�高レイテンシ�環境�
+    (<em>例</em> 100ms 程度�大陸横断高速通信路��)
+    ��一般的� OS �デフォルト値を増や����常�便利��。</p>
+
+    <p><code>0</code>���場��OS �デフォルト値�使用�れ��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerLimit" id="ServerLimit">ServerLimit</a> <a name="serverlimit" id="serverlimit">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>設定�能�サー�プロセス数�上�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ServerLimit <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>詳細�使用法を�照</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p><code class="module"><a href="../mod/prefork.html">prefork</a></code> MPM �場�����ディレクティブ�
+    Apache プロセス稼�中���る
+    <code class="directive"><a href="#maxclients">MaxClients</a></code>
+    �設定�能�上�値を設定�る����り��
+    (訳注: prefork �場���時クライアント数 = サー�プロセス数���) 。
+    <code class="module"><a href="../mod/worker.html">worker</a></code> MPM �場������ディレクティブ�
+    <code class="directive"><a href="#threadlimit">ThreadLimit</a></code>
+    ディレクティブ�組������
+    Apache プロセス稼�中���る
+    <code class="directive"><a href="#maxclients">MaxClients</a></code>
+    �設定�能�上�値を設定�る����り��。
+    �起動中���ディレクティブを変更��も無視�れ����
+    <code class="directive"><a href="#maxclients">MaxClients</a></code>
+    ��起動中�修正�る�������。</p>
+
+    <p>��ディレクティブを使用�る際�特�注�������。
+    <code class="directive">ServerLimit</code> �必�以上�大��値�
+    設定�れ�場���余計�未使用共有メモリ�割り当�られ��。
+    <code class="directive">ServerLimit</code> �
+    <code class="directive"><a href="#maxclients">MaxClients</a></code>
+    �システム�扱�る範囲を越��設定値�����る��
+    Apache �起動�����起動��も�安定��る��ょ�。</p>
+
+    <p><code class="module"><a href="../mod/prefork.html">prefork</a></code> MPM ���
+    <code class="directive"><a href="#maxclients">MaxClients</a></code>
+    を 256 (デフォルト) よりも大��値�設定�る必���る時���使用������。
+    希望� <code class="directive"><a href="#maxclients">MaxClients</a></code>
+    数��ら���必�以上�大��値を指定�る����������。</p>
+
+    <p><code class="module"><a href="../mod/worker.html">worker</a></code> MPM ���
+    <code class="directive"><a href="#maxclients">MaxClients</a></code> �
+    <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
+    �設定� 16 サー�プロセス (デフォルト) 
+    以上必���る場����使用������。希望�
+    <code class="directive"><a href="#maxclients ">MaxClients </a></code> �
+    <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
+    ��ら���必���るサー�プロセス数以上�大��値を
+    設定�る����������。</p>
+
+    <div class="note"><h3>注�</h3>
+      <p><code>ServerLimit 20000</code> ���制�付��コンパイル�れ����
+      (<code class="module"><a href="../mod/prefork.html">prefork</a></code> MPM �� <code>200000</code>) 。
+      �れ�スペルミス�よ��誤��酷�状���る�を�
+      回��る���処置��。</p>
+    </div>
+
+<h3>�照</h3>
+<ul>
+<li><a href="../stopping.html">Apache ��止��起動</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="StartServers" id="StartServers">StartServers</a> <a name="startservers" id="startservers">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>起動時�生��れる�サー�プロセス�数</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>StartServers <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>詳細�使用方法を�照</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p><code class="directive">StartServers</code> ディレクティブ��
+    起動時�生��れる�サー�プロセス�数を設定���。
+    プロセス数�負��応��動的�制御�れ�����
+    通常���値を調整�る�由���り����ょ�。</p>
+
+    <p>デフォルト値� MPM ���異�り��。
+    <code class="module"><a href="../mod/worker.html">worker</a></code> � <code>StartServers 3</code> ��。
+    <code class="module"><a href="../mod/prefork.html">prefork</a></code> � <code>5</code> ��
+    <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> � <code>2</code> ��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="StartThreads" id="StartThreads">StartThreads</a> <a name="startthreads" id="startthreads">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>起動時�生��れるスレッド�数</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>StartThreads <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>詳細�使用方法を�照</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code></td></tr>
+</table>
+    <p>起動時�生��れるスレッド�数��。
+    スレッド数�負��応��動的�制御�れ�����
+    通常���値を調整�る�由���り����ょ�。</p>
+
+    <p><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> ��デフォルト�
+    <code>StartThreads 50</code> ��
+    ��場�プロセス�一��������
+    起動時�リクエスト�応答�るスレッド��数��り��。</p>
+
+    <p><code class="module"><a href="../mod/beos.html">beos</a></code> ��デフォルト� <code>StartThreads
+    10</code> ��。
+    ���起動時�生��れるスレッド��数�も�映�れ��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ThreadLimit" id="ThreadLimit">ThreadLimit</a> <a name="threadlimit" id="threadlimit">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>設定�能��プロセス毎�スレッド数�上�を
+設定���</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ThreadLimit <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>詳細�使用方法を�照</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0.41 ��れ以�� <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code> 
+�利用�能</td></tr>
+</table>
+    <p>��ディレクティブ�
+    Apache プロセス稼�中���る
+    <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
+    �設定�能�上�値を設定���。�起動時���ディレクティブ�値を
+    変更��も無視�れ����
+    <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
+    ��起動中����ディレクティブ�指定�れ�上�値��
+    変更�る�������。</p>
+
+    <p>��ディレクティブを使用�る際�特�注�������。
+    <code class="directive">ThreadLimit</code> �
+    <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
+    よりも���大��値�設定�れ�場���
+    余計�未使用共有メモリ�割り当�られ������。
+    <code class="directive">ThreadLimit</code> �
+    <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
+    �両方�システム�扱�る範囲を超���る場���
+    Apache �起動�����起動�����も�安定��る��ょ�。
+    ��ディレクティブ�値�今使用���る Apache � <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code> �予想上�値を
+    超��値��設定��������。
+    </p>
+
+    <p><code class="directive">ThreadLimit</code> �デフォルト値�
+    <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code> ���� <code>1920</code> ��
+    他�場�� <code>64</code> ��。</p>
+
+    <div class="note"><h3>注�</h3>
+      <p><code>ThreadLimit 20000</code> (<code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>
+      �場�� <code>ThreadLimit 15000</code> )
+      ���制�付��コンパイル�れ����。
+      �れ�スペルミス�よ��誤��酷�状���る�を�
+      回��る���処置��。</p>
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ThreadsPerChild" id="ThreadsPerChild">ThreadsPerChild</a> <a name="threadsperchild" id="threadsperchild">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�プロセス�れ�れ�生��れるスレッド数</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ThreadsPerChild <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>詳細�使用方法を�照</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p>��ディレクティブ���れ�れ��プロセス�生��れる
+    スレッド数を設定���。
+    �プロセス�開始時��れら�スレッドを生����
+    ��後�生����ん。<code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code> �よ���
+    �プロセス�一�����よ�� MPM を利用���る���れ��
+    ��値�サー��負�全体を�分�り扱�る程度��
+    大����れ��り��ん。<code class="module"><a href="../mod/worker.html">worker</a></code> �よ���
+    �プロセス�複数�るよ�� MPM を利用���る���れ��
+    サー��通常負�を�分扱�る程度��
+    <em>スレッド�数</em>�多���れ��り��ん。</p>
+
+    <p><code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>�� <code class="directive">ThreadsPerChild</code>
+    �デフォルト値� <code>64</code> ��他�場��
+    <code>25</code> ��。</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ThreadStackSize" id="ThreadStackSize">ThreadStackSize</a> <a name="threadstacksize" id="threadstacksize">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>クライアント�コ�クションを����スレッド�使用�る
+スタック��イト数</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>ThreadStackSize <var>size</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>NetWare �� 65536。他� OS �����値</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.1 以�</td></tr>
+</table>
+    <p>クライアントコ�クションを�����コ�クション処��必��モジュール�
+    呼�出�を行����るスレッド��(自動変数用�) スタックサイズ�
+    <code class="directive">ThreadStackSize</code> ディレクティブ�指定���。
+    大抵�場� OS �指定���るスタックサイズ�デフォルト値�
+    �切�も�����調整�必���る場�も�り��:</p>
+
+    <ul>
+      <li>スレッドスタックサイズ�デフォルト値�比較的���設定�れ��る
+      プラットホーム (例�� HP-UX) ���自動変数用�領域�大��容�を
+      使用�るサードパーティ製モジュール���� Apache �クラッシュ�る
+      場�も�り��。��モジュール�他�プラットホーム��
+      スタックサイズ�大������快調�動作�る�も�れ��ん。
+      ��タイプ�クラッシュ��<code class="directive">ThreadStackSize</code>
+      � OS �デフォルト値より大��値を指定�る���解決���。
+      サードパーティ製モジュール���処置�必���る�記載�れ��る
+      場���Apache �出力�るメッセージ�スレッドスタックサイズ�
+      ����る�指摘�れ��る場�������調整を������。</li>
+
+      <li>デフォルトスレッドスタックサイズ��Web サー�用途�必���よりも
+      明ら��大���る場��<code class="directive">ThreadStackSize</code> 
+      を OS �デフォルト値よりも���値��る�����プロセス��り�
+      スレッド数をより多����られるよ���り��。
+      ��タイプ�調整��テスト環境�ウェブサー�を完全�
+      テスト��る場�����行������。
+      �れ�多数�スタック��求�れるリクエストを��る����る�も
+      �れ���ら��。
+      Web サー��設定を変更�る���在� <code class="directive">ThreadStackSize</code> 
+      �設定��り消�れる場���り��。</li>
+    </ul>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="User" id="User">User</a> <a name="user" id="user">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>リクエスト�応答�る際�用�るユーザ ID</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>User <var>unix-userid</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>User #-1</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>Apache 2.0 以���グロー�ル設定���有効��。
+</td></tr>
+</table>
+    <p><code class="directive">User</code> ディレクティブ�
+    サー��リクエスト�応答�る際�用�るユーザ ID を設定���。
+    ��ディレクティブを使用�る�����スタンドアロン型�
+    サー��最�� <code>root</code> 権��起動�れ��る必���り��。
+    � root ユーザ�サー�を起動��場���
+    権��低�ユーザ��変�る�������
+    �局元�ユーザ�プロセス���実行�れ続���。
+    <code>root</code> �起動��場��親プロセス� root
+    ���実行�れ��る��正常�動作��。
+    <var>Unix-userid</var> �次��れ���。</p>
+
+    <dl>
+      <dt>ユーザ�</dt>
+      <dd>ユーザを����照���。</dd>
+
+      <dt># �続��ユーザ番�</dt>
+      <dd>ユーザを番���照���。</dd>
+    </dl>
+
+    <p>��ユーザ��外部�見�るよ���図�����ファイル��
+    アクセス�能�������よ��権�を������������
+    �様� HTTP リクエスト�対��応答�るよ���図�����
+    実行コードを�実行��るよ��権�を����������。
+    サー�を実行�る���特定�新��ユーザ�グループを
+    設定�る��を�薦������。
+    <code>nobody</code> ユーザを使用�る管�者も�����
+    �れ�常�望��������り��ん。
+    ���ら <code>nobody</code> ユーザ��システム�
+    他�役割を担���る�も知れ���ら��。</p>
+
+    <div class="warning"><h3>セキュリティ</h3>
+      <p>正確��ん���をや���る������険性を知ら����
+      <code class="directive">User</code> (や <code class="directive"><a href="#group">Group</a></code>) を <code>root</code> �
+      設定��������。</p>
+    </div>
+
+    <p>特記事項: ��ディレクティブを
+    <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+    �使用�る���サ�ート�れ���り���。
+    <code class="program"><a href="../programs/suexec.html">suexec</a></code> ���サー�を設定�る���れ��
+    <code class="directive"><a href="../mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code>
+    を使用������。</p>
+
+    <div class="note"><h3>注�</h3>
+      <p><code class="directive">User</code> ディレクティブ�
+      <code class="module"><a href="../mod/beos.html">beos</a></code> � <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> MPM
+      �も存在�����実質的�無効��互�性������存在���。</p>
+    </div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../de/mod/mpm_common.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/mpm_common.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mpm_common.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../tr/mod/mpm_common.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mpm_common.html.tr.utf8 b/docs/manual/mod/mpm_common.html.tr.utf8
new file mode 100644
index 00000000..8036ae81
--- /dev/null
+++ b/docs/manual/mod/mpm_common.html.tr.utf8
@@ -0,0 +1,942 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>mpm_common - Apache HTTP Sunucusu</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="../">Sürüm 2.2</a> &gt; <a href="./">Modüller</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache MPM Ortak Yönergeleri</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="../de/mod/mpm_common.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/mpm_common.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mpm_common.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../tr/mod/mpm_common.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">Açıklama:</a></th><td>Birden fazla Çok Süreçlilik Modülü (MPM) tarafından gerçeklenmiş
+  yönergeler bütünü.</td></tr>
+<tr><th><a href="module-dict.html#Status">Durum:</a></th><td>MPM</td></tr></table>
+</div>
+<div id="quickview"><h3 class="directives">Yönergeler</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#acceptmutex">AcceptMutex</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#coredumpdirectory">CoreDumpDirectory</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#enableexceptionhook">EnableExceptionHook</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#gracefulshutdowntimeout">GracefulShutdownTimeout</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#group">Group</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#listen">Listen</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#listenbacklog">ListenBackLog</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#lockfile">LockFile</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxclients">MaxClients</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxmemfree">MaxMemFree</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxrequestsperchild">MaxRequestsPerChild</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxsparethreads">MaxSpareThreads</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#minsparethreads">MinSpareThreads</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#pidfile">PidFile</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#receivebuffersize">ReceiveBufferSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#scoreboardfile">ScoreBoardFile</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#sendbuffersize">SendBufferSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#serverlimit">ServerLimit</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#startservers">StartServers</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#startthreads">StartThreads</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#threadlimit">ThreadLimit</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#threadsperchild">ThreadsPerChild</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#threadstacksize">ThreadStackSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#user">User</a></li>
+</ul>
+</div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="AcceptMutex" id="AcceptMutex">AcceptMutex</a> <a name="acceptmutex" id="acceptmutex">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Apache HTTPd Sunucusunun ağ soketlerinden istekleri kabul eden
+  çok sayıda çocuk süreci sıraya sokmak için kullandığı yöntemi
+  belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>AcceptMutex Default|<var>yöntem</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>AcceptMutex Default</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p><code class="directive">AcceptMutex</code> yönergesi Apache HTTPd Sunucusunun
+     ağ soketlerinden istekleri kabul eden çok sayıda çocuk süreci sıraya
+     sokmak için kullandığı yöntemi
+     belirler. Apache 2.0’dan önce, yöntem sadece derleme sırasında
+     seçilebiliyordu. Kullanılacak en uygun yöntem mimariye ve platforma aşırı
+     derecede bağımlıdır. Bu konuda daha ayrıntılı bilgi edinmek için <a href="../misc/perf-tuning.html">Başarım Arttırma İpuçları</a> belgesine
+     bakabilirsiniz.</p>
+
+    <p>Bu yönergeye değer olarak <code>Default</code> belirtilmişse derleme
+     sırasında seçilen öntanımlı yöntem kullanılacaktır. Diğer olası yöntemler
+     aşağıda listelenmiştir. Tüm yöntemlerin tüm platformlarda mevcut
+     olmadığına dikkat ediniz. Eğer belirtilen yöntem mevcut değilse hata
+     günlüğüne mevcut yöntemlerin listesini içeren bir ileti yazılacaktır.</p>
+
+    <dl>
+      <dt><code>flock</code></dt>
+      <dd><code class="directive"><a href="#lockfile">LockFile</a></code> yönergesi ile
+        belirtilen dosyayı kilitlemek için <code>flock(2)</code> sistem
+        çağrısı kullanılır.</dd>
+
+      <dt><code>fcntl</code></dt>
+      <dd><code class="directive"><a href="#lockfile">LockFile</a></code> yönergesi ile
+        belirtilen dosyayı kilitlemek için <code>fcntl(2)</code> sistem
+        çağrısı kullanılır.</dd>
+
+      <dt><code>posixsem</code></dt>
+      <dd>Muteksleri gerçeklemek için POSIX uyumlu semaforlar kullanılır.</dd>
+
+      <dt><code>pthread</code></dt>
+      <dd>POSIX Evreleri (PThreads) belirtimi tarafından gerçeklenen muteksler
+       kullanılır.</dd>
+
+      <dt><code>sysvsem</code></dt>
+      <dd>Muteksleri gerçeklemek için SysV tarzı semaforlar kullanılır.</dd>
+    </dl>
+
+    <p>Sisteminiz için derleme sırasında seçilmiş öntanımlı yöntemi öğrenmek
+      isterseniz <code class="directive"><a href="../mod/core.html#loglevel">LogLevel</a></code> yönergesine
+      <code>debug</code> değerini atayabilirsiniz. Öntanımlı <code class="directive">AcceptMutex</code>, <code class="directive"><a href="../mod/core.html#errorlog">ErrorLog</a></code>
+      ile belirtilen günlük dosyasına yazılacaktır.</p>
+
+  <div class="warning"><h3>Uyarı</h3>
+     <p>Çoğu sistemde, <code>pthread</code> seçeneği seçildiği takdirde,
+      <code>AcceptCntl</code> muteksi tutulurken bir çocuk süreç anormal
+      şekilde sonlanırsa, muteksi kurtarmak için sunucunun elle yeniden
+      başlatılması gerekecektir.</p>
+     <p>Solaris, bir muteks tutulurken, bir çocuk süreç anormal şekilde
+      sonlandıktan sonra muteksin Apache tarafından kurtarılmasına imkan veren
+      bir mekanizma sağlaması sebebiyle diğerlerinden ayrılır.</p>
+     <p>Sisteminiz <code>pthread_mutexattr_setrobust_np()</code> iÅŸlevini
+      gerçekliyorsa <code>pthread</code> seçeneğini gönül rahatlığıyla
+      kullanabilirsiniz.</p>
+  </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CoreDumpDirectory" id="CoreDumpDirectory">CoreDumpDirectory</a> <a name="coredumpdirectory" id="coredumpdirectory">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td><code>core</code> dosyasını dökümlemek üzere Apache’nin geçmeye
+  çalışacağı dizin.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>CoreDumpDirectory <var>dizin</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>Öntanımlı değer için aşağıdaki açıklamaya bakınız</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p>Bu yönerge <code>core</code> dosyasını dökümlemek üzere Apache’nin
+      geçmeye çalışacağı dizini belirler. <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> dizini öntanımlı dizin olmakla
+      birlikte, bu dizin kullanıcılar tarafından yazılabilir bir dizin
+      olmadığından bir <code>core</code> dosyası dökümlenmez. Hata ayıklama
+      amacıyla bir <code>core</code> dosyası dökümlemek isterseniz farklı bir
+      yer belirtmek için bu yönergeyi kullanabilirsiniz.</p>
+
+    <div class="note"><h3>Linux üzerinde <code>core</code> dökümlemek</h3>
+      <p>Apache root olarak başlatılıp başka bir kullanıcıya geçilirse Linux
+        çekirdeği süreç tarafından yazılabilir olsa bile <code>core</code>
+        dökümlemeyi <em>iptal eder</em>. Eğer
+        <code class="directive">CoreDumpDirectory</code> yönergesi ile açıkça bir
+        dizin belirtirseniz, Apache (2.0.46 ve sonraki sürümleri), Linux 2.4 ve
+        sonrasında <code>core</code> dökümlemeyi yeniden
+        etkinleÅŸtirecektir.</p>
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="EnableExceptionHook" id="EnableExceptionHook">EnableExceptionHook</a> <a name="enableexceptionhook" id="enableexceptionhook">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bir çöküş sonrası olağandışılık eylemcilerini çalıştıracak
+  kancayı etkin kılar.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>EnableExceptionHook On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>EnableExceptionHook Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Sürüm 2.0.49 ve sonrasında mevcuttur</td></tr>
+</table>
+    <p>Güvenlik sebebiyle bu yönerge sadece Apache
+      <code>--enable-exception-hook</code> seçeneği ile yapılandırılmışsa
+      kullanılabilir olacaktır. Bu, harici modüllerin eklenmesine ve bir çocuk
+      sürecin çöküşü sonrası bir şeyler yapmaya izin veren bir kancayı etkin
+      kılar.</p>
+
+    <p>Bu kancayı kullanan iki modül (<code>mod_whatkilledus</code> ve
+    <code>mod_backtrace</code>) zaten vardır. bunlar hakkında daha fazla bilgi
+      edinmek için Jeff Trawick'in <a href="http://www.apache.org/~trawick/exception_hook.html">EnableExceptionHook site</a>sine bakabilirsiniz.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="GracefulShutdownTimeout" id="GracefulShutdownTimeout">GracefulShutdownTimeout</a> <a name="gracefulshutdowntimeout" id="gracefulshutdowntimeout">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Sunucunun nazikçe kapatılmasının ardından ana süreç çıkana kadar
+  geçecek süre için bir zaman aşımı belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>GracefulShutDownTimeout <var>saniye</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>GracefulShutDownTimeout 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/event.html">event</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Sürüm 2.2 ve sonrasında mevcuttur</td></tr>
+</table>
+    <p><code class="directive">GracefulShutdownTimeout</code> yönergesi, sunucuya
+      "nazikçe dur" sinyali gönderildikten sonra mevcut bağlantılara hizmet
+      sunmaya daha kaç saniye devam edebileceğini belirtir.</p>
+
+    <p>Bu değerin <code>0</code> olarak belirtilmesi, sunucunun bekleyen bütün
+      isteklere hizmet sunumu tamamlanıncaya kadar (gerekirse sonsuza kadar)
+      bekleyebileceği anlamına gelir.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Group" id="Group">Group</a> <a name="group" id="group">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>İsteklere yanıt verecek sunucunun ait olacağı grubu belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>Group <var>unix-grubu</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>Group #-1</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Apache 2.0’dan itibaren sadece sunucu geneli için geçerlidir.</td></tr>
+</table>
+    <p><code class="directive">Group</code> yönergesi, sunucunun hangi grup altında
+      isteklere yanıt vereceğini belirler. Bu yönergenin uygulanabilmesi için
+      sunucunun <code>root</code> olarak çalıştırılmış olması gerekir.
+      Sunucuyu <code>root</code> dışında bir kullanıcı başlattığı takdirde,
+      sunucu belirtilen gruba geçemez ve kullanıcının kendi grubunda
+      çalışmaya devam eder. <var>unix-grubu</var> şunlardan biri olabilir:</p>
+
+    <dl>
+      <dt>Bir grup adı</dt>
+      <dd>Gruba ismiyle baÅŸvurulur.</dd>
+
+      <dt><code>#</code> ardından grup numarası</dt>
+      <dd>Gruba numarası ile başvurulur.</dd>
+    </dl>
+
+    <div class="example"><h3>Örnek</h3><p><code>
+      Group www-group
+    </code></p></div>
+
+    <p>Çalışan sunucu için özellikle yeni bir grup atamanız önerilir. Bazı
+      sistem yöneticileri <code>nobody</code> grubunu kullanırlar fakat
+      bu her zaman mümkün olmadığı gibi arzulanan da değildir.</p>
+
+    <div class="warning"><h3>Güvenlik</h3>
+      <p>Ne yaptığınızı ve ne tehlikelere yol açacağınızı bilmiyorsanız
+      <code class="directive">Group</code> (veya <code class="directive"><a href="#user">User</a></code>) yönergesine değer olarak
+      <code>root</code> atamayınız.</p>
+    </div>
+
+    <p>Özel bilgi: Bu yönergenin <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> taşıyıcısı içinde kullanımı
+      artık desteklenmemektedir. Sunucunuzu <code class="program"><a href="../programs/suexec.html">suexec</a></code> için
+      yapılandırırken <code class="directive"><a href="../mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code> yönergesini
+      kullanınız.</p>
+
+    <div class="note"><h3>Ek Bilgi</h3>
+      <p><code class="directive">Group</code> yönergesi <code class="module"><a href="../mod/beos.html">beos</a></code> ve
+        <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> MPM’lerinde mevcut olsa da, aslında
+        işlevsiz olup sadece uyumluluk adına mevcuttur.</p>
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="Listen" id="Listen">Listen</a> <a name="listen" id="listen">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Sunucunun dinleyeceği IP adresini ve portu belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>Listen [<var>IP-adresi</var>:]<var>port-numarası</var>
+  [<var>protokol</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/event.html">event</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Apache 2.0’dan beri gerekli yönergelerden biridir.<br />
+<var>protokol</var> argümanı 2.1.5 sürümünde eklenmiştir.</td></tr>
+</table>
+    <p><code class="directive">Listen</code> yönergesi Apache’yi sadece belli IP
+      adreslerini ve portlarını dinlemeye sevkeder.
+      <code class="directive">Listen</code> artık belirtilmesi zorunlu yönergelerden
+      biridir. Yapılandırma dosyasında bulunmadığı takdirde sunucu
+      başlatılırken başarısız olacaktır. Bu Apache Sunucusunun önceki
+      sürümünde böyle değildi.</p>
+
+    <p><code class="directive">Listen</code> yönergesi Apache’ye, sadece belli
+      portlardan veya IP adresi ve port çiftlerinden gelen istekleri kabul
+      etmesini söyler. Eğer sadece port numarası belirtilmişse sunucu
+      belirtilen portu bütün ağ arabirimlerinde dinleyecektir. Eğer portla
+      birlikte bir IP adresi de belirtilmiÅŸse, sunucu belirtilen portu sadece
+      belirtilen arabirimden dinleyecektir.</p>
+
+    <p>Çok sayıda IP adresi ve port belirtmek için çok sayıda
+      <code class="directive">Listen</code> yönergesi kullanılabilir. Sunucu bu
+      durumda belirtilen bütün IP adreslerinden ve portlardan gelecek
+      isteklere yanıt verecektir.</p>
+
+    <p>Örneğin sunucunun hem port 80 hem de port 8000’den istek kabul etmesini
+      istiyorsanız bunu şöyle belirtebilirsiniz:</p>
+
+    <div class="example"><p><code>
+      Listen 80<br />
+      Listen 8000
+    </code></p></div>
+
+    <p>Sunucunun belirtilen iki ağ arabiriminden ve port numarasından gelen
+      bağlantıları kabul etmesi için şu yapılandırmayı kullanabilirsiniz:</p>
+
+    <div class="example"><p><code>
+      Listen 192.170.2.1:80<br />
+      Listen 192.170.2.5:8000
+    </code></p></div>
+
+    <p>IPv6 adresleri belirtilirken örnekteki gibi köşeli ayraçlar arasına
+      alınmalıdır:</p>
+
+    <div class="example"><p><code>
+      Listen [2001:db8::a00:20ff:fea7:ccea]:80
+    </code></p></div>
+
+    <p>İsteğe bağlı <var>protocol</var> argümanı çoğu yapılandırmada gerekli
+      değildir. Belirtilmediği takdirde. port 443 için <code>https</code> ve
+      tüm diğer portlar için <code>http</code> öntanımlıdır. Protokol, isteği
+      hangi modülün elde edeceğinin ve <code class="directive"><a href="../mod/core.html#acceptfilter">AcceptFilter</a></code> yönergesi ile protokole özgü
+      hangi en iyilemelerin uygulanacağının saptanmasında kullanılır.</p>
+
+    <p>Protokol belirtme ihtiyacını sadece standartdışı portlar
+      çalıştırıyorsanız duyarsınız. Örneğin, port 8443 üzerinde bir
+      <code>https</code> sitesi çalıştırmak istiyorsanız bunu şöyle
+      belirtebilirsiniz:</p>
+
+    <div class="example"><p><code>
+      Listen 192.170.2.1:8443 https
+    </code></p></div>
+
+    <div class="note"><h3>Hata durumu</h3>
+      Aynı IP adresi ve portun çok sayıda <code class="directive">Listen</code>
+      yönergesinde belirtilmesi bir "adres kullanımda" (<code>Address already
+      in use</code>) hatasına yol açar.
+    </div>
+
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><a href="../dns-caveats.html">DNS ve Apache ile ilgili Konular</a> </li>
+<li><a href="../bind.html">Sunucunun Kullandığı Adreslerin ve Portların
+  Ayarlanması</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ListenBackLog" id="ListenBackLog">ListenBackLog</a> <a name="listenbacklog" id="listenbacklog">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Bekleyen bağlantılar kuyruğunun azami uzunluğunu
+  belirler</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ListenBacklog <var>kuyruk-uzunluğu</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>ListenBacklog 511</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p>Bekleyen bağlantılar kuyruğunun azami uzunluğu. Genellikle bu ayar ne
+      gerekir ne de istenir. Ancak bazı sistemlerde TCP SYN yüklenme
+      saldırılarına karşı bu değerin arttırılması gerekebilir.
+      <var>kuyruk-uzunluğu</var> parametresi için <code>listen(2)</code>
+      işlevinin açıklamasına bakınız.</p>
+
+    <p>Bu değer çoğunlukla işletim sistemi tarafından daha küçük bir sayıyla
+      sınırlanır. Bu, işletim sistemine bağlı olarak değişiklik gösterir.
+      Ayrıca, çoğu işletim sisteminin <var>kuyruk-uzunluğu</var> parametresi
+      ile ne belirttiğinize bakmaksızın kendisi için atanmış değeri (fakat
+      normal olarak daha büyüğünü) kullanacağına dikkat ediniz.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LockFile" id="LockFile">LockFile</a> <a name="lockfile" id="lockfile">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Apache HTTPd Sunucusunun ağ soketlerinden istekleri kabul eden
+  çok sayıda çocuk süreci sıraya sokarken kullandığı kilit dosyasının yerini
+  belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>LockFile <var>dosya</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>LockFile logs/accept.lock</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p><code class="directive">LockFile</code> yönergesi, <code class="directive"><a href="#acceptmutex">AcceptMutex</a></code> yönergesi <code>fcntl</code>
+      veya <code>flock</code> değeri ile belirtildiği takdirde kullanılan
+      kilit dosyasının yerini belirler. Bu yönerge normalde öntanımlı
+      değeriyle bırakılır. Değişmesini gerektiren ana sebep, <code>logs</code>
+      dizininin ağ dosya sisteminde (NFS) yeralması halinde <strong>kilit
+      dosyasının bir yerel diskte saklanması gereği</strong>dir. Ana sürecin
+      süreç kimliği dosyaya kendiliğinden eklenir.</p>
+
+    <div class="warning"><h3>Güvenlik</h3>
+      <p>Bu dosyayı herkesin yazabildiği <code>/var/tmp</code> gibi bir dizine
+        koymaktan kaçınmak gerekir. Çünkü, bu takdirde, birileri sunucunun
+        hizmet sunmaya başlarken oluşturacağı kilit dosyası ile aynı isimde
+        bir dosya oluşturarak hizmet reddi saldırısı (DoS) başlatabilir.</p>
+    </div>
+
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="#acceptmutex">AcceptMutex</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxClients" id="MaxClients">MaxClients</a> <a name="maxclients" id="maxclients">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>İstekleri sunarken oluşturulacak çocuk süreçlerin azami sayısını
+  belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>MaxClients <var>sayı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>Ayrıntılar için aşağıdaki açıklamaya bakınız.</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p><code class="directive">MaxClients</code> yönergesi aynı anda sunulacak istek
+      sayısını sınırlamak için kullanılır. <code class="directive">MaxClients</code>
+      istekten fazlası geldiği takdirde bu istekler normal olarak kuyruğa
+      alınıp bekletilir. Kuyrukta bekletilecek isteklerin azami sayısı ise
+      <code class="directive"><a href="#listenbacklog">ListenBacklog</a></code> yönergesi ile
+      belirlenir. İstek sunmakta olan çocuk süreçlerden biri serbest
+      kaldığında bekletilen bağlantılardan birine hizmet sunulmaya
+      başlanır.</p>
+
+    <p>Evreli olmayan sunucularda (<code class="module"><a href="../mod/prefork.html">prefork</a></code> gibi)
+      <code class="directive">MaxClients</code> yönergesi istekleri sunmak için
+      başlatılacak çocuk süreçlerin azami sayısını belirler. Öntanımlı değer
+      256 olup bu değeri arttırmak isterseniz <code class="directive"><a href="#serverlimit">ServerLimit</a></code> değerini de
+      arttırmalısınız.</p>
+
+    <p>Çok evreli ve melez sunucularda (<code class="module"><a href="../mod/beos.html">beos</a></code> veya
+      <code class="module"><a href="../mod/worker.html">worker</a></code> gibi) <code class="directive">MaxClients</code>
+      yönergesi istemcilere hizmet verecek evre sayısını sınırlar. Öntanımlı
+      değer <code class="module"><a href="../mod/beos.html">beos</a></code> için <code>50</code> iken melez MPM’ler için
+      <code class="directive"><a href="#serverlimit">ServerLimit</a></code> ile <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code> çarpımıdır (<code>16 x
+      25</code>). Bu bakımdan <code class="directive">MaxClients</code> değerini 16
+      süreçten fazlasına ayarlamak için <code class="directive"><a href="#serverlimit">ServerLimit</a></code> değerini de
+      arttırmalısınız.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxMemFree" id="MaxMemFree">MaxMemFree</a> <a name="maxmemfree" id="maxmemfree">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td><code>free()</code> çağrılmaksızın ana bellek ayırıcının
+  ayırmasına izin verilen azami bellek miktarını belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>MaxMemFree <var>kB-sayısı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>MaxMemFree 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code></td></tr>
+</table>
+    <p><code class="directive">MaxMemFree</code> yönergesi, <code>free()</code>
+      çağrılmaksızın ana bellek ayırıcının ayırmasına izin verilen azami
+      bellek miktarını kB cinsinden belirler. Bir değerle belirtilmediğinde
+      veya <code>0</code> değeriyle belirtildiğinde eşik sınırsız
+      olacaktır.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxRequestsPerChild" id="MaxRequestsPerChild">MaxRequestsPerChild</a> <a name="maxrequestsperchild" id="maxrequestsperchild">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Tek bir çocuk sürecin ömrü boyunca işleme sokabileceği istek
+  sayısını sınırlamakta kullanılır.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>MaxRequestsPerChild <var>sayı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>MaxRequestsPerChild 10000</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p><code class="directive">MaxRequestsPerChild</code> yönergesi, tek bir çocuk
+      sürecin işleme sokabileceği istek sayısını sınırlamakta kullanılır.
+      <code class="directive">MaxRequestsPerChild</code> istekten sonra çocuk süreç
+      ölür. Eğer <code class="directive">MaxRequestsPerChild</code> için
+      <code>0</code> belirtilmişse sürecin ömrü sonsuz olacaktır.</p>
+
+    <div class="note"><h3>Sıfırdan farklı öntanımlı değerler</h3>
+      <p><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> ve <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code> için
+        öntanımlı değer <code>0</code>’dır.</p>
+    </div>
+
+    <p><code class="directive">MaxRequestsPerChild</code> için sıfırdan farklı bir
+      değer belirtilmesi sürecin kullanacağı bellek miktarını sınırlamak
+      suretiyle olası bellek sızıntılarını engeller.</p>
+
+    <div class="note"><h3>Ek Bilgi</h3>
+      <p><code class="directive"><a href="../mod/core.html#keepalive">KeepAlive</a></code> isteklerinde sadece
+        ilk istek bu sınıra uygun sayılır. Etkisi ise, davranışın çocuk süreç
+        başına <em>bağlantı</em> sayısının sınırlanması şeklinde
+        deÄŸiÅŸmesidir.</p>
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxSpareThreads" id="MaxSpareThreads">MaxSpareThreads</a> <a name="maxsparethreads" id="maxsparethreads">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Boştaki azami evre sayısını belirler</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>MaxSpareThreads <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>Ayrıntılar için aşağıdaki açıklamaya bakınız.</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p>Boştaki azami evre sayısı. Her MPM bu yönerge karşısında farklı
+      davranır.</p>
+
+    <p><code class="module"><a href="../mod/worker.html">worker</a></code> için <code>MaxSpareThreads 250</code>
+      öntanımlıdır. Bu MPM boştaki evreleri sunucu genelinde izler. Eğer
+      sunucuda çok fazla boşta evre varsa, sunucu boştaki evrelerin sayısı bu
+      sınırın altına inene kadar çocuk süreçleri öldürür.</p>
+
+    <p><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> için <code>MaxSpareThreads 100</code>
+      öntanımlıdır. Bu MPM tek bir süreç olarak çalıştığından boştaki evre
+      sayısı aynı zamanda sunucu genelinde boştaki evre sayısıdır.</p>
+
+    <p><code class="module"><a href="../mod/beos.html">beos</a></code> ve <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> MPM’leri
+      <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> gibidir. <code class="module"><a href="../mod/beos.html">beos</a></code> için
+      <code>MaxSpareThreads 50</code> öntanımlıyken  <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>
+      için öntanımlı değer <code>10</code>’dur.</p>
+
+    <div class="note"><h3>Kısıtlamalar</h3>
+      <p><code class="directive">MaxSpareThreads</code> için değer aralığı sınırlıdır.
+        Apache belirtilen değeri aşağıdaki kurallara uygun olarak
+        kendiliğinden düzeltecektir:</p>
+      <ul>
+        <li><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> modülü, değerin <code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code> değerinden küçük
+          olmasını gerektirir.</li>
+
+        <li><code class="module"><a href="../mod/worker.html">worker</a></code> için değer, <code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code>
+          ve <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code>
+          toplamına eşit veya büyük olmak zorundadır.</li>
+      </ul>
+    </div>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="#minsparethreads">MinSpareThreads</a></code></li>
+<li><code class="directive"><a href="#startservers">StartServers</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MinSpareThreads" id="MinSpareThreads">MinSpareThreads</a> <a name="minsparethreads" id="minsparethreads">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>İsteklerin ani artışında devreye girecek boştaki evrelerin asgari
+  sayısını belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>MinSpareThreads <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>Ayrıntılar için aşağıdaki açıklamaya bakınız.</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p>İsteklerin ani artışında devreye girecek boştaki evrelerin asgari
+      sayısı. Her MPM bu yönerge karşısında farklı davranır.</p>
+
+    <p><code class="module"><a href="../mod/worker.html">worker</a></code> için <code>MinSpareThreads 75</code>
+      öntanımlıdır ve bu modüller boştaki evreleri sunucu genelinde
+      izler. Eğer sunucuda boştaki evre sayısı yetersizse, sunucu boştaki
+      evrelerin sayısı bu sınırın üstüne çıkana kadar çocuk süreç
+      oluÅŸturur.</p>
+
+    <p><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> için <code>MinSpareThreads 10</code>
+      öntanımlıdır ve tek süreç kendisi olduğundan izleme sunucu genelinde
+      yapılır.</p>
+
+    <p><code class="module"><a href="../mod/beos.html">beos</a></code> ve <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> modülleri
+      <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> gibidir. <code class="module"><a href="../mod/beos.html">beos</a></code> için
+      <code>MinSpareThreads 1</code> öntanımlı iken <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>
+      için öntanımlı değer <code>5</code>’tir.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><code class="directive"><a href="#maxsparethreads">MaxSpareThreads</a></code></li>
+<li><code class="directive"><a href="#startservers">StartServers</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="PidFile" id="PidFile">PidFile</a> <a name="pidfile" id="pidfile">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Ana sürecin süreç kimliğinin (PID) kaydedileceği dosyayı belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>PidFile <var>dosya</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>PidFile logs/httpd.pid</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p><code class="directive">PidFile</code> yönergesi, sunucunun artalan sürecinin
+      süreç kimliğinin kaydedileceği dosyayı belirler. Dosya ismi mutlak dosya
+      yoluyla belirtilmemişse dosya yolunun <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> dizinine göre belirtildiği kabul
+      edilir.</p>
+
+    <div class="example"><h3>Örnek</h3><p><code>
+      PidFile /var/run/apache.pid
+    </code></p></div>
+
+    <p>Sunucuya sinyal gönderebilmek çoğunlukla işe yarar. Böylece <code class="directive"><a href="../mod/core.html#errorlog">ErrorLog</a></code> ve <code class="directive"><a href="../mod/mod_log_config.html#transferlog">TransferLog</a></code> dosyaları kapatılıp
+      yeniden açılır ve yapılandırma dosyaları yeniden okunur. Bu,
+      <code class="directive">PidFile</code> dosyasında belirtilen süreç kimliğine bir
+      SIGHUP (kill -1) sinyali gönderilerek yapılır.</p>
+
+    <p>Günlük dosyasının yeri ve <a href="../misc/security_tips.html#serverroot">güvenlik</a> ile ilgili
+      uyarılar <code class="directive">PidFile</code> dosyası içinde sözkonusu
+      olabilir.</p>
+
+    <div class="note"><h3>Ek Bilgi</h3>
+      <p>Apache 2’de sunucuyu (yeniden) başlatırken veya durdururken sadece
+        <code class="program"><a href="../programs/apachectl.html">apachectl</a></code> betiğini kullanmanız önerilir.</p>
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ReceiveBufferSize" id="ReceiveBufferSize">ReceiveBufferSize</a> <a name="receivebuffersize" id="receivebuffersize">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>TCP alım tamponu boyu</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ReceiveBufferSize <var>bayt-sayısı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>ReceiveBufferSize 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p>Sunucu TCP alım tamponu boyunu <var>bayt-sayısı</var> ile belirtilen
+      bayta ayarlayacaktır.</p>
+
+    <p><code>0</code> değeri atarsanız sunucu işletim sistemi öntanımlısını
+      kullanacaktır.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ScoreBoardFile" id="ScoreBoardFile">ScoreBoardFile</a> <a name="scoreboardfile" id="scoreboardfile">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Çocuk süreçler için eşgüdüm verisini saklamakta kullanılan
+  dosyanın yerini belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ScoreBoardFile <var>dosya-yolu</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>ScoreBoardFile logs/apache_status</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p>Apache ana ve çocuk süreçler arasında iletişim için bir çetele tutar.
+      Bazı mimariler bu iletişimi kolaylaştırmak için bir dosya gerektirir.
+      Eğer yönerge belirtilmezse Apache çeteleyi önce tamamen bellekte
+      oluşturmayı dener (anonim paylaşımlı bellek kullanarak); bunda başarılı
+      olamazsa dosyayı diskte oluşturmaya çalışacaktır (paylaşımlı belleğe
+      eşlemli dosya kullanarak). Bu yönergenin belirtilmesi Apache sunucusunun
+      dosyayı daima diskte oluşturmasına sebep olur.</p>
+
+    <div class="example"><h3>Örnek</h3><p><code>
+      ScoreBoardFile /var/run/apache_status
+    </code></p></div>
+
+    <p>Paylaşımlı belleğe eşlemli dosya, çeteleye doğrudan erişmesi gereken
+      üçüncü parti uygulamalar için yararlıdır.</p>
+
+    <p>Eğer <code class="directive">ScoreBoardFile</code> yönergesi ile bir dosya
+      belirtecekseniz, dosyayı bir RAM diske yerleştirerek hız artışı
+      sağlayabilirsiniz. Fakat, günlük dosyası yerleştirme ve <a href="../misc/security_tips.html">güvenlik</a> ile ilgili uyarılara
+      benzer uyarılara karşı dikkatli olunuz.</p>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><a href="../stopping.html">Sunucuyu Durdurma ve Yeniden BaÅŸlatma</a> </li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SendBufferSize" id="SendBufferSize">SendBufferSize</a> <a name="sendbuffersize" id="sendbuffersize">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>TCP tamponu boyu</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>SendBufferSize <var>bayt-sayısı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>SendBufferSize 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p>Sunucu TCP gönderim tamponu boyunu <var>bayt-sayısı</var> ile
+      belirtilen bayta ayarlayacaktır. Yüksek hızlı yüksek yataklık süresi
+      için standart işletim sistemi öntanımlılarını arttırmak çok yararlıdır
+      (örneğin, kıtalar arası hızlı borularda olduğu gibi 100 ms
+      civarında).</p>
+
+    <p><code>0</code> değeri atarsanız sunucu işletim sistemi öntanımlısını
+      kullanacaktır.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ServerLimit" id="ServerLimit">ServerLimit</a> <a name="serverlimit" id="serverlimit">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Ayarlanabilir süreç sayısının üst sınırını belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ServerLimit <var>sayı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>Ayrıntılar için aşağıdaki açıklamaya bakınız.</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p><code class="module"><a href="../mod/prefork.html">prefork</a></code> modülü söz konusu olduğunda bu yönerge, Apache
+      sürecinin ömrü boyunca <code class="directive"><a href="#maxclients">MaxClients</a></code> yönergesine atanabilecek
+      azami değeri belirler. <code class="module"><a href="../mod/worker.html">worker</a></code> modülü sözkonusu
+      olduğunda ise, Apache sürecinin ömrü boyunca <code class="directive"><a href="#maxclients">MaxClients</a></code> yönergesine atanabilecek
+      azami deÄŸeri <code class="directive"><a href="#threadlimit">ThreadLimit</a></code> ile
+      birlikte belirler. Bu yönergeyi bir yeniden başlatma sırasında
+      değiştirirseniz bu değişiklik yok sayılır fakat <code class="directive"><a href="#maxclients">MaxClients</a></code> değişiklikleri dikkate
+      alınır.</p>
+
+    <p>Bu yönergenin kullanılması özel bir dikkat gerektirir. Eğer
+      <code class="directive">ServerLimit</code> gereğinden yüksek bir değere
+      ayarlanırsa, gereksiz yere paylaşımlı bellek ayrılmış olur. Eğer
+      <code class="directive">ServerLimit</code> ve <code class="directive"><a href="#maxclients">MaxClients</a></code> deÄŸerleri sistemin
+      işleyebileceğinden daha yüksek değerlere ayarlanırsa Apache
+      başlayamayacağı gibi sistemi kararsız hale de getirebilir.</p>
+
+    <p>Bu yönergeyi <code class="module"><a href="../mod/prefork.html">prefork</a></code> modülü ile sadece <code class="directive"><a href="#maxclients">MaxClients</a></code> yönergesine 256’dan
+      (öntanımlı) daha büyük bir değer atayacaksanız kullanınız. Bu yönergeye
+      <code class="directive"><a href="#maxclients">MaxClients</a></code> için atamak
+      istediğiniz değerden fazlasını atamayınız.</p>
+
+    <p><code class="module"><a href="../mod/worker.html">worker</a></code> modülü söz konusu olduğunda bu yönergeyi
+      <code class="directive"><a href="#maxclients">MaxClients</a></code> ve
+      <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code> ayarları 16
+      sunucu sürecinden (16 öntanımlıdır) fazlasını gerektiriyorsa
+      ayarlayınız. Bu yönergeye <code class="directive"><a href="#maxclients&#10;      ">MaxClients
+      </a></code> ve <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code> için gerekli gördüğünüz
+      sunucu süreci sayısından fazlasını atamayınız.</p>
+
+    <div class="note"><h3>Ek Bilgi</h3>
+      <p>Sunucu içinde derlenmiş olarak <code>ServerLimit 20000</code>
+        şeklinde bir zorlayıcı sınır vardır (<code class="module"><a href="../mod/prefork.html">prefork</a></code> için
+        200000’dir). Bu önlem, yazım hatalarının istenmeyen sonuçlara yol
+        açmasını engellemek için düşünülmüştür.</p>
+    </div>
+
+<h3>Ayrıca bakınız:</h3>
+<ul>
+<li><a href="../stopping.html">Sunucuyu Durdurma ve Yeniden BaÅŸlatma</a> </li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="StartServers" id="StartServers">StartServers</a> <a name="startservers" id="startservers">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Sunucunun başlatılması sırasında oluşturulan çocuk süreçlerin
+  sayısını belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>StartServers <var>sayı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>Ayrıntılar için aşağıdaki açıklamaya bakınız.</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code>, <code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p><code class="directive">StartServers</code> yönergesi, sunucunun başlatılması
+      sırasında oluşturulan çocuk süreçlerin sayısını belirler. Süreç sayısı
+      normal olarak yüke bağlı olarak değişse de bu değerin ayarlanmasını
+      gerektirecek küçük bir sebep vardır.</p>
+
+    <p>Öntanımlı değer MPM’den MPM’e fark eder. Öntanımlı değer
+      <code class="module"><a href="../mod/worker.html">worker</a></code> için <code>3</code> iken
+      <code class="module"><a href="../mod/prefork.html">prefork</a></code> için <code>5</code> ve
+      <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> için <code>2</code>’dir.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="StartThreads" id="StartThreads">StartThreads</a> <a name="startthreads" id="startthreads">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Sunucunun başlatılması sırasında oluşturulan evrelerin sayısını
+  belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>StartThreads <var>sayı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>Ayrıntılar için aşağıdaki açıklamaya bakınız.</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/beos.html">beos</a></code>, <code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code></td></tr>
+</table>
+    <p><code class="directive">StartThreads</code> yönergesi, sunucunun başlatılması
+      sırasında oluşturulan evrelerin sayısını belirler. Evre sayısı normal
+      olarak yüke bağlı olarak değişse de bu değerin ayarlanmasını
+      gerektirecek küçük bir sebep vardır.</p>
+
+    <p><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code> için <code>StartThreads 50</code>
+      öntanımlı olup, sadece tek bir süreç olduğundan, sunucunun başlatılması
+      sırasında oluşturulan evrelerin toplam sayısı <code>50</code>’dir.</p>
+
+    <p><code class="module"><a href="../mod/beos.html">beos</a></code> için <code>StartThreads 10</code> öntanımlı olup
+      sunucunun başlatılması sırasında oluşturulan evrelerin toplam sayısı
+      <code>10</code>’dur.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ThreadLimit" id="ThreadLimit">ThreadLimit</a> <a name="threadlimit" id="threadlimit">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Çocuk süreç başına ayarlanabilir evre sayısının üst sınırını
+  belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ThreadLimit <var>sayı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>Ayrıntılar için aşağıdaki açıklamaya bakınız.</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td><code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code> için Apache 2.0.41 ve sonrasında mevcuttur.</td></tr>
+</table>
+    <p>Bu yönerge, Apache sürecinin ömrü boyunca <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code> yönergesine
+      atanabilecek azami değeri belirler. Bu yönergeyi bir yeniden başlatma
+      sırasında değiştirirseniz bu değişiklik yok sayılır fakat <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code> değişiklikleri dikkate
+      alınır.</p>
+
+    <p>Bu yönergenin kullanılması özel bir dikkat gerektirir. Eğer
+      <code class="directive">ThreadLimit</code> değeri <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code> değerinden yüksek bir
+      değere ayarlanırsa, gereksiz yere paylaşımlı bellek ayrılmış olur. Eğer
+      <code class="directive">ThreadLimit</code> ve <code class="directive"><a href="#threadsperchild">ThreadsPerChild</a></code> deÄŸerleri sistemin
+      işleyebileceğinden daha yüksek değerlere ayarlanırsa Apache
+      başlayamayacağı gibi sistemi kararsız hale de getirebilir. Bu yönergeye
+      Apache sunucusunun çalışması için öngörülmüş en büyük değerden daha
+      yükseğini atamayınız.</p>
+
+    <p><code class="directive">ThreadLimit</code> yönergesinin öntanımlı değeri
+      <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code> için <code>1920</code>, diğerleri için
+      <code>64</code>’tür.</p>
+
+    <div class="note"><h3>Ek Bilgi</h3>
+      <p>Sunucu içinde derlenmiş olarak <code>ThreadLimit 20000</code>
+        şeklinde bir zorlayıcı sınır vardır (<code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code> için
+        15000’dir). Bu önlem, yazım hatalarının istenmeyen sonuçlara yol
+        açmasını engellemek için düşünülmüştür.</p>
+    </div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ThreadsPerChild" id="ThreadsPerChild">ThreadsPerChild</a> <a name="threadsperchild" id="threadsperchild">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>Her çocuk süreç tarafından oluşturulan evrelerin sayısını
+  belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ThreadsPerChild <var>sayı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>Ayrıntılar için aşağıdaki açıklamaya bakınız.</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+</table>
+    <p>Bu yönerge, her çocuk süreç tarafından oluşturulan evrelerin sayısını
+      belirler. Çocuk süreçler bu evreleri başlatıldıklarında oluştururlar ve
+      bundan daha fazlasını asla oluşturmazlar. <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>
+      gibi sadece bir çocuk sürecin bulunduğu bir MPM kullanıyorsanız, bu
+      sayı sunucunun tüm yükünü kaldırabilecek kadar büyük olmalıdır.
+      <code class="module"><a href="../mod/worker.html">worker</a></code> gibi çok çocuk süreçli bir MPM kullanıyorsanız,
+      <em>toplam</em> evre sayısı sunucunun tüm yükünü kaldırabilecek kadar
+      büyük olmalıdır.</p>
+
+    <p><code class="directive">ThreadsPerChild</code> için öntanımlı değer
+      <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code> kullanıldığında <code>64</code> diğerleri
+      için <code>25</code>’tir.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ThreadStackSize" id="ThreadStackSize">ThreadStackSize</a> <a name="threadstacksize" id="threadstacksize">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>İstemci bağlantılarını elde eden evreler tarafından kullanılan
+  yığıtın bayt cinsinden uzunluğunu belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>ThreadStackSize <var>boyut</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>NetWare üzerinde 65536; diğer işletim sistemlerinde
+  deÄŸiÅŸir.</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/mpm_netware.html">mpm_netware</a></code>, <code class="module"><a href="../mod/mpm_winnt.html">mpm_winnt</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Apache 2.1 ve sonrasında mevcuttur.</td></tr>
+</table>
+    <p><code class="directive">ThreadStackSize</code> yönergesi, istemci
+      bağlantılarını elde eden evreler ve bu bağlantıları işlemekte yardımcı
+      olan modül çağrıları tarafından kullanılan yığıtın bayt cinsinden
+      uzunluğunu belirler. Çoğu durumda işletim sistemi yığıtı uygun bir
+      boyuta ayarlar, fakat yine de ayarlanmasını gerektirecek bazı durumlar
+      olabilir:</p>
+
+    <ul>
+      <li>HP-UX gibi görece küçük yığıt boyuna sahip platformlarda, Apache,
+        görece büyük yığıt alanı kullanan bazı üçüncü parti modüller yüzünden
+        çökebilir. Bu modüller öntanımlı yığıt boyu daha büyük olan diğer
+        platformlarda sorunsuz çalışabilir. Bu tür çökmeler
+        <code class="directive">ThreadStackSize</code> yönergesine daha büyük yığıt
+        boyu atanarak çözümlenir. Böyle bir ayarlamayı sadece üçüncü parti
+        modülün üreticisi bunun gerekliliğini belirtmişse veya Apache’nin
+        evre yığıt boyutunun küçüklüğünden dolayı çöktüğü teşhis edildiği
+        takdirde yapınız.</li>
+
+      <li>Öntanımlı yığıt boyu Apache sunucusu için gerekenden belirgin
+        şekilde büyük bazı platformalarda, eğer
+        <code class="directive">ThreadStackSize</code> yönergesi ile bu boyuttan daha
+        düşük bir değer atanmışsa çocuk süreç başına evre sayısının yüksek
+        olduğu durumlarda bu yığıt yetmeyebilir. Böyle bir ayarlama sadece
+        sunucunun öldüresiye denendiği dolayısıyla yığıt boyutlarının aşırı
+        zorlandığı deneme ortamlarında yapılmalıdır. Sunucu yapılandırmasında
+        yapılan bir değişiklik mevcut <code class="directive">ThreadStackSize</code>
+        ayarını geçersiz hale getirebilir.</li>
+    </ul>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="User" id="User">User</a> <a name="user" id="user">Yönergesi</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Açıklama:</a></th><td>İsteklere yanıt verecek sunucunun ait olacağı kullanıcıyı
+  belirler.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Sözdizimi:</a></th><td><code>User <var>unix-kullanıcısı</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Öntanımlı:</a></th><td><code>User #-1</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">BaÄŸlam:</a></th><td>sunucu geneli</td></tr>
+<tr><th><a href="directive-dict.html#Status">Durum:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">Modül:</a></th><td><code class="module"><a href="../mod/prefork.html">prefork</a></code>, <code class="module"><a href="../mod/worker.html">worker</a></code></td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Uyumluluk:</a></th><td>Apache 2.0’dan itibaren sadece sunucu geneli için
+  geçerlidir.</td></tr>
+</table>
+    <p><code class="directive">User</code> yönergesi, sunucunun hangi kullanıcı olarak
+      isteklere yanıt vereceğini belirler. Bu yönergenin uygulanabilmesi için
+      sunucunun <code>root</code> olarak çalıştırılmış olması gerekir.
+      Sunucuyu <code>root</code> dışında bir kullanıcı başlattığı takdirde,
+      sunucu belirtilen kullanıcıya geçemez ve mevcut kullanıcıyla çalışmaya
+      devam eder. Eğer sunucuyu <code>root</code> olarak başlatmışsanız ana
+      süreç root olarak çalışmaya devam edecektir. <var>unix-kullanıcısı</var>
+      ÅŸunlardan biri olabilir:</p>
+
+    <dl>
+      <dt>Bir kullanıcı adı</dt>
+      <dd>Gruba ismiyle baÅŸvurulur.</dd>
+
+      <dt><code>#</code> ardından kullanıcı numarası</dt>
+      <dd>Kullanıcıya numarası ile başvurulur.</dd>
+    </dl>
+
+    <p>Bu yönergede belirtilecek kullanıcının, başkaları tarafından üzerinde
+      değişiklik yapılabilecek dosyalardan başkasına erişemeyen bir kullanıcı
+      olmaması gerektiği gibi, HTTP isteklerini işlemek dışında işlemler de
+      yapabilen bir kullanıcı olmamalıdır.
+      Çalışan sunucu için özellikle yeni bir grup atamanız önerilir. Bazı
+      sistem yöneticileri <code>nobody</code> kullanıcısını kullanırlar fakat
+      <code>nobody</code> kullanıcısı sistemde başka amaçlarla
+      kullanılabildiğinden bu her zaman mümkün olmadığı gibi arzulanan da
+      deÄŸildir.</p>
+
+    <div class="warning"><h3>Güvenlik</h3>
+      <p>Ne yaptığınızı ve ne tehlikelere yol açacağınızı bilmiyorsanız
+      <code class="directive">User</code> (veya <code class="directive"><a href="#group">Group</a></code>) yönergesine değer olarak
+      <code>root</code> atamayınız.</p>
+    </div>
+
+    <p>Özel bilgi: Bu yönergenin <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> taşıyıcısı içinde kullanımı
+      artık desteklenmemektedir. Sunucunuzu <code class="program"><a href="../programs/suexec.html">suexec</a></code> için
+      yapılandırırken <code class="directive"><a href="../mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code> yönergesini
+      kullanınız.</p>
+
+    <div class="note"><h3>Ek Bilgi</h3>
+      <p><code class="directive">User</code>yönergesi <code class="module"><a href="../mod/beos.html">beos</a></code> ve
+        <code class="module"><a href="../mod/mpmt_os2.html">mpmt_os2</a></code> MPM’lerinde mevcut olsa da, aslında
+        işlevsiz olup sadece uyumluluk adına mevcuttur.</p>
+    </div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="../de/mod/mpm_common.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/mpm_common.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/mpm_common.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../tr/mod/mpm_common.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mpm_netware.html b/docs/manual/mod/mpm_netware.html
index 03b1ca93..4b973d16 100644
--- a/docs/manual/mod/mpm_netware.html
+++ b/docs/manual/mod/mpm_netware.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mpm_netware.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mpm_netware.html.en b/docs/manual/mod/mpm_netware.html.en
index e42ed879..2f5e8a97 100644
--- a/docs/manual/mod/mpm_netware.html.en
+++ b/docs/manual/mod/mpm_netware.html.en
@@ -105,6 +105,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mpm_netware.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mpm_winnt.html b/docs/manual/mod/mpm_winnt.html
index c5d89ac9..2c0ccc92 100644
--- a/docs/manual/mod/mpm_winnt.html
+++ b/docs/manual/mod/mpm_winnt.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mpm_winnt.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -6,6 +8,6 @@ URI: mpm_winnt.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mpm_winnt.html.ja.euc-jp
+URI: mpm_winnt.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/mpm_winnt.html.de b/docs/manual/mod/mpm_winnt.html.de
index 33743788..06b5088f 100644
--- a/docs/manual/mod/mpm_winnt.html.de
+++ b/docs/manual/mod/mpm_winnt.html.de
@@ -89,6 +89,6 @@ Direktive, um den Gebrauch von AcceptEx() zu deaktivieren.</code></td></tr>
 <a href="../en/mod/mpm_winnt.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mpm_winnt.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mpm_winnt.html.en b/docs/manual/mod/mpm_winnt.html.en
index 6fac9763..a8cde033 100644
--- a/docs/manual/mod/mpm_winnt.html.en
+++ b/docs/manual/mod/mpm_winnt.html.en
@@ -89,6 +89,6 @@ NT.</td></tr>
 <a href="../en/mod/mpm_winnt.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mpm_winnt.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mpm_winnt.html.ja.euc-jp b/docs/manual/mod/mpm_winnt.html.ja.utf8
index e6706cc4..696d4324 100644
--- a/docs/manual/mod/mpm_winnt.html.ja.euc-jp
+++ b/docs/manual/mod/mpm_winnt.html.ja.utf8
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="EUC-JP"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
               This file is generated from xml source: DO NOT EDIT
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       -->
-<title>mpm_winnt - Apache HTTP ¥µ¡¼¥Ð</title>
+<title>mpm_winnt - Apache HTTP サー�</title>
 <link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
 <link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
 <link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
 <link href="../images/favicon.ico" rel="shortcut icon" /></head>
 <body>
 <div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
 <img alt="" src="../images/feather.gif" /></div>
 <div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
 <div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
 <div id="page-content">
 <div id="preamble"><h1>Apache MPM winnt</h1>
 <div class="toplang">
@@ -25,22 +25,20 @@
 <a href="../en/mod/mpm_winnt.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mpm_winnt.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>Windows NT
-¸þ¤±¤ËºÇŬ²½¤µ¤ì¤¿¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>mpm_winnt_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>mpm_winnt.c</td></tr></table>
-<h3>³µÍ×</h3>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>Windows NT
+���最�化�れ�マル�プロセッシングモジュール</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>mpm_winnt_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>mpm_winnt.c</td></tr></table>
+<h3>概�</h3>
 
-    <p>¤³¤Î¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë (MPM)
-    ¤Ï Windows NT ¤Ç¤Î¥Ç¥Õ¥©¥ë¥È¤Ë¤Ê¤ê¤Þ¤¹¡£
-    °ì¤Ä¤ÎÀ©¸æÍÑ¥×¥í¥»¥¹¤òÍѤ¤¡¢¤³¤ì¤¬°ì¤Ä¤Î»Ò¥×¥í¥»¥¹¤òµ¯Æ°¤·¡¢
-    ¤½¤·¤Æ»Ò¥×¥í¥»¥¹¤¬¥ê¥¯¥¨¥¹¥È¤ò¼è¤ê°·¤¦¤¿¤á¤Ë¥¹¥ì¥Ã¥É¤ò
-    µ¯Æ°¤·¤Þ¤¹¡£</p>
+    <p>��マル�プロセッシングモジュール (MPM)
+    � Windows NT ��デフォルト��り��。
+    一��制御用プロセスを用���れ�一���プロセスを起動��
+    ����プロセス�リクエストを�り扱����スレッドを
+    起動���。</p>
 </div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
 <ul id="toc">
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
@@ -48,6 +46,7 @@
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#pidfile">PidFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#receivebuffersize">ReceiveBufferSize</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#scoreboardfile">ScoreBoardFile</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
 <li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadlimit">ThreadLimit</a></li>
@@ -58,23 +57,23 @@
 </div>
 
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="Win32DisableAcceptEx" id="Win32DisableAcceptEx">Win32DisableAcceptEx</a> <a name="win32disableacceptex" id="win32disableacceptex">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
+<div class="directive-section"><h2><a name="Win32DisableAcceptEx" id="Win32DisableAcceptEx">Win32DisableAcceptEx</a> <a name="win32disableacceptex" id="win32disableacceptex">ディレクティブ</a></h2>
 <table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¤Î¼õ¤±ÉÕ¤±¤Ë accept() ¤òAcceptEx ¤ÎÂå¤ï¤ê¤Ë»È¤¦</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>Win32DisableAcceptEx</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>AcceptEx() ¤Ï¥Ç¥Õ¥©¥ë¥È¤ÇÍ­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£AcceptEx() ¤ò̵¸ú¤Ë¤¹¤ë
-¤¿¤á¤Ë¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¤¤Þ¤¹¡£</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>mpm_winnt</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">¸ß´¹À­:</a></th><td>2.0.49 ¥Ð¡¼¥¸¥ç¥ó°Ê¹ß¤Ç»ÈÍѲÄǽ</td></tr>
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>�ットワーク接続���付�� accept() をAcceptEx �代�り�使�</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>Win32DisableAcceptEx</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>AcceptEx() �デフォルト�有効�������。AcceptEx() を無効��る
+�����ディレクティブを使���。</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>mpm_winnt</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">互�性:</a></th><td>2.0.49 �ージョン以��使用�能</td></tr>
 </table>
-    <p>AcceptEx() ¤Ï Microsoft WinSock v2 API ¤Ç¡¢¾ì¹ç¤Ë¤è¤Ã¤Æ¤Ï
-    BSD ·Á¼°¤Î <code>accept()</code> API ¤è¤ê¤â¤è¤¤À­Ç½¤òȯ´ø¤·¤Þ¤¹¡£
-    ¤è¤¯»È¤ï¤ì¤Æ¤¤¤ë Windows À½ÉʤÎÃæ¤Ç¡¢Æä˥¦¥£¥ë¥¹¥¹¥­¥ã¥Ê¤ä VPN ¥Ñ¥Ã¥±¡¼¥¸
-    ¤ÎÃæ¤Ë¤Ï¡¢¥Ð¥°¤¬¸¶°ø¤Ç <code>AcceptEx()</code> ¤ÎŬÀÚ¤ÊÆ°ºî¤ò˸¤²¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£
-    °Ê²¼¤Î¤è¤¦¤Ê¥¨¥é¡¼¤ËÁø¶ø¤·¤¿¾ì¹ç¤Ï¡¢¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ·¤Æ
-    <code>AcceptEx()</code> ¤ò»ÈÍѤ·¤Ê¤¤¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
+    <p>AcceptEx() � Microsoft WinSock v2 API ��場��よ���
+    BSD 形�� <code>accept()</code> API よりもよ�性能を発����。
+    よ�使�れ��る Windows 製��中��特�ウィルススキャナや VPN パッケージ
+    �中����グ�原因� <code>AcceptEx()</code> ��切�動作を妨�るも���り��。
+    以下�よ��エラー�����場�����ディレクティブを使用��
+    <code>AcceptEx()</code> を使用���よ��������。</p>
 
     <div class="example"><p><code>
         [error] (730038)An operation was attempted on something that is
@@ -88,6 +87,6 @@
 <a href="../en/mod/mpm_winnt.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mpm_winnt.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mpmt_os2.html b/docs/manual/mod/mpmt_os2.html
index df2b37df..eb0b883e 100644
--- a/docs/manual/mod/mpmt_os2.html
+++ b/docs/manual/mod/mpmt_os2.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mpmt_os2.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mpmt_os2.html.en b/docs/manual/mod/mpmt_os2.html.en
index 035eb061..83318aa7 100644
--- a/docs/manual/mod/mpmt_os2.html.en
+++ b/docs/manual/mod/mpmt_os2.html.en
@@ -68,6 +68,6 @@ uses</a></li>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mpmt_os2.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/prefork.html b/docs/manual/mod/prefork.html
index 4676cc4f..76d4d3d9 100644
--- a/docs/manual/mod/prefork.html
+++ b/docs/manual/mod/prefork.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: prefork.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -6,6 +8,6 @@ URI: prefork.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: prefork.html.ja.euc-jp
+URI: prefork.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/prefork.html.de b/docs/manual/mod/prefork.html.de
index dc3d0fed..56548f56 100644
--- a/docs/manual/mod/prefork.html.de
+++ b/docs/manual/mod/prefork.html.de
@@ -186,6 +186,6 @@
 <a href="../en/mod/prefork.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/prefork.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/prefork.html.en b/docs/manual/mod/prefork.html.en
index be212529..0f19987a 100644
--- a/docs/manual/mod/prefork.html.en
+++ b/docs/manual/mod/prefork.html.en
@@ -171,6 +171,6 @@ uses</a></li>
 <a href="../en/mod/prefork.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/prefork.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/prefork.html.ja.euc-jp b/docs/manual/mod/prefork.html.ja.euc-jp
deleted file mode 100644
index 3432f7ba..00000000
--- a/docs/manual/mod/prefork.html.ja.euc-jp
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>prefork - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache MPM prefork</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../de/mod/prefork.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="../en/mod/prefork.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/prefork.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥¹¥ì¥Ã¥É¤ò»È¤ï¤º¡¢Àè¹Ô¤·¤Æ fork ¤ò¹Ô¤Ê¤¦¥¦¥§¥Ö¥µ¡¼¥Ð¤ò¼ÂÁõ
-</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>mpm_prefork_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>prefork.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë (MPM) ¤Ï¡¢
-    Unix ¾å¤Ç¤Î Apache 1.3 ¤Î¥Ç¥Õ¥©¥ë¥È¤ÎµóÆ°¤ÈÈó¾ï¤Ë¤è¤¯»÷¤¿ÊýË¡¤Ç
-    ¥ê¥¯¥¨¥¹¥È¤ò½èÍý¤¹¤ë¡¢¥¹¥ì¥Ã¥É¤ò»È¤ï¤º¡¢Àè¹Ô¤·¤Æ fork ¤ò¹Ô¤Ê¤¦
-    ¥¦¥§¥Ö¥µ¡¼¥Ð¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£
-    ¥¹¥ì¥Ã¥É¥»¡¼¥Õ¤Ç¤Ê¤¤¥é¥¤¥Ö¥é¥ê¤È¤Î¸ß´¹À­¤ò¤È¤ë¤¿¤á¤Ë¡¢
-    ¥¹¥ì¥Ã¥É¤òÈò¤±¤ëɬÍפΤ¢¤ë¥µ¥¤¥È¤Ç¤Ï¡¢¤³¤Î¥â¥¸¥å¡¼¥ë¤Î»ÈÍѤ¬Å¬ÀڤǤ·¤ç¤¦¡£
-    ¤¢¤ë¥ê¥¯¥¨¥¹¥È¤ÇȯÀ¸¤·¤¿ÌäÂ꤬¾¤Î¥ê¥¯¥¨¥¹¥È¤Ë±Æ¶Á¤·¤Ê¤¤¤è¤¦¤Ë¡¢
-    ¸Ä¡¹¤Î¥ê¥¯¥¨¥¹¥È¤òñΥ¤¹¤ë¤Î¤Ë¤â¡¢ºÇŬ¤Ê MPM ¤Ç¤¹¡£</p>
-
-    <p>¤³¤Î MPM ¤ÏÈó¾ï¤Ë¼«Î§Åª¤Ê¤Î¤Ç¡¢¤³¤Î MPM ¤ÎÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    Ä´À°¤¹¤ëɬÍפϤۤȤó¤É¤Ê¤¤¤Ç¤·¤ç¤¦¡£¤â¤Ã¤È¤â½ÅÍפʤ³¤È¤Ï¡¢
-    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
-    ¤¬¡¢Í½ÁÛ¤µ¤ì¤ëƱ»þ¥ê¥¯¥¨¥¹¥È¿ô¤ò½½Ê¬°·¤¨¤ë¤°¤é¤¤¤ÏÂ礭¤¤¤±¤ì¤É¤â¡¢
-    Á´¥×¥í¥»¥¹¤Ë½½Ê¬¤ÊʪÍý¥á¥â¥ê¤¬³Î¼Â¤Ë¹Ô¤­ÅϤëÄøÅ٤ˤϾ®¤µ¤¤Ãͤˤ¹¤ë¡¢
-    ¤È¤¤¤¦¤³¤È¤Ç¤¹¡£</p>
-
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#acceptmutex">AcceptMutex</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#enableexceptionhook">EnableExceptionHook</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#group">Group</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listenbacklog">ListenBacklog</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#lockfile">LockFile</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxclients">MaxClients</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#maxspareservers">MaxSpareServers</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#minspareservers">MinSpareServers</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#pidfile">PidFile</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#scoreboardfile">ScoreBoardFile</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#serverlimit">ServerLimit</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startservers">StartServers</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#how-it-works">Æ°ºîÊýË¡</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><a href="../bind.html">Apache
-¤¬»ÈÍѤ¹¤ë¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤ÎÀßÄê</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="how-it-works" id="how-it-works">Æ°ºîÊýË¡</a></h2>
-    <p>°ì¤Ä¤Î¥³¥ó¥È¥í¡¼¥ë¥×¥í¥»¥¹¤¬¡¢
-    ¥³¥Í¥¯¥·¥ç¥ó¤ËÂФ·¤Æ listen ¤·¤Æ¡¢¤·¤«¤ë¤Ù¤­»þ¤Ë±þÅú¤¹¤ë
-    »Ò¥×¥í¥»¥¹¤òµ¯Æ°¤·¤Þ¤¹¡£Apache ¤Ï¾ï¤Ë´ö¤Ä¤«¤Î<dfn>¥¹¥Ú¥¢</dfn>
-    ¤«¥¢¥¤¥É¥ë¤Ê¥µ¡¼¥Ð¥×¥í¥»¥¹¤ò°Ý»ý¤·¤Æ¤¤¤Æ¡¢¤½¤ì¤é¤ÏÆþ¤Ã¤Æ¤­¤¿
-    ¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤Ç¤­¤ë¤è¤¦¤ËÂÔµ¡¤·¤Æ¤¤¤Þ¤¹¡£
-    ¤³¤Î¤è¤¦¤Ë¤·¤Æ¥¯¥é¥¤¥¢¥ó¥È¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤¬±þÅú¤µ¤ì¤ëÁ°¤Ë¡¢
-    ¿·¤·¤¤»Ò¥×¥í¥»¥¹¤¬ fork ¤µ¤ì¤ë¤Î¤òÂÔ¤¿¤Ê¤¯¤Æ¤â¤è¤¤¤è¤¦¤Ë
-    ¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p>¿Æ¥×¥í¥»¥¹¤¬¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤¹¤ë¤Î»Ò¥×¥í¥»¥¹¤ò
-    ¤É¤Î¤è¤¦¤ËÀ¸À®¤¹¤ë¤«¤Ï¡¢
-    <code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code>,
-    <code class="directive"><a href="#minspareservers">MinSpareServers</a></code>,
-    <code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code>,
-    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
-    ¤ÇÄ´À°¤·¤Þ¤¹¡£°ìÈÌŪ¤Ë¡¢Apache ¤ÏÈó¾ï¤Ë¼«Î§Åª¤Ê¤Î¤Ç¡¢
-    ÂçÄñ¤Î¥µ¥¤¥È¤Ç¤Ï¤³¤ì¤é¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¥Ç¥Õ¥©¥ë¥ÈÃͤ«¤éÄ´À°¤¹¤ë
-    ɬÍפϤʤ¤¤Ç¤·¤ç¤¦¡£
-    Ʊ»þ¤Ë 256 ¤òĶ¤¨¤ë¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤·¤Ê¤¤¤È¤¤¤±¤Ê¤¤¥µ¥¤¥È¤Ç¤Ï¡¢
-    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
-    ¤òÁý¤ä¤¹É¬Íפ¬¤¢¤ë¤Ç¤·¤ç¤¦¡£
-    °ìÊý¡¢¥á¥â¥ê¤Î¸Â¤é¤ì¤Æ¤¤¤ë¥µ¥¤¥È¤Ç¤Ï¡¢¥¹¥é¥Ã¥·¥ó¥°
-    (¥á¥â¥ê¤È¥Ç¥£¥¹¥¯´Ö¤Ç²¿Å٤⥹¥ï¥Ã¥×) ¤¬µ¯¤³¤ë¤Î¤òËɤ°¤¿¤á¤Ë
-    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
-    ¤ò¸º¤é¤¹É¬Íפ¬¤¢¤ë¤Ç¤·¤ç¤¦¡£¥×¥í¥»¥¹À¸À®¤Î¥Á¥å¡¼¥Ë¥ó¥°¤Ë´Ø¤¹¤ë
-    ¾Ü¤·¤¤¾ðÊó¤Ï¡¢<a href="../misc/perf-tuning.html">À­Ç½¤Ë´Ø¤¹¤ë¥Ò¥ó¥È</a>
-    ¤Ë¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>Ä̾ï Unix ¤Ç¤Ï¿Æ¥×¥í¥»¥¹¤Ï 80 È֥ݡ¼¥È¤Ë¥Ð¥¤¥ó¥É¤¹¤ë¤¿¤á¤Ë
-    <code>root</code> ¤Çµ¯Æ°¤µ¤ì¤Þ¤¹¤¬¡¢»Ò¥×¥í¥»¥¹¤ä¥¹¥ì¥Ã¥É¤Ï
-    ¤â¤Ã¤ÈÄ㤤¸¢¸Â¤Î¥æ¡¼¥¶¤Ç Apache ¤Ë¤è¤Ã¤Æµ¯Æ°¤µ¤ì¤Þ¤¹¡£
-    <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> ¤È
-    <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    Apache ¤Î»Ò¥×¥í¥»¥¹¤Î¸¢¸Â¤òÀßÄꤹ¤ë¤Î¤ËÍѤ¤¤é¤ì¤Þ¤¹¡£
-    »Ò¥×¥í¥»¥¹¤Ï¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤ë¥³¥ó¥Æ¥ó¥ÄÁ´¤Æ¤òÆɤá¤Ê¤¤¤È¤¤¤±¤Þ¤»¤ó¤¬¡¢
-    ²Äǽ¤Ê¸Â¤êɬÍ׺Ǿ®¸Â¤Î¸¢¸Â¤Î¤ß¤ò»ý¤Ã¤Æ¤¤¤ë¤è¤¦¤Ë¤¹¤ë¤Ù¤­¤Ç¤¹¡£</p>
-
-    <p><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></code>
-    ¤Ï¡¢¸Å¤¤¥×¥í¥»¥¹¤òÄä»ß¤·¤Æ¿·¤·¤¤¥×¥í¥»¥¹¤òµ¯Æ°¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢
-    ¤É¤ÎÄøÅÙ¤ÎÉÑÅ٤ǥµ¡¼¥Ð¤¬¥×¥í¥»¥¹¤ò¥ê¥µ¥¤¥¯¥ë¤¹¤ë¤«¤òÀ©¸æ¤·¤Þ¤¹¡£</p>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="MaxSpareServers" id="MaxSpareServers">MaxSpareServers</a> <a name="maxspareservers" id="maxspareservers">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¢¥¤¥É¥ë¤Ê»Ò¥µ¡¼¥Ð¥×¥í¥»¥¹¤ÎºÇÂç¸Ä¿ô</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>MaxSpareServers <var>number</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>MaxSpareServers 10</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>prefork</td></tr>
-</table>
-    <p><code class="directive">MaxSpareServers</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    <em>¥¢¥¤¥É¥ë¤Ê</em>»Ò¥µ¡¼¥Ð¥×¥í¥»¥¹¤Î´õ˾ºÇÂç¸Ä¿ô¤òÀßÄꤷ¤Þ¤¹¡£
-    ¥¢¥¤¥É¥ë¥×¥í¥»¥¹¤È¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤ò°·¤Ã¤Æ¤¤¤Ê¤¤¥×¥í¥»¥¹¤Ç¤¹¡£
-    <code class="directive">MaxSpareServers</code> ¤è¤ê¤â¿¤¤¿ô¤¬¥¢¥¤¥É¥ë¤Ç¤¢¤ì¤Ð¡¢
-    ¿Æ¥×¥í¥»¥¹¤ÏĶ²á¥×¥í¥»¥¹¤ò kill ¤·¤Þ¤¹¡£</p>
-
-    <p>Èó¾ï¤Ëº®¤ó¤Ç¤¤¤ë¥µ¥¤¥È¤Ç¤Î¤ß¡¢¤³¤Î¥Ñ¥é¥á¡¼¥¿¤ò¥Á¥å¡¼¥Ë¥ó¥°¤¹¤ë¤Ù¤­¤Ç¤¹¡£
-    ¤³¤Î¥Ñ¥é¥á¡¼¥¿¤òÂ礭¤¯¤¹¤ë¤È¤¤¤¦¤³¤È¤Ï¡¢ÂçÄñ¤Î¾ì¹ç¤Ï°­¤¤È¯ÁۤǤ¹¡£
-    <code class="directive"><a href="#minspareservers">MinSpareServers</a></code>
-    °Ê²¼¤ËÀßÄꤷ¤¿¾ì¹ç¡¢<code class="directive">MinSpareServers</code>
-    <code>+1</code> ¤Ë¼«Æ°Ä´À°¤µ¤ì¤Þ¤¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#minspareservers">MinSpareServers</a></code></li>
-<li><code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="directive-section"><h2><a name="MinSpareServers" id="MinSpareServers">MinSpareServers</a> <a name="minspareservers" id="minspareservers">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-<table class="directive">
-<tr><th><a href="directive-dict.html#Description">ÀâÌÀ:</a></th><td>¥¢¥¤¥É¥ë¤Ê»Ò¥µ¡¼¥Ð¥×¥í¥»¥¹¤ÎºÇ¾®¸Ä¿ô</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">¹½Ê¸:</a></th><td><code>MinSpareServers <var>number</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">¥Ç¥Õ¥©¥ë¥È:</a></th><td><code>MinSpareServers 5</code></td></tr>
-<tr><th><a href="directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È:</a></th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-<tr><th><a href="directive-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="directive-dict.html#Module">¥â¥¸¥å¡¼¥ë:</a></th><td>prefork</td></tr>
-</table>
-    <p><code class="directive">MaxSpareServers</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    <em>¥¢¥¤¥É¥ë¤Ê</em>»Ò¥µ¡¼¥Ð¥×¥í¥»¥¹¤Î´õ˾ºÇ¾®¸Ä¿ô¤òÀßÄꤷ¤Þ¤¹¡£
-    ¥¢¥¤¥É¥ë¥×¥í¥»¥¹¤È¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤ò°·¤Ã¤Æ¤¤¤Ê¤¤¥×¥í¥»¥¹¤Ç¤¹¡£
-    <code class="directive">MinSpareServers</code> ¤è¤ê¤â¾¯¤Ê¤¤¿ô¤¬¥¢¥¤¥É¥ë¤Ç¤¢¤ì¤Ð¡¢
-    ¿Æ¥×¥í¥»¥¹¤ÏºÇ¹â¤Ç 1 ÉäˤĤ­ 1 ¸Ä¤Î³ä¹ç¤Ç¿·¤·¤¤»Ò¥×¥í¥»¥¹¤òÀ¸À®¤·¤Þ¤¹¡£</p>
-
-    <p>Èó¾ï¤Ëº®¤ó¤Ç¤¤¤ë¥µ¥¤¥È¤Ç¤Î¤ß¡¢¤³¤Î¥Ñ¥é¥á¡¼¥¿¤ò¥Á¥å¡¼¥Ë¥ó¥°¤¹¤ë¤Ù¤­¤Ç¤¹¡£
-    ¤³¤Î¥Ñ¥é¥á¡¼¥¿¤òÂ礭¤¯¤¹¤ë¤È¤¤¤¦¤³¤È¤Ï¡¢ÂçÄñ¤Î¾ì¹ç¤Ï°­¤¤È¯ÁۤǤ¹¡£</p>
-
-<h3>»²¾È</h3>
-<ul>
-<li><code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code></li>
-<li><code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code></li>
-</ul>
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../de/mod/prefork.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="../en/mod/prefork.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/prefork.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/prefork.html.ja.utf8 b/docs/manual/mod/prefork.html.ja.utf8
new file mode 100644
index 00000000..6e997f10
--- /dev/null
+++ b/docs/manual/mod/prefork.html.ja.utf8
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>prefork - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache MPM prefork</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../de/mod/prefork.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/prefork.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/prefork.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>スレッドを使���先行�� fork を行��ウェブサー�を実装
+</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>mpm_prefork_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>prefork.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>��マル�プロセッシングモジュール (MPM) ��
+    Unix 上�� Apache 1.3 �デフォルト�挙動��常�よ�似�方法�
+    リクエストを処��る�スレッドを使���先行�� fork を行��
+    ウェブサー�を実装�����。
+    スレッドセーフ���ライブラリ��互�性を�る����
+    スレッドを��る必���るサイト�����モジュール�使用��切��ょ�。
+    �るリクエスト�発生���題�他�リクエスト�影響���よ���
+    個々�リクエストを�離�る��も�最�� MPM ��。</p>
+
+    <p>�� MPM ��常�自律的������ MPM �設定ディレクティブを
+    調整�る必����ん�����ょ�。も��も�������
+    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
+    ��予想�れる�時リクエスト数を�分扱�る�ら��大���れ�も�
+    全プロセス��分�物�メモリ�確実�行�渡る程度�����値��る�
+    �������。</p>
+
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#acceptmutex">AcceptMutex</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#enableexceptionhook">EnableExceptionHook</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#group">Group</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listenbacklog">ListenBacklog</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#lockfile">LockFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxclients">MaxClients</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#maxspareservers">MaxSpareServers</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#minspareservers">MinSpareServers</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#pidfile">PidFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#receivebuffersize">ReceiveBufferSize</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#scoreboardfile">ScoreBoardFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#serverlimit">ServerLimit</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startservers">StartServers</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#how-it-works">動作方法</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><a href="../bind.html">Apache
+�使用�るアドレス��ート�設定</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="how-it-works" id="how-it-works">動作方法</a></h2>
+    <p>一��コントロールプロセス��
+    コ�クション�対�� listen �����る��時�応答�る
+    �プロセスを起動���。Apache �常�幾���<dfn>スペア</dfn>
+    �アイドル�サー�プロセスを維�������れら�入����
+    リクエスト�応答��るよ��待機�����。
+    ��よ����クライアント��リクエスト�応答�れる���
+    新���プロセス� fork �れる�を待����もよ�よ��
+    ������。</p>
+
+    <p>親プロセス�リクエスト�応答�る��プロセスを
+    ��よ��生��る���
+    <code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code>,
+    <code class="directive"><a href="#minspareservers">MinSpareServers</a></code>,
+    <code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code>,
+    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
+    �調整���。一般的��Apache ��常�自律的����
+    大抵�サイト���れら�ディレクティブをデフォルト値�ら調整�る
+    必������ょ�。
+    �時� 256 を超�るリクエスト�応答��������サイト���
+    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
+    を増や�必���る��ょ�。
+    一方�メモリ��られ��るサイト���スラッシング
+    (メモリ�ディスク間�何度もスワップ) �起�る�を防����
+    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
+    を減ら�必���る��ょ�。プロセス生���ューニング�関�る
+    詳��情報��<a href="../misc/perf-tuning.html">性能�関�るヒント</a>
+    ��り��。</p>
+
+    <p>通常 Unix ��親プロセス� 80 番�ート��インド�る���
+    <code>root</code> �起動�れ�����プロセスやスレッド�
+    も��低�権��ユーザ� Apache �よ��起動�れ��。
+    <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> �
+    <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code>
+    ディレクティブ�
+    Apache ��プロセス�権�を設定�る��用�られ��。
+    �プロセス�クライアント��るコンテンツ全�を読��������ん��
+    �能��り必�最���権���を����るよ���る����。</p>
+
+    <p><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></code>
+    ����プロセスを�止��新��プロセスを起動�る���よ���
+    ��程度�頻度�サー��プロセスをリサイクル�る�を制御���。</p>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MaxSpareServers" id="MaxSpareServers">MaxSpareServers</a> <a name="maxspareservers" id="maxspareservers">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>アイドル��サー�プロセス�最大個数</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>MaxSpareServers <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>MaxSpareServers 10</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>prefork</td></tr>
+</table>
+    <p><code class="directive">MaxSpareServers</code> ディレクティブ��
+    <em>アイドル�</em>�サー�プロセス�希望最大個数を設定���。
+    アイドルプロセス���リクエストを扱�����プロセス��。
+    <code class="directive">MaxSpareServers</code> よりも多�数�アイドル��れ��
+    親プロセス�超�プロセスを kill ���。</p>
+
+    <p>�常�混ん��るサイト������パラメータを�ューニング�る����。
+    ��パラメータを大���る�������大抵�場��悪�発想��。
+    <code class="directive"><a href="#minspareservers">MinSpareServers</a></code>
+    以下�設定��場��<code class="directive">MinSpareServers</code>
+    <code>+1</code> �自動調整�れ��。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#minspareservers">MinSpareServers</a></code></li>
+<li><code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="MinSpareServers" id="MinSpareServers">MinSpareServers</a> <a name="minspareservers" id="minspareservers">ディレクティブ</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>アイドル��サー�プロセス�最�個数</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>MinSpareServers <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>MinSpareServers 5</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">コンテキスト:</a></th><td>サー�設定ファイル</td></tr>
+<tr><th><a href="directive-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="directive-dict.html#Module">モジュール:</a></th><td>prefork</td></tr>
+</table>
+    <p><code class="directive">MaxSpareServers</code> ディレクティブ��
+    <em>アイドル�</em>�サー�プロセス�希望最�個数を設定���。
+    アイドルプロセス���リクエストを扱�����プロセス��。
+    <code class="directive">MinSpareServers</code> よりも少��数�アイドル��れ��
+    親プロセス�最高� 1 秒��� 1 個�割��新���プロセスを生����。</p>
+
+    <p>�常�混ん��るサイト������パラメータを�ューニング�る����。
+    ��パラメータを大���る�������大抵�場��悪�発想��。</p>
+
+<h3>�照</h3>
+<ul>
+<li><code class="directive"><a href="#maxspareservers">MaxSpareServers</a></code></li>
+<li><code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code></li>
+</ul>
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../de/mod/prefork.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/prefork.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/prefork.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/quickreference.html b/docs/manual/mod/quickreference.html
index d0378571..1e27a3b5 100644
--- a/docs/manual/mod/quickreference.html
+++ b/docs/manual/mod/quickreference.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: quickreference.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -10,9 +12,9 @@ URI: quickreference.html.es
 Content-Language: es
 Content-type: text/html; charset=ISO-8859-1
 
-URI: quickreference.html.ja.euc-jp
+URI: quickreference.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: quickreference.html.ko.euc-kr
 Content-Language: ko
@@ -21,3 +23,7 @@ Content-type: text/html; charset=EUC-KR
 URI: quickreference.html.ru.koi8-r
 Content-Language: ru
 Content-type: text/html; charset=KOI8-R
+
+URI: quickreference.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de
index cd4a9d22..e1cbef1f 100644
--- a/docs/manual/mod/quickreference.html.de
+++ b/docs/manual/mod/quickreference.html.de
@@ -25,8 +25,12 @@
 <a href="../es/mod/quickreference.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/quickreference.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/quickreference.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/quickreference.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Diese Übersetzung ist möglicherweise
+            nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
+            die neuesten Änderungen.</div>
 
     <p>Die Kurzreferenz der Direktiven zeigt die Verwendung,
     Voreinstellung, den Status und den Kontext aller
@@ -45,21 +49,17 @@
   </div>
 <div id="directive-ref"><table id="legend">
 <tr><td class="letters"><span><a href="#A">&nbsp;A&nbsp;</a> | <a href="#B">&nbsp;B&nbsp;</a> | <a href="#C">&nbsp;C&nbsp;</a> | <a href="#D">&nbsp;D&nbsp;</a> | <a href="#E">&nbsp;E&nbsp;</a> | <a href="#F">&nbsp;F&nbsp;</a> | <a href="#G">&nbsp;G&nbsp;</a> | <a href="#H">&nbsp;H&nbsp;</a> | <a href="#I">&nbsp;I&nbsp;</a> | <a href="#K">&nbsp;K&nbsp;</a> | <a href="#L">&nbsp;L&nbsp;</a> | <a href="#M">&nbsp;M&nbsp;</a> | <a href="#N">&nbsp;N&nbsp;</a> | <a href="#O">&nbsp;O&nbsp;</a> | <a href="#P">&nbsp;P&nbsp;</a> | <a href="#R">&nbsp;R&nbsp;</a> | <a href="#S">&nbsp;S&nbsp;</a> | <a href="#T">&nbsp;T&nbsp;</a> | <a href="#U">&nbsp;U&nbsp;</a> | <a href="#V">&nbsp;V&nbsp;</a> | <a href="#W">&nbsp;W&nbsp;</a> | <a href="#X">&nbsp;X&nbsp;</a></span></td>
-<td><table>
-      
-      <tr><th>s</th><td>Serverkonfiguration</td></tr>
-      <tr><th>v</th><td>Virtual&nbsp;Host</td></tr>
-      <tr><th>d</th><td>Verzeichnis</td></tr>
-      <tr><th>h</th><td>.htaccess</td></tr>
-    </table></td>
-<td><table>
-      
-      <tr><th>C</th><td>Core</td></tr>
-      <tr><th>M</th><td>MPM</td></tr>
-      <tr><th>B</th><td>Basis</td></tr>
-      <tr><th>E</th><td>Erweiterung</td></tr>
-      <tr><th>X</th><td>experimentell</td></tr>
-    </table></td></tr>
+<td><table><tr><th>s</th><td>Serverkonfiguration</td></tr>
+<tr><th>v</th><td>Virtual Host</td></tr>
+<tr><th>d</th><td>Verzeichnis</td></tr>
+<tr><th>h</th><td>.htaccess</td></tr>
+</table></td>
+<td><table><tr><th>C</th><td>Core</td></tr>
+<tr><th>M</th><td>MPM</td></tr>
+<tr><th>B</th><td>Basis</td></tr>
+<tr><th>E</th><td>Erweiterung</td></tr>
+<tr><th>X</th><td>experimentell</td></tr>
+</table></td></tr>
 </table>
 <table class="qref">
 <tr><td><a href="mpm_common.html#acceptmutex" id="A" name="A">AcceptMutex Default|<var>Methode</var></a></td><td> Default </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Vom Apache verwendete Methode zur Serialisierung mehrerer
@@ -267,10 +267,10 @@ HTTP-Response-Headern</td></tr>
 <tr><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Location of the DAV lock database</td></tr>
 <tr class="odd"><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
 a DAV resource</td></tr>
-<tr><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of connections</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum number of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td> 10 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td> 1 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum number of connections</td></tr>
 <tr><td><a href="mod_dbd.html#dbdparams">DBDParams
 <var>param1</var>=<var>value1</var>[,<var>param2</var>=<var>value2</var>]</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Parameters for database connection</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdpersist">DBDPersist On|Off</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Whether to use persistent connections</td></tr>
@@ -349,7 +349,7 @@ angegebenen MIME-Content-Type</td></tr>
 <tr class="odd"><td><a href="mod_log_forensic.html#forensiclog">ForensicLog <var>filename</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets filename of the forensic log</td></tr>
 <tr><td><a href="mpm_common.html#group" id="G" name="G">Group <var>Unix-Gruppe</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Benutzergruppe, unter welcher der Server Anfragen
   beantwortet</td></tr>
-<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|add|unset|echo|edit
+<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|merge|add|unset|echo|edit
 <var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP response headers</td></tr>
 <tr><td><a href="mod_autoindex.html#headername">HeaderName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the top
 of the index listing</td></tr>
@@ -509,7 +509,7 @@ evaluated.</td></tr>
 ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Passes environment variables from the shell</td></tr>
 <tr><td><a href="mpm_common.html#pidfile">PidFile <var>Dateiname</var></a></td><td> logs/httpd.pid </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Datei, in welcher der Server die Prozess-ID des Daemons
 ablegt</td></tr>
-<tr class="odd"><td><a href="mod_echo.html#protocolecho">ProtocolEcho On|Off</a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Turn the echo server on or off</td></tr>
+<tr class="odd"><td><a href="mod_echo.html#protocolecho">ProtocolEcho On|Off</a></td><td> Off </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Turn the echo server on or off</td></tr>
 <tr><td><a href="mod_proxy.html#proxy">&lt;Proxy <var>wildcard-url</var>&gt; ...&lt;/Proxy&gt;</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Container for directives applied to proxied resources</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxybadheader">ProxyBadHeader IsError|Ignore|StartBody</a></td><td> IsError </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Determines how to handle bad header lines in a
 response</td></tr>
@@ -524,247 +524,253 @@ proxied</td></tr>
 proxied resources</td></tr>
 <tr><td><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards <var>number</var></a></td><td> -1 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximium number of proxies that a request can be forwarded
 through</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxypass">ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var> <var>key=value</var> ...]] [nocanon]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maps remote servers into the local server URL-space</td></tr>
-<tr><td><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch [<var>regex</var>] !|<var>url</var> [<var>key=value</var>
-	<var>[key=value</var> ...]]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Maps remote servers into the local server URL-space using regular expressions</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse [<var>path</var>] <var>url</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adjusts the URL in HTTP response headers sent from a reverse
+<tr class="odd"><td><a href="mod_proxy.html#proxypass">ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var>
+<var>key=value</var> ...]] [nocanon] [interpolate]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maps remote servers into the local server URL-space</td></tr>
+<tr><td><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv On|Off</a></td><td> Off </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable Environment Variable interpolation in Reverse Proxy configurations</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch [<var>regex</var>] !|<var>url</var> [<var>key=value</var>
+	<var>[key=value</var> ...]]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maps remote servers into the local server URL-space using regular expressions</td></tr>
+<tr><td><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse [<var>path</var>] <var>url</var>
+[<var>interpolate</var>]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Adjusts the URL in HTTP response headers sent from a reverse
 proxied server</td></tr>
-<tr><td><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain <var>internal-domain</var> <var>public-domain</var></a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Adjusts the Domain string in Set-Cookie headers from a reverse-
+<tr class="odd"><td><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain <var>internal-domain</var>
+<var>public-domain</var> [<var>interpolate</var>]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adjusts the Domain string in Set-Cookie headers from a reverse-
 proxied server</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath <var>internal-path</var> <var>public-path</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adjusts the Path string in Set-Cookie headers from a reverse-
+<tr><td><a href="mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath <var>internal-path</var>
+<var>public-path</var> [<var>interpolate</var>]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Adjusts the Path string in Set-Cookie headers from a reverse-
 proxied server</td></tr>
-<tr><td><a href="mod_proxy.html#proxypreservehost">ProxyPreserveHost On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Use incoming Host HTTP request header for proxy
+<tr class="odd"><td><a href="mod_proxy.html#proxypreservehost">ProxyPreserveHost On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Use incoming Host HTTP request header for proxy
 request</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network buffer size for proxied HTTP and FTP
+<tr><td><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network buffer size for proxied HTTP and FTP
 connections</td></tr>
-<tr><td><a href="mod_proxy.html#proxyremote">ProxyRemote <var>match</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Remote proxy used to handle certain requests</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch <var>regex</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Remote proxy used to handle requests matched by regular
+<tr class="odd"><td><a href="mod_proxy.html#proxyremote">ProxyRemote <var>match</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Remote proxy used to handle certain requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch <var>regex</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Remote proxy used to handle requests matched by regular
 expressions</td></tr>
-<tr><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
-<tr><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
-<tr><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
+<tr class="odd"><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
+<tr><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
 header for proxied requests</td></tr>
-<tr class="odd"><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Name of the file that will be inserted at the end
+<tr><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the end
 of the index listing</td></tr>
-<tr><td><a href="mod_alias.html#redirect">Redirect [<var>status</var>] <var>URL-path</var>
-<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external redirect asking the client to fetch
+<tr class="odd"><td><a href="mod_alias.html#redirect">Redirect [<var>status</var>] <var>URL-path</var>
+<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external redirect asking the client to fetch
 a different URL</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#redirectmatch">RedirectMatch [<var>status</var>] <var>regex</var>
-<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external redirect based on a regular expression match 
+<tr><td><a href="mod_alias.html#redirectmatch">RedirectMatch [<var>status</var>] <var>regex</var>
+<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external redirect based on a regular expression match 
 of the current URL</td></tr>
-<tr><td><a href="mod_alias.html#redirectpermanent">RedirectPermanent <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external permanent redirect asking the client to fetch
+<tr class="odd"><td><a href="mod_alias.html#redirectpermanent">RedirectPermanent <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external permanent redirect asking the client to fetch
 a different URL</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#redirecttemp">RedirectTemp <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external temporary redirect asking the client to fetch
+<tr><td><a href="mod_alias.html#redirecttemp">RedirectTemp <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external temporary redirect asking the client to fetch
 a different URL</td></tr>
-<tr><td><a href="mod_mime.html#removecharset">RemoveCharset <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any character set associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removecharset">RemoveCharset <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any character set associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removeencoding">RemoveEncoding <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content encoding associations for a set of file
+<tr><td><a href="mod_mime.html#removeencoding">RemoveEncoding <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any content encoding associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_mime.html#removehandler">RemoveHandler <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any handler associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removehandler">RemoveHandler <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any handler associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removeinputfilter">RemoveInputFilter <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any input filter associations for a set of file
+<tr><td><a href="mod_mime.html#removeinputfilter">RemoveInputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any input filter associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_mime.html#removelanguage">RemoveLanguage <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any language associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removelanguage">RemoveLanguage <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any language associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any output filter associations for a set of file
+<tr><td><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any output filter associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any content type associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content type associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset|edit <var>header</var>
-[<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
-<tr><td><a href="core.html#require">Require <var>Name</var> [<var>Name</var>] ...</a></td><td></td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Wählt die authentisierten Benutzer aus, die auf eine
+<tr><td><a href="mod_headers.html#requestheader">RequestHeader set|append|merge|add|unset|edit <var>header</var>
+[<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
+<tr class="odd"><td><a href="core.html#require">Require <var>Name</var> [<var>Name</var>] ...</a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Wählt die authentisierten Benutzer aus, die auf eine
 Ressource zugreifen können</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
-<tr><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
-      <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a condition under which rewriting will take place
+<tr><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
+      <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines a condition under which rewriting will take place
 </td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewriteengine">RewriteEngine on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables or disables runtime rewriting engine</td></tr>
-<tr><td><a href="mod_rewrite.html#rewritelock">RewriteLock <em>file-path</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the name of the lock file used for <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code>
+<tr><td><a href="mod_rewrite.html#rewriteengine">RewriteEngine on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables or disables runtime rewriting engine</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewritelock">RewriteLock <em>file-path</em></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the lock file used for <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code>
 synchronization</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewritelog">RewriteLog <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the file used for logging rewrite engine
+<tr><td><a href="mod_rewrite.html#rewritelog">RewriteLog <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the name of the file used for logging rewrite engine
 processing</td></tr>
-<tr><td><a href="mod_rewrite.html#rewriteloglevel">RewriteLogLevel <em>Level</em></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the verbosity of the log file used by the rewrite
+<tr class="odd"><td><a href="mod_rewrite.html#rewriteloglevel">RewriteLogLevel <em>Level</em></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the verbosity of the log file used by the rewrite
 engine</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
-</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
-<tr><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <var>Options</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewriterule">RewriteRule
-      <em>Pattern</em> <em>Substitution</em> [<em>flags</em>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
-<tr><td><a href="core.html#rlimitcpu">RLimitCPU <var>Sekunden</var>|max [<var>Sekunden</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Begrenzt den CPU-Verbrauch von Prozessen, die von
+<tr><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
+</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <var>Options</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
+<tr><td><a href="mod_rewrite.html#rewriterule">RewriteRule
+      <em>Pattern</em> <em>Substitution</em> [<em>flags</em>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
+<tr class="odd"><td><a href="core.html#rlimitcpu">RLimitCPU <var>Sekunden</var>|max [<var>Sekunden</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Begrenzt den CPU-Verbrauch von Prozessen, die von
 Apache-Kindprozessen gestartet wurden</td></tr>
-<tr class="odd"><td><a href="core.html#rlimitmem">RLimitMEM <var>Bytes</var>|max [<var>Bytes</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Begrenzt den Speicherverbrauch von Prozessen, die von
+<tr><td><a href="core.html#rlimitmem">RLimitMEM <var>Bytes</var>|max [<var>Bytes</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Begrenzt den Speicherverbrauch von Prozessen, die von
 Apache-Kindprozessen gestartet wurden</td></tr>
-<tr><td><a href="core.html#rlimitnproc">RLimitNPROC <var>Zahl</var>|max [<var>Zahl</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Begrenzt die Anzahl der Prozesse, die von Prozessen gestartet
+<tr class="odd"><td><a href="core.html#rlimitnproc">RLimitNPROC <var>Zahl</var>|max [<var>Zahl</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Begrenzt die Anzahl der Prozesse, die von Prozessen gestartet
 werden können, der ihrerseits von Apache-Kinprozessen gestartet
 wurden</td></tr>
-<tr class="odd"><td><a href="core.html#satisfy" id="S" name="S">Satisfy Any|All</a></td><td> All </td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Zusammenspiel von rechnerbasierter Zugriffskontrolle und
+<tr><td><a href="core.html#satisfy" id="S" name="S">Satisfy Any|All</a></td><td> All </td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Zusammenspiel von rechnerbasierter Zugriffskontrolle und
 Benutzerauthentisierung</td></tr>
-<tr><td><a href="mpm_common.html#scoreboardfile">ScoreBoardFile <var>Dateipfad</var></a></td><td> logs/apache_status </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Ablageort der Datei, die zur Speicherung von Daten zur
+<tr class="odd"><td><a href="mpm_common.html#scoreboardfile">ScoreBoardFile <var>Dateipfad</var></a></td><td> logs/apache_status </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Ablageort der Datei, die zur Speicherung von Daten zur
   Koordinierung der Kindprozesse verwendet wird</td></tr>
-<tr class="odd"><td><a href="mod_actions.html#script">Script <var>Methode</var> <var>CGI-Skript</var></a></td><td></td><td>svd</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Aktiviert ein CGI-Skript für eine bestimmte 
+<tr><td><a href="mod_actions.html#script">Script <var>Methode</var> <var>CGI-Skript</var></a></td><td></td><td>svd</td><td>B</td></tr><tr><td class="descr" colspan="4">Aktiviert ein CGI-Skript für eine bestimmte 
   Anfragemethode.</td></tr>
-<tr><td><a href="mod_alias.html#scriptalias">ScriptAlias <var>URL-path</var>
-<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps a URL to a filesystem location and designates the
+<tr class="odd"><td><a href="mod_alias.html#scriptalias">ScriptAlias <var>URL-path</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps a URL to a filesystem location and designates the
 target as a CGI script</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch <var>regex</var>
-<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps a URL to a filesystem location using a regular expression
+<tr><td><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch <var>regex</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps a URL to a filesystem location using a regular expression
 and designates the target as a CGI script</td></tr>
-<tr><td><a href="core.html#scriptinterpretersource">ScriptInterpreterSource Registry|Registry-Strict|Script</a></td><td> Script </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Methode zur Ermittlung des Interpreters von
+<tr class="odd"><td><a href="core.html#scriptinterpretersource">ScriptInterpreterSource Registry|Registry-Strict|Script</a></td><td> Script </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Methode zur Ermittlung des Interpreters von
 CGI-Skripten</td></tr>
-<tr class="odd"><td><a href="mod_cgi.html#scriptlog">ScriptLog <var>file-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the CGI script error logfile</td></tr>
-<tr><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <var>bytes</var></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maximum amount of PUT or POST requests that will be recorded
+<tr><td><a href="mod_cgi.html#scriptlog">ScriptLog <var>file-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Location of the CGI script error logfile</td></tr>
+<tr class="odd"><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <var>bytes</var></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum amount of PUT or POST requests that will be recorded
 in the scriptlog</td></tr>
-<tr class="odd"><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Size limit of the CGI script logfile</td></tr>
-<tr><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">The filename prefix of the socket to use for communication with
+<tr><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Size limit of the CGI script logfile</td></tr>
+<tr class="odd"><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">The filename prefix of the socket to use for communication with
 the cgi daemon</td></tr>
-<tr class="odd"><td><a href="mod_nw_ssl.html#securelisten">SecureListen [<var>IP-address</var>:]<var>portnumber</var>
-<var>Certificate-Name</var> [MUTUAL]</a></td><td></td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Enables SSL encryption for the specified port</td></tr>
-<tr><td><a href="mod_status.html#seerequesttail">SeeRequestTail On|Off</a></td><td> Off </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">Determine if mod_status displays the first 63 characters
+<tr><td><a href="mod_nw_ssl.html#securelisten">SecureListen [<var>IP-address</var>:]<var>portnumber</var>
+<var>Certificate-Name</var> [MUTUAL]</a></td><td></td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">Enables SSL encryption for the specified port</td></tr>
+<tr class="odd"><td><a href="mod_status.html#seerequesttail">SeeRequestTail On|Off</a></td><td> Off </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Determine if mod_status displays the first 63 characters
 of a request or the last 63, assuming the request itself is greater than
 63 chars.</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>Bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Größe des TCP-Puffers</td></tr>
-<tr><td><a href="core.html#serveradmin">ServerAdmin <var>E-Mail-Adresse</var>|<var>URL</var></a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">E-Mail-Adresse, die der Server in Fehlermeldungen einfügt,
+<tr><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>Bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Größe des TCP-Puffers</td></tr>
+<tr class="odd"><td><a href="core.html#serveradmin">ServerAdmin <var>E-Mail-Adresse</var>|<var>URL</var></a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">E-Mail-Adresse, die der Server in Fehlermeldungen einfügt,
 welche an den Client gesendet werden</td></tr>
-<tr class="odd"><td><a href="core.html#serveralias">ServerAlias <var>Hostname</var> [<var>Hostname</var>] ...</a></td><td></td><td>v</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Alternativer Name für einen Host, der verwendet wird, wenn
+<tr><td><a href="core.html#serveralias">ServerAlias <var>Hostname</var> [<var>Hostname</var>] ...</a></td><td></td><td>v</td><td>C</td></tr><tr><td class="descr" colspan="4">Alternativer Name für einen Host, der verwendet wird, wenn
 Anfragen einem namensbasierten virtuellen Host zugeordnet werden</td></tr>
-<tr><td><a href="mpm_common.html#serverlimit">ServerLimit <var>Anzahl</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Obergrenze für die konfigurierbare Anzahl von
+<tr class="odd"><td><a href="mpm_common.html#serverlimit">ServerLimit <var>Anzahl</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Obergrenze für die konfigurierbare Anzahl von
   Prozessen</td></tr>
-<tr class="odd"><td><a href="core.html#servername">ServerName
-<var>voll-qualifizierter-Domainname</var>[:<var>port</var>]</a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Rechnername und Port, die der Server dazu verwendet, sich
+<tr><td><a href="core.html#servername">ServerName
+<var>voll-qualifizierter-Domainname</var>[:<var>port</var>]</a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Rechnername und Port, die der Server dazu verwendet, sich
 selbst zu identifizieren</td></tr>
-<tr><td><a href="core.html#serverpath">ServerPath <var>URL-Pfad</var></a></td><td></td><td>v</td><td>C</td></tr><tr><td class="descr" colspan="4">Veralteter URL-Pfad für einen namensbasierten
+<tr class="odd"><td><a href="core.html#serverpath">ServerPath <var>URL-Pfad</var></a></td><td></td><td>v</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Veralteter URL-Pfad für einen namensbasierten
 virtuellen Host, auf den von einem inkompatiblen Browser zugegriffen
 wird</td></tr>
-<tr class="odd"><td><a href="core.html#serverroot">ServerRoot <var>Verzeichnis</var></a></td><td> /usr/local/apache </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Basisverzeichnis der Serverinstallation</td></tr>
-<tr><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Konfiguriert die Fußzeile von servergenerierten
+<tr><td><a href="core.html#serverroot">ServerRoot <var>Verzeichnis</var></a></td><td> /usr/local/apache </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Basisverzeichnis der Serverinstallation</td></tr>
+<tr class="odd"><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Konfiguriert die Fußzeile von servergenerierten
 Dokumenten</td></tr>
-<tr class="odd"><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Konfiguriert den HTTP-Response-Header
+<tr><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Konfiguriert den HTTP-Response-Header
 <code>Server</code></td></tr>
-<tr><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> <var>value</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables</td></tr>
-<tr class="odd"><td><a href="mod_setenvif.html#setenvif">SetEnvIf <em>attribute
+<tr class="odd"><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> <var>value</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables</td></tr>
+<tr><td><a href="mod_setenvif.html#setenvif">SetEnvIf <em>attribute
     regex [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables based on attributes of the request
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables based on attributes of the request
 </td></tr>
-<tr><td><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase <em>attribute regex 
+<tr class="odd"><td><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase <em>attribute regex 
         [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables based on attributes of the request
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables based on attributes of the request
 without respect to case</td></tr>
-<tr class="odd"><td><a href="core.html#sethandler">SetHandler <var>Handlername</var>|None</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Erzwingt die Verarbeitung aller passenden Dateien durch
+<tr><td><a href="core.html#sethandler">SetHandler <var>Handlername</var>|None</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Erzwingt die Verarbeitung aller passenden Dateien durch
 einen Handler</td></tr>
-<tr><td><a href="core.html#setinputfilter">SetInputFilter <var>Filter</var>[;<var>Filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Bestimmt die Filter, die Client-Anfragen und POST-Eingaben
+<tr class="odd"><td><a href="core.html#setinputfilter">SetInputFilter <var>Filter</var>[;<var>Filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Bestimmt die Filter, die Client-Anfragen und POST-Eingaben
 verarbeiten</td></tr>
-<tr class="odd"><td><a href="core.html#setoutputfilter">SetOutputFilter <var>Filter</var>[;<var>Filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Bestimmt die Filter, die Antworten des Servers verarbeiten</td></tr>
-<tr><td><a href="mod_include.html#ssienableaccess">SSIEnableAccess on|off</a></td><td> off </td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">Enable the -A flag during conditional flow control processing.</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssiendtag">SSIEndTag <var>tag</var></a></td><td> "--&gt;" </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">String that ends an include element</td></tr>
-<tr><td><a href="mod_include.html#ssierrormsg">SSIErrorMsg <var>message</var></a></td><td> "[an error occurred +</td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Error message displayed when there is an SSI
+<tr><td><a href="core.html#setoutputfilter">SetOutputFilter <var>Filter</var>[;<var>Filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Bestimmt die Filter, die Antworten des Servers verarbeiten</td></tr>
+<tr class="odd"><td><a href="mod_include.html#ssienableaccess">SSIEnableAccess on|off</a></td><td> off </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Enable the -A flag during conditional flow control processing.</td></tr>
+<tr><td><a href="mod_include.html#ssiendtag">SSIEndTag <var>tag</var></a></td><td> "--&gt;" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that ends an include element</td></tr>
+<tr class="odd"><td><a href="mod_include.html#ssierrormsg">SSIErrorMsg <var>message</var></a></td><td> "[an error occurred +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Error message displayed when there is an SSI
 error</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssistarttag">SSIStartTag <var>tag</var></a></td><td> "&lt;!--#" </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">String that starts an include element</td></tr>
-<tr><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <var>formatstring</var></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Configures the format in which date strings are
+<tr><td><a href="mod_include.html#ssistarttag">SSIStartTag <var>tag</var></a></td><td> "&lt;!--#" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that starts an include element</td></tr>
+<tr class="odd"><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <var>formatstring</var></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the format in which date strings are
 displayed</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">String displayed when an unset variable is echoed</td></tr>
-<tr><td><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+<tr><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">String displayed when an unset variable is echoed</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
 for Client Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+<tr><td><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
 Client Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+<tr class="odd"><td><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
 for defining acceptable CA names</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+<tr><td><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
 defining acceptable CA names</td></tr>
-<tr><td><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
+<tr class="odd"><td><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
 Client Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
+<tr><td><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
 Client Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of PEM-encoded Server CA Certificates</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcertificatefile">SSLCertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Server PEM-encoded X.509 Certificate file</td></tr>
-<tr><td><a href="mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Server PEM-encoded Private Key file</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslciphersuite">SSLCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
+<tr class="odd"><td><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of PEM-encoded Server CA Certificates</td></tr>
+<tr><td><a href="mod_ssl.html#sslcertificatefile">SSLCertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Server PEM-encoded X.509 Certificate file</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Server PEM-encoded Private Key file</td></tr>
+<tr><td><a href="mod_ssl.html#sslciphersuite">SSLCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
 handshake</td></tr>
-<tr><td><a href="mod_ssl.html#sslcryptodevice">SSLCryptoDevice <em>engine</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable use of a cryptographic hardware accelerator</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslengine">SSLEngine on|off|optional</a></td><td> off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">SSL Engine Operation Switch</td></tr>
-<tr><td><a href="mod_ssl.html#sslhonorcipherorder">SSLHonorCiperOrder <em>flag</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Option to prefer the server's cipher preference order</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslmutex">SSLMutex <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Semaphore for internal mutual exclusion of 
+<tr class="odd"><td><a href="mod_ssl.html#sslcryptodevice">SSLCryptoDevice <em>engine</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable use of a cryptographic hardware accelerator</td></tr>
+<tr><td><a href="mod_ssl.html#sslengine">SSLEngine on|off|optional</a></td><td> off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">SSL Engine Operation Switch</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslhonorcipherorder">SSLHonorCiperOrder <em>flag</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Option to prefer the server's cipher preference order</td></tr>
+<tr><td><a href="mod_ssl.html#sslmutex">SSLMutex <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Semaphore for internal mutual exclusion of 
 operations</td></tr>
-<tr><td><a href="mod_ssl.html#ssloptions">SSLOptions [+|-]<em>option</em> ...</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure various SSL engine run-time options</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslpassphrasedialog">SSLPassPhraseDialog <em>type</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of pass phrase dialog for encrypted private 
+<tr class="odd"><td><a href="mod_ssl.html#ssloptions">SSLOptions [+|-]<em>option</em> ...</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure various SSL engine run-time options</td></tr>
+<tr><td><a href="mod_ssl.html#sslpassphrasedialog">SSLPassPhraseDialog <em>type</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of pass phrase dialog for encrypted private 
 keys</td></tr>
-<tr><td><a href="mod_ssl.html#sslprotocol">SSLProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure usable SSL protocol flavors</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+<tr class="odd"><td><a href="mod_ssl.html#sslprotocol">SSLProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure usable SSL protocol flavors</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
 for Remote Server Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+<tr class="odd"><td><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
 Remote Server Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
+<tr><td><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
 Remote Server Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
+<tr class="odd"><td><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
 Remote Server Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
+<tr><td><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
 proxy handshake</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine on|off</a></td><td> off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">SSL Proxy Engine Operation Switch</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile <em>filename</em></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded client certificates and keys to be used by the proxy</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath <em>directory</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded client certificates and keys to be used by the proxy</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure usable SSL protocol flavors for proxy usage</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxyverify">SSLProxyVerify <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of remote server Certificate verification</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxyverifydepth">SSLProxyVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum depth of CA Certificates in Remote Server
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine on|off</a></td><td> off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">SSL Proxy Engine Operation Switch</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile <em>filename</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded client certificates and keys to be used by the proxy</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath <em>directory</em></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded client certificates and keys to be used by the proxy</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure usable SSL protocol flavors for proxy usage</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyverify">SSLProxyVerify <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of remote server Certificate verification</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxyverifydepth">SSLProxyVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum depth of CA Certificates in Remote Server
 Certificate verification</td></tr>
-<tr><td><a href="mod_ssl.html#sslrandomseed">SSLRandomSeed <em>context</em> <em>source</em> 
-[<em>bytes</em>]</a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Pseudo Random Number Generator (PRNG) seeding 
+<tr class="odd"><td><a href="mod_ssl.html#sslrandomseed">SSLRandomSeed <em>context</em> <em>source</em> 
+[<em>bytes</em>]</a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Pseudo Random Number Generator (PRNG) seeding 
 source</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslrequire">SSLRequire <em>expression</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Allow access only when an arbitrarily complex 
+<tr><td><a href="mod_ssl.html#sslrequire">SSLRequire <em>expression</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Allow access only when an arbitrarily complex 
 boolean expression is true</td></tr>
-<tr><td><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Deny access when SSL is not used for the 
+<tr class="odd"><td><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Deny access when SSL is not used for the 
 HTTP request</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslsessioncache">SSLSessionCache <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of the global/inter-process SSL Session 
+<tr><td><a href="mod_ssl.html#sslsessioncache">SSLSessionCache <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of the global/inter-process SSL Session 
 Cache</td></tr>
-<tr><td><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout <em>seconds</em></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Number of seconds before an SSL session expires
+<tr class="odd"><td><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout <em>seconds</em></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Number of seconds before an SSL session expires
 in the Session Cache</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslusername">SSLUserName <em>varname</em></a></td><td></td><td>sdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Variable name to determine user name</td></tr>
-<tr><td><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of Client Certificate verification</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum depth of CA Certificates in Client 
+<tr><td><a href="mod_ssl.html#sslusername">SSLUserName <em>varname</em></a></td><td></td><td>sdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Variable name to determine user name</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of Client Certificate verification</td></tr>
+<tr><td><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum depth of CA Certificates in Client 
 Certificate verification</td></tr>
-<tr><td><a href="mpm_common.html#startservers">StartServers <var>Anzahl</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Anzahl der Kindprozesse des Servers, die beim Start erstellt
+<tr class="odd"><td><a href="mpm_common.html#startservers">StartServers <var>Anzahl</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Anzahl der Kindprozesse des Servers, die beim Start erstellt
   werden</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#startthreads">StartThreads <var>Anzahl</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Anzahl der Threads, die beim Start erstellt werden</td></tr>
-<tr><td><a href="mod_substitute.html#substitute">Substitute <var>s/pattern/substitution/[inf]</var></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Pattern to filter the response content</td></tr>
-<tr class="odd"><td><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup <em>User Group</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">User and group permissions for CGI programs</td></tr>
-<tr><td><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit <var>Anzahl</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Bestimmt die Obergrenze der konfigurierbaren Anzahl von Threads
+<tr><td><a href="mpm_common.html#startthreads">StartThreads <var>Anzahl</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Anzahl der Threads, die beim Start erstellt werden</td></tr>
+<tr class="odd"><td><a href="mod_substitute.html#substitute">Substitute <var>s/pattern/substitution/[infq]</var></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Pattern to filter the response content</td></tr>
+<tr><td><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup <em>User Group</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">User and group permissions for CGI programs</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit <var>Anzahl</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Bestimmt die Obergrenze der konfigurierbaren Anzahl von Threads
   pro Kindprozess</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>Anzahl</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Anzahl der Threads, die mit jedem Kindprozess gestartet
+<tr><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>Anzahl</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Anzahl der Threads, die mit jedem Kindprozess gestartet
   werden</td></tr>
-<tr><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Die Größe des Stacks in Bytes, der von Threads
+<tr class="odd"><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Die Größe des Stacks in Bytes, der von Threads
 verwendet wird, die Client-Verbindungen bearbeiten.</td></tr>
-<tr class="odd"><td><a href="core.html#timeout">TimeOut <var>Sekunden</var></a></td><td> 300 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Zeitspanne, die der Server auf verschiedene Ereignisse wartet,
+<tr><td><a href="core.html#timeout">TimeOut <var>Sekunden</var></a></td><td> 300 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Zeitspanne, die der Server auf verschiedene Ereignisse wartet,
 bevor er die Anfrage abbricht</td></tr>
-<tr><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Specify location of a log file</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">The location of the <code>mime.types</code> file</td></tr>
-<tr><td><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv <var>env-variable</var> [<var>env-variable</var>]
-...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes variables from the environment</td></tr>
-<tr class="odd"><td><a href="core.html#usecanonicalname">UseCanonicalName On|Off|DNS</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Bestimmt, wie der Server seinen eigenen Namen und Port
+<tr class="odd"><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Specify location of a log file</td></tr>
+<tr><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">The location of the <code>mime.types</code> file</td></tr>
+<tr class="odd"><td><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv <var>env-variable</var> [<var>env-variable</var>]
+...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes variables from the environment</td></tr>
+<tr><td><a href="core.html#usecanonicalname">UseCanonicalName On|Off|DNS</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Bestimmt, wie der Server seinen eigenen Namen und Port
 ermittelt</td></tr>
-<tr><td><a href="mpm_common.html#user">User <var>Unix-User-ID</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Die Benutzerkennung, unter welcher der Server Anfragen
+<tr class="odd"><td><a href="mpm_common.html#user">User <var>Unix-User-ID</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Die Benutzerkennung, unter welcher der Server Anfragen
   beantwortet</td></tr>
-<tr class="odd"><td><a href="mod_userdir.html#userdir">UserDir <em>directory-filename</em></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the user-specific directories</td></tr>
-<tr><td><a href="mod_vhost_alias.html#virtualdocumentroot" id="V" name="V">VirtualDocumentRoot <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the document root
+<tr><td><a href="mod_userdir.html#userdir">UserDir <em>directory-filename</em> [<em>directory-filename</em>] ...
+</a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Location of the user-specific directories</td></tr>
+<tr class="odd"><td><a href="mod_vhost_alias.html#virtualdocumentroot" id="V" name="V">VirtualDocumentRoot <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the document root
 for a given virtual host</td></tr>
-<tr class="odd"><td><a href="mod_vhost_alias.html#virtualdocumentrootip">VirtualDocumentRootIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the document root
+<tr><td><a href="mod_vhost_alias.html#virtualdocumentrootip">VirtualDocumentRootIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the document root
 for a given virtual host</td></tr>
-<tr><td><a href="core.html#virtualhost">&lt;VirtualHost
+<tr class="odd"><td><a href="core.html#virtualhost">&lt;VirtualHost
     <var>Adresse</var>[:<var>Port</var>] [<var>Adresse</var>[:<var>Port</var>]]
-    ...&gt; ... &lt;/VirtualHost&gt;</a></td><td></td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Enthält Direktiven, die nur auf bestimmte Hostnamen oder
+    ...&gt; ... &lt;/VirtualHost&gt;</a></td><td></td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Enthält Direktiven, die nur auf bestimmte Hostnamen oder
 IP-Adressen angewendet werden</td></tr>
-<tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the CGI directory for
+<tr><td><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the CGI directory for
 a given virtual host</td></tr>
-<tr><td><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the cgi directory for
+<tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the cgi directory for
 a given virtual host</td></tr>
-<tr class="odd"><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Für die Annahme von Netzwerkverbindungen wird accept() anstelle von AcceptEx() verwendet</td></tr>
-<tr><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Parse SSI directives in files with the execute bit
+<tr><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Für die Annahme von Netzwerkverbindungen wird accept() anstelle von AcceptEx() verwendet</td></tr>
+<tr class="odd"><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Parse SSI directives in files with the execute bit
 set</td></tr>
 </table></div>
 <div class="bottomlang">
@@ -773,8 +779,9 @@ set</td></tr>
 <a href="../es/mod/quickreference.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/quickreference.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/quickreference.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/quickreference.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 7acaa3f0..7de47013 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -25,7 +25,8 @@
 <a href="../es/mod/quickreference.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/quickreference.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/quickreference.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/quickreference.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>The directive quick reference shows the usage, default, status,
@@ -43,21 +44,17 @@
   </div>
 <div id="directive-ref"><table id="legend">
 <tr><td class="letters"><span><a href="#A">&nbsp;A&nbsp;</a> | <a href="#B">&nbsp;B&nbsp;</a> | <a href="#C">&nbsp;C&nbsp;</a> | <a href="#D">&nbsp;D&nbsp;</a> | <a href="#E">&nbsp;E&nbsp;</a> | <a href="#F">&nbsp;F&nbsp;</a> | <a href="#G">&nbsp;G&nbsp;</a> | <a href="#H">&nbsp;H&nbsp;</a> | <a href="#I">&nbsp;I&nbsp;</a> | <a href="#K">&nbsp;K&nbsp;</a> | <a href="#L">&nbsp;L&nbsp;</a> | <a href="#M">&nbsp;M&nbsp;</a> | <a href="#N">&nbsp;N&nbsp;</a> | <a href="#O">&nbsp;O&nbsp;</a> | <a href="#P">&nbsp;P&nbsp;</a> | <a href="#R">&nbsp;R&nbsp;</a> | <a href="#S">&nbsp;S&nbsp;</a> | <a href="#T">&nbsp;T&nbsp;</a> | <a href="#U">&nbsp;U&nbsp;</a> | <a href="#V">&nbsp;V&nbsp;</a> | <a href="#W">&nbsp;W&nbsp;</a> | <a href="#X">&nbsp;X&nbsp;</a></span></td>
-<td><table>
-      
-      <tr><th>s</th><td>server&nbsp;config</td></tr>
-      <tr><th>v</th><td>virtual&nbsp;host</td></tr>
-      <tr><th>d</th><td>directory</td></tr>
-      <tr><th>h</th><td>.htaccess</td></tr>
-    </table></td>
-<td><table>
-      
-      <tr><th>C</th><td>Core</td></tr>
-      <tr><th>M</th><td>MPM</td></tr>
-      <tr><th>B</th><td>Base</td></tr>
-      <tr><th>E</th><td>Extension</td></tr>
-      <tr><th>X</th><td>Experimental</td></tr>
-    </table></td></tr>
+<td><table><tr><th>s</th><td>server config</td></tr>
+<tr><th>v</th><td>virtual host</td></tr>
+<tr><th>d</th><td>directory</td></tr>
+<tr><th>h</th><td>.htaccess</td></tr>
+</table></td>
+<td><table><tr><th>C</th><td>Core</td></tr>
+<tr><th>M</th><td>MPM</td></tr>
+<tr><th>B</th><td>Base</td></tr>
+<tr><th>E</th><td>Extension</td></tr>
+<tr><th>X</th><td>Experimental</td></tr>
+</table></td></tr>
 </table>
 <table class="qref">
 <tr><td><a href="core.html#acceptfilter" id="A" name="A">AcceptFilter <var>protocol</var> <var>accept_filter</var></a></td><td></td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures optimizations for a Protocol's Listener Sockets</td></tr>
@@ -264,10 +261,10 @@ switch before dumping core</td></tr>
 <tr class="odd"><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the DAV lock database</td></tr>
 <tr><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
 a DAV resource</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td> 10 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td> 1 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdparams">DBDParams
 <var>param1</var>=<var>value1</var>[,<var>param2</var>=<var>value2</var>]</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Parameters for database connection</td></tr>
 <tr><td><a href="mod_dbd.html#dbdpersist">DBDPersist On|Off</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Whether to use persistent connections</td></tr>
@@ -345,7 +342,7 @@ MIME content-type</td></tr>
 will exit.</td></tr>
 <tr><td><a href="mpm_common.html#group">Group <var>unix-group</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Group under which the server will answer
 requests</td></tr>
-<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|add|unset|echo|edit
+<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|merge|add|unset|echo|edit
 <var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP response headers</td></tr>
 <tr><td><a href="mod_autoindex.html#headername">HeaderName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the top
 of the index listing</td></tr>
@@ -421,7 +418,7 @@ subrequests</td></tr>
 from the client</td></tr>
 <tr class="odd"><td><a href="core.html#limitrequestfields">LimitRequestFields <var>number</var></a></td><td> 100 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the number of HTTP request header fields that
 will be accepted from the client</td></tr>
-<tr><td><a href="core.html#limitrequestfieldsize">LimitRequestFieldsize <var>bytes</var></a></td><td></td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the size of the HTTP request header allowed from the
+<tr><td><a href="core.html#limitrequestfieldsize">LimitRequestFieldSize <var>bytes</var></a></td><td> 8190 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the size of the HTTP request header allowed from the
 client</td></tr>
 <tr class="odd"><td><a href="core.html#limitrequestline">LimitRequestLine <var>bytes</var></a></td><td> 8190 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limit the size of the HTTP request line that will be accepted
 from the client</td></tr>
@@ -499,7 +496,7 @@ evaluated.</td></tr>
 ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Passes environment variables from the shell</td></tr>
 <tr><td><a href="mpm_common.html#pidfile">PidFile <var>filename</var></a></td><td> logs/httpd.pid </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">File where the server records the process ID
 of the daemon</td></tr>
-<tr class="odd"><td><a href="mod_echo.html#protocolecho">ProtocolEcho On|Off</a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Turn the echo server on or off</td></tr>
+<tr class="odd"><td><a href="mod_echo.html#protocolecho">ProtocolEcho On|Off</a></td><td> Off </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Turn the echo server on or off</td></tr>
 <tr><td><a href="mod_proxy.html#proxy">&lt;Proxy <var>wildcard-url</var>&gt; ...&lt;/Proxy&gt;</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Container for directives applied to proxied resources</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxybadheader">ProxyBadHeader IsError|Ignore|StartBody</a></td><td> IsError </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Determines how to handle bad header lines in a
 response</td></tr>
@@ -514,246 +511,252 @@ proxied</td></tr>
 proxied resources</td></tr>
 <tr><td><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards <var>number</var></a></td><td> -1 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximium number of proxies that a request can be forwarded
 through</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxypass">ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var> <var>key=value</var> ...]] [nocanon]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maps remote servers into the local server URL-space</td></tr>
-<tr><td><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch [<var>regex</var>] !|<var>url</var> [<var>key=value</var>
-	<var>[key=value</var> ...]]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Maps remote servers into the local server URL-space using regular expressions</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse [<var>path</var>] <var>url</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adjusts the URL in HTTP response headers sent from a reverse
+<tr class="odd"><td><a href="mod_proxy.html#proxypass">ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var>
+<var>key=value</var> ...]] [nocanon] [interpolate]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maps remote servers into the local server URL-space</td></tr>
+<tr><td><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv On|Off</a></td><td> Off </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable Environment Variable interpolation in Reverse Proxy configurations</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch [<var>regex</var>] !|<var>url</var> [<var>key=value</var>
+	<var>[key=value</var> ...]]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maps remote servers into the local server URL-space using regular expressions</td></tr>
+<tr><td><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse [<var>path</var>] <var>url</var>
+[<var>interpolate</var>]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Adjusts the URL in HTTP response headers sent from a reverse
 proxied server</td></tr>
-<tr><td><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain <var>internal-domain</var> <var>public-domain</var></a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Adjusts the Domain string in Set-Cookie headers from a reverse-
+<tr class="odd"><td><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain <var>internal-domain</var>
+<var>public-domain</var> [<var>interpolate</var>]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adjusts the Domain string in Set-Cookie headers from a reverse-
 proxied server</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath <var>internal-path</var> <var>public-path</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adjusts the Path string in Set-Cookie headers from a reverse-
+<tr><td><a href="mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath <var>internal-path</var>
+<var>public-path</var> [<var>interpolate</var>]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Adjusts the Path string in Set-Cookie headers from a reverse-
 proxied server</td></tr>
-<tr><td><a href="mod_proxy.html#proxypreservehost">ProxyPreserveHost On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Use incoming Host HTTP request header for proxy
+<tr class="odd"><td><a href="mod_proxy.html#proxypreservehost">ProxyPreserveHost On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Use incoming Host HTTP request header for proxy
 request</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network buffer size for proxied HTTP and FTP
+<tr><td><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network buffer size for proxied HTTP and FTP
 connections</td></tr>
-<tr><td><a href="mod_proxy.html#proxyremote">ProxyRemote <var>match</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Remote proxy used to handle certain requests</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch <var>regex</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Remote proxy used to handle requests matched by regular
+<tr class="odd"><td><a href="mod_proxy.html#proxyremote">ProxyRemote <var>match</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Remote proxy used to handle certain requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch <var>regex</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Remote proxy used to handle requests matched by regular
 expressions</td></tr>
-<tr><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
-<tr><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
-<tr><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
+<tr class="odd"><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
+<tr><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
 header for proxied requests</td></tr>
-<tr class="odd"><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Name of the file that will be inserted at the end
+<tr><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the end
 of the index listing</td></tr>
-<tr><td><a href="mpm_common.html#receivebuffersize">ReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">TCP receive buffer size</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#redirect">Redirect [<var>status</var>] <var>URL-path</var>
-<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external redirect asking the client to fetch
+<tr class="odd"><td><a href="mpm_common.html#receivebuffersize">ReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">TCP receive buffer size</td></tr>
+<tr><td><a href="mod_alias.html#redirect">Redirect [<var>status</var>] <var>URL-path</var>
+<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external redirect asking the client to fetch
 a different URL</td></tr>
-<tr><td><a href="mod_alias.html#redirectmatch">RedirectMatch [<var>status</var>] <var>regex</var>
-<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external redirect based on a regular expression match 
+<tr class="odd"><td><a href="mod_alias.html#redirectmatch">RedirectMatch [<var>status</var>] <var>regex</var>
+<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external redirect based on a regular expression match 
 of the current URL</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#redirectpermanent">RedirectPermanent <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external permanent redirect asking the client to fetch
+<tr><td><a href="mod_alias.html#redirectpermanent">RedirectPermanent <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external permanent redirect asking the client to fetch
 a different URL</td></tr>
-<tr><td><a href="mod_alias.html#redirecttemp">RedirectTemp <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external temporary redirect asking the client to fetch
+<tr class="odd"><td><a href="mod_alias.html#redirecttemp">RedirectTemp <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external temporary redirect asking the client to fetch
 a different URL</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removecharset">RemoveCharset <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any character set associations for a set of file
+<tr><td><a href="mod_mime.html#removecharset">RemoveCharset <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any character set associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_mime.html#removeencoding">RemoveEncoding <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any content encoding associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removeencoding">RemoveEncoding <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content encoding associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removehandler">RemoveHandler <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any handler associations for a set of file
+<tr><td><a href="mod_mime.html#removehandler">RemoveHandler <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any handler associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_mime.html#removeinputfilter">RemoveInputFilter <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any input filter associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removeinputfilter">RemoveInputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any input filter associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removelanguage">RemoveLanguage <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any language associations for a set of file
+<tr><td><a href="mod_mime.html#removelanguage">RemoveLanguage <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any language associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any output filter associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any output filter associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content type associations for a set of file
+<tr><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any content type associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset|edit <var>header</var>
-[<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
-<tr class="odd"><td><a href="core.html#require">Require <var>entity-name</var> [<var>entity-name</var>] ...</a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Selects which authenticated users can access
+<tr class="odd"><td><a href="mod_headers.html#requestheader">RequestHeader set|append|merge|add|unset|edit <var>header</var>
+[<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
+<tr><td><a href="core.html#require">Require <var>entity-name</var> [<var>entity-name</var>] ...</a></td><td></td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Selects which authenticated users can access
 a resource</td></tr>
-<tr><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
-      <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines a condition under which rewriting will take place
+<tr class="odd"><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
+<tr><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
+      <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a condition under which rewriting will take place
 </td></tr>
-<tr><td><a href="mod_rewrite.html#rewriteengine">RewriteEngine on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables or disables runtime rewriting engine</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewritelock">RewriteLock <em>file-path</em></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the lock file used for <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code>
+<tr class="odd"><td><a href="mod_rewrite.html#rewriteengine">RewriteEngine on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables or disables runtime rewriting engine</td></tr>
+<tr><td><a href="mod_rewrite.html#rewritelock">RewriteLock <em>file-path</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the name of the lock file used for <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code>
 synchronization</td></tr>
-<tr><td><a href="mod_rewrite.html#rewritelog">RewriteLog <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the name of the file used for logging rewrite engine
+<tr class="odd"><td><a href="mod_rewrite.html#rewritelog">RewriteLog <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the file used for logging rewrite engine
 processing</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewriteloglevel">RewriteLogLevel <em>Level</em></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the verbosity of the log file used by the rewrite
+<tr><td><a href="mod_rewrite.html#rewriteloglevel">RewriteLogLevel <em>Level</em></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the verbosity of the log file used by the rewrite
 engine</td></tr>
-<tr><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
-</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <var>Options</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
-<tr><td><a href="mod_rewrite.html#rewriterule">RewriteRule
-      <em>Pattern</em> <em>Substitution</em> [<em>flags</em>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
-<tr class="odd"><td><a href="core.html#rlimitcpu">RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the CPU consumption of processes launched
+<tr class="odd"><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
+</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
+<tr><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <var>Options</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewriterule">RewriteRule
+      <em>Pattern</em> <em>Substitution</em> [<em>flags</em>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
+<tr><td><a href="core.html#rlimitcpu">RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the CPU consumption of processes launched
 by Apache children</td></tr>
-<tr><td><a href="core.html#rlimitmem">RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the memory consumption of processes launched
+<tr class="odd"><td><a href="core.html#rlimitmem">RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the memory consumption of processes launched
 by Apache children</td></tr>
-<tr class="odd"><td><a href="core.html#rlimitnproc">RLimitNPROC <var>number</var>|max [<var>number</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the number of processes that can be launched by
+<tr><td><a href="core.html#rlimitnproc">RLimitNPROC <var>number</var>|max [<var>number</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the number of processes that can be launched by
 processes launched by Apache children</td></tr>
-<tr><td><a href="core.html#satisfy" id="S" name="S">Satisfy Any|All</a></td><td> All </td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Interaction between host-level access control and
+<tr class="odd"><td><a href="core.html#satisfy" id="S" name="S">Satisfy Any|All</a></td><td> All </td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Interaction between host-level access control and
 user authentication</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#scoreboardfile">ScoreBoardFile <var>file-path</var></a></td><td> logs/apache_status </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the file used to store coordination data for
+<tr><td><a href="mpm_common.html#scoreboardfile">ScoreBoardFile <var>file-path</var></a></td><td> logs/apache_status </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Location of the file used to store coordination data for
 the child processes</td></tr>
-<tr><td><a href="mod_actions.html#script">Script <var>method</var> <var>cgi-script</var></a></td><td></td><td>svd</td><td>B</td></tr><tr><td class="descr" colspan="4">Activates a CGI script for a particular request
+<tr class="odd"><td><a href="mod_actions.html#script">Script <var>method</var> <var>cgi-script</var></a></td><td></td><td>svd</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Activates a CGI script for a particular request
 method.</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#scriptalias">ScriptAlias <var>URL-path</var>
-<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps a URL to a filesystem location and designates the
+<tr><td><a href="mod_alias.html#scriptalias">ScriptAlias <var>URL-path</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps a URL to a filesystem location and designates the
 target as a CGI script</td></tr>
-<tr><td><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch <var>regex</var>
-<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps a URL to a filesystem location using a regular expression
+<tr class="odd"><td><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch <var>regex</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps a URL to a filesystem location using a regular expression
 and designates the target as a CGI script</td></tr>
-<tr class="odd"><td><a href="core.html#scriptinterpretersource">ScriptInterpreterSource Registry|Registry-Strict|Script</a></td><td> Script </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Technique for locating the interpreter for CGI
+<tr><td><a href="core.html#scriptinterpretersource">ScriptInterpreterSource Registry|Registry-Strict|Script</a></td><td> Script </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Technique for locating the interpreter for CGI
 scripts</td></tr>
-<tr><td><a href="mod_cgi.html#scriptlog">ScriptLog <var>file-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Location of the CGI script error logfile</td></tr>
-<tr class="odd"><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <var>bytes</var></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum amount of PUT or POST requests that will be recorded
+<tr class="odd"><td><a href="mod_cgi.html#scriptlog">ScriptLog <var>file-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the CGI script error logfile</td></tr>
+<tr><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <var>bytes</var></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maximum amount of PUT or POST requests that will be recorded
 in the scriptlog</td></tr>
-<tr><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Size limit of the CGI script logfile</td></tr>
-<tr class="odd"><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">The filename prefix of the socket to use for communication with
+<tr class="odd"><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Size limit of the CGI script logfile</td></tr>
+<tr><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">The filename prefix of the socket to use for communication with
 the cgi daemon</td></tr>
-<tr><td><a href="mod_nw_ssl.html#securelisten">SecureListen [<var>IP-address</var>:]<var>portnumber</var>
-<var>Certificate-Name</var> [MUTUAL]</a></td><td></td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">Enables SSL encryption for the specified port</td></tr>
-<tr class="odd"><td><a href="mod_status.html#seerequesttail">SeeRequestTail On|Off</a></td><td> Off </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Determine if mod_status displays the first 63 characters
+<tr class="odd"><td><a href="mod_nw_ssl.html#securelisten">SecureListen [<var>IP-address</var>:]<var>portnumber</var>
+<var>Certificate-Name</var> [MUTUAL]</a></td><td></td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Enables SSL encryption for the specified port</td></tr>
+<tr><td><a href="mod_status.html#seerequesttail">SeeRequestTail On|Off</a></td><td> Off </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">Determine if mod_status displays the first 63 characters
 of a request or the last 63, assuming the request itself is greater than
 63 chars.</td></tr>
-<tr><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">TCP buffer size</td></tr>
-<tr class="odd"><td><a href="core.html#serveradmin">ServerAdmin <var>email-address</var>|<var>URL</var></a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Email address that the server includes in error
+<tr class="odd"><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">TCP buffer size</td></tr>
+<tr><td><a href="core.html#serveradmin">ServerAdmin <var>email-address</var>|<var>URL</var></a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Email address that the server includes in error
 messages sent to the client</td></tr>
-<tr><td><a href="core.html#serveralias">ServerAlias <var>hostname</var> [<var>hostname</var>] ...</a></td><td></td><td>v</td><td>C</td></tr><tr><td class="descr" colspan="4">Alternate names for a host used when matching requests
+<tr class="odd"><td><a href="core.html#serveralias">ServerAlias <var>hostname</var> [<var>hostname</var>] ...</a></td><td></td><td>v</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Alternate names for a host used when matching requests
 to name-virtual hosts</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#serverlimit">ServerLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Upper limit on configurable number of processes</td></tr>
-<tr><td><a href="core.html#servername">ServerName [<var>scheme</var>://]<var>fully-qualified-domain-name</var>[:<var>port</var>]</a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Hostname and port that the server uses to identify
+<tr><td><a href="mpm_common.html#serverlimit">ServerLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Upper limit on configurable number of processes</td></tr>
+<tr class="odd"><td><a href="core.html#servername">ServerName [<var>scheme</var>://]<var>fully-qualified-domain-name</var>[:<var>port</var>]</a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Hostname and port that the server uses to identify
 itself</td></tr>
-<tr class="odd"><td><a href="core.html#serverpath">ServerPath <var>URL-path</var></a></td><td></td><td>v</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Legacy URL pathname for a name-based virtual host that
+<tr><td><a href="core.html#serverpath">ServerPath <var>URL-path</var></a></td><td></td><td>v</td><td>C</td></tr><tr><td class="descr" colspan="4">Legacy URL pathname for a name-based virtual host that
 is accessed by an incompatible browser</td></tr>
-<tr><td><a href="core.html#serverroot">ServerRoot <var>directory-path</var></a></td><td> /usr/local/apache </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Base directory for the server installation</td></tr>
-<tr class="odd"><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the footer on server-generated documents</td></tr>
-<tr><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures the <code>Server</code> HTTP response
+<tr class="odd"><td><a href="core.html#serverroot">ServerRoot <var>directory-path</var></a></td><td> /usr/local/apache </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Base directory for the server installation</td></tr>
+<tr><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures the footer on server-generated documents</td></tr>
+<tr class="odd"><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the <code>Server</code> HTTP response
 header</td></tr>
-<tr class="odd"><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> <var>value</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables</td></tr>
-<tr><td><a href="mod_setenvif.html#setenvif">SetEnvIf <em>attribute
+<tr><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> <var>value</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables</td></tr>
+<tr class="odd"><td><a href="mod_setenvif.html#setenvif">SetEnvIf <em>attribute
     regex [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables based on attributes of the request
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables based on attributes of the request
 </td></tr>
-<tr class="odd"><td><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase <em>attribute regex 
+<tr><td><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase <em>attribute regex 
         [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables based on attributes of the request
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables based on attributes of the request
 without respect to case</td></tr>
-<tr><td><a href="core.html#sethandler">SetHandler <var>handler-name</var>|None</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Forces all matching files to be processed by a
+<tr class="odd"><td><a href="core.html#sethandler">SetHandler <var>handler-name</var>|None</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Forces all matching files to be processed by a
 handler</td></tr>
-<tr class="odd"><td><a href="core.html#setinputfilter">SetInputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the filters that will process client requests and POST
+<tr><td><a href="core.html#setinputfilter">SetInputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Sets the filters that will process client requests and POST
 input</td></tr>
-<tr><td><a href="core.html#setoutputfilter">SetOutputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Sets the filters that will process responses from the
+<tr class="odd"><td><a href="core.html#setoutputfilter">SetOutputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the filters that will process responses from the
 server</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssienableaccess">SSIEnableAccess on|off</a></td><td> off </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Enable the -A flag during conditional flow control processing.</td></tr>
-<tr><td><a href="mod_include.html#ssiendtag">SSIEndTag <var>tag</var></a></td><td> "--&gt;" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that ends an include element</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssierrormsg">SSIErrorMsg <var>message</var></a></td><td> "[an error occurred +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Error message displayed when there is an SSI
+<tr><td><a href="mod_include.html#ssienableaccess">SSIEnableAccess on|off</a></td><td> off </td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">Enable the -A flag during conditional flow control processing.</td></tr>
+<tr class="odd"><td><a href="mod_include.html#ssiendtag">SSIEndTag <var>tag</var></a></td><td> "--&gt;" </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">String that ends an include element</td></tr>
+<tr><td><a href="mod_include.html#ssierrormsg">SSIErrorMsg <var>message</var></a></td><td> "[an error occurred +</td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Error message displayed when there is an SSI
 error</td></tr>
-<tr><td><a href="mod_include.html#ssistarttag">SSIStartTag <var>tag</var></a></td><td> "&lt;!--#" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that starts an include element</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <var>formatstring</var></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the format in which date strings are
+<tr class="odd"><td><a href="mod_include.html#ssistarttag">SSIStartTag <var>tag</var></a></td><td> "&lt;!--#" </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">String that starts an include element</td></tr>
+<tr><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <var>formatstring</var></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Configures the format in which date strings are
 displayed</td></tr>
-<tr><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">String displayed when an unset variable is echoed</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+<tr class="odd"><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">String displayed when an unset variable is echoed</td></tr>
+<tr><td><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
 for Client Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+<tr class="odd"><td><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
 Client Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+<tr><td><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
 for defining acceptable CA names</td></tr>
-<tr><td><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+<tr class="odd"><td><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
 defining acceptable CA names</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
+<tr><td><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
 Client Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
+<tr class="odd"><td><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
 Client Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of PEM-encoded Server CA Certificates</td></tr>
-<tr><td><a href="mod_ssl.html#sslcertificatefile">SSLCertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Server PEM-encoded X.509 Certificate file</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Server PEM-encoded Private Key file</td></tr>
-<tr><td><a href="mod_ssl.html#sslciphersuite">SSLCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
+<tr><td><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of PEM-encoded Server CA Certificates</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslcertificatefile">SSLCertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Server PEM-encoded X.509 Certificate file</td></tr>
+<tr><td><a href="mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Server PEM-encoded Private Key file</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslciphersuite">SSLCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
 handshake</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcryptodevice">SSLCryptoDevice <em>engine</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable use of a cryptographic hardware accelerator</td></tr>
-<tr><td><a href="mod_ssl.html#sslengine">SSLEngine on|off|optional</a></td><td> off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">SSL Engine Operation Switch</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslhonorcipherorder">SSLHonorCiperOrder <em>flag</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Option to prefer the server's cipher preference order</td></tr>
-<tr><td><a href="mod_ssl.html#sslmutex">SSLMutex <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Semaphore for internal mutual exclusion of 
+<tr><td><a href="mod_ssl.html#sslcryptodevice">SSLCryptoDevice <em>engine</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable use of a cryptographic hardware accelerator</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslengine">SSLEngine on|off|optional</a></td><td> off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">SSL Engine Operation Switch</td></tr>
+<tr><td><a href="mod_ssl.html#sslhonorcipherorder">SSLHonorCiperOrder <em>flag</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Option to prefer the server's cipher preference order</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslmutex">SSLMutex <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Semaphore for internal mutual exclusion of 
 operations</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#ssloptions">SSLOptions [+|-]<em>option</em> ...</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure various SSL engine run-time options</td></tr>
-<tr><td><a href="mod_ssl.html#sslpassphrasedialog">SSLPassPhraseDialog <em>type</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of pass phrase dialog for encrypted private 
+<tr><td><a href="mod_ssl.html#ssloptions">SSLOptions [+|-]<em>option</em> ...</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure various SSL engine run-time options</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslpassphrasedialog">SSLPassPhraseDialog <em>type</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of pass phrase dialog for encrypted private 
 keys</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslprotocol">SSLProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure usable SSL protocol flavors</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+<tr><td><a href="mod_ssl.html#sslprotocol">SSLProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure usable SSL protocol flavors</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
 for Remote Server Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+<tr><td><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
 Remote Server Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
+<tr class="odd"><td><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
 Remote Server Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
+<tr><td><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
 Remote Server Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
 proxy handshake</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine on|off</a></td><td> off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">SSL Proxy Engine Operation Switch</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile <em>filename</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded client certificates and keys to be used by the proxy</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath <em>directory</em></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded client certificates and keys to be used by the proxy</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure usable SSL protocol flavors for proxy usage</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxyverify">SSLProxyVerify <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of remote server Certificate verification</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxyverifydepth">SSLProxyVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum depth of CA Certificates in Remote Server
+<tr><td><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine on|off</a></td><td> off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">SSL Proxy Engine Operation Switch</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile <em>filename</em></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded client certificates and keys to be used by the proxy</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath <em>directory</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded client certificates and keys to be used by the proxy</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure usable SSL protocol flavors for proxy usage</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxyverify">SSLProxyVerify <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of remote server Certificate verification</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyverifydepth">SSLProxyVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum depth of CA Certificates in Remote Server
 Certificate verification</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslrandomseed">SSLRandomSeed <em>context</em> <em>source</em> 
-[<em>bytes</em>]</a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Pseudo Random Number Generator (PRNG) seeding 
+<tr><td><a href="mod_ssl.html#sslrandomseed">SSLRandomSeed <em>context</em> <em>source</em> 
+[<em>bytes</em>]</a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Pseudo Random Number Generator (PRNG) seeding 
 source</td></tr>
-<tr><td><a href="mod_ssl.html#sslrequire">SSLRequire <em>expression</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Allow access only when an arbitrarily complex 
+<tr class="odd"><td><a href="mod_ssl.html#sslrequire">SSLRequire <em>expression</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Allow access only when an arbitrarily complex 
 boolean expression is true</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Deny access when SSL is not used for the 
+<tr><td><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Deny access when SSL is not used for the 
 HTTP request</td></tr>
-<tr><td><a href="mod_ssl.html#sslsessioncache">SSLSessionCache <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of the global/inter-process SSL Session 
+<tr class="odd"><td><a href="mod_ssl.html#sslsessioncache">SSLSessionCache <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of the global/inter-process SSL Session 
 Cache</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout <em>seconds</em></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Number of seconds before an SSL session expires
+<tr><td><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout <em>seconds</em></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Number of seconds before an SSL session expires
 in the Session Cache</td></tr>
-<tr><td><a href="mod_ssl.html#sslusername">SSLUserName <em>varname</em></a></td><td></td><td>sdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Variable name to determine user name</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of Client Certificate verification</td></tr>
-<tr><td><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum depth of CA Certificates in Client 
+<tr class="odd"><td><a href="mod_ssl.html#sslusername">SSLUserName <em>varname</em></a></td><td></td><td>sdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Variable name to determine user name</td></tr>
+<tr><td><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of Client Certificate verification</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum depth of CA Certificates in Client 
 Certificate verification</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#startservers">StartServers <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of child server processes created at startup</td></tr>
-<tr><td><a href="mpm_common.html#startthreads">StartThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of threads created on startup</td></tr>
-<tr class="odd"><td><a href="mod_substitute.html#substitute">Substitute <var>s/pattern/substitution/[inf]</var></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Pattern to filter the response content</td></tr>
-<tr><td><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup <em>User Group</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">User and group permissions for CGI programs</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the upper limit on the configurable number of threads
+<tr><td><a href="mpm_common.html#startservers">StartServers <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of child server processes created at startup</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#startthreads">StartThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of threads created on startup</td></tr>
+<tr><td><a href="mod_substitute.html#substitute">Substitute <var>s/pattern/substitution/[infq]</var></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Pattern to filter the response content</td></tr>
+<tr class="odd"><td><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup <em>User Group</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">User and group permissions for CGI programs</td></tr>
+<tr><td><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Sets the upper limit on the configurable number of threads
 per child process</td></tr>
-<tr><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of threads created by each child process</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">The size in bytes of the stack used by threads handling 
+<tr class="odd"><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of threads created by each child process</td></tr>
+<tr><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">The size in bytes of the stack used by threads handling 
 client connections</td></tr>
-<tr><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Amount of time the server will wait for
+<tr class="odd"><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Amount of time the server will wait for
 certain events before failing a request</td></tr>
-<tr class="odd"><td><a href="core.html#traceenable">TraceEnable <var>[on|off|extended]</var></a></td><td> on </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Determines the behaviour on <code>TRACE</code>
+<tr><td><a href="core.html#traceenable">TraceEnable <var>[on|off|extended]</var></a></td><td> on </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Determines the behaviour on <code>TRACE</code>
 requests</td></tr>
-<tr><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Specify location of a log file</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">The location of the <code>mime.types</code> file</td></tr>
-<tr><td><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv <var>env-variable</var> [<var>env-variable</var>]
-...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes variables from the environment</td></tr>
-<tr class="odd"><td><a href="core.html#usecanonicalname">UseCanonicalName On|Off|DNS</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures how the server determines its own name and
+<tr class="odd"><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Specify location of a log file</td></tr>
+<tr><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">The location of the <code>mime.types</code> file</td></tr>
+<tr class="odd"><td><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv <var>env-variable</var> [<var>env-variable</var>]
+...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes variables from the environment</td></tr>
+<tr><td><a href="core.html#usecanonicalname">UseCanonicalName On|Off|DNS</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures how the server determines its own name and
 port</td></tr>
-<tr><td><a href="core.html#usecanonicalphysicalport">UseCanonicalPhysicalPort On|Off</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures how the server determines its own name and
+<tr class="odd"><td><a href="core.html#usecanonicalphysicalport">UseCanonicalPhysicalPort On|Off</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures how the server determines its own name and
 port</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#user">User <var>unix-userid</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">The userid under which the server will answer
+<tr><td><a href="mpm_common.html#user">User <var>unix-userid</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">The userid under which the server will answer
 requests</td></tr>
-<tr><td><a href="mod_userdir.html#userdir">UserDir <em>directory-filename</em></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Location of the user-specific directories</td></tr>
-<tr class="odd"><td><a href="mod_vhost_alias.html#virtualdocumentroot" id="V" name="V">VirtualDocumentRoot <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the document root
+<tr class="odd"><td><a href="mod_userdir.html#userdir">UserDir <em>directory-filename</em> [<em>directory-filename</em>] ...
+</a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the user-specific directories</td></tr>
+<tr><td><a href="mod_vhost_alias.html#virtualdocumentroot" id="V" name="V">VirtualDocumentRoot <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the document root
 for a given virtual host</td></tr>
-<tr><td><a href="mod_vhost_alias.html#virtualdocumentrootip">VirtualDocumentRootIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the document root
+<tr class="odd"><td><a href="mod_vhost_alias.html#virtualdocumentrootip">VirtualDocumentRootIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the document root
 for a given virtual host</td></tr>
-<tr class="odd"><td><a href="core.html#virtualhost">&lt;VirtualHost
+<tr><td><a href="core.html#virtualhost">&lt;VirtualHost
     <var>addr</var>[:<var>port</var>] [<var>addr</var>[:<var>port</var>]]
-    ...&gt; ... &lt;/VirtualHost&gt;</a></td><td></td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Contains directives that apply only to a specific
+    ...&gt; ... &lt;/VirtualHost&gt;</a></td><td></td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Contains directives that apply only to a specific
 hostname or IP address</td></tr>
-<tr><td><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the CGI directory for
+<tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the CGI directory for
 a given virtual host</td></tr>
-<tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the cgi directory for
+<tr><td><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the cgi directory for
 a given virtual host</td></tr>
-<tr><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Use accept() rather than AcceptEx() to accept network connections</td></tr>
-<tr class="odd"><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Parse SSI directives in files with the execute bit
+<tr class="odd"><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Use accept() rather than AcceptEx() to accept network connections</td></tr>
+<tr><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Parse SSI directives in files with the execute bit
 set</td></tr>
 </table></div>
 <div class="bottomlang">
@@ -762,8 +765,9 @@ set</td></tr>
 <a href="../es/mod/quickreference.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/quickreference.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/quickreference.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/quickreference.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es
index c2c3cde3..89a75a1a 100644
--- a/docs/manual/mod/quickreference.html.es
+++ b/docs/manual/mod/quickreference.html.es
@@ -25,8 +25,13 @@
 <a href="../es/mod/quickreference.html" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/quickreference.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/quickreference.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/quickreference.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">Esta traducción podría estar
+            obsoleta. Consulte la versión en inglés de la
+            documentación para comprobar si se han producido cambios
+            recientemente.</div>
 
     <p>La Guía Rápida de Referencia de Directivas muestra el uso, las
     opciones por defecto, el estado y el contexto de cada directiva de
@@ -46,21 +51,17 @@
   </div>
 <div id="directive-ref"><table id="legend">
 <tr><td class="letters"><span><a href="#A">&nbsp;A&nbsp;</a> | <a href="#B">&nbsp;B&nbsp;</a> | <a href="#C">&nbsp;C&nbsp;</a> | <a href="#D">&nbsp;D&nbsp;</a> | <a href="#E">&nbsp;E&nbsp;</a> | <a href="#F">&nbsp;F&nbsp;</a> | <a href="#G">&nbsp;G&nbsp;</a> | <a href="#H">&nbsp;H&nbsp;</a> | <a href="#I">&nbsp;I&nbsp;</a> | <a href="#K">&nbsp;K&nbsp;</a> | <a href="#L">&nbsp;L&nbsp;</a> | <a href="#M">&nbsp;M&nbsp;</a> | <a href="#N">&nbsp;N&nbsp;</a> | <a href="#O">&nbsp;O&nbsp;</a> | <a href="#P">&nbsp;P&nbsp;</a> | <a href="#R">&nbsp;R&nbsp;</a> | <a href="#S">&nbsp;S&nbsp;</a> | <a href="#T">&nbsp;T&nbsp;</a> | <a href="#U">&nbsp;U&nbsp;</a> | <a href="#V">&nbsp;V&nbsp;</a> | <a href="#W">&nbsp;W&nbsp;</a> | <a href="#X">&nbsp;X&nbsp;</a></span></td>
-<td><table>
-      
-      <tr><th>s</th><td>server&nbsp;config</td></tr>
-      <tr><th>v</th><td>virtual&nbsp;host</td></tr>
-      <tr><th>d</th><td>directory</td></tr>
-      <tr><th>h</th><td>.htaccess</td></tr>
-    </table></td>
-<td><table>
-      
-      <tr><th>C</th><td>Core</td></tr>
-      <tr><th>M</th><td>MPM</td></tr>
-      <tr><th>B</th><td>Base</td></tr>
-      <tr><th>E</th><td>Extensión</td></tr>
-      <tr><th>X</th><td>Experimental</td></tr>
-    </table></td></tr>
+<td><table><tr><th>s</th><td>server config</td></tr>
+<tr><th>v</th><td>virtual host</td></tr>
+<tr><th>d</th><td>directory</td></tr>
+<tr><th>h</th><td>.htaccess</td></tr>
+</table></td>
+<td><table><tr><th>C</th><td>Core</td></tr>
+<tr><th>M</th><td>MPM</td></tr>
+<tr><th>B</th><td>Base</td></tr>
+<tr><th>E</th><td>Extensión</td></tr>
+<tr><th>X</th><td>Experimental</td></tr>
+</table></td></tr>
 </table>
 <table class="qref">
 <tr><td><a href="core.html#acceptfilter" id="A" name="A">AcceptFilter <var>protocol</var> <var>accept_filter</var></a></td><td></td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures optimizations for a Protocol's Listener Sockets</td></tr>
@@ -267,10 +268,10 @@ switch before dumping core</td></tr>
 <tr class="odd"><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the DAV lock database</td></tr>
 <tr><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
 a DAV resource</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td> 10 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td> 1 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdparams">DBDParams
 <var>param1</var>=<var>value1</var>[,<var>param2</var>=<var>value2</var>]</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Parameters for database connection</td></tr>
 <tr><td><a href="mod_dbd.html#dbdpersist">DBDPersist On|Off</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Whether to use persistent connections</td></tr>
@@ -348,7 +349,7 @@ MIME content-type</td></tr>
 will exit.</td></tr>
 <tr><td><a href="mpm_common.html#group">Group <var>unix-group</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Group under which the server will answer
 requests</td></tr>
-<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|add|unset|echo|edit
+<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|merge|add|unset|echo|edit
 <var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP response headers</td></tr>
 <tr><td><a href="mod_autoindex.html#headername">HeaderName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the top
 of the index listing</td></tr>
@@ -424,7 +425,7 @@ subrequests</td></tr>
 from the client</td></tr>
 <tr class="odd"><td><a href="core.html#limitrequestfields">LimitRequestFields <var>number</var></a></td><td> 100 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the number of HTTP request header fields that
 will be accepted from the client</td></tr>
-<tr><td><a href="core.html#limitrequestfieldsize">LimitRequestFieldsize <var>bytes</var></a></td><td></td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the size of the HTTP request header allowed from the
+<tr><td><a href="core.html#limitrequestfieldsize">LimitRequestFieldSize <var>bytes</var></a></td><td> 8190 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the size of the HTTP request header allowed from the
 client</td></tr>
 <tr class="odd"><td><a href="core.html#limitrequestline">LimitRequestLine <var>bytes</var></a></td><td> 8190 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limit the size of the HTTP request line that will be accepted
 from the client</td></tr>
@@ -502,7 +503,7 @@ evaluated.</td></tr>
 ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Passes environment variables from the shell</td></tr>
 <tr><td><a href="mpm_common.html#pidfile">PidFile <var>filename</var></a></td><td> logs/httpd.pid </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">File where the server records the process ID
 of the daemon</td></tr>
-<tr class="odd"><td><a href="mod_echo.html#protocolecho">ProtocolEcho On|Off</a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Turn the echo server on or off</td></tr>
+<tr class="odd"><td><a href="mod_echo.html#protocolecho">ProtocolEcho On|Off</a></td><td> Off </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Turn the echo server on or off</td></tr>
 <tr><td><a href="mod_proxy.html#proxy">&lt;Proxy <var>wildcard-url</var>&gt; ...&lt;/Proxy&gt;</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Container for directives applied to proxied resources</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxybadheader">ProxyBadHeader IsError|Ignore|StartBody</a></td><td> IsError </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Determines how to handle bad header lines in a
 response</td></tr>
@@ -517,246 +518,252 @@ proxied</td></tr>
 proxied resources</td></tr>
 <tr><td><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards <var>number</var></a></td><td> -1 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximium number of proxies that a request can be forwarded
 through</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxypass">ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var> <var>key=value</var> ...]] [nocanon]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maps remote servers into the local server URL-space</td></tr>
-<tr><td><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch [<var>regex</var>] !|<var>url</var> [<var>key=value</var>
-	<var>[key=value</var> ...]]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Maps remote servers into the local server URL-space using regular expressions</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse [<var>path</var>] <var>url</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adjusts the URL in HTTP response headers sent from a reverse
+<tr class="odd"><td><a href="mod_proxy.html#proxypass">ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var>
+<var>key=value</var> ...]] [nocanon] [interpolate]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maps remote servers into the local server URL-space</td></tr>
+<tr><td><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv On|Off</a></td><td> Off </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable Environment Variable interpolation in Reverse Proxy configurations</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch [<var>regex</var>] !|<var>url</var> [<var>key=value</var>
+	<var>[key=value</var> ...]]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maps remote servers into the local server URL-space using regular expressions</td></tr>
+<tr><td><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse [<var>path</var>] <var>url</var>
+[<var>interpolate</var>]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Adjusts the URL in HTTP response headers sent from a reverse
 proxied server</td></tr>
-<tr><td><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain <var>internal-domain</var> <var>public-domain</var></a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Adjusts the Domain string in Set-Cookie headers from a reverse-
+<tr class="odd"><td><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain <var>internal-domain</var>
+<var>public-domain</var> [<var>interpolate</var>]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adjusts the Domain string in Set-Cookie headers from a reverse-
 proxied server</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath <var>internal-path</var> <var>public-path</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adjusts the Path string in Set-Cookie headers from a reverse-
+<tr><td><a href="mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath <var>internal-path</var>
+<var>public-path</var> [<var>interpolate</var>]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Adjusts the Path string in Set-Cookie headers from a reverse-
 proxied server</td></tr>
-<tr><td><a href="mod_proxy.html#proxypreservehost">ProxyPreserveHost On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Use incoming Host HTTP request header for proxy
+<tr class="odd"><td><a href="mod_proxy.html#proxypreservehost">ProxyPreserveHost On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Use incoming Host HTTP request header for proxy
 request</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network buffer size for proxied HTTP and FTP
+<tr><td><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network buffer size for proxied HTTP and FTP
 connections</td></tr>
-<tr><td><a href="mod_proxy.html#proxyremote">ProxyRemote <var>match</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Remote proxy used to handle certain requests</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch <var>regex</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Remote proxy used to handle requests matched by regular
+<tr class="odd"><td><a href="mod_proxy.html#proxyremote">ProxyRemote <var>match</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Remote proxy used to handle certain requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch <var>regex</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Remote proxy used to handle requests matched by regular
 expressions</td></tr>
-<tr><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
-<tr><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
-<tr><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
+<tr class="odd"><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
+<tr><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
 header for proxied requests</td></tr>
-<tr class="odd"><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Name of the file that will be inserted at the end
+<tr><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the end
 of the index listing</td></tr>
-<tr><td><a href="mpm_common.html#receivebuffersize">ReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">TCP receive buffer size</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#redirect">Redirect [<var>status</var>] <var>URL-path</var>
-<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external redirect asking the client to fetch
+<tr class="odd"><td><a href="mpm_common.html#receivebuffersize">ReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">TCP receive buffer size</td></tr>
+<tr><td><a href="mod_alias.html#redirect">Redirect [<var>status</var>] <var>URL-path</var>
+<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external redirect asking the client to fetch
 a different URL</td></tr>
-<tr><td><a href="mod_alias.html#redirectmatch">RedirectMatch [<var>status</var>] <var>regex</var>
-<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external redirect based on a regular expression match 
+<tr class="odd"><td><a href="mod_alias.html#redirectmatch">RedirectMatch [<var>status</var>] <var>regex</var>
+<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external redirect based on a regular expression match 
 of the current URL</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#redirectpermanent">RedirectPermanent <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external permanent redirect asking the client to fetch
+<tr><td><a href="mod_alias.html#redirectpermanent">RedirectPermanent <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external permanent redirect asking the client to fetch
 a different URL</td></tr>
-<tr><td><a href="mod_alias.html#redirecttemp">RedirectTemp <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external temporary redirect asking the client to fetch
+<tr class="odd"><td><a href="mod_alias.html#redirecttemp">RedirectTemp <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external temporary redirect asking the client to fetch
 a different URL</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removecharset">RemoveCharset <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any character set associations for a set of file
+<tr><td><a href="mod_mime.html#removecharset">RemoveCharset <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any character set associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_mime.html#removeencoding">RemoveEncoding <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any content encoding associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removeencoding">RemoveEncoding <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content encoding associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removehandler">RemoveHandler <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any handler associations for a set of file
+<tr><td><a href="mod_mime.html#removehandler">RemoveHandler <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any handler associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_mime.html#removeinputfilter">RemoveInputFilter <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any input filter associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removeinputfilter">RemoveInputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any input filter associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removelanguage">RemoveLanguage <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any language associations for a set of file
+<tr><td><a href="mod_mime.html#removelanguage">RemoveLanguage <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any language associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any output filter associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any output filter associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content type associations for a set of file
+<tr><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any content type associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset|edit <var>header</var>
-[<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
-<tr class="odd"><td><a href="core.html#require">Require <var>entity-name</var> [<var>entity-name</var>] ...</a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Selects which authenticated users can access
+<tr class="odd"><td><a href="mod_headers.html#requestheader">RequestHeader set|append|merge|add|unset|edit <var>header</var>
+[<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
+<tr><td><a href="core.html#require">Require <var>entity-name</var> [<var>entity-name</var>] ...</a></td><td></td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Selects which authenticated users can access
 a resource</td></tr>
-<tr><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
-      <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines a condition under which rewriting will take place
+<tr class="odd"><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
+<tr><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
+      <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a condition under which rewriting will take place
 </td></tr>
-<tr><td><a href="mod_rewrite.html#rewriteengine">RewriteEngine on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables or disables runtime rewriting engine</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewritelock">RewriteLock <em>file-path</em></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the lock file used for <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code>
+<tr class="odd"><td><a href="mod_rewrite.html#rewriteengine">RewriteEngine on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables or disables runtime rewriting engine</td></tr>
+<tr><td><a href="mod_rewrite.html#rewritelock">RewriteLock <em>file-path</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the name of the lock file used for <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code>
 synchronization</td></tr>
-<tr><td><a href="mod_rewrite.html#rewritelog">RewriteLog <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the name of the file used for logging rewrite engine
+<tr class="odd"><td><a href="mod_rewrite.html#rewritelog">RewriteLog <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the file used for logging rewrite engine
 processing</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewriteloglevel">RewriteLogLevel <em>Level</em></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the verbosity of the log file used by the rewrite
+<tr><td><a href="mod_rewrite.html#rewriteloglevel">RewriteLogLevel <em>Level</em></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the verbosity of the log file used by the rewrite
 engine</td></tr>
-<tr><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
-</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <var>Options</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
-<tr><td><a href="mod_rewrite.html#rewriterule">RewriteRule
-      <em>Pattern</em> <em>Substitution</em> [<em>flags</em>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
-<tr class="odd"><td><a href="core.html#rlimitcpu">RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the CPU consumption of processes launched
+<tr class="odd"><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
+</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
+<tr><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <var>Options</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewriterule">RewriteRule
+      <em>Pattern</em> <em>Substitution</em> [<em>flags</em>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
+<tr><td><a href="core.html#rlimitcpu">RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the CPU consumption of processes launched
 by Apache children</td></tr>
-<tr><td><a href="core.html#rlimitmem">RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the memory consumption of processes launched
+<tr class="odd"><td><a href="core.html#rlimitmem">RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the memory consumption of processes launched
 by Apache children</td></tr>
-<tr class="odd"><td><a href="core.html#rlimitnproc">RLimitNPROC <var>number</var>|max [<var>number</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the number of processes that can be launched by
+<tr><td><a href="core.html#rlimitnproc">RLimitNPROC <var>number</var>|max [<var>number</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the number of processes that can be launched by
 processes launched by Apache children</td></tr>
-<tr><td><a href="core.html#satisfy" id="S" name="S">Satisfy Any|All</a></td><td> All </td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Interaction between host-level access control and
+<tr class="odd"><td><a href="core.html#satisfy" id="S" name="S">Satisfy Any|All</a></td><td> All </td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Interaction between host-level access control and
 user authentication</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#scoreboardfile">ScoreBoardFile <var>file-path</var></a></td><td> logs/apache_status </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the file used to store coordination data for
+<tr><td><a href="mpm_common.html#scoreboardfile">ScoreBoardFile <var>file-path</var></a></td><td> logs/apache_status </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Location of the file used to store coordination data for
 the child processes</td></tr>
-<tr><td><a href="mod_actions.html#script">Script <var>method</var> <var>cgi-script</var></a></td><td></td><td>svd</td><td>B</td></tr><tr><td class="descr" colspan="4">Activates a CGI script for a particular request
+<tr class="odd"><td><a href="mod_actions.html#script">Script <var>method</var> <var>cgi-script</var></a></td><td></td><td>svd</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Activates a CGI script for a particular request
 method.</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#scriptalias">ScriptAlias <var>URL-path</var>
-<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps a URL to a filesystem location and designates the
+<tr><td><a href="mod_alias.html#scriptalias">ScriptAlias <var>URL-path</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps a URL to a filesystem location and designates the
 target as a CGI script</td></tr>
-<tr><td><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch <var>regex</var>
-<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps a URL to a filesystem location using a regular expression
+<tr class="odd"><td><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch <var>regex</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps a URL to a filesystem location using a regular expression
 and designates the target as a CGI script</td></tr>
-<tr class="odd"><td><a href="core.html#scriptinterpretersource">ScriptInterpreterSource Registry|Registry-Strict|Script</a></td><td> Script </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Technique for locating the interpreter for CGI
+<tr><td><a href="core.html#scriptinterpretersource">ScriptInterpreterSource Registry|Registry-Strict|Script</a></td><td> Script </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Technique for locating the interpreter for CGI
 scripts</td></tr>
-<tr><td><a href="mod_cgi.html#scriptlog">ScriptLog <var>file-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Location of the CGI script error logfile</td></tr>
-<tr class="odd"><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <var>bytes</var></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum amount of PUT or POST requests that will be recorded
+<tr class="odd"><td><a href="mod_cgi.html#scriptlog">ScriptLog <var>file-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the CGI script error logfile</td></tr>
+<tr><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <var>bytes</var></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maximum amount of PUT or POST requests that will be recorded
 in the scriptlog</td></tr>
-<tr><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Size limit of the CGI script logfile</td></tr>
-<tr class="odd"><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">The filename prefix of the socket to use for communication with
+<tr class="odd"><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Size limit of the CGI script logfile</td></tr>
+<tr><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">The filename prefix of the socket to use for communication with
 the cgi daemon</td></tr>
-<tr><td><a href="mod_nw_ssl.html#securelisten">SecureListen [<var>IP-address</var>:]<var>portnumber</var>
-<var>Certificate-Name</var> [MUTUAL]</a></td><td></td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">Enables SSL encryption for the specified port</td></tr>
-<tr class="odd"><td><a href="mod_status.html#seerequesttail">SeeRequestTail On|Off</a></td><td> Off </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Determine if mod_status displays the first 63 characters
+<tr class="odd"><td><a href="mod_nw_ssl.html#securelisten">SecureListen [<var>IP-address</var>:]<var>portnumber</var>
+<var>Certificate-Name</var> [MUTUAL]</a></td><td></td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Enables SSL encryption for the specified port</td></tr>
+<tr><td><a href="mod_status.html#seerequesttail">SeeRequestTail On|Off</a></td><td> Off </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">Determine if mod_status displays the first 63 characters
 of a request or the last 63, assuming the request itself is greater than
 63 chars.</td></tr>
-<tr><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">TCP buffer size</td></tr>
-<tr class="odd"><td><a href="core.html#serveradmin">ServerAdmin <var>email-address</var>|<var>URL</var></a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Email address that the server includes in error
+<tr class="odd"><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">TCP buffer size</td></tr>
+<tr><td><a href="core.html#serveradmin">ServerAdmin <var>email-address</var>|<var>URL</var></a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Email address that the server includes in error
 messages sent to the client</td></tr>
-<tr><td><a href="core.html#serveralias">ServerAlias <var>hostname</var> [<var>hostname</var>] ...</a></td><td></td><td>v</td><td>C</td></tr><tr><td class="descr" colspan="4">Alternate names for a host used when matching requests
+<tr class="odd"><td><a href="core.html#serveralias">ServerAlias <var>hostname</var> [<var>hostname</var>] ...</a></td><td></td><td>v</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Alternate names for a host used when matching requests
 to name-virtual hosts</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#serverlimit">ServerLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Upper limit on configurable number of processes</td></tr>
-<tr><td><a href="core.html#servername">ServerName [<var>scheme</var>://]<var>fully-qualified-domain-name</var>[:<var>port</var>]</a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Hostname and port that the server uses to identify
+<tr><td><a href="mpm_common.html#serverlimit">ServerLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Upper limit on configurable number of processes</td></tr>
+<tr class="odd"><td><a href="core.html#servername">ServerName [<var>scheme</var>://]<var>fully-qualified-domain-name</var>[:<var>port</var>]</a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Hostname and port that the server uses to identify
 itself</td></tr>
-<tr class="odd"><td><a href="core.html#serverpath">ServerPath <var>URL-path</var></a></td><td></td><td>v</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Legacy URL pathname for a name-based virtual host that
+<tr><td><a href="core.html#serverpath">ServerPath <var>URL-path</var></a></td><td></td><td>v</td><td>C</td></tr><tr><td class="descr" colspan="4">Legacy URL pathname for a name-based virtual host that
 is accessed by an incompatible browser</td></tr>
-<tr><td><a href="core.html#serverroot">ServerRoot <var>directory-path</var></a></td><td> /usr/local/apache </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Base directory for the server installation</td></tr>
-<tr class="odd"><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the footer on server-generated documents</td></tr>
-<tr><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures the <code>Server</code> HTTP response
+<tr class="odd"><td><a href="core.html#serverroot">ServerRoot <var>directory-path</var></a></td><td> /usr/local/apache </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Base directory for the server installation</td></tr>
+<tr><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures the footer on server-generated documents</td></tr>
+<tr class="odd"><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the <code>Server</code> HTTP response
 header</td></tr>
-<tr class="odd"><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> <var>value</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables</td></tr>
-<tr><td><a href="mod_setenvif.html#setenvif">SetEnvIf <em>attribute
+<tr><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> <var>value</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables</td></tr>
+<tr class="odd"><td><a href="mod_setenvif.html#setenvif">SetEnvIf <em>attribute
     regex [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables based on attributes of the request
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables based on attributes of the request
 </td></tr>
-<tr class="odd"><td><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase <em>attribute regex 
+<tr><td><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase <em>attribute regex 
         [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables based on attributes of the request
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables based on attributes of the request
 without respect to case</td></tr>
-<tr><td><a href="core.html#sethandler">SetHandler <var>handler-name</var>|None</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Forces all matching files to be processed by a
+<tr class="odd"><td><a href="core.html#sethandler">SetHandler <var>handler-name</var>|None</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Forces all matching files to be processed by a
 handler</td></tr>
-<tr class="odd"><td><a href="core.html#setinputfilter">SetInputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the filters that will process client requests and POST
+<tr><td><a href="core.html#setinputfilter">SetInputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Sets the filters that will process client requests and POST
 input</td></tr>
-<tr><td><a href="core.html#setoutputfilter">SetOutputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Sets the filters that will process responses from the
+<tr class="odd"><td><a href="core.html#setoutputfilter">SetOutputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the filters that will process responses from the
 server</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssienableaccess">SSIEnableAccess on|off</a></td><td> off </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Enable the -A flag during conditional flow control processing.</td></tr>
-<tr><td><a href="mod_include.html#ssiendtag">SSIEndTag <var>tag</var></a></td><td> "--&gt;" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that ends an include element</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssierrormsg">SSIErrorMsg <var>message</var></a></td><td> "[an error occurred +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Error message displayed when there is an SSI
+<tr><td><a href="mod_include.html#ssienableaccess">SSIEnableAccess on|off</a></td><td> off </td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">Enable the -A flag during conditional flow control processing.</td></tr>
+<tr class="odd"><td><a href="mod_include.html#ssiendtag">SSIEndTag <var>tag</var></a></td><td> "--&gt;" </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">String that ends an include element</td></tr>
+<tr><td><a href="mod_include.html#ssierrormsg">SSIErrorMsg <var>message</var></a></td><td> "[an error occurred +</td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Error message displayed when there is an SSI
 error</td></tr>
-<tr><td><a href="mod_include.html#ssistarttag">SSIStartTag <var>tag</var></a></td><td> "&lt;!--#" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that starts an include element</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <var>formatstring</var></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the format in which date strings are
+<tr class="odd"><td><a href="mod_include.html#ssistarttag">SSIStartTag <var>tag</var></a></td><td> "&lt;!--#" </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">String that starts an include element</td></tr>
+<tr><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <var>formatstring</var></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Configures the format in which date strings are
 displayed</td></tr>
-<tr><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">String displayed when an unset variable is echoed</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+<tr class="odd"><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">String displayed when an unset variable is echoed</td></tr>
+<tr><td><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
 for Client Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+<tr class="odd"><td><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
 Client Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+<tr><td><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
 for defining acceptable CA names</td></tr>
-<tr><td><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+<tr class="odd"><td><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
 defining acceptable CA names</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
+<tr><td><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
 Client Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
+<tr class="odd"><td><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
 Client Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of PEM-encoded Server CA Certificates</td></tr>
-<tr><td><a href="mod_ssl.html#sslcertificatefile">SSLCertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Server PEM-encoded X.509 Certificate file</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Server PEM-encoded Private Key file</td></tr>
-<tr><td><a href="mod_ssl.html#sslciphersuite">SSLCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
+<tr><td><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of PEM-encoded Server CA Certificates</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslcertificatefile">SSLCertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Server PEM-encoded X.509 Certificate file</td></tr>
+<tr><td><a href="mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Server PEM-encoded Private Key file</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslciphersuite">SSLCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
 handshake</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcryptodevice">SSLCryptoDevice <em>engine</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable use of a cryptographic hardware accelerator</td></tr>
-<tr><td><a href="mod_ssl.html#sslengine">SSLEngine on|off|optional</a></td><td> off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">SSL Engine Operation Switch</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslhonorcipherorder">SSLHonorCiperOrder <em>flag</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Option to prefer the server's cipher preference order</td></tr>
-<tr><td><a href="mod_ssl.html#sslmutex">SSLMutex <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Semaphore for internal mutual exclusion of 
+<tr><td><a href="mod_ssl.html#sslcryptodevice">SSLCryptoDevice <em>engine</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable use of a cryptographic hardware accelerator</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslengine">SSLEngine on|off|optional</a></td><td> off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">SSL Engine Operation Switch</td></tr>
+<tr><td><a href="mod_ssl.html#sslhonorcipherorder">SSLHonorCiperOrder <em>flag</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Option to prefer the server's cipher preference order</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslmutex">SSLMutex <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Semaphore for internal mutual exclusion of 
 operations</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#ssloptions">SSLOptions [+|-]<em>option</em> ...</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure various SSL engine run-time options</td></tr>
-<tr><td><a href="mod_ssl.html#sslpassphrasedialog">SSLPassPhraseDialog <em>type</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of pass phrase dialog for encrypted private 
+<tr><td><a href="mod_ssl.html#ssloptions">SSLOptions [+|-]<em>option</em> ...</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure various SSL engine run-time options</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslpassphrasedialog">SSLPassPhraseDialog <em>type</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of pass phrase dialog for encrypted private 
 keys</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslprotocol">SSLProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure usable SSL protocol flavors</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+<tr><td><a href="mod_ssl.html#sslprotocol">SSLProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure usable SSL protocol flavors</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
 for Remote Server Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+<tr><td><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
 Remote Server Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
+<tr class="odd"><td><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
 Remote Server Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
+<tr><td><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
 Remote Server Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
 proxy handshake</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine on|off</a></td><td> off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">SSL Proxy Engine Operation Switch</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile <em>filename</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded client certificates and keys to be used by the proxy</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath <em>directory</em></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded client certificates and keys to be used by the proxy</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure usable SSL protocol flavors for proxy usage</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxyverify">SSLProxyVerify <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of remote server Certificate verification</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxyverifydepth">SSLProxyVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum depth of CA Certificates in Remote Server
+<tr><td><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine on|off</a></td><td> off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">SSL Proxy Engine Operation Switch</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile <em>filename</em></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded client certificates and keys to be used by the proxy</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath <em>directory</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded client certificates and keys to be used by the proxy</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure usable SSL protocol flavors for proxy usage</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxyverify">SSLProxyVerify <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of remote server Certificate verification</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyverifydepth">SSLProxyVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum depth of CA Certificates in Remote Server
 Certificate verification</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslrandomseed">SSLRandomSeed <em>context</em> <em>source</em> 
-[<em>bytes</em>]</a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Pseudo Random Number Generator (PRNG) seeding 
+<tr><td><a href="mod_ssl.html#sslrandomseed">SSLRandomSeed <em>context</em> <em>source</em> 
+[<em>bytes</em>]</a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Pseudo Random Number Generator (PRNG) seeding 
 source</td></tr>
-<tr><td><a href="mod_ssl.html#sslrequire">SSLRequire <em>expression</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Allow access only when an arbitrarily complex 
+<tr class="odd"><td><a href="mod_ssl.html#sslrequire">SSLRequire <em>expression</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Allow access only when an arbitrarily complex 
 boolean expression is true</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Deny access when SSL is not used for the 
+<tr><td><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Deny access when SSL is not used for the 
 HTTP request</td></tr>
-<tr><td><a href="mod_ssl.html#sslsessioncache">SSLSessionCache <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of the global/inter-process SSL Session 
+<tr class="odd"><td><a href="mod_ssl.html#sslsessioncache">SSLSessionCache <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of the global/inter-process SSL Session 
 Cache</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout <em>seconds</em></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Number of seconds before an SSL session expires
+<tr><td><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout <em>seconds</em></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Number of seconds before an SSL session expires
 in the Session Cache</td></tr>
-<tr><td><a href="mod_ssl.html#sslusername">SSLUserName <em>varname</em></a></td><td></td><td>sdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Variable name to determine user name</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of Client Certificate verification</td></tr>
-<tr><td><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum depth of CA Certificates in Client 
+<tr class="odd"><td><a href="mod_ssl.html#sslusername">SSLUserName <em>varname</em></a></td><td></td><td>sdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Variable name to determine user name</td></tr>
+<tr><td><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of Client Certificate verification</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum depth of CA Certificates in Client 
 Certificate verification</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#startservers">StartServers <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of child server processes created at startup</td></tr>
-<tr><td><a href="mpm_common.html#startthreads">StartThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of threads created on startup</td></tr>
-<tr class="odd"><td><a href="mod_substitute.html#substitute">Substitute <var>s/pattern/substitution/[inf]</var></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Pattern to filter the response content</td></tr>
-<tr><td><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup <em>User Group</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">User and group permissions for CGI programs</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the upper limit on the configurable number of threads
+<tr><td><a href="mpm_common.html#startservers">StartServers <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of child server processes created at startup</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#startthreads">StartThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of threads created on startup</td></tr>
+<tr><td><a href="mod_substitute.html#substitute">Substitute <var>s/pattern/substitution/[infq]</var></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Pattern to filter the response content</td></tr>
+<tr class="odd"><td><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup <em>User Group</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">User and group permissions for CGI programs</td></tr>
+<tr><td><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Sets the upper limit on the configurable number of threads
 per child process</td></tr>
-<tr><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of threads created by each child process</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">The size in bytes of the stack used by threads handling 
+<tr class="odd"><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of threads created by each child process</td></tr>
+<tr><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">The size in bytes of the stack used by threads handling 
 client connections</td></tr>
-<tr><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Amount of time the server will wait for
+<tr class="odd"><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Amount of time the server will wait for
 certain events before failing a request</td></tr>
-<tr class="odd"><td><a href="core.html#traceenable">TraceEnable <var>[on|off|extended]</var></a></td><td> on </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Determines the behaviour on <code>TRACE</code>
+<tr><td><a href="core.html#traceenable">TraceEnable <var>[on|off|extended]</var></a></td><td> on </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Determines the behaviour on <code>TRACE</code>
 requests</td></tr>
-<tr><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Specify location of a log file</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">The location of the <code>mime.types</code> file</td></tr>
-<tr><td><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv <var>env-variable</var> [<var>env-variable</var>]
-...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes variables from the environment</td></tr>
-<tr class="odd"><td><a href="core.html#usecanonicalname">UseCanonicalName On|Off|DNS</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures how the server determines its own name and
+<tr class="odd"><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Specify location of a log file</td></tr>
+<tr><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">The location of the <code>mime.types</code> file</td></tr>
+<tr class="odd"><td><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv <var>env-variable</var> [<var>env-variable</var>]
+...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes variables from the environment</td></tr>
+<tr><td><a href="core.html#usecanonicalname">UseCanonicalName On|Off|DNS</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures how the server determines its own name and
 port</td></tr>
-<tr><td><a href="core.html#usecanonicalphysicalport">UseCanonicalPhysicalPort On|Off</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures how the server determines its own name and
+<tr class="odd"><td><a href="core.html#usecanonicalphysicalport">UseCanonicalPhysicalPort On|Off</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures how the server determines its own name and
 port</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#user">User <var>unix-userid</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">The userid under which the server will answer
+<tr><td><a href="mpm_common.html#user">User <var>unix-userid</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">The userid under which the server will answer
 requests</td></tr>
-<tr><td><a href="mod_userdir.html#userdir">UserDir <em>directory-filename</em></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Location of the user-specific directories</td></tr>
-<tr class="odd"><td><a href="mod_vhost_alias.html#virtualdocumentroot" id="V" name="V">VirtualDocumentRoot <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the document root
+<tr class="odd"><td><a href="mod_userdir.html#userdir">UserDir <em>directory-filename</em> [<em>directory-filename</em>] ...
+</a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the user-specific directories</td></tr>
+<tr><td><a href="mod_vhost_alias.html#virtualdocumentroot" id="V" name="V">VirtualDocumentRoot <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the document root
 for a given virtual host</td></tr>
-<tr><td><a href="mod_vhost_alias.html#virtualdocumentrootip">VirtualDocumentRootIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the document root
+<tr class="odd"><td><a href="mod_vhost_alias.html#virtualdocumentrootip">VirtualDocumentRootIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the document root
 for a given virtual host</td></tr>
-<tr class="odd"><td><a href="core.html#virtualhost">&lt;VirtualHost
+<tr><td><a href="core.html#virtualhost">&lt;VirtualHost
     <var>addr</var>[:<var>port</var>] [<var>addr</var>[:<var>port</var>]]
-    ...&gt; ... &lt;/VirtualHost&gt;</a></td><td></td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Contains directives that apply only to a specific
+    ...&gt; ... &lt;/VirtualHost&gt;</a></td><td></td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Contains directives that apply only to a specific
 hostname or IP address</td></tr>
-<tr><td><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the CGI directory for
+<tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the CGI directory for
 a given virtual host</td></tr>
-<tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the cgi directory for
+<tr><td><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the cgi directory for
 a given virtual host</td></tr>
-<tr><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Use accept() rather than AcceptEx() to accept network connections</td></tr>
-<tr class="odd"><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Parse SSI directives in files with the execute bit
+<tr class="odd"><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Use accept() rather than AcceptEx() to accept network connections</td></tr>
+<tr><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Parse SSI directives in files with the execute bit
 set</td></tr>
 </table></div>
 <div class="bottomlang">
@@ -765,8 +772,9 @@ set</td></tr>
 <a href="../es/mod/quickreference.html" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/quickreference.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/quickreference.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/quickreference.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Módulos</a> | <a href="../mod/directives.html">Directivas</a> | <a href="../faq/">Preguntas Frecuentes</a> | <a href="../glossary.html">Glosario</a> | <a href="../sitemap.html">Mapa de este sitio web</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/quickreference.html.ja.euc-jp b/docs/manual/mod/quickreference.html.ja.utf8
index 7d18b0b0..f811b111 100644
--- a/docs/manual/mod/quickreference.html.ja.euc-jp
+++ b/docs/manual/mod/quickreference.html.ja.utf8
@@ -1,150 +1,149 @@
-<?xml version="1.0" encoding="EUC-JP"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
               This file is generated from xml source: DO NOT EDIT
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       -->
-<title>¥Ç¥£¥ì¥¯¥Æ¥£¥Ö ¥¯¥¤¥Ã¥¯¥ê¥Õ¥¡¥ì¥ó¥¹ - Apache HTTP ¥µ¡¼¥Ð</title>
+<title>ディレクティブ クイックリファレンス - Apache HTTP サー�</title>
 <link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
 <link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
 <link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
 <link href="../images/favicon.ico" rel="shortcut icon" /></head>
 <body id="directive-index">
 <div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
 <img alt="" src="../images/feather.gif" /></div>
 <div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
 <div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="preamble"><h1>¥Ç¥£¥ì¥¯¥Æ¥£¥Ö ¥¯¥¤¥Ã¥¯¥ê¥Õ¥¡¥ì¥ó¥¹</h1>
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="preamble"><h1>ディレクティブ クイックリファレンス</h1>
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../de/mod/quickreference.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/quickreference.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../es/mod/quickreference.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
+<a href="../es/mod/quickreference.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/quickreference.html" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/quickreference.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/quickreference.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
 
-    <p>¥Ç¥£¥ì¥¯¥Æ¥£¥Ö ¥¯¥¤¥Ã¥¯¥ê¥Õ¥¡¥ì¥ó¥¹¤Ç¤Ï¡¢³Æ Apache ÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-    »ÈÍÑÊýË¡¡¢¥Ç¥Õ¥©¥ë¥ÈÃÍ¡¢¥¹¥Æ¡¼¥¿¥¹¤È¥³¥ó¥Æ¥­¥¹¥È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£
-    ³Æ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¡¢¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ë´Ø¤·¤Æ¤Ï
-    <a href="directive-dict.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¼­½ñ</a>¤ò
-    ¤´Í÷²¼¤µ¤¤¡£</p>
+    <p>ディレクティブ クイックリファレンス���� Apache 設定ディレクティブ�
+    使用方法�デフォルト値�ステータス�コンテキストを示�����。
+    �ディレクティブ��より詳��情報�関���
+    <a href="directive-dict.html">ディレクティブ辞書</a>を
+    �覧下��。</p>
 
-    <p>Âè 1 ÎóÌܤϥǥ£¥ì¥¯¥Æ¥£¥Ö¤Î̾Á°¤È»ÈÍÑÊýË¡¤Ç¤¹¡£
-    Âè 2 ÎóÌÜ¤Ï (¤â¤·¤¢¤ì¤Ð) ¥Ç¥Õ¥©¥ë¥ÈÃͤȤʤäƤ¤¤Þ¤¹¡£
-    ¥Ç¥Õ¥©¥ë¥ÈÃͤ¬Ä¹¤¹¤®¤Æɽ¼¨¤·¤­¤ì¤Ê¤¤¾ì¹ç¤Ï¡¢ºÇ½é¤Îʸ»úÎó¤Î¸å¤í¤Ë
-    ¡Ö + ¡×¤¬Â³¤­¤Þ¤¹¡£</p>
+    <p>第 1 列目�ディレクティブ����使用方法��。
+    第 2 列目� (も��れ�) デフォルト値�������。
+    デフォルト値�長���表示��れ��場���最��文字列�後��
+    「 + ��続���。</p>
 
-    <p>Âè 3, 4 Îó¤Ï¡¢²¼¤Îɽ¤ÎÃí¼á¤Ë½¾¤Ã¤Æ¡¢
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î»ÈÍѤǤ­¤ë¥³¥ó¥Æ¥­¥¹¥È¤È¡¢
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¥¹¥Æ¡¼¥¿¥¹¤¬¼¨¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
+    <p>第 3, 4 列��下�表�注釈�従���
+    ディレクティブ�使用��るコンテキスト��
+    ディレクティブ�ステータス�示�れ����。</p>
   </div>
 <div id="directive-ref"><table id="legend">
 <tr><td class="letters"><span><a href="#A">&nbsp;A&nbsp;</a> | <a href="#B">&nbsp;B&nbsp;</a> | <a href="#C">&nbsp;C&nbsp;</a> | <a href="#D">&nbsp;D&nbsp;</a> | <a href="#E">&nbsp;E&nbsp;</a> | <a href="#F">&nbsp;F&nbsp;</a> | <a href="#G">&nbsp;G&nbsp;</a> | <a href="#H">&nbsp;H&nbsp;</a> | <a href="#I">&nbsp;I&nbsp;</a> | <a href="#K">&nbsp;K&nbsp;</a> | <a href="#L">&nbsp;L&nbsp;</a> | <a href="#M">&nbsp;M&nbsp;</a> | <a href="#N">&nbsp;N&nbsp;</a> | <a href="#O">&nbsp;O&nbsp;</a> | <a href="#P">&nbsp;P&nbsp;</a> | <a href="#R">&nbsp;R&nbsp;</a> | <a href="#S">&nbsp;S&nbsp;</a> | <a href="#T">&nbsp;T&nbsp;</a> | <a href="#U">&nbsp;U&nbsp;</a> | <a href="#V">&nbsp;V&nbsp;</a> | <a href="#W">&nbsp;W&nbsp;</a> | <a href="#X">&nbsp;X&nbsp;</a></span></td>
-<td><table>
-      
-      <tr><th>s</th><td>¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ë</td></tr>
-      <tr><th>v</th><td>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</td></tr>
-      <tr><th>d</th><td>¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-      <tr><th>h</th><td>.htaccess</td></tr>
-    </table></td>
-<td><table>
-      
-      <tr><th>C</th><td>Core</td></tr>
-      <tr><th>M</th><td>MPM</td></tr>
-      <tr><th>B</th><td>Base</td></tr>
-      <tr><th>E</th><td>Extension</td></tr>
-      <tr><th>X</th><td>Experimental</td></tr>
-    </table></td></tr>
+<td><table><tr><th>s</th><td>サー�設定ファイル</td></tr>
+<tr><th>v</th><td>�ー�ャルホスト</td></tr>
+<tr><th>d</th><td>ディレクトリ</td></tr>
+<tr><th>h</th><td>.htaccess</td></tr>
+</table></td>
+<td><table><tr><th>C</th><td>Core</td></tr>
+<tr><th>M</th><td>MPM</td></tr>
+<tr><th>B</th><td>Base</td></tr>
+<tr><th>E</th><td>Extension</td></tr>
+<tr><th>X</th><td>Experimental</td></tr>
+</table></td></tr>
 </table>
 <table class="qref">
-<tr><td><a href="core.html#acceptfilter" id="A" name="A">AcceptFilter <var>protocol</var> <var>accept_filter</var></a></td><td></td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">¥×¥í¥È¥³¥ë¤ò Listen ¤·¤Æ¤¤¤ë¥½¥±¥Ã¥È¤ÎºÇŬ²½¤òÀßÄꤹ¤ë</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#acceptmutex">AcceptMutex default|<var>method</var></a></td><td> default </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Ê£¿ô¤Î»Ò¥×¥í¥»¥¹¤¬¥Í¥Ã¥È¥ï¡¼¥¯¥½¥±¥Ã¥È¤Ç¥ê¥¯¥¨¥¹¥È¤ò
-accept ¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤È¤­¤Ë¡¢Apache ¤¬¤½¤ì¤é¤Î»Ò¥×¥í¥»¥¹¤òľÎ󲽤¹¤ë¤¿¤á¤Ë
-»È¤¦ÊýË¡</td></tr>
-<tr><td><a href="core.html#acceptpathinfo">AcceptPathInfo On|Off|Default</a></td><td> Default </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">¸å¤Ë³¤¯¥Ñ¥¹Ì¾¾ðÊó¤ò¼õ¤±ÉÕ¤±¤ë¥ê¥½¡¼¥¹¤Î»ØÄê</td></tr>
-<tr class="odd"><td><a href="core.html#accessfilename">AccessFileName <var>filename</var> [<var>filename</var>] ...</a></td><td> .htaccess </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">ʬ»¶ÀßÄê¥Õ¥¡¥¤¥ë¤Î̾Á°</td></tr>
-<tr><td><a href="mod_actions.html#action">Action <var>action-type</var> <var>cgi-script</var> [virtual]</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ÆÃÄê¤Î¥Ï¥ó¥É¥é¤ä¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤ËÂФ·¤Æ CGI ¤ò¼Â¹Ô¤¹¤ë¤è¤¦¤Ë
-ÀßÄê</td></tr>
-<tr class="odd"><td><a href="mod_autoindex.html#addalt">AddAlt <var>string</var> <var>file</var> [<var>file</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¥¢¥¤¥³¥ó¤ÎÂå¤ï¤ê¤Ë
-ɽ¼¨¤µ¤ì¤ë¡¢¥Õ¥¡¥¤¥ë̾¤ÇÁªÂò¤µ¤ì¤¿ÂåÂإƥ­¥¹¥È</td></tr>
+<tr><td><a href="core.html#acceptfilter" id="A" name="A">AcceptFilter <var>protocol</var> <var>accept_filter</var></a></td><td></td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">プロトコルを Listen ���るソケット�最�化を設定�る</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#acceptmutex">AcceptMutex default|<var>method</var></a></td><td> default </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">複数��プロセス��ットワークソケット�リクエストを
+accept �よ�����る����Apache ��れら��プロセスを直列化�る���
+使�方法</td></tr>
+<tr><td><a href="core.html#acceptpathinfo">AcceptPathInfo On|Off|Default</a></td><td> Default </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">後�続�パス�情報を��付�るリソース�指定</td></tr>
+<tr class="odd"><td><a href="core.html#accessfilename">AccessFileName <var>filename</var> [<var>filename</var>] ...</a></td><td> .htaccess </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">分散設定ファイル���</td></tr>
+<tr><td><a href="mod_actions.html#action">Action <var>action-type</var> <var>cgi-script</var> [virtual]</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">特定��ンドラやコンテントタイプ�対�� CGI を実行�るよ��
+設定</td></tr>
+<tr class="odd"><td><a href="mod_autoindex.html#addalt">AddAlt <var>string</var> <var>file</var> [<var>file</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">アイコン�代�り�
+表示�れる�ファイル���択�れ�代替テキスト</td></tr>
 <tr><td><a href="mod_autoindex.html#addaltbyencoding">AddAltByEncoding <var>string</var> <var>MIME-encoding</var>
-[<var>MIME-encoding</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">¥¢¥¤¥³¥ó¤ÎÂå¤ï¤ê¤Ëɽ¼¨¤µ¤ì¤ë¡¢MIME Éä¹æ²½ÊýË¡¤ÇÁªÂò¤µ¤ì¤¿
-ÂåÂإƥ­¥¹¥È</td></tr>
+[<var>MIME-encoding</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">アイコン�代�り�表示�れる�MIME 符�化方法��択�れ�
+代替テキスト</td></tr>
 <tr class="odd"><td><a href="mod_autoindex.html#addaltbytype">AddAltByType <var>string</var> <var>MIME-type</var>
-[<var>MIME-type</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¥¢¥¤¥³¥ó¤ÎÂå¤ï¤ê¤Ë
-ɽ¼¨¤µ¤ì¤ë¡¢MIME ¥¿¥¤¥×¤ÇÁªÂò¤µ¤ì¤¿ÂåÂإƥ­¥¹¥È</td></tr>
+[<var>MIME-type</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">アイコン�代�り�
+表示�れる�MIME タイプ��択�れ�代替テキスト</td></tr>
 <tr><td><a href="mod_mime.html#addcharset">AddCharset <var>charset</var> <var>extension</var>
-[<var>extension</var>] ...</a></td><td></td><td>svdh</td><td /></tr><tr><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤ò»ØÄꤵ¤ì¤¿Ê¸»ú¥»¥Ã¥È¤Ë¥Þ¥Ã¥×¤¹¤ë</td></tr>
-<tr class="odd"><td><a href="core.html#adddefaultcharset">AddDefaultCharset On|Off|<var>charset</var></a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¥ì¥¹¥Ý¥ó¥¹¤Î¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤¬ <code>text/plain</code> ¤¢¤ë¤¤¤Ï
-<code>text/html</code> ¤Î¾ì¹ç¤ËÄɲ乤ë¥Ç¥Õ¥©¥ë¥È¤Î charset ¥Ñ¥é¥á¡¼¥¿</td></tr>
-<tr><td><a href="mod_autoindex.html#adddescription">AddDescription <var>string</var> <var>file</var> [<var>file</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æɽ¼¨¤¹¤ëÀâÌÀ</td></tr>
+[<var>extension</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ファイル��拡張�を指定�れ�文字セット�マップ�る</td></tr>
+<tr class="odd"><td><a href="core.html#adddefaultcharset">AddDefaultCharset On|Off|<var>charset</var></a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">レス�ンス�コンテントタイプ� <code>text/plain</code> �る��
+<code>text/html</code> �場��追加�るデフォルト� charset パラメータ</td></tr>
+<tr><td><a href="mod_autoindex.html#adddescription">AddDescription <var>string</var> <var>file</var> [<var>file</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ファイル�対��表示�る説明</td></tr>
 <tr class="odd"><td><a href="mod_mime.html#addencoding">AddEncoding <var>MIME-enc</var> <var>extension</var>
-[<var>extension</var>] ...</a></td><td></td><td>svdh</td><td /></tr><tr class="odd"><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤ò»ØÄꤵ¤ì¤¿¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°
-¤Ë¥Þ¥Ã¥×¤¹¤ë</td></tr>
+[<var>extension</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ファイル��拡張�を指定�れ�エンコーディング
+�マップ�る</td></tr>
 <tr><td><a href="mod_mime.html#addhandler">AddHandler <var>handler-name</var> <var>extension</var>
-[<var>extension</var>] ...</a></td><td></td><td>svdh</td><td /></tr><tr><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤ò»ØÄꤵ¤ì¤¿¥Ï¥ó¥É¥é¤Ë¥Þ¥Ã¥×¤¹¤ë</td></tr>
+[<var>extension</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ファイル��拡張�を指定�れ��ンドラ�マップ�る</td></tr>
 <tr class="odd"><td><a href="mod_autoindex.html#addicon">AddIcon <var>icon</var> <var>name</var>
-[<var>name</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë¤Ëɽ¼¨¤¹¤ë¥¢¥¤¥³¥ó¤ò̾Á°¤ÇÁªÂò</td></tr>
+[<var>name</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ファイル�表示�るアイコンを����択</td></tr>
 <tr><td><a href="mod_autoindex.html#addiconbyencoding">AddIconByEncoding <var>icon</var> <var>MIME-encoding</var>
-[<var>MIME-encoding</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë¤Ëɽ¼¨¤¹¤ë¥¢¥¤¥³¥ó¤ò MIME 
-Éä¹æ²½ÊýË¡¤ÇÁªÂò</td></tr>
+[<var>MIME-encoding</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ファイル�表示�るアイコンを MIME 
+符�化方法��択</td></tr>
 <tr class="odd"><td><a href="mod_autoindex.html#addiconbytype">AddIconByType <var>icon</var> <var>MIME-type</var>
-[<var>MIME-type</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë¤ÎÎÙ¤Ëɽ¼¨¤¹¤ë¥¢¥¤¥³¥ó¤ò
-MIME ¥¿¥¤¥×¤Ë¤è¤Ã¤ÆÁªÂò</td></tr>
+[<var>MIME-type</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ファイル�隣�表示�るアイコンを
+MIME タイプ�よ���択</td></tr>
 <tr><td><a href="mod_mime.html#addinputfilter">AddInputFilter <var>filter</var>[;<var>filter</var>...]
-<var>extension</var> [<var>extension</var>] ...</a></td><td></td><td>svdh</td><td /></tr><tr><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤ò¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¥¯¥¨¥¹¥È¤ò½èÍý¤¹¤ë
-    ¥Õ¥£¥ë¥¿¤Ë¥Þ¥Ã¥×¤¹¤ë</td></tr>
+<var>extension</var> [<var>extension</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ファイル�拡張�をクライアント�リクエストを処��る
+    フィルタ�マップ�る</td></tr>
 <tr class="odd"><td><a href="mod_mime.html#addlanguage">AddLanguage <var>MIME-lang</var> <var>extension</var>
-[<var>extension</var>] ...</a></td><td></td><td>svdh</td><td /></tr><tr class="odd"><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤵ¤ì¤¿¸À¸ì¤Ë¥Þ¥Ã¥×</td></tr>
-<tr><td><a href="mod_info.html#addmoduleinfo">AddModuleInfo <var>module-name</var> <var>string</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">server-info ¥Ï¥ó¥É¥é¤Ë¤è¤êɽ¼¨¤µ¤ì¤ë¥â¥¸¥å¡¼¥ë¤Î¾ðÊó¤Ë
-ÄɲäξðÊó¤òÉÕ¤±²Ã¤¨¤ë</td></tr>
+[<var>extension</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ファイル�を指定�れ�言語�マップ</td></tr>
+<tr><td><a href="mod_info.html#addmoduleinfo">AddModuleInfo <var>module-name</var> <var>string</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">server-info �ンドラ�より表示�れるモジュール�情報�
+追加�情報を付�加�る</td></tr>
 <tr class="odd"><td><a href="mod_mime.html#addoutputfilter">AddOutputFilter <var>filter</var>[;<var>filter</var>...]
-<var>extension</var> [<var>extension</var>] ...</a></td><td></td><td>svdh</td><td /></tr><tr class="odd"><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤ò¥µ¡¼¥Ð¤«¤é¤Î±þÅú¤ò½èÍý¤¹¤ë¥Õ¥£¥ë¥¿¤Ë
-    ¥Þ¥Ã¥×¤¹¤ë</td></tr>
+<var>extension</var> [<var>extension</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ファイル��拡張�をサー��ら�応答を処��るフィルタ�
+    マップ�る</td></tr>
 <tr><td><a href="core.html#addoutputfilterbytype">AddOutputFilterByType <var>filter</var>[;<var>filter</var>...] <var>MIME-type</var>
-[<var>MIME-type</var>] ...</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">MIME-type ¤Ë½ÐÎÏ¥Õ¥£¥ë¥¿¤ò³ä¤êÅö¤Æ¤ë</td></tr>
+[<var>MIME-type</var>] ...</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">MIME-type �出力フィルタを割り当�る</td></tr>
 <tr class="odd"><td><a href="mod_mime.html#addtype">AddType <var>MIME-type</var> <var>extension</var>
-[<var>extension</var>] ...</a></td><td></td><td>svdh</td><td /></tr><tr class="odd"><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤ò»ØÄꤵ¤ì¤¿¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤Ë¥Þ¥Ã¥×</td></tr>
+[<var>extension</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ファイル��拡張�を指定�れ�コンテントタイプ�マップ</td></tr>
 <tr><td><a href="mod_alias.html#alias">Alias <var>URL-path</var>
-<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">URL ¤ò¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î°ÌÃ֤˥ޥåפ¹¤ë</td></tr>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">URL をファイルシステム��置�マップ�る</td></tr>
 <tr class="odd"><td><a href="mod_alias.html#aliasmatch">AliasMatch <var>regex</var>
-<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Àµµ¬É½¸½¤ò»È¤Ã¤Æ URL ¤ò¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î°ÌÃ֤˥ޥåפ¹¤ë</td></tr>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">正�表�を使�� URL をファイルシステム��置�マップ�る</td></tr>
 <tr><td><a href="mod_authz_host.html#allow"> Allow from all|<var>host</var>|env=<var>env-variable</var>
-[<var>host</var>|env=<var>env-variable</var>] ...</a></td><td></td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">¥µ¡¼¥Ð¤Î¤¢¤ëÎΰè¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤ë¥Û¥¹¥È¤òÀ©¸æ¤¹¤ë</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#allowconnect">AllowCONNECT <var>port</var> [<var>port</var>] ...</a></td><td> 443 563 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¥×¥í¥­¥·¤ò·Ðͳ¤·¤Æ¡¢¤É¤Î¥Ý¡¼¥È¤Ë <code>CONNECT</code>
-¤Ç¤­¤ë¤«¤ò»ØÄꤹ¤ë</td></tr>
-<tr><td><a href="core.html#allowencodedslashes">AllowEncodedSlashes On|Off</a></td><td> Off </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">URL Ãæ¤ÎÉä¹æ²½¤µ¤ì¤¿¥Ñ¥¹Ê¬Î¥Ê¸»ú¤¬Àè¤ËÅÁ¤¨¤é¤ì¤ë¤Î¤òµö²Ä¤¹¤ë¤«¤É¤¦¤«¤ò
-·èÄꤹ¤ë</td></tr>
+[<var>host</var>|env=<var>env-variable</var>] ...</a></td><td></td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">サー���る領域�アクセス��るホストを制御�る</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#allowconnect">AllowCONNECT <var>port</var> [<var>port</var>] ...</a></td><td> 443 563 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">プロキシを経由������ート� <code>CONNECT</code>
+��る�を指定�る</td></tr>
+<tr><td><a href="core.html#allowencodedslashes">AllowEncodedSlashes On|Off</a></td><td> Off </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">URL 中�符�化�れ�パス分離文字�先���られる�を許��る����を
+決定�る</td></tr>
 <tr class="odd"><td><a href="core.html#allowoverride">AllowOverride All|None|<var>directive-type</var> 
-[<var>directive-type</var>] ...</a></td><td> All </td><td>d</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4"><code>.htaccess</code> ¤Çµö²Ä¤µ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¼ïÎà</td></tr>
-<tr><td><a href="mod_authn_anon.html#anonymous">Anonymous <var>user</var> [<var>user</var>] ...</a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">¥Ñ¥¹¥ï¡¼¥É¤Î¸¡ººÌµ¤·¤Ç¥¢¥¯¥»¥¹¤òµö²Ä¤¹¤ë userID ¤ò»ØÄꤹ¤ë
+[<var>directive-type</var>] ...</a></td><td> All </td><td>d</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4"><code>.htaccess</code> �許��れるディレクティブ�種類</td></tr>
+<tr><td><a href="mod_authn_anon.html#anonymous">Anonymous <var>user</var> [<var>user</var>] ...</a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">パスワード�検査無��アクセスを許��る userID を指定�る
 </td></tr>
-<tr class="odd"><td><a href="mod_authn_anon.html#anonymous_logemail">Anonymous_LogEmail On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">ÆþÎϤµ¤ì¤¿¥Ñ¥¹¥ï¡¼¥É¤¬¥¨¥é¡¼¥í¥°¤Ë¥í¥®¥ó¥°¤µ¤ì¤ë¤«¤É¤¦¤«¤ò
-ÀßÄꤹ¤ë</td></tr>
-<tr><td><a href="mod_authn_anon.html#anonymous_mustgiveemail">Anonymous_MustGiveEmail On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">¶õ¥Ñ¥¹¥ï¡¼¥É¤òµö²Ä¤¹¤ë¤«¤É¤¦¤«¤ò»ØÄꤹ¤ë</td></tr>
-<tr class="odd"><td><a href="mod_authn_anon.html#anonymous_nouserid">Anonymous_NoUserID On|Off</a></td><td> Off </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¶õ userID ¤òµö²Ä¤¹¤ë¤«¤ò»ØÄꤹ¤ë</td></tr>
-<tr><td><a href="mod_authn_anon.html#anonymous_verifyemail">Anonymous_VerifyEmail On|Off</a></td><td> Off </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">¥Ñ¥¹¥ï¡¼¥ÉÍó¤¬Àµ¤·¤¤·Á¼°¤ÎÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤Ç¤¢¤ë¤³¤È¤ò
-Ä´¤Ù¤ë¤«¤É¤¦¤«¤òÀßÄꤹ¤ë</td></tr>
-<tr class="odd"><td><a href="mod_auth_basic.html#authbasicauthoritative">AuthBasicAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ǧ¾Ú¤È¾µÇ§¤ò¡¢¤è¤êÄ㤤¥ì¥Ù¥ë¤Î¥â¥¸¥å¡¼¥ë¤Ë°Ü¹Ô¤µ¤»¤ë¤«¤ò
-ÀßÄꤷ¤Þ¤¹¡£</td></tr>
+<tr class="odd"><td><a href="mod_authn_anon.html#anonymous_logemail">Anonymous_LogEmail On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">入力�れ�パスワード�エラーログ�ロギング�れる����を
+設定�る</td></tr>
+<tr><td><a href="mod_authn_anon.html#anonymous_mustgiveemail">Anonymous_MustGiveEmail On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">空パスワードを許��る����を指定�る</td></tr>
+<tr class="odd"><td><a href="mod_authn_anon.html#anonymous_nouserid">Anonymous_NoUserID On|Off</a></td><td> Off </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">空 userID を許��る�を指定�る</td></tr>
+<tr><td><a href="mod_authn_anon.html#anonymous_verifyemail">Anonymous_VerifyEmail On|Off</a></td><td> Off </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">パスワード欄�正��形��電�メールアドレス��る��を
+調�る����を設定�る</td></tr>
+<tr class="odd"><td><a href="mod_auth_basic.html#authbasicauthoritative">AuthBasicAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">�証�承�を�より低�レベル�モジュール�移行��る�を
+設定���。</td></tr>
 <tr><td><a href="mod_auth_basic.html#authbasicprovider">AuthBasicProvider On|Off|<var>provider-name</var>
-[<var>provider-name</var>] ...</a></td><td> On </td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">¤³¤Î°ÌÃÖ¤ËÂФ¹¤ëǧ¾Ú¥×¥í¥Ð¥¤¥À¤òÀßÄꤷ¤Þ¤¹¡£</td></tr>
+[<var>provider-name</var>] ...</a></td><td> On </td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">���置�対�る�証プロ�イダを設定���。</td></tr>
 <tr class="odd"><td><a href="mod_authn_dbd.html#authdbduserpwquery">AuthDBDUserPWQuery <var>query</var></a></td><td></td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">SQL query to look up a password for a user</td></tr>
 <tr><td><a href="mod_authn_dbd.html#authdbduserrealmquery">AuthDBDUserRealmQuery <var>query</var></a></td><td></td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">SQL query to look up a password hash for a user and realm.
 </td></tr>
 <tr class="odd"><td><a href="mod_authz_dbm.html#authdbmgroupfile">AuthDBMGroupFile <var>file-path</var></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the database file containing the list
 of user groups for authorization</td></tr>
-<tr><td><a href="mod_authn_dbm.html#authdbmtype">AuthDBMType default|SDBM|GDBM|NDBM|DB</a></td><td> default </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">¥Ñ¥¹¥ï¡¼¥É¤òÊݸ¤¹¤ë¤¿¤á¤ËɬÍפʥǡ¼¥¿¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë¤Î¼ïÎà¤ò
-ÀßÄꤹ¤ë</td></tr>
-<tr class="odd"><td><a href="mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile <var>file-path</var></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">ǧ¾ÚÍѤΥ桼¥¶¤È¥Ñ¥¹¥ï¡¼¥É¤Î¥ê¥¹¥È¤òÊÝ»ý¤·¤Æ¤¤¤ë
-¥Ç¡¼¥¿¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë̾¤òÀßÄꤹ¤ë</td></tr>
-<tr><td><a href="mod_authn_default.html#authdefaultauthoritative">AuthDefaultAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">¼¡¤ÎÄ㼡¥ì¥Ù¥ë¤Îǧ¾Ú¥â¥¸¥å¡¼¥ë¤ËÀ©¸æ¤òÅϤ¹¤«¤É¤¦¤«¤ò
-ÀßÄꤷ¤Þ¤¹</td></tr>
+<tr><td><a href="mod_authn_dbm.html#authdbmtype">AuthDBMType default|SDBM|GDBM|NDBM|DB</a></td><td> default </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">パスワードを�存�る���必��データベースファイル�種類を
+設定�る</td></tr>
+<tr class="odd"><td><a href="mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile <var>file-path</var></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">�証用�ユーザ�パスワード�リストを�����る
+データベースファイル�を設定�る</td></tr>
+<tr><td><a href="mod_authn_default.html#authdefaultauthoritative">AuthDefaultAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">次�低次レベル��証モジュール�制御を渡�����を
+設定���</td></tr>
 <tr class="odd"><td><a href="mod_auth_digest.html#authdigestalgorithm">AuthDigestAlgorithm MD5|MD5-sess</a></td><td> MD5 </td><td>dh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Selects the algorithm used to calculate the challenge and
 response hashes in digest authentication</td></tr>
 <tr><td><a href="mod_auth_digest.html#authdigestdomain">AuthDigestDomain <var>URI</var> [<var>URI</var>] ...</a></td><td></td><td>dh</td><td>X</td></tr><tr><td class="descr" colspan="4">URIs that are in the same protection space for digest
@@ -159,8 +158,8 @@ server</td></tr>
 authentication</td></tr>
 <tr><td><a href="mod_auth_digest.html#authdigestshmemsize">AuthDigestShmemSize <var>size</var></a></td><td> 1000 </td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">The amount of shared memory to allocate for keeping track
 of clients</td></tr>
-<tr class="odd"><td><a href="mod_authz_groupfile.html#authgroupfile">AuthGroupFile <var>file-path</var></a></td><td></td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¾Úǧ¤Ë»ÈÍѤ¹¤ë¥æ¡¼¥¶¥°¥ë¡¼¥×¤Î°ìÍ÷¤¬³ÊǼ¤µ¤ì¤Æ¤¤¤ë¡¢
-¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÀßÄꤹ¤ë</td></tr>
+<tr class="odd"><td><a href="mod_authz_groupfile.html#authgroupfile">AuthGroupFile <var>file-path</var></a></td><td></td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">証��使用�るユーザグループ�一覧�格��れ��る�
+テキストファイル���を設定�る</td></tr>
 <tr><td><a href="mod_authnz_ldap.html#authldapbinddn">AuthLDAPBindDN <em>distinguished-name</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Optional DN to use in binding to the LDAP server</td></tr>
 <tr class="odd"><td><a href="mod_authnz_ldap.html#authldapbindpassword">AuthLDAPBindPassword <em>password</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Password used in conjuction with the bind DN</td></tr>
 <tr><td><a href="mod_authnz_ldap.html#authldapcharsetconfig">AuthLDAPCharsetConfig <em>file-path</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Language to charset conversion configuration file</td></tr>
@@ -174,134 +173,134 @@ query to set the REMOTE_USER environment variable</td></tr>
 <tr><td><a href="mod_authnz_ldap.html#authldapremoteuserisdn">AuthLDAPRemoteUserIsDN on|off</a></td><td> off </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Use the DN of the client username to set the REMOTE_USER
 environment variable</td></tr>
 <tr class="odd"><td><a href="mod_authnz_ldap.html#authldapurl">AuthLDAPUrl <em>url [NONE|SSL|TLS|STARTTLS]</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">URL specifying the LDAP search parameters</td></tr>
-<tr><td><a href="core.html#authname">AuthName <var>auth-domain</var></a></td><td></td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">HTTP ǧ¾Ú¤Îǧ²ÄÎΰè (ÌõÃí: realm)</td></tr>
+<tr><td><a href="core.html#authname">AuthName <var>auth-domain</var></a></td><td></td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">HTTP �証���領域 (訳注: realm)</td></tr>
 <tr class="odd"><td><a href="mod_authn_alias.html#authnprovideralias">&lt;AuthnProviderAlias <var>baseProvider Alias</var>&gt;
 ... &lt;/AuthnProviderAlias&gt;</a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enclose a group of directives that represent an
 extension of a base authentication provider and referenced by
 the specified alias</td></tr>
-<tr><td><a href="core.html#authtype">AuthType Basic|Digest</a></td><td></td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">¥æ¡¼¥¶Ç§¾Ú¤Î¼ïÎà</td></tr>
-<tr class="odd"><td><a href="mod_authn_file.html#authuserfile">AuthUserFile <var>file-path</var></a></td><td></td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ǧ¾Ú¤Ë»ÈÍѤ¹¤ë¥æ¡¼¥¶¤È¥Ñ¥¹¥ï¡¼¥É¤Î°ìÍ÷¤¬³ÊǼ¤µ¤ì¤Æ¤¤¤ë¡¢
-¥Æ¥­¥¹¥È¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÀßÄꤹ¤ë</td></tr>
+<tr><td><a href="core.html#authtype">AuthType Basic|Digest</a></td><td></td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">ユーザ�証�種類</td></tr>
+<tr class="odd"><td><a href="mod_authn_file.html#authuserfile">AuthUserFile <var>file-path</var></a></td><td></td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">�証�使用�るユーザ�パスワード�一覧�格��れ��る�
+テキストファイル���を設定�る</td></tr>
 <tr><td><a href="mod_authz_dbm.html#authzdbmauthoritative">AuthzDBMAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether authorization will be passed on to lower level
 modules</td></tr>
 <tr class="odd"><td><a href="mod_authz_dbm.html#authzdbmtype">AuthzDBMType default|SDBM|GDBM|NDBM|DB</a></td><td> default </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the type of database file that is used to
 store list of user groups</td></tr>
-<tr><td><a href="mod_authz_default.html#authzdefaultauthoritative">AuthzDefaultAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">¾µÇ§¤¬Äã°Ì¤Î¥â¥¸¥å¡¼¥ë¤ËÅϤµ¤ì¤ë¤«¤É¤¦¤«¤òÀßÄꤹ¤ë</td></tr>
-<tr class="odd"><td><a href="mod_authz_groupfile.html#authzgroupfileauthoritative">AuthzGroupFileAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¾µÇ§¤¬²¼°Ì¤Î¥â¥¸¥å¡¼¥ë¤ËÅϤµ¤ì¤ë¤«¤É¤¦¤«¤òÀßÄꤹ¤ë</td></tr>
+<tr><td><a href="mod_authz_default.html#authzdefaultauthoritative">AuthzDefaultAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">承��低��モジュール�渡�れる����を設定�る</td></tr>
+<tr class="odd"><td><a href="mod_authz_groupfile.html#authzgroupfileauthoritative">AuthzGroupFileAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">承��下��モジュール�渡�れる����を設定�る</td></tr>
 <tr><td><a href="mod_authnz_ldap.html#authzldapauthoritative">AuthzLDAPAuthoritative on|off</a></td><td> on </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Prevent other authentication modules from
 authenticating the user if this one fails</td></tr>
-<tr class="odd"><td><a href="mod_authz_owner.html#authzownerauthoritative">AuthzOwnerAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¾µÇ§¤¬²¼°Ì¾µÇ§¥â¥¸¥å¡¼¥ë¤ËÅϤµ¤ì¤ë¤«¤É¤¦¤«¤òÀßÄꤹ¤ë</td></tr>
-<tr><td><a href="mod_authz_user.html#authzuserauthoritative">AuthzUserAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">¾µÇ§¤¬²¼°Ì¤Î¥â¥¸¥å¡¼¥ë¤ËÅϤµ¤ì¤ë¤«¤É¤¦¤«¤òÀßÄꤹ¤ë</td></tr>
+<tr class="odd"><td><a href="mod_authz_owner.html#authzownerauthoritative">AuthzOwnerAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">承��下�承�モジュール�渡�れる����を設定�る</td></tr>
+<tr><td><a href="mod_authz_user.html#authzuserauthoritative">AuthzUserAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">承��下��モジュール�渡�れる����を設定�る</td></tr>
 <tr class="odd"><td><a href="mod_setenvif.html#browsermatch" id="B" name="B">BrowserMatch <em>regex [!]env-variable</em>[=<em>value</em>]
-[[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">HTTP User-Agent ¤Ë´ð¤Å¤¤¤Æ´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë
+[[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">HTTP User-Agent �基���環境変数を設定�る
 </td></tr>
 <tr><td><a href="mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase  <em>regex [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">HTTP User-Agent ¤Ë´ð¤Å¤¤¤ÆÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤»¤º¤Ë
-´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë</td></tr>
-<tr class="odd"><td><a href="mod_log_config.html#bufferedlogs">BufferedLogs On|Off</a></td><td> Off </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¥Ç¥£¥¹¥¯¤Ë½ñ¤­½Ð¤¹Á°¤Ë¥á¥â¥ê¤Ë¥í¥°¥¨¥ó¥È¥ê¤ò¥Ð¥Ã¥Õ¥¡¤¹¤ë</td></tr>
-<tr><td><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire <var>seconds</var></a></td><td> 3600 (1»þ´Ö) </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">´üÆü¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Ë¥É¥­¥å¥á¥ó¥È¤ò¥­¥ã¥Ã¥·¥å¤¹¤ë¥Ç¥Õ¥©¥ë¥È¤Î´ü´Ö</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê̾¤Îʸ»ú¿ô</td></tr>
-<tr><td><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 3 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">¥­¥ã¥Ã¥·¥å¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Î¿¼¤µ¤Î¿ô</td></tr>
-<tr class="odd"><td><a href="mod_cache.html#cachedisable">CacheDisable <var> url-string</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">ÆÃÄê¤Î URL ¤ò¥­¥ã¥Ã¥·¥å¤·¤Ê¤¤</td></tr>
-<tr><td><a href="mod_cache.html#cacheenable">CacheEnable <var>cache_type</var> <var>url-string</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">»ØÄꤷ¤¿¥¹¥È¥ì¡¼¥¸´ÉÍýÊý¼°¤ò»È¤Ã¤Æ¤Î¥­¥ã¥Ã¥·¥å¤òÍ­¸ú¤Ë¤¹¤ë</td></tr>
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">HTTP User-Agent �基���大文字�文字を区別���
+環境変数を設定�る</td></tr>
+<tr class="odd"><td><a href="mod_log_config.html#bufferedlogs">BufferedLogs On|Off</a></td><td> Off </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ディスク�書�出���メモリ�ログエントリを�ッファ�る</td></tr>
+<tr><td><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire <var>seconds</var></a></td><td> 3600 (1時間) </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">期日�指定�れ�������ドキュメントをキャッシュ�るデフォルト�期間</td></tr>
+<tr class="odd"><td><a href="mod_disk_cache.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">サブディレクトリ��文字数</td></tr>
+<tr><td><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 3 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">キャッシュ�サブディレクトリ�深��数</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cachedisable">CacheDisable <var> url-string</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">特定� URL をキャッシュ���</td></tr>
+<tr><td><a href="mod_cache.html#cacheenable">CacheEnable <var>cache_type</var> <var>url-string</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">指定��ストレージ管�方�を使���キャッシュを有効��る</td></tr>
 <tr class="odd"><td><a href="mod_file_cache.html#cachefile">CacheFile <var>file-path</var> [<var>file-path</var>] ...</a></td><td></td><td>s</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Cache a list of file handles at startup time</td></tr>
-<tr><td><a href="mod_cache.html#cacheignorecachecontrol">CacheIgnoreCacheControl On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">¥­¥ã¥Ã¥·¥å¤µ¤ì¤Æ¤¤¤ë¥³¥ó¥Æ¥ó¥Ä¤òÊÖ¤µ¤Ê¤¤¤è¤¦¤Ë¥¯¥é¥¤¥¢¥ó¥È¤«¤é
-¥ê¥¯¥¨¥¹¥È¤µ¤ì¤Æ¤â̵»ë¤¹¤ë</td></tr>
-<tr class="odd"><td><a href="mod_cache.html#cacheignoreheaders">CacheIgnoreHeaders <var>header-string</var> [<var>header-string</var>] ...</a></td><td> None </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">»ØÄꤵ¤ì¤¿ HTTP ¥Ø¥Ã¥À¤ò¥­¥ã¥Ã¥·¥å¤ËÊݸ¤·¤Ê¤¤¡£
+<tr><td><a href="mod_cache.html#cacheignorecachecontrol">CacheIgnoreCacheControl On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">キャッシュ�れ��るコンテンツを返���よ��クライアント�ら
+リクエスト�れ�も無視�る</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cacheignoreheaders">CacheIgnoreHeaders <var>header-string</var> [<var>header-string</var>] ...</a></td><td> None </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">指定�れ� HTTP ヘッダをキャッシュ��存���。
 </td></tr>
-<tr><td><a href="mod_cache.html#cacheignorenolastmod">CacheIgnoreNoLastMod On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">±þÅú¤Ë Last Modified ¤¬Ìµ¤¯¤Æ¤âµ¤¤Ë¤·¤Ê¤¤¤è¤¦¤Ë¤¹¤ë</td></tr>
-<tr class="odd"><td><a href="mod_cache.html#cachelastmodifiedfactor">CacheLastModifiedFactor <var>float</var></a></td><td> 0.1 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">LastModified ¤ÎÆüÉդ˴ð¤Å¤¤¤ÆÍ­¸ú´ü¸Â (expiry) 
-¤ò·×»»¤¹¤ë¤¿¤á¤Î½Å¤ß¤ò»ØÄꤹ¤ë
+<tr><td><a href="mod_cache.html#cacheignorenolastmod">CacheIgnoreNoLastMod On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">応答� Last Modified �無��も気����よ���る</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cachelastmodifiedfactor">CacheLastModifiedFactor <var>float</var></a></td><td> 0.1 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">LastModified �日付�基���有効期� (expiry) 
+を計算�る�����を指定�る
 </td></tr>
-<tr><td><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire <var>seconds</var></a></td><td> 86400 (°ìÆü) </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">¥É¥­¥å¥á¥ó¥È¤ò¥­¥ã¥Ã¥·¥å¤¹¤ëºÇÂç»þ´Ö¤òÉÿô¤Ç¸½¤·¤¿¤â¤Î</td></tr>
-<tr class="odd"><td><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¥­¥ã¥Ã¥·¥å¤ËÊݴɤµ¤ì¤ë¥É¥­¥å¥á¥ó¥È¤ÎºÇÂç¤Î (¥Ð¥¤¥È¤Ç¤Î) ¥µ¥¤¥º</td></tr>
-<tr><td><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">¥­¥ã¥Ã¥·¥å¤ËÊݴɤµ¤ì¤ë¥É¥­¥å¥á¥ó¥È¤ÎºÇ¾®¸Â¤Î (¥Ð¥¤¥È¤Ç¤Î) Â礭¤µ</td></tr>
-<tr class="odd"><td><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs On|Off</a></td><td> Off </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤µ¤ì¤¿¥É¥­¥å¥á¥ó¥È¤ò¥×¥í¥­¥·¥µ¡¼¥Ð¤¬
-¥­¥ã¥Ã¥·¥å¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë</td></tr>
-<tr><td><a href="mod_disk_cache.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">¥­¥ã¥Ã¥·¥å¥Õ¥¡¥¤¥ë¤¬Êݴɤµ¤ì¤ë¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr class="odd"><td><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">no-store ¤È»ØÄꤵ¤ì¤Æ¤¤¤ë¥ì¥¹¥Ý¥ó¥¹¤Î¥­¥ã¥Ã¥·¥å¤ò»î¤ß¤ë¡£</td></tr>
-<tr><td><a href="mod_cache.html#cachestoreprivate">CacheStorePrivate On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">private ¤È»ØÄꤵ¤ì¤Æ¤¤¤ë¥ì¥¹¥Ý¥ó¥¹¤Î¥­¥ã¥Ã¥·¥å¤ò»î¤ß¤ë¡£</td></tr>
-<tr class="odd"><td><a href="core.html#cgimapextension">CGIMapExtension <var>cgi-path</var> <var>.extension</var></a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">CGI ¥¹¥¯¥ê¥×¥È¤Î¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Î°ÌÃÖ¤òÄ´¤Ù¤ë¤¿¤á¤Î¼êË¡</td></tr>
+<tr><td><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire <var>seconds</var></a></td><td> 86400 (一日) </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">ドキュメントをキャッシュ�る最大時間を秒数�表��も�</td></tr>
+<tr class="odd"><td><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">キャッシュ��管�れるドキュメント�最大� (�イト��) サイズ</td></tr>
+<tr><td><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">キャッシュ��管�れるドキュメント�最��� (�イト��) 大��</td></tr>
+<tr class="odd"><td><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs On|Off</a></td><td> Off </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">コンテント�ゴシエーション�れ�ドキュメントをプロキシサー��
+キャッシュ��るよ���る</td></tr>
+<tr><td><a href="mod_disk_cache.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">キャッシュファイル��管�れるルートディレクトリ</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">no-store �指定�れ��るレス�ンス�キャッシュを試�る。</td></tr>
+<tr><td><a href="mod_cache.html#cachestoreprivate">CacheStorePrivate On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">private �指定�れ��るレス�ンス�キャッシュを試�る。</td></tr>
+<tr class="odd"><td><a href="core.html#cgimapextension">CGIMapExtension <var>cgi-path</var> <var>.extension</var></a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">CGI スクリプト�インタープリタ��置を調�る���手法</td></tr>
 <tr><td><a href="mod_charset_lite.html#charsetdefault">CharsetDefault <var>charset</var></a></td><td></td><td>svdh</td><td>X</td></tr><tr><td class="descr" colspan="4">Charset to translate into</td></tr>
 <tr class="odd"><td><a href="mod_charset_lite.html#charsetoptions">CharsetOptions <var>option</var> [<var>option</var>] ...</a></td><td> DebugLevel=0 NoImpl +</td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Configures charset translation behavior</td></tr>
 <tr><td><a href="mod_charset_lite.html#charsetsourceenc">CharsetSourceEnc <var>charset</var></a></td><td></td><td>svdh</td><td>X</td></tr><tr><td class="descr" colspan="4">Source charset of files</td></tr>
-<tr class="odd"><td><a href="mod_speling.html#checkspelling">CheckSpelling on|off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">spelling ¥â¥¸¥å¡¼¥ë¤ò»ÈÍѤ¹¤ë¤è¤¦¤Ë¤¹¤ë</td></tr>
-<tr><td><a href="core.html#contentdigest">ContentDigest On|Off</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4"><code>Content-MD5</code> HTTP ±þÅú¥Ø¥Ã¥À¤ÎÀ¸À®¤òÍ­¸ú¤Ë¤¹¤ë</td></tr>
+<tr class="odd"><td><a href="mod_speling.html#checkspelling">CheckSpelling on|off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">spelling モジュールを使用�るよ���る</td></tr>
+<tr><td><a href="core.html#contentdigest">ContentDigest On|Off</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4"><code>Content-MD5</code> HTTP 応答ヘッダ�生�を有効��る</td></tr>
 <tr class="odd"><td><a href="mod_usertrack.html#cookiedomain">CookieDomain <em>domain</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The domain to which the tracking cookie applies</td></tr>
 <tr><td><a href="mod_usertrack.html#cookieexpires">CookieExpires <em>expiry-period</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Expiry time for the tracking cookie</td></tr>
-<tr class="odd"><td><a href="mod_log_config.html#cookielog">CookieLog <var>filename</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¥¯¥Ã¥­¥ó¥°¤Î¥í¥®¥ó¥°¤Î¤¿¤á¤Î¥Õ¥¡¥¤¥ë̾¤òÀßÄꤹ¤ë</td></tr>
+<tr class="odd"><td><a href="mod_log_config.html#cookielog">CookieLog <var>filename</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">クッキング�ロギング����ファイル�を設定�る</td></tr>
 <tr><td><a href="mod_usertrack.html#cookiename">CookieName <em>token</em></a></td><td> Apache </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Name of the tracking cookie</td></tr>
 <tr class="odd"><td><a href="mod_usertrack.html#cookiestyle">CookieStyle
     <em>Netscape|Cookie|Cookie2|RFC2109|RFC2965</em></a></td><td> Netscape </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Format of the cookie header field</td></tr>
 <tr><td><a href="mod_usertrack.html#cookietracking">CookieTracking on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables tracking cookie</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory <var>directory</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Apache ¤¬¥³¥¢¥À¥ó¥×¤¹¤ëÁ°¤Ë°ÜÆ°¤ò»î¤ß¤ë¥Ç¥£¥ì¥¯¥È¥ê
+<tr class="odd"><td><a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory <var>directory</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Apache �コアダンプ�る��移動を試�るディレクトリ
 </td></tr>
 <tr><td><a href="mod_log_config.html#customlog">CustomLog  <var>file</var>|<var>pipe</var>
 <var>format</var>|<var>nickname</var>
-[env=[!]<var>environment-variable</var>]</a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">¥í¥°¥Õ¥¡¥¤¥ë¤Î̾Á°¤È½ñ¼°¤òÀßÄꤹ¤ë</td></tr>
-<tr class="odd"><td><a href="mod_dav.html#dav" id="D" name="D">Dav On|Off|<var>provider-name</var></a></td><td> Off </td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">WebDAV HTTP ¥á¥½¥Ã¥É¤òÍ­¸ú¤Ë¤·¤Þ¤¹</td></tr>
-<tr><td><a href="mod_dav.html#davdepthinfinity">DavDepthInfinity on|off</a></td><td> off </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">PROPFIND, Depth: Infinity ¥ê¥¯¥¨¥¹¥È¤òµö²Ä¤·¤Þ¤¹</td></tr>
-<tr class="odd"><td><a href="mod_dav_lock.html#davgenericlockdb">DavGenericLockDB <var>file-path</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">DAV ¥í¥Ã¥¯¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¾ì½ê</td></tr>
-<tr><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">DAV ¥í¥Ã¥¯¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î°ÌÃÖ</td></tr>
-<tr class="odd"><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¥µ¡¼¥Ð¤¬ DAV ¥ê¥½¡¼¥¹¤Î¥í¥Ã¥¯¤ò°Ý»ý¤¹¤ëºÇ¾®»þ´Ö¤Ç¤¹¡£
+[env=[!]<var>environment-variable</var>]</a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">ログファイル����書�を設定�る</td></tr>
+<tr class="odd"><td><a href="mod_dav.html#dav" id="D" name="D">Dav On|Off|<var>provider-name</var></a></td><td> Off </td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">WebDAV HTTP メソッドを有効����</td></tr>
+<tr><td><a href="mod_dav.html#davdepthinfinity">DavDepthInfinity on|off</a></td><td> off </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">PROPFIND, Depth: Infinity リクエストを許����</td></tr>
+<tr class="odd"><td><a href="mod_dav_lock.html#davgenericlockdb">DavGenericLockDB <var>file-path</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">DAV ロックデータベース�場所</td></tr>
+<tr><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">DAV ロックデータベース��置</td></tr>
+<tr class="odd"><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">サー�� DAV リソース�ロックを維��る最�時間��。
 </td></tr>
-<tr><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of connections</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum number of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td> 10 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td> 1 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum number of connections</td></tr>
 <tr><td><a href="mod_dbd.html#dbdparams">DBDParams
 <var>param1</var>=<var>value1</var>[,<var>param2</var>=<var>value2</var>]</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Parameters for database connection</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdpersist">DBDPersist On|Off</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Whether to use persistent connections</td></tr>
 <tr><td><a href="mod_dbd.html#dbdpreparesql">DBDPrepareSQL <var>"SQL statement"</var> <var>label</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Define an SQL prepared statement</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdriver">DBDriver <var>name</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Specify an SQL driver</td></tr>
-<tr><td><a href="mod_autoindex.html#defaulticon">DefaultIcon <var>url-path</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ÆÃÄê¤Î¥¢¥¤¥³¥ó¤¬²¿¤âÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤»þ¤Ë
-¥Õ¥¡¥¤¥ë¤Ëɽ¼¨¤¹¤ë¥¢¥¤¥³¥ó</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#defaultlanguage">DefaultLanguage <var>MIME-lang</var></a></td><td></td><td>svdh</td><td /></tr><tr class="odd"><td class="descr" colspan="4">¤¢¤ë¥¹¥³¡¼¥×¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò»ØÄꤵ¤ì¤¿¸À¸ì¤Ë
-ÀßÄꤹ¤ë</td></tr>
-<tr><td><a href="core.html#defaulttype">DefaultType <var>MIME-type</var></a></td><td> text/plain </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">¥µ¡¼¥Ð¤¬¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤ò·èÄê¤Ç¤­¤Ê¤¤¤È¤­¤Ë
-Á÷¤é¤ì¤ë MIME ¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×</td></tr>
-<tr class="odd"><td><a href="mod_deflate.html#deflatebuffersize">DeflateBufferSize <var>value</var></a></td><td> 8096 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">zlib ¤¬°ìÅ٤˰µ½Ì¤¹¤ë²ô¤ÎÂ礭¤µ</td></tr>
-<tr><td><a href="mod_deflate.html#deflatecompressionlevel">DeflateCompressionLevel <var>value</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">½ÐÎϤËÂФ·¤Æ¹Ô¤Ê¤¦°µ½Ì¤ÎÄøÅÙ</td></tr>
-<tr class="odd"><td><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote [<var>type</var>] <var>notename</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¥í¥®¥ó¥°ÍѤ˰µ½ÌÈæ¤ò¥á¥â¤ËÄɲÃ</td></tr>
-<tr><td><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel <var>value</var></a></td><td> 9 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">zlib ¤¬°µ½Ì¤Ë»È¤¦¥á¥â¥ê¤Î¥ì¥Ù¥ë¤ò»ØÄê</td></tr>
-<tr class="odd"><td><a href="mod_deflate.html#deflatewindowsize">DeflateWindowSize <var>value</var></a></td><td> 15 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Zlib ¤Î°µ½ÌÍÑ¥¦¥£¥ó¥É¥¦¤ÎÂ礭¤µ</td></tr>
+<tr><td><a href="mod_autoindex.html#defaulticon">DefaultIcon <var>url-path</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">特定�アイコン�何も設定�れ����時�
+ファイル�表示�るアイコン</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#defaultlanguage">DefaultLanguage <var>MIME-lang</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">�るスコープ�����ファイルを指定�れ�言語�
+設定�る</td></tr>
+<tr><td><a href="core.html#defaulttype">DefaultType <var>MIME-type|none</var></a></td><td> text/plain </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">サー��コンテントタイプを決定�������
+�られる MIME コンテントタイプ</td></tr>
+<tr class="odd"><td><a href="mod_deflate.html#deflatebuffersize">DeflateBufferSize <var>value</var></a></td><td> 8096 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">zlib �一度�圧縮�る塊�大��</td></tr>
+<tr><td><a href="mod_deflate.html#deflatecompressionlevel">DeflateCompressionLevel <var>value</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">出力�対��行��圧縮�程度</td></tr>
+<tr class="odd"><td><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote [<var>type</var>] <var>notename</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">ロギング用�圧縮比をメモ�追加</td></tr>
+<tr><td><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel <var>value</var></a></td><td> 9 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">zlib �圧縮�使�メモリ�レベルを指定</td></tr>
+<tr class="odd"><td><a href="mod_deflate.html#deflatewindowsize">DeflateWindowSize <var>value</var></a></td><td> 15 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Zlib �圧縮用ウィンドウ�大��</td></tr>
 <tr><td><a href="mod_authz_host.html#deny"> Deny from all|<var>host</var>|env=<var>env-variable</var>
-[<var>host</var>|env=<var>env-variable</var>] ...</a></td><td></td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">¥µ¡¼¥Ð¤¬¥¢¥¯¥»¥¹¤òµñÈݤ¹¤ë¥Û¥¹¥È¤òÀ©¸æ¤¹¤ë</td></tr>
+[<var>host</var>|env=<var>env-variable</var>] ...</a></td><td></td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">サー��アクセスを拒��るホストを制御�る</td></tr>
 <tr class="odd"><td><a href="core.html#directory">&lt;Directory <var>directory-path</var>&gt;
-... &lt;/Directory&gt;</a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">»ØÄê¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Ç¥£¥ì¥¯¥È¥ê¤È¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤È¤Î¤ß¤Ë
-ŬÍѤµ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò°Ï¤à</td></tr>
+... &lt;/Directory&gt;</a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">指定�ファイルシステム�ディレクトリ�サブディレクトリ����
+�用�れるディレクティブを囲む</td></tr>
 <tr><td><a href="mod_dir.html#directoryindex">DirectoryIndex
-    <var>local-url</var> [<var>local-url</var>] ...</a></td><td> index.html </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">¥¯¥é¥¤¥¢¥ó¥È¤¬¥Ç¥£¥ì¥¯¥È¥ê¤ò¥ê¥¯¥¨¥¹¥È¤·¤¿¤È¤­¤ËÄ´¤Ù¤ë
-¥ê¥½¡¼¥¹¤Î¥ê¥¹¥È</td></tr>
+    <var>local-url</var> [<var>local-url</var>] ...</a></td><td> index.html </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">クライアント�ディレクトリをリクエスト�����調�る
+リソース�リスト</td></tr>
 <tr class="odd"><td><a href="core.html#directorymatch">&lt;DirectoryMatch <var>regex</var>&gt;
-... &lt;/DirectoryMatch&gt;</a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Àµµ¬É½¸½¤Ë¥Þ¥Ã¥Á¤¹¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥Ç¥£¥ì¥¯¥È¥ê¤È
-¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤È¤Î¤ß¤ËŬÍѤµ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò°Ï¤à</td></tr>
-<tr><td><a href="mod_dir.html#directoryslash">DirectorySlash On|Off</a></td><td> On </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">¥Ñ¥¹ËöÈø¤Î¥¹¥é¥Ã¥·¥å¤Ç¥ê¥À¥¤¥ì¥¯¥È¤¹¤ë¤«¤É¤¦¤«¤Î¥ª¥ó¥ª¥Õ¤ò¥È¥°¥ë¤µ¤»¤ë</td></tr>
-<tr class="odd"><td><a href="core.html#documentroot">DocumentRoot <var>directory-path</var></a></td><td> /usr/local/apache/h +</td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¥¦¥§¥Ö¤«¤é¸«¤¨¤ë¥á¥¤¥ó¤Î¥É¥­¥å¥á¥ó¥È¥Ä¥ê¡¼¤Ë¤Ê¤ë
-¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><td><a href="mod_dumpio.html#dumpioinput">DumpIOInput On|Off</a></td><td> Off </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">¥¨¥é¡¼¥í¥°¤Ë¤¹¤Ù¤Æ¤ÎÆþÎϥǡ¼¥¿¤ò¥À¥ó¥×</td></tr>
-<tr class="odd"><td><a href="mod_dumpio.html#dumpiooutput">DumpIOOutput On|Off</a></td><td> Off </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¥¨¥é¡¼¥í¥°¤Ë¤¹¤Ù¤Æ¤Î½ÐÎϥǡ¼¥¿¤ò¥À¥ó¥×</td></tr>
-<tr><td><a href="mpm_common.html#enableexceptionhook" id="E" name="E">EnableExceptionHook On|Off</a></td><td> Off </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">¥¯¥é¥Ã¥·¥å¤Î¸å¤ËÎã³°¥Ï¥ó¥É¥é¤ò¼Â¹Ô¤¹¤ë¥Õ¥Ã¥¯¤òÍ­¸ú¤Ë¤¹¤ë</td></tr>
-<tr class="odd"><td><a href="core.html#enablemmap">EnableMMAP On|Off</a></td><td> On </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">ÇÛÁ÷Ãæ¤Ë¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤à¤¿¤á¤Ë¥á¥â¥ê¥Þ¥Ã¥Ô¥ó¥°¤ò
-»È¤¦¤«¤É¤¦¤«</td></tr>
-<tr><td><a href="core.html#enablesendfile">EnableSendfile On|Off</a></td><td> On </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ø¤ÎÇÛÁ÷»þ¤Ë¥«¡¼¥Í¥ë¤Î sendfile ¥µ¥Ý¡¼¥È¤ò
-»È¤¦¤«¤É¤¦¤«</td></tr>
-<tr class="odd"><td><a href="core.html#errordocument">ErrorDocument <var>error-code document</var></a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¥¨¥é¡¼¤¬È¯À¸¤·¤¿¤È¤­¤Ë¥µ¡¼¥Ð¤¬¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤ë¤â¤Î</td></tr>
-<tr><td><a href="core.html#errorlog"> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</a></td><td> logs/error_log (Uni +</td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">¥µ¡¼¥Ð¤¬¥¨¥é¡¼¤ò¥í¥°¼ý½¸¤¹¤ë¾ì½ê</td></tr>
+... &lt;/DirectoryMatch&gt;</a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">正�表��マッ��るファイルシステム�ディレクトリ�
+サブディレクトリ�����用�れるディレクティブを囲む</td></tr>
+<tr><td><a href="mod_dir.html#directoryslash">DirectorySlash On|Off</a></td><td> On </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">パス末尾�スラッシュ�リダイレクト�る�����オンオフをトグル��る</td></tr>
+<tr class="odd"><td><a href="core.html#documentroot">DocumentRoot <var>directory-path</var></a></td><td> /usr/local/apache/h +</td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">ウェブ�ら見�るメイン�ドキュメントツリー��る
+ディレクトリ</td></tr>
+<tr><td><a href="mod_dumpio.html#dumpioinput">DumpIOInput On|Off</a></td><td> Off </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">エラーログ�����入力データをダンプ</td></tr>
+<tr class="odd"><td><a href="mod_dumpio.html#dumpiooutput">DumpIOOutput On|Off</a></td><td> Off </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">エラーログ�����出力データをダンプ</td></tr>
+<tr><td><a href="mpm_common.html#enableexceptionhook" id="E" name="E">EnableExceptionHook On|Off</a></td><td> Off </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">クラッシュ�後�例外�ンドラを実行�るフックを有効��る</td></tr>
+<tr class="odd"><td><a href="core.html#enablemmap">EnableMMAP On|Off</a></td><td> On </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">��中�ファイルを読�込む���メモリマッピングを
+使�����</td></tr>
+<tr><td><a href="core.html#enablesendfile">EnableSendfile On|Off</a></td><td> On </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">ファイル�クライアント����時�カー�ル� sendfile サ�ートを
+使�����</td></tr>
+<tr class="odd"><td><a href="core.html#errordocument">ErrorDocument <var>error-code document</var></a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">エラー�発生�����サー��クライアント��るも�</td></tr>
+<tr><td><a href="core.html#errorlog"> ErrorLog <var>file-path</var>|syslog[:<var>facility</var>]</a></td><td> logs/error_log (Uni +</td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">サー��エラーをログ�集�る場所</td></tr>
 <tr class="odd"><td><a href="mod_example.html#example">Example</a></td><td></td><td>svdh</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Demonstration directive to illustrate the Apache module
 API</td></tr>
-<tr><td><a href="mod_expires.html#expiresactive">ExpiresActive On|Off</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4"><code>Expires</code> ¥Ø¥Ã¥À¤ÎÀ¸À®¤òÍ­¸ú¤Ë¤¹¤ë</td></tr>
+<tr><td><a href="mod_expires.html#expiresactive">ExpiresActive On|Off</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4"><code>Expires</code> ヘッダ�生�を有効��る</td></tr>
 <tr class="odd"><td><a href="mod_expires.html#expiresbytype">ExpiresByType <var>MIME-type</var>
-<var>&lt;code&gt;seconds</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">MIME ¥¿¥¤¥×¤Ë¤è¤Ã¤ÆÀßÄꤵ¤ì¤ë <code>Expires</code> ¥Ø¥Ã¥À¤ÎÃÍ</td></tr>
-<tr><td><a href="mod_expires.html#expiresdefault">ExpiresDefault <var>&lt;code&gt;seconds</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">´ü¸ÂÀÚ¤ì´üÆü¤ò·×»»¤¹¤ë¥Ç¥Õ¥©¥ë¥È¥¢¥ë¥´¥ê¥º¥à</td></tr>
-<tr class="odd"><td><a href="mod_status.html#extendedstatus">ExtendedStatus On|Off</a></td><td> Off </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">³Æ¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ³ÈÄ¥¥¹¥Æ¡¼¥¿¥¹¾ðÊó¤òÊݸ¤¹¤ë</td></tr>
-<tr><td><a href="mod_ext_filter.html#extfilterdefine">ExtFilterDefine <var>filtername</var> <var>parameters</var></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">³°Éô¥Õ¥£¥ë¥¿¤òÄêµÁ</td></tr>
-<tr class="odd"><td><a href="mod_ext_filter.html#extfilteroptions">ExtFilterOptions <var>option</var> [<var>option</var>] ...</a></td><td> DebugLevel=0 NoLogS +</td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4"><code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> ¤Î¥ª¥×¥·¥ç¥ó¤òÀßÄê</td></tr>
-<tr><td><a href="core.html#fileetag" id="F" name="F">FileETag <var>component</var> ...</a></td><td> INode MTime Size </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">ETag HTTP ±þÅú¥Ø¥Ã¥À¤òºîÀ®¤¹¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤ë
-¥Õ¥¡¥¤¥ë¤Î°À­</td></tr>
-<tr class="odd"><td><a href="core.html#files">&lt;Files <var>filename</var>&gt; ... &lt;/Files&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¥Þ¥Ã¥Á¤¹¤ë¥Õ¥¡¥¤¥ë̾¤ËŬÍѤµ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò°Ï¤à</td></tr>
-<tr><td><a href="core.html#filesmatch">&lt;FilesMatch <var>regex</var>&gt; ... &lt;/FilesMatch&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Àµµ¬É½¸½¤Ë¥Þ¥Ã¥Á¤¹¤ë¥Õ¥¡¥¤¥ë̾¤ËŬÍѤµ¤ì¤ë
-¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò°Ï¤à</td></tr>
+<var>&lt;code&gt;seconds</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">MIME タイプ�よ��設定�れる <code>Expires</code> ヘッダ�値</td></tr>
+<tr><td><a href="mod_expires.html#expiresdefault">ExpiresDefault <var>&lt;code&gt;seconds</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">期�切れ期日を計算�るデフォルトアルゴリズム</td></tr>
+<tr class="odd"><td><a href="mod_status.html#extendedstatus">ExtendedStatus On|Off</a></td><td> Off </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">�リクエスト�対��拡張ステータス情報を�存�る</td></tr>
+<tr><td><a href="mod_ext_filter.html#extfilterdefine">ExtFilterDefine <var>filtername</var> <var>parameters</var></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">外部フィルタを定義</td></tr>
+<tr class="odd"><td><a href="mod_ext_filter.html#extfilteroptions">ExtFilterOptions <var>option</var> [<var>option</var>] ...</a></td><td> DebugLevel=0 NoLogS +</td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4"><code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> �オプションを設定</td></tr>
+<tr><td><a href="core.html#fileetag" id="F" name="F">FileETag <var>component</var> ...</a></td><td> INode MTime Size </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">ETag HTTP 応答ヘッダを作��る���使用�れる
+ファイル�属性</td></tr>
+<tr class="odd"><td><a href="core.html#files">&lt;Files <var>filename</var>&gt; ... &lt;/Files&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">マッ��るファイル���用�れるディレクティブを囲む</td></tr>
+<tr><td><a href="core.html#filesmatch">&lt;FilesMatch <var>regex</var>&gt; ... &lt;/FilesMatch&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">正�表��マッ��るファイル���用�れる
+ディレクティブを囲む</td></tr>
 <tr class="odd"><td><a href="mod_filter.html#filterchain">FilterChain [+=-@!]<var>filter-name</var> <var>...</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Configure the filter chain</td></tr>
 <tr><td><a href="mod_filter.html#filterdeclare">FilterDeclare <var>filter-name</var> <var>[type]</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Declare a smart filter</td></tr>
 <tr class="odd"><td><a href="mod_filter.html#filterprotocol">FilterProtocol <var>filter-name</var> [<var>provider-name</var>]
@@ -310,44 +309,44 @@ API</td></tr>
  [req|resp|env]=<var>dispatch</var> <var>match</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Register a content filter</td></tr>
 <tr class="odd"><td><a href="mod_filter.html#filtertrace">FilterTrace <var>filter-name</var> <var>level</var></a></td><td></td><td>svd</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Get debug/diagnostic information from
     <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code></td></tr>
-<tr><td><a href="mod_negotiation.html#forcelanguagepriority">ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]</a></td><td> Prefer </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Í×µá¤Ë¹ç¤¦Ã±ÆȤΥɥ­¥å¥á¥ó¥È¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¤È¤­¤Ë¹Ô¤Ê¤¦¤³¤È¤ò»ØÄê
+<tr><td><a href="mod_negotiation.html#forcelanguagepriority">ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]</a></td><td> Prefer </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">�求����独�ドキュメント�見��ら�������行����を指定
 </td></tr>
-<tr class="odd"><td><a href="core.html#forcetype">ForceType <var>MIME-type</var>|None</a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¤¹¤Ù¤Æ¤Î¥Þ¥Ã¥Á¤¹¤ë¥Õ¥¡¥¤¥ë¤¬»ØÄê¤Î MIME ¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤Ç
-Á÷¤é¤ì¤ë¤è¤¦¤Ë¤¹¤ë</td></tr>
-<tr><td><a href="mod_log_forensic.html#forensiclog">ForensicLog <var>filename</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Forensic ¥í¥°¤Î¥Õ¥¡¥¤¥ë̾¤òÀßÄꤹ¤ë</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#gracefulshutdowntimeout" id="G" name="G">GracefulShutDownTimeout <var>seconds</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">²º¤ä¤«¤ÊÄä»ß¤ò¤«¤±¤¿¸å¡¢½ªÎ»¤¹¤ë¤Þ¤ÇÂԤĻþ´Ö</td></tr>
-<tr><td><a href="mpm_common.html#group">Group <var>unix-group</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤¹¤ëºÝ¤Ë½ê°¤¹¤ë¥°¥ë¡¼¥×</td></tr>
+<tr class="odd"><td><a href="core.html#forcetype">ForceType <var>MIME-type</var>|None</a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">����マッ��るファイル�指定� MIME コンテントタイプ�
+�られるよ���る</td></tr>
+<tr><td><a href="mod_log_forensic.html#forensiclog">ForensicLog <var>filename</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Forensic ログ�ファイル�を設定�る</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#gracefulshutdowntimeout" id="G" name="G">GracefulShutDownTimeout <var>seconds</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">�や���止を���後�終了�る��待�時間</td></tr>
+<tr><td><a href="mpm_common.html#group">Group <var>unix-group</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">リクエスト�応答�る際�所属�るグループ</td></tr>
 <tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|add|unset|echo
-<var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">HTTP ±þÅú¥Ø¥Ã¥À¤ÎÀßÄê</td></tr>
+<var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">HTTP 応答ヘッダ�設定</td></tr>
 <tr><td><a href="mod_autoindex.html#headername">HeaderName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">
-¥¤¥ó¥Ç¥Ã¥¯¥¹°ìÍ÷¤ÎÀèƬ¤ËÁÞÆþ¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤Î̾Á°</td></tr>
-<tr class="odd"><td><a href="core.html#hostnamelookups">HostnameLookups On|Off|Double</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¥¯¥é¥¤¥¢¥ó¥È¤Î IP ¥¢¥É¥ì¥¹¤Î DNS ¥ë¥Ã¥¯¥¢¥Ã¥×¤ò
-Í­¸ú¤Ë¤¹¤ë</td></tr>
-<tr><td><a href="mod_ident.html#identitycheck" id="I" name="I">IdentityCheck On|Off</a></td><td> Off </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables logging of the RFC 1413 identity of the remote
-user</td></tr>
-<tr class="odd"><td><a href="mod_ident.html#identitychecktimeout">IdentityCheckTimeout <var>seconds</var></a></td><td> 30 </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Determines the timeout duration for ident requests</td></tr>
+インデックス一覧�先頭�挿入�れるファイル���</td></tr>
+<tr class="odd"><td><a href="core.html#hostnamelookups">HostnameLookups On|Off|Double</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">クライアント� IP アドレス� DNS ルックアップを
+有効��る</td></tr>
+<tr><td><a href="mod_ident.html#identitycheck" id="I" name="I">IdentityCheck On|Off</a></td><td> Off </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">リモートユーザ� RFC 1413 �よるアイデンティティ�ロギングを
+有効��る</td></tr>
+<tr class="odd"><td><a href="mod_ident.html#identitychecktimeout">IdentityCheckTimeout <var>seconds</var></a></td><td> 30 </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Ident リクエスト�タイムアウト�る���期間を決�る</td></tr>
 <tr><td><a href="core.html#ifdefine">&lt;IfDefine [!]<var>parameter-name</var>&gt; ...
-    &lt;/IfDefine&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">µ¯Æ°»þ¤Ë¥Æ¥¹¥È¤¬¿¿¤Ç¤¢¤ë¤È¤­¤Î¤ß¤Ë½èÍý¤µ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-°Ï¤à</td></tr>
+    &lt;/IfDefine&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">起動時�テスト�真��る�����処��れるディレクティブを
+囲む</td></tr>
 <tr class="odd"><td><a href="core.html#ifmodule">&lt;IfModule [!]<var>module-file</var>|<var>module-identifier</var>&gt; ...
-    &lt;/IfModule&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¥â¥¸¥å¡¼¥ë¤Î¸ºß¤¹¤ë¤«¤·¤Ê¤¤¤«¤Ë±þ¤¸¤Æ½èÍý¤µ¤ì¤ë
-¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò°Ï¤à</td></tr>
+    &lt;/IfModule&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">モジュール�存在�る������応��処��れる
+ディレクティブを囲む</td></tr>
 <tr><td><a href="mod_version.html#ifversion">&lt;IfVersion [[!]<var>operator</var>] <var>version</var>&gt; ...
-&lt;/IfVersion&gt;</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">¥Ð¡¼¥¸¥ç¥ó°Í¸¤ÎÀßÄê¤òÆþ¤ì¤ë</td></tr>
+&lt;/IfVersion&gt;</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">�ージョン�存�設定を入れる</td></tr>
 <tr class="odd"><td><a href="mod_imagemap.html#imapbase">ImapBase map|referer|<var>URL</var></a></td><td> http://servername/ </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Default <code>base</code> for imagemap files</td></tr>
 <tr><td><a href="mod_imagemap.html#imapdefault">ImapDefault error|nocontent|map|referer|<var>URL</var></a></td><td> nocontent </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Default action when an imagemap is called with coordinates
 that are not explicitly mapped</td></tr>
 <tr class="odd"><td><a href="mod_imagemap.html#imapmenu">ImapMenu none|formatted|semiformatted|unformatted</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Action if no coordinates are given when calling
 an imagemap</td></tr>
-<tr><td><a href="core.html#include">Include <var>file-path</var>|<var>directory-path</var></a></td><td></td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">¥µ¡¼¥ÐÀßÄê¥Õ¥¡¥¤¥ëÃ椫¤é¾¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò¼è¤ê¹þ¤à</td></tr>
-<tr class="odd"><td><a href="mod_autoindex.html#indexignore">IndexIgnore <var>file</var> [<var>file</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¥Ç¥£¥ì¥¯¥È¥ê°ìÍ÷¤ò¹Ô¤Ê¤¦ºÝ¤Ë̵»ë¤¹¤Ù¤­
-¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤ËÄɲÃ</td></tr>
-<tr><td><a href="mod_autoindex.html#indexoptions">IndexOptions  [+|-]<var>option</var> [[+|-]<var>option</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">¥Ç¥£¥ì¥¯¥È¥ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤ÎÍÍ¡¹¤ÊÀßÄê¹àÌÜ
+<tr><td><a href="core.html#include">Include <var>file-path</var>|<var>directory-path</var></a></td><td></td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">サー�設定ファイル中�ら他�設定ファイルを�り込む</td></tr>
+<tr class="odd"><td><a href="mod_autoindex.html#indexignore">IndexIgnore <var>file</var> [<var>file</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ディレクトリ一覧を行��際�無視���
+ファイルリスト�追加</td></tr>
+<tr><td><a href="mod_autoindex.html#indexoptions">IndexOptions  [+|-]<var>option</var> [[+|-]<var>option</var>] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ディレクトリインデックス�様々�設定項目
 </td></tr>
 <tr class="odd"><td><a href="mod_autoindex.html#indexorderdefault">IndexOrderDefault Ascending|Descending
 Name|Date|Size|Description</a></td><td> Ascending Name </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">
-¥Ç¥£¥ì¥¯¥È¥ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤Îɸ½à¤Î½çÈÖÉÕ¤±¤òÀßÄê</td></tr>
-<tr><td><a href="mod_autoindex.html#indexstylesheet">IndexStyleSheet <var>url-path</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">¥Ç¥£¥ì¥¯¥È¥ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ë CSS ¥¹¥¿¥¤¥ë¥·¡¼¥È¤òÄɲ乤ë</td></tr>
+ディレクトリインデックス�標準�順番付�を設定</td></tr>
+<tr><td><a href="mod_autoindex.html#indexstylesheet">IndexStyleSheet <var>url-path</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ディレクトリインデックス� CSS スタイルシートを追加�る</td></tr>
 <tr class="odd"><td><a href="mod_isapi.html#isapiappendlogtoerrors">ISAPIAppendLogToErrors on|off</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Record <code>HSE_APPEND_LOG_PARAMETER</code> requests from
 ISAPI extensions to the error log</td></tr>
 <tr><td><a href="mod_isapi.html#isapiappendlogtoquery">ISAPIAppendLogToQuery on|off</a></td><td> on </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Record <code>HSE_APPEND_LOG_PARAMETER</code> requests from
@@ -359,11 +358,11 @@ ISAPI extensions to the query field</td></tr>
 extensions</td></tr>
 <tr><td><a href="mod_isapi.html#isapireadaheadbuffer">ISAPIReadAheadBuffer <var>size</var></a></td><td> 49152 </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Size of the Read Ahead Buffer sent to ISAPI
 extensions</td></tr>
-<tr class="odd"><td><a href="core.html#keepalive" id="K" name="K">KeepAlive On|Off</a></td><td> On </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">HTTP ¤Î»ý³Ū¤ÊÀܳ¤òÍ­¸ú¤Ë¤¹¤ë</td></tr>
-<tr><td><a href="core.html#keepalivetimeout">KeepAliveTimeout <var>seconds</var></a></td><td> 5 </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">»ý³Ū¤ÊÀܳ¤Ç¼¡¤Î¥ê¥¯¥¨¥¹¥È¤¬Íè¤ë¤Þ¤Ç¥µ¡¼¥Ð¤¬ÂԤĻþ´Ö</td></tr>
+<tr class="odd"><td><a href="core.html#keepalive" id="K" name="K">KeepAlive On|Off</a></td><td> On </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">HTTP ��続的�接続を有効��る</td></tr>
+<tr><td><a href="core.html#keepalivetimeout">KeepAliveTimeout <var>seconds</var></a></td><td> 5 </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">�続的�接続�次�リクエスト��る��サー��待�時間</td></tr>
 <tr class="odd"><td><a href="mod_negotiation.html#languagepriority" id="L" name="L">LanguagePriority <var>MIME-lang</var> [<var>MIME-lang</var>]
-...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¥¯¥é¥¤¥¢¥ó¥È¤¬Í¥ÀèÅÙ¤ò¼¨¤µ¤Ê¤«¤Ã¤¿¤È¤­¤Î¸À¸ì¤Î variant ¤ÎÍ¥ÀèÅÙ¤ò
-»ØÄê</td></tr>
+...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">クライアント�優先度を示��������言語� variant �優先度を
+指定</td></tr>
 <tr><td><a href="mod_ldap.html#ldapcacheentries">LDAPCacheEntries <var>number</var></a></td><td> 1024 </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of entries in the primary LDAP cache</td></tr>
 <tr class="odd"><td><a href="mod_ldap.html#ldapcachettl">LDAPCacheTTL <var>seconds</var></a></td><td> 600 </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Time that cached items remain valid</td></tr>
 <tr><td><a href="mod_ldap.html#ldapconnectiontimeout">LDAPConnectionTimeout <var>seconds</var></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Specifies the socket connection timeout in seconds</td></tr>
@@ -381,52 +380,52 @@ Certificate Authority or global client certificates</td></tr>
 <tr class="odd"><td><a href="mod_ldap.html#ldaptrustedmode">LDAPTrustedMode <var>type</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Specifies the SSL/TLS mode to be used when connecting to an LDAP server.</td></tr>
 <tr><td><a href="mod_ldap.html#ldapverifyservercert">LDAPVerifyServerCert <var>On|Off</var></a></td><td> On </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Force server certificate verification</td></tr>
 <tr class="odd"><td><a href="core.html#limit">&lt;Limit <var>method</var> [<var>method</var>] ... &gt; ...
-    &lt;/Limit&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">°Ï¤¤¤ÎÃæ¤Ë¤¢¤ë¥¢¥¯¥»¥¹À©¸æ¤ÎŬÍѤòÆÃÄê¤Î HTTP ¥á¥½¥Ã¥É¤Î¤ß¤Ë
-À©¸Â¤¹¤ë</td></tr>
+    &lt;/Limit&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">囲��中��るアクセス制御��用を特定� HTTP メソッド���
+制��る</td></tr>
 <tr><td><a href="core.html#limitexcept">&lt;LimitExcept <var>method</var> [<var>method</var>] ... &gt; ...
-    &lt;/LimitExcept&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">»ØÄꤵ¤ì¤¿¤â¤Î°Ê³°¤Î HTTP ¥á¥½¥Ã¥É¤Ë¥¢¥¯¥»¥¹À©¸æ¤ò
-À©¸Â¤¹¤ë</td></tr>
-<tr class="odd"><td><a href="core.html#limitinternalrecursion">LimitInternalRecursion <var>number</var> [<var>number</var>]</a></td><td> 10 </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">ÆâÉô¥ê¥À¥¤¥ì¥¯¥È¤ÈÆþ¤ì»Ò¤Ë¤Ê¤Ã¤¿¥µ¥Ö¥ê¥¯¥¨¥¹¥È¤ÎºÇÂç¿ô¤ò·èÄꤹ¤ë</td></tr>
-<tr><td><a href="core.html#limitrequestbody">LimitRequestBody <var>bytes</var></a></td><td> 0 </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">¥¯¥é¥¤¥¢¥ó¥È¤«¤éÁ÷¤é¤ì¤ë HTTP ¥ê¥¯¥¨¥¹¥È¤Î¥Ü¥Ç¥£¤Î
-ÁíÎ̤òÀ©¸Â¤¹¤ë</td></tr>
-<tr class="odd"><td><a href="core.html#limitrequestfields">LimitRequestFields <var>number</var></a></td><td> 100 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î HTTP ¥ê¥¯¥¨¥¹¥È¤Î¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¤Î¿ô¤ò
-À©¸Â¤¹¤ë</td></tr>
-<tr><td><a href="core.html#limitrequestfieldsize">LimitRequestFieldsize <var>bytes</var></a></td><td></td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î HTTP ¥ê¥¯¥¨¥¹¥È¤Î¥Ø¥Ã¥À¤Î
-¥µ¥¤¥º¤òÀ©¸Â¤¹¤ë</td></tr>
-<tr class="odd"><td><a href="core.html#limitrequestline">LimitRequestLine <var>bytes</var></a></td><td> 8190 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î HTTP ¥ê¥¯¥¨¥¹¥È¹Ô¤Î¥µ¥¤¥º¤òÀ©¸Â¤¹¤ë</td></tr>
-<tr><td><a href="core.html#limitxmlrequestbody">LimitXMLRequestBody <var>bytes</var></a></td><td> 1000000 </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">XML ·Á¼°¤Î¥ê¥¯¥¨¥¹¥È¤Î¥Ü¥Ç¥£¤Î¥µ¥¤¥º¤òÀ©¸Â¤¹¤ë</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#listen">Listen [<var>IP-address</var>:]<var>portnumber</var> [<var>protocol</var>]</a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">¥µ¡¼¥Ð¤¬ listen ¤¹¤ëIP ¥¢¥É¥ì¥¹¤È¥Ý¡¼¥ÈÈÖ¹æ</td></tr>
-<tr><td><a href="mpm_common.html#listenbacklog">ListenBacklog <var>backlog</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">ÊÝα¾õÂ֤Υ³¥Í¥¯¥·¥ç¥ó¤Î¥­¥å¡¼¤ÎºÇÂçĹ</td></tr>
-<tr class="odd"><td><a href="mod_so.html#loadfile">LoadFile <em>filename</em> [<em>filename</em>] ...</a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">»ØÄꤵ¤ì¤¿¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤ä¥é¥¤¥Ö¥é¥ê¤ò¥ê¥ó¥¯¤¹¤ë</td></tr>
-<tr><td><a href="mod_so.html#loadmodule">LoadModule <em>module filename</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤ä¥é¥¤¥Ö¥é¥ê¤ò¥ê¥ó¥¯¤·¡¢»ÈÍѥ⥸¥å¡¼¥ë¤Î
-¥ê¥¹¥È¤ËÄɲ乤ë</td></tr>
+    &lt;/LimitExcept&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">指定�れ�も�以外� HTTP メソッド�アクセス制御を
+制��る</td></tr>
+<tr class="odd"><td><a href="core.html#limitinternalrecursion">LimitInternalRecursion <var>number</var> [<var>number</var>]</a></td><td> 10 </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">内部リダイレクト�入れ�����サブリクエスト�最大数を決定�る</td></tr>
+<tr><td><a href="core.html#limitrequestbody">LimitRequestBody <var>bytes</var></a></td><td> 0 </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">クライアント�ら�られる HTTP リクエスト�ボディ�
+��を制��る</td></tr>
+<tr class="odd"><td><a href="core.html#limitrequestfields">LimitRequestFields <var>number</var></a></td><td> 100 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">クライアント�ら� HTTP リクエスト�ヘッダフィールド�数を
+制��る</td></tr>
+<tr><td><a href="core.html#limitrequestfieldsize">LimitRequestFieldSize <var>bytes</var></a></td><td> 8190 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">クライアント�ら� HTTP リクエスト�ヘッダ�
+サイズを制��る</td></tr>
+<tr class="odd"><td><a href="core.html#limitrequestline">LimitRequestLine <var>bytes</var></a></td><td> 8190 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">クライアント�ら� HTTP リクエスト行�サイズを制��る</td></tr>
+<tr><td><a href="core.html#limitxmlrequestbody">LimitXMLRequestBody <var>bytes</var></a></td><td> 1000000 </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">XML 形��リクエスト�ボディ�サイズを制��る</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#listen">Listen [<var>IP-address</var>:]<var>portnumber</var> [<var>protocol</var>]</a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">サー�� listen �るIP アドレス��ート番�</td></tr>
+<tr><td><a href="mpm_common.html#listenbacklog">ListenBacklog <var>backlog</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">�留状態�コ�クション�キュー�最大長</td></tr>
+<tr class="odd"><td><a href="mod_so.html#loadfile">LoadFile <em>filename</em> [<em>filename</em>] ...</a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">指定�れ�オブジェクトファイルやライブラリをリンク�る</td></tr>
+<tr><td><a href="mod_so.html#loadmodule">LoadModule <em>module filename</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">オブジェクトファイルやライブラリをリンク��使用モジュール�
+リスト�追加�る</td></tr>
 <tr class="odd"><td><a href="core.html#location">&lt;Location
-    <var>URL-path</var>|<var>URL</var>&gt; ... &lt;/Location&gt;</a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">°Ï¤ó¤À¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¥Þ¥Ã¥Á¤¹¤ë URL ¤Î¤ß¤ËŬÍÑ</td></tr>
+    <var>URL-path</var>|<var>URL</var>&gt; ... &lt;/Location&gt;</a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">囲ん�ディレクティブをマッ��る URL ����用</td></tr>
 <tr><td><a href="core.html#locationmatch">&lt;LocationMatch
-    <var>regex</var>&gt; ... &lt;/LocationMatch&gt;</a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">°Ï¤ó¤À¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÀµµ¬É½¸½¤Ë¥Þ¥Ã¥Á¤¹¤ë URL ¤Î¤ß¤Ë
-ŬÍÑ</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#lockfile">LockFile <var>filename</var></a></td><td> logs/accept.lock </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">¼õÉÕ¤òľÎ󲽤¹¤ë¤¿¤á¤Î¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ</td></tr>
+    <var>regex</var>&gt; ... &lt;/LocationMatch&gt;</a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">囲ん�ディレクティブを正�表��マッ��る URL ���
+�用</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#lockfile">LockFile <var>filename</var></a></td><td> logs/accept.lock </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">�付を直列化�る���ロックファイル��置</td></tr>
 <tr><td><a href="mod_log_config.html#logformat">LogFormat <var>format</var>|<var>nickname</var>
-[<var>nickname</var>]</a></td><td> "%h %l %u %t \"%r\" +</td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">¥í¥°¥Õ¥¡¥¤¥ë¤Ç»ÈÍѤ¹¤ë½ñ¼°¤òÀßÄꤹ¤ë</td></tr>
-<tr class="odd"><td><a href="core.html#loglevel">LogLevel <var>level</var></a></td><td> warn </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">ErrorLog ¤Î¾éĹÀ­¤òÀ©¸æ¤¹¤ë</td></tr>
-<tr><td><a href="mpm_common.html#maxclients" id="M" name="M">MaxClients <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤¹¤ë¤¿¤á¤ËºîÀ®¤µ¤ì¤ë
-»Ò¥×¥í¥»¥¹¤ÎºÇÂç¸Ä¿ô</td></tr>
-<tr class="odd"><td><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests <var>number</var></a></td><td> 100 </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">»ý³Ū¤ÊÀܳ¾å¤Çµö²Ä¤µ¤ì¤ë¥ê¥¯¥¨¥¹¥È¤Î¿ô</td></tr>
-<tr><td><a href="mpm_common.html#maxmemfree">MaxMemFree <var>KBytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4"><code>free()</code> ¤¬¸Æ¤Ð¤ì¤Ê¤¤¸Â¤ê¡¢
-¼ç¥á¥â¥ê¥¢¥í¥±¡¼¥¿¤¬ÊÝ»ý¤·Â³¤±¤é¤ì¤ë¥á¥â¥ê¤ÎºÇÂçÎÌ</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild <var>number</var></a></td><td> 10000 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">¸Ä¡¹¤Î»Ò¥µ¡¼¥Ð¤¬²ÔƯÃæ¤Ë°·¤¦¥ê¥¯¥¨¥¹¥È¿ô¤Î¾å¸Â</td></tr>
+[<var>nickname</var>]</a></td><td> "%h %l %u %t \"%r\" +</td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">ログファイル�使用�る書�を設定�る</td></tr>
+<tr class="odd"><td><a href="core.html#loglevel">LogLevel <var>level</var></a></td><td> warn </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">ErrorLog �冗長性を制御�る</td></tr>
+<tr><td><a href="mpm_common.html#maxclients" id="M" name="M">MaxClients <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">リクエスト�応答�る���作��れる
+�プロセス�最大個数</td></tr>
+<tr class="odd"><td><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests <var>number</var></a></td><td> 100 </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">�続的�接続上�許��れるリクエスト�数</td></tr>
+<tr><td><a href="mpm_common.html#maxmemfree">MaxMemFree <var>KBytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4"><code>free()</code> �呼�れ���り�
+主メモリアロケータ����続�られるメモリ�最大�</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild <var>number</var></a></td><td> 10000 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">個々��サー��稼�中�扱�リクエスト数�上�</td></tr>
 <tr><td><a href="beos.html#maxrequestsperthread">MaxRequestsPerThread <var>number</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Limit on the number of requests that an individual thread
 will handle during its life</td></tr>
-<tr class="odd"><td><a href="prefork.html#maxspareservers">MaxSpareServers <var>number</var></a></td><td> 10 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">¥¢¥¤¥É¥ë¤Ê»Ò¥µ¡¼¥Ð¥×¥í¥»¥¹¤ÎºÇÂç¸Ä¿ô</td></tr>
-<tr><td><a href="mpm_common.html#maxsparethreads">MaxSpareThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">¥¢¥¤¥É¥ë¥¹¥ì¥Ã¥É¤ÎºÇÂç¿ô</td></tr>
+<tr class="odd"><td><a href="prefork.html#maxspareservers">MaxSpareServers <var>number</var></a></td><td> 10 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">アイドル��サー�プロセス�最大個数</td></tr>
+<tr><td><a href="mpm_common.html#maxsparethreads">MaxSpareThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">アイドルスレッド�最大数</td></tr>
 <tr class="odd"><td><a href="mpm_netware.html#maxthreads">MaxThreads <var>number</var></a></td><td> 2048 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Set the maximum number of worker threads</td></tr>
-<tr><td><a href="mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount <var>value</var></a></td><td> 1009 </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">¥­¥ã¥Ã¥·¥å¤ËÊݴɤµ¤ì¤ë¥ª¥Ö¥¸¥§¥¯¥È¤ÎºÇÂç¿ô</td></tr>
-<tr class="odd"><td><a href="mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize <var>bytes</var></a></td><td> 10000 </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¥­¥ã¥Ã¥·¥å¤ËÊݴɤǤ­¤ë¥É¥­¥å¥á¥ó¥È¤ÎºÇÂ祵¥¤¥º (¥Ð¥¤¥È)</td></tr>
-<tr><td><a href="mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer <var>size_in_bytes</var></a></td><td> of 100000 ¤« MCacheM +</td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">¥¹¥È¥ê¡¼¥à¤µ¤ì¤Æ¤¤¤ë±þÅú¤ò¥­¥ã¥Ã¥·¥åÉÔǽ¤È·èÄꤹ¤ë¤Þ¤Ç¤Ë
-¥á¥â¥ê¤Ë¥Ð¥Ã¥Õ¥¡¤¹¤ëºÇÂçÎÌ</td></tr>
-<tr class="odd"><td><a href="mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¥­¥ã¥Ã¥·¥å¤ËÊݴɤµ¤ì¤ë¥É¥­¥å¥á¥ó¥È¤ÎºÇ¾®¥µ¥¤¥º (¥Ð¥¤¥È)</td></tr>
-<tr><td><a href="mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm LRU|GDSF</a></td><td> GDSF </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">¥­¥ã¥Ã¥·¥å¤«¤éºï½ü¤¹¤ë¥É¥­¥å¥á¥ó¥È¤òÁª¤Ö¤¿¤á¤Î¥¢¥ë¥´¥ê¥º¥à</td></tr>
-<tr class="odd"><td><a href="mod_mem_cache.html#mcachesize">MCacheSize <var>KBytes</var></a></td><td> 100 </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¥­¥ã¥Ã¥·¥å¤Ë»È¤ï¤ì¤ë¥á¥â¥ê¤ÎºÇÂçÎ̤ò¥Ð¥¤¥Èñ°Ì¤Ç»ØÄê</td></tr>
+<tr><td><a href="mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount <var>value</var></a></td><td> 1009 </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">キャッシュ��管�れるオブジェクト�最大数</td></tr>
+<tr class="odd"><td><a href="mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize <var>bytes</var></a></td><td> 10000 </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">キャッシュ��管��るドキュメント�最大サイズ (�イト)</td></tr>
+<tr><td><a href="mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer <var>size_in_bytes</var></a></td><td> of 100000 � MCacheM +</td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">ストリーム�れ��る応答をキャッシュ�能�決定�る���
+メモリ��ッファ�る最大�</td></tr>
+<tr class="odd"><td><a href="mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">キャッシュ��管�れるドキュメント�最�サイズ (�イト)</td></tr>
+<tr><td><a href="mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm LRU|GDSF</a></td><td> GDSF </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">キャッシュ�ら削除�るドキュメントを�����アルゴリズム</td></tr>
+<tr class="odd"><td><a href="mod_mem_cache.html#mcachesize">MCacheSize <var>KBytes</var></a></td><td> 100 </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">キャッシュ�使�れるメモリ�最大�を�イト���指定</td></tr>
 <tr><td><a href="mod_cern_meta.html#metadir">MetaDir <var>directory</var></a></td><td> .web </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Name of the directory to find CERN-style meta information
 files</td></tr>
 <tr class="odd"><td><a href="mod_cern_meta.html#metafiles">MetaFiles on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Activates CERN meta-file processing</td></tr>
@@ -434,85 +433,85 @@ files</td></tr>
 meta information</td></tr>
 <tr class="odd"><td><a href="mod_mime_magic.html#mimemagicfile">MimeMagicFile <var>file-path</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable MIME-type determination based on file contents
 using the specified magic file</td></tr>
-<tr><td><a href="prefork.html#minspareservers">MinSpareServers <var>number</var></a></td><td> 5 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">¥¢¥¤¥É¥ë¤Ê»Ò¥µ¡¼¥Ð¥×¥í¥»¥¹¤ÎºÇ¾®¸Ä¿ô</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#minsparethreads">MinSpareThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤¹¤ë¤³¤È¤Î¤Ç¤­¤ë
-¥¢¥¤¥É¥ë¥¹¥ì¥Ã¥É¿ô¤ÎºÇ¾®¿ô</td></tr>
+<tr><td><a href="prefork.html#minspareservers">MinSpareServers <var>number</var></a></td><td> 5 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">アイドル��サー�プロセス�最�個数</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#minsparethreads">MinSpareThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">リクエスト�応答�る�����る
+アイドルスレッド数�最�数</td></tr>
 <tr><td><a href="mod_file_cache.html#mmapfile">MMapFile <var>file-path</var> [<var>file-path</var>] ...</a></td><td></td><td>s</td><td>X</td></tr><tr><td class="descr" colspan="4">Map a list of files into memory at startup time</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#modmimeusepathinfo">ModMimeUsePathInfo On|Off</a></td><td> Off </td><td>d</td><td /></tr><tr class="odd"><td class="descr" colspan="4"><code>path_info</code> ¥³¥ó¥Ý¡¼¥Í¥ó¥È¤ò¥Õ¥¡¥¤¥ë̾¤Î°ìÉô¤È¤·¤Æ°·¤¦¤è¤¦¤Ë
-<code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> ¤ËÄÌÃΤ¹¤ë</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#modmimeusepathinfo">ModMimeUsePathInfo On|Off</a></td><td> Off </td><td>d</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4"><code>path_info</code> コン�ー�ントをファイル��一部���扱�よ��
+<code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> �通知�る</td></tr>
 <tr><td><a href="mod_mime.html#multiviewsmatch">MultiviewsMatch Any|NegotiatedOnly|Filters|Handlers
-[Handlers|Filters]</a></td><td> NegotiatedOnly </td><td>svdh</td><td /></tr><tr><td class="descr" colspan="4">MultiViews ¤Ç¤Î¥Þ¥Ã¥Á¥ó¥°¤Î¸¡º÷¤Ë´Þ¤Þ¤»¤ë
-¥Õ¥¡¥¤¥ë¤Î¥¿¥¤¥×¤ò»ØÄꤹ¤ë</td></tr>
-<tr class="odd"><td><a href="core.html#namevirtualhost" id="N" name="N">NameVirtualHost <var>addr</var>[:<var>port</var>]</a></td><td></td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¤¿¤á¤Î IP ¥¢¥É¥ì¥¹¤ò»ØÄê</td></tr>
-<tr><td><a href="mod_proxy.html#noproxy">NoProxy <var>host</var> [<var>host</var>] ...</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">ľÀÜÀܳ¤¹¤ë ¥Û¥¹¥È¡¢¥É¥á¥¤¥ó¡¢¥Í¥Ã¥È¥ï¡¼¥¯</td></tr>
+[Handlers|Filters]</a></td><td> NegotiatedOnly </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">MultiViews ��マッ�ング�検索����る
+ファイル�タイプを指定�る</td></tr>
+<tr class="odd"><td><a href="core.html#namevirtualhost" id="N" name="N">NameVirtualHost <var>addr</var>[:<var>port</var>]</a></td><td></td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">��ベース��ー�ャルホスト���� IP アドレスを指定</td></tr>
+<tr><td><a href="mod_proxy.html#noproxy">NoProxy <var>host</var> [<var>host</var>] ...</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">直接接続�る ホスト�ドメイン��ットワーク</td></tr>
 <tr class="odd"><td><a href="mod_nw_ssl.html#nwssltrustedcerts">NWSSLTrustedCerts <var>filename</var> [<var>filename</var>] ...</a></td><td></td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">List of additional client certificates</td></tr>
 <tr><td><a href="mod_nw_ssl.html#nwsslupgradeable">NWSSLUpgradeable [<var>IP-address</var>:]<var>portnumber</var></a></td><td></td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">Allows a connection to be upgraded to an SSL connection upon request</td></tr>
 <tr class="odd"><td><a href="core.html#options" id="O" name="O">Options
-    [+|-]<var>option</var> [[+|-]<var>option</var>] ...</a></td><td> All </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¥Ç¥£¥ì¥¯¥È¥ê¤ËÂФ·¤Æ»ÈÍѲÄǽ¤Êµ¡Ç½¤òÀßÄꤹ¤ë</td></tr>
-<tr><td><a href="mod_authz_host.html#order"> Order <var>ordering</var></a></td><td> Deny,Allow </td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">¥Ç¥Õ¥©¥ë¥È¤Î¥¢¥¯¥»¥¹²Äǽ¤Ê¾õÂ֤ȡ¢<code class="directive">Allow</code> ¤È
-<code class="directive">Deny</code> ¤¬É¾²Á¤µ¤ì¤ë½çÈÖ¤òÀ©¸æ¤¹¤ë</td></tr>
+    [+|-]<var>option</var> [[+|-]<var>option</var>] ...</a></td><td> All </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">ディレクトリ�対��使用�能�機能を設定�る</td></tr>
+<tr><td><a href="mod_authz_host.html#order"> Order <var>ordering</var></a></td><td> Deny,Allow </td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">デフォルト�アクセス�能�状態��<code class="directive">Allow</code> �
+<code class="directive">Deny</code> �評価�れる順番を制御�る</td></tr>
 <tr class="odd"><td><a href="mod_env.html#passenv" id="P" name="P">PassEnv <var>env-variable</var> [<var>env-variable</var>]
-...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¥·¥§¥ë¤«¤é¤Î´Ä¶­ÊÑ¿ô¤òÅϤ¹</td></tr>
-<tr><td><a href="mpm_common.html#pidfile">PidFile <var>filename</var></a></td><td> logs/httpd.pid </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">¥Ç¡¼¥â¥ó¤Î¥×¥í¥»¥¹ ID
-¤ò¥µ¡¼¥Ð¤¬µ­Ï¿¤¹¤ë¤¿¤á¤Î¥Õ¥¡¥¤¥ë</td></tr>
-<tr class="odd"><td><a href="mod_echo.html#protocolecho">ProtocolEcho On|Off</a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">¥¨¥³¡¼¥µ¡¼¥Ð¤ÎÍ­¸ú̵¸ú¤òÀßÄꤷ¤Þ¤¹¡£</td></tr>
-<tr><td><a href="mod_proxy.html#proxy">&lt;Proxy <var>wildcard-url</var>&gt; ...&lt;/Proxy&gt;</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">¥×¥í¥­¥·¤µ¤ì¤ë¥ê¥½¡¼¥¹¤ËŬÍѤµ¤ì¤ë¥³¥ó¥Æ¥Ê</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxybadheader">ProxyBadHeader IsError|Ignore|StartBody</a></td><td> IsError </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">±þÅú¤Ë¤ª¤«¤·¤Ê¥Ø¥Ã¥À¤¬¤¢¤ë¾ì¹ç¤Î°·¤¤Êý¤ò·è¤á¤ë</td></tr>
+...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">シェル�ら�環境変数を渡�</td></tr>
+<tr><td><a href="mpm_common.html#pidfile">PidFile <var>filename</var></a></td><td> logs/httpd.pid </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">デーモン�プロセス ID
+をサー��記録�る���ファイル</td></tr>
+<tr class="odd"><td><a href="mod_echo.html#protocolecho">ProtocolEcho On|Off</a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">エコーサー��有効無効を設定���。</td></tr>
+<tr><td><a href="mod_proxy.html#proxy">&lt;Proxy <var>wildcard-url</var>&gt; ...&lt;/Proxy&gt;</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">プロキシ�れるリソース��用�れるコンテナ</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxybadheader">ProxyBadHeader IsError|Ignore|StartBody</a></td><td> IsError </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">応答�����ヘッダ��る場��扱�方を決�る</td></tr>
 <tr><td><a href="mod_proxy.html#proxyblock">ProxyBlock *|<var>word</var>|<var>host</var>|<var>domain</var>
-[<var>word</var>|<var>host</var>|<var>domain</var>] ...</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">¥×¥í¥­¥·Àܳ¤ò¶Ø»ß¤¹¤ë¸ì¶ç¡¢¥Û¥¹¥È̾¡¢¥É¥á¥¤¥ó¤ò»ØÄꤹ¤ë</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxydomain">ProxyDomain <var>Domain</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¥×¥í¥­¥·¤µ¤ì¤¿¥ê¥¯¥¨¥¹¥È¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥É¥á¥¤¥ó̾</td></tr>
-<tr><td><a href="mod_proxy.html#proxyerroroverride">ProxyErrorOverride On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">¥×¥í¥­¥·¤µ¤ì¤¿¥³¥ó¥Æ¥ó¥Ä¤Î¥¨¥é¡¼¥Ú¡¼¥¸¤ò¾å½ñ¤­¤¹¤ë</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyiobuffersize">ProxyIOBufferSize <var>bytes</var></a></td><td> 8192 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">ÆâÉô¥Ç¡¼¥¿¥¹¥ë¡¼¥×¥Ã¥È¥Ð¥Ã¥Õ¥¡¤Î¥µ¥¤¥º¤ò·èÄꤹ¤ë</td></tr>
-<tr><td><a href="mod_proxy.html#proxymatch">&lt;ProxyMatch <var>regex</var>&gt; ...&lt;/ProxyMatch&gt;</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Àµµ¬É½¸½¤Ç¤Î¥Þ¥Ã¥Á¤Ë¤è¤ë¥×¥í¥­¥·¥ê¥½¡¼¥¹ÍѤΥǥ£¥ì¥¯¥Æ¥£¥Ö¥³¥ó¥Æ¥Ê</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards <var>number</var></a></td><td> 10 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¥ê¥¯¥¨¥¹¥È¤¬¥Õ¥©¥ï¡¼¥É¤µ¤ì¤ë¥×¥í¥­¥·¤ÎºÇÂç¿ô</td></tr>
-<tr><td><a href="mod_proxy.html#proxypass">ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var> <var>key=value</var> ...]]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">¥ê¥â¡¼¥È¥µ¡¼¥Ð¤ò¥í¡¼¥«¥ë¥µ¡¼¥Ð¤Î URL ¶õ´Ö¤Ë¥Þ¥Ã¥×¤¹¤ë</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse [<var>path</var>] <var>url</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¤µ¤ì¤¿¥µ¡¼¥Ð¤«¤éÁ÷¤é¤ì¤¿ HTTP ±þÅú¥Ø¥Ã¥À¤Î
-URL ¤òÄ´À°¤¹¤ë</td></tr>
-<tr><td><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain <var>internal-domain</var> <var>public-domain</var></a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¥µ¡¼¥Ð¤«¤é¤Î Set-Cookie ¥Ø¥Ã¥À¤Î Domain ʸ»úÎó¤ò
-Ä´À°¤¹¤ë</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath <var>internal-path</var> <var>public-path</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Reverse ¥×¥í¥­¥·¥µ¡¼¥Ð¤«¤é¤Î Set-Cookie ¥Ø¥Ã¥À¤Î Path ʸ»úÎó¤ò
-Ä´À°¤¹¤ë</td></tr>
-<tr><td><a href="mod_proxy.html#proxypreservehost">ProxyPreserveHost On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">¥×¥í¥­¥·¥ê¥¯¥¨¥¹¥È¤Ë¡¢¼õ¤±ÉÕ¤±¤¿ Host HTTP ¥Ø¥Ã¥À¤ò»È¤¦</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¥×¥í¥­¥·¤µ¤ì¤ë HTTP ¤È FTP Àܳ¤Î¤¿¤á¤Î¥Í¥Ã¥È¥ï¡¼¥¯¥Ð¥Ã¥Õ¥¡¥µ¥¤¥º</td></tr>
-<tr><td><a href="mod_proxy.html#proxyremote">ProxyRemote <var>match</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">ÆÃÄê¤Î¥ê¥¯¥¨¥¹¥È¤ò°·¤¦»þ¤Ë»È¤ï¤ì¤ë¥ê¥â¡¼¥È¥×¥í¥­¥·¤ò»ØÄꤹ¤ë</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch <var>regex</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Àµµ¬É½¸½¤Ç¤Î¥Þ¥Ã¥Á¤Ë¤è¤ë¥ê¥¯¥¨¥¹¥È¤ò°·¤¦¥ê¥â¡¼¥È¥×¥í¥­¥·¤Î»ØÄê</td></tr>
-<tr><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">¥Õ¥©¥ï¡¼¥É (ɸ½à¤Î) ¥×¥í¥­¥·¥ê¥¯¥¨¥¹¥È¤òÍ­¸ú¤Ë¤¹¤ë</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¥×¥í¥­¥·¤µ¤ì¤¿¥ê¥¯¥¨¥¹¥È¤Î¥Í¥Ã¥È¥ï¡¼¥¯¥¿¥¤¥à¥¢¥¦¥È</td></tr>
-<tr><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">¥×¥í¥­¥·¤µ¤ì¤¿¥ê¥¯¥¨¥¹¥È¤Î <code>Via</code> HTTP ±þÅú¥Ø¥Ã¥À
-¤Ë¤è¤êÄ󶡤µ¤ì¤ë¾ðÊó</td></tr>
-<tr class="odd"><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¥¤¥ó¥Ç¥Ã¥¯¥¹°ìÍ÷¤ÎºÇ¸å¤ËÁÞÆþ¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤Î̾Á°</td></tr>
-<tr><td><a href="mpm_common.html#receivebuffersize">ReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">TCP ¼õ¿®¥Ð¥Ã¥Õ¥¡¥µ¥¤¥º</td></tr>
+[<var>word</var>|<var>host</var>|<var>domain</var>] ...</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">プロキシ接続を�止�る語��ホスト��ドメインを指定�る</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxydomain">ProxyDomain <var>Domain</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">プロキシ�れ�リクエスト�デフォルト�ドメイン�</td></tr>
+<tr><td><a href="mod_proxy.html#proxyerroroverride">ProxyErrorOverride On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">プロキシ�れ�コンテンツ�エラーページを上書��る</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxyiobuffersize">ProxyIOBufferSize <var>bytes</var></a></td><td> 8192 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">内部データスループット�ッファ�サイズを決定�る</td></tr>
+<tr><td><a href="mod_proxy.html#proxymatch">&lt;ProxyMatch <var>regex</var>&gt; ...&lt;/ProxyMatch&gt;</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">正�表���マッ��よるプロキシリソース用�ディレクティブコンテナ</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards <var>number</var></a></td><td> 10 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">リクエスト�フォワード�れるプロキシ�最大数</td></tr>
+<tr><td><a href="mod_proxy.html#proxypass">ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var> <var>key=value</var> ...]]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">リモートサー�をローカルサー�� URL 空間�マップ�る</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse [<var>path</var>] <var>url</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">リ�ースプロキシ�れ�サー��ら�られ� HTTP 応答ヘッダ�
+URL を調整�る</td></tr>
+<tr><td><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain <var>internal-domain</var> <var>public-domain</var></a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">リ�ースプロキシサー��ら� Set-Cookie ヘッダ� Domain 文字列を
+調整�る</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath <var>internal-path</var> <var>public-path</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Reverse プロキシサー��ら� Set-Cookie ヘッダ� Path 文字列を
+調整�る</td></tr>
+<tr><td><a href="mod_proxy.html#proxypreservehost">ProxyPreserveHost On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">プロキシリクエスト����付�� Host HTTP ヘッダを使�</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">プロキシ�れる HTTP � FTP 接続�����ットワーク�ッファサイズ</td></tr>
+<tr><td><a href="mod_proxy.html#proxyremote">ProxyRemote <var>match</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">特定�リクエストを扱�時�使�れるリモートプロキシを指定�る</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch <var>regex</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">正�表���マッ��よるリクエストを扱�リモートプロキシ�指定</td></tr>
+<tr><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">フォワード (標準�) プロキシリクエストを有効��る</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">プロキシ�れ�リクエスト��ットワークタイムアウト</td></tr>
+<tr><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">プロキシ�れ�リクエスト� <code>Via</code> HTTP 応答ヘッダ
+�より�供�れる情報</td></tr>
+<tr class="odd"><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">インデックス一覧�最後�挿入�れるファイル���</td></tr>
+<tr><td><a href="mpm_common.html#receivebuffersize">ReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">TCP �信�ッファサイズ</td></tr>
 <tr class="odd"><td><a href="mod_alias.html#redirect">Redirect [<var>status</var>] <var>URL-path</var>
-<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¥¯¥é¥¤¥¢¥ó¥È¤¬°ã¤¦ URL ¤ò¼èÆÀ¤¹¤ë¤è¤¦¤Ë³°Éô¤Ø¤Î¥ê¥À¥¤¥ì¥¯¥È¤ò
-Á÷¤ë</td></tr>
+<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">クライアント��� URL を�得�るよ��外部��リダイレクトを
+�る</td></tr>
 <tr><td><a href="mod_alias.html#redirectmatch">RedirectMatch [<var>status</var>] <var>regex</var>
-<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">¸½ºß¤Î URL ¤Ø¤ÎÀµµ¬É½¸½¤Î¥Þ¥Ã¥Á¤Ë¤è¤ê
-³°Éô¤Ø¤Î¥ê¥À¥¤¥ì¥¯¥È¤òÁ÷¤ë</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#redirectpermanent">RedirectPermanent <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¥¯¥é¥¤¥¢¥ó¥È¤¬°ã¤¦ URL ¤ò¼èÆÀ¤¹¤ë¤è¤¦¤Ë³°Éô¤Ø¤Î±Êµ×Ū¤Ê
-¥ê¥À¥¤¥ì¥¯¥È¤òÁ÷¤ë</td></tr>
-<tr><td><a href="mod_alias.html#redirecttemp">RedirectTemp <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">¥¯¥é¥¤¥¢¥ó¥È¤¬°ã¤¦ URL ¤ò¼èÆÀ¤¹¤ë¤è¤¦¤Ë³°Éô¤Ø¤Î°ì»þŪ¤Ê
-¥ê¥À¥¤¥ì¥¯¥È¤òÁ÷¤ë</td></tr>
+<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">�在� URL ��正�表��マッ��より
+外部��リダイレクトを�る</td></tr>
+<tr class="odd"><td><a href="mod_alias.html#redirectpermanent">RedirectPermanent <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">クライアント��� URL を�得�るよ��外部��永久的�
+リダイレクトを�る</td></tr>
+<tr><td><a href="mod_alias.html#redirecttemp">RedirectTemp <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">クライアント��� URL を�得�るよ��外部��一時的�
+リダイレクトを�る</td></tr>
 <tr class="odd"><td><a href="mod_mime.html#removecharset">RemoveCharset <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td /></tr><tr class="odd"><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¤¹¤Ù¤Æ¤Îʸ»ú¥»¥Ã¥È
-¤ò²ò½ü¤¹¤ë</td></tr>
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ファイル�拡張��関連付�られ�����文字セット
+を解除�る</td></tr>
 <tr><td><a href="mod_mime.html#removeencoding">RemoveEncoding <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td /></tr><tr><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¤¹¤Ù¤Æ¤Î¥³¥ó¥Æ¥ó¥È¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°
-¤ò²ò½ü¤¹¤ë</td></tr>
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ファイル�拡張��関連付�られ�����コンテントエンコーディング
+を解除�る</td></tr>
 <tr class="odd"><td><a href="mod_mime.html#removehandler">RemoveHandler <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td /></tr><tr class="odd"><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¤¹¤Ù¤Æ¤Î¥Ï¥ó¥É¥é¤ò
-²ò½ü¤¹¤ë</td></tr>
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ファイル�拡張��関連付�られ������ンドラを
+解除�る</td></tr>
 <tr><td><a href="mod_mime.html#removeinputfilter">RemoveInputFilter <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td /></tr><tr><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿ÆþÎÏ¥Õ¥£¥ë¥¿¤ò²ò½ü¤¹¤ë</td></tr>
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ファイル拡張��関連付�られ�入力フィルタを解除�る</td></tr>
 <tr class="odd"><td><a href="mod_mime.html#removelanguage">RemoveLanguage <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td /></tr><tr class="odd"><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿¸À¸ì¤ò²ò½ü¤¹¤ë</td></tr>
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ファイル拡張��関連付�られ�言語を解除�る</td></tr>
 <tr><td><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td /></tr><tr><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë³ÈÄ¥»Ò¤Ë´ØÏ¢ÉÕ¤±¤é¤ì¤¿½ÐÎÏ¥Õ¥£¥ë¥¿¤ò²ò½ü¤¹¤ë</td></tr>
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ファイル拡張��関連付�られ�出力フィルタを解除�る</td></tr>
 <tr class="odd"><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td /></tr><tr class="odd"><td class="descr" colspan="4">¥Õ¥¡¥¤¥ë¤Î³ÈÄ¥»Ò¤È´ØÏ¢ÉÕ¤±¤é¤ì¤¿¥³¥ó¥Æ¥ó¥È¥¿¥¤¥×¤ò
-²ò½ü¤¹¤ë</td></tr>
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ファイル�拡張��関連付�られ�コンテントタイプを
+解除�る</td></tr>
 <tr><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset <var>header</var>
-[<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">HTTP ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤ÎÀßÄê</td></tr>
-<tr class="odd"><td><a href="core.html#require">Require <var>entity-name</var> [<var>entity-name</var>] ...</a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¤É¤Îǧ¾ÚºÑ¤ß¥æ¡¼¥¶¤¬¥ê¥½¡¼¥¹¤ò¥¢¥¯¥»¥¹¤Ç¤­¤ë¤«¤òÁªÂò¤¹¤ë</td></tr>
+[<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">HTTP リクエストヘッダ�設定</td></tr>
+<tr class="odd"><td><a href="core.html#require">Require <var>entity-name</var> [<var>entity-name</var>] ...</a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">���証済�ユーザ�リソースをアクセス��る�を�択�る</td></tr>
 <tr><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
 <tr class="odd"><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
       <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines a condition under which rewriting will take place
@@ -529,58 +528,58 @@ engine</td></tr>
 <tr class="odd"><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <var>Options</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
 <tr><td><a href="mod_rewrite.html#rewriterule">RewriteRule
       <em>Pattern</em> <em>Substitution</em> [<em>flags</em>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
-<tr class="odd"><td><a href="core.html#rlimitcpu">RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Apache ¤Î»Ò¥×¥í¥»¥¹¤«¤éµ¯Æ°¤µ¤ì¤¿¥×¥í¥»¥¹¤Î CPU ¾ÃÈñÎ̤ò
-À©¸Â¤¹¤ë</td></tr>
-<tr><td><a href="core.html#rlimitmem">RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Apache ¤Î»Ò¥×¥í¥»¥¹¤«¤éµ¯Æ°¤µ¤ì¤¿¥×¥í¥»¥¹¤Î¥á¥â¥ê¾ÃÈñÎ̤ò
-À©¸Â¤¹¤ë</td></tr>
-<tr class="odd"><td><a href="core.html#rlimitnproc">RLimitNPROC <var>number</var>|max [<var>number</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Apache ¤Î»Ò¥×¥í¥»¥¹¤«¤éµ¯Æ°¤µ¤ì¤¿¥×¥í¥»¥¹¤¬µ¯Æ°¤¹¤ë¥×¥í¥»¥¹¤Î
-¿ô¤òÀ©¸Â¤¹¤ë</td></tr>
-<tr><td><a href="core.html#satisfy" id="S" name="S">Satisfy Any|All</a></td><td> All </td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">¥Û¥¹¥È¥ì¥Ù¥ë¤Î¥¢¥¯¥»¥¹À©¸æ¤È¥æ¡¼¥¶Ç§¾Ú¤È¤ÎÁê¸ßºîÍѤò»ØÄê</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#scoreboardfile">ScoreBoardFile <var>file-path</var></a></td><td> logs/apache_status </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">»Ò¥×¥í¥»¥¹¤ÈÏ¢·È¤¹¤ë¤¿¤á¤Î¥Ç¡¼¥¿¤òÊݸ¤¹¤ë
-¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ</td></tr>
-<tr><td><a href="mod_actions.html#script">Script <var>method</var> <var>cgi-script</var></a></td><td></td><td>svd</td><td>B</td></tr><tr><td class="descr" colspan="4">ÆÃÄê¤Î¥ê¥¯¥¨¥¹¥È¥á¥½¥Ã¥É¤ËÂФ·¤Æ CGI ¥¹¥¯¥ê¥×¥È¤ò
-¼Â¹Ô¤¹¤ë¤è¤¦¤ËÀßÄê</td></tr>
+<tr class="odd"><td><a href="core.html#rlimitcpu">RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Apache ��プロセス�ら起動�れ�プロセス� CPU 消費�を
+制��る</td></tr>
+<tr><td><a href="core.html#rlimitmem">RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Apache ��プロセス�ら起動�れ�プロセス�メモリ消費�を
+制��る</td></tr>
+<tr class="odd"><td><a href="core.html#rlimitnproc">RLimitNPROC <var>number</var>|max [<var>number</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Apache ��プロセス�ら起動�れ�プロセス�起動�るプロセス�
+数を制��る</td></tr>
+<tr><td><a href="core.html#satisfy" id="S" name="S">Satisfy Any|All</a></td><td> All </td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">ホストレベル�アクセス制御�ユーザ�証��相互作用を指定</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#scoreboardfile">ScoreBoardFile <var>file-path</var></a></td><td> logs/apache_status </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">�プロセス�連��る���データを�存�る
+ファイル��置</td></tr>
+<tr><td><a href="mod_actions.html#script">Script <var>method</var> <var>cgi-script</var></a></td><td></td><td>svd</td><td>B</td></tr><tr><td class="descr" colspan="4">特定�リクエストメソッド�対�� CGI スクリプトを
+実行�るよ��設定</td></tr>
 <tr class="odd"><td><a href="mod_alias.html#scriptalias">ScriptAlias <var>URL-path</var>
-<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">URL ¤ò¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î°ÌÃ֤إޥåפ·¡¢¥Þ¥Ã¥×Àè¤ò
-CGI ¥¹¥¯¥ê¥×¥È¤Ë»ØÄê</td></tr>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">URL をファイルシステム��置�マップ��マップ先を
+CGI スクリプト�指定</td></tr>
 <tr><td><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch <var>regex</var>
-<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">URL ¤òÀµµ¬É½¸½¤ò»È¤Ã¤Æ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î°ÌÃ֤إޥåפ·¡¢¥Þ¥Ã¥×Àè¤ò
-CGI ¥¹¥¯¥ê¥×¥È¤Ë»ØÄê</td></tr>
-<tr class="odd"><td><a href="core.html#scriptinterpretersource">ScriptInterpreterSource Registry|Registry-Strict|Script</a></td><td> Script </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">CGI ¥¹¥¯¥ê¥×¥È¤Î¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Î°ÌÃÖ¤òÄ´¤Ù¤ë¤¿¤á¤Î¼êË¡</td></tr>
-<tr><td><a href="mod_cgi.html#scriptlog">ScriptLog <var>file-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">CGI ¥¹¥¯¥ê¥×¥È¤Î¥¨¥é¡¼¥í¥°¥Õ¥¡¥¤¥ë¤Î¾ì½ê</td></tr>
-<tr class="odd"><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <em>bytes</em></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¥¹¥¯¥ê¥×¥È¥í¥°¤Ëµ­Ï¿¤µ¤ì¤ë PUT ¤ä POST ¥ê¥¯¥¨¥¹¥È¤ÎÆâÍƤξå¸Â</td></tr>
-<tr><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">CGI ¥¹¥¯¥ê¥×¥È¤Î¥í¥°¥Õ¥¡¥¤¥ë¤ÎÂ礭¤µ¤Î¾å¸Â</td></tr>
-<tr class="odd"><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">CGI ¥Ç¡¼¥â¥ó¤È¤ÎÄÌ¿®¤Ë»È¤ï¤ì¤ë¥½¥±¥Ã¥È¤Î¥Õ¥¡¥¤¥ë̾¤ÎÀÜƬ¼­</td></tr>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">URL を正�表�を使��ファイルシステム��置�マップ��マップ先を
+CGI スクリプト�指定</td></tr>
+<tr class="odd"><td><a href="core.html#scriptinterpretersource">ScriptInterpreterSource Registry|Registry-Strict|Script</a></td><td> Script </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">CGI スクリプト�インタープリタ��置を調�る���手法</td></tr>
+<tr><td><a href="mod_cgi.html#scriptlog">ScriptLog <var>file-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">CGI スクリプト�エラーログファイル�場所</td></tr>
+<tr class="odd"><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <em>bytes</em></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">スクリプトログ�記録�れる PUT や POST リクエスト�内容�上�</td></tr>
+<tr><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">CGI スクリプト�ログファイル�大���上�</td></tr>
+<tr class="odd"><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">CGI デーモン��通信�使�れるソケット�ファイル��接頭辞</td></tr>
 <tr><td><a href="mod_nw_ssl.html#securelisten">SecureListen [<var>IP-address</var>:]<var>portnumber</var>
 <var>Certificate-Name</var> [MUTUAL]</a></td><td></td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">Enables SSL encryption for the specified port</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">TCP ¥Ð¥Ã¥Õ¥¡¥µ¥¤¥º</td></tr>
-<tr><td><a href="core.html#serveradmin">ServerAdmin <var>email-address</var>|<var>URL</var></a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">¥µ¡¼¥Ð¤¬¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤ë¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤Ë´Þ¤á¤ëÅŻҥ᡼¥ë¤Î
-¥¢¥É¥ì¥¹</td></tr>
-<tr class="odd"><td><a href="core.html#serveralias">ServerAlias <var>hostname</var> [<var>hostname</var>] ...</a></td><td></td><td>v</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¥ê¥¯¥¨¥¹¥È¤ò̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë¥Þ¥Ã¥Á¤µ¤»¤Æ¤¤¤ë¤È¤­¤Ë
-»ÈÍѤµ¤ì¤ë¥Û¥¹¥È¤ÎÊÌ̾</td></tr>
-<tr><td><a href="mpm_common.html#serverlimit">ServerLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">ÀßÄê²Äǽ¤Ê¥µ¡¼¥Ð¥×¥í¥»¥¹¿ô¤Î¾å¸Â</td></tr>
-<tr class="odd"><td><a href="core.html#servername">ServerName [<var>scheme</var>://]<var>fully-qualified-domain-name</var>[:<var>port</var>]</a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¥µ¡¼¥Ð¤¬¼«Ê¬¼«¿È¤ò¼¨¤¹¤È¤­¤Ë»È¤¦¥Û¥¹¥È̾¤È¥Ý¡¼¥È</td></tr>
-<tr><td><a href="core.html#serverpath">ServerPath <var>URL-path</var></a></td><td></td><td>v</td><td>C</td></tr><tr><td class="descr" colspan="4">Èó¸ß´¹¤Î¥Ö¥é¥¦¥¶¤¬Ì¾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë¥¢¥¯¥»¥¹¤·¤¿¤È¤­¤Î
-¤¿¤á¤Î¸ß´¹ÍÑ URL ¥Ñ¥¹Ì¾</td></tr>
-<tr class="odd"><td><a href="core.html#serverroot">ServerRoot <var>directory-path</var></a></td><td> /usr/local/apache </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¥µ¡¼¥Ð¤Î¥Ù¡¼¥¹¥Ç¥£¥ì¥¯¥È¥ê</td></tr>
-<tr><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">¥µ¡¼¥Ð¤¬À¸À®¤¹¤ë¥É¥­¥å¥á¥ó¥È¤Î¥Õ¥Ã¥¿¤òÀßÄê</td></tr>
-<tr class="odd"><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4"><code>Server</code> HTTP ±þÅú¥Ø¥Ã¥À¤òÀßÄꤹ¤ë</td></tr>
-<tr><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> <var>value</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">TCP �ッファサイズ</td></tr>
+<tr><td><a href="core.html#serveradmin">ServerAdmin <var>email-address</var>|<var>URL</var></a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">サー��クライアント��るエラーメッセージ���る電�メール�
+アドレス</td></tr>
+<tr class="odd"><td><a href="core.html#serveralias">ServerAlias <var>hostname</var> [<var>hostname</var>] ...</a></td><td></td><td>v</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">リクエストを��ベース��ー�ャルホスト�マッ�����る���
+使用�れるホスト�別�</td></tr>
+<tr><td><a href="mpm_common.html#serverlimit">ServerLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">設定�能�サー�プロセス数�上�</td></tr>
+<tr class="odd"><td><a href="core.html#servername">ServerName [<var>scheme</var>://]<var>fully-qualified-domain-name</var>[:<var>port</var>]</a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">サー��自分自身を示����使�ホスト���ート</td></tr>
+<tr><td><a href="core.html#serverpath">ServerPath <var>URL-path</var></a></td><td></td><td>v</td><td>C</td></tr><tr><td class="descr" colspan="4">�互��ブラウザ���ベース��ー�ャルホスト�アクセス�����
+���互�用 URL パス�</td></tr>
+<tr class="odd"><td><a href="core.html#serverroot">ServerRoot <var>directory-path</var></a></td><td> /usr/local/apache </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">インストール�れ�サー��ベースディレクトリ</td></tr>
+<tr><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">サー��生��るドキュメント�フッタを設定</td></tr>
+<tr class="odd"><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4"><code>Server</code> HTTP 応答ヘッダを設定�る</td></tr>
+<tr><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> <var>value</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">環境変数を設定�る</td></tr>
 <tr class="odd"><td><a href="mod_setenvif.html#setenvif">SetEnvIf <em>attribute
     regex [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¥ê¥¯¥¨¥¹¥È¤Î°À­¤Ë´ð¤Å¤¤¤Æ´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">リクエスト�属性�基���環境変数を設定�る
 </td></tr>
 <tr><td><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase <em>attribute regex 
         [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">¥ê¥¯¥¨¥¹¥È¤Î°À­¤Ë´ð¤Å¤¤¤ÆÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤»¤º¤Ë´Ä¶­ÊÑ¿ô¤òÀßÄꤹ¤ë</td></tr>
-<tr class="odd"><td><a href="core.html#sethandler">SetHandler <var>handler-name</var>|None</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¥Þ¥Ã¥Á¤¹¤ë¥Õ¥¡¥¤¥ë¤¬¥Ï¥ó¥É¥é¤Ç½èÍý¤µ¤ì¤ë¤è¤¦¤Ë¤¹¤ë</td></tr>
-<tr><td><a href="core.html#setinputfilter">SetInputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¥¯¥¨¥¹¥È¤ä POST ¤ÎÆþÎϤò½èÍý¤¹¤ë¥Õ¥£¥ë¥¿¤òÀßÄꤹ¤ë</td></tr>
-<tr class="odd"><td><a href="core.html#setoutputfilter">SetOutputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¥µ¡¼¥Ð¤Î±þÅú¤ò½èÍý¤¹¤ë¥Õ¥£¥ë¥¿¤òÀßÄꤹ¤ë</td></tr>
-<tr><td><a href="mod_include.html#ssiendtag">SSIEndTag <var>tag</var></a></td><td> "--&gt;" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">include Í×ÁǤò½ªÎ»¤µ¤»¤ëʸ»úÎó</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssierrormsg">SSIErrorMsg <var>message</var></a></td><td> "[an error occurred +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">SSI ¤Î¥¨¥é¡¼¤¬¤¢¤Ã¤¿¤È¤­¤Ëɽ¼¨¤µ¤ì¤ë¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸</td></tr>
-<tr><td><a href="mod_include.html#ssistarttag">SSIStartTag <var>tag</var></a></td><td> "&lt;!--#" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">include Í×ÁǤò³«»Ï¤¹¤ëʸ»úÎó</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <var>formatstring</var></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ÆüÉÕ¤±¤ò¸½¤¹Ê¸»úÎó¤Î½ñ¼°¤òÀßÄꤹ¤ë</td></tr>
-<tr><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">̤ÄêµÁ¤ÎÊÑ¿ô¤¬ echo ¤µ¤ì¤¿¤È¤­¤Ëɽ¼¨¤µ¤ì¤ëʸ»úÎó</td></tr>
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">リクエスト�属性�基���大文字�文字を区別���環境変数を設定�る</td></tr>
+<tr class="odd"><td><a href="core.html#sethandler">SetHandler <var>handler-name</var>|None</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">マッ��るファイル��ンドラ�処��れるよ���る</td></tr>
+<tr><td><a href="core.html#setinputfilter">SetInputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">クライアント�リクエストや POST �入力を処��るフィルタを設定�る</td></tr>
+<tr class="odd"><td><a href="core.html#setoutputfilter">SetOutputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">サー��応答を処��るフィルタを設定�る</td></tr>
+<tr><td><a href="mod_include.html#ssiendtag">SSIEndTag <var>tag</var></a></td><td> "--&gt;" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">include �素を終了��る文字列</td></tr>
+<tr class="odd"><td><a href="mod_include.html#ssierrormsg">SSIErrorMsg <var>message</var></a></td><td> "[an error occurred +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">SSI �エラー�������表示�れるエラーメッセージ</td></tr>
+<tr><td><a href="mod_include.html#ssistarttag">SSIStartTag <var>tag</var></a></td><td> "&lt;!--#" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">include �素を開始�る文字列</td></tr>
+<tr class="odd"><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <var>formatstring</var></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">日付�を表�文字列�書�を設定�る</td></tr>
+<tr><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">未定義�変数� echo �れ����表示�れる文字列</td></tr>
 <tr class="odd"><td><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
 for Client Auth</td></tr>
 <tr><td><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
@@ -639,51 +638,52 @@ in the Session Cache</td></tr>
 <tr class="odd"><td><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of Client Certificate verification</td></tr>
 <tr><td><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum depth of CA Certificates in Client 
 Certificate verification</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#startservers">StartServers <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">µ¯Æ°»þ¤ËÀ¸À®¤µ¤ì¤ë»Ò¥µ¡¼¥Ð¥×¥í¥»¥¹¤Î¿ô</td></tr>
-<tr><td><a href="mpm_common.html#startthreads">StartThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">µ¯Æ°»þ¤ËÀ¸À®¤µ¤ì¤ë¥¹¥ì¥Ã¥É¤Î¿ô</td></tr>
-<tr class="odd"><td><a href="mod_substitute.html#substitute">Substitute <var>s/pattern/substitution/[inf]</var></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Pattern to filter the response content</td></tr>
-<tr><td><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup <em>User Group</em></a></td><td></td><td>sv</td><td /></tr><tr><td class="descr" colspan="4">CGI ¥×¥í¥°¥é¥à¤Î¥æ¡¼¥¶¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¡¢¥°¥ë¡¼¥×¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">ÀßÄê²Äǽ¤Ê»Ò¥×¥í¥»¥¹Ëè¤Î¥¹¥ì¥Ã¥É¿ô¤Î¾å¸Â¤ò
-ÀßÄꤷ¤Þ¤¹</td></tr>
-<tr><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">»Ò¥×¥í¥»¥¹¤½¤ì¤¾¤ì¤ËÀ¸À®¤µ¤ì¤ë¥¹¥ì¥Ã¥É¿ô</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">¥¯¥é¥¤¥¢¥ó¥È¤Î¥³¥Í¥¯¥·¥ç¥ó¤ò¼õ¤±»ý¤Ä¥¹¥ì¥Ã¥É¤¬»ÈÍѤ¹¤ë
-¥¹¥¿¥Ã¥¯¤Î¥Ð¥¤¥È¿ô</td></tr>
-<tr><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">³Æ¥¤¥Ù¥ó¥È¤Ë¤Ä¤¤¤Æ¡¢¥ê¥¯¥¨¥¹¥È¤ò¼ºÇÔ¤µ¤»¤ë¤Þ¤Ç¤Ë¥µ¡¼¥Ð¤¬
-ÂԤĻþ´Ö¤òÀßÄê</td></tr>
-<tr class="odd"><td><a href="core.html#traceenable">TraceEnable <var>[on|off|extended]</var></a></td><td> on </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4"><code>TRACE</code> ¥á¥½¥Ã¥É¤Î¥ê¥¯¥¨¥¹¥È¤ËÂФ¹¤ë±þÅúÊýË¡¤ò·è¤á¤ë
+<tr class="odd"><td><a href="mpm_common.html#startservers">StartServers <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">起動時�生��れる�サー�プロセス�数</td></tr>
+<tr><td><a href="mpm_common.html#startthreads">StartThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">起動時�生��れるスレッド�数</td></tr>
+<tr class="odd"><td><a href="mod_substitute.html#substitute">Substitute <var>s/pattern/substitution/[infq]</var></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Pattern to filter the response content</td></tr>
+<tr><td><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup <em>User Group</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">CGI プログラム�ユーザパーミッション�グループパーミッション</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">設定�能��プロセス毎�スレッド数�上�を
+設定���</td></tr>
+<tr><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">�プロセス�れ�れ�生��れるスレッド数</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">クライアント�コ�クションを����スレッド�使用�る
+スタック��イト数</td></tr>
+<tr><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">�イベント�����リクエストを失敗��る���サー��
+待�時間を設定</td></tr>
+<tr class="odd"><td><a href="core.html#traceenable">TraceEnable <var>[on|off|extended]</var></a></td><td> on </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4"><code>TRACE</code> メソッド�リクエスト�対�る応答方法を決�る
 </td></tr>
-<tr><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">¥í¥°¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤ò»ØÄê</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td /></tr><tr class="odd"><td class="descr" colspan="4"><code>mime.types</code> ¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ</td></tr>
+<tr><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">ログファイル��置を指定</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4"><code>mime.types</code> ファイル��置</td></tr>
 <tr><td><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv <var>env-variable</var> [<var>env-variable</var>]
-...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">´Ä¶­¤«¤éÊÑ¿ô¤ò¼è¤ê½ü¤¯</td></tr>
-<tr class="odd"><td><a href="core.html#usecanonicalname">UseCanonicalName On|Off|Dns</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">¥µ¡¼¥Ð¤¬¼«Ê¬¼«¿È¤Î̾Á°¤È¥Ý¡¼¥È¤ò·èÄꤹ¤ëÊýË¡¤òÀßÄꤹ¤ë</td></tr>
-<tr><td><a href="core.html#usecanonicalphysicalport">UseCanonicalPhysicalPort On|Off</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">¥µ¡¼¥Ð¤Î̾Á°¤È¥Ý¡¼¥È¤Î²ò·èÊýË¡¤òÀßÄꤹ¤ë</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#user">User <var>unix-userid</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤¹¤ëºÝ¤ËÍѤ¤¤ë¥æ¡¼¥¶ ID</td></tr>
-<tr><td><a href="mod_userdir.html#userdir">UserDir <em>directory-filename</em></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">¥æ¡¼¥¶ÀìÍѥǥ£¥ì¥¯¥È¥ê¤Î°ÌÃÖ</td></tr>
+...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">環境�ら変数を�り除�</td></tr>
+<tr class="odd"><td><a href="core.html#usecanonicalname">UseCanonicalName On|Off|Dns</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">サー��自分自身�����ートを決定�る方法を設定�る</td></tr>
+<tr><td><a href="core.html#usecanonicalphysicalport">UseCanonicalPhysicalPort On|Off</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">サー������ート�解決方法を設定�る</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#user">User <var>unix-userid</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">リクエスト�応答�る際�用�るユーザ ID</td></tr>
+<tr><td><a href="mod_userdir.html#userdir">UserDir <em>directory-filename</em></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">ユーザ専用ディレクトリ��置</td></tr>
 <tr class="odd"><td><a href="mod_vhost_alias.html#virtualdocumentroot" id="V" name="V">VirtualDocumentRoot <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the document root
 for a given virtual host</td></tr>
 <tr><td><a href="mod_vhost_alias.html#virtualdocumentrootip">VirtualDocumentRootIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the document root
 for a given virtual host</td></tr>
 <tr class="odd"><td><a href="core.html#virtualhost">&lt;VirtualHost
     <var>addr</var>[:<var>port</var>] [<var>addr</var>[:<var>port</var>]]
-    ...&gt; ... &lt;/VirtualHost&gt;</a></td><td></td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">ÆÃÄê¤Î¥Û¥¹¥È̾¤ä IP ¥¢¥É¥ì¥¹¤Î¤ß¤ËŬÍѤµ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-°Ï¤à</td></tr>
+    ...&gt; ... &lt;/VirtualHost&gt;</a></td><td></td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">特定�ホスト�や IP アドレス����用�れるディレクティブを
+囲む</td></tr>
 <tr><td><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the CGI directory for
 a given virtual host</td></tr>
 <tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the cgi directory for
 a given virtual host</td></tr>
-<tr><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¤Î¼õ¤±ÉÕ¤±¤Ë accept() ¤òAcceptEx ¤ÎÂå¤ï¤ê¤Ë»È¤¦</td></tr>
-<tr class="odd"><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¼Â¹Ô¥Ó¥Ã¥È¤¬ÀßÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤Î SSI ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-²òÀϤ¹¤ë</td></tr>
+<tr><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">�ットワーク接続���付�� accept() をAcceptEx �代�り�使�</td></tr>
+<tr class="odd"><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">実行ビット�設定�れ�ファイル� SSI ディレクティブを
+解��る</td></tr>
 </table></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../de/mod/quickreference.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/quickreference.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../es/mod/quickreference.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
+<a href="../es/mod/quickreference.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/quickreference.html" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/quickreference.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/quickreference.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr
index ecc6e39b..187eeb30 100644
--- a/docs/manual/mod/quickreference.html.ko.euc-kr
+++ b/docs/manual/mod/quickreference.html.ko.euc-kr
@@ -25,8 +25,11 @@
 <a href="../es/mod/quickreference.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/quickreference.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/quickreference.html" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/quickreference.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
+            ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
 
     <p>ÀÌ ¹®¼­´Â ¾ÆÆÄÄ¡ ¼³Á¤Áö½Ã¾î °¢°¢ÀÇ ¿ëµµ, ±âº»°ª, »óÅÂ,
     »ç¿ëÀå¼Ò¸¦ º¸¿©ÁØ´Ù. À̵éÀº <a href="directive-dict.html">Áö½Ã¾î »çÀü</a>¿¡¼­ ¼³¸íÇÑ´Ù.</p>
@@ -40,21 +43,17 @@
   </div>
 <div id="directive-ref"><table id="legend">
 <tr><td class="letters"><span><a href="#A">&nbsp;A&nbsp;</a> | <a href="#B">&nbsp;B&nbsp;</a> | <a href="#C">&nbsp;C&nbsp;</a> | <a href="#D">&nbsp;D&nbsp;</a> | <a href="#E">&nbsp;E&nbsp;</a> | <a href="#F">&nbsp;F&nbsp;</a> | <a href="#G">&nbsp;G&nbsp;</a> | <a href="#H">&nbsp;H&nbsp;</a> | <a href="#I">&nbsp;I&nbsp;</a> | <a href="#K">&nbsp;K&nbsp;</a> | <a href="#L">&nbsp;L&nbsp;</a> | <a href="#M">&nbsp;M&nbsp;</a> | <a href="#N">&nbsp;N&nbsp;</a> | <a href="#O">&nbsp;O&nbsp;</a> | <a href="#P">&nbsp;P&nbsp;</a> | <a href="#R">&nbsp;R&nbsp;</a> | <a href="#S">&nbsp;S&nbsp;</a> | <a href="#T">&nbsp;T&nbsp;</a> | <a href="#U">&nbsp;U&nbsp;</a> | <a href="#V">&nbsp;V&nbsp;</a> | <a href="#W">&nbsp;W&nbsp;</a> | <a href="#X">&nbsp;X&nbsp;</a></span></td>
-<td><table>
-      
-      <tr><th>s</th><td>ÁÖ¼­¹ö¼³Á¤</td></tr>
-      <tr><th>v</th><td>°¡»óÈ£½ºÆ®</td></tr>
-      <tr><th>d</th><td>directory</td></tr>
-      <tr><th>h</th><td>.htaccess</td></tr>
-    </table></td>
-<td><table>
-      
-      <tr><th>C</th><td>Core</td></tr>
-      <tr><th>M</th><td>MPM</td></tr>
-      <tr><th>B</th><td>Base</td></tr>
-      <tr><th>E</th><td>Extension</td></tr>
-      <tr><th>X</th><td>Experimental</td></tr>
-    </table></td></tr>
+<td><table><tr><th>s</th><td>ÁÖ¼­¹ö¼³Á¤</td></tr>
+<tr><th>v</th><td>°¡»óÈ£½ºÆ®</td></tr>
+<tr><th>d</th><td>directory</td></tr>
+<tr><th>h</th><td>.htaccess</td></tr>
+</table></td>
+<td><table><tr><th>C</th><td>Core</td></tr>
+<tr><th>M</th><td>MPM</td></tr>
+<tr><th>B</th><td>Base</td></tr>
+<tr><th>E</th><td>Extension</td></tr>
+<tr><th>X</th><td>Experimental</td></tr>
+</table></td></tr>
 </table>
 <table class="qref">
 <tr><td><a href="core.html#acceptfilter" id="A" name="A">AcceptFilter <var>protocol</var> <var>accept_filter</var></a></td><td></td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures optimizations for a Protocol's Listener Sockets</td></tr>
@@ -232,10 +231,10 @@ switch before dumping core</td></tr>
 <tr class="odd"><td><a href="mod_dav_lock.html#davgenericlockdb">DavGenericLockDB <var>file-path</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the DAV lock database</td></tr>
 <tr><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">DAV Àá±Ý µ¥ÀÌÅͺ£À̽º À§Ä¡</td></tr>
 <tr class="odd"><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¼­¹ö°¡ DAV ÀÚ¿ø¿¡ ´ëÇØ À¯ÁöÇÒ Àá±ÝÀÇ Ãּҽð£</td></tr>
-<tr><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of connections</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum number of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td> 10 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td> 1 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Minimum number of connections</td></tr>
 <tr><td><a href="mod_dbd.html#dbdparams">DBDParams
 <var>param1</var>=<var>value1</var>[,<var>param2</var>=<var>value2</var>]</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Parameters for database connection</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdpersist">DBDPersist On|Off</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Whether to use persistent connections</td></tr>
@@ -377,7 +376,7 @@ subrequests</td></tr>
 from the client</td></tr>
 <tr><td><a href="core.html#limitrequestfields">LimitRequestFields <var>number</var></a></td><td> 100 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the number of HTTP request header fields that
 will be accepted from the client</td></tr>
-<tr class="odd"><td><a href="core.html#limitrequestfieldsize">LimitRequestFieldsize <var>bytes</var></a></td><td></td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the size of the HTTP request header allowed from the
+<tr class="odd"><td><a href="core.html#limitrequestfieldsize">LimitRequestFieldSize <var>bytes</var></a></td><td> 8190 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the size of the HTTP request header allowed from the
 client</td></tr>
 <tr><td><a href="core.html#limitrequestline">LimitRequestLine <var>bytes</var></a></td><td> 8190 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Limit the size of the HTTP request line that will be accepted
 from the client</td></tr>
@@ -462,239 +461,244 @@ proxied</td></tr>
 proxied resources</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards <var>number</var></a></td><td> -1 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximium number of proxies that a request can be forwarded
 through</td></tr>
-<tr><td><a href="mod_proxy.html#proxypass">ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var> <var>key=value</var> ...]] [nocanon]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Maps remote servers into the local server URL-space</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch [<var>regex</var>] !|<var>url</var> [<var>key=value</var>
-	<var>[key=value</var> ...]]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maps remote servers into the local server URL-space using regular expressions</td></tr>
-<tr><td><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse [<var>path</var>] <var>url</var></a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Adjusts the URL in HTTP response headers sent from a reverse
+<tr><td><a href="mod_proxy.html#proxypass">ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var>
+<var>key=value</var> ...]] [nocanon] [interpolate]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Maps remote servers into the local server URL-space</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv On|Off</a></td><td> Off </td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable Environment Variable interpolation in Reverse Proxy configurations</td></tr>
+<tr><td><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch [<var>regex</var>] !|<var>url</var> [<var>key=value</var>
+	<var>[key=value</var> ...]]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Maps remote servers into the local server URL-space using regular expressions</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse [<var>path</var>] <var>url</var>
+[<var>interpolate</var>]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adjusts the URL in HTTP response headers sent from a reverse
 proxied server</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain <var>internal-domain</var> <var>public-domain</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adjusts the Domain string in Set-Cookie headers from a reverse-
+<tr><td><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain <var>internal-domain</var>
+<var>public-domain</var> [<var>interpolate</var>]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Adjusts the Domain string in Set-Cookie headers from a reverse-
 proxied server</td></tr>
-<tr><td><a href="mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath <var>internal-path</var> <var>public-path</var></a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Adjusts the Path string in Set-Cookie headers from a reverse-
+<tr class="odd"><td><a href="mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath <var>internal-path</var>
+<var>public-path</var> [<var>interpolate</var>]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adjusts the Path string in Set-Cookie headers from a reverse-
 proxied server</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxypreservehost">ProxyPreserveHost On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Use incoming Host HTTP request header for proxy
+<tr><td><a href="mod_proxy.html#proxypreservehost">ProxyPreserveHost On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Use incoming Host HTTP request header for proxy
 request</td></tr>
-<tr><td><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network buffer size for proxied HTTP and FTP
+<tr class="odd"><td><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network buffer size for proxied HTTP and FTP
 connections</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyremote">ProxyRemote <var>match</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Remote proxy used to handle certain requests</td></tr>
-<tr><td><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch <var>regex</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Remote proxy used to handle requests matched by regular
+<tr><td><a href="mod_proxy.html#proxyremote">ProxyRemote <var>match</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Remote proxy used to handle certain requests</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch <var>regex</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Remote proxy used to handle requests matched by regular
 expressions</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
-<tr><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
-<tr><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
+<tr><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
+<tr><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
 header for proxied requests</td></tr>
-<tr><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ÆÄÀϸñ·Ï ¸¶Áö¸·¿¡ »ðÀÔÇÒ ÆÄÀÏÀÇ À̸§</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#receivebuffersize">ReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">TCP receive buffer size</td></tr>
-<tr><td><a href="mod_alias.html#redirect">Redirect [<var>status</var>] <var>URL-path</var>
-<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Ŭ¶óÀ̾ðÆ®°¡ ´Ù¸¥ URL¿¡ Á¢¼ÓÇϵµ·Ï ¿äûÇÏ´Â ¿ÜºÎ
+<tr class="odd"><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ÆÄÀϸñ·Ï ¸¶Áö¸·¿¡ »ðÀÔÇÒ ÆÄÀÏÀÇ À̸§</td></tr>
+<tr><td><a href="mpm_common.html#receivebuffersize">ReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">TCP receive buffer size</td></tr>
+<tr class="odd"><td><a href="mod_alias.html#redirect">Redirect [<var>status</var>] <var>URL-path</var>
+<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Ŭ¶óÀ̾ðÆ®°¡ ´Ù¸¥ URL¿¡ Á¢¼ÓÇϵµ·Ï ¿äûÇÏ´Â ¿ÜºÎ
 ¸®´ÙÀÌ·º¼ÇÀ» º¸³½´Ù</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#redirectmatch">RedirectMatch [<var>status</var>] <var>regex</var>
-<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ÇöÀç URLÀÌ Á¤±ÔÇ¥Çö½Ä¿¡ ÇØ´çÇÏ¸é ¿ÜºÎ ¸®´ÙÀÌ·º¼ÇÀ»
+<tr><td><a href="mod_alias.html#redirectmatch">RedirectMatch [<var>status</var>] <var>regex</var>
+<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ÇöÀç URLÀÌ Á¤±ÔÇ¥Çö½Ä¿¡ ÇØ´çÇÏ¸é ¿ÜºÎ ¸®´ÙÀÌ·º¼ÇÀ»
 º¸³½´Ù</td></tr>
-<tr><td><a href="mod_alias.html#redirectpermanent">RedirectPermanent <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Ŭ¶óÀ̾ðÆ®°¡ ´Ù¸¥ URL¿¡ Á¢¼ÓÇϵµ·Ï ¿äûÇÏ´Â ¿ÜºÎ
+<tr class="odd"><td><a href="mod_alias.html#redirectpermanent">RedirectPermanent <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Ŭ¶óÀ̾ðÆ®°¡ ´Ù¸¥ URL¿¡ Á¢¼ÓÇϵµ·Ï ¿äûÇÏ´Â ¿ÜºÎ
 ¿µ±¸ ¸®´ÙÀÌ·º¼ÇÀ» º¸³½´Ù</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#redirecttemp">RedirectTemp <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Ŭ¶óÀ̾ðÆ®°¡ ´Ù¸¥ URL¿¡ Á¢¼ÓÇϵµ·Ï ¿äûÇÏ´Â ¿ÜºÎ
+<tr><td><a href="mod_alias.html#redirecttemp">RedirectTemp <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Ŭ¶óÀ̾ðÆ®°¡ ´Ù¸¥ URL¿¡ Á¢¼ÓÇϵµ·Ï ¿äûÇÏ´Â ¿ÜºÎ
 Àӽà ¸®´ÙÀÌ·º¼ÇÀ» º¸³½´Ù</td></tr>
-<tr><td><a href="mod_mime.html#removecharset">RemoveCharset <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any character set associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removecharset">RemoveCharset <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any character set associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removeencoding">RemoveEncoding <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content encoding associations for a set of file
+<tr><td><a href="mod_mime.html#removeencoding">RemoveEncoding <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any content encoding associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_mime.html#removehandler">RemoveHandler <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any handler associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removehandler">RemoveHandler <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any handler associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removeinputfilter">RemoveInputFilter <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any input filter associations for a set of file
+<tr><td><a href="mod_mime.html#removeinputfilter">RemoveInputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any input filter associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_mime.html#removelanguage">RemoveLanguage <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any language associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removelanguage">RemoveLanguage <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any language associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any output filter associations for a set of file
+<tr><td><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any output filter associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any content type associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content type associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset <var>header</var>
-[<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">HTTP ¿äû Çì´õ¸¦ ±¸¼ºÇÑ´Ù</td></tr>
-<tr><td><a href="core.html#require">Require <var>entity-name</var> [<var>entity-name</var>] ...</a></td><td></td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Selects which authenticated users can access
+<tr><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset <var>header</var>
+[<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">HTTP ¿äû Çì´õ¸¦ ±¸¼ºÇÑ´Ù</td></tr>
+<tr class="odd"><td><a href="core.html#require">Require <var>entity-name</var> [<var>entity-name</var>] ...</a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Selects which authenticated users can access
 a resource</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
-<tr><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
-      <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a condition under which rewriting will take place
+<tr><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
+      <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines a condition under which rewriting will take place
 </td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewriteengine">RewriteEngine on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables or disables runtime rewriting engine</td></tr>
-<tr><td><a href="mod_rewrite.html#rewritelock">RewriteLock <em>file-path</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the name of the lock file used for <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code>
+<tr><td><a href="mod_rewrite.html#rewriteengine">RewriteEngine on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables or disables runtime rewriting engine</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewritelock">RewriteLock <em>file-path</em></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the lock file used for <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code>
 synchronization</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewritelog">RewriteLog <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the file used for logging rewrite engine
+<tr><td><a href="mod_rewrite.html#rewritelog">RewriteLog <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the name of the file used for logging rewrite engine
 processing</td></tr>
-<tr><td><a href="mod_rewrite.html#rewriteloglevel">RewriteLogLevel <em>Level</em></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the verbosity of the log file used by the rewrite
+<tr class="odd"><td><a href="mod_rewrite.html#rewriteloglevel">RewriteLogLevel <em>Level</em></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the verbosity of the log file used by the rewrite
 engine</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
-</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
-<tr><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <var>Options</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewriterule">RewriteRule
-      <em>Pattern</em> <em>Substitution</em> [<em>flags</em>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
-<tr><td><a href="core.html#rlimitcpu">RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the CPU consumption of processes launched
+<tr><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
+</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <var>Options</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
+<tr><td><a href="mod_rewrite.html#rewriterule">RewriteRule
+      <em>Pattern</em> <em>Substitution</em> [<em>flags</em>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
+<tr class="odd"><td><a href="core.html#rlimitcpu">RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the CPU consumption of processes launched
 by Apache children</td></tr>
-<tr class="odd"><td><a href="core.html#rlimitmem">RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the memory consumption of processes launched
+<tr><td><a href="core.html#rlimitmem">RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the memory consumption of processes launched
 by Apache children</td></tr>
-<tr><td><a href="core.html#rlimitnproc">RLimitNPROC <var>number</var>|max [<var>number</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the number of processes that can be launched by
+<tr class="odd"><td><a href="core.html#rlimitnproc">RLimitNPROC <var>number</var>|max [<var>number</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the number of processes that can be launched by
 processes launched by Apache children</td></tr>
-<tr class="odd"><td><a href="core.html#satisfy" id="S" name="S">Satisfy Any|All</a></td><td> All </td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Interaction between host-level access control and
+<tr><td><a href="core.html#satisfy" id="S" name="S">Satisfy Any|All</a></td><td> All </td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Interaction between host-level access control and
 user authentication</td></tr>
-<tr><td><a href="mpm_common.html#scoreboardfile">ScoreBoardFile <var>file-path</var></a></td><td> logs/apache_status </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Location of the file used to store coordination data for
+<tr class="odd"><td><a href="mpm_common.html#scoreboardfile">ScoreBoardFile <var>file-path</var></a></td><td> logs/apache_status </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the file used to store coordination data for
 the child processes</td></tr>
-<tr class="odd"><td><a href="mod_actions.html#script">Script <var>method</var> <var>cgi-script</var></a></td><td></td><td>svd</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ƯÁ¤ ¿äû¸Þ¼­µå¿¡ ´ëÇØ CGI ½ºÅ©¸³Æ®¸¦
+<tr><td><a href="mod_actions.html#script">Script <var>method</var> <var>cgi-script</var></a></td><td></td><td>svd</td><td>B</td></tr><tr><td class="descr" colspan="4">ƯÁ¤ ¿äû¸Þ¼­µå¿¡ ´ëÇØ CGI ½ºÅ©¸³Æ®¸¦
 »ç¿ëÇÑ´Ù.</td></tr>
-<tr><td><a href="mod_alias.html#scriptalias">ScriptAlias <var>URL-path</var>
-<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">URLÀ» ƯÁ¤ ÆÄÀϽýºÅÛ Àå¼Ò·Î ´ëÀÀÇÏ°í ´ë»óÀÌ CGI
+<tr class="odd"><td><a href="mod_alias.html#scriptalias">ScriptAlias <var>URL-path</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">URLÀ» ƯÁ¤ ÆÄÀϽýºÅÛ Àå¼Ò·Î ´ëÀÀÇÏ°í ´ë»óÀÌ CGI
 ½ºÅ©¸³Æ®¶ó°í ¾Ë¸°´Ù</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch <var>regex</var>
-<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Á¤±ÔÇ¥Çö½ÄÀ» »ç¿ëÇÏ¿© URLÀ» ƯÁ¤ ÆÄÀϽýºÅÛ Àå¼Ò·Î
+<tr><td><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch <var>regex</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Á¤±ÔÇ¥Çö½ÄÀ» »ç¿ëÇÏ¿© URLÀ» ƯÁ¤ ÆÄÀϽýºÅÛ Àå¼Ò·Î
 ´ëÀÀÇÏ°í ´ë»óÀÌ CGI ½ºÅ©¸³Æ®¶ó°í ¾Ë¸°´Ù</td></tr>
-<tr><td><a href="core.html#scriptinterpretersource">ScriptInterpreterSource Registry|Registry-Strict|Script</a></td><td> Script </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Technique for locating the interpreter for CGI
+<tr class="odd"><td><a href="core.html#scriptinterpretersource">ScriptInterpreterSource Registry|Registry-Strict|Script</a></td><td> Script </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Technique for locating the interpreter for CGI
 scripts</td></tr>
-<tr class="odd"><td><a href="mod_cgi.html#scriptlog">ScriptLog <var>file-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">CGI ½ºÅ©¸³Æ® ¿À·ù·Î±×ÆÄÀÏÀÇ À§Ä¡</td></tr>
-<tr><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <var>bytes</var></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">½ºÅ©¸³Æ® ·Î±×¿¡ ±â·ÏÇÒ PUT ȤÀº POST ¿äûÀÇ ÃÖ´ë·®</td></tr>
-<tr class="odd"><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">CGI ½ºÅ©¸³Æ® ·Î±×ÆÄÀÏÀÇ Å©±â Á¦ÇÑ</td></tr>
-<tr><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">cgi µ¥¸ó°ú Åë½ÅÀ» À§ÇØ »ç¿ëÇÒ ¼ÒÄÏÀÇ À̸§</td></tr>
-<tr class="odd"><td><a href="mod_nw_ssl.html#securelisten">SecureListen [<var>IP-address</var>:]<var>portnumber</var>
-<var>Certificate-Name</var> [MUTUAL]</a></td><td></td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Enables SSL encryption for the specified port</td></tr>
-<tr><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">TCP buffer size</td></tr>
-<tr class="odd"><td><a href="core.html#serveradmin">ServerAdmin <var>email-address</var>|<var>URL</var></a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Email address that the server includes in error
+<tr><td><a href="mod_cgi.html#scriptlog">ScriptLog <var>file-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">CGI ½ºÅ©¸³Æ® ¿À·ù·Î±×ÆÄÀÏÀÇ À§Ä¡</td></tr>
+<tr class="odd"><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <var>bytes</var></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">½ºÅ©¸³Æ® ·Î±×¿¡ ±â·ÏÇÒ PUT ȤÀº POST ¿äûÀÇ ÃÖ´ë·®</td></tr>
+<tr><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">CGI ½ºÅ©¸³Æ® ·Î±×ÆÄÀÏÀÇ Å©±â Á¦ÇÑ</td></tr>
+<tr class="odd"><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">cgi µ¥¸ó°ú Åë½ÅÀ» À§ÇØ »ç¿ëÇÒ ¼ÒÄÏÀÇ À̸§</td></tr>
+<tr><td><a href="mod_nw_ssl.html#securelisten">SecureListen [<var>IP-address</var>:]<var>portnumber</var>
+<var>Certificate-Name</var> [MUTUAL]</a></td><td></td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">Enables SSL encryption for the specified port</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">TCP buffer size</td></tr>
+<tr><td><a href="core.html#serveradmin">ServerAdmin <var>email-address</var>|<var>URL</var></a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Email address that the server includes in error
 messages sent to the client</td></tr>
-<tr><td><a href="core.html#serveralias">ServerAlias <var>hostname</var> [<var>hostname</var>] ...</a></td><td></td><td>v</td><td>C</td></tr><tr><td class="descr" colspan="4">Alternate names for a host used when matching requests
+<tr class="odd"><td><a href="core.html#serveralias">ServerAlias <var>hostname</var> [<var>hostname</var>] ...</a></td><td></td><td>v</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Alternate names for a host used when matching requests
 to name-virtual hosts</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#serverlimit">ServerLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Upper limit on configurable number of processes</td></tr>
-<tr><td><a href="core.html#servername">ServerName [<var>scheme</var>://]<var>fully-qualified-domain-name</var>[:<var>port</var>]</a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Hostname and port that the server uses to identify
+<tr><td><a href="mpm_common.html#serverlimit">ServerLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Upper limit on configurable number of processes</td></tr>
+<tr class="odd"><td><a href="core.html#servername">ServerName [<var>scheme</var>://]<var>fully-qualified-domain-name</var>[:<var>port</var>]</a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Hostname and port that the server uses to identify
 itself</td></tr>
-<tr class="odd"><td><a href="core.html#serverpath">ServerPath <var>URL-path</var></a></td><td></td><td>v</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Legacy URL pathname for a name-based virtual host that
+<tr><td><a href="core.html#serverpath">ServerPath <var>URL-path</var></a></td><td></td><td>v</td><td>C</td></tr><tr><td class="descr" colspan="4">Legacy URL pathname for a name-based virtual host that
 is accessed by an incompatible browser</td></tr>
-<tr><td><a href="core.html#serverroot">ServerRoot <var>directory-path</var></a></td><td> /usr/local/apache </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Base directory for the server installation</td></tr>
-<tr class="odd"><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the footer on server-generated documents</td></tr>
-<tr><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures the <code>Server</code> HTTP response
+<tr class="odd"><td><a href="core.html#serverroot">ServerRoot <var>directory-path</var></a></td><td> /usr/local/apache </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Base directory for the server installation</td></tr>
+<tr><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures the footer on server-generated documents</td></tr>
+<tr class="odd"><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the <code>Server</code> HTTP response
 header</td></tr>
-<tr class="odd"><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> <var>value</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ȯ°æº¯¼ö¸¦ ¼³Á¤ÇÑ´Ù</td></tr>
-<tr><td><a href="mod_setenvif.html#setenvif">SetEnvIf <em>attribute
+<tr><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> <var>value</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ȯ°æº¯¼ö¸¦ ¼³Á¤ÇÑ´Ù</td></tr>
+<tr class="odd"><td><a href="mod_setenvif.html#setenvif">SetEnvIf <em>attribute
     regex [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">¿äûÀÇ ¼ºÁú¿¡ µû¶ó ȯ°æº¯¼ö¸¦ ¼³Á¤ÇÑ´Ù</td></tr>
-<tr class="odd"><td><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase <em>attribute regex 
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">¿äûÀÇ ¼ºÁú¿¡ µû¶ó ȯ°æº¯¼ö¸¦ ¼³Á¤ÇÑ´Ù</td></tr>
+<tr><td><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase <em>attribute regex 
         [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">´ë¼Ò¹®ÀÚ¸¦ ±¸º°ÇÏÁö¾Ê°í ¿äûÀÇ ¼ºÁú¿¡ µû¶ó ȯ°æº¯¼ö¸¦
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">´ë¼Ò¹®ÀÚ¸¦ ±¸º°ÇÏÁö¾Ê°í ¿äûÀÇ ¼ºÁú¿¡ µû¶ó ȯ°æº¯¼ö¸¦
 ¼³Á¤ÇÑ´Ù</td></tr>
-<tr><td><a href="core.html#sethandler">SetHandler <var>handler-name</var>|None</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Forces all matching files to be processed by a
+<tr class="odd"><td><a href="core.html#sethandler">SetHandler <var>handler-name</var>|None</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Forces all matching files to be processed by a
 handler</td></tr>
-<tr class="odd"><td><a href="core.html#setinputfilter">SetInputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the filters that will process client requests and POST
+<tr><td><a href="core.html#setinputfilter">SetInputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Sets the filters that will process client requests and POST
 input</td></tr>
-<tr><td><a href="core.html#setoutputfilter">SetOutputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Sets the filters that will process responses from the
+<tr class="odd"><td><a href="core.html#setoutputfilter">SetOutputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the filters that will process responses from the
 server</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssienableaccess">SSIEnableAccess on|off</a></td><td> off </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Enable the -A flag during conditional flow control processing.</td></tr>
-<tr><td><a href="mod_include.html#ssiendtag">SSIEndTag <var>tag</var></a></td><td> "--&gt;" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that ends an include element</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssierrormsg">SSIErrorMsg <var>message</var></a></td><td> "[an error occurred +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Error message displayed when there is an SSI
+<tr><td><a href="mod_include.html#ssienableaccess">SSIEnableAccess on|off</a></td><td> off </td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">Enable the -A flag during conditional flow control processing.</td></tr>
+<tr class="odd"><td><a href="mod_include.html#ssiendtag">SSIEndTag <var>tag</var></a></td><td> "--&gt;" </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">String that ends an include element</td></tr>
+<tr><td><a href="mod_include.html#ssierrormsg">SSIErrorMsg <var>message</var></a></td><td> "[an error occurred +</td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Error message displayed when there is an SSI
 error</td></tr>
-<tr><td><a href="mod_include.html#ssistarttag">SSIStartTag <var>tag</var></a></td><td> "&lt;!--#" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that starts an include element</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <var>formatstring</var></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the format in which date strings are
+<tr class="odd"><td><a href="mod_include.html#ssistarttag">SSIStartTag <var>tag</var></a></td><td> "&lt;!--#" </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">String that starts an include element</td></tr>
+<tr><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <var>formatstring</var></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Configures the format in which date strings are
 displayed</td></tr>
-<tr><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">String displayed when an unset variable is echoed</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+<tr class="odd"><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">String displayed when an unset variable is echoed</td></tr>
+<tr><td><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
 for Client Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+<tr class="odd"><td><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
 Client Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+<tr><td><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
 for defining acceptable CA names</td></tr>
-<tr><td><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+<tr class="odd"><td><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
 defining acceptable CA names</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
+<tr><td><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
 Client Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
+<tr class="odd"><td><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
 Client Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of PEM-encoded Server CA Certificates</td></tr>
-<tr><td><a href="mod_ssl.html#sslcertificatefile">SSLCertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Server PEM-encoded X.509 Certificate file</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Server PEM-encoded Private Key file</td></tr>
-<tr><td><a href="mod_ssl.html#sslciphersuite">SSLCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
+<tr><td><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of PEM-encoded Server CA Certificates</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslcertificatefile">SSLCertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Server PEM-encoded X.509 Certificate file</td></tr>
+<tr><td><a href="mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Server PEM-encoded Private Key file</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslciphersuite">SSLCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
 handshake</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcryptodevice">SSLCryptoDevice <em>engine</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable use of a cryptographic hardware accelerator</td></tr>
-<tr><td><a href="mod_ssl.html#sslengine">SSLEngine on|off|optional</a></td><td> off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">SSL Engine Operation Switch</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslhonorcipherorder">SSLHonorCiperOrder <em>flag</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Option to prefer the server's cipher preference order</td></tr>
-<tr><td><a href="mod_ssl.html#sslmutex">SSLMutex <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Semaphore for internal mutual exclusion of 
+<tr><td><a href="mod_ssl.html#sslcryptodevice">SSLCryptoDevice <em>engine</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable use of a cryptographic hardware accelerator</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslengine">SSLEngine on|off|optional</a></td><td> off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">SSL Engine Operation Switch</td></tr>
+<tr><td><a href="mod_ssl.html#sslhonorcipherorder">SSLHonorCiperOrder <em>flag</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Option to prefer the server's cipher preference order</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslmutex">SSLMutex <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Semaphore for internal mutual exclusion of 
 operations</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#ssloptions">SSLOptions [+|-]<em>option</em> ...</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure various SSL engine run-time options</td></tr>
-<tr><td><a href="mod_ssl.html#sslpassphrasedialog">SSLPassPhraseDialog <em>type</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of pass phrase dialog for encrypted private 
+<tr><td><a href="mod_ssl.html#ssloptions">SSLOptions [+|-]<em>option</em> ...</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure various SSL engine run-time options</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslpassphrasedialog">SSLPassPhraseDialog <em>type</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of pass phrase dialog for encrypted private 
 keys</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslprotocol">SSLProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure usable SSL protocol flavors</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+<tr><td><a href="mod_ssl.html#sslprotocol">SSLProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure usable SSL protocol flavors</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
 for Remote Server Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+<tr><td><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
 Remote Server Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
+<tr class="odd"><td><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
 Remote Server Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
+<tr><td><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
 Remote Server Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
 proxy handshake</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine on|off</a></td><td> off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">SSL Proxy Engine Operation Switch</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile <em>filename</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded client certificates and keys to be used by the proxy</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath <em>directory</em></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded client certificates and keys to be used by the proxy</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure usable SSL protocol flavors for proxy usage</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxyverify">SSLProxyVerify <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of remote server Certificate verification</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxyverifydepth">SSLProxyVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum depth of CA Certificates in Remote Server
+<tr><td><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine on|off</a></td><td> off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">SSL Proxy Engine Operation Switch</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile <em>filename</em></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded client certificates and keys to be used by the proxy</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath <em>directory</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded client certificates and keys to be used by the proxy</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure usable SSL protocol flavors for proxy usage</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxyverify">SSLProxyVerify <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of remote server Certificate verification</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyverifydepth">SSLProxyVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum depth of CA Certificates in Remote Server
 Certificate verification</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslrandomseed">SSLRandomSeed <em>context</em> <em>source</em> 
-[<em>bytes</em>]</a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Pseudo Random Number Generator (PRNG) seeding 
+<tr><td><a href="mod_ssl.html#sslrandomseed">SSLRandomSeed <em>context</em> <em>source</em> 
+[<em>bytes</em>]</a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Pseudo Random Number Generator (PRNG) seeding 
 source</td></tr>
-<tr><td><a href="mod_ssl.html#sslrequire">SSLRequire <em>expression</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Allow access only when an arbitrarily complex 
+<tr class="odd"><td><a href="mod_ssl.html#sslrequire">SSLRequire <em>expression</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Allow access only when an arbitrarily complex 
 boolean expression is true</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Deny access when SSL is not used for the 
+<tr><td><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Deny access when SSL is not used for the 
 HTTP request</td></tr>
-<tr><td><a href="mod_ssl.html#sslsessioncache">SSLSessionCache <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of the global/inter-process SSL Session 
+<tr class="odd"><td><a href="mod_ssl.html#sslsessioncache">SSLSessionCache <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of the global/inter-process SSL Session 
 Cache</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout <em>seconds</em></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Number of seconds before an SSL session expires
+<tr><td><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout <em>seconds</em></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Number of seconds before an SSL session expires
 in the Session Cache</td></tr>
-<tr><td><a href="mod_ssl.html#sslusername">SSLUserName <em>varname</em></a></td><td></td><td>sdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Variable name to determine user name</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of Client Certificate verification</td></tr>
-<tr><td><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum depth of CA Certificates in Client 
+<tr class="odd"><td><a href="mod_ssl.html#sslusername">SSLUserName <em>varname</em></a></td><td></td><td>sdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Variable name to determine user name</td></tr>
+<tr><td><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of Client Certificate verification</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum depth of CA Certificates in Client 
 Certificate verification</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#startservers">StartServers <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of child server processes created at startup</td></tr>
-<tr><td><a href="mpm_common.html#startthreads">StartThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of threads created on startup</td></tr>
-<tr class="odd"><td><a href="mod_substitute.html#substitute">Substitute <var>s/pattern/substitution/[inf]</var></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Pattern to filter the response content</td></tr>
-<tr><td><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup <em>User Group</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">CGI ÇÁ·Î±×·¥ÀÌ »ç¿ëÇÒ »ç¿ëÀÚ¿Í ±×·ì ±ÇÇÑ</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the upper limit on the configurable number of threads
+<tr><td><a href="mpm_common.html#startservers">StartServers <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of child server processes created at startup</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#startthreads">StartThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of threads created on startup</td></tr>
+<tr><td><a href="mod_substitute.html#substitute">Substitute <var>s/pattern/substitution/[infq]</var></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Pattern to filter the response content</td></tr>
+<tr class="odd"><td><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup <em>User Group</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">CGI ÇÁ·Î±×·¥ÀÌ »ç¿ëÇÒ »ç¿ëÀÚ¿Í ±×·ì ±ÇÇÑ</td></tr>
+<tr><td><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Sets the upper limit on the configurable number of threads
 per child process</td></tr>
-<tr><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of threads created by each child process</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">The size in bytes of the stack used by threads handling 
+<tr class="odd"><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of threads created by each child process</td></tr>
+<tr><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">The size in bytes of the stack used by threads handling 
 client connections</td></tr>
-<tr><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Amount of time the server will wait for
+<tr class="odd"><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Amount of time the server will wait for
 certain events before failing a request</td></tr>
-<tr class="odd"><td><a href="core.html#traceenable">TraceEnable <var>[on|off|extended]</var></a></td><td> on </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Determines the behaviour on <code>TRACE</code>
+<tr><td><a href="core.html#traceenable">TraceEnable <var>[on|off|extended]</var></a></td><td> on </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Determines the behaviour on <code>TRACE</code>
 requests</td></tr>
-<tr><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">·Î±×ÆÄÀÏ À§Ä¡¸¦ ¼³Á¤ÇÑ´Ù</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">The location of the <code>mime.types</code> file</td></tr>
-<tr><td><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv <var>env-variable</var> [<var>env-variable</var>]
-...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">ȯ°æº¯¼ö¸¦ Á¦°ÅÇÑ´Ù</td></tr>
-<tr class="odd"><td><a href="core.html#usecanonicalname">UseCanonicalName On|Off|DNS</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures how the server determines its own name and
+<tr class="odd"><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">·Î±×ÆÄÀÏ À§Ä¡¸¦ ¼³Á¤ÇÑ´Ù</td></tr>
+<tr><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">The location of the <code>mime.types</code> file</td></tr>
+<tr class="odd"><td><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv <var>env-variable</var> [<var>env-variable</var>]
+...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">ȯ°æº¯¼ö¸¦ Á¦°ÅÇÑ´Ù</td></tr>
+<tr><td><a href="core.html#usecanonicalname">UseCanonicalName On|Off|DNS</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures how the server determines its own name and
 port</td></tr>
-<tr><td><a href="core.html#usecanonicalphysicalport">UseCanonicalPhysicalPort On|Off</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures how the server determines its own name and
+<tr class="odd"><td><a href="core.html#usecanonicalphysicalport">UseCanonicalPhysicalPort On|Off</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures how the server determines its own name and
 port</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#user">User <var>unix-userid</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">The userid under which the server will answer
+<tr><td><a href="mpm_common.html#user">User <var>unix-userid</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">The userid under which the server will answer
 requests</td></tr>
-<tr><td><a href="mod_userdir.html#userdir">UserDir <em>directory-filename</em></a></td><td> public_html </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">»ç¿ëÀÚº° µð·ºÅ丮 À§Ä¡</td></tr>
-<tr class="odd"><td><a href="mod_vhost_alias.html#virtualdocumentroot" id="V" name="V">VirtualDocumentRoot <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the document root
+<tr class="odd"><td><a href="mod_userdir.html#userdir">UserDir <em>directory-filename</em></a></td><td> public_html </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">»ç¿ëÀÚº° µð·ºÅ丮 À§Ä¡</td></tr>
+<tr><td><a href="mod_vhost_alias.html#virtualdocumentroot" id="V" name="V">VirtualDocumentRoot <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the document root
 for a given virtual host</td></tr>
-<tr><td><a href="mod_vhost_alias.html#virtualdocumentrootip">VirtualDocumentRootIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the document root
+<tr class="odd"><td><a href="mod_vhost_alias.html#virtualdocumentrootip">VirtualDocumentRootIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the document root
 for a given virtual host</td></tr>
-<tr class="odd"><td><a href="core.html#virtualhost">&lt;VirtualHost
+<tr><td><a href="core.html#virtualhost">&lt;VirtualHost
     <var>addr</var>[:<var>port</var>] [<var>addr</var>[:<var>port</var>]]
-    ...&gt; ... &lt;/VirtualHost&gt;</a></td><td></td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Contains directives that apply only to a specific
+    ...&gt; ... &lt;/VirtualHost&gt;</a></td><td></td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Contains directives that apply only to a specific
 hostname or IP address</td></tr>
-<tr><td><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the CGI directory for
+<tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the CGI directory for
 a given virtual host</td></tr>
-<tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the cgi directory for
+<tr><td><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the cgi directory for
 a given virtual host</td></tr>
-<tr><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Use accept() rather than AcceptEx() to accept network connections</td></tr>
-<tr class="odd"><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Parse SSI directives in files with the execute bit
+<tr class="odd"><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Use accept() rather than AcceptEx() to accept network connections</td></tr>
+<tr><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Parse SSI directives in files with the execute bit
 set</td></tr>
 </table></div>
 <div class="bottomlang">
@@ -703,8 +707,9 @@ set</td></tr>
 <a href="../es/mod/quickreference.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/quickreference.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/quickreference.html" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/quickreference.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/quickreference.html.ru.koi8-r b/docs/manual/mod/quickreference.html.ru.koi8-r
index 774bd3be..7e2b2ffd 100644
--- a/docs/manual/mod/quickreference.html.ru.koi8-r
+++ b/docs/manual/mod/quickreference.html.ru.koi8-r
@@ -25,8 +25,12 @@
 <a href="../es/mod/quickreference.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/quickreference.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/quickreference.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/quickreference.html" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/quickreference.html" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/quickreference.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
+<div class="outofdate">üÔÏÔ ÐÅÒÅ×ÏÄ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÒÅ×ÛÉÍ. óÍÏÔÒÉÔÅ
+            ÁÎÇÌÉÊÓËÕÀ ×ÅÒÓÉÀ ÄÌÑ ÏÚÎÁËÏÍÌÅÎÉÑ ÓÏ ×ÓÅÍÉ ÐÏÓÌÅÄÎÉÍÉ ÉÚÍÅÎÅÎÉÑÍÉ
+            × ÄÏËÕÍÅÎÔÅ.</div>
 
     <p>÷ ËÒÁÔËÏÍ ÓÐÒÁ×ÏÞÎÉËÅ ÐÏ ÄÉÒÅËÔÉ×ÁÍ ×Ù ÎÁÊÄ£ÔÅ ÉÎÆÏÒÍÁÃÉÀ
     Ï ÔÏÍ, ËÁË ÉÓÐÏÌØÚÏ×ÁÔØ ÔÕ ÉÌÉ ÉÎÕÀ ÄÉÒÅËÔÉ×Õ, Å£ ÚÎÁÞÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ, ÓÔÁÔÕÓ
@@ -45,21 +49,17 @@
   </div>
 <div id="directive-ref"><table id="legend">
 <tr><td class="letters"><span><a href="#A">&nbsp;A&nbsp;</a> | <a href="#B">&nbsp;B&nbsp;</a> | <a href="#C">&nbsp;C&nbsp;</a> | <a href="#D">&nbsp;D&nbsp;</a> | <a href="#E">&nbsp;E&nbsp;</a> | <a href="#F">&nbsp;F&nbsp;</a> | <a href="#G">&nbsp;G&nbsp;</a> | <a href="#H">&nbsp;H&nbsp;</a> | <a href="#I">&nbsp;I&nbsp;</a> | <a href="#K">&nbsp;K&nbsp;</a> | <a href="#L">&nbsp;L&nbsp;</a> | <a href="#M">&nbsp;M&nbsp;</a> | <a href="#N">&nbsp;N&nbsp;</a> | <a href="#O">&nbsp;O&nbsp;</a> | <a href="#P">&nbsp;P&nbsp;</a> | <a href="#R">&nbsp;R&nbsp;</a> | <a href="#S">&nbsp;S&nbsp;</a> | <a href="#T">&nbsp;T&nbsp;</a> | <a href="#U">&nbsp;U&nbsp;</a> | <a href="#V">&nbsp;V&nbsp;</a> | <a href="#W">&nbsp;W&nbsp;</a> | <a href="#X">&nbsp;X&nbsp;</a></span></td>
-<td><table>
-      
-      <tr><th>s</th><td>server&nbsp;config</td></tr>
-      <tr><th>v</th><td>virtual&nbsp;host</td></tr>
-      <tr><th>d</th><td>directory</td></tr>
-      <tr><th>h</th><td>.htaccess</td></tr>
-    </table></td>
-<td><table>
-      
-      <tr><th>C</th><td>Core</td></tr>
-      <tr><th>M</th><td>MPM</td></tr>
-      <tr><th>B</th><td>Base</td></tr>
-      <tr><th>E</th><td>Extension</td></tr>
-      <tr><th>X</th><td>Experimental</td></tr>
-    </table></td></tr>
+<td><table><tr><th>s</th><td>server config</td></tr>
+<tr><th>v</th><td>virtual host</td></tr>
+<tr><th>d</th><td>directory</td></tr>
+<tr><th>h</th><td>.htaccess</td></tr>
+</table></td>
+<td><table><tr><th>C</th><td>Core</td></tr>
+<tr><th>M</th><td>MPM</td></tr>
+<tr><th>B</th><td>Base</td></tr>
+<tr><th>E</th><td>Extension</td></tr>
+<tr><th>X</th><td>Experimental</td></tr>
+</table></td></tr>
 </table>
 <table class="qref">
 <tr><td><a href="core.html#acceptfilter" id="A" name="A">AcceptFilter <var>protocol</var> <var>accept_filter</var></a></td><td></td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures optimizations for a Protocol's Listener Sockets</td></tr>
@@ -266,10 +266,10 @@ switch before dumping core</td></tr>
 <tr class="odd"><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the DAV lock database</td></tr>
 <tr><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
 a DAV resource</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
-<tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
-<tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td> 2 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td> 10 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td> 1 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
 <tr class="odd"><td><a href="mod_dbd.html#dbdparams">DBDParams
 <var>param1</var>=<var>value1</var>[,<var>param2</var>=<var>value2</var>]</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Parameters for database connection</td></tr>
 <tr><td><a href="mod_dbd.html#dbdpersist">DBDPersist On|Off</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Whether to use persistent connections</td></tr>
@@ -347,7 +347,7 @@ MIME content-type</td></tr>
 will exit.</td></tr>
 <tr><td><a href="mpm_common.html#group">Group <var>unix-group</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Group under which the server will answer
 requests</td></tr>
-<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|add|unset|echo|edit
+<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|merge|add|unset|echo|edit
 <var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP response headers</td></tr>
 <tr><td><a href="mod_autoindex.html#headername">HeaderName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the top
 of the index listing</td></tr>
@@ -423,7 +423,7 @@ subrequests</td></tr>
 from the client</td></tr>
 <tr class="odd"><td><a href="core.html#limitrequestfields">LimitRequestFields <var>number</var></a></td><td> 100 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the number of HTTP request header fields that
 will be accepted from the client</td></tr>
-<tr><td><a href="core.html#limitrequestfieldsize">LimitRequestFieldsize <var>bytes</var></a></td><td></td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the size of the HTTP request header allowed from the
+<tr><td><a href="core.html#limitrequestfieldsize">LimitRequestFieldSize <var>bytes</var></a></td><td> 8190 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the size of the HTTP request header allowed from the
 client</td></tr>
 <tr class="odd"><td><a href="core.html#limitrequestline">LimitRequestLine <var>bytes</var></a></td><td> 8190 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limit the size of the HTTP request line that will be accepted
 from the client</td></tr>
@@ -501,7 +501,7 @@ evaluated.</td></tr>
 ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Passes environment variables from the shell</td></tr>
 <tr><td><a href="mpm_common.html#pidfile">PidFile <var>filename</var></a></td><td> logs/httpd.pid </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">File where the server records the process ID
 of the daemon</td></tr>
-<tr class="odd"><td><a href="mod_echo.html#protocolecho">ProtocolEcho On|Off</a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Turn the echo server on or off</td></tr>
+<tr class="odd"><td><a href="mod_echo.html#protocolecho">ProtocolEcho On|Off</a></td><td> Off </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Turn the echo server on or off</td></tr>
 <tr><td><a href="mod_proxy.html#proxy">&lt;Proxy <var>wildcard-url</var>&gt; ...&lt;/Proxy&gt;</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Container for directives applied to proxied resources</td></tr>
 <tr class="odd"><td><a href="mod_proxy.html#proxybadheader">ProxyBadHeader IsError|Ignore|StartBody</a></td><td> IsError </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Determines how to handle bad header lines in a
 response</td></tr>
@@ -516,246 +516,252 @@ proxied</td></tr>
 proxied resources</td></tr>
 <tr><td><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards <var>number</var></a></td><td> -1 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximium number of proxies that a request can be forwarded
 through</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxypass">ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var> <var>key=value</var> ...]] [nocanon]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maps remote servers into the local server URL-space</td></tr>
-<tr><td><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch [<var>regex</var>] !|<var>url</var> [<var>key=value</var>
-	<var>[key=value</var> ...]]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Maps remote servers into the local server URL-space using regular expressions</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse [<var>path</var>] <var>url</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adjusts the URL in HTTP response headers sent from a reverse
+<tr class="odd"><td><a href="mod_proxy.html#proxypass">ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var>
+<var>key=value</var> ...]] [nocanon] [interpolate]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maps remote servers into the local server URL-space</td></tr>
+<tr><td><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv On|Off</a></td><td> Off </td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable Environment Variable interpolation in Reverse Proxy configurations</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch [<var>regex</var>] !|<var>url</var> [<var>key=value</var>
+	<var>[key=value</var> ...]]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maps remote servers into the local server URL-space using regular expressions</td></tr>
+<tr><td><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse [<var>path</var>] <var>url</var>
+[<var>interpolate</var>]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Adjusts the URL in HTTP response headers sent from a reverse
 proxied server</td></tr>
-<tr><td><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain <var>internal-domain</var> <var>public-domain</var></a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Adjusts the Domain string in Set-Cookie headers from a reverse-
+<tr class="odd"><td><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain <var>internal-domain</var>
+<var>public-domain</var> [<var>interpolate</var>]</a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adjusts the Domain string in Set-Cookie headers from a reverse-
 proxied server</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath <var>internal-path</var> <var>public-path</var></a></td><td></td><td>svd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adjusts the Path string in Set-Cookie headers from a reverse-
+<tr><td><a href="mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath <var>internal-path</var>
+<var>public-path</var> [<var>interpolate</var>]</a></td><td></td><td>svd</td><td>E</td></tr><tr><td class="descr" colspan="4">Adjusts the Path string in Set-Cookie headers from a reverse-
 proxied server</td></tr>
-<tr><td><a href="mod_proxy.html#proxypreservehost">ProxyPreserveHost On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Use incoming Host HTTP request header for proxy
+<tr class="odd"><td><a href="mod_proxy.html#proxypreservehost">ProxyPreserveHost On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Use incoming Host HTTP request header for proxy
 request</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network buffer size for proxied HTTP and FTP
+<tr><td><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network buffer size for proxied HTTP and FTP
 connections</td></tr>
-<tr><td><a href="mod_proxy.html#proxyremote">ProxyRemote <var>match</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Remote proxy used to handle certain requests</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch <var>regex</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Remote proxy used to handle requests matched by regular
+<tr class="odd"><td><a href="mod_proxy.html#proxyremote">ProxyRemote <var>match</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Remote proxy used to handle certain requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch <var>regex</var> <var>remote-server</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Remote proxy used to handle requests matched by regular
 expressions</td></tr>
-<tr><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
-<tr><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
-<tr class="odd"><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
-<tr><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
+<tr class="odd"><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
+<tr><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
 header for proxied requests</td></tr>
-<tr class="odd"><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Name of the file that will be inserted at the end
+<tr><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the end
 of the index listing</td></tr>
-<tr><td><a href="mpm_common.html#receivebuffersize">ReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">TCP receive buffer size</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#redirect">Redirect [<var>status</var>] <var>URL-path</var>
-<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external redirect asking the client to fetch
+<tr class="odd"><td><a href="mpm_common.html#receivebuffersize">ReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">TCP receive buffer size</td></tr>
+<tr><td><a href="mod_alias.html#redirect">Redirect [<var>status</var>] <var>URL-path</var>
+<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external redirect asking the client to fetch
 a different URL</td></tr>
-<tr><td><a href="mod_alias.html#redirectmatch">RedirectMatch [<var>status</var>] <var>regex</var>
-<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external redirect based on a regular expression match 
+<tr class="odd"><td><a href="mod_alias.html#redirectmatch">RedirectMatch [<var>status</var>] <var>regex</var>
+<var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external redirect based on a regular expression match 
 of the current URL</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#redirectpermanent">RedirectPermanent <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external permanent redirect asking the client to fetch
+<tr><td><a href="mod_alias.html#redirectpermanent">RedirectPermanent <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external permanent redirect asking the client to fetch
 a different URL</td></tr>
-<tr><td><a href="mod_alias.html#redirecttemp">RedirectTemp <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sends an external temporary redirect asking the client to fetch
+<tr class="odd"><td><a href="mod_alias.html#redirecttemp">RedirectTemp <var>URL-path</var> <var>URL</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external temporary redirect asking the client to fetch
 a different URL</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removecharset">RemoveCharset <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any character set associations for a set of file
+<tr><td><a href="mod_mime.html#removecharset">RemoveCharset <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any character set associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_mime.html#removeencoding">RemoveEncoding <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any content encoding associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removeencoding">RemoveEncoding <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content encoding associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removehandler">RemoveHandler <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any handler associations for a set of file
+<tr><td><a href="mod_mime.html#removehandler">RemoveHandler <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any handler associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_mime.html#removeinputfilter">RemoveInputFilter <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any input filter associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removeinputfilter">RemoveInputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any input filter associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removelanguage">RemoveLanguage <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any language associations for a set of file
+<tr><td><a href="mod_mime.html#removelanguage">RemoveLanguage <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any language associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any output filter associations for a set of file
+<tr class="odd"><td><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any output filter associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
-...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content type associations for a set of file
+<tr><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any content type associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset|edit <var>header</var>
-[<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
-<tr class="odd"><td><a href="core.html#require">Require <var>entity-name</var> [<var>entity-name</var>] ...</a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Selects which authenticated users can access
+<tr class="odd"><td><a href="mod_headers.html#requestheader">RequestHeader set|append|merge|add|unset|edit <var>header</var>
+[<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
+<tr><td><a href="core.html#require">Require <var>entity-name</var> [<var>entity-name</var>] ...</a></td><td></td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Selects which authenticated users can access
 a resource</td></tr>
-<tr><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
-      <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines a condition under which rewriting will take place
+<tr class="odd"><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
+<tr><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
+      <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a condition under which rewriting will take place
 </td></tr>
-<tr><td><a href="mod_rewrite.html#rewriteengine">RewriteEngine on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables or disables runtime rewriting engine</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewritelock">RewriteLock <em>file-path</em></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the lock file used for <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code>
+<tr class="odd"><td><a href="mod_rewrite.html#rewriteengine">RewriteEngine on|off</a></td><td> off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables or disables runtime rewriting engine</td></tr>
+<tr><td><a href="mod_rewrite.html#rewritelock">RewriteLock <em>file-path</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the name of the lock file used for <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code>
 synchronization</td></tr>
-<tr><td><a href="mod_rewrite.html#rewritelog">RewriteLog <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the name of the file used for logging rewrite engine
+<tr class="odd"><td><a href="mod_rewrite.html#rewritelog">RewriteLog <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the file used for logging rewrite engine
 processing</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewriteloglevel">RewriteLogLevel <em>Level</em></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the verbosity of the log file used by the rewrite
+<tr><td><a href="mod_rewrite.html#rewriteloglevel">RewriteLogLevel <em>Level</em></a></td><td> 0 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the verbosity of the log file used by the rewrite
 engine</td></tr>
-<tr><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
-</a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
-<tr class="odd"><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <var>Options</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
-<tr><td><a href="mod_rewrite.html#rewriterule">RewriteRule
-      <em>Pattern</em> <em>Substitution</em> [<em>flags</em>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
-<tr class="odd"><td><a href="core.html#rlimitcpu">RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the CPU consumption of processes launched
+<tr class="odd"><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
+</a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
+<tr><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <var>Options</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewriterule">RewriteRule
+      <em>Pattern</em> <em>Substitution</em> [<em>flags</em>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
+<tr><td><a href="core.html#rlimitcpu">RLimitCPU <var>seconds</var>|max [<var>seconds</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the CPU consumption of processes launched
 by Apache children</td></tr>
-<tr><td><a href="core.html#rlimitmem">RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the memory consumption of processes launched
+<tr class="odd"><td><a href="core.html#rlimitmem">RLimitMEM <var>bytes</var>|max [<var>bytes</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the memory consumption of processes launched
 by Apache children</td></tr>
-<tr class="odd"><td><a href="core.html#rlimitnproc">RLimitNPROC <var>number</var>|max [<var>number</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the number of processes that can be launched by
+<tr><td><a href="core.html#rlimitnproc">RLimitNPROC <var>number</var>|max [<var>number</var>|max]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the number of processes that can be launched by
 processes launched by Apache children</td></tr>
-<tr><td><a href="core.html#satisfy" id="S" name="S">Satisfy Any|All</a></td><td> All </td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Interaction between host-level access control and
+<tr class="odd"><td><a href="core.html#satisfy" id="S" name="S">Satisfy Any|All</a></td><td> All </td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Interaction between host-level access control and
 user authentication</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#scoreboardfile">ScoreBoardFile <var>file-path</var></a></td><td> logs/apache_status </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the file used to store coordination data for
+<tr><td><a href="mpm_common.html#scoreboardfile">ScoreBoardFile <var>file-path</var></a></td><td> logs/apache_status </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Location of the file used to store coordination data for
 the child processes</td></tr>
-<tr><td><a href="mod_actions.html#script">Script <var>method</var> <var>cgi-script</var></a></td><td></td><td>svd</td><td>B</td></tr><tr><td class="descr" colspan="4">Activates a CGI script for a particular request
+<tr class="odd"><td><a href="mod_actions.html#script">Script <var>method</var> <var>cgi-script</var></a></td><td></td><td>svd</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Activates a CGI script for a particular request
 method.</td></tr>
-<tr class="odd"><td><a href="mod_alias.html#scriptalias">ScriptAlias <var>URL-path</var>
-<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps a URL to a filesystem location and designates the
+<tr><td><a href="mod_alias.html#scriptalias">ScriptAlias <var>URL-path</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps a URL to a filesystem location and designates the
 target as a CGI script</td></tr>
-<tr><td><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch <var>regex</var>
-<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maps a URL to a filesystem location using a regular expression
+<tr class="odd"><td><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch <var>regex</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maps a URL to a filesystem location using a regular expression
 and designates the target as a CGI script</td></tr>
-<tr class="odd"><td><a href="core.html#scriptinterpretersource">ScriptInterpreterSource Registry|Registry-Strict|Script</a></td><td> Script </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Technique for locating the interpreter for CGI
+<tr><td><a href="core.html#scriptinterpretersource">ScriptInterpreterSource Registry|Registry-Strict|Script</a></td><td> Script </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Technique for locating the interpreter for CGI
 scripts</td></tr>
-<tr><td><a href="mod_cgi.html#scriptlog">ScriptLog <var>file-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Location of the CGI script error logfile</td></tr>
-<tr class="odd"><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <var>bytes</var></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum amount of PUT or POST requests that will be recorded
+<tr class="odd"><td><a href="mod_cgi.html#scriptlog">ScriptLog <var>file-path</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the CGI script error logfile</td></tr>
+<tr><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <var>bytes</var></a></td><td> 1024 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Maximum amount of PUT or POST requests that will be recorded
 in the scriptlog</td></tr>
-<tr><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Size limit of the CGI script logfile</td></tr>
-<tr class="odd"><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">The filename prefix of the socket to use for communication with
+<tr class="odd"><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Size limit of the CGI script logfile</td></tr>
+<tr><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">The filename prefix of the socket to use for communication with
 the cgi daemon</td></tr>
-<tr><td><a href="mod_nw_ssl.html#securelisten">SecureListen [<var>IP-address</var>:]<var>portnumber</var>
-<var>Certificate-Name</var> [MUTUAL]</a></td><td></td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">Enables SSL encryption for the specified port</td></tr>
-<tr class="odd"><td><a href="mod_status.html#seerequesttail">SeeRequestTail On|Off</a></td><td> Off </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Determine if mod_status displays the first 63 characters
+<tr class="odd"><td><a href="mod_nw_ssl.html#securelisten">SecureListen [<var>IP-address</var>:]<var>portnumber</var>
+<var>Certificate-Name</var> [MUTUAL]</a></td><td></td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Enables SSL encryption for the specified port</td></tr>
+<tr><td><a href="mod_status.html#seerequesttail">SeeRequestTail On|Off</a></td><td> Off </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">Determine if mod_status displays the first 63 characters
 of a request or the last 63, assuming the request itself is greater than
 63 chars.</td></tr>
-<tr><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">TCP buffer size</td></tr>
-<tr class="odd"><td><a href="core.html#serveradmin">ServerAdmin <var>email-address</var>|<var>URL</var></a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Email address that the server includes in error
+<tr class="odd"><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>bytes</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">TCP buffer size</td></tr>
+<tr><td><a href="core.html#serveradmin">ServerAdmin <var>email-address</var>|<var>URL</var></a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Email address that the server includes in error
 messages sent to the client</td></tr>
-<tr><td><a href="core.html#serveralias">ServerAlias <var>hostname</var> [<var>hostname</var>] ...</a></td><td></td><td>v</td><td>C</td></tr><tr><td class="descr" colspan="4">Alternate names for a host used when matching requests
+<tr class="odd"><td><a href="core.html#serveralias">ServerAlias <var>hostname</var> [<var>hostname</var>] ...</a></td><td></td><td>v</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Alternate names for a host used when matching requests
 to name-virtual hosts</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#serverlimit">ServerLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Upper limit on configurable number of processes</td></tr>
-<tr><td><a href="core.html#servername">ServerName [<var>scheme</var>://]<var>fully-qualified-domain-name</var>[:<var>port</var>]</a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Hostname and port that the server uses to identify
+<tr><td><a href="mpm_common.html#serverlimit">ServerLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Upper limit on configurable number of processes</td></tr>
+<tr class="odd"><td><a href="core.html#servername">ServerName [<var>scheme</var>://]<var>fully-qualified-domain-name</var>[:<var>port</var>]</a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Hostname and port that the server uses to identify
 itself</td></tr>
-<tr class="odd"><td><a href="core.html#serverpath">ServerPath <var>URL-path</var></a></td><td></td><td>v</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Legacy URL pathname for a name-based virtual host that
+<tr><td><a href="core.html#serverpath">ServerPath <var>URL-path</var></a></td><td></td><td>v</td><td>C</td></tr><tr><td class="descr" colspan="4">Legacy URL pathname for a name-based virtual host that
 is accessed by an incompatible browser</td></tr>
-<tr><td><a href="core.html#serverroot">ServerRoot <var>directory-path</var></a></td><td> /usr/local/apache </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Base directory for the server installation</td></tr>
-<tr class="odd"><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the footer on server-generated documents</td></tr>
-<tr><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures the <code>Server</code> HTTP response
+<tr class="odd"><td><a href="core.html#serverroot">ServerRoot <var>directory-path</var></a></td><td> /usr/local/apache </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Base directory for the server installation</td></tr>
+<tr><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures the footer on server-generated documents</td></tr>
+<tr class="odd"><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the <code>Server</code> HTTP response
 header</td></tr>
-<tr class="odd"><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> <var>value</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables</td></tr>
-<tr><td><a href="mod_setenvif.html#setenvif">SetEnvIf <em>attribute
+<tr><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> <var>value</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables</td></tr>
+<tr class="odd"><td><a href="mod_setenvif.html#setenvif">SetEnvIf <em>attribute
     regex [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables based on attributes of the request
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables based on attributes of the request
 </td></tr>
-<tr class="odd"><td><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase <em>attribute regex 
+<tr><td><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase <em>attribute regex 
         [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables based on attributes of the request
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables based on attributes of the request
 without respect to case</td></tr>
-<tr><td><a href="core.html#sethandler">SetHandler <var>handler-name</var>|None</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Forces all matching files to be processed by a
+<tr class="odd"><td><a href="core.html#sethandler">SetHandler <var>handler-name</var>|None</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Forces all matching files to be processed by a
 handler</td></tr>
-<tr class="odd"><td><a href="core.html#setinputfilter">SetInputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the filters that will process client requests and POST
+<tr><td><a href="core.html#setinputfilter">SetInputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Sets the filters that will process client requests and POST
 input</td></tr>
-<tr><td><a href="core.html#setoutputfilter">SetOutputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Sets the filters that will process responses from the
+<tr class="odd"><td><a href="core.html#setoutputfilter">SetOutputFilter <var>filter</var>[;<var>filter</var>...]</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the filters that will process responses from the
 server</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssienableaccess">SSIEnableAccess on|off</a></td><td> off </td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Enable the -A flag during conditional flow control processing.</td></tr>
-<tr><td><a href="mod_include.html#ssiendtag">SSIEndTag <var>tag</var></a></td><td> "--&gt;" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that ends an include element</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssierrormsg">SSIErrorMsg <var>message</var></a></td><td> "[an error occurred +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Error message displayed when there is an SSI
+<tr><td><a href="mod_include.html#ssienableaccess">SSIEnableAccess on|off</a></td><td> off </td><td>dh</td><td>B</td></tr><tr><td class="descr" colspan="4">Enable the -A flag during conditional flow control processing.</td></tr>
+<tr class="odd"><td><a href="mod_include.html#ssiendtag">SSIEndTag <var>tag</var></a></td><td> "--&gt;" </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">String that ends an include element</td></tr>
+<tr><td><a href="mod_include.html#ssierrormsg">SSIErrorMsg <var>message</var></a></td><td> "[an error occurred +</td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Error message displayed when there is an SSI
 error</td></tr>
-<tr><td><a href="mod_include.html#ssistarttag">SSIStartTag <var>tag</var></a></td><td> "&lt;!--#" </td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">String that starts an include element</td></tr>
-<tr class="odd"><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <var>formatstring</var></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Configures the format in which date strings are
+<tr class="odd"><td><a href="mod_include.html#ssistarttag">SSIStartTag <var>tag</var></a></td><td> "&lt;!--#" </td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">String that starts an include element</td></tr>
+<tr><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <var>formatstring</var></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Configures the format in which date strings are
 displayed</td></tr>
-<tr><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">String displayed when an unset variable is echoed</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+<tr class="odd"><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">String displayed when an unset variable is echoed</td></tr>
+<tr><td><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
 for Client Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+<tr class="odd"><td><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
 Client Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+<tr><td><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
 for defining acceptable CA names</td></tr>
-<tr><td><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+<tr class="odd"><td><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
 defining acceptable CA names</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
+<tr><td><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
 Client Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
+<tr class="odd"><td><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
 Client Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of PEM-encoded Server CA Certificates</td></tr>
-<tr><td><a href="mod_ssl.html#sslcertificatefile">SSLCertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Server PEM-encoded X.509 Certificate file</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Server PEM-encoded Private Key file</td></tr>
-<tr><td><a href="mod_ssl.html#sslciphersuite">SSLCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
+<tr><td><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of PEM-encoded Server CA Certificates</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslcertificatefile">SSLCertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Server PEM-encoded X.509 Certificate file</td></tr>
+<tr><td><a href="mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Server PEM-encoded Private Key file</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslciphersuite">SSLCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
 handshake</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslcryptodevice">SSLCryptoDevice <em>engine</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable use of a cryptographic hardware accelerator</td></tr>
-<tr><td><a href="mod_ssl.html#sslengine">SSLEngine on|off|optional</a></td><td> off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">SSL Engine Operation Switch</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslhonorcipherorder">SSLHonorCiperOrder <em>flag</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Option to prefer the server's cipher preference order</td></tr>
-<tr><td><a href="mod_ssl.html#sslmutex">SSLMutex <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Semaphore for internal mutual exclusion of 
+<tr><td><a href="mod_ssl.html#sslcryptodevice">SSLCryptoDevice <em>engine</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable use of a cryptographic hardware accelerator</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslengine">SSLEngine on|off|optional</a></td><td> off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">SSL Engine Operation Switch</td></tr>
+<tr><td><a href="mod_ssl.html#sslhonorcipherorder">SSLHonorCiperOrder <em>flag</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Option to prefer the server's cipher preference order</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslmutex">SSLMutex <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Semaphore for internal mutual exclusion of 
 operations</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#ssloptions">SSLOptions [+|-]<em>option</em> ...</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure various SSL engine run-time options</td></tr>
-<tr><td><a href="mod_ssl.html#sslpassphrasedialog">SSLPassPhraseDialog <em>type</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of pass phrase dialog for encrypted private 
+<tr><td><a href="mod_ssl.html#ssloptions">SSLOptions [+|-]<em>option</em> ...</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure various SSL engine run-time options</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslpassphrasedialog">SSLPassPhraseDialog <em>type</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of pass phrase dialog for encrypted private 
 keys</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslprotocol">SSLProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure usable SSL protocol flavors</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+<tr><td><a href="mod_ssl.html#sslprotocol">SSLProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure usable SSL protocol flavors</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
 for Remote Server Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+<tr><td><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
 Remote Server Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
+<tr class="odd"><td><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile <em>file-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
 Remote Server Auth</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
+<tr><td><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath <em>directory-path</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
 Remote Server Auth</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
 proxy handshake</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine on|off</a></td><td> off </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">SSL Proxy Engine Operation Switch</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile <em>filename</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded client certificates and keys to be used by the proxy</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath <em>directory</em></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded client certificates and keys to be used by the proxy</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure usable SSL protocol flavors for proxy usage</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslproxyverify">SSLProxyVerify <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of remote server Certificate verification</td></tr>
-<tr><td><a href="mod_ssl.html#sslproxyverifydepth">SSLProxyVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum depth of CA Certificates in Remote Server
+<tr><td><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine on|off</a></td><td> off </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">SSL Proxy Engine Operation Switch</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile <em>filename</em></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded client certificates and keys to be used by the proxy</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath <em>directory</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded client certificates and keys to be used by the proxy</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure usable SSL protocol flavors for proxy usage</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxyverify">SSLProxyVerify <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of remote server Certificate verification</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyverifydepth">SSLProxyVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum depth of CA Certificates in Remote Server
 Certificate verification</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslrandomseed">SSLRandomSeed <em>context</em> <em>source</em> 
-[<em>bytes</em>]</a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Pseudo Random Number Generator (PRNG) seeding 
+<tr><td><a href="mod_ssl.html#sslrandomseed">SSLRandomSeed <em>context</em> <em>source</em> 
+[<em>bytes</em>]</a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Pseudo Random Number Generator (PRNG) seeding 
 source</td></tr>
-<tr><td><a href="mod_ssl.html#sslrequire">SSLRequire <em>expression</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Allow access only when an arbitrarily complex 
+<tr class="odd"><td><a href="mod_ssl.html#sslrequire">SSLRequire <em>expression</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Allow access only when an arbitrarily complex 
 boolean expression is true</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Deny access when SSL is not used for the 
+<tr><td><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Deny access when SSL is not used for the 
 HTTP request</td></tr>
-<tr><td><a href="mod_ssl.html#sslsessioncache">SSLSessionCache <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of the global/inter-process SSL Session 
+<tr class="odd"><td><a href="mod_ssl.html#sslsessioncache">SSLSessionCache <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of the global/inter-process SSL Session 
 Cache</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout <em>seconds</em></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Number of seconds before an SSL session expires
+<tr><td><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout <em>seconds</em></a></td><td> 300 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Number of seconds before an SSL session expires
 in the Session Cache</td></tr>
-<tr><td><a href="mod_ssl.html#sslusername">SSLUserName <em>varname</em></a></td><td></td><td>sdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Variable name to determine user name</td></tr>
-<tr class="odd"><td><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of Client Certificate verification</td></tr>
-<tr><td><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum depth of CA Certificates in Client 
+<tr class="odd"><td><a href="mod_ssl.html#sslusername">SSLUserName <em>varname</em></a></td><td></td><td>sdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Variable name to determine user name</td></tr>
+<tr><td><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient <em>level</em></a></td><td> none </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of Client Certificate verification</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth <em>number</em></a></td><td> 1 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum depth of CA Certificates in Client 
 Certificate verification</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#startservers">StartServers <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of child server processes created at startup</td></tr>
-<tr><td><a href="mpm_common.html#startthreads">StartThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of threads created on startup</td></tr>
-<tr class="odd"><td><a href="mod_substitute.html#substitute">Substitute <var>s/pattern/substitution/[inf]</var></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Pattern to filter the response content</td></tr>
-<tr><td><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup <em>User Group</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">User and group permissions for CGI programs</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the upper limit on the configurable number of threads
+<tr><td><a href="mpm_common.html#startservers">StartServers <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of child server processes created at startup</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#startthreads">StartThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of threads created on startup</td></tr>
+<tr><td><a href="mod_substitute.html#substitute">Substitute <var>s/pattern/substitution/[infq]</var></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Pattern to filter the response content</td></tr>
+<tr class="odd"><td><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup <em>User Group</em></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">User and group permissions for CGI programs</td></tr>
+<tr><td><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Sets the upper limit on the configurable number of threads
 per child process</td></tr>
-<tr><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of threads created by each child process</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">The size in bytes of the stack used by threads handling 
+<tr class="odd"><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of threads created by each child process</td></tr>
+<tr><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>size</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">The size in bytes of the stack used by threads handling 
 client connections</td></tr>
-<tr><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Amount of time the server will wait for
+<tr class="odd"><td><a href="core.html#timeout">TimeOut <var>seconds</var></a></td><td> 300 </td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Amount of time the server will wait for
 certain events before failing a request</td></tr>
-<tr class="odd"><td><a href="core.html#traceenable">TraceEnable <var>[on|off|extended]</var></a></td><td> on </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Determines the behaviour on <code>TRACE</code>
+<tr><td><a href="core.html#traceenable">TraceEnable <var>[on|off|extended]</var></a></td><td> on </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Determines the behaviour on <code>TRACE</code>
 requests</td></tr>
-<tr><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Specify location of a log file</td></tr>
-<tr class="odd"><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">The location of the <code>mime.types</code> file</td></tr>
-<tr><td><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv <var>env-variable</var> [<var>env-variable</var>]
-...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes variables from the environment</td></tr>
-<tr class="odd"><td><a href="core.html#usecanonicalname">UseCanonicalName On|Off|DNS</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures how the server determines its own name and
+<tr class="odd"><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Specify location of a log file</td></tr>
+<tr><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">The location of the <code>mime.types</code> file</td></tr>
+<tr class="odd"><td><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv <var>env-variable</var> [<var>env-variable</var>]
+...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes variables from the environment</td></tr>
+<tr><td><a href="core.html#usecanonicalname">UseCanonicalName On|Off|DNS</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures how the server determines its own name and
 port</td></tr>
-<tr><td><a href="core.html#usecanonicalphysicalport">UseCanonicalPhysicalPort On|Off</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr><td class="descr" colspan="4">Configures how the server determines its own name and
+<tr class="odd"><td><a href="core.html#usecanonicalphysicalport">UseCanonicalPhysicalPort On|Off</a></td><td> Off </td><td>svd</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Configures how the server determines its own name and
 port</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#user">User <var>unix-userid</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">The userid under which the server will answer
+<tr><td><a href="mpm_common.html#user">User <var>unix-userid</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">The userid under which the server will answer
 requests</td></tr>
-<tr><td><a href="mod_userdir.html#userdir">UserDir <em>directory-filename</em></a></td><td></td><td>sv</td><td>B</td></tr><tr><td class="descr" colspan="4">Location of the user-specific directories</td></tr>
-<tr class="odd"><td><a href="mod_vhost_alias.html#virtualdocumentroot" id="V" name="V">VirtualDocumentRoot <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the document root
+<tr class="odd"><td><a href="mod_userdir.html#userdir">UserDir <em>directory-filename</em> [<em>directory-filename</em>] ...
+</a></td><td></td><td>sv</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the user-specific directories</td></tr>
+<tr><td><a href="mod_vhost_alias.html#virtualdocumentroot" id="V" name="V">VirtualDocumentRoot <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the document root
 for a given virtual host</td></tr>
-<tr><td><a href="mod_vhost_alias.html#virtualdocumentrootip">VirtualDocumentRootIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the document root
+<tr class="odd"><td><a href="mod_vhost_alias.html#virtualdocumentrootip">VirtualDocumentRootIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the document root
 for a given virtual host</td></tr>
-<tr class="odd"><td><a href="core.html#virtualhost">&lt;VirtualHost
+<tr><td><a href="core.html#virtualhost">&lt;VirtualHost
     <var>addr</var>[:<var>port</var>] [<var>addr</var>[:<var>port</var>]]
-    ...&gt; ... &lt;/VirtualHost&gt;</a></td><td></td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Contains directives that apply only to a specific
+    ...&gt; ... &lt;/VirtualHost&gt;</a></td><td></td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Contains directives that apply only to a specific
 hostname or IP address</td></tr>
-<tr><td><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the CGI directory for
+<tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the CGI directory for
 a given virtual host</td></tr>
-<tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the cgi directory for
+<tr><td><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the cgi directory for
 a given virtual host</td></tr>
-<tr><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Use accept() rather than AcceptEx() to accept network connections</td></tr>
-<tr class="odd"><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Parse SSI directives in files with the execute bit
+<tr class="odd"><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Use accept() rather than AcceptEx() to accept network connections</td></tr>
+<tr><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Parse SSI directives in files with the execute bit
 set</td></tr>
 </table></div>
 <div class="bottomlang">
@@ -764,8 +770,9 @@ set</td></tr>
 <a href="../es/mod/quickreference.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/quickreference.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/quickreference.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/mod/quickreference.html" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/mod/quickreference.html" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/quickreference.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">íÏÄÕÌÉ</a> | <a href="../mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="../sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8
new file mode 100644
index 00000000..5145e7ab
--- /dev/null
+++ b/docs/manual/mod/quickreference.html.tr.utf8
@@ -0,0 +1,769 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Hızlı Yönerge Kılavuzu - Apache HTTP Sunucusu</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="directive-index">
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="../">Sürüm 2.2</a> &gt; <a href="./">Modüller</a></div>
+<div id="preamble"><h1>Hızlı Yönerge Kılavuzu</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="../de/mod/quickreference.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/quickreference.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/mod/quickreference.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="../ja/mod/quickreference.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/quickreference.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/quickreference.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+    <p>Bu hızlı yönerge kılavuzunda Apache yapılandırma yönergelerinin kullanımı, öntanımlı değerleri, durumu ve bağlamı gösterilmiştir. Bunların her biri hakkında ayrıntılı bilgi almak için <a href="directive-dict.html">Yönerge Sözlüğü</a>ne bakınız.</p>
+
+    <p>İlk sütunda yönergenin ismi ve kullanımı belirtilmiştir. İkinci sütunda yönergenin varsa öntanımlı değeri gösterilmiştir. Eğer öntanımlı değer sütuna sığmayacak kadar uzunsa sığmayan kısmın yerine “+� imi konmuştur.</p>
+
+    <p>Aşağıda sağdaki gösterge tablolarına uygun olarak, üçüncü sütunda yönergenin kullanımına izin verilen bağlamlar, dördüncü sütunda ise  yönergenin durumu gösterilmiştir.</p>
+  </div>
+<div id="directive-ref"><table id="legend">
+<tr><td class="letters"><span><a href="#A">&nbsp;A&nbsp;</a> | <a href="#B">&nbsp;B&nbsp;</a> | <a href="#C">&nbsp;C&nbsp;</a> | <a href="#D">&nbsp;D&nbsp;</a> | <a href="#E">&nbsp;E&nbsp;</a> | <a href="#F">&nbsp;F&nbsp;</a> | <a href="#G">&nbsp;G&nbsp;</a> | <a href="#H">&nbsp;H&nbsp;</a> | <a href="#I">&nbsp;I&nbsp;</a> | <a href="#K">&nbsp;K&nbsp;</a> | <a href="#L">&nbsp;L&nbsp;</a> | <a href="#M">&nbsp;M&nbsp;</a> | <a href="#N">&nbsp;N&nbsp;</a> | <a href="#O">&nbsp;O&nbsp;</a> | <a href="#P">&nbsp;P&nbsp;</a> | <a href="#R">&nbsp;R&nbsp;</a> | <a href="#S">&nbsp;S&nbsp;</a> | <a href="#T">&nbsp;T&nbsp;</a> | <a href="#U">&nbsp;U&nbsp;</a> | <a href="#V">&nbsp;V&nbsp;</a> | <a href="#W">&nbsp;W&nbsp;</a> | <a href="#X">&nbsp;X&nbsp;</a></span></td>
+<td><table><tr><th>s</th><td>sunucu geneli</td></tr>
+<tr><th>k</th><td>sanal konak</td></tr>
+<tr><th>d</th><td>dizin</td></tr>
+<tr><th>h</th><td>.htaccess</td></tr>
+</table></td>
+<td><table><tr><th>Ç</th><td>Çekirdek</td></tr>
+<tr><th>M</th><td>MPM</td></tr>
+<tr><th>T</th><td>Temel</td></tr>
+<tr><th>E</th><td>Eklenti</td></tr>
+<tr><th>D</th><td>Deneysel</td></tr>
+</table></td></tr>
+</table>
+<table class="qref">
+<tr><td><a href="core.html#acceptfilter" id="A" name="A">AcceptFilter <var>protocol</var> <var>kabul_süzgeci</var></a></td><td></td><td>s</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Bir protokolün dinleyici soketleri için en iyilemeleri ayarlar
+</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#acceptmutex">AcceptMutex Default|<var>yöntem</var></a></td><td> Default </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Apache HTTPd Sunucusunun ağ soketlerinden istekleri kabul eden
+  çok sayıda çocuk süreci sıraya sokmak için kullandığı yöntemi
+  belirler.</td></tr>
+<tr><td><a href="core.html#acceptpathinfo">AcceptPathInfo On|Off|Default</a></td><td> Default </td><td>skdh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Dosya isminden sonra belirtilen yol verisini kabul veya
+  reddeder.</td></tr>
+<tr class="odd"><td><a href="core.html#accessfilename">AccessFileName <var>filename</var> [<var>filename</var>] ...</a></td><td> .htaccess </td><td>sk</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Dağıtık yapılandırma dosyasının ismi belirtilir.</td></tr>
+<tr><td><a href="mod_actions.html#action">Action <var>action-type</var> <var>cgi-script</var> [virtual]</a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Activates a CGI script for a particular handler or
+content-type</td></tr>
+<tr class="odd"><td><a href="mod_autoindex.html#addalt">AddAlt <var>string</var> <var>file</var> [<var>file</var>] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Alternate text to display for a file, instead of an
+icon selected by filename</td></tr>
+<tr><td><a href="mod_autoindex.html#addaltbyencoding">AddAltByEncoding <var>string</var> <var>MIME-encoding</var>
+[<var>MIME-encoding</var>] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Alternate text to display for a file instead of an icon
+selected by MIME-encoding</td></tr>
+<tr class="odd"><td><a href="mod_autoindex.html#addaltbytype">AddAltByType <var>string</var> <var>MIME-type</var>
+[<var>MIME-type</var>] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Alternate text to display for a file, instead of an
+icon selected by MIME content-type</td></tr>
+<tr><td><a href="mod_mime.html#addcharset">AddCharset <var>charset</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Maps the given filename extensions to the specified content
+charset</td></tr>
+<tr class="odd"><td><a href="core.html#adddefaultcharset">AddDefaultCharset On|Off|<var>karküm</var></a></td><td> Off </td><td>skdh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Bir yanıtın içerik türü <code>text/plain</code> veya
+  <code>text/html</code> olduğunda eklenecek öntanımlı karakter kümesi
+  parametresini belirler.</td></tr>
+<tr><td><a href="mod_autoindex.html#adddescription">AddDescription <var>string file</var> [<var>file</var>] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Description to display for a file</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#addencoding">AddEncoding <var>MIME-enc</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Maps the given filename extensions to the specified encoding
+type</td></tr>
+<tr><td><a href="mod_mime.html#addhandler">AddHandler <var>handler-name</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Maps the filename extensions to the specified
+handler</td></tr>
+<tr class="odd"><td><a href="mod_autoindex.html#addicon">AddIcon <var>icon</var> <var>name</var> [<var>name</var>]
+...</a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Icon to display for a file selected by name</td></tr>
+<tr><td><a href="mod_autoindex.html#addiconbyencoding">AddIconByEncoding <var>icon</var> <var>MIME-encoding</var>
+[<var>MIME-encoding</var>] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Icon to display next to files selected by MIME 
+content-encoding</td></tr>
+<tr class="odd"><td><a href="mod_autoindex.html#addiconbytype">AddIconByType <var>icon</var> <var>MIME-type</var>
+[<var>MIME-type</var>] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Icon to display next to files selected by MIME 
+content-type</td></tr>
+<tr><td><a href="mod_mime.html#addinputfilter">AddInputFilter <var>filter</var>[;<var>filter</var>...]
+<var>extension</var> [<var>extension</var>] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Maps filename extensions to the filters that will process
+client requests</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#addlanguage">AddLanguage <var>MIME-lang</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Maps the given filename extension to the specified content
+language</td></tr>
+<tr><td><a href="mod_info.html#addmoduleinfo">AddModuleInfo <var>module-name</var> <var>string</var></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Adds additional information to the module
+information displayed by the server-info handler</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#addoutputfilter">AddOutputFilter <var>filter</var>[;<var>filter</var>...]
+<var>extension</var> [<var>extension</var>] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Maps filename extensions to the filters that will process
+responses from the server</td></tr>
+<tr><td><a href="core.html#addoutputfilterbytype">AddOutputFilterByType <var>süzgeç</var>[;<var>süzgeç</var>...]
+<var>MIME-türü</var> [<var>MIME-türü</var>] ...</a></td><td></td><td>skdh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Belli bir MIME türüne bir çıktı süzgeci atar.</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#addtype">AddType <var>MIME-type</var> <var>extension</var>
+[<var>extension</var>] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Maps the given filename extensions onto the specified content
+type</td></tr>
+<tr><td><a href="mod_alias.html#alias">Alias <var>URL-path</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sk</td><td>T</td></tr><tr><td class="descr" colspan="4">Maps URLs to filesystem locations</td></tr>
+<tr class="odd"><td><a href="mod_alias.html#aliasmatch">AliasMatch <var>regex</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sk</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Maps URLs to filesystem locations using regular 
+expressions</td></tr>
+<tr><td><a href="mod_authz_host.html#allow"> Allow from all|<var>host</var>|env=<var>env-variable</var>
+[<var>host</var>|env=<var>env-variable</var>] ...</a></td><td></td><td>dh</td><td>T</td></tr><tr><td class="descr" colspan="4">Controls which hosts can access an area of the
+server</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#allowconnect">AllowCONNECT <var>port</var> [<var>port</var>] ...</a></td><td> 443 563 </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Ports that are allowed to <code>CONNECT</code> through the
+proxy</td></tr>
+<tr><td><a href="core.html#allowencodedslashes">AllowEncodedSlashes On|Off</a></td><td> Off </td><td>sk</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Kodlanmış dosya yolu ayracı içeren URL’lere izin verilip
+  verilmeyeceÄŸini belirler.</td></tr>
+<tr class="odd"><td><a href="core.html#allowoverride">AllowOverride All|None|<var>yönerge-türü</var>
+[<var>yönerge-türü</var>] ...</a></td><td> All </td><td>d</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4"><code>.htaccess</code> dosyalarında bulunmasına izin verilen
+  yönerge türleri belirtilir.</td></tr>
+<tr><td><a href="mod_authn_anon.html#anonymous">Anonymous <var>user</var> [<var>user</var>] ...</a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Specifies userIDs that are allowed access without
+password verification</td></tr>
+<tr class="odd"><td><a href="mod_authn_anon.html#anonymous_logemail">Anonymous_LogEmail On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets whether the password entered will be logged in the
+error log</td></tr>
+<tr><td><a href="mod_authn_anon.html#anonymous_mustgiveemail">Anonymous_MustGiveEmail On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Specifies whether blank passwords are allowed</td></tr>
+<tr class="odd"><td><a href="mod_authn_anon.html#anonymous_nouserid">Anonymous_NoUserID On|Off</a></td><td> Off </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets whether the userID field may be empty</td></tr>
+<tr><td><a href="mod_authn_anon.html#anonymous_verifyemail">Anonymous_VerifyEmail On|Off</a></td><td> Off </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether to check the password field for a correctly
+formatted email address</td></tr>
+<tr class="odd"><td><a href="mod_auth_basic.html#authbasicauthoritative">AuthBasicAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Sets whether authorization and authentication are passed to
+lower level modules</td></tr>
+<tr><td><a href="mod_auth_basic.html#authbasicprovider">AuthBasicProvider <var>provider-name</var>
+[<var>provider-name</var>] ...</a></td><td> file </td><td>dh</td><td>T</td></tr><tr><td class="descr" colspan="4">Sets the authentication provider(s) for this location</td></tr>
+<tr class="odd"><td><a href="mod_authn_dbd.html#authdbduserpwquery">AuthDBDUserPWQuery <var>query</var></a></td><td></td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">SQL query to look up a password for a user</td></tr>
+<tr><td><a href="mod_authn_dbd.html#authdbduserrealmquery">AuthDBDUserRealmQuery <var>query</var></a></td><td></td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">SQL query to look up a password hash for a user and realm.
+</td></tr>
+<tr class="odd"><td><a href="mod_authz_dbm.html#authdbmgroupfile">AuthDBMGroupFile <var>file-path</var></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the database file containing the list
+of user groups for authorization</td></tr>
+<tr><td><a href="mod_authn_dbm.html#authdbmtype">AuthDBMType default|SDBM|GDBM|NDBM|DB</a></td><td> default </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the type of database file that is used to
+store passwords</td></tr>
+<tr class="odd"><td><a href="mod_authn_dbm.html#authdbmuserfile">AuthDBMUserFile <var>file-path</var></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of a database file containing the list of users and
+passwords for authentication</td></tr>
+<tr><td><a href="mod_authn_default.html#authdefaultauthoritative">AuthDefaultAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>T</td></tr><tr><td class="descr" colspan="4">Sets whether authentication is passed to lower level
+modules</td></tr>
+<tr class="odd"><td><a href="mod_auth_digest.html#authdigestalgorithm">AuthDigestAlgorithm MD5|MD5-sess</a></td><td> MD5 </td><td>dh</td><td>D</td></tr><tr class="odd"><td class="descr" colspan="4">Selects the algorithm used to calculate the challenge and
+response hashes in digest authentication</td></tr>
+<tr><td><a href="mod_auth_digest.html#authdigestdomain">AuthDigestDomain <var>URI</var> [<var>URI</var>] ...</a></td><td></td><td>dh</td><td>D</td></tr><tr><td class="descr" colspan="4">URIs that are in the same protection space for digest
+authentication</td></tr>
+<tr class="odd"><td><a href="mod_auth_digest.html#authdigestnccheck">AuthDigestNcCheck On|Off</a></td><td> Off </td><td>s</td><td>D</td></tr><tr class="odd"><td class="descr" colspan="4">Enables or disables checking of the nonce-count sent by the
+server</td></tr>
+<tr><td><a href="mod_auth_digest.html#authdigestnonceformat">AuthDigestNonceFormat <var>format</var></a></td><td></td><td>dh</td><td>D</td></tr><tr><td class="descr" colspan="4">Determines how the nonce is generated</td></tr>
+<tr class="odd"><td><a href="mod_auth_digest.html#authdigestnoncelifetime">AuthDigestNonceLifetime <var>seconds</var></a></td><td> 300 </td><td>dh</td><td>D</td></tr><tr class="odd"><td class="descr" colspan="4">How long the server nonce is valid</td></tr>
+<tr><td><a href="mod_auth_digest.html#authdigestprovider">AuthDigestProvider <var>provider-name</var>
+[<var>provider-name</var>] ...</a></td><td> file </td><td>dh</td><td>D</td></tr><tr><td class="descr" colspan="4">Sets the authentication provider(s) for this location</td></tr>
+<tr class="odd"><td><a href="mod_auth_digest.html#authdigestqop">AuthDigestQop none|auth|auth-int [auth|auth-int]</a></td><td> auth </td><td>dh</td><td>D</td></tr><tr class="odd"><td class="descr" colspan="4">Determines the quality-of-protection to use in digest
+authentication</td></tr>
+<tr><td><a href="mod_auth_digest.html#authdigestshmemsize">AuthDigestShmemSize <var>size</var></a></td><td> 1000 </td><td>s</td><td>D</td></tr><tr><td class="descr" colspan="4">The amount of shared memory to allocate for keeping track
+of clients</td></tr>
+<tr class="odd"><td><a href="mod_authz_groupfile.html#authgroupfile">AuthGroupFile <var>file-path</var></a></td><td></td><td>dh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of a text file containing the list
+of user groups for authorization</td></tr>
+<tr><td><a href="mod_authnz_ldap.html#authldapbinddn">AuthLDAPBindDN <em>distinguished-name</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Optional DN to use in binding to the LDAP server</td></tr>
+<tr class="odd"><td><a href="mod_authnz_ldap.html#authldapbindpassword">AuthLDAPBindPassword <em>password</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Password used in conjuction with the bind DN</td></tr>
+<tr><td><a href="mod_authnz_ldap.html#authldapcharsetconfig">AuthLDAPCharsetConfig <em>file-path</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Language to charset conversion configuration file</td></tr>
+<tr class="odd"><td><a href="mod_authnz_ldap.html#authldapcomparednonserver">AuthLDAPCompareDNOnServer on|off</a></td><td> on </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Use the LDAP server to compare the DNs</td></tr>
+<tr><td><a href="mod_authnz_ldap.html#authldapdereferencealiases">AuthLDAPDereferenceAliases never|searching|finding|always</a></td><td> Always </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">When will the module de-reference aliases</td></tr>
+<tr class="odd"><td><a href="mod_authnz_ldap.html#authldapgroupattribute">AuthLDAPGroupAttribute <em>attribute</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">LDAP attributes used to check for group membership</td></tr>
+<tr><td><a href="mod_authnz_ldap.html#authldapgroupattributeisdn">AuthLDAPGroupAttributeIsDN on|off</a></td><td> on </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Use the DN of the client username when checking for
+group membership</td></tr>
+<tr class="odd"><td><a href="mod_authnz_ldap.html#authldapremoteuserattribute">AuthLDAPRemoteUserAttribute uid</a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Use the value of the attribute returned during the user
+query to set the REMOTE_USER environment variable</td></tr>
+<tr><td><a href="mod_authnz_ldap.html#authldapremoteuserisdn">AuthLDAPRemoteUserIsDN on|off</a></td><td> off </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Use the DN of the client username to set the REMOTE_USER
+environment variable</td></tr>
+<tr class="odd"><td><a href="mod_authnz_ldap.html#authldapurl">AuthLDAPUrl <em>url [NONE|SSL|TLS|STARTTLS]</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">URL specifying the LDAP search parameters</td></tr>
+<tr><td><a href="core.html#authname">AuthName <var>yetki-alanı</var></a></td><td></td><td>dh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">HTTP kimlik doğrulamasında kullanmak için yetki alanı ismi</td></tr>
+<tr class="odd"><td><a href="mod_authn_alias.html#authnprovideralias">&lt;AuthnProviderAlias <var>baseProvider Alias</var>&gt;
+... &lt;/AuthnProviderAlias&gt;</a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enclose a group of directives that represent an
+extension of a base authentication provider and referenced by
+the specified alias</td></tr>
+<tr><td><a href="core.html#authtype">AuthType Basic|Digest</a></td><td></td><td>dh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Kullanıcı kimlik doğrulaması türü</td></tr>
+<tr class="odd"><td><a href="mod_authn_file.html#authuserfile">AuthUserFile <var>file-path</var></a></td><td></td><td>dh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of a text file containing the list of users and
+passwords for authentication</td></tr>
+<tr><td><a href="mod_authz_dbm.html#authzdbmauthoritative">AuthzDBMAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets whether authorization will be passed on to lower level
+modules</td></tr>
+<tr class="odd"><td><a href="mod_authz_dbm.html#authzdbmtype">AuthzDBMType default|SDBM|GDBM|NDBM|DB</a></td><td> default </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the type of database file that is used to
+store list of user groups</td></tr>
+<tr><td><a href="mod_authz_default.html#authzdefaultauthoritative">AuthzDefaultAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>T</td></tr><tr><td class="descr" colspan="4">Sets whether authorization is passed to lower level
+modules</td></tr>
+<tr class="odd"><td><a href="mod_authz_groupfile.html#authzgroupfileauthoritative">AuthzGroupFileAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Sets whether authorization will be passed on to lower level
+modules</td></tr>
+<tr><td><a href="mod_authnz_ldap.html#authzldapauthoritative">AuthzLDAPAuthoritative on|off</a></td><td> on </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Prevent other authentication modules from
+authenticating the user if this one fails</td></tr>
+<tr class="odd"><td><a href="mod_authz_owner.html#authzownerauthoritative">AuthzOwnerAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets whether authorization will be passed on to lower level
+modules</td></tr>
+<tr><td><a href="mod_authz_user.html#authzuserauthoritative">AuthzUserAuthoritative On|Off</a></td><td> On </td><td>dh</td><td>T</td></tr><tr><td class="descr" colspan="4">Sets whether authorization will be passed on to lower level
+modules</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#balancermember" id="B" name="B">BalancerMember <var>url</var> [<var>key=value [key=value ...]]</var></a></td><td></td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Add a member to a load balancing group</td></tr>
+<tr><td><a href="mod_setenvif.html#browsermatch">BrowserMatch <em>regex [!]env-variable</em>[=<em>value</em>]
+[[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Sets environment variables conditional on HTTP User-Agent
+</td></tr>
+<tr class="odd"><td><a href="mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase  <em>regex [!]env-variable</em>[=<em>value</em>]
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables conditional on User-Agent without
+respect to case</td></tr>
+<tr><td><a href="mod_log_config.html#bufferedlogs">BufferedLogs On|Off</a></td><td> Off </td><td>s</td><td>T</td></tr><tr><td class="descr" colspan="4">Buffer log entries in memory before writing to disk</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire <var>seconds</var></a></td><td> 3600 (one hour) </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The default duration to cache a document when no expiry date is specified.</td></tr>
+<tr><td><a href="mod_disk_cache.html#cachedirlength">CacheDirLength <var>length</var></a></td><td> 2 </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">The number of characters in subdirectory names</td></tr>
+<tr class="odd"><td><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels <var>levels</var></a></td><td> 3 </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The number of levels of subdirectories in the
+cache.</td></tr>
+<tr><td><a href="mod_cache.html#cachedisable">CacheDisable <var> url-string</var></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Disable caching of specified URLs</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cacheenable">CacheEnable <var>cache_type</var> <var>url-string</var></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable caching of specified URLs using a specified storage
+manager</td></tr>
+<tr><td><a href="mod_file_cache.html#cachefile">CacheFile <var>file-path</var> [<var>file-path</var>] ...</a></td><td></td><td>s</td><td>D</td></tr><tr><td class="descr" colspan="4">Cache a list of file handles at startup time</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cacheignorecachecontrol">CacheIgnoreCacheControl On|Off</a></td><td> Off </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Ignore request to not serve cached content to client</td></tr>
+<tr><td><a href="mod_cache.html#cacheignoreheaders">CacheIgnoreHeaders <var>header-string</var> [<var>header-string</var>] ...</a></td><td> None </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Do not store the given HTTP header(s) in the cache.
+</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cacheignorenolastmod">CacheIgnoreNoLastMod On|Off</a></td><td> Off </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Ignore the fact that a response has no Last Modified
+header.</td></tr>
+<tr><td><a href="mod_cache.html#cacheignorequerystring">CacheIgnoreQueryString On|Off</a></td><td> Off </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Ignore query string when caching</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cachelastmodifiedfactor">CacheLastModifiedFactor <var>float</var></a></td><td> 0.1 </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The factor used to compute an expiry date based on the
+LastModified date.</td></tr>
+<tr><td><a href="mod_cache.html#cachemaxexpire">CacheMaxExpire <var>seconds</var></a></td><td> 86400 (one day) </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">The maximum time in seconds to cache a document</td></tr>
+<tr class="odd"><td><a href="mod_disk_cache.html#cachemaxfilesize">CacheMaxFileSize <var>bytes</var></a></td><td> 1000000 </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum size (in bytes) of a document to be placed in the
+cache</td></tr>
+<tr><td><a href="mod_disk_cache.html#cacheminfilesize">CacheMinFileSize <var>bytes</var></a></td><td> 1 </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum size (in bytes) of a document to be placed in the
+cache</td></tr>
+<tr class="odd"><td><a href="mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs On|Off</a></td><td> Off </td><td>sk</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Allows content-negotiated documents to be 
+cached by proxy servers</td></tr>
+<tr><td><a href="mod_disk_cache.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">The directory root under which cache files are
+stored</td></tr>
+<tr class="odd"><td><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore On|Off</a></td><td> Off </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Attempt to cache requests or responses that have been marked as no-store.</td></tr>
+<tr><td><a href="mod_cache.html#cachestoreprivate">CacheStorePrivate On|Off</a></td><td> Off </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Attempt to cache responses that the server has marked as private</td></tr>
+<tr class="odd"><td><a href="core.html#cgimapextension">CGIMapExtension <var>cgi-yolu</var> <var>.uzantı</var></a></td><td></td><td>dh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">CGI betik yorumlayıcısını saptama tekniğini belirler.
+</td></tr>
+<tr><td><a href="mod_charset_lite.html#charsetdefault">CharsetDefault <var>charset</var></a></td><td></td><td>skdh</td><td>D</td></tr><tr><td class="descr" colspan="4">Charset to translate into</td></tr>
+<tr class="odd"><td><a href="mod_charset_lite.html#charsetoptions">CharsetOptions <var>option</var> [<var>option</var>] ...</a></td><td> DebugLevel=0 NoImpl +</td><td>skdh</td><td>D</td></tr><tr class="odd"><td class="descr" colspan="4">Configures charset translation behavior</td></tr>
+<tr><td><a href="mod_charset_lite.html#charsetsourceenc">CharsetSourceEnc <var>charset</var></a></td><td></td><td>skdh</td><td>D</td></tr><tr><td class="descr" colspan="4">Source charset of files</td></tr>
+<tr class="odd"><td><a href="mod_speling.html#checkcaseonly">CheckCaseOnly on|off</a></td><td> Off </td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the action of the speling module to case corrections</td></tr>
+<tr><td><a href="mod_speling.html#checkspelling">CheckSpelling on|off</a></td><td> Off </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables the spelling 
+module</td></tr>
+<tr class="odd"><td><a href="core.html#contentdigest">ContentDigest On|Off</a></td><td> Off </td><td>skdh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4"><code>Content-MD5</code> HTTP yanıt başlıklarının üretimini
+  etkin kılar.</td></tr>
+<tr><td><a href="mod_usertrack.html#cookiedomain">CookieDomain <em>domain</em></a></td><td></td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The domain to which the tracking cookie applies</td></tr>
+<tr class="odd"><td><a href="mod_usertrack.html#cookieexpires">CookieExpires <em>expiry-period</em></a></td><td></td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Expiry time for the tracking cookie</td></tr>
+<tr><td><a href="mod_log_config.html#cookielog">CookieLog <var>filename</var></a></td><td></td><td>sk</td><td>T</td></tr><tr><td class="descr" colspan="4">Sets filename for the logging of cookies</td></tr>
+<tr class="odd"><td><a href="mod_usertrack.html#cookiename">CookieName <em>token</em></a></td><td> Apache </td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Name of the tracking cookie</td></tr>
+<tr><td><a href="mod_usertrack.html#cookiestyle">CookieStyle
+    <em>Netscape|Cookie|Cookie2|RFC2109|RFC2965</em></a></td><td> Netscape </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Format of the cookie header field</td></tr>
+<tr class="odd"><td><a href="mod_usertrack.html#cookietracking">CookieTracking on|off</a></td><td> off </td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables tracking cookie</td></tr>
+<tr><td><a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory <var>dizin</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4"><code>core</code> dosyasını dökümlemek üzere Apache’nin geçmeye
+  çalışacağı dizin.</td></tr>
+<tr class="odd"><td><a href="mod_log_config.html#customlog">CustomLog  <var>file</var>|<var>pipe</var>
+<var>format</var>|<var>nickname</var>
+[env=[!]<var>environment-variable</var>]</a></td><td></td><td>sk</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Sets filename and format of log file</td></tr>
+<tr><td><a href="mod_dav.html#dav" id="D" name="D">Dav On|Off|<var>provider-name</var></a></td><td> Off </td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable WebDAV HTTP methods</td></tr>
+<tr class="odd"><td><a href="mod_dav.html#davdepthinfinity">DavDepthInfinity on|off</a></td><td> off </td><td>skd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Allow PROPFIND, Depth: Infinity requests</td></tr>
+<tr><td><a href="mod_dav_lock.html#davgenericlockdb">DavGenericLockDB <var>file-path</var></a></td><td></td><td>skd</td><td>E</td></tr><tr><td class="descr" colspan="4">Location of the DAV lock database</td></tr>
+<tr class="odd"><td><a href="mod_dav_fs.html#davlockdb">DavLockDB <var>file-path</var></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the DAV lock database</td></tr>
+<tr><td><a href="mod_dav.html#davmintimeout">DavMinTimeout <var>seconds</var></a></td><td> 0 </td><td>skd</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum amount of time the server holds a lock on
+a DAV resource</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdexptime">DBDExptime <var>time-in-seconds</var></a></td><td> 300 </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Keepalive time for idle connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdkeep">DBDKeep <var>number</var></a></td><td> 2 </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum sustained number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdmax">DBDMax <var>number</var></a></td><td> 10 </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of connections</td></tr>
+<tr><td><a href="mod_dbd.html#dbdmin">DBDMin <var>number</var></a></td><td> 1 </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Minimum number of connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdparams">DBDParams
+<var>param1</var>=<var>value1</var>[,<var>param2</var>=<var>value2</var>]</a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Parameters for database connection</td></tr>
+<tr><td><a href="mod_dbd.html#dbdpersist">DBDPersist On|Off</a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Whether to use persistent connections</td></tr>
+<tr class="odd"><td><a href="mod_dbd.html#dbdpreparesql">DBDPrepareSQL <var>"SQL statement"</var> <var>label</var></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Define an SQL prepared statement</td></tr>
+<tr><td><a href="mod_dbd.html#dbdriver">DBDriver <var>name</var></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Specify an SQL driver</td></tr>
+<tr class="odd"><td><a href="mod_autoindex.html#defaulticon">DefaultIcon <var>url-path</var></a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Icon to display for files when no specific icon is
+configured</td></tr>
+<tr><td><a href="mod_mime.html#defaultlanguage">DefaultLanguage <var>MIME-lang</var></a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Sets all files in the given scope to the specified
+language</td></tr>
+<tr class="odd"><td><a href="core.html#defaulttype">DefaultType <var>MIME-türü</var>|none</a></td><td> text/plain </td><td>skdh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Sunucunun MIME türünü saptayamadığı durumda göndereceği MIME
+  içerik türünü belirler.</td></tr>
+<tr><td><a href="mod_deflate.html#deflatebuffersize">DeflateBufferSize <var>value</var></a></td><td> 8096 </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Fragment size to be compressed at one time by zlib</td></tr>
+<tr class="odd"><td><a href="mod_deflate.html#deflatecompressionlevel">DeflateCompressionLevel <var>value</var></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">How much compression do we apply to the output</td></tr>
+<tr><td><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote [<var>type</var>] <var>notename</var></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Places the compression ratio in a note for logging</td></tr>
+<tr class="odd"><td><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel <var>value</var></a></td><td> 9 </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">How much memory should be used by zlib for compression</td></tr>
+<tr><td><a href="mod_deflate.html#deflatewindowsize">DeflateWindowSize <var>value</var></a></td><td> 15 </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Zlib compression window size</td></tr>
+<tr class="odd"><td><a href="mod_authz_host.html#deny"> Deny from all|<var>host</var>|env=<var>env-variable</var>
+[<var>host</var>|env=<var>env-variable</var>] ...</a></td><td></td><td>dh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Controls which hosts are denied access to the
+server</td></tr>
+<tr><td><a href="core.html#directory">&lt;Directory <var>dizin-yolu</var>&gt;
+... &lt;/Directory&gt;</a></td><td></td><td>sk</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Sadece ismi belirtilen dosya sistemi dizininde ve bunun
+  altdizinlerinde uygulanacak bir yönerge grubunu sarmalar.</td></tr>
+<tr class="odd"><td><a href="mod_dir.html#directoryindex">DirectoryIndex
+    <var>local-url</var> [<var>local-url</var>] ...</a></td><td> index.html </td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">List of resources to look for when the client requests
+a directory</td></tr>
+<tr><td><a href="core.html#directorymatch">&lt;DirectoryMatch <var>düzifd</var>&gt;
+... &lt;/DirectoryMatch&gt;</a></td><td></td><td>sk</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Bir düzenli ifade ile eşleşen dosya sistemi dizininde ve bunun
+  altdizinlerinde uygulanacak bir yönerge grubunu sarmalar.</td></tr>
+<tr class="odd"><td><a href="mod_dir.html#directoryslash">DirectorySlash On|Off</a></td><td> On </td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Toggle trailing slash redirects on or off</td></tr>
+<tr><td><a href="core.html#documentroot">DocumentRoot <var>dizin-yolu</var></a></td><td> /usr/local/apache/h +</td><td>sk</td><td>Ç</td></tr><tr><td class="descr" colspan="4">İstemciye görünür olan ana belge ağacının kök dizinini belirler.</td></tr>
+<tr class="odd"><td><a href="mod_dumpio.html#dumpioinput">DumpIOInput On|Off</a></td><td> Off </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dump all input data to the error log</td></tr>
+<tr><td><a href="mod_dumpio.html#dumpiologlevel">DumpIOLogLevel <var>level</var></a></td><td> debug </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Controls the logging level of the DumpIO output</td></tr>
+<tr class="odd"><td><a href="mod_dumpio.html#dumpiooutput">DumpIOOutput On|Off</a></td><td> Off </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dump all output data to the error log</td></tr>
+<tr><td><a href="mpm_common.html#enableexceptionhook" id="E" name="E">EnableExceptionHook On|Off</a></td><td> Off </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Bir çöküş sonrası olağandışılık eylemcilerini çalıştıracak
+  kancayı etkin kılar.</td></tr>
+<tr class="odd"><td><a href="core.html#enablemmap">EnableMMAP On|Off</a></td><td> On </td><td>skdh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Teslimat sırasında okunacak dosyalar için bellek eşlemeyi etkin
+  kılar.</td></tr>
+<tr><td><a href="core.html#enablesendfile">EnableSendfile On|Off</a></td><td> On </td><td>skdh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Dosyaların istemciye tesliminde çekirdeğin dosya gönderme
+  desteğinin kullanımını etkin kılar.</td></tr>
+<tr class="odd"><td><a href="core.html#errordocument">ErrorDocument <var>hata-kodu</var> <var>belge</var></a></td><td></td><td>skdh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Bir hata durumunda sunucunun istemciye ne döndüreceğini
+  belirler.</td></tr>
+<tr><td><a href="core.html#errorlog"> ErrorLog <var>dosya-yolu</var>|syslog[:<var>oluşum</var>]</a></td><td> logs/error_log (Uni +</td><td>sk</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Sunucunun hata günlüğünü tutacağı yeri belirler.</td></tr>
+<tr class="odd"><td><a href="mod_example.html#example">Example</a></td><td></td><td>skdh</td><td>D</td></tr><tr class="odd"><td class="descr" colspan="4">Demonstration directive to illustrate the Apache module
+API</td></tr>
+<tr><td><a href="mod_expires.html#expiresactive">ExpiresActive On|Off</a></td><td></td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables generation of <code>Expires</code>
+headers</td></tr>
+<tr class="odd"><td><a href="mod_expires.html#expiresbytype">ExpiresByType <var>MIME-type</var>
+<var>&lt;code&gt;seconds</var></a></td><td></td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Value of the <code>Expires</code> header configured
+by MIME type</td></tr>
+<tr><td><a href="mod_expires.html#expiresdefault">ExpiresDefault <var>&lt;code&gt;seconds</var></a></td><td></td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Default algorithm for calculating expiration time</td></tr>
+<tr class="odd"><td><a href="mod_status.html#extendedstatus">ExtendedStatus On|Off</a></td><td> Off </td><td>s</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Keep track of extended status information for each 
+request</td></tr>
+<tr><td><a href="mod_ext_filter.html#extfilterdefine">ExtFilterDefine <var>filtername</var> <var>parameters</var></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Define an external filter</td></tr>
+<tr class="odd"><td><a href="mod_ext_filter.html#extfilteroptions">ExtFilterOptions <var>option</var> [<var>option</var>] ...</a></td><td> DebugLevel=0 NoLogS +</td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> options</td></tr>
+<tr><td><a href="core.html#fileetag" id="F" name="F">FileETag <var>bileşen</var> ...</a></td><td> INode MTime Size </td><td>skdh</td><td>Ç</td></tr><tr><td class="descr" colspan="4"><code>ETag</code> HTTP yanıt başlığını oluşturmakta kullanılacak
+  dosya özniteliklerini belirler.</td></tr>
+<tr class="odd"><td><a href="core.html#files">&lt;Files <var>dosya-adı</var>&gt; ... &lt;/Files&gt;</a></td><td></td><td>skdh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Dosya isimleriyle eşleşme halinde uygulanacak yönergeleri
+  içerir.</td></tr>
+<tr><td><a href="core.html#filesmatch">&lt;FilesMatch <var>düzifd</var>&gt; ... &lt;/FilesMatch&gt;</a></td><td></td><td>skdh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Düzenli ifadelerin dosya isimleriyle eşleşmesi halinde
+  uygulanacak yönergeleri içerir.</td></tr>
+<tr class="odd"><td><a href="mod_filter.html#filterchain">FilterChain [+=-@!]<var>filter-name</var> <var>...</var></a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Configure the filter chain</td></tr>
+<tr><td><a href="mod_filter.html#filterdeclare">FilterDeclare <var>filter-name</var> <var>[type]</var></a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Declare a smart filter</td></tr>
+<tr class="odd"><td><a href="mod_filter.html#filterprotocol">FilterProtocol <var>filter-name</var> [<var>provider-name</var>]
+    <var>proto-flags</var></a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Deal with correct HTTP protocol handling</td></tr>
+<tr><td><a href="mod_filter.html#filterprovider">FilterProvider <var>filter-name</var> <var>provider-name</var>
+ [req|resp|env]=<var>dispatch</var> <var>match</var></a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Register a content filter</td></tr>
+<tr class="odd"><td><a href="mod_filter.html#filtertrace">FilterTrace <var>filter-name</var> <var>level</var></a></td><td></td><td>skd</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Get debug/diagnostic information from
+    <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code></td></tr>
+<tr><td><a href="mod_negotiation.html#forcelanguagepriority">ForceLanguagePriority None|Prefer|Fallback [Prefer|Fallback]</a></td><td> Prefer </td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Action to take if a single acceptable document is not 
+found</td></tr>
+<tr class="odd"><td><a href="core.html#forcetype">ForceType <var>MIME-türü</var>|None</a></td><td></td><td>dh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Bütün dosyaların belirtilen MIME içerik türüyle sunulmasına
+  sebep olur.</td></tr>
+<tr><td><a href="mod_log_forensic.html#forensiclog">ForensicLog <var>filename</var>|<var>pipe</var></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets filename of the forensic log</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#gracefulshutdowntimeout" id="G" name="G">GracefulShutDownTimeout <var>saniye</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Sunucunun nazikçe kapatılmasının ardından ana süreç çıkana kadar
+  geçecek süre için bir zaman aşımı belirler.</td></tr>
+<tr><td><a href="mpm_common.html#group">Group <var>unix-grubu</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">İsteklere yanıt verecek sunucunun ait olacağı grubu belirler.</td></tr>
+<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|merge|add|unset|echo|edit
+<var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP response headers</td></tr>
+<tr><td><a href="mod_autoindex.html#headername">HeaderName <var>filename</var></a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the top
+of the index listing</td></tr>
+<tr class="odd"><td><a href="core.html#hostnamelookups">HostnameLookups On|Off|Double</a></td><td> Off </td><td>skd</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">İstemci IP adresleri üzerinde DNS sorgularını etkin kılar.
+</td></tr>
+<tr><td><a href="mod_ident.html#identitycheck" id="I" name="I">IdentityCheck On|Off</a></td><td> Off </td><td>skd</td><td>E</td></tr><tr><td class="descr" colspan="4">Enables logging of the RFC 1413 identity of the remote
+user</td></tr>
+<tr class="odd"><td><a href="mod_ident.html#identitychecktimeout">IdentityCheckTimeout <var>seconds</var></a></td><td> 30 </td><td>skd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Determines the timeout duration for ident requests</td></tr>
+<tr><td><a href="core.html#ifdefine">&lt;IfDefine [!]<var>parametre-adı</var>&gt; ...
+    &lt;/IfDefine&gt;</a></td><td></td><td>skdh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Başlatma sırasında bir doğruluk sınamasından sonra işleme
+sokulacak yönergeleri sarmalar.</td></tr>
+<tr class="odd"><td><a href="core.html#ifmodule">&lt;IfModule [!]<var>modül-dosyası</var>|<var>modül-betimleyici</var>&gt; ...
+    &lt;/IfModule&gt;</a></td><td></td><td>skdh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Belli bir modülün varlığına veya yokluğuna göre işleme sokulacak
+yönergeleri sarmalar.</td></tr>
+<tr><td><a href="mod_version.html#ifversion">&lt;IfVersion [[!]<var>operator</var>] <var>version</var>&gt; ...
+&lt;/IfVersion&gt;</a></td><td></td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">contains version dependent configuration</td></tr>
+<tr class="odd"><td><a href="mod_imagemap.html#imapbase">ImapBase map|referer|<var>URL</var></a></td><td> http://servername/ </td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Default <code>base</code> for imagemap files</td></tr>
+<tr><td><a href="mod_imagemap.html#imapdefault">ImapDefault error|nocontent|map|referer|<var>URL</var></a></td><td> nocontent </td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Default action when an imagemap is called with coordinates
+that are not explicitly mapped</td></tr>
+<tr class="odd"><td><a href="mod_imagemap.html#imapmenu">ImapMenu none|formatted|semiformatted|unformatted</a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Action if no coordinates are given when calling
+an imagemap</td></tr>
+<tr><td><a href="core.html#include">Include <var>dosya-yolu</var>|<var>dizin-yolu</var></a></td><td></td><td>skd</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Sunucu yapılandırma dosyalarının başka dosyaları içermesini sağlar.
+</td></tr>
+<tr class="odd"><td><a href="mod_autoindex.html#indexignore">IndexIgnore <var>file</var> [<var>file</var>] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Adds to the list of files to hide when listing 
+a directory</td></tr>
+<tr><td><a href="mod_autoindex.html#indexoptions">IndexOptions  [+|-]<var>option</var> [[+|-]<var>option</var>]
+...</a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Various configuration settings for directory 
+indexing</td></tr>
+<tr class="odd"><td><a href="mod_autoindex.html#indexorderdefault">IndexOrderDefault Ascending|Descending
+Name|Date|Size|Description</a></td><td> Ascending Name </td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the default ordering of the directory index</td></tr>
+<tr><td><a href="mod_autoindex.html#indexstylesheet">IndexStyleSheet <var>url-path</var></a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Adds a CSS stylesheet to the directory index</td></tr>
+<tr class="odd"><td><a href="mod_isapi.html#isapiappendlogtoerrors">ISAPIAppendLogToErrors on|off</a></td><td> off </td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Record <code>HSE_APPEND_LOG_PARAMETER</code> requests from
+ISAPI extensions to the error log</td></tr>
+<tr><td><a href="mod_isapi.html#isapiappendlogtoquery">ISAPIAppendLogToQuery on|off</a></td><td> on </td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Record <code>HSE_APPEND_LOG_PARAMETER</code> requests from
+ISAPI extensions to the query field</td></tr>
+<tr class="odd"><td><a href="mod_isapi.html#isapicachefile">ISAPICacheFile <var>file-path</var> [<var>file-path</var>]
+...</a></td><td></td><td>sk</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">ISAPI .dll files to be loaded at startup</td></tr>
+<tr><td><a href="mod_isapi.html#isapifakeasync">ISAPIFakeAsync on|off</a></td><td> off </td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Fake asynchronous support for ISAPI callbacks</td></tr>
+<tr class="odd"><td><a href="mod_isapi.html#isapilognotsupported">ISAPILogNotSupported on|off</a></td><td> off </td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Log unsupported feature requests from ISAPI
+extensions</td></tr>
+<tr><td><a href="mod_isapi.html#isapireadaheadbuffer">ISAPIReadAheadBuffer <var>size</var></a></td><td> 49152 </td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Size of the Read Ahead Buffer sent to ISAPI
+extensions</td></tr>
+<tr class="odd"><td><a href="core.html#keepalive" id="K" name="K">KeepAlive On|Off</a></td><td> On </td><td>sk</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">HTTP kalıcı bağlantılarını etkin kılar</td></tr>
+<tr><td><a href="core.html#keepalivetimeout">KeepAliveTimeout <var>saniye</var></a></td><td> 5 </td><td>sk</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Bir kalıcı bağlantıda sunucunun bir sonraki isteği bekleme süresi
+</td></tr>
+<tr class="odd"><td><a href="mod_negotiation.html#languagepriority" id="L" name="L">LanguagePriority <var>MIME-lang</var> [<var>MIME-lang</var>]
+...</a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">The precendence of language variants for cases where
+the client does not express a preference</td></tr>
+<tr><td><a href="mod_ldap.html#ldapcacheentries">LDAPCacheEntries <var>number</var></a></td><td> 1024 </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of entries in the primary LDAP cache</td></tr>
+<tr class="odd"><td><a href="mod_ldap.html#ldapcachettl">LDAPCacheTTL <var>seconds</var></a></td><td> 600 </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Time that cached items remain valid</td></tr>
+<tr><td><a href="mod_ldap.html#ldapconnectiontimeout">LDAPConnectionTimeout <var>seconds</var></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Specifies the socket connection timeout in seconds</td></tr>
+<tr class="odd"><td><a href="mod_ldap.html#ldapopcacheentries">LDAPOpCacheEntries <var>number</var></a></td><td> 1024 </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Number of entries used to cache LDAP compare 
+operations</td></tr>
+<tr><td><a href="mod_ldap.html#ldapopcachettl">LDAPOpCacheTTL <var>seconds</var></a></td><td> 600 </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Time that entries in the operation cache remain
+valid</td></tr>
+<tr class="odd"><td><a href="mod_ldap.html#ldapsharedcachefile">LDAPSharedCacheFile <var>directory-path/filename</var></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the shared memory cache file</td></tr>
+<tr><td><a href="mod_ldap.html#ldapsharedcachesize">LDAPSharedCacheSize <var>bytes</var></a></td><td> 102400 </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Size in bytes of the shared-memory cache</td></tr>
+<tr class="odd"><td><a href="mod_ldap.html#ldaptrustedclientcert">LDAPTrustedClientCert <var>type</var> <var>directory-path/filename/nickname</var> <var>[password]</var></a></td><td></td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the file containing or nickname referring to a per
+connection client certificate. Not all LDAP toolkits support per
+connection client certificates.</td></tr>
+<tr><td><a href="mod_ldap.html#ldaptrustedglobalcert">LDAPTrustedGlobalCert <var>type</var> <var>directory-path/filename</var> <var>[password]</var></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the file or database containing global trusted
+Certificate Authority or global client certificates</td></tr>
+<tr class="odd"><td><a href="mod_ldap.html#ldaptrustedmode">LDAPTrustedMode <var>type</var></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Specifies the SSL/TLS mode to be used when connecting to an LDAP server.</td></tr>
+<tr><td><a href="mod_ldap.html#ldapverifyservercert">LDAPVerifyServerCert <var>On|Off</var></a></td><td> On </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Force server certificate verification</td></tr>
+<tr class="odd"><td><a href="core.html#limit">&lt;Limit <var>yöntem</var> [<var>yöntem</var>] ... &gt; ...
+    &lt;/Limit&gt;</a></td><td></td><td>skdh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Erişimi sınırlanacak HTTP yöntemleri için erişim sınırlayıcıları
+sarmalar.</td></tr>
+<tr><td><a href="core.html#limitexcept">&lt;LimitExcept <var>yöntem</var> [<var>yöntem</var>] ... &gt; ...
+    &lt;/LimitExcept&gt;</a></td><td></td><td>skdh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">İsimleri belirtilenler dışında kalan HTTP yöntemleri için
+kullanılacak erişim sınırlayıcıları sarmalar.</td></tr>
+<tr class="odd"><td><a href="core.html#limitinternalrecursion">LimitInternalRecursion <var>sayı</var> [<var>sayı</var>]</a></td><td> 10 </td><td>sk</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Dahili yönlendirmelerin ve istek içi isteklerin azami sayısını
+belirler.</td></tr>
+<tr><td><a href="core.html#limitrequestbody">LimitRequestBody <var>bayt-sayısı</var></a></td><td> 0 </td><td>skdh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">İstemci tarafından gönderilen HTTP istek gövdesinin toplam
+uzunluğunu sınırlar.</td></tr>
+<tr class="odd"><td><a href="core.html#limitrequestfields">LimitRequestFields <var>sayı</var></a></td><td> 100 </td><td>s</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">İstemciden kabul edilecek HTTP isteği başlık alanlarının sayısını
+sınırlar.</td></tr>
+<tr><td><a href="core.html#limitrequestfieldsize">LimitRequestFieldSize <var>bayt-sayısı</var></a></td><td> 8190 </td><td>s</td><td>Ç</td></tr><tr><td class="descr" colspan="4">İstemciden kabul edilecek HTTP isteği başlık uzunluğunu sınırlar.
+</td></tr>
+<tr class="odd"><td><a href="core.html#limitrequestline">LimitRequestLine <var>bayt-sayısı</var></a></td><td> 8190 </td><td>s</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">İstemciden kabul edilecek HTTP istek satırının uzunluğunu sınırlar.
+</td></tr>
+<tr><td><a href="core.html#limitxmlrequestbody">LimitXMLRequestBody <var>bayt-sayısı</var></a></td><td> 1000000 </td><td>skdh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Bir XML temelli istek gövdesinin uzunluğunu sınırlar.</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#listen">Listen [<var>IP-adresi</var>:]<var>port-numarası</var>
+  [<var>protokol</var>]</a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Sunucunun dinleyeceÄŸi IP adresini ve portu belirler.</td></tr>
+<tr><td><a href="mpm_common.html#listenbacklog">ListenBacklog <var>kuyruk-uzunluğu</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Bekleyen bağlantılar kuyruğunun azami uzunluğunu
+  belirler</td></tr>
+<tr class="odd"><td><a href="mod_so.html#loadfile">LoadFile <em>filename</em> [<em>filename</em>] ...</a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Link in the named object file or library</td></tr>
+<tr><td><a href="mod_so.html#loadmodule">LoadModule <em>module filename</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Links in the object file or library, and adds to the list
+of active modules</td></tr>
+<tr class="odd"><td><a href="core.html#location">&lt;Location <var>URL-yolu</var>|<var>URL</var>&gt; ...
+&lt;/Location&gt;</a></td><td></td><td>sk</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">İçerdiği yönergeler sadece eşleşen URL’lere uygulanır.
+</td></tr>
+<tr><td><a href="core.html#locationmatch">&lt;LocationMatch
+    <var>düzifade</var>&gt; ... &lt;/LocationMatch&gt;</a></td><td></td><td>sk</td><td>Ç</td></tr><tr><td class="descr" colspan="4">İçerdiği yönergeler sadece düzenli ifadelerle eşleşen URL’lere
+uygulanır.</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#lockfile">LockFile <var>dosya</var></a></td><td> logs/accept.lock </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Apache HTTPd Sunucusunun aÄŸ soketlerinden istekleri kabul eden
+  çok sayıda çocuk süreci sıraya sokarken kullandığı kilit dosyasının yerini
+  belirler.</td></tr>
+<tr><td><a href="mod_log_config.html#logformat">LogFormat <var>format</var>|<var>nickname</var>
+[<var>nickname</var>]</a></td><td> "%h %l %u %t \"%r\" +</td><td>sk</td><td>T</td></tr><tr><td class="descr" colspan="4">Describes a format for use in a log file</td></tr>
+<tr class="odd"><td><a href="core.html#loglevel">LogLevel <var>seviye</var></a></td><td> warn </td><td>sk</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Hata günlüklerinin ayrıntı seviyesini belirler.</td></tr>
+<tr><td><a href="mpm_common.html#maxclients" id="M" name="M">MaxClients <var>sayı</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">İstekleri sunarken oluşturulacak çocuk süreçlerin azami sayısını
+  belirler.</td></tr>
+<tr class="odd"><td><a href="core.html#maxkeepaliverequests">MaxKeepAliveRequests <var>sayı</var></a></td><td> 100 </td><td>sk</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Bir kalıcı bağlantıda izin verilen istek sayısı</td></tr>
+<tr><td><a href="mpm_common.html#maxmemfree">MaxMemFree <var>kB-sayısı</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4"><code>free()</code> çağrılmaksızın ana bellek ayırıcının
+  ayırmasına izin verilen azami bellek miktarını belirler.</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild <var>sayı</var></a></td><td> 10000 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Tek bir çocuk sürecin ömrü boyunca işleme sokabileceği istek
+  sayısını sınırlamakta kullanılır.</td></tr>
+<tr><td><a href="beos.html#maxrequestsperthread">MaxRequestsPerThread <var>number</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Limit on the number of requests that an individual thread
+will handle during its life</td></tr>
+<tr class="odd"><td><a href="prefork.html#maxspareservers">MaxSpareServers <var>number</var></a></td><td> 10 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum number of idle child server processes</td></tr>
+<tr><td><a href="mpm_common.html#maxsparethreads">MaxSpareThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Boştaki azami evre sayısını belirler</td></tr>
+<tr class="odd"><td><a href="mpm_netware.html#maxthreads">MaxThreads <var>number</var></a></td><td> 2048 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Set the maximum number of worker threads</td></tr>
+<tr><td><a href="mod_mem_cache.html#mcachemaxobjectcount">MCacheMaxObjectCount <var>value</var></a></td><td> 1009 </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">The maximum number of objects allowed to be placed in the
+cache</td></tr>
+<tr class="odd"><td><a href="mod_mem_cache.html#mcachemaxobjectsize">MCacheMaxObjectSize <var>bytes</var></a></td><td> 10000 </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum size (in bytes) of a document allowed in the
+cache</td></tr>
+<tr><td><a href="mod_mem_cache.html#mcachemaxstreamingbuffer">MCacheMaxStreamingBuffer <var>size_in_bytes</var></a></td><td> the smaller of 1000 +</td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum amount of a streamed response to buffer in memory
+before declaring the response uncacheable</td></tr>
+<tr class="odd"><td><a href="mod_mem_cache.html#mcacheminobjectsize">MCacheMinObjectSize <var>bytes</var></a></td><td> 1 </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum size (in bytes) of a document to be allowed in the
+cache</td></tr>
+<tr><td><a href="mod_mem_cache.html#mcacheremovalalgorithm">MCacheRemovalAlgorithm LRU|GDSF</a></td><td> GDSF </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">The algorithm used to select documents for removal from the
+cache</td></tr>
+<tr class="odd"><td><a href="mod_mem_cache.html#mcachesize">MCacheSize <var>KBytes</var></a></td><td> 100 </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum amount of memory used by the cache in
+KBytes</td></tr>
+<tr><td><a href="mod_cern_meta.html#metadir">MetaDir <var>directory</var></a></td><td> .web </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Name of the directory to find CERN-style meta information
+files</td></tr>
+<tr class="odd"><td><a href="mod_cern_meta.html#metafiles">MetaFiles on|off</a></td><td> off </td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Activates CERN meta-file processing</td></tr>
+<tr><td><a href="mod_cern_meta.html#metasuffix">MetaSuffix <var>suffix</var></a></td><td> .meta </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">File name suffix for the file containg CERN-style
+meta information</td></tr>
+<tr class="odd"><td><a href="mod_mime_magic.html#mimemagicfile">MimeMagicFile <var>file-path</var></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enable MIME-type determination based on file contents
+using the specified magic file</td></tr>
+<tr><td><a href="prefork.html#minspareservers">MinSpareServers <var>number</var></a></td><td> 5 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Minimum number of idle child server processes</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#minsparethreads">MinSpareThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">İsteklerin ani artışında devreye girecek boştaki evrelerin asgari
+  sayısını belirler.</td></tr>
+<tr><td><a href="mod_file_cache.html#mmapfile">MMapFile <var>file-path</var> [<var>file-path</var>] ...</a></td><td></td><td>s</td><td>D</td></tr><tr><td class="descr" colspan="4">Map a list of files into memory at startup time</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#modmimeusepathinfo">ModMimeUsePathInfo On|Off</a></td><td> Off </td><td>d</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Tells <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code> to treat <code>path_info</code>
+components as part of the filename</td></tr>
+<tr><td><a href="mod_mime.html#multiviewsmatch">MultiviewsMatch Any|NegotiatedOnly|Filters|Handlers
+[Handlers|Filters]</a></td><td> NegotiatedOnly </td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">The types of files that will be included when searching for
+a matching file with MultiViews</td></tr>
+<tr class="odd"><td><a href="core.html#namevirtualhost" id="N" name="N">NameVirtualHost <var>adres</var>[:<var>port</var>]</a></td><td></td><td>s</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">İsme dayalı sanal konaklar için IP adresi belirtir</td></tr>
+<tr><td><a href="mod_proxy.html#noproxy">NoProxy <var>host</var> [<var>host</var>] ...</a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Hosts, domains, or networks that will be connected to
+directly</td></tr>
+<tr class="odd"><td><a href="mod_nw_ssl.html#nwssltrustedcerts">NWSSLTrustedCerts <var>filename</var> [<var>filename</var>] ...</a></td><td></td><td>s</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">List of additional client certificates</td></tr>
+<tr><td><a href="mod_nw_ssl.html#nwsslupgradeable">NWSSLUpgradeable [<var>IP-address</var>:]<var>portnumber</var></a></td><td></td><td>s</td><td>T</td></tr><tr><td class="descr" colspan="4">Allows a connection to be upgraded to an SSL connection upon request</td></tr>
+<tr class="odd"><td><a href="core.html#options" id="O" name="O">Options
+    [+|-]<var>seçenek</var> [[+|-]<var>seçenek</var>] ...</a></td><td> All </td><td>skdh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Belli bir dizinde geçerli olacak özellikleri yapılandırır.
+</td></tr>
+<tr><td><a href="mod_authz_host.html#order"> Order <var>ordering</var></a></td><td> Deny,Allow </td><td>dh</td><td>T</td></tr><tr><td class="descr" colspan="4">Controls the default access state and the order in which
+<code class="directive">Allow</code> and <code class="directive">Deny</code> are
+evaluated.</td></tr>
+<tr class="odd"><td><a href="mod_env.html#passenv" id="P" name="P">PassEnv <var>env-variable</var> [<var>env-variable</var>]
+...</a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Passes environment variables from the shell</td></tr>
+<tr><td><a href="mpm_common.html#pidfile">PidFile <var>dosya</var></a></td><td> logs/httpd.pid </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Ana sürecin süreç kimliğinin (PID) kaydedileceği dosyayı belirler.</td></tr>
+<tr class="odd"><td><a href="mod_echo.html#protocolecho">ProtocolEcho On|Off</a></td><td> Off </td><td>sk</td><td>D</td></tr><tr class="odd"><td class="descr" colspan="4">Turn the echo server on or off</td></tr>
+<tr><td><a href="mod_proxy.html#proxy">&lt;Proxy <var>wildcard-url</var>&gt; ...&lt;/Proxy&gt;</a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Container for directives applied to proxied resources</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxybadheader">ProxyBadHeader IsError|Ignore|StartBody</a></td><td> IsError </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Determines how to handle bad header lines in a
+response</td></tr>
+<tr><td><a href="mod_proxy.html#proxyblock">ProxyBlock *|<var>word</var>|<var>host</var>|<var>domain</var>
+[<var>word</var>|<var>host</var>|<var>domain</var>] ...</a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Words, hosts, or domains that are banned from being
+proxied</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxydomain">ProxyDomain <var>Domain</var></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Default domain name for proxied requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxyerroroverride">ProxyErrorOverride On|Off</a></td><td> Off </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Override error pages for proxied content</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxyftpdircharset">ProxyFtpDirCharset <var>character set</var></a></td><td> ISO-8859-1 </td><td>skd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Define the character set for proxied FTP listings</td></tr>
+<tr><td><a href="mod_proxy.html#proxyiobuffersize">ProxyIOBufferSize <var>bytes</var></a></td><td> 8192 </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Determine size of internal data throughput buffer</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxymatch">&lt;ProxyMatch <var>regex</var>&gt; ...&lt;/ProxyMatch&gt;</a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Container for directives applied to regular-expression-matched 
+proxied resources</td></tr>
+<tr><td><a href="mod_proxy.html#proxymaxforwards">ProxyMaxForwards <var>number</var></a></td><td> -1 </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximium number of proxies that a request can be forwarded
+through</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxypass">ProxyPass [<var>path</var>] !|<var>url</var> [<var>key=value</var>
+<var>key=value</var> ...]] [nocanon] [interpolate]</a></td><td></td><td>skd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maps remote servers into the local server URL-space</td></tr>
+<tr><td><a href="mod_proxy.html#proxypassinterpolateenv">ProxyPassInterpolateEnv On|Off</a></td><td> Off </td><td>skd</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable Environment Variable interpolation in Reverse Proxy configurations</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxypassmatch">ProxyPassMatch [<var>regex</var>] !|<var>url</var> [<var>key=value</var>
+	<var>[key=value</var> ...]]</a></td><td></td><td>skd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maps remote servers into the local server URL-space using regular expressions</td></tr>
+<tr><td><a href="mod_proxy.html#proxypassreverse">ProxyPassReverse [<var>path</var>] <var>url</var>
+[<var>interpolate</var>]</a></td><td></td><td>skd</td><td>E</td></tr><tr><td class="descr" colspan="4">Adjusts the URL in HTTP response headers sent from a reverse
+proxied server</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain <var>internal-domain</var>
+<var>public-domain</var> [<var>interpolate</var>]</a></td><td></td><td>skd</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Adjusts the Domain string in Set-Cookie headers from a reverse-
+proxied server</td></tr>
+<tr><td><a href="mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath <var>internal-path</var>
+<var>public-path</var> [<var>interpolate</var>]</a></td><td></td><td>skd</td><td>E</td></tr><tr><td class="descr" colspan="4">Adjusts the Path string in Set-Cookie headers from a reverse-
+proxied server</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxypreservehost">ProxyPreserveHost On|Off</a></td><td> Off </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Use incoming Host HTTP request header for proxy
+request</td></tr>
+<tr><td><a href="mod_proxy.html#proxyreceivebuffersize">ProxyReceiveBufferSize <var>bytes</var></a></td><td> 0 </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Network buffer size for proxied HTTP and FTP
+connections</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxyremote">ProxyRemote <var>match</var> <var>remote-server</var></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Remote proxy used to handle certain requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxyremotematch">ProxyRemoteMatch <var>regex</var> <var>remote-server</var></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Remote proxy used to handle requests matched by regular
+expressions</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxyrequests">ProxyRequests On|Off</a></td><td> Off </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables forward (standard) proxy requests</td></tr>
+<tr><td><a href="mod_proxy.html#proxyset">ProxySet <var>url</var> <var>key=value [key=value ...]</var></a></td><td></td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4">Set various Proxy balancer or member parameters</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxystatus">ProxyStatus Off|On|Full</a></td><td> Off </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Show Proxy LoadBalancer status in mod_status</td></tr>
+<tr><td><a href="mod_proxy.html#proxytimeout">ProxyTimeout <var>seconds</var></a></td><td> 300 </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Network timeout for proxied requests</td></tr>
+<tr class="odd"><td><a href="mod_proxy.html#proxyvia">ProxyVia On|Off|Full|Block</a></td><td> Off </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Information provided in the <code>Via</code> HTTP response
+header for proxied requests</td></tr>
+<tr><td><a href="mod_autoindex.html#readmename" id="R" name="R">ReadmeName <var>filename</var></a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the end
+of the index listing</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#receivebuffersize">ReceiveBufferSize <var>bayt-sayısı</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">TCP alım tamponu boyu</td></tr>
+<tr><td><a href="mod_alias.html#redirect">Redirect [<var>status</var>] <var>URL-path</var>
+<var>URL</var></a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Sends an external redirect asking the client to fetch
+a different URL</td></tr>
+<tr class="odd"><td><a href="mod_alias.html#redirectmatch">RedirectMatch [<var>status</var>] <var>regex</var>
+<var>URL</var></a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external redirect based on a regular expression match 
+of the current URL</td></tr>
+<tr><td><a href="mod_alias.html#redirectpermanent">RedirectPermanent <var>URL-path</var> <var>URL</var></a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Sends an external permanent redirect asking the client to fetch
+a different URL</td></tr>
+<tr class="odd"><td><a href="mod_alias.html#redirecttemp">RedirectTemp <var>URL-path</var> <var>URL</var></a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Sends an external temporary redirect asking the client to fetch
+a different URL</td></tr>
+<tr><td><a href="mod_mime.html#removecharset">RemoveCharset <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>kdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Removes any character set associations for a set of file
+extensions</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#removeencoding">RemoveEncoding <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>kdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content encoding associations for a set of file
+extensions</td></tr>
+<tr><td><a href="mod_mime.html#removehandler">RemoveHandler <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>kdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Removes any handler associations for a set of file
+extensions</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#removeinputfilter">RemoveInputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>kdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any input filter associations for a set of file
+extensions</td></tr>
+<tr><td><a href="mod_mime.html#removelanguage">RemoveLanguage <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>kdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Removes any language associations for a set of file
+extensions</td></tr>
+<tr class="odd"><td><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>kdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any output filter associations for a set of file
+extensions</td></tr>
+<tr><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
+...</a></td><td></td><td>kdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Removes any content type associations for a set of file
+extensions</td></tr>
+<tr class="odd"><td><a href="mod_headers.html#requestheader">RequestHeader set|append|merge|add|unset|edit <var>header</var>
+[<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
+<tr><td><a href="core.html#require">Require <var>öğe-adı</var> [<var>öğe-adı</var>] ...</a></td><td></td><td>dh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Bir özkaynağa erişebilecek kimliği doğrulanmış kullanıcıları belirler</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>
+<tr><td><a href="mod_rewrite.html#rewritecond"> RewriteCond
+      <em>TestString</em> <em>CondPattern</em></a></td><td></td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Defines a condition under which rewriting will take place
+</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewriteengine">RewriteEngine on|off</a></td><td> off </td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Enables or disables runtime rewriting engine</td></tr>
+<tr><td><a href="mod_rewrite.html#rewritelock">RewriteLock <em>file-path</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the name of the lock file used for <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code>
+synchronization</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewritelog">RewriteLog <em>file-path</em></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets the name of the file used for logging rewrite engine
+processing</td></tr>
+<tr><td><a href="mod_rewrite.html#rewriteloglevel">RewriteLogLevel <em>Level</em></a></td><td> 0 </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the verbosity of the log file used by the rewrite
+engine</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewritemap">RewriteMap <em>MapName</em> <em>MapType</em>:<em>MapSource</em>
+</a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines a mapping function for key-lookup</td></tr>
+<tr><td><a href="mod_rewrite.html#rewriteoptions">RewriteOptions <var>Options</var></a></td><td></td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets some special options for the rewrite engine</td></tr>
+<tr class="odd"><td><a href="mod_rewrite.html#rewriterule">RewriteRule
+      <em>Pattern</em> <em>Substitution</em> [<em>flags</em>]</a></td><td></td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Defines rules for the rewriting engine</td></tr>
+<tr><td><a href="core.html#rlimitcpu">RLimitCPU <var>saniye</var>|max [<var>saniye</var>|max]</a></td><td></td><td>skdh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Apache alt süreçleri tarafından çalıştırılan süreçlerin işlemci
+tüketimine sınırlama getirir.</td></tr>
+<tr class="odd"><td><a href="core.html#rlimitmem">RLimitMEM <var>bayt-sayısı</var>|max [<var>bayt-sayısı</var>|max]
+</a></td><td></td><td>skdh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Apache alt süreçleri tarafından çalıştırılan süreçlerin bellek
+tüketimine sınırlama getirir.</td></tr>
+<tr><td><a href="core.html#rlimitnproc">RLimitNPROC <var>sayı</var>|max [<var>sayı</var>|max]</a></td><td></td><td>skdh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Apache alt süreçleri tarafından çalıştırılabilecek süreç sayısına
+sınırlama getirir.</td></tr>
+<tr class="odd"><td><a href="core.html#satisfy" id="S" name="S">Satisfy Any|All</a></td><td> All </td><td>dh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Konak seviyesinde erişim denetimi ile kullanıcı kimlik doğrulaması arasındaki etkileşim</td></tr>
+<tr><td><a href="mpm_common.html#scoreboardfile">ScoreBoardFile <var>dosya-yolu</var></a></td><td> logs/apache_status </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Çocuk süreçler için eşgüdüm verisini saklamakta kullanılan
+  dosyanın yerini belirler.</td></tr>
+<tr class="odd"><td><a href="mod_actions.html#script">Script <var>method</var> <var>cgi-script</var></a></td><td></td><td>skd</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Activates a CGI script for a particular request
+method.</td></tr>
+<tr><td><a href="mod_alias.html#scriptalias">ScriptAlias <var>URL-path</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sk</td><td>T</td></tr><tr><td class="descr" colspan="4">Maps a URL to a filesystem location and designates the
+target as a CGI script</td></tr>
+<tr class="odd"><td><a href="mod_alias.html#scriptaliasmatch">ScriptAliasMatch <var>regex</var>
+<var>file-path</var>|<var>directory-path</var></a></td><td></td><td>sk</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Maps a URL to a filesystem location using a regular expression
+and designates the target as a CGI script</td></tr>
+<tr><td><a href="core.html#scriptinterpretersource">ScriptInterpreterSource Registry|Registry-Strict|Script</a></td><td> Script </td><td>skdh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">CGI betikleri için yorumlayıcı belirleme tekniği</td></tr>
+<tr class="odd"><td><a href="mod_cgi.html#scriptlog">ScriptLog <var>file-path</var></a></td><td></td><td>sk</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the CGI script error logfile</td></tr>
+<tr><td><a href="mod_cgi.html#scriptlogbuffer">ScriptLogBuffer <var>bytes</var></a></td><td> 1024 </td><td>sk</td><td>T</td></tr><tr><td class="descr" colspan="4">Maximum amount of PUT or POST requests that will be recorded
+in the scriptlog</td></tr>
+<tr class="odd"><td><a href="mod_cgi.html#scriptloglength">ScriptLogLength <var>bytes</var></a></td><td> 10385760 </td><td>sk</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Size limit of the CGI script logfile</td></tr>
+<tr><td><a href="mod_cgid.html#scriptsock">ScriptSock <var>file-path</var></a></td><td> logs/cgisock </td><td>s</td><td>T</td></tr><tr><td class="descr" colspan="4">The filename prefix of the socket to use for communication with
+the cgi daemon</td></tr>
+<tr class="odd"><td><a href="mod_nw_ssl.html#securelisten">SecureListen [<var>IP-address</var>:]<var>portnumber</var>
+<var>Certificate-Name</var> [MUTUAL]</a></td><td></td><td>s</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Enables SSL encryption for the specified port</td></tr>
+<tr><td><a href="mod_status.html#seerequesttail">SeeRequestTail On|Off</a></td><td> Off </td><td>s</td><td>T</td></tr><tr><td class="descr" colspan="4">Determine if mod_status displays the first 63 characters
+of a request or the last 63, assuming the request itself is greater than
+63 chars.</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#sendbuffersize">SendBufferSize <var>bayt-sayısı</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">TCP tamponu boyu</td></tr>
+<tr><td><a href="core.html#serveradmin">ServerAdmin <var>eposta-adresi</var>|<var>URL</var></a></td><td></td><td>sk</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Sunucunun hata iletilerinde istemciye göstereceği eposta adresi
+</td></tr>
+<tr class="odd"><td><a href="core.html#serveralias">ServerAlias <var>konakadı</var> [<var>konakadı</var>] ...</a></td><td></td><td>k</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">İstekleri isme dayalı sanal konaklarla eşleştirilirken
+kullanılacak konak adları için başka isimler belirtebilmeyi sağlar.
+</td></tr>
+<tr><td><a href="mpm_common.html#serverlimit">ServerLimit <var>sayı</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Ayarlanabilir süreç sayısının üst sınırını belirler.</td></tr>
+<tr class="odd"><td><a href="core.html#servername">ServerName [<var>şema</var>://]<var>tam-nitelenmiş-alan-adı</var>[:<var>port</var>]
+</a></td><td></td><td>sk</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Sunucunun özdeşleşeceği konak ismi ve port.</td></tr>
+<tr><td><a href="core.html#serverpath">ServerPath <var>URL-yolu</var></a></td><td></td><td>k</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Uyumsuz bir tarayıcı tarafından erişilmesi için bir isme dayalı sanal konak için meşru URL yolu</td></tr>
+<tr class="odd"><td><a href="core.html#serverroot">ServerRoot <var>dizin-yolu</var></a></td><td> /usr/local/apache </td><td>s</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Sunucu yapılandırması için kök dizin</td></tr>
+<tr><td><a href="core.html#serversignature">ServerSignature On|Off|EMail</a></td><td> Off </td><td>skdh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Sunucu tarafından üretilen belgelerin dipnotunu ayarlar.
+</td></tr>
+<tr class="odd"><td><a href="core.html#servertokens">ServerTokens Major|Minor|Min[imal]|Prod[uctOnly]|OS|Full</a></td><td> Full </td><td>s</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4"><code>Server</code> HTTP yanıt başlığını yapılandırır.
+</td></tr>
+<tr><td><a href="mod_env.html#setenv">SetEnv <var>env-variable</var> <var>value</var></a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Sets environment variables</td></tr>
+<tr class="odd"><td><a href="mod_setenvif.html#setenvif">SetEnvIf <em>attribute
+    regex [!]env-variable</em>[=<em>value</em>]
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables based on attributes of the request
+</td></tr>
+<tr><td><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase <em>attribute regex 
+        [!]env-variable</em>[=<em>value</em>]
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Sets environment variables based on attributes of the request
+without respect to case</td></tr>
+<tr class="odd"><td><a href="core.html#sethandler">SetHandler <var>eylemci-ismi</var>|None</a></td><td></td><td>skdh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Eşleşen tüm dosyaların belli bir eylemci tarafından işlenmesine
+sebep olur.</td></tr>
+<tr><td><a href="core.html#setinputfilter">SetInputFilter <var>süzgeç</var>[;<var>süzgeç</var>...]</a></td><td></td><td>skdh</td><td>Ç</td></tr><tr><td class="descr" colspan="4">POST girdilerini ve istemci isteklerini işleyecek süzgeçleri
+belirler.</td></tr>
+<tr class="odd"><td><a href="core.html#setoutputfilter">SetOutputFilter <var>süzgeç</var>[;<var>süzgeç</var>...]</a></td><td></td><td>skdh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Sunucunun yanıtlarını işleyecek süzgeçleri belirler.</td></tr>
+<tr><td><a href="mod_include.html#ssienableaccess">SSIEnableAccess on|off</a></td><td> off </td><td>dh</td><td>T</td></tr><tr><td class="descr" colspan="4">Enable the -A flag during conditional flow control processing.</td></tr>
+<tr class="odd"><td><a href="mod_include.html#ssiendtag">SSIEndTag <var>tag</var></a></td><td> "--&gt;" </td><td>sk</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">String that ends an include element</td></tr>
+<tr><td><a href="mod_include.html#ssierrormsg">SSIErrorMsg <var>message</var></a></td><td> "[an error occurred +</td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Error message displayed when there is an SSI
+error</td></tr>
+<tr class="odd"><td><a href="mod_include.html#ssistarttag">SSIStartTag <var>tag</var></a></td><td> "&lt;!--#" </td><td>sk</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">String that starts an include element</td></tr>
+<tr><td><a href="mod_include.html#ssitimeformat">SSITimeFormat <var>formatstring</var></a></td><td> "%A, %d-%b-%Y %H:%M +</td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Configures the format in which date strings are
+displayed</td></tr>
+<tr class="odd"><td><a href="mod_include.html#ssiundefinedecho">SSIUndefinedEcho <var>string</var></a></td><td> "(none)" </td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">String displayed when an unset variable is echoed</td></tr>
+<tr><td><a href="mod_ssl.html#sslcacertificatefile">SSLCACertificateFile <em>file-path</em></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+for Client Auth</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslcacertificatepath">SSLCACertificatePath <em>directory-path</em></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+Client Auth</td></tr>
+<tr><td><a href="mod_ssl.html#sslcadnrequestfile">SSLCADNRequestFile <em>file-path</em></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+for defining acceptable CA names</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslcadnrequestpath">SSLCADNRequestPath <em>directory-path</em></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+defining acceptable CA names</td></tr>
+<tr><td><a href="mod_ssl.html#sslcarevocationfile">SSLCARevocationFile <em>file-path</em></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
+Client Auth</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslcarevocationpath">SSLCARevocationPath <em>directory-path</em></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
+Client Auth</td></tr>
+<tr><td><a href="mod_ssl.html#sslcertificatechainfile">SSLCertificateChainFile <em>file-path</em></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">File of PEM-encoded Server CA Certificates</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslcertificatefile">SSLCertificateFile <em>file-path</em></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Server PEM-encoded X.509 Certificate file</td></tr>
+<tr><td><a href="mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile <em>file-path</em></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Server PEM-encoded Private Key file</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslciphersuite">SSLCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
+handshake</td></tr>
+<tr><td><a href="mod_ssl.html#sslcryptodevice">SSLCryptoDevice <em>engine</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Enable use of a cryptographic hardware accelerator</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslengine">SSLEngine on|off|optional</a></td><td> off </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">SSL Engine Operation Switch</td></tr>
+<tr><td><a href="mod_ssl.html#sslhonorcipherorder">SSLHonorCiperOrder <em>flag</em></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Option to prefer the server's cipher preference order</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslmutex">SSLMutex <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Semaphore for internal mutual exclusion of 
+operations</td></tr>
+<tr><td><a href="mod_ssl.html#ssloptions">SSLOptions [+|-]<em>option</em> ...</a></td><td></td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure various SSL engine run-time options</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslpassphrasedialog">SSLPassPhraseDialog <em>type</em></a></td><td> builtin </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of pass phrase dialog for encrypted private 
+keys</td></tr>
+<tr><td><a href="mod_ssl.html#sslprotocol">SSLProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure usable SSL protocol flavors</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxycacertificatefile">SSLProxyCACertificateFile <em>file-path</em></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA Certificates 
+for Remote Server Auth</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxycacertificatepath">SSLProxyCACertificatePath <em>directory-path</em></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA Certificates for 
+Remote Server Auth</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxycarevocationfile">SSLProxyCARevocationFile <em>file-path</em></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded CA CRLs for 
+Remote Server Auth</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxycarevocationpath">SSLProxyCARevocationPath <em>directory-path</em></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded CA CRLs for 
+Remote Server Auth</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyciphersuite">SSLProxyCipherSuite <em>cipher-spec</em></a></td><td> ALL:!ADH:RC4+RSA:+H +</td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Cipher Suite available for negotiation in SSL 
+proxy handshake</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxyengine">SSLProxyEngine on|off</a></td><td> off </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">SSL Proxy Engine Operation Switch</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxymachinecertificatefile">SSLProxyMachineCertificateFile <em>filename</em></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">File of concatenated PEM-encoded client certificates and keys to be used by the proxy</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxymachinecertificatepath">SSLProxyMachineCertificatePath <em>directory</em></a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Directory of PEM-encoded client certificates and keys to be used by the proxy</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyprotocol">SSLProxyProtocol [+|-]<em>protocol</em> ...</a></td><td> all </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure usable SSL protocol flavors for proxy usage</td></tr>
+<tr><td><a href="mod_ssl.html#sslproxyverify">SSLProxyVerify <em>level</em></a></td><td> none </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of remote server Certificate verification</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslproxyverifydepth">SSLProxyVerifyDepth <em>number</em></a></td><td> 1 </td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum depth of CA Certificates in Remote Server
+Certificate verification</td></tr>
+<tr><td><a href="mod_ssl.html#sslrandomseed">SSLRandomSeed <em>context</em> <em>source</em> 
+[<em>bytes</em>]</a></td><td></td><td>s</td><td>E</td></tr><tr><td class="descr" colspan="4">Pseudo Random Number Generator (PRNG) seeding 
+source</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslrequire">SSLRequire <em>expression</em></a></td><td></td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Allow access only when an arbitrarily complex 
+boolean expression is true</td></tr>
+<tr><td><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Deny access when SSL is not used for the 
+HTTP request</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslsessioncache">SSLSessionCache <em>type</em></a></td><td> none </td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Type of the global/inter-process SSL Session 
+Cache</td></tr>
+<tr><td><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout <em>seconds</em></a></td><td> 300 </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Number of seconds before an SSL session expires
+in the Session Cache</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslusername">SSLUserName <em>varname</em></a></td><td></td><td>sdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Variable name to determine user name</td></tr>
+<tr><td><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient <em>level</em></a></td><td> none </td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Type of Client Certificate verification</td></tr>
+<tr class="odd"><td><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth <em>number</em></a></td><td> 1 </td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum depth of CA Certificates in Client 
+Certificate verification</td></tr>
+<tr><td><a href="mpm_common.html#startservers">StartServers <var>sayı</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Sunucunun başlatılması sırasında oluşturulan çocuk süreçlerin
+  sayısını belirler.</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#startthreads">StartThreads <var>sayı</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Sunucunun başlatılması sırasında oluşturulan evrelerin sayısını
+  belirler.</td></tr>
+<tr><td><a href="mod_substitute.html#substitute">Substitute <var>s/pattern/substitution/[infq]</var></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Pattern to filter the response content</td></tr>
+<tr class="odd"><td><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup <em>User Group</em></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">User and group permissions for CGI programs</td></tr>
+<tr><td><a href="mpm_common.html#threadlimit" id="T" name="T">ThreadLimit <var>sayı</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Çocuk süreç başına ayarlanabilir evre sayısının üst sınırını
+  belirler.</td></tr>
+<tr class="odd"><td><a href="mpm_common.html#threadsperchild">ThreadsPerChild <var>sayı</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Her çocuk süreç tarafından oluşturulan evrelerin sayısını
+  belirler.</td></tr>
+<tr><td><a href="mpm_common.html#threadstacksize">ThreadStackSize <var>boyut</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">İstemci bağlantılarını elde eden evreler tarafından kullanılan
+  yığıtın bayt cinsinden uzunluğunu belirler.</td></tr>
+<tr class="odd"><td><a href="core.html#timeout">TimeOut <var>saniye</var></a></td><td> 300 </td><td>sk</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Bir istek için başarısız olmadan önce belirli olayların
+gerçekleşmesi için sunucunun geçmesini bekleyeceği süre.</td></tr>
+<tr><td><a href="core.html#traceenable">TraceEnable <var>[on|off|extended]</var></a></td><td> on </td><td>s</td><td>Ç</td></tr><tr><td class="descr" colspan="4"><code>TRACE</code> isteklerinde davranış şeklini belirler
+</td></tr>
+<tr class="odd"><td><a href="mod_log_config.html#transferlog">TransferLog <var>file</var>|<var>pipe</var></a></td><td></td><td>sk</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Specify location of a log file</td></tr>
+<tr><td><a href="mod_mime.html#typesconfig">TypesConfig <var>file-path</var></a></td><td> conf/mime.types </td><td>s</td><td>T</td></tr><tr><td class="descr" colspan="4">The location of the <code>mime.types</code> file</td></tr>
+<tr class="odd"><td><a href="mod_env.html#unsetenv" id="U" name="U">UnsetEnv <var>env-variable</var> [<var>env-variable</var>]
+...</a></td><td></td><td>skdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Removes variables from the environment</td></tr>
+<tr><td><a href="core.html#usecanonicalname">UseCanonicalName On|Off|DNS</a></td><td> Off </td><td>skd</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Sunucunun kendi adını ve portunu nasıl belirleyeceğini ayarlar
+</td></tr>
+<tr class="odd"><td><a href="core.html#usecanonicalphysicalport">UseCanonicalPhysicalPort On|Off</a></td><td> Off </td><td>skd</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Sunucunun kendi adını ve portunu nasıl belirleyeceğini ayarlar
+</td></tr>
+<tr><td><a href="mpm_common.html#user">User <var>unix-kullanıcısı</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">İsteklere yanıt verecek sunucunun ait olacağı kullanıcıyı
+  belirler.</td></tr>
+<tr class="odd"><td><a href="mod_userdir.html#userdir">UserDir <em>directory-filename</em> [<em>directory-filename</em>] ...
+</a></td><td></td><td>sk</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Location of the user-specific directories</td></tr>
+<tr><td><a href="mod_vhost_alias.html#virtualdocumentroot" id="V" name="V">VirtualDocumentRoot <em>interpolated-directory</em>|none</a></td><td> none </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the document root
+for a given virtual host</td></tr>
+<tr class="odd"><td><a href="mod_vhost_alias.html#virtualdocumentrootip">VirtualDocumentRootIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the document root
+for a given virtual host</td></tr>
+<tr><td><a href="core.html#virtualhost">&lt;VirtualHost
+    <var>adres</var>[:<var>port</var>] [<var>adres</var>[:<var>port</var>]]
+    ...&gt; ... &lt;/VirtualHost&gt;</a></td><td></td><td>s</td><td>Ç</td></tr><tr><td class="descr" colspan="4">Sadece belli bir konak ismine ve porta uygulanacak yönergeleri barındırır.</td></tr>
+<tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptalias">VirtualScriptAlias <em>interpolated-directory</em>|none</a></td><td> none </td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Dynamically configure the location of the CGI directory for
+a given virtual host</td></tr>
+<tr><td><a href="mod_vhost_alias.html#virtualscriptaliasip">VirtualScriptAliasIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Dynamically configure the location of the cgi directory for
+a given virtual host</td></tr>
+<tr class="odd"><td><a href="mpm_winnt.html#win32disableacceptex" id="W" name="W">Win32DisableAcceptEx</a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Use accept() rather than AcceptEx() to accept network connections</td></tr>
+<tr><td><a href="mod_include.html#xbithack" id="X" name="X">XBitHack on|off|full</a></td><td> off </td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Parse SSI directives in files with the execute bit
+set</td></tr>
+</table></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="../de/mod/quickreference.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/quickreference.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/mod/quickreference.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="../ja/mod/quickreference.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/mod/quickreference.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../ru/mod/quickreference.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/mod/quickreference.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/worker.html b/docs/manual/mod/worker.html
index 1d429299..42c3f80a 100644
--- a/docs/manual/mod/worker.html
+++ b/docs/manual/mod/worker.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: worker.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -6,6 +8,6 @@ URI: worker.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: worker.html.ja.euc-jp
+URI: worker.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mod/worker.html.de b/docs/manual/mod/worker.html.de
index 83966b54..50f7e9a9 100644
--- a/docs/manual/mod/worker.html.de
+++ b/docs/manual/mod/worker.html.de
@@ -165,6 +165,6 @@
 <a href="../en/mod/worker.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/worker.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/worker.html.en b/docs/manual/mod/worker.html.en
index c291798c..21d81739 100644
--- a/docs/manual/mod/worker.html.en
+++ b/docs/manual/mod/worker.html.en
@@ -172,6 +172,6 @@ uses</a></li>
 <a href="../en/mod/worker.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/worker.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/worker.html.ja.euc-jp b/docs/manual/mod/worker.html.ja.euc-jp
deleted file mode 100644
index b1db8327..00000000
--- a/docs/manual/mod/worker.html.ja.euc-jp
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>worker - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥â¥¸¥å¡¼¥ë</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache MPM worker</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../de/mod/worker.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="../en/mod/worker.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/worker.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">ÀâÌÀ:</a></th><td>¥Þ¥ë¥Á¥¹¥ì¥Ã¥É¤È¥Þ¥ë¥Á¥×¥í¥»¥¹¤Î¥Ï¥¤¥Ö¥ê¥Ã¥É·¿
-¥¦¥§¥Ö¥µ¡¼¥Ð¤ò¼ÂÁõ¤·¤¿¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë</td></tr>
-<tr><th><a href="module-dict.html#Status">¥¹¥Æ¡¼¥¿¥¹:</a></th><td>MPM</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">¥â¥¸¥å¡¼¥ë¼±ÊÌ»Ò:</a></th><td>mpm_worker_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">¥½¡¼¥¹¥Õ¥¡¥¤¥ë:</a></th><td>worker.c</td></tr></table>
-<h3>³µÍ×</h3>
-
-    <p>¤³¤Î¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë (MPM) 
-    ¤Ï¡¢¥Þ¥ë¥Á¥¹¥ì¥Ã¥É¤È¥Þ¥ë¥Á¥×¥í¥»¥¹¤Î¥Ï¥¤¥Ö¥ê¥Ã¥É·¿¥µ¡¼¥Ð¤ò
-    ¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£¥ê¥¯¥¨¥¹¥È¤Î±þÅú¤Ë¥¹¥ì¥Ã¥É¤ò»È¤¦¤È¡¢
-    ¥×¥í¥»¥¹¥Ù¡¼¥¹¤Î¥µ¡¼¥Ð¤è¤ê¤â¾¯¤Ê¤¤¥·¥¹¥Æ¥à»ñ¸»¤Ç¡¢
-    ¿¤¯¤Î¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤µ¤é¤Ë¡¢Â¿¤¯¤Î¥¹¥ì¥Ã¥É¤ò»ý¤Ã¤¿Ê£¿ô¤Î¥×¥í¥»¥¹¤ò°Ý»ý¤¹¤ë¤³¤È¤Ç¡¢
-    ¥×¥í¥»¥¹¥Ù¡¼¥¹¤Î¥µ¡¼¥Ð¤Î»ý¤Ä°ÂÄêÀ­¤òÊÝ»ý¤·¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î MPM ¤òÀ©¸æ¤¹¤ë¤Î¤Ë»È¤ï¤ì¤ëºÇ¤â½ÅÍפʥǥ£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-    <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code> ¤È
-    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> ¤Ç¤¹¡£
-    <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code> ¤Ï
-    ³Æ»Ò¥×¥í¥»¥¹¤ÇÍÑ°Õ¤µ¤ì¤ë¥¹¥ì¥Ã¥É¿ô¤òÀ©¸æ¤·¤Æ¡¢
-    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> ¤Ï
-    µ¯Æ°¤µ¤ì¤ë¥¹¥ì¥Ã¥É¤ÎÁí¿ô¤ÎºÇÂçÃͤòÀ©¸Â¤·¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><h3 class="directives">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</h3>
-<ul id="toc">
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#acceptmutex">AcceptMutex</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#enableexceptionhook">EnableExceptionHook</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#group">Group</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listenbacklog">ListenBacklog</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#lockfile">LockFile</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxclients">MaxClients</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#minsparethreads">MinSpareThreads</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#pidfile">PidFile</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#scoreboardfile">ScoreBoardFile</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#serverlimit">ServerLimit</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startservers">StartServers</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadlimit">ThreadLimit</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadsperchild">ThreadsPerChild</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadstacksize">ThreadStackSize</a></li>
-<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
-</ul>
-<h3>¥È¥Ô¥Ã¥¯</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#how-it-works">Æ°ºîÊýË¡</a></li>
-</ul><h3>»²¾È</h3>
-<ul class="seealso">
-<li><a href="../bind.html">Apache 
-¤Î»ÈÍѤ¹¤ë¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤ÎÀßÄê</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="how-it-works" id="how-it-works">Æ°ºîÊýË¡</a></h2>
-    <p>°ì¤Ä¤ÎÀ©¸æÍÑ¥×¥í¥»¥¹ (¿Æ) ¤¬»Ò¥×¥í¥»¥¹¤òµ¯Æ°¤·¤Þ¤¹¡£
-    »Ò¥×¥í¥»¥¹¤Ï
-    <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄꤵ¤ì¤¿°ìÄê¿ô¤Î¥µ¡¼¥Ð¥¹¥ì¥Ã¥É¤ÈÀܳ¤ò
-    listen ¤¹¤ë¥¹¥ì¥Ã¥É¤ò°ì¤Äºî¤ê¤Þ¤¹¡£
-    Listener ¥¹¥ì¥Ã¥É¤ÏÀܳ¤¬Í褿¤È¤­¤Ë¥µ¡¼¥Ð¥×¥í¥»¥¹¤ËÅϤ·¤Þ¤¹¡£</p>
-
-    <p>Apache ¤Ï<dfn>¥¹¥Ú¥¢¤Î</dfn>¡¢¤Ä¤Þ¤ê¥¢¥¤¥É¥ë¤Ê¥µ¡¼¥Ð¥¹¥ì¥Ã¥É¤Î
-    ¥×¡¼¥ë¤ò¾ï¤Ë°Ý»ý¤·¤Æ¤¤¤Æ¡¢¤½¤ì¤é¤ÏÆþ¤Ã¤Æ¤¯¤ë¥ê¥¯¥¨¥¹¥È¤Ë
-    Åú¤¨¤é¤ì¤ë¤è¤¦¤ËÂÔµ¡¤·¤Æ¤¤¤Þ¤¹¡£
-    ¤³¤Î¤è¤¦¤Ë¤·¤Æ¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ï¥ê¥¯¥¨¥¹¥È¤Î±þÅú¤¬ÆÀ¤é¤ì¤ë¤è¤¦¤Ë¤Ê¤ë¤¿¤á¤Ë
-    ¿·¤·¤¤¥¹¥ì¥Ã¥É¤ä¥×¥í¥»¥¹¤¬À¸À®¤µ¤ì¤ë¤Î¤ò
-    ÂÔ¤¿¤Ê¤¯¤Æ¤â¤è¤¤¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-    µ¯Æ°½é´ü»þ¤Î¥×¥í¥»¥¹Áí¿ô¤Ï¡¢
-    <code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÀßÄꤵ¤ì¤Þ¤¹¡£¤½¤Î¸å¤Î²ÔƯÃæ¤Ë¡¢
-    Apache ¤ÏÁ´¥×¥í¥»¥¹¤Î¥¢¥¤¥É¥ë¥¹¥ì¥Ã¥É¤Î¹ç·×¿ô¤ò¸«ÀѤâ¤Ã¤Æ¡¢
-    <code class="directive"><a href="../mod/mpm_common.html#minsparethreads">MinSpareThreads</a></code> ¤È
-    <code class="directive"><a href="../mod/mpm_common.html#maxsparethreads">MaxSpareThreads</a></code>
-    ¤Ç»ØÄꤵ¤ì¤¿ÈϰϤÎÃæ¤Ë¤³¤Î¿ô¤¬¼ý¤Þ¤ë¤è¤¦¤Ë fork ¤·¤¿¤ê
-    kill ¤·¤¿¤ê¤·¤Þ¤¹¡£¤³¤ÎÁàºî¤ÏÈó¾ï¤Ë¼«Î§Åª¤Ê¤Î¤Ç¡¢
-    ¤³¤ì¤é¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¥Ç¥Õ¥©¥ë¥ÈÃͤ«¤éÊѹ¹¤¹¤ëɬÍפÏ
-    ¤á¤Ã¤¿¤Ë¤Ê¤¤¤Ç¤·¤ç¤¦¡£
-    Ʊ»þ¤Ë±þÅú¤¹¤ë¤³¤È¤Î¤Ç¤­¤ë¥¯¥é¥¤¥¢¥ó¥È¿ô¤ÎºÇÂç¿ô
-    (¤Ä¤Þ¤êÁ´¥×¥í¥»¥¹Ãæ¤ÎÁí¥¹¥ì¥Ã¥É¿ô¤ÎºÇÂçÃÍ) ¤Ï
-    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç·èÄꤵ¤ì¤Þ¤¹¡£
-    ³èÆ°Ãæ¤Î»Ò¥×¥í¥»¥¹¿ô¤ÎºÇÂçÃͤÏ
-    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> ¤ò
-    <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code> ¤Ç³ä¤Ã¤¿
-    ¤â¤Î¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-    
-    <p>³èÆ°Ãæ¤Î»Ò¥×¥í¥»¥¹¤Î¿ô¤È»Ò¥×¥í¥»¥¹Ãæ¤Î¥µ¡¼¥Ð¥¹¥ì¥Ã¥É¤Î¿ô¤Î±Û¤¨¤é¤ì¤Ê¤¤
-    ¾å¸Â¤òÀßÄꤹ¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Æó¤Ä¤¢¤ê¤Þ¤¹¡£¤³¤ì¤é¤Ï¥µ¡¼¥Ð¤ò
-    ´°Á´¤ËÄä»ß¤·¤Æ¡¢ºÆµ¯Æ°¤¹¤ë¤³¤È¤Ç¤·¤«Êѹ¹¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
-    <code class="directive"><a href="../mod/mpm_common.html#serverlimit&#10;    ">ServerLimit
-    </a></code> ¤Ï³èÆ°Ãæ¤Î»Ò¥×¥í¥»¥¹¤Î±Û¤¨¤é¤ì¤Ê¤¤¾å¸Â¤òÀßÄꤷ¡¢
-    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö
-    ¤ÎÃͤò <code class="directive"><a href="../mod/mpm_common.html#&#10;    threadsperchild">
-    ThreadsPerChild</a></code> ¤ÎÃͤdzä¤Ã¤¿ÃͰʾå¤Ç¤¢¤ë
-    ɬÍפ¬¤¢¤ê¤Þ¤¹¡£<code class="directive"><a href="../mod/mpm_common.html#threadlimit">ThreadLimit</a></code> ¤Ï
-    ¥µ¡¼¥Ð¥¹¥ì¥Ã¥É¤Î±Û¤¨¤é¤ì¤Ê¤¤¾å¸Â¤Ç¡¢<code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-    ÃͰʾå¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È°Ê³°¤ÎÃͤò»ØÄꤹ¤ë¾ì¹ç¤Ï
-    ¾¤Î <code class="module"><a href="../mod/worker.html">worker</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤è¤ê¤âÁ°¤Ë½ñ¤«¤ì¤Æ¤¤¤ë
-    ɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>³èÆ°Ãæ¤Î»Ò¥×¥í¥»¥¹·²¤Ë²Ã¤¨¤Æ¡¢¾¯¤Ê¤¯¤È¤â°ì¤Ä¤Î¥µ¡¼¥Ð¥¹¥ì¥Ã¥É¤¬
-    ´û¸¤Î¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤ÎÀܳ¤ò°·¤Ã¤Æ¤¤¤ë½ªÎ»¤·¤è¤¦¤È¤·¤Æ¤¤¤ë
-    »Ò¥×¥í¥»¥¹¤¬¤¢¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£½ªÎ»Ãæ¤Î¥×¥í¥»¥¹¤Ï <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> ¤Ç»ØÄꤵ¤ì¤¿¿ô¤Þ¤Ç
-    ¸ºß¤Ç¤­¤Þ¤¹¤¬¡¢¼ÂºÝ¤Ë´üÂÔ¤µ¤ì¤ë¿ô¤Ï¤º¤Ã¤È¾¯¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£¤³¤Î
-    ¿¶Éñ¤¤¤Ï³Æ»Ò¥×¥í¥»¥¹¤ò½ªÎ»¤µ¤»¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤³¤È¤Ç²óÈò¤Ç¤­¤Þ¤¹¡£
-    ¤³¤ì¤Ï°Ê²¼¤ÎÍͤˤ·¤Æ¼Â¸½¤Ç¤­¤Þ¤¹¡£</p>
-     
-    <ul>
-      <li><code class="directive"><a href="../mod/mpm_common.html#&#10;      maxrequestsperchild">
-      MaxRequestsPerChild</a></code> ¤ÎÃͤò 0 ¤ËÀßÄꤹ¤ë</li>
-
-      <li><code class="directive"><a href="../mod/mpm_common.html#&#10;      maxsparethreads">
-      MaxSpareThreads</a></code> ¤ÎÃͤò
-      <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
-      ¤ÈƱ¤¸Ãͤˤ¹¤ë</li>
-    </ul>
-
-    <p><code class="module"><a href="../mod/worker.html">worker</a></code> MPM ¤Îŵ·¿Åª¤Ê¥×¥í¥»¥¹¡¦¥¹¥ì¥Ã¥ÉÀ©¸æ¤Î
-    ÀßÄê¤Ç¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <div class="example"><p><code>
-      ServerLimit         16<br />
-      StartServers         2<br />
-      MaxClients         150<br />
-      MinSpareThreads     25<br />
-      MaxSpareThreads     75<br />
-      ThreadsPerChild     25
-    </code></p></div>
-
-    <p>Ä̾ï Unix ¤Ç¤Ï¿Æ¥×¥í¥»¥¹¤Ï 80 È֥ݡ¼¥È¤Ë¥Ð¥¤¥ó¥É¤¹¤ë¤¿¤á¤Ë
-    <code>root</code> ¤Çµ¯Æ°¤µ¤ì¤Þ¤¹¤¬¡¢»Ò¥×¥í¥»¥¹¤ä¥¹¥ì¥Ã¥É¤Ï
-    ¤â¤Ã¤ÈÄ㤤¸¢¸Â¤Î¥æ¡¼¥¶¤Ç Apache ¤Ë¤è¤Ã¤Æµ¯Æ°¤µ¤ì¤Þ¤¹¡£
-    <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> ¤È
-    <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    Apache ¤Î»Ò¥×¥í¥»¥¹¤Î¸¢¸Â¤òÀßÄꤹ¤ë¤Î¤ËÍѤ¤¤é¤ì¤Þ¤¹¡£
-    »Ò¥×¥í¥»¥¹¤Ï¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤ë¥³¥ó¥Æ¥ó¥ÄÁ´¤Æ¤òÆɤá¤Ê¤¤¤È¤¤¤±¤Þ¤»¤ó¤¬¡¢
-    ²Äǽ¤Ê¸Â¤êɬÍ׺Ǿ®¸Â¤Î¸¢¸Â¤Î¤ß¤ò»ý¤Ã¤Æ¤¤¤ë¤è¤¦¤Ë¤¹¤ë¤Ù¤­¤Ç¤¹¡£
-    ¤µ¤é¤Ë¡¢<code class="program"><a href="../programs/suexec.html">suexec</a></code>
-    ¤¬»ÈÍѤµ¤ì¤Æ¤¤¤Ê¤¤¸Â¤ê¡¢¤³¤ì¤é¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    CGI ¥¹¥¯¥ê¥×¥È¤Ç·Ñ¾µ¤µ¤ì¤ë¸¢¸Â¤âÀßÄꤷ¤Þ¤¹¡£</p>
-
-    <p><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></code>
-    ¤Ï¡¢¸Å¤¤¥×¥í¥»¥¹¤òÄä»ß¤·¤Æ¿·¤·¤¤¥×¥í¥»¥¹¤òµ¯Æ°¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢
-    ¤É¤ÎÄøÅÙ¤ÎÉÑÅ٤ǥµ¡¼¥Ð¤¬¥×¥í¥»¥¹¤ò¥ê¥µ¥¤¥¯¥ë¤¹¤ë¤«¤òÀ©¸æ¤·¤Þ¤¹¡£</p>
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../de/mod/worker.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="../en/mod/worker.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/mod/worker.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/worker.html.ja.utf8 b/docs/manual/mod/worker.html.ja.utf8
new file mode 100644
index 00000000..b1010d0f
--- /dev/null
+++ b/docs/manual/mod/worker.html.ja.utf8
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>worker - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">モジュール</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache MPM worker</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../de/mod/worker.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/worker.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/worker.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>マル�スレッド�マル�プロセス��イブリッド型
+ウェブサー�を実装��マル�プロセッシングモジュール</td></tr>
+<tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>MPM</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">モジュール識別�:</a></th><td>mpm_worker_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">ソースファイル:</a></th><td>worker.c</td></tr></table>
+<h3>概�</h3>
+
+    <p>��マル�プロセッシングモジュール (MPM) 
+    ��マル�スレッド�マル�プロセス��イブリッド型サー�を
+    実装�����。リクエスト�応答�スレッドを使���
+    プロセスベース�サー�よりも少��システム資���
+    多��リクエスト�応答�る�������。
+    �ら��多��スレッドを���複数�プロセスを維��る����
+    プロセスベース�サー����安定性を�������。</p>
+
+    <p>�� MPM を制御�る��使�れる最も���ディレクティブ��
+    <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code> �
+    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> ��。
+    <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code> �
+    ��プロセス�用��れるスレッド数を制御���
+    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> �
+    起動�れるスレッド��数�最大値を制����。</p>
+</div>
+<div id="quickview"><h3 class="directives">ディレクティブ</h3>
+<ul id="toc">
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#acceptmutex">AcceptMutex</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#enableexceptionhook">EnableExceptionHook</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#group">Group</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listen">Listen</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#listenbacklog">ListenBacklog</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#lockfile">LockFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxclients">MaxClients</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxmemfree">MaxMemFree</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#minsparethreads">MinSpareThreads</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#pidfile">PidFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#receivebuffersize">ReceiveBufferSize</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#scoreboardfile">ScoreBoardFile</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#sendbuffersize">SendBufferSize</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#serverlimit">ServerLimit</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#startservers">StartServers</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadlimit">ThreadLimit</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadsperchild">ThreadsPerChild</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#threadstacksize">ThreadStackSize</a></li>
+<li><img alt="" src="../images/right.gif" /> <a href="mpm_common.html#user">User</a></li>
+</ul>
+<h3>トピック</h3>
+<ul id="topics">
+<li><img alt="" src="../images/down.gif" /> <a href="#how-it-works">動作方法</a></li>
+</ul><h3>�照</h3>
+<ul class="seealso">
+<li><a href="../bind.html">Apache 
+�使用�るアドレス��ート�設定</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="how-it-works" id="how-it-works">動作方法</a></h2>
+    <p>一��制御用プロセス (親) ��プロセスを起動���。
+    �プロセス�
+    <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code>
+    ディレクティブ�指定�れ�一定数�サー�スレッド�接続を
+    listen �るスレッドを一�作り��。
+    Listener スレッド�接続������サー�プロセス�渡���。</p>
+
+    <p>Apache �<dfn>スペア�</dfn>���りアイドル�サー�スレッド�
+    プールを常�維�������れら�入���るリクエスト�
+    答�られるよ��待機�����。
+    ��よ�����クライアント�リクエスト�応答�得られるよ���る���
+    新��スレッドやプロセス�生��れる�を
+    待����もよ�よ��������。
+    起動�期時�プロセス�数��
+    <code class="directive"><a href="../mod/mpm_common.html#startservers">StartServers</a></code>
+    ディレクティブ�設定�れ��。��後�稼�中��
+    Apache �全プロセス�アイドルスレッド��計数を見�も���
+    <code class="directive"><a href="../mod/mpm_common.html#minsparethreads">MinSpareThreads</a></code> �
+    <code class="directive"><a href="../mod/mpm_common.html#maxsparethreads">MaxSpareThreads</a></code>
+    �指定�れ�範囲�中���数���るよ�� fork ��り
+    kill ��り���。���作��常�自律的����
+    �れら�ディレクティブをデフォルト値�ら変更�る必��
+    ��������ょ�。
+    �時�応答�る�����るクライアント数�最大数
+    (��り全プロセス中��スレッド数�最大値) �
+    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
+    ディレクティブ�決定�れ��。
+    活動中��プロセス数�最大値�
+    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> ã‚’
+    <code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code> �割��
+    も���り��。</p>
+    
+    <p>活動中��プロセス�数��プロセス中�サー�スレッド�数�越�られ��
+    上�を設定�るディレクティブ�二��り��。�れら�サー�を
+    完全��止����起動�る�����変更�る�������ん。
+    <code class="directive"><a href="../mod/mpm_common.html#serverlimit&#10;    ">ServerLimit
+    </a></code> �活動中��プロセス�越�られ��上�を設定��
+    <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> ディレクティブ
+    �値を <code class="directive"><a href="../mod/mpm_common.html#&#10;    threadsperchild">
+    ThreadsPerChild</a></code> �値�割��値以上��る
+    必���り��。<code class="directive"><a href="../mod/mpm_common.html#threadlimit">ThreadLimit</a></code> �
+    サー�スレッド�越�られ��上���<code class="directive"><a href="../mod/mpm_common.html#threadsperchild">ThreadsPerChild</a></code> ディレクティブ�
+    値以上��る必���り��。デフォルト以外�値を指定�る場��
+    他� <code class="module"><a href="../mod/worker.html">worker</a></code> ディレクティブよりも��書�れ��る
+    必���り��。</p>
+
+    <p>活動中��プロセス群�加���少���も一��サー�スレッド�
+    既存�クライアント�ら�接続を扱���る終了�よ�����る
+    �プロセス��る�能性��り��。終了中�プロセス� <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code> �指定�れ�数��
+    存在������実際�期待�れる数����少���り��。��
+    振舞����プロセスを終了����よ���る���回�����。
+    �れ�以下�様���実�����。</p>
+     
+    <ul>
+      <li><code class="directive"><a href="../mod/mpm_common.html#&#10;      maxrequestsperchild">
+      MaxRequestsPerChild</a></code> �値を 0 �設定�る</li>
+
+      <li><code class="directive"><a href="../mod/mpm_common.html#&#10;      maxsparethreads">
+      MaxSpareThreads</a></code> �値を
+      <code class="directive"><a href="../mod/mpm_common.html#maxclients">MaxClients</a></code>
+      ���値��る</li>
+    </ul>
+
+    <p><code class="module"><a href="../mod/worker.html">worker</a></code> MPM �典型的�プロセス・スレッド制御�
+    設定���次�よ���り��。</p>
+
+    <div class="example"><p><code>
+      ServerLimit         16<br />
+      StartServers         2<br />
+      MaxClients         150<br />
+      MinSpareThreads     25<br />
+      MaxSpareThreads     75<br />
+      ThreadsPerChild     25
+    </code></p></div>
+
+    <p>通常 Unix ��親プロセス� 80 番�ート��インド�る���
+    <code>root</code> �起動�れ�����プロセスやスレッド�
+    も��低�権��ユーザ� Apache �よ��起動�れ��。
+    <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code> �
+    <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code> ディレクティブ�
+    Apache ��プロセス�権�を設定�る��用�られ��。
+    �プロセス�クライアント��るコンテンツ全�を読��������ん��
+    �能��り必�最���権���を����るよ���る����。
+    �ら��<code class="program"><a href="../programs/suexec.html">suexec</a></code>
+    �使用�れ�����り��れら�ディレクティブ�
+    CGI スクリプト�継承�れる権�も設定���。</p>
+
+    <p><code class="directive"><a href="../mod/mpm_common.html#maxrequestsperchild">MaxRequestsPerChild</a></code>
+    ����プロセスを�止��新��プロセスを起動�る���よ���
+    ��程度�頻度�サー��プロセスをリサイクル�る�を制御���。</p>
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../de/mod/worker.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/mod/worker.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/mod/worker.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mpm.html b/docs/manual/mpm.html
index 52d9e78e..e66905a0 100644
--- a/docs/manual/mpm.html
+++ b/docs/manual/mpm.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mpm.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -14,10 +16,14 @@ URI: mpm.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mpm.html.ja.euc-jp
+URI: mpm.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mpm.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: mpm.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/mpm.html.de b/docs/manual/mpm.html.de
index 72f1713a..20326cc9 100644
--- a/docs/manual/mpm.html.de
+++ b/docs/manual/mpm.html.de
@@ -23,7 +23,8 @@
 <a href="./es/mpm.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/mpm.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/mpm.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/mpm.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
   <p>Das Dokument beschreibt, was ein Multi-Processing-Modul ist und wie solche
@@ -120,8 +121,9 @@
 <a href="./es/mpm.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/mpm.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/mpm.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/mpm.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mpm.html.en b/docs/manual/mpm.html.en
index c65592f7..931d37ca 100644
--- a/docs/manual/mpm.html.en
+++ b/docs/manual/mpm.html.en
@@ -23,7 +23,8 @@
 <a href="./es/mpm.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/mpm.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/mpm.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/mpm.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
 <p>This document describes what a Multi-Processing Module is and
@@ -120,8 +121,9 @@ choice at compile-time.</p>
 <a href="./es/mpm.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/mpm.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/mpm.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/mpm.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mpm.html.es b/docs/manual/mpm.html.es
index d1d53c0f..15051447 100644
--- a/docs/manual/mpm.html.es
+++ b/docs/manual/mpm.html.es
@@ -23,7 +23,8 @@
 <a href="./es/mpm.html" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/mpm.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/mpm.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/mpm.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">Esta traducción podría estar
             obsoleta. Consulte la versión en inglés de la
@@ -134,8 +135,9 @@ especifica lo contrario al compilar.</p>
 <a href="./es/mpm.html" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/mpm.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/mpm.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/mpm.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Módulos</a> | <a href="./mod/directives.html">Directivas</a> | <a href="./faq/">Preguntas Frecuentes</a> | <a href="./glossary.html">Glosario</a> | <a href="./sitemap.html">Mapa de este sitio web</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mpm.html.fr b/docs/manual/mpm.html.fr
index 825b9534..16d23c74 100644
--- a/docs/manual/mpm.html.fr
+++ b/docs/manual/mpm.html.fr
@@ -23,7 +23,8 @@
 <a href="./es/mpm.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/mpm.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/mpm.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/mpm.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
 <p>Ce document décrit ce qu'est un Module Multi-Processus, ainsi
@@ -122,8 +123,9 @@ pas un choix différent à la compilation.</p>
 <a href="./es/mpm.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/mpm.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/mpm.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/mpm.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossaire</a> | <a href="./sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mpm.html.ja.euc-jp b/docs/manual/mpm.html.ja.euc-jp
deleted file mode 100644
index 17de4d59..00000000
--- a/docs/manual/mpm.html.ja.euc-jp
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë (MPM) - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë (MPM)</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./de/mpm.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/mpm.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/mpm.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./fr/mpm.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/mpm.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-
-<p>¤³¤Îʸ½ñ¤Ç¤Ï¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë¤¬¤É¤Î¤è¤¦¤Ê¤â¤Î¤Ç¡¢
-Apache HTTP ¥µ¡¼¥Ð¤Ç¤É¤Î¤è¤¦¤Ë»ÈÍѤµ¤ì¤ë¤«¤Ë¤Ä¤¤¤Æ²òÀ⤷¤Æ¤¤¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#introduction">¤Ï¤¸¤á¤Ë</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#choosing">MPM ¤òÁª¤Ö</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#defaults">MPM ¥Ç¥Õ¥©¥ë¥ÈÃÍ</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="introduction" id="introduction">¤Ï¤¸¤á¤Ë</a></h2>
-
-    <p>Apache HTTP ¥µ¡¼¥Ð¤Ï°Û¤Ê¤ëÉý¹­¤¤´Ä¶­¡¢Â¿¼ï¿Íͤʥץé¥Ã¥È¥Û¡¼¥à¤Ç
-    Æ°ºî¤¹¤ë¤è¤¦¤Ë¡¢¥Ñ¥ï¥Õ¥ë¤Ç½ÀÆðÀ­¤ËÉÙ¤ó¤ÀÀ߷פˤʤäƤ¤¤Þ¤¹¡£
-    °Û¤Ê¤ë¥×¥é¥Ã¥È¥Û¡¼¥à¡¦°Û¤Ê¤ë´Ä¶­¤Ç¤Ï¤·¤Ð¤·¤Ð¡¢
-    °Û¤Ê¤ëµ¡Ç½¤¬É¬Íפˤʤ俤ꡢ
-    Ʊ¤¸µ¡Ç½¤Ç¤â¸úΨ¤Î¤¿¤á¤Ë°Û¤Ê¤ë¼ÂÁõ¤¬É¬Íפˤʤ俤ꤷ¤Þ¤¹¡£
-    Apache ¤Ç¤Ï¥â¥¸¥å¡¼¥ë²½¤µ¤ì¤¿À߷פˤè¤êÉý¹­¤¤´Ä¶­¤ËŬ±þ¤·¤Æ¤­¤Þ¤·¤¿¡£
-    ¤³¤ÎÀ߷פΤª¤«¤²¤Ç¡¢´ÉÍý¼Ô¤Ï
-    ¥³¥ó¥Ñ¥¤¥ë»þ¤Þ¤¿¤Ï¼Â¹Ô»þ¤Ë¤É¤Î¥â¥¸¥å¡¼¥ë¤ò¥í¡¼¥É¤¹¤ë¤«Áª¤Ö¤³¤È¤Ë¤è¤Ã¤Æ¡¢
-    ¤É¤Îµ¡Ç½¤ò¥µ¡¼¥Ð¤Ë¼è¤ê¹þ¤à¤«ÁªÂò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>Apache 2.0 ¤Ç¤Ï¡¢
-    ¤³¤Î¥â¥¸¥å¡¼¥ë²½¤µ¤ì¤¿À߷פò¥µ¡¼¥Ð¤Î´ðËܵ¡Ç½¤Ë¤Þ¤Ç³ÈÄ¥¤·¤Þ¤·¤¿¡£
-    ¥µ¡¼¥Ð¤Ë¤ÏÀºÁª¤µ¤ì¤¿¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë (MPM) 
-    ¤¬ÉÕ¤¤¤Æ¤­¤Æ¡¢¤³¤ì¤é¤Ï¥Þ¥·¥ó¤Î¥Í¥Ã¥È¥ï¡¼¥¯¥Ý¡¼¥È¤ò¥Ð¥¤¥ó¥É¤·¤¿¤ê¡¢
-    ¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±ÉÕ¤±¤¿¤ê¡¢¥ê¥¯¥¨¥¹¥È¤ò°·¤¦¤è¤¦»Ò¥×¥í¥»¥¹¤Ë³ä¤êÅö¤Æ¤¿¤ê¡¢
-    ¤È¤¤¤Ã¤¿Ìò³ä¤ò»ý¤Á¤Þ¤¹¡£</p>
-
-    <p>¥â¥¸¥å¡¼¥ë²½¤µ¤ì¤¿À߷פò¥µ¡¼¥Ð¤Î¤³¤Î¥ì¥Ù¥ë¤Þ¤Ç³ÈÄ¥¤¹¤ë¤³¤È¤Ç
-    Æó¤Ä¤Î½ÅÍפÊÍøÅÀ¤¬À¸¤Þ¤ì¤Þ¤¹:</p>
-
-    <ul>
-      <li>Apache ¤ÏÉý¹­¤¤¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ò
-      ¤è¤êÈþ¤·¤¯¸úΨŪ¤Ë¥µ¥Ý¡¼¥È¤Ç¤­¤Þ¤¹¡£
-      ÆÃ¤Ë Windows ÈǤΠApache ¤Ï¿ïʬ¸úΨŪ¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
-      ¤Ê¤¼¤Ê¤é <code class="module"><a href="./mod/mpm_winnt.html">mpm_winnt</a></code>
-      ¤Ë¤è¤Ã¤Æ¡¢Apache 1.3 ¤ÇÍѤ¤¤é¤ì¤Æ¤¤¤¿ POSIX 
-      ¥ì¥¤¥ä¤ÎÂå¤ï¤ê¤Ë¥Í¥¤¥Æ¥£¥Ö¤Î¥Í¥Ã¥È¥ï¡¼¥¯µ¡Ç½¤ò
-      ÍøÍѤǤ­¤ë¤«¤é¤Ç¤¹¡£
-      ÆÃÊ̲½¤µ¤ì¤¿ MPM 
-      ¤ò¼ÂÁõ¤·¤¿Â¾¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ç¤â¡¢
-      ƱÍͤˤ³¤ÎÍøÅÀ¤ÏÀ¸¤Þ¤ì¤Þ¤¹¡£</li>
-
-      <li>¥µ¡¼¥Ð¤ÏÆÃÄê¤Î¥µ¥¤¥È¸þ¤±¤Ë¡¢¤è¤ê¾å¼ê¤Ë¥«¥¹¥¿¥Þ¥¤¥º¤Ç¤­¤Þ¤¹¡£
-      Î㤨¤Ð¡¢Èó¾ï¤ËÂ礭¤Ê¥¹¥±¡¼¥é¥Ó¥ê¥Æ¥£¤òɬÍפȤ¹¤ë¥µ¥¤¥È¤Ç¤Ï¡¢
-      <code class="module"><a href="./mod/worker.html">worker</a></code> ¤ä <code class="module"><a href="./mod/event.html">event</a></code> ¤È¤¤¤Ã¤¿¥¹¥ì¥Ã¥É²½¤µ¤ì¤¿
-      MPM ¤òÍøÍѤǤ­¤ë°ìÊý¤Ç¡¢°ÂÄêÀ­¤ä¸Å¤¤¥½¥Õ¥È¥¦¥§¥¢¤È¤Î¸ß´¹À­¤ò
-      ɬÍפȤ¹¤ë¥µ¥¤¥È¤Ç¤Ï <code class="module"><a href="./mod/prefork.html">prefork</a></code>
-      ¤¬ÍøÍѤǤ­¤Þ¤¹¡£</li>
-    </ul>
-
-    <p>¥æ¡¼¥¶¥ì¥Ù¥ë¤Ç¤Ï¡¢MPM ¤Ï¾¤Î Apache 
-    ¥â¥¸¥å¡¼¥ë¤ÈƱÅù¤Ë¸«¤¨¤Þ¤¹¡£
-    ¼ç¤Ê°ã¤¤¤Ï¡¢¤¤¤Ä¤Ç¤âÍ£°ì¤Î MPM 
-    ¤¬¥í¡¼¥É¤µ¤ì¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤È¤¤¤¦ÅÀ¤Ç¤¹¡£
-    ÍøÍѲÄǽ¤Ê MPM ¤Ï 
-    <a href="mod/">module ¥¤¥ó¥Ç¥Ã¥¯¥¹</a>¤Ë¤¢¤ê¤Þ¤¹¡£</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="choosing" id="choosing">MPM ¤òÁª¤Ö</a></h2>
-
-    <p>MPM ¤ÏÀßÄêÃæ¤ËÁªÂò¤·¤Æ¡¢¥µ¡¼¥ÐÆâÉô¤Ë¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Ê¤±¤ì¤Ð
-    ¤Ê¤ê¤Þ¤»¤ó¡£
-    ¥³¥ó¥Ñ¥¤¥é¤Ï¡¢¥¹¥ì¥Ã¥É¤¬»ÈÍѤµ¤ì¤Æ¤¤¤ë¾ì¹ç¤ËÍÍ¡¹¤Êµ¡Ç½¤òºÇŬ²½¤Ç¤­¤Þ¤¹¤¬¡¢
-    ¤½¤Î¤¿¤á¤Ë¤Ï¤½¤â¤½¤â¥¹¥ì¥Ã¥É¤¬»È¤ï¤ì¤Æ¤¤¤ë¤È¤¤¤¦¤³¤È¤òÃΤëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>˾¤ß¤Î MPM ¤ò¼ÂºÝ¤ËÁª¤Ö¤¿¤á¤Ë¤Ï¡¢<code class="program"><a href="./programs/configure.html">configure</a></code> ¥¹¥¯¥ê¥×¥È¤Ç
-    <code>--with-mpm=<em>NAME</em></code> °ú¿ô¤òÍѤ¤¤Æ¤¯¤À¤µ¤¤¡£
-    <em>NAME</em> ¤Ï˾¤ß¤Î MPM ¤Î̾Á°¤Ç¤¹¡£</p>
-
-    <p>¥µ¡¼¥Ð¥³¥ó¥Ñ¥¤¥ë¸å¤Ï¡¢¤É¤Î MPM ¤¬ÁªÂò¤µ¤ì¤¿¤«¤ò
-    <code>./httpd -l</code> ¤Ç³Î¤«¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢MPM
-    ¤ò´Þ¤á¡¢¥µ¡¼¥Ð¤Ë¥³¥ó¥Ñ¥¤¥ë¤ÇÁȤ߹þ¤Þ¤ì¤¿¥â¥¸¥å¡¼¥ëÁ´¤Æ¤ò
-    Îóµó¤·¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="defaults" id="defaults">MPM ¥Ç¥Õ¥©¥ë¥ÈÃÍ</a></h2>
-
-<p>¼¡É½¤ËÍÍ¡¹¤Ê OS ¸þ¤±¤Î¥Ç¥Õ¥©¥ë¥È¤Î MPM °ìÍ÷¤ò·ÇºÜ¤·¤Æ¤¤¤Þ¤¹¡£
-¥³¥ó¥Ñ¥¤¥ë»þ¤Ë°Õ¿ÞŪ¤Ë¾¤òÁªÂò¤·¤Ê¤±¤ì¤Ð¡¢¼«Æ°Åª¤Ë¤³¤ì¤é¤Î MPM
-¤¬ÁªÂò¤µ¤ì¤Þ¤¹¡£</p>
-
-<table>
-
-<tr><td>BeOS</td><td><code class="module"><a href="./mod/beos.html">beos</a></code></td></tr>
-<tr><td>Netware</td><td><code class="module"><a href="./mod/mpm_netware.html">mpm_netware</a></code></td></tr>
-<tr><td>OS/2</td><td><code class="module"><a href="./mod/mpmt_os2.html">mpmt_os2</a></code></td></tr>
-<tr><td>Unix</td><td><code class="module"><a href="./mod/prefork.html">prefork</a></code></td></tr>
-<tr><td>Windows</td><td><code class="module"><a href="./mod/mpm_winnt.html">mpm_winnt</a></code></td></tr>
-</table>
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./de/mpm.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/mpm.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/mpm.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./fr/mpm.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/mpm.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mpm.html.ja.utf8 b/docs/manual/mpm.html.ja.utf8
new file mode 100644
index 00000000..66dff69a
--- /dev/null
+++ b/docs/manual/mpm.html.ja.utf8
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>マル�プロセッシングモジュール (MPM) - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>マル�プロセッシングモジュール (MPM)</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./de/mpm.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/mpm.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/mpm.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/mpm.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/mpm.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/mpm.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+<p>��文書��マル�プロセッシングモジュール���よ��も���
+Apache HTTP サー����よ��使用�れる�����解説�����。</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#introduction">����</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#choosing">MPM を��</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#defaults">MPM デフォルト値</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="introduction" id="introduction">����</a></h2>
+
+    <p>Apache HTTP サー��異�る幅広�環境�多種多様�プラットホーム�
+    動作�るよ���パワフル�柔軟性�富ん�設計�������。
+    異�るプラットホーム・異�る環境�������
+    異�る機能�必�����り�
+    ��機能�も効率����異�る実装�必�����り���。
+    Apache ��モジュール化�れ�設計�より幅広�環境��応������。
+    ��設計������管�者�
+    コンパイル時���実行時���モジュールをロード�る������よ���
+    ��機能をサー���り込む��択�る�������。</p>
+
+    <p>Apache 2.0 ���
+    ��モジュール化�れ�設計をサー��基本機能���拡張����。
+    サー���精��れ�マル�プロセッシングモジュール (MPM) 
+    �付������れら�マシン��ットワーク�ートを�インド��り�
+    リクエストを��付��り�リクエストを扱�よ��プロセス�割り当��り�
+    ����役割を����。</p>
+
+    <p>モジュール化�れ�設計をサー����レベル��拡張�る���
+    二�����利点�生�れ��:</p>
+
+    <ul>
+      <li>Apache �幅広�オペレーティングシステムを
+      より美��効率的�サ�ート����。
+      特� Windows 版� Apache ��分効率的��り���。
+      ���ら <code class="module"><a href="./mod/mpm_winnt.html">mpm_winnt</a></code>
+      �よ���Apache 1.3 �用�られ��� POSIX 
+      レイヤ�代�り��イティブ��ットワーク機能を
+      利用��る�ら��。
+      特別化�れ� MPM 
+      を実装��他�オペレーティングシステム�も�
+      �様���利点�生�れ��。</li>
+
+      <li>サー��特定�サイト����より上手�カスタマイズ����。
+      例����常�大��スケーラビリティを必���るサイト���
+      <code class="module"><a href="./mod/worker.html">worker</a></code> や <code class="module"><a href="./mod/event.html">event</a></code> ����スレッド化�れ�
+      MPM を利用��る一方��安定性や��ソフトウェア��互�性を
+      必���るサイト�� <code class="module"><a href="./mod/prefork.html">prefork</a></code>
+      �利用����。</li>
+    </ul>
+
+    <p>ユーザレベル���MPM �他� Apache 
+    モジュール��等�見���。
+    主��������も唯一� MPM 
+    �ロード�れ��れ��ら�����点��。
+    利用�能� MPM � 
+    <a href="mod/">module インデックス</a>��り��。</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="choosing" id="choosing">MPM を��</a></h2>
+
+    <p>MPM �設定中��択���サー�内部�コンパイル�れ��れ�
+    �り��ん。
+    コンパイラ��スレッド�使用�れ��る場��様々�機能を最�化������
+    �������も�もスレッド�使�れ��る�����を知る必���り��。</p>
+
+    <p>望�� MPM を実際��������<code class="program"><a href="./programs/configure.html">configure</a></code> スクリプト�
+    <code>--with-mpm=<em>NAME</em></code> 引数を用������。
+    <em>NAME</em> �望�� MPM �����。</p>
+
+    <p>サー�コンパイル後���� MPM ��択�れ��を
+    <code>./httpd -l</code> �確��る�������。
+    ��コマンド��MPM
+    を���サー��コンパイル�組�込�れ�モジュール全�を
+    列挙���。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="defaults" id="defaults">MPM デフォルト値</a></h2>
+
+<p>次表�様々� OS ���デフォルト� MPM 一覧を掲載�����。
+コンパイル時��図的�他を�択���れ��自動的��れら� MPM
+��択�れ��。</p>
+
+<table>
+
+<tr><td>BeOS</td><td><code class="module"><a href="./mod/beos.html">beos</a></code></td></tr>
+<tr><td>Netware</td><td><code class="module"><a href="./mod/mpm_netware.html">mpm_netware</a></code></td></tr>
+<tr><td>OS/2</td><td><code class="module"><a href="./mod/mpmt_os2.html">mpmt_os2</a></code></td></tr>
+<tr><td>Unix</td><td><code class="module"><a href="./mod/prefork.html">prefork</a></code></td></tr>
+<tr><td>Windows</td><td><code class="module"><a href="./mod/mpm_winnt.html">mpm_winnt</a></code></td></tr>
+</table>
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./de/mpm.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/mpm.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/mpm.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/mpm.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/mpm.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/mpm.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/mpm.html.ko.euc-kr b/docs/manual/mpm.html.ko.euc-kr
index 041bfbf5..a25c9544 100644
--- a/docs/manual/mpm.html.ko.euc-kr
+++ b/docs/manual/mpm.html.ko.euc-kr
@@ -23,7 +23,8 @@
 <a href="./es/mpm.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="./fr/mpm.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/mpm.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/mpm.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/mpm.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/mpm.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
             ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
@@ -117,8 +118,9 @@
 <a href="./es/mpm.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="./fr/mpm.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/mpm.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/mpm.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/mpm.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/mpm.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/mpm.html.tr.utf8 b/docs/manual/mpm.html.tr.utf8
new file mode 100644
index 00000000..b1c1bc57
--- /dev/null
+++ b/docs/manual/mpm.html.tr.utf8
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Çok Süreçlilik Modülleri (MPM’ler) - Apache HTTP Sunucusu</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="./">Sürüm 2.2</a></div><div id="page-content"><div id="preamble"><h1>Çok Süreçlilik Modülleri (MPM’ler)</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="./de/mpm.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/mpm.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/mpm.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/mpm.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/mpm.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/mpm.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+  <p>Bu belgede Çok Süreçlilik Modülü denince ne anlaşıldığı ve bunların
+    Apache HTTP Sunucusu tarafından nasıl kullanıldıkları açıklanmıştır.</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#introduction">GiriÅŸ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#choosing">MPM Seçimi</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#defaults">Öntanımlı MPM’ler</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="introduction" id="introduction">GiriÅŸ</a></h2>
+
+    <p>Apache HTTP Sunucusu çok çeşitli platformlar üstünde farklı ortamlarda
+      çalışabilen güçlü ve esnek bir HTTP sunucusu olarak tasarlanmıştır.
+      Farklı platformlar ve farklı ortamlar çoğunlukla farklı özellikler veya
+      aynı özelliğin en yüksek verimlilikle gerçeklenmesi için farklı yöntemler
+      gerektirir. Apache, geniş ortam çeşitliliğini daima modüler tasarımı
+      sayesinde uzlaştırmıştır.  Bu tasarım, site yöneticilerine, sunucularında
+      bulunmasını istedikleri özellikleri derleme sırasında veya çalışma anında
+      gerekli modülleri yüklemek suretiyle seçebilme imkanı verir.</p>
+
+    <p>Apache 2.0, bu modüler tasarımı sunucunun en temel işlevlerine kadar
+      indirmiştir. Sunucu, Çok Süreçlilik Modülleri adı verilen ve makine
+      üzerindeki ağ portlarının bağlanmasından, isteklerin kabul edilmesinden
+      ve bu istekleri yanıtlayacak çocuklara dağıtmaktan sorumlu olan
+      modüllerin seçimine imkan verecek bir yapılanma ile gelir.</p>
+
+    <p>Sunucunun modüler tasarımının bu seviyede genişletilmesi iki önemli
+      yarar saÄŸlar:</p>
+
+    <ul>
+      <li>Apache geniş çeşitlilikteki işletim sistemlerini daha temiz ve daha
+        verimli bir şekilde destekleyebilmektedir. Özellikle,
+        <code class="module"><a href="./mod/mpm_winnt.html">mpm_winnt</a></code> modülü, Apache 1.3’te kullanılan POSIX
+        katmanının yerine işletim sistemine özgü özellikleri
+        kullanabildiğinden, Apache HTTP Sunucusunun Windows sürümü artık çok
+        daha verimli bir duruma gelmiştir. Aynı fayda özelleştirilmiş MPM’lerle
+        diğer işletim sistemlerine de sağlanmıştır.</li>
+
+      <li>Sunucu, belli bir sitenin ihtiyaçlarına uygun olarak daha iyi
+        kişiselleştirilebilmektedir. Örneğin, eski yazılım ile uyumluluk ve
+        kararlılığa önem veren siteler <code class="module"><a href="./mod/prefork.html">prefork</a></code> modülünü
+        kullanabilirken, daha geniş ölçeklenebilirlik gerektiren siteler
+        <code class="module"><a href="./mod/worker.html">worker</a></code> veya <code class="module"><a href="./mod/event.html">event</a></code> gibi evreli MPM
+        modüllerinden birini seçebilmektedir.</li>
+    </ul>
+
+    <p>Kullanıcı açısından MPM’lerin diğer Apache modüllerinden görünüşte bir
+      farkı yoktur. Asıl fark sunucuya yüklenebilecek azami MPM modülü
+      sayısının bir ve yalnız bir olarak sınırlanmış olmasıdır. Mevcut MPM
+      modülleri <a href="mod/">modül dizini</a> sayfasında listelenmiştir..</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="choosing" id="choosing">MPM Seçimi</a></h2>
+
+    <p>MPM’ler paket yapılandırması sırasında seçilmeli ve sunucu içinde
+      derlenmelidir. Derleyiciler evrelerin kullanılacağını bildikleri
+      takdirde çoğu işlevi evreleri kullanacak şekilde
+      en iyileyebilmektedir.</p>
+
+    <p>Kullanmak istediğiniz MPM’yi kendiniz seçmek istediğiniz takdirde
+      <code class="program"><a href="./programs/configure.html">configure</a></code> betiÄŸini
+      <code>--with-mpm=<em>AD</em></code> seçeneği ile kullanınız. Burada
+      <em>AD</em> istenen MPM’nin adıdır.</p>
+
+    <p>Sunucu derlendikten sonra hangi MPM’nin seçilmiş olduğunu <code>./httpd
+      -l</code> komutuyla saptamak mümkündür. Bu komut, MPM de dahil omak
+      üzere sunucuyla birlikte derlenmiş tüm modülleri listeleyecektir.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="defaults" id="defaults">Öntanımlı MPM’ler</a></h2>
+
+    <p>Aşağıdaki tabloda çeşitli işletim sistemlerinde öntanımlı olan MPM’ler
+      listelenmiştir. Derleme sırasında başka bir seçim yapmadığınız takdirde
+      bu işletim sistemlerinde bu MPM’ler seçilmiş olacaktır.</p>
+
+    <table>
+      
+      <tr><td>BeOS</td><td><code class="module"><a href="./mod/beos.html">beos</a></code></td></tr>
+      <tr><td>Netware</td><td><code class="module"><a href="./mod/mpm_netware.html">mpm_netware</a></code></td></tr>
+      <tr><td>OS/2</td><td><code class="module"><a href="./mod/mpmt_os2.html">mpmt_os2</a></code></td></tr>
+      <tr><td>Unix</td><td><code class="module"><a href="./mod/prefork.html">prefork</a></code></td></tr>
+      <tr><td>Windows</td><td><code class="module"><a href="./mod/mpm_winnt.html">mpm_winnt</a></code></td></tr>
+    </table>
+</div></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="./de/mpm.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/mpm.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/mpm.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/mpm.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/mpm.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/mpm.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/mpm.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/new_features_2_0.html b/docs/manual/new_features_2_0.html
index 798ba8a5..7250bda1 100644
--- a/docs/manual/new_features_2_0.html
+++ b/docs/manual/new_features_2_0.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: new_features_2_0.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -10,9 +12,9 @@ URI: new_features_2_0.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: new_features_2_0.html.ja.euc-jp
+URI: new_features_2_0.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: new_features_2_0.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/new_features_2_0.html.de b/docs/manual/new_features_2_0.html.de
index 6b4366f7..2b5564f9 100644
--- a/docs/manual/new_features_2_0.html.de
+++ b/docs/manual/new_features_2_0.html.de
@@ -258,6 +258,6 @@
 <a href="./pt-br/new_features_2_0.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
 <a href="./ru/new_features_2_0.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/new_features_2_0.html.en b/docs/manual/new_features_2_0.html.en
index f1563feb..834ee4df 100644
--- a/docs/manual/new_features_2_0.html.en
+++ b/docs/manual/new_features_2_0.html.en
@@ -238,6 +238,6 @@
 <a href="./pt-br/new_features_2_0.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
 <a href="./ru/new_features_2_0.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/new_features_2_0.html.fr b/docs/manual/new_features_2_0.html.fr
index 379b2219..b08757ab 100644
--- a/docs/manual/new_features_2_0.html.fr
+++ b/docs/manual/new_features_2_0.html.fr
@@ -246,6 +246,6 @@
 <a href="./pt-br/new_features_2_0.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
 <a href="./ru/new_features_2_0.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossaire</a> | <a href="./sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/new_features_2_0.html.ja.euc-jp b/docs/manual/new_features_2_0.html.ja.euc-jp
deleted file mode 100644
index 4784b727..00000000
--- a/docs/manual/new_features_2_0.html.ja.euc-jp
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>Apache 2.0 ¤Î¿·µ¡Ç½¤Î³µÍ× - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache 2.0 ¤Î¿·µ¡Ç½¤Î³µÍ×</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./de/new_features_2_0.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/new_features_2_0.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/new_features_2_0.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/new_features_2_0.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/new_features_2_0.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/new_features_2_0.html" hreflang="pt-br" rel="alternate" title="Portugu�«´s (Brasil)">&nbsp;pt-br&nbsp;</a> |
-<a href="./ru/new_features_2_0.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
-</div>
-
-  <p>¤³¤Îʸ½ñ¤Ç¤Ï¡¢Apache HTTP ¥µ¡¼¥Ð¥Ð¡¼¥¸¥ç¥ó 1.3 ¤È 2.0
-     ¤Î¼ç¤Ê°ã¤¤¤Ë¤Ä¤¤¤Æµ­½Ò¤·¤Æ¤¤¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#core">¥³¥¢µ¡Ç½¤Î³ÈÄ¥</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#module">¥â¥¸¥å¡¼¥ë¤Î³ÈÄ¥</a></li>
-</ul><h3>»²¾È</h3><ul class="seealso"><li><a href="upgrading.html">1.3 ¤«¤é 2.0 ¤Ø¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É</a></li></ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="core" id="core">¥³¥¢µ¡Ç½¤Î³ÈÄ¥</a></h2>
-    
-
-    <dl>
-      <dt>Unix ¤Î¥¹¥ì¥Ã¥É</dt>
-
-      <dd>POSIX ¥¹¥ì¥Ã¥É¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë Unix ¥·¥¹¥Æ¥à¾å¤Ç¤Ï¡¢
-      Apache ¤Ï¥Þ¥ë¥Á¥×¥í¥»¥¹¡¢¥Þ¥ë¥Á¥¹¥ì¥Ã¥É¤Î¥Ï¥¤¥Ö¥ê¥Ã¥É¥â¡¼¥É¤Ç
-      ¼Â¹Ô¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£¤³¤ì¤Ë¤è¤ê
-      ¿¤¯¤ÎÀßÄê¤Ë¤ª¤¤¤Æ¥¹¥±¡¼¥é¥Ó¥ê¥Æ¥£¤¬¸þ¾å¤·¤Þ¤¹¡£</dd>
-
-      <dt>¿·¤·¤¤¥Ó¥ë¥É¥·¥¹¥Æ¥à</dt>
-
-      <dd>¥Ó¥ë¥É¥·¥¹¥Æ¥à¤Ï <code>autoconf</code> ¤È <code>libtool</code>
-      ¤Ë´ð¤Å¤¤¤¿¤â¤Î¤Ë¤Ê¤ë¤è¤¦¤Ë¡¢
-      ¿·¤·¤¯½ñ¤­Ä¾¤µ¤ì¤Þ¤·¤¿¡£¤³¤ì¤Ë¤è¤ê¡¢Apache ¤Î configure ¤Î¥·¥¹¥Æ¥à¤Ï
-      ¾¤Î¥Ñ¥Ã¥±¡¼¥¸¤È»÷¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤·¤¿¡£</dd>
-
-      <dt>¥Þ¥ë¥Á¥×¥í¥È¥³¥ë¥µ¥Ý¡¼¥È</dt>
-
-      <dd>Apache ¤ËÊ£¿ô¤Î¥×¥í¥È¥³¥ë¤ò°·¤¦¤¿¤á¤Îµ¡¹½¤¬È÷¤ï¤ê¤Þ¤·¤¿¡£
-      Îã¤È¤·¤Æ <code class="module"><a href="./mod/mod_echo.html">mod_echo</a></code> ¤¬½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</dd>
-
-      <dt>Unix °Ê³°¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î¥µ¥Ý¡¼¥È¤Î²þÁ±</dt>
-
-      <dd>Apache 2.0 ¤Ï BeOS¡¢OS/2¡¢Windows ¤Ê¤É¤Î Unix °Ê³°¤Î
-      ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¡¢¤è¤ê®¤¯¡¢¤è¤ê°ÂÄꤷ¤ÆÆ°ºî¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
-      ¥×¥é¥Ã¥È¥Õ¥©¡¼¥àÆÃÍ­¤Î <a href="mpm.html">¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë</a> (MPM) ¤È
-      Apache Portable Runtime (APR) ¤ÎƳÆþ¤Ë¤è¤ê¡¢
-      ¥Í¥¤¥Æ¥£¥ô¤Î API ¤Ç¼ÂÁõ¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¡¢
-      ¥Ð¥°¤¬Â¿¤¯¡¢À­Ç½¤Î°­¤¤¤³¤È¤¬Â¿¤¤ POSIX ¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¥ì¥¤¥ä¤Î»ÈÍѤò
-      ²óÈò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤·¤¿¡£</dd>
-
-      <dt>¿·¤·¤¤ Apache API</dt>
-
-      <dd>2.0 ¤Ç¤Ï¥â¥¸¥å¡¼¥ë¤Î API ¤¬Â礭¤¯ÊѤï¤ê¤Þ¤·¤¿¡£
-      1.3 ¤Ë¤¢¤Ã¤¿¥â¥¸¥å¡¼¥ë¤Î½çÈÖ/Í¥ÀèÅÙ¤ÎÌäÂê¤Î¿¤¯¤Ï
-      ¤Ê¤¯¤Ê¤Ã¤Æ¤¤¤ë¤Ï¤º¤Ç¤¹¡£2.0 ¤ÏÍ¥ÀèÅÙ¤ÎÁªÂò¤ò¤Û¤È¤ó¤É¤ò¼«Æ°Åª¤Ë¹Ô¤Ê¤¤¡¢
-      ¥â¥¸¥å¡¼¥ë¤Î½çÈ֤Ϥè¤ê½ÀÆðÀ­¤ò¹â¤á¤ë¤¿¤á¤Ë¥Õ¥Ã¥¯Ëè¤Ë¹Ô¤Ê¤ï¤ì¤ë¤è¤¦¤Ë
-      ¤Ê¤ê¤Þ¤·¤¿¡£¤Þ¤¿¡¢¥³¥¢ Apache ¥µ¡¼¥Ð¤Ë¥Ñ¥Ã¥Á¤ò¤¢¤Æ¤ë¤³¤È¤Ê¤¯
-      ÄɲäΥ⥸¥å¡¼¥ëµ¡Ç½¤òÄ󶡤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¿·¤·¤¤´Ø¿ô¤¬
-      Äɲ䵤ì¤Þ¤·¤¿¡£</dd>
-
-      <dt>IPv6 ¥µ¥Ý¡¼¥È</dt>
-
-      <dd>Apache ¤¬»ÈÍѤ·¤Æ¤¤¤ë Apache Portable Runtime library ¤¬
-      IPv6 ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤Ç¤Ï Apache ¤Ï ¥Ç¥Õ¥©¥ë¥È¤Ç
-      IPv6 ¤Î¥½¥±¥Ã¥È¤ò listen ¤·¤Þ¤¹¡£¤µ¤é¤Ë¡¢
-      <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>,
-      <code class="directive"><a href="./mod/core.html#namevirtualhost">NameVirtualHost</a></code>,
-      <code class="directive"><a href="./mod/core.html#virtualhost">VirtualHost</a></code>
-      ¤Î³Æ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬ IPv6 ¤Î¥¢¥É¥ì¥¹¤ò
-      ¥µ¥Ý¡¼¥È¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿ (Î㤨¤Ð¡¢
-      "<code>Listen [2001:db8::1]:8080</code>")¡£</dd>
-
-      <dt>¥Õ¥£¥ë¥¿</dt>
-
-      <dd>Apache ¤Î¥â¥¸¥å¡¼¥ë¤Ï¥µ¡¼¥Ð¤«¤éÁ÷¤é¤ì¤Æ¤­¤¿¤ê¡¢¥µ¡¼¥Ð¤Ø
-      Á÷¤ë¥¹¥È¥ê¡¼¥à¤ËÂФ·¤ÆÆ°ºî¤¹¤ë¥Õ¥£¥ë¥¿¤È¤·¤Æ½ñ¤¯¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë
-      ¤Ê¤ê¤Þ¤·¤¿¡£¤³¤ì¤Ë¤è¤ê¡¢Î㤨¤Ð CGI ¥¹¥¯¥ê¥×¥È¤Î½ÐÎϤò
-      <code class="module"><a href="./mod/mod_include.html">mod_include</a></code> ¤Î <code>INCLUDES</code> ¥Õ¥£¥ë¥¿¤ò»È¤Ã¤Æ
-      Server Side Include ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò²òÀϤ¹¤ë¡¢
-      ¤È¤¤¤¦¤è¤¦¤Ê¤³¤È¤¬²Äǽ¤Ë¤Ê¤ê¤Þ¤·¤¿¡£<code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code>
-      ¤Ç³°Éô¥×¥í¥°¥é¥à¤ò¥Õ¥£¥ë¥¿¤È¤·¤ÆÆ°ºî¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¤³¤ì¤Ï CGI ¥×¥í¥°¥é¥à¤ò¥Ï¥ó¥É¥é¤È¤·¤ÆÆ°ºî¤µ¤»¤ë¤Î¤È
-      ¤è¤¯»÷¤¿ÊýË¡¤Ç¤Ç¤­¤Þ¤¹¡£</dd>
-
-      <dt>¿¸À¸ì¥¨¥é¡¼±þÅú</dt>
-
-      <dd>¥Ö¥é¥¦¥¶¤Ø¤Î¥¨¥é¡¼±þÅú¤Î¥á¥Ã¥»¡¼¥¸¤¬¡¢SSI ¤Îʸ½ñ¤ò»È¤Ã¤Æ
-      Ê£¿ô¤Î¸À¸ì¤ÇÄ󶡤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£¸«¤¿¤á¤Î°ì´ÓÀ­¤òÊݤĤ¿¤á¤Ë
-      ´ÉÍý¼Ô¤¬¥«¥¹¥¿¥Þ¥¤¥º¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</dd>
-
-      <dt>ÀßÄê¤Î´ÊÁDz½</dt>
-
-      <dd>¿¤¯¤Îº®Íð¤ò¾·¤­¤¬¤Á¤Ê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬´ÊÁDz½¤µ¤ì¤Þ¤·¤¿¡£
-      ¤è¤¯º®Íð¤ò°ú¤­µ¯¤³¤·¤Æ¤¤¤¿ <code>Port</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È 
-      <code>Bind</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-      ¤Ê¤¯¤Ê¤ê¤Þ¤·¤¿¡£<code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¤ß¤¬ IP ¥¢¥É¥ì¥¹¤Î¥Ð¥¤¥ó¥É¤Ë»È¤ï¤ì¤Þ¤¹¡£
-      <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤Ï
-      ¥ê¥À¥¤¥ì¥¯¥È¤È vhost ¤Îǧ¼±¤Î¤¿¤á¤À¤±¤Ë¥µ¡¼¥Ð¤Î̾Á°¤È¥Ý¡¼¥ÈÈÖ¹æ¤ò
-      »ØÄꤷ¤Þ¤¹¡£</dd>
-
-      <dt>Windows NT ¤Î¥Í¥¤¥Æ¥£¥ô Unicode ¥µ¥Ý¡¼¥È</dt>
-
-      <dd>Windows NT ¾å¤Î Apache 2.0 ¤Ï¥Õ¥¡¥¤¥ë̾¤Îʸ»ú¥¨¥ó¥³¡¼¥ÉÁ´¤Æ¤Ë
-      utf-8 ¤ò»È¤¦¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£¤³¤ì¤é¤Ï Unicode ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë
-      ľÀÜÊÑ´¹¤µ¤ì¤ë¤Î¤Ç¡¢Windows 2000 ¤È Windows XP ¤ò´Þ¤à¡¢Á´¤Æ¤Î
-      Windows NT ·Ï¤Ç¿¸À¸ì¥µ¥Ý¡¼¥È¤¬Ä󶡤µ¤ì¤Þ¤¹¡£
-      <em>¤³¤Î¥µ¥Ý¡¼¥È¤Ï¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥¢¥¯¥»¥¹»þ¤Ë¥í¡¼¥«¥ë¤Î
-      ¥³¡¼¥É¥Ú¡¼¥¸¤ò»È¤¦ Windows 95, 98, ME ¤Ë¤ÏŬÍѤµ¤ì¤Þ¤»¤ó¡£</em></dd>
-
-      <dt>Àµµ¬É½¸½¥é¥¤¥Ö¥é¥ê¤Î¥¢¥Ã¥×¥Ç¡¼¥È</dt>
-
-      <dd>Apache 2.0 ¤Ï <a href="http://www.pcre.org/">Perl
-      ¸ß´¹Àµµ¬É½¸½¥é¥¤¥Ö¥é¥ê (PCRE) </a>¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£
-      Àµµ¬É½¸½¤Îɾ²Á¤Ë¤Ï¡¢¤è¤ê¶¯ÎϤˤʤä¿ Perl 5
-      ¹½Ê¸¤ò»ÈÍѤ·¤Þ¤¹¡£</dd>
-
-    </dl>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="module" id="module">¥â¥¸¥å¡¼¥ë¤Î³ÈÄ¥</a></h2>
-    
-
-    <dl>
-      <dt><code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code></dt>
-
-      <dd>Apache 2.0 ¤Î¿·¥â¥¸¥å¡¼¥ë¡£¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï OpenSSL ¤¬
-      Ä󶡤¹¤ë SSL/TLS °Å¹æ¥×¥í¥È¥³¥ë¤Ø¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ç¤¹¡£</dd>
-
-      <dt><code class="module"><a href="./mod/mod_dav.html">mod_dav</a></code></dt>
-
-      <dd>Apache 2.0 ¤Î¿·¥â¥¸¥å¡¼¥ë¡£¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¥¦¥§¥Ö¥³¥ó¥Æ¥ó¥Ä¤ò
-      Á÷¤ê¡¢°Ý»ý¤¹¤ë¤¿¤á¤Îµ¬³Ê
-      HTTP Distributed Authoring and Versioning (DAV) ¤ò¼ÂÁõ¤·¤Æ¤¤¤Þ¤¹¡£</dd>
-
-      <dt><code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code></dt>
-
-      <dd>Apache 2.0 ¤Î¿·¥â¥¸¥å¡¼¥ë¡£Á÷¿®Á°¤ËÁ÷¿®ÆâÍƤò°µ½Ì¤·¤Æ
-      ¥Í¥Ã¥È¥ï¡¼¥¯ÂÓ°è¤òÀáÌ󤹤롢¤È¤¤¤¦¥ê¥¯¥¨¥¹¥È¤ò¥Ö¥é¥¦¥¶¤¬
-      Í×µá¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£</dd>
-
-      <dt><code class="module"><a href="./mod/mod_auth_ldap.html">mod_auth_ldap</a></code></dt>
-
-      <dd>Apache 2.0.41 ¤Î¿·¥â¥¸¥å¡¼¥ë¡£HTTP ´ðËÜǧ¾Ú¤Î¾ÚÌÀ½ñ¤òÊݸ¤¹¤ë¤Î¤Ë¡¢
-      LDAP ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò»ÈÍѤǤ­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-      ´ØÏ¢¥â¥¸¥å¡¼¥ë¤Î <code class="module"><a href="./mod/mod_ldap.html">mod_ldap</a></code> ¤Ç¡¢
-      ¥³¥Í¥¯¥·¥ç¥ó¤Î¥×¡¼¥ëµ¡Ç½¤È·ë²Ì¤Î¥­¥ã¥Ã¥·¥åµ¡Ç½¤¬Ä󶡤µ¤ì¤Þ¤¹¡£</dd>
-
-      <dt><code class="module"><a href="./mod/mod_auth_digest.html">mod_auth_digest</a></code></dt>
-
-      <dd>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¶¦Í­¥á¥â¥ê¤ò»È¤¦¤³¤È¤Ë¤è¤ê¡¢¥×¥í¥»¥¹¤ò¤Þ¤¿¤¤¤À
-      ¥»¥Ã¥·¥ç¥ó¤Î¥­¥ã¥Ã¥·¥å¤ò¥µ¥Ý¡¼¥È¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£</dd>
-
-      <dt><code class="module"><a href="./mod/mod_charset_lite.html">mod_charset_lite</a></code></dt>
-
-      <dd>Apache 2.0 ¤Î¿·¥â¥¸¥å¡¼¥ë¡£¤³¤Î¼Â¸³Åª¤Ê¥â¥¸¥å¡¼¥ë¤Ï
-      ¥­¥ã¥é¥¯¥¿¥»¥Ã¥È¤ÎÊÑ´¹¤äºÆÉä¹æ²½¤ò²Äǽ¤Ë¤·¤Þ¤¹¡£</dd>
-
-      <dt><code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code></dt>
-
-      <dd>Apache 2.0 ¤Î¿·¥â¥¸¥å¡¼¥ë¡£¤³¤Î¥â¥¸¥å¡¼¥ë¤Ë¤Ï¡¢
-      Apache 1.3 ¤Ë¤ª¤±¤ë <code>mod_mmap_static</code> µ¡Ç½¤¬´Þ¤Þ¤ì¡¢
-      ¤Þ¤¿¡¢ÄɲäΥ­¥ã¥Ã¥·¥åµ¡Ç½¤¬²Ã¤ï¤Ã¤Æ¤¤¤Þ¤¹¡£</dd>
-
-      <dt><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></dt>
-
-      <dd>¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï Apache 2.0 ¤ÇÈó¾ï¤Ë½ÀÆðÀ­¤¬
-      ¹â¤¯¤Ê¤ê¤Þ¤·¤¿¡£<code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code>
-      ¤Ç»È¤ï¤ì¤ë¥ê¥¯¥¨¥¹¥È¤Î¥Ø¥Ã¥À¤òÊѹ¹¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¤·¡¢
-      ±þÅú¥Ø¥Ã¥À¤ò¾ò·ï¤Ë±þ¤¸¤ÆÀßÄê¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£</dd>
-
-      <dt><code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code></dt>
-
-      <dd>proxy ¥â¥¸¥å¡¼¥ë¤Ï¿·¤·¤¤¥Õ¥£¥ë¥¿¤Îµ¡¹½¤òÍøÍѤ¹¤ë¤¿¤á¤È¡¢
-      ¤è¤ê¿®Íê¤Ç¤­¤ë¡¢HTTP/1.1 ¤Ë½àµò¤·¤¿ proxy ¤ò¼ÂÁõ¤¹¤ë¤¿¤á¤Ë
-      ´°Á´¤Ë½ñ¤­Ä¾¤µ¤ì¤Þ¤·¤¿¡£¤µ¤é¤Ë¡¢¿·¤·¤¤ 
-      <code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>
-      ÀßÄꥻ¥¯¥·¥ç¥ó¤¬proxy ¤µ¤ì¤ë¥µ¥¤¥È¤Î¤è¤êÆɤߤ䤹¤¯ (ÆâÉôŪ¤Ë¤â¤è¤ê®¤¤)
-      ÀßÄê¤òÄ󶡤·¤Þ¤¹¡£¥ª¡¼¥Ð¡¼¥í¡¼¥É¤µ¤ì¤¿
-      <code>&lt;Directory "proxy:... &gt;</code>
-      ÀßÄê¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï <code>proxy_connect</code>,
-      <code>proxy_ftp</code>, <code>proxy_http</code> 
-      ¤È¤¤¤Ã¤¿¡¢ÆÃÄê¤Î¥×¥í¥È¥³¥ë¤ò¥µ¥Ý¡¼¥È¤¹¤ë
-      ¥â¥¸¥å¡¼¥ë¤Ëʬ³ä¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£</dd>
-
-      <dt><code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code></dt>
-
-      <dd>¥¯¥é¥¤¥¢¥ó¥È¤¬ NOT ACCEPTABLE ¤ä MULTIPLE CHOICES ±þÅú¤Î
-      Âå¤ï¤ê¤Ë¾ï¤ËñÆȤÎʸ½ñ¤ò¼õ¤±¤È¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë¡¢¿·¤·¤¤¥Ç¥£¥ì¥¯¥Æ¥£¥Ö
-      <code class="directive"><a href="./mod/mod_negotiation.html#forcelanguagepriority">ForceLanguagePriority</a></code>
-      ¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
-      ¤µ¤é¤Ë¡¢¤è¤ê°ì´ÓÀ­¤Î¤¢¤ë·ë²Ì¤òÄ󶡤¹¤ë¤¿¤á¤Ë
-      ¥Í¥´¥·¥¨¡¼¥·¥ç¥ó¤È MultiViews ¤Î¥¢¥ë¥´¥ê¥º¥à¤¬²þÁ±¤µ¤ì¡¢
-      ʸ½ñ¤ÎÆâÍƤò´Þ¤á¤ë¤³¤È¤Î¤Ç¤­¤ë¡¢¿·¤·¤¤·Á¼°¤Î¥¿¥¤¥×¥Þ¥Ã¥×¤¬
-      Ä󶡤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£</dd>
-
-      <dt><code class="module"><a href="./mod/mod_autoindex.html">mod_autoindex</a></code></dt>
-
-      <dd>Autoindex ¤µ¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆâÍÆ°ìÍ÷¤¬¡¢
-      ¤­¤ì¤¤¤Ëɽ¼¨¤µ¤ì¤ë¤¿¤á¤Ë HTML ¤Î¥Æ¡¼¥Ö¥ë¤ò»È¤¦¤è¤¦¤Ë
-      ÀßÄê¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£¤Þ¤¿¡¢¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤ë¥½¡¼¥Æ¥£¥ó¥°¤Ê¤É¡¢
-      ¤è¤êºÙ¤«¤¤¥½¡¼¥Æ¥£¥ó¥°¤ÎÀ©¸æ¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¡¢¥Ç¥£¥ì¥¯¥È¥ê
-      ¤ÎÆâÍÆ°ìÍ÷¤ò¥ï¥¤¥ë¥É¥«¡¼¥É¤Ë¤è¤êÁªÊ̤¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤â¤Ê¤ê¤Þ¤·¤¿¡£</dd>
-
-      <dt><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></dt>
-
-      <dd>¿·¤·¤¤¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê¡¢SSI ¤Î¥Ç¥Õ¥©¥ë¥È¤Î³«»Ï¥¿¥°¤È½ªÎ»¥¿¥°¤ò
-      Êѹ¹¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£¤Þ¤¿¡¢¥¨¥é¡¼¤È»þ¹ï¤Î·Á¼°¤ÎÀßÄ꤬ SSI ¤Î
-      ʸ½ñÃæ¤Ç¤Ï¤Ê¤¯¡¢¼çÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Ç¹Ô¤Ê¤¨¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
-      Àµµ¬É½¸½¤Î²òÀϤȥ°¥ë¡¼¥×²½¤Î·ë²Ì (Perl ¤ÎÀµµ¬É½¸½¤Î¹½Ê¸¤Ë
-      ´ð¤Å¤¤¤¿¤â¤Î¤Ë¤Ê¤ê¤Þ¤·¤¿) ¤ò <code class="module"><a href="./mod/mod_include.html">mod_include</a></code>
-      ¤ÎÊÑ¿ô $0 .. $9 ¤Ë¤è¤ê¼èÆÀ¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£</dd>
-
-      <dt><code class="module"><a href="./mod/mod_auth_dbm.html">mod_auth_dbm</a></code></dt>
-
-      <dd><code class="directive"><a href="./mod/mod_auth_dbm.html#authdbmtype">AuthDBMType</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê¡¢Ê£¿ô¤Î DBM ·¿¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¥µ¥Ý¡¼¥È¤¹¤ë
-      ¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£</dd>
-
-    </dl>
-  </div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./de/new_features_2_0.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/new_features_2_0.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/new_features_2_0.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/new_features_2_0.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/new_features_2_0.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/new_features_2_0.html" hreflang="pt-br" rel="alternate" title="Portugu�«´s (Brasil)">&nbsp;pt-br&nbsp;</a> |
-<a href="./ru/new_features_2_0.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/new_features_2_0.html.ja.utf8 b/docs/manual/new_features_2_0.html.ja.utf8
new file mode 100644
index 00000000..fc0484fd
--- /dev/null
+++ b/docs/manual/new_features_2_0.html.ja.utf8
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Apache 2.0 �新機能�概� - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache 2.0 �新機能�概�</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./de/new_features_2_0.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/new_features_2_0.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./fr/new_features_2_0.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/new_features_2_0.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/new_features_2_0.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./pt-br/new_features_2_0.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./ru/new_features_2_0.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+</div>
+
+  <p>��文書���Apache HTTP サー��ージョン 1.3 � 2.0
+     �主�������記述�����。</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#core">コア機能�拡張</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#module">モジュール�拡張</a></li>
+</ul><h3>�照</h3><ul class="seealso"><li><a href="upgrading.html">1.3 �ら 2.0 ��アップグレード</a></li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="core" id="core">コア機能�拡張</a></h2>
+    
+
+    <dl>
+      <dt>Unix �スレッド</dt>
+
+      <dd>POSIX スレッドをサ�ート���る Unix システム上���
+      Apache �マル�プロセス�マル�スレッド��イブリッドモード�
+      実行��るよ���り���。�れ�より
+      多��設定����スケーラビリティ��上���。</dd>
+
+      <dt>新��ビルドシステム</dt>
+
+      <dd>ビルドシステム� <code>autoconf</code> � <code>libtool</code>
+      �基���も���るよ���
+      新��書�直�れ���。�れ�より�Apache � configure �システム�
+      他�パッケージ�似�も���り���。</dd>
+
+      <dt>マル�プロトコルサ�ート</dt>
+
+      <dd>Apache �複数�プロトコルを扱����機構�備�り���。
+      例��� <code class="module"><a href="./mod/mod_echo.html">mod_echo</a></code> �書�れ����。</dd>
+
+      <dt>Unix 以外�プラットフォーム�サ�ート�改善</dt>
+
+      <dd>Apache 2.0 � BeOS�OS/2�Windows ��� Unix 以外�
+      プラットフォーム��より速��より安定��動作�るよ���り���。
+      プラットフォーム特有� <a href="mpm.html">マル�プロセッシングモジュール</a> (MPM) �
+      Apache Portable Runtime (APR) �導入�より�
+      �イティヴ� API �実装�れるよ���り�
+      �グ�多��性能�悪����多� POSIX エミュレーションレイヤ�使用を
+      回��る��������。</dd>
+
+      <dt>新�� Apache API</dt>
+
+      <dd>2.0 ��モジュール� API �大��変�り���。
+      1.3 ����モジュール�順番/優先度��題�多��
+      ������る����。2.0 �優先度��択を��ん�を自動的�行���
+      モジュール�順番�より柔軟性を高�る���フック毎�行��れるよ��
+      �り���。���コア Apache サー��パッ�を��る����
+      追加�モジュール機能を�供�る�����るよ��新��関数�
+      追加�れ���。</dd>
+
+      <dt>IPv6 サ�ート</dt>
+
+      <dd>Apache �使用���る Apache Portable Runtime library �
+      IPv6 をサ�ート���るシステム�� Apache � デフォルト�
+      IPv6 �ソケットを listen ���。�ら��
+      <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>,
+      <code class="directive"><a href="./mod/core.html#namevirtualhost">NameVirtualHost</a></code>,
+      <code class="directive"><a href="./mod/core.html#virtualhost">VirtualHost</a></code>
+      ��ディレクティブ� IPv6 �アドレスを
+      サ�ート�るよ���り��� (例���
+      "<code>Listen [2001:db8::1]:8080</code>")。</dd>
+
+      <dt>フィルタ</dt>
+
+      <dd>Apache �モジュール�サー��ら�られ���り�サー��
+      �るストリーム�対��動作�るフィルタ���書������るよ��
+      �り���。�れ�より�例�� CGI スクリプト�出力を
+      <code class="module"><a href="./mod/mod_include.html">mod_include</a></code> � <code>INCLUDES</code> フィルタを使��
+      Server Side Include �ディレクティブを解��る�
+      ���よ������能��り���。<code class="module"><a href="./mod/mod_ext_filter.html">mod_ext_filter</a></code>
+      �外部プログラムをフィルタ���動作��る�������。
+      �れ� CGI プログラムを�ンドラ���動作��る��
+      よ�似�方法�����。</dd>
+
+      <dt>多言語エラー応答</dt>
+
+      <dd>ブラウザ��エラー応答�メッセージ��SSI �文書を使��
+      複数�言語��供�れるよ���り���。見���一貫性を�����
+      管�者�カスタマイズ�る��も����。</dd>
+
+      <dt>設定�簡素化</dt>
+
+      <dd>多��混乱を招����ディレクティブ�簡素化�れ���。
+      よ�混乱を引�起����� <code>Port</code> ディレクティブ� 
+      <code>Bind</code> ディレクティブ�
+      ���り���。<code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
+      ディレクティブ��� IP アドレス��インド�使�れ��。
+      <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code> ディレクティブ��
+      リダイレクト� vhost ��識������サー������ート番�を
+      指定���。</dd>
+
+      <dt>Windows NT ��イティヴ Unicode サ�ート</dt>
+
+      <dd>Windows NT 上� Apache 2.0 �ファイル��文字エンコード全��
+      utf-8 を使�よ���り���。�れら� Unicode ファイルシステム�
+      直接変��れる���Windows 2000 � Windows XP を�む�全��
+      Windows NT 系�多言語サ�ート��供�れ��。
+      <em>��サ�ート��ファイルシステム�アクセス時�ローカル�
+      コードページを使� Windows 95, 98, ME ���用�れ��ん。</em></dd>
+
+      <dt>正�表�ライブラリ�アップデート</dt>
+
+      <dd>Apache 2.0 � <a href="http://www.pcre.org/">Perl
+      互�正�表�ライブラリ (PCRE) </a>を�ん����。
+      正�表��評価���より強力���� Perl 5
+      構文を使用���。</dd>
+
+    </dl>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="module" id="module">モジュール�拡張</a></h2>
+    
+
+    <dl>
+      <dt><code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code></dt>
+
+      <dd>Apache 2.0 �新モジュール。��モジュール� OpenSSL �
+      �供�る SSL/TLS 暗�プロトコル��インタフェース��。</dd>
+
+      <dt><code class="module"><a href="./mod/mod_dav.html">mod_dav</a></code></dt>
+
+      <dd>Apache 2.0 �新モジュール。��モジュール�ウェブコンテンツを
+      �り�維��る����格
+      HTTP Distributed Authoring and Versioning (DAV) を実装�����。</dd>
+
+      <dt><code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code></dt>
+
+      <dd>Apache 2.0 �新モジュール。�信���信内容を圧縮��
+      �ットワーク帯域を節約�る����リクエストをブラウザ�
+      �求��るよ�����。</dd>
+
+      <dt><code class="module"><a href="./mod/mod_auth_ldap.html">mod_auth_ldap</a></code></dt>
+
+      <dd>Apache 2.0.41 �新モジュール。HTTP 基本�証�証明書を�存�る���
+      LDAP データベースを使用��るよ���り��。
+      関連モジュール� <code class="module"><a href="./mod/mod_ldap.html">mod_ldap</a></code> ��
+      コ�クション�プール機能��果�キャッシュ機能��供�れ��。</dd>
+
+      <dt><code class="module"><a href="./mod/mod_auth_digest.html">mod_auth_digest</a></code></dt>
+
+      <dd>��モジュール�共有メモリを使����より�プロセスを����
+      セッション�キャッシュをサ�ート�るよ���り���。</dd>
+
+      <dt><code class="module"><a href="./mod/mod_charset_lite.html">mod_charset_lite</a></code></dt>
+
+      <dd>Apache 2.0 �新モジュール。��実験的�モジュール�
+      キャラクタセット�変�や�符�化を�能����。</dd>
+
+      <dt><code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code></dt>
+
+      <dd>Apache 2.0 �新モジュール。��モジュール���
+      Apache 1.3 ���る <code>mod_mmap_static</code> 機能���れ�
+      ���追加�キャッシュ機能�加������。</dd>
+
+      <dt><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></dt>
+
+      <dd>��モジュール� Apache 2.0 ��常�柔軟性�
+      高��り���。<code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code>
+      �使�れるリクエスト�ヘッダを変更��るよ���り�����
+      応答ヘッダを�件�応��設定��るよ���り���。</dd>
+
+      <dt><code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code></dt>
+
+      <dd>proxy モジュール�新��フィルタ�機構を利用�る����
+      より信頼��る�HTTP/1.1 �準拠�� proxy を実装�る���
+      完全�書�直�れ���。�ら��新�� 
+      <code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>
+      設定セクション�proxy �れるサイト�より読�や�� (内部的�もより速�)
+      設定を�供���。オー�ーロード�れ�
+      <code>&lt;Directory "proxy:... &gt;</code>
+      設定�サ�ート�れ����ん。��モジュール� <code>proxy_connect</code>,
+      <code>proxy_ftp</code>, <code>proxy_http</code> 
+      �����特定�プロトコルをサ�ート�る
+      モジュール�分割�れるよ���り���。</dd>
+
+      <dt><code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code></dt>
+
+      <dd>クライアント� NOT ACCEPTABLE や MULTIPLE CHOICES 応答�
+      代�り�常��独�文書を���るよ���る����新��ディレクティブ
+      <code class="directive"><a href="./mod/mod_negotiation.html#forcelanguagepriority">ForceLanguagePriority</a></code>
+      を使������るよ���り���。
+      �ら��より一貫性��る�果を�供�る���
+      �ゴシエーション� MultiViews �アルゴリズム�改善�れ�
+      文書�内容を��る�����る�新��形��タイプマップ�
+      �供�れるよ���り���。</dd>
+
+      <dt><code class="module"><a href="./mod/mod_autoindex.html">mod_autoindex</a></code></dt>
+
+      <dd>Autoindex �れるディレクトリ�内容一覧��
+      �れ��表示�れる��� HTML �テーブルを使�よ��
+      設定��るよ���り���。����ージョン�よるソーティング���
+      より細��ソーティング�制御���るよ���り�ディレクトリ
+      �内容一覧をワイルドカード�より�別�る�����るよ��も�り���。</dd>
+
+      <dt><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></dt>
+
+      <dd>新��ディレクティブ�より�SSI �デフォルト�開始タグ�終了タグを
+      変更��るよ���り���。���エラー�時刻�形��設定� SSI �
+      文書中�����主設定ファイル中�行��るよ���り���。
+      正�表��解��グループ化��果 (Perl �正�表��構文�
+      基���も���り���) を <code class="module"><a href="./mod/mod_include.html">mod_include</a></code>
+      �変数 $0 .. $9 �より�得��るよ���り���。</dd>
+
+      <dt><code class="module"><a href="./mod/mod_auth_dbm.html">mod_auth_dbm</a></code></dt>
+
+      <dd><code class="directive"><a href="./mod/mod_auth_dbm.html#authdbmtype">AuthDBMType</a></code>
+      ディレクティブ�より�複数� DBM 型�データベースをサ�ート�る
+      よ���り���。</dd>
+
+    </dl>
+  </div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./de/new_features_2_0.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/new_features_2_0.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./fr/new_features_2_0.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/new_features_2_0.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/new_features_2_0.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./pt-br/new_features_2_0.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
+<a href="./ru/new_features_2_0.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/new_features_2_0.html.ko.euc-kr b/docs/manual/new_features_2_0.html.ko.euc-kr
index e8f86432..ba12e360 100644
--- a/docs/manual/new_features_2_0.html.ko.euc-kr
+++ b/docs/manual/new_features_2_0.html.ko.euc-kr
@@ -228,6 +228,6 @@
 <a href="./pt-br/new_features_2_0.html" hreflang="pt-br" rel="alternate" title="Portugu&#234;s (Brasil)">&nbsp;pt-br&nbsp;</a> |
 <a href="./ru/new_features_2_0.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/new_features_2_0.html.pt-br b/docs/manual/new_features_2_0.html.pt-br
index 56d74c77..4c33085b 100644
--- a/docs/manual/new_features_2_0.html.pt-br
+++ b/docs/manual/new_features_2_0.html.pt-br
@@ -237,6 +237,6 @@
 <a href="./pt-br/new_features_2_0.html" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
 <a href="./ru/new_features_2_0.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licenciado sob a <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licenciado sob a <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Módulos</a> | <a href="./mod/directives.html">Diretrizes</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossário</a> | <a href="./sitemap.html">Mapa do site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/new_features_2_0.html.ru.koi8-r b/docs/manual/new_features_2_0.html.ru.koi8-r
index 0a32fb0b..3ceff09b 100644
--- a/docs/manual/new_features_2_0.html.ru.koi8-r
+++ b/docs/manual/new_features_2_0.html.ru.koi8-r
@@ -245,6 +245,6 @@
 <a href="./pt-br/new_features_2_0.html" hreflang="pt-br" rel="alternate" title="Portugu&#234;s (Brasil)">&nbsp;pt-br&nbsp;</a> |
 <a href="./ru/new_features_2_0.html" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">íÏÄÕÌÉ</a> | <a href="./mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="./sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/new_features_2_2.html b/docs/manual/new_features_2_2.html
index 8e8372ab..a456a904 100644
--- a/docs/manual/new_features_2_2.html
+++ b/docs/manual/new_features_2_2.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: new_features_2_2.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/new_features_2_2.html.en b/docs/manual/new_features_2_2.html.en
index edc5bccf..48059b7a 100644
--- a/docs/manual/new_features_2_2.html.en
+++ b/docs/manual/new_features_2_2.html.en
@@ -266,6 +266,6 @@
 <a href="./ko/new_features_2_2.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/new_features_2_2.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/new_features_2_2.html.fr b/docs/manual/new_features_2_2.html.fr
index 5dfc2e12..b79f4b02 100644
--- a/docs/manual/new_features_2_2.html.fr
+++ b/docs/manual/new_features_2_2.html.fr
@@ -295,6 +295,6 @@
 <a href="./ko/new_features_2_2.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/new_features_2_2.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossaire</a> | <a href="./sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/new_features_2_2.html.ko.euc-kr b/docs/manual/new_features_2_2.html.ko.euc-kr
index 6b9f2e33..77360279 100644
--- a/docs/manual/new_features_2_2.html.ko.euc-kr
+++ b/docs/manual/new_features_2_2.html.ko.euc-kr
@@ -123,6 +123,6 @@
 <a href="./ko/new_features_2_2.html" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/new_features_2_2.html" hreflang="pt-br" rel="alternate" title="Portugu&#234;s (Brasil)">&nbsp;pt-br&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/new_features_2_2.html.pt-br b/docs/manual/new_features_2_2.html.pt-br
index 3a5a57b8..db6cc51f 100644
--- a/docs/manual/new_features_2_2.html.pt-br
+++ b/docs/manual/new_features_2_2.html.pt-br
@@ -132,6 +132,6 @@
 <a href="./ko/new_features_2_2.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./pt-br/new_features_2_2.html" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licenciado sob a <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licenciado sob a <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Módulos</a> | <a href="./mod/directives.html">Diretrizes</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossário</a> | <a href="./sitemap.html">Mapa do site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/ebcdic.html b/docs/manual/platform/ebcdic.html
index f9b208e4..a48afa88 100644
--- a/docs/manual/platform/ebcdic.html
+++ b/docs/manual/platform/ebcdic.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: ebcdic.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/platform/ebcdic.html.en b/docs/manual/platform/ebcdic.html.en
index 7cc32312..5aa37f31 100644
--- a/docs/manual/platform/ebcdic.html.en
+++ b/docs/manual/platform/ebcdic.html.en
@@ -579,6 +579,6 @@
 <p><span>Available Languages: </span><a href="../en/platform/ebcdic.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/platform/ebcdic.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/ebcdic.html.ko.euc-kr b/docs/manual/platform/ebcdic.html.ko.euc-kr
index 5d068c2f..9e0ef5c5 100644
--- a/docs/manual/platform/ebcdic.html.ko.euc-kr
+++ b/docs/manual/platform/ebcdic.html.ko.euc-kr
@@ -554,6 +554,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/platform/ebcdic.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/platform/ebcdic.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/index.html b/docs/manual/platform/index.html
index 5b7bb86f..df57cd0f 100644
--- a/docs/manual/platform/index.html
+++ b/docs/manual/platform/index.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: index.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/platform/index.html.en b/docs/manual/platform/index.html.en
index abc92121..3746efe2 100644
--- a/docs/manual/platform/index.html.en
+++ b/docs/manual/platform/index.html.en
@@ -89,6 +89,6 @@
 <p><span>Available Languages: </span><a href="../en/platform/" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/platform/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/index.html.ko.euc-kr b/docs/manual/platform/index.html.ko.euc-kr
index b4869d32..05fad938 100644
--- a/docs/manual/platform/index.html.ko.euc-kr
+++ b/docs/manual/platform/index.html.ko.euc-kr
@@ -89,6 +89,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/platform/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/platform/" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/netware.html b/docs/manual/platform/netware.html
index cb2d4221..953689aa 100644
--- a/docs/manual/platform/netware.html
+++ b/docs/manual/platform/netware.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: netware.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/platform/netware.html.en b/docs/manual/platform/netware.html.en
index ce3f4e28..ff6515a7 100644
--- a/docs/manual/platform/netware.html.en
+++ b/docs/manual/platform/netware.html.en
@@ -654,6 +654,6 @@
 <p><span>Available Languages: </span><a href="../en/platform/netware.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/platform/netware.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/netware.html.ko.euc-kr b/docs/manual/platform/netware.html.ko.euc-kr
index 06b8898a..5f7b534a 100644
--- a/docs/manual/platform/netware.html.ko.euc-kr
+++ b/docs/manual/platform/netware.html.ko.euc-kr
@@ -576,6 +576,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/platform/netware.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/platform/netware.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/perf-hp.html b/docs/manual/platform/perf-hp.html
index 23995ca4..951a04bd 100644
--- a/docs/manual/platform/perf-hp.html
+++ b/docs/manual/platform/perf-hp.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: perf-hp.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/platform/perf-hp.html.en b/docs/manual/platform/perf-hp.html.en
index 0159398e..4b000abe 100644
--- a/docs/manual/platform/perf-hp.html.en
+++ b/docs/manual/platform/perf-hp.html.en
@@ -100,6 +100,6 @@ Subject: HP-UX tuning tips
 <p><span>Available Languages: </span><a href="../en/platform/perf-hp.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/platform/perf-hp.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/perf-hp.html.ko.euc-kr b/docs/manual/platform/perf-hp.html.ko.euc-kr
index 867bd874..4567b3d0 100644
--- a/docs/manual/platform/perf-hp.html.ko.euc-kr
+++ b/docs/manual/platform/perf-hp.html.ko.euc-kr
@@ -95,6 +95,6 @@ Subject: HP-UX tuning tips
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/platform/perf-hp.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/platform/perf-hp.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/win_compiling.html b/docs/manual/platform/win_compiling.html
index 6f9885da..2ac828ca 100644
--- a/docs/manual/platform/win_compiling.html
+++ b/docs/manual/platform/win_compiling.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: win_compiling.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/platform/win_compiling.html.en b/docs/manual/platform/win_compiling.html.en
index 8875282e..0411bdd9 100644
--- a/docs/manual/platform/win_compiling.html.en
+++ b/docs/manual/platform/win_compiling.html.en
@@ -374,7 +374,7 @@ nmake /f Makefile.win installd INSTDIR=<em>dir</em>
     <p>This will install the following:</p>
 
     <ul>
-      <li><code><em>dir</em>\bin\Apache.exe</code> - Apache
+      <li><code><em>dir</em>\bin\httpd.exe</code> - Apache
       executable</li>
 
       <li><code><em>dir</em>\bin\ApacheMonitor.exe</code> - Service
@@ -461,6 +461,6 @@ nmake /f Makefile.win installd INSTDIR=<em>dir</em>
 <p><span>Available Languages: </span><a href="../en/platform/win_compiling.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/platform/win_compiling.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/win_compiling.html.ko.euc-kr b/docs/manual/platform/win_compiling.html.ko.euc-kr
index 5a29c248..86d17b62 100644
--- a/docs/manual/platform/win_compiling.html.ko.euc-kr
+++ b/docs/manual/platform/win_compiling.html.ko.euc-kr
@@ -418,6 +418,6 @@ nmake /f Makefile.win installd INSTDIR=<em>dir</em>
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/platform/win_compiling.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/platform/win_compiling.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/windows.html b/docs/manual/platform/windows.html
index dbcab1c6..a4e6fa16 100644
--- a/docs/manual/platform/windows.html
+++ b/docs/manual/platform/windows.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: windows.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/platform/windows.html.en b/docs/manual/platform/windows.html.en
index f5d1c832..ffa70bb0 100644
--- a/docs/manual/platform/windows.html.en
+++ b/docs/manual/platform/windows.html.en
@@ -250,7 +250,7 @@
       <li><p>Apache for Windows contains the ability to load modules at
       runtime, without recompiling the server. If Apache is compiled
       normally, it will install a number of optional modules in the
-      <code>\Apache2\modules</code> directory. To activate these or
+      <code>\Apache2.2\modules</code> directory. To activate these or
       other modules, the new <code class="directive"><a href="../mod/mod_so.html#loadmodule">LoadModule</a></code>
       directive must be used. For example, to activate the status
       module, use the following (in addition to the status-activating
@@ -320,7 +320,7 @@
     the command prompt at the Apache <code>bin</code> subdirectory:</p>
 
     <div class="example"><p><code>
-      httpd -k install
+      httpd.exe -k install
     </code></p></div>
 
     <p>If you need to specify the name of the service you want to
@@ -329,14 +329,14 @@
     computer.</p>
 
     <div class="example"><p><code>
-      httpd -k install -n "MyServiceName"
+      httpd.exe -k install -n "MyServiceName"
     </code></p></div>
 
     <p>If you need to have specifically named configuration files for
     different services, you must use this:</p>
 
     <div class="example"><p><code>
-      httpd -k install -n "MyServiceName" -f "c:\files\my.conf"
+      httpd.exe -k install -n "MyServiceName" -f "c:\files\my.conf"
     </code></p></div>
 
     <p>If you use the first command without any special parameters except
@@ -347,13 +347,13 @@
     <p>Removing an Apache service is easy. Just use:</p>
 
     <div class="example"><p><code>
-      httpd -k uninstall
+      httpd.exe -k uninstall
     </code></p></div>
 
     <p>The specific Apache service to be uninstalled can be specified by using:</p>
 
     <div class="example"><p><code>
-      httpd -k uninstall -n "MyServiceName"
+      httpd.exe -k uninstall -n "MyServiceName"
     </code></p></div>
 
     <p>Normal starting, restarting and shutting down of an Apache
@@ -364,34 +364,34 @@
     service's configuration file by using:</p>
 
     <div class="example"><p><code>
-      httpd -n "MyServiceName" -t
+      httpd.exe -n "MyServiceName" -t
     </code></p></div>
 
     <p>You can control an Apache service by its command line switches,
     too. To start an installed Apache service you'll use this:</p>
 
     <div class="example"><p><code>
-      httpd -k start
+      httpd.exe -k start
     </code></p></div>
 
     <p>To stop an Apache service via the command line switches, use
     this:</p>
 
     <div class="example"><p><code>
-      httpd -k stop
+      httpd.exe -k stop
     </code></p></div>
 
     <p>or</p>
 
     <div class="example"><p><code>
-      httpd -k shutdown
+      httpd.exe -k shutdown
     </code></p></div>
 
     <p>You can also restart a running service and force it to reread
     its configuration file by using:</p>
 
     <div class="example"><p><code>
-      httpd -k restart
+      httpd.exe -k restart
     </code></p></div>
 
     <p>By default, all Apache services are registered to run as the
@@ -433,7 +433,7 @@
       Apache <code>logs</code> directory.</li>
 
       <li>Grant the account read and execute (RX) rights to the
-      <code>Apache.exe</code> binary executable.</li>
+      <code>httpd.exe</code> binary executable.</li>
     </ol>
 
     <div class="note">It is usually a good practice to grant the user the Apache
@@ -483,7 +483,7 @@
       in the background. If you run the command</p>
 
       <div class="example"><p><code>
-        httpd -n "MyServiceName" -k start
+        httpd.exe -n "MyServiceName" -k start
       </code></p></div>
 
       <p>via a shortcut on your desktop, for example, then if the
@@ -531,7 +531,7 @@
     use the following command:</p>
 
     <div class="example"><p><code>
-      apache
+      httpd.exe
     </code></p></div>
 
     <p>Apache will execute, and will remain running until it is stopped
@@ -552,7 +552,7 @@
     window and entering:</p>
 
     <div class="example"><p><code>
-      httpd -k shutdown
+      httpd.exe -k shutdown
     </code></p></div>
 
     <p>This should be preferred over pressing Control-C because this
@@ -563,7 +563,7 @@
     complete without interruption. To restart Apache, use:</p>
 
     <div class="example"><p><code>
-      httpd -k restart
+      httpd.exe -k restart
     </code></p></div>
 
     <div class="note">Note for people familiar with the Unix version of Apache:
@@ -575,7 +575,7 @@
     <p>If the Apache console window closes immediately or unexpectedly
     after startup, open the Command Prompt from the Start Menu --&gt;
     Programs. Change to the folder to which you installed Apache, type
-    the command <code>httpd</code>, and read the error message. Then
+    the command <code>httpd.exe</code>, and read the error message. Then
     change to the logs folder, and review the <code>error.log</code>
     file for configuration mistakes. If you accepted the defaults when
     you installed Apache, the commands would be:</p>
@@ -583,7 +583,7 @@
     <div class="example"><p><code>
       c: <br />
       cd "\Program Files\Apache Software Foundation\Apache2.2\bin" <br />
-      httpd 
+      httpd.exe
     </code></p></div>
 
     <p>Then wait for Apache to stop, or press Control-C. Then enter the
@@ -603,20 +603,20 @@
       a particular configuration file:</p>
 
       <div class="example"><p><code>
-        httpd -f "c:\my server files\anotherconfig.conf"
+        httpd.exe -f "c:\my server files\anotherconfig.conf"
       </code></p></div>
 
       <p>or</p>
 
       <div class="example"><p><code>
-        httpd -f files\anotherconfig.conf
+        httpd.exe -f files\anotherconfig.conf
       </code></p></div></li>
 
       <li><p><code>-n</code> specifies the installed Apache service
       whose configuration file is to be used:</p>
 
       <div class="example"><p><code>
-        httpd -n "MyServiceName"
+        httpd.exe -n "MyServiceName"
       </code></p></div>
       </li>
     </ul>
@@ -633,7 +633,7 @@
     invoking Apache with the <code>-V</code> switch, like this:</p>
 
     <div class="example"><p><code>
-      httpd -V
+      httpd.exe -V
     </code></p></div>
 
     <p>Apache will then try to determine its <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> by trying the following, in this order:</p>
@@ -651,7 +651,7 @@
 
       <li>The server root compiled into the server. This is <code>
       /apache</code> by default, you can verify it by using <code>
-      httpd -V</code> and looking for a value labelled as
+      httpd.exe -V</code> and looking for a value labelled as
       <code>HTTPD_ROOT</code>.</li>
     </ol>
 
@@ -728,9 +728,9 @@
 
     <p>If you happen to be running Apache on an alternate port, you
     need to explicitly put that in the URL:</p>
-   
+
     <div class="example"><p><code>
-       http://127.0.0.1:8080/
+      http://127.0.0.1:8080/
     </code></p></div>
 
     <p>Once your basic installation is working, you should configure it
@@ -750,6 +750,6 @@
 <p><span>Available Languages: </span><a href="../en/platform/windows.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/platform/windows.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/platform/windows.html.ko.euc-kr b/docs/manual/platform/windows.html.ko.euc-kr
index 289056cd..e178b73f 100644
--- a/docs/manual/platform/windows.html.ko.euc-kr
+++ b/docs/manual/platform/windows.html.ko.euc-kr
@@ -683,6 +683,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/platform/windows.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/platform/windows.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/ab.html b/docs/manual/programs/ab.html
index 3ba123c4..e28c506c 100644
--- a/docs/manual/programs/ab.html
+++ b/docs/manual/programs/ab.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: ab.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/programs/ab.html.en b/docs/manual/programs/ab.html.en
index dd5ef2da..9585d1e0 100644
--- a/docs/manual/programs/ab.html.en
+++ b/docs/manual/programs/ab.html.en
@@ -193,6 +193,6 @@
 <p><span>Available Languages: </span><a href="../en/programs/ab.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/ab.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/ab.html.ko.euc-kr b/docs/manual/programs/ab.html.ko.euc-kr
index a025a69b..3abaa7ca 100644
--- a/docs/manual/programs/ab.html.ko.euc-kr
+++ b/docs/manual/programs/ab.html.ko.euc-kr
@@ -196,6 +196,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/programs/ab.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/ab.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/apachectl.html b/docs/manual/programs/apachectl.html
index b3966d8d..dc1c00fd 100644
--- a/docs/manual/programs/apachectl.html
+++ b/docs/manual/programs/apachectl.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: apachectl.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/programs/apachectl.html.en b/docs/manual/programs/apachectl.html.en
index d1dcac09..09d3394b 100644
--- a/docs/manual/programs/apachectl.html.en
+++ b/docs/manual/programs/apachectl.html.en
@@ -153,6 +153,6 @@ use the normal <code>apachectl start</code>.</dd>
 <p><span>Available Languages: </span><a href="../en/programs/apachectl.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/apachectl.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/apachectl.html.ko.euc-kr b/docs/manual/programs/apachectl.html.ko.euc-kr
index 73edbd06..c18f1854 100644
--- a/docs/manual/programs/apachectl.html.ko.euc-kr
+++ b/docs/manual/programs/apachectl.html.ko.euc-kr
@@ -139,6 +139,6 @@ Ok</code> ȤÀº ƯÁ¤ ¼³Á¤¿À·ù¿¡ ´ëÇÑ ÀÚ¼¼ÇÑ Á¤º¸¸¦ ¾Ë·ÁÁØ´Ù.
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/programs/apachectl.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/apachectl.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/apxs.html b/docs/manual/programs/apxs.html
index b6d6d1de..115f6a21 100644
--- a/docs/manual/programs/apxs.html
+++ b/docs/manual/programs/apxs.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: apxs.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/programs/apxs.html.en b/docs/manual/programs/apxs.html.en
index 6bef6596..41b255bd 100644
--- a/docs/manual/programs/apxs.html.en
+++ b/docs/manual/programs/apxs.html.en
@@ -325,6 +325,6 @@
 <p><span>Available Languages: </span><a href="../en/programs/apxs.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/apxs.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/apxs.html.ko.euc-kr b/docs/manual/programs/apxs.html.ko.euc-kr
index c6a91808..b16e2c88 100644
--- a/docs/manual/programs/apxs.html.ko.euc-kr
+++ b/docs/manual/programs/apxs.html.ko.euc-kr
@@ -319,6 +319,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/programs/apxs.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/apxs.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/configure.html b/docs/manual/programs/configure.html
index 9f569079..d95653aa 100644
--- a/docs/manual/programs/configure.html
+++ b/docs/manual/programs/configure.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: configure.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/programs/configure.html.en b/docs/manual/programs/configure.html.en
index ab3a7f11..29c19587 100644
--- a/docs/manual/programs/configure.html.en
+++ b/docs/manual/programs/configure.html.en
@@ -942,6 +942,6 @@
 <p><span>Available Languages: </span><a href="../en/programs/configure.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/configure.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/configure.html.ko.euc-kr b/docs/manual/programs/configure.html.ko.euc-kr
index dfb53c3d..c91640da 100644
--- a/docs/manual/programs/configure.html.ko.euc-kr
+++ b/docs/manual/programs/configure.html.ko.euc-kr
@@ -925,6 +925,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/programs/configure.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/configure.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/dbmmanage.html b/docs/manual/programs/dbmmanage.html
index 443de47d..db3812df 100644
--- a/docs/manual/programs/dbmmanage.html
+++ b/docs/manual/programs/dbmmanage.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: dbmmanage.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/programs/dbmmanage.html.en b/docs/manual/programs/dbmmanage.html.en
index 47b5a14c..b27cbb37 100644
--- a/docs/manual/programs/dbmmanage.html.en
+++ b/docs/manual/programs/dbmmanage.html.en
@@ -186,6 +186,6 @@
 <p><span>Available Languages: </span><a href="../en/programs/dbmmanage.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/dbmmanage.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/dbmmanage.html.ko.euc-kr b/docs/manual/programs/dbmmanage.html.ko.euc-kr
index 1029fc11..d1951a8a 100644
--- a/docs/manual/programs/dbmmanage.html.ko.euc-kr
+++ b/docs/manual/programs/dbmmanage.html.ko.euc-kr
@@ -167,6 +167,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/programs/dbmmanage.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/dbmmanage.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/htcacheclean.html b/docs/manual/programs/htcacheclean.html
index 454c0046..ff6681d9 100644
--- a/docs/manual/programs/htcacheclean.html
+++ b/docs/manual/programs/htcacheclean.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: htcacheclean.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/programs/htcacheclean.html.en b/docs/manual/programs/htcacheclean.html.en
index 79c5adeb..d8263290 100644
--- a/docs/manual/programs/htcacheclean.html.en
+++ b/docs/manual/programs/htcacheclean.html.en
@@ -45,7 +45,7 @@
     -<strong>p</strong><var>path</var>
     -<strong>l</strong><var>limit</var></code></p>
 
-    <p><code><strong>htcacheclean</strong> -<strong>b</strong>
+    <p><code><strong>htcacheclean</strong>
     [ -<strong>n</strong> ]
     [ -<strong>t</strong> ]
     [ -<strong>i</strong> ]
@@ -115,6 +115,6 @@
 <p><span>Available Languages: </span><a href="../en/programs/htcacheclean.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/htcacheclean.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/htcacheclean.html.ko.euc-kr b/docs/manual/programs/htcacheclean.html.ko.euc-kr
index 7690983d..7c749a73 100644
--- a/docs/manual/programs/htcacheclean.html.ko.euc-kr
+++ b/docs/manual/programs/htcacheclean.html.ko.euc-kr
@@ -108,6 +108,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/programs/htcacheclean.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/htcacheclean.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/htdbm.html b/docs/manual/programs/htdbm.html
index ad1f2a28..c08c45e8 100644
--- a/docs/manual/programs/htdbm.html
+++ b/docs/manual/programs/htdbm.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: htdbm.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/programs/htdbm.html.en b/docs/manual/programs/htdbm.html.en
index e45dff73..63e2a198 100644
--- a/docs/manual/programs/htdbm.html.en
+++ b/docs/manual/programs/htdbm.html.en
@@ -276,6 +276,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/programs/htdbm.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/htdigest.html b/docs/manual/programs/htdigest.html
index bb29be39..ed61ddf3 100644
--- a/docs/manual/programs/htdigest.html
+++ b/docs/manual/programs/htdigest.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: htdigest.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/programs/htdigest.html.en b/docs/manual/programs/htdigest.html.en
index bfe0092c..d277e241 100644
--- a/docs/manual/programs/htdigest.html.en
+++ b/docs/manual/programs/htdigest.html.en
@@ -73,6 +73,6 @@
 <p><span>Available Languages: </span><a href="../en/programs/htdigest.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/htdigest.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/htdigest.html.ko.euc-kr b/docs/manual/programs/htdigest.html.ko.euc-kr
index 455a8c58..47724751 100644
--- a/docs/manual/programs/htdigest.html.ko.euc-kr
+++ b/docs/manual/programs/htdigest.html.ko.euc-kr
@@ -70,6 +70,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/programs/htdigest.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/htdigest.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/htpasswd.html b/docs/manual/programs/htpasswd.html
index 5462afe3..204404b6 100644
--- a/docs/manual/programs/htpasswd.html
+++ b/docs/manual/programs/htpasswd.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: htpasswd.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/programs/htpasswd.html.en b/docs/manual/programs/htpasswd.html.en
index a5cceb55..1f7ac989 100644
--- a/docs/manual/programs/htpasswd.html.en
+++ b/docs/manual/programs/htpasswd.html.en
@@ -222,6 +222,6 @@ distribution.</li></ul></div>
 <p><span>Available Languages: </span><a href="../en/programs/htpasswd.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/htpasswd.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/htpasswd.html.ko.euc-kr b/docs/manual/programs/htpasswd.html.ko.euc-kr
index 9e392218..dec2603a 100644
--- a/docs/manual/programs/htpasswd.html.ko.euc-kr
+++ b/docs/manual/programs/htpasswd.html.ko.euc-kr
@@ -212,6 +212,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/programs/htpasswd.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/htpasswd.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/httpd.html b/docs/manual/programs/httpd.html
index 7d7ff916..59789654 100644
--- a/docs/manual/programs/httpd.html
+++ b/docs/manual/programs/httpd.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: httpd.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/programs/httpd.html.en b/docs/manual/programs/httpd.html.en
index b6f28606..f83f69d6 100644
--- a/docs/manual/programs/httpd.html.en
+++ b/docs/manual/programs/httpd.html.en
@@ -191,6 +191,6 @@ be read.</dd>
 <p><span>Available Languages: </span><a href="../en/programs/httpd.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/httpd.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/httpd.html.ko.euc-kr b/docs/manual/programs/httpd.html.ko.euc-kr
index 4e6614cc..14666f61 100644
--- a/docs/manual/programs/httpd.html.ko.euc-kr
+++ b/docs/manual/programs/httpd.html.ko.euc-kr
@@ -183,6 +183,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/programs/httpd.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/httpd.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/httxt2dbm.html b/docs/manual/programs/httxt2dbm.html
index c6222ab2..25cca38f 100644
--- a/docs/manual/programs/httxt2dbm.html
+++ b/docs/manual/programs/httxt2dbm.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: httxt2dbm.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/programs/httxt2dbm.html.en b/docs/manual/programs/httxt2dbm.html.en
index e8a8d8bb..e5e8d027 100644
--- a/docs/manual/programs/httxt2dbm.html.en
+++ b/docs/manual/programs/httxt2dbm.html.en
@@ -77,6 +77,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/programs/httxt2dbm.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/index.html b/docs/manual/programs/index.html
index 01f64142..2f5b561b 100644
--- a/docs/manual/programs/index.html
+++ b/docs/manual/programs/index.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: index.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
@@ -13,3 +15,7 @@ Content-type: text/html; charset=EUC-KR
 URI: index.html.ru.koi8-r
 Content-Language: ru
 Content-type: text/html; charset=KOI8-R
+
+URI: index.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/programs/index.html.en b/docs/manual/programs/index.html.en
index e87134ce..6451b616 100644
--- a/docs/manual/programs/index.html.en
+++ b/docs/manual/programs/index.html.en
@@ -21,7 +21,8 @@
 <p><span>Available Languages: </span><a href="../en/programs/" title="English">&nbsp;en&nbsp;</a> |
 <a href="../es/programs/" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ko/programs/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/programs/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/programs/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/programs/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>This page documents all the executable programs included
@@ -99,8 +100,9 @@
 <p><span>Available Languages: </span><a href="../en/programs/" title="English">&nbsp;en&nbsp;</a> |
 <a href="../es/programs/" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ko/programs/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/programs/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/programs/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/programs/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/index.html.es b/docs/manual/programs/index.html.es
index 0299574d..82edc188 100644
--- a/docs/manual/programs/index.html.es
+++ b/docs/manual/programs/index.html.es
@@ -21,7 +21,8 @@
 <p><span>Idiomas disponibles: </span><a href="../en/programs/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../es/programs/" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ko/programs/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/programs/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/programs/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/programs/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">Esta traducción podría estar
             obsoleta. Consulte la versión en inglés de la
@@ -95,8 +96,9 @@
 <p><span>Idiomas disponibles: </span><a href="../en/programs/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../es/programs/" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ko/programs/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/programs/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/programs/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/programs/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Módulos</a> | <a href="../mod/directives.html">Directivas</a> | <a href="../faq/">Preguntas Frecuentes</a> | <a href="../glossary.html">Glosario</a> | <a href="../sitemap.html">Mapa de este sitio web</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/index.html.ko.euc-kr b/docs/manual/programs/index.html.ko.euc-kr
index 1de27d0d..85c20d7a 100644
--- a/docs/manual/programs/index.html.ko.euc-kr
+++ b/docs/manual/programs/index.html.ko.euc-kr
@@ -21,7 +21,8 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/programs/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../es/programs/" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="../ko/programs/" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/programs/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/programs/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/programs/" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
             ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
@@ -91,8 +92,9 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/programs/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../es/programs/" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="../ko/programs/" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/programs/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/programs/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/programs/" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/index.html.ru.koi8-r b/docs/manual/programs/index.html.ru.koi8-r
index dee060b8..3269f2e1 100644
--- a/docs/manual/programs/index.html.ru.koi8-r
+++ b/docs/manual/programs/index.html.ru.koi8-r
@@ -21,7 +21,8 @@
 <p><span>äÏÓÔÕÐÎÙÅ ÑÚÙËÉ: </span><a href="../en/programs/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../es/programs/" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="../ko/programs/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/programs/" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/programs/" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/programs/" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>üÔÏÔ ÄÏËÕÍÅÎÔ ÏÐÉÓÙ×ÁÅÔ ÎÁÚÎÁÞÅÎÉÅ É ÉÐÏÌØÚÏ×ÁÎÉÅ
@@ -93,8 +94,9 @@
 <p><span>äÏÓÔÕÐÎÙÅ ÑÚÙËÉ: </span><a href="../en/programs/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../es/programs/" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="../ko/programs/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/programs/" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/programs/" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/programs/" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">íÏÄÕÌÉ</a> | <a href="../mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="../sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/index.html.tr.utf8 b/docs/manual/programs/index.html.tr.utf8
new file mode 100644
index 00000000..ff80991d
--- /dev/null
+++ b/docs/manual/programs/index.html.tr.utf8
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Sunucu ve Destek Programları - Apache HTTP Sunucusu</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page" class="no-sidebar"><div id="page-header">
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="../"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="../">Sürüm 2.2</a></div><div id="page-content"><div id="preamble"><h1>Sunucu ve Destek Programları</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="../en/programs/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/programs/" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="../ko/programs/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../ru/programs/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/programs/" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+    <p>Bu sayfada Apache HTTP Sunucusuna dahil tüm çalıştırılabilir programlar tanıtılmıştır.</p>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="index" id="index">Dizin</a></h2>
+
+    <dl>
+      <dt><code class="program"><a href="../programs/httpd.html">httpd</a></code></dt>
+
+      <dd>Apache hiper metin aktarım protokolü sunucusu.</dd>
+
+      <dt><code class="program"><a href="../programs/apachectl.html">apachectl</a></code></dt>
+
+      <dd>Apache HTTP Sunucusu denetim arayüzü.</dd>
+
+      <dt><code class="program"><a href="../programs/ab.html">ab</a></code></dt>
+
+      <dd>Apache HTTP Sunucusu  başarım ölçme aracı.</dd>
+
+      <dt><code class="program"><a href="../programs/apxs.html">apxs</a></code></dt>
+
+      <dd>Apache HTTP Sunucusu eklenti aracı (APache eXtenSion tool).</dd>
+
+      <dt><code class="program"><a href="../programs/configure.html">configure</a></code></dt>
+
+      <dd>Kaynak ağacını yapılandırır.</dd>
+
+      <dt><code class="program"><a href="../programs/dbmmanage.html">dbmmanage</a></code></dt>
+
+      <dd>Kullanıcı kimlik doğrulama dosyalarını temel kimlik doğrulaması için DBM biçeminde oluşturur ve günceller.</dd>
+
+      <dt><code class="program"><a href="../programs/htcacheclean.html">htcacheclean</a></code></dt>
+      <dd>Disk arabelleÄŸini temizler.</dd>
+
+      <dt><code class="program"><a href="../programs/htdigest.html">htdigest</a></code></dt>
+
+      <dd>Kullanıcı kimlik doğrulama dosyalarını özet kimlik doğrulaması için oluşturur ve günceller.</dd>
+
+      <dt><code class="program"><a href="../programs/htdbm.html">htdbm</a></code></dt>
+
+      <dd>DBM parola veritabanlarını idare eder.</dd>
+
+      <dt><code class="program"><a href="../programs/htpasswd.html">htpasswd</a></code></dt>
+
+      <dd>Kullanıcı kimlik doğrulama dosyalarını temel kimlik doğrulaması için oluşturur ve günceller.</dd>
+
+      <dt><code class="program"><a href="../programs/httxt2dbm.html">httxt2dbm</a></code></dt>
+
+      <dd><code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code> ile kullanmak üzere DBM dosyaları oluşturur.</dd>
+
+      <dt><code class="program"><a href="../programs/logresolve.html">logresolve</a></code></dt>
+
+      <dd>Apache günlük dosyalarındaki IP adreslerini konak isimlerine dönüştürür.</dd>
+
+      <dt><code class="program"><a href="../programs/rotatelogs.html">rotatelogs</a></code></dt>
+
+      <dd>Sunucuyu öldürmek gerekmeksizin günlük dosyalarının döndürülmesini sağlar.</dd>
+
+      <dt><code class="program"><a href="../programs/suexec.html">suexec</a></code></dt>
+
+      <dd>Bir dosyayı belli bir kullanıcı adına çalıştırır.</dd>
+
+      <dt><a href="other.html">DiÄŸer Programlar</a></dt>
+      <dd>Kendi kılavuz sayfası bulunmayan destek araçları.</dd>
+    </dl>
+</div></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="../en/programs/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/programs/" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="../ko/programs/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../ru/programs/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/programs/" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/logresolve.html b/docs/manual/programs/logresolve.html
index 6c1b8a70..6c22877a 100644
--- a/docs/manual/programs/logresolve.html
+++ b/docs/manual/programs/logresolve.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: logresolve.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/programs/logresolve.html.en b/docs/manual/programs/logresolve.html.en
index 1ea810cc..eac37f37 100644
--- a/docs/manual/programs/logresolve.html.en
+++ b/docs/manual/programs/logresolve.html.en
@@ -67,6 +67,6 @@ original address.</dd>
 <p><span>Available Languages: </span><a href="../en/programs/logresolve.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/logresolve.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/logresolve.html.ko.euc-kr b/docs/manual/programs/logresolve.html.ko.euc-kr
index c5d07f8d..d52fe0f6 100644
--- a/docs/manual/programs/logresolve.html.ko.euc-kr
+++ b/docs/manual/programs/logresolve.html.ko.euc-kr
@@ -64,6 +64,6 @@ IP ÁּҷΠȣ½ºÆ®¸íÀ» ãÀºÈÄ ±× È£½ºÆ®¸íÀ¸·Î ´Ù½Ã IP ÁÖ¼ÒµéÀ»
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/programs/logresolve.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/logresolve.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/other.html b/docs/manual/programs/other.html
index 2f947740..9df608ae 100644
--- a/docs/manual/programs/other.html
+++ b/docs/manual/programs/other.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: other.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/programs/other.html.en b/docs/manual/programs/other.html.en
index d2120e73..e7a108ef 100644
--- a/docs/manual/programs/other.html.en
+++ b/docs/manual/programs/other.html.en
@@ -54,6 +54,6 @@
 <p><span>Available Languages: </span><a href="../en/programs/other.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/other.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/other.html.ko.euc-kr b/docs/manual/programs/other.html.ko.euc-kr
index 289ad4fb..a1130420 100644
--- a/docs/manual/programs/other.html.ko.euc-kr
+++ b/docs/manual/programs/other.html.ko.euc-kr
@@ -52,6 +52,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/programs/other.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/other.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/rotatelogs.html b/docs/manual/programs/rotatelogs.html
index d4b500ff..95b63244 100644
--- a/docs/manual/programs/rotatelogs.html
+++ b/docs/manual/programs/rotatelogs.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: rotatelogs.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/programs/rotatelogs.html.en b/docs/manual/programs/rotatelogs.html.en
index f8ae5346..2be35e16 100644
--- a/docs/manual/programs/rotatelogs.html.en
+++ b/docs/manual/programs/rotatelogs.html.en
@@ -37,6 +37,7 @@
 
      <p><code><strong>rotatelogs</strong>
      [ -<strong>l</strong> ]
+     [ -<strong>f</strong> ]
      <var>logfile</var>
      <var>rotationtime</var>|<var>filesize</var>M 
      [ <var>offset</var> ]</code></p>
@@ -53,6 +54,16 @@ rotation.  Note that using <code>-l</code> in an environment which
 changes the GMT offset (such as for BST or DST) can lead to unpredictable
 results!</dd>
 
+<dt><code>-f</code></dt>
+<dd>Causes the logfile to be opened immediately, as soon as
+<code>rotatelogs</code> starts, instead of waiting for the
+first logfile entry to be read (for non-busy sites, there may be
+a substantial delay between when the server is started
+and when the first request is handled, meaning that the
+associated logfile does not "exist" until then, which
+causes problems from some automated logging tools).
+<em>Available in version 2.2.9 and later.</em></dd>
+
 <dt><code><var>logfile</var></code></dt>
 
 <dd>The path plus basename of the logfile.  If <var>logfile</var>
@@ -166,6 +177,6 @@ extensions.</p>
 <p><span>Available Languages: </span><a href="../en/programs/rotatelogs.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/rotatelogs.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/rotatelogs.html.ko.euc-kr b/docs/manual/programs/rotatelogs.html.ko.euc-kr
index 6e690007..68f0022c 100644
--- a/docs/manual/programs/rotatelogs.html.ko.euc-kr
+++ b/docs/manual/programs/rotatelogs.html.ko.euc-kr
@@ -140,6 +140,6 @@ GMT ½Ã°£Â÷°¡ º¯Çϴ ȯ°æ¿¡¼­ <code>-l</code>À» »ç¿ëÇÏ¸é ¿¹±âÄ¡
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/programs/rotatelogs.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/rotatelogs.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/suexec.html b/docs/manual/programs/suexec.html
index f9408988..2a856133 100644
--- a/docs/manual/programs/suexec.html
+++ b/docs/manual/programs/suexec.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: suexec.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/programs/suexec.html.en b/docs/manual/programs/suexec.html.en
index de4bde4f..e84d7ce6 100644
--- a/docs/manual/programs/suexec.html.en
+++ b/docs/manual/programs/suexec.html.en
@@ -56,6 +56,6 @@ changeable only at compile time.</dd>
 <p><span>Available Languages: </span><a href="../en/programs/suexec.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/suexec.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/programs/suexec.html.ko.euc-kr b/docs/manual/programs/suexec.html.ko.euc-kr
index 927e7c11..a22d6441 100644
--- a/docs/manual/programs/suexec.html.ko.euc-kr
+++ b/docs/manual/programs/suexec.html.ko.euc-kr
@@ -57,6 +57,6 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/programs/suexec.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/programs/suexec.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/rewrite/index.html b/docs/manual/rewrite/index.html
index 5f97bff8..e4d079c3 100644
--- a/docs/manual/rewrite/index.html
+++ b/docs/manual/rewrite/index.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: index.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/rewrite/index.html.en b/docs/manual/rewrite/index.html.en
index 2ee4200b..1b61e89d 100644
--- a/docs/manual/rewrite/index.html.en
+++ b/docs/manual/rewrite/index.html.en
@@ -33,7 +33,7 @@
       </blockquote>
 
       <blockquote>
-            <p>`` Despite the tons of examples and docs,
+            <p>``Despite the tons of examples and docs,
             mod_rewrite is voodoo. Damned cool voodoo, but still
             voodoo.''</p>
 
@@ -59,7 +59,8 @@
       <p>This module operates on the full URLs (including the
       path-info part) both in per-server context
       (<code>httpd.conf</code>) and per-directory context
-      (<code>.htaccess</code>) and can even generate query-string
+      (<code>.htaccess</code> files and <code>&lt;Directory&gt;</code>
+      blocks) and can even generate query-string
       parts on result. The rewritten result can lead to internal
       sub-processing, external request redirection or even to an
       internal proxy throughput.</p>
@@ -69,10 +70,8 @@
       entire module in just one day.</p>
 
 </div>
-<div id="quickview"><h3>See also</h3><ul class="seealso"><li><a href="../mod/mod_rewrite.html">mod_rewrite reference
-documentation</a></li><li><a href="rewrite_intro.html">Introduction</a></li><li><a href="rewrite_tech.html">Technical details</a></li><li><a href="rewrite_guide.html">Practical solutions to common
-problems</a></li><li><a href="rewrite_guide_advanced.html">Practical solutions to
-advanced problems</a></li></ul></div>
+<div id="quickview"><h3>See also</h3><ul class="seealso"><li><a href="../urlmapping.html">Mapping URLs to the Filesystem</a></li><li><a href="http://wiki.apache.org/httpd/Rewrite">mod_rewrite
+wiki</a></li><li><a href="../glossary.html">Glossary</a></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="documentation" id="documentation">Documentation</a></h2>
@@ -80,17 +79,16 @@ advanced problems</a></li></ul></div>
 <li><a href="../mod/mod_rewrite.html">mod_rewrite reference
 documentation</a></li>
 <li><a href="rewrite_intro.html">Introduction</a></li>
+<li><a href="rewrite_flags.html">Flags</a></li>
 <li><a href="rewrite_tech.html">Technical details</a></li>
-<li><a href="rewrite_guide.html">Practical solutions to common
-problems</a></li>
-<li><a href="rewrite_guide_advanced.html">Practical solutions to
-advanced problems</a></li>
-<li><a href="../glossary.html">Glossary</a></li>
+<li><a href="rewrite_guide.html">Rewrite Guide - useful examples</a></li>
+<li><a href="rewrite_guide_advanced.html">Advanced Rewrite Guide - more
+useful examples</a></li>
 </ul>
 </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/rewrite/" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/rewrite/rewrite_flags.html b/docs/manual/rewrite/rewrite_flags.html
new file mode 100644
index 00000000..ac41b36d
--- /dev/null
+++ b/docs/manual/rewrite/rewrite_flags.html
@@ -0,0 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
+URI: rewrite_flags.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/rewrite/rewrite_flags.html.en b/docs/manual/rewrite/rewrite_flags.html.en
new file mode 100644
index 00000000..7063cc57
--- /dev/null
+++ b/docs/manual/rewrite/rewrite_flags.html.en
@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Apache mod_rewrite Flags - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.2</a> &gt; <a href="./">Rewrite</a></div><div id="page-content"><div id="preamble"><h1>Apache mod_rewrite Flags</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/rewrite/rewrite_flags.html" title="English">&nbsp;en&nbsp;</a></p>
+</div>
+
+<p>This document discusses the flags which are available to the
+<code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directive,
+providing detailed explanations and examples. This is not necessarily
+a comprehensive list of all flags available, so be sure to also
+consult the reference documentation.</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#introduction">Introduction</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#flags">The flags</a></li>
+</ul><h3>See also</h3><ul class="seealso"><li><a href="../mod/mod_rewrite.html">Module documentation</a></li><li><a href="rewrite_tech.html">Technical details</a></li><li><a href="rewrite_guide.html">Rewrite Guide - useful examples</a></li><li><a href="rewrite_guide_advanced.html">Advanced Rewrite Guide -
+advanced useful examples</a></li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="introduction" id="introduction">Introduction</a></h2>
+<p><code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>s can have
+their behavior modified by one or more flags. Flags are included in
+square brackets at the end of the rule, and multiple flags are separated
+by commas.</p>
+<div class="example"><p><code>
+RewriteRule pattern target [Flag1,Flag2,Flag3]
+</code></p></div>
+
+<p>The flags all have a short form, such as <code>CO</code>, as well as
+a longer form, such as <code>cookie</code>. Some flags take one or more
+arguments. Flags are not case sensitive.</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="flags" id="flags">The flags</a></h2>
+
+<p>Each flag has a long and short form. While it is most common to use
+the short form, it is recommended that you familiarize yourself with the
+long form, so that you remember what each flag is supposed to do.</p>
+
+<p>Presented here are each of the available flags, along with an example
+of how you might use them.</p>
+
+<h3><a name="flag_c" id="flag_c">C|chain</a></h3>
+<p>The [C] or [chain] flag indicates that the <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> is chained to the next
+rule. That is, if the rule matches, then it is processed as usual and
+control moves on to the next rule. However, if it does not match, then
+the next rule, and any other rules that are chained together, will be
+skipped.</p>
+
+
+
+<h3><a name="flag_co" id="flag_co">CO|cookie</a></h3>
+<p>The [CO], or [cookie] flag, allows you to set a cookie when a
+particular <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>
+matches. The argument consists of three required fields and two optional
+fields.</p>
+<p>You must declare a name and value for the cookie to be set, and the
+domain for which you wish the cookie to be valid. You may optionally set
+the lifetime of the cookie, and the path for which it should be
+returned.</p>
+<p>By default, the lifetime of the cookie is the current browser
+session.</p>
+<p>By default, the path for which the cookie will be valid is "/" - that
+is, the entire website.</p>
+<p>Several examples are offered here:</p>
+
+<div class="example"><p><code>
+RewriteEngine On<br />
+RewriteRule ^/index.html - [CO=frontdoor:yes:.apache.org:1440:/]
+</code></p></div>
+
+<p>This rule doesn't rewrite the request (the "-" rewrite target tells
+mod_rewrite to pass the request through unchanged) but sets a cookie
+called 'frontdoor' to a value of 'yes'. The cookie is valid for any host
+in the <code>.apache.org</code> domain. It will be set to expire in 1440
+minutes (24 hours) and will be returned for all URIs.</p>
+
+
+
+<h3><a name="flag_e" id="flag_e">E|env</a></h3>
+<p>With the [E], or [env] flag, you can set the value of an environment
+variable. Note that some environment variables may be set after the rule
+is run, thus unsetting what you have set. See <a href="../env.html">the
+Environment Variables document</a> for more details on how Environment
+variables work.</p>
+
+<p>The following example sets an evironment variable called 'image' to a
+value of '1' if the requested URI is an image file. Then, that
+environment variable is used to exclude those requests from the access
+log.</p>
+
+<div class="example"><p><code>
+RewriteRule \.(png|gif|jpg) - [E=image:1]<br />
+CustomLog logs/access_log combined env=!image
+</code></p></div>
+
+<p>Note that this same effect can be obtained using <code class="directive"><a href="../mod/mod_setenvif.html#setenvif">SetEnvIf</a></code>. This technique is offered as
+an example, not as a recommendation.</p>
+
+
+<h3><a name="flag_f" id="flag_f">F|forbidden</a></h3>
+<p>Using the [F] flag causes Apache to return a 403 Forbidden status
+code to the client. While the same behavior can be accomplished using
+the <code class="directive"><a href="../mod/mod_access.html#deny">Deny</a></code> directive, this 
+allows more flexibility in assigning a Forbidden status.</p>
+
+<p>The following rule will forbid <code>.exe</code> files from being
+downloaded from your server.</p>
+
+<div class="example"><p><code>
+RewriteRule \.exe - [F]
+</code></p></div>
+
+<p>This example uses the "-" syntax for the rewrite target, which means
+that the requested URI is not modified. There's no reason to rewrite to
+another URI, if you're going to forbid the request.</p>
+
+
+
+<h3><a name="flag_g" id="flag_g">G|gone</a></h3>
+<p>The [G] flag forces Apache to return a 410 Gone status with the
+response. This indicates that a resource used to be available, but is no
+longer available.</p>
+
+<p>As with the [F] flag, you will typically use the "-" syntax for the
+rewrite target when using the [G] flag:</p>
+
+<div class="example"><p><code>
+RewriteRule oldproduct - [G,NC]
+</code></p></div>
+
+
+<h3><a name="flag_h" id="flag_h">H|handler</a></h3>
+<p>Forces the resulting request to be handled with the specified
+handler. For example, one might use this to force all files without a
+file extension to be parsed by the php handler:</p>
+
+<div class="example"><p><code>
+RewriteRule !\. - [H=application/x-httpd-php]
+</code></p></div>
+
+<p>
+The regular expression above - <code>!\.</code> - will match any request
+that does not contain the literal <code>.</code> character.
+</p>
+
+
+<h3><a name="flag_l" id="flag_l">L|last</a></h3>
+<p>The [L] flag causes <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> to stop processing
+the rule set. In most contexts, this means that if the rule matches, no
+further rules will be processed.</p>
+
+<p>If you are using <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> in either
+<code>.htaccess</code> files or in 
+<code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> sections,
+it is important to have some understanding of how the rules are
+processed.  The simplified form of this is that once the rules have been
+processed, the rewritten request is handed back to the URL parsing
+engine to do what it may with it. It is possible that as the rewritten
+request is handled, the <code>.htaccess</code> file or 
+<code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> section
+may be encountered again, and thus the ruleset may be run again from the
+start. Most commonly this will happen if one of the rules causes a
+redirect - either internal or external - causing the request process to
+start over.</p>
+
+<p>It is therefore important, if you are using <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directives in one of these
+context that you take explicit steps to avoid rules looping, and not
+count solely on the [L] flag to terminate execution of a series of
+rules, as shown below.</p>
+
+<p>The example given here will rewrite any request to
+<code>index.php</code>, giving the original request as a query string
+argument to <code>index.php</code>, however, if the request is already
+for <code>index.php</code>, this rule will be skipped.</p>
+
+<div class="example"><p><code>
+RewriteCond %{REQUEST_URI} !index\.php<br />
+RewriteRule ^(.*) index.php?req=$1 [L]
+</code></p></div>
+
+
+<h3><a name="flag_n" id="flag_n">N|next</a></h3>
+<p>
+The [N] flag causes the ruleset to start over again from the top. Use
+with extreme caution, as it may result in loop.
+</p>
+<p>
+The [Next] flag could be used, for example, if you wished to replace a
+certain string or letter repeatedly in a request. The example shown here
+will replace A with B everywhere in a request, and will continue doing
+so until there are no more As to be replaced.
+</p>
+
+<div class="example"><p><code>
+RewriteRule (.*)A(.*) $1B$2 [N]
+</code></p></div>
+
+<p>You can think of this as a <code>while</code> loop: While this
+pattern still matches, perform this substitution.</p>
+
+
+
+<h3><a name="flag_nc" id="flag_nc">NC|nocase</a></h3>
+<p>Use of the [NC] flag causes the <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> to be matched in a
+case-insensitive manner. That is, it doesn't care whether letters appear
+as upper-case or lower-case in the matched URI.</p>
+
+<p>In the example below, any request for an image file will be proxied
+to your dedicated image server. The match is case-insensitive, so that
+<code>.jpg</code> and <code>.JPG</code> files are both acceptable, for
+example.</p>
+
+<div class="example"><p><code>
+RewriteRule (.*\.(jpg|gif|png))$ http://images.example.com$1 [P,NC]
+</code></p></div>
+
+
+<h3><a name="flag_ne" id="flag_ne">NE|noescape</a></h3>
+<p>By default, special characters, such as <code>&amp;</code> and
+<code>?</code>, for example, will be converted to their hexcode
+equivalent. Using the [NE] flag prevents that from happening.
+</p>
+
+<div class="example"><p><code>
+RewriteRule ^/anchor/(.+) /bigpage.html#$1 [NE,R]
+</code></p></div>
+
+<p>
+The above example will redirect <code>/anchor/xyz</code> to
+<code>/bigpage.html#xyz</code>. Omitting the [NE] will result in the #
+being converted to its hexcode equivalent, <code>%23</code>, which will
+then result in a 404 Not Found error condition.
+</p>
+
+
+
+<h3><a name="flag_ns" id="flag_ns">NS|nosubreq</a></h3>
+<p>Use of the [NS] flag prevents the rule from being used on
+subrequests. For example, a page which is included using an SSI (Server
+Side Include) is a subrequest, and you may want to avoid rewrites
+happening on those subrequests.</p>
+
+<p>
+Images, javascript files, or css files, loaded as part of an HTML page,
+are not subrequests - the browser requests them as separate HTTP
+requests.
+</p>
+
+
+<h3><a name="flag_p" id="flag_p">P|proxy</a></h3>
+<p>Use of the [P] flag causes the request to be handled by
+<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>, and handled via a proxy request. For
+example, if you wanted all image requests to be handled by a back-end
+image server, you might do something like the following:</p>
+
+<div class="example"><p><code>
+RewriteRule (.*)\.(jpg|gif|png) http://images.example.com$1.$2 [P]
+</code></p></div>
+
+<p>Use of the [P] flag implies [L] - that is, the request is immediatly
+pushed through the proxy, and any following rules will not be
+considered.</p>
+
+
+
+<h3><a name="flag_pt" id="flag_pt">PT|passthrough</a></h3>
+
+<p>
+The target (or substitution string) in a RewriteRule is assumed to be a
+file path, by default. The use of the [PT] flag causes it to be treated
+as a URI instead. That is to say, the
+use of the [PT] flag causes the result of the <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> to be passed back through
+URL mapping, so that location-based mappings, such as <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code>, for example, might have a chance to take
+effect.
+</p>
+
+<p>
+If, for example, you have an 
+<code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code>
+for /icons, and have a <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> pointing there, you should
+use the [PT] flag to ensure that the 
+<code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code> is evaluated.
+</p>
+
+<div class="example"><p><code>
+Alias /icons /usr/local/apache/icons<br />
+RewriteRule /pics/(.+)\.jpg /icons/$1.gif [PT]
+</code></p></div>
+
+<p>
+Omission of the [PT] flag in this case will cause the Alias to be
+ignored, resulting in a 'File not found' error being returned.
+</p>
+
+
+
+<h3><a name="flag_qsa" id="flag_qsa">QSA|qsappend</a></h3>
+<p>
+When the replacement URI contains a query string, the default behavior
+of <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> is to discard
+the existing query string, and replace it with the newly generated one.
+Using the [QSA] flag causes the query strings to be combined.
+</p>
+
+<p>Consider the following rule:</p>
+
+<div class="example"><p><code>
+RewriteRule /pages/(.+) /page.php?page=$1 [QSA]
+</code></p></div>
+
+<p>With the [QSA] flag, a request for <code>/pages/123?one=two</code> will be
+mapped to <code>/page.php?page=123&amp;one=two</code>. Without the [QSA]
+flag, that same request will be mapped to
+<code>/page.php?page=123</code> - that is, the existing query string
+will be discarded.
+</p>
+
+
+<h3><a name="flag_r" id="flag_r">R|redirect</a></h3>
+<p>
+Use of the [R] flag causes a HTTP redirect to be issued to the browser.
+If a fully-qualified URL is specified (that is, including
+<code>http://servername/</code>) then a redirect will be issued to that
+location. Otherwise, the current servername will be used to generate the
+URL sent with the redirect.
+</p>
+
+<p>
+A status code may be specified, in the range 300-399, with a 302 status
+code being used by default if none is specified.
+</p>
+
+<p>
+You will almost always want to use [R] in conjunction with [L] (that is,
+use [R,L]) because on its own, the [R] flag prepends
+<code>http://thishost[:thisport]</code> to the URI, but then passes this
+on to the next rule in the ruleset, which can often result in 'Invalid
+URI in request' warnings.
+</p>
+
+
+
+<h3><a name="flag_s" id="flag_s">S|skip</a></h3>
+<p>The [S] flag is used to skip rules that you don't want to run. This
+can be thought of as a <code>goto</code> statement in your rewrite
+ruleset. In the following example, we only want to run the <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> if the requested URI
+doesn't correspond with an actual file.</p>
+
+<div class="example"><p><code>
+# Is the request for a non-existent file?
+RewriteCond %{REQUEST_FILENAME} !-f<br />
+RewriteCond %{REQUEST_FILENAME} !-d<br />
+# If so, skip these two RewriteRules
+RewriteRule .? - [S=2]<br />
+<br />
+RewriteRule (.*\.gif) images.php?$1<br />
+RewriteRule (.*\.html) docs.php?$1
+</code></p></div>
+
+<p>This technique is useful because a <code class="directive"><a href="../mod/mod_rewrite.html#rewritecond">RewriteCond</a></code> only applies to the
+<code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> immediately
+following it. Thus, if you want to make a <code>RewriteCond</code> apply
+to several <code>RewriteRule</code>s, one possible technique is to
+negate those conditions and use a [Skip] flag.</p>
+
+
+
+<h3><a name="flag_t" id="flag_t">T|type</a></h3>
+<p>Sets the MIME type with which the resulting response will be
+sent. This has the same effect as the <code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code> directive.</p>
+
+<p>For example, you might use the following technique to serve Perl
+source code as plain text, if requested in a particular way:</p>
+
+<div class="example"><p><code>
+# Serve .pl files as plain text
+RewriteRule \.pl$ - [T=text/plain]
+</code></p></div>
+
+<p>Or, perhaps, if you have a camera that produces jpeg images without
+file extensions, you could force those images to be served with the
+correct MIME type by virtue of their file names:</p>
+
+<div class="example"><p><code>
+# Files with 'IMG' in the name are jpg images.<br />
+RewriteRule IMG - [T=image/jpg]
+</code></p></div>
+
+<p>Please note that this is a trivial example, and could be better done
+using <code class="directive"><a href="../mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code>
+instead. Always consider the alternate
+solutions to a problem before resorting to rewrite, which will
+invariably be a less efficient solution than the alternatives.</p>
+
+
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/rewrite/rewrite_flags.html" title="English">&nbsp;en&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/rewrite/rewrite_guide.html b/docs/manual/rewrite/rewrite_guide.html
index 49f623e9..69c288c8 100644
--- a/docs/manual/rewrite/rewrite_guide.html
+++ b/docs/manual/rewrite/rewrite_guide.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: rewrite_guide.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/rewrite/rewrite_guide.html.en b/docs/manual/rewrite/rewrite_guide.html.en
index 63fa1cee..54b7923c 100644
--- a/docs/manual/rewrite/rewrite_guide.html.en
+++ b/docs/manual/rewrite/rewrite_guide.html.en
@@ -14,9 +14,9 @@
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
 <p class="apache">Apache HTTP Server Version 2.2</p>
 <img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./index.html"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
 <div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.2</a></div><div id="page-content"><div id="preamble"><h1>URL Rewriting Guide</h1>
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.2</a> &gt; <a href="./">Rewrite</a></div><div id="page-content"><div id="preamble"><h1>URL Rewriting Guide</h1>
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../en/rewrite/rewrite_guide.html" title="English">&nbsp;en&nbsp;</a></p>
 </div>
@@ -26,7 +26,7 @@
     <a href="../mod/mod_rewrite.html">reference documentation</a>.
     It describes how one can use Apache's <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
     to solve typical URL-based problems with which webmasters are
-    commonony confronted. We give detailed descriptions on how to
+    commonly confronted. We give detailed descriptions on how to
     solve each problem by configuring URL rewriting rulesets.</p>
 
     <div class="warning">ATTENTION: Depending on your server configuration
@@ -50,15 +50,19 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#uservhosts">Virtual User Hosts</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#redirecthome">Redirect Homedirs For Foreigners</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#redirectanchors">Redirecting Anchors</a></li>
-<li><img alt="" src="../images/down.gif" /> Time-Dependent Rewriting</li>
-<li><img alt="" src="../images/down.gif" /> Backward Compatibility for YYYY to XXXX migration</li>
-<li><img alt="" src="../images/down.gif" /> <a href="#content">Content Handling</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#access">Access Restriction</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#other">Other</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#time-dependent">Time-Dependent Rewriting</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#backward-compatibility">Backward Compatibility for YYYY to XXXX migration</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#old-to-new">From Old to New (intern)</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#old-to-new-extern">From Old to New (extern)</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#static-to-dynamic">From Static to Dynamic</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#blocking-of-robots">Blocking of Robots</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#blocked-inline-images">Blocked Inline-Images</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxy-deny">Proxy Deny</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#external-rewriting">External Rewriting Engine</a></li>
 </ul><h3>See also</h3><ul class="seealso"><li><a href="../mod/mod_rewrite.html">Module
 documentation</a></li><li><a href="rewrite_intro.html">mod_rewrite
-introduction</a></li><li><a href="rewrite_guide_advanced.html">Practical solutions to
-advanced problems</a></li><li><a href="rewrite_tech.html">Technical details</a></li></ul></div>
+introduction</a></li><li><a href="rewrite_guide_advanced.html">Advanced Rewrite Guide - advanced 
+useful examples</a></li><li><a href="rewrite_tech.html">Technical details</a></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="canonicalurl" id="canonicalurl">Canonical URLs</a></h2>
@@ -276,12 +280,12 @@ RewriteRule   ^/~(.+)  http://<strong>newserver</strong>/~$1  [R,L]
 <div class="example"><pre>
 RewriteEngine on
 
-#   first try to find it in custom/...
+#   first try to find it in dir1/...
 #   ...and if found stop and be happy:
 RewriteCond         /your/docroot/<strong>dir1</strong>/%{REQUEST_FILENAME}  -f
 RewriteRule  ^(.+)  /your/docroot/<strong>dir1</strong>/$1  [L]
 
-#   second try to find it in pub/...
+#   second try to find it in dir2/...
 #   ...and if found stop and be happy:
 RewriteCond         /your/docroot/<strong>dir2</strong>/%{REQUEST_FILENAME}  -f
 RewriteRule  ^(.+)  /your/docroot/<strong>dir2</strong>/$1  [L]
@@ -418,7 +422,7 @@ RewriteRule   ^(/~.+)         http://www.somewhere.com/$1 [R,L]
 
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2>Time-Dependent Rewriting</h2>
+<h2><a name="time-dependent" id="time-dependent">Time-Dependent Rewriting</a></h2>
 
       
 
@@ -459,7 +463,7 @@ RewriteRule   ^foo\.html$             foo.night.html
 
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2>Backward Compatibility for YYYY to XXXX migration</h2>
+<h2><a name="backward-compatibility" id="backward-compatibility">Backward Compatibility for YYYY to XXXX migration</a></h2>
 
       
 
@@ -502,11 +506,7 @@ RewriteRule   ^(.*)$ $1.html
 
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="content" id="content">Content Handling</a></h2>
-
-    
-
-    <h3>From Old to New (intern)</h3>
+<h2><a name="old-to-new" id="old-to-new">From Old to New (intern)</a></h2>
 
       
 
@@ -535,9 +535,9 @@ RewriteRule    ^<strong>foo</strong>\.html$  <strong>bar</strong>.html
         </dd>
       </dl>
 
-    
-
-    <h3>From Old to New (extern)</h3>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="old-to-new-extern" id="old-to-new-extern">From Old to New (extern)</a></h2>
 
       
 
@@ -567,9 +567,9 @@ RewriteRule    ^<strong>foo</strong>\.html$  <strong>bar</strong>.html  [<strong
         </dd>
       </dl>
 
-    
-
-    <h3>From Static to Dynamic</h3>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="static-to-dynamic" id="static-to-dynamic">From Static to Dynamic</a></h2>
 
       
 
@@ -587,7 +587,8 @@ RewriteRule    ^<strong>foo</strong>\.html$  <strong>bar</strong>.html  [<strong
 
         <dd>
           <p>We just rewrite the URL to the CGI-script and force the
-          correct MIME-type so it gets really run as a CGI-script.
+          handler to be <strong>cgi-script</strong> so that it is
+          executed as a CGI program.
           This way a request to <code>/~quux/foo.html</code>
           internally leads to the invocation of
           <code>/~quux/foo.cgi</code>.</p>
@@ -595,19 +596,14 @@ RewriteRule    ^<strong>foo</strong>\.html$  <strong>bar</strong>.html  [<strong
 <div class="example"><pre>
 RewriteEngine  on
 RewriteBase    /~quux/
-RewriteRule    ^foo\.<strong>html</strong>$  foo.<strong>cgi</strong>  [T=<strong>application/x-httpd-cgi</strong>]
+RewriteRule    ^foo\.<strong>html</strong>$  foo.<strong>cgi</strong>  [H=<strong>cgi-script</strong>]
 </pre></div>
         </dd>
       </dl>
 
-    
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="access" id="access">Access Restriction</a></h2>
-
-    
-
-    <h3>Blocking of Robots</h3>
+<h2><a name="blocking-of-robots" id="blocking-of-robots">Blocking of Robots</a></h2>
 
       
 
@@ -643,9 +639,9 @@ RewriteRule ^<strong>/~quux/foo/arc/</strong>.+   -   [<strong>F</strong>]
         </dd>
       </dl>
 
-    
-
-    <h3>Blocked Inline-Images</h3>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="blocked-inline-images" id="blocked-inline-images">Blocked Inline-Images</a></h2>
 
       
 
@@ -681,9 +677,9 @@ RewriteRule <strong>^inlined-in-foo\.gif$</strong>   -                        [F
         </dd>
       </dl>
 
-    
-
-    <h3>Proxy Deny</h3>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="proxy-deny" id="proxy-deny">Proxy Deny</a></h2>
 
       
 
@@ -718,15 +714,9 @@ RewriteRule !^http://[^/.]\.mydomain.com.*  - [F]
         </dd>
       </dl>
 
-    
-
-  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="other" id="other">Other</a></h2>
-
-    
-
-    <h3>External Rewriting Engine</h3>
+<h2><a name="external-rewriting" id="external-rewriting">External Rewriting Engine</a></h2>
 
       
 
@@ -778,12 +768,10 @@ while (&lt;&gt;) {
         </dd>
       </dl>
 
-    
-
-  </div></div>
+    </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/rewrite/rewrite_guide.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/rewrite/rewrite_guide_advanced.html b/docs/manual/rewrite/rewrite_guide_advanced.html
index 07850dd6..d08ed10d 100644
--- a/docs/manual/rewrite/rewrite_guide_advanced.html
+++ b/docs/manual/rewrite/rewrite_guide_advanced.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: rewrite_guide_advanced.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/rewrite/rewrite_guide_advanced.html.en b/docs/manual/rewrite/rewrite_guide_advanced.html.en
index 9ea476f0..1859b9b5 100644
--- a/docs/manual/rewrite/rewrite_guide_advanced.html.en
+++ b/docs/manual/rewrite/rewrite_guide_advanced.html.en
@@ -14,9 +14,9 @@
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
 <p class="apache">Apache HTTP Server Version 2.2</p>
 <img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./index.html"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
 <div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.2</a></div><div id="page-content"><div id="preamble"><h1>URL Rewriting Guide - Advanced topics</h1>
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.2</a> &gt; <a href="./">Rewrite</a></div><div id="page-content"><div id="preamble"><h1>URL Rewriting Guide - Advanced topics</h1>
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../en/rewrite/rewrite_guide_advanced.html" title="English">&nbsp;en&nbsp;</a></p>
 </div>
@@ -26,34 +26,45 @@
     <a href="../mod/mod_rewrite.html">reference documentation</a>.
     It describes how one can use Apache's <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
     to solve typical URL-based problems with which webmasters are
-    commonony confronted. We give detailed descriptions on how to
+    commonly confronted. We give detailed descriptions on how to
     solve each problem by configuring URL rewriting rulesets.</p>
 
     <div class="warning">ATTENTION: Depending on your server configuration
-    it may be necessary to slightly change the examples for your
-    situation, e.g. adding the <code>[PT]</code> flag when
-    additionally using <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> and
+    it may be necessary to adjust the examples for your
+    situation, e.g., adding the <code>[PT]</code> flag if
+    using <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> and
     <code class="module"><a href="../mod/mod_userdir.html">mod_userdir</a></code>, etc. Or rewriting a ruleset
-    to fit in <code>.htaccess</code> context instead
+    to work in <code>.htaccess</code> context instead
     of per-server context. Always try to understand what a
-    particular ruleset really does before you use it. This
+    particular ruleset really does before you use it; this
     avoids many problems.</div>
 
   </div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#cluster">Webcluster through Homogeneous URL Layout</a></li>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#cluster">Web Cluster with Consistent URL Space</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#structuredhomedirs">Structured Homedirs</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#filereorg">Filesystem Reorganization</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#redirect404">Redirect Failing URLs To Other Webserver</a></li>
-<li><img alt="" src="../images/down.gif" /> Archive Access Multiplexer</li>
-<li><img alt="" src="../images/down.gif" /> <a href="#content">Content Handling</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#access">Access Restriction</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#redirect404">Redirect Failing URLs to Another Web Server</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#archive-access-multiplexer">Archive Access Multiplexer</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#browser-dependent-content">Browser Dependent Content</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#dynamic-mirror">Dynamic Mirror</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#reverse-dynamic-mirror">Reverse Dynamic Mirror</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#retrieve-missing-data">Retrieve Missing Data from Intranet</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#load-balancing">Load Balancing</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#new-mime-type">New MIME-type, New Service</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#on-the-fly-content">On-the-fly Content-Regeneration</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#autorefresh">Document With Autorefresh</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#mass-virtual-hosting">Mass Virtual Hosting</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#host-deny">Host Deny</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxy-deny">Proxy Deny</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#special-authentication">Special Authentication Variant</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#referer-deflector">Referer-based Deflector</a></li>
 </ul><h3>See also</h3><ul class="seealso"><li><a href="../mod/mod_rewrite.html">Module
 documentation</a></li><li><a href="rewrite_intro.html">mod_rewrite
-introduction</a></li><li><a href="rewrite_guide.html">Practical solutions to common
-problems</a></li><li><a href="rewrite_tech.html">Technical details</a></li></ul></div>
+introduction</a></li><li><a href="rewrite_guide.html">Rewrite Guide - useful
+examples</a></li><li><a href="rewrite_tech.html">Technical details</a></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="cluster" id="cluster">Webcluster through Homogeneous URL Layout</a></h2>
+<h2><a name="cluster" id="cluster">Web Cluster with Consistent URL Space</a></h2>
 
       
 
@@ -62,23 +73,23 @@ problems</a></li><li><a href="rewrite_tech.html">Technical details</a></li></ul>
 
         <dd>
           <p>We want to create a homogeneous and consistent URL
-          layout over all WWW servers on a Intranet webcluster, i.e.
-          all URLs (per definition server local and thus server
-          dependent!) become actually server <em>independent</em>!
-          What we want is to give the WWW namespace a consistent
-          server-independent layout: no URL should have to include
-          any physically correct target server. The cluster itself
-          should drive us automatically to the physical target
-          host.</p>
+          layout across all WWW servers on an Intranet web cluster, i.e.,
+          all URLs (by definition server-local and thus
+          server-dependent!) become server <em>independent</em>!
+          What we want is to give the WWW namespace a single consistent
+          layout: no URL should refer to
+          any particular target server. The cluster itself
+          should connect users automatically to a physical target
+          host as needed, invisibly.</p>
         </dd>
 
         <dt>Solution:</dt>
 
         <dd>
-          <p>First, the knowledge of the target servers come from
-          (distributed) external maps which contain information
-          where our users, groups and entities stay. The have the
-          form</p>
+          <p>First, the knowledge of the target servers comes from
+          (distributed) external maps which contain information on
+          where our users, groups, and entities reside. They have the
+          form:</p>
 
 <div class="example"><pre>
 user1  server_of_user1
@@ -88,7 +99,7 @@ user2  server_of_user2
 
           <p>We put them into files <code>map.xxx-to-host</code>.
           Second we need to instruct all servers to redirect URLs
-          of the forms</p>
+          of the forms:</p>
 
 <div class="example"><pre>
 /u/user/anypath
@@ -104,8 +115,8 @@ http://physical-host/g/group/anypath
 http://physical-host/e/entity/anypath
 </pre></div>
 
-          <p>when the URL is not locally valid to a server. The
-          following ruleset does this for us by the help of the map
+          <p>when any URL path need not be valid on every server. The
+          following ruleset does this for us with the help of the map
           files (assuming that server0 is a default server which
           will be used if a user has no entry in the map):</p>
 
@@ -136,9 +147,9 @@ RewriteRule   ^/([uge])/([^/]+)/([^.]+.+)   /$1/$2/.www/$3\
         <dt>Description:</dt>
 
         <dd>
-          <p>Some sites with thousands of users usually use a
-          structured homedir layout, i.e. each homedir is in a
-          subdirectory which begins for instance with the first
+          <p>Some sites with thousands of users use a
+          structured homedir layout, <em>i.e.</em> each homedir is in a
+          subdirectory which begins (for instance) with the first
           character of the username. So, <code>/~foo/anypath</code>
           is <code>/home/<strong>f</strong>/foo/.www/anypath</code>
           while <code>/~bar/anypath</code> is
@@ -149,7 +160,7 @@ RewriteRule   ^/([uge])/([^/]+)/([^.]+.+)   /$1/$2/.www/$3\
 
         <dd>
           <p>We use the following ruleset to expand the tilde URLs
-          into exactly the above layout.</p>
+          into the above layout.</p>
 
 <div class="example"><pre>
 RewriteEngine on
@@ -175,7 +186,7 @@ RewriteRule   ^/~(<strong>([a-z])</strong>[a-z0-9]+)(.*)  /home/<strong>$2</stro
           adjusted. Background: <strong><em>net.sw</em></strong> is
           my archive of freely available Unix software packages,
           which I started to collect in 1992. It is both my hobby
-          and job to to this, because while I'm studying computer
+          and job to do this, because while I'm studying computer
           science I have also worked for many years as a system and
           network administrator in my spare time. Every week I need
           some sort of software so I created a deep hierarchy of
@@ -204,11 +215,11 @@ drwxrwxr-x  10 netsw  users    512 Jul  9 14:08 X11/
           the world via a nice Web interface. "Nice" means that I
           wanted to offer an interface where you can browse
           directly through the archive hierarchy. And "nice" means
-          that I didn't wanted to change anything inside this
+          that I didn't want to change anything inside this
           hierarchy - not even by putting some CGI scripts at the
-          top of it. Why? Because the above structure should be
-          later accessible via FTP as well, and I didn't want any
-          Web or CGI stuff to be there.</p>
+          top of it. Why? Because the above structure should later be
+          accessible via FTP as well, and I didn't want any
+          Web or CGI stuff mixed in there.</p>
         </dd>
 
         <dt>Solution:</dt>
@@ -236,8 +247,8 @@ drwxr-xr-x   2 netsw  users     512 Jul  8 23:47 netsw-img/
 </pre></div>
 
           <p>The <code>DATA/</code> subdirectory holds the above
-          directory structure, i.e. the real
-          <strong><em>net.sw</em></strong> stuff and gets
+          directory structure, <em>i.e.</em> the real
+          <strong><em>net.sw</em></strong> stuff, and gets
           automatically updated via <code>rdist</code> from time to
           time. The second part of the problem remains: how to link
           these two structures together into one smooth-looking URL
@@ -246,7 +257,7 @@ drwxr-xr-x   2 netsw  users     512 Jul  8 23:47 netsw-img/
           for the various URLs. Here is the solution: first I put
           the following into the per-directory configuration file
           in the <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
-          of the server to rewrite the announced URL
+          of the server to rewrite the public URL path
           <code>/net.sw/</code> to the internal path
           <code>/e/netsw</code>:</p>
 
@@ -296,7 +307,7 @@ RewriteRule   (.*)                     netsw-lsdir.cgi/$1
 
           <ol>
             <li>Notice the <code>L</code> (last) flag and no
-            substitution field ('<code>-</code>') in the forth part</li>
+            substitution field ('<code>-</code>') in the fourth part</li>
 
             <li>Notice the <code>!</code> (not) character and
             the <code>C</code> (chain) flag at the first rule
@@ -309,7 +320,7 @@ RewriteRule   (.*)                     netsw-lsdir.cgi/$1
 
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="redirect404" id="redirect404">Redirect Failing URLs To Other Webserver</a></h2>
+<h2><a name="redirect404" id="redirect404">Redirect Failing URLs to Another Web Server</a></h2>
 
       
 
@@ -319,18 +330,18 @@ RewriteRule   (.*)                     netsw-lsdir.cgi/$1
         <dd>
           <p>A typical FAQ about URL rewriting is how to redirect
           failing requests on webserver A to webserver B. Usually
-          this is done via <code class="directive"><a href="../mod/core.html#errordocument">ErrorDocument</a></code> CGI-scripts in Perl, but
+          this is done via <code class="directive"><a href="../mod/core.html#errordocument">ErrorDocument</a></code> CGI scripts in Perl, but
           there is also a <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> solution.
-          But notice that this performs more poorly than using an
+          But note that this performs more poorly than using an
           <code class="directive"><a href="../mod/core.html#errordocument">ErrorDocument</a></code>
-          CGI-script!</p>
+          CGI script!</p>
         </dd>
 
         <dt>Solution:</dt>
 
         <dd>
           <p>The first solution has the best performance but less
-          flexibility, and is less error safe:</p>
+          flexibility, and is less safe:</p>
 
 <div class="example"><pre>
 RewriteEngine on
@@ -341,7 +352,7 @@ RewriteRule   ^(.+)                             http://<strong>webserverB</stron
           <p>The problem here is that this will only work for pages
           inside the <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>. While you can add more
           Conditions (for instance to also handle homedirs, etc.)
-          there is better variant:</p>
+          there is a better variant:</p>
 
 <div class="example"><pre>
 RewriteEngine on
@@ -351,17 +362,17 @@ RewriteRule   ^(.+)          http://<strong>webserverB</strong>.dom/$1
 
           <p>This uses the URL look-ahead feature of <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.
           The result is that this will work for all types of URLs
-          and is a safe way. But it does a performance impact on
-          the webserver, because for every request there is one
-          more internal subrequest. So, if your webserver runs on a
+          and is safe. But it does have a performance impact on
+          the web server, because for every request there is one
+          more internal subrequest. So, if your web server runs on a
           powerful CPU, use this one. If it is a slow machine, use
-          the first approach or better a <code class="directive"><a href="../mod/core.html#errordocument">ErrorDocument</a></code> CGI-script.</p>
+          the first approach or better an <code class="directive"><a href="../mod/core.html#errordocument">ErrorDocument</a></code> CGI script.</p>
         </dd>
       </dl>
 
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2>Archive Access Multiplexer</h2>
+<h2><a name="archive-access-multiplexer" id="archive-access-multiplexer">Archive Access Multiplexer</a></h2>
 
       
 
@@ -371,18 +382,18 @@ RewriteRule   ^(.+)          http://<strong>webserverB</strong>.dom/$1
         <dd>
           <p>Do you know the great CPAN (Comprehensive Perl Archive
           Network) under <a href="http://www.perl.com/CPAN">http://www.perl.com/CPAN</a>?
-          This does a redirect to one of several FTP servers around
-          the world which carry a CPAN mirror and is approximately
-          near the location of the requesting client. Actually this
-          can be called an FTP access multiplexing service. While
-          CPAN runs via CGI scripts, how can a similar approach
-          implemented via <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>?</p>
+          CPAN automatically redirects browsers to one of many FTP
+          servers around the world (generally one near the requesting
+          client); each server carries a full CPAN mirror. This is
+          effectively an FTP access multiplexing service.
+          CPAN runs via CGI scripts, but how could a similar approach
+          be implemented via <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>?</p>
         </dd>
 
         <dt>Solution:</dt>
 
         <dd>
-          <p>First we notice that from version 3.0.0
+          <p>First we notice that as of version 3.0.0,
           <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> can
           also use the "<code>ftp:</code>" scheme on redirects.
           And second, the location approximation can be done by a
@@ -414,11 +425,7 @@ com       ftp://ftp.cxan.com/CxAN/
 
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="content" id="content">Content Handling</a></h2>
-
-    
-
-   <h3>Browser Dependent Content</h3>
+<h2><a name="browser-dependent-content" id="browser-dependent-content">Browser Dependent Content</a></h2>
 
       
 
@@ -428,9 +435,9 @@ com       ftp://ftp.cxan.com/CxAN/
         <dd>
           <p>At least for important top-level pages it is sometimes
           necessary to provide the optimum of browser dependent
-          content, i.e. one has to provide a maximum version for the
-          latest Netscape variants, a minimum version for the Lynx
-          browsers and a average feature version for all others.</p>
+          content, i.e., one has to provide one version for
+          current browsers, a different version for the Lynx and text-mode
+          browsers, and another for other browsers.</p>
         </dd>
 
         <dt>Solution:</dt>
@@ -438,14 +445,14 @@ com       ftp://ftp.cxan.com/CxAN/
         <dd>
           <p>We cannot use content negotiation because the browsers do
           not provide their type in that form. Instead we have to
-          act on the HTTP header "User-Agent". The following condig
+          act on the HTTP header "User-Agent". The following config
           does the following: If the HTTP header "User-Agent"
           begins with "Mozilla/3", the page <code>foo.html</code>
-          is rewritten to <code>foo.NS.html</code> and and the
+          is rewritten to <code>foo.NS.html</code> and the
           rewriting stops. If the browser is "Lynx" or "Mozilla" of
-          version 1 or 2 the URL becomes <code>foo.20.html</code>.
+          version 1 or 2, the URL becomes <code>foo.20.html</code>.
           All other browsers receive page <code>foo.32.html</code>.
-          This is done by the following ruleset:</p>
+          This is done with the following ruleset:</p>
 
 <div class="example"><pre>
 RewriteCond %{HTTP_USER_AGENT}  ^<strong>Mozilla/3</strong>.*
@@ -460,9 +467,9 @@ RewriteRule ^foo\.html$         foo.<strong>32</strong>.html          [<strong>L
         </dd>
       </dl>
 
-    
-
-    <h3>Dynamic Mirror</h3>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="dynamic-mirror" id="dynamic-mirror">Dynamic Mirror</a></h2>
 
       
 
@@ -470,25 +477,25 @@ RewriteRule ^foo\.html$         foo.<strong>32</strong>.html          [<strong>L
         <dt>Description:</dt>
 
         <dd>
-          <p>Assume there are nice webpages on remote hosts we want
+          <p>Assume there are nice web pages on remote hosts we want
           to bring into our namespace. For FTP servers we would use
           the <code>mirror</code> program which actually maintains an
           explicit up-to-date copy of the remote data on the local
-          machine. For a webserver we could use the program
-          <code>webcopy</code> which acts similar via HTTP. But both
-          techniques have one major drawback: The local copy is
-          always just as up-to-date as often we run the program. It
-          would be much better if the mirror is not a static one we
+          machine. For a web server we could use the program
+          <code>webcopy</code> which runs via HTTP. But both
+          techniques have a major drawback: The local copy is
+          always only as up-to-date as the last time we ran the program. It
+          would be much better if the mirror was not a static one we
           have to establish explicitly. Instead we want a dynamic
-          mirror with data which gets updated automatically when
-          there is need (updated data on the remote host).</p>
+          mirror with data which gets updated automatically
+          as needed on the remote host(s).</p>
         </dd>
 
         <dt>Solution:</dt>
 
         <dd>
-          <p>To provide this feature we map the remote webpage or even
-          the complete remote webarea to our namespace by the use
+          <p>To provide this feature we map the remote web page or even
+          the complete remote web area to our namespace by the use
           of the <dfn>Proxy Throughput</dfn> feature
           (flag <code>[P]</code>):</p>
 
@@ -506,9 +513,9 @@ RewriteRule    ^<strong>usa-news\.html</strong>$   <strong>http://www.quux-corp.
         </dd>
       </dl>
 
-    
-
-    <h3>Reverse Dynamic Mirror</h3>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="reverse-dynamic-mirror" id="reverse-dynamic-mirror">Reverse Dynamic Mirror</a></h2>
 
       
 
@@ -528,9 +535,9 @@ RewriteRule   ^http://www\.remotesite\.com/(.*)$ /mirror/of/remotesite/$1
         </dd>
       </dl>
 
-    
-
-    <h3>Retrieve Missing Data from Intranet</h3>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="retrieve-missing-data" id="retrieve-missing-data">Retrieve Missing Data from Intranet</a></h2>
 
       
 
@@ -539,22 +546,22 @@ RewriteRule   ^http://www\.remotesite\.com/(.*)$ /mirror/of/remotesite/$1
 
         <dd>
           <p>This is a tricky way of virtually running a corporate
-          (external) Internet webserver
+          (external) Internet web server
           (<code>www.quux-corp.dom</code>), while actually keeping
-          and maintaining its data on a (internal) Intranet webserver
+          and maintaining its data on an (internal) Intranet web server
           (<code>www2.quux-corp.dom</code>) which is protected by a
-          firewall. The trick is that on the external webserver we
-          retrieve the requested data on-the-fly from the internal
+          firewall. The trick is that the external web server retrieves
+          the requested data on-the-fly from the internal
           one.</p>
         </dd>
 
         <dt>Solution:</dt>
 
         <dd>
-          <p>First, we have to make sure that our firewall still
-          protects the internal webserver and that only the
-          external webserver is allowed to retrieve data from it.
-          For a packet-filtering firewall we could for instance
+          <p>First, we must make sure that our firewall still
+          protects the internal web server and only the
+          external web server is allowed to retrieve data from it.
+          On a packet-filtering firewall, for instance, we could
           configure a firewall ruleset like the following:</p>
 
 <div class="example"><pre>
@@ -576,9 +583,9 @@ RewriteRule ^/home/([^/]+)/.www/?(.*) http://<strong>www2</strong>.quux-corp.dom
         </dd>
       </dl>
 
-    
-
-    <h3>Load Balancing</h3>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="load-balancing" id="load-balancing">Load Balancing</a></h2>
 
       
 
@@ -587,25 +594,25 @@ RewriteRule ^/home/([^/]+)/.www/?(.*) http://<strong>www2</strong>.quux-corp.dom
 
         <dd>
           <p>Suppose we want to load balance the traffic to
-          <code>www.foo.com</code> over <code>www[0-5].foo.com</code>
+          <code>www.example.com</code> over <code>www[0-5].example.com</code>
           (a total of 6 servers). How can this be done?</p>
         </dd>
 
         <dt>Solution:</dt>
 
         <dd>
-          <p>There are a lot of possible solutions for this problem.
-          We will discuss first a commonly known DNS-based variant
-          and then the special one with <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>:</p>
+          <p>There are many possible solutions for this problem.
+          We will first discuss a common DNS-based method,
+          and then one based on <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>:</p>
 
           <ol>
             <li>
               <strong>DNS Round-Robin</strong>
 
               <p>The simplest method for load-balancing is to use
-              the DNS round-robin feature of <code>BIND</code>.
-              Here you just configure <code>www[0-9].foo.com</code>
-              as usual in your DNS with A(address) records, e.g.</p>
+              DNS round-robin.
+              Here you just configure <code>www[0-9].example.com</code>
+              as usual in your DNS with A (address) records, e.g.,</p>
 
 <div class="example"><pre>
 www0   IN  A       1.2.3.1
@@ -616,7 +623,7 @@ www4   IN  A       1.2.3.5
 www5   IN  A       1.2.3.6
 </pre></div>
 
-              <p>Then you additionally add the following entry:</p>
+              <p>Then you additionally add the following entries:</p>
 
 <div class="example"><pre>
 www   IN  A       1.2.3.1
@@ -626,19 +633,21 @@ www   IN  A       1.2.3.4
 www   IN  A       1.2.3.5
 </pre></div>
 
-              <p>Now when <code>www.foo.com</code> gets
+              <p>Now when <code>www.example.com</code> gets
               resolved, <code>BIND</code> gives out <code>www0-www5</code>
-              - but in a slightly permutated/rotated order every time.
+              - but in a permutated (rotated) order every time.
               This way the clients are spread over the various
-              servers. But notice that this not a perfect load
-              balancing scheme, because DNS resolve information
-              gets cached by the other nameservers on the net, so
-              once a client has resolved <code>www.foo.com</code>
-              to a particular <code>wwwN.foo.com</code>, all
-              subsequent requests also go to this particular name
-              <code>wwwN.foo.com</code>. But the final result is
-              ok, because the total sum of the requests are really
-              spread over the various webservers.</p>
+              servers. But notice that this is not a perfect load
+              balancing scheme, because DNS resolutions are
+              cached by clients and other nameservers, so
+              once a client has resolved <code>www.example.com</code>
+              to a particular <code>wwwN.example.com</code>, all its
+              subsequent requests will continue to go to the same
+              IP (and thus a single server), rather than being
+              distributed across the other available servers. But the
+              overall result is
+              okay because the requests are collectively
+              spread over the various web servers.</p>
             </li>
 
             <li>
@@ -648,8 +657,8 @@ www   IN  A       1.2.3.5
               load-balancing is to use the program
               <code>lbnamed</code> which can be found at <a href="http://www.stanford.edu/~schemers/docs/lbnamed/lbnamed.html">
               http://www.stanford.edu/~schemers/docs/lbnamed/lbnamed.html</a>.
-              It is a Perl 5 program in conjunction with auxilliary
-              tools which provides a real load-balancing for
+              It is a Perl 5 program which, in conjunction with auxilliary
+              tools, provides real load-balancing via
               DNS.</p>
             </li>
 
@@ -658,17 +667,17 @@ www   IN  A       1.2.3.5
 
               <p>In this variant we use <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
               and its proxy throughput feature. First we dedicate
-              <code>www0.foo.com</code> to be actually
-              <code>www.foo.com</code> by using a single</p>
+              <code>www0.example.com</code> to be actually
+              <code>www.example.com</code> by using a single</p>
 
 <div class="example"><pre>
-www    IN  CNAME   www0.foo.com.
+www    IN  CNAME   www0.example.com.
 </pre></div>
 
               <p>entry in the DNS. Then we convert
-              <code>www0.foo.com</code> to a proxy-only server,
-              i.e. we configure this machine so all arriving URLs
-              are just pushed through the internal proxy to one of
+              <code>www0.example.com</code> to a proxy-only server,
+              i.e., we configure this machine so all arriving URLs
+              are simply passed through its internal proxy to one of
               the 5 other servers (<code>www1-www5</code>). To
               accomplish this we first establish a ruleset which
               contacts a load balancing script <code>lb.pl</code>
@@ -706,30 +715,34 @@ while (&lt;STDIN&gt;) {
 </pre></div>
 
               <div class="note">A last notice: Why is this useful? Seems like
-              <code>www0.foo.com</code> still is overloaded? The
+              <code>www0.example.com</code> still is overloaded? The
               answer is yes, it is overloaded, but with plain proxy
               throughput requests, only! All SSI, CGI, ePerl, etc.
-              processing is completely done on the other machines.
-              This is the essential point.</div>
+              processing is handled done on the other machines.
+              For a complicated site, this may work well. The biggest
+              risk here is that www0 is now a single point of failure --
+              if it crashes, the other servers are inaccessible.</div>
             </li>
 
             <li>
-              <strong>Hardware/TCP Round-Robin</strong>
-
-              <p>There is a hardware solution available, too. Cisco
-              has a beast called LocalDirector which does a load
-              balancing at the TCP/IP level. Actually this is some
-              sort of a circuit level gateway in front of a
-              webcluster. If you have enough money and really need
-              a solution with high performance, use this one.</p>
+              <strong>Dedicated Load Balancers</strong>
+
+              <p>There are more sophisticated solutions, as well. Cisco,
+              F5, and several other companies sell hardware load
+              balancers (typically used in pairs for redundancy), which
+              offer sophisticated load balancing and auto-failover
+              features. There are software packages which offer similar
+              features on commodity hardware, as well. If you have
+              enough money or need, check these out. The <a href="http://vegan.net/lb/">lb-l mailing list</a> is a
+              good place to research.</p>
             </li>
           </ol>
         </dd>
       </dl>
 
-    
-
-    <h3>New MIME-type, New Service</h3>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="new-mime-type" id="new-mime-type">New MIME-type, New Service</a></h2>
 
       
 
@@ -737,8 +750,8 @@ while (&lt;STDIN&gt;) {
         <dt>Description:</dt>
 
         <dd>
-          <p>On the net there are a lot of nifty CGI programs. But
-          their usage is usually boring, so a lot of webmaster
+          <p>On the net there are many nifty CGI programs. But
+          their usage is usually boring, so a lot of webmasters
           don't use them. Even Apache's Action handler feature for
           MIME-types is only appropriate when the CGI programs
           don't need special URLs (actually <code>PATH_INFO</code>
@@ -746,10 +759,10 @@ while (&lt;STDIN&gt;) {
           let us configure a new file type with extension
           <code>.scgi</code> (for secure CGI) which will be processed
           by the popular <code>cgiwrap</code> program. The problem
-          here is that for instance we use a Homogeneous URL Layout
-          (see above) a file inside the user homedirs has the URL
-          <code>/u/user/foo/bar.scgi</code>. But
-          <code>cgiwrap</code> needs the URL in the form
+          here is that for instance if we use a Homogeneous URL Layout
+          (see above) a file inside the user homedirs might have a URL
+          like <code>/u/user/foo/bar.scgi</code>, but
+          <code>cgiwrap</code> needs URLs in the form
           <code>/~user/foo/bar.scgi/</code>. The following rule
           solves the problem:</p>
 
@@ -760,12 +773,12 @@ RewriteRule ^/[uge]/<strong>([^/]+)</strong>/\.www/(.+)\.scgi(.*) ...
 
           <p>Or assume we have some more nifty programs:
           <code>wwwlog</code> (which displays the
-          <code>access.log</code> for a URL subtree and
+          <code>access.log</code> for a URL subtree) and
           <code>wwwidx</code> (which runs Glimpse on a URL
           subtree). We have to provide the URL area to these
-          programs so they know on which area they have to act on.
-          But usually this ugly, because they are all the times
-          still requested from that areas, i.e. typically we would
+          programs so they know which area they are really working with.
+          But usually this is complicated, because they may still be
+          requested by the alternate URL form, i.e., typically we would
           run the <code>swwidx</code> program from within
           <code>/u/user/foo/</code> via hyperlink to</p>
 
@@ -773,10 +786,10 @@ RewriteRule ^/[uge]/<strong>([^/]+)</strong>/\.www/(.+)\.scgi(.*) ...
 /internal/cgi/user/swwidx?i=/u/user/foo/
 </pre></div>
 
-          <p>which is ugly. Because we have to hard-code
+          <p>which is ugly, because we have to hard-code
           <strong>both</strong> the location of the area
           <strong>and</strong> the location of the CGI inside the
-          hyperlink. When we have to reorganize the area, we spend a
+          hyperlink. When we have to reorganize, we spend a
           lot of time changing the various hyperlinks.</p>
         </dd>
 
@@ -811,9 +824,9 @@ HREF="*"
         </dd>
       </dl>
 
-    
-
-    <h3>On-the-fly Content-Regeneration</h3>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="on-the-fly-content" id="on-the-fly-content">On-the-fly Content-Regeneration</a></h2>
 
       
 
@@ -822,12 +835,12 @@ HREF="*"
 
         <dd>
           <p>Here comes a really esoteric feature: Dynamically
-          generated but statically served pages, i.e. pages should be
+          generated but statically served pages, i.e., pages should be
           delivered as pure static pages (read from the filesystem
           and just passed through), but they have to be generated
-          dynamically by the webserver if missing. This way you can
-          have CGI-generated pages which are statically served unless
-          one (or a cronjob) removes the static contents. Then the
+          dynamically by the web server if missing. This way you can
+          have CGI-generated pages which are statically served unless an
+          admin (or a <code>cron</code> job) removes the static contents. Then the
           contents gets refreshed.</p>
         </dd>
 
@@ -841,22 +854,22 @@ RewriteCond %{REQUEST_FILENAME}   <strong>!-s</strong>
 RewriteRule ^page\.<strong>html</strong>$          page.<strong>cgi</strong>   [T=application/x-httpd-cgi,L]
 </pre></div>
 
-          <p>Here a request to <code>page.html</code> leads to a
+          <p>Here a request for <code>page.html</code> leads to an
           internal run of a corresponding <code>page.cgi</code> if
-          <code>page.html</code> is still missing or has filesize
+          <code>page.html</code> is missing or has filesize
           null. The trick here is that <code>page.cgi</code> is a
-          usual CGI script which (additionally to its <code>STDOUT</code>)
+          CGI script which (additionally to its <code>STDOUT</code>)
           writes its output to the file <code>page.html</code>.
-          Once it was run, the server sends out the data of
+          Once it has completed, the server sends out
           <code>page.html</code>. When the webmaster wants to force
-          a refresh the contents, he just removes
-          <code>page.html</code> (usually done by a cronjob).</p>
+          a refresh of the contents, he just removes
+          <code>page.html</code> (typically from <code>cron</code>).</p>
         </dd>
       </dl>
 
-    
-
-    <h3>Document With Autorefresh</h3>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="autorefresh" id="autorefresh">Document With Autorefresh</a></h2>
 
       
 
@@ -864,9 +877,9 @@ RewriteRule ^page\.<strong>html</strong>$          page.<strong>cgi</strong>   [
         <dt>Description:</dt>
 
         <dd>
-          <p>Wouldn't it be nice while creating a complex webpage if
-          the webbrowser would automatically refresh the page every
-          time we write a new version from within our editor?
+          <p>Wouldn't it be nice, while creating a complex web page, if
+          the web browser would automatically refresh the page every
+          time we save a new version from within our editor?
           Impossible?</p>
         </dd>
 
@@ -874,10 +887,10 @@ RewriteRule ^page\.<strong>html</strong>$          page.<strong>cgi</strong>   [
 
         <dd>
           <p>No! We just combine the MIME multipart feature, the
-          webserver NPH feature and the URL manipulation power of
+          web server NPH feature, and the URL manipulation power of
           <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>. First, we establish a new
           URL feature: Adding just <code>:refresh</code> to any
-          URL causes this to be refreshed every time it gets
+          URL causes the 'page' to be refreshed every time it is
           updated on the filesystem.</p>
 
 <div class="example"><pre>
@@ -1006,9 +1019,9 @@ exit(0);
         </dd>
       </dl>
 
-    
-
-    <h3>Mass Virtual Hosting</h3>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="mass-virtual-hosting" id="mass-virtual-hosting">Mass Virtual Hosting</a></h2>
 
       
 
@@ -1017,18 +1030,17 @@ exit(0);
 
         <dd>
           <p>The <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> feature of Apache is nice
-          and works great when you just have a few dozens
+          and works great when you just have a few dozen
           virtual hosts. But when you are an ISP and have hundreds of
-          virtual hosts to provide this feature is not the best
-          choice.</p>
+          virtual hosts, this feature is suboptimal.</p>
         </dd>
 
         <dt>Solution:</dt>
 
         <dd>
-          <p>To provide this feature we map the remote webpage or even
-          the complete remote webarea to our namespace by the use
-          of the <dfn>Proxy Throughput</dfn> feature (flag <code>[P]</code>):</p>
+          <p>To provide this feature we map the remote web page or even
+          the complete remote web area to our namespace using the
+          <dfn>Proxy Throughput</dfn> feature (flag <code>[P]</code>):</p>
 
 <div class="example"><pre>
 ##
@@ -1085,22 +1097,16 @@ RewriteCond   ${lowercase:%{HTTP_HOST}|NONE}  ^(.+)$
 RewriteCond   ${vhost:%1}  ^(/.*)$
 #
 #   5. finally we can map the URL to its docroot location
-#      and remember the virtual host for logging puposes
+#      and remember the virtual host for logging purposes
 RewriteRule   ^/(.*)$   %1/$1  [E=VHOST:${lowercase:%{HTTP_HOST}}]
     :
 </pre></div>
         </dd>
       </dl>
 
-    
-
-  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="access" id="access">Access Restriction</a></h2>
-
-    
-
-    <h3>Host Deny</h3>
+<h2><a name="host-deny" id="host-deny">Host Deny</a></h2>
 
       
 
@@ -1153,9 +1159,9 @@ bsdti1.sdm.de  -
         </dd>
       </dl>
 
-    
-
-    <h3>Proxy Deny</h3>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="proxy-deny" id="proxy-deny">Proxy Deny</a></h2>
 
       
 
@@ -1172,7 +1178,7 @@ bsdti1.sdm.de  -
         <dd>
           <p>We first have to make sure <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
           is below(!) <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> in the Configuration
-          file when compiling the Apache webserver. This way it gets
+          file when compiling the Apache web server. This way it gets
           called <em>before</em> <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>. Then we
           configure the following for a host-dependent deny...</p>
 
@@ -1190,9 +1196,9 @@ RewriteRule !^http://[^/.]\.mydomain.com.*  - [F]
         </dd>
       </dl>
 
-    
-
-    <h3>Special Authentication Variant</h3>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="special-authentication" id="special-authentication">Special Authentication Variant</a></h2>
 
       
 
@@ -1200,11 +1206,11 @@ RewriteRule !^http://[^/.]\.mydomain.com.*  - [F]
         <dt>Description:</dt>
 
         <dd>
-          <p>Sometimes a very special authentication is needed, for
-          instance a authentication which checks for a set of
+          <p>Sometimes very special authentication is needed, for
+          instance authentication which checks for a set of
           explicitly configured users. Only these should receive
           access and without explicit prompting (which would occur
-          when using the Basic Auth via <code class="module"><a href="../mod/mod_auth.html">mod_auth</a></code>).</p>
+          when using Basic Auth via <code class="module"><a href="../mod/mod_auth_basic.html">mod_auth_basic</a></code>).</p>
         </dd>
 
         <dt>Solution:</dt>
@@ -1222,9 +1228,9 @@ RewriteRule ^/~quux/only-for-friends/      -                                 [F]
         </dd>
       </dl>
 
-    
-
-    <h3>Referer-based Deflector</h3>
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="referer-deflector" id="referer-deflector">Referer-based Deflector</a></h2>
 
       
 
@@ -1274,12 +1280,10 @@ http://www.badguys.com/bad/index3.html   http://somewhere.com/
         </dd>
       </dl>
 
-    
-
-  </div></div>
+    </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/rewrite/rewrite_guide_advanced.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/rewrite/rewrite_intro.html b/docs/manual/rewrite/rewrite_intro.html
index 607f1c18..e6e697d2 100644
--- a/docs/manual/rewrite/rewrite_intro.html
+++ b/docs/manual/rewrite/rewrite_intro.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: rewrite_intro.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/rewrite/rewrite_intro.html.en b/docs/manual/rewrite/rewrite_intro.html.en
index e96dd216..e80d4441 100644
--- a/docs/manual/rewrite/rewrite_intro.html.en
+++ b/docs/manual/rewrite/rewrite_intro.html.en
@@ -14,9 +14,9 @@
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
 <p class="apache">Apache HTTP Server Version 2.2</p>
 <img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./index.html"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
 <div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache mod_rewrite Introduction</h1>
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.2</a> &gt; <a href="./">Rewrite</a></div><div id="page-content"><div id="preamble"><h1>Apache mod_rewrite Introduction</h1>
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../en/rewrite/rewrite_intro.html" title="English">&nbsp;en&nbsp;</a></p>
 </div>
@@ -35,7 +35,6 @@ but this doc should help the beginner get their feet wet.
 <li><img alt="" src="../images/down.gif" /> <a href="#rewritecond">Rewrite conditions</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#rewritemap">Rewrite maps</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#htaccess">.htaccess files</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#EnvVar">Environment Variables</a></li>
 </ul><h3>See also</h3><ul class="seealso"><li><a href="../mod/mod_rewrite.html">Module
 documentation</a></li><li><a href="rewrite_tech.html">Technical details</a></li><li><a href="rewrite_guide.html">Practical solutions to common
 problems</a></li><li><a href="rewrite_guide_advanced.html">Practical solutions to
@@ -53,6 +52,19 @@ using them without actually understanding what they do.</p>
 <p>This document attempts to give sufficient background so that what
 follows is understood, rather than just copied blindly.
 </p>
+
+<p>Remember that many common URL-manipulation tasks don't require the
+full power and complexity of <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>. For simple
+tasks, see <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> and the documentation
+on <a href="../urlmapping.html">mapping URLs to the
+filesystem</a>.</p>
+
+<p>Finally, before proceeding, be sure to configure
+the <code class="directive"><a href="../mod/mod_rewrite.html#rewritelog">RewriteLog</a></code>. Although
+this log file can give an overwhelming amount of information, it is
+indispensable in debugging problems with <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>
+configuration, since it will tell you exactly how each rule is
+processed.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="regex" id="regex">Regular Expressions</a></h2>
@@ -85,7 +97,7 @@ well as write your own.</p>
 <th>Example</th>
 </tr>
 
-<tr><td><code>.</code></td><td>Matches any
+<tr><td><code>.</code></td><td>Matches any single
 character</td><td><code>c.t</code> will match <code>cat</code>,
 <code>cot</code>, <code>cut</code>, etc.</td></tr>
 <tr><td><code>+</code></td><td>Repeats the previous match one or more
@@ -94,10 +106,9 @@ times</td><td><code>a+</code> matches <code>a</code>, <code>aa</code>,
 <tr><td><code>*</code></td><td>Repeats the previous match zero or more
 times.</td><td><code>a*</code> matches all the same things
 <code>a+</code> matches, but will also match an empty string.</td></tr>
-<tr><td><code>?</code></td><td>Makes the match optional.</td><td /></tr>
-<tr><td><code>.</code></td><td>Matches any
-character</td><td><code>colou?r</code> will match <code>color</code> and
-<code>colour</code>.</td></tr>
+<tr><td><code>?</code></td><td>Makes the match optional.</td><td>
+<code>colou?r</code> will match <code>color</code> and <code>colour</code>.</td>
+</tr>
 <tr><td><code>^</code></td><td>Called an anchor, matches the beginning
 of the string</td><td><code>^a</code> matches a string that begins with
 <code>a</code></td></tr>
@@ -111,11 +122,14 @@ For more on backreferences see <a href="#InternalBackRefs">below</a>.</td></tr>
 <tr><td><code>[ ]</code></td><td>A character class - matches one of the
 characters</td><td><code>c[uoa]t</code> matches <code>cut</code>,
 <code>cot</code> or <code>cat</code>.</td></tr>
-<tr><td><code>!</code></td><td>Not</td><td>Negates a match - that is,
-ensures that it does not match.</td></tr>
-
+<tr><td><code>[^ ]</code></td><td>Negative character class - matches any character not specified</td><td><code>c[^/]t</code> matches <code>cat</code> or <code>c=t</code> but not <code>c/t</code></td></tr>
 </table>
 
+<p>In <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> the <code>!</code> character can be
+used before a regular expression to negate it. This is, a string will
+be considered to have matched only if it does not match the rest of
+the expression.</p>
+
 
 
 <h3><a name="InternalBackRefs" id="InternalBackRefs">Regex Back-Reference Availability</a></h3>
@@ -138,59 +152,161 @@ ensures that it does not match.</td></tr>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="rewriterule" id="rewriterule">RewriteRule basics</a></h2>
-<p>
-Basic anatomy of a RewriteRule, with exhaustively annotated simple
-examples.
-</p>
+<p>A <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> consists
+of three arguments separated by spaces. The arguments are</p>
+<ol>
+<li><var>Pattern</var>: which incoming URLs should be affected by the rule;</li>
+<li><var>Substitution</var>: where should the matching requests be sent;</li>
+<li><var>[flags]</var>: options affecting the rewritten request.</li>
+</ol>
+
+<p>The <var>Pattern</var> is always a <a href="#regex">regular
+expression</a> matched against the URL-Path of the incoming request
+(the part after the hostname but before any question mark indicating
+the beginning of a query string).</p>
+
+<p>The <var>Substitution</var> can itself be one of three things:</p>
+
+<dl>
+<dt>A full filesystem path to a resource</dt>
+<dd>
+<div class="example"><p><code>
+RewriteRule ^/games.* /usr/local/games/web
+</code></p></div>
+<p>This maps a request to an arbitrary location on your filesystem, much
+like the <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code> directive.</p>
+</dd>
+
+<dt>A web-path to a resource</dt>
+<dd>
+<div class="example"><p><code>
+RewriteRule ^/foo$ /bar
+</code></p></div>
+<p>If <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> is set
+to <code>/usr/local/apache2/htdocs</code>, then this directive would
+map requests for <code>http://example.com/foo</code> to the
+path <code>/usr/local/apache2/htdocs/bar</code>.</p>
+</dd>
+
+<dt>An absolute URL</dt>
+<dd>
+<div class="example"><p><code>
+RewriteRule ^/product/view$ http://site2.example.com/seeproduct.html [R]
+</code></p></div>
+<p>This tells the client to make a new request for the specified URL.</p>
+</dd>
+</dl>
+
+<p>The <var>Substitution</var> can also
+contain <em>back-references</em> to parts of the incoming URL-path
+matched by the <var>Pattern</var>. Consider the following:</p>
+<div class="example"><p><code>
+RewriteRule ^/product/(.*)/view$ /var/web/productdb/$1
+</code></p></div>
+<p>The variable <code>$1</code> will be replaced with whatever text
+was matched by the expression inside the parenthesis in
+the <var>Pattern</var>. For example, a request
+for <code>http://example.com/product/r14df/view</code> will be mapped
+to the path <code>/var/web/productdb/r14df</code>.</p>
+
+<p>If there is more than one expression in parenthesis, they are
+available in order in the
+variables <code>$1</code>, <code>$2</code>, <code>$3</code>, and so
+on.</p>
+
+
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="flags" id="flags">Rewrite Flags</a></h2>
-<p>Discussion of the flags to RewriteRule, and when and why one might
-use them.</p>
+<p>The behavior of a <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> can be modified by the
+application of one or more flags to the end of the rule. For example, the
+matching behavior of a rule can be made case-insensitive by the
+application of the <code>[NC]</code> flag:
+</p>
+<div class="example"><p><code>
+RewriteRule ^puppy.html smalldog.html [NC]
+</code></p></div>
+
+<p>For more details on the available flags, their meanings, and
+examples, see the <a href="rewrite_flags.html">Rewrite Flags</a> document.</p>
+
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="rewritecond" id="rewritecond">Rewrite conditions</a></h2>
-<p>Discussion of RewriteCond, looping, and other related concepts.
-</p>
+<p>One or more <code class="directive"><a href="../mod/mod_rewrite.html#rewritecond">RewriteCond</a></code>
+directives can be used to restrict the types of requests that will be
+subject to the
+following <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>. The
+first argument is a variable describing a characteristic of the
+request, the second argument is a <a href="#regex">regular
+expression</a> that must match the variable, and a third optional
+argument is a list of flags that modify how the match is evaluated.</p>
+
+<p>For example, to send all requests from a particular IP range to a
+different server, you could use:</p>
+<div class="example"><p><code>
+RewriteCond %{REMOTE_ADDR} ^10\.2\.<br />
+RewriteRule (.*) http://intranet.example.com$1
+</code></p></div>
+
+<p>When more than
+one <code class="directive"><a href="../mod/mod_rewrite.html#rewritecond">RewriteCond</a></code> is
+specified, they must all match for
+the <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> to be
+applied. For example, to deny requests that contain the word "hack" in
+their query string, except if they also contain a cookie containing
+the word "go", you could use:</p>
+<div class="example"><p><code>
+RewriteCond %{QUERY_STRING} hack<br />
+RewriteCond %{HTTP_COOKIE} !go<br />
+RewriteRule .* - [F]
+</code></p></div>
+<p>Notice that the exclamation mark specifies a negative match, so the rule is only applied if the cookie does not contain "go".</p>
+
+<p>Matches in the regular expressions contained in
+the <code class="directive"><a href="../mod/mod_rewrite.html#rewritecond">RewriteCond</a></code>s can be
+used as part of the <var>Substitution</var> in
+the <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> using the
+variables <code>%1</code>, <code>%2</code>, etc. For example, this
+will direct the request to a different directory depending on the
+hostname used to access the site:</p>
+<div class="example"><p><code>
+RewriteCond %{HTTP_HOST} (.*)<br />
+RewriteRule ^/(.*) /sites/%1/$1
+</code></p></div>
+<p>If the request was for <code>http://example.com/foo/bar</code>,
+then <code>%1</code> would contain <code>example.com</code>
+and <code>$1</code> would contain <code>foo/bar</code>.</p>
+
+
+
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="rewritemap" id="rewritemap">Rewrite maps</a></h2>
-<p>Discussion of RewriteMap, including simple, but heavily annotated,
-examples.</p>
+<p>See <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code>.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="htaccess" id="htaccess">.htaccess files</a></h2>
-<p>Discussion of the differences between rewrite rules in httpd.conf and
-in .htaccess files.</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="EnvVar" id="EnvVar">Environment Variables</a></h2>
-
-<p>This module keeps track of two additional (non-standard)
-CGI/SSI environment variables named <code>SCRIPT_URL</code>
-and <code>SCRIPT_URI</code>. These contain the
-<em>logical</em> Web-view to the current resource, while the
-standard CGI/SSI variables <code>SCRIPT_NAME</code> and
-<code>SCRIPT_FILENAME</code> contain the <em>physical</em>
-System-view. </p>
-
-<p>Notice: These variables hold the URI/URL <em>as they were
-initially requested</em>, <em>i.e.</em>, <em>before</em> any
-rewriting. This is important because the rewriting process is
-primarily used to rewrite logical URLs to physical
-pathnames.</p>
-
-<div class="example"><h3>Example</h3><pre>
-SCRIPT_NAME=/sw/lib/w3s/tree/global/u/rse/.www/index.html
-SCRIPT_FILENAME=/u/rse/.www/index.html
-SCRIPT_URL=/u/rse/
-SCRIPT_URI=http://en1.engelschall.com/u/rse/
-</pre></div>
+
+<p>Rewriting is typically configured in the main server configuration
+setting (outside any <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> section) or
+inside <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+containers. This is the easiest way to do rewriting and is
+recommended. It is possible, however, to do rewriting
+inside <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code>
+sections or <a href="../howto/htaccess.html"><code>.htaccess</code>
+files</a> at the expense of some additional complexity. This technique
+is called per-directory rewrites.</p>
+
+<p>The main difference with per-server rewrites is that the path
+prefix of the directory containing the <code>.htaccess</code> file is
+stripped before matching in
+the <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>. In addition, the <code class="directive"><a href="../mod/mod_rewrite.html#rewritebase">RewriteBase</a></code> should be used to assure the request is properly mapped.</p>
 
 </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/rewrite/rewrite_intro.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/rewrite/rewrite_tech.html b/docs/manual/rewrite/rewrite_tech.html
index 4e06869f..18b37ed7 100644
--- a/docs/manual/rewrite/rewrite_tech.html
+++ b/docs/manual/rewrite/rewrite_tech.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: rewrite_tech.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/rewrite/rewrite_tech.html.en b/docs/manual/rewrite/rewrite_tech.html.en
index b18aff71..75158d6a 100644
--- a/docs/manual/rewrite/rewrite_tech.html.en
+++ b/docs/manual/rewrite/rewrite_tech.html.en
@@ -14,9 +14,9 @@
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
 <p class="apache">Apache HTTP Server Version 2.2</p>
 <img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./index.html"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
 <div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache mod_rewrite Technical Details</h1>
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.2</a> &gt; <a href="./">Rewrite</a></div><div id="page-content"><div id="preamble"><h1>Apache mod_rewrite Technical Details</h1>
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../en/rewrite/rewrite_tech.html" title="English">&nbsp;en&nbsp;</a></p>
 </div>
@@ -29,9 +29,9 @@ and URL matching.</p>
 <li><img alt="" src="../images/down.gif" /> <a href="#InternalRuleset">Ruleset Processing</a></li>
 </ul><h3>See also</h3><ul class="seealso"><li><a href="../mod/mod_rewrite.html">Module
 documentation</a></li><li><a href="rewrite_intro.html">mod_rewrite
-introduction</a></li><li><a href="rewrite_guide.html">Practical solutions to common
-problems</a></li><li><a href="rewrite_guide_advanced.html">Practical solutions to
-advanced problems</a></li></ul></div>
+introduction</a></li><li><a href="rewrite_guide.html">Rewrite Guide - useful 
+examples</a></li><li><a href="rewrite_guide_advanced.html">Advanced Rewrite Guide -
+advanced useful examples</a></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="Internal" id="Internal">Internal Processing</a></h2>
@@ -162,6 +162,6 @@ advanced problems</a></li></ul></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/rewrite/rewrite_tech.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/sections.html b/docs/manual/sections.html
index 7afbefe4..f4f8cf04 100644
--- a/docs/manual/sections.html
+++ b/docs/manual/sections.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: sections.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
@@ -6,10 +8,14 @@ URI: sections.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: sections.html.ja.euc-jp
+URI: sections.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: sections.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: sections.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en
index 609063b2..f3671510 100644
--- a/docs/manual/sections.html.en
+++ b/docs/manual/sections.html.en
@@ -21,7 +21,8 @@
 <p><span>Available Languages: </span><a href="./en/sections.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/sections.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/sections.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sections.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
  <p>Directives in the <a href="configuring.html">configuration files</a> may apply to the
 entire server, or they may be restricted to apply only to particular
@@ -472,8 +473,9 @@ Deny from badguy.example.com<br />
 <p><span>Available Languages: </span><a href="./en/sections.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/sections.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/sections.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sections.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/sections.html.fr b/docs/manual/sections.html.fr
index 6e71fbbc..94bebd01 100644
--- a/docs/manual/sections.html.fr
+++ b/docs/manual/sections.html.fr
@@ -21,10 +21,11 @@
 <p><span>Langues Disponibles: </span><a href="./en/sections.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/sections.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/sections.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sections.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
  <p>Les directives des <a href="configuring.html">fichiers de configuration</a> peuvent s'appliquer
-au serveur dans son ensemble, ou seulement à des répertoires, fichiers, hôtes,
+au serveur dans son ensemble, ou seulement à des répertoires, fichiers, hôtes,
 ou URLs particuliers.  Ce document décrit comment utiliser les conteneurs de
 sections de configuration ou les fichiers <code>.htaccess</code> pour
 modifier la portée des directives de configuration.</p>
@@ -33,7 +34,7 @@ modifier la portée des directives de configuration.</p>
 configuration</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#file-and-web">Système de fichiers et
 arborescence du site web</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#virtualhost">Hôtes virtuels</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#virtualhost">Hôtes virtuels</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#proxy">Mandataire</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#whatwhere">Quelles sont les directives autorisées ?</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#mergin">Comment les sections sont combinées entre elles</a></li>
@@ -332,14 +333,14 @@ toutes les requêtes sans tenir compte de l'URL spécifique.</p>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="virtualhost" id="virtualhost">Hôtes virtuels</a></h2>
+<h2><a name="virtualhost" id="virtualhost">Hôtes virtuels</a></h2>
 
 <p>Le conteneur <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-contient des directives qui s'appliquent à des hôtes spécifiques.
-Ceci s'avère utile pour servir des hôtes multiples à partir de la même machine,
+contient des directives qui s'appliquent à des hôtes spécifiques.
+Ceci s'avère utile pour servir des hôtes multiples à partir de la même machine,
 chacun d'entre eux possédant une configuration différente.  Pour de plus amples
 informations,
-voir la <a href="vhosts/">Documentation sur les hôtes virtuels</a>.</p>
+voir la <a href="vhosts/">Documentation sur les hôtes virtuels</a>.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="proxy" id="proxy">Mandataire</a></h2>
@@ -441,7 +442,7 @@ sont interprétées.</p>
 
     <p>Les sections situées à l'intérieur de sections <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
     sont appliquées <em>après</em> les sections correspondantes situées en
-    dehors de la définition de l'hôte virtuel, ce qui permet à l'hôte virtuel
+    dehors de la définition de l'hôte virtuel, ce qui permet à l'hôte virtuel
     de prévaloir sur la configuration du serveur principal.</p>
 
     <p>Quand la requête est servie par le module <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code>,
@@ -452,10 +453,10 @@ sont interprétées.</p>
     sur celles qui les précèdent.</p>
 
 <div class="note"><h3>Note technique</h3>
-	Une séquence
-	<code>&lt;Location&gt;</code>/<code>&lt;LocationMatch&gt;</code>
-	est réellement traitée juste avant la phase de traduction du nom
-	(où <code>Aliases</code> et <code>DocumentRoots</code>
+      Une séquence
+      <code>&lt;Location&gt;</code>/<code>&lt;LocationMatch&gt;</code>
+      est réellement traitée juste avant la phase de traduction du nom
+      (où <code>Aliases</code> et <code>DocumentRoots</code>
       sont utilisés pour faire correspondre les URLs aux noms de fichiers).
       Les effets de cette séquence disparaissent totalement lorsque
       la traduction est terminée.
@@ -521,8 +522,9 @@ Deny from badguy.example.com<br />
 <p><span>Langues Disponibles: </span><a href="./en/sections.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/sections.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/sections.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sections.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossaire</a> | <a href="./sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/sections.html.ja.euc-jp b/docs/manual/sections.html.ja.euc-jp
deleted file mode 100644
index c3ee29a4..00000000
--- a/docs/manual/sections.html.ja.euc-jp
+++ /dev/null
@@ -1,470 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>¥»¥¯¥·¥ç¥ó¤ÎÀßÄê - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>¥»¥¯¥·¥ç¥ó¤ÎÀßÄê</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./en/sections.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/sections.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/sections.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
- <p><a href="configuring.html">ÀßÄê¥Õ¥¡¥¤¥ë</a>Ãæ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-¥µ¡¼¥ÐÁ´ÂΤËŬÍѤµ¤ì¤¿¤ê¡¢ÆÃÄê¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ä¥Õ¥¡¥¤¥ë¡¢¥Û¥¹¥È¡¢URL ¤Ë¤Î¤ß
-ŬÍѤµ¤ì¤ë¤è¤¦¤ËÀ©¸Â¤·¤¿¤ê¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤³¤Îʸ½ñ¤ÏÀßÄêÍѤΥ»¥¯¥·¥ç¥ó¤Î
-¥³¥ó¥Æ¥Ê¤ä <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤ò»È¤Ã¤Æ¾¤ÎÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î
-¥¹¥³¡¼¥×¤òÊѹ¹¤¹¤ëÊýË¡¤òÀâÌÀ¤·¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#types">ÀßÄêÍÑ¥»¥¯¥·¥ç¥ó¥³¥ó¥Æ¥Ê¤Î¼ïÎà</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#file-and-web">¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤È¥¦¥§¥Ö¶õ´Ö</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#virtualhost">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#proxy">¥×¥í¥¯¥·</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#whatwhere">¤É¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬»È¤¨¤ë¤Î?</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#mergin">¥»¥¯¥·¥ç¥ó¤Î¥Þ¡¼¥¸ÊýË¡</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="types" id="types">ÀßÄêÍÑ¥»¥¯¥·¥ç¥ó¥³¥ó¥Æ¥Ê¤Î¼ïÎà</a></h2>
-
-<table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="./mod/core.html">core</a></code></li><li><code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxymatch">&lt;ProxyMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li></ul></td></tr></table>
-
-<p>¥³¥ó¥Æ¥Ê¤Ë¤ÏÆó¤Ä¤Î´ðËܤȤʤë¼ïÎब¤¢¤ê¤Þ¤¹¡£¤Û¤È¤ó¤É¤Î¥³¥ó¥Æ¥Ê¤Ï
-³Æ¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æɾ²Á¤µ¤ì¤Þ¤¹¡£¤½¤Î¾ì¹ç¡¢¥³¥ó¥Æ¥ÊÃæ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-¥³¥ó¥Æ¥Ê¤Ë¥Þ¥Ã¥Á¤¹¤ë¥ê¥¯¥¨¥¹¥È¤Ë¤Î¤ßŬÍѤµ¤ì¤Þ¤¹¡£
-°ìÊý¡¢<code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code> ¥³¥ó¥Æ¥Ê¤È <code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> ¥³¥ó¥Æ¥Ê¤Ï
-¥µ¡¼¥Ð¤Îµ¯Æ°»þ¤ÈºÆµ¯Æ°»þ¤Ë¤Î¤ßɾ²Á¤µ¤ì¤Þ¤¹¡£µ¯Æ°»þ¤Ë¾ò·ï¤¬¿¿¤Ç¤¢¤ì¤Ð¡¢
-¥³¥ó¥Æ¥ÊÃæ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤¹¤Ù¤Æ¤Î¥ê¥¯¥¨¥¹¥È¤ËŬÍѤµ¤ì¤Þ¤¹¡£¾ò·ï¤¬
-µ¶¤Ç¤¢¤ì¤Ð¡¢¥³¥ó¥Æ¥ÊÃæ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï̵»ë¤µ¤ì¤Þ¤¹¡£</p>
-
-<p><code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-<code class="program"><a href="./programs/httpd.html">httpd</a></code> ¥³¥Þ¥ó¥É¥é¥¤¥ó¤ÇŬÀڤʥѥé¥á¡¼¥¿¤¬ÄêµÁ¤µ¤ì¤¿¤È¤­¤Ë¤Î¤ß
-ŬÍѤµ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò°Ï¤¤¤Þ¤¹¡£Î㤨¤Ð¼¡¤ÎÀßÄê¤Ç¤Ï¡¢¥µ¡¼¥Ð¤¬
-<code>httpd -DClosedForNow</code> ¤ò»È¤Ã¤Æµ¯Æ°¤µ¤ì¤¿¤È¤­¤À¤±¤¹¤Ù¤Æ¤Î
-¥ê¥¯¥¨¥¹¥È¤òÊ̤Υµ¥¤¥È¤Ë¥ê¥À¥¤¥ì¥¯¥È¤·¤Þ¤¹:</p>
-
-<div class="example"><p><code>
-&lt;IfDefine ClosedForNow&gt;<br />
-Redirect / http://otherserver.example.com/<br />
-&lt;/IfDefine&gt;
-</code></p></div>
-
-<p><code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> ¤Ï
-Èó¾ï¤Ë»÷¤Æ¤¤¤Þ¤¹¤¬¡¢Âå¤ï¤ê¤Ë¥µ¡¼¥Ð¾å¤Ç¥â¥¸¥å¡¼¥ë¤¬»ÈÍѲÄǽ¤Ê¾ì¹ç¤Ë¤Î¤ß
-ŬÍѲÄǽ¤Ê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò°Ï¤¤¤Þ¤¹¡£¥â¥¸¥å¡¼¥ë¤Ï¥µ¡¼¥Ð¤Ë
-ÀÅŪ¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ë¤«¡¢Æ°Åª¤ËÁȤ߹þ¤à¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Æ¡¢ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Ç
-<code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code> ¤Î¹Ô¤¬¤è¤êÁ°¤Î
-Éôʬ¤Ë½ñ¤«¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÆÃÄê¤Î¥â¥¸¥å¡¼¥ë¤Î
-¸ºß¤Ë´Ø¤ï¤é¤ºÀßÄê¥Õ¥¡¥¤¥ë¤¬Æ°ºî¤¹¤ëɬÍפ¬¤¢¤ë¾ì¹ç¤Ë¤Î¤ß»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
-¾ï¤ËÆ°ºî¤·¤ÆÍߤ·¤¤¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò°Ï¤à¤¿¤á¤Ë»È¤¦¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-¸ºß¤·¤Ê¤¤¥â¥¸¥å¡¼¥ë¤Ë´Ø¤¹¤ëÍ­ÍѤʥ¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤ÎȯÀ¸¤òÍÞÀ©¤·¤Æ¤·¤Þ¤¤¤Þ¤¹¤Î¤Ç¡£
-</p>
-
-<p>¼¡¤ÎÎã¤Ç¤Ï¡¢<code class="module"><a href="./mod/mod_mime_magic.html">mod_mime_magic</a></code> ¤¬¤¢¤ë¤È¤­¤Ë¤Î¤ß <code class="directive"><a href="./mod/mod_mime_magic.html#mimemagicfiles">MimeMagicFiles</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬
-ŬÍѤµ¤ì¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>
-&lt;IfModule mod_mime_magic.c&gt;<br />
-MimeMagicFile conf/magic<br />
-&lt;/IfModule&gt;
-</code></p></div>
-
-<p><code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-<code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-¥Æ¥¹¥È¤ÎÁ°¤Ë "!" ¤òÉÕ¤±¤ë¤³¤È¤ÇÈÝÄê¤Î¾ò·ï¤òŬÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-¤Þ¤¿¡¢¤³¤ì¤é¤Î¥»¥¯¥·¥ç¥ó¤Ï¤è¤êÊ£»¨¤ÊÀ©¸Â¤ò²Ý¤¹¤¿¤á¤ËÆþ¤ì»Ò¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="file-and-web" id="file-and-web">¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤È¥¦¥§¥Ö¶õ´Ö</a></h2>
-
-<p>ºÇ¤â¤è¤¯»È¤ï¤ì¤ëÀßÄê¤Î¥»¥¯¥·¥ç¥ó¥³¥ó¥Æ¥Ê¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ä¥¦¥§¥Ö¶õ´Ö¤Î
-ÆÃÄê¤Î¾ì½ê¤ÎÀßÄê¤òÊѹ¹¤¹¤ë¤â¤Î¤Ç¤¹¡£¤Þ¤º¡¢¤³¤ÎÆó¤Ä¤Î°ã¤¤¤òÍý²ò¤¹¤ë¤³¤È¤¬
-ÂçÀڤǤ¹¡£¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ï¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤«¤é¸«¤¿¥Ç¥£¥¹¥¯¤ÎÆâÍƤǤ¹¡£
-¤¿¤È¤¨¤Ð¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤Ï Apache ¤Ï Unix ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ç¤Ï
-<code>/usr/local/apache2</code> ¤Ë¡¢Windows ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ç¤Ï
-<code>"c:/Program Files/Apache Group/Apache2"</code> ¤Ë¸ºß¤·¤Þ¤¹¡£
-(Apache ¤Ç¤Ï Windows ¤Ç¤â¥Ñ¥¹¥»¥Ñ¥ì¡¼¥¿¤È¤·¤Æ¥¹¥é¥Ã¥·¥å¤ò»È¤¦¤³¤È¤Ë
-µ¤¤ò¤Ä¤±¤Æ¤¯¤À¤µ¤¤¡£) ÂоÈŪ¤Ë¡¢¥¦¥§¥Ö¶õ´Ö¤Ï¤¢¤Ê¤¿¤Î¥µ¥¤¥È¤ò
-¥¦¥§¥Ö¥µ¡¼¥Ð¤«¤éÇÛ¿®¤µ¤ì¤ë¤â¤Î¤È¤·¤Æ¸«¤¿¤â¤Î¤Ç¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ë¸«¤¨¤ë¤â¤Î¤Ç¤¹¡£
-¥Ç¥Õ¥©¥ë¥È¤Î Unix ¾å¤Î Apache ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤Ï¥¦¥§¥Ö¶õ´Ö¤Î
-<code>/dir/</code> ¤È¤¤¤¦¥Ñ¥¹¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î
-<code>/usr/local/apache2/htdocs/dir/</code> ¤È¤¤¤¦¥Ñ¥¹¤ËÂбþ¤·¤Þ¤¹¡£
-¥¦¥§¥Ö¥Ú¡¼¥¸¤Ï¥Ç¡¼¥¿¥Ù¡¼¥¹¤ä¾¤Î¾ì½ê¤«¤éưŪ¤ËÀ¸À®¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¤Î¤Ç¡¢
-¥¦¥§¥Ö¶õ´Ö¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ËľÀܥޥåפ¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£</p>
-
-<h3><a name="filesystem" id="filesystem">¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥³¥ó¥Æ¥Ê</a></h3>
-
-<p><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-<code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¡¢¤½¤ì¤È
-¤½¤ì¤é¤ÎÀµµ¬É½¸½ÈǤϥǥ£¥ì¥¯¥Æ¥£¥Ö¤ò¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î°ìÉôʬ¤ËÂФ·¤ÆŬÍѤ·¤Þ¤¹¡£
-<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤Î
-Ãæ¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤È¤½¤Î¤¹¤Ù¤Æ¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ë
-ŬÍѤµ¤ì¤Þ¤¹¡£<a href="howto/htaccess.html">.htaccess ¥Õ¥¡¥¤¥ë</a>¤ò
-»È¤¦¤³¤È¤Ç¤âƱ¤¸¸ú²Ì¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Î㤨¤Ð¡¢¼¡¤ÎÀßÄê¤Ç¤Ï
-<code>/var/web/dir1</code> ¤È¤¹¤Ù¤Æ¤Î¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ËÂФ·¤Æ
-¥Ç¥£¥ì¥¯¥È¥ê¥¤¥ó¥Ç¥Ã¥¯¥¹¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>
-&lt;Directory /var/web/dir1&gt;<br />
-Options +Indexes<br />
-&lt;/Directory&gt;
-</code></p></div>
-
-<p><code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤Î
-Ãæ¤Ë¤¢¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤É¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë¤«¤Ë´Ø¤ï¤é¤º¡¢»ØÄꤵ¤ì¤¿Ì¾Á°¤Î
-¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ËŬÍѤµ¤ì¤Þ¤¹¡£¤Ç¤¹¤«¤éÎ㤨¤Ð°Ê²¼¤ÎÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬
-ÀßÄê¥Õ¥¡¥¤¥ë¤Î¼ç¥»¥¯¥·¥ç¥ó¤Ë½ñ¤«¤ì¤¿¤È¤­¤Ë¤Ï¡¢¤¹¤Ù¤Æ¤Î¾ì½ê¤Î
-<code>private.html</code> ¤È¤¤¤¦Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤Ø¤Î¥¢¥¯¥»¥¹¤òµñÈݤ·¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>
-&lt;Files private.html&gt;<br />
-Order allow,deny<br />
-Deny from all<br />
-&lt;/Files&gt;
-</code></p></div>
-
-<p>¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎÆÃÄê¤Î¾ì½ê¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ë¤¿¤á¤Ë¡¢
-<code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤È
-<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤ò
-ÁȤ߹ç¤ï¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£Î㤨¤Ð¡¢¼¡¤ÎÀßÄê¤Ç¤Ï
-<code>/var/web/dir1/private.html</code>, 
-<code>/var/web/dir1/subdir2/private.html</code>, 
-<code>/var/web/dir1/subdir3/private.html</code> ¤Ê¤É¡¢
-<code>/var/web/dir1/</code> ¥Ç¥£¥ì¥¯¥È¥ê¤Î²¼¤Ë¤¢¤ë¤¹¤Ù¤Æ¤Î
-<code>private.html</code> ¤Ø¤Î¥¢¥¯¥»¥¹¤òµñÈݤ·¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>
-&lt;Directory /var/web/dir1&gt;<br />
-&lt;Files private.html&gt;<br />
-Order allow,deny<br />
-Deny from all<br />
-&lt;/Files&gt;<br />
-&lt;/Directory&gt;
-</code></p></div>
-
-
-<h3><a name="webspace" id="webspace">¥¦¥§¥Ö¶õ´Ö¥³¥ó¥Æ¥Ê</a></h3>
-
-<p>°ìÊý¡¢<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>
-¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È¤½¤ÎÀµµ¬É½¸½ÈǤϥ¦¥§¥Ö¶õ´Ö¾å¤ÎÆâÍƤËÂФ·¤ÆÀßÄê¤òÊѹ¹¤·¤Þ¤¹¡£
-¤¿¤È¤¨¤Ð¡¢¼¡¤ÎÀßÄê¤Ç¤Ï /private ¤Ç»Ï¤Þ¤ë URL ¥Ñ¥¹¤Ø¤Î¥¢¥¯¥»¥¹¤òÀ©¸Â¤·¤Þ¤¹¡£
-¶ñÂÎŪ¤Ë¤Ï¡¢
-<code>http://yoursite.example.com/private</code>,
-<code>http://yoursite.example.com/private123</code>, 
-<code>http://yoursite.example.com/private/dir/file.html</code> 
-¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ä¡¢
-¾¤ÎƱÍÍ¤Ë <code>/private</code> ʸ»úÎó¤Ç»Ï¤Þ¤ë¥ê¥¯¥¨¥¹¥È¤Ë
-ŬÍѤµ¤ì¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>
-&lt;Location /private&gt;<br />
-Order Allow,Deny<br />
-Deny from all<br />
-&lt;/Location&gt;
-</code></p></div>
-
-<p><code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>
-¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤È´Ø·¸¤¢¤ëɬÍפ¬Á´¤¯¤¢¤ê¤Þ¤»¤ó¡£
-¤¿¤È¤¨¤Ð¼¡¤ÎÎã¤Ç¤Ï¡¢¤É¤Î¤è¤¦¤Ë¤·¤ÆÆÃÄê¤Î URL ¤ò
-<code class="module"><a href="./mod/mod_status.html">mod_status</a></code>¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë Apache 
-ÆâÉô¥Ï¥ó¥É¥é¤Ë¥Þ¥Ã¥×¤¹¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë
-<code>server-status</code> ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£</p>
-
-<div class="example"><p><code>
-&lt;Location /server-status&gt;<br />
-SetHandler server-status<br />
-&lt;/Location&gt;
-</code></p></div>
-
-
-<h3><a name="wildcards" id="wildcards">¥ï¥¤¥ë¥É¥«¡¼¥É¤ÈÀµµ¬É½¸½</a></h3>
-
-<p><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>, 
-<code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code>, 
-<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code> 
-¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¤Ï¡¢ C ɸ½à¥é¥¤¥Ö¥é¥ê¤Î <code>fnmatch</code> ¤Î¤è¤¦¤Ë
-shell ¥¹¥¿¥¤¥ë¤Î¥ï¥¤¥ë¥É¥«¡¼¥É¥­¥ã¥é¥¯¥¿¤¬»ÈÍѤǤ­¤Þ¤¹¡£
-"*" ʸ»ú¤ÏǤ°Õ¤Îʸ»úÎó¤Ë¥Þ¥Ã¥Á¤·¡¢"?" ʸ»ú¤ÏǤ°Õ¤Î 1 ʸ»ú¤Ë¥Þ¥Ã¥Á¤·¡¢
-"[<em>seq</em>]" ¤Ï <em>seq</em> ¤ÎǤ°Õ¤Îʸ»ú¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¡£
-"/" ʸ»ú¤Ï¤É¤Î¥ï¥¤¥ë¥É¥«¡¼¥É¤Ç¤â¥Þ¥Ã¥Á¤µ¤ì¤Þ¤»¤ó¡£
-ÌÀ¼¨Åª¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-<p>¤³¤ì¤è¤ê½ÀÆð¤Ê¥Þ¥Ã¥Á¥ó¥°¤¬É¬Íפʾì¹ç¤Ï¡¢¤³¤ì¤é¤Î¥³¥ó¥Æ¥Ê¤ËÀµµ¬É½¸½
-(regex) ÈǤǤ¢¤ë
-<code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code>, 
-<code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code>, 
-<code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>
-¤¬¤¢¤ê¡¢¥Þ¥Ã¥Á¤òÁªÂò¤¹¤ë¤Î¤Ë perl ¸ß´¹<a href="glossary.html#regex">Àµµ¬É½¸½</a>¤ò»ÈÍѤǤ­¤Þ¤¹¡£¤·¤«¤·¡¢¼¡¤ÎÀßÄê¤Î¥Þ¡¼¥¸¤ËÌܤòÄ̤·¤Æ¡¢
-regex ¥»¥¯¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎŬÍѤ¬¤É¤Î¤è¤¦¤Ë
-ÊѲ½¤¹¤ë¤«ÇÄ°®¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-<p>Á´¥æ¡¼¥¶¥Ç¥£¥ì¥¯¥È¥ê¤ÎÀßÄê¤òÊѹ¹¤¹¤ë¡¢Èó regex
-¥ï¥¤¥ë¥É¥«¡¼¥É¥»¥¯¥·¥ç¥ó¤Ï¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>
-&lt;Directory /home/*/public_html&gt;<br />
-Options Indexes<br />
-&lt;/Directory&gt;
-</code></p></div>
-
-<p>regex ¥»¥¯¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¡¢²èÁü¥Õ¥¡¥¤¥ë¤Î¿¤¯¤Î¥¿¥¤¥×¤ËÂФ¹¤ë
-¥¢¥¯¥»¥¹¤ò°ìÅ٤˵ñÈݤǤ­¤Þ¤¹¡£</p>
-<div class="example"><p><code>
-&lt;FilesMatch \.(?i:gif|jpe?g|png)$&gt;<br />
-Order allow,deny<br />
-Deny from all<br />
-&lt;/FilesMatch&gt;
-</code></p></div>
-
-
-
-<h3><a name="whichwhen" id="whichwhen">¤¤¤Ä²¿¤ò»È¤¦¤«</a></h3>
-
-<p>¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥³¥ó¥Æ¥Ê¤È¥¦¥§¥Ö¶õ´Ö¥³¥ó¥Æ¥Ê¤ò»È¤¤Ê¬¤±¤ë¤Î¤Ï¡¢
-¼ÂºÝ¤Ë¤ÏÈó¾ï¤Ë´Êñ¤Ç¤¹¡£¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë°Í¸¤¹¤ë
-¥ª¥Ö¥¸¥§¥¯¥È¤Ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òŬ±þ¤¹¤ë¾ì¹ç¤Ï¡¢É¬¤º
-<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> ¤«
-<code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code>
-¤ò»ÈÍѤ·¤Þ¤¹¡£¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë°Í¸¤·¤Ê¤¤¥ª¥Ö¥¸¥§¥¯¥È
-(¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éÀ¸À®¤µ¤ì¤ë¥¦¥§¥Ö¥Ú¡¼¥¸¤Ê¤É) 
-¤Ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òŬÍѤ¹¤ëºÝ¤Ë¤Ï¡¢
-<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>
-¤ò»ÈÍѤ·¤Þ¤¹¡£</p>
-
-<p>¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ø¤Î¥¢¥¯¥»¥¹¤òÀ©¸Â¤¹¤ë¤¿¤á¤Ë¡¢
-<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>
-¤ò·è¤·¤Æ»ÈÍѤʤ¤¤è¤¦¤Ë¤·¤Þ¤·¤ç¤¦¡£
-Ʊ°ì¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à°ÌÃ֤˥ޥåפ·¤Æ¤¤¤ë¡¢¥¦¥§¥Ö¶õ´Ö°ÌÃÖ (URL)
-¤¬Â¿¿ô¤¢¤Ã¤Æ¡¢ÀßÄꤷ¤¿À©¸Â¤ò±ª²ó¤µ¤ì¤Æ¤·¤Þ¤¦¤«¤â¤·¤ì¤Ê¤¤¤«¤é¤Ç¤¹¡£
-Î㤨¤Ð¼¡¤ÎÀßÄê¤ò¹Í¤¨¤Æ¤ß¤Þ¤·¤ç¤¦¡£</p>
-
-<div class="example"><p><code>
-&lt;Location /dir/&gt;<br />
-Order allow,deny<br />
-Deny from all<br />
-&lt;/Location&gt;
-</code></p></div>
-
-<p><code>http://yoursite.example.com/dir/</code>
-¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ç¤Ï¾å¼ê¤¯Æ°ºî¤·¤Þ¤¹¡£¤·¤«¤·Âçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤·¤Ê¤¤
-¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò»È¤Ã¤Æ¤¤¤¿¤é¤É¤¦¤Ê¤ë¤Ç¤·¤ç¤¦?
-<code>http://yoursite.example.com/DIR/</code> 
-¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ç´Êñ¤Ë¥¢¥¯¥»¥¹À©¸Â¤ò±ª²ó¤µ¤ì¤Æ¤·¤Þ¤¤¤Þ¤¹¡£¤³¤ì¤ËÂФ·¤Æ
-<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>
-¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ¹¤ë¤È¡¢¤É¤Î¤è¤¦¤Ë¸Æ¤Ó½Ð¤µ¤ì¤¿¤«¤Ë´Ø¤ï¤é¤º
-¤½¤Î¾ì½ê¤«¤éÄ󶡤µ¤ì¤ëÆâÍƤËŬÍѤµ¤ì¤Þ¤¹¡£
-(Îã³°¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ê¥ó¥¯¤Ç¤¹¡£¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò»È¤Ã¤Æ¡¢
-Ʊ°ì¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òÊ£¿ô¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ËÀßÃ֤Ǥ­¤Þ¤¹¡£
-<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>
-¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥Ñ¥¹Ì¾¤ò¥ê¥»¥Ã¥È¤¹¤ë¤³¤È¤Ê¤¯¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò
-é¤ê¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢¹âÅ٤ʥ»¥­¥å¥ê¥Æ¥£¤¬Í׵ᤵ¤ì¤ë¾ì¹ç¤Ï¡¢
-ŬÀÚ¤Ë <code class="directive"><a href="./mod/core.html#options">Options</a></code> 
-¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ·¤Æ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò̵¸ú¤Ë¤¹¤ë¤Ù¤­¤Ç¤¹¡£)</p>
-
-<p>Âçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤¹¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ò»ÈÍѤ·¤Æ¤¤¤ë¤«¤é¾åµ­¤Î¤³¤È¤Ï
-̵´Ø·¸¤À¤È»×¤ï¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¤¬¡¢
-Ʊ°ì¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à°ÌÃÖ¤ËÊ£¿ô¤Î¥¦¥§¥Ö¶õ´Ö°ÌÃÖ¤ò¥Þ¥Ã¥×¤¹¤ëÊýË¡¤Ï¡¢
-¾¤Ë¤¤¤¯¤é¤Ç¤â¤¢¤ë¤È¤¤¤¦¤³¤È¤ò³Ð¤¨¤Æ¤¤¤Æ¤¯¤À¤µ¤¤¡£
-¤Ç¤¹¤«¤é¤Ç¤­¤ë¸Â¤ê¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥³¥ó¥Æ¥Ê¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
-¤·¤«¤·¤Ê¤¬¤é°ì¤Ä¤À¤±Îã³°¤¬¤¢¤ê¤Þ¤¹¡£
-<code>&lt;Location /&gt;</code> ¥»¥¯¥·¥ç¥ó¤Ï¤É¤ó¤Ê URL 
-¤Ë¤â´Ø¤ï¤é¤ºÅ¬ÍѤµ¤ì¤ë¤Î¤Ç¡¢´°Á´¤Ë°ÂÁ´¤Ç¤¹¡£</p>
-
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="virtualhost" id="virtualhost">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></h2>
-
-<p><code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-¥³¥ó¥Æ¥Ê¤ÏÆÃÄê¤Î¥Û¥¹¥È¤ËŬÍѤ¹¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò³ÊǼ¤·¤Þ¤¹¡£
-°ìÂæ¤Î¥Þ¥·¥ó¤ÇÊ£¿ô¤Î¥Û¥¹¥È¤ò°Û¤Ê¤ëÀßÄê¤ÇÄ󶡤·¤¿¤¤¤È¤­¤ËÍ­ÍѤǤ¹¡£
-¾ÜºÙ¤Ë´Ø¤·¤Æ¤Ï<a href="vhosts/">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¥É¥­¥å¥á¥ó¥È</a>¤ò
-¤´Í÷²¼¤µ¤¤¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="proxy" id="proxy">¥×¥í¥¯¥·</a></h2>
-
-<p><code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>
-¤È <code class="directive"><a href="./mod/mod_proxy.html#proxymatch">&lt;ProxyMatch&gt;</a></code>
-¥³¥ó¥Æ¥Ê¤Ï¡¢ÆÃÄê¤Î URL ¤Ë¥Þ¥Ã¥Á¤¹¤ë <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code>
-¥×¥í¥¯¥·¥µ¡¼¥Ð¤ò·Ðͳ¤·¤Æ¥¢¥¯¥»¥¹¤·¤¿¥µ¥¤¥È¤ËÂФ·¤Æ¤Î¤ßŬÍѤµ¤ì¤ë
-ÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò³ÊǼ¤·¤Þ¤¹¡£Î㤨¤Ð¼¡¤ÎÀßÄê¤Ï¡¢<code>cnn.com</code> 
-¥¦¥§¥Ö¥µ¥¤¥È¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤¿¤á¤ËÍѤ¤¤é¤ì¤ë¥×¥í¥¯¥·¥µ¡¼¥Ð¤ò
-À©¸Â¤·¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>
-&lt;Proxy http://cnn.com/*&gt;<br />
-Order allow,deny<br />
-Deny from all<br />
-&lt;/Proxy&gt;
-</code></p></div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="whatwhere" id="whatwhere">¤É¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬»È¤¨¤ë¤Î?</a></h2>
-
-<p>¤É¤Î¥¿¥¤¥×¤ÎÀßÄꥻ¥¯¥·¥ç¥ó¤Ç¤É¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬»ÈÍѤǤ­¤ë¤«¤Ï¡¢
-¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î <a href="mod/directive-dict.html#Context">Context</a>
-¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£
-<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>
-¤Ç»ÈÍѲÄǽ¤Ê¤â¤Î¤ÏÁ´¤Æ¡¢Æ±ÍͤË
-<code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code>,
-<code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code>,
-<code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code>,
-<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>,
-<code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>,
-<code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>,
-<code class="directive"><a href="./mod/mod_proxy.html#proxymatch">&lt;ProxyMatch&gt;</a></code>
-¥»¥¯¥·¥ç¥ó¤Ç»ÈÍѲÄǽ¤Ç¤¹¡£¤·¤«¤·¤Ê¤¬¤é´ö¤Ä¤«Îã³°¤â¸ºß¤·¤Þ¤¹¡£</p>
-
-<ul>
-<li><code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>
-¥»¥¯¥·¥ç¥ó¤Ç¤Î¤ß»ÈÍѲÄǽ¤Ç¤¹¡£</li>
-
-<li><code>FollowSymLinks</code> ¤È <code>SymLinksIfOwnerMatch</code> ¤Î
-<code class="directive"><a href="./mod/core.html#options">Options</a></code> ¤Ï¡¢
-<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>
-¥»¥¯¥·¥ç¥ó¤« <code>.htaccess</code> ¥Õ¥¡¥¤¥ë¤Ç¤Î¤ß»ÈÍѲÄǽ¤Ç¤¹¡£</li>
-
-<li><code class="directive"><a href="./mod/core.html#options">Options</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-<code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code>
-¤È <code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code>
-¥»¥¯¥·¥ç¥ó¤Ç¤Ï»ÈÍѤǤ­¤Þ¤»¤ó¡£</li>
-</ul>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="mergin" id="mergin">¥»¥¯¥·¥ç¥ó¤Î¥Þ¡¼¥¸ÊýË¡</a></h2>
-
-    <p>¥Þ¡¼¥¸¤Î½çÈ֤ϰʲ¼¤Î¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹:</p>
-
-    <ol>
-      <li><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> (Àµµ¬É½¸½Ìµ¤·) ¤È
-      <code>.htaccess</code> ¤òƱ»þ¤Ë (<code>.htaccess</code> ¤¬µö²Ä¤µ¤ì¤Æ¤¤¤ì¤Ð¡¢¤½¤ì¤¬
-      <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> ¤ò¾å½ñ¤­¤·¤Þ¤¹)
-      </li>
-
-      <li><code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code>
-      (¤È <code>&lt;Directory ~&gt;</code></li>
-
-      <li><code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> ¤È
-      <code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code> ¤òƱ»þ¤Ë</li>
-
-      <li><code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code> ¤È
-      <code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code> ¤òƱ»þ¤Ë</li>
-    </ol>
-
-    <p><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>
-    °Ê³°¤Ï¡¢¤½¤ì¤¾¤ì¤Î¥°¥ë¡¼¥×¤ÏÀßÄê¥Õ¥¡¥¤¥ë¤Ë¸½¤ì¤¿½çÈ֤˽èÍý¤µ¤ì¤Þ¤¹¡£
-    <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> (¾å¤Î¥°¥ë¡¼¥× 1)
-    ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤¬Ã»¤¤¤â¤Î¤«¤éŤ¤¤â¤Î¤Ø¤È½èÍý¤µ¤ì¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢
-    Î㤨¤Ð <code>&lt;Directory /var/web/dir1&gt;</code> ¤Ï
-    <code>&lt;Directory /var/web/dir/subdir&gt;</code> ¤ÎÁ°¤Ë½èÍý¤µ¤ì¤Þ¤¹¡£Ê£¿ô¤Î
-    <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> ¥»¥¯¥·¥ç¥ó¤¬
-    Ʊ¤¸¥Ç¥£¥ì¥¯¥È¥ê¤Ë
-    ŬÍѤµ¤ì¤ë¾ì¹ç¤Ï¡¢ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Î½çÈ֤˽¾¤Ã¤Æ½èÍý¤µ¤ì¤Þ¤¹¡£
-    <code class="directive"><a href="./mod/core.html#include">Include</a></code>
-    ¤Ë¤è¤Ã¤ÆÁÞÆþ¤µ¤ì¤¿ÀßÄê¤Ï ÁÞÆþ¤·¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î
-    <code class="directive"><a href="./mod/core.html#include">Include</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î°ÌÃ֤ˤ¢¤Ã¤¿¤«¤Î¤è¤¦¤Ë°·¤ï¤ì¤Þ¤¹¡£</p>
-
-    <p><code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> ¥»¥¯¥·¥ç¥óÃæ¤Î¥»¥¯¥·¥ç¥ó¤Ï
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎÄêµÁ¤Î³°Â¦¤ÎÂбþ¤¹¤ë¥»¥¯¥·¥ç¥ó¤Î
-    <em>¸å</em>¤ËŬÍѤµ¤ì¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤¬
-    ¥á¥¤¥ó¤Î¥µ¡¼¥ÐÀßÄê¤ò¾å½ñ¤­¤Ç¤­¤ë¤è¤¦¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p><code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code> ¤Ç¥ê¥¯¥¨¥¹¥È¤¬½èÍý¤µ¤ì¤ë¾ì¹ç¤Ï¡¢
-    ½èÍý½çÈ֤Τ¦¤Á¡¢<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> ¥³¥ó¥Æ¥Ê¤ÎÉôʬ¤¬
-    <code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>
-    ¥³¥ó¥Æ¥Ê¤Ë¼è¤Ã¤ÆÂå¤ï¤é¤ì¤Þ¤¹¡£</p>
-
-    <p>¸å¤Î¥»¥¯¥·¥ç¥ó¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬Á°¤Î¥»¥¯¥·¥ç¥ó¤Î¤â¤Î¤ò¾å½ñ¤­¤·¤Þ¤¹¡£</p>
-
-
-<div class="note"><h3>µ»½Ñ¥á¥â</h3>
-      ¼ÂºÝ¤Ë¤Ï¡¢Ì¾Á°¤òÊÑ´¹¤¹¤ëÃʳ¬ (URL
-      ¤ò¥Õ¥¡¥¤¥ë̾¤Ë¥Þ¥Ã¥×¤¹¤ë¤¿¤á¤Ë <code>Alias</code> ¤ä
-      <code>DocumentRoot</code> ¤¬»ÈÍѤµ¤ì¤ë¤È¤³¤í) ¤ÎľÁ°¤Ë
-      <code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>/<code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>
-      ¤¬¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£
-      ¤³¤ì¤é¤òŬÍѤ·¤¿·ë²Ì¤ÏÊÑ´¹¤¬½ª¤ï¤Ã¤¿¸å¤Ë´°Á´¤Ë¼Î¤Æ¤é¤ì¤Þ¤¹¡£
-</div>
-<h3><a name="merge-examples" id="merge-examples">Îã</a></h3>
-
-<p>¼¡¤Ï¥Þ¡¼¥¸¤Î½çÈÖ¤ò¼¨¤¹¤¿¤á¤Î×ó°ÕŪ¤ÊÎã¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-¥ê¥¯¥¨¥¹¥ÈÁ´¤Æ¤ËŬÍѤµ¤ì¤ë¤È¤·¤Æ¡¢ËÜÎã¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-A &gt; B &gt; C &gt; D &gt; E ¤Î½çÈÖ¤ËŬÍѤµ¤ì¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>
-&lt;Location /&gt;<br />
-E<br />
-&lt;/Location&gt;<br />
-<br />
-&lt;Files f.html&gt;<br />
-D<br />
-&lt;/Files&gt;<br />
-<br />
-&lt;VirtualHost *&gt;<br />
-&lt;Directory /a/b&gt;<br />
-B<br />
-&lt;/Directory&gt;<br />
-&lt;/VirtualHost&gt;<br />
-<br />
-&lt;DirectoryMatch "^.*b$"&gt;<br />
-C<br />
-&lt;/DirectoryMatch&gt;<br />
-<br />
-&lt;Directory /a/b&gt;<br />
-A<br />
-&lt;/Directory&gt;<br />
-<br />
-</code></p></div>
-
-<p>¤â¤Ã¤È¶ñÂÎŪ¤Ê¡¢¼¡¤ÎÎã¤ò¹Í¤¨¤Æ¤ß¤Þ¤·¤ç¤¦¡£
-<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> 
-¥»¥¯¥·¥ç¥ó¤ËÀßÃÖ¤µ¤ì¤¿¥¢¥¯¥»¥¹À©¸Â¤Ë´Ø¤ï¤é¤º¡¢
-<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>
-¥»¥¯¥·¥ç¥ó¤¬ºÇ¸å¤Ëɾ²Á¤µ¤ì¤Æ¡¢¥µ¡¼¥Ð¤Ø¤Î¥¢¥¯¥»¥¹¤ÏÀ©¸Â¤µ¤ì¤Þ¤»¤ó¡£
-¸À¤¤´¹¤¨¤ì¤Ð¡¢¥Þ¡¼¥¸¤Î½çÈ֤ϽÅÍפǡ¢Ãí°Õ¤·¤Æ»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤!</p>
-
-<div class="example"><p><code>
-&lt;Location /&gt;<br />
-Order deny,allow<br />
-Allow from all<br />
-&lt;/Location&gt;<br />
-<br />
-# Woops!  This &lt;Directory&gt; section will have no effect<br />
-&lt;Directory /&gt;<br />
-Order allow,deny<br />
-Allow from all<br />
-Deny from badguy.example.com<br />
-&lt;/Directory&gt;
-</code></p></div>
-
-
-
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./en/sections.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/sections.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/sections.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/sections.html.ja.utf8 b/docs/manual/sections.html.ja.utf8
new file mode 100644
index 00000000..60a48d1e
--- /dev/null
+++ b/docs/manual/sections.html.ja.utf8
@@ -0,0 +1,490 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>セクション�設定 - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>セクション�設定</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./en/sections.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./fr/sections.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/sections.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sections.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+ <p><a href="configuring.html">設定ファイル</a>中�ディレクティブ�
+サー�全体��用�れ�り�特定�ディレクトリやファイル�ホスト�URL ���
+�用�れるよ��制���り�る�������。��文書�設定用�セクション�
+コンテナや <code>.htaccess</code> ファイルを使��他�設定ディレクティブ�
+スコープを変更�る方法を説明���。</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#types">設定用セクションコンテナ�種類</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#file-and-web">ファイルシステム�ウェブ空間</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#virtualhost">�ー�ャルホスト</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#proxy">プロクシ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#whatwhere">��ディレクティブ�使�る�?</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#mergin">セクション�マージ方法</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="types" id="types">設定用セクションコンテナ�種類</a></h2>
+
+<table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="./mod/core.html">core</a></code></li><li><code class="module"><a href="./mod/mod_version.html">mod_version</a></code></li><li><code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code></li><li><code class="directive"><a href="./mod/mod_version.html#ifversion">&lt;IfVersion&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxymatch">&lt;ProxyMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li></ul></td></tr></table>
+
+<p>コンテナ��二��基本��る種類��り��。��ん��コンテナ�
+�リクエスト�対��評価�れ��。��場��コンテナ中�ディレクティブ�
+コンテナ�マッ��るリクエスト����用�れ��。
+一方�<code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code> コンテナ. <code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> コンテナ,
+<code class="directive"><a href="./mod/mod_version.html#ifversion">&lt;IfVersion&gt;</a></code> �
+サー��起動時��起動時���評価�れ��。起動時��件�真��れ��
+コンテナ中�ディレクティブ�����リクエスト��用�れ��。�件�
+���れ��コンテナ中�ディレクティブ�無視�れ��。</p>
+
+<p><code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code> ディレクティブ�
+<code class="program"><a href="./programs/httpd.html">httpd</a></code> コマンドライン��切�パラメータ�定義�れ������
+�用�れるディレクティブを囲���。例��次�設定���サー��
+<code>httpd -DClosedForNow</code> を使��起動�れ���������
+リクエストを別�サイト�リダイレクト���:</p>
+
+<div class="example"><p><code>
+&lt;IfDefine ClosedForNow&gt;<br />
+Redirect / http://otherserver.example.com/<br />
+&lt;/IfDefine&gt;
+</code></p></div>
+
+<p><code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> �
+�常�似������代�り�サー�上�モジュール�使用�能�場����
+�用�能�ディレクティブを囲���。モジュール�サー��
+�的�組�込�れ��る��動的�組�込むよ��������設定ファイル中�
+<code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code> �行�より��
+部分�書�れ��る必���り��。��ディレクティブ�特定�モジュール�
+存在�関�ら�設定ファイル�動作�る必���る場����使������。
+常�動作��欲��ディレクティブを囲む���使������り��ん。
+存在���モジュール�関�る有用�エラーメッセージ�発生を抑制���������。
+</p>
+
+<p>次�例���<code class="module"><a href="./mod/mod_mime_magic.html">mod_mime_magic</a></code> ��る����� <code class="directive"><a href="./mod/mod_mime_magic.html#mimemagicfiles">MimeMagicFiles</a></code> ディレクティブ�
+�用�れ��。</p>
+
+<div class="example"><p><code>
+&lt;IfModule mod_mime_magic.c&gt;<br />
+MimeMagicFile conf/magic<br />
+&lt;/IfModule&gt;
+</code></p></div>
+
+<p><code class="directive"><a href="./mod/mod_version.html#ifversion">&lt;IfVersion&gt;</a></code>
+ディレクティブ� <code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code> 
+ã‚„ <code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> 
+�よ�似������サー��特定��ージョン��る�����有効����
+ディレクティブを囲む��使���。
+テストスイートや大�模�ットワーク����������ージョン� httpd を
+異�る設定�扱�用途���デザイン�れ����。</p>
+
+<div class="example"><p><code>
+  &lt;IfVersion &gt;= 2.1&gt;<br />
+  <span class="indent">
+    # this happens only in versions greater or<br />
+    # equal 2.1.0.<br />
+  </span>
+  &lt;/IfVersion&gt;
+</code></p></div>
+
+<p><code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code> ディレクティブ,
+<code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> ディレクティブ,
+<code class="directive"><a href="./mod/mod_version.html#ifversion">&lt;IfVersion&gt;</a></code> ディレクティブ�
+テスト��� "!" を付�る����定��件を�用�る�������。
+����れら�セクション�より複雑�制�を課����入れ���る�������。
+</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="file-and-web" id="file-and-web">ファイルシステム�ウェブ空間</a></h2>
+
+<p>最もよ�使�れる設定�セクションコンテナ�ファイルシステムやウェブ空間�
+特定�場所�設定を変更�るも���。�����二����を�解�る���
+大切��。ファイルシステム�オペレーティングシステム�ら見�ディスク�内容��。
+�����デフォルト�インストール�� Apache � Unix ファイルシステム��
+<code>/usr/local/apache2</code> ��Windows ファイルシステム��
+<code>"c:/Program Files/Apache Group/Apache2"</code> �存在���。
+(Apache �� Windows �もパスセパレータ���スラッシュを使����
+気を�������。) 対照的��ウェブ空間�����サイトを
+ウェブサー��ら�信�れるも����見�も���クライアント�見�るも���。
+デフォルト� Unix 上� Apache �インストール��ウェブ空間�
+<code>/dir/</code> ���パス�ファイルシステム�
+<code>/usr/local/apache2/htdocs/dir/</code> ���パス�対応���。
+ウェブページ�データベースや他�場所�ら動的�生��る��も�������
+ウェブ空間�ファイルシステム�直接マップ�る必���り��ん。</p>
+
+<h3><a name="filesystem" id="filesystem">ファイルシステムコンテナ</a></h3>
+
+<p><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> ディレクティブ�
+<code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> ディレクティブ��れ�
+�れら�<a class="glossarylink" href="./glossary.html#regex" title="用語集を�照">正�表�</a>版�ディレクティブを
+ファイルシステム�一部分�対���用���。
+<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> セクション�
+中�ディレクティブ�指定�れ�ディレクトリ�������サブディレクトリ�
+�用�れ��。<a href="howto/htaccess.html">.htaccess ファイル</a>を
+使����も��効果を得る�������。例���次�設定��
+<code>/var/web/dir1</code> �����サブディレクトリ�対��
+ディレクトリインデックスを行����。</p>
+
+<div class="example"><p><code>
+&lt;Directory /var/web/dir1&gt;<br />
+Options +Indexes<br />
+&lt;/Directory&gt;
+</code></p></div>
+
+<p><code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> セクション�
+中��るディレクティブ���ディレクトリ��る��関�ら��指定�れ����
+����ファイル��用�れ��。���ら例��以下�設定ディレクティブ�
+設定ファイル�主セクション�書�れ����������場所�
+<code>private.html</code> ������ファイル��アクセスを拒����。</p>
+
+<div class="example"><p><code>
+&lt;Files private.html&gt;<br />
+Order allow,deny<br />
+Deny from all<br />
+&lt;/Files&gt;
+</code></p></div>
+
+<p>ファイルシステム�特定�場所��るファイルを指定�る����
+<code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> セクション�
+<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> セクションを
+組����る�������。例���次�設定��
+<code>/var/web/dir1/private.html</code>, 
+<code>/var/web/dir1/subdir2/private.html</code>, 
+<code>/var/web/dir1/subdir3/private.html</code> ���
+<code>/var/web/dir1/</code> ディレクトリ�下��る����
+<code>private.html</code> ��アクセスを拒����。</p>
+
+<div class="example"><p><code>
+&lt;Directory /var/web/dir1&gt;<br />
+&lt;Files private.html&gt;<br />
+Order allow,deny<br />
+Deny from all<br />
+&lt;/Files&gt;<br />
+&lt;/Directory&gt;
+</code></p></div>
+
+
+<h3><a name="webspace" id="webspace">ウェブ空間コンテナ</a></h3>
+
+<p>一方�<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>
+ディレクティブ���正�表�版�ウェブ空間上�内容�対��設定を変更���。
+�����次�設定�� /private �始�る URL パス��アクセスを制����。
+具体的���
+<code>http://yoursite.example.com/private</code>,
+<code>http://yoursite.example.com/private123</code>, 
+<code>http://yoursite.example.com/private/dir/file.html</code> 
+��リクエストや�
+他��様� <code>/private</code> 文字列�始�るリクエスト�
+�用�れ��。</p>
+
+<div class="example"><p><code>
+&lt;Location /private&gt;<br />
+Order Allow,Deny<br />
+Deny from all<br />
+&lt;/Location&gt;
+</code></p></div>
+
+<p><code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>
+ディレクティブ�ファイルシステム�関係�る必��全��り��ん。
+����次�例�����よ����特定� URL を
+<code class="module"><a href="./mod/mod_status.html">mod_status</a></code>��供�れ��る Apache 
+内部�ンドラ�マップ�る�を示�����。ファイルシステム�
+<code>server-status</code> ���ファイル�存在�る必���り��ん。</p>
+
+<div class="example"><p><code>
+&lt;Location /server-status&gt;<br />
+SetHandler server-status<br />
+&lt;/Location&gt;
+</code></p></div>
+
+
+<h3><a name="wildcards" id="wildcards">ワイルドカード�正�表�</a></h3>
+
+<p><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>, 
+<code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code>, 
+<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code> 
+ディレクティブ��� C 標準ライブラリ� <code>fnmatch</code> �よ��
+shell スタイル�ワイルドカードキャラクタ�使用����。
+"*" 文字�任��文字列�マッ���"?" 文字�任�� 1 文字�マッ���
+"[<em>seq</em>]" � <em>seq</em> �任��文字�マッ����。
+"/" 文字���ワイルドカード�もマッ��れ��ん。
+明示的�指定�る必���り��。</p>
+
+<p>�れより柔軟�マッ�ング�必��場����れら�コンテナ�正�表�
+(regex) 版��る
+<code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code>, 
+<code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code>, 
+<code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>
+��り�マッ�を�択�る�� perl 互�<a class="glossarylink" href="./glossary.html#regex" title="用語集を�照">正�表�</a>を使用����。����次�設定�マージ�目を通���
+正�表��セクションを使用�る����ディレクティブ��用���よ��
+変化�る�把����������。</p>
+
+<p>全ユーザディレクトリ�設定を変更�る�� regex
+ワイルドカードセクション�次�よ���り��。</p>
+
+<div class="example"><p><code>
+&lt;Directory /home/*/public_html&gt;<br />
+Options Indexes<br />
+&lt;/Directory&gt;
+</code></p></div>
+
+<p>regex セクションを使用�る����画�ファイル�多��タイプ�対�る
+アクセスを一度�拒�����。</p>
+<div class="example"><p><code>
+&lt;FilesMatch \.(?i:gif|jpe?g|png)$&gt;<br />
+Order allow,deny<br />
+Deny from all<br />
+&lt;/FilesMatch&gt;
+</code></p></div>
+
+
+
+<h3><a name="whichwhen" id="whichwhen">��何を使��</a></h3>
+
+<p>ファイルシステムコンテナ�ウェブ空間コンテナを使�分�る���
+実際���常�簡���。ファイルシステム��存�る
+オブジェクト�ディレクティブを�応�る場���必�
+<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> �
+<code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code>
+を使用���。ファイルシステム��存���オブジェクト
+(データベース�ら生��れるウェブページ��) 
+�ディレクティブを�用�る際���
+<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>
+を使用���。</p>
+
+<p>ファイルシステム上�オブジェクト��アクセスを制��る����
+<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>
+を決��使用���よ�����ょ�。
+�一�ファイルシステム�置�マップ���る�ウェブ空間�置 (URL)
+�多数����設定��制�を迂回�れ�����も�れ���ら��。
+例��次�設定を考�����ょ�。</p>
+
+<div class="example"><p><code>
+&lt;Location /dir/&gt;<br />
+Order allow,deny<br />
+Deny from all<br />
+&lt;/Location&gt;
+</code></p></div>
+
+<p><code>http://yoursite.example.com/dir/</code>
+��リクエスト��上手�動作���。���大文字�文字を区別���
+ファイルシステムを使����ら���る��ょ�?
+<code>http://yoursite.example.com/DIR/</code> 
+��リクエスト�簡��アクセス制�を迂回�れ������。�れ�対��
+<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>
+ディレクティブを使用�る����よ��呼�出�れ���関�ら�
+��場所�ら�供�れる内容��用�れ��。
+(例外�ファイルシステム�リンク��。シンボリックリンクを使���
+�一�ディレクトリを複数�ファイルシステム�設置����。
+<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>
+ディレクティブ�パス�をリセット�る����シンボリックリンクを
+辿り��。���ら�高度�セキュリティ��求�れる場���
+�切� <code class="directive"><a href="./mod/core.html#options">Options</a></code> 
+ディレクティブを使用��シンボリックリンクを無効��る����。)</p>
+
+<p>大文字�文字を区別�るファイルシステムを使用���る�ら上記����
+無関係����れる�も�れ��ん��
+�一�ファイルシステム�置�複数�ウェブ空間�置をマップ�る方法��
+他���ら�も�る�����を覚��������。
+���ら��る�りファイルシステムコンテナを使用������。
+�����ら一���例外��り��。
+<code>&lt;Location /&gt;</code> セクション��ん� URL 
+�も関�ら��用�れる���完全�安全��。</p>
+
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="virtualhost" id="virtualhost">�ー�ャルホスト</a></h2>
+
+<p><code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+コンテナ�特定�ホスト��用�るディレクティブを格����。
+一��マシン�複数�ホストを異�る設定��供������有用��。
+詳細�関���<a href="vhosts/">�ー�ャルホストドキュメント</a>を
+�覧下��。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="proxy" id="proxy">プロクシ</a></h2>
+
+<p><code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>
+� <code class="directive"><a href="./mod/mod_proxy.html#proxymatch">&lt;ProxyMatch&gt;</a></code>
+コンテナ��特定� URL �マッ��る <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code>
+プロクシサー�を経由��アクセス��サイト�対�����用�れる
+設定ディレクティブを格����。例��次�設定��<code>cnn.com</code> 
+ウェブサイト�アクセス�る���用�られるプロクシサー�を
+制����。</p>
+
+<div class="example"><p><code>
+&lt;Proxy http://cnn.com/*&gt;<br />
+Order allow,deny<br />
+Deny from all<br />
+&lt;/Proxy&gt;
+</code></p></div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="whatwhere" id="whatwhere">��ディレクティブ�使�る�?</a></h2>
+
+<p>��タイプ�設定セクション���ディレクティブ�使用��る���
+ディレクティブ� <a href="mod/directive-dict.html#Context">Context</a>
+を見�����。
+<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>
+�使用�能�も��全���様�
+<code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code>,
+<code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code>,
+<code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code>,
+<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>,
+<code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>,
+<code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>,
+<code class="directive"><a href="./mod/mod_proxy.html#proxymatch">&lt;ProxyMatch&gt;</a></code>
+セクション�使用�能��。�����ら幾��例外も存在���。</p>
+
+<ul>
+<li><code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code> ディレクティブ�
+<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>
+セクション���使用�能��。</li>
+
+<li><code>FollowSymLinks</code> � <code>SymLinksIfOwnerMatch</code> �
+<code class="directive"><a href="./mod/core.html#options">Options</a></code> ��
+<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>
+セクション� <code>.htaccess</code> ファイル���使用�能��。</li>
+
+<li><code class="directive"><a href="./mod/core.html#options">Options</a></code> ディレクティブ��
+<code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code>
+� <code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code>
+セクション��使用����ん。</li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="mergin" id="mergin">セクション�マージ方法</a></h2>
+
+    <p>マージ�順番�以下�よ��������:</p>
+
+    <ol>
+      <li><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> (正�表�無�) �
+      <code>.htaccess</code> を�時� (<code>.htaccess</code> �許��れ��れ���れ�
+      <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> を上書����)
+      </li>
+
+      <li><code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code>
+      (� <code>&lt;Directory ~&gt;</code></li>
+
+      <li><code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> �
+      <code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code> を�時�</li>
+
+      <li><code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code> �
+      <code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code> を�時�</li>
+    </ol>
+
+    <p><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>
+    以外���れ�れ�グループ�設定ファイル��れ�順番�処��れ��。
+    <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> (上�グループ 1)
+    �ディレクトリ�短�も��ら長�も���処��れ��。���ら�
+    例�� <code>&lt;Directory /var/web/dir1&gt;</code> �
+    <code>&lt;Directory /var/web/dir/subdir&gt;</code> ���処��れ��。複数�
+    <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> セクション�
+    ��ディレクトリ�
+    �用�れる場���設定ファイル中�順番�従��処��れ��。
+    <code class="directive"><a href="./mod/core.html#include">Include</a></code>
+    �よ��挿入�れ�設定� 挿入���るファイル�
+    <code class="directive"><a href="./mod/core.html#include">Include</a></code>
+    ディレクティブ��置������よ��扱�れ��。</p>
+
+    <p><code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> セクション中�セクション�
+    �ー�ャルホスト�定義�外��対応�るセクション�
+    <em>後</em>��用�れ��。�れ�より�ー�ャルホスト�
+    メイン�サー�設定を上書���るよ��り��。</p>
+
+    <p><code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code> �リクエスト�処��れる場���
+    処�順番����<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> コンテナ�部分�
+    <code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>
+    コンテナ����代�られ��。</p>
+
+    <p>後�セクション�ディレクティブ���セクション�も�を上書����。</p>
+
+
+<div class="note"><h3>技術メモ</h3>
+      実際�����を変��る段階 (URL
+      をファイル��マップ�る��� <code>Alias</code> や
+      <code>DocumentRoot</code> �使用�れる���) �直��
+      <code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>/<code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>
+      �行��れ��。
+      �れらを�用���果�変��終���後�完全���られ��。
+</div>
+<h3><a name="merge-examples" id="merge-examples">例</a></h3>
+
+<p>次�マージ�順番を示������的�例�������。
+リクエスト全���用�れる����本例�ディレクティブ�
+A &gt; B &gt; C &gt; D &gt; E �順番��用�れ��。</p>
+
+<div class="example"><p><code>
+&lt;Location /&gt;<br />
+E<br />
+&lt;/Location&gt;<br />
+<br />
+&lt;Files f.html&gt;<br />
+D<br />
+&lt;/Files&gt;<br />
+<br />
+&lt;VirtualHost *&gt;<br />
+&lt;Directory /a/b&gt;<br />
+B<br />
+&lt;/Directory&gt;<br />
+&lt;/VirtualHost&gt;<br />
+<br />
+&lt;DirectoryMatch "^.*b$"&gt;<br />
+C<br />
+&lt;/DirectoryMatch&gt;<br />
+<br />
+&lt;Directory /a/b&gt;<br />
+A<br />
+&lt;/Directory&gt;<br />
+<br />
+</code></p></div>
+
+<p>も��具体的��次�例を考�����ょ�。
+<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> 
+セクション�設置�れ�アクセス制��関�ら��
+<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>
+セクション�最後�評価�れ��サー���アクセス�制��れ��ん。
+言���れ��マージ�順番�����注���使用������!</p>
+
+<div class="example"><p><code>
+&lt;Location /&gt;<br />
+Order deny,allow<br />
+Allow from all<br />
+&lt;/Location&gt;<br />
+<br />
+# Woops!  This &lt;Directory&gt; section will have no effect<br />
+&lt;Directory /&gt;<br />
+Order allow,deny<br />
+Allow from all<br />
+Deny from badguy.example.com<br />
+&lt;/Directory&gt;
+</code></p></div>
+
+
+
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./en/sections.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./fr/sections.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/sections.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sections.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/sections.html.ko.euc-kr b/docs/manual/sections.html.ko.euc-kr
index c9685481..c67d8b36 100644
--- a/docs/manual/sections.html.ko.euc-kr
+++ b/docs/manual/sections.html.ko.euc-kr
@@ -21,7 +21,8 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="./en/sections.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/sections.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/sections.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sections.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/sections.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sections.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
             ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
@@ -417,8 +418,9 @@ Deny from badguy.example.com<br />
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="./en/sections.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/sections.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/sections.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sections.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/sections.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sections.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/sections.html.tr.utf8 b/docs/manual/sections.html.tr.utf8
new file mode 100644
index 00000000..7b7945db
--- /dev/null
+++ b/docs/manual/sections.html.tr.utf8
@@ -0,0 +1,500 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Yapılandırma Bölümleri - Apache HTTP Sunucusu</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="./">Sürüm 2.2</a></div><div id="page-content"><div id="preamble"><h1>Yapılandırma Bölümleri</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="./en/sections.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./fr/sections.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/sections.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sections.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+ <p><a href="configuring.html">Yapılandırma dosyaları</a>ndaki 
+yönergeler sunucunun tamamına uygulanacağı gibi sadece belli dizinler, 
+dosyalar, konaklar veya URL’lere uygulanmakla sınırlanabilir. Bu belgede, 
+yapılandırma bölümü taşıyıcılarınının veya <code>.htaccess</code> 
+dosyalarının, yapılandırma dosyalarındaki diğer yönergelerin etki alanlarını 
+değiştirtirmek için nasıl kullanılacağı açıklanmıştır.</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#types">Yapılandırma Bölümü Taşıyıcılarının Türleri</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#file-and-web">Dosya Sistemi ve Site Alanı</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#virtualhost">Sanal Konaklar</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#proxy">Vekil</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#whatwhere">Hangi Yönergelere İzin Veriliyor?</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#mergin">Bölümler Nasıl Katıştırılır?</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="types" id="types">Yapılandırma Bölümü Taşıyıcılarının Türleri</a></h2>
+
+<table class="related"><tr><th>İlgili Modüller</th><th>İlgili Yönergeler</th></tr><tr><td><ul><li><code class="module"><a href="./mod/core.html">core</a></code></li><li><code class="module"><a href="./mod/mod_version.html">mod_version</a></code></li><li><code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code></li><li><code class="directive"><a href="./mod/mod_version.html#ifversion">&lt;IfVersion&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxymatch">&lt;ProxyMatch&gt;</a></code></li><li><code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li></ul></td></tr></table>
+
+<p>İki temel taşıyıcı türü vardır. Taşıyıcıların çoğu her istek için 
+değerlendirmeye alınır. Taşıyıcılardaki yönergeler ise sadece bu taşıyıcılarla 
+eşleşen istekler için uygulanır. Diğer yandan, <code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code>, <code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> ve <code class="directive"><a href="./mod/mod_version.html#ifversion">&lt;IfVersion&gt;</a></code> taşıyıcıları sadece sunucu başlatılırken veya yeniden 
+başlatılırken değerlendirmeye alınır. Başlatma sırasında gerektirdikleri 
+koşullar sağlanıyorsa içerdikleri yönergeler tüm isteklere uygulanır. 
+Aksi takdirde, içerdikleri yönergeler yok sayılır.</p>
+
+<p><code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code> yönergesi 
+sadece <code class="program"><a href="./programs/httpd.html">httpd</a></code> komut satırında uygun parametreler 
+tanımlanmışsa uygulanabilecek yönergeleri içerir. Örneğin, aşağıdaki 
+yapılandırma ile tüm isteklerin diğer siteye yönlendirilebilmesi sadece 
+sunucu <code>httpd -DClosedForNow</code> komut satırı ile başlatıldığı 
+takdirde mümkün olur:</p>
+
+<div class="example"><p><code>
+&lt;IfDefine ClosedForNow&gt;<br />
+<span class="indent">
+  Redirect / http://otherserver.example.com/<br />
+</span>
+&lt;/IfDefine&gt;
+</code></p></div>
+
+<p><code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> yönergesi 
+sadece belli bir modülün sunucuda kullanılabilir durumda olması halinde 
+uygulanabilecek yönergeleri içerir. Modülün ya sunucuyla birlikte durağan 
+olarak derlenmiş olması ya da devingen olarak derlenmiş ve yapılandırma 
+dosyasında yönergeden önce o modüle ilişkin bir <code class="directive"><a href="./mod/mod_so.html#loadmodule">LoadModule</a></code> satırının bulunması gerekir. Bu yönergeyi sadece 
+belli bir modülün varlığının veya yokluğunun yapılandırma dosyanızın 
+çalışmasını etkilememesini istediğiniz durumlarda kullanmalısınız. Eksik 
+modüllerle ilgili hata iletilerini engellediğinden, taşıyıcı içine, her 
+zaman çalışması istenen yönergeler konulmamalıdır.</p>
+
+<p>Aşağıdaki örnekte, <code class="directive"><a href="./mod/mod_mime_magic.html#mimemagicfiles">MimeMagicFiles</a></code> yönergesi sadece 
+<code class="module"><a href="./mod/mod_mime_magic.html">mod_mime_magic</a></code> modülü mevcutsa uygulanacaktır.</p>
+
+<div class="example"><p><code>
+&lt;IfModule mod_mime_magic.c&gt;<br />
+<span class="indent">
+  MimeMagicFile conf/magic<br />
+</span>
+&lt;/IfModule&gt;
+</code></p></div>
+
+<p><code class="directive"><a href="./mod/mod_version.html#ifversion">&lt;IfVersion&gt;</a></code> 
+yönergesi sunucunun belli bir sürümünün çalıştırılması halinde uygulanabilecek 
+yönergeleri içerebilmesi dışında <code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code> ve <code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> yönergeleri gibidir. <code class="module"><a href="./mod/mod_version.html">mod_version</a></code> 
+modülü farklı httpd sürümleri ve farklı yapılandırmalarla büyük ağlarda 
+çalışmayı mümkün kılmak veya sürüm denemeleri yapabilmek amacıyla 
+tasarlanmıştır.</p>
+
+<div class="example"><p><code>
+&lt;IfVersion &gt;= 2.1&gt;<br />
+<span class="indent">
+  # burası sadece 2.1.0 veya daha üstü sürümlerde<br />
+  # iş görür.<br />
+</span>
+&lt;/IfVersion&gt;
+</code></p></div>
+
+<p><code class="directive"><a href="./mod/core.html#ifdefine">&lt;IfDefine&gt;</a></code>,
+<code class="directive"><a href="./mod/core.html#ifmodule">&lt;IfModule&gt;</a></code> ve
+<code class="directive"><a href="./mod/mod_version.html#ifversion">&lt;IfVersion&gt;</a></code> 
+yönergelerinin önüne "!" konularak olumsuz koşullar için uygulanabilir. 
+Ayrıca, bu bölümler daha karmaşık sınırlamalar elde etmek amacıyla bir 
+diğerinin içinde kullanılabilirler.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="file-and-web" id="file-and-web">Dosya Sistemi ve Site Alanı</a></h2>
+
+<p>En sık kullanılan yapılandırma bölümü taşıyıcıları dosya sistemindeki 
+veya site alanındaki belli yerlerin yapılandırmalarını değiştirmekte 
+kullanılanlardır. Öncelikle, bu ikisi arasındaki farkları bilmek önemlidir. 
+Dosya sistemi disklerinizin işletim sistemi tarafından size gösterilen halidir. 
+Örneğin, öntanımlı kurulumda Apache, Unix sistemlerinde 
+<code>/usr/local/apache2</code> altındayken Windows sistemlerinde 
+<code>"c:/Program Files/Apache Group/Apache2"</code> altındadır. 
+(Bilgi: Windows için bile, Apache’de dosya yolu belirtilirken tersbölü 
+değil normal bölü karakterleri kullanılır.) Site alanı ise sunucu tarafından 
+istemciye sunulan dizin ağacıdır. Yani, site alanı içindeki <code>/dir/</code> 
+dizini, Apache’nin Unix üzerinde dosya sistemine öntanımlı olarak kurulduğu 
+yer göz önüne alınarak, dosya sistemindeki  
+<code>/usr/local/apache2/htdocs/dir/</code> dizinine karşılıktır. Site 
+sayfaları veritabanlarından veya başka yerlerden devingen olarak 
+üretilebildiğinden site alanlarının doğrudan dosya sistemine eşlenmesi 
+gerekli deÄŸildir.</p>
+
+<h3><a name="filesystem" id="filesystem">Dosya Sistemi Taşıyıcıları</a></h3>
+
+<p><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>
+ve <code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> taşıyıcıları,
+<a class="glossarylink" href="./glossary.html#regex" title="sözlüğe bakınız">düzenli ifade</a> karşılıkları ile beraber, 
+yönergeleri dosya sisteminin parçalarına uygularlar. Bir <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> bölümü içindeki yönergeler 
+belli bir dosya sistemi dizinine ve onun alt dizinlerine uygulanır. Aynı etki 
+<a href="howto/htaccess.html">.htaccess dosyaları</a> kullanılarak da 
+sağlanabilir. Örneğin aşağıdaki yapılandırmada, <code>/var/web/dir1</code> 
+dizini ve alt dizinlerinde dizin içeriğinin listelenmesi etkin kılınmaktadır.</p>
+
+<div class="example"><p><code>
+&lt;Directory /var/web/dir1&gt;<br />
+<span class="indent">
+  Options +Indexes<br />
+</span>
+&lt;/Directory&gt;
+</code></p></div>
+
+<p>Bir <code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> bölümü 
+içindeki yönergeler, hangi dizinde bulunduğuna bakılmaksızın ismi 
+belirtilen dosyalara uygulanır. Örneğin, aşağıdaki yapılandırma yönergeleri 
+yapılandırma dosyasının ana bölümüne yerleştirildiği takdirde 
+<code>gizli.html</code> isimli dosyalara nerede bulunursa bulunsun eriÅŸime 
+izin vermeyecektir.</p>
+
+<div class="example"><p><code>
+&lt;Files gizli.html&gt;<br />
+<span class="indent">
+Order allow,deny<br />
+Deny from all<br />
+</span>
+&lt;/Files&gt;
+</code></p></div>
+
+<p>Dosya sisteminin belli bir yerindeki belli dosyalarla ilgili yaptırımlar 
+için <code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> ve
+<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> bölümleri 
+birlikte kullanılabilir. Örneğin, aşağıdaki yapılandırma 
+<code>/var/web/dir1/gizli.html</code>,
+<code>/var/web/dir1/subdir2/gizli.html</code>,
+<code>/var/web/dir1/subdir3/gizli.html</code> ve 
+<code>/var/web/dir1/</code> altında bulunabilecek diğer tüm 
+<code>gizli.html</code> dosyalarına erişimi yasaklar.</p>
+
+<div class="example"><p><code>
+&lt;Directory /var/web/dir1&gt;<br />
+<span class="indent">
+&lt;Files gizli.html&gt;<br />
+<span class="indent">
+Order allow,deny<br />
+Deny from all<br />
+</span>
+&lt;/Files&gt;<br />
+</span>
+&lt;/Directory&gt;
+</code></p></div>
+
+
+<h3><a name="webspace" id="webspace">Site Alanı Taşıyıcıları</a></h3>
+
+<p><code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code> yönergesi ve 
+yönergenin <a class="glossarylink" href="./glossary.html#regex" title="sözlüğe bakınız">düzenli ifade</a> karşılığı site 
+alanındaki içerik için yapılandırmayı değiştirir.  Örneğin aşağıdaki 
+yapılandırma, <code>/gizli</code> ile başlayan URL yollarına erişimi engeller. 
+Özellikle, <code>http://siteniz.mesela.dom/gizli</code>,
+<code>http://siteniz.mesela.dom/gizli123</code> ve
+<code>http://siteniz.mesela.dom/gizli/dir/dosya.html</code> 
+istekleri yanında <code>/gizli</code> ile başlayan diğer isteklere de 
+uygulanır.</p>
+
+<div class="example"><p><code>
+&lt;Location /gizli&gt;<br />
+<span class="indent">
+Order Allow,Deny<br />
+Deny from all<br />
+</span>
+&lt;/Location&gt;
+</code></p></div>
+
+<p>Dosya sistemi ile etkileşime girmeyen herşey için 
+<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code> yönergesi gerekir. 
+Aşağıdaki örnekte, belli bir URL’nin <code class="module"><a href="./mod/mod_status.html">mod_status</a></code> modülü 
+tarafından sağlanan bir dahili Apache eylemcisine nasıl eşlenebileceği 
+gösterilmiştir. Bu örnek için dosya sisteminde <code>server-status</code> 
+adında bir dosya veya dizin bulunması gerekli değildir.</p>
+
+<div class="example"><p><code>
+&lt;Location /server-status&gt;<br />
+<span class="indent">
+SetHandler server-status<br />
+</span>
+&lt;/Location&gt;
+</code></p></div>
+
+
+<h3><a name="wildcards" id="wildcards">Dosya Adı Şablonları ve Düzenli İfadeler</a></h3>
+
+<p><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>,
+<code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> ve
+<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code> yönergelerinde, 
+Standart C kütüphanesindeki <code>fnmatch</code> işlevindeki gibi kabuk tarzı 
+dosya ismi kalıpları kullanılabilir. "*" karakteri herhangi bir karakter 
+dizisi ile eÅŸleÅŸirken "?" karakteri tek tek karakterlerle ve "[<em>seq</em>]"
+kalıbı ise <em>seq</em> içindeki her karakterle eşleşir. "/" karakteri her 
+hangi bir kalıp karakteri ile eşleşmez; açıkça belirtilmesi gerekir.</p>
+
+<p>Daha esnek bir eşleşmenin gerekli olduğu durumlar için her taşıyıcının bir 
+düzenli ifade karşılığı vardır. <code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code>, <code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code> ve <code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code> yönergelerinde gerekli eşleşmeleri seçmek için 
+perl uyumlu <a class="glossarylink" href="./glossary.html#regex" title="sözlüğe bakınız">düzenli ifadelerin</a> kullanımına 
+izin verilir. Ayrıca, yönergelerin uygulanışının düzenli ifade bölümleri kullanılarak nasıl değiştirileceğini öğrenmek için, aşağıda, yapılandırmanın katıştırılmasıyla ilgili bölüme de bakınız.</p>
+
+<p>Tüm kullanıcı dizinlerine ilişkin yapılandırmayı değiştirmek için dosya 
+ismi kalıpları şöyle kullanılabilirdi:</p>
+
+<div class="example"><p><code>
+&lt;Directory /home/*/public_html&gt;<br />
+<span class="indent">
+Options Indexes<br />
+</span>
+&lt;/Directory&gt;
+</code></p></div>
+
+<p>Düzenli ifade bölümleri kullanarak çeşitli türlerdeki resim dosyalarına 
+eriÅŸimi bir defada yasaklayabiliriz:</p>
+<div class="example"><p><code>
+&lt;FilesMatch \.(?i:gif|jpe?g|png)$&gt;<br />
+<span class="indent">
+Order allow,deny<br />
+Deny from all<br />
+</span>
+&lt;/FilesMatch&gt;
+</code></p></div>
+
+
+
+<h3><a name="whichwhen" id="whichwhen">Ne, Ne Zaman Kullanılır?</a></h3>
+
+<p>Dosya sistemi taşıyıcıları ile site alanı taşıyıcıları arasında seçim 
+yapmak aslında oldukça kolaydır. Dosya sisteminde bulunan nesnelere 
+uygulanacak yönergeler için daima <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> veya <code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> kullanılır. Dosya sisteminde bulunmayan nesnelere 
+(bir sayfanın bir veritabanı tarafından üretilmesi gibi) uygulanacak 
+yönergeler için ise <code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code> kullanılır.</p>
+
+<p>Dosya sistemindeki nesnelere erişimi kısıtlarken asla <code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code> kullanmamak önemlidir. 
+Bunun sebebi farklı site alanı konumlarının (URL’ler) aynı dosya sistemi 
+konumuna eşlenebilmesi dolayısıyla kısıtlamalarınızın etrafından 
+dolaşılabilmesine izin vermesidir. Örneğin, aşağıdaki yapılandırmayı 
+ele alalım:</p>
+
+<div class="example"><p><code>
+&lt;Location /dir/&gt;<br />
+<span class="indent">
+Order allow,deny<br />
+Deny from all<br />
+</span>
+&lt;/Location&gt;
+</code></p></div>
+
+<p><code>http://siteniz.mesela.dom/dir/</code> için bir istek yapılmışsa 
+bu doğru çalışacaktır. Fakat dosya sistemi harf büyüklüğüne duyarsızsa 
+ne olacak? Kısıtlamanız, istek <code>http://siteniz.mesela.dom/DIR/</code> 
+şeklinde yapılarak kolayca geçersiz kılınabilir. Halbuki <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> yönergesi isteğin nasıl 
+yapıldığına bakılmaksızın bu konumdan sunulan her türlü içeriğe uygulanacaktı. 
+(Dosya sistemi bağlarıyla bu da aşılabilir. Sembolik bağlar kullanılarak aynı 
+dizin dosya sisteminin bir çok yerine yerleştirilebilir. <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> yönergesi dosya yolunu
+sıfırlamaksızın sembolik bağları izleyecektir. Bu bakımdan, en yüksek 
+seviyede güvenlik için uygun <code class="directive"><a href="./mod/core.html#options">Options</a></code> 
+yönergesi ile sembolik bağların izlenmesi devredışı bırakılabilir.)</p>
+
+<p>Belki de siz sırf harf büyüklüğüne duyarlı bir dosya sistemi 
+kullanıyorsunuz diye böyle uygulamalara ihtiyacınız olmadığını 
+düşünüyor olabilirsiniz, fakat aynı site alanını çok sayıda dosya 
+sistemi konumuna eşleyecek daha bir sürü yol bulunduğunu unutmayınız. 
+Bu bakımdan dosya sisteminde yapacağınız kısıtlamalarda daima dosya 
+sistemi taşıyıcılarını kullanmalısınız. Bununla birlikte bu kuralın da 
+bir istisnası vardır. Yapılandırma kısıtlamalarının bir 
+<code>&lt;Location/&gt;</code> bölümü içine koyulması, bu bölüme konan 
+yönergelerin etki alanının belli bir URL ile sınırlı olmaması nedeniyle
+mükemmelen güvenlidir.</p>
+
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="virtualhost" id="virtualhost">Sanal Konaklar</a></h2>
+
+<p><code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> taşıyıcısının 
+içinde belli bir konağa uygulanan yönergeler bulunur. Aynı makinede çok sayıda 
+konağı farklı yapılandırmalarla  sunuyorsanız bu taşıyıcı çok işinize yarar. 
+Daha fazla bilgi için <a href="vhosts/">Sanal Konak Belgeleri</a> bölümüne bakınız.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="proxy" id="proxy">Vekil</a></h2>
+
+<p><code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>
+ve <code class="directive"><a href="./mod/mod_proxy.html#proxymatch">&lt;ProxyMatch&gt;</a></code>
+taşıyıcıları, sadece belli bir URL ile eşleşen <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code> 
+vekil sunucusu üzerinden erişilen sitelere uygulanan yapılandırma 
+yönergelerini bulundururlar. Örneğin aşağıdaki yapılandırma 
+<code>cnn.com</code> sitesine erişim için vekil sunucunun kullanılmasını
+engelleyecektir.</p>
+
+<div class="example"><p><code>
+&lt;Proxy http://cnn.com/*&gt;<br />
+<span class="indent">
+Order allow,deny<br />
+Deny from all<br />
+</span>
+&lt;/Proxy&gt;
+</code></p></div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="whatwhere" id="whatwhere">Hangi Yönergelere İzin Veriliyor?</a></h2>
+
+<p>Hangi yönergelere hangi yapılandırma bölümlerinde izin verildiğini 
+öğrenmek için yönerge <a href="mod/directive-dict.html#Context">bağlamına</a> bakınız.
+<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> bölümlerinde 
+izin verilen herşeye sözdizimsel olarak ayrıca
+<code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code>,
+<code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code>,
+<code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code>,
+<code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>,
+<code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code>,
+<code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>
+ve <code class="directive"><a href="./mod/mod_proxy.html#proxymatch">&lt;ProxyMatch&gt;</a></code>
+bölümlerinde de izin verilir. Yine de bazı istisnai durumlar mevcuttur:</p>
+
+<ul>
+<li><code class="directive"><a href="./mod/core.html#allowoverride">AllowOverride</a></code> yönergesi sadece
+<code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> bölümlerinde çalışır.</li>
+
+<li><code class="directive"><a href="./mod/core.html#options">Options</a></code> yönergesinin 
+<code>FollowSymLinks</code> ve <code>SymLinksIfOwnerMatch</code> 
+seçenekleri sadece <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> bölümlerinde veya <code>.htaccess</code> 
+dosyalarında çalışır.</li>
+
+<li><code class="directive"><a href="./mod/core.html#options">Options</a></code> yönergesi 
+<code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> ve 
+<code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code> 
+bölümlerinde kullanılamaz.</li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="mergin" id="mergin">Bölümler Nasıl Katıştırılır?</a></h2>
+
+<p>Yapılandırma bölümleri belli bir sıra ile uygulanır. Yapılandırma 
+yönergelerinin yorumlanışı üzerinde önemli etkilere sahip olabilmesi 
+nedeniyle neyin ne zaman çalıştığını anlamak çok önemlidir.</p>
+
+    <p>Yapılandırma bölümlerinin katıştırılma sırası şöyledir:</p>
+
+    <ol>
+      <li><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> (düzenli ifadeler hariç)
+      ve <code>.htaccess</code> aynı anda işleme sokulur 
+      (<code>.htaccess</code> ile eğer izin verilmişse <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> içindeki bazı 
+      yönergeler geçersiz kılınabileceği için).</li>
+
+      <li><code class="directive"><a href="./mod/core.html#directorymatch">&lt;DirectoryMatch&gt;</a></code>
+      (ve <code>&lt;Directory ~&gt;</code>).</li>
+
+      <li><code class="directive"><a href="./mod/core.html#files">&lt;Files&gt;</a></code> ve <code class="directive"><a href="./mod/core.html#filesmatch">&lt;FilesMatch&gt;</a></code> aynı anda işleme sokulur.</li>
+
+      <li><code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code>
+      ve <code class="directive"><a href="./mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code> 
+      aynı anda işleme sokulur.</li>
+    </ol>
+
+    <p><code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code>
+     bölümündekiler hariç, her grup, yapılandırma dosyasında bulundukları 
+     sıraya göre işleme sokulurlar. Yukarıda 1. grup olan <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> bölümü en kısa 
+     dizin elemanından en uzun dizin elemanına doğru işleme sokulur. 
+     Yani, örneğin, <code>&lt;Directory /var/web/dir&gt;</code> bölümü 
+     <code>&lt;Directory /var/web/dir/subdir&gt;</code> bölümünden önce 
+     işleme sokulacaktır. Eğer aynı uzunlukta çok sayıda dizin varsa 
+     <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> bölümleri 
+     yapılandırma dosyasında bulundukları sıraya göre işleme sokulurlar. 
+     <code class="directive"><a href="./mod/core.html#include">Include</a></code> yönergeleri ile 
+     yapılandırmaya dahil edilen dosyaların içerikleri <code class="directive"><a href="./mod/core.html#include">Include</a></code> yönergesinin bulunduğu yere 
+     konulduktan sonra iÅŸleme sokulurlar.</p>
+
+    <p><code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> 
+    bölümlerinin içindeki bölümler, sanal konak tanımı dışındaki 
+    karşılıklarından <em>sonra</em> uygulanırlar.</p>
+
+    <p>İstek <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code> tarafından sunulduğu takdirde, 
+    <code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code> taşıyıcısı 
+    işlem sırasında <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> 
+    taşıyıcısının yerini alır.</p>
+
+    <p>Sonraki bölümler öncekileri geçersiz kılmak üzere işleme alınırlar.</p>
+
+<div class="note"><h3>Bazı Teknik Bilgiler</h3>
+  Aslında, isim dönüşüm aşamasından (<code>Aliases</code> ve 
+  <code>DocumentRoots</code>, URL’leri dosya isimlerine eşlemek için 
+  kullanılırken) hemen önce uygulanan bir 
+  <code>&lt;Location&gt;</code>/<code>&lt;LocationMatch&gt;</code> 
+  dizisi vardır. Bu dizinin sonuçları isim dönüşüm aşaması tamamlandıktan 
+  sonra tamamen elden çıkarılır.
+</div>
+
+<h3><a name="merge-examples" id="merge-examples">Bazı Örnekler</a></h3>
+
+<p>Aşağıdaki yapay örnekte katıştırma sırası gösterilmiştir. Hepsinin 
+aynı isteğe uygulandığı varsayımıyla, bu örnekteki yönergeler 
+A &gt; B &gt; C &gt; D &gt; E sırasıyla uygulanacaktır.</p>
+
+<div class="example"><p><code>
+&lt;Location /&gt;<br />
+E<br />
+&lt;/Location&gt;<br />
+<br />
+&lt;Files f.html&gt;<br />
+D<br />
+&lt;/Files&gt;<br />
+<br />
+&lt;VirtualHost *&gt;<br />
+&lt;Directory /a/b&gt;<br />
+B<br />
+&lt;/Directory&gt;<br />
+&lt;/VirtualHost&gt;<br />
+<br />
+&lt;DirectoryMatch "^.*b$"&gt;<br />
+C<br />
+&lt;/DirectoryMatch&gt;<br />
+<br />
+&lt;Directory /a/b&gt;<br />
+A<br />
+&lt;/Directory&gt;<br />
+<br />
+</code></p></div>
+
+<p>Daha somut bir örnek olarak aşağıdakini ele alalım. <code class="directive"><a href="./mod/core.html#directory">&lt;Directory&gt;</a></code> bölümlerindeki erişim sınırlamaları 
+ne olursa olsun <code class="directive"><a href="./mod/core.html#location">&lt;Location&gt;</a></code> 
+bölümü son olarak değerlendirmeye alınacak ve sunucuya sınırsız erişim 
+verecektir. Başka bir deyişle, katıştırma sırası önemlidir, bu nedenle 
+dikkatli olmalısınız!</p>
+
+<div class="example"><p><code>
+&lt;Location /&gt;<br />
+<span class="indent">
+  Order deny,allow<br />
+  Allow from all<br />
+</span>
+&lt;/Location&gt;<br />
+<br />
+# Alooo!  Bu &lt;Directory&gt; bölümünün hiçbir hükmü yok.<br />
+&lt;Directory /&gt;<br />
+<span class="indent">
+  Order allow,deny<br />
+  Allow from all<br />
+  Deny from kkadam.mesela.dom<br />
+</span>
+&lt;/Directory&gt;
+</code></p></div>
+
+
+
+</div></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="./en/sections.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./fr/sections.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/sections.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/sections.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sections.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/server-wide.html b/docs/manual/server-wide.html
index d43014c0..0ce91384 100644
--- a/docs/manual/server-wide.html
+++ b/docs/manual/server-wide.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: server-wide.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: server-wide.html.ja.euc-jp
+URI: server-wide.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: server-wide.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/server-wide.html.en b/docs/manual/server-wide.html.en
index c4bf7467..4ea65455 100644
--- a/docs/manual/server-wide.html.en
+++ b/docs/manual/server-wide.html.en
@@ -95,6 +95,6 @@ the basic operations of the server.</p>
 <a href="./ja/server-wide.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/server-wide.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/server-wide.html.ja.euc-jp b/docs/manual/server-wide.html.ja.euc-jp
deleted file mode 100644
index 1be7e10b..00000000
--- a/docs/manual/server-wide.html.ja.euc-jp
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>¥µ¡¼¥ÐÁ´ÂΤÎÀßÄê - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>¥µ¡¼¥ÐÁ´ÂΤÎÀßÄê</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./en/server-wide.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./ja/server-wide.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/server-wide.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-<p>¤³¤Î¥É¥­¥å¥á¥ó¥È¤Ç¤Ï<code class="module"><a href="./mod/core.html">core</a></code>
-¥µ¡¼¥Ð¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÃæ¤Ç¡¢
-´ðËÜÆ°ºî¤òÀßÄꤹ¤ë¤¿¤á¤Î¤â¤Î¤òÀâÌÀ¤·¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#identification">¥µ¡¼¥Ð ID</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#locations">¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#resource">¥ê¥½¡¼¥¹¤ÎÀ©¸Â</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="identification" id="identification">¥µ¡¼¥Ð ID</a></h2>
-    
-
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#servername">ServerName</a></code></li><li><code class="directive"><a href="./mod/core.html#serveradmin">ServerAdmin</a></code></li><li><code class="directive"><a href="./mod/core.html#serversignature">ServerSignature</a></code></li><li><code class="directive"><a href="./mod/core.html#servertokens">ServerTokens</a></code></li><li><code class="directive"><a href="./mod/core.html#usecanonicalname">UseCanonicalName</a></code></li></ul></td></tr></table>
-
-    <p><code class="directive"><a href="./mod/core.html#serveradmin">ServerAdmin</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    <code class="directive"><a href="./mod/core.html#servertokens">ServerTokens</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤Ê¤É¤Î¥µ¡¼¥Ð¤¬ºî¤ë¥É¥­¥å¥á¥ó¥È¤Ë¡¢
-    ¤É¤Î¤è¤¦¤Ê¥µ¡¼¥Ð¤Î¾ðÊó¤òɽ¼¨¤¹¤ë¤«¤òÀ©¸æ¤·¤Þ¤¹¡£
-    <code class="directive"><a href="./mod/core.html#servertokens">ServerTokens</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢Server HTTP
-    ¥ì¥¹¥Ý¥ó¥¹¥Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É¤ÎÃͤòÀßÄꤷ¤Þ¤¹¡£</p>
-
-    <p><code class="directive"><a href="./mod/core.html#servername">ServerName</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-    <code class="directive"><a href="./mod/core.html#usecanonicalname">UseCanonicalName</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢¥µ¡¼¥Ð¤¬¼«Ê¬¼«¿È¤ò»²¾È¤¹¤ë URL
-    ¤òºî¤ë¤È¤­¤Ë»È¤ï¤ì¤Þ¤¹¡£
-    ¤¿¤È¤¨¤Ð¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬¥Ç¥£¥ì¥¯¥È¥ê¤òÍ׵ᤷ¤Æ¡¢
-    ¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê̾¤ÎºÇ¸å¤Ë¥¹¥é¥Ã¥·¥å¤¬ÉÕ¤¤¤Æ¤¤¤Ê¤¤¤è¤¦¤Ê¾ì¹ç¤Ë¤Ï¡¢
-    ¥É¥­¥å¥á¥ó¥È¤ÎÁêÂÐŪ¤Ê»²¾È¤òÀµ¤·¤¯²ò·è¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë¡¢
-    Apache ¤ÏºÇ¸å¤Î¥¹¥é¥Ã¥·¥å¤ò´Þ¤ó¤À´°Á´¤Ê¥Ñ¥¹¤Ë¥¯¥é¥¤¥¢¥ó¥È¤ò
-    ¥ê¥À¥¤¥ì¥¯¥È¤µ¤»¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="locations" id="locations">¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ</a></h2>
-    
-
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></code></li><li><code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code></li><li><code class="directive"><a href="./mod/core.html#errorlog">ErrorLog</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#lockfile">LockFile</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#scoreboardfile">ScoreBoardFile</a></code></li><li><code class="directive"><a href="./mod/core.html#serverroot">ServerRoot</a></code></li></ul></td></tr></table>
-
-    <p>¤³¤ì¤é¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï Apache
-    ¤¬Å¬ÀÚ¤ÊÆ°ºî¤ò¤¹¤ë¤¿¤á¤ËɬÍפʳƼï¥Õ¥¡¥¤¥ë¤Î°ÌÃÖ¤òÀ©¸æ¤·¤Þ¤¹¡£
-    ¥Ñ¥¹¤¬¥¹¥é¥Ã¥·¥å (/) ¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤Ê¤¤¤È¤­¤Ï¡¢¥Õ¥¡¥¤¥ë¤Ï
-    <code class="directive"><a href="./mod/core.html#serverroot">ServerRoot</a></code> ¤«¤é¤ÎÁêÂХѥ¹¤È¤·¤Æ
-    õ¤µ¤ì¤Þ¤¹¡£root
-    °Ê³°¤Î¥æ¡¼¥¶¤¬½ñ¤­¹þ¤ß²Äǽ¤Ê¥Ñ¥¹¤Ë¥Õ¥¡¥¤¥ë¤òÃÖ¤¯¾ì¹ç¤ÏÃí°Õ¤¬É¬ÍפǤ¹¡£
-    ¾ÜºÙ¤Ï<a href="misc/security_tips.html#serverroot">¡Ö¥»¥­¥å¥ê¥Æ¥£¾ðÊó¡×</a>
-    ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="resource" id="resource">¥ê¥½¡¼¥¹¤ÎÀ©¸Â</a></h2>
-    
-
-    <table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#limitrequestbody">LimitRequestBody</a></code></li><li><code class="directive"><a href="./mod/core.html#limitrequestfields">LimitRequestFields</a></code></li><li><code class="directive"><a href="./mod/core.html#limitrequestfieldsize">LimitRequestFieldsize</a></code></li><li><code class="directive"><a href="./mod/core.html#limitrequestline">LimitRequestLine</a></code></li><li><code class="directive"><a href="./mod/core.html#rlimitcpu">RLimitCPU</a></code></li><li><code class="directive"><a href="./mod/core.html#rlimitmem">RLimitMEM</a></code></li><li><code class="directive"><a href="./mod/core.html#rlimitnproc">RLimitNPROC</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#threadstacksize">ThreadStackSize</a></code></li></ul></td></tr></table>
-
-    <p><code class="directive">LimitRequest</code>* ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï Apache
-    ¤¬¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î¥ê¥¯¥¨¥¹¥ÈÆɤ߹þ¤ß¤Ç»È¤¦
-    ¥ê¥½¡¼¥¹¤òÀ©¸Â¤¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£¤³¤ì¤é¤ÎÃͤòÀ©¸Â¤¹¤ë¤³¤È¤Ç¡¢
-    ¤¤¤¯¤Ä¤«¤Î¥µ¡¼¥Ó¥¹µñÈݹ¶·â¤Ï±Æ¶Á¤òϤ餲¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p><code class="directive">RLimit</code>* ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢Apache ¤Î»Ò¥×¥í¥»¥¹¤«¤é
-    fork ¤µ¤ì¤¿¥×¥í¥»¥¹¤¬»ÈÍѤ¹¤ë¥ê¥½¡¼¥¹¤òÀ©¸Â¤¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£
-    Æäˡ¢¤³¤ì¤Ï CGI ¥¹¥¯¥ê¥×¥È¤È SSI exec
-    ¥³¥Þ¥ó¥É¤Ç»È¤ï¤ì¤ë¥ê¥½¡¼¥¹¤òÀ©¸æ¤·¤Þ¤¹¡£</p>
-
-    <p><code class="directive"><a href="./mod/mpm_common.html#threadstacksize">ThreadStackSize</a></code> ¤Ï Netware
-    ¤Ç¤Î¤ß¡¢¥¹¥¿¥Ã¥¯¤ÎÂ礭¤µ¤òÀ©¸æ¤¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£</p>
-  </div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./en/server-wide.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./ja/server-wide.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/server-wide.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/server-wide.html.ja.utf8 b/docs/manual/server-wide.html.ja.utf8
new file mode 100644
index 00000000..3e249bb3
--- /dev/null
+++ b/docs/manual/server-wide.html.ja.utf8
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>サー�全体�設定 - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>サー�全体�設定</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./en/server-wide.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./ja/server-wide.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/server-wide.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+
+<p>��ドキュメント��<code class="module"><a href="./mod/core.html">core</a></code>
+サー��ディレクティブ�中��
+基本動作を設定�る���も�を説明���。</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#identification">サー� ID</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#locations">ファイル��置</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#resource">リソース�制�</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="identification" id="identification">サー� ID</a></h2>
+    
+
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#servername">ServerName</a></code></li><li><code class="directive"><a href="./mod/core.html#serveradmin">ServerAdmin</a></code></li><li><code class="directive"><a href="./mod/core.html#serversignature">ServerSignature</a></code></li><li><code class="directive"><a href="./mod/core.html#servertokens">ServerTokens</a></code></li><li><code class="directive"><a href="./mod/core.html#usecanonicalname">UseCanonicalName</a></code></li><li><code class="directive"><a href="./mod/core.html#usecanonicalphysicalport">UseCanonicalPhysicalPort</a></code></li></ul></td></tr></table>
+
+    <p><code class="directive"><a href="./mod/core.html#serveradmin">ServerAdmin</a></code>, 
+    <code class="directive"><a href="./mod/core.html#servertokens">ServerTokens</a></code>, 
+    <code class="directive"><a href="./mod/core.html#usecanonicalphysicalport">UseCanonicalPhysicalPort</a></code>
+    ディレクティブ��エラーメッセージ���サー��作るドキュメント��
+    ��よ��サー��情報を表示�る�を制御���。
+    <code class="directive"><a href="./mod/core.html#servertokens">ServerTokens</a></code> ディレクティブ��Server HTTP
+    レス�ンスヘッダフィールド�値を設定���。</p>
+
+    <p><code class="directive"><a href="./mod/core.html#servername">ServerName</a></code> ディレクティブ�
+    <code class="directive"><a href="./mod/core.html#usecanonicalname">UseCanonicalName</a></code>
+    ディレクティブ��サー��自分自身を�照�る URL
+    を作る���使�れ��。
+    �����クライアント�ディレクトリを�求���
+    ��ディレクトリ��最後�スラッシュ�付�����よ��場����
+    ドキュメント�相対的��照を正��解決��るよ���る����
+    Apache �最後�スラッシュを�ん�完全�パス�クライアントを
+    リダイレクト��る必���り��。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="locations" id="locations">ファイル��置</a></h2>
+    
+
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></code></li><li><code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code></li><li><code class="directive"><a href="./mod/core.html#errorlog">ErrorLog</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#lockfile">LockFile</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#scoreboardfile">ScoreBoardFile</a></code></li><li><code class="directive"><a href="./mod/core.html#serverroot">ServerRoot</a></code></li></ul></td></tr></table>
+
+    <p>�れら�ディレクティブ� Apache
+    ��切�動作を�る���必���種ファイル��置を制御���。
+    パス�スラッシュ (/) �始����������ファイル�
+    <code class="directive"><a href="./mod/core.html#serverroot">ServerRoot</a></code> �ら�相対パス���
+    探�れ��。root
+    以外�ユーザ�書�込��能�パス�ファイルを置�場��注��必���。
+    詳細�<a href="misc/security_tips.html#serverroot">「セキュリティ情報�</a>
+    を�照������。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="resource" id="resource">リソース�制�</a></h2>
+    
+
+    <table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td /><td><ul><li><code class="directive"><a href="./mod/core.html#limitrequestbody">LimitRequestBody</a></code></li><li><code class="directive"><a href="./mod/core.html#limitrequestfields">LimitRequestFields</a></code></li><li><code class="directive"><a href="./mod/core.html#limitrequestfieldsize">LimitRequestFieldsize</a></code></li><li><code class="directive"><a href="./mod/core.html#limitrequestline">LimitRequestLine</a></code></li><li><code class="directive"><a href="./mod/core.html#rlimitcpu">RLimitCPU</a></code></li><li><code class="directive"><a href="./mod/core.html#rlimitmem">RLimitMEM</a></code></li><li><code class="directive"><a href="./mod/core.html#rlimitnproc">RLimitNPROC</a></code></li><li><code class="directive"><a href="./mod/mpm_common.html#threadstacksize">ThreadStackSize</a></code></li></ul></td></tr></table>
+
+    <p><code class="directive">LimitRequest</code>* ディレクティブ� Apache
+    �クライアント�ら�リクエスト読�込��使�
+    リソースを制��る���使�れ��。�れら�値を制��る����
+    �����サービス拒�攻撃�影響を和ら�る�������。</p>
+
+    <p><code class="directive">RLimit</code>* ディレクティブ��Apache ��プロセス�ら
+    fork �れ�プロセス�使用�るリソースを制��る���使�れ��。
+    特���れ� CGI スクリプト� SSI exec
+    コマンド�使�れるリソースを制御���。</p>
+
+    <p><code class="directive"><a href="./mod/mpm_common.html#threadstacksize">ThreadStackSize</a></code> � Netware
+    ����スタック�大��を制御�る���使�れ��。</p>
+  </div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./en/server-wide.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./ja/server-wide.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/server-wide.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/server-wide.html.ko.euc-kr b/docs/manual/server-wide.html.ko.euc-kr
index 4ae2812c..d7a14cea 100644
--- a/docs/manual/server-wide.html.ko.euc-kr
+++ b/docs/manual/server-wide.html.ko.euc-kr
@@ -90,6 +90,6 @@
 <a href="./ja/server-wide.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/server-wide.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/sitemap.html b/docs/manual/sitemap.html
index 84947e10..33ee329a 100644
--- a/docs/manual/sitemap.html
+++ b/docs/manual/sitemap.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: sitemap.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -10,10 +12,14 @@ URI: sitemap.html.es
 Content-Language: es
 Content-type: text/html; charset=ISO-8859-1
 
-URI: sitemap.html.ja.euc-jp
+URI: sitemap.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: sitemap.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: sitemap.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/sitemap.html.de b/docs/manual/sitemap.html.de
index 219fdccc..b2c0cd23 100644
--- a/docs/manual/sitemap.html.de
+++ b/docs/manual/sitemap.html.de
@@ -24,7 +24,8 @@
 <a href="./en/sitemap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/sitemap.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./ja/sitemap.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sitemap.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
 <p>Diese Seite verzeichnet die zur Zeit verfügbaren Dokumente der
@@ -260,8 +261,9 @@ HPUX betreiben</a></li>
 <a href="./en/sitemap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/sitemap.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./ja/sitemap.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sitemap.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/sitemap.html.en b/docs/manual/sitemap.html.en
index c8a0455d..5c0f65ab 100644
--- a/docs/manual/sitemap.html.en
+++ b/docs/manual/sitemap.html.en
@@ -24,7 +24,8 @@
 <a href="./en/sitemap.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/sitemap.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./ja/sitemap.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sitemap.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
 <p>This page lists the currently available documents of the
@@ -258,8 +259,9 @@ Server on HPUX</a></li>
 <a href="./en/sitemap.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/sitemap.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./ja/sitemap.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sitemap.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/sitemap.html.es b/docs/manual/sitemap.html.es
index f78fb57b..6c585a28 100644
--- a/docs/manual/sitemap.html.es
+++ b/docs/manual/sitemap.html.es
@@ -24,7 +24,8 @@
 <a href="./en/sitemap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/sitemap.html" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./ja/sitemap.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sitemap.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">Esta traducción podría estar
             obsoleta. Consulte la versión en inglés de la
@@ -263,8 +264,9 @@ Referencia de Directivas</a></li>
 <a href="./en/sitemap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/sitemap.html" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./ja/sitemap.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sitemap.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Módulos</a> | <a href="./mod/directives.html">Directivas</a> | <a href="./faq/">Preguntas Frecuentes</a> | <a href="./glossary.html">Glosario</a> | <a href="./sitemap.html">Mapa de este sitio web</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/sitemap.html.ja.euc-jp b/docs/manual/sitemap.html.ja.euc-jp
deleted file mode 100644
index d368158b..00000000
--- a/docs/manual/sitemap.html.ja.euc-jp
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>Site Map - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page">
-<div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div>
-<div id="page-content"><div id="preamble"><h1>Site Map</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./de/sitemap.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/sitemap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/sitemap.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./ja/sitemap.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-<p>¤³¤Î¥Ú¡¼¥¸¤Ï¸½»þÅÀ¤ÇÍøÍѲÄǽ¤Ê
-<a href="./">Apache HTTP ¥µ¡¼¥Ð¥Ð¡¼¥¸¥ç¥ó 2.2 ¤Î¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a>
-¤Î°ìÍ÷¤Ç¤¹¡£</p>
-</div>
-<div id="quickview"><ul id="toc">
-<li><img alt="" src="./images/down.gif" /> <a href="#release">¥ê¥ê¡¼¥¹¤Î¥á¥â</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#using">Apache HTTP ¥µ¡¼¥Ð¤Î»ÈÍÑ</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#vhosts">Apache ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¥É¥­¥å¥á¥ó¥È</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#faq">Apache ¥µ¡¼¥Ð¤Î¤è¤¯¤¢¤ë¼ÁÌä</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#ssl">Apache ¤Î SSL/TLS °Å¹æ²½</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#howto">¥¬¥¤¥É¡¢¥Á¥å¡¼¥È¥ê¥¢¥ë¡¢¥Ï¥¦¥Ä¡¼</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#platform">¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¸ÇÍ­¤Î¾ðÊó</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#programs">Apache HTTP ¥µ¡¼¥Ð¤È¥µ¥Ý¡¼¥È¥×¥í¥°¥é¥à</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#misc">Apache ¤½¤Î¾</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#modules">Apache ¥â¥¸¥å¡¼¥ë</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#developer">³«È¯¼Ô¤Î¤¿¤á¤Î¥É¥­¥å¥á¥ó¥È</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#index">ÍѸ콸¤Èº÷°ú</a></li>
-</ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section"><h2><a name="release" id="release">¥ê¥ê¡¼¥¹¤Î¥á¥â</a></h2>
-<ul><li><a href="upgrading.html">1.3 ¤«¤é 2.0 ¤Ø¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É</a></li>
-<li><a href="new_features_2_0.html">Apache 2.0 ¤Î¿·µ¡Ç½</a></li>
-<li><a href="license.html">Apache License</a></li>
-</ul>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section"><h2><a name="using" id="using">Apache HTTP ¥µ¡¼¥Ð¤Î»ÈÍÑ</a></h2>
-<ul><li><a href="install.html">Apache ¤Î¥³¥ó¥Ñ¥¤¥ë¤È¥¤¥ó¥¹¥È¡¼¥ë</a></li>
-<li><a href="invoking.html">Apache ¤Îµ¯Æ°</a></li>
-<li><a href="stopping.html">¥µ¡¼¥Ð¤ÎÄä»ß¤ÈºÆµ¯Æ°</a></li>
-<li><a href="configuring.html">ÀßÄê¥Õ¥¡¥¤¥ë</a></li>
-<li><a href="sections.html">Directory, Location, Files ¥»¥¯¥·¥ç¥ó¤ÎÆ°ºîÊýË¡</a></li>
-<li><a href="server-wide.html">¥µ¡¼¥ÐÁ´ÂΤÎÀßÄê</a></li>
-<li><a href="logs.html">¥í¥°¥Õ¥¡¥¤¥ë</a></li>
-<li><a href="urlmapping.html">URL ¤«¤é¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Î°ÌÃ֤ؤΥޥå×</a></li>
-<li><a href="misc/security_tips.html">¥»¥­¥å¥ê¥Æ¥£¤Î¥³¥Ä</a></li>
-<li><a href="dso.html">ưŪ¶¦Í­¥ª¥Ö¥¸¥§¥¯¥È (DSO) ¥µ¥Ý¡¼¥È</a></li>
-<li><a href="content-negotiation.html">¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥ó</a></li>
-<li><a href="custom-error.html">¥«¥¹¥¿¥à¥¨¥é¡¼¥ì¥¹¥Ý¥ó¥¹</a></li>
-<li><a href="bind.html">Apache ¤¬»ÈÍѤ¹¤ë¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤ÎÀßÄê</a></li>
-<li><a href="mpm.html">¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°¥â¥¸¥å¡¼¥ë (MPM)</a></li>
-<li><a href="env.html">Apache ¤Ë¤ª¤±¤ë´Ä¶­ÊÑ¿ô</a></li>
-<li><a href="handler.html">Apache ¤Î¥Ï¥ó¥É¥é¤Î»ÈÍÑ</a></li>
-<li><a href="filter.html">¥Õ¥£¥ë¥¿</a></li>
-<li><a href="suexec.html">suEXEC ¥µ¥Ý¡¼¥È</a></li>
-<li><a href="misc/perf-tuning.html">À­Ç½¤Ë´Ø¤¹¤ë¥Ò¥ó¥È</a></li>
-<li><a href="misc/rewriteguide.html">URL ¥ê¥é¥¤¥È¥¬¥¤¥É</a></li>
-</ul>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section"><h2><a name="vhosts" id="vhosts">Apache ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¥É¥­¥å¥á¥ó¥È</a></h2>
-<ul><li class="separate"><a href="vhosts/">³µÎ¬</a></li>
-<li><a href="vhosts/name-based.html">̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></li>
-<li><a href="vhosts/ip-based.html">IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¥µ¥Ý¡¼¥È</a></li>
-<li><a href="vhosts/mass.html">ưŪ¤ËÀßÄꤵ¤ì¤¿Â絬ÌϥС¼¥Á¥ã¥ë¥Û¥¹¥È</a></li>
-<li><a href="vhosts/examples.html">VirtualHost ¤ÎÎã</a></li>
-<li><a href="vhosts/details.html">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¥Þ¥Ã¥Á¥ó¥°¤Î¾Ü¤·¤¤ÀâÌÀ</a></li>
-<li><a href="vhosts/fd-limits.html">¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Î¸Â³¦</a></li>
-<li><a href="dns-caveats.html">DNS ¤È Apache ¤È¤Ë´Ø·¸¤¹¤ëÌäÂê</a></li>
-</ul>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section"><h2><a name="faq" id="faq">Apache ¥µ¡¼¥Ð¤Î¤è¤¯¤¢¤ë¼ÁÌä</a></h2>
-<ul><li><a href="faq/">³µÎ¬</a></li>
-<li><a href="faq/support.html">¥µ¥Ý¡¼¥È</a></li>
-<li><a href="faq/error.html">¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸</a></li>
-</ul>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section"><h2><a name="ssl" id="ssl">Apache ¤Î SSL/TLS °Å¹æ²½</a></h2>
-<ul><li class="separate"><a href="ssl/">³µÎ¬</a></li>
-<li><a href="ssl/ssl_intro.html">SSL/TLS °Å¹æ²½: ÆþÌç</a></li>
-<li><a href="ssl/ssl_compat.html">SSL/TLS °Å¹æ²½: ¸ß´¹À­</a></li>
-<li><a href="ssl/ssl_howto.html">SSL/TLS °Å¹æ²½: ¥Ï¥¦¥Ä¡¼</a></li>
-<li><a href="ssl/ssl_faq.html">SSL/TLS °Å¹æ²½: FAQ</a></li>
-</ul>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section"><h2><a name="howto" id="howto">¥¬¥¤¥É¡¢¥Á¥å¡¼¥È¥ê¥¢¥ë¡¢¥Ï¥¦¥Ä¡¼</a></h2>
-<ul><li class="separate"><a href="howto/">³µÎ¬</a></li>
-<li><a href="howto/auth.html">ǧ¾Ú</a></li>
-<li><a href="howto/cgi.html">CGI ¤Ë¤è¤ëưŪ¥³¥ó¥Æ¥ó¥Ä</a></li>
-<li><a href="howto/ssi.html">Server Side Includes ÆþÌç</a></li>
-<li><a href="howto/htaccess.html">.htaccess ¥Õ¥¡¥¤¥ë</a></li>
-<li><a href="howto/public_html.html">¥æ¡¼¥¶Ëè¤Î¥¦¥§¥Ö¥Ç¥£¥ì¥¯¥È¥ê</a></li>
-</ul>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section"><h2><a name="platform" id="platform">¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¸ÇÍ­¤Î¾ðÊó</a></h2>
-<ul><li class="separate"><a href="platform/">³µÎ¬</a></li>
-<li><a href="platform/windows.html">Microsoft Windows ¤Ç¤Î Apache ¤Î»ÈÍÑ</a></li>
-<li><a href="platform/win_compiling.html">Microsoft Windows ¤Ç¤Î Apache
-¤Î¥³¥ó¥Ñ¥¤¥ë</a></li>
-<li><a href="platform/netware.html">Novell NetWare ¤Ç Apache ¤ò»È¤¦</a></li>
-<li><a href="platform/perf-hp.html">HPUX ¤Ç¹âÀ­Ç½¥¦¥§¥Ö¥µ¡¼¥Ð¤ò¼Â¹Ô¤¹¤ë</a></li>
-<li><a href="platform/ebcdic.html">EBCDIC ÈÇ Apache</a></li>
-</ul>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section"><h2><a name="programs" id="programs">Apache HTTP ¥µ¡¼¥Ð¤È¥µ¥Ý¡¼¥È¥×¥í¥°¥é¥à</a></h2>
-<ul><li class="separate"><a href="programs/">³µÎ¬</a></li>
-<li><a href="programs/httpd.html">¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸: httpd</a></li>
-<li><a href="programs/ab.html">¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸: ab</a></li>
-<li><a href="programs/apachectl.html">¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸: apachectl</a></li>
-<li><a href="programs/apxs.html">¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸: apxs</a></li>
-<li><a href="programs/configure.html">¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸: configure</a></li>
-<li><a href="programs/dbmmanage.html">¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸: dbmmanage</a></li>
-<li><a href="programs/htcacheclean.html">¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸: htcacheclean</a></li>
-<li><a href="programs/htdbm.html">¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸: htdbm</a></li>
-<li><a href="programs/htdigest.html">¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸: htdigest</a></li>
-<li><a href="programs/htpasswd.html">¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸: htpasswd</a></li>
-<li><a href="programs/logresolve.html">¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸: logresolve</a></li>
-<li><a href="programs/rotatelogs.html">¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸: rotatelogs</a></li>
-<li><a href="programs/suexec.html">¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸: suexec</a></li>
-<li><a href="programs/other.html">¾¤Î¥×¥í¥°¥é¥à</a></li>
-</ul>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section"><h2><a name="misc" id="misc">Apache ¤½¤Î¾</a></h2>
-<ul><li class="separate"><a href="misc/">³µÎ¬</a></li>
-<li><a href="misc/relevant_standards.html">´ØÏ¢¤¹¤ëɸ½àµ¬³Ê</a></li>
-</ul>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section"><h2><a name="modules" id="modules">Apache ¥â¥¸¥å¡¼¥ë</a></h2>
-<ul><li><a href="mod/module-dict.html">Apache ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÀâÌÀ¤Ë»È¤ï¤ì¤ëÍѸì</a></li>
-<li><a href="mod/directive-dict.html">Apache ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÀâÌÀ¤Ë»È¤ï¤ì¤ëÍѸì</a></li>
-</ul><ul><li><a href="mod/core.html">Apache ¥³¥¢µ¡Ç½</a></li>
-<li><a href="mod/mpm_common.html">Apache MPM ¶¦Ḁ̈ǥ£¥ì¥¯¥Æ¥£¥Ö</a></li>
-<li><a href="mod/beos.html">Apache MPM beos</a></li>
-<li><a href="mod/event.html">Apache MPM event</a></li>
-<li><a href="mod/mpm_netware.html">Apache MPM netware</a></li>
-<li><a href="mod/mpmt_os2.html">Apache MPM os2</a></li>
-<li><a href="mod/prefork.html">Apache MPM prefork</a></li>
-<li><a href="mod/mpm_winnt.html">Apache MPM winnt</a></li>
-<li><a href="mod/worker.html">Apache MPM worker</a></li>
-</ul><ul><li><a href="mod/mod_actions.html">Apache ¥â¥¸¥å¡¼¥ë mod_actions</a></li>
-<li><a href="mod/mod_alias.html">Apache ¥â¥¸¥å¡¼¥ë mod_alias</a></li>
-<li><a href="mod/mod_asis.html">Apache ¥â¥¸¥å¡¼¥ë mod_asis</a></li>
-<li><a href="mod/mod_auth_basic.html">Apache ¥â¥¸¥å¡¼¥ë mod_auth_basic</a></li>
-<li><a href="mod/mod_auth_digest.html">Apache ¥â¥¸¥å¡¼¥ë mod_auth_digest</a></li>
-<li><a href="mod/mod_authn_alias.html">Apache ¥â¥¸¥å¡¼¥ë mod_authn_alias</a></li>
-<li><a href="mod/mod_authn_anon.html">Apache ¥â¥¸¥å¡¼¥ë mod_authn_anon</a></li>
-<li><a href="mod/mod_authn_dbd.html">Apache ¥â¥¸¥å¡¼¥ë mod_authn_dbd</a></li>
-<li><a href="mod/mod_authn_dbm.html">Apache ¥â¥¸¥å¡¼¥ë mod_authn_dbm</a></li>
-<li><a href="mod/mod_authn_default.html">Apache ¥â¥¸¥å¡¼¥ë mod_authn_default</a></li>
-<li><a href="mod/mod_authn_file.html">Apache ¥â¥¸¥å¡¼¥ë mod_authn_file</a></li>
-<li><a href="mod/mod_authnz_ldap.html">Apache ¥â¥¸¥å¡¼¥ë mod_authnz_ldap</a></li>
-<li><a href="mod/mod_authz_dbm.html">Apache ¥â¥¸¥å¡¼¥ë mod_authz_dbm</a></li>
-<li><a href="mod/mod_authz_default.html">Apache ¥â¥¸¥å¡¼¥ë mod_authz_default</a></li>
-<li><a href="mod/mod_authz_groupfile.html">Apache ¥â¥¸¥å¡¼¥ë mod_authz_groupfile</a></li>
-<li><a href="mod/mod_authz_host.html">Apache ¥â¥¸¥å¡¼¥ë mod_authz_host</a></li>
-<li><a href="mod/mod_authz_owner.html">Apache ¥â¥¸¥å¡¼¥ë mod_authz_owner</a></li>
-<li><a href="mod/mod_authz_user.html">Apache ¥â¥¸¥å¡¼¥ë mod_authz_user</a></li>
-<li><a href="mod/mod_autoindex.html">Apache ¥â¥¸¥å¡¼¥ë mod_autoindex</a></li>
-<li><a href="mod/mod_cache.html">Apache ¥â¥¸¥å¡¼¥ë mod_cache</a></li>
-<li><a href="mod/mod_cern_meta.html">Apache ¥â¥¸¥å¡¼¥ë mod_cern_meta</a></li>
-<li><a href="mod/mod_cgi.html">Apache ¥â¥¸¥å¡¼¥ë mod_cgi</a></li>
-<li><a href="mod/mod_cgid.html">Apache ¥â¥¸¥å¡¼¥ë mod_cgid</a></li>
-<li><a href="mod/mod_charset_lite.html">Apache ¥â¥¸¥å¡¼¥ë mod_charset_lite</a></li>
-<li><a href="mod/mod_dav.html">Apache ¥â¥¸¥å¡¼¥ë mod_dav</a></li>
-<li><a href="mod/mod_dav_fs.html">Apache ¥â¥¸¥å¡¼¥ë mod_dav_fs</a></li>
-<li><a href="mod/mod_dav_lock.html">Apache ¥â¥¸¥å¡¼¥ë mod_dav_lock</a></li>
-<li><a href="mod/mod_dbd.html">Apache ¥â¥¸¥å¡¼¥ë mod_dbd</a></li>
-<li><a href="mod/mod_deflate.html">Apache ¥â¥¸¥å¡¼¥ë mod_deflate</a></li>
-<li><a href="mod/mod_dir.html">Apache ¥â¥¸¥å¡¼¥ë mod_dir</a></li>
-<li><a href="mod/mod_disk_cache.html">Apache ¥â¥¸¥å¡¼¥ë mod_disk_cache</a></li>
-<li><a href="mod/mod_dumpio.html">Apache ¥â¥¸¥å¡¼¥ë mod_dumpio</a></li>
-<li><a href="mod/mod_echo.html">Apache ¥â¥¸¥å¡¼¥ë mod_echo</a></li>
-<li><a href="mod/mod_env.html">Apache ¥â¥¸¥å¡¼¥ë mod_env</a></li>
-<li><a href="mod/mod_example.html">Apache ¥â¥¸¥å¡¼¥ë mod_example</a></li>
-<li><a href="mod/mod_expires.html">Apache ¥â¥¸¥å¡¼¥ë mod_expires</a></li>
-<li><a href="mod/mod_ext_filter.html">Apache ¥â¥¸¥å¡¼¥ë mod_ext_filter</a></li>
-<li><a href="mod/mod_file_cache.html">Apache ¥â¥¸¥å¡¼¥ë mod_file_cache</a></li>
-<li><a href="mod/mod_filter.html">Apache ¥â¥¸¥å¡¼¥ë mod_filter</a></li>
-<li><a href="mod/mod_headers.html">Apache ¥â¥¸¥å¡¼¥ë mod_headers</a></li>
-<li><a href="mod/mod_ident.html">Apache ¥â¥¸¥å¡¼¥ë mod_ident</a></li>
-<li><a href="mod/mod_imagemap.html">Apache ¥â¥¸¥å¡¼¥ë mod_imagemap</a></li>
-<li><a href="mod/mod_include.html">Apache ¥â¥¸¥å¡¼¥ë mod_include</a></li>
-<li><a href="mod/mod_info.html">Apache ¥â¥¸¥å¡¼¥ë mod_info</a></li>
-<li><a href="mod/mod_isapi.html">Apache ¥â¥¸¥å¡¼¥ë mod_isapi</a></li>
-<li><a href="mod/mod_ldap.html">Apache ¥â¥¸¥å¡¼¥ë mod_ldap</a></li>
-<li><a href="mod/mod_log_config.html">Apache ¥â¥¸¥å¡¼¥ë mod_log_config</a></li>
-<li><a href="mod/mod_log_forensic.html">Apache ¥â¥¸¥å¡¼¥ë mod_log_forensic</a></li>
-<li><a href="mod/mod_logio.html">Apache ¥â¥¸¥å¡¼¥ë mod_logio</a></li>
-<li><a href="mod/mod_mem_cache.html">Apache ¥â¥¸¥å¡¼¥ë mod_mem_cache</a></li>
-<li><a href="mod/mod_mime.html">Apache ¥â¥¸¥å¡¼¥ë mod_mime</a></li>
-<li><a href="mod/mod_mime_magic.html">Apache ¥â¥¸¥å¡¼¥ë mod_mime_magic</a></li>
-<li><a href="mod/mod_negotiation.html">Apache ¥â¥¸¥å¡¼¥ë mod_negotiation</a></li>
-<li><a href="mod/mod_nw_ssl.html">Apache ¥â¥¸¥å¡¼¥ë mod_nw_ssl</a></li>
-<li><a href="mod/mod_proxy.html">Apache ¥â¥¸¥å¡¼¥ë mod_proxy</a></li>
-<li><a href="mod/mod_proxy_ajp.html">Apache ¥â¥¸¥å¡¼¥ë mod_proxy_ajp</a></li>
-<li><a href="mod/mod_proxy_balancer.html">Apache ¥â¥¸¥å¡¼¥ë mod_proxy_balancer</a></li>
-<li><a href="mod/mod_proxy_connect.html">Apache ¥â¥¸¥å¡¼¥ë mod_proxy_connect</a></li>
-<li><a href="mod/mod_proxy_ftp.html">Apache ¥â¥¸¥å¡¼¥ë mod_proxy_ftp</a></li>
-<li><a href="mod/mod_proxy_http.html">Apache ¥â¥¸¥å¡¼¥ë mod_proxy_http</a></li>
-<li><a href="mod/mod_rewrite.html">Apache ¥â¥¸¥å¡¼¥ë mod_rewrite</a></li>
-<li><a href="mod/mod_setenvif.html">Apache ¥â¥¸¥å¡¼¥ë mod_setenvif</a></li>
-<li><a href="mod/mod_so.html">Apache ¥â¥¸¥å¡¼¥ë mod_so</a></li>
-<li><a href="mod/mod_speling.html">Apache ¥â¥¸¥å¡¼¥ë mod_speling</a></li>
-<li><a href="mod/mod_ssl.html">Apache ¥â¥¸¥å¡¼¥ë mod_ssl</a></li>
-<li><a href="mod/mod_status.html">Apache ¥â¥¸¥å¡¼¥ë mod_status</a></li>
-<li><a href="mod/mod_substitute.html">Apache ¥â¥¸¥å¡¼¥ë mod_substitute</a></li>
-<li><a href="mod/mod_suexec.html">Apache ¥â¥¸¥å¡¼¥ë mod_suexec</a></li>
-<li><a href="mod/mod_unique_id.html">Apache ¥â¥¸¥å¡¼¥ë mod_unique_id</a></li>
-<li><a href="mod/mod_userdir.html">Apache ¥â¥¸¥å¡¼¥ë mod_userdir</a></li>
-<li><a href="mod/mod_usertrack.html">Apache ¥â¥¸¥å¡¼¥ë mod_usertrack</a></li>
-<li><a href="mod/mod_version.html">Apache ¥â¥¸¥å¡¼¥ë mod_version</a></li>
-<li><a href="mod/mod_vhost_alias.html">Apache ¥â¥¸¥å¡¼¥ë mod_vhost_alias</a></li>
-</ul>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section"><h2><a name="developer" id="developer">³«È¯¼Ô¤Î¤¿¤á¤Î¥É¥­¥å¥á¥ó¥È</a></h2>
-<ul><li class="separate"><a href="developer/">³µÎ¬</a></li>
-<li><a href="developer/API.html">Apache API ¥á¥â</a></li>
-<li><a href="developer/debugging.html">APR
-¤Î¥á¥â¥ê¥¢¥í¥±¡¼¥·¥ç¥ó¤Î¥Ç¥Ð¥Ã¥°</a></li>
-<li><a href="developer/documenting.html">Apache 2.0 ¤ÎÀâÌÀ¤ò½ñ¤¯</a></li>
-<li><a href="developer/hooks.html">Apache 2.0 ¥Õ¥Ã¥¯´Ø¿ô</a></li>
-<li><a href="developer/modules.html">Apache 1.3 ¤«¤é Apache 2.0 ¤Ë¥â¥¸¥å¡¼¥ë¤ò
-°Ü¿¢¤¹¤ë</a></li>
-<li><a href="developer/request.html">Apache 2.0 ¤Î¥ê¥¯¥¨¥¹¥È½èÍý</a></li>
-<li><a href="developer/filters.html">Apache 2.0 ¤Î¥Õ¥£¥ë¥¿¤ÎÆ°ºî¤Î»ÅÊý</a></li>
-</ul>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section"><h2><a name="index" id="index">ÍѸ콸¤Èº÷°ú</a></h2>
-<ul><li><a href="glossary.html">ÍѸ콸</a></li>
-<li><a href="mod/">¥â¥¸¥å¡¼¥ëº÷°ú</a></li>
-<li><a href="mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Öº÷°ú</a></li>
-<li><a href="mod/quickreference.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö ¥¯¥¤¥Ã¥¯¥ê¥Õ¥¡¥ì¥ó¥¹</a></li>
-</ul>
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./de/sitemap.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/sitemap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/sitemap.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./ja/sitemap.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/sitemap.html.ja.utf8 b/docs/manual/sitemap.html.ja.utf8
new file mode 100644
index 00000000..f356e81c
--- /dev/null
+++ b/docs/manual/sitemap.html.ja.utf8
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Site Map - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page">
+<div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div>
+<div id="page-content"><div id="preamble"><h1>Site Map</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./de/sitemap.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/sitemap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/sitemap.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./ja/sitemap.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sitemap.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+<p>��ページ��時点�利用�能�
+<a href="./">Apache HTTP サー��ージョン 2.2 �ドキュメンテーション</a>
+�一覧��。</p>
+</div>
+<div id="quickview"><ul id="toc">
+<li><img alt="" src="./images/down.gif" /> <a href="#release">リリース�メモ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#using">Apache HTTP サー��使用</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#vhosts">Apache �ー�ャルホストドキュメント</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#faq">Apache サー��よ��る質�</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#ssl">Apache � SSL/TLS 暗�化</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#howto">ガイド��ュートリアル��ウツー</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#platform">プラットフォーム固有�情報</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#programs">Apache HTTP サー��サ�ートプログラム</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#misc">Apache ��他</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#modules">Apache モジュール</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#developer">開発者����ドキュメント</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#index">用語集�索引</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="release" id="release">リリース�メモ</a></h2>
+<ul><li><a href="upgrading.html">2.0 �ら 2.2 ��アップグレード</a></li>
+<li><a href="new_features_2_2.html">Apache 2.1/2.2 �新機能</a></li>
+<li><a href="new_features_2_0.html">Apache 2.0 �新機能</a></li>
+<li><a href="license.html">Apache License</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="using" id="using">Apache HTTP サー��使用</a></h2>
+<ul><li><a href="install.html">Apache �コンパイル�インストール</a></li>
+<li><a href="invoking.html">Apache �起動</a></li>
+<li><a href="stopping.html">サー���止��起動</a></li>
+<li><a href="configuring.html">設定ファイル</a></li>
+<li><a href="sections.html">Directory, Location, Files セクション�動作方法</a></li>
+<li><a href="caching.html">キャッシュ機能</a></li>
+<li><a href="server-wide.html">サー�全体�設定</a></li>
+<li><a href="logs.html">ログファイル</a></li>
+<li><a href="urlmapping.html">URL �らファイルシステム上��置��マップ</a></li>
+<li><a href="misc/security_tips.html">セキュリティ�コツ</a></li>
+<li><a href="dso.html">動的共有オブジェクト (DSO) サ�ート</a></li>
+<li><a href="content-negotiation.html">コンテント�ゴシエーション</a></li>
+<li><a href="custom-error.html">カスタムエラーレス�ンス</a></li>
+<li><a href="bind.html">Apache �使用�るアドレス��ート�設定</a></li>
+<li><a href="mpm.html">マル�プロセッシングモジュール (MPM)</a></li>
+<li><a href="env.html">Apache ���る環境変数</a></li>
+<li><a href="handler.html">Apache ��ンドラ�使用</a></li>
+<li><a href="filter.html">フィルタ</a></li>
+<li><a href="suexec.html">suEXEC サ�ート</a></li>
+<li><a href="misc/perf-tuning.html">性能�関�るヒント</a></li>
+<li><a href="misc/rewriteguide.html">URL リライトガイド</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="vhosts" id="vhosts">Apache �ー�ャルホストドキュメント</a></h2>
+<ul><li class="separate"><a href="vhosts/">概略</a></li>
+<li><a href="vhosts/name-based.html">��ベース��ー�ャルホスト</a></li>
+<li><a href="vhosts/ip-based.html">IP ベース��ー�ャルホスト�サ�ート</a></li>
+<li><a href="vhosts/mass.html">動的�設定�れ�大�模�ー�ャルホスト</a></li>
+<li><a href="vhosts/examples.html">VirtualHost �例</a></li>
+<li><a href="vhosts/details.html">�ー�ャルホスト�マッ�ング�詳��説明</a></li>
+<li><a href="vhosts/fd-limits.html">ファイル記述���界</a></li>
+<li><a href="dns-caveats.html">DNS � Apache ��関係�る�題</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="faq" id="faq">Apache サー��よ��る質�</a></h2>
+<ul><li><a href="faq/">概略</a></li>
+<li><a href="faq/background.html">�ックグラウンド�情報</a></li>
+<li><a href="faq/support.html">サ�ート</a></li>
+<li><a href="faq/error.html">エラーメッセージ</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="ssl" id="ssl">Apache � SSL/TLS 暗�化</a></h2>
+<ul><li class="separate"><a href="ssl/">概略</a></li>
+<li><a href="ssl/ssl_intro.html">SSL/TLS 暗�化: 入門</a></li>
+<li><a href="ssl/ssl_compat.html">SSL/TLS 暗�化: 互�性</a></li>
+<li><a href="ssl/ssl_howto.html">SSL/TLS 暗�化: �ウツー</a></li>
+<li><a href="ssl/ssl_faq.html">SSL/TLS 暗�化: FAQ</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="howto" id="howto">ガイド��ュートリアル��ウツー</a></h2>
+<ul><li class="separate"><a href="howto/">概略</a></li>
+<li><a href="howto/auth.html">�証</a></li>
+<li><a href="howto/cgi.html">CGI �よる動的コンテンツ</a></li>
+<li><a href="howto/ssi.html">Server Side Includes 入門</a></li>
+<li><a href="howto/htaccess.html">.htaccess ファイル</a></li>
+<li><a href="howto/public_html.html">ユーザ毎�ウェブディレクトリ</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="platform" id="platform">プラットフォーム固有�情報</a></h2>
+<ul><li class="separate"><a href="platform/">概略</a></li>
+<li><a href="platform/windows.html">Microsoft Windows �� Apache �使用</a></li>
+<li><a href="platform/win_compiling.html">Microsoft Windows �� Apache
+�コンパイル</a></li>
+<li><a href="platform/netware.html">Novell NetWare � Apache を使�</a></li>
+<li><a href="platform/perf-hp.html">HPUX �高性能ウェブサー�を実行�る</a></li>
+<li><a href="platform/ebcdic.html">EBCDIC 版 Apache</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="programs" id="programs">Apache HTTP サー��サ�ートプログラム</a></h2>
+<ul><li class="separate"><a href="programs/">概略</a></li>
+<li><a href="programs/httpd.html">マニュアルページ: httpd</a></li>
+<li><a href="programs/ab.html">マニュアルページ: ab</a></li>
+<li><a href="programs/apachectl.html">マニュアルページ: apachectl</a></li>
+<li><a href="programs/apxs.html">マニュアルページ: apxs</a></li>
+<li><a href="programs/configure.html">マニュアルページ: configure</a></li>
+<li><a href="programs/dbmmanage.html">マニュアルページ: dbmmanage</a></li>
+<li><a href="programs/htcacheclean.html">マニュアルページ: htcacheclean</a></li>
+<li><a href="programs/htdbm.html">マニュアルページ: htdbm</a></li>
+<li><a href="programs/htdigest.html">マニュアルページ: htdigest</a></li>
+<li><a href="programs/htpasswd.html">マニュアルページ: htpasswd</a></li>
+<li><a href="programs/logresolve.html">マニュアルページ: logresolve</a></li>
+<li><a href="programs/rotatelogs.html">マニュアルページ: rotatelogs</a></li>
+<li><a href="programs/suexec.html">マニュアルページ: suexec</a></li>
+<li><a href="programs/other.html">他�プログラム</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="misc" id="misc">Apache ��他</a></h2>
+<ul><li class="separate"><a href="misc/">概略</a></li>
+<li><a href="misc/relevant_standards.html">関連�る標準�格</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="modules" id="modules">Apache モジュール</a></h2>
+<ul><li><a href="mod/module-dict.html">Apache ディレクティブ�説明�使�れる用語</a></li>
+<li><a href="mod/directive-dict.html">Apache ディレクティブを説明�使�れる用語</a></li>
+</ul><ul><li><a href="mod/core.html">Apache コア機能</a></li>
+<li><a href="mod/mpm_common.html">Apache MPM 共通ディレクティブ</a></li>
+<li><a href="mod/beos.html">Apache MPM beos</a></li>
+<li><a href="mod/event.html">Apache MPM event</a></li>
+<li><a href="mod/mpm_netware.html">Apache MPM netware</a></li>
+<li><a href="mod/mpmt_os2.html">Apache MPM os2</a></li>
+<li><a href="mod/prefork.html">Apache MPM prefork</a></li>
+<li><a href="mod/mpm_winnt.html">Apache MPM winnt</a></li>
+<li><a href="mod/worker.html">Apache MPM worker</a></li>
+</ul><ul><li><a href="mod/mod_actions.html">Apache モジュール mod_actions</a></li>
+<li><a href="mod/mod_alias.html">Apache モジュール mod_alias</a></li>
+<li><a href="mod/mod_asis.html">Apache モジュール mod_asis</a></li>
+<li><a href="mod/mod_auth_basic.html">Apache モジュール mod_auth_basic</a></li>
+<li><a href="mod/mod_auth_digest.html">Apache モジュール mod_auth_digest</a></li>
+<li><a href="mod/mod_authn_alias.html">Apache モジュール mod_authn_alias</a></li>
+<li><a href="mod/mod_authn_anon.html">Apache モジュール mod_authn_anon</a></li>
+<li><a href="mod/mod_authn_dbd.html">Apache モジュール mod_authn_dbd</a></li>
+<li><a href="mod/mod_authn_dbm.html">Apache モジュール mod_authn_dbm</a></li>
+<li><a href="mod/mod_authn_default.html">Apache モジュール mod_authn_default</a></li>
+<li><a href="mod/mod_authn_file.html">Apache モジュール mod_authn_file</a></li>
+<li><a href="mod/mod_authnz_ldap.html">Apache モジュール mod_authnz_ldap</a></li>
+<li><a href="mod/mod_authz_dbm.html">Apache モジュール mod_authz_dbm</a></li>
+<li><a href="mod/mod_authz_default.html">Apache モジュール mod_authz_default</a></li>
+<li><a href="mod/mod_authz_groupfile.html">Apache モジュール mod_authz_groupfile</a></li>
+<li><a href="mod/mod_authz_host.html">Apache モジュール mod_authz_host</a></li>
+<li><a href="mod/mod_authz_owner.html">Apache モジュール mod_authz_owner</a></li>
+<li><a href="mod/mod_authz_user.html">Apache モジュール mod_authz_user</a></li>
+<li><a href="mod/mod_autoindex.html">Apache モジュール mod_autoindex</a></li>
+<li><a href="mod/mod_cache.html">Apache モジュール mod_cache</a></li>
+<li><a href="mod/mod_cern_meta.html">Apache モジュール mod_cern_meta</a></li>
+<li><a href="mod/mod_cgi.html">Apache モジュール mod_cgi</a></li>
+<li><a href="mod/mod_cgid.html">Apache モジュール mod_cgid</a></li>
+<li><a href="mod/mod_charset_lite.html">Apache モジュール mod_charset_lite</a></li>
+<li><a href="mod/mod_dav.html">Apache モジュール mod_dav</a></li>
+<li><a href="mod/mod_dav_fs.html">Apache モジュール mod_dav_fs</a></li>
+<li><a href="mod/mod_dav_lock.html">Apache モジュール mod_dav_lock</a></li>
+<li><a href="mod/mod_dbd.html">Apache モジュール mod_dbd</a></li>
+<li><a href="mod/mod_deflate.html">Apache モジュール mod_deflate</a></li>
+<li><a href="mod/mod_dir.html">Apache モジュール mod_dir</a></li>
+<li><a href="mod/mod_disk_cache.html">Apache モジュール mod_disk_cache</a></li>
+<li><a href="mod/mod_dumpio.html">Apache モジュール mod_dumpio</a></li>
+<li><a href="mod/mod_echo.html">Apache モジュール mod_echo</a></li>
+<li><a href="mod/mod_env.html">Apache モジュール mod_env</a></li>
+<li><a href="mod/mod_example.html">Apache モジュール mod_example</a></li>
+<li><a href="mod/mod_expires.html">Apache モジュール mod_expires</a></li>
+<li><a href="mod/mod_ext_filter.html">Apache モジュール mod_ext_filter</a></li>
+<li><a href="mod/mod_file_cache.html">Apache モジュール mod_file_cache</a></li>
+<li><a href="mod/mod_filter.html">Apache モジュール mod_filter</a></li>
+<li><a href="mod/mod_headers.html">Apache モジュール mod_headers</a></li>
+<li><a href="mod/mod_ident.html">Apache モジュール mod_ident</a></li>
+<li><a href="mod/mod_imagemap.html">Apache モジュール mod_imagemap</a></li>
+<li><a href="mod/mod_include.html">Apache モジュール mod_include</a></li>
+<li><a href="mod/mod_info.html">Apache モジュール mod_info</a></li>
+<li><a href="mod/mod_isapi.html">Apache モジュール mod_isapi</a></li>
+<li><a href="mod/mod_ldap.html">Apache モジュール mod_ldap</a></li>
+<li><a href="mod/mod_log_config.html">Apache モジュール mod_log_config</a></li>
+<li><a href="mod/mod_log_forensic.html">Apache モジュール mod_log_forensic</a></li>
+<li><a href="mod/mod_logio.html">Apache モジュール mod_logio</a></li>
+<li><a href="mod/mod_mem_cache.html">Apache モジュール mod_mem_cache</a></li>
+<li><a href="mod/mod_mime.html">Apache モジュール mod_mime</a></li>
+<li><a href="mod/mod_mime_magic.html">Apache モジュール mod_mime_magic</a></li>
+<li><a href="mod/mod_negotiation.html">Apache モジュール mod_negotiation</a></li>
+<li><a href="mod/mod_nw_ssl.html">Apache モジュール mod_nw_ssl</a></li>
+<li><a href="mod/mod_proxy.html">Apache モジュール mod_proxy</a></li>
+<li><a href="mod/mod_proxy_ajp.html">Apache モジュール mod_proxy_ajp</a></li>
+<li><a href="mod/mod_proxy_balancer.html">Apache モジュール mod_proxy_balancer</a></li>
+<li><a href="mod/mod_proxy_connect.html">Apache モジュール mod_proxy_connect</a></li>
+<li><a href="mod/mod_proxy_ftp.html">Apache モジュール mod_proxy_ftp</a></li>
+<li><a href="mod/mod_proxy_http.html">Apache モジュール mod_proxy_http</a></li>
+<li><a href="mod/mod_rewrite.html">Apache モジュール mod_rewrite</a></li>
+<li><a href="mod/mod_setenvif.html">Apache モジュール mod_setenvif</a></li>
+<li><a href="mod/mod_so.html">Apache モジュール mod_so</a></li>
+<li><a href="mod/mod_speling.html">Apache モジュール mod_speling</a></li>
+<li><a href="mod/mod_ssl.html">Apache モジュール mod_ssl</a></li>
+<li><a href="mod/mod_status.html">Apache モジュール mod_status</a></li>
+<li><a href="mod/mod_substitute.html">Apache モジュール mod_substitute</a></li>
+<li><a href="mod/mod_suexec.html">Apache モジュール mod_suexec</a></li>
+<li><a href="mod/mod_unique_id.html">Apache モジュール mod_unique_id</a></li>
+<li><a href="mod/mod_userdir.html">Apache モジュール mod_userdir</a></li>
+<li><a href="mod/mod_usertrack.html">Apache モジュール mod_usertrack</a></li>
+<li><a href="mod/mod_version.html">Apache モジュール mod_version</a></li>
+<li><a href="mod/mod_vhost_alias.html">Apache モジュール mod_vhost_alias</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="developer" id="developer">開発者����ドキュメント</a></h2>
+<ul><li class="separate"><a href="developer/">概略</a></li>
+<li><a href="developer/API.html">Apache API メモ</a></li>
+<li><a href="developer/debugging.html">APR
+�メモリアロケーション�デ�ッグ</a></li>
+<li><a href="developer/documenting.html">Apache 2.0 �説明を書�</a></li>
+<li><a href="developer/hooks.html">Apache 2.0 フック関数</a></li>
+<li><a href="developer/modules.html">Apache 1.3 �ら Apache 2.0 �モジュールを
+移��る</a></li>
+<li><a href="developer/request.html">Apache 2.0 �リクエスト処�</a></li>
+<li><a href="developer/filters.html">Apache 2.0 �フィルタ�動作�仕方</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="index" id="index">用語集�索引</a></h2>
+<ul><li><a href="glossary.html">用語集</a></li>
+<li><a href="mod/">モジュール索引</a></li>
+<li><a href="mod/directives.html">ディレクティブ索引</a></li>
+<li><a href="mod/quickreference.html">ディレクティブ クイックリファレンス</a></li>
+</ul>
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./de/sitemap.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/sitemap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/sitemap.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./ja/sitemap.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sitemap.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/sitemap.html.ko.euc-kr b/docs/manual/sitemap.html.ko.euc-kr
index 24d23cb2..2c4d8621 100644
--- a/docs/manual/sitemap.html.ko.euc-kr
+++ b/docs/manual/sitemap.html.ko.euc-kr
@@ -24,7 +24,8 @@
 <a href="./en/sitemap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/sitemap.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="./ja/sitemap.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sitemap.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/sitemap.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sitemap.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
             ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
@@ -261,8 +262,9 @@
 <a href="./en/sitemap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./es/sitemap.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="./ja/sitemap.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/sitemap.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/sitemap.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sitemap.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/sitemap.html.tr.utf8 b/docs/manual/sitemap.html.tr.utf8
new file mode 100644
index 00000000..c0f538b7
--- /dev/null
+++ b/docs/manual/sitemap.html.tr.utf8
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Site Haritası - Apache HTTP Sunucusu</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page">
+<div id="page-header">
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="./">Sürüm 2.2</a></div>
+<div id="page-content"><div id="preamble"><h1>Site Haritası</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="./de/sitemap.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/sitemap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/sitemap.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./ja/sitemap.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sitemap.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+<p>Bu sayfada <a href="./">Apache HTTP Sunucusu Sürüm 2.2
+Belgeleri</a>nin tamamı listelenmiştir.</p>
+</div>
+<div id="quickview"><ul id="toc">
+<li><img alt="" src="./images/down.gif" /> <a href="#release">Sürümlerin Dağıtım Bilgileri</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#using">Apache HTTP Sunucusunun Kullanımı</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#vhosts">Apache Sanal Konak (VirtualHost) Belgeleri</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#faq">Apache Sunucusu ile ilgili Sıkça Sorulan Sorular</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#ssl">Apache SSL/TLS Åžifrelemesi</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#howto">Kılavuzlar, Öğreticiler ve Nasıllar</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#platform">Platformlara Özgü Bilgiler</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#programs">Apache HTTP Sunucusu  ve Desteklenen Programlar</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#misc">Çeşitli Belgeler</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#modules">Apache Modülleri</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#developer">GeliÅŸtirici Belgeleri</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#index">Terimler ve Dizin</a></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="release" id="release">Sürümlerin Dağıtım Bilgileri</a></h2>
+<ul><li><a href="upgrading.html">2.2’ye 2.0’dan yükseltme</a></li>
+<li><a href="new_features_2_2.html">Apache 2.1/2.2’deki yeni özellikler</a></li>
+<li><a href="new_features_2_0.html">Apache 2.0’daki yeni özellikler</a></li>
+<li><a href="license.html">Apache Lisansı</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="using" id="using">Apache HTTP Sunucusunun Kullanımı</a></h2>
+<ul><li><a href="install.html">Derleme ve Kurulum</a></li>
+<li><a href="invoking.html">Sunucuyu BaÅŸlatma</a></li>
+<li><a href="stopping.html">Sunucuyu Durdurma ve Yeniden BaÅŸlatma</a></li>
+<li><a href="configuring.html">Yapılandırma Dosyaları</a></li>
+<li><a href="sections.html">Directory, Location ve Files Bölümleri Nasıl Çalışır</a></li>
+<li><a href="caching.html">İçerik Bellekleme</a></li>
+<li><a href="server-wide.html">Sunucu Genelinde Yapılandırma</a></li>
+<li><a href="logs.html">Günlük Dosyaları</a></li>
+<li><a href="urlmapping.html">URL’lerin Dosya Sistemi ile Eşlenmesi</a></li>
+<li><a href="misc/security_tips.html">Güvenlik İpuçları</a></li>
+<li><a href="dso.html">Devingen Paylaşımlı Nesne (DSO) Desteği</a></li>
+<li><a href="content-negotiation.html">İçerik Dili Yönetimi</a></li>
+<li><a href="custom-error.html">Özel Hata Yanıtları</a></li>
+<li><a href="bind.html">Sunucunun Kullandığı Adreslerin ve Portların Ayarlanması</a></li>
+<li><a href="mpm.html">Çok Süreçlilik Modülleri (MPM’ler)</a></li>
+<li><a href="env.html">Ortam DeÄŸiÅŸkenleri</a></li>
+<li><a href="handler.html">Eylemci Kullanımı</a></li>
+<li><a href="filter.html">Süzgeçler</a></li>
+<li><a href="suexec.html">CGI için Suexec Desteği</a></li>
+<li><a href="misc/perf-tuning.html">Başarım Arttırma İpuçları</a></li>
+<li><a href="misc/rewriteguide.html">URL Yeniden Yazma Rehberi</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="vhosts" id="vhosts">Apache Sanal Konak (VirtualHost) Belgeleri</a></h2>
+<ul><li class="separate"><a href="vhosts/">Genel Bakış</a></li>
+<li><a href="vhosts/name-based.html">İsme göre Sanal Konak Desteği</a></li>
+<li><a href="vhosts/ip-based.html">IP Adresine göre Sanal Konak Desteği</a></li>
+<li><a href="vhosts/mass.html">Sanal Konakların Devingen olarak Yapılandırılması</a></li>
+<li><a href="vhosts/examples.html">VirtualHost Örnekleri</a></li>
+<li><a href="vhosts/details.html">Sanal Konak EÅŸleÅŸtirmesinin DerinliÄŸine Ä°ncelenmesi</a></li>
+<li><a href="vhosts/fd-limits.html">Dosya Tanıtıcı Sınırlamaları</a></li>
+<li><a href="dns-caveats.html">DNS ve Apache ile ilgili Konular</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="faq" id="faq">Apache Sunucusu ile ilgili Sıkça Sorulan Sorular</a></h2>
+<ul><li><a href="faq/">Genel Bakış</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="ssl" id="ssl">Apache SSL/TLS Åžifrelemesi</a></h2>
+<ul><li class="separate"><a href="ssl/">Genel Bakış</a></li>
+<li><a href="ssl/ssl_intro.html">SSL/TLS Åžifrelemesi: GiriÅŸ</a></li>
+<li><a href="ssl/ssl_compat.html">SSL/TLS Åžifrelemesi: Uyumluluk</a></li>
+<li><a href="ssl/ssl_howto.html">SSL/TLS Şifrelemesi: Nasıl</a></li>
+<li><a href="ssl/ssl_faq.html">SSL/TLS Åžifrelemesi: SSS</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="howto" id="howto">Kılavuzlar, Öğreticiler ve Nasıllar</a></h2>
+<ul><li class="separate"><a href="howto/">Genel Bakış</a></li>
+<li><a href="howto/auth.html">Kimlik DoÄŸrulama</a></li>
+<li><a href="howto/cgi.html">CGI ile Devingen İçerik</a></li>
+<li><a href="howto/ssi.html">Sunucu Taraflı İçerik Yerleştirme (SSI)</a></li>
+<li><a href="howto/htaccess.html">.htaccess Dosyaları</a></li>
+<li><a href="howto/public_html.html">Kullanıcı Dizinleri (public_html)</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="platform" id="platform">Platformlara Özgü Bilgiler</a></h2>
+<ul><li class="separate"><a href="platform/">Genel Bakış</a></li>
+<li><a href="platform/windows.html">Microsoft
+Windows ile Apache Kullanımı</a></li>
+<li><a href="platform/win_compiling.html">Microsoft Windows için Apache Derleme</a></li>
+<li><a href="platform/netware.html">Novell NetWare ile Apache Kullanımı</a></li>
+<li><a href="platform/perf-hp.html">HPUX üzerinde Yüksek Başarımlı HTTP Sunucusu Çalıştırma</a></li>
+<li><a href="platform/ebcdic.html">Apache EBCDIC Portu</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="programs" id="programs">Apache HTTP Sunucusu  ve Desteklenen Programlar</a></h2>
+<ul><li class="separate"><a href="programs/">Genel Bakış</a></li>
+<li><a href="programs/httpd.html">Kılavuz Sayfası: httpd</a></li>
+<li><a href="programs/ab.html">Kılavuz Sayfası: ab</a></li>
+<li><a href="programs/apachectl.html">Kılavuz Sayfası: apachectl</a></li>
+<li><a href="programs/apxs.html">Kılavuz Sayfası: apxs</a></li>
+<li><a href="programs/configure.html">Kılavuz Sayfası: configure</a></li>
+<li><a href="programs/dbmmanage.html">Kılavuz Sayfası: dbmmanage</a></li>
+<li><a href="programs/htcacheclean.html">Kılavuz Sayfası: htcacheclean</a></li>
+<li><a href="programs/htdbm.html">Kılavuz Sayfası: htdbm</a></li>
+<li><a href="programs/htdigest.html">Kılavuz Sayfası: htdigest</a></li>
+<li><a href="programs/htpasswd.html">Kılavuz Sayfası: htpasswd</a></li>
+<li><a href="programs/logresolve.html">Kılavuz Sayfası: logresolve</a></li>
+<li><a href="programs/rotatelogs.html">Kılavuz Sayfası: rotatelogs</a></li>
+<li><a href="programs/suexec.html">Kılavuz Sayfası: suexec</a></li>
+<li><a href="programs/other.html">DiÄŸer Programlar</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="misc" id="misc">Çeşitli Belgeler</a></h2>
+<ul><li class="separate"><a href="misc/">Genel Bakış</a></li>
+<li><a href="misc/relevant_standards.html">Ä°lgili Standartlar</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="modules" id="modules">Apache Modülleri</a></h2>
+<ul><li><a href="mod/module-dict.html">Apache modüllerini tanımlamakta kullanılan terimlerin açıklamaları</a></li>
+<li><a href="mod/directive-dict.html">Apache yönergelerini tanımlamakta kullanılan terimlerin açıklamaları</a></li>
+</ul><ul><li><a href="mod/core.html">Apache Temel Özellikleri</a></li>
+<li><a href="mod/mpm_common.html">Apache MPM Ortak Yönergeleri</a></li>
+<li><a href="mod/beos.html">Apache MPM beos</a></li>
+<li><a href="mod/event.html">Apache MPM event</a></li>
+<li><a href="mod/mpm_netware.html">Apache MPM netware</a></li>
+<li><a href="mod/mpmt_os2.html">Apache MPM os2</a></li>
+<li><a href="mod/prefork.html">Apache MPM prefork</a></li>
+<li><a href="mod/mpm_winnt.html">Apache MPM winnt</a></li>
+<li><a href="mod/worker.html">Apache MPM worker</a></li>
+</ul><ul><li><a href="mod/mod_actions.html">Apache Modülü mod_actions</a></li>
+<li><a href="mod/mod_alias.html">Apache Modülü mod_alias</a></li>
+<li><a href="mod/mod_asis.html">Apache Modülü mod_asis</a></li>
+<li><a href="mod/mod_auth_basic.html">Apache Modülü mod_auth_basic</a></li>
+<li><a href="mod/mod_auth_digest.html">Apache Modülü mod_auth_digest</a></li>
+<li><a href="mod/mod_authn_alias.html">Apache Modülü mod_authn_alias</a></li>
+<li><a href="mod/mod_authn_anon.html">Apache Modülü mod_authn_anon</a></li>
+<li><a href="mod/mod_authn_dbd.html">Apache Modülü mod_authn_dbd</a></li>
+<li><a href="mod/mod_authn_dbm.html">Apache Modülü mod_authn_dbm</a></li>
+<li><a href="mod/mod_authn_default.html">Apache Modülü mod_authn_default</a></li>
+<li><a href="mod/mod_authn_file.html">Apache Modülü mod_authn_file</a></li>
+<li><a href="mod/mod_authnz_ldap.html">Apache Modülü mod_authnz_ldap</a></li>
+<li><a href="mod/mod_authz_dbm.html">Apache Modülü mod_authz_dbm</a></li>
+<li><a href="mod/mod_authz_default.html">Apache Modülü mod_authz_default</a></li>
+<li><a href="mod/mod_authz_groupfile.html">Apache Modülü mod_authz_groupfile</a></li>
+<li><a href="mod/mod_authz_host.html">Apache Modülü mod_authz_host</a></li>
+<li><a href="mod/mod_authz_owner.html">Apache Modülü mod_authz_owner</a></li>
+<li><a href="mod/mod_authz_user.html">Apache Modülü mod_authz_user</a></li>
+<li><a href="mod/mod_autoindex.html">Apache Modülü mod_autoindex</a></li>
+<li><a href="mod/mod_cache.html">Apache Modülü mod_cache</a></li>
+<li><a href="mod/mod_cern_meta.html">Apache Modülü mod_cern_meta</a></li>
+<li><a href="mod/mod_cgi.html">Apache Modülü mod_cgi</a></li>
+<li><a href="mod/mod_cgid.html">Apache Modülü mod_cgid</a></li>
+<li><a href="mod/mod_charset_lite.html">Apache Modülü mod_charset_lite</a></li>
+<li><a href="mod/mod_dav.html">Apache Modülü mod_dav</a></li>
+<li><a href="mod/mod_dav_fs.html">Apache Modülü mod_dav_fs</a></li>
+<li><a href="mod/mod_dav_lock.html">Apache Modülü mod_dav_lock</a></li>
+<li><a href="mod/mod_dbd.html">Apache Modülü mod_dbd</a></li>
+<li><a href="mod/mod_deflate.html">Apache Modülü mod_deflate</a></li>
+<li><a href="mod/mod_dir.html">Apache Modülü mod_dir</a></li>
+<li><a href="mod/mod_disk_cache.html">Apache Modülü mod_disk_cache</a></li>
+<li><a href="mod/mod_dumpio.html">Apache Modülü mod_dumpio</a></li>
+<li><a href="mod/mod_echo.html">Apache Modülü mod_echo</a></li>
+<li><a href="mod/mod_env.html">Apache Modülü mod_env</a></li>
+<li><a href="mod/mod_example.html">Apache Modülü mod_example</a></li>
+<li><a href="mod/mod_expires.html">Apache Modülü mod_expires</a></li>
+<li><a href="mod/mod_ext_filter.html">Apache Modülü mod_ext_filter</a></li>
+<li><a href="mod/mod_file_cache.html">Apache Modülü mod_file_cache</a></li>
+<li><a href="mod/mod_filter.html">Apache Modülü mod_filter</a></li>
+<li><a href="mod/mod_headers.html">Apache Modülü mod_headers</a></li>
+<li><a href="mod/mod_ident.html">Apache Modülü mod_ident</a></li>
+<li><a href="mod/mod_imagemap.html">Apache Modülü mod_imagemap</a></li>
+<li><a href="mod/mod_include.html">Apache Modülü mod_include</a></li>
+<li><a href="mod/mod_info.html">Apache Modülü mod_info</a></li>
+<li><a href="mod/mod_isapi.html">Apache Modülü mod_isapi</a></li>
+<li><a href="mod/mod_ldap.html">Apache Modülü mod_ldap</a></li>
+<li><a href="mod/mod_log_config.html">Apache Modülü mod_log_config</a></li>
+<li><a href="mod/mod_log_forensic.html">Apache Modülü mod_log_forensic</a></li>
+<li><a href="mod/mod_logio.html">Apache Modülü mod_logio</a></li>
+<li><a href="mod/mod_mem_cache.html">Apache Modülü mod_mem_cache</a></li>
+<li><a href="mod/mod_mime.html">Apache Modülü mod_mime</a></li>
+<li><a href="mod/mod_mime_magic.html">Apache Modülü mod_mime_magic</a></li>
+<li><a href="mod/mod_negotiation.html">Apache Modülü mod_negotiation</a></li>
+<li><a href="mod/mod_nw_ssl.html">Apache Modülü mod_nw_ssl</a></li>
+<li><a href="mod/mod_proxy.html">Apache Modülü mod_proxy</a></li>
+<li><a href="mod/mod_proxy_ajp.html">Apache Modülü mod_proxy_ajp</a></li>
+<li><a href="mod/mod_proxy_balancer.html">Apache Modülü mod_proxy_balancer</a></li>
+<li><a href="mod/mod_proxy_connect.html">Apache Modülü mod_proxy_connect</a></li>
+<li><a href="mod/mod_proxy_ftp.html">Apache Modülü mod_proxy_ftp</a></li>
+<li><a href="mod/mod_proxy_http.html">Apache Modülü mod_proxy_http</a></li>
+<li><a href="mod/mod_rewrite.html">Apache Modülü mod_rewrite</a></li>
+<li><a href="mod/mod_setenvif.html">Apache Modülü mod_setenvif</a></li>
+<li><a href="mod/mod_so.html">Apache Modülü mod_so</a></li>
+<li><a href="mod/mod_speling.html">Apache Modülü mod_speling</a></li>
+<li><a href="mod/mod_ssl.html">Apache Modülü mod_ssl</a></li>
+<li><a href="mod/mod_status.html">Apache Modülü mod_status</a></li>
+<li><a href="mod/mod_substitute.html">Apache Modülü mod_substitute</a></li>
+<li><a href="mod/mod_suexec.html">Apache Modülü mod_suexec</a></li>
+<li><a href="mod/mod_unique_id.html">Apache Modülü mod_unique_id</a></li>
+<li><a href="mod/mod_userdir.html">Apache Modülü mod_userdir</a></li>
+<li><a href="mod/mod_usertrack.html">Apache Modülü mod_usertrack</a></li>
+<li><a href="mod/mod_version.html">Apache Modülü mod_version</a></li>
+<li><a href="mod/mod_vhost_alias.html">Apache Modülü mod_vhost_alias</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="developer" id="developer">GeliÅŸtirici Belgeleri</a></h2>
+<ul><li class="separate"><a href="developer/">Genel Bakış</a></li>
+<li><a href="developer/API.html">Apache API Bilgileri</a></li>
+<li><a href="developer/debugging.html">APR’de Bellek Ayırmada Hata Ayıklama</a></li>
+<li><a href="developer/documenting.html">Apache 2.0 Belgeleri</a></li>
+<li><a href="developer/hooks.html">Apache 2.0 Kullanıcı İşlevleri</a></li>
+<li><a href="developer/modules.html">Modüllerin Apache 1.3’ten Apache 2.0’a Dönüştürülmesi</a></li>
+<li><a href="developer/request.html">Apache 2.0’da İsteklerin İşlenmesi</a></li>
+<li><a href="developer/filters.html">Apache 2.0’da Süzgeçler Nasıl Çalışır</a></li>
+</ul>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section"><h2><a name="index" id="index">Terimler ve Dizin</a></h2>
+<ul><li><a href="glossary.html">Terimler</a></li>
+<li><a href="mod/">Modül Dizini</a></li>
+<li><a href="mod/directives.html">Yönerge Dizini</a></li>
+<li><a href="mod/quickreference.html">Hızlı Yönerge Kılavuzu</a></li>
+</ul>
+</div></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="./de/sitemap.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/sitemap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/sitemap.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./ja/sitemap.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/sitemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/sitemap.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/ssl/index.html b/docs/manual/ssl/index.html
index 39629cac..6f573395 100644
--- a/docs/manual/ssl/index.html
+++ b/docs/manual/ssl/index.html
@@ -1,7 +1,9 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: index.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: index.html.ja.euc-jp
+URI: index.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/ssl/index.html.en b/docs/manual/ssl/index.html.en
index 6a0b4021..9e4c9e4b 100644
--- a/docs/manual/ssl/index.html.en
+++ b/docs/manual/ssl/index.html.en
@@ -52,6 +52,6 @@ provided by this module is provided in the <a href="../mod/mod_ssl.html">mod_ssl
 <p><span>Available Languages: </span><a href="../en/ssl/" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/ssl/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/ssl/index.html.ja.euc-jp b/docs/manual/ssl/index.html.ja.utf8
index 279f0c19..fb9265b3 100644
--- a/docs/manual/ssl/index.html.ja.euc-jp
+++ b/docs/manual/ssl/index.html.ja.utf8
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="EUC-JP"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
               This file is generated from xml source: DO NOT EDIT
         XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       -->
-<title>Apache ¤Î SSL/TLS °Å¹æ²½ - Apache HTTP ¥µ¡¼¥Ð</title>
+<title>Apache � SSL/TLS 暗�化 - Apache HTTP サー�</title>
 <link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
 <link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
 <link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
 <link href="../images/favicon.ico" rel="shortcut icon" /></head>
 <body id="manual-page"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
 <img alt="" src="../images/feather.gif" /></div>
 <div class="up"><a href="../"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
 <div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache ¤Î SSL/TLS °Å¹æ²½</h1>
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache � SSL/TLS 暗�化</h1>
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../en/ssl/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/ssl/" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div>
 
-<p>Apache HTTP ¥µ¡¼¥Ð¥â¥¸¥å¡¼¥ë <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> ¤¬
+<p>Apache HTTP サー�モジュール <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> �
 <a href="http://www.openssl.org/">OpenSSL</a>
-¥é¥¤¥Ö¥é¥ê¤Ø¤Î¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¤¬¡¢¤³¤ì¤Ï
-Secure Sockts Layer ¤È Transport Layer Security
-¥×¥í¥È¥³¥ë¤òÍѤ¤¤¿¶¯ÎϤʰŹ沽¤òÄ󶡤·¤Þ¤¹¡£
-¤³¤Î¥â¥¸¥å¡¼¥ë¤ä¤³¤Îʸ½ñ¤Ï Ralf S. Engelschall ¤Î mod_ssl
-¥×¥í¥¸¥§¥¯¥È¤Ë´ð¤Å¤¤¤Æ¤¤¤Þ¤¹¡£</p>
+ライブラリ��インターフェースを�供��������れ�
+Secure Sockts Layer � Transport Layer Security
+プロトコルを用��強力�暗�化を�供���。
+��モジュールや��文書� Ralf S. Engelschall � mod_ssl
+プロジェクト�基������。</p>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#documentation">Documentation</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#mod-ssl">mod_ssl</a></li>
@@ -37,23 +37,23 @@ Secure Sockts Layer ¤È Transport Layer Security
 <div class="section">
 <h2><a name="documentation" id="documentation">Documentation</a></h2>
 <ul>
-<li><a href="ssl_intro.html">¤Ï¤¸¤á¤Ë</a></li>
-<li><a href="ssl_compat.html">¸ß´¹À­</a></li>
+<li><a href="ssl_intro.html">����</a></li>
+<li><a href="ssl_compat.html">互�性</a></li>
 <li><a href="ssl_howto.html">How-To</a></li>
-<li><a href="ssl_faq.html">¤è¤¯¤¢¤ë¼ÁÌä</a></li>
-<li><a href="../glossary.html">ÍѸì</a></li>
+<li><a href="ssl_faq.html">よ��る質�</a></li>
+<li><a href="../glossary.html">用語</a></li>
 </ul>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="mod-ssl" id="mod-ssl">mod_ssl</a></h2>
-<p>¤³¤Î¥â¥¸¥å¡¼¥ë¤ÇÄ󶡤µ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ä´Ä¶­ÊÑ¿ô¤Ë´Ø¤¹¤ë
-¾Ü¤·¤¤Ê¸½ñ¤Ï¡¢<a href="../mod/mod_ssl.html">mod_ssl
-¥ê¥Õ¥¡¥ì¥ó¥¹</a>¤ò¤´Í÷²¼¤µ¤¤¡£</p>
+<p>��モジュール��供�れるディレクティブや環境変数�関�る
+詳��文書��<a href="../mod/mod_ssl.html">mod_ssl
+リファレンス</a>を�覧下��。</p>
 </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/ssl/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/ssl/" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/ssl/ssl_compat.html b/docs/manual/ssl/ssl_compat.html
index 3a8ed1be..eb43a0be 100644
--- a/docs/manual/ssl/ssl_compat.html
+++ b/docs/manual/ssl/ssl_compat.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: ssl_compat.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/ssl/ssl_compat.html.en b/docs/manual/ssl/ssl_compat.html.en
index 817a63b7..1e727fc1 100644
--- a/docs/manual/ssl/ssl_compat.html.en
+++ b/docs/manual/ssl/ssl_compat.html.en
@@ -221,6 +221,6 @@ are listed in <a href="#table3">Table 3</a>.</p>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/ssl/ssl_compat.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/ssl/ssl_faq.html b/docs/manual/ssl/ssl_faq.html
index c6d2ea13..ce1cf81d 100644
--- a/docs/manual/ssl/ssl_faq.html
+++ b/docs/manual/ssl/ssl_faq.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: ssl_faq.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/ssl/ssl_faq.html.en b/docs/manual/ssl/ssl_faq.html.en
index 0ea9dfab..32ceefd2 100644
--- a/docs/manual/ssl/ssl_faq.html.en
+++ b/docs/manual/ssl/ssl_faq.html.en
@@ -49,7 +49,6 @@ author.</p>
 <h2><a name="about" id="about">About The Module</a></h2>
 <ul>
 <li><a href="#history">What is the history of mod_ssl?</a></li>
-<li><a href="#y2k">mod_ssl and Year 2000?</a></li>
 <li><a href="#wassenaar">mod_ssl and Wassenaar Arrangement?</a></li>
 </ul>
 
@@ -104,7 +103,7 @@ author.</p>
 <li><a href="#mutex">Why do I get permission errors related to 
 SSLMutex when I start Apache?</a></li>
 <li><a href="#entropy">Why does mod_ssl stop with the error "Failed to 
-generate temporary 512 bit RSA private key", when I start Apache?</a></li>
+generate temporary 512 bit RSA private key" when I start Apache?</a></li>
 </ul>
 
 <h3><a name="mutex" id="mutex">Why do I get permission errors related to 
@@ -120,7 +119,7 @@ generate temporary 512 bit RSA private key", when I start Apache?</a></li>
 
 
 <h3><a name="entropy" id="entropy">Why does mod_ssl stop with the error
-	"Failed to generate temporary 512 bit RSA private key", when I start 
+	"Failed to generate temporary 512 bit RSA private key" when I start 
 	Apache?</a></h3>
     <p>Cryptographic software needs a source of unpredictable data
     to work correctly. Many open source operating systems provide
@@ -134,7 +133,7 @@ generate temporary 512 bit RSA private key", when I start Apache?</a></li>
     <p>To prevent this error, <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> has to provide 
     enough entropy to the PRNG to allow it to work correctly. This can 
     be done via the <code class="directive"><a href="../mod/mod_ssl.html#sslrandomseed">SSLRandomSeed</a></code> 
-    directives.</p>
+    directive.</p>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -146,7 +145,7 @@ the same server?</a></li>
 <li><a href="#httpstest">How do I speak HTTPS manually for testing 
 purposes?</a></li>
 <li><a href="#hang">Why does the connection hang when I connect to my 
-SSL-aware Apache server</a></li>
+SSL-aware Apache server?</a></li>
 <li><a href="#refused">Why do I get ``Connection Refused'' errors, when 
 trying to access my newly installed Apache+mod_ssl server via HTTPS?</a></li>
 <li><a href="#envvars">Why are the <code>SSL_XXX</code> variables not
@@ -161,16 +160,17 @@ relative hyperlinks?</a></li>
     port 80, HTTPS to port 443), so there is no direct conflict between 
     them. You can either run two separate server instances bound to 
     these ports, or use Apache's elegant virtual hosting facility to 
-    create two virtual servers over one instance of Apache - one 
-    responding to requests on port 80 and speaking HTTP and the other 
-    responding to requests on port 443 speaking HTTPS.</p>
+    create two virtual servers, both served by the same instance of Apache 
+    - one responding over HTTP to requests on port 80, and the other 
+    responding over HTTPS to requests on port 443.</p>
 
 
 <h3><a name="ports" id="ports">Which port does HTTPS use?</a></h3>
 <p>You can run HTTPS on any port, but the standards specify port 443, which
     is where any HTTPS compliant browser will look by default. You can force
-    your browser to look on a different port by specifying it in the URL like
-    this (for port 666): <code>https://secure.server.dom:666/</code></p>
+    your browser to look on a different port by specifying it in the URL. For
+    example, if your server is set up to serve pages over HTTPS on port 8080,
+    you can access them at <code>https://example.com:8080/</code></p>
 
 
 <h3><a name="httpstest" id="httpstest">How do I speak HTTPS manually for testing purposes?</a></h3>
@@ -182,41 +182,39 @@ relative hyperlinks?</a></li>
     <p>for simple testing of Apache via HTTP, it's not so easy for
     HTTPS because of the SSL protocol between TCP and HTTP. With the
     help of OpenSSL's <code>s_client</code> command, however, you can 
-    do a similar check for HTTPS:</p>
+    do a similar check via HTTPS:</p>
     
     <div class="example"><p><code>$ openssl s_client -connect localhost:443 -state -debug<br />
     GET / HTTP/1.0</code></p></div>
-    
-    <p>Before the actual HTTP response you will receive detailed 
-    information about the SSL handshake. For a more general command 
-    line client which directly understands both HTTP and HTTPS, can 
-    perform GET and POST operations, can use a proxy, supports byte 
-    ranges, etc. you should have a look at the nifty 
-    <a href="http://curl.haxx.se/">cURL</a> tool. Using this, you can 
-    check that Apache is responding correctly on ports 80 and 443 as 
-    follows:</p>
-    
+
+    <p>Before the actual HTTP response you will receive detailed
+    information about the SSL handshake. For a more general command
+    line client which directly understands both HTTP and HTTPS, can
+    perform GET and POST operations, can use a proxy, supports byte
+    ranges, etc. you should have a look at the nifty
+    <a href="http://curl.haxx.se/">cURL</a> tool. Using this, you can
+    check that Apache is responding correctly to requests via HTTP and
+    HTTPS as follows:</p>
+
     <div class="example"><p><code>$ curl http://localhost/<br />
     $ curl https://localhost/</code></p></div>
 
 
 <h3><a name="hang" id="hang">Why does the connection hang when I connect 
     to my SSL-aware Apache server?</a></h3>
-<p>Because you connected with HTTP to the HTTPS port, i.e. you used an URL of
-    the form ``<code>http://</code>'' instead of ``<code>https://</code>''.
-    This also happens the other way round when you connect via HTTPS to a HTTP
-    port, i.e. when you try to use ``<code>https://</code>'' on a server that
-    doesn't support SSL (on this port). Make sure you are connecting to a
-    virtual server that supports SSL, which is probably the IP associated with
-    your hostname, not localhost (127.0.0.1).</p>
 
+<p>This can happen when you try to connect to a HTTPS server (or virtual
+    server) via HTTP (eg, using <code>http://example.com/</code> instead of
+    <code>https://example.com</code>). It can also happen when trying to
+    connect via HTTPS to a HTTP server (eg, using
+    <code>https://example.com/</code> on a server which doesn't support HTTPS,
+    or which supports it on a non-standard port). Make sure that you're
+    connecting to a (virtual) server that supports SSL.</p>
 
 <h3><a name="refused" id="refused">Why do I get ``Connection Refused'' messages, 
     when trying to access my newly installed Apache+mod_ssl server via HTTPS?</a></h3>
-<p>This can happen for various reasons. The most common mistakes 
-    include starting Apache with just <code>apachectl start</code> (or
-    <code class="program"><a href="../programs/httpd.html">httpd</a></code>) instead of <code>apachectl startssl</code> (or
-    <code>httpd -DSSL</code>). Your configuration may also be incorrect. 
+<p>
+    This error can be caused by an incorrect configuration.
     Please make sure that your <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code> directives match your 
     <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
     directives. If all else fails, please start afresh, using the default 
@@ -244,7 +242,7 @@ relative hyperlinks?</a></li>
 
     <p>This rewrite ruleset lets you use hyperlinks of the form
     <code>&lt;a href="document.html:SSL"&gt;</code>, to switch to HTTPS
-    in a relative link.</p>
+    in a relative link. (Replace SSL with NOSSL to switch to HTTP.)</p>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
@@ -253,7 +251,7 @@ relative hyperlinks?</a></li>
 <li><a href="#keyscerts">What are RSA Private Keys, CSRs and 
 Certificates?</a></li>
 <li><a href="#startup">Is there a difference on startup between
-the original Apache and an SSL-aware Apache?</a></li>
+a non-SSL-aware Apache and an SSL-aware Apache?</a></li>
 <li><a href="#selfcert">How do I create a self-signed SSL 
 Certificate for testing purposes?</a></li>
 <li><a href="#realcert">How do I create a real SSL Certificate?</a></li>
@@ -299,7 +297,7 @@ verify my Verisign Global ID server certificate?</a></li>
 
 
 <h3><a name="startup" id="startup">Is there a difference on startup between 
-    the original Apache and an SSL-aware Apache?</a></h3>
+    a non-SSL-aware Apache and an SSL-aware Apache?</a></h3>
 <p>Yes. In general, starting Apache with 
     <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> built-in is just like starting Apache 
     without it. However, if you have a passphrase on your SSL private 
@@ -310,7 +308,8 @@ verify my Verisign Global ID server certificate?</a></li>
     can be problematic - for example, when starting the server from the 
     system boot scripts. In this case, you can follow the steps
     <a href="#removepassphrase">below</a> to remove the passphrase from
-    your private key.</p>
+    your private key. Bear in mind that doing so brings additional security
+    risks - proceed with caution!</p>
 
 
 <h3><a name="selfcert" id="selfcert">How do I create a self-signed SSL 
@@ -505,7 +504,7 @@ Certificate for testing purposes?</a></h3>
 <h3><a name="removepassphrase" id="removepassphrase">How can I get rid of the pass-phrase dialog at Apache startup time?</a></h3>
 <p>The reason this dialog pops up at startup and every re-start
     is that the RSA private key inside your server.key file is stored in
-    encrypted format for security reasons. The pass-phrase is needed decrypt
+    encrypted format for security reasons. The pass-phrase is needed to decrypt
     this file, so it can be read and parsed. Removing the pass-phrase 
     removes a layer of security from your server - proceed with caution!</p>
     <ol>
@@ -572,7 +571,7 @@ Certificate for testing purposes?</a></h3>
 bad certificate" error?</a></h3>
 <p>Errors such as <code>OpenSSL: error:14094412: SSL
     routines:SSL3_READ_BYTES:sslv3 alert bad certificate</code> in the SSL
-    logfile, are usually caused a browser which is unable to handle the server
+    logfile, are usually caused by a browser which is unable to handle the server
     certificate/private-key. For example, Netscape Navigator 3.x is 
     unable to handle RSA key lengths not equal to 1024 bits.</p>
 
@@ -615,7 +614,7 @@ Verisign, for installing my Verisign certificate?</a></h3>
     certificate to a file, and give the name of that file to the 
     <code class="directive"><a href="../mod/mod_ssl.html#sslcertificatefile">SSLCertificateFile</a></code> directive.
     You will also need to give it the key file. For more information, 
-    see the <code class="directive"><a href="../mod/mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile</a></code> 
+    see the <code class="directive"><a href="../mod/mod_ssl.html#sslcertificatekeyfile">SSLCertificateKeyFile</a></code>
     directive.</p> 
 
 
@@ -983,8 +982,8 @@ provide when writing a bug report?</a></h3>
     <dt>In case of core dumps please include a Backtrace</dt>
     <dd>If your Apache+mod_ssl+OpenSSL dumps its core, please attach
     a stack-frame ``backtrace'' (see <a href="#backtrace">below</a> 
-    for information on how to get this). Without this information, the 
-    reason for your core dump cannot be found
+    for information on how to get this). This information is required
+    in order to find a reason for your core dump.
     </dd>
     
     <dt>A detailed description of your problem</dt>
@@ -1039,6 +1038,6 @@ the reason for my core dump?</a></h3>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/ssl/ssl_faq.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/ssl/ssl_howto.html b/docs/manual/ssl/ssl_howto.html
index ca42f094..9f06e018 100644
--- a/docs/manual/ssl/ssl_howto.html
+++ b/docs/manual/ssl/ssl_howto.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: ssl_howto.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/ssl/ssl_howto.html.en b/docs/manual/ssl/ssl_howto.html.en
index 4cc911de..2a38982f 100644
--- a/docs/manual/ssl/ssl_howto.html.en
+++ b/docs/manual/ssl/ssl_howto.html.en
@@ -202,9 +202,13 @@ AuthName             "Snake Oil Authentication"
 AuthType             Basic
 AuthBasicProvider    file
 AuthUserFile         /usr/local/apache2/conf/httpd.passwd
-require              valid-user
+Require              valid-user
 &lt;/Directory&gt;</pre></div>
-
+    
+    <p>The password used in this example is the DES encrypted string "password".
+    See the <code class="directive"><a href="../mod/mod_ssl.html#ssloptions">SSLOptions</a></code> docs for more 
+    information.</p>
+    
     <div class="example"><h3>httpd.passwd</h3><pre>
 /C=DE/L=Munich/O=Snake Oil, Ltd./OU=Staff/CN=Foo:xxj31ZMTZzkVA
 /C=US/L=S.F./O=Snake Oil, Ltd./OU=CA/CN=Bar:xxj31ZMTZzkVA
@@ -236,7 +240,7 @@ plain HTTP access for clients on the Intranet.</a></h3>
 
    
    <p>These examples presume that clients on the Intranet have IPs in the range 
-   192.160.1.0/24, and that the part of the Intranet website you want to allow
+   192.168.1.0/24, and that the part of the Intranet website you want to allow
    internet access to is <code>/usr/local/apache2/htdocs/subarea</code>. 
    This configuration should remain outside of your HTTPS virtual host, so
    that it applies to both HTTPS and HTTP.</p>
@@ -289,6 +293,6 @@ Require              valid-user
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/ssl/ssl_howto.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/ssl/ssl_intro.html b/docs/manual/ssl/ssl_intro.html
index 263c0f21..0163b215 100644
--- a/docs/manual/ssl/ssl_intro.html
+++ b/docs/manual/ssl/ssl_intro.html
@@ -1,7 +1,9 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: ssl_intro.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: ssl_intro.html.ja.euc-jp
+URI: ssl_intro.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/ssl/ssl_intro.html.en b/docs/manual/ssl/ssl_intro.html.en
index d27ab56f..8b04e215 100644
--- a/docs/manual/ssl/ssl_intro.html.en
+++ b/docs/manual/ssl/ssl_intro.html.en
@@ -645,6 +645,6 @@ Version 3.0</q>, 1996. See <a href="http://www.netscape.com/eng/ssl3/draft302.tx
 <p><span>Available Languages: </span><a href="../en/ssl/ssl_intro.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/ssl/ssl_intro.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/ssl/ssl_intro.html.ja.euc-jp b/docs/manual/ssl/ssl_intro.html.ja.euc-jp
deleted file mode 100644
index cbc476ce..00000000
--- a/docs/manual/ssl/ssl_intro.html.ja.euc-jp
+++ /dev/null
@@ -1,697 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>SSL/TLS °Å¹æ²½: ¤Ï¤¸¤á¤Ë - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">SSL/TLS</a></div><div id="page-content"><div id="preamble"><h1>SSL/TLS °Å¹æ²½: ¤Ï¤¸¤á¤Ë</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/ssl/ssl_intro.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/ssl/ssl_intro.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-<blockquote>
-<p>ɸ½àµ¬³Ê¤ÎÎɤ¤½ê¤Ï¡¢¤¿¤¯¤µ¤ó¤Îµ¬³Ê¤«¤éÁª¤Ù¤ë¤È¤¤¤¦¤³¤È¤À¡£
-¤½¤·¤Æ¡¢¤â¤·ËÜÅö¤Ë¤É¤Îµ¬³Ê¤âµ¤¤ËÆþ¤é¤Ê¤±¤ì¤Ð¡¢
-°ìǯÂԤĤÀ¤±¤Çõ¤·¤Æ¤¤¤¿µ¬³Ê¤¬¸½¤ì¤ë¡£</p>
-
-<p class="cite">-- <cite>A. Tanenbaum</cite>, "Introduction to
-Computer Networks"</p>
-</blockquote>
-
-<p>
-ÆþÌç¤È¤¤¤¦¤³¤È¤Ç¡¢¤³¤Î¾Ï¤Ï Web¡¢HTTP¡¢Apache ¤ËÄ̤¸¤Æ¤¤¤ë
-ÆɼԸþ¤±¤Ç¤¹¤¬¡¢¥»¥­¥å¥ê¥Æ¥£ÀìÌç²È¸þ¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-SSL ¥×¥í¥È¥³¥ë¤Î·èÄêŪ¤Ê¼ê°ú¤­¤Ç¤¢¤ë¤Ä¤â¤ê¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-¤Þ¤¿¡¢ÁÈ¿¥Æâ¤Îǧ¾Ú´ÉÍý¤Î¤¿¤á¤ÎÆÃÄê¤Î¥Æ¥¯¥Ë¥Ã¥¯¤ä¡¢
-Æõö¤äÍ¢½Ðµ¬À©¤Ê¤É¤Î½ÅÍפÊˡŪ¤ÊÌäÂê¤Ë¤Ä¤¤¤Æ¤â°·¤¤¤Þ¤»¤ó¡£
-¤à¤·¤í¡¢¹¹¤Ê¤ë¸¦µæ¤Ø¤Î½ÐȯÅÀ¤È¤·¤Æ¿§¡¹¤Ê³µÇ°¡¢ÄêµÁ¡¢Îã¤òʤ٤뤳¤È¤Ç
- mod_ssl ¤Î¥æ¡¼¥¶¤Ë´ðÁÃÃ챤òÄ󶡤¹¤ë»ö¤òÌÜŪ¤È¤·¤Æ¤¤¤Þ¤¹¡£</p>
-
-<p>¤³¤³¤Ë¼¨¤µ¤ì¤¿ÆâÍƤϼç¤Ë¡¢¸¶Ãø¼Ô¤Îµö²Ä¤Î²¼
-The Open Group Research Institute ¤Î <a href="http://home.earthlink.net/~fjhirsch/">Frederick J. Hirsch</a>
- »á¤Îµ­»ö <a href="http://home.earthlink.net/~fjhirsch/Papers/wwwj/article.html">
-Introducing SSL and Certificates using SSLeay</a> ¤ò´ð¤Ë¤·¤Æ¤¤¤Þ¤¹¡£
-»á¤Îµ­»ö¤Ï <a href="http://www.ora.com/catalog/wjsum97/">Web Security: A Matter of
-Trust</a>, World Wide Web Journal, Volume 2, Issue 3, Summer 1997
-¤Ë·ÇºÜ¤µ¤ì¤Þ¤·¤¿¡£
-¹ÎÄêŪ¤Ê°Õ¸«¤Ï <a href="mailto:hirsch@fjhirsch.com">Frederick Hirsch</a> »á
- (¸µµ­»ö¤ÎÃø¼Ô) ¤ØÁ´¤Æ¤Î¶ì¾ð¤Ï <a href="mailto:rse@engelschall.com">Ralf S. Engelschall</a> (
-<code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> ¤Îºî¼Ô) ¤Ø¤ª´ê¤¤¤·¤Þ¤¹¡£
-[ÌõÃí: Ìõ¤Ë¤Ä¤¤¤Æ¤Ï <a href="mailto:apache-docs@ml.apache.or.jp">
-Apache ¥É¥­¥å¥á¥ó¥ÈËÝÌõ¥×¥í¥¸¥§¥¯¥È</a>
-¤Ø¤ª´ê¤¤¤·¤Þ¤¹¡£]</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#cryptographictech">°Å¹æ²½µ»½Ñ</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#certificates">¾ÚÌÀ½ñ</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#ssl">Secure Sockets Layer (SSL)</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#references">»²¹Íʸ¸¥</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="cryptographictech" id="cryptographictech">°Å¹æ²½µ»½Ñ</a></h2>
-
-<p>SSL ¤òÍý²ò¤¹¤ë¤Ë¤Ï¡¢°Å¹æ¥¢¥ë¥´¥ê¥º¥à¡¢
-¥á¥Ã¥»¡¼¥¸¥À¥¤¥¸¥§¥¹¥È´Ø¿ô(ÊÌ̾: °ìÊý¸þ´Ø¿ô¡¢¥Ï¥Ã¥·¥å´Ø¿ô)¡¢
-ÅŻҽð̾¤Ê¤É¤Ø¤ÎÍý²ò¤¬É¬ÍפǤ¹¡£
-¤³¤ì¤é¤Îµ»½Ñ¤ÏËܤ¬´Ý¤´¤ÈɬÍפÊÂêÌܤÇ
-(Î㤨¤Ð [<a href="#AC96">AC96</a>] ¤ò»²¾È)¡¢
-¥×¥é¥¤¥Ð¥·¡¼¡¢¿®ÍÑ¡¢Ç§¾Ú¤Ê¤É¤Îµ»½Ñ¤Î´ðÁäȤʤäƤ¤¤Þ¤¹¡£</p>
-
-<h3><a name="cryptographicalgo" id="cryptographicalgo">°Å¹æ¥¢¥ë¥´¥ê¥º¥à</a></h3>
-
-    <p>Î㤨¤Ð¡¢¥¢¥ê¥¹¤¬Á÷¶â¤Î¤¿¤á¤Ë¶ä¹Ô¤Ë¥á¥Ã¥»¡¼¥¸¤òÁ÷¤ê¤¿¤¤¤È¤·¤Þ¤¹¡£
-    ¸ýºÂÈÖ¹æ¤äÁ÷¶â¤Î¶â³Û¤¬´Þ¤Þ¤ì¤ë¤¿¤á¡¢
-    ¥¢¥ê¥¹¤Ï¤½¤Î¥á¥Ã¥»¡¼¥¸¤òÈëÌ©¤Ë¤·¤¿¤¤¤È»×¤¤¤Þ¤¹¡£
-    ²ò·èÊýË¡¤Î°ì¤Ä¤Ï°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤ò»È¤Ã¤Æ¡¢¥á¥Ã¥»¡¼¥¸¤ò
-    Æɤޤ»¤¿¤¤¿Í°Ê³°¤ÏÆɤळ¤È¤¬¤Ç¤­¤Ê¤¤°Å¹æ²½¤µ¤ì¤¿
-    ·ÁÂÖ¤ËÊѤ¨¤Æ¤·¤Þ¤¦¤³¤È¤Ç¤¹¡£
-    ¤½¤Î·ÁÂ֤ˤʤë¤È¡¢
-    ¥á¥Ã¥»¡¼¥¸¤ÏÈëÌ©¤Î¸°¤Ë¤è¤Ã¤Æ¤Î¤ß²ò¼á¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¸°¤Ê¤·¤Ç¤Ï¡¢¥á¥Ã¥»¡¼¥¸¤ÏÌò¤ËΩ¤Á¤Þ¤»¤ó¡£
-    Îɤ¤°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢¿¯Æþ¼Ô¤¬¸µ¤Î¥Æ¥­¥¹¥È¤ò²òÆɤ¹¤ë¤³¤È¤ò
-    Èó¾ï¤ËÆñ¤·¤¯¤¹¤ë¤¿¤á¡¢ÅØÎϤ¬³ä¤Ë¹ç¤ï¤Ê¤¯¤µ¤»¤Þ¤¹¡£</p>
-
-    <p>°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ë¤Ï
-    ½¾Íè·¿¤È¸ø³«¸°¤ÎÆó¤Ä¤Î¼ïÎब¤¢¤ê¤Þ¤¹¡£</p>
-
-    <dl>
-    <dt>½¾Íè·¿°Å¹æ</dt>
-    <dd>ÂоΰŹæ¤È¤·¤Æ¤âÃΤé¤ì¡¢
-    Á÷¿®¼Ô¤È¼õ¿®¼Ô¤¬¸°¤ò¶¦Í­¤¹¤ë¤³¤È¤¬É¬ÍפǤ¹¡£
-    ¸°¤È¤Ï¡¢¥á¥Ã¥»¡¼¥¸¤ò°Å¹æ²½¤·¤¿¤êÉü¹æ¤¹¤ë¤Î¤Ë»È¤ï¤ì¤ëÈëÌ©
-    ¤Î¾ðÊó¤Î¤³¤È¤Ç¤¹¡£
-    ¤â¤·¡¢¤³¤Î¸°¤¬ÈëÌ©¤Ê¤é¡¢Á÷¿®¼Ô¤È¼õ¿®¼Ô°Ê³°¤Ïï¤â¥á¥Ã¥»¡¼¥¸¤òÆÉ
-    ¤à¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£
-    ¤â¤·¤â¡¢¥¢¥ê¥¹¤È¶ä¹Ô¤¬ÈëÌ©¤Î¸°¤òÃΤäƤ¤¤ë¤Ê¤é¡¢
-    Èà¤é¤Ï¤ª¸ß¤¤¤ËÈëÌ©¤Î¥á¥Ã¥»¡¼¥¸¤òÁ÷¤ë¤³¤È¤¬¤Ç¤­¤ë¤Ç¤·¤ç¤¦¡£
-    ¤¿¤À¤·¡¢»öÁ°¤ËÆâÌ©¤Ë¸°¤òÁª¤Ö¤È¤¤¤¦»Å»ö¤ÏÌäÂê¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£</dd>
-
-    <dt>¸ø³«¸°°Å¹æ</dt>
-    <dd>ÈóÂоΰŹæ¤È¤·¤Æ¤âÃΤé¤ì¡¢
-    ¥á¥Ã¥»¡¼¥¸¤ò°Å¹æ²½¤¹¤ë¤³¤È¤Î¤Ç¤­¤ëÆó¤Ä¤Î¸°
-    ¤ò»ÈÍѤ¹¤ë¥¢¥ë¥´¥ê¥º¥à¤òÄêµÁ¤¹¤ë¤³¤È¤Ç¸°¤Î¤ä¤ê¼è¤ê¤ÎÌäÂê¤ò²ò·è
-    ¤·¤Þ¤¹¡£
-    ¤â¤·¡¢¤¢¤ë¸°¤¬°Å¹æ²½¤Ë»È¤ï¤ì¤¿¤Ê¤é¡¢
-    ¤â¤¦ÊÒÊý¤Î¸°¤ÇÉü¹æ¤·¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó¡£
-    ¤³¤ÎÊý¼°¤Ë¤è¤Ã¤Æ¡¢°ì¤Ä¤Î¸°¤ò¸øɽ¤·¤Æ(¸ø³«¸°)¡¢
-    ¤â¤¦ÊÒÊý¤òÈëÌ©¤Ë¤·¤Æ¤ª¤¯(ÈëÌ©¸°)¤À¤±¤Ç¡¢
-    °ÂÁ´¤Ê¥á¥Ã¥»¡¼¥¸¤ò¼õ¤±¼è¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</dd>
-    </dl>
-
-    <p>ï¤â¤¬°Å¹æ²½¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò¸ø³«¸°¤Ë¤è¤Ã¤Æ°Å¹æ²½
-    ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢ÈëÌ©¸°¤Î»ý¤Á¼ç¤À¤±¤¬¤½¤ì¤òÆɤळ¤È¤¬
-    ¤Ç¤­¤Þ¤¹¡£
-    ¤³¤ÎÊýË¡¤Ç¡¢¶ä¹Ô¤Î¸ø³«¸°¤ò»È¤Ã¤Æ°Å¹æ²½¤¹¤ë¤³¤È¤Ç¡¢
-    ¥¢¥ê¥¹¤ÏÈëÌ©¤Î¥á¥Ã¥»¡¼¥¸¤òÁ÷¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¶ä¹Ô¤Î¤ß¤¬Éü¹æ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-
-<h3><a name="messagedigests" id="messagedigests">¥á¥Ã¥»¡¼¥¸¥À¥¤¥¸¥§¥¹¥È</a></h3>
-
-    <p>¥¢¥ê¥¹¤Ï¥á¥Ã¥»¡¼¥¸¤òÈëÌ©¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢
-    狼¤¬Î㤨¤Ð¼«Ê¬¤ËÁ÷¶â¤¹¤ë¤è¤¦¤Ë¥á¥Ã¥»¡¼¥¸¤òÊѹ¹¤·¤¿¤ê¡¢
-    Ê̤Τâ¤Î¤ËÃÖ¤­´¹¤¨¤Æ¤·¤Þ¤¦¤«¤â¤·¤ì¤Ê¤¤¤È¤¤¤¦ÌäÂ꤬¤¢¤ê¤Þ¤¹¡£
-    ¥¢¥ê¥¹¤Î¥á¥Ã¥»¡¼¥¸¤Î¿®ÍѤòÊݾڤ¹¤ëÊýË¡¤Î°ì¤Ä¤Ï¡¢
-    ¥á¥Ã¥»¡¼¥¸¤Î´Ê·é¤Ê¥À¥¤¥¸¥§¥¹¥È¤òºî¤Ã¤Æ¡¢¤½¤ì¤â¶ä¹Ô¤ËÁ÷¤ë¤È¤¤¤¦¤â¤Î¤Ç¤¹¡£
-    ¥á¥Ã¥»¡¼¥¸¤ò¼õ¤±¼è¤ë¤È¶ä¹Ô¤â¥À¥¤¥¸¥§¥¹¥È¤òºîÀ®¤·¡¢
-    ¥¢¥ê¥¹¤¬Á÷¤Ã¤¿¤â¤Î¤ÈÈæ¤Ù¤Þ¤¹¡£¤â¤·°ìÃפ·¤¿¤Ê¤é¡¢
-    ¼õ¤±¼è¤Ã¤¿¥á¥Ã¥»¡¼¥¸¤Ï̵½ý¤À¤È¤¤¤¦¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p>¤³¤Î¤è¤¦¤ÊÍ×Ìó¤Ï<dfn>¥á¥Ã¥»¡¼¥¸¥À¥¤¥¸¥§¥¹¥È</dfn>¡¢
-    <em>°ìÊý¹Ô´Ø¿ô</em>¡¢¤Þ¤¿¤Ï<em>¥Ï¥Ã¥·¥å´Ø¿ô</em>¤È¸Æ¤Ð¤ì¤Þ¤¹¡£
-    ¥á¥Ã¥»¡¼¥¸¥À¥¤¥¸¥§¥¹¥È¤ÏŤ¤²ÄÊÑĹ¤Î¥á¥Ã¥»¡¼¥¸¤«¤é
-    û¤¤¸ÇÄêŤÎɽ¸½¤òºî¤ë¤Î¤Ë»È¤ï¤ì¤Þ¤¹¡£
-    ¥À¥¤¥¸¥§¥¹¥È¥¢¥ë¥´¥ê¥º¥à¤Ï¥á¥Ã¥»¡¼¥¸¤«¤é
-    °ì°Õ¤Ê¥À¥¤¥¸¥§¥¹¥È¤òÀ¸À®¤¹¤ë¤è¤¦¤Ëºî¤é¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¥á¥Ã¥»¡¼¥¸¥À¥¤¥¸¥§¥¹¥È¤Ï¥À¥¤¥¸¥§¥¹¥È¤«¤é¸µ¤Î¥á¥Ã¥»¡¼¥¸¤ò
-    ȽÄꤹ¤ë¤Î¤¬¤È¤Æ¤âÆñ¤·¤¤¤è¤¦¤Ë¤Ç¤­¤Æ¤¤¤Þ¤¹¡£
-    ¤Þ¤¿¡¢Æ±¤¸Í×Ìó¤òºîÀ®¤¹¤ëÆó¤Ä¤Î¥á¥Ã¥»¡¼¥¸¤òõ¤¹¤Î¤ÏÉÔ²Äǽ¤Ç¤¹¡£
-    ¤è¤Ã¤Æ¡¢Æ±¤¸Í×Ìó¤ò»È¤Ã¤Æ¥á¥Ã¥»¡¼¥¸¤òÃÖ¤­´¹¤¨¤ë¤È¤¤¤¦
-    ²ÄǽÀ­¤òÇÓ½ü¤·¤Æ¤¤¤Þ¤¹¡£</p>
-
-<p>¥¢¥ê¥¹¤Ø¤Î¤â¤¦°ì¤Ä¤ÎÌäÂê¤Ï¡¢¤³¤Î¥À¥¤¥¸¥§¥¹¥È¤ò°ÂÁ´¤ËÁ÷¤ëÊýË¡¤òõ¤¹¤³¤È¤Ç¤¹¡£
-¤³¤ì¤¬¤Ç¤­¤ì¤Ð¡¢¥á¥Ã¥»¡¼¥¸¤Î¿®ÍѤ¬Êݾڤµ¤ì¤Þ¤¹¡£
-°ì¤Ä¤ÎÊýË¡¤Ï¤³¤Î¥À¥¤¥¸¥§¥¹¥È¤ËÅŻҽð̾¤ò´Þ¤à¤³¤È¤Ç¤¹¡£</p>
-
-
-<h3><a name="digitalsignatures" id="digitalsignatures">ÅŻҽð̾</a></h3>
-<p>¥¢¥ê¥¹¤¬¶ä¹Ô¤Ë¥á¥Ã¥»¡¼¥¸¤òÁ÷¤Ã¤¿¤È¤­¡¢¶ä¹Ô¤Ï¡¢
-¿¯Æþ¼Ô¤¬Èà½÷¤Ë¤Ê¤ê¤¹¤Þ¤·¤ÆÈà½÷¤Î¸ýºÂ¤Ø¤Î¼è°ú¤ò¿½ÀÁ¤·¤Æ¤¤¤Ê¤¤¤«¡¢
-¥á¥Ã¥»¡¼¥¸¤¬ËÜÅö¤ËÈà½÷¤«¤é¤Î¤â¤Î¤«³Î¼Â¤Ëʬ¤«¤é¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó¡£
-¥¢¥ê¥¹¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¡¢¥á¥Ã¥»¡¼¥¸¤Ë´Þ¤Þ¤ì¤¿
-<em>ÅŻҽð̾</em>¤¬¤³¤³¤ÇÌò¤ËΩ¤Á¤Þ¤¹¡£</p>
-
-<p>ÅŻҽð̾¤Ï¥á¥Ã¥»¡¼¥¸¤Î¥À¥¤¥¸¥§¥¹¥È¤ä¤½¤Î¾¤Î¾ðÊó(½èÍýÈÖ¹æ¤Ê¤É)¤ò
-Á÷¿®¼Ô¤ÎÈëÌ©¸°¤Ç°Å¹æ²½¤¹¤ë¤³¤È¤Çºî¤é¤ì¤Þ¤¹¡£
-ï¤â¤¬¸ø³«¸°¤ò»È¤Ã¤Æ½ð̾¤ò<em>Éü¹æ</em>¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢
-½ð̾¼Ô¤Î¤ß¤¬ÈëÌ©¸°¤òÃΤäƤ¤¤Þ¤¹¡£
-¤³¤ì¤Ï¡¢Èà¤é¤Î¤ß¤¬½ð̾¤·¤¨¤¿¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
-¥À¥¤¥¸¥§¥¹¥È¤òÅŻҽð̾¤Ë´Þ¤à¤³¤È¤Ï¡¢
-¤½¤Î½ð̾¤¬¤½¤Î¥á¥Ã¥»¡¼¥¸¤Î¤ß¤ËÍ­¸ú¤Ç¤¢¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
-¤³¤ì¤Ï¡¢Ã¯¤â¥À¥¤¥¸¥§¥¹¥È¤òÊѤ¨¤Æ½ð̾¤ò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Ê¤¤¤¿¤á¡¢
-¥á¥Ã¥»¡¼¥¸¤Î¿®ÍѤâÊݾڤ·¤Þ¤¹¡£</p>
-
-<p>¿¯Æþ¼Ô¤¬½ð̾¤ò˵¼õ¤·¤Æ¸åÆü¤ËºÆÍøÍѤ¹¤ë¤Î¤òËɤ°¤¿¤á
-ÅŻҽð̾¤Ë¤Ï°ì°Õ¤Ê½èÍýÈֹ椬´Þ¤Þ¤ì¤Þ¤¹¡£
-¤³¤ì¤Ï¡¢¥¢¥ê¥¹¤¬¤½¤ó¤Ê¥á¥Ã¥»¡¼¥¸¤ÏÁ÷¤Ã¤Æ¤¤¤Ê¤¤¤È¸À¤¦º¾µ½
-¤«¤é¶ä¹Ô¤ò¼é¤ê¤Þ¤¹¡£
-Èà½÷¤À¤±¤¬½ð̾¤·¤¨¤¿¤«¤é¤Ç¤¹¡£(ÈÝǧËÉ»ß)</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="certificates" id="certificates">¾ÚÌÀ½ñ</a></h2>
-
-<p>¥¢¥ê¥¹¤ÏÈëÌ©¤Î¥á¥Ã¥»¡¼¥¸¤ò¶ä¹Ô¤ËÁ÷¤ê¡¢
-½ð̾¤ò¤·¤Æ¡¢¥á¥Ã¥»¡¼¥¸¤Î¿®ÍѤòÊݾڤ¹¤ë¤³¤È¤¬¤Ç¤­¤ë¤ª¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¤¬¡¢
-ÄÌ¿®¤·¤Æ¤¤¤ëÁê¼ê¤¬ËÜÅö¤Ë¶ä¹Ô¤Ê¤Î¤«³Î¤«¤á¤Ê¤¯¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£
-¤³¤ì¤Ï¡¢Èà½÷¤¬»È¤¦¸ø³«¸°¤¬¶ä¹Ô¤ÎÈëÌ©¸°¤ÈÂФˤʤäƤ¤¤ë¤â¤Î¤«¡¢
-Èà½÷¤Ï³Î¤«¤á¤Ê¤¯¤Æ¤Ï¤¤¤±¤Ê¤¤¤È¤¤¤¦¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
-ƱÍͤˡ¢¶ä¹Ô¤Ï¥á¥Ã¥»¡¼¥¸¤Î½ð̾¤¬ËÜÅö¤Ë¥¢¥ê¥¹¤Î½ð̾¤«³Îǧ¤¹¤ëɬÍפ¬
-¤¢¤ê¤Þ¤¹¡£</p>
-
-<p>¤â¤·Î¾¼Ô¤Ë¿È¸µ¤ò¾ÚÌÀ¤·¡¢¸ø³«¸°¤ò³Îǧ¤·¡¢¤Þ¤¿¿®Íꤵ¤ì¤¿µ¡´Ø¤¬½ð̾
-¤·¤¿¾ÚÌÀ½ñ¤¬¤¢¤ì¤Ð¡¢Î¾¼Ô¤È¤âÄÌ¿®Áê¼ê¤Ë¤Ä¤¤¤ÆÀµ¤·¤¤Áê¼ê¤À¤È
-³Î¿®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-¤½¤Î¤è¤¦¤Ê¿®Íꤵ¤ì¤¿µ¡´Ø¤Ï<em>ǧ¾Ú¶É</em>
- (Certificate Authority ¤Þ¤¿¤Ï CA) ¤È¸Æ¤Ð¤ì¡¢
-¾ÚÌÀ½ñ (certificate) ¤¬Ç§¾Ú (authentication) ¤Ë»È¤ï¤ì¤Þ¤¹¡£</p>
-
-<h3><a name="certificatecontents" id="certificatecontents">¾ÚÌÀ½ñ¤ÎÆâÍÆ</a></h3>
-
-    <p>¾ÚÌÀ½ñ¤Ï¸ø³«¸°¤È¸Ä¿Í¡¢¥µ¡¼¥Ð¡¢¤½¤Î¾¤Î¼çÂΤμºߤοȸµ¤ò
-    ´ØÏ¢ÉÕ¤±¤Þ¤¹¡£
-    <a href="#table1">ɽ1</a>¤Ë¼¨¤µ¤ì¤ë¤è¤¦¤Ë¾ÚÌÀÂоݤξðÊó¤Ï
-    ¿È¸µ¾ÚÌÀ¤Î¾ðÊó(¼±ÊÌ̾)¤È¸ø³«¸°¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
-    ¾ÚÌÀ½ñ¤Ï¤Þ¤¿¡¢Ç§¾Ú¶É¤Î¿È¸µ¾ÚÌÀ¤È½ð̾¡¢¤½¤·¤Æ¾ÚÌÀ½ñ¤ÎÍ­¸ú´ü´Ö¤ò
-    ´Þ¤ß¤Þ¤¹¡£
-    ¥·¥ê¥¢¥ë¥Ê¥ó¥Ð¡¼¤Ê¤É¤Îǧ¾Ú¶É¤Î´ÉÍý¾å¤Î¾ðÊó¤ä
-    ¤½¤Î¾¤ÎÄɲäξðÊ󤬴ޤޤì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>
-
-    <h4><a name="table1" id="table1">ɽ1: ¾ÚÌÀ½ñ¾ðÊó</a></h4>
-    
-    <table>
-    
-    <tr><th>¾ÚÌÀÂоÝ</th>
-        <td>¼±ÊÌ̾¡¢¸ø³«¸°</td></tr>
-    <tr><th>ȯ¹Ô¼Ô</th>
-        <td>¼±ÊÌ̾¡¢¸ø³«¸°</td></tr>
-    <tr><th>Í­¸ú´ü´Ö</th>
-        <td>³«»ÏÆü¡¢¼º¸úÆü</td></tr>
-    <tr><th>´ÉÍý¾ðÊó</th>
-        <td>¥Ð¡¼¥¸¥ç¥ó¡¢¥·¥ê¥¢¥ë¥Ê¥ó¥Ð¡¼</td></tr>
-    <tr><th>³ÈÄ¥¾ðÊó</th>
-        <td>´ðËÜŪ¤ÊÀ©Ì󡢥ͥåȥ¹¥±¡¼¥×¥Õ¥é¥Ã¥°¡¢¤½¤Î¾</td></tr>
-    </table>
-    
-
-    <p>¼±ÊÌ̾(¥Ç¥£¥¹¥Æ¥£¥ó¥°¥¤¥Ã¥·¥å¡¦¥Í¡¼¥à)¤ÏÆÃÄê¤Î¾õ¶·¤Ë¤ª¤±¤ë
-    ¿Èʬ¾ÚÌÀ¤òÄ󶡤¹¤ë¤Î¤Ë»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£Î㤨¤Ð¡¢¤¢¤ë¿Í¤Ï
-    »äÍѤȲñ¼Ò¤È¤ÇÊÌ¡¹¤Î¿Èʬ¾ÚÌÀ¤ò»ý¤Ä¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-    
-    ¼±ÊÌ̾¤Ï X.509 ɸ½àµ¬³Ê [<a href="#X509">X509</a>] ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-    X.509 ɸ½àµ¬³Ê¤Ï¡¢¹àÌÜ¡¢¹àÌÜ̾¡¢¤½¤·¤Æ¹àÌܤÎά¾Î¤òÄêµÁ¤·¤Æ¤¤¤Þ¤¹¡£(<a href="#table2">ɽ
-    2</a> »²¾È)</p>
-
-    <h4><a name="table2" id="table2">ɽ 2: ¼±ÊÌ̾¾ðÊó</a></h4>
-    
-    <table class="bordered">
-    
-    <tr><th>¼±ÊÌ̾¹àÌÜ</th>
-        <th>ά¾Î</th>
-        <th>ÀâÌÀ</th>
-        <th>Îã</th></tr>
-    <tr><td>Common Name (¥³¥â¥ó¥Í¡¼¥à)</td>
-        <td>CN</td>
-        <td>ǧ¾Ú¤µ¤ì¤ë̾Á°<br />
-        SSLÀܳ¤¹¤ëURL</td>
-        <td>CN=www.example.com</td></tr>
-    <tr><td>Organization or Company (ÁÈ¿¥Ì¾)</td>
-        <td>O</td>
-        <td>ÃÄÂΤÎÀµ¼°±Ñ¸ìÁÈ¿¥Ì¾</td>
-        <td>O=Example Japan K.K.</td></tr>
-    <tr><td>Organizational Unit (ÉôÌç̾)</td>
-        <td>OU</td>
-        <td>Éô½ð̾¤Ê¤É</td>
-        <td>OU=Customer Service</td></tr>
-    <tr><td>City/Locality (»Ô¶èĮ¼)</td>
-        <td>L</td>
-        <td>½êºß¤·¤Æ¤ë»Ô¶èĮ¼</td>
-        <td>L=Sapporo</td></tr>
-    <tr><td>State/Province (ÅÔÆ»Éܸ©)</td>
-        <td>ST</td>
-        <td>½êºß¤·¤Æ¤ëÅÔÆ»Éܸ©</td>
-        <td>ST=Hokkaido</td></tr>
-    <tr><td>Country(¹ñ)</td>
-        <td>C</td>
-        <td>½êºß¤·¤Æ¤¤¤ë¹ñ̾¤Î ISO ¥³¡¼¥É<br />
-        ÆüËܤξì¹ç JP
-        </td>
-        <td>C=JP</td></tr>
-    </table>
-    
-
-    <p>ǧ¾Ú¶É¤Ï¤É¤Î¹àÌܤ¬¾Êά²Äǽ¤Ç¤É¤ì¤¬É¬¿Ü¤«¤ÎÊý¿Ë¤òÄêµÁ¤¹¤ë
-    ¤«¤â¤·¤ì¤Þ¤»¤ó¡£¹àÌܤÎÆâÍƤˤĤ¤¤Æ¤âǧ¾Ú¶É¤ä¾ÚÌÀ½ñ¤Î¥æ¡¼¥¶¤«¤é¤Î
-    Í׷郎¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-    Î㤨¤Ð¡¢¥Í¥Ã¥È¥¹¥±¡¼¥×¤Î¥Ö¥é¥¦¥¶¤Ï¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤Î
-     Common Name (¥³¥â¥ó¥Í¡¼¥à)¤¬¥µ¡¼¥Ð¤Î¥É¥á¥¤¥ó̾¤Î
-     <code>*.example.com</code> 
-    ¤È¤¤¤¦¤è¤¦¤Ê¥ï¥¤¥ë¥É¥«¡¼¥É¤Î¥Ñ¥¿¡¼¥ó¤Ë¥Þ¥Ã¥Á¤¹¤ë¤³¤È
-    ¤òÍ׵ᤷ¤Þ¤¹¡£</p>
-
-    <p>¥Ð¥¤¥Ê¥ê·Á¼°¤Î¾ÚÌÀ½ñ¤Ï ASN.1 ɽµ­Ë¡
-     [<a href="#X208">X208</a>] [<a href="#PKCS">PKCS</a>] ¤Ç
-    ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¤³¤Îɽµ­Ë¡¤ÏÆâÍƤò¤É¤Î¤è¤¦¤Ëµ­½Ò¤¹¤ë¤«¤òÄêµÁ¤·¡¢
-    Éä¹æ²½¤Îµ¬Ä꤬¤³¤Î¾ðÊ󤬤ɤΤ褦¤Ë¥Ð¥¤¥Ê¥ê·Á¼°¤ËÊÑ´¹¤µ¤ì¤ë¤«¤ò
-    ÄêµÁ¤·¤Þ¤¹¡£
-    ¾ÚÌÀ½ñ¤Î¥Ð¥¤¥Ê¥êÉä¹æ²½¤Ï Distinguished Encoding
-    Rules (DER) ¤ÇÄêµÁ¤µ¤ì¡¢¤½¤ì¤Ï¤è¤ê°ìÈÌŪ¤Ê Basic Encoding Rules
-    (BER) ¤Ë´ð¤Å¤¤¤Æ¤¤¤Þ¤¹¡£
-    ¥Ð¥¤¥Ê¥ê·Á¼°¤ò°·¤¦¤³¤È¤Î¤Ç¤­¤Ê¤¤Á÷¿®¤Ç¤Ï¡¢
-    ¥Ð¥¤¥Ê¥ê·Á¼°¤Ï Base64 Éä¹æ²½ [<a href="#MIME">MIME</a>] ¤Ç
-    ASCII ·Á¼°¤ËÊÑ´¹¤µ¤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤Î¤è¤¦¤ËÉä¹æ²½¤µ¤ì¡¢°Ê²¼¤ÎÎã¤Ë¼¨¤µ¤ì¤ë¤è¤¦¤Ë¶èÀÚ¤ê¹Ô¤Ë
-    ¶´¤Þ¤ì¤¿¤â¤Î¤Ï PEM Éä¹æ²½¤µ¤ì¤¿¤È¸À¤¤¤Þ¤¹¡£
-    (PEM ¤Î̾Á°¤Ï "Privacy Enhanced Mail" ¤ËͳÍ褷¤Þ¤¹)</p>
-
-    <div class="example"><h3>PEM Éä¹æ²½¤µ¤ì¤¿¾ÚÌÀ½ñ¤ÎÎã (example.crt)</h3><pre>-----BEGIN CERTIFICATE-----
-MIIC7jCCAlegAwIBAgIBATANBgkqhkiG9w0BAQQFADCBqTELMAkGA1UEBhMCWFkx
-FTATBgNVBAgTDFNuYWtlIERlc2VydDETMBEGA1UEBxMKU25ha2UgVG93bjEXMBUG
-A1UEChMOU25ha2UgT2lsLCBMdGQxHjAcBgNVBAsTFUNlcnRpZmljYXRlIEF1dGhv
-cml0eTEVMBMGA1UEAxMMU25ha2UgT2lsIENBMR4wHAYJKoZIhvcNAQkBFg9jYUBz
-bmFrZW9pbC5kb20wHhcNOTgxMDIxMDg1ODM2WhcNOTkxMDIxMDg1ODM2WjCBpzEL
-MAkGA1UEBhMCWFkxFTATBgNVBAgTDFNuYWtlIERlc2VydDETMBEGA1UEBxMKU25h
-a2UgVG93bjEXMBUGA1UEChMOU25ha2UgT2lsLCBMdGQxFzAVBgNVBAsTDldlYnNl
-cnZlciBUZWFtMRkwFwYDVQQDExB3d3cuc25ha2VvaWwuZG9tMR8wHQYJKoZIhvcN
-AQkBFhB3d3dAc25ha2VvaWwuZG9tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQDH9Ge/s2zcH+da+rPTx/DPRp3xGjHZ4GG6pCmvADIEtBtKBFAcZ64n+Dy7Np8b
-vKR+yy5DGQiijsH1D/j8HlGE+q4TZ8OFk7BNBFazHxFbYI4OKMiCxdKzdif1yfaa
-lWoANFlAzlSdbxeGVHoT0K+gT5w3UxwZKv2DLbCTzLZyPwIDAQABoyYwJDAPBgNV
-HRMECDAGAQH/AgEAMBEGCWCGSAGG+EIBAQQEAwIAQDANBgkqhkiG9w0BAQQFAAOB
-gQAZUIHAL4D09oE6Lv2k56Gp38OBDuILvwLg1v1KL8mQR+KFjghCrtpqaztZqcDt
-2q2QoyulCgSzHbEGmi0EsdkPfg6mp0penssIFePYNI+/8u9HT4LuKMJX15hxBam7
-dUHzICxBVC1lnHyYGjDuAMhe396lYAn8bCld1/L4NMGBCQ==
------END CERTIFICATE-----</pre></div>
-
-
-<h3><a name="certificateauthorities" id="certificateauthorities">ǧ¾Ú¶É</a></h3>
-
-    <p>¤Þ¤º¾ÚÌÀ½ñ¤Î¿½ÀÁ¤Î¾ðÊó¤ò³Îǧ¤¹¤ë¤³¤È¤Ç¡¢
-    ǧ¾Ú¶É¤ÏÈëÌ©¸°¤Î»ý¤Á¼ç¤Î¿È¸µ¤òÊݾڤ·¤Þ¤¹¡£
-    Î㤨¤Ð¡¢¥¢¥ê¥¹¤¬¸Ä¿Í¾ÚÌÀ½ñ¤ò¿½ÀÁ¤·¤¿¤È¤¹¤ë¤È¡¢
-    ǧ¾Ú¶É¤Ï¥¢¥ê¥¹¤¬¾ÚÌÀ½ñ¤Î¿½ÀÁ¤¬¼çÄ¥¤¹¤ëÄ̤ê¤Î
-    ¿Íʪ¤À¤È¤¤¤¦¤³¤È¤ò³Îǧ¤·¤Ê¤¯¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£</p>
-
-    <h4><a name="certificatechains" id="certificatechains">¾ÚÌÀ½ñ³¬Áع½Â¤</a></h4>
-    
-        <p>ǧ¾Ú¶É¤Ï¾¤Îǧ¾Ú¶É¤Ø¤Î¾ÚÌÀ½ñ¤òȯ¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-        ̤ÃΤξÚÌÀ½ñ¤òÄ´¤Ù¤ë»þ¤Ë¡¢¥¢¥ê¥¹¤Ï¤½¤Î¾ÚÌÀ½ñ¤Îȯ¹Ô¼Ô
-        ¤Ë¼«¿®¤¬»ý¤Æ¤ë¤Þ¤Ç¡¢È¯¹Ô¼Ô¤Î¾ÚÌÀ½ñ¤ò
-        ¤½¤Î¾å°Ì³¬ÁؤÎǧ¾Ú¶É¤ò¤¿¤É¤Ã¤ÆÄ´¤Ù¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-        ¡Ö°­¼Á¤Ê¡×¾ÚÌÀ½ñ¤Î´í¸±À­¤ò¸º¤é¤¹¤¿¤á¡¢
-        Èà½÷¤Ï¸Â¤é¤ì¤¿Ï¢º¿¤Îȯ¹Ô¼Ô¤Î¤ß¿®Íꤹ¤ë¤è¤¦¤Ë
-        ·è¤á¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-    
-
-    <h4><a name="rootlevelca" id="rootlevelca">ºÇ¾å°Ìǧ¾Ú¶É¤ÎºîÀ®</a></h4>
-    
-        <p>Á°¤Ë½Ò¤Ù¤¿¤è¤¦¤Ë¡¢Á´¤Æ¤Î¾ÚÌÀ½ñ¤Ë¤Ä¤¤¤Æ¡¢
-        ºÇ¾å°Ì¤Îǧ¾Ú¶É(CA)¤Þ¤Ç¤½¤ì¤¾¤ì¤Îȯ¹Ô¼Ô¤¬
-        Âоݤοȸµ¾ÚÌÀ¤ÎÍ­¸úÀ­¤òÌÀ¤é¤«¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-        ÌäÂê¤Ï¡¢Ã¯¤¬¤½¤ÎºÇ¾å°Ì¤Îǧ¾Úµ¡´Ø¤Î¾ÚÌÀ½ñ¤òÊݾڤ¹¤ë¤Î¤«¡¢
-        ¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
-        ¤³¤Î¤è¤¦¤Ê¾ì¹ç¤Ë¸Â¤ê¡¢¾ÚÌÀ½ñ¤Ï¡Ö¼«¸Ê½ð̾¡×¤µ¤ì¤Þ¤¹¡£
-        ¤Ä¤Þ¤ê¡¢¾ÚÌÀ½ñ¤Îȯ¹Ô¼Ô¤È¾ÚÌÀÂоݤ¬Æ±¤¸¤È¤¤¤¦¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
-        ¤½¤Î·ë²Ì¡¢¼«¸Ê½ð̾¤µ¤ì¤¿¾ÚÌÀ½ñ¤ò¿®ÍѤ¹¤ë¤Ë¤Ï
-        ºÙ¿´¤ÎÃí°Õ¤¬É¬ÍפǤ¹¡£
-        ºÇ¾å°Ìǧ¾Ú¶É¤¬¸ø³«¸°¤ò¹­¤¯¸øɽ¤¹¤ë¤³¤È¤Ç¡¢
-        ¤½¤Î¸°¤ò¿®Íꤹ¤ë¥ê¥¹¥¯¤òÄ㤯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-        ¤â¤·¡¢Â¾¿Í¤¬¤½¤Îǧ¾Ú¶É¤Ë¤Ê¤ê¤¹¤Þ¤·¤¿»þ¤Ë¡¢¤½¤ì¤¬Ïª¸«¤·¤ä
-        ¤¹¤¤¤«¤é¤Ç¤¹¡£
-        ¿¤¯¤Î¥Ö¥é¥¦¥¶¤Ïͭ̾¤Êǧ¾Ú¶É¤ò¿®Íꤹ¤ë¤è¤¦¤Ë
-        ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-        <p><a href="http://www.thawte.com/">Thawte</a> 
-        ¤ä <a href="http://www.verisign.com/">VeriSign</a> 
-        ¤Î¤è¤¦¤Ê¿¤¯¤Î²ñ¼Ò¤¬Ç§¾Ú¶É¤È¤·¤Æ³«Àߤ·¤Þ¤·¤¿¡£
-        ¤³¤Î¤è¤¦¤Ê²ñ¼Ò¤Ï°Ê²¼¤Î¥µ¡¼¥Ó¥¹¤òÄ󶡤·¤Þ¤¹:</p>
-
-        <ul>
-        <li>¾ÚÌÀ½ñ¿½ÀÁ¤Î³Îǧ</li>
-        <li>¾ÚÌÀ½ñ¿½ÀÁ¤Î½èÍý</li>
-        <li>¾ÚÌÀ½ñ¤Îȯ¹Ô¤È´ÉÍý</li>
-        </ul>
-
-        <p>¼«Ê¬¤Çǧ¾Ú¶É¤òºî¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£
-        ¥¤¥ó¥¿¡¼¥Í¥Ã¥È´Ä¶­¤Ç¤Ï´í¸±¤Ç¤¹¤¬¡¢
-        ¸Ä¿Í¤ä¥µ¡¼¥Ð¤Î¿È¸µ¾ÚÌÀ¤¬´Êñ¤Ë¹Ô¤¨¤ëÁÈ¿¥¤Î
-        ¥¤¥ó¥È¥é¥Í¥Ã¥ÈÆâ¤Ç¤ÏÌò¤ËΩ¤Ä¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>
-    
-
-    <h4><a name="certificatemanagement" id="certificatemanagement">¾ÚÌÀ½ñ´ÉÍý</a></h4>
-    
-        <p>ǧ¾Ú¶É¤Î³«ÀߤÏÅ°Ä줷¤¿´ÉÍý¡¢µ»½Ñ¡¢±¿ÍѤÎÂÎÀ©¤òɬÍפȤ¹¤ë
-        ÀÕǤ¤Î¤¢¤ë»Å»ö¤Ç¤¹¡£
-        ǧ¾Ú¶É¤Ï¾ÚÌÀ½ñ¤òȯ¹Ô¤¹¤ë¤À¤±¤Ç¤Ê¤¯¡¢
-        ´ÉÍý¤â¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-        ¶ñÂÎŪ¤Ë¤Ï¡¢¾ÚÌÀ½ñ¤¬¤¤¤Ä¤Þ¤ÇÍ­¸ú¤«¤ò·èÄꤷ¡¢¹¹¿·¤·¡¢
-        ¤Þ¤¿´û¤Ëȯ¹Ô¤µ¤ì¤¿¤¬¼º¸ú¤·¤¿¾ÚÌÀ½ñ¤Î¥ê¥¹¥È
-        (Certificate Revocation Lists ¤Þ¤¿¤Ï CRL)
-        ¤ò´ÉÍý¤·¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó¡£
-        Î㤨¤Ð¡¢¥¢¥ê¥¹¤¬²ñ¼Ò¤«¤é¼Ò°÷¤È¤·¤Æ¾ÚÌÀ½ñ¤òÍ¿¤¨¤é¤ì¤¿¤È¤·¤Þ¤¹¡£
-        ¤½¤·¤Æ¡¢¥¢¥ê¥¹¤¬²ñ¼Ò¤ò¼­¤á¤ë¤È¤­¤Ë¤Ï¾ÚÌÀ½ñ¤ò¼è¤ê¾Ã¤µ¤Ê¤±¤ì¤Ð
-        ¤¤¤±¤Ê¤¤¤È¤·¤Þ¤¹¡£
-        ¾ÚÌÀ½ñ¤Ï¼¡¡¹¤È¿Í¤ËÅϤµ¤ì¤Æ¤¤¤¯¤â¤Î¤Ê¤Î¤Ç¡¢
-        ¾ÚÌÀ½ñ¤½¤Î¤â¤Î¤«¤é¡¢¤½¤ì¤¬¼è¤ê¾Ã¤µ¤ì¤¿¤«È½ÃǤ¹¤ë¤³¤È¤Ï
-        ÉÔ²Äǽ¤Ç¤¹¡£
-        ¤è¤Ã¤Æ¡¢¾ÚÌÀ½ñ¤ÎÍ­¸úÀ­¤òÄ´¤Ù¤ë¤È¤­¤Ë¤Ï¡¢
-        ǧ¾Ú¶É¤ËÏ¢Íí¤·¤Æ CRL ¤ò¾È¹ç¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-        ÉáÄ̤³¤Î²áÄø¤Ï¼«Æ°²½¤µ¤ì¤Æ¤¤¤ë¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</p>
-
-        <div class="note"><h3>Ãí°Õ</h3>
-        <p>¥Ç¥Õ¥©¥ë¥È¤Ç¥Ö¥é¥¦¥¶¤ËÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤Ç§¾Ú¶É¤ò»È¤Ã¤¿¾ì¹ç¡¢
-        ǧ¾Ú¶É¤Î¾ÚÌÀ½ñ¤ò¥Ö¥é¥¦¥¶¤ËÆɤ߹þ¤ó¤Ç¡¢
-        ¥Ö¥é¥¦¥¶¤¬¤½¤Îǧ¾Ú¶É¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤¿¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤ò
-        Í­¸ú²½¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-        °ìÅÙÆɤ߹þ¤Þ¤ì¤ë¤È¡¢¤½¤Îǧ¾Ú¶É¤Ë¤è¤Ã¤Æ½ð̾¤µ¤ì¤¿Á´¤Æ¤Î
-        ¾ÚÌÀ½ñ¤ò¼õ¤±Æþ¤ì¤ë¤¿¤á¡¢´í¸±¤òȼ¤¤¤Þ¤¹¡£</p>
-        </div>
-    
-
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="ssl" id="ssl">Secure Sockets Layer (SSL)</a></h2>
-
-<p>Secure Sockets Layer ¥×¥í¥È¥³¥ë¤Ï¿®ÍêÀ­¤Î¤¢¤ë¥³¥Í¥¯¥·¥ç¥ó·¿¤Î
-¥Í¥Ã¥È¥ï¡¼¥¯ÁؤΥץí¥È¥³¥ë(Î㤨¤Ð¡¢TCP/IP)¤È
-¥¢¥×¥ê¥±¡¼¥·¥ç¥óÁؤΥץí¥È¥³¥ë(Î㤨¤Ð¡¢HTTP)
-¤Î´Ö¤ËÃÖ¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-SSL ¤Ï¡¢Áê¸ßǧ¾Ú¤Ë¤è¤Ã¤Æ¥µ¡¼¥Ð¤È¥¯¥é¥¤¥¢¥ó¥È´Ö¤Î°ÂÁ´¤ÊÄÌ¿®¤ò¡¢
-ÅŻҽð̾¤Ë¤è¤Ã¤Æ¥Ç¡¼¥¿¤Î´°Á´À­¤ò¡¢
-¤½¤·¤Æ°Å¹æ²½¤Ë¤è¤Ã¤Æ¥×¥é¥¤¥Ð¥·¤òÄ󶡤·¤Þ¤¹¡£</p>
-
-<p>SSL ¥×¥í¥È¥³¥ë¤Ï°Å¹æ²½¡¢¥À¥¤¥¸¥§¥¹¥È¡¢ÅŻҽð̾¤Ë¤Ä¤¤¤Æ¡¢
-ÍÍ¡¹¤Ê¥¢¥ë¥´¥ê¥º¥à¤ò¥µ¥Ý¡¼¥È¤¹¤ë¤è¤¦¤Ë¤Ç¤­¤Æ¤¤¤Þ¤¹¡£
-¤³¤¦¤¹¤ë¤³¤È¤Ç¡¢Ë¡¤äÍ¢½Ð¤Îµ¬À©¤ò¹Íθ¤ËÆþ¤ì¤Æ¡¢¥µ¡¼¥Ð¤Ë¹ç¤ï¤»¤¿
-¥¢¥ë¥´¥ê¥º¥à¤òÁª¤Ö¤³¤È¤¬¤Ç¤­¡¢¤Þ¤¿¡¢¿·¤·¤¤¥¢¥ë¥´¥ê¥º¥à¤ò
-ÍøÍѤ·¤Æ¤¤¤¯¤³¤È¤â²Äǽ¤Ë¤·¤Æ¤¤¤Þ¤¹¡£
-¥¢¥ë¥´¥ê¥º¥à¤ÎÁªÂò¤Ï¥×¥í¥È¥³¥ë¥»¥Ã¥·¥ç¥ó³«»Ï»þ¤Ë
-¥µ¡¼¥Ð¤È¥¯¥é¥¤¥¢¥ó¥È´Ö¤Ç¼è¤ê·è¤á¤é¤ì¤Þ¤¹¡£</p>
-
-<h3><a name="table4" id="table4">ɽ4: SSL ¥×¥í¥È¥³¥ë¤Î¥Ð¡¼¥¸¥ç¥ó</a></h3>
-
-    <table class="bordered">
-    
-    <tr><th>¥Ð¡¼¥¸¥ç¥ó</th>
-        <th>½Ðŵ</th>
-        <th>ÀâÌÀ</th>
-        <th>¥Ö¥é¥¦¥¶¤Î¥µ¥Ý¡¼¥È</th></tr>
-    <tr><td>SSL v2.0</td>
-        <td>Vendor Standard (Netscape Corp. ¤è¤ê) [<a href="#SSL2">SSL2</a>]</td>
-        <td>¼ÂÁõ¤¬¸½Â¸¤¹¤ë½é¤á¤Æ¤Î SSL ¥×¥í¥È¥³¥ë</td>
-        <td>- NS Navigator 1.x/2.x<br />
-        - MS IE 3.x<br />
-        - Lynx/2.8+OpenSSL</td></tr>
-    <tr><td>SSL v3.0</td>
-        <td>Expired Internet Draft (Netscape Corp. ¤è¤ê) [<a href="#SSL3">SSL3</a>]</td>
-        <td>ÆÃÄê¤Î¥»¥­¥å¥ê¥Æ¥£¹¶·â¤òËɤ°¤¿¤á¤Î²þÄû¡¢
-        ÈóRSA °Å¹æ¤ÎÄɲᢾÚÌÀ½ñ³¬Áع½Â¤¤Î¥µ¥Ý¡¼¥È</td>
-        <td>- NS Navigator 2.x/3.x/4.x<br />
-        - MS IE 3.x/4.x<br />
-        - Lynx/2.8+OpenSSL</td></tr>
-    <tr><td>TLS v1.0</td>
-        <td>Proposed Internet Standard (IETF ¤è¤ê) [<a href="#TLS1">TLS1</a>]</td>
-        <td>MAC ¥ì¥¤¥ä¤ò HMAC ¤Ø¹¹¿·¡¢¥Ö¥í¥Ã¥¯°Å¹æ¤Î block
-        padding¡¢¥á¥Ã¥»¡¼¥¸½ç½ø¤Îɸ½à²½¡¢·Ù¹ðʸ¤Î½¼¼Â¤Ê¤É¤Î¤¿¤á
-        SSL 3.0 ¤ò²þÄû¡£</td>
-        <td>- Lynx/2.8+OpenSSL</td></tr>
-    </table>
-
-
-<p><a href="#table4">ɽ4</a>¤Ë¼¨¤µ¤ì¤ë¤È¤ª¤ê¡¢SSL ¥×¥í¥È¥³¥ë¤Ë¤Ï
-¤¤¤¯¤Ä¤â¤Î¥Ð¡¼¥¸¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£
-ɽ¤Ë¤â½ñ¤«¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢SSL 3.0 ¤ÎÍøÅÀ¤Î°ì¤Ä¤Ï
-¾ÚÌÀ½ñ³¬Áع½Â¤¤ò¥µ¥Ý¡¼¥È¤¹¤ë¤³¤È¤Ç¤¹¡£
-¤³¤Îµ¡Ç½¤Ë¤è¤Ã¤Æ¡¢¥µ¡¼¥Ð¤Ï¼«Ê¬¤Î¾ÚÌÀ½ñ¤Ë²Ã¤¨¤Æ¡¢
-ȯ¹Ô¼Ô¤Î¾ÚÌÀ½ñ¤ò¥Ö¥é¥¦¥¶¤ËÅϤ¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-¾ÚÌÀ½ñ³¬Áع½Â¤¤Ë¤è¤Ã¤Æ¡¢
-¥Ö¥é¥¦¥¶¤Ëȯ¹Ô¼Ô¤Î¾ÚÌÀ½ñ¤¬Ä¾ÀÜÅÐÏ¿¤µ¤ì¤Æ¤¤¤Ê¤¯¤Æ¤â¡¢
-³¬ÁؤÎÃæ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ì¤Ð¡¢
-¥Ö¥é¥¦¥¶¤Ï¥µ¡¼¥Ð¤Î¾ÚÌÀ½ñ¤òÍ­¸ú²½¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-SSL 3.0 ¤Ï¸½ºß Internet Engineering Task Force (IETF) 
-¤Ë¤è¤Ã¤Æ³«È¯¤µ¤ì¤Æ¤¤¤ë Transport Layer Security 
-[<a href="#TLS1">TLS</a>] ¥×¥í¥È¥³¥ëɸ½àµ¬³Ê¤Î´ðÁäȤʤäƤ¤¤Þ¤¹¡£</p>
-
-<h3><a name="session" id="session">¥»¥Ã¥·¥ç¥ó¤Î³ÎΩ</a></h3>
-
-    <p><a href="#figure1">¿Þ1</a>¤Ç¼¨¤µ¤ì¤ë¤è¤¦¤Ë¡¢
-    ¥»¥Ã¥·¥ç¥ó¤Î³ÎΩ¤Ï¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð´Ö¤Î
-    ¥Ï¥ó¥É¥·¥§¡¼¥¯¥·¡¼¥¯¥¨¥ó¥¹¤Ë¤è¤Ã¤Æ¹Ô¤Ê¤ï¤ì¤Þ¤¹¡£
-    ¥µ¡¼¥Ð¤¬¾ÚÌÀ½ñ¤òÄ󶡤¹¤ë¤«¡¢¥¯¥é¥¤¥¢¥ó¥È¤Î¾ÚÌÀ½ñ¤ò¥ê¥¯¥¨¥¹¥È¤¹¤ë¤«
-    ¤È¤¤¤¦¥µ¡¼¥Ð¤ÎÀßÄê¤Ë¤è¤ê¡¢¤³¤Î¥·¡¼¥¯¥¨¥ó¥¹¤Ï°Û¤Ê¤ë¤â¤Î¤È¤Ê¤ê¤Þ¤¹¡£
-    °Å¹æ¾ðÊó¤Î´ÉÍý¤Î¤¿¤á¤Ë¡¢ÄɲäΥϥó¥É¥·¥§¡¼¥¯²áÄø¤¬É¬Íפˤʤë
-    ¾ì¹ç¤â¤¢¤ê¤Þ¤¹¤¬¡¢¤³¤Îµ­»ö¤Ç¤Ï
-    ¤è¤¯¤¢¤ë¥·¥Ê¥ê¥ª¤ò¼êû¤ËÀâÌÀ¤·¤Þ¤¹¡£
-    Á´¤Æ¤Î²ÄǽÀ­¤Ë¤Ä¤¤¤Ï¡¢SSL »ÅÍͽñ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <div class="note"><h3>Ãí°Õ</h3>
-    <p>°ìÅÙ SSL ¥»¥Ã¥·¥ç¥ó¤¬³ÎΩ¤¹¤ë¤È¡¢¥»¥Ã¥·¥ç¥ó¤òºÆÍøÍѤ¹¤ë¤³¤È¤Ç¡¢
-    ¥»¥Ã¥·¥ç¥ó¤ò³«»Ï¤¹¤ë¤¿¤á¤Î¿¤¯¤Î²áÄø¤ò·«¤êÊÖ¤¹¤È¤¤¤¦
-    ¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤Î»¼º¤òËɤ®¤Þ¤¹¡£
-    ¤½¤Î¤¿¤á¡¢¥µ¡¼¥Ð¤ÏÁ´¤Æ¤Î¥»¥Ã¥·¥ç¥ó¤Ë°ì°Õ¤Ê¥»¥Ã¥·¥ç¥ó¼±ÊÌ̾¤ò
-    ³ä¤êÅö¤Æ¡¢¥µ¡¼¥Ð¤Ë¥­¥ã¥Ã¥·¥å¤·¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ï¼¡²ó¤«¤é
-    (¼±ÊÌ̾¤¬¥µ¡¼¥Ð¤Î¥­¥ã¥Ã¥·¥å¤Ç´ü¸ÂÀÚ¤ì¤Ë¤Ê¤ë¤Þ¤Ç¤Ï)
-    ¥Ï¥ó¥É¥·¥§¡¼¥¯¤Ê¤·¤ÇÀܳ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-    </div>
-
-    <p class="figure">
-    <img src="../images/ssl_intro_fig1.gif" alt="" width="423" height="327" /><br />
-    <a id="figure1" name="figure1"><dfn>¿Þ1</dfn></a>: SSL
-    ¥Ï¥ó¥É¥·¥§¡¼¥¯¥·¡¼¥¯¥¨¥ó¥¹³µÎ¬</p>
-
-    <p>¥µ¡¼¥Ð¤È¥¯¥é¥¤¥¢¥ó¥È¤Ç»È¤ï¤ì¤ë
-    ¥Ï¥ó¥É¥·¥§¡¼¥¯¥·¡¼¥¯¥¨¥ó¥¹¤ÎÍ×ÁǤò°Ê²¼¤Ë¼¨¤·¤Þ¤¹:</p>
-
-    <ol>
-    <li>¥Ç¡¼¥¿ÄÌ¿®¤Ë»È¤ï¤ì¤ë°Å¹æ¥¹¥¤¡¼¥È¤Î¼è¤ê·è¤á</li>
-    <li>¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð´Ö¤Ç¤Î¥»¥Ã¥·¥ç¥ó¸°¤Î³ÎΩ¤È¶¦Í­</li>
-    <li>¥ª¥×¥·¥ç¥ó¤È¤·¤Æ¡¢¥¯¥é¥¤¥¢¥ó¥È¤ËÂФ¹¤ë¥µ¡¼¥Ð¤Îǧ¾Ú</li>
-    <li>¥ª¥×¥·¥ç¥ó¤È¤·¤Æ¡¢¥µ¡¼¥Ð¤ËÂФ¹¤ë¥¯¥é¥¤¥¢¥ó¥È¤Îǧ¾Ú</li>
-    </ol>
-
-    <p>Âè°ì¥¹¥Æ¥Ã¥×¤Î°Å¹æ¥¹¥¤¡¼¥È¼è¤ê·è¤á¤Ë¤è¤Ã¤Æ¡¢
-    ¥µ¡¼¥Ð¤È¥¯¥é¥¤¥¢¥ó¥È¤Ï¤½¤ì¤¾¤ì¤Ë¤¢¤Ã¤¿
-    °Å¹æ¥¹¥¤¡¼¥È¤òÁª¤Ö¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    SSL3.0 ¥×¥í¥È¥³¥ë¤Î»ÅÍͽñ¤Ï 31 ¤Î°Å¹æ¥¹¥¤¡¼¥È¤òÄêµÁ¤·¤Æ¤¤¤Þ¤¹¡£
-    °Å¹æ¥¹¥¤¡¼¥È¤Ï°Ê²¼¤Î¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Ë¤è¤êÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹:</p>
-
-    <ul>
-    <li>¸°¤Î¸ò´¹¼êÃÊ</li>
-    <li>¥Ç¡¼¥¿ÄÌ¿®¤Î°Å¹æ½Ñ</li>
-    <li>Message Authentication Code (MAC) ºîÀ®¤Î¤¿¤á¤Î
-    ¥á¥Ã¥»¡¼¥¸¥À¥¤¥¸¥§¥¹¥È</li>
-    </ul>
-
-    <p>¤³¤ì¤é¤Î»°¤Ä¤ÎÍ×ÁǤϰʲ¼¤Î¥»¥¯¥·¥ç¥ó¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-
-
-<h3><a name="keyexchange" id="keyexchange">¸°¤Î¸ò´¹¼êÃÊ</a></h3>
-
-    <p>¸°¤Î¸ò´¹¼êÃʤϥ¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥Ç¡¼¥¿ÄÌ¿®¤Ë»È¤ï¤ì¡¢
-    ¶¦Í­¤µ¤ì¤ëÂоΰŹ渰¤ò¤É¤Î¤è¤¦¤Ë¤¬¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð¤Ç
-    ¼è¤ê·è¤á¤ë¤«¤òÄêµÁ¤·¤Þ¤¹¡£
-    SSL 2.0 ¤Ï RSA ¸°¸ò´¹¤·¤«»È¤¤¤Þ¤»¤ó¤¬¡¢
-    SSL 3.0 ¤Ï¾ÚÌÀ½ñ¤¬»È¤ï¤ì¤ë¤È¤­¤Ï RSA ¸°¸ò´¹¤ò»È¤¤¡¢
-    ¾ÚÌÀ½ñ¤¬Ìµ¤¯¡¢¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð¤Î»öÁ°¤ÎÄÌ¿®¤¬Ìµ¤¤¾ì¹ç¤Ï
-    Diffie-Hellman ¸°¸ò´¹¤ò»È¤¦
-    ¤Ê¤ÉÍÍ¡¹¤Ê¸°¸ò´¹¥¢¥ë¥´¥ê¥º¥à¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£</p>
-
-    <p>¸°¤Î¸ò´¹ÊýË¡¤Ë¤ª¤±¤ë°ì¤Ä¤ÎÁªÂò»è¤ÏÅŻҽð̾¤Ç¤¹¡£
-    ÅŻҽð̾¤ò»È¤¦¤«¤É¤¦¤«¡¢¤Þ¤¿¡¢
-    ¤É¤Î¼ïÎà¤Î½ð̾¤ò»È¤¦¤«¤È¤¤¤¦ÁªÂò¤¬¤¢¤ê¤Þ¤¹¡£
-    ÈëÌ©¸°¤Ç½ð̾¤¹¤ë¤³¤È¤Ç¶¦Í­¸°¤òÀ¸À®¤¹¤·¡¢¾ðÊó¸ò´¹¤¹¤ë»þ¤Î
-    ¥Þ¥ó¡¦¥¤¥ó¡¦¥¶¡¦¥ß¥É¥ë¹¶·â¤òËɤ°¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    [<a href="#AC96">AC96</a>, p516]</p>
-
-
-<h3><a name="ciphertransfer" id="ciphertransfer">¥Ç¡¼¥¿ÄÌ¿®¤Î°Å¹æ½Ñ</a></h3>
-
-    <p>SSL ¤Ï¥»¥Ã¥·¥ç¥ó¤Î¥á¥Ã¥»¡¼¥¸¤Î°Å¹æ²½¤ËÁ°½Ò¤·¤¿
-    ½¾Íè·¿°Å¹æ(ÂоΰŹæ)¤òÍѤ¤¤Þ¤¹¡£
-    °Å¹æ²½¤·¤Ê¤¤¤È¤¤¤¦ÁªÂò»è¤â´Þ¤á¶å¤Ä¤ÎÁªÂò»è¤¬¤¢¤ê¤Þ¤¹:</p>
-
-    <ul>
-    <li>°Å¹æ²½¤Ê¤·</li>
-    <li>¥¹¥È¥ê¡¼¥à°Å¹æ
-        <ul>
-        <li>40-bit ¸°¤Ç¤Î RC4</li>
-        <li>128-bit ¸°¤Ç¤Î RC4</li>
-        </ul></li>
-    <li>CBC ¥Ö¥í¥Ã¥¯°Å¹æ
-        <ul><li>40 bit ¸°¤Ç¤Î RC2</li>
-        <li>40 bit ¸°¤Ç¤Î DES</li>
-        <li>56 bit ¸°¤Ç¤Î DES</li>
-        <li>168 bit ¸°¤Ç¤Î Triple-DES</li>
-        <li>Idea (128 bit ¸°)</li>
-        <li>Fortezza (96 bit ¸°)</li>
-        </ul></li>
-    </ul>
-
-    <p>¤³¤³¤Ç¤Î CBC ¤È¤Ï°Å¹æ¥Ö¥í¥Ã¥¯Ï¢º¿ (Cipher Block Chaining)
-     ¤Îά¤Ç¡¢°ì¤ÄÁ°¤Î°Å¹æ²½¤µ¤ì¤¿°Å¹æʸ¤Î°ìÉô¤¬
-    ¥Ö¥í¥Ã¥¯¤Î°Å¹æ²½¤Ë»È¤ï¤ì¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
-    DES ¤Ï¥Ç¡¼¥¿°Å¹æ²½É¸½àµ¬³Ê (Data Encryption Standard)
-     [<a href="#AC96">AC96</a>, ch12] ¤Îά¤Ç¡¢
-    DES40 ¤ä 3DES_EDE ¤ò´Þ¤à¤¤¤¯¤Ä¤â¤Î¼ïÎब¤¢¤ê¤Þ¤¹¡£
-    Idea ¤ÏºÇ¹â¤Ê¤â¤Î¤Î°ì¤Ä¤Ç¡¢°Å¹æ½ÑŪ¤Ë¤Ï¸½ºß¤¢¤ëÃæ¤Ç
-    ºÇ¤â¶¯ÎϤʤâ¤Î¤Ç¤¹¡£
-    RC2 ¤Ï RSA DSI ¤Ë¤è¤ëÆÈÀêŪ¤Ê¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹¡£
-     [<a href="#AC96">AC96</a>,
-    ch13]</p>
-
-
-<h3><a name="digestfuntion" id="digestfuntion">¥À¥¤¥¸¥§¥¹¥È´Ø¿ô</a></h3>
-
-    <p>
-    ¥À¥¤¥¸¥§¥¹¥È´Ø¿ô¤ÎÁªÂò¤Ï¥ì¥³¡¼¥É¥æ¥Ë¥Ã¥È¤«¤é¤É¤Î¤è¤¦¤Ë¥À¥¤¥¸¥§¥¹¥È¤¬À¸À®¤µ¤ì¤ë¤«¤ò·èÄꤷ¤Þ¤¹¡£
-    SSL ¤Ï°Ê²¼¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹:</p>
-
-    <ul>
-    <li>¥À¥¤¥¸¥§¥¹¥È¤Ê¤·</li>
-    <li>MD5 (128-bit ¥Ï¥Ã¥·¥å)</li>
-    <li>Secure Hash Algorithm (SHA-1) (160-bit ¥Ï¥Ã¥·¥å)</li>
-    </ul>
-
-    <p>¥á¥Ã¥»¡¼¥¸¥À¥¤¥¸¥§¥¹¥È¤Ï Message Authentication Code (MAC) 
-    ¤ÎÀ¸À®¤Ë»È¤ï¤ì¡¢¥á¥Ã¥»¡¼¥¸¤È¶¦¤Ë°Å¹æ²½¤µ¤ì¡¢¥á¥Ã¥»¡¼¥¸¤Î¿®ÍѤò
-    Ä󶡤·¡¢¥ê¥×¥ì¥¤¹¶·â¤òËɤ®¤Þ¤¹¡£</p>
-
-
-<h3><a name="handshake" id="handshake">¥Ï¥ó¥É¥·¥§¡¼¥¯¥·¡¼¥¯¥¨¥ó¥¹¥×¥í¥È¥³¥ë</a></h3>
-
-    <p>¥Ï¥ó¥É¥·¥§¡¼¥¯¥·¡¼¥¯¥¨¥ó¥¹¤Ï»°¤Ä¤Î¥×¥í¥È¥³¥ë¤ò»È¤¤¤Þ¤¹:</p>
-
-    <ul>
-    <li><dfn>SSL ¥Ï¥ó¥É¥·¥§¡¼¥¯¥×¥í¥È¥³¥ë</dfn>¤Ï
-    ¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð´Ö¤Ç¤Î SSL ¥»¥Ã¥·¥ç¥ó¤Î³ÎΩ¤Ë»È¤ï¤ì¤Þ¤¹¡£</li>
-    <li><dfn>SSL °Å¹æ»ÅÍÍÊѹ¹¥×¥í¥È¥³¥ë</dfn>¤Ï
-    ¥»¥Ã¥·¥ç¥ó¤Ç¤Î°Å¹æ¥¹¥¤¡¼¥È¤Î¼è¤ê·è¤á¤Ë»È¤ï¤ì¤Þ¤¹¡£</li>
-    <li><dfn>SSL ·Ù¹ð¥×¥í¥È¥³¥ë</dfn>¤Ï
-    ¥¯¥é¥¤¥¢¥ó¥È¥µ¡¼¥Ð´Ö¤Ç SSL ¥¨¥é¡¼¤òÅÁ㤹¤ë¤Î¤Ë»È¤ï¤ì¤Þ¤¹¡£</li>
-    </ul>
-
-    <p>»°¤Ä¤Î¥×¥í¥È¥³¥ë¤Ï¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥×¥í¥È¥³¥ë¥Ç¡¼¥¿¤È¤È¤â¤Ë¡¢
-    <a href="#figure2">¿Þ2</a>¤Ë¼¨¤¹¤È¤ª¤ê <dfn>SSL ¥ì¥³¡¼¥É¥×¥í¥È¥³¥ë</dfn>
-    ¤Ç¥«¥×¥»¥ë²½¤µ¤ì¤Þ¤¹¡£
-    ¥«¥×¥»¥ë²½¤µ¤ì¤¿¥×¥í¥È¥³¥ë¤Ï¥Ç¡¼¥¿¤ò¸¡ºº¤·¤Ê¤¤
-    ²¼ÁؤΥץí¥È¥³¥ë¤Ë¤è¤Ã¤Æ¥Ç¡¼¥¿¤È¤·¤ÆÅÁ㤵¤ì¤Þ¤¹¡£
-    ¥«¥×¥»¥ë²½¤µ¤ì¤¿¥×¥í¥È¥³¥ë¤Ï²¼ÁؤΥץí¥È¥³¥ë¤Ë´Ø¤·¤Æ°ìÀÚ´ØÃΤ·¤Þ¤»¤ó¡£</p>
-
-    <p class="figure">
-    <img src="../images/ssl_intro_fig2.gif" alt="" width="428" height="217" /><br />
-    <a id="figure2" name="figure2"><dfn>¿Þ2</dfn></a>: SSL ¥×¥í¥È¥³¥ë¥¹¥¿¥Ã¥¯
-    </p>
-
-    <p>
-    ¥ì¥³¡¼¥É¥×¥í¥È¥³¥ë¤Ë¤è¤ë SSL ¥³¥ó¥È¥í¡¼¥ë¥×¥í¥È¥³¥ë¤Î¥«¥×¥»¥ë²½¤Ï¡¢
-    ¥¢¥¯¥Æ¥£¥Ö¤Ê¥»¥Ã¥·¥ç¥ó¤ÎÆó²óÌܤÎÄÌ¿®¤¬¤¢¤Ã¤¿¾ì¹ç¡¢
-    ¥³¥ó¥È¥í¡¼¥ë¥×¥í¥È¥³¥ë¤¬°ÂÁ´¤Ç¤¢¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
-    ´û¤Ë¥»¥Ã¥·¥ç¥ó¤¬Ìµ¤¤¾ì¹ç¤Ï¡¢Null °Å¹æ¥¹¥¤¡¼¥È¤¬»È¤ï¤ì¡¢
-    °Å¹æ²½¤Ï¹Ô¤Ê¤ï¤ì¤º¡¢¥»¥Ã¥·¥ç¥ó¤¬³ÎΩ¤¹¤ë¤Þ¤Ç¤Ï
-    ¥À¥¤¥¸¥§¥¹¥È¤â̵¤¤¾õÂ֤Ȥʤê¤Þ¤¹¡£</p>
-
-
-<h3><a name="datatransfer" id="datatransfer">¥Ç¡¼¥¿ÄÌ¿®</a></h3>
-
-    <p><a href="#figure3">¿Þ3</a>¤Ë¼¨¤µ¤ì¤ë SSL ¥ì¥³¡¼¥É¥×¥í¥È¥³¥ë
-    ¤Ï¥¯¥é¥¤¥¢¥ó¥È¤È¥µ¡¼¥Ð´Ö¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ä
-    SSL ¥³¥ó¥È¥í¡¼¥ë¥Ç¡¼¥¿¤ÎÄÌ¿®¤Ë»È¤ï¤ì¤Þ¤¹¡£
-    ¤³¤Î¥Ç¡¼¥¿¤Ï¤è¤ê¾®¤µ¤¤¥æ¥Ë¥Ã¥È¤Ëʬ¤±¤é¤ì¤¿¤ê¡¢
-    ¤¤¤¯¤Ä¤«¤Î¹âµé¥×¥í¥È¥³¥ë¤ò¤Þ¤È¤á¤Æ°ì¥æ¥Ë¥Ã¥È¤È¤·¤ÆÄÌ¿®¤¬
-    ¹Ô¤Ê¤ï¤ì¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¡£
-    ¥Ç¡¼¥¿¤ò°µ½Ì¤·¡¢¥À¥¤¥¸¥§¥¹¥È½ð̾¤òźÉÕ¤·¤Æ¡¢
-    ¤³¤ì¤é¤Î¥æ¥Ë¥Ã¥È¤ò°Å¹æ²½¤·¤¿¤Î¤Á¡¢¥Ù¡¼¥¹¤È¤Ê¤Ã¤Æ¤¤¤ë
-    ¿®ÍêÀ­¤Î¤¢¤ë¥È¥é¥ó¥¹¥Ý¡¼¥È¥×¥í¥È¥³¥ë¤òÍѤ¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-    (Ãí°Õ: ¸½ºß¥á¥¸¥ã¡¼¤Ê SLL ¼ÂÁõ¤Ç°µ½Ì¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¤â¤Î¤Ï¤¢¤ê¤Þ¤»¤ó)</p>
-
-    <p class="figure">
-    <img src="../images/ssl_intro_fig3.gif" alt="" width="423" height="323" /><br />
-    <a id="figure3" name="figure3"><dfn>¿Þ 3</dfn></a>: SSL ¥ì¥³¡¼¥É¥×¥í¥È¥³¥ë
-    </p>
-
-
-<h3><a name="securehttp" id="securehttp">HTTP ÄÌ¿®¤Î°ÂÁ´²½</a></h3>
-
-    <p>¤è¤¯¤¢¤ë SSL ¤Î»È¤¤Êý¤Ï¥Ö¥é¥¦¥¶¤È¥¦¥§¥Ö¥µ¡¼¥Ð´Ö¤Î HTTP ÄÌ¿®
-    ¤Î°ÂÁ´²½¤Ç¤¹¡£
-    ¤³¤ì¤Ï¡¢½¾Íè¤Î°ÂÁ´¤Ç¤Ï¤Ê¤¤ HTTP ¤Î»ÈÍѤò½ü³°¤¹¤ë¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-    °ÂÁ´²½¤µ¤ì¤¿¤â¤Î¤Ï¼ç¤Ë SSH ¾å¤ÎÉáÄ̤ΠHTTP ¤Ç¡¢HTTPS ¤È¸Æ¤Ð¤ì¤Þ¤¹¡£
-    Â礭¤Ê°ã¤¤¤Ï¡¢URL ¥¹¥­¡¼¥à¤Ë <code>http</code> ¤ÎÂå¤ï¤ê¤Ë <code>https</code>
-    ¤òÍѤ¤¡¢¥µ¡¼¥Ð¤¬Ê̤Υݡ¼¥È¤ò»È¤¦¤³¤È¤Ç¤¹ (¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï443)¡£
-    ¤³¤ì¤¬¼ç¤Ë <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> ¤¬ Apache ¥¦¥§¥Ö¥µ¡¼¥Ð¤ËÄ󶡤¹¤ëµ¡Ç½¤Ç¤¹¡£</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="references" id="references">»²¹Íʸ¸¥</a></h2>
-
-<dl>
-<dt><a id="AC96" name="AC96">[AC96]</a></dt>
-<dd>Bruce Schneier, <q>Applied Cryptography</q>, 2nd Edition, Wiley,
-1996. See <a href="http://www.counterpane.com/">http://www.counterpane.com/</a> for various other materials by Bruce
-Schneier.</dd>
-
-<dt><a id="X208" name="X208">[X208]</a></dt>
-<dd>ITU-T Recommendation X.208, <q>Specification of Abstract Syntax Notation
-One (ASN.1)</q>, 1988. See for instance <a href="http://www.itu.int/rec/recommendation.asp?type=items&amp;lang=e&amp;parent=T-REC-X.208-198811-I">http://www.itu.int/rec/recommendation.asp?type=items&amp;lang=e&amp;parent=T-REC-X.208-198811-I</a>.
-</dd>
-
-<dt><a id="X509" name="X509">[X509]</a></dt>
-<dd>ITU-T Recommendation X.509, <q>The Directory - Authentication
-Framework</q>. See for instance <a href="http://www.itu.int/rec/recommendation.asp?type=folders&amp;lang=e&amp;parent=T-REC-X.509">http://www.itu.int/rec/recommendation.asp?type=folders&amp;lang=e&amp;parent=T-REC-X.509</a>.
-</dd>
-
-<dt><a id="PKCS" name="PKCS">[PKCS]</a></dt>
-<dd><q>Public Key Cryptography Standards (PKCS)</q>, 
-RSA Laboratories Technical Notes, See <a href="http://www.rsasecurity.com/rsalabs/pkcs/">http://www.rsasecurity.com/rsalabs/pkcs/</a>.</dd>
-
-<dt><a id="MIME" name="MIME">[MIME]</a></dt>
-<dd>N. Freed, N. Borenstein, <q>Multipurpose Internet Mail Extensions
-(MIME) Part One: Format of Internet Message Bodies</q>, RFC2045.
-See for instance <a href="http://ietf.org/rfc/rfc2045.txt">http://ietf.org/rfc/rfc2045.txt</a>.</dd>
-
-<dt><a id="SSL2" name="SSL2">[SSL2]</a></dt>
-<dd>Kipp E.B. Hickman, <q>The SSL Protocol</q>, 1995. See <a href="http://www.netscape.com/eng/security/SSL_2.html">http://www.netscape.com/eng/security/SSL_2.html</a>.</dd>
-
-<dt><a id="SSL3" name="SSL3">[SSL3]</a></dt>
-<dd>Alan O. Freier, Philip Karlton, Paul C. Kocher, <q>The SSL Protocol
-Version 3.0</q>, 1996. See <a href="http://www.netscape.com/eng/ssl3/draft302.txt">http://www.netscape.com/eng/ssl3/draft302.txt</a>.</dd>
-
-<dt><a id="TLS1" name="TLS1">[TLS1]</a></dt>
-<dd>Tim Dierks, Christopher Allen, <q>The TLS Protocol Version 1.0</q>,
-1999. See <a href="http://ietf.org/rfc/rfc2246.txt">http://ietf.org/rfc/rfc2246.txt</a>.</dd>
-</dl>
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/ssl/ssl_intro.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../ja/ssl/ssl_intro.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/ssl/ssl_intro.html.ja.utf8 b/docs/manual/ssl/ssl_intro.html.ja.utf8
new file mode 100644
index 00000000..c3650237
--- /dev/null
+++ b/docs/manual/ssl/ssl_intro.html.ja.utf8
@@ -0,0 +1,697 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>SSL/TLS 暗�化: ���� - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">SSL/TLS</a></div><div id="page-content"><div id="preamble"><h1>SSL/TLS 暗�化: ����</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/ssl/ssl_intro.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/ssl/ssl_intro.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+
+<blockquote>
+<p>標準�格�良�所�����ん��格�ら��る������。
+����も�本当����格も気�入ら��れ��
+一年待����探�����格��れる。</p>
+
+<p class="cite">-- <cite>A. Tanenbaum</cite>, "Introduction to
+Computer Networks"</p>
+</blockquote>
+
+<p>
+入門���������章� Web�HTTP�Apache �通���る
+読者������セキュリティ専門家�����り��ん。
+SSL プロトコル�決定的�手引���る�もり��り��ん。
+���組織内��証管�����特定�テクニックや�
+特許や輸出�制������法的��題����も扱���ん。
+む���更�る研究��出発点���色々�概念�定義�例を並�る���
+ mod_ssl �ユーザ�基礎知識を�供�る事を目的������。</p>
+
+<p>���示�れ�内容�主��原著者�許��下
+The Open Group Research Institute � <a href="http://home.earthlink.net/~fjhirsch/">Frederick J. Hirsch</a>
+ ��記事 <a href="http://home.earthlink.net/~fjhirsch/Papers/wwwj/article.html">
+Introducing SSL and Certificates using SSLeay</a> を基������。
+��記事� <a href="http://www.ora.com/catalog/wjsum97/">Web Security: A Matter of
+Trust</a>, World Wide Web Journal, Volume 2, Issue 3, Summer 1997
+�掲載�れ���。
+肯定的��見� <a href="mailto:hirsch@fjhirsch.com">Frederick Hirsch</a> �
+ (元記事�著者) �全��苦情� <a href="mailto:rse@engelschall.com">Ralf S. Engelschall</a> (
+<code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> �作者) ��願����。
+[訳注: 訳����� <a href="mailto:apache-docs@ml.apache.or.jp">
+Apache ドキュメント翻訳プロジェクト</a>
+��願����。]</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#cryptographictech">暗�化技術</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#certificates">証明書</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ssl">Secure Sockets Layer (SSL)</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#references">�考文献</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="cryptographictech" id="cryptographictech">暗�化技術</a></h2>
+
+<p>SSL を�解�る���暗�アルゴリズム�
+メッセージダイジェスト関数(別�: 一方�関数��ッシュ関数)�
+電�署������解�必���。
+�れら�技術�本�丸��必��題目�
+(例�� [<a href="#AC96">AC96</a>] を�照)�
+プライ�シー�信用��証���技術�基礎�������。</p>
+
+<h3><a name="cryptographicalgo" id="cryptographicalgo">暗�アルゴリズム</a></h3>
+
+    <p>例���アリス��金����銀行�メッセージを�り������。
+    �座番�や�金�金����れる���
+    アリス���メッセージを秘密���������。
+    解決方法�一��暗�アルゴリズムを使���メッセージを
+    読����人以外�読む�������暗�化�れ�
+    形態�変���������。
+    ��形態��る��
+    メッセージ�秘密���よ����解釈�る�������。
+    ������メッセージ�役�立���ん。
+    良�暗�アルゴリズム��侵入者�元�テキストを解読�る��を
+    �常�難���る���努力�割���������。</p>
+
+    <p>暗�アルゴリズム��
+    従�型�公開��二��種類��り��。</p>
+
+    <dl>
+    <dt>従�型暗�</dt>
+    <dd>対称暗����も知られ�
+    �信者��信者��を共有�る���必���。
+    ����メッセージを暗�化��り復��る��使�れる秘密
+    �情報�����。
+    も������秘密�ら��信者��信者以外�誰もメッセージを読
+    む�������ん。
+    も�も�アリス�銀行�秘密��を知���る�ら�
+    彼ら��互��秘密�メッセージを�る�����る��ょ�。
+    ����事��内密��を�����仕事��題を�ん����。</dd>
+
+    <dt>公開�暗�</dt>
+    <dd>�対称暗����も知られ�
+    メッセージを暗�化�る�����る二���
+    を使用�るアルゴリズムを定義�る�����やり�り��題を解決
+    ���。
+    も���る��暗�化�使�れ��ら�
+    も�片方���復����れ�����ん。
+    ��方��よ���一���を公表��(公開�)�
+    も�片方を秘密�����(秘密�)����
+    安全�メッセージを���る�������。</dd>
+    </dl>
+
+    <p>誰も�暗�化�れ�メッセージを公開��よ��暗�化
+    �る���������秘密����主����れを読む���
+    ����。
+    ��方法��銀行�公開�を使��暗�化�る����
+    アリス�秘密�メッセージを�る�������。
+    銀行���復��る�������。</p>
+
+
+<h3><a name="messagedigests" id="messagedigests">メッセージダイジェスト</a></h3>
+
+    <p>アリス�メッセージを秘密��る���������
+    誰��例��自分��金�るよ��メッセージを変更��り�
+    別�も��置��������も�れ������題��り��。
+    アリス�メッセージ�信用を�証�る方法�一���
+    メッセージ�簡潔�ダイジェストを作����れも銀行��る���も���。
+    メッセージを���る�銀行もダイジェストを作���
+    アリス����も��比���。も�一致���ら�
+    �����メッセージ�無傷��������り��。</p>
+
+    <p>��よ���約�<dfn>メッセージダイジェスト</dfn>�
+    <em>一方行関数</em>����<em>�ッシュ関数</em>�呼�れ��。
+    メッセージダイジェスト�長��変長�メッセージ�ら
+    短�固定長�表�を作る��使�れ��。
+    ダイジェストアルゴリズム�メッセージ�ら
+    一��ダイジェストを生��るよ��作られ����。
+    メッセージダイジェスト�ダイジェスト�ら元�メッセージを
+    判定�る����も難��よ��������。
+    ������約を作��る二��メッセージを探�����能��。
+    よ������約を使��メッセージを置���る���
+    �能性を排除�����。</p>
+
+<p>アリス��も�一���題����ダイジェストを安全��る方法を探�����。
+�れ���れ��メッセージ�信用��証�れ��。
+一��方法���ダイジェスト�電�署�を�む����。</p>
+
+
+<h3><a name="digitalsignatures" id="digitalsignatures">電�署�</a></h3>
+<p>アリス�銀行�メッセージを������銀行��
+侵入者�彼女��り����彼女��座���引を申請�������
+メッセージ�本当�彼女�ら�も��確実�分�ら��れ�����ん。
+アリス�よ��作��れ�メッセージ���れ�
+<em>電�署�</em>����役�立���。</p>
+
+<p>電�署��メッセージ�ダイジェストや��他�情報(処�番���)を
+�信者�秘密��暗�化�る���作られ��。
+誰も�公開�を使��署�を<em>復�</em>�る���������
+署�者���秘密�を知�����。
+�れ��彼ら���署������を�味���。
+ダイジェストを電�署���む����
+��署����メッセージ���有効��る��を�味���。
+�れ��誰もダイジェストを変��署�を�る����������
+メッセージ�信用も�証���。</p>
+
+<p>侵入者�署�を����後日��利用�る�を防���
+電�署���一��処�番����れ��。
+�れ��アリス��ん�メッセージ��������言��欺
+�ら銀行を守り��。
+彼女���署�����ら��。(��防止)</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="certificates" id="certificates">証明書</a></h2>
+
+<p>アリス�秘密�メッセージを銀行��り�
+署�を���メッセージ�信用を�証�る�����る����り�����
+通信���る相手�本当�銀行���確����������ん。
+�れ��彼女�使�公開��銀行�秘密��対�����るも���
+彼女�確���������������を�味���。
+�様��銀行�メッセージ�署��本当�アリス�署��確��る必��
+�り��。</p>
+
+<p>も�両者�身元を証明��公開�を確�����信頼�れ�機関�署�
+��証明書��れ��両者�も通信相手����正��相手��
+確信�る�������。
+��よ��信頼�れ�機関�<em>�証局</em>
+ (Certificate Authority ��� CA) �呼�れ�
+証明書 (certificate) ��証 (authentication) �使�れ��。</p>
+
+<h3><a name="certificatecontents" id="certificatecontents">証明書�内容</a></h3>
+
+    <p>証明書�公開��個人�サー����他�主体�実在�身元を
+    関連付���。
+    <a href="#table1">表1</a>�示�れるよ��証明対象�情報�
+    身元証明�情報(識別�)�公開����れ��。
+    証明書�����証局�身元証明�署�����証明書�有効期間を
+    ����。
+    シリアルナン�ー����証局�管�上�情報や
+    ��他�追加�情報���れ��る�も�れ��ん。</p>
+
+    <h4><a name="table1" id="table1">表1: 証明書情報</a></h4>
+    
+    <table>
+    
+    <tr><th>証明対象</th>
+        <td>識別��公開�</td></tr>
+    <tr><th>発行者</th>
+        <td>識別��公開�</td></tr>
+    <tr><th>有効期間</th>
+        <td>開始日�失効日</td></tr>
+    <tr><th>管�情報</th>
+        <td>�ージョン�シリアルナン�ー</td></tr>
+    <tr><th>拡張情報</th>
+        <td>基本的�制約��ットスケープフラッグ���他</td></tr>
+    </table>
+    
+
+    <p>識別�(ディスティングイッシュ・�ーム)�特定�状����る
+    身分証明を�供�る��使�れ����。例����る人�
+    �用�会社��別々�身分証明を���も�れ��ん。
+    
+    識別�� X.509 標準�格 [<a href="#X509">X509</a>] �定義�れ����。
+    X.509 標準�格��項目�項目�����項目�略称を定義�����。(<a href="#table2">表
+    2</a> �照)</p>
+
+    <h4><a name="table2" id="table2">表 2: 識別�情報</a></h4>
+    
+    <table class="bordered">
+    
+    <tr><th>識別�項目</th>
+        <th>略称</th>
+        <th>説明</th>
+        <th>例</th></tr>
+    <tr><td>Common Name (コモン�ーム)</td>
+        <td>CN</td>
+        <td>�証�れる��<br />
+        SSL接続�るURL</td>
+        <td>CN=www.example.com</td></tr>
+    <tr><td>Organization or Company (組織�)</td>
+        <td>O</td>
+        <td>団体�正�英語組織�</td>
+        <td>O=Example Japan K.K.</td></tr>
+    <tr><td>Organizational Unit (部門�)</td>
+        <td>OU</td>
+        <td>部署���</td>
+        <td>OU=Customer Service</td></tr>
+    <tr><td>City/Locality (市区町�)</td>
+        <td>L</td>
+        <td>所在��る市区町�</td>
+        <td>L=Sapporo</td></tr>
+    <tr><td>State/Province (都�府県)</td>
+        <td>ST</td>
+        <td>所在��る都�府県</td>
+        <td>ST=Hokkaido</td></tr>
+    <tr><td>Country(国)</td>
+        <td>C</td>
+        <td>所在���る国�� ISO コード<br />
+        日本�場� JP
+        </td>
+        <td>C=JP</td></tr>
+    </table>
+    
+
+    <p>�証局���項目��略�能��れ�必須��方�を定義�る
+    �も�れ��ん。項目�内容����も�証局や証明書�ユーザ�ら�
+    �件��る�も�れ��ん。
+    例����ットスケープ�ブラウザ�サー��証明書�
+     Common Name (コモン�ーム)�サー��ドメイン��
+     <code>*.example.com</code> 
+    ���よ��ワイルドカード�パターン�マッ��る��
+    を�求���。</p>
+
+    <p>�イナリ形��証明書� ASN.1 表記法
+     [<a href="#X208">X208</a>] [<a href="#PKCS">PKCS</a>] �
+    定義�れ����。
+    ��表記法�内容を��よ��記述�る�を定義��
+    符�化��定���情報���よ���イナリ形��変��れる�を
+    定義���。
+    証明書��イナリ符�化� Distinguished Encoding
+    Rules (DER) �定義�れ��れ�より一般的� Basic Encoding Rules
+    (BER) �基������。
+    �イナリ形�を扱���������信���
+    �イナリ形�� Base64 符�化 [<a href="#MIME">MIME</a>] �
+    ASCII 形��変��れる����り��。
+    ��よ��符�化�れ�以下�例�示�れるよ��区切り行�
+    挟�れ�も�� PEM 符�化�れ��言���。
+    (PEM ���� "Privacy Enhanced Mail" �由����)</p>
+
+    <div class="example"><h3>PEM 符�化�れ�証明書�例 (example.crt)</h3><pre>-----BEGIN CERTIFICATE-----
+MIIC7jCCAlegAwIBAgIBATANBgkqhkiG9w0BAQQFADCBqTELMAkGA1UEBhMCWFkx
+FTATBgNVBAgTDFNuYWtlIERlc2VydDETMBEGA1UEBxMKU25ha2UgVG93bjEXMBUG
+A1UEChMOU25ha2UgT2lsLCBMdGQxHjAcBgNVBAsTFUNlcnRpZmljYXRlIEF1dGhv
+cml0eTEVMBMGA1UEAxMMU25ha2UgT2lsIENBMR4wHAYJKoZIhvcNAQkBFg9jYUBz
+bmFrZW9pbC5kb20wHhcNOTgxMDIxMDg1ODM2WhcNOTkxMDIxMDg1ODM2WjCBpzEL
+MAkGA1UEBhMCWFkxFTATBgNVBAgTDFNuYWtlIERlc2VydDETMBEGA1UEBxMKU25h
+a2UgVG93bjEXMBUGA1UEChMOU25ha2UgT2lsLCBMdGQxFzAVBgNVBAsTDldlYnNl
+cnZlciBUZWFtMRkwFwYDVQQDExB3d3cuc25ha2VvaWwuZG9tMR8wHQYJKoZIhvcN
+AQkBFhB3d3dAc25ha2VvaWwuZG9tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+gQDH9Ge/s2zcH+da+rPTx/DPRp3xGjHZ4GG6pCmvADIEtBtKBFAcZ64n+Dy7Np8b
+vKR+yy5DGQiijsH1D/j8HlGE+q4TZ8OFk7BNBFazHxFbYI4OKMiCxdKzdif1yfaa
+lWoANFlAzlSdbxeGVHoT0K+gT5w3UxwZKv2DLbCTzLZyPwIDAQABoyYwJDAPBgNV
+HRMECDAGAQH/AgEAMBEGCWCGSAGG+EIBAQQEAwIAQDANBgkqhkiG9w0BAQQFAAOB
+gQAZUIHAL4D09oE6Lv2k56Gp38OBDuILvwLg1v1KL8mQR+KFjghCrtpqaztZqcDt
+2q2QoyulCgSzHbEGmi0EsdkPfg6mp0penssIFePYNI+/8u9HT4LuKMJX15hxBam7
+dUHzICxBVC1lnHyYGjDuAMhe396lYAn8bCld1/L4NMGBCQ==
+-----END CERTIFICATE-----</pre></div>
+
+
+<h3><a name="certificateauthorities" id="certificateauthorities">�証局</a></h3>
+
+    <p>��証明書�申請�情報を確��る����
+    �証局�秘密����主�身元を�証���。
+    例���アリス�個人証明書を申請����る��
+    �証局�アリス�証明書�申請�主張�る通り�
+    人物������を確����������ん。</p>
+
+    <h4><a name="certificatechains" id="certificatechains">証明書階層構造</a></h4>
+    
+        <p>�証局�他��証局��証明書を発行�る�������。
+        未知�証明書を調�る時��アリス���証明書�発行者
+        �自信���る���発行者�証明書を
+        ��上�階層��証局を����調�る必���り��。
+        「悪質��証明書��険性を減ら����
+        彼女��られ�連鎖�発行者��信頼�るよ��
+        決�る��も����。</p>
+    
+
+    <h4><a name="rootlevelca" id="rootlevelca">最上��証局�作�</a></h4>
+    
+        <p>��述��よ���全��証明書�����
+        最上���証局(CA)���れ�れ�発行者�
+        対象�身元証明�有効性を明ら���る必���り��。
+        �題��誰���最上���証機関�証明書を�証�る���
+        �������。
+        ��よ��場���り�証明書�「自己署���れ��。
+        ��り�証明書�発行者�証明対象����������り��。
+        ���果�自己署��れ�証明書を信用�る��
+        細心�注��必���。
+        最上��証局�公開�を広�公表�る����
+        ���を信頼�るリスクを低��る�������。
+        も��他人����証局��り����時���れ�露見�や
+        ���ら��。
+        多��ブラウザ�有���証局を信頼�るよ��
+        設定�れ����。</p>
+
+        <p><a href="http://www.thawte.com/">Thawte</a> 
+        ã‚„ <a href="http://www.verisign.com/">VeriSign</a> 
+        �よ��多��会社��証局���開設����。
+        ��よ��会社�以下�サービスを�供���:</p>
+
+        <ul>
+        <li>証明書申請�確�</li>
+        <li>証明書申請�処�</li>
+        <li>証明書�発行�管�</li>
+        </ul>
+
+        <p>自分��証局を作る��も�能��。
+        インター�ット環境���険����
+        個人やサー��身元証明�簡��行�る組織�
+        イントラ�ット内��役�立��も�れ��ん。</p>
+    
+
+    <h4><a name="certificatemanagement" id="certificatemanagement">証明書管�</a></h4>
+    
+        <p>�証局�開設�徹底��管��技術��用�体制を必���る
+        責任��る仕事��。
+        �証局�証明書を発行�る������
+        管�も���れ��り��ん。
+        具体的���証明書�����有効�を決定��更新��
+        ��既�発行�れ��失効��証明書�リスト
+        (Certificate Revocation Lists ��� CRL)
+        を管����れ�����ん。
+        例���アリス�会社�ら社員���証明書を与�られ�����。
+        ����アリス�会社を辞�る����証明書を�り消���れ�
+        ��������。
+        証明書�次々�人�渡�れ���も�����
+        証明書��も��ら��れ��り消�れ��判断�る���
+        ��能��。
+        よ���証明書�有効性を調�る�����
+        �証局�連絡�� CRL を照��る必���り��。
+        普通���程�自動化�れ��るも����り��ん。</p>
+
+        <div class="note"><h3>注�</h3>
+        <p>デフォルト�ブラウザ�設定�れ�����証局を使��場��
+        �証局�証明書をブラウザ�読�込ん��
+        ブラウザ����証局�よ��署��れ�サー��証明書を
+        有効化�る必���り��。
+        一度読�込�れる�����証局�よ��署��れ�全��
+        証明書を��入れる����険を伴���。</p>
+        </div>
+    
+
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ssl" id="ssl">Secure Sockets Layer (SSL)</a></h2>
+
+<p>Secure Sockets Layer プロトコル�信頼性��るコ�クション型�
+�ットワーク層�プロトコル(例���TCP/IP)�
+アプリケーション層�プロトコル(例���HTTP)
+�間�置��������。
+SSL ��相互�証�よ��サー��クライアント間�安全�通信を�
+電�署��よ��データ�完全性を�
+���暗�化�よ��プライ�シを�供���。</p>
+
+<p>SSL プロトコル�暗�化�ダイジェスト�電�署������
+様々�アルゴリズムをサ�ート�るよ��������。
+���る����法や輸出��制を考慮�入れ��サー������
+アルゴリズムを�����������新��アルゴリズムを
+利用������も�能������。
+アルゴリズム��択�プロトコルセッション開始時�
+サー��クライアント間��り決�られ��。</p>
+
+<h3><a name="table4" id="table4">表4: SSL プロトコル��ージョン</a></h3>
+
+    <table class="bordered">
+    
+    <tr><th>�ージョン</th>
+        <th>出典</th>
+        <th>説明</th>
+        <th>ブラウザ�サ�ート</th></tr>
+    <tr><td>SSL v2.0</td>
+        <td>Vendor Standard (Netscape Corp. より) [<a href="#SSL2">SSL2</a>]</td>
+        <td>実装��存�る���� SSL プロトコル</td>
+        <td>- NS Navigator 1.x/2.x<br />
+        - MS IE 3.x<br />
+        - Lynx/2.8+OpenSSL</td></tr>
+    <tr><td>SSL v3.0</td>
+        <td>Expired Internet Draft (Netscape Corp. より) [<a href="#SSL3">SSL3</a>]</td>
+        <td>特定�セキュリティ攻撃を防����改訂�
+        �RSA 暗��追加�証明書階層構造�サ�ート</td>
+        <td>- NS Navigator 2.x/3.x/4.x<br />
+        - MS IE 3.x/4.x<br />
+        - Lynx/2.8+OpenSSL</td></tr>
+    <tr><td>TLS v1.0</td>
+        <td>Proposed Internet Standard (IETF より) [<a href="#TLS1">TLS1</a>]</td>
+        <td>MAC レイヤを HMAC �更新�ブロック暗�� block
+        padding�メッセージ順��標準化�警告文�充実�����
+        SSL 3.0 を改訂。</td>
+        <td>- Lynx/2.8+OpenSSL</td></tr>
+    </table>
+
+
+<p><a href="#table4">表4</a>�示�れる��り�SSL プロトコル��
+���も��ージョン��り��。
+表�も書�れ��るよ���SSL 3.0 �利点�一��
+証明書階層構造をサ�ート�る����。
+��機能�よ���サー��自分�証明書�加���
+発行者�証明書をブラウザ�渡��������。
+証明書階層構造�よ���
+ブラウザ�発行者�証明書�直接登録�れ�����も�
+階層�中���れ��れ��
+ブラウザ�サー��証明書を有効化�る�������。
+SSL 3.0 ��在 Internet Engineering Task Force (IETF) 
+�よ��開発�れ��る Transport Layer Security 
+[<a href="#TLS1">TLS</a>] プロトコル標準�格�基礎�������。</p>
+
+<h3><a name="session" id="session">セッション�確立</a></h3>
+
+    <p><a href="#figure1">図1</a>�示�れるよ���
+    セッション�確立�クライアント�サー�間�
+    �ンドシェークシークエンス�よ��行��れ��。
+    サー��証明書を�供�る��クライアント�証明書をリクエスト�る�
+    ���サー��設定�より���シークエンス�異�るも���り��。
+    暗�情報�管������追加��ンドシェーク�程�必���る
+    場�も�り������記事��
+    よ��るシナリオを手短�説明���。
+    全���能性�����SSL 仕様書を�照������。</p>
+
+    <div class="note"><h3>注�</h3>
+    <p>一度 SSL セッション�確立�る��セッションを�利用�る����
+    セッションを開始�る���多���程を繰り返����
+    パフォーマンス��失を防���。
+    �����サー��全��セッション�一��セッション識別�を
+    割り当��サー��キャッシュ��クライアント�次回�ら
+    (識別��サー��キャッシュ�期�切れ��る���)
+    �ンドシェーク���接続�る�������。</p>
+    </div>
+
+    <p class="figure">
+    <img src="../images/ssl_intro_fig1.gif" alt="" width="423" height="327" /><br />
+    <a id="figure1" name="figure1"><dfn>図1</dfn></a>: SSL
+    �ンドシェークシークエンス概略</p>
+
+    <p>サー��クライアント�使�れる
+    �ンドシェークシークエンス��素を以下�示���:</p>
+
+    <ol>
+    <li>データ通信�使�れる暗�スイート��り決�</li>
+    <li>クライアント�サー�間��セッション��確立�共有</li>
+    <li>オプション����クライアント�対�るサー���証</li>
+    <li>オプション����サー��対�るクライアント��証</li>
+    </ol>
+
+    <p>第一ステップ�暗�スイート�り決��よ���
+    サー��クライアント��れ�れ����
+    暗�スイートを���������。
+    SSL3.0 プロトコル�仕様書� 31 �暗�スイートを定義�����。
+    暗�スイート�以下�コン�ー�ント�より定義�れ����:</p>
+
+    <ul>
+    <li>��交�手段</li>
+    <li>データ通信�暗�術</li>
+    <li>Message Authentication Code (MAC) 作�����
+    メッセージダイジェスト</li>
+    </ul>
+
+    <p>�れら�三���素�以下�セクション�説明�れ����。</p>
+
+
+<h3><a name="keyexchange" id="keyexchange">��交�手段</a></h3>
+
+    <p>��交�手段�アプリケーション�データ通信�使�れ�
+    共有�れる対称暗��を��よ���クライアント�サー��
+    �り決�る�を定義���。
+    SSL 2.0 � RSA �交���使���ん��
+    SSL 3.0 �証明書�使�れる��� RSA �交�を使��
+    証明書�無��クライアント�サー��事��通信�無�場��
+    Diffie-Hellman �交�を使�
+    ��様々��交�アルゴリズムをサ�ート���。</p>
+
+    <p>��交�方法���る一���択肢�電�署���。
+    電�署�を使���������
+    ��種類�署�を使������択��り��。
+    秘密��署��る���共有�を生����情報交��る時�
+    マン・イン・ザ・ミドル攻撃を防��������。
+    [<a href="#AC96">AC96</a>, p516]</p>
+
+
+<h3><a name="ciphertransfer" id="ciphertransfer">データ通信�暗�術</a></h3>
+
+    <p>SSL �セッション�メッセージ�暗�化��述��
+    従�型暗�(対称暗�)を用���。
+    暗�化�������択肢も������択肢��り��:</p>
+
+    <ul>
+    <li>暗�化��</li>
+    <li>ストリーム暗�
+        <ul>
+        <li>40-bit ��� RC4</li>
+        <li>128-bit ��� RC4</li>
+        </ul></li>
+    <li>CBC ブロック暗�
+        <ul><li>40 bit ��� RC2</li>
+        <li>40 bit ��� DES</li>
+        <li>56 bit ��� DES</li>
+        <li>168 bit ��� Triple-DES</li>
+        <li>Idea (128 bit �)</li>
+        <li>Fortezza (96 bit �)</li>
+        </ul></li>
+    </ul>
+
+    <p>���� CBC ��暗�ブロック連鎖 (Cipher Block Chaining)
+     �略��一���暗�化�れ�暗�文�一部�
+    ブロック�暗�化�使�れる��を�味���。
+    DES �データ暗�化標準�格 (Data Encryption Standard)
+     [<a href="#AC96">AC96</a>, ch12] �略��
+    DES40 や 3DES_EDE を�む���も�種類��り��。
+    Idea �最高�も��一���暗�術的���在�る中�
+    最も強力�も���。
+    RC2 � RSA DSI �よる独�的�アルゴリズム��。
+     [<a href="#AC96">AC96</a>,
+    ch13]</p>
+
+
+<h3><a name="digestfuntion" id="digestfuntion">ダイジェスト関数</a></h3>
+
+    <p>
+    ダイジェスト関数��択�レコードユニット�ら��よ��ダイジェスト�生��れる�を決定���。
+    SSL �以下をサ�ート���:</p>
+
+    <ul>
+    <li>ダイジェスト��</li>
+    <li>MD5 (128-bit �ッシュ)</li>
+    <li>Secure Hash Algorithm (SHA-1) (160-bit �ッシュ)</li>
+    </ul>
+
+    <p>メッセージダイジェスト� Message Authentication Code (MAC) 
+    �生��使�れ�メッセージ�共�暗�化�れ�メッセージ�信用を
+    �供��リプレイ攻撃を防���。</p>
+
+
+<h3><a name="handshake" id="handshake">�ンドシェークシークエンスプロトコル</a></h3>
+
+    <p>�ンドシェークシークエンス�三��プロトコルを使���:</p>
+
+    <ul>
+    <li><dfn>SSL �ンドシェークプロトコル</dfn>�
+    クライアント�サー�間�� SSL セッション�確立�使�れ��。</li>
+    <li><dfn>SSL 暗�仕様変更プロトコル</dfn>�
+    セッション��暗�スイート��り決��使�れ��。</li>
+    <li><dfn>SSL 警告プロトコル</dfn>�
+    クライアントサー�間� SSL エラーを���る��使�れ��。</li>
+    </ul>
+
+    <p>三��プロトコル��アプリケーションプロトコルデータ��も��
+    <a href="#figure2">図2</a>�示���り <dfn>SSL レコードプロトコル</dfn>
+    �カプセル化�れ��。
+    カプセル化�れ�プロトコル�データを検査���
+    下層�プロトコル�よ��データ������れ��。
+    カプセル化�れ�プロトコル�下層�プロトコル�関��一切関知���ん。</p>
+
+    <p class="figure">
+    <img src="../images/ssl_intro_fig2.gif" alt="" width="428" height="217" /><br />
+    <a id="figure2" name="figure2"><dfn>図2</dfn></a>: SSL プロトコルスタック
+    </p>
+
+    <p>
+    レコードプロトコル�よる SSL コントロールプロトコル�カプセル化��
+    アクティブ�セッション�二回目�通信����場��
+    コントロールプロトコル�安全��る��を�味���。
+    既�セッション�無�場���Null 暗�スイート�使�れ�
+    暗�化�行��れ��セッション�確立�る���
+    ダイジェストも無�状態��り��。</p>
+
+
+<h3><a name="datatransfer" id="datatransfer">データ通信</a></h3>
+
+    <p><a href="#figure3">図3</a>�示�れる SSL レコードプロトコル
+    �クライアント�サー�間�アプリケーションや
+    SSL コントロールデータ�通信�使�れ��。
+    ��データ�より���ユニット�分�られ�り�
+    �����高級プロトコルを����一ユニット���通信�
+    行��れる��も�り��。
+    データを圧縮��ダイジェスト署�を添付���
+    �れら�ユニットを暗�化�����ベース�����る
+    信頼性��るトランス�ートプロトコルを用�る�も�れ��ん。
+    (注�: �在メジャー� SLL 実装�圧縮をサ�ート���るも���り��ん)</p>
+
+    <p class="figure">
+    <img src="../images/ssl_intro_fig3.gif" alt="" width="423" height="323" /><br />
+    <a id="figure3" name="figure3"><dfn>図 3</dfn></a>: SSL レコードプロトコル
+    </p>
+
+
+<h3><a name="securehttp" id="securehttp">HTTP 通信�安全化</a></h3>
+
+    <p>よ��る SSL �使�方�ブラウザ�ウェブサー�間� HTTP 通信
+    �安全化��。
+    �れ��従��安全���� HTTP �使用を除外�るも����り��ん。
+    安全化�れ�も��主� SSH 上�普通� HTTP ��HTTPS �呼�れ��。
+    大������URL スキーム� <code>http</code> �代�り� <code>https</code>
+    を用��サー��別��ートを使����� (デフォルト��443)。
+    �れ�主� <code class="module"><a href="../mod/mod_ssl.html">mod_ssl</a></code> � Apache ウェブサー���供�る機能��。</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="references" id="references">�考文献</a></h2>
+
+<dl>
+<dt><a id="AC96" name="AC96">[AC96]</a></dt>
+<dd>Bruce Schneier, <q>Applied Cryptography</q>, 2nd Edition, Wiley,
+1996. See <a href="http://www.counterpane.com/">http://www.counterpane.com/</a> for various other materials by Bruce
+Schneier.</dd>
+
+<dt><a id="X208" name="X208">[X208]</a></dt>
+<dd>ITU-T Recommendation X.208, <q>Specification of Abstract Syntax Notation
+One (ASN.1)</q>, 1988. See for instance <a href="http://www.itu.int/rec/recommendation.asp?type=items&amp;lang=e&amp;parent=T-REC-X.208-198811-I">http://www.itu.int/rec/recommendation.asp?type=items&amp;lang=e&amp;parent=T-REC-X.208-198811-I</a>.
+</dd>
+
+<dt><a id="X509" name="X509">[X509]</a></dt>
+<dd>ITU-T Recommendation X.509, <q>The Directory - Authentication
+Framework</q>. See for instance <a href="http://www.itu.int/rec/recommendation.asp?type=folders&amp;lang=e&amp;parent=T-REC-X.509">http://www.itu.int/rec/recommendation.asp?type=folders&amp;lang=e&amp;parent=T-REC-X.509</a>.
+</dd>
+
+<dt><a id="PKCS" name="PKCS">[PKCS]</a></dt>
+<dd><q>Public Key Cryptography Standards (PKCS)</q>, 
+RSA Laboratories Technical Notes, See <a href="http://www.rsasecurity.com/rsalabs/pkcs/">http://www.rsasecurity.com/rsalabs/pkcs/</a>.</dd>
+
+<dt><a id="MIME" name="MIME">[MIME]</a></dt>
+<dd>N. Freed, N. Borenstein, <q>Multipurpose Internet Mail Extensions
+(MIME) Part One: Format of Internet Message Bodies</q>, RFC2045.
+See for instance <a href="http://ietf.org/rfc/rfc2045.txt">http://ietf.org/rfc/rfc2045.txt</a>.</dd>
+
+<dt><a id="SSL2" name="SSL2">[SSL2]</a></dt>
+<dd>Kipp E.B. Hickman, <q>The SSL Protocol</q>, 1995. See <a href="http://www.netscape.com/eng/security/SSL_2.html">http://www.netscape.com/eng/security/SSL_2.html</a>.</dd>
+
+<dt><a id="SSL3" name="SSL3">[SSL3]</a></dt>
+<dd>Alan O. Freier, Philip Karlton, Paul C. Kocher, <q>The SSL Protocol
+Version 3.0</q>, 1996. See <a href="http://www.netscape.com/eng/ssl3/draft302.txt">http://www.netscape.com/eng/ssl3/draft302.txt</a>.</dd>
+
+<dt><a id="TLS1" name="TLS1">[TLS1]</a></dt>
+<dd>Tim Dierks, Christopher Allen, <q>The TLS Protocol Version 1.0</q>,
+1999. See <a href="http://ietf.org/rfc/rfc2246.txt">http://ietf.org/rfc/rfc2246.txt</a>.</dd>
+</dl>
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/ssl/ssl_intro.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../ja/ssl/ssl_intro.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/stopping.html b/docs/manual/stopping.html
index 8824688c..de6c126e 100644
--- a/docs/manual/stopping.html
+++ b/docs/manual/stopping.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: stopping.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -14,10 +16,14 @@ URI: stopping.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: stopping.html.ja.euc-jp
+URI: stopping.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: stopping.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: stopping.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/stopping.html.de b/docs/manual/stopping.html.de
index 4487d5fe..b3da1216 100644
--- a/docs/manual/stopping.html.de
+++ b/docs/manual/stopping.html.de
@@ -23,7 +23,8 @@
 <a href="./es/stopping.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/stopping.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/stopping.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/stopping.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">Diese Übersetzung ist möglicherweise
             nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
@@ -301,8 +302,9 @@
 <a href="./es/stopping.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/stopping.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/stopping.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/stopping.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/stopping.html.en b/docs/manual/stopping.html.en
index ee4b8a1e..a1453814 100644
--- a/docs/manual/stopping.html.en
+++ b/docs/manual/stopping.html.en
@@ -23,7 +23,8 @@
 <a href="./es/stopping.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/stopping.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/stopping.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/stopping.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>This document covers stopping and restarting Apache on
@@ -228,8 +229,9 @@ error. See above for a method of avoiding this.</div>
 <a href="./es/stopping.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/stopping.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/stopping.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/stopping.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/stopping.html.es b/docs/manual/stopping.html.es
index 21c7715d..11d50e64 100644
--- a/docs/manual/stopping.html.es
+++ b/docs/manual/stopping.html.es
@@ -23,7 +23,8 @@
 <a href="./es/stopping.html" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/stopping.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/stopping.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/stopping.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">Esta traducción podría estar
             obsoleta. Consulte la versión en inglés de la
@@ -262,8 +263,9 @@ más arriba cómo puede solucionar este problema.</div>
 <a href="./es/stopping.html" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/stopping.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/stopping.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/stopping.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licencia bajo los términos de la <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Módulos</a> | <a href="./mod/directives.html">Directivas</a> | <a href="./faq/">Preguntas Frecuentes</a> | <a href="./glossary.html">Glosario</a> | <a href="./sitemap.html">Mapa de este sitio web</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/stopping.html.fr b/docs/manual/stopping.html.fr
index b8ca0c8f..1699505d 100644
--- a/docs/manual/stopping.html.fr
+++ b/docs/manual/stopping.html.fr
@@ -23,7 +23,8 @@
 <a href="./es/stopping.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/stopping.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/stopping.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/stopping.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>Ce document couvre l'arrêt et le redémarrage d'Apache sur
@@ -268,8 +269,9 @@ pour éviter ce problème.</div>
 <a href="./es/stopping.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="./fr/stopping.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="./ja/stopping.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/stopping.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossaire</a> | <a href="./sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/stopping.html.ja.euc-jp b/docs/manual/stopping.html.ja.euc-jp
deleted file mode 100644
index 0912fc4c..00000000
--- a/docs/manual/stopping.html.ja.euc-jp
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>Ää»ß¤ÈºÆµ¯Æ° - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>Ää»ß¤ÈºÆµ¯Æ°</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./de/stopping.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/stopping.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/stopping.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./fr/stopping.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/stopping.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-    <p>¤³¤Îʸ½ñ¤Ç¤Ï Unix ¤ËÎà»÷¤·¤¿¥·¥¹¥Æ¥à¤Ç¤Î
-    Apache ¤ÎÄä»ß¤ÈºÆµ¯Æ°¤Ë¤Ä¤¤¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹¡£
-    Windows NT, 2000, XP ¥æ¡¼¥¶¤Ï<a href="platform/windows.html#winsvc">¥µ¡¼¥Ó¥¹¤È¤·¤Æ
-    Apache ¤ò¼Â¹Ô¤¹¤ë</a>¤Ç¡¢Windows 9x, ME¥æ¡¼¥¶¤Ï<a href="platform/windows.html#wincons">¥³¥ó¥½¡¼¥ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤·¤Æ
-    Apache ¤ò¼Â¹Ô¤¹¤ë</a>¤Ç¡¢
-    ¤³¤ì¤é¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤Ç¤Î»ÈÍÑÊýË¡¤ò¤´Í÷²¼¤µ¤¤¡£</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#introduction">¥¤¥ó¥È¥í¥À¥¯¥·¥ç¥ó</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#term">µÞ¤ÊÄä»ß</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#graceful">´Ë¤ä¤«¤ÊºÆµ¯Æ°</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#hup">µÞ¤ÊºÆµ¯Æ°</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#race">ÉÕÏ¿: ¥·¥°¥Ê¥ë¤È¶¥¹ç¾õÂÖ</a></li>
-</ul><h3>»²¾È</h3><ul class="seealso"><li><code class="program"><a href="./programs/httpd.html">httpd</a></code></li><li><code class="program"><a href="./programs/apachectl.html">apachectl</a></code></li></ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="introduction" id="introduction">¥¤¥ó¥È¥í¥À¥¯¥·¥ç¥ó</a></h2>
-
-    <p>Apache ¤òÄä»ß¤·¤¿¤êºÆµ¯Æ°¤·¤¿¤ê¤¹¤ë¤¿¤á¤Ë¤Ï¡¢¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë
-    <code class="program"><a href="./programs/httpd.html">httpd</a></code> ¥×¥í¥»¥¹¤Ë¥·¥°¥Ê¥ë¤òÁ÷¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¥·¥°¥Ê¥ë¤òÁ÷¤ë¤Ë¤ÏÆó¤Ä¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£
-    °ì¤ÄÌÜ¤Ï¥×¥í¥»¥¹¤ËľÀÜ¥·¥°¥Ê¥ë¤òÁ÷¤ë unix ¤Î <code>kill</code>
-    ¥³¥Þ¥ó¥É¤ò»ÈÍѤ¹¤ëÊýË¡¤Ç¤¹¡£
-    ¥·¥¹¥Æ¥à¤ò¸«¤ì¤Ð¤¿¤¯¤µ¤ó¤Î <code class="program"><a href="./programs/httpd.html">httpd</a></code> ¤¬
-    ¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¤Î¤Ëµ¤¤¬ÉÕ¤¯¤Ç¤·¤ç¤¦¤¬¡¢¥·¥°¥Ê¥ë¤òÁ÷¤ë¤Î¤Ï
-    ¿Æ¥×¥í¥»¥¹¤À¤±¤Ç¡¢¤½¤ì°Ê³°¤Î¸Ä¡¹¤Î¥×¥í¥»¥¹¤Ë¤Ï
-    ¥·¥°¥Ê¥ë¤òÁ÷¤é¤Ê¤¤¤Ç²¼¤µ¤¤¡£¤½¤Î¿Æ¥×¥í¥»¥¹¤Î pid ¤Ï
-    <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code>
-    ¤Ë½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï¤Ä¤Þ¤ê¡¢¿Æ°Ê³°¤Î¥×¥í¥»¥¹¤Ë
-    ¥·¥°¥Ê¥ë¤òÁ÷¤ëɬÍפ¹¤é¤Ê¤¤¡¢¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
-    ¿Æ¥×¥í¥»¥¹¤ËÁ÷¤ë¤³¤È¤¬¤Ç¤­¤ë 3 ¼ïÎà¤Î¥·¥°¥Ê¥ë¤¬¤¢¤ê¤Þ¤¹:
-    <code><a href="#term">TERM</a></code>,
-    <code><a href="#hup">HUP</a></code>, 
-    <code><a href="#graceful">USR1</a></code>
-    ¤Ç¤¹¡£¤³¤ì¤é¤ÎÀâÌÀ¤Ë¤Ä¤¤¤Æ¤Ï³¤­¤ò¤´Í÷²¼¤µ¤¤¡£</p>
-
-    <p>¿Æ¥×¥í¥»¥¹¤Ë¥·¥°¥Ê¥ë¤òÁ÷¤ë¤Ë¤Ï¡¢
-    ¼¡¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¤òȯ¹Ô¤·¤Æ²¼¤µ¤¤:</p>
-
-<div class="example"><p><code>kill -TERM `cat /usr/local/apache2/logs/httpd.pid`</code></p></div>
-
-    <p><code class="program"><a href="./programs/httpd.html">httpd</a></code> ¥×¥í¥»¥¹¤Ë¥·¥°¥Ê¥ë¤òÁ÷¤ë 2 ÈÖÌܤÎÊýË¡¤Ï
-    <code>-k</code> ¤È¤¤¤¦¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç¤¹¡£
-    ²¼¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢<code>stop</code>, <code>restart</code>, 
-    <code>graceful</code> ¤ò»ØÄê¤Ç¤­¤Þ¤¹¡£
-    ¤³¤ì¤é¤Ï <code class="program"><a href="./programs/httpd.html">httpd</a></code> ¤Î°ú¿ô¤Ç¤¹¤¬¡¢
-    À©¸æÍѤΥ¹¥¯¥ê¥×¥È <code class="program"><a href="./programs/apachectl.html">apachectl</a></code> ¤Ï¤½¤ì¤é¤Î°ú¿ô¤ò¤½¤Î¤Þ¤Þ
-    <code class="program"><a href="./programs/httpd.html">httpd</a></code> ¤ËÅϤ·¤Þ¤¹¡£</p>
-
-    <p><code class="program"><a href="./programs/httpd.html">httpd</a></code> ¤Ë¥·¥°¥Ê¥ë¤òÁ÷¤Ã¤¿¸å¡¢
-    ¼Â¹Ô¾õ¶·¤ò¼¡¤Î¥³¥Þ¥ó¥É¤ÇÆɤळ¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-<div class="example"><p><code>tail -f /usr/local/apache2/logs/error_log</code></p></div>
-    <p>¤³¤³¤Ëµó¤²¤¿Îã¤Ï¡¢³Æ¼«¤Î
-    <code class="directive"><a href="./mod/core.html#serverroot">ServerRoot</a></code>
-    ¤È
-    <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code>
-    ¤ÎÀßÄê¤ËŬ¹ç¤¹¤ë¤è¤¦¤ËŬµ¹½¤Àµ¤·¤Æ²¼¤µ¤¤¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="term" id="term">µÞ¤ÊÄä»ß</a></h2>
-
-<dl><dt>¥·¥°¥Ê¥ë: TERM</dt>
-<dd><code>apachectl -k stop</code></dd>
-</dl>
-
-    <p><code>TERM</code> ¤¢¤ë¤¤¤Ï <code>stop</code> 
-    ¥·¥°¥Ê¥ë¤ò¿Æ¥×¥í¥»¥¹¤ËÁ÷¤ë¤È¡¢Â¨ºÂ¤Ë»Ò¥×¥í¥»¥¹Á´¤Æ¤ò kill ¤·¤è¤¦¤È¤·¤Þ¤¹¡£
-    »Ò¥×¥í¥»¥¹¤ò´°Á´¤Ë kill ¤·½ª¤ï¤ë¤Þ¤Ç¤Ë¿ôÉ䫤«¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-    ¤½¤Î¸å¡¢¿Æ¥×¥í¥»¥¹¼«¿È¤¬½ªÎ»¤·¤Þ¤¹¡£
-    ½èÍýÃæ¤Î¥ê¥¯¥¨¥¹¥È¤ÏÁ´¤ÆÄä»ß¤µ¤ì¡¢¤â¤Ï¤ä¥ê¥¯¥¨¥¹¥È¤ËÂФ¹¤ë
-    ±þÅú¤Ï¤µ¤ì¤Þ¤»¤ó¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="graceful" id="graceful">´Ë¤ä¤«¤ÊºÆµ¯Æ°</a></h2>
-
-<dl><dt>¥·¥°¥Ê¥ë: USR1</dt>
-<dd><code>apachectl -k graceful</code></dd>
-</dl>
-
-    <p>¿Æ¥×¥í¥»¥¹¤Ï <code>USR1</code> ¤¢¤ë¤¤¤Ï <code>graceful</code>
-    ¥·¥°¥Ê¥ë¤ò¼õ¤±¼è¤ë¤È¡¢»Ò¥×¥í¥»¥¹¤Ë¸½ºß¤Î¥ê¥¯¥¨¥¹¥È¤Î½èÍý¤Î¸å¤Ë½ªÎ»¤¹¤ë
-    (¤¢¤ë¤¤¤Ï²¿¤â¤·¤Æ¤¤¤Ê¤±¤ì¤Ð¤¹¤°¤Ë½ªÎ»¤¹¤ë)
-    ¤è¤¦¤Ë<em>½õ¸À</em>¤·¤Þ¤¹¡£
-    ¿Æ¥×¥í¥»¥¹¤ÏÀßÄê¥Õ¥¡¥¤¥ë¤òºÆÆɹþ¤·¤Æ¡¢¥í¥°¥Õ¥¡¥¤¥ë¤ò³«¤­Ä¾¤·¤Þ¤¹¡£
-    »Ò¥×¥í¥»¥¹¤¬½ù¡¹¤Ë¤Ê¤¯¤Ê¤ë¤Ë½¾¤Ã¤Æ¡¢
-    ¿·¤·¤¤<em>À¤Âå</em>¤ÎÀßÄê¤Ë¤è¤ë»Ò¥×¥í¥»¥¹¤ËÃÖ¤­´¹¤¨¤Æ¤¤¤­¤Þ¤¹¡£
-    ¤½¤·¤Æ¡¢¤³¤ì¤é¤¬¿·¤¿¤Ê¥ê¥¯¥¨¥¹¥È¤Ë¨ºÂ¤Ë±þÅú¤·»Ï¤á¤Þ¤¹¡£</p>
-
-    <div class="note">ÆÃÄê¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤Ç¤Ï <code>USR1</code>
-    ¤ò´Ë¤ä¤«¤ÊºÆµ¯Æ°¤Î¤¿¤á¤Ë»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤¬¡¢Âå¤ï¤ê¤Î¥·¥°¥Ê¥ë
-    (Î㤨¤Ð WINCH) ¤¬»ÈÍѤǤ­¤ë¤Ç¤·¤ç¤¦¡£
-    <code>apachectl graceful</code>
-    ¤È¤¤¤¦¥³¥Þ¥ó¥É¤Ï¥×¥é¥Ã¥È¥Û¡¼¥à¤Ë¹ç¤Ã¤¿¥·¥°¥Ê¥ë¤òÁ÷¤ê¤Þ¤¹¡£</div>
-
-    <p>¤³¤Î¥³¡¼¥É¤Ï¾ï¤Ë
-    MPM ¤Î¥×¥í¥»¥¹À©¸æ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÀßÄê¤ò½Å»ë¤·¤Þ¤¹¤Î¤Ç¡¢
-    ¥¯¥é¥¤¥¢¥ó¥È¤Î¥ê¥¯¥¨¥¹¥È¤ò°·¤¦¥×¥í¥»¥¹¤È¥¹¥ì¥Ã¥É¤Î¿ô¤òºÆµ¯Æ°¤Î½èÍýÃæ¤â
-    ŬÀÚ¤ÊÃͤ˰ݻý¤µ¤ì¤Þ¤¹¡£¡£¤Þ¤¿¡¢¼¡¤Î¤è¤¦¤Ë¤·¤Æ
-    <code class="directive"><a href="./mod/mpm_common.html#startservers">StartServers</a></code>
-    ¤ò¼é¤ê¤Þ¤¹:
-    ¾¯¤Ê¤¯¤È¤â 1 Éøå¤Ë <code class="directive"><a href="./mod/mpm_common.html#startservers">StartServers</a></code> ¸Ä¤Î¿·¤·¤¤»Ò¥×¥í¥»¥¹¤¬
-    À¸À®¤µ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢¤½¤Î¿ô¤Ë¤Ê¤ë¤è¤¦¤ËŬµ¹¥×¥í¥»¥¹¤òÀ¸À®¤·¤Þ¤¹¡£
-    ¤³¤ÎµóÆ°¤Ï¸½ºß¤ÎÉé²Ù¤ËÂФ·¤ÆŬÀÚ¤Ê»Ò¥×¥í¥»¥¹¤Î¿ô¤È
-    <code class="directive"><a href="./mod/mpm_common.html#startservers">StartServers</a></code> ¥Ñ¥é¥á¡¼¥¿¤Ç¤Î
-    ´õ˾¤Î¿ô¤ÎξÊý¤ò°Ý»ý¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p><code class="module"><a href="./mod/mod_status.html">mod_status</a></code> ¤ò
-    »ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢<code>USR1</code> ¥·¥°¥Ê¥ë¤¬Á÷¤é¤ì¤¿ºÝ¤Ë
-    ¥µ¡¼¥ÐÅý·×¤¬¥¼¥í¤Ë<strong>ÀßÄꤵ¤ì¤Ê¤¤</strong>¤³¤È¤Ë
-    Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ¥µ¡¼¥Ð¤¬¿·¤·¤¤¥ê¥¯¥¨¥¹¥È¤Ë±þÅúÉÔǽ¤Ê»þ´Ö¤òºÇ¾®¤Ë¤¹¤ë¤è¤¦¤Ë
-    (¥ê¥¯¥¨¥¹¥È¤Ï OS ¤Ë¤è¤Ã¤Æ¥­¥å¡¼¤ËÄɲ䵤ì¤ë¤Î¤ÇÀäÂФËʶ¼º¤Ï¤·¤Þ¤»¤ó)¡¢
-    ¤Þ¤¿Æ±»þ¤Ë¡¢´õ˾¤Î¥Á¥å¡¼¥Ë¥ó¥°¥Ñ¥é¥á¡¼¥¿¤ò¼é¤ë¤è¤¦¤Ë
-    ¥³¡¼¥É¤Ï½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
-    ¤³¤Î¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë¡¢À¤Âå¤ò¤Þ¤¿¤¬¤Ã¤¿Á´»Ò¥×¥í¥»¥¹¤ÎÄÉÀפ˻Ȥï¤ì¤Æ¤¤¤ë
-    <em>¥¹¥³¥¢¥Ü¡¼¥É</em>¤ò°Ý»ý¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-
-    <p>status ¥â¥¸¥å¡¼¥ë¤Ï¡¢´Ë¤ä¤«¤ÊºÆµ¯Æ°°ÊÁ°¤«¤é³«»Ï¤·¤Æ
-    ¥ê¥¯¥¨¥¹¥È¤Ë±þÅú¤·Â³¤±¤Æ¤¤¤ë»Ò¥×¥í¥»¥¹¤òÆÃÄꤹ¤ë¤¿¤á¤Ë¡¢
-    <code>G</code> ¤ò»È¤¦¤³¤È¤â¤·¤Þ¤¹¡£</p>
-
-    <p>¸½ºß¡¢<code>USR1</code> ¤ò»È¤¦¥í¥°°ÜÆ°¥¹¥¯¥ê¥×¥È¤Ç¤Ï¡¢
-    ºÆµ¯Æ°Á°¤Î»Ò¥×¥í¥»¥¹¤¬¥í¥°¤ò½ñ¤­½ª¤ï¤Ã¤¿¤³¤È¤ò³Î¾Ú¤¹¤ëÊýË¡¤¬
-    ¤¢¤ê¤Þ¤»¤ó¡£¸Å¤¤¥í¥°¤ËÂФ·¤Æ²¿¤«¤¹¤ëÁ°¤Ë¡¢
-    <code>USR1</code> ¥·¥°¥Ê¥ë¤òÁ÷¤Ã¤¿¸å¤¤¤¯¤é¤«Å¬Åö¤Ê»þ´ÖÂԤĤ³¤È¤ò
-    Äó°Æ¤·¤Þ¤¹¡£Î㤨¤Ð¡¢ÂÓ°è¤Î¶¹¤¤ÄÌ¿®Ï©¤Î¥æ¡¼¥¶¤Î¥ê¥¯¥¨¥¹¥È¤Î¤Û¤È¤ó¤É¤¬ 10 
-    ʬ°Ê²¼¤Ç´°Î»¤·¤Æ¤¤¤ë¤È¤¤¤¦¤³¤È¤¬Ê¬¤«¤Ã¤Æ¤¤¤ì¤Ð¡¢
-    ¸Å¤¤¥í¥°¤Ë²¿¤«¤¹¤ëÁ°¤Ë 15 ʬÂԤĤȤ¤¤¦¤³¤È¤Ç¤¹¡£</p>
-
-    <div class="note">ºÆµ¯Æ°»þ¤ËÀßÄê¥Õ¥¡¥¤¥ë¤Ë¸í¤ê¤¬¤¢¤ë¤È¡¢
-    ¿Æ¥×¥í¥»¥¹¤ÏºÆµ¯Æ°¤»¤º¤Ë¥¨¥é¡¼¤È¤È¤â¤Ë½ªÎ»¤·¤Þ¤¹¡£
-    ´Ë¤ä¤«¤ÊºÆµ¯Æ°¤Î¾ì¹ç¤Ï¡¢¿Æ¥×¥í¥»¥¹¤¬½ªÎ»¤·¤¿¸å¤Ç¤â»Ò¥×¥í¥»¥¹¤¬
-    ¼Â¹Ô¤µ¤ì¤¿¤Þ¤ÞÊüÃÖ¤µ¤ì¤¿¤ê¤â¤·¤Þ¤¹¡£
-    (ºÇ¸å¤Î¥ê¥¯¥¨¥¹¥È¤ò½èÍý¤·¤¿¸å¡Ö´Ë¤ä¤«¤Ë½ªÎ»¡×¤¹¤ë
-    »Ò¥×¥í¥»¥¹¤È¤Ê¤ê¤Þ¤¹¡£)
-    ¥µ¡¼¥Ð¤òºÆµ¯Æ°¤¹¤ëºÝ¤Ë¡¢¤³¤ì¤¬ÌäÂê¤Ë¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó
-    -- ¥µ¡¼¥Ð¤Ï listen ¤¹¤ë¥Ý¡¼¥È¤Ë¥Ð¥¤¥ó¥É¤Ç¤­¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-    ºÆµ¯Æ°¤¹¤ëÁ°¤Ë¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤Î¹½Ê¸¤ò <code>-t</code>
-    ¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô
-    (<code class="program"><a href="./programs/httpd.html">httpd</a></code> ¤ò¤´Í÷²¼¤µ¤¤)
-    ¤ò»È¤Ã¤Æ¸¡¾Ú¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ÀßÄê¥Õ¥¡¥¤¥ë¤Î°Ọ̃Ū¤ÊÆâÍƤò¹½Ê¸¤ÈƱÍͤ˸¡¾Ú¤·¤¿¤¤¾ì¹ç¤Ï¡¢
-    Èó root ¥æ¡¼¥¶¤Ç <code class="program"><a href="./programs/httpd.html">httpd</a></code> ¤òµ¯Æ°¤·¤è¤¦¤È¤¹¤ì¤Ð¤ï¤«¤ê¤Þ¤¹¡£
-    ¤â¤·¥¨¥é¡¼¤¬¤Ê¤±¤ì¤Ð¡¢¥½¥±¥Ã¥È¤ä¥í¥°¤ò³«¤³¤¦¤È¤·¤Æ
-    root ¤Ç¤Ê¤¤¤¿¤á
-    (¤â¤·¤¯¤Ï¼Â¹ÔÃæ¤Î <code class="program"><a href="./programs/httpd.html">httpd</a></code>
-    ¤¬´û¤ËɬÍפʥݡ¼¥È¤Ë¥Ð¥¤¥ó¥É¤·¤Æ¤¤¤ë¤¿¤á)
-    ¤Ë¼ºÇÔ¤¹¤ë¤Ç¤·¤ç¤¦¡£
-    ¤³¤ì°Ê³°¤ÎÍýͳ¤Çµ¯Æ°¤Ë¼ºÇÔ¤·¤¿¤Î¤Ç¤¢¤ì¤Ð¡¢
-    ¤½¤ì¤ÏÀßÄê¥Õ¥¡¥¤¥ë¤Î¥¨¥é¡¼¤Ç¡¢
-    ´Ë¤ä¤«¤ÊºÆµ¯Æ°¤ò¹Ô¤¦Á°¤Ë¤½¤Î¸í¤ê¤ò½¤Àµ¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="hup" id="hup">µÞ¤ÊºÆµ¯Æ°</a></h2>
-
-<dl><dt>¥·¥°¥Ê¥ë: HUP</dt>
-<dd><code>apachectl -k restart</code></dd>
-</dl>
-
-    <p><code>HUP</code> ¤¢¤ë¤¤¤Ï <code>restart</code> ¥·¥°¥Ê¥ë¤ò¿Æ¥×¥í¥»¥¹¤ËÁ÷¤ë¤È¡¢
-    <code>TERM</code> ¤ÈƱÍÍ¤Ë»Ò¥×¥í¥»¥¹¤ò kill ¤·¤Þ¤¹¤¬¡¢
-    ¿Æ¥×¥í¥»¥¹¤Ï½ªÎ»¤·¤Þ¤»¤ó¡£
-    ÀßÄê¥Õ¥¡¥¤¥ë¤òºÆÆɹþ¤·¤Æ¡¢¥í¥°¥Õ¥¡¥¤¥ëÁ´¤Æ¤ò³«¤­Ä¾¤·¤Þ¤¹¡£
-    ¤½¤Î¸å¡¢¿·¤·¤¤»Ò¥×¥í¥»¥¹¤òµ¯Æ°¤·¤Æ±þÅú¤ò³¤±¤Þ¤¹¡£</p>
-
-    <p><code class="module"><a href="./mod/mod_status.html">mod_status</a></code>
-    ¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢<code>HUP</code> ¤¬Á÷¤é¤ì¤¿¾ì¹ç¤Ë
-    ¥µ¡¼¥ÐÅý·×¤¬¥¼¥í¤ËÀßÄꤵ¤ì¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <div class="note">ºÆµ¯Æ°»þ¤ËÀßÄê¥Õ¥¡¥¤¥ë¤Ë¸í¤ê¤¬¤¢¤ë¤È¡¢
-    ¿Æ¥×¥í¥»¥¹¤ÏºÆµ¯Æ°¤»¤º¤Ë¥¨¥é¡¼¤È¤È¤â¤Ë½ªÎ»¤·¤Þ¤¹¡£
-    ¤³¤ì¤òÈò¤±¤ë¤Ë¤Ï¼¡¤ÎÊýË¡¤ò¤´Í÷²¼¤µ¤¤¡£</div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="race" id="race">ÉÕÏ¿: ¥·¥°¥Ê¥ë¤È¶¥¹ç¾õÂÖ</a></h2>
-
-    <p>Apache 1.2b9 °ÊÁ°¤Ï¡¢ºÆµ¯Æ°¤äÄä»ß¤Î¥·¥°¥Ê¥ë¤ò´Þ¤à<em>¶¥¹ç¾õÂÖ</em>
-    (¶¥¹ç¾õÂÖ¤ò´Êñ¤ËÀâÌÀ¤¹¤ë¤È: ¥¿¥¤¥ß¥ó¤Ë¥°¤è¤ëÌäÂê¤Ç¡¢
-    ¶ñ¹ç¤Î°­¤¤»þ´ÖÂӤˤÁ¤ç¤¦¤É²¿¤«¤¬µ¯¤³¤ë¤ÈͽÁÛ³°¤ÎÆ°ºî¤ò¤¹¤ë
-    ¤è¤¦¤Ê¤³¤È¤ò»Ø¤·¤Þ¤¹) ¤¬¤¢¤ê¤Þ¤·¤¿¡£
-    ¡ÖÀµ¤·¤¤¡×µ¡Ç½¤ò»ý¤Ã¤Æ¤¤¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¤Ï¡¢¤Ç¤­¤ë¤À¤±
-    ¤³¤Î¤è¤¦¤Ê¤³¤È¤¬µ¯¤³¤é¤Ê¤¤¤è¤¦¤Ë¤·¤Æ¤¤¤Þ¤¹¡£
-    ¤·¤«¤·¡¢¤¢¤ë¼ï¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¤Ï¶¥¹ç¾õÂÖ¤Ï̤¤À³Î¼Â¤Ëµ¯¤³¤ê¤¨¤ë
-    ¤È¤¤¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p>¥Ç¥£¥¹¥¯¾å¤Ç
-    <code class="directive"><a href="./mod/mpm_common.html#scoreboardfile">ScoreBoardFile</a></code>
-    ¤ò»ÈÍѤ·¤Æ¤¤¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¤Ï¡¢
-    ÀøºßŪ¤Ë¥¹¥³¥¢¥Ü¡¼¥É¤¬²õ¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
-    ¥¹¥³¥¢¥Ü¡¼¥É¤¬²õ¤ì¤¿¾ì¹ç¤Ï¡¢
-    "bind: Address already in use" (<code>HUP</code> ¸å) ¤ä
-    "long lost child came home!" (<code>USR1</code> ¸å)
-    ¤È¤¤¤Ã¤¿·ë²Ì¤Ë¤Ê¤ê¤Þ¤¹¡£
-    Á°¼Ô¤ÏÃ×̿Ū¤Ê¥¨¥é¡¼¤Ç¤¹¤¬¡¢
-    ¸å¼Ô¤Ï¥¹¥³¥¢¥Ü¡¼¥É¥¹¥í¥Ã¥È¤ò¼º¤¦¤À¤±¤Ç¤¹¡£
-    ¤Ç¤¹¤«¤é´Ë¤ä¤«¤ÊºÆµ¯Æ°¤Ï¡¢¤¿¤Þ¤Ë³Î¼Â¤ÊºÆµ¯Æ° (HUP)
-    ¤âÊ»ÍѤ·¤Æ»È¤Ã¤¿Êý¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£
-    ¤³¤ì¤é¤ÎÌäÂê¤ò¹îÉþ¤¹¤ë¤Î¤ÏÈó¾ï¤ËÆñ¤·¤¤¤Î¤Ç¤¹¤¬¡¢
-    ¹¬¤¤¤Ê¤³¤È¤ËÂçÉôʬ¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¤Ï¥¹¥³¥¢¥Ü¡¼¥É¤Î¥Õ¥¡¥¤¥ë¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£
-    ¤³¤ì¤ò»ÈÍѤ¹¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ï¡¢
-    <code class="directive"><a href="./mod/mpm_common.html#scoreboardfile">ScoreBoardFile</a></code>
-    ¤ò¤´Í÷²¼¤µ¤¤¡£</p>
-
-    <p>Á´¤Æ¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë¤ª¤¤¤Æ¡¢¸Ä¡¹¤Î»Ò¥×¥í¥»¥¹¤Ç
-    ·Ñ³Ū¤Ê HTTP ¥³¥Í¥¯¥·¥ç¥ó (KeepAlive)
-    ¤Ë´Ø¤¹¤ë¾®¤µ¤Ê¶¥¹ç¾õÂÖ¤¬µ¯¤³¤ê¤¨¤Þ¤¹¡£
-    ¥ê¥¯¥¨¥¹¥È¹Ô¤òÆɤó¤À¸å¡¢¤½¤·¤Æ¥ê¥¯¥¨¥¹¥È¥Ø¥Ã¥À¤òÆɤàÁ°¤Ë
-    »Ò¥×¥í¥»¥¹¤Ï½ªÎ»¤¹¤ë¤«¤âÃΤì¤Þ¤»¤ó¡£
-    ¤³¤ì¤ËÂФ¹¤ë½¤Àµ¤¬¤¢¤ê¤Þ¤¹¤¬ 1.2 ¤Ç½¤Àµ¤¹¤ë¤Ë¤Ïȯ¸«¤¬ÃÙ¤¹¤®¤Þ¤·¤¿¡£
-    ÍýÏÀŪ¤Ë¤Ï¡¢¤³¤ì¤ÏÌäÂê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-    ¤Ê¤¼¤Ê¤é KeepAlive ¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ï¡¢¥Í¥Ã¥È¥ï¡¼¥¯ÃÙ±ä¤ä
-    ¥µ¡¼¥Ð¤Î¥¿¥¤¥à¥¢¥¦¥È¤Ê¤É¤ËÈ÷¤¨¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤«¤é¤Ç¤¹¡£
-    ¼ÂºÝ¤Ë¤â²¿¤«±Æ¶Á¤¬¤¢¤ë¤è¤¦¤Ë¤Ï¸«¤¨¤Þ¤»¤ó
-    -- ¥Æ¥¹¥È¥±¡¼¥¹¤Ç¥µ¡¼¥Ð¤ò 1 ÉÃ´Ö¤Ë 20 ²óºÆµ¯Æ°¤·¤Æ¤â
-    ¥¯¥é¥¤¥¢¥ó¥È¤Ï²õ¤ì¤¿²èÁü¤ä¶õ¤Î¥É¥­¥å¥á¥ó¥È¤ò¼õ¤±¼è¤ë¤³¤È¤Ê¤¯
-    Àµ¾ï¤Ë±ÜÍ÷¤Ç¤­¤Æ¤¤¤Þ¤¹¡£</p>
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./de/stopping.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/stopping.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./es/stopping.html" hreflang="es" rel="alternate" title="Espa�«Ðol">&nbsp;es&nbsp;</a> |
-<a href="./fr/stopping.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/stopping.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/stopping.html.ja.utf8 b/docs/manual/stopping.html.ja.utf8
new file mode 100644
index 00000000..3ef097a1
--- /dev/null
+++ b/docs/manual/stopping.html.ja.utf8
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>�止��起動 - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>�止��起動</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./de/stopping.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/stopping.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/stopping.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/stopping.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/stopping.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/stopping.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+
+    <p>��文書�� Unix �類似��システム��
+    Apache ��止��起動����扱�����。
+    Windows NT, 2000, XP ユーザ�<a href="platform/windows.html#winsvc">サービス���
+    Apache を実行�る</a>��Windows 9x, MEユーザ�<a href="platform/windows.html#wincons">コンソールアプリケーション���
+    Apache を実行�る</a>��
+    �れら�プラットホーム��使用方法を�覧下��。</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#introduction">イントロダクション</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#term">急��止</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#graceful">緩や���起動 (Graceful Restart)</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#hup">急��起動</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#gracefulstop">緩や���止 (Graceful Stop)</a></li>
+</ul><h3>�照</h3><ul class="seealso"><li><code class="program"><a href="./programs/httpd.html">httpd</a></code></li><li><code class="program"><a href="./programs/apachectl.html">apachectl</a></code></li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="introduction" id="introduction">イントロダクション</a></h2>
+
+    <p>Apache を�止��り�起動��り�る�����実行�れ��る
+    <code class="program"><a href="./programs/httpd.html">httpd</a></code> プロセス�シグナルを�る必���り��。
+    シグナルを�る��二��方法��り��。
+    一�目�プロセス�直接シグナルを�る unix � <code>kill</code>
+    コマンドを使用�る方法��。
+    システムを見れ����ん� <code class="program"><a href="./programs/httpd.html">httpd</a></code> �
+    実行�れ��る��気�付���ょ���シグナルを�る��
+    親プロセス�����れ以外�個々�プロセス��
+    シグナルを�ら���下��。��親プロセス� pid �
+    <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code>
+    �書�れ����。�れ���り�親以外�プロセス�
+    シグナルを�る必��ら����������。
+    親プロセス��る�����る 3 種類�シグナル��り��:
+    <code><a href="#term">TERM</a></code>,
+    <code><a href="#hup">HUP</a></code>, 
+    <code><a href="#graceful">USR1</a></code>
+    ��。�れら�説明�����続�を�覧下��。</p>
+
+    <p>親プロセス�シグナルを�る���
+    次�よ��コマンドを発行��下��:</p>
+
+<div class="example"><p><code>kill -TERM `cat /usr/local/apache2/logs/httpd.pid`</code></p></div>
+
+    <p><code class="program"><a href="./programs/httpd.html">httpd</a></code> プロセス�シグナルを�る 2 番目�方法�
+    <code>-k</code> ���コマンドライン引数を使用�る����。
+    下�説明�れ��るよ���<code>stop</code>, <code>restart</code>, 
+    <code>graceful</code>, <code>graceful-stop</code> を指定����。
+    �れら� <code class="program"><a href="./programs/httpd.html">httpd</a></code> �引数����
+    制御用�スクリプト <code class="program"><a href="./programs/apachectl.html">apachectl</a></code> ��れら�引数を����
+    <code class="program"><a href="./programs/httpd.html">httpd</a></code> �渡���。</p>
+
+    <p><code class="program"><a href="./programs/httpd.html">httpd</a></code> �シグナルを���後�
+    実行状�を次�コマンド�読む�������:</p>
+
+<div class="example"><p><code>tail -f /usr/local/apache2/logs/error_log</code></p></div>
+    <p>���挙��例���自�
+    <code class="directive"><a href="./mod/core.html#serverroot">ServerRoot</a></code>
+    �
+    <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code>
+    �設定����るよ���宜修正��下��。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="term" id="term">急��止</a></h2>
+
+<dl><dt>シグナル: TERM</dt>
+<dd><code>apachectl -k stop</code></dd>
+</dl>
+
+    <p><code>TERM</code> �る�� <code>stop</code> 
+    シグナルを親プロセス��る���座��プロセス全�を kill �よ�����。
+    �プロセスを完全� kill �終�る���数秒��る�も�れ��ん。
+    ��後�親プロセス自身�終了���。
+    処�中�リクエスト�全��止�れ�も�やリクエスト�対�る
+    応答��れ��ん。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="graceful" id="graceful">緩や���起動 (Graceful Restart)</a></h2>
+
+<dl><dt>シグナル: USR1</dt>
+<dd><code>apachectl -k graceful</code></dd>
+</dl>
+
+    <p>親プロセス� <code>USR1</code> �る�� <code>graceful</code>
+    シグナルを���る���プロセス��在�リクエスト�処��後�終了�る
+    (�る��何も�����れ����終了�る)
+    よ��<em>助言</em>���。
+    親プロセス�設定ファイルを�読込���ログファイルを開�直���。
+    �プロセス��々����る�従���
+    新��<em>世代</em>�設定�よる�プロセス�置��������。
+    �����れら�新��リクエスト��座�応答�始���。</p>
+
+    <p>��コード�常�
+    MPM �プロセス制御ディレクティブ�設定を�視������
+    クライアント�リクエストを扱�プロセス�スレッド�数を�起動�処�中も
+    �切�値�維��れ��。。���次�よ����
+    <code class="directive"><a href="./mod/mpm_common.html#startservers">StartServers</a></code>
+    を守り��:
+    少���も 1 秒後� <code class="directive"><a href="./mod/mpm_common.html#startservers">StartServers</a></code> 個�新���プロセス�
+    生��れ����れ����数��るよ���宜プロセスを生����。
+    ��挙動��在�負��対���切��プロセス�数�
+    <code class="directive"><a href="./mod/mpm_common.html#startservers">StartServers</a></code> パラメータ��
+    希望�数�両方を維��よ�������。</p>
+
+    <p><code class="module"><a href="./mod/mod_status.html">mod_status</a></code> ã‚’
+    使用���る場���<code>USR1</code> シグナル��られ�際�
+    サー�統計�ゼロ�<strong>設定�れ��</strong>���
+    注�������。
+    サー��新��リクエスト�応答�能�時間を最���るよ��
+    (リクエスト� OS �よ��キュー�追加�れる��絶対�紛失����ん)�
+    ���時��希望��ューニングパラメータを守るよ��
+    コード�書�れ����。
+    ��よ���る����世代を�����全�プロセス�追跡�使�れ��る
+    <em>スコアボード</em>を維����れ��り��ん。</p>
+
+    <p>status モジュール��緩や���起動以��ら開始��
+    リクエスト�応答�続���る�プロセスを特定�る����
+    <code>G</code> を使���も���。</p>
+
+    <p>�在�<code>USR1</code> を使�ログ移動スクリプト���
+    �起動���プロセス�ログを書�終�����を確証�る方法�
+    �り��ん。��ログ�対��何��る���
+    <code>USR1</code> シグナルを���後��ら��当�時間待���を
+    �案���。例���帯域�狭�通信路�ユーザ�リクエスト���ん�� 10 
+    分以下�完了���る������分����れ��
+    ��ログ�何��る�� 15 分待��������。</p>
+
+    <div class="note">�起動時�設定ファイル�誤り��る��
+    親プロセス��起動���エラー��も�終了���。
+    緩や���起動�場���親プロセス�終了��後�も�プロセス�
+    実行�れ���放置�れ�りも���。
+    (最後�リクエストを処���後「緩や��終了��る
+    �プロセス��り��。)
+    サー�を�起動�る際���れ��題��る�も�れ��ん
+    -- サー�� listen �る�ート��インド�����も�れ��ん。
+    �起動�る���設定ファイル�構文を <code>-t</code>
+    コマンドライン引数
+    (<code class="program"><a href="./programs/httpd.html">httpd</a></code> を�覧下��)
+    を使��検証�る�������。
+    設定ファイル��味的�内容を構文��様�検証���場���
+    � root ユーザ� <code class="program"><a href="./programs/httpd.html">httpd</a></code> を起動�よ���れ���り��。
+    も�エラー���れ��ソケットやログを開�����
+    root �����
+    (も���実行中� <code class="program"><a href="./programs/httpd.html">httpd</a></code>
+    �既�必���ート��インド���る��)
+    �失敗�る��ょ�。
+    �れ以外��由�起動�失敗�����れ��
+    �れ�設定ファイル�エラー��
+    緩や���起動を行�����誤りを修正���れ��り��ん。</div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="hup" id="hup">急��起動</a></h2>
+
+<dl><dt>シグナル: HUP</dt>
+<dd><code>apachectl -k restart</code></dd>
+</dl>
+
+    <p><code>HUP</code> �る�� <code>restart</code> シグナルを親プロセス��る��
+    <code>TERM</code> ��様��プロセスを kill �����
+    親プロセス�終了���ん。
+    設定ファイルを�読込���ログファイル全�を開�直���。
+    ��後�新���プロセスを起動��応答を続���。</p>
+
+    <p><code class="module"><a href="./mod/mod_status.html">mod_status</a></code>
+    を使���る場���<code>HUP</code> ��られ�場��
+    サー�統計�ゼロ�設定�れる���注�������。</p>
+
+    <div class="note">�起動時�設定ファイル�誤り��る��
+    親プロセス��起動���エラー��も�終了���。
+    �れを��る��次�方法を�覧下��。</div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="gracefulstop" id="gracefulstop">緩や���止 (Graceful Stop)</a></h2>
+
+<dl><dt>Signal: WINCH</dt>
+<dd><code>apachectl -k graceful-stop</code></dd>
+</dl>
+
+    <p>親プロセス� <code>WINCH</code> �る�� <code>graceful-stop</code>
+    シグナルを���る���プロセス��在�リクエスト�処��後�終了�る
+    (�る��何も�����れ����終了�る)
+    よ��<em>助言</em>���。
+    ��後�親プロセス� <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code>
+    を削除��全�ート�ら� Listen をや���。
+    親プロセス�����継続���プロセス�リクエストを処��る
+    �を監視�����。�プロセス�全�処�を終��終了�る��<code class="directive"><a href="./mod/mpm_common.html#gracefulshutdowntimeout">GracefulShutdownTimeout</a></code>
+    �指定�れ�タイムアウト����後��親プロセスも終了���。
+    タイムアウト����場���残り��プロセス�� <code>TERM</code>
+    シグナル��信�れ�強制終了�れ��。</p>
+    
+    <p><code>TERM</code> シグナル�よ���"graceful" 状態��る親プロセス�
+    �プロセス�全��直��終了���。����
+    <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code> �既�削除
+    �れ�����������<code>apachectl</code> や <code>httpd</code>
+    ��れら�シグナルを�る�������ん。</p>
+
+    <div class="note"><p><code>graceful-stop</code> シグナルを使��������一�設定
+    ファイルを使�� <code class="program"><a href="./programs/httpd.html">httpd</a></code> を�時�複数起動�る���
+    ��るよ���り��。
+    ��機能を使���Apache をアップグレード�る際���も便利��ょ�。
+    ����設定�よ���デッドロックや競�状態 (レースコンディション) 
+    を引�起���も�れ��ん。</p>
+
+    <p><code class="directive"><a href="./mod/core.html#lockfile">Lockfile</a></code> や <code class="directive"><a href="./mod/mod_cgid.html#scriptsock">ScriptSock</a></code> ����ディスク上�ファイル������
+    ファイル�サー�� PID ���れるよ��������httpd �複数�時�動作����も
+    �題�����よ��注��払�れ����。
+    ����設定ディレクティブやサードパーティ製モジュール�CGI �使用�れる永続的�
+    ディスクを使��ロックや状態ファイルを活用���る場�����も�
+    複数� <code class="program"><a href="./programs/httpd.html">httpd</a></code> �動作���る状態����も��れ�れ�
+    ファイルを上書����よ��注����れ��り��ん。</p>
+
+    <p>潜在的�競�状態����も心��る必���る��ょ�。
+    ���� <code class="program"><a href="./programs/rotatelogs.html">rotatelogs</a></code> 形��パイプ�よるログ���該当���。
+    複数� <code class="program"><a href="./programs/rotatelogs.html">rotatelogs</a></code> インスタンス��時���ログファイルを
+    rotate �よ���る��ログファイル�破壊�れる�も�れ��ん。</p></div>
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./de/stopping.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/stopping.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/stopping.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/stopping.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/stopping.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/stopping.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/stopping.html.ko.euc-kr b/docs/manual/stopping.html.ko.euc-kr
index 34d13625..e1621702 100644
--- a/docs/manual/stopping.html.ko.euc-kr
+++ b/docs/manual/stopping.html.ko.euc-kr
@@ -23,7 +23,8 @@
 <a href="./es/stopping.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="./fr/stopping.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/stopping.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/stopping.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/stopping.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/stopping.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
             ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
@@ -200,8 +201,9 @@
 <a href="./es/stopping.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="./fr/stopping.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="./ja/stopping.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/stopping.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="./ko/stopping.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/stopping.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/stopping.html.tr.utf8 b/docs/manual/stopping.html.tr.utf8
new file mode 100644
index 00000000..392c7c12
--- /dev/null
+++ b/docs/manual/stopping.html.tr.utf8
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Durdurma ve Yeniden BaÅŸlatma - Apache HTTP Sunucusu</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="./">Sürüm 2.2</a></div><div id="page-content"><div id="preamble"><h1>Durdurma ve Yeniden Başlatma</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="./de/stopping.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/stopping.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/stopping.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/stopping.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/stopping.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/stopping.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+    <p>Bu belge Apache HTTPd’nin Unix benzeri sistemlerde durdurulması ve
+      yeniden başlatılması konularını kapsar. Windows NT, 2000 ve XP
+      kullanıcıları Apache HTTPd’yi bu platformlarda nasıl denetimlerine
+      alacaklarını öğrenmek için <a href="platform/windows.html#winsvc">Apache
+      HTTPd’nin Bir Hizmet Olarak Çalıştırılması</a> sayfasına, Windows 9x ve
+      ME kullanıcıları ise <a href="platform/windows.html#wincons">Apache
+      HTTPd’nin Bir Konsol Uygulaması Olarak Çalıştırılması</a> sayfasına
+      bakabilirler.</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#introduction">GiriÅŸ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#term">Hemen Durdur</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#graceful">Nazikçe Yeniden Başlat</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#hup">Hemen Yeniden BaÅŸlat</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#gracefulstop">Nazikçe Durdur</a></li>
+</ul><h3>Ayrıca bakınız:</h3><ul class="seealso"><li><code class="program"><a href="./programs/httpd.html">httpd</a></code></li><li><code class="program"><a href="./programs/apachectl.html">apachectl</a></code></li><li><a href="invoking.html">Başlatma</a></li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="introduction" id="introduction">GiriÅŸ</a></h2>
+
+    <p>Apache HTTPd’yi durdurmak ve yeniden başlatmak için çalışan
+      <code class="program"><a href="./programs/httpd.html">httpd</a></code> süreçlerine bir sinyal göndermeniz gerekir.
+      Sinyal göndermek için iki yol vardır. İlki, süreçlere doğrudan sinyal
+      göndermek için unix <code>kill</code> komutunun kullanımıdır. Bu
+      suretle, sisteminizde çalışmakta olan bir çok <code class="program"><a href="./programs/httpd.html">httpd</a></code>
+      sürecini uyarabilirsiniz ama süreç kimliği <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code> yönergesi ile belirtilen dosyada
+      tutulan ana süreç dışında hiçbirine sinyal göndermemelisiniz. Başka
+      bir deyişle, ana süreç haricinde hiçbir sürece sinyal göndermeye normal
+      olarak ihtiyacınız olmaması gerekir. Ana sürece gönderebileceğiniz
+      dört çeşit sinyal vardır:
+      <code><a href="#term">TERM</a></code>,
+      <code><a href="#graceful">USR1</a></code>,
+      <code><a href="#hup">HUP</a></code> ve
+      <code><a href="#gracefulstop">WINCH</a></code>. Bunlar yeri geldikçe
+      açıklanacaktır.</p>
+
+    <p>Ana sürece <code>kill</code> ile sinyal göndermek için şöyle bir
+      komut verebilirsiniz:</p>
+
+    <div class="example"><p><code>kill -TERM `cat /usr/local/apache2/logs/httpd.pid`</code></p></div>
+
+    <p><code class="program"><a href="./programs/httpd.html">httpd</a></code> süreçlerine sinyal göndermenin ikinci yolu
+      <code>-k</code> komut satırı seçeneğini şu değerlerden biri ile
+      kullanmaktır: <code>stop</code>, <code>restart</code>,
+      <code>graceful</code> ve <code>graceful-stop</code>. Bunlar aşağıda
+      açıklanacaktır. <code>-k</code> komut satırı seçeneği
+      <code class="program"><a href="./programs/httpd.html">httpd</a></code>’ye ait olsa da ana sürece bu sinyalleri
+      göndermek için <code class="program"><a href="./programs/apachectl.html">apachectl</a></code> betiğini kullanmanızı
+      öneririz. <code class="program"><a href="./programs/apachectl.html">apachectl</a></code>, komut satırı seçeneklerini
+      <code class="program"><a href="./programs/httpd.html">httpd</a></code>’ye aktaracaktır.</p>
+
+    <p><code class="program"><a href="./programs/httpd.html">httpd</a></code>’ye sinyal gönderdikten sonra olup biteni şu
+      komutla izleyebilirsiniz:</p>
+
+    <div class="example"><p><code>tail -f /usr/local/apache2/logs/error_log</code></p></div>
+
+    <p>Bu örnekleri, kendi <code class="directive"><a href="./mod/core.html#serverroot">ServerRoot</a></code> ve
+      <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code> yönergelerinizdeki
+      ayarlara uygun olarak değiştirdikten sonra kullanınız.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="term" id="term">Hemen Durdur</a></h2>
+
+  <dl><dt>Sinyal: TERM</dt>
+    <dd><code>apachectl -k stop</code></dd>
+  </dl>
+
+    <p>Ana sürece <code>TERM</code> veya <code>stop</code> sinyali
+      göndererek tüm çocukların bir an önce öldürülmeye çalışılmasını sağlamış
+      olursunuz. Tüm çocukların öldürülmesi bir kaç saniye sürebilir. Son
+      olarak ana süreç çıkacaktır. Yanıtlanmakta olan istekler hemen
+      sonlandırılacak ve artık isteklere yanıt verilmeyecektir.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="graceful" id="graceful">Nazikçe Yeniden Başlat</a></h2>
+
+  <dl><dt>Sinyal: USR1</dt>
+    <dd><code>apachectl -k graceful</code></dd>
+  </dl>
+
+    <p>Ana sürece <code>USR1</code> veya <code>graceful</code> sinyalinin
+      gönderilmesi, çocuklara ellerindeki mevcut işleri bitirdikten sonra
+      (veya sundukları bir şey yoksa hemen) çıkmalarının <em>önerilmesi</em>
+      demektir. Ana süreç kendi yapılandırma dosyalarını yeniden okur ve
+      kendi günlük dosyalarını yeniden açar. Ana sürecin öldürdüğü her sürecin
+      yerine yeni yapılandırma <em>kuşağından</em> bir süreç başlatır ve hemen
+      yeni isteklere hizmet sunulmaya başlanır.</p>
+
+    <p>Bu kod MPM’lerin süreçleri denetleyen yönergelerine daima uyacak
+      şekilde tasarlanmıştır. Bu suretle, istemcilere hizmet sunacak çocuk
+      süreçler ve evreler, yeniden başlatma işleminde de uygun sayıda
+      sağlanmış olur. Bununla birlikte, <code class="directive"><a href="./mod/mpm_common.html#startservers">StartServers</a></code> yönergesinde şöyle
+      davranılır: İlk saniye içinde en azından <code class="directive"><a href="./mod/mpm_common.html#startservers">StartServers</a></code> sayıda yeni çocuk
+      oluşturulmamışsa iş olmayan bir devreyi geçiştirecek kadarı oluşturulur.
+      Ardından sunucunun mevcut yükünü karşılamak için gereken sayıda çocuk
+      süreç oluşturulur. Bu suretle, kod her ikisi için de gereğini yerine
+      getirmeye çalışmış olur.</p>
+
+    <p><code class="module"><a href="./mod/mod_status.html">mod_status</a></code> kullanıcıları <code>USR1</code>
+      gönderildiği zaman sunucu istatistiklerinin sıfırlanmadığı konusunda
+      uyarılacaktır. Kod, sunucunun yeni isteklere yanıt veremediği zamanı en
+      aza indirmenin yanısıra ayar parametrelerinize de uymak üzere
+      tasarlanmıştır (yeni istekler işletim sistemi tarafından kuyruğa
+      alınacağından bir istek kaybı olayı yaşanmaz). Bunu sağlamak için, her
+      iki kuşağın çocuklarının izini sürecek bir <em>çetele</em> tutulur.</p>
+
+    <p><code class="module"><a href="./mod/mod_status.html">mod_status</a></code> modülü, nazikçe yeniden başlat komutunun
+      verilmesinden önce başlamış ve sunulmaya devam eden isteklere bakan
+      çocukları imlemek için ayrıca bir <code>G</code> (Graceful’un baş harfi)
+      kullanır.</p>
+
+    <p>Günlük dosyası döndürme betiğine, yeniden başlatma öncesi günlüğe yazan
+      tüm çocukların işini bitirdiğini <code>USR1</code> kullanarak
+      bildirmenin bir yolu yoktur.  Önerimiz, eski günlük kaydı üzerinde bir
+      işlem yapmaya başlamadan önce <code>USR1</code> sinyali gönderilmesinin
+      ardından belli bir süre beklenilmesi olacaktır. Örneğin, düşük band
+      genişliğine sahip istemcilere hizmet sunan çoğu sürecin işinin 10
+      dakikadan önce bitmeyeceğini gözönüne alarak eski günlük üzerinde işlem
+      yapmaya başlamak için 15 dakika beklenebilir.</p>
+
+    <div class="note">Bir yeniden başlatma isteğinde, eğer yapılandırma dosyalarınızda bir
+      hata varsa sunucu yeniden başlamaz ve bir hata ile çıkar. Nazikçe
+      yeniden başlatma durumunda ana süreç çıkarken çocuklarını çalışır durumda
+      bırakır. (Bunlar, ellerindeki istekler bitince ‘nazikçe çıkacak’ olan
+      çocuk süreçlerdir.) Eğer sunucuyu yeniden başlatmaya çalışırsanız bu
+      sorunlara yol açar; örneğin, dinleyeceği portları bağlayamayabilir. Bir
+      yeniden başlatma öncesinde yapılandırma dosyalarınızın sözdizimini
+      <code>-t</code> komut satırı seçeneği ile sınayabilirsiniz (bkz,
+      <code class="program"><a href="./programs/httpd.html">httpd</a></code>).  Ancak, bu hala sunucunuzun düzgünce yeniden
+      başlatılmasını garanti etmeyecektir. Yapılandırma dosyalarınızı
+      sözdizimi denetiminin yanında anlamlandırılması bakımından da sınamak
+      için <code class="program"><a href="./programs/httpd.html">httpd</a></code>’nin root olmayan bir kullanıcı tarafından
+      çalıştırılmasını deneyebilirsiniz. Eğer yapılandırma dosyalarında bir
+      hata yoksa soketleri ve günlük dosyalarını açmaya çalışırken root
+      aidiyetinde çalışmadığından veya çalışmakta olan asıl sunucu bu portları
+      zaten dinlediğinden başarısız olacaktır. Eğer başka bir sebeple
+      başarısız olursa olası sebep bir yapılandırma dosyası hatasıdır ve asıl
+      sunucuya ‘nazikçe yeniden başla’ komutunu vermeden önce bu hatayı
+      düzeltmeniz gerekir.</div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="hup" id="hup">Hemen Yeniden BaÅŸlat</a></h2>
+
+  <dl><dt>Sinyal: HUP</dt>
+    <dd><code>apachectl -k restart</code></dd>
+  </dl>
+
+    <p>Ana sürece <code>HUP</code> veya <code>restart</code> sinyalinin
+      gönderilmesi tüm çocukların <code>TERM</code> sinyali gönderilmiş gibi
+      öldürülmesine sebep olur fakat ana sürecin çıkmasını sağlamaz.
+      Ana süreç yapılandırma dosyalarını yeniden okur ve günlük kayıt
+      dosyalarını yeniden açar. Bunların ardından isteklere yanıt verecek yeni
+      kuşak çocukları oluşturmaya başlar.</p>
+
+    <p><code class="module"><a href="./mod/mod_status.html">mod_status</a></code> kullanıcıları bir <code>HUP</code> sinyali
+      gönderildiğinde sunucu istatistiklerinin sıfırlandığı konusunda
+      uyarılırlar.</p>
+
+    <div class="note">Eğer yapılandırma dosyalarınızda sözdizimi hatası varsa yeniden
+     başlatma işlemi gerçekleşmez ve ana süreç bir hata vererek çıkar.
+     Bundan kaçınmak için önceki yönteme bakınız.</div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="gracefulstop" id="gracefulstop">Nazikçe Durdur</a></h2>
+
+  <dl><dt>Sinyal: WINCH</dt>
+    <dd><code>apachectl -k graceful-stop</code></dd>
+  </dl>
+
+    <p>Ana sürecin <code>WINCH</code> veya <code>graceful-stop</code>
+      sinyalini alması, çocuklara ellerindeki mevcut işleri bitirdikten sonra
+      (veya sundukları bir şey yoksa hemen) çıkmalarının <em>önerilmesine</em>
+      sebep olur. Ebevey süreç bunun hemen <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code> dosyasını siler ve port
+      dinlemeyi keser. Ana süreç çalışmaya ve isteklere yanıt vermekte olan
+      çocuk süreçleri izlemeye devam eder. Tüm çocuklar işlerini bitirip
+      çıktığında veya <code class="directive"><a href="./mod/mpm_common.html#gracefulshutdowntimeout">GracefulShutdownTimeout</a></code> ile belirtilen
+      zaman aşımı dolduğunda ana süreç de kendini sonlandırır. Eğer zaman aşımı
+      devreye girmişse o an calışmakta olan çocuk süreçlere <code>TERM</code>
+      sinyali gönderilerek hemen çıkmaları sağlanır.</p>
+
+    <p>Bir <code>TERM</code> sinyali ile "graceful" durumundaki tüm çocuklar
+      ve ana süreç hemen sonlandırılacaktır. Bununla birlikte, <code class="directive"><a href="./mod/mpm_common.html#pidfile">PidFile</a></code> dosyası da silineceğinden, artık
+      <code>apachectl</code> veya <code>httpd</code>’yi bu sinyali göndermek
+      için kullanamayacaksınız.</p>
+
+    <div class="note"><p><code>graceful-stop</code> sinyali, aynı anda, aynı yapılandırma
+      ile çok sayıda <code class="program"><a href="./programs/httpd.html">httpd</a></code> kopyasının çalıştırılabilmesine
+      imkan verir.  Bu, Apache nazikçe yükseltileceği zaman güçlü bir özellik
+      haline gelmekteyse de, bazı yapılandırmalarda yarış koşullarının
+      oluşmasına ve kısır çekişmelere (deadlock) sebep olabilir.</p>
+
+    <p>Sunucunun süreç kimliğini içeren <code class="directive"><a href="./mod/core.html#lockfile">Lockfile</a></code> ve <code class="directive"><a href="./mod/mod_cgid.html#scriptsock">ScriptSock</a></code> gibi dosyaların disk üzerindeki
+      mevcudiyetlerinin sorunsuz olarak devam ettiÄŸinden emin olunmaya
+      çalışılmalıdır.  Ayrıca, bir yapılandırma yönergesi, üçüncü parti bir
+      modül veya kalıcı CGI uygulamalarına ait disk kilit veya durum dosyaları
+      olabilir; <code class="program"><a href="./programs/httpd.html">httpd</a></code>’nin birden fazla kopyasının çalışması
+      nedeniyle bu dosyaların da üzerine yazılmadığından emin olunmaya
+      çalışılmalıdır.</p>
+
+    <p><code class="program"><a href="./programs/rotatelogs.html">rotatelogs</a></code> tarzı borulu günlükleme kullanımı gibi
+      durumlarda yarış koşullarının oluşması olasılığına karşı uyanık
+      olunmalıdır. Aynı günlük kayıt dosyalarını aynı anda döndürmeye çalışan
+      birden fazla <code class="program"><a href="./programs/rotatelogs.html">rotatelogs</a></code> kopyasının çalıştırılması
+      halinde bunların her biri diğerlerinin günlük kayıt dosyalarının kaybına
+      sebep olabilir.</p></div>
+</div></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="./de/stopping.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="./en/stopping.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./es/stopping.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
+<a href="./fr/stopping.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="./ja/stopping.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="./tr/stopping.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="./mod/">Modüller</a> | <a href="./mod/directives.html">Yönergeler</a> | <a href="./faq/">SSS</a> | <a href="./glossary.html">Terimler</a> | <a href="./sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/style/latex/common.xsl b/docs/manual/style/latex/common.xsl
deleted file mode 100644
index a0f10cbb..00000000
--- a/docs/manual/style/latex/common.xsl
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-<!-- Constants used for case translation -->
-<xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz'" />
-<xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'" />
-
-<!-- ==================================================================== -->
-<!-- Process a documentation section                                      -->
-<!-- ==================================================================== -->
-<xsl:template match="section">
-<xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="section/title">
-<xsl:text>\subsection*{</xsl:text>
-<xsl:apply-templates/>
-<xsl:text>}</xsl:text><xsl:call-template name="label"/>
-<xsl:text>
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="section/section/title">
-<xsl:text>\subsubsection*{</xsl:text>
-<xsl:apply-templates/>
-<xsl:text>}</xsl:text><xsl:call-template name="label"/>
-<xsl:text>
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="section/section/section/title">
-<xsl:text>\subsubsection*{</xsl:text>
-<xsl:apply-templates/>
-<xsl:text>}</xsl:text><xsl:call-template name="label"/>
-<xsl:text>
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="note/title"></xsl:template>
-<xsl:template match="example/title"></xsl:template>
-
-<xsl:template name="label">
-<xsl:if test="../@id">
-<xsl:variable name="metafile" select="document(/*/@metafile)/metafile" />
-<xsl:text>\label{</xsl:text><xsl:value-of 
-select="$metafile/path"/><xsl:value-of 
-select="$metafile/basename"/>
-<xsl:text>:</xsl:text>
-<xsl:value-of select="../@id"/>
-<xsl:text>}</xsl:text>
-</xsl:if>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- <example>                                                            -->
-<!-- ==================================================================== -->
-<!-- verbatim inside of fbox doesn't work for some reason -->
-<xsl:template match="example">
-<xsl:text>\par\smallskip\begin{center}</xsl:text>
-<xsl:if test="not(pre)"><xsl:text>\fbox{</xsl:text></xsl:if>
-<xsl:text>\begin{minipage}{.8\textwidth}\begin{flushleft}</xsl:text>
-<xsl:apply-templates select="title" mode="print" />
-<xsl:text>{\ttfamily\small </xsl:text>
-<xsl:text>\noindent </xsl:text><xsl:apply-templates/>
-<xsl:text>}</xsl:text>
-<xsl:text>\end{flushleft}\end{minipage}</xsl:text>
-<xsl:if test="not(pre)"><xsl:text>}</xsl:text></xsl:if>
-<xsl:text>\end{center}\par\smallskip</xsl:text>
-</xsl:template>
-
-<xsl:template match="example/title" mode="print">
-<xsl:text>\textbf{</xsl:text>
-    <xsl:apply-templates/>
-<xsl:text>}\\ </xsl:text>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- indentations                                                         -->
-<!-- ==================================================================== -->
-<xsl:template match="indent">
-<xsl:text>\begin{list}{}{\topsep 0pt\rightmargin 0pt\leftmargin 2em}
-\item[] </xsl:text>
-<xsl:apply-templates/>
-<xsl:text>\end{list}</xsl:text>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- <note>                                                               -->
-<!-- ==================================================================== -->
-<xsl:template match="note">
-<xsl:text>\par\smallskip
-{\Huge </xsl:text>
-<xsl:choose>
-<xsl:when test="@type='warning'">
-  <xsl:text>\fbox{!} </xsl:text>
-</xsl:when>
-<xsl:otherwise>
-  <xsl:text>$\Longrightarrow$</xsl:text>
-</xsl:otherwise>
-</xsl:choose>
-<xsl:text>}\begin{minipage}[t]{.8\textwidth}
-\noindent </xsl:text>
-<xsl:apply-templates select="title" mode="print" />
-<xsl:apply-templates/>
-<xsl:text>\end{minipage}\par\smallskip</xsl:text>
-</xsl:template>
-
-<xsl:template match="note/title" mode="print">
-<xsl:text>\textbf{</xsl:text>
-    <xsl:apply-templates/>
-<xsl:text>} \\
-\noindent </xsl:text>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- <directive>                                                          -->
-<!-- Inserts link to another directive, which might be in another module. -->
-<!-- References are converted into lower case.                            -->
-<!-- ==================================================================== -->
-<xsl:template match="directive" name="directive">
-<xsl:text>\textsc{</xsl:text>
-   <xsl:if test="@type='section'"><xsl:text>\textless{}</xsl:text></xsl:if>
-   <xsl:text>\hyperlink{/mod/</xsl:text>
-   <xsl:value-of select="@module"/>
-   <xsl:text>:</xsl:text>
-   <xsl:value-of select="translate(.,$uppercase,$lowercase)"/>
-   <xsl:text>}{</xsl:text>
-        <xsl:apply-templates/>
-   <xsl:text>}</xsl:text>
-   <xsl:if test="@type='section'"><xsl:text>\textgreater{}</xsl:text></xsl:if>
-<xsl:text>}</xsl:text>
-</xsl:template>
-<!-- /directive -->
-
-<!-- ==================================================================== -->
-<!-- <module>                                                             -->
-<!-- Inserts a link to refereed module                                    -->
-<!-- ==================================================================== -->
-<xsl:template match="module" name="module">
-<xsl:text>\textsc{\hyperlink{/mod/</xsl:text>
-  <xsl:value-of select="."/>
-  <xsl:text>}{</xsl:text>
-    <xsl:apply-templates/>
-  <xsl:text>}</xsl:text>
-<xsl:text>}</xsl:text>
-</xsl:template>
-<!-- /module -->
-
-
-
-<!-- ==================================================================== -->
-<!-- <related>                                                            -->
-<!-- ==================================================================== -->
-<xsl:template match="related">
-<xsl:text>
-\fbox{\begin{tabular}{rr}
-\begin{minipage}[t]{.49\linewidth}
-\textbf{</xsl:text>
-<xsl:value-of select="$message[@id='relatedmodules']" />
-<xsl:text>} \\
-</xsl:text>
-<xsl:for-each select="modulelist/module">
-<xsl:call-template name="module"/>
-<xsl:text> \\
-</xsl:text>
-</xsl:for-each>
-<xsl:text>
-\end{minipage} &amp; 
-\begin{minipage}[t]{.4\linewidth}
-\textbf{</xsl:text>
-<xsl:value-of select="$message[@id='relateddirectives']" />
-<xsl:text>} \\
-</xsl:text>
-<xsl:for-each select="directivelist/directive">
-<xsl:call-template name="directive"/>
-<xsl:text> \\
-</xsl:text>
-</xsl:for-each>
-<xsl:text>
-\end{minipage}
-\end{tabular}}
-\smallskip
-</xsl:text>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- <seealso>                                                            -->
-<!-- ==================================================================== -->
-<xsl:template name="seealso">
-     <xsl:if test="seealso">
-	<xsl:text>\textbf{</xsl:text>
-        <xsl:value-of select="$message[@id='seealso']" />
-        <xsl:text>}\begin{itemize}</xsl:text>
-        <xsl:for-each select="seealso">
-        <xsl:text>\item </xsl:text>
-          <xsl:apply-templates />
-        <xsl:text>
-</xsl:text>
-        </xsl:for-each>
-<xsl:text>\end{itemize}</xsl:text>
-     </xsl:if>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- section-title                                                        -->
-<!-- ==================================================================== -->
-<xsl:template name="section-title">
-<xsl:variable name="metafile" select="document(/*/@metafile)/metafile" />
-<xsl:text>\section{</xsl:text><xsl:apply-templates select="title"/>
-<xsl:text>}</xsl:text>
-<xsl:text>\label{</xsl:text><xsl:value-of 
-select="$metafile/path"/><xsl:value-of 
-select="$metafile/basename"/>
-<xsl:text>}
-</xsl:text>
-</xsl:template>
-
-</xsl:stylesheet>
-
diff --git a/docs/manual/style/latex/directiveindex.xsl b/docs/manual/style/latex/directiveindex.xsl
deleted file mode 100644
index b97c346a..00000000
--- a/docs/manual/style/latex/directiveindex.xsl
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-<!-- ==================================================================== -->
-<!-- <directiveindex>                                                     -->
-<!-- Builds the directive index page                                      -->
-<!-- ==================================================================== -->
-<xsl:template match="directiveindex">
-
-    <xsl:variable name="directives"
-        select="document(document($allmodules)/modulefilelist/modulefile)
-                /modulesynopsis[status!='Obsolete']
-                /directivesynopsis[not(@location)]" />
-
-
-  <xsl:call-template name="section-title"/>
-
-  <xsl:apply-templates select="summary" />
-
-  <xsl:call-template name="seealso"/>
-
-  <xsl:text>\begin{itemize}
-</xsl:text>
-  <xsl:for-each select="$directives">
-  <xsl:sort select="name" />
-
-  <xsl:text>
-\item </xsl:text>
-  <xsl:apply-templates select="name" mode="simple"/>
-  <xsl:text> (p.\ \pageref{/mod/</xsl:text>
-  <xsl:value-of select="../name"/><xsl:text>:</xsl:text>
-  <xsl:value-of select="translate(name, $uppercase, $lowercase)"/>
-  <xsl:text>})</xsl:text>
-</xsl:for-each>
-
-  <xsl:text>\end{itemize}</xsl:text>
-
-</xsl:template>
-<!-- /directiveindex -->
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/latex/faq.xsl b/docs/manual/style/latex/faq.xsl
deleted file mode 100644
index 5c00e7f2..00000000
--- a/docs/manual/style/latex/faq.xsl
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY lf SYSTEM "util/lf.xml">
-]>
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-<!-- ==================================================================== -->
-<!-- <faq>                                                                -->
-<!-- Process an entire document into an HTML page                         -->
-<!-- ==================================================================== -->
-<xsl:template match="faq">
-
-<xsl:call-template name="section-title"/>
-
-<xsl:apply-templates select="summary"/>
-
-<xsl:call-template name="seealso"/>
-
-<xsl:apply-templates select="section"/>
-
-</xsl:template>
-<!-- /faq -->
-</xsl:stylesheet>
diff --git a/docs/manual/style/latex/html.xsl b/docs/manual/style/latex/html.xsl
deleted file mode 100644
index c77f1ec3..00000000
--- a/docs/manual/style/latex/html.xsl
+++ /dev/null
@@ -1,323 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-
-<!-- ==================================================================== -->
-<!-- Ordinary HTML that must be converted to latex                        -->
-<!-- ==================================================================== -->
-
-<xsl:template match="ul">
-<xsl:text>\begin{itemize}
-</xsl:text>
-<xsl:apply-templates/>
-<xsl:text>\end{itemize}
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="ol">
-<xsl:text>\begin{enumerate}
-</xsl:text>
-<xsl:apply-templates/>
-<xsl:text>\end{enumerate}
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="li">
-<xsl:text>\item </xsl:text>
-<xsl:apply-templates/>
-<xsl:text>
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="dl">
-<xsl:text>\begin{description}
-</xsl:text>
-<xsl:apply-templates/>
-<xsl:text>\end{description}
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="dt">
-<xsl:text>\item[</xsl:text><xsl:apply-templates/>
-<xsl:text>] </xsl:text>
-</xsl:template>
-
-<xsl:template match="dd">
-<xsl:apply-templates/>
-</xsl:template>
-
-<!-- Latex doesn't like successive line breaks, so replace any
-     sequence of two or more br separated only by white-space with
-     one line break followed by smallskips. -->
-<xsl:template match="br">
-<xsl:choose>
-<xsl:when test="name(preceding-sibling::node()[1])='br' or name(preceding-sibling::node()[1])='indent'">
-<xsl:text>\smallskip </xsl:text>
-</xsl:when>
-<xsl:when test="name(preceding-sibling::node()[2])='br' or name(preceding-sibling::node()[2])='indent'">
-  <xsl:choose>
-  <xsl:when test="normalize-space(preceding-sibling::node()[1])=''">
-    <xsl:text>\smallskip </xsl:text>
-  </xsl:when>
-  <xsl:otherwise>
-    <!-- Don't put a line break if we are the last thing -->
-    <xsl:if test="not(position()=last()) and not(position()=last()-1 and normalize-space(following-sibling::node()[1])='')">
-      <xsl:text>\\ </xsl:text>
-    </xsl:if>
-  </xsl:otherwise>
-  </xsl:choose>
-</xsl:when>
-<xsl:otherwise>
-    <!-- Don't put a line break if we are the last thing -->
-    <xsl:if test="not(position()=last()) and not(position()=last()-1 and normalize-space(following-sibling::node()[1])='')">
-      <xsl:text>\\ </xsl:text>
-    </xsl:if>
-</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-
-<xsl:template match="p">
-<xsl:apply-templates/>
-<xsl:text>\par
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="code">
-<xsl:text>\texttt{</xsl:text>
-<xsl:apply-templates/>
-<xsl:text>}</xsl:text>
-</xsl:template>
-
-<xsl:template match="strong">
-<xsl:text>\textbf{</xsl:text>
-<xsl:apply-templates/>
-<xsl:text>}</xsl:text>
-</xsl:template>
-
-<xsl:template match="em">
-<xsl:text>\textit{</xsl:text>
-<xsl:apply-templates/>
-<xsl:text>}</xsl:text>
-</xsl:template>
-
-<!-- Value-of used here explicitly because we don't wan't latex-escaping
-performed.  Of course, this will conflict with html where some tags are
-interpreted in pre -->
-<xsl:template match="pre">
-<xsl:text>\begin{verbatim}
-</xsl:text>
-<xsl:value-of select="."/>
-<xsl:text>\end{verbatim}
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="blockquote">
-<xsl:text>\begin{quotation}
-</xsl:text>
-<xsl:apply-templates/>
-<xsl:text>\end{quotation}
-</xsl:text>
-</xsl:template>
-
-<!-- XXX: We need to deal with table headers -->
-
-<xsl:template match="table">
-<xsl:variable name="table-type">
-  <xsl:choose>
-  <xsl:when test="count(tr) &gt; 15">longtable</xsl:when>
-  <xsl:otherwise>tabular</xsl:otherwise>
-  </xsl:choose>
-</xsl:variable>
-
-<xsl:text>\begin{</xsl:text><xsl:value-of select="$table-type"/>
-<xsl:text>}{|</xsl:text>
-<xsl:choose>
-<xsl:when test="columnspec">
-  <xsl:for-each select="columnspec/column">
-    <xsl:text>l</xsl:text>
-    <xsl:if test="../../@border and not(position()=last())">
-      <xsl:text>|</xsl:text>
-    </xsl:if>
-  </xsl:for-each>
-</xsl:when>
-<xsl:otherwise>
-  <xsl:for-each select="tr[1]/*">
-    <xsl:text>l</xsl:text>
-    <xsl:if test="../../@border and not(position()=last())">
-      <xsl:text>|</xsl:text>
-    </xsl:if>
-  </xsl:for-each>
-</xsl:otherwise>
-</xsl:choose>
-<xsl:text>|}\hline
-</xsl:text>
-<xsl:apply-templates select="tr"/>
-<xsl:text>\hline\end{</xsl:text>
-<xsl:value-of select="$table-type"/>
-<xsl:text>}
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="tr">
-  <xsl:apply-templates select="td|th"/>
-  <xsl:text>\\</xsl:text>
-  <xsl:if test="../@border and not(position()=last())">
-    <xsl:text>\hline</xsl:text>
-  </xsl:if>
-  <xsl:text>
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="td">
-    <xsl:variable name="pos" select="position()"/>
-    <xsl:text>\begin{minipage}[t]{</xsl:text>
-    <xsl:choose>
-    <xsl:when test="../../columnspec">
-      <xsl:value-of select="../../columnspec/column[$pos]/@width"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select=".95 div last()"/>
-    </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>\textwidth}\small </xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>\end{minipage}</xsl:text>
-    <xsl:if test="not(position()=last())">
-      <xsl:text> &amp; </xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="th">
-    <xsl:variable name="pos" select="position()"/>
-    <xsl:text>\begin{minipage}[t]{</xsl:text>
-    <xsl:choose>
-    <xsl:when test="../../columnspec">
-      <xsl:value-of select="../../columnspec/column[$pos]/@width"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select=".95 div last()"/>
-    </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>\textwidth}\bfseries </xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>\end{minipage}</xsl:text>
-    <xsl:if test="not(position()=last())">
-      <xsl:text> &amp; </xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<!--
-   This is a horrible hack, but it seems to mostly work.  It does a
-   few things:
-
-   1. Transforms references starting in http:// to footnotes with the
-      appropriate hyperref macro to make them clickable.  (This needs
-      to be expanded to deal with news: and needs to be adjusted to
-      deal with "#", which is creating bad links at the moment.)
-
-   2. For intra-document references, constructs the appropriate absolute
-      reference using a latex \pageref.  
-      This involves applying a simplified version of the
-      general URL resolution rules to deal with ../.  It only works for
-      one level of subdirectory.
-
-   3. It is also necessary to deal with the fact that index pages
-      get references as "/".
--->
-<xsl:template match="a">
-<xsl:apply-templates/>
-<xsl:if test="@href">
-<xsl:variable name="relpath" select="document(/*/@metafile)/metafile/relpath" />
-<xsl:variable name="path" select="document(/*/@metafile)/metafile/path" />
-<xsl:variable name="fileref">
-  <xsl:choose>
-  <xsl:when test="contains(@href, '.html')">
-    <xsl:value-of select="substring-before(@href, '.html')"/>
-  </xsl:when>
-  <xsl:otherwise>
-    <xsl:value-of select="concat(@href, 'index')"/>
-  </xsl:otherwise>
-  </xsl:choose>
-</xsl:variable>
-<xsl:choose>
-
-<xsl:when test="starts-with(@href, 'http:') or starts-with(@href, 'news:') or starts-with(@href, 'mailto:')">
-  <xsl:if test="not(.=@href)">
-    <xsl:text>\footnote{</xsl:text>
-      <xsl:text>\href{</xsl:text>
-      <xsl:call-template name="replace-string">
-        <xsl:with-param name="text" select="@href"/>
-        <xsl:with-param name="replace" select="'#'"/>
-        <xsl:with-param name="with" select="'\#'"/>
-      </xsl:call-template>
-      <xsl:text>}{</xsl:text>
-    <xsl:call-template name="ltescape">
-      <xsl:with-param name="string" select="@href"/>
-    </xsl:call-template>
-    <xsl:text>}}</xsl:text>
-  </xsl:if>
-</xsl:when>
-<xsl:when test="starts-with(@href, '#')">
-<!-- Don't do inter-section references -->
-</xsl:when>
-<xsl:otherwise>
-  <xsl:text> (p.\ \pageref{</xsl:text>
-    <xsl:call-template name="replace-string">
-      <xsl:with-param name="replace" select="'#'"/>
-      <xsl:with-param name="with" select="':'"/>
-      <xsl:with-param name="text">
-      <xsl:choose>
-      <xsl:when test="$relpath='.'">
-        <xsl:value-of select="concat('/',$fileref)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-        <xsl:when test="starts-with($fileref,'..')">
-          <xsl:value-of select="substring-after($fileref,'..')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="concat($path,$fileref)"/>
-        </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-      </xsl:choose>
-      </xsl:with-param>
-     </xsl:call-template>
-  <xsl:text>}) </xsl:text>
-</xsl:otherwise>
-</xsl:choose>
-</xsl:if>
-</xsl:template>
-
-<xsl:template match="img">
-<xsl:variable name="path" select="document(/*/@metafile)/metafile/path" />
-<xsl:text>\includegraphics{</xsl:text>
-      <xsl:call-template name="replace-string">
-        <xsl:with-param name="text" select="concat('.',$path,@src)"/>
-        <xsl:with-param name="replace" select="'.gif'"/>
-        <xsl:with-param name="with" select="''"/>
-      </xsl:call-template>
-<xsl:text>}</xsl:text>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/latex/latex.xsl b/docs/manual/style/latex/latex.xsl
deleted file mode 100644
index 76faf4a9..00000000
--- a/docs/manual/style/latex/latex.xsl
+++ /dev/null
@@ -1,383 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY % HTTPD-VERSION SYSTEM "../version.ent">
-    %HTTPD-VERSION;
-]>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<xsl:output 
-  method="text"
-  encoding="ISO-8859-1"
-  indent="no"
-/>
-
-<!-- Read the localized messages from the specified language file -->
-<xsl:variable name="message" select="document('../lang/en.xml')
-                                     /language/messages/message"/>
-<xsl:variable name="allmodules" select="document('../xsl/util/allmodules.xml')
-                                        /items/item[@lang='en']"/>
-
-<!-- Get the guts of the stylesheets -->
-<xsl:include href="manualpage.xsl" />
-<xsl:include href="common.xsl" />
-<xsl:include href="html.xsl" />
-<xsl:include href="synopsis.xsl" />
-<xsl:include href="moduleindex.xsl" />
-<xsl:include href="directiveindex.xsl" />
-<xsl:include href="faq.xsl" />
-<xsl:include href="quickreference.xsl" />
-
-<xsl:template match="sitemap">
-<xsl:text>
-\documentclass[10pt]{book}
-\usepackage{times}
-\usepackage{longtable}
-\usepackage{style/latex/atbeginend}
-\usepackage[pdftex]{graphicx}
-\usepackage[colorlinks=true,letterpaper=true,linkcolor=blue,urlcolor=blue]{hyperref}
-
-% Let LaTeX be lenient about very-bad line wrapping.
-\tolerance=9999 
-\emergencystretch=60pt
-
-% Adjust margins to a reasonable level
-\topmargin 0pt
-\advance \topmargin by -\headheight
-\advance \topmargin by -\headsep
-\textheight 8.9in
-\oddsidemargin 0pt
-\evensidemargin \oddsidemargin
-\marginparwidth 0.5in
-\textwidth 6.5in
-
-% Keep paragraphs flush left (rather than the default of indenting
-% the first line) and put a space between paragraphs.
-\setlength{\parindent}{0ex}
-\addtolength{\parskip}{1.2ex}
-
-% Shrink the inter-item spaces
-\AfterBegin{itemize}{\setlength{\itemsep}{0em}}
-
-\pagestyle{headings}
-
-\hypersetup{
-    pdftitle={</xsl:text>
-<xsl:value-of select="$message[@id='apache']" />
-<xsl:text> </xsl:text>
-<xsl:value-of select="$message[@id='http-server']" />
-<xsl:text> </xsl:text>
-<xsl:value-of select="$message[@id='documentation']" />
-<xsl:text> </xsl:text>
-<xsl:value-of select="$message[@id='version']" />
-<xsl:text>},
-    pdfauthor={Apache Software Foundation}
-  }
-
-\title{</xsl:text>
-<xsl:value-of select="$message[@id='apache']" />
-<xsl:text> </xsl:text>
-<xsl:value-of select="$message[@id='http-server']" />
-<xsl:text> </xsl:text>
-<xsl:value-of select="$message[@id='documentation']" />
-<xsl:text> </xsl:text>
-<xsl:value-of select="$message[@id='version']" />
-<xsl:text>\\ \bigskip \bigskip
-\includegraphics{images/feather}\\ \bigskip}
-\author{Apache Software Foundation}
-\date{\today}
-
-\begin{document}
-\frontmatter
-\maketitle
-
-\section*{About The PDF Documentation}
-
-Copyright \copyright 2005 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); 
-you may not use this file except in compliance with the License. 
-You may obtain a copy of the License at \href{http://www.apache.org/licenses/LICENSE-2.0}{http://www.apache.org/licenses/LICENSE-2.0}
-
-This version of the Apache HTTP Server Documentation is converted from
-XML source files to \LaTeX\ using XSLT with the help of Apache Ant,
-Apache XML Xalan, and Apache XML Xerces.
-
-Since the HTML version of the documentation is more commonly checked
-during development, the PDF version may contain some errors and
-inconsistencies, especially in formatting.  If you have difficulty
-reading a part of this file, please consult the HTML version
-of the documentation on the Apache HTTP Server website at
-\href{http://httpd.apache.org/docs/&httpd.docs;/}{http://httpd.apache.org/docs/&httpd.docs;/}
-
-The Apache HTTP Server Documentation is maintained by the Apache HTTP
-Server Documentation Project.  More information is available at
-\href{http://httpd.apache.org/docs-project/}{http://httpd.apache.org/docs-project/}
-
-\tableofcontents
-\mainmatter
-</xsl:text>
-
-<xsl:for-each select="category">
-  <xsl:text>\chapter{</xsl:text>
-  <xsl:apply-templates select="title" mode="printcat"/>
-  <xsl:text>}
-</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:if test="@id = 'modules'">
-        <xsl:apply-templates select="document($allmodules)/modulefilelist" />
-    </xsl:if>
-</xsl:for-each>
-
-<xsl:text>\end{document}</xsl:text>
-</xsl:template>
-
-<xsl:template match="page">
-<xsl:text>\include{</xsl:text>
-<xsl:choose>
-<xsl:when test="contains(@href,'.')">
-  <xsl:value-of select="substring-before(@href,'.')"/>
-</xsl:when>
-<xsl:otherwise>
-  <xsl:value-of select="concat(@href,'index')"/>
-</xsl:otherwise>
-</xsl:choose>
-<xsl:text>}
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="category/title" mode="printcat">
-<xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="category/title"></xsl:template>
-
-<xsl:template match="modulefilelist">
-<xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="modulefile">
-<xsl:text>\include{mod/</xsl:text>
-<xsl:value-of select="substring-before(.,'.')"/>
-<xsl:text>}
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="summary">
-<xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template name="replace-string">
-  <xsl:param name="text"/>
-  <xsl:param name="replace"/>
-  <xsl:param name="with"/>
-    
-  <xsl:choose>
-    <xsl:when test="not(contains($text,$replace))">
-      <xsl:value-of select="$text"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="substring-before($text,$replace)"/>
-      <xsl:value-of select="$with"/>
-      <xsl:call-template name="replace-string">
-        <xsl:with-param name="text" select="substring-after($text,$replace)"/>
-        <xsl:with-param name="replace" select="$replace"/>
-        <xsl:with-param name="with" select="$with"/>
-       </xsl:call-template>
-     </xsl:otherwise>
-   </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Take care of all the LaTeX special characters.                       -->
-<!-- Silly multi-variable technique used to avoid deep recursion.         -->
-<!-- ==================================================================== -->
-<xsl:template match="text()">
-<xsl:call-template name="ltescape">
-  <xsl:with-param name="string" select="."/>
-</xsl:call-template>
-</xsl:template>
-
-
-<xsl:template name="ltescape">
-<xsl:param name="string"/>
-
-<xsl:variable name="result1">
- <xsl:choose>
- <xsl:when test="contains($string, '\')">
-   <xsl:call-template name="replace-string">
-    <xsl:with-param name="replace" select="'\'"/>
-    <xsl:with-param name="with" select="'\textbackslash '"/>
-    <xsl:with-param name="text" select="normalize-space($string)"/>
-   </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
-   <xsl:value-of select="$string"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:variable>
-
-<xsl:variable name="result2">
- <xsl:choose>
- <xsl:when test="contains($result1, '$')">
-   <xsl:call-template name="replace-string">
-    <xsl:with-param name="replace" select="'$'"/>
-    <xsl:with-param name="with" select="'\$'"/>
-    <xsl:with-param name="text" select="$result1"/>
-   </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
-   <xsl:value-of select="$result1"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:variable>
-
-<xsl:variable name="result3">
- <xsl:choose>
- <xsl:when test="contains($result2, '{')">
-   <xsl:call-template name="replace-string">
-    <xsl:with-param name="replace" select="'{'"/>
-    <xsl:with-param name="with" select="'\{'"/>
-    <xsl:with-param name="text" select="$result2"/>
-   </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
-   <xsl:value-of select="$result2"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:variable>
-
-<xsl:variable name="result4">
- <xsl:choose>
- <xsl:when test="contains($result3, '}')">
-   <xsl:call-template name="replace-string">
-    <xsl:with-param name="replace" select="'}'"/>
-    <xsl:with-param name="with" select="'\}'"/>
-    <xsl:with-param name="text" select="$result3"/>
-   </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
-   <xsl:value-of select="$result3"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:variable>
-
-<!-- The '[' and ']' characters don't, in general, need to be
-  escaped.  But there are times when it is ambiguous whether
-  [ is the beginning of an optional argument or a literal '['.
-  Hence, it is safer to protect the literal ones with {}. -->
-<xsl:variable name="result5">
- <xsl:choose>
- <xsl:when test="contains($result4, '[')">
-   <xsl:call-template name="replace-string">
-    <xsl:with-param name="replace" select="'['"/>
-    <xsl:with-param name="with" select="'{[}'"/>
-    <xsl:with-param name="text" select="$result4"/>
-   </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
-   <xsl:value-of select="$result4"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:variable>
-
-<xsl:variable name="result6">
- <xsl:choose>
- <xsl:when test="contains($result5, ']')">
-   <xsl:call-template name="replace-string">
-    <xsl:with-param name="replace" select="']'"/>
-    <xsl:with-param name="with" select="'{]}'"/>
-    <xsl:with-param name="text" select="$result5"/>
-   </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
-   <xsl:value-of select="$result5"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:variable>
-
-<xsl:variable name="result7">
- <xsl:choose>
- <xsl:when test="contains($result6, '&quot;')">
-   <xsl:call-template name="replace-string">
-    <xsl:with-param name="replace" select="'&quot;'"/>
-    <xsl:with-param name="with" select="'\texttt{&quot;}'"/>
-    <xsl:with-param name="text" select="$result6"/>
-   </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
-   <xsl:value-of select="$result6"/>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:variable>
-
-
-    <xsl:call-template name="replace-string">
-    <xsl:with-param name="replace" select="'_'"/>
-    <xsl:with-param name="with" select="'\_'"/>
-    <xsl:with-param name="text">
-      <xsl:call-template name="replace-string">
-      <xsl:with-param name="replace" select="'#'"/>
-      <xsl:with-param name="with" select="'\#'"/>
-      <xsl:with-param name="text">
-        <xsl:call-template name="replace-string">
-        <xsl:with-param name="replace" select="'%'"/>
-        <xsl:with-param name="with" select="'\%'"/>
-        <xsl:with-param name="text">
-          <xsl:call-template name="replace-string">
-          <xsl:with-param name="replace" select="'&gt;'"/>
-          <xsl:with-param name="with" select="'\textgreater{}'"/>
-          <xsl:with-param name="text">
-            <xsl:call-template name="replace-string">
-            <xsl:with-param name="replace" select="'&lt;'"/>
-            <xsl:with-param name="with" select="'\textless{}'"/>
-            <xsl:with-param name="text">
-              <xsl:call-template name="replace-string">
-              <xsl:with-param name="replace" select="'~'"/>
-              <xsl:with-param name="with" select="'\textasciitilde{}'"/>
-              <xsl:with-param name="text">
-                <xsl:call-template name="replace-string">
-                <xsl:with-param name="replace" select="'^'"/>
-                <xsl:with-param name="with" select="'\^{}'"/>
-                <xsl:with-param name="text">
-                    <xsl:call-template name="replace-string">
-                    <xsl:with-param name="replace" select="'&amp;'"/>
-                    <xsl:with-param name="with" select="'\&amp;'"/>
-                    <xsl:with-param name="text" select="$result7"/>
-                    </xsl:call-template>
-                </xsl:with-param>
-                </xsl:call-template>
-              </xsl:with-param>
-              </xsl:call-template>
-            </xsl:with-param>
-            </xsl:call-template>
-          </xsl:with-param>
-          </xsl:call-template>
-        </xsl:with-param>
-        </xsl:call-template>
-      </xsl:with-param>
-      </xsl:call-template>
-    </xsl:with-param>
-    </xsl:call-template>
-
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/latex/manualpage.xsl b/docs/manual/style/latex/manualpage.xsl
deleted file mode 100644
index 172e54b7..00000000
--- a/docs/manual/style/latex/manualpage.xsl
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-<xsl:template match="manualpage">
-
-<xsl:call-template name="section-title"/>
-
-<xsl:apply-templates select="summary"/>
-
-<xsl:call-template name="seealso"/>
-
-<xsl:apply-templates select="section"/>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/latex/moduleindex.xsl b/docs/manual/style/latex/moduleindex.xsl
deleted file mode 100644
index 2824d607..00000000
--- a/docs/manual/style/latex/moduleindex.xsl
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-<!-- ==================================================================== -->
-<!-- <moduleindex>                                                        -->
-<!-- Builds the moduleindex page                                          -->
-<!-- ==================================================================== -->
-<xsl:template match="moduleindex">
-
-  <xsl:variable name="metafile" select="document(/*/@metafile)/metafile" /> 
-
-  <xsl:call-template name="section-title"/>
-
-  <xsl:apply-templates select="summary"/>
-
-  <xsl:call-template name="seealso"/>
-
-   <xsl:text>\subsection*{</xsl:text>
-   <xsl:value-of select="$message[@id='corefeatures']" />
-   <xsl:text>}
-
-\begin{description}
-\item[</xsl:text>
-    <xsl:apply-templates select="document(document($allmodules)/modulefilelist/modulefile
-                              [starts-with(., 'core.xml')])
-                              /modulesynopsis/name"/>
-    <xsl:text>] (p.\ \pageref{/mod/</xsl:text>
-    <xsl:value-of select="document(document($allmodules)/modulefilelist/modulefile
-                              [starts-with(., 'core.xml')])
-                              /modulesynopsis/name"/>
-    <xsl:text>}) </xsl:text>
-
-    <xsl:apply-templates select="document(document($allmodules)/modulefilelist/modulefile
-                                 [starts-with(., 'core.xml')])
-                                 /modulesynopsis/description" />
-
-    <xsl:text>
-\item[</xsl:text>
-
-    <xsl:apply-templates  select="document(document($allmodules)/modulefilelist/modulefile
-                                  [starts-with(., 'mpm_common.xml')])
-                                  /modulesynopsis/name" />
-    <xsl:text>] (p.\ \pageref{/mod/</xsl:text>
-    <xsl:value-of select="document(document($allmodules)/modulefilelist/modulefile
-                                   [starts-with(., 'mpm_common.xml')])
-                                   /modulesynopsis/name"/>
-    <xsl:text>}) </xsl:text>
-    <xsl:apply-templates select="document(document($allmodules)/modulefilelist/modulefile
-                                         [starts-with(., 'mpm_common.xml')])
-                                         /modulesynopsis/description" />
-
-
-
-    <!-- and now the remaining MPMs -->
-    <xsl:variable name="mpmmodules"
-         select="document(document($allmodules)/modulefilelist/modulefile)
-                 /modulesynopsis[status='MPM' and name != 'mpm_common']" />
-    <xsl:variable name="translist">
-      <xsl:call-template name="module-translist">
-         <xsl:with-param name="modules" select="$mpmmodules" />
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:for-each select="$mpmmodules">
-      <xsl:sort select="substring-before(substring-after($translist,
-                  concat('- ', translate(normalize-space(name), $lowercase,
-                  $uppercase), ' ')), ' -')" />
-
-      <xsl:text>
-\item[</xsl:text>
-      <xsl:apply-templates select="name"/>
-      <xsl:text>] (p.\ \pageref{/mod/</xsl:text>
-      <xsl:value-of select="name"/>
-      <xsl:text>}) </xsl:text>
-
-      <xsl:apply-templates select="description" />
-
-    </xsl:for-each>
-
-    <xsl:text>\end{description}
-
-</xsl:text>
-
-    <!-- /core section -->
-
-    <xsl:text>\section*{</xsl:text>
-    <xsl:value-of select="$message[@id='othermodules']" />
-    <xsl:text>}
-\begin{description}
-</xsl:text>
-            
-    <xsl:variable name="modules"
-         select="document(document($allmodules)/modulefilelist/modulefile)
-                 /modulesynopsis[status!='MPM' and status!='Core']" />
-
-    <xsl:call-template name="mindex-of-letter">
-       <xsl:with-param name="modules" select="$modules" />
-    </xsl:call-template>
-
-    <xsl:text>\end{description}
-</xsl:text>
-</xsl:template> 
-<!-- /moduleindex -->
-
-
-<!-- ==================================================================== -->
-<!-- the working horse. builds list items of all modules starting with    -->
-<!-- one letter when done, it calls itself to catch the next letter       -->
-<!-- ==================================================================== -->
-<xsl:template name="mindex-of-letter">
-<xsl:param name="modules"/>
-
-<xsl:variable name="translist">
-    <xsl:call-template name="module-translist">
-        <xsl:with-param name="modules" select="$modules" />
-    </xsl:call-template>
-</xsl:variable>
-
-<xsl:for-each select="$modules">
-<xsl:sort
-    select="substring-before(substring-after($translist, concat('- ',
-        translate(normalize-space(name),$lowercase,$uppercase), ' ')), ' -')" />
-
-<xsl:text>
-\item[</xsl:text>
-<xsl:apply-templates select="name"/>
-<xsl:text>] (p.\ \pageref{/mod/</xsl:text>
-<xsl:value-of select="name"/>
-<xsl:text>}) </xsl:text>
-
-        <xsl:apply-templates select="description" />
-
-</xsl:for-each> <!-- /directives -->
-
-</xsl:template>
-<!-- /mindex-of-letter -->
-
-<!-- ==================================================================== -->
-<!-- define module name translations for sorting                          -->
-<!--                                                                      -->
-<!-- it's a kind of a hack...                                             -->
-<!-- we build a string that contains the following data:                  -->
-<!-- "- modulename sortname - modulename sortname - ..."                  -->
-<!-- (with all data in uppercase)                                         -->
-<!--                                                                      -->
-<!-- So, the translation from modulename to sortname can be done with the -->
-<!-- expression below:                                                    -->
-<!--
-       substring-before(
-           substring-after($translist, 
-                           concat('- ', translate(modulename,
-                                                  $lowercase, $uppercase),
-                                  ' ')
-                           ),
-           ' -')
-                                                                          -->
-<!-- ==================================================================== -->
-<xsl:template name="module-translist">
-<xsl:param name="modules" />
-
-<xsl:text>-</xsl:text>
-<xsl:for-each select="$modules">
-    <xsl:variable name="sname" select="translate(normalize-space(name),
-                                       $lowercase, $uppercase)" />
-
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$sname" />
-    <xsl:text> </xsl:text>
-    <xsl:call-template name="module-translatename">
-        <xsl:with-param name="name" select="$sname" />
-    </xsl:call-template>
-    <xsl:text> -</xsl:text>
-</xsl:for-each>
-</xsl:template>
-<!-- /module-translist -->
-
-<xsl:template name="module-translatename">
-<xsl:param name="name" />
-
-<xsl:variable name="sname" select="translate($name, $lowercase, $uppercase)" />
-
-<xsl:choose>
-<xsl:when test="starts-with($sname, 'MOD_') or starts-with($sname, 'MPM_')">
-    <xsl:value-of select="substring($name, 5)" />
-</xsl:when>
-
-<xsl:when test="starts-with($sname, 'MPMT_')">
-    <xsl:value-of select="substring($name, 6)" />
-</xsl:when>
-
-<xsl:otherwise>
-    <xsl:value-of select="$name" />
-</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-<!-- /module-translatename -->
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/latex/quickreference.xsl b/docs/manual/style/latex/quickreference.xsl
deleted file mode 100644
index 02a27e2a..00000000
--- a/docs/manual/style/latex/quickreference.xsl
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-<!-- ==================================================================== -->
-<!-- <quickreference>                                                     -->
-<!-- Builds the directive quickreference page                             -->
-<!-- ==================================================================== -->
-<xsl:template match="quickreference">
-
-  <xsl:call-template name="section-title"/>
-
-  <xsl:apply-templates select="summary"/>
-
-  <xsl:call-template name="seealso"/>
-
-  <xsl:apply-templates select="legend"/>
-
-  <xsl:variable name="directives"
-       select="document(document($allmodules)/modulefilelist/modulefile)
-         /modulesynopsis/directivesynopsis[not(@location)]" />
-
-  <xsl:text>\footnotesize
-</xsl:text>
-
-  <xsl:text>\begin{longtable}{p{.60\textwidth}p{.25\textwidth}ll}\hline
-</xsl:text>
-
-<xsl:for-each
-   select="$directives[translate(substring(normalize-space(name), 1,1),
-                                          $lowercase,$uppercase)]">
-<xsl:sort select="name" />
-
-   <xsl:text>\texttt{</xsl:text>
-   <xsl:apply-templates select="syntax" />
-   <xsl:text>}</xsl:text>
-   <xsl:text>&amp;</xsl:text>
-
-   <!-- if the default value contains (at least) one <br />, -->
-   <!-- this probably means that a short explanation follows -->
-   <!-- the actual default value. We cut off the string      -->
-   <!-- after the <br /> so it will not be shown here.       -->
-   <!-- (add the + character instead)                        -->
-   <xsl:variable name="default">
-       <xsl:choose>
-       <xsl:when test="count(default[count(br) &gt; 0]) &gt; 0">
-          <xsl:value-of select="default/child::node()
-                       [count(preceding-sibling::*) = 0]" />
-       </xsl:when>
-       <xsl:otherwise>
-            <xsl:value-of select="default"/>
-       </xsl:otherwise>
-       </xsl:choose>
-    </xsl:variable>
-
-     <xsl:call-template name="ltescape">
-        <xsl:with-param name="string">
-            <xsl:value-of select="substring(substring-after(concat($default,
-                                  ' '), name),1,20)" />
-        </xsl:with-param>
-      </xsl:call-template>
-
-      <xsl:if test="string-length(substring-after(concat($default, ' '),
-                name)) &gt; 20 or count(default[count(br) &gt; 0]) &gt; 0">
-         <xsl:text> +</xsl:text>
-      </xsl:if>
-
-      <xsl:text>&amp;</xsl:text>
-
-            <xsl:if test="contextlist/context
-                          [normalize-space(.)='server config']">s</xsl:if>
-            <xsl:if test="contextlist/context
-                          [normalize-space(.)='virtual host']">v</xsl:if>
-            <xsl:if test="contextlist/context
-                          [normalize-space(.)='directory']">d</xsl:if>
-            <xsl:if test="contextlist/context
-                          [normalize-space(.)='.htaccess']">h</xsl:if>
-
-      <xsl:text>&amp;</xsl:text>
-            <xsl:choose>
-            <xsl:when test="../status='Base'">B</xsl:when>
-            <xsl:when test="../status='MPM'">M</xsl:when>
-            <xsl:when test="../status='Core'">C</xsl:when>
-            <xsl:when test="../status='Extension'">E</xsl:when>
-            <xsl:when test="../status='Experimental'">X</xsl:when>
-            </xsl:choose>
-
-     <xsl:text>\\*
-</xsl:text>
-
-      <xsl:text>\multicolumn{4}{l}{\begin{minipage}[t]{.95\textwidth}</xsl:text>
-         <xsl:choose>
-         <xsl:when test="string-length(normalize-space(description)) &gt; 0">
-             <xsl:apply-templates select="description"/>
-         </xsl:when>
-         <xsl:otherwise>
-             <xsl:text>-</xsl:text>
-         </xsl:otherwise>
-         </xsl:choose>
-
-      <xsl:text>\hfill p.\ \pageref{/mod/</xsl:text>
-        <xsl:value-of select="../name"/> <xsl:text>:</xsl:text>
-        <xsl:value-of select="translate(name, $uppercase, $lowercase)"/>
-      <xsl:text>}</xsl:text>
-
-
-    <xsl:text>\end{minipage}} \\ \hline
-</xsl:text>
-
-  </xsl:for-each> <!-- /directives -->
-
-  <xsl:text>\end{longtable}
-\normalsize</xsl:text>
-
-</xsl:template>
-
-<xsl:template match="legend">
-<xsl:apply-templates/>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/latex/synopsis.xsl b/docs/manual/style/latex/synopsis.xsl
deleted file mode 100644
index 74780ac9..00000000
--- a/docs/manual/style/latex/synopsis.xsl
+++ /dev/null
@@ -1,346 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-
-<!-- ==================================================================== -->
-<!-- <modulesynopsis>                                                     -->
-<!-- ==================================================================== -->
-
-<xsl:template match="modulesynopsis">
-
-<xsl:text>\section{</xsl:text>
-<xsl:choose>
-  <xsl:when test="../status='Core'">
-    <xsl:value-of select="$message[@id='apachecore']" />
-  </xsl:when>
-  <xsl:when test=".='mpm_common'">
-    <xsl:value-of select="$message[@id='apachempmcommon']" />
-  </xsl:when>
-  <xsl:when test="../status='MPM'">
-    <xsl:value-of select="$message[@id='apachempm']" />
-    <xsl:text> </xsl:text>
-    <xsl:apply-templates select="name"/>
-  </xsl:when>
-  <xsl:otherwise>
-    <xsl:value-of select="$message[@id='apachemodule']" />
-    <xsl:text> </xsl:text>
-    <xsl:apply-templates select="name"/>
-  </xsl:otherwise>
-</xsl:choose>
-<xsl:text>}\label{</xsl:text>
-<xsl:value-of select="concat('/mod/',name)"/>
-<xsl:text>}\hypertarget{</xsl:text>
-<xsl:value-of select="concat('/mod/',name)"/>
-<xsl:text>}{}</xsl:text>
-
-<xsl:text>
-\begin{tabular}{lp{.75\linewidth}}
-\hline
-</xsl:text>
-<xsl:value-of select="$message[@id='description']" />
-<xsl:text>: &amp;</xsl:text> 
-<xsl:apply-templates select="description" />
-<xsl:text>\\
-</xsl:text>
-
-<xsl:value-of select="$message[@id='status']" />
-<xsl:text>: &amp;</xsl:text>
-<xsl:value-of select="status" />
-<xsl:text>\\
-</xsl:text>
-
-<xsl:if test="identifier">
-<xsl:value-of select="$message[@id='moduleidentifier']" />
-<xsl:text>: &amp;</xsl:text>
-<xsl:apply-templates select="identifier" />
-<xsl:text>\\
-</xsl:text>
-</xsl:if>
-
-<xsl:if test="sourcefile">
-<xsl:value-of select="$message[@id='sourcefile']" />
-<xsl:text>: &amp;</xsl:text>
-<xsl:apply-templates select="sourcefile" />
-<xsl:text>\\
-</xsl:text>
-</xsl:if>
-
-<xsl:if test="compatibility">
-<xsl:value-of select="$message[@id='compatibility']" />
-<xsl:text>: &amp;</xsl:text>
-<xsl:apply-templates select="compatibility" />
-<xsl:text> \\
-</xsl:text>
-</xsl:if>
-<xsl:text>\hline \end{tabular}
-</xsl:text>
-    <!-- Summary of module features/usage (1 to 3 paragraphs, -->
-    <!-- optional)                                            -->
-    <xsl:if test="summary">
-      <xsl:text>\subsection*{</xsl:text>
-      <xsl:value-of select="$message[@id='summary']" />
-      <xsl:text>}
-</xsl:text>
-      <xsl:apply-templates select="summary" />
-     </xsl:if>
-
-     <xsl:text>
-\smallskip\textbf{</xsl:text>
-     <xsl:value-of select="$message[@id='directives']" />
-     <xsl:text>}
-</xsl:text>
-
-     <xsl:choose>
-     <xsl:when test="directivesynopsis">
-       <xsl:text>\begin{itemize}</xsl:text>
-       <xsl:for-each select="directivesynopsis">
-         <xsl:sort select="name" />
-         <xsl:text>\item </xsl:text>
-         <xsl:if test="@type='section'">
-           <xsl:text>\textless{}</xsl:text>
-         </xsl:if>
-         <xsl:apply-templates select="name" mode="simple"/>
-         <xsl:if test="@type='section'">
-           <xsl:text>\textgreater{}</xsl:text>
-         </xsl:if>
-         <xsl:if test="@location">
-           <xsl:variable name="lowerlocation"
-            select="translate(@location, $uppercase, $lowercase)" />
-           <xsl:text> (p.\ \pageref{/mod/</xsl:text>
-           <xsl:value-of select="concat(translate(@location,$uppercase,$lowercase),':',translate(name,$uppercase,$lowercase))"/>
-           <xsl:text>}) </xsl:text>
-         </xsl:if>
-         <xsl:text>
-</xsl:text>
-       </xsl:for-each>
-       <xsl:text>\end{itemize}
-</xsl:text>
-     </xsl:when>
-     <xsl:otherwise>
-       <xsl:value-of select="$message[@id='nodirectives']" />
-     <xsl:text>
-</xsl:text>
-     </xsl:otherwise>
-     </xsl:choose>
-
-     <xsl:text>
-</xsl:text>
-
-<xsl:call-template name="seealso"/>
-
-     <!-- Sections of documentation about the module as a whole -->
-       <xsl:apply-templates select="section" />
-
-     <!-- Directive documentation -->
-       <xsl:apply-templates select="directivesynopsis">
-         <xsl:sort select="name" />
-       </xsl:apply-templates>
-
-</xsl:template>
-<!-- /modulesynopsis -->
-
-
-<!-- ==================================================================== -->
-<!-- Directivesynopsis                                                    -->
-<!-- ==================================================================== -->
-<xsl:template match="directivesynopsis/name" mode="simple" name="simpledirname">
-<xsl:if test="@type='section'"><xsl:text>\textless{}</xsl:text></xsl:if>
-<xsl:apply-templates/>
-<xsl:if test="@type='section'"><xsl:text>\textgreater{}</xsl:text></xsl:if>
-</xsl:template>
-
-<xsl:template match="directivesynopsis/name">
-<xsl:text>\subsection*{</xsl:text>
-<xsl:call-template name="simpledirname"/>
-  <xsl:choose>
-  <xsl:when test="$message[@id='directive']/@replace-space-with">
-    <xsl:value-of select="$message[@id='directive']/@replace-space-with"/>
-  </xsl:when>
-  <xsl:otherwise>
-    <xsl:text> </xsl:text>
-  </xsl:otherwise>
-  </xsl:choose>
-
-<xsl:value-of select="$message[@id='directive']" />
-<xsl:text>}\label{</xsl:text>
-<xsl:value-of select="concat('/mod/', //modulesynopsis/name, ':', translate(., $uppercase, $lowercase))"/>
-<xsl:text>}\hypertarget{</xsl:text>
-<xsl:value-of select="concat('/mod/', //modulesynopsis/name, ':', translate(., $uppercase, $lowercase))"/>
-<xsl:text>}{}</xsl:text>
-
-</xsl:template>
-
-<xsl:template match="directivesynopsis">
-<xsl:if test="not(@location)">
-  <xsl:apply-templates select="name"/>
-  <!-- Directive header -->
-  <xsl:text>
-\begin{tabular}{lp{.8\linewidth}}
-\hline
-</xsl:text>
-<xsl:value-of select="$message[@id='description']" />
-<xsl:text>: &amp; </xsl:text>
-<xsl:apply-templates select="description" />
-<xsl:text>\\
-</xsl:text>
-
-<xsl:value-of select="$message[@id='syntax']" />
-<xsl:text>: &amp; {\ttfamily </xsl:text>
-<xsl:apply-templates select="syntax" />
-<xsl:text>}\\
-</xsl:text>
-
-<xsl:if test="default">
-<xsl:value-of select="$message[@id='default']" />
-<xsl:text>: &amp; {\ttfamily </xsl:text>
-<xsl:apply-templates select="default" />
-<xsl:text>} \\
-</xsl:text>
-</xsl:if>
-
-<xsl:value-of select="$message[@id='context']" />
-<xsl:text>: &amp;</xsl:text>
-<xsl:apply-templates select="contextlist" />
-<xsl:text> \\
-</xsl:text>
-
-<xsl:if test="override">
-<xsl:value-of select="$message[@id='override']"/>
-<xsl:text>: &amp;</xsl:text>
-<xsl:apply-templates select="override" />
-<xsl:text> \\
-</xsl:text>
-</xsl:if>
-
-<xsl:value-of select="$message[@id='status']" />
-<xsl:text>: &amp;</xsl:text>
-<xsl:value-of select="../status" />
-<xsl:text> \\
-</xsl:text>
-
-<xsl:value-of select="$message[@id='module']" />
-<xsl:text>: &amp;</xsl:text>
-<xsl:choose>
-<xsl:when test="modulelist">
-  <xsl:apply-templates select="modulelist" />
-</xsl:when>
-<xsl:otherwise>
-  <xsl:apply-templates select="../name" />
-</xsl:otherwise>
-</xsl:choose>
-<xsl:text> \\
-</xsl:text>
-
-<xsl:if test="compatibility">
-<xsl:value-of select="$message[@id='compatibility']" />
-<xsl:text>: &amp;</xsl:text>
-<xsl:apply-templates select="compatibility" />
-<xsl:text> \\
-</xsl:text>
-</xsl:if>
-
-<xsl:text>\hline
-\end{tabular}
-
-</xsl:text>
-
-<xsl:apply-templates select="usage" />
-
-<xsl:call-template name="seealso"/>
-
-</xsl:if> <!-- /not(@location) -->
-</xsl:template>
-<!-- /directivesynopsis -->
-
-
-<!-- ==================================================================== -->
-<!-- <contextlist>                                                        -->
-<!-- ==================================================================== -->
-<xsl:template match="contextlist">
-<xsl:apply-templates select="context" />
-</xsl:template>
-<!-- /contextlist -->
-
-
-<!-- ==================================================================== -->
-<!-- <context>                                                            -->
-<!-- Each entry is separeted with a comma                                 -->
-<!-- ==================================================================== -->
-<xsl:template match="context">
-<xsl:choose>
-<xsl:when test="normalize-space(.) = 'server config'">
-    <xsl:value-of select="$message[@id='serverconfig']" />
-</xsl:when>
-<xsl:when test="normalize-space(.) = 'virtual host'">
-    <xsl:value-of select="$message[@id='virtualhost']" />
-</xsl:when>
-<xsl:when test="normalize-space(.) = 'directory'">
-    <xsl:value-of select="$message[@id='directory']" />
-</xsl:when>
-<xsl:when test="normalize-space(.) = '.htaccess'">
-    <xsl:value-of select="$message[@id='htaccess']" />
-</xsl:when>
-<xsl:otherwise> <!-- error -->
-    <xsl:message terminate="yes">
-        unknown context: <xsl:value-of select="." />
-    </xsl:message>
-</xsl:otherwise>
-</xsl:choose>
-
-<xsl:if test="position() != last()">
-    <xsl:text>, </xsl:text>
-</xsl:if>
-</xsl:template>
-<!-- /context -->
-
-
-<!-- ==================================================================== -->
-<!-- <modulelist>                                                         -->
-<!-- ==================================================================== -->
-<xsl:template match="modulelist">
-<xsl:for-each select="module">
-    <xsl:call-template name="module" />
-    <xsl:if test="position() != last()">
-        <xsl:text>, </xsl:text>
-    </xsl:if>
-</xsl:for-each>
-</xsl:template>
-<!-- /modulelist -->
-
-
-<!-- ==================================================================== -->
-<!-- modulesynopsis/compatibility                                         -->
-<!-- ==================================================================== -->
-<xsl:template match="modulesynopsis/compatibility">
-<xsl:apply-templates />
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- directivesynopsis/compatibility                                      -->
-<!-- ==================================================================== -->
-<xsl:template match="directivesynopsis/compatibility">
-<xsl:apply-templates />
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/manual.de.xsl b/docs/manual/style/manual.de.xsl
deleted file mode 100644
index 0b1667ad..00000000
--- a/docs/manual/style/manual.de.xsl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<xsl:output method="xml" encoding="ISO-8859-1" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
-
-<!-- Read the localized messages from the specified language file -->
-<xsl:variable name="message" select="document('lang/de.xml')/language/messages/message"/>
-<xsl:variable name="doclang">de</xsl:variable>
-<xsl:variable name="allmodules" select="document('xsl/util/allmodules.xml')/items/item[@lang=$doclang]"/>
-
-<!-- some meta information have to be passed to the transformation -->
-<xsl:variable name="output-encoding">ISO-8859-1</xsl:variable>
-<xsl:variable name="is-chm" select="false()"/>
-<xsl:variable name="is-zip" select="false()"/>
-
-<!-- Now get the real guts of the stylesheet -->
-<xsl:include href="xsl/common.xsl"/>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/docs/manual/style/manual.en.xsl b/docs/manual/style/manual.en.xsl
deleted file mode 100644
index c3d88747..00000000
--- a/docs/manual/style/manual.en.xsl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<xsl:output method="xml" encoding="ISO-8859-1" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
-
-<!-- Read the localized messages from the specified language file -->
-<xsl:variable name="message" select="document('lang/en.xml')/language/messages/message"/>
-<xsl:variable name="doclang">en</xsl:variable>
-<xsl:variable name="allmodules" select="document('xsl/util/allmodules.xml')/items/item[@lang=$doclang]"/>
-
-<!-- some meta information have to be passed to the transformation -->
-<xsl:variable name="output-encoding">ISO-8859-1</xsl:variable>
-<xsl:variable name="is-chm" select="false()"/>
-<xsl:variable name="is-zip" select="false()"/>
-
-<!-- Now get the real guts of the stylesheet -->
-<xsl:include href="xsl/common.xsl"/>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/docs/manual/style/manual.es.xsl b/docs/manual/style/manual.es.xsl
deleted file mode 100644
index e25c9703..00000000
--- a/docs/manual/style/manual.es.xsl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<xsl:output method="xml" encoding="ISO-8859-1" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
-
-<!-- Read the localized messages from the specified language file -->
-<xsl:variable name="message" select="document('lang/es.xml')/language/messages/message"/>
-<xsl:variable name="doclang">es</xsl:variable>
-<xsl:variable name="allmodules" select="document('xsl/util/allmodules.xml')/items/item[@lang=$doclang]"/>
-
-<!-- some meta information have to be passed to the transformation -->
-<xsl:variable name="output-encoding">ISO-8859-1</xsl:variable>
-<xsl:variable name="is-chm" select="false()"/>
-<xsl:variable name="is-zip" select="false()"/>
-
-<!-- Now get the real guts of the stylesheet -->
-<xsl:include href="xsl/common.xsl"/>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/docs/manual/style/manual.fr.xsl b/docs/manual/style/manual.fr.xsl
deleted file mode 100644
index 0a644415..00000000
--- a/docs/manual/style/manual.fr.xsl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<xsl:output method="xml" encoding="ISO-8859-1" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
-
-<!-- Read the localized messages from the specified language file -->
-<xsl:variable name="message" select="document('lang/fr.xml')/language/messages/message"/>
-<xsl:variable name="doclang">fr</xsl:variable>
-<xsl:variable name="allmodules" select="document('xsl/util/allmodules.xml')/items/item[@lang=$doclang]"/>
-
-<!-- some meta information have to be passed to the transformation -->
-<xsl:variable name="output-encoding">ISO-8859-1</xsl:variable>
-<xsl:variable name="is-chm" select="false()"/>
-<xsl:variable name="is-zip" select="false()"/>
-
-<!-- Now get the real guts of the stylesheet -->
-<xsl:include href="xsl/common.xsl"/>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/docs/manual/style/manual.ja.xsl b/docs/manual/style/manual.ja.xsl
deleted file mode 100644
index 239141b2..00000000
--- a/docs/manual/style/manual.ja.xsl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<xsl:output method="xml" encoding="EUC-JP" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
-
-<!-- Read the localized messages from the specified language file -->
-<xsl:variable name="message" select="document('lang/ja.xml')/language/messages/message"/>
-<xsl:variable name="doclang">ja</xsl:variable>
-<xsl:variable name="allmodules" select="document('xsl/util/allmodules.xml')/items/item[@lang=$doclang]"/>
-
-<!-- some meta information have to be passed to the transformation -->
-<xsl:variable name="output-encoding">EUC-JP</xsl:variable>
-<xsl:variable name="is-chm" select="false()"/>
-<xsl:variable name="is-zip" select="false()"/>
-
-<!-- Now get the real guts of the stylesheet -->
-<xsl:include href="xsl/common.xsl"/>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/docs/manual/style/manual.ko.xsl b/docs/manual/style/manual.ko.xsl
deleted file mode 100644
index b4e69d92..00000000
--- a/docs/manual/style/manual.ko.xsl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<xsl:output method="xml" encoding="EUC-KR" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
-
-<!-- Read the localized messages from the specified language file -->
-<xsl:variable name="message" select="document('lang/ko.xml')/language/messages/message"/>
-<xsl:variable name="doclang">ko</xsl:variable>
-<xsl:variable name="allmodules" select="document('xsl/util/allmodules.xml')/items/item[@lang=$doclang]"/>
-
-<!-- some meta information have to be passed to the transformation -->
-<xsl:variable name="output-encoding">EUC-KR</xsl:variable>
-<xsl:variable name="is-chm" select="false()"/>
-<xsl:variable name="is-zip" select="false()"/>
-
-<!-- Now get the real guts of the stylesheet -->
-<xsl:include href="xsl/common.xsl"/>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/docs/manual/style/manual.pt-br.xsl b/docs/manual/style/manual.pt-br.xsl
deleted file mode 100644
index a6be5add..00000000
--- a/docs/manual/style/manual.pt-br.xsl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<xsl:output method="xml" encoding="ISO-8859-1" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
-
-<!-- Read the localized messages from the specified language file -->
-<xsl:variable name="message" select="document('lang/pt-br.xml')/language/messages/message"/>
-<xsl:variable name="doclang">pt-br</xsl:variable>
-<xsl:variable name="allmodules" select="document('xsl/util/allmodules.xml')/items/item[@lang=$doclang]"/>
-
-<!-- some meta information have to be passed to the transformation -->
-<xsl:variable name="output-encoding">ISO-8859-1</xsl:variable>
-<xsl:variable name="is-chm" select="false()"/>
-<xsl:variable name="is-zip" select="false()"/>
-
-<!-- Now get the real guts of the stylesheet -->
-<xsl:include href="xsl/common.xsl"/>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/docs/manual/style/manual.ru.xsl b/docs/manual/style/manual.ru.xsl
deleted file mode 100644
index 53adbad9..00000000
--- a/docs/manual/style/manual.ru.xsl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<xsl:output method="xml" encoding="KOI8-R" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
-
-<!-- Read the localized messages from the specified language file -->
-<xsl:variable name="message" select="document('lang/ru.xml')/language/messages/message"/>
-<xsl:variable name="doclang">ru</xsl:variable>
-<xsl:variable name="allmodules" select="document('xsl/util/allmodules.xml')/items/item[@lang=$doclang]"/>
-
-<!-- some meta information have to be passed to the transformation -->
-<xsl:variable name="output-encoding">KOI8-R</xsl:variable>
-<xsl:variable name="is-chm" select="false()"/>
-<xsl:variable name="is-zip" select="false()"/>
-
-<!-- Now get the real guts of the stylesheet -->
-<xsl:include href="xsl/common.xsl"/>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index e076bfb9..4aa5433e 100644
--- a/docs/manual/style/version.ent
+++ b/docs/manual/style/version.ent
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "2">
-<!ENTITY httpd.patch "8">
+<!ENTITY httpd.patch "9">
 
 <!ENTITY httpd.docs "2.2">
diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
deleted file mode 100644
index 839f01b3..00000000
--- a/docs/manual/style/xsl/common.xsl
+++ /dev/null
@@ -1,1156 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY nbsp SYSTEM "util/nbsp.xml">
-    <!ENTITY lf SYSTEM "util/lf.xml">
-]>
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-<!--                                                                      -->
-<!-- Please, don't hard-code output strings! Use the language             -->
-<!-- files and the translation "stuff"...                                 -->
-<!--                                                                      -->
-
-<!-- Injected variables:                                                  -->
-<!--   $is-chm          - (boolean) target is for CHM generation or not   -->
-<!--   $is-zip          - (boolean) target is for ZIP generation or not   -->
-<!--   $message         - (node-set) localized common text snippets       -->
-<!--   $doclang         - (string) document language                      -->
-<!--   $output-encoding - (string) MIME charset name of the output        -->
-<!--                      encoding                                        -->
-
-<!-- Constants used for case translation -->
-<xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz'" />
-<xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'" />
-
-<!-- space separated list of blockelements defined in common.dtd -->
-<!--    used for inline content catching in <example>s           -->
-<xsl:variable name="blockelements">
-    p  example  note  table  ul  ol  dl  pre  img  blockquote
-</xsl:variable>
-
-<!-- relative path to /manual/ -->
-<xsl:variable name="metafile" select="document(/*/@metafile)/metafile" />
-<xsl:variable name="path"     select="$metafile/relpath" />
-
-<!-- load outsourced page types -->
-<xsl:include href="moduleindex.xsl" />
-<xsl:include href="directiveindex.xsl" />
-<xsl:include href="manualpage.xsl" />
-<xsl:include href="synopsis.xsl" />
-<xsl:include href="sitemap.xsl" />
-<xsl:include href="indexpage.xsl" />
-<xsl:include href="quickreference.xsl" />
-<xsl:include href="faq.xsl" />
-
-<!-- load utility snippets -->
-<xsl:include href="util/modtrans.xsl" />
-
-<!-- make sure, we set relative anchors only, if we're actually -->
-<!-- transforming a modulefile (see <directive> template)       -->
-<xsl:variable name="in-modulesynopsis" select="boolean(/modulesynopsis)" />
-
-<!-- when referencing to a directory, we may need to complete the path -->
-<!-- with the index file (for offline applications like *.chm files)   -->
-<xsl:variable name="index-file">
-    <xsl:if test="$is-chm or $is-zip">index.html</xsl:if>
-</xsl:variable>
-
-<!-- it may be desired to open external targets in a new window -->
-<xsl:variable name="ext-target" select="boolean($is-chm)" />
-
-<!-- #################################################################### -->
-<!-- Utility templates for constructing pages                             -->
-<!-- #################################################################### -->
-
-<!-- ==================================================================== -->
-<!-- HTML head                                                            -->
-<!-- ==================================================================== -->
-<xsl:template name="head">
-<head>
-    <!-- the meta element is necessary for offline handling like CHM -->
-    <xsl:choose>
-    <xsl:when test="$is-chm or $is-zip">
-        <meta http-equiv="Content-Type"
-                 content="text/html; charset={$output-encoding}" />
-    </xsl:when>
-    <xsl:otherwise>
-        <xsl:comment>
-            &lf;
-            <xsl:text>        </xsl:text>
-            <xsl:text>XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</xsl:text>
-            <xsl:text>XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</xsl:text>
-            &lf;
-            <xsl:text>              </xsl:text>
-            <xsl:text>This file is generated from xml source: </xsl:text>
-            <xsl:text>DO NOT EDIT</xsl:text>
-            &lf;
-            <xsl:text>        </xsl:text>
-            <xsl:text>XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</xsl:text>
-            <xsl:text>XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</xsl:text>
-            &lf;
-            <xsl:text>      </xsl:text>
-        </xsl:comment>
-    </xsl:otherwise>
-    </xsl:choose>&lf;
-
-    <title>
-        <xsl:choose>
-        <xsl:when test="name">
-            <xsl:value-of select="name"/>
-        </xsl:when>
-
-        <xsl:otherwise>
-            <xsl:value-of select="title"/>
-        </xsl:otherwise>
-        </xsl:choose>
-
-        <xsl:text> </xsl:text>
-        <xsl:value-of select="normalize-space($message[@id='apachetitle'])"/>
-    </title>&lf;
-
-    <!-- chm files get a slightly different stylesheet -->
-    <xsl:choose>
-    <xsl:when test="$is-chm">
-        <link type="text/css" rel="stylesheet" media="all"
-              href="{$path}/style/css/manual-chm.css" />
-    </xsl:when>
-    <!-- zip packages do also -->
-    <xsl:when test="$is-zip">
-        <link title="Main stylesheet"  type="text/css" media="all"
-                rel="stylesheet"
-               href="{$path}/style/css/manual-zip.css" />&lf;
-        <link title="No Sidebar - Default font size" type="text/css" media="all"
-               rel="alternate stylesheet"
-               href="{$path}/style/css/manual-zip-100pc.css"/>
-    </xsl:when>
-    <xsl:otherwise>
-        <link title="Main stylesheet"  type="text/css" media="all"
-                rel="stylesheet"
-               href="{$path}/style/css/manual.css" />&lf;
-        <link title="No Sidebar - Default font size" type="text/css" media="all"
-               rel="alternate stylesheet"
-               href="{$path}/style/css/manual-loose-100pc.css"/>
-    </xsl:otherwise>
-    </xsl:choose>&lf;
-
-    <link type="text/css" media="print"
-           rel="stylesheet"
-           href="{$path}/style/css/manual-print.css"/>
-
-    <!-- chm files do not need a favicon -->
-    <xsl:if test="not($is-chm or $is-zip)">&lf;
-        <link rel="shortcut icon" href="{$path}/images/favicon.ico" />
-    </xsl:if>
-</head>
-</xsl:template>
-<!-- /head -->
-
-
-<!-- ==================================================================== -->
-<!-- page top                                                             -->
-<!-- ==================================================================== -->
-<xsl:template name="top">
-<div id="page-header">&lf;
-    <xsl:call-template name="super-menu" />&lf;
-
-    <p class="apache">
-        <xsl:value-of select="normalize-space($message
-                                              [@id='apachehttpserver'])"/>
-    </p>&lf;
-
-    <img src="{$path}/images/feather.gif" alt="" />
-</div>&lf; <!-- /page-header -->
-
-<div class="up">
-    <a href="./{$index-file}">
-        <xsl:if test="parentdocument">
-            <xsl:attribute name="href">
-                <xsl:value-of select="parentdocument/@href"/>
-            </xsl:attribute>
-
-            <xsl:call-template name="helper.uri.fix">
-                <xsl:with-param name="uri" select="parentdocument/@href" />
-            </xsl:call-template>
-      </xsl:if>
-
-      <img src="{$path}/images/left.gif" alt="&lt;-" title="&lt;-" />
-    </a>
-</div>&lf;
-
-<div id="path">&lf;
-    <a href="http://www.apache.org/">
-        <xsl:if test="$ext-target">
-            <xsl:attribute name="target">_blank</xsl:attribute>
-        </xsl:if>
-        <xsl:value-of select="$message[@id='apache']" />
-    </a>
-
-    <xsl:text> &gt; </xsl:text>
-
-    <a href="http://httpd.apache.org/">
-        <xsl:if test="$ext-target">
-            <xsl:attribute name="target">_blank</xsl:attribute>
-        </xsl:if>
-        <xsl:value-of select="$message[@id='http-server']" />
-    </a>
-
-    <xsl:text> &gt; </xsl:text>
-
-    <a href="http://httpd.apache.org/docs/">
-        <xsl:if test="$ext-target">
-            <xsl:attribute name="target">_blank</xsl:attribute>
-        </xsl:if>
-        <xsl:value-of select="$message[@id='documentation']" />
-    </a>
-
-    <xsl:if test="not(../indexpage)">
-    <xsl:text> &gt; </xsl:text>
-
-    <a href="{$path}/{$index-file}">
-        <xsl:value-of select="$message[@id='version']"/>
-    </a>
-    </xsl:if>
-
-    <xsl:if test="../modulesynopsis or ../directiveindex or ../quickreference">
-    <xsl:text> &gt; </xsl:text>
-
-    <a href="./{$index-file}">
-        <xsl:value-of select="$message[@id='modules']"/>
-    </a>
-    </xsl:if>
-
-    <xsl:if test="parentdocument/text()">
-    <xsl:text> &gt; </xsl:text>
-
-    <a href="{parentdocument/@href}">
-        <xsl:call-template name="helper.uri.fix">
-            <xsl:with-param name="uri" select="parentdocument/@href"/>
-        </xsl:call-template>
-        <xsl:value-of select="parentdocument"/>
-    </a>
-    </xsl:if>
-</div> <!-- /path -->
-</xsl:template>
-<!-- /top -->
-
-
-<!-- ==================================================================== -->
-<!-- out of date                                                          -->
-<!-- ==================================================================== -->
-<xsl:template name="outofdate">
-<xsl:if test="$metafile/variants/variant[.=$doclang]/@outdated = 'yes'">
-    &lf;
-    <div class="outofdate">
-        <xsl:value-of select="$message[@id='outofdate']"/>
-    </div>
-</xsl:if>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- page bottom                                                          -->
-<!-- ==================================================================== -->
-<xsl:template name="bottom">
-<xsl:call-template name="langavail">
-    <xsl:with-param name="position" select="'bottom'" />
-</xsl:call-template>
-
-<div id="footer">&lf;
-    <p class="apache">
-        <xsl:text>Copyright 2007 The Apache Software Foundation.</xsl:text><br />
-        <xsl:value-of select="$message[@id='licensed']"/>
-        <xsl:text> </xsl:text>
-
-        <a href="http://www.apache.org/licenses/LICENSE-2.0">
-            <xsl:if test="$ext-target">
-                <xsl:attribute name="target">_blank</xsl:attribute>
-            </xsl:if>
-            <xsl:text>Apache License, Version 2.0</xsl:text>
-        </a>
-        <xsl:text>.</xsl:text>
-    </p>&lf;
-
-    <xsl:call-template name="super-menu"/>
-
-</div> <!-- /footer -->
-</xsl:template>
-<!-- /bottom -->
-
-
-<!-- ==================================================================== -->
-<!-- build an "available languages" section                               -->
-<!-- ==================================================================== -->
-<xsl:template name="langavail">
-<xsl:param name="position" select="'top'" />
-
-<xsl:if test="not($is-chm or $is-zip)">
-<div class="{$position}lang">&lf;
-    <p>
-        <span>
-            <xsl:value-of select="$message[@id='langavail']" />
-            <xsl:text>: </xsl:text>
-        </span>
-
-        <xsl:for-each select="$metafile/variants/variant">
-        <xsl:sort select="." />
-
-            <a href="{$path}/{.}{$metafile/path}{$metafile/basename}.html">
-                <xsl:if test="$metafile/basename = 'index'">
-                    <xsl:attribute name="href">
-                        <xsl:value-of
-                            select="concat($path, '/', ., $metafile/path)" />
-                    </xsl:attribute>
-                </xsl:if>
-                <xsl:if test="$doclang != .">
-                    <xsl:attribute name="hreflang">
-                        <xsl:value-of select="." />
-                    </xsl:attribute>
-                    <xsl:attribute name="rel">alternate</xsl:attribute>
-                </xsl:if>
-                <xsl:attribute name="title">
-                    <xsl:value-of select="document(concat('../lang/', .,
-                                                   '.xml'))
-                                          /language/messages/message
-                                          [@id='nativename']" />
-                </xsl:attribute>
-
-                &nbsp;
-                <xsl:value-of select="." />
-                &nbsp;
-            </a>
-            <xsl:if test="position() != last()">
-                <xsl:text> |&#xA;</xsl:text>
-            </xsl:if>
-        </xsl:for-each>
-    </p>&lf;
-</div> <!-- /.{$position}lang -->
-</xsl:if>
-
-<xsl:if test="$position = 'top'">
-    <xsl:call-template name="outofdate" />
-</xsl:if>
-
-</xsl:template>
-<!-- /langavail -->
-
-
-<!-- ==================================================================== -->
-<!-- Process a documentation section                                      -->
-<!-- ==================================================================== -->
-<xsl:template match="section">
-<xsl:call-template name="toplink" />&lf;
-<div class="section">&lf;
-
-    <!-- Section heading -->
-    <h2>
-        <xsl:choose>
-        <xsl:when test="@id">
-          <a id="{@id}" name="{@id}">
-              <xsl:apply-templates select="title" mode="print" />
-          </a>
-        </xsl:when>
-
-        <xsl:otherwise>
-            <xsl:apply-templates select="title" mode="print" />
-        </xsl:otherwise>
-        </xsl:choose>
-    </h2>
-
-    <!-- Section body -->
-    <xsl:apply-templates />
-</div> <!-- /.section -->
-</xsl:template>
-<!-- /section -->
-
-
-<!-- ==================================================================== -->
-<!-- handle subsections (lower level headings)                            -->
-<!-- ==================================================================== -->
-<xsl:template match="section/section">
-<!-- Section heading -->
-<h3>
-    <xsl:choose>
-    <xsl:when test="@id">
-        <a id="{@id}" name="{@id}">
-            <xsl:apply-templates select="title" mode="print" />
-        </a>
-    </xsl:when>
-
-    <xsl:otherwise>
-        <xsl:apply-templates select="title" mode="print" />
-    </xsl:otherwise>
-    </xsl:choose>
-</h3>
-
-<!-- Section body -->
-<xsl:apply-templates />
-</xsl:template>
-<!-- /section/section -->
-
-
-<!-- ==================================================================== -->
-<!-- handle subsubsections (h4)                                           -->
-<!-- ==================================================================== -->
-<xsl:template match="section/section/section">
-<!-- Section heading -->
-<h4>
-    <xsl:choose>
-    <xsl:when test="@id">
-        <a id="{@id}" name="{@id}">
-            <xsl:apply-templates select="title" mode="print" />
-        </a>
-    </xsl:when>
-
-    <xsl:otherwise>
-        <xsl:apply-templates select="title" mode="print" />
-    </xsl:otherwise>
-    </xsl:choose>
-</h4>
-
-<!-- Section body -->
-<xsl:apply-templates/>
-
-</xsl:template>
-<!-- /section/section/section -->
-
-
-<!-- ==================================================================== -->
-<!-- section nesting > h4 is not supported for now                        -->
-<!-- ==================================================================== -->
-<xsl:template match="section/section/section/section">
-<xsl:message terminate="yes">
-    <xsl:text>FATAL: exceeding maximum section nesting level.</xsl:text>
-    &lf;&lf;
-    <xsl:text>Perhaps you should consider to split your document into</xsl:text>
-    &lf;
-    <xsl:text>several ones...</xsl:text>
-    &lf;
-</xsl:message>
-</xsl:template>
-<!-- /section/section/section/section -->
-
-
-<!-- ==================================================================== -->
-<!-- (sub)section titles                                                  -->
-<!-- ==================================================================== -->
-<xsl:template match="section/title" mode="print">
-<xsl:apply-templates/>
-</xsl:template>
-<xsl:template match="section/title" />
-<!-- /section/title -->
-
-
-<!-- ==================================================================== -->
-<!-- generate section index                                               -->
-<!-- ==================================================================== -->
-<xsl:template match="section" mode="index">
-<li>
-    <img src="{$path}/images/down.gif" alt="" />
-    <xsl:text> </xsl:text>
-    <xsl:choose>
-    <xsl:when test="@id">
-        <a href="#{@id}">
-            <xsl:apply-templates select="title" mode="print" />
-        </a>
-    </xsl:when>
-    <xsl:otherwise>
-        <xsl:apply-templates select="title" mode="print" />
-    </xsl:otherwise>
-    </xsl:choose>
-</li>&lf;
-</xsl:template>
-<!-- /section index -->
-
-
-<!-- ==================================================================== -->
-<!-- docs super menu                                                      -->
-<!-- ==================================================================== -->
-<xsl:template name="super-menu">
-<p class="menu">
-    <a href="{$path}/mod/{$index-file}">
-        <xsl:value-of select="$message[@id='modules']" />
-    </a>
-
-    <xsl:text> | </xsl:text>
-
-    <a href="{$path}/mod/directives.html">
-        <xsl:value-of select="$message[@id='directives']" />
-    </a>
-
-    <xsl:text> | </xsl:text>
-
-    <a href="{$path}/faq/{$index-file}">
-        <xsl:value-of select="$message[@id='faq']" />
-    </a>
-
-    <xsl:text> | </xsl:text>
-
-    <a href="{$path}/glossary.html">
-        <xsl:value-of select="$message[@id='glossary']" />
-    </a>
-
-    <xsl:text> | </xsl:text>
-
-    <a href="{$path}/sitemap.html">
-        <xsl:value-of select="$message[@id='sitemap']" />
-    </a>
-</p>
-</xsl:template>
-<!-- /super-menu -->
-
-
-<!-- ==================================================================== -->
-<!-- <example>                                                            -->
-<!-- iterate over *all* nodes; bare text and other inline stuff is        -->
-<!-- wrapped into <p><code>, block level elements (defined in             -->
-<!-- $blockelements) are applied "as is"                                  -->
-<!-- ==================================================================== -->
-<xsl:variable name="blocks"
-            select="concat(' ', normalize-space($blockelements), ' ')" />
-
-<xsl:template match="example">
-<div class="example">
-    <xsl:apply-templates select="title" mode="print" />
-
-    <xsl:for-each select="./node()">
-        <xsl:variable name="is-block-node"
-                    select="boolean(contains($blocks,
-                                             concat(' ', local-name(), ' ')))"/>
-        <!-- bb = (number of) blocks nodes before (the current) -->
-        <xsl:variable name="bb"
-                    select="count(preceding-sibling::*[
-                                contains($blocks,
-                                         concat(' ', local-name(), ' '))])" />
-
-        <xsl:if test="$is-block-node or position()=last()">
-            <xsl:variable name="content">
-                <!-- phew. short explanation, what happens here:      -->
-                <!-- We want to get the inline stuff between the last -->
-                <!-- block node and the current node.                 -->
-                <!-- So filter all previous nodes for the condition   -->
-                <!-- that the number of block nodes of all of *their* -->
-                <!-- previous nodes is >= $bb. Hope that helps ;-)    -->
-                <xsl:apply-templates
-                    select="preceding-sibling::node()[
-                                count(preceding-sibling::*[
-                                    contains($blocks,
-                                             concat(' ', local-name(), ' '))])
-                                &gt;= $bb]" />
-
-                <xsl:apply-templates
-                    select="self::node()[not($is-block-node)]" />
-            </xsl:variable>
-
-            <!-- apply bare text only, if it's not only \s or empty -->
-            <xsl:if test="not(normalize-space($content) = '')">
-                <p><code>
-                    <!-- same as $content above. xsl:copy-of seems to make -->
-                    <!-- thread problems with xalan-j ... -->
-                    <xsl:apply-templates
-                        select="preceding-sibling::node()[
-                                    count(preceding-sibling::*[
-                                        contains($blocks,
-                                                 concat(' ', local-name(),
-                                                        ' '))])
-                                    &gt;= $bb]" />
-
-                    <xsl:apply-templates
-                        select="self::node()[not($is-block-node)]" />
-                </code></p>
-            </xsl:if>
-
-            <xsl:apply-templates select="self::node()[$is-block-node]" />
-        </xsl:if>
-    </xsl:for-each>
-    <!-- /node() -->
-</div> <!-- /.example -->
-</xsl:template>
-<!-- /example -->
-
-
-<!-- ==================================================================== -->
-<!-- example/title                                                        -->
-<!-- ==================================================================== -->
-<xsl:template match="example/title" mode="print">
-<h3>
-    <xsl:apply-templates/>
-</h3>
-</xsl:template>
-<xsl:template match="example/title" />
-<!-- /example/title -->
-
-
-<!-- ==================================================================== -->
-<!-- indentations                                                         -->
-<!-- ==================================================================== -->
-<xsl:template match="indent">
-<span class="indent">
-    <xsl:apply-templates/>
-</span>
-</xsl:template>
-<!-- /indent -->
-
-
-<!-- ==================================================================== -->
-<!-- <note>                                                               -->
-<!-- ==================================================================== -->
-<xsl:template match="note">
-<div class="note">
-    <xsl:if test="@type='warning'">
-        <xsl:attribute name="class">warning</xsl:attribute>
-    </xsl:if>
-
-    <xsl:apply-templates/>
-</div>
-</xsl:template>
-<!-- /note -->
-
-
-<!-- ==================================================================== -->
-<!-- <note><title>                                                        -->
-<!-- ==================================================================== -->
-<xsl:template match="note/title">
-<h3>
-    <xsl:apply-templates/>
-</h3>
-</xsl:template>
-<!-- /note/title -->
-
-
-<!-- ==================================================================== -->
-<!-- <directive>                                                          -->
-<!-- Inserts link to another directive, which might be in another module. -->
-<!-- References are converted into lower case.                            -->
-<!-- ==================================================================== -->
-<xsl:template match="directive" name="directive">
-<code class="directive">
-    <xsl:choose>
-    <xsl:when test="@module">
-        <xsl:variable name="lowerdirective"
-            select="translate(., $uppercase, $lowercase)" />
-
-        <xsl:choose>
-        <xsl:when test="$in-modulesynopsis and @module = /modulesynopsis/name">
-            <a href="#{$lowerdirective}">
-                <xsl:if test="@type='section'">&lt;</xsl:if>
-                <xsl:value-of select="."/>
-                <xsl:if test="@type='section'">&gt;</xsl:if>
-            </a>
-        </xsl:when>
-        <xsl:otherwise>
-            <a href="{$path}/mod/{@module}.html#{$lowerdirective}">
-                <xsl:if test="@type='section'">&lt;</xsl:if>
-                <xsl:value-of select="."/>
-                <xsl:if test="@type='section'">&gt;</xsl:if>
-            </a>
-        </xsl:otherwise>
-        </xsl:choose>
-    </xsl:when>
-
-    <xsl:otherwise>
-        <xsl:if test="@type='section'">&lt;</xsl:if>
-        <xsl:value-of select="."/>
-        <xsl:if test="@type='section'">&gt;</xsl:if>
-    </xsl:otherwise>
-    </xsl:choose>
-</code>
-</xsl:template>
-<!-- /directive -->
-
-
-<!-- ==================================================================== -->
-<!-- <module>                                                             -->
-<!-- Inserts a link to refereed module                                    -->
-<!-- ==================================================================== -->
-<xsl:template match="module" name="module">
-<code class="module">
-    <a href="{$path}/mod/{.}.html">
-        <xsl:value-of select="."/>
-    </a>
-</code>
-</xsl:template>
-<!-- /module -->
-
-
-<!-- ==================================================================== -->
-<!-- <program>                                                            -->
-<!-- Inserts a link to referred program                                   -->
-<!-- ==================================================================== -->
-<xsl:template match="program">
-<code class="program">
-    <a href="{$path}/programs/{normalize-space(.)}.html">
-        <xsl:value-of select="normalize-space(.)" />
-    </a>
-</code>
-</xsl:template>
-<!-- /program -->
-
-
-<!-- ==================================================================== -->
-<!-- <related>                                                            -->
-<!-- ==================================================================== -->
-<xsl:template match="related">
-<table class="related">
-<tr>
-    <th>
-        <xsl:value-of select="$message[@id='relatedmodules']" />
-    </th>
-    <th>
-        <xsl:value-of select="$message[@id='relateddirectives']" />
-    </th>
-</tr>
-<tr>
-    <td>
-        <xsl:if test="count(modulelist/*) &gt; 0">
-            <ul>
-                <xsl:apply-templates select="modulelist" />
-            </ul>
-        </xsl:if>
-    </td>
-    <td>
-        <xsl:if test="count(directivelist/*) &gt; 0">
-            <ul>
-                <xsl:apply-templates select="directivelist"/>
-            </ul>
-        </xsl:if>
-    </td>
-</tr>
-</table>
-</xsl:template>
-<!-- /related -->
-
-<!-- ==================================================================== -->
-<!-- related/modulelist                                                   -->
-<!-- ==================================================================== -->
-<xsl:template match="related/modulelist">
-<xsl:for-each select="module">
-    <li>
-        <xsl:call-template name="module"/>
-    </li>
-</xsl:for-each>
-</xsl:template>
-<!-- /related/modulelist -->
-
-
-<!-- ==================================================================== -->
-<!-- related/directivelist                                                -->
-<!-- ==================================================================== -->
-<xsl:template match="related/directivelist">
-<xsl:for-each select="directive">
-    <li>
-        <xsl:call-template name="directive"/>
-    </li>
-</xsl:for-each>
-</xsl:template>
-<!-- /related/directivelist -->
-
-
-<!-- ==================================================================== -->
-<!-- <table>                                                              -->
-<!-- ==================================================================== -->
-<xsl:template match="table">
-<table>
-    <!-- existing border attribute will result in <table class="bordered"> -->
-    <xsl:if test="@border">
-        <xsl:attribute name="class">bordered</xsl:attribute>
-    </xsl:if>
-
-    <xsl:choose>
-    <xsl:when test="@style = 'zebra'">
-        <xsl:apply-templates select="tr" mode="zebra-table" />
-    </xsl:when>
-    <xsl:when test="@style = 'data'">
-        <xsl:apply-templates select="tr" mode="data-table" />
-    </xsl:when>
-    <xsl:otherwise>
-        <xsl:apply-templates />
-    </xsl:otherwise>
-    </xsl:choose>
-</table>
-</xsl:template>
-<!-- /table -->
-
-<!-- data-table -->
-<xsl:template match="tr" mode="data-table">
-<!-- style="data": fixed font, padding-left and right alignment for <td>s -->
-<xsl:variable name="cross-table" select="boolean(
-    preceding-sibling::tr/th[1]|following-sibling::tr/th[1])" />
-
-<tr>
-    <xsl:for-each select="node()">
-        <xsl:choose>
-        <xsl:when test="local-name() = 'td'">
-            <td class="data">
-                <xsl:apply-templates select="*|@*|text()" />
-            </td>
-        </xsl:when>
-        <xsl:when test="local-name() = 'th' and
-                        (not($cross-table) or
-                         count(preceding-sibling::*) &gt; 0)">
-            <th class="data">
-                <xsl:apply-templates select="*|@*|text()" />
-            </th>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:apply-templates select="self::node()" />
-        </xsl:otherwise>
-        </xsl:choose>
-    </xsl:for-each>
-</tr>&lf;
-</xsl:template>
-
-
-<!-- zebra-table -->
-<xsl:template match="tr" mode="zebra-table">
-<!-- style="zebra": alternating colors per row, i.e. every second row -->
-<!--                gets a class="odd". Header lines (no <td>) get a  -->
-<!--                class="header". These lines will be excluded from -->
-<!--                the "odd" line count. That way header lines act   -->
-<!--                interjectional, which creates a better visual and -->
-<!--                psychological effect.                             -->
-<tr>
-    <xsl:choose>
-    <xsl:when test="count(td) = 0">
-        <xsl:attribute name="class">header</xsl:attribute>
-    </xsl:when>
-
-    <xsl:when test="position() mod 2 = (count(preceding-sibling::tr[count(td) = 0]) mod 2)">
-        <xsl:attribute name="class">odd</xsl:attribute>
-    </xsl:when>
-    </xsl:choose>
-
-    <xsl:apply-templates />
-</tr>&lf;
-</xsl:template>
-<!-- /zebra-table -->
-
-
-<!-- ==================================================================== -->
-<!-- <ol>                                                                 -->
-<!-- ==================================================================== -->
-<xsl:template match="ol">
-<ol>
-    <!-- A. B. C. D. (list-style-type="upper-alpha") -->
-    <xsl:choose>
-    <xsl:when test="@type = 'A'">
-        <xsl:attribute name="class">up-A</xsl:attribute>
-    </xsl:when>
-    <xsl:when test="@type = 'a'">
-        <xsl:attribute name="class">lo-A</xsl:attribute>
-    </xsl:when>
-    </xsl:choose>
-
-    <xsl:apply-templates/>
-</ol>
-</xsl:template>
-<!-- /ol -->
-
-
-<!-- ==================================================================== -->
-<!-- diverse elements                                                     -->
-<!-- Passes through content                                               -->
-<!-- ==================================================================== -->
-<xsl:template match="summary|description|usage|syntax|default">
-<xsl:apply-templates/>
-</xsl:template>
-<!-- /diverse -->
-
-
-<!-- ==================================================================== -->
-<!-- <a>                                                                  -->
-<!-- ==================================================================== -->
-<xsl:template match="a">
-<xsl:choose>
-<xsl:when test="not(@href)">
-    <xsl:copy>
-        <xsl:apply-templates select="@*|*|text()"/>
-    </xsl:copy>
-</xsl:when>
-<xsl:otherwise>
-    <a href="@href">
-        <xsl:apply-templates select="@*"/>
-        <xsl:call-template name="helper.uri.fix">
-            <xsl:with-param name="uri" select="@href"/>
-        </xsl:call-template>
-
-        <xsl:apply-templates select="*|text()"/>
-    </a>
-</xsl:otherwise>
-</xsl:choose>
-</xsl:template> 
-<!-- /a -->
-
-
-<!-- ==================================================================== -->
-<!-- toplink                                                              -->
-<!-- ==================================================================== -->
-<xsl:template name="toplink">
-<div class="top">
-    <a href="#page-header"><img src="{$path}/images/up.gif" alt="top" /></a>
-</div>
-</xsl:template>
-<!-- /toplink -->
-
-
-<!-- ==================================================================== -->
-<!-- <transnote>                                                          -->
-<!-- translator's notes are displayed in a different color                -->
-<!-- ==================================================================== -->
-<xsl:template match="transnote">
-<span class="transnote">
-    <xsl:text>(</xsl:text>
-    <em>
-        <xsl:value-of select="$message[@id='transnote']" />
-    </em>
-    <xsl:text> </xsl:text>
-    <xsl:apply-templates />
-    <xsl:text>)</xsl:text>
-</span>
-</xsl:template>
-<!-- /transnote -->
-
-<!-- ==================================================================== -->
-<!-- <phonetic>                                                           -->
-<!-- phonetics are enclosed in  square brackets and displayed in a        -->
-<!-- different color                                                      -->
-<!-- ==================================================================== -->
-<xsl:template match="phonetic">
-<span class="phonetic">
-    <xsl:text>[</xsl:text>
-    <xsl:apply-templates />
-    <xsl:text>]</xsl:text>
-</span>
-</xsl:template>
-<!-- /phonetic -->
-
-
-<!-- ==================================================================== -->
-<!-- <glossary>                                                           -->
-<!-- link to a glossary anchor                                            -->
-<!-- ==================================================================== -->
-<xsl:template match="glossary">
-  <xsl:variable name="glosslink">
-    <xsl:choose>
-    <xsl:when test="@ref">
-      <xsl:value-of select="@ref"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="translate(., $uppercase, $lowercase)"/>
-    </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <a href="{$path}/glossary.html#{$glosslink}" class="glossarylink">
-     <xsl:attribute name="title">
-        <xsl:value-of select="$message[@id='glossarylink']" />
-     </xsl:attribute>
-     <xsl:apply-templates />
-  </a>
-</xsl:template>
-<!-- /glossary -->
-
-<!-- ==================================================================== -->
-<!-- Filter &#160; in text() nodes.                                       -->
-<!-- In some environments this character won't be transformed correctly,  -->
-<!-- so we just write it explicitely as "&nbsp;" into the output.         -->
-<!-- ==================================================================== -->
-<xsl:template match="text()" name="filter.nbsp">
-<xsl:param name="text" select="." />
-
-<xsl:choose>
-<xsl:when test="contains($text, '&#160;')">
-    <xsl:value-of select="substring-before($text, '&#160;')" />
-    &nbsp;
-    <xsl:call-template name="filter.nbsp">
-        <xsl:with-param name="text" select="substring-after($text, '&#160;')" />
-    </xsl:call-template>
-</xsl:when>
-<xsl:otherwise>
-    <xsl:value-of select="$text" />
-</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-<!-- /filter.nbsp -->
-
-
-<!-- ==================================================================== -->
-<!-- Process everything else by just passing it through                   -->
-<!-- ==================================================================== -->
-<xsl:template match="*">
-<xsl:message terminate="yes">
-    <xsl:text>Unknown element: </xsl:text>
-    <xsl:value-of select="local-name()" />&lf;
-    <xsl:text>Is the document valid (try `build validate-xml`)?</xsl:text>
-</xsl:message>
-</xsl:template>
-<xsl:template match="@*">
-<xsl:copy>
-    <xsl:apply-templates select="*|@*|text()" />
-</xsl:copy>
-</xsl:template>
-<xsl:template match="br"><br /></xsl:template>
-<xsl:template match="tr"><tr><xsl:apply-templates select="*|@*|text()" /></tr></xsl:template>
-<xsl:template match="th"><th><xsl:apply-templates select="*|@*|text()" /></th></xsl:template>
-<xsl:template match="td"><td><xsl:apply-templates select="*|@*|text()" /></td></xsl:template>
-<xsl:template match="p"><p><xsl:apply-templates select="*|@*|text()" /></p></xsl:template>
-<xsl:template match="ul"><ul><xsl:apply-templates select="*|@*|text()" /></ul></xsl:template>
-<xsl:template match="li"><li><xsl:apply-templates select="*|@*|text()" /></li></xsl:template>
-<xsl:template match="dl"><dl><xsl:apply-templates select="*|@*|text()" /></dl></xsl:template>
-<xsl:template match="dt"><dt><xsl:apply-templates select="*|@*|text()" /></dt></xsl:template>
-<xsl:template match="dd"><dd><xsl:apply-templates select="*|@*|text()" /></dd></xsl:template>
-<xsl:template match="em"><em><xsl:apply-templates select="*|@*|text()" /></em></xsl:template>
-<xsl:template match="strong"><strong><xsl:apply-templates select="*|@*|text()" /></strong></xsl:template>
-<xsl:template match="pre"><pre><xsl:apply-templates select="*|@*|text()" /></pre></xsl:template>
-<xsl:template match="code"><code><xsl:apply-templates select="*|@*|text()" /></code></xsl:template>
-<xsl:template match="var"><var><xsl:apply-templates select="*|@*|text()" /></var></xsl:template>
-<xsl:template match="dfn"><dfn><xsl:apply-templates select="*|@*|text()" /></dfn></xsl:template>
-<xsl:template match="blockquote"><blockquote><xsl:apply-templates select="*|@*|text()" /></blockquote></xsl:template>
-<xsl:template match="q"><q><xsl:apply-templates select="*|@*|text()" /></q></xsl:template>
-<xsl:template match="cite"><cite><xsl:apply-templates select="*|@*|text()" /></cite></xsl:template>
-<xsl:template match="img"><img><xsl:apply-templates select="*|@*|text()" /></img></xsl:template>
-<!-- /pass through -->
-
-
-<!-- ==================================================================== -->
-<!-- create a letter bar                                                  -->
-<!-- ==================================================================== -->
-<xsl:template name="letter-bar">
-<xsl:param name="letters" />
-<xsl:param name="first" />
-
-<xsl:if test="not($first)">
-    <xsl:text> | </xsl:text>
-</xsl:if>
-
-<a href="#{substring($letters,1,1)}">
-    &nbsp;
-    <xsl:value-of select="substring($letters, 1, 1)" />
-    &nbsp;
-</a>
-
-<xsl:if test="string-length($letters) &gt; 1">
-    <xsl:call-template name="letter-bar">
-        <xsl:with-param name="letters" select="substring($letters, 2)" />
-        <xsl:with-param name="first" select="false()" />
-    </xsl:call-template>
-</xsl:if>
-</xsl:template>
-<!-- /letter-bar -->
-
-
-<!-- ==================================================================== -->
-<!-- template(s) for collecting all start letters of directives           -->
-<!-- ==================================================================== -->
-<xsl:template name="directive-startletters">
-<xsl:param name="directives" />
-
-<xsl:call-template name="_squeeze-letters">
-    <xsl:with-param name="lastletter" select="''" />
-    <xsl:with-param name="letters">
-        <xsl:for-each select="$directives">
-        <xsl:sort select="name"/>
-            <xsl:value-of
-                select="translate(substring(normalize-space(name), 1, 1),
-                                  $lowercase, $uppercase)" />
-        </xsl:for-each>
-    </xsl:with-param>
-</xsl:call-template>
-</xsl:template>
-<!-- /directive-startletters -->
-
-
-<!-- ==================================================================== -->
-<!-- squeeze subsequent letters in a string                               -->
-<!-- ==================================================================== -->
-<xsl:template name="_squeeze-letters">
-<xsl:param name="letters"/>
-<xsl:param name="lastletter"/>
-
-<xsl:variable name="current" select="substring($letters, 1, 1)" />
-
-<xsl:if test="not($lastletter = $current)">
-    <xsl:value-of select="$current" />
-</xsl:if>
-
-<xsl:if test="string-length($letters) &gt; 1">
-    <xsl:call-template name="_squeeze-letters">
-        <xsl:with-param name="letters" select="substring($letters, 2)" />
-        <xsl:with-param name="lastletter" select="$current"/>
-    </xsl:call-template>
-</xsl:if>
-</xsl:template>
-<!-- /_squeeze-letters -->
-
-
-<!-- ==================================================================== -->
-<!-- fix href and target attribute of an element.                         -->
-<!-- ==================================================================== -->
-<xsl:template name="helper.uri.fix">
-<xsl:param name="uri"/>
-
-<xsl:choose>
-<!-- lame is_absolute_uri test -->
-<xsl:when test="    contains($uri, ':')
-                and string-length(substring-before($uri, ':')) &lt; 7">
-    <xsl:if test="$ext-target">
-        <xsl:attribute name="target">_blank</xsl:attribute>
-    </xsl:if>
-</xsl:when>
-<xsl:otherwise>
-    <xsl:variable name="fragment">
-        <xsl:if test="contains($uri, '#')">
-            <xsl:value-of select="concat('#', substring-after($uri, '#'))"/>
-        </xsl:if>
-    </xsl:variable>
-    <xsl:variable name="absuri">
-        <xsl:choose>
-        <xsl:when test="contains($uri, '#')">
-            <xsl:value-of select="concat('#', substring-before($uri, '#'))"/>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="$uri"/>
-        </xsl:otherwise>
-        </xsl:choose>
-    </xsl:variable>
-        
-    <xsl:if test="substring($absuri, string-length($uri), 1) = '/'">
-        <xsl:attribute name="href">
-            <xsl:value-of select="concat($absuri, $index-file, $fragment)"/>
-        </xsl:attribute>
-    </xsl:if>
-</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-<!-- /helper.uri.fix -->
-
-
-<!-- ==================================================================== -->
-<!-- Ignore table hints used for latex                                    -->
-<!-- ==================================================================== -->
-<xsl:template match="columnspec">
-</xsl:template>
-
-<xsl:template match="column">
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/xsl/convmap.xsl b/docs/manual/style/xsl/convmap.xsl
deleted file mode 100644
index da4444fe..00000000
--- a/docs/manual/style/xsl/convmap.xsl
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY lf SYSTEM "util/lf.xml">
-]>
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-<xsl:output method="text" encoding="ISO-8859-1" indent="no" />
-
-<!-- Constants used for case translation -->
-<xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz'" />
-<xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'" />
-
-<!-- ==================================================================== -->
-<!-- <modulefilelist>                                                     -->
-<!-- Builds the rewrite map                                               -->
-<!-- ==================================================================== -->
-<xsl:template match="modulefilelist">
-<xsl:text># Mapping from directive names to URLs</xsl:text>&lf;
-<xsl:text># GENERATED FROM XML -- DO NOT EDIT</xsl:text>&lf;
-<xsl:text># You may use it as follows:</xsl:text>&lf;
-<xsl:text># RewriteEngine On</xsl:text>&lf;
-<xsl:text># RewriteMap dir2url </xsl:text>
-<xsl:text>txt:/path/to/convenience.map</xsl:text>&lf;
-<xsl:text># RewriteCond ${dir2url:$1} (.+)</xsl:text>&lf;
-<xsl:text># RewriteRule ^/+([^/]+)$ /manual/%1 [R=301,NE,L]</xsl:text>&lf;&lf;
-
-<xsl:apply-templates
-    select="document(modulefile)/modulesynopsis[status!='Obsolete']
-                /directivesynopsis[not(@location)]">
-    <xsl:sort select="name" />
-</xsl:apply-templates>
-
-</xsl:template>
-<!-- /modulefilelist -->
-
-<!-- ==================================================================== -->
-<!-- <directivesynopsis>                                                  -->
-<!-- ==================================================================== -->
-<xsl:template match="directivesynopsis">
-
-    <xsl:value-of select="translate(name, $uppercase, $lowercase)" />
-    <xsl:text>&#9;mod/</xsl:text>
-    <xsl:value-of select="../name" />
-    <xsl:text>.html#</xsl:text>
-    <xsl:value-of select="translate(name, $uppercase, $lowercase)" />
-    &lf;
-
-</xsl:template>
-<!-- /directivesynopsis -->
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/xsl/directiveindex.xsl b/docs/manual/style/xsl/directiveindex.xsl
deleted file mode 100644
index 1e13e7d6..00000000
--- a/docs/manual/style/xsl/directiveindex.xsl
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY lf SYSTEM "util/lf.xml">
-]>
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-<!-- ==================================================================== -->
-<!-- <directiveindex>                                                     -->
-<!-- Builds the directive index page                                      -->
-<!-- ==================================================================== -->
-<xsl:template match="directiveindex">
-<html xml:lang="{$doclang}" lang="{$doclang}">
-    <xsl:call-template name="head"/>&lf;
-
-    <body id="directive-index">
-        <xsl:call-template name="top"/>
-
-        <xsl:variable name="directives"
-            select="document(document($allmodules)/modulefilelist/modulefile)
-                        /modulesynopsis[status!='Obsolete']
-                        /directivesynopsis[not(@location)]" />
-
-        <!-- collect the start letters -->
-        <xsl:variable name="start-letters">
-            <xsl:call-template name="directive-startletters">
-                <xsl:with-param name="directives" select="$directives" />
-            </xsl:call-template>
-        </xsl:variable>
-
-        <div id="preamble">
-            <h1>
-                <xsl:value-of select="title" />
-            </h1>&lf;
-
-            <xsl:call-template name="langavail" />&lf;
-
-            <xsl:apply-templates select="summary" />&lf;
-
-            <!-- letter bar -->
-            <p class="letters">
-                <xsl:call-template name="letter-bar">
-                    <xsl:with-param name="letters" select="$start-letters" />
-                    <xsl:with-param name="first" select="true()" />
-                </xsl:call-template>
-            </p>&lf; <!-- /.letters -->
-        </div>&lf; <!-- /preamble -->
-
-        <div id="directive-list">
-            <ul>&lf;
-                <xsl:call-template name="dindex-of-letter">
-                    <xsl:with-param name="letters-todo"
-                        select="$start-letters" />
-                    <xsl:with-param name="directives" select="$directives" />
-                </xsl:call-template>
-            </ul>
-        </div>&lf; <!-- /#directive-list -->
-
-        <xsl:call-template name="bottom" />&lf;
-    </body>
-</html>
-</xsl:template>
-<!-- /directiveindex -->
-
-
-<!-- ==================================================================== -->
-<!-- the working horse. builds list items of all directives starting with -->
-<!-- one letter when done, it calls itself to catch the next letter       -->
-<!-- ==================================================================== -->
-<xsl:template name="dindex-of-letter">
-<xsl:param name="letters-todo" />
-<xsl:param name="directives" />
-
-<xsl:variable name="letter" select="substring($letters-todo, 1, 1)"/>
-
-<xsl:for-each
-    select="$directives
-                [$letter = translate(substring(normalize-space(name), 1, 1),
-                                     $lowercase, $uppercase)]">
-<xsl:sort select="name" />
-    <li>
-        <a href="{../name}.html#{translate(name, $uppercase, $lowercase)}">
-            <xsl:if test="position() = 1">
-                <xsl:attribute name="id">
-                    <xsl:value-of select="$letter" />
-                </xsl:attribute>
-                <xsl:attribute name="name">
-                    <xsl:value-of select="$letter" />
-                </xsl:attribute>
-            </xsl:if>
-
-            <xsl:if test="@type = 'section'">&lt;</xsl:if>
-            <xsl:value-of select="name" />
-            <xsl:if test="@type = 'section'">&gt;</xsl:if>
-        </a>
-    </li>&lf;
-</xsl:for-each>
-
-<!-- call next letter, if there is -->
-<xsl:if test="string-length($letters-todo) &gt; 1">
-    <xsl:call-template name="dindex-of-letter">
-        <xsl:with-param name="letters-todo"
-            select="substring($letters-todo, 2)" />
-        <xsl:with-param name="directives" select="$directives" />
-    </xsl:call-template>
-</xsl:if>
-
-</xsl:template>
-<!-- /dindex-of-letter -->
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/xsl/faq.xsl b/docs/manual/style/xsl/faq.xsl
deleted file mode 100644
index 2cd3d3bb..00000000
--- a/docs/manual/style/xsl/faq.xsl
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY lf SYSTEM "util/lf.xml">
-]>
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-<!-- ==================================================================== -->
-<!-- <faq>                                                                -->
-<!-- Process an entire document into an HTML page                         -->
-<!-- ==================================================================== -->
-<xsl:template match="faq">
-<html xml:lang="{$doclang}" lang="{$doclang}">
-    <xsl:call-template name="head"/>&lf;
-
-    <body id="manual-page">
-        <!-- unsqueeze if there's no sidebar -->
-        <xsl:if test="   not(count(section) > 1
-                      or (/faq/@all-in-one = 'yes')
-                      or seealso)">
-            <xsl:attribute name="class">no-sidebar</xsl:attribute>
-        </xsl:if>
-
-        <xsl:call-template name="top" />          
-
-        <div id="page-content">
-            <div id="preamble">        
-                <h1>
-                    <xsl:value-of select="title" />
-                </h1>&lf;
-
-                <xsl:call-template name="langavail" />&lf;
-
-                <xsl:apply-templates select="summary"/>
-            </div>&lf; <!-- /#preamble -->
-
-            <xsl:if
-                test="(    not($is-chm)
-                       and (count(section) > 1 or (/faq/@all-in-one = 'yes')))
-                      or seealso">
-                <div id="quickview">
-                    <xsl:if test="not($is-chm)">
-                        <xsl:if test="count(section) > 1">
-                            <ul id="toc">
-                                <xsl:apply-templates
-                                    select="section" mode="index" />
-                            </ul>
-                        </xsl:if>
-
-                        <xsl:if test="/faq/@all-in-one = 'yes'">
-                            <ul id="toc">
-                            <li>
-                                <img src="{$path}/images/down.gif" alt="" />
-                                <xsl:text> </xsl:text>
-                                <a href="#topics">
-                                    <xsl:value-of select="$message
-                                                          [@id='topics']" />
-                                </a>
-                            </li>&lf;
-
-                            <xsl:apply-templates
-                                select="categories/categoryfile" mode="toc" />
-                            </ul>
-                        </xsl:if>
-                    </xsl:if> <!-- !$is-chm -->
-
-                    <xsl:if test="seealso">
-                        <h3>
-                            <xsl:value-of
-                                select="$message[@id='seealso']" />
-                        </h3>
-
-                        <ul class="seealso">
-                        <xsl:for-each select="seealso">
-                            <li>
-                                <xsl:apply-templates />
-                            </li>
-                        </xsl:for-each>
-                        </ul>
-                    </xsl:if>
-                </div>&lf; <!-- /#quickview -->
-            </xsl:if> <!-- /have sidebar -->
-
-            <!-- either one ... -->
-            <xsl:apply-templates select="section" />
-            <!-- ... or the other is allowed -->
-            <xsl:apply-templates select="categories" />
-        </div>&lf; <!-- /#page-content -->
-
-        <xsl:call-template name="bottom" />&lf;
-    </body>
-</html>
-</xsl:template>
-<!-- /faq -->
-
-<!-- ==================================================================== -->
-<!-- <categories> (see categories.xml)                                    -->
-<!-- ==================================================================== -->
-<xsl:template match="categories">
-<xsl:call-template name="toplink" />&lf;
-
-<div class="section">&lf;
-
-    <!-- Section heading -->
-    <h2>
-        <a name="topics" id="topics">
-            <xsl:value-of select="$message[@id='topics']" />
-        </a>
-    </h2>&lf;
-
-    <dl>
-        <xsl:apply-templates select="categoryfile" mode="index"/>
-    </dl>
-</div> <!-- /.section -->
-
-<xsl:if test="/faq/@all-in-one = 'yes'">
-    <xsl:apply-templates select="categoryfile" mode="suckin" />
-</xsl:if>
-</xsl:template>
-<!-- /categories -->
-
-<!-- ==================================================================== -->
-<!-- <categoryfile> mode="index"                                          -->
-<!-- just write the short description with a link to the resource         -->
-<!-- ==================================================================== -->
-<xsl:template match="categories/categoryfile" mode="index">
-<xsl:variable name="current" select="document(.)/faq" />
-
-<dt>
-    <a>
-        <xsl:attribute name="href">
-            <xsl:choose>
-            <xsl:when test="/faq/@all-in-one = 'yes'">
-                <xsl:value-of select="concat('#', $current/section/@id)" />
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="concat(document($current/@metafile)
-                                             /metafile/basename, '.html')" />
-            </xsl:otherwise>
-            </xsl:choose>
-        </xsl:attribute>
-
-        <xsl:value-of select="$current/section/title" />
-    </a>
-</dt>
-<dd>
-    <xsl:apply-templates select="$current/description" />
-</dd>&lf;
-</xsl:template>
-<!-- /categoryfile, "index" -->
-
-
-<!-- ==================================================================== -->
-<!-- <categoryfile> mode="toc"                                            -->
-<!-- create sidebar links                                                 -->
-<!-- ==================================================================== -->
-<xsl:template match="categories/categoryfile" mode="toc">
-<xsl:variable name="current" select="document(.)/faq" />
-
-<li>
-    <img src="{$path}/images/down.gif" alt="" />
-    <xsl:text> </xsl:text>
-    <a href="#{$current/section/@id}">
-        <xsl:value-of select="$current/section/title" />
-    </a>
-</li>&lf;
-</xsl:template>
-<!-- /categoryfile, "toc" -->
-
-
-<!-- ==================================================================== -->
-<!-- <categoryfile> mode="suckin"                                         -->
-<!-- load whole file contents (for all-in-one page)                       -->
-<!-- ==================================================================== -->
-<xsl:template match="categories/categoryfile" mode="suckin">
-<xsl:apply-templates select="document(.)/faq/section" />
-</xsl:template>
-<!-- /categoryfile, "suckin" -->
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/xsl/hhc.xsl b/docs/manual/style/xsl/hhc.xsl
deleted file mode 100644
index c9fde798..00000000
--- a/docs/manual/style/xsl/hhc.xsl
+++ /dev/null
@@ -1,668 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY lf SYSTEM "../xsl/util/lf.xml">
-    <!ENTITY tab SYSTEM "../xsl/util/tab.xml">
-
-    <!ENTITY ul.start SYSTEM "../xsl/util/ul-start.xml">
-    <!ENTITY ul.end SYSTEM   "../xsl/util/ul-end.xml"  >
-    <!ENTITY li.start SYSTEM "../xsl/util/li-start.xml">
-    <!ENTITY li.end SYSTEM   "../xsl/util/li-end.xml"  >
-]>
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="">
-
-<!--                                                                      -->
-<!-- WARNING! Do not touch anything, especially the whitespaces [1]       -->
-<!-- unless you know, what you're doing. The HTML help compiler parses    -->
-<!-- the TOC file not really as html instead of line by line and takes    -->
-<!-- care of whitespace indentations etc.                                 -->
-<!--                                                                      -->
-<!--   [1] Covered by the &lf; and &tab; entities.                        -->
-<!--                                                                      -->
-<!-- You have been warned.                                                -->
-<!--                                                                      -->
-
-<!-- create nodeset for referencing later                                 -->
-<xsl:variable name="not-exists" select="document('')/xsl:stylesheet/xsl:template
-                                        [@name='data']/not-exists/file" />
-
-<xsl:template name="data">
-<!-- documents not converted (yet?). -->
-<not-exists>
-<!--  example: <file>developer/API.xml</file> -->
-</not-exists>
-</xsl:template>
-
-<!-- Constants used for case translation -->
-<xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz'" />
-<xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'" />
-
-<!-- document() works relative to the xsl (!) file -->
-<xsl:variable name="basedir" select="'../../'"/>
-
-<!-- icons -->
-<xsl:variable name="icon.document" select="'11'" />
-<xsl:variable name="icon.document.not-translated" select="'12'" />
-<xsl:variable name="icon.section" select="'35'" />
-<xsl:variable name="icon.directive" select="'41'" />
-<xsl:variable name="icon.commondirective" select="'19'" />
-<!-- this should not happen. this icon is only displayed within the
-     toc view of the help workshop (it's a question mark): -->
-<xsl:variable name="icon.no-anchor" select="'9'" />
-
-<!-- for module-translatename -->
-<xsl:include href="../xsl/util/modtrans.xsl"/>
-
-<!-- ==================================================================== -->
-<!-- <sitemap>                                                            -->
-<!-- Create CHM contents file (toc) from sitemap                          -->
-<!-- The file is an html style text file (see warning on top)             -->
-<!-- ==================================================================== -->
-<xsl:template match="/sitemap">
-
-<!-- html head -->
-<xsl:text>&lt;html&gt;&lt;head&gt;</xsl:text>
-<xsl:text>&lt;title&gt;Apache HTTP Server Documentation&lt;/title&gt;</xsl:text>
-<xsl:text>&lt;/head&gt;</xsl:text>&lf;
-
-<xsl:text>&lt;body&gt;</xsl:text>&lf;
-
-<!-- toc properties first -->
-<xsl:text>&lt;object type="text/site properties"&gt;</xsl:text>&lf;&tab;
-<!-- XXX: that magic value is still obfuscated. Research needed ... -->
-<xsl:text>&lt;param name="Window Styles" value="0x800027"&gt;</xsl:text>&lf;&tab;
-<xsl:text>&lt;param name="Font" value="</xsl:text>
-    <xsl:value-of select="$toc-font" />
-<xsl:text>"&gt;</xsl:text>&lf;
-<xsl:text>&lt;/object&gt;</xsl:text>&lf;
-
-&ul.start; &lf;
-
-    <!-- index page on top. -->
-    &li.start;
-    <xsl:call-template name="object">
-        <xsl:with-param name="name"
-            select="normalize-space($message[@id='apachehttpserver'])" />
-        <xsl:with-param name="href" select="'index.html'" />
-        <xsl:with-param name="indent" select="'&#9;&#9;'" />
-    </xsl:call-template>
-    &li.end; &lf;
-
-    <!-- iterate over the categories in document order -->
-    <xsl:for-each select="category">
-        &li.start;
-        <xsl:call-template name="folder">
-            <xsl:with-param name="name" select="normalize-space(title)" />
-        </xsl:call-template>&lf;&tab;
-
-        &ul.start; &lf;&tab;
-            <xsl:apply-templates select="page" />
-            <xsl:if test="@id = 'modules'">
-                <xsl:apply-templates select="document($allmodules)/modulefilelist" />
-            </xsl:if>
-        &ul.end; &lf;
-        &li.end; &lf;&tab;
-    </xsl:for-each>&lf;
-
-&ul.end; &lf;
-
-<xsl:text>&lt;/body&gt;&lt;/html&gt;</xsl:text>&lf;
-</xsl:template>
-<!-- /sitemap -->
-
-
-<!-- ==================================================================== -->
-<!-- category/page                                                        -->
-<!-- ==================================================================== -->
-<xsl:template match="category/page">
-&li.start;
-
-<!-- document entry, if not href attribute, assume it means "sitemap" -->
-<xsl:call-template name="object">
-    <xsl:with-param name="name">
-        <xsl:choose>
-        <xsl:when test="@href">
-            <xsl:value-of select="normalize-space(.)" />
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="normalize-space($message[@id='sitemap'])" />
-        </xsl:otherwise>
-        </xsl:choose>
-    </xsl:with-param>
-    <xsl:with-param name="href">
-        <xsl:choose>
-        <xsl:when test="not(@href)">
-            <xsl:text>sitemap.html</xsl:text>
-        </xsl:when>
-        <xsl:when test="contains(@href, '#')">
-            <xsl:value-of select="substring-before(@href, '#')" />
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="@href"/>
-        </xsl:otherwise>
-        </xsl:choose>
-    </xsl:with-param>
-    <xsl:with-param name="indent" select="'&#9;&#9;'" />
-</xsl:call-template>
-
-<!-- now try to index the sections of the document -->
-<xsl:apply-templates select="self::page" mode="index" />
-
-&li.end; &lf;&tab;
-</xsl:template>
-<!-- /category/page -->
-
-
-<!-- ==================================================================== -->
-<!-- category/page, mode="index"                                          -->
-<!-- display all section headings of one page                             -->
-<!-- ==================================================================== -->
-<xsl:template match="category/page" mode="index">
-<xsl:variable name="href.offline">
-    <xsl:choose>
-    <xsl:when test="string-length(@href) = 0">
-        <xsl:text>sitemap.html</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-        <xsl:call-template name="helper.href.offline">
-            <xsl:with-param name="href" select="@href" />
-        </xsl:call-template>
-    </xsl:otherwise>
-    </xsl:choose>
-</xsl:variable>
-<xsl:variable name="xml"
-    select="concat(substring-before($href.offline, '.html'), '.xml')" />
-
-<xsl:if test="not($xml = $not-exists)">
-    <xsl:variable name="xmlfile">
-        <xsl:variable name="metafile"
-            select="document(document(concat($basedir, $xml))/*/@metafile)
-                    /metafile" />
-        <xsl:choose>
-        <xsl:when test="$metafile/variants/variant[.=$doclang] and not
-                        ($metafile/variants/variant[.=$doclang]
-                         /@htmlonly = 'yes')">
-                <xsl:value-of select="concat($basedir,
-                                   substring-before($xml, '.xml'), $xml-ext)" />
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="concat($basedir, $xml)" />
-        </xsl:otherwise>
-        </xsl:choose>
-    </xsl:variable>
-
-    <xsl:variable name="current" select="document($xmlfile)" />
-
-    <xsl:if test="count($current/*/*[local-name()='section' or
-                                     local-name()='category']) &gt; 1">
-        &lf;&tab;&tab;&tab;
-        &ul.start; &lf;&tab;&tab;&tab;
-
-        <xsl:for-each select="$current/*/*[local-name()='section' or
-                                           local-name()='category']">
-            &li.start;
-
-            <xsl:call-template name="object">
-                <xsl:with-param name="name" select="normalize-space(title)" />
-                <xsl:with-param name="href">
-                    <xsl:if test="@id">
-                        <xsl:value-of
-                            select="concat(substring-before($xml, '.xml'),
-                                           '.html#', @id)" />
-                    </xsl:if>
-                </xsl:with-param>
-                <xsl:with-param name="indent" select="'&#9;&#9;&#9;&#9;'" />
-            </xsl:call-template>
-
-            &li.end; &lf;&tab;&tab;
-        </xsl:for-each>
-
-        &ul.end; &lf;&tab;
-    </xsl:if> <!-- count() > 1 -->
-</xsl:if> <!-- xml exists -->
-</xsl:template>
-<!-- /category/page, "index" -->
-
-
-<!-- ==================================================================== -->
-<!-- category/modulefilelist                                              -->
-<!-- process all listed module files                                      -->
-<!-- ==================================================================== -->
-<xsl:template match="modulefilelist">
-<!-- create a module name translation list for sorting -->
-<xsl:variable name="translist">
-    <xsl:text>-</xsl:text>
-
-    <xsl:for-each select="modulefile">
-        <xsl:variable name="current"
-            select="document(concat($basedir,'mod/',.))/modulesynopsis" />
-   
-        <xsl:text> </xsl:text>
-        <xsl:value-of select="$current/name"/>
-        <xsl:text> </xsl:text>
-        <xsl:call-template name="module-translatename">
-            <xsl:with-param name="name" select="$current/name"/>
-        </xsl:call-template>
-        <xsl:text> -</xsl:text>
-    </xsl:for-each>
-</xsl:variable>
-
-<!-- put core and mpm_common on top -->
-<xsl:call-template name="toc-entry.mpm">
-    <xsl:with-param name="current"
-        select="document(concat($basedir, 'mod/', modulefile[starts-with(.,
-                         'core.xml')]/text()))/modulesynopsis" />
-    <xsl:with-param name="name" select="'core'" />
-</xsl:call-template>
-
-<xsl:call-template name="toc-entry.mpm">
-    <xsl:with-param name="current"
-        select="document(concat($basedir, 'mod/', modulefile[starts-with(.,
-                         'mpm_common.xml')]/text()))/modulesynopsis" />
-    <xsl:with-param name="name" select="'common'" />
-</xsl:call-template>
-
-<!-- remaining MPMs -->
-<xsl:for-each select="modulefile">
-<xsl:sort select="substring-before(substring-after($translist, concat('- ',
-    document(concat($basedir, 'mod/', .))/modulesynopsis/name, ' ')), ' -')" />
-
-    <xsl:variable name="current"
-        select="document(concat($basedir, 'mod/', .))/modulesynopsis" />
-
-    <xsl:if test="$current/status='MPM' and not($current/name='mpm_common')">
-        <xsl:call-template name="toc-entry.mpm">
-            <xsl:with-param name="current" select="$current" />
-            <xsl:with-param name="name" select="substring-before(
-                substring-after($translist, concat('- ', $current/name, ' ')),
-                ' -')" />
-        </xsl:call-template>
-    </xsl:if>
-</xsl:for-each>
-
-<!-- normal modules -->
-<xsl:for-each select="modulefile">
-<xsl:sort select="substring-before(substring-after($translist, concat('- ',
-    document(concat($basedir, 'mod/', .))/modulesynopsis/name, ' ')), ' -')" />
-
-    <xsl:variable name="current"
-        select="document(concat($basedir, 'mod/', .))/modulesynopsis" />
-
-    <xsl:if test="not($current/status='MPM') and not($current/status='Core')">
-        <xsl:call-template name="toc-entry.module">
-            <xsl:with-param name="current" select="$current"/>
-        </xsl:call-template>
-    </xsl:if>
-</xsl:for-each>
-</xsl:template>
-<!-- /category/modulefilelist -->
-
-
-<!-- ==================================================================== -->
-<!-- toc-entry.mpm                                                        -->
-<!-- create entry (and initiate subsection entries) of an mpm             -->
-<!-- ==================================================================== -->
-<xsl:template name="toc-entry.mpm">
-<xsl:param name="current" />
-<xsl:param name="name" />
-
-&li.start;
-
-<xsl:call-template name="object">
-    <xsl:with-param name="name">
-        <xsl:choose>
-        <xsl:when test="$name='core'">
-            <xsl:value-of select="normalize-space($message[@id='apachecore'])" />
-        </xsl:when>
-        <xsl:when test="$name='common'">
-            <xsl:value-of select="normalize-space($message[@id='apachempmcommon'])" />
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="normalize-space($message[@id='apachempm'])" />
-            <xsl:text> </xsl:text>
-            <xsl:value-of select="$name" />
-        </xsl:otherwise>
-        </xsl:choose>
-    </xsl:with-param>
-    <xsl:with-param name="href"
-        select="concat('mod/', $current/name, '.html')" />
-    <xsl:with-param name="indent" select="'&#9;&#9;&#9;'" />
-</xsl:call-template>
-    
-<xsl:call-template name="sections-and-directives">
-    <xsl:with-param name="current" select="$current" />
-</xsl:call-template>
-
-&li.end; &lf;&tab;
-</xsl:template>
-<!-- /toc-entry.mpm -->
-  
-
-<!-- ==================================================================== -->
-<!-- toc-entry.module                                                     -->
-<!-- create entry (and initiate subsection entries) of a module           -->
-<!-- ==================================================================== -->
-<xsl:template name="toc-entry.module">
-<xsl:param name="current"/>
-
-&li.start;
-
-<xsl:call-template name="object">
-    <xsl:with-param name="name">
-        <xsl:value-of select="normalize-space($message[@id='apachemodule'])" />
-        <xsl:text> </xsl:text>
-        <xsl:value-of select="$current/name" />
-    </xsl:with-param>
-    <xsl:with-param name="href"
-        select="concat('mod/', $current/name, '.html')" />
-    <xsl:with-param name="indent" select="'&#9;&#9;&#9;'" />
-</xsl:call-template>
-    
-<xsl:call-template name="sections-and-directives">
-    <xsl:with-param name="current" select="$current" />
-</xsl:call-template>
-
-&li.end; &lf;&tab;
-</xsl:template>
-<!-- /toc-entry.module -->
-
-
-<!-- ==================================================================== -->
-<!-- sections-and-directives                                              -->
-<!-- process sections and directives of a module file                     -->
-<!-- ==================================================================== -->
-<xsl:template name="sections-and-directives">
-<xsl:param name="current" />
-
-<xsl:if test="count($current/section) &gt; 0 or
-              count($current/directivesynopsis) &gt; 0">
-    &lf;&tab;&tab;
-
-    &ul.start; &lf;&tab;&tab;
-
-    <!-- sections -->
-    <xsl:for-each select="$current/section">
-        &li.start;
-
-        <xsl:call-template name="object">
-            <xsl:with-param name="name" select="normalize-space(title)" />
-            <xsl:with-param name="href">
-                <xsl:if test="@id">
-                    <xsl:value-of
-                        select="concat('mod/', $current/name, '.html#', @id)" />
-                </xsl:if>
-            </xsl:with-param>
-            <xsl:with-param name="indent" select="'&#9;&#9;&#9;&#9;'" />
-        </xsl:call-template>
-
-        &li.end; &lf;&tab;&tab;
-    </xsl:for-each>
-
-    <!-- directives within the current document -->
-    <xsl:for-each select="$current/directivesynopsis[not(@location)]">
-    <xsl:sort select="name" />
-        &li.start;
-
-        <xsl:call-template name="object">
-            <xsl:with-param name="name">
-                <xsl:if test="@type='section'">&lt;</xsl:if>
-                <xsl:value-of select="name"/>
-                <xsl:if test="@type='section'">&gt;</xsl:if>
-                <xsl:choose>
-                <xsl:when test="$message[@id='directive']
-                                /@replace-space-with">
-                    <xsl:value-of select="$message[@id='directive']
-                                          /@replace-space-with" />
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:text> </xsl:text>
-                </xsl:otherwise>
-                </xsl:choose>
-                <xsl:value-of select="normalize-space($message[@id='directive'])" />
-            </xsl:with-param>
-            <xsl:with-param name="href"
-                select="concat('mod/', $current/name, '.html#',
-                               translate(name, $uppercase, $lowercase))" />
-            <xsl:with-param name="indent" select="'&#9;&#9;&#9;&#9;'" />
-            <xsl:with-param name="icon" select="$icon.directive" />
-        </xsl:call-template>
-
-        &li.end; &lf;&tab;&tab;
-    </xsl:for-each>
-
-    <!-- directives described elsewhere -->
-    <xsl:for-each select="$current/directivesynopsis[@location]">
-    <xsl:sort select="name" />
-        &li.start;
-
-        <xsl:call-template name="object">
-            <xsl:with-param name="name">
-                <xsl:if test="@type='section'">&lt;</xsl:if>
-                <xsl:value-of select="name"/>
-                <xsl:if test="@type='section'">&gt;</xsl:if>
-                <xsl:choose>
-                <xsl:when test="$message[@id='directive']
-                                /@replace-space-with">
-                    <xsl:value-of select="$message[@id='directive']
-                                          /@replace-space-with" />
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:text> </xsl:text>
-                </xsl:otherwise>
-                </xsl:choose>
-                <xsl:value-of select="normalize-space($message[@id='directive'])" />
-            </xsl:with-param>
-            <xsl:with-param name="href"
-                select="concat('mod/', @location, '.html#',
-                               translate(name, $uppercase, $lowercase))" />
-            <xsl:with-param name="indent" select="'&#9;&#9;&#9;&#9;'" />
-            <xsl:with-param name="icon" select="$icon.commondirective" />
-        </xsl:call-template>
-
-        &li.end; &lf;&tab;&tab;
-    </xsl:for-each>
-
-    &ul.end; &lf;&tab;
-</xsl:if> <!-- sections or directives present -->
-</xsl:template>
-<!-- /sections-and-directives -->
-
-
-<!-- ==================================================================== -->
-<!-- object                                                               -->
-<!-- display an <object> and do some magic to select the right content    -->
-<!-- ==================================================================== -->
-<xsl:template name="object">
-<xsl:param name="name" select="'? unknown ?'" />
-<xsl:param name="href" />
-<xsl:param name="icon" select="$icon.section" />
-<xsl:param name="indent" />
-
-<xsl:variable name="href.offline">
-    <xsl:call-template name="helper.href.offline">
-        <xsl:with-param name="href" select="$href" />
-    </xsl:call-template>
-</xsl:variable>
-
-<!-- xml file is expected to have the same basename -->
-<xsl:variable name="xml"
-    select="concat(substring-before($href.offline, '.html'), '.xml')" />
-
-<xsl:text>&lt;object type="text/sitemap"&gt;</xsl:text>&lf;
-<xsl:value-of select="$indent" />
-
-<xsl:text>&lt;param name="Name" value="</xsl:text>
-    <xsl:call-template name="filter.attval">
-        <xsl:with-param name="text" select="$name" />
-    </xsl:call-template>
-<xsl:text>"&gt;</xsl:text>&lf;
-<xsl:value-of select="$indent" />
-
-<xsl:if test="string-length($href.offline) &gt; 0">
-    <xsl:text>&lt;param name="Local" value="</xsl:text>
-        <xsl:call-template name="filter.attval">
-            <xsl:with-param name="text" select="$href.offline" />
-        </xsl:call-template>
-    <xsl:text>"&gt;</xsl:text>&lf;
-    <xsl:value-of select="$indent" />
-</xsl:if>
-
-<xsl:text>&lt;param name="ImageNumber" value="</xsl:text>
-    <xsl:choose>
-    <xsl:when test="string-length($href.offline) &gt; 0">
-        <xsl:choose>
-        <xsl:when test="contains($href, '#')">
-            <xsl:value-of select="$icon" />
-        </xsl:when>
-        <xsl:when test="$doclang='en' or
-                        (not($xml = $not-exists) and
-                         (document(document(concat($basedir, $xml))
-                                   /*/@metafile)
-                          /metafile/variants/variant
-                          [.=$doclang and not(@htmlonly='yes')]))">
-            <xsl:value-of select="$icon.document" />
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="$icon.document.not-translated" />
-        </xsl:otherwise>
-        </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-        <xsl:value-of select="$icon.no-anchor" />
-    </xsl:otherwise>
-    </xsl:choose>
-<xsl:text>"&gt;</xsl:text>&lf;
-<xsl:value-of select="substring($indent, 2)" />
-
-<xsl:text>&lt;/object&gt;</xsl:text>
-</xsl:template>
-<!-- /object -->
-
-
-<!-- ==================================================================== -->
-<!-- folder                                                               -->
-<!-- ==================================================================== -->
-<xsl:template name="folder">
-<xsl:param name="name" select="'? unknown ?'" />
-
-<xsl:text>&lt;object type="text/sitemap"&gt;</xsl:text>&lf;&tab;&tab;
-<xsl:text>&lt;param name="Name" value="</xsl:text>
-    <xsl:call-template name="filter.attval">
-        <xsl:with-param name="text" select="$name" />
-    </xsl:call-template>
-<xsl:text>"&gt;</xsl:text>&lf;&tab;
-<xsl:text>&lt;/object&gt;</xsl:text>
-</xsl:template>
-<!-- /folder -->
-
-
-<!-- ==================================================================== -->
-<!-- helper.href.offline                                                  -->
-<!-- change uri reference to work offline (/ -> /index.html)              -->
-<!-- ==================================================================== -->
-<xsl:template name="helper.href.offline">
-<xsl:param name="href" />
-
-<xsl:choose>
-<xsl:when test="string-length($href) = 0" />
-<xsl:when test="contains($href, '#') and '/' = substring($href,
-                               string-length(substring-before($href, '#')), 1)">
-    <xsl:value-of select="substring-before($href, '#')" />
-    <xsl:text>index.html#</xsl:text>
-    <xsl:value-of select="substring-after($href, '#')" />
-</xsl:when>
-<xsl:when test="substring($href, string-length($href), 1) = '/'">
-    <xsl:value-of select="$href" />
-    <xsl:text>index.html</xsl:text>
-</xsl:when>
-<xsl:otherwise>
-    <xsl:value-of select="$href" />
-</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-<!-- /helper.href.offline -->
-
-
-<!-- ==================================================================== -->
-<!-- filter.attval                                                        -->
-<!-- escape special characters for being valid within an attribute        -->
-<!-- ==================================================================== -->
-<xsl:template name="filter.attval">
-<xsl:param name="text" />
-
-<xsl:choose>
-<xsl:when test="contains($text, '&amp;')">
-    <xsl:call-template name="filter.attval.special">
-        <xsl:with-param name="text" select="substring-before($text, '&amp;')" />
-    </xsl:call-template>
-    <xsl:text>&amp;amp;</xsl:text>
-    <xsl:call-template name="filter.attval">
-        <xsl:with-param name="text" select="substring-after($text, '&amp;')" />
-    </xsl:call-template>
-</xsl:when>
-<xsl:otherwise>
-    <xsl:call-template name="filter.attval.special">
-        <xsl:with-param name="text" select="$text" />
-    </xsl:call-template>
-</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-<!-- /filter.attval -->
-
-
-<!-- ==================================================================== -->
-<!-- filter.attval.special                                                -->
-<!-- accompanying template of filter.attval                               -->
-<!-- ==================================================================== -->
-<xsl:template name="filter.attval.special">
-<xsl:param name="text" />
-
-<xsl:choose>
-<xsl:when test="contains($text, '&lt;')">
-    <xsl:value-of select="substring-before($text, '&lt;')" />
-    <xsl:text>&amp;lt;</xsl:text>
-    <xsl:call-template name="filter.attval.special">
-        <xsl:with-param name="text" select="substring-after($text, '&lt;')" />
-    </xsl:call-template>
-</xsl:when>
-<xsl:when test="contains($text, '&gt;')">
-    <xsl:value-of select="substring-before($text, '&gt;')" />
-    <xsl:text>&amp;gt;</xsl:text>
-    <xsl:call-template name="filter.attval.special">
-        <xsl:with-param name="text" select="substring-after($text, '&gt;')" />
-    </xsl:call-template>
-</xsl:when>
-<xsl:when test="contains($text, '&quot;')">
-    <xsl:value-of select="substring-before($text, '&quot;')" />
-    <xsl:text>&amp;quot;</xsl:text>
-    <xsl:call-template name="filter.attval.special">
-        <xsl:with-param name="text" select="substring-after($text, '&quot;')" />
-    </xsl:call-template>
-</xsl:when>
-<xsl:otherwise>
-    <xsl:value-of select="$text" />
-</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-<!-- /filter.attval.special -->
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/xsl/hhp.xsl b/docs/manual/style/xsl/hhp.xsl
deleted file mode 100644
index 369377e8..00000000
--- a/docs/manual/style/xsl/hhp.xsl
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY lf SYSTEM "../xsl/util/lf.xml">
-]>
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="">
-
-<!-- the accompanying server version -->
-<xsl:param name="httpd.version" select="'generic'" />
-
-<!-- create nodeset for referencing later                                 -->
-<xsl:variable name="htmlhelp.def" select="document('')/xsl:stylesheet
-                                        /xsl:template[@name='htmlhelp.def']" />
-
-<!-- ==================================================================== -->
-<!-- <sitemap>                                                            -->
-<!-- Create CHM project file from sitemap                                 -->
-<!-- The file is an *.ini format text file                                -->
-<!-- ==================================================================== -->
-<xsl:template match="/sitemap">
-
-<!-- static information                                               -->
-<!-- **************************************************************** -->
-<xsl:text>[OPTIONS]</xsl:text>&lf;
-<xsl:text>Binary TOC=No</xsl:text>&lf;
-<xsl:text>Compatibility=1.0</xsl:text>&lf;
-
-<!-- resulting filename -->
-<xsl:text>Compiled file=httpd-docs-</xsl:text>
-<xsl:value-of select="$httpd.version" />
-<xsl:text>.</xsl:text>
-<xsl:value-of select="$doclang" />
-<xsl:text>.chm</xsl:text>&lf;
-
-<xsl:text>Contents file=toc.hhc</xsl:text>&lf;
-<xsl:text>Default Window=Main</xsl:text>&lf;
-<xsl:text>Default topic=index.html</xsl:text>&lf;
-
-<!-- compiler related -->
-<xsl:text>Display compile progress=Yes</xsl:text>&lf;
-<xsl:text>Enhanced decompilation=Yes</xsl:text>&lf;
-
-<!-- search related -->
-<xsl:text>Full-text search=Yes</xsl:text>&lf;
-<xsl:text>Language=</xsl:text>
-<xsl:value-of select="$hhp-lang" />&lf;
-
-<!-- title of the help file -->
-<xsl:text>Title=</xsl:text>
-<xsl:value-of select="normalize-space($message[@id='apachehttpserver'])"/>&lf;&lf;
-
-<!-- main window definition -->
-<xsl:text>[WINDOWS]</xsl:text>&lf;
-<xsl:text>Main=</xsl:text>
-
-<!-- title -->
-<xsl:text>"</xsl:text>
-<xsl:value-of select="normalize-space($message[@id='apachehttpserver'])"/>
-<xsl:text>",</xsl:text>
-
-<!-- toc file -->
-<xsl:text>"toc.hhc",</xsl:text>
-
-<!-- index file (currently none) -->
-<xsl:text>,</xsl:text>
-
-<!-- default file (startup) -->
-<xsl:text>"index.html",</xsl:text>
-
-<!-- Home button file -->
-<xsl:text>"index.html",</xsl:text>
-
-<!-- Jump 1 url, text -->
-<xsl:text>,,</xsl:text>
-
-<!-- Jump 2 url, text -->
-<xsl:text>,,</xsl:text>
-
-<!-- navigation pane style (0x1e357e) -->
-<xsl:call-template name="helper.number2hex">
-    <xsl:with-param name="number" select="sum($htmlhelp.def/navigation/style
-                                              [@selected='yes'])" />
-</xsl:call-template>
-<xsl:text>,</xsl:text>
-
-<!-- navigation pane initial width (px) -->
-<xsl:text>180,</xsl:text>
-
-<!-- button mask -->
-<xsl:call-template name="helper.number2hex">
-    <xsl:with-param name="number" select="sum($htmlhelp.def/buttons/button
-                                              [@visible='yes'])" />
-</xsl:call-template>
-<xsl:text>,</xsl:text>
-
-<!-- Initial Position [Left, Top, Right, Bottom] -->
-<xsl:text>[0,0,600,380],</xsl:text>
-
-<!-- window style -->
-<xsl:call-template name="helper.number2hex">
-    <xsl:with-param name="result" select="'0000'" /> <!-- << 16 -->
-    <xsl:with-param name="number" select="sum($htmlhelp.def/windowstyle/style
-                                              [@selected='yes'])" />
-</xsl:call-template>
-<xsl:text>,</xsl:text>
-
-<!-- extended style -->
-<xsl:text>,</xsl:text>
-
-<!-- flag: navigation pane initial closed (=1) -->
-<xsl:text>,</xsl:text>
-
-<!-- unknown, default pane, unknown, unknown -->
-<xsl:text>,,,0</xsl:text>&lf;&lf;
-
-<!-- file list                                                        -->
-<!-- **************************************************************** -->
-<xsl:text>[FILES]</xsl:text>&lf;
-
-<!-- not automatically sucked in. (because only @import()ed) -->
-<xsl:text>style\css\manual.css</xsl:text>&lf;
-<xsl:text>style\css\manual-loose-100pc.css</xsl:text>&lf;
-
-<!-- include project file itself for easier recompiling -->
-<xsl:text>manual.hhp</xsl:text>&lf;
-
-<!-- and now all sitemap-listed files -->
-<xsl:for-each select="category">
-    <xsl:apply-templates select="page[@href]" />
-    <xsl:if test="@id = 'modules'">
-        <xsl:apply-templates select="document($allmodules)/modulefilelist
-                                     /modulefile" />
-    </xsl:if>
-</xsl:for-each>&lf;
-</xsl:template>
-<!-- /sitemap -->
-
-
-<!-- ==================================================================== -->
-<!-- files referenced in sitemap                                          -->
-<!-- ==================================================================== -->
-<xsl:template match="category/page">
-<xsl:variable name="filename">
-    <xsl:choose>
-    <xsl:when test="contains(@href, '#') and substring(@href,
-                    string-length(substring-before(@href, '#')), 1) = '/'">
-        <xsl:value-of select="substring-before(@href, '#')" />
-        <xsl:text>index.html</xsl:text>
-    </xsl:when>
-    <xsl:when test="substring(@href, string-length(@href), 1) = '/'">
-        <xsl:value-of select="@href"/>
-        <xsl:text>index.html</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-        <xsl:value-of select="@href"/>
-    </xsl:otherwise>
-    </xsl:choose>
-</xsl:variable>
-
-<xsl:value-of select="translate($filename, '/', '\')" />&lf;
-</xsl:template>
-<!-- /page[@href] -->
-
-
-<!-- ==================================================================== -->
-<!-- list module files                                                    -->
-<!-- ==================================================================== -->
-<xsl:template match="modulefilelist/modulefile">
-<xsl:text>mod\</xsl:text>
-<xsl:value-of select="substring-before(normalize-space(.), '.xml')" />
-<xsl:text>.html</xsl:text>&lf;
-</xsl:template>
-<!-- /modulefilelist/modulefile -->
-
-
-<!-- ==================================================================== -->
-<!-- convert number to its hexadecimal representation.                    -->
-<!-- I could not find a built-in function, so write our own ... *sigh*    -->
-<!-- ==================================================================== -->
-<xsl:template name="helper.number2hex">
-<xsl:param name="number" />
-<xsl:param name="result" />
-
-<xsl:choose>
-<xsl:when test="number($number) &gt; 0">
-    <xsl:call-template name="helper.number2hex">
-        <xsl:with-param name="number" select="floor(number($number) div 16)" />
-        <xsl:with-param name="result"
-            select="concat(substring('0123456789abcdef',
-                                     (number($number) mod 16) + 1, 1),
-                           $result)" />
-    </xsl:call-template>
-</xsl:when>
-<xsl:otherwise>
-    <!-- if zero, don't print anything. hh.exe (the viewer) seems to -->
-    <!-- prefer an empty value -->
-    <xsl:if test="string-length(translate($result, '0', '')) &gt; 0">
-        <xsl:text>0x</xsl:text>
-        <xsl:value-of select="$result" />
-    </xsl:if>
-</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-<!-- /helper.number2hex -->
-
-
-<!-- ==================================================================== -->
-<!-- some of the values are derived from htmlhelp.h                       -->
-<!-- do NOT call this template, it's referenced automagically via         -->
-<!-- document() function and acts as simple data container.               -->
-<!--                                                                      -->
-<!-- Hints: 'ni' means 'not implemented' (by the help viewer)             -->
-<!--        'ns' means 'not useful for standalone help file'              -->
-<!-- ==================================================================== -->
-<xsl:template name="htmlhelp.def">
-<navigation>
-    <style               >        1</style> <!-- auto hide nav. pane   <<  0 -->
-    <style               >        2</style> <!-- ns: topmost window    <<  1 -->
-    <style               >        4</style> <!-- ns: no title bar      <<  2 -->
-    <style               >        8</style> <!-- ns: no win. style     <<  3 -->
-    <style               >       16</style> <!-- ns: no ext. style     <<  4 -->
-    <style selected="yes">       32</style> <!-- use tri-pane win.     <<  5 -->
-    <style               >       64</style> <!-- no toolbar text       <<  6 -->
-    <style               >      128</style> <!-- ns: send WM_QUIT      <<  7 -->
-    <style selected="yes">      256</style> <!-- toc auto sync         <<  8 -->
-    <style               >      512</style> <!-- ns: send track. not.  <<  9 -->
-    <style selected="yes">     1024</style> <!-- search tab            << 10 -->
-    <style               >     2048</style> <!-- ni(?): history tab    << 11 -->
-    <style selected="yes">     4096</style> <!-- favorites tab         << 12 -->
-    <style               >     8192</style> <!-- ni(?): title sync     << 13 -->
-    <style               >    16384</style> <!-- nav. only             << 14 -->
-    <style               >    32768</style> <!-- no toolbar            << 15 -->
-    <style selected="yes">    65536</style> <!-- show menu             << 16 -->
-    <style selected="yes">   131072</style> <!-- advanced search       << 17 -->
-    <style selected="yes">   262144</style> <!-- safe user's win. size << 18 -->
-    <style               >   524288</style> <!-- custom tab 1          << 19 -->
-    <style               >  1048576</style> <!-- custom tab 2          << 20 -->
-    <style               >  2097152</style> <!-- custom tab 3          << 21 -->
-    <style               >  4194304</style> <!-- custom tab 4          << 22 -->
-    <style               >  8388608</style> <!-- custom tab 5          << 23 -->
-    <style               > 16777216</style> <!-- custom tab 6          << 24 -->
-    <style               > 33554432</style> <!-- custom tab 7          << 25 -->
-    <style               > 67108864</style> <!-- custom tab 8          << 26 -->
-    <style               >134217728</style> <!-- custom tab 9          << 27 -->
-    <style               >268435456</style> <!-- window has margin (?) << 28 -->
-</navigation>
-
-<buttons>
-    <button visible="yes">      2</button> <!-- expand/contract   <<  1 -->
-    <button visible="yes">      4</button> <!-- back              <<  2 -->
-    <button visible="yes">      8</button> <!-- forward           <<  3 -->
-    <button visible="yes">     16</button> <!-- Stop              <<  4 -->
-    <button              >     32</button> <!-- Refresh           <<  5 -->
-    <button visible="yes">     64</button> <!-- Home              <<  6 -->
-    <button              >    128</button> <!-- ni: browse fwd    <<  7 -->
-    <button              >    256</button> <!-- ni: browse back   <<  8 -->
-    <button              >    512</button> <!-- ni: notes         <<  9 -->
-    <button              >   1024</button> <!-- ni: contents      << 10 -->
-    <button visible="yes">   2048</button> <!-- Sync TOC          << 11 -->
-    <button visible="yes">   4096</button> <!-- Options           << 12 -->
-    <button visible="yes">   8192</button> <!-- Print             << 13 -->
-    <button              >  16384</button> <!-- ni: index         << 14 -->
-    <button              >  32768</button> <!-- ni: search        << 15 -->
-    <button              >  65536</button> <!-- ni: history       << 16 -->
-    <button              > 131072</button> <!-- ni: favorites     << 17 -->
-    <button              > 262144</button> <!-- Jump 1            << 18 -->
-    <button              > 524288</button> <!-- Jump 2            << 19 -->
-    <button visible="yes">1048576</button> <!-- (Font) Zoom       << 20 -->
-    <!-- the following work only with binary toc, which unfortunately   -->
-    <!-- seems to eat the different icons ...                           -->
-    <button              >2097152</button> <!-- TOC next          << 21 -->
-    <button              >4194304</button> <!-- TOC prev          << 22 -->
-</buttons>
-
-<windowstyle>
-    <!-- all the stuff is additionally shifted << 16 (by the caller) -->
-    <style selected="yes">    1</style> <!-- maximize box     <<  0 -->
-    <style selected="yes">    2</style> <!-- minimize box     <<  1 -->
-    <style selected="yes">    4</style> <!-- thick frame      <<  2 -->
-    <style selected="yes">    8</style> <!-- system menu      <<  3 -->
-    <style               >   16</style> <!-- horiz. scroll    <<  4 -->
-    <style               >   32</style> <!-- vertic. scroll   <<  5 -->
-    <style selected="yes">   64</style> <!-- dialog frame     <<  6 -->
-    <style selected="yes">  128</style> <!-- border           <<  7 -->
-    <style selected="yes">  256</style> <!-- maximize         <<  8 -->
-    <style               >  512</style> <!-- clip child win.  <<  9 -->
-    <style               > 1024</style> <!-- clip sibl. win.  << 10 -->
-    <style               > 2048</style> <!-- disabled         << 11 -->
-    <style selected="yes"> 4096</style> <!-- visible          << 12 -->
-    <style selected="yes"> 8192</style> <!-- minimize         << 13 -->
-    <style               >16384</style> <!-- child window     << 14 -->
-    <style               >32768</style> <!-- pop-up           << 15 -->
-</windowstyle>
-</xsl:template>
-<!-- /htmlhelp.def -->
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/xsl/indexpage.xsl b/docs/manual/style/xsl/indexpage.xsl
deleted file mode 100644
index d62814bf..00000000
--- a/docs/manual/style/xsl/indexpage.xsl
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY lf SYSTEM "util/lf.xml">
-]>
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-<!--                                                                      -->
-<!-- three columns, select were the particular categories shall be        -->
-<!-- placed in. (order is irrelevant, they're placed in document order)   -->
-<!--                                                                      -->
-<xsl:variable name="indexpage-column1" select="'
-    release
-    manual
-'"/>
-
-<xsl:variable name="indexpage-column2" select="'
-    usersguide
-'"/>
-
-<xsl:variable name="indexpage-column3" select="'
-    howto
-    platform
-    other
-'"/>
-
-<!-- ==================================================================== -->
-<!-- <indexpage>                                                          -->
-<!-- Process an entire document into an HTML page                         -->
-<!-- ==================================================================== -->
-<xsl:template match="/indexpage">
-<html xml:lang="{$doclang}" lang="{$doclang}">
-    <xsl:call-template name="head"/>&lf;
-
-    <body id="index-page">&lf;
-        <xsl:call-template name="top"/>&lf;
-
-        <div id="page-content">
-            <h1>
-                <xsl:value-of select="title"/>
-            </h1>&lf;
-
-            <xsl:call-template name="langavail" />&lf;
-
-            <form>
-                <xsl:call-template name="search.spec" />
-            </form>&lf;
-
-            <table id="indextable">
-            <tr>
-                <td class="col1">
-                    <xsl:apply-templates
-                        select="category[contains($indexpage-column1, @id)]" />
-                </td>
-                <td>
-                    <xsl:apply-templates
-                        select="category[contains($indexpage-column2, @id)]" />
-                </td>
-                <td class="col3">
-                    <xsl:apply-templates
-                        select="category[contains($indexpage-column3, @id)]" />
-                </td>
-            </tr>
-            </table>
-        </div>&lf; <!-- /#page-content -->
-
-        <xsl:call-template name="bottom" />&lf;
-    </body>
-</html>
-</xsl:template>
-<!-- /indexpage -->
-
-
-<!-- ==================================================================== -->
-<!-- category/page                                                        -->
-<!-- ==================================================================== -->
-<xsl:template match="indexpage/category/page">
-<li>
-    <xsl:if test="@separate='yes'">
-        <xsl:attribute name="class">separate</xsl:attribute>
-    </xsl:if>
-
-    <xsl:choose>
-    <xsl:when test="@href">
-        <a href="{@href}">
-            <xsl:call-template name="helper.uri.fix">
-                <xsl:with-param name="uri" select="@href"/>
-            </xsl:call-template>
-
-            <xsl:value-of select="." />
-        </a>
-    </xsl:when>
-    <xsl:otherwise>
-        <xsl:value-of select="." />
-    </xsl:otherwise>
-    </xsl:choose>
-</li>&lf;
-</xsl:template>
-<!-- /category/page -->
-
-
-<!-- ==================================================================== -->
-<!-- Process a indexpage category                                         -->
-<!-- ==================================================================== -->
-<xsl:template match="indexpage/category">
-<div class="category">
-    <!-- Section heading -->
-    <h2>
-        <xsl:if test="@id">
-            <a id="{@id}" name="{@id}">
-                <xsl:apply-templates select="title" mode="print" />
-            </a>
-        </xsl:if>
-
-        <xsl:if test="not(@id)">
-            <xsl:apply-templates select="title" mode="print" />
-        </xsl:if>
-    </h2>&lf;
-
-    <!-- category body -->
-    <ul>
-        <xsl:apply-templates select="page" />
-    </ul>&lf;
-</div> <!-- /.section -->
-</xsl:template>
-<!-- /category -->
-
-
-<!-- ==================================================================== -->
-<!-- search specification                                                 -->
-<!-- hidden fields are taken from the advanced search page                -->
-<!-- ==================================================================== -->
-<xsl:template name="search.spec">
-<xsl:attribute name="method">get</xsl:attribute>
-<xsl:attribute name="action">http://www.google.com/search</xsl:attribute>
-<xsl:if test="$ext-target">
-    <xsl:attribute name="target">_blank</xsl:attribute>
-</xsl:if>
-
-<p>
-    <!-- search google: -->
-    <!-- with all of the words -->
-    <input type="text" value="" name="as_q" />
-    <xsl:text> </xsl:text>
-    <input type="submit" value="{$message[@id='search']}" />
-
-    <!-- the specified number of results -->
-    <input type="hidden" name="num" value="10" />
-
-    <!-- the current displayed language -->
-    <input type="hidden" name="hl" value="{$doclang}" />
-
-    <!-- the current document encoding for input (?) -->
-    <input type="hidden" name="ie" value="{$output-encoding}" />
-
-    <!-- (submit the original button and name) -->
-    <input type="hidden" name="btnG" value="Google Search" />
-
-    <!-- including the exact phrase "Version major.minor" -->
-    <input type="hidden" value="{normalize-space($message[@id='version'])}"
-           name="as_epq" />
-
-    <!-- with at least one of the words (none) -->
-    <input type="hidden" value="" name="as_oq" />
-
-    <!-- without the phrase "List-Post" (to exclude the mail archives) -->
-    <input type="hidden" value="&quot;List-Post&quot;" name="as_eq" />
-
-    <!-- return results written in (any) language -->
-    <input type="hidden" name="lr" value="" />
-
-    <!-- and any format -->
-    <input type="hidden" name="as_ft" value="i" />
-    <input type="hidden" name="as_filetype" value="" />
-
-    <!-- updated anytime -->
-    <input type="hidden" name="as_qdr" value="all" />
-
-    <!-- where the result appears anywhere in the document -->
-    <input type="hidden" name="as_occt" value="any" />
-
-    <!-- only from httpd.apache.org -->
-    <input type="hidden" name="as_dt" value="i" />
-    <input type="hidden" name="as_sitesearch" value="httpd.apache.org" />
-
-    <!-- turn off "safe" mode -->
-    <input type="hidden" name="safe" value="off" />
-</p>
-</xsl:template>
-<!-- /search.spec -->
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/xsl/language.xsl b/docs/manual/style/xsl/language.xsl
deleted file mode 100644
index 8ef0b4a0..00000000
--- a/docs/manual/style/xsl/language.xsl
+++ /dev/null
@@ -1,658 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY lf SYSTEM "util/lf.xml">
-    <!ENTITY xsl "http://www.w3.org/1999/XSL/Transform">
-]>
-
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="">
-
-<xsl:output 
-  method="xml"
-  encoding="utf-8"
-  indent="no"
-/>
-
-<xsl:param name="type" />
-<xsl:param name="langs" />
-
-<!-- ==================================================================== -->
-<!-- /                                                                    -->
-<!-- bootstrap                                                            -->
-<!-- ==================================================================== -->
-<xsl:template match="/">
-<xsl:choose>
-<xsl:when test="$type = 'list'">
-    <language-list>
-    &lf;
-    <xsl:call-template name="language-list">
-        <xsl:with-param name="langs" select="normalize-space($langs)" />
-    </xsl:call-template>
-    </language-list>
-    &lf;
-</xsl:when>
-<xsl:otherwise>
-    <xsl:apply-templates select="*" />
-</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- language-list                                                        -->
-<!-- generate language list                                               -->
-<!-- ==================================================================== -->
-<xsl:template name="language-list">
-<xsl:param name="langs" />
-
-<xsl:if test="string-length($langs)">
-    <lang>
-        <xsl:value-of select="substring-before(concat($langs, ' '),' ')" />
-    </lang>
-    &lf;
-
-    <xsl:call-template name="language-list">
-        <xsl:with-param name="langs" select="normalize-space(substring-after(
-                                             concat($langs, ' '), ' '))" />
-    </xsl:call-template>
-</xsl:if>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- <language-list>                                                      -->
-<!-- generate stuff from language list                                    -->
-<!-- ==================================================================== -->
-<xsl:template match="/language-list">
-<xsl:choose>
-<xsl:when test="$type = 'design'">
-    <items>
-    &lf;
-        <xsl:for-each select="lang">
-            <xsl:variable name="file" select="document(concat('../lang/', .,
-                                              '.xml'))/language" />
-            <item lang="{$file/@id}" charset="{$file/charset}" >
-                <xsl:value-of select="$file/target-ext" />
-            </item>
-            &lf;
-        </xsl:for-each>
-    </items>
-    &lf;
-</xsl:when>
-<xsl:when test="$type = 'targets'">
-    <xsl:apply-templates select="/language-list" mode="targets" />
-</xsl:when>
-<xsl:when test="$type = 'desc'">
-    <xsl:apply-templates select="/language-list" mode="desc" />
-</xsl:when>
-<xsl:when test="$type = 'modlists'">
-    <xsl:apply-templates select="/language-list" mode="modlists" />
-</xsl:when>
-</xsl:choose>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- <language-list>                                                      -->
-<!-- generate target list from language list                              -->
-<!-- ==================================================================== -->
-<xsl:template match="/language-list" mode="targets">
-
-<xsl:call-template name="copyright" />
-
-<xsl:call-template name="head">
-    <xsl:with-param name="text" select="'this file contains language specific
-        targets and will be included'" />
-</xsl:call-template>
-
-<xsl:call-template name="head">
-    <xsl:with-param name="text" select="'into build.xml. IT IS AUTOGENERATED.
-        DO NOT TOUCH!'" />
-</xsl:call-template>
-<xsl:call-template name="sep" />
-
-<project name="lang-targets">
-    &lf;&lf;
-
-    <!-- build *-all targets -->
-    <!-- =================== -->
-    <target name="all"
-            description="- builds all HTML files and nroff man pages">
-        <xsl:attribute name="depends">
-            <xsl:for-each select="lang[document(concat('../lang/', .,
-                                       '.xml'))/language/messages]">
-                <xsl:value-of select="." />
-                <xsl:if test="position() != last()">, </xsl:if>
-            </xsl:for-each>
-        </xsl:attribute>
-    </target>
-    &lf;
-
-    <target name="zip-all"
-            description="- builds all zip download packages">
-        <xsl:attribute name="depends">
-            <xsl:for-each select="lang[document(concat('../lang/', .,
-                                       '.xml'))/language/messages]">
-                <xsl:text>zip-</xsl:text>
-                <xsl:value-of select="." />
-                <xsl:if test="position() != last()">, </xsl:if>
-            </xsl:for-each>
-        </xsl:attribute>
-    </target>
-    &lf;
-
-    <target name="war-all"
-            description="- builds all war download packages">
-        <xsl:attribute name="depends">
-            <xsl:for-each select="lang[document(concat('../lang/', .,
-                                       '.xml'))/language/messages]">
-                <xsl:text>war-</xsl:text>
-                <xsl:value-of select="." />
-                <xsl:if test="position() != last()">, </xsl:if>
-            </xsl:for-each>
-        </xsl:attribute>
-    </target>
-    &lf;
-
-    <!-- single language targets -->
-    <!-- ======================= -->
-    <xsl:for-each select="lang">
-    <xsl:sort select="." />
-        <xsl:variable name="file" select="document(concat('../lang/', .,
-                                                   '.xml'))/language" />
-
-        <xsl:if test="$file/messages">
-            &lf;
-            <xsl:call-template name="head">
-                <xsl:with-param name="text" select="$file/name" />
-            </xsl:call-template>
-            <xsl:call-template name="sep" />
-
-            <property name="inputext.{.}" value="{$file/source-ext}" />&lf;
-            <property name="outputext.{.}" value="{$file/target-ext}" />&lf;&lf;
-
-            <target name="{.}" description="- builds {$file/name} HTML files">
-                &lf;
-                <xsl:text>    </xsl:text>
-                <html.generic lang="{.}" />&lf;
-
-                <xsl:if test=". = 'en'">
-                    <xsl:text>    </xsl:text><runtarget target="man-en" />&lf;
-                </xsl:if>
-            </target>
-            &lf;
-
-            <target name="-off-{.}" depends="metafiles"
-                  unless="-off.{.}.done">&lf;
-                <xsl:text>    </xsl:text>
-                <dependencies.offline lang="{.}" style="zip" dir="_off" />&lf;
-                <xsl:text>    </xsl:text>
-                <offline.generic lang="{.}" style="zip" dir="_off" />&lf;
-                <xsl:text>    </xsl:text>
-                <property name="-off.{.}.done" value="yes" />&lf;
-            </target>
-            &lf;
-
-            <target name="zip-{.}" depends="-off-{.}"
-                    description="- builds the {$file/name} zipped download package">&lf;
-                <xsl:text>    </xsl:text>
-                <zip.generic lang="{.}" />&lf;
-            </target>
-            &lf;
-
-            <target name="war-{.}" depends="-off-{.}"
-                    description="- builds the {$file/name} Konqueror Web Archive">&lf;
-                <xsl:text>    </xsl:text>
-                <war.generic lang="{.}" />&lf;
-            </target>
-            &lf;
-
-            <xsl:if test="$file/chm">
-                <target name="chm-{.}"
-                        description="- builds the {$file/name} CHM file">&lf;
-                    <xsl:text>    </xsl:text>
-                    <chm.generic lang="{.}" />&lf;
-                </target>
-                &lf;
-            </xsl:if>
-
-            <xsl:if test="$file/man">
-                <target name="man-{.}"
-                        description="- builds the {$file/name} nroff files">&lf;
-                    <xsl:text>    </xsl:text>
-                    <nroff.generic lang="{.}" />&lf;
-                </target>
-                &lf;
-            </xsl:if>
-
-            <xsl:if test=". = 'en'">
-                <target name="latex-en"
-                        description="- builds the English latex file">&lf;
-                    <xsl:text>    </xsl:text>
-                    <latex.generic lang="en" />&lf;
-                </target>
-                &lf;
-            </xsl:if>
-        </xsl:if>
-    </xsl:for-each>
-    &lf;
-
-    <!-- XML validation -->
-    <!-- ============== -->
-    <xsl:call-template name="head">
-        <xsl:with-param name="text" select="'XML validation.'" />
-    </xsl:call-template>
-    <xsl:call-template name="head">
-        <xsl:with-param name="text" select="'If you get an error during
-            transformation, this task may be useful'" />
-    </xsl:call-template>
-    <xsl:call-template name="head">
-        <xsl:with-param name="text" select="'because it mostly gives you a
-            hint, where you forgot the &lt;/p&gt; ;-)'" />
-    </xsl:call-template>
-    <xsl:call-template name="sep" />
-
-    <target name="validate-xml" description="- validates all XML source files">
-        &lf;
-        <xsl:text>    </xsl:text>
-        <xmlvalidate lenient="false" failonerror="false" warn="true">
-            &lf;
-            <xsl:text>        </xsl:text>
-            <xmlcatalog refid="w3c-catalog" />&lf;
-            <xsl:text>        </xsl:text>
-            <fileset dir="../">&lf;
-                <xsl:for-each select="lang">
-                <xsl:sort select="." />
-
-                    <xsl:variable name="file" select="document(concat(
-                                                      '../lang/', ., '.xml'))
-                                                      /language" />
-                    <xsl:if test="$file/messages">
-                        <xsl:text>            </xsl:text>
-                        <include name="**/*{$file/source-ext}" />&lf;
-                    </xsl:if>
-                </xsl:for-each>
-                &lf;
-                <xsl:text>            </xsl:text>
-                <patternset refid="excludes" />&lf;
-                <xsl:text>            </xsl:text>
-                <patternset refid="scratch" />&lf;
-            <xsl:text>        </xsl:text>
-            </fileset>
-            &lf;
-        <xsl:text>    </xsl:text>
-        </xmlvalidate>
-        &lf;
-    </target>
-    &lf;&lf;
-</project>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- <language-list>                                                      -->
-<!-- generate list of modulelists                                         -->
-<!-- ==================================================================== -->
-<xsl:template match="/language-list" mode="modlists">
-<items>
-    &lf;
-    <xsl:for-each select="lang">
-    <xsl:sort select="." />
-
-        <xsl:variable name="file" select="document(concat(
-                                          '../lang/', ., '.xml'))
-                                          /language" />
-        <item lang="{.}">
-            <xsl:text>../../../mod/allmodules</xsl:text>
-            <xsl:value-of select="$file/source-ext" />
-        </item>
-        &lf;
-    </xsl:for-each>
-</items>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- <language-list>                                                      -->
-<!-- generate project description                                         -->
-<!-- ==================================================================== -->
-<xsl:template match="/language-list" mode="desc">
-
-<xsl:call-template name="copyright" />
-
-<description><xsl:text>
-This build file contains all operations that are necessary for building
-the Apache httpd documentation. It is called by invoking build.bat (Win32)
-or build.sh (/bin/sh systems) with a target argument (full list below).
-For example, if you want to build the Japanese HTML files, type:
-
-  ./build.sh ja
-
-Some targets have additional requirements:
-
-* 'metafiles' and 'modulelists' need perl in PATH. (It's checked automatically
-  and skipped if perl is not available)
-
-* 'chm-foo' targets need:
-  - the HTML Help compiler in PATH (or modify this build file). The
-    compiler (hhc.exe) is part of the HTML Help Workshop which is freely
-    available and can be downloaded from
-    http://msdn.microsoft.com/library/en-us/htmlhelp/html/hwMicrosoftHTMLHelpDownloads.asp
-  - The appropriate locale (e.g. Japanese) before invoking hhc.exe. Otherwise
-    the compiler is not able to build the fulltext search index correctly and
-    the TOC may be garbled, too. In particular:
-</xsl:text>
-
-    <xsl:for-each select="lang">
-    <xsl:sort select="." />
-
-        <xsl:variable name="file" select="document(concat('../lang/', .,
-                                          '.xml'))/language" />
-
-        <xsl:if test="$file/messages and $file/chm">
-            <xsl:text>    + chm-</xsl:text>
-            <xsl:value-of select="." />
-            <xsl:text>: </xsl:text>
-            <xsl:value-of select="normalize-space($file/chm/settings)" />
-            &lf;
-        </xsl:if>
-    </xsl:for-each>
-    &lf;
-</description>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- <language>                                                           -->
-<!-- generate language specific xslt                                      -->
-<!-- ==================================================================== -->
-<xsl:template match="/language">
-
-<xsl:call-template name="copyright" />
-
-<xsl:element name="xsl:stylesheet" namespace="&xsl;">
-    <xsl:attribute name="version">1.0</xsl:attribute>
-    &lf;
-    &lf;
-
-    <xsl:element name="xsl:output">
-        <xsl:attribute name="method">
-            <xsl:choose>
-            <xsl:when test="$type = 'manual' or
-                            $type = 'chm' or
-                            $type = 'zip'">
-                <xsl:text>xml</xsl:text>
-            </xsl:when>
-            <xsl:when test="$type = 'hhc' or
-                            $type = 'hhp' or
-                            $type = 'man'">
-                <xsl:text>text</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:message terminate="yes">
-                    <xsl:text>Unknown style type '</xsl:text>
-                    <xsl:value-of select="$type" />
-                    <xsl:text>'!</xsl:text>
-                </xsl:message>
-            </xsl:otherwise>
-            </xsl:choose>
-        </xsl:attribute>
-        <xsl:attribute name="encoding">
-            <xsl:choose>
-            <xsl:when test="$type = 'chm' or
-                            $type = 'hhc' or
-                            $type = 'hhp'">
-                <xsl:value-of select="chm/charset" />
-            </xsl:when>
-            <xsl:when test="$type = 'man'">
-                <xsl:value-of select="man/charset" />
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="charset" />
-            </xsl:otherwise>
-            </xsl:choose>
-        </xsl:attribute>
-        <xsl:attribute name="indent">no</xsl:attribute>
-        <xsl:if test="$type = 'manual' or
-                      $type = 'chm' or
-                      $type = 'zip'">
-            <xsl:attribute name="doctype-public">
-                <xsl:text>-//W3C//DTD XHTML 1.0 Strict//EN</xsl:text>
-            </xsl:attribute>
-        </xsl:if>
-        <xsl:if test="$type = 'manual'">
-            <xsl:attribute name="doctype-system">
-                <xsl:text>http://www.w3.org/TR/xhtml1/DTD/</xsl:text>
-                <xsl:text>xhtml1-strict.dtd</xsl:text>
-            </xsl:attribute>
-        </xsl:if>
-        <xsl:if test="$type = 'chm' or
-                      $type = 'zip'">
-            <xsl:attribute name="omit-xml-declaration">yes</xsl:attribute>
-        </xsl:if>
-    </xsl:element>
-    &lf;&lf;
-
-    <xsl:comment>
-        <xsl:text> Read the localized messages from the specified </xsl:text>
-        <xsl:text>language file </xsl:text>
-    </xsl:comment>
-    &lf;
-
-    <xsl:element name="xsl:variable">
-        <xsl:attribute name="name">message</xsl:attribute>
-        <xsl:attribute name="select">
-            <xsl:text>document('</xsl:text>
-            <xsl:if test="$type != 'manual'">../</xsl:if>
-            <xsl:text>lang/</xsl:text>
-            <xsl:value-of select="@id" />
-            <xsl:text>.xml')/language/messages/message</xsl:text>
-        </xsl:attribute>
-    </xsl:element>
-    &lf;
-
-    <xsl:if test="$type != 'man'">
-        <xsl:element name="xsl:variable">
-            <xsl:attribute name="name">doclang</xsl:attribute>
-            <xsl:value-of select="@id" />
-        </xsl:element>
-        &lf;
-        <xsl:element name="xsl:variable">
-            <xsl:attribute name="name">allmodules</xsl:attribute>
-            <xsl:attribute name="select">
-                <xsl:text>document('</xsl:text>
-                <xsl:if test="$type != 'manual'">../</xsl:if>
-                <xsl:text>xsl/util/allmodules.xml')</xsl:text>
-                <xsl:text>/items/item[@lang=$doclang]</xsl:text>
-            </xsl:attribute>
-        </xsl:element>
-        &lf;
-    </xsl:if>
-    &lf;
-
-    <xsl:if test="$type != 'man'">
-        <xsl:comment>
-            <xsl:text> some meta information have to be passed to </xsl:text>
-            <xsl:text>the transformation </xsl:text>
-        </xsl:comment>
-        &lf;
-    </xsl:if>
-
-    <xsl:if test="$type = 'manual' or
-                  $type = 'chm' or
-                  $type = 'zip' or
-                  $type = 'hhc'">
-        <xsl:element name="xsl:variable">
-            <xsl:attribute name="name">output-encoding</xsl:attribute>
-            <xsl:choose>
-            <xsl:when test="$type = 'chm' or
-                             $type = 'hhc'">
-                <xsl:value-of select="normalize-space(chm/charset)" />
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="normalize-space(charset)" />
-            </xsl:otherwise>
-            </xsl:choose>
-        </xsl:element>
-        &lf;
-    </xsl:if>
-
-    <xsl:if test="$type = 'manual' or
-                  $type = 'chm' or
-                  $type = 'zip'">
-        <xsl:element name="xsl:variable">
-            <xsl:attribute name="name">is-chm</xsl:attribute>
-            <xsl:attribute name="select">
-                <xsl:choose>
-                <xsl:when test="$type = 'chm'">
-                    <xsl:text>true()</xsl:text>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:text>false()</xsl:text>
-                </xsl:otherwise>
-                </xsl:choose>
-            </xsl:attribute>
-        </xsl:element>
-        &lf;
-
-        <xsl:element name="xsl:variable">
-            <xsl:attribute name="name">is-zip</xsl:attribute>
-            <xsl:attribute name="select">
-                <xsl:choose>
-                <xsl:when test="$type = 'zip'">
-                    <xsl:text>true()</xsl:text>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:text>false()</xsl:text>
-                </xsl:otherwise>
-                </xsl:choose>
-            </xsl:attribute>
-        </xsl:element>
-        &lf;&lf;
-    </xsl:if>
-
-    <xsl:if test="$type = 'hhc'">
-        <xsl:element name="xsl:variable">
-            <xsl:attribute name="name">toc-font</xsl:attribute>
-            <xsl:value-of select="normalize-space(chm/toc-font)" />
-        </xsl:element>
-        &lf;
-
-        <xsl:element name="xsl:variable">
-            <xsl:attribute name="name">xml-ext</xsl:attribute>
-            <xsl:value-of select="normalize-space(source-ext)" />
-        </xsl:element>
-        &lf;&lf;
-    </xsl:if>
-
-    <xsl:if test="$type = 'hhp'">
-        <xsl:element name="xsl:variable">
-            <xsl:attribute name="name">hhp-lang</xsl:attribute>
-            <xsl:value-of select="normalize-space(chm/lang)" />
-        </xsl:element>
-        &lf;&lf;
-    </xsl:if>
-
-    <xsl:comment> Now get the real guts of the stylesheet </xsl:comment>
-    &lf;
-
-    <xsl:element name="xsl:include">
-        <xsl:attribute name="href">
-            <xsl:choose>
-            <xsl:when test="$type = 'chm' or
-                            $type = 'zip'">
-                <xsl:text>../xsl/common.xsl</xsl:text>
-            </xsl:when>
-            <xsl:when test="$type = 'hhc'">
-                <xsl:text>../xsl/hhc.xsl</xsl:text>
-            </xsl:when>
-            <xsl:when test="$type = 'hhp'">
-                <xsl:text>../xsl/hhp.xsl</xsl:text>
-            </xsl:when>
-            <xsl:when test="$type = 'man'">
-                <xsl:text>../xsl/nroff.xsl</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:text>xsl/common.xsl</xsl:text>
-            </xsl:otherwise>
-            </xsl:choose>
-        </xsl:attribute>
-    </xsl:element>
-    &lf;&lf;
-</xsl:element>
-
-</xsl:template>
-<!-- /language -->
-
-
-<xsl:template name="copyright">
-&lf;
-<xsl:comment><xsl:text>
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-</xsl:text></xsl:comment>
-&lf;&lf;
-</xsl:template>
-
-
-<xsl:template name="sepstring">
-<xsl:text>============================================</xsl:text>
-<xsl:text>========================</xsl:text>
-</xsl:template>
-
-
-<xsl:template name="sep">
-<xsl:comment>
-    <xsl:text> </xsl:text>
-    <xsl:call-template name="sepstring" />
-    <xsl:text> </xsl:text>
-</xsl:comment>
-&lf;
-</xsl:template>
-
-<xsl:template name="head">
-<xsl:param name="text" />
-
-<xsl:variable name="s"><xsl:call-template name="sepstring" /></xsl:variable>
-<xsl:variable name="empty" select="translate($s, '=', ' ')" />
-
-<xsl:comment>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="substring(concat(normalize-space($text), $empty), 1,
-                                    string-length($empty))" />
-    <xsl:text> </xsl:text>
-</xsl:comment>
-&lf;
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/xsl/maf.xsl b/docs/manual/style/xsl/maf.xsl
deleted file mode 100644
index f7718bd6..00000000
--- a/docs/manual/style/xsl/maf.xsl
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY lf SYSTEM "util/lf.xml">
-]>
-
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<xsl:output
-  method="xml"
-  encoding="utf-8"
-  indent="no"
-/>
-
-<xsl:param name="date" select="false()" />
-<xsl:param name="lang" />
-
-<!-- ==================================================================== -->
-<!-- <indexpage>                                                          -->
-<!-- build rdf description                                                -->
-<!-- ==================================================================== -->
-<xsl:template match="/indexpage">
-<RDF:RDF xmlns:MAF="http://maf.mozdev.org/metadata/rdf#"
-             xmlns:NC="http://home.netscape.com/NC-rdf#"
-             xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">&lf;
-  <RDF:Description RDF:about="urn:root">&lf;
-    <MAF:originalurl RDF:resource="" />&lf;
-    <MAF:title RDF:resource="{title}" />&lf;
-    <xsl:if test="$date">
-        <MAF:archivetime RDF:resource="{$date}" />&lf;
-    </xsl:if>
-    <MAF:indexfilename RDF:resource="index.html" />&lf;
-  </RDF:Description>&lf;
-</RDF:RDF>&lf;
-</xsl:template>
-<!-- /indexpage -->
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/xsl/manualpage.xsl b/docs/manual/style/xsl/manualpage.xsl
deleted file mode 100644
index 30cc9d10..00000000
--- a/docs/manual/style/xsl/manualpage.xsl
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY lf SYSTEM "util/lf.xml">
-]>
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-<!-- ==================================================================== -->
-<!-- <manualpage>                                                         -->
-<!-- Process an entire document into an HTML page                         -->
-<!-- ==================================================================== -->
-<xsl:template match="manualpage">
-<html xml:lang="{$doclang}" lang="{$doclang}">
-    <xsl:call-template name="head" />&lf;
-
-    <body id="manual-page">
-        <!-- unsqueeze if there's no sidebar -->
-        <xsl:if test="not(count(section) > 1 or seealso)">
-          <xsl:attribute name="class">no-sidebar</xsl:attribute>
-        </xsl:if>
-
-        <xsl:call-template name="top"/>          
-
-        <div id="page-content">
-            <div id="preamble">        
-                <h1>
-                    <xsl:value-of select="title"/>
-                </h1>&lf;
-
-                <xsl:call-template name="langavail" />&lf;
-
-                <xsl:apply-templates select="summary" />
-            </div>&lf; <!-- /#preamble -->
-          
-            <xsl:if test="(not($is-chm) and count(section) > 1) or seealso">
-                <div id="quickview">
-                    <xsl:if test="not($is-chm) and count(section) > 1">
-                        <ul id="toc">
-                        <xsl:apply-templates select="section" mode="index" />
-                        </ul>
-                    </xsl:if>
-
-                    <xsl:if test="seealso">
-                        <h3>
-                            <xsl:value-of
-                                select="$message[@id='seealso']" />
-                        </h3>
-                        <ul class="seealso">
-                        <xsl:for-each select="seealso">
-                            <li>
-                                <xsl:apply-templates />
-                            </li>
-                        </xsl:for-each>
-                        </ul>
-                    </xsl:if>
-                </div>&lf; <!-- /#quickview -->
-            </xsl:if>
-
-            <xsl:apply-templates select="section" />
-        </div>&lf; <!-- /#page-content -->
-
-        <xsl:call-template name="bottom" />&lf;
-    </body>
-</html>
-</xsl:template>
-<!-- /manualpage -->
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/xsl/moduleindex.xsl b/docs/manual/style/xsl/moduleindex.xsl
deleted file mode 100644
index e3651a45..00000000
--- a/docs/manual/style/xsl/moduleindex.xsl
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY lf SYSTEM "util/lf.xml">
-]>
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-<!-- ==================================================================== -->
-<!-- <moduleindex>                                                        -->
-<!-- Builds the moduleindex page                                          -->
-<!-- ==================================================================== -->
-<xsl:template match="moduleindex">
-<html xml:lang="{$doclang}" lang="{$doclang}">
-    <xsl:call-template name="head"/>&lf;
-
-    <body id="module-index">
-        <xsl:call-template name="top"/>  
-
-        <div id="page-content">
-            <div id="preamble">
-                <h1>
-                    <xsl:value-of select="title" />
-                </h1>&lf;
-
-                <xsl:call-template name="langavail" />&lf;
-
-                <xsl:apply-templates select="summary" />
-            </div>&lf; <!-- /#preamble -->
-
-            <xsl:if test="not($is-chm) or seealso">
-                <div id="quickview">
-                    <xsl:if test="not($is-chm)">
-                        <ul id="toc">&lf;
-                        <li>
-                            <img src="{$path}/images/down.gif" alt="" />
-                            <xsl:text> </xsl:text>
-                            <a href="#core">
-                                <xsl:value-of select="$message
-                                                      [@id='corefeatures']" />
-                            </a>
-                        </li>
-                        <li>
-                            <img src="{$path}/images/down.gif" alt="" />
-                            <xsl:text> </xsl:text>
-                            <a href="#other">
-                                <xsl:value-of select="$message
-                                                      [@id='othermodules']" />
-                            </a>
-                        </li>
-                        </ul>
-                    </xsl:if> <!-- !$is-chm -->
-
-                    <xsl:if test="seealso">
-                        <h3>
-                            <xsl:value-of select="$message
-                                                  [@id='seealso']" />
-                        </h3>&lf;            
-
-                        <ul class="seealso">&lf;
-                        <xsl:for-each select="seealso">
-                            <li>
-                                <xsl:apply-templates />
-                            </li>&lf;
-                        </xsl:for-each>
-                        </ul>
-                    </xsl:if> <!-- /seealso -->
-                </div> <!-- /#quickview -->
-            </xsl:if>&lf; <!-- have sidebar -->
-
-            <xsl:call-template name="toplink" />&lf;
-
-            <div class="section">
-                <h2>
-                    <a name="core" id="core">
-                        <xsl:value-of select="$message
-                                              [@id='corefeatures']" />
-                    </a>
-                </h2>&lf;
-
-                <!-- core -->
-                <dl>&lf;
-                <dt>
-                    <a href="{document(document($allmodules)/modulefilelist
-                              /modulefile[starts-with(., 'core.xml')])
-                              /modulesynopsis/name}.html">
-                        <xsl:value-of
-                            select="document(document($allmodules)/modulefilelist
-                                    /modulefile[starts-with(., 'core.xml')])
-                                    /modulesynopsis/name" />
-                    </a>
-                </dt>
-                <dd>
-                    <xsl:apply-templates
-                        select="document(document($allmodules)/modulefilelist
-                                         /modulefile[starts-with(., 'core.xml')])
-                                /modulesynopsis/description" />
-                </dd>&lf;
-
-                <!-- mpm_common -->
-                <dt>
-                    <a href="{document(document($allmodules)/modulefilelist
-                                       /modulefile[starts-with(., 'mpm_common.xml')])
-                              /modulesynopsis/name}.html">
-                        <xsl:value-of
-                            select="document(document($allmodules)/modulefilelist
-                                             /modulefile[starts-with(., 'mpm_common.xml')])
-                                    /modulesynopsis/name" />
-                    </a>
-                </dt>
-                <dd class="separate">
-                    <xsl:apply-templates
-                        select="document(document($allmodules)/modulefilelist
-                                         /modulefile[starts-with(., 'mpm_common.xml')])
-                                /modulesynopsis/description" />
-                </dd>&lf;
-
-                <!-- and now the remaining MPMs -->
-                <xsl:variable name="mpmmodules"
-                    select="document(document($allmodules)/modulefilelist/modulefile)
-                            /modulesynopsis
-                                [status='MPM' and name != 'mpm_common']" />
-                <xsl:variable name="translist">
-                    <xsl:call-template name="module-translist">
-                        <xsl:with-param name="modules" select="$mpmmodules" />
-                    </xsl:call-template>
-                </xsl:variable>
-
-                <xsl:for-each select="$mpmmodules">
-                <xsl:sort select="substring-before(substring-after($translist,
-                    concat('- ', translate(normalize-space(name), $lowercase,
-                    $uppercase), ' ')), ' -')" />
-
-                    <dt>
-                        <a href="{name}.html">
-                            <xsl:value-of select="name" />
-                        </a>
-                    </dt>
-                    <dd>
-                        <xsl:apply-templates select="description" />
-                    </dd>&lf;
-                </xsl:for-each>
-                </dl>
-            </div>&lf; <!-- /core section -->
-
-            <xsl:call-template name="toplink" />&lf;
-
-            <div class="section">
-                <h2>
-                    <a name="other" id="other">
-                        <xsl:value-of select="$message
-                                              [@id='othermodules']" />
-                    </a>
-                </h2>&lf;
-            
-                <xsl:variable name="modules"
-                    select="document(document($allmodules)/modulefilelist/modulefile)
-                            /modulesynopsis[status!='MPM' and
-                                            status!='Core']" />
-
-                <xsl:variable name="start-letters">
-                    <xsl:call-template name="module-startletters">
-                        <xsl:with-param name="modules" select="$modules" />
-                    </xsl:call-template>
-                </xsl:variable>
-
-                <p class="letters">
-                    <xsl:call-template name="letter-bar">
-                        <xsl:with-param name="letters" select="$start-letters"/>
-                        <xsl:with-param name="first" select="true()"/>
-                    </xsl:call-template>
-                </p>&lf;
-
-                <dl>
-                <xsl:call-template name="mindex-of-letter">
-                    <xsl:with-param name="letters-todo"
-                        select="$start-letters" />
-                    <xsl:with-param name="modules" select="$modules" />
-                </xsl:call-template>
-                </dl>
-            </div> <!-- /modules section -->
-        </div>&lf; <!-- /#page-content -->
-
-        <xsl:call-template name="bottom" />&lf;
-    </body>
-</html>
-</xsl:template> 
-<!-- /moduleindex -->
-
-
-<!-- ==================================================================== -->
-<!-- the working horse. builds list items of all modules starting with    -->
-<!-- one letter when done, it calls itself to catch the next letter       -->
-<!-- ==================================================================== -->
-<xsl:template name="mindex-of-letter">
-<xsl:param name="letters-todo"/>
-<xsl:param name="modules"/>
-
-<xsl:variable name="letter" select="substring($letters-todo, 1, 1)" />
-<xsl:variable name="translist">
-    <xsl:call-template name="module-translist">
-        <xsl:with-param name="modules" select="$modules" />
-    </xsl:call-template>
-</xsl:variable>
-
-<xsl:for-each
-    select="$modules[$letter=substring(substring-before(substring-after(
-        $translist, concat('- ', translate(normalize-space(name), $lowercase,
-        $uppercase), ' ')), ' -'), 1, 1)]">
-<xsl:sort
-    select="substring-before(substring-after($translist, concat('- ',
-        translate(normalize-space(name),$lowercase,$uppercase), ' ')), ' -')" />
-
-    <dt>
-        <a href="{name}.html">
-            <xsl:if test="position() = 1">
-                <xsl:attribute name="id">
-                    <xsl:value-of select="$letter" />
-                </xsl:attribute>
-                <xsl:attribute name="name">
-                    <xsl:value-of select="$letter" />
-                </xsl:attribute>
-            </xsl:if>
-
-            <xsl:value-of select="name" />
-        </a>
-    </dt>
-    <dd>
-        <xsl:apply-templates select="description" />
-    </dd>&lf;
-</xsl:for-each> <!-- /directives -->
-
-<!-- call next letter, if there is -->
-<xsl:if test="string-length($letters-todo) &gt; 1">
-    <xsl:call-template name="mindex-of-letter">
-        <xsl:with-param name="letters-todo"
-            select="substring($letters-todo, 2)" />
-        <xsl:with-param name="modules" select="$modules" />
-    </xsl:call-template>
-</xsl:if>
-</xsl:template>
-<!-- /mindex-of-letter -->
-
-
-<!-- ==================================================================== -->
-<!-- collect start letters of modules                                     -->
-<!-- ==================================================================== -->
-<xsl:template name="module-startletters">
-<xsl:param name="modules" />
-
-<xsl:variable name="translist">
-    <xsl:call-template name="module-translist">
-        <xsl:with-param name="modules" select="$modules" />
-    </xsl:call-template>
-</xsl:variable>
-
-<xsl:call-template name="_squeeze-letters">
-    <xsl:with-param name="lastletter" select="''" />
-    <xsl:with-param name="letters">
-        <xsl:for-each select="$modules">
-        <xsl:sort
-            select="substring-before(substring-after($translist, concat('- ',
-                translate(normalize-space(name), $lowercase, $uppercase), ' ')),
-                ' -')" />
-            <xsl:value-of
-                select="substring(substring-before(substring-after($translist,
-                    concat('- ', translate(normalize-space(name), $lowercase,
-                    $uppercase), ' ')), ' -'), 1, 1)" />
-        </xsl:for-each>
-    </xsl:with-param>
-</xsl:call-template>
-</xsl:template>
-<!-- /module-startletters -->
-
-
-<!-- ==================================================================== -->
-<!-- define module name translations for sorting                          -->
-<!--                                                                      -->
-<!-- it's a kind of a hack...                                             -->
-<!-- we build a string that contains the following data:                  -->
-<!-- "- modulename sortname - modulename sortname - ..."                  -->
-<!-- (with all data in uppercase)                                         -->
-<!--                                                                      -->
-<!-- So, the translation from modulename to sortname can be done with the -->
-<!-- expression below:                                                    -->
-<!--
-       substring-before(
-           substring-after($translist, 
-                           concat('- ', translate(modulename,
-                                                  $lowercase, $uppercase),
-                                  ' ')
-                           ),
-           ' -')
-                                                                          -->
-<!-- ==================================================================== -->
-<xsl:template name="module-translist">
-<xsl:param name="modules" />
-
-<xsl:text>-</xsl:text>
-<xsl:for-each select="$modules">
-    <xsl:variable name="sname" select="translate(normalize-space(name),
-                                       $lowercase, $uppercase)" />
-
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$sname" />
-    <xsl:text> </xsl:text>
-    <xsl:call-template name="module-translatename">
-        <xsl:with-param name="name" select="$sname" />
-    </xsl:call-template>
-    <xsl:text> -</xsl:text>
-</xsl:for-each>
-</xsl:template>
-<!-- /module-translist -->
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/xsl/nroff.xsl b/docs/manual/style/xsl/nroff.xsl
deleted file mode 100644
index 074d7fca..00000000
--- a/docs/manual/style/xsl/nroff.xsl
+++ /dev/null
@@ -1,448 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
- * This software is based on initial work of Joe Orton <jorton redhat.com>
- * (contributed to the ASF) which is based on the db2man stylesheets developed
- * by Martijn van Beers. db2man is now part of docbook-xsl, which is
- * licensed under the following terms:
- *
- * Copyright
- * =========
- *
- * Copyright (C) 1999, 2000, 2001, 2002 Norman Walsh
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the ``Software''), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * Except as contained in this notice, the names of individuals
- * credited with contribution to this software shall not be used in
- * advertising or otherwise to promote the sale, use or other
- * dealings in this Software without prior written authorization
- * from the individuals in question.
- *
- * Any stylesheet derived from this Software that is publically
- * distributed will be identified with a different name and the
- * version strings in any derived Software will be changed so that
- * no possibility of confusion between the derived package and this
- * Software will exist.
- *
- * Warranty
- * ========
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT.  IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER
- * CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE. 
- */ -->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY lf SYSTEM "../xsl/util/lf.xml">
-]>
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<!--                                                                      -->
-<!-- params injected from elsewhere                                       -->
-<!--                                                                      -->
-<xsl:param name="section" select="'1'" />
-<xsl:param name="date" />
-
-<!-- Constants used for case translation -->
-<xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz'" />
-<xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'" />
-
-<!-- ==================================================================== -->
-<!-- <manualpage>                                                         -->
-<!-- Process an entire document into an nroff formatted man page          -->
-<!-- ==================================================================== -->
-<xsl:template match="manualpage">
-<!-- start at the beginning ;-) -->
-<xsl:text>.\" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</xsl:text>&lf;
-<xsl:text>.\" DO NOT EDIT! Generated from XML source.</xsl:text>&lf;
-<xsl:text>.\" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</xsl:text>&lf;
-<xsl:text>.de Sh \" Subsection</xsl:text>&lf;
-<xsl:text>.br</xsl:text>&lf;
-<xsl:text>.if t .Sp</xsl:text>&lf;
-<xsl:text>.ne 5</xsl:text>&lf;
-<xsl:text>.PP</xsl:text>&lf;
-<xsl:text>\fB\\$1\fR</xsl:text>&lf;
-<xsl:text>.PP</xsl:text>&lf;
-<xsl:text>..</xsl:text>&lf;
-<xsl:text>.de Sp \" Vertical space (when we can't use .PP)</xsl:text>&lf;
-<xsl:text>.if t .sp .5v</xsl:text>&lf;
-<xsl:text>.if n .sp</xsl:text>&lf;
-<xsl:text>..</xsl:text>&lf;
-<xsl:text>.de Ip \" List item</xsl:text>&lf;
-<xsl:text>.br</xsl:text>&lf;
-<xsl:text>.ie \\n(.$>=3 .ne \\$3</xsl:text>&lf;
-<xsl:text>.el .ne 3</xsl:text>&lf;
-<xsl:text>.IP "\\$1" \\$2</xsl:text>&lf;
-<xsl:text>..</xsl:text>&lf;
-
-<!-- reftitle -->
-<xsl:text>.TH "</xsl:text>
-<!-- standard man page width is 64 chars; 6 chars needed for the two
-    (x) volume numbers, and 2 spaces, leaves 56 -->
-<xsl:value-of select="substring(translate(substring-before(
-    normalize-space(title), ' - '), $lowercase, $uppercase), 1, (56 -
-    string-length(substring-before(normalize-space(title), ' - '))) div 2)" />
-<xsl:text>" </xsl:text>
-
-<!-- section -->
-<xsl:value-of select="$section" />
-<xsl:text> "</xsl:text>
-
-<!-- date; perhaps injected via ant later. -->
-<xsl:value-of select="$date" />
-<xsl:text>" "</xsl:text>
-
-<!-- productname -->
-<xsl:value-of select="'Apache HTTP Server'" />
-<xsl:text>" "</xsl:text>
-
-<!-- title -->
-<xsl:value-of select="substring-before(normalize-space(title), ' - ')" />
-<xsl:text>"</xsl:text>&lf;
-
-<!-- reorder the paragraphs a bit -->
-<xsl:apply-templates select="title" />&lf;
-<xsl:apply-templates select="section[@id='synopsis']" />&lf;
-<xsl:apply-templates select="summary" />&lf;
-<xsl:apply-templates select="section[@id!='synopsis']" />&lf;
-</xsl:template>
-<!-- /manualpage -->
-
-
-<!-- ==================================================================== -->
-<!-- <manualpage><title>                                                  -->
-<!-- Process heading                                                      -->
-<!-- ==================================================================== -->
-<xsl:template match="manualpage/title">
-&lf;
-<xsl:text>.SH NAME</xsl:text>&lf;
-<xsl:variable name="text">
-    <xsl:call-template name="filter.escape">
-        <xsl:with-param name="text" select="normalize-space(.)" />
-    </xsl:call-template>
-</xsl:variable>
-<xsl:value-of select="substring-before($text, ' - ')" />
-<xsl:text> \- </xsl:text>
-<xsl:value-of select="substring-after($text, ' - ')" />
-</xsl:template>
-<!-- /manualpage/title -->
-
-
-<!-- ==================================================================== -->
-<!-- <p>                                                                  -->
-<!-- Process paragraph                                                    -->
-<!-- ==================================================================== -->
-<xsl:template match="p">
-&lf;
-<xsl:text>.PP</xsl:text>&lf;
-
-<xsl:for-each select="node()">
-    <xsl:choose>
-    <xsl:when test="self::text()">
-	    <xsl:if test="starts-with(translate(., '&#10;', ' '), ' ') and
-		              preceding-sibling::node()[name(.) != '']">
-	        <xsl:text> </xsl:text>
-	    </xsl:if>
-        <xsl:variable name="content">
-	        <xsl:apply-templates select="." />
-	    </xsl:variable>
-	    <xsl:value-of select="normalize-space($content)"/>
-	    <xsl:if test="translate(substring(., string-length(.), 1), '&#10;',
-                      ' ') = ' ' and following-sibling::node()[name(.) != '']">
-	        <xsl:text> </xsl:text>
-	    </xsl:if>
-    </xsl:when>
-    <xsl:otherwise>
-        <xsl:variable name="content">
-            <xsl:apply-templates select="." />
-        </xsl:variable>
-        <xsl:value-of select="normalize-space($content)"/>
-    </xsl:otherwise>
-    </xsl:choose>
-</xsl:for-each>&lf;
-</xsl:template>
-<!-- /p -->
-
-
-<!-- ==================================================================== -->
-<!-- <section>                                                            -->
-<!-- process main section                                                 -->
-<!-- ==================================================================== -->
-<xsl:template match="section">
-&lf;
-<xsl:text>.SH "</xsl:text>
-    <xsl:call-template name="filter.escape">
-        <xsl:with-param name="text"
-            select="normalize-space(translate(title, $lowercase, $uppercase))"/>
-    </xsl:call-template>
-<xsl:text>"</xsl:text>&lf;
-<xsl:apply-templates />
-</xsl:template>
-<xsl:template match="section/title" />
-<!-- /section -->
-
-
-<!-- ==================================================================== -->
-<!-- <section><section>                                                   -->
-<!-- process subsection                                                   -->
-<!-- ==================================================================== -->
-<xsl:template match="section/section">
-&lf;
-<xsl:text>.SS "</xsl:text>
-    <xsl:call-template name="filter.escape">
-        <xsl:with-param name="text" select="normalize-space(title)"/>
-    </xsl:call-template>
-<xsl:text>"</xsl:text>&lf;
-<xsl:apply-templates />
-</xsl:template>
-<!-- /section/section -->
-
-
-<!-- ==================================================================== -->
-<!-- <summary>                                                            -->
-<!-- process summary section                                              -->
-<!-- ==================================================================== -->
-<xsl:template match="summary">
-&lf;
-<xsl:text>.SH "</xsl:text>
-    <xsl:call-template name="filter.escape">
-        <xsl:with-param name="text" select="normalize-space(translate($message
-                          [@id='summary'], $lowercase, $uppercase))"/>
-    </xsl:call-template>
-<xsl:text>"</xsl:text>&lf;
-<xsl:apply-templates />
-</xsl:template>
-<!-- /summary -->
-
-
-<!-- ==================================================================== -->
-<!-- <var>, <em>                                                          -->
-<!-- show it somewhat special (italic)                                    -->
-<!-- ==================================================================== -->
-<xsl:template match="var|em">
-<xsl:text>\fI</xsl:text>
-    <xsl:apply-templates />
-<xsl:text>\fR</xsl:text>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- <strong>                                                             -->
-<!-- show it somewhat special (bold)                                      -->
-<!-- ==================================================================== -->
-<xsl:template match="strong">
-<xsl:text>\fB</xsl:text>
-    <xsl:apply-templates />
-<xsl:text>\fR</xsl:text>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- <directive>                                                          -->
-<!-- ==================================================================== -->
-<xsl:template match="directive">
-<xsl:if test="@type = 'section'">&lt;</xsl:if>
-<xsl:apply-templates />
-<xsl:if test="@type = 'section'">&gt;</xsl:if>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- <dl>                                                                 -->
-<!-- ==================================================================== -->
-<xsl:template match="dl">
-&lf;
-<xsl:apply-templates />&lf;
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- <dt>                                                                 -->
-<!-- ==================================================================== -->
-<xsl:template match="dt">
-&lf;
-<xsl:text>.TP</xsl:text>&lf;
-
-<xsl:variable name="dt-content">
-    <xsl:apply-templates />
-</xsl:variable>
-<xsl:value-of select="normalize-space($dt-content)" />&lf;
-
-<xsl:variable name="dd-content">
-    <xsl:apply-templates
-        select="following-sibling::dd[position() = 1]/node()" />
-</xsl:variable>
-<xsl:value-of select="normalize-space($dd-content)" />
-</xsl:template>
-<!-- /dt -->
-
-
-<!-- ==================================================================== -->
-<!-- <example>                                                            -->
-<!-- ==================================================================== -->
-<xsl:template match="example[ancestor::dd]">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="example[not(ancestor::dd)]">
-&lf;
-<xsl:text>.nf</xsl:text>&lf;
-<xsl:apply-templates />&lf;
-<xsl:text>.fi</xsl:text>&lf;
-</xsl:template>
-<!-- /example -->
-
-
-<!-- ==================================================================== -->
-<!-- simple table support ... (exactly 2 columns)                         -->
-<!-- ==================================================================== -->
-<xsl:template match="table/tr">
-<xsl:if test="count(./*) &gt; 2">
-    <xsl:message terminate="yes">
-FATAL: only tables with two (2) columns are supported.
-    </xsl:message>
-</xsl:if>
-
-&lf;
-<xsl:text>.Ip "\(bu \s-1</xsl:text>
-<xsl:variable name="first-content">
-   <xsl:apply-templates select="./*[1]/node()" />
-</xsl:variable>
-<xsl:value-of select="normalize-space($first-content)" />
-
-<xsl:text>\s0 \- </xsl:text>
-<xsl:variable name="second-content">
-   <xsl:apply-templates select="./*[2]/node()" />
-</xsl:variable>
-<xsl:value-of select="normalize-space($second-content)" />&lf;
-</xsl:template>
-<!-- /table/tr -->
-
-
-<!-- ==================================================================== -->
-<!-- text filter                                                          -->
-<!-- ==================================================================== -->
-<xsl:template match="text()">
-<xsl:choose>
-<xsl:when test="normalize-space(.) != ''">
-<xsl:call-template name="filter.escape">
-    <xsl:with-param name="text" select="." />
-</xsl:call-template>
-</xsl:when>
-<xsl:otherwise>
-    <xsl:text> </xsl:text>
-</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- pass through content                                                 -->
-<!-- ==================================================================== -->
-<xsl:template match="a|code|module|table|program">
-<xsl:apply-templates />
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- remove some stuff from the output                                    -->
-<!-- ==================================================================== -->
-<xsl:template match="parentdocument|seealso|dd|td|example/br" />
-
-
-<!-- ==================================================================== -->
-<!-- the rest will be rejected                                            -->
-<!-- ==================================================================== -->
-<xsl:template match="*">
-<xsl:message terminate="yes">
-FATAL: the behaviour of the &lt;<xsl:value-of select="local-name()" />&gt;
-element was not tested. You need to modify
-the XSLT stylesheet in order to get it work.
-</xsl:message>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- filter.escape                                                        -->
-<!-- escape special characters                                            -->
-<!-- ==================================================================== -->
-<xsl:template name="filter.escape">
-<xsl:param name="text" />
-
-<xsl:choose>
-<xsl:when test="contains($text, '\')">
-    <xsl:call-template name="filter.escape.period">
-        <xsl:with-param name="text" select="substring-before($text, '\')" />
-    </xsl:call-template>
-    <xsl:text>\\</xsl:text>
-    <xsl:call-template name="filter.escape">
-        <xsl:with-param name="text" select="substring-after($text, '\\')" />
-    </xsl:call-template>
-</xsl:when>
-<xsl:otherwise>
-    <xsl:call-template name="filter.escape.period">
-        <xsl:with-param name="text" select="$text" />
-    </xsl:call-template>
-</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-<!-- /filter.escape -->
-
-
-<!-- ==================================================================== -->
-<!-- filter.period                                                        -->
-<!-- accompanying template to filter.escape                               -->
-<!-- ==================================================================== -->
-<xsl:template name="filter.escape.period">
-<xsl:param name="text" />
-
-<xsl:choose>
-<xsl:when test="contains($text, '.')"><!-- period replaced by \&. -->
-    <xsl:value-of select="substring-before($text, '.')" />
-    <xsl:text>\&amp;.</xsl:text>
-    <xsl:call-template name="filter.escape.period">
-        <xsl:with-param name="text" select="substring-after($text, '.')" />
-    </xsl:call-template>
-</xsl:when>
-<xsl:otherwise>
-    <xsl:value-of select="$text" />
-</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-<!-- /filter.escape.period -->
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/xsl/quickreference.xsl b/docs/manual/style/xsl/quickreference.xsl
deleted file mode 100644
index cf255dcd..00000000
--- a/docs/manual/style/xsl/quickreference.xsl
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY lf SYSTEM "util/lf.xml">
-]>
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-<!-- ==================================================================== -->
-<!-- <quickreference>                                                     -->
-<!-- Builds the directive quickreference page                             -->
-<!-- ==================================================================== -->
-<xsl:template match="quickreference">
-<html xml:lang="{$doclang}" lang="{$doclang}">
-    <xsl:call-template name="head"/>&lf;
-
-    <body id="directive-index">&lf;
-        <xsl:call-template name="top"/>&lf;
-
-        <div id="preamble">
-            <h1>
-                <xsl:value-of select="title" />
-            </h1>&lf;
-
-            <xsl:call-template name="langavail" />&lf;
-
-            <xsl:apply-templates select="summary" />
-        </div>&lf; <!-- /#preamble -->
-
-        <div id="directive-ref">
-            <xsl:variable name="directives"
-                select="document(document($allmodules)/modulefilelist/modulefile)
-                        /modulesynopsis/directivesynopsis[not(@location)]" />
-
-            <xsl:variable name="start-letters">
-                <xsl:call-template name="directive-startletters">
-                    <xsl:with-param name="directives" select="$directives" />
-                </xsl:call-template>
-            </xsl:variable>
-
-            <table id="legend">&lf;
-            <tr>
-                <td class="letters">
-                    <span>
-                        <xsl:call-template name="letter-bar">
-                            <xsl:with-param name="letters"
-                                select="$start-letters" />
-                            <xsl:with-param name="first" select="true()" />
-                        </xsl:call-template>
-                    </span>
-                </td>&lf;
-                <td>
-                    <xsl:apply-templates select="legend/table[position()=1]" />
-                </td>&lf;
-                <td>
-                    <xsl:apply-templates select="legend/table[position()=2]" />
-                </td>
-            </tr>&lf;
-            </table>&lf;
-
-            <table class="qref">&lf;
-            <xsl:call-template name="reference-of-letter">
-                <xsl:with-param name="letters-todo" select="$start-letters" />
-                <xsl:with-param name="offset" select="number(0)" />
-                <xsl:with-param name="directives" select="$directives" />
-            </xsl:call-template>
-            </table>
-        </div>&lf; <!-- /#directive-ref -->
-
-        <xsl:call-template name="bottom"/>&lf;
-    </body>
-</html>
-</xsl:template>
-<!-- /quickreference -->
-
-
-<!-- ==================================================================== -->
-<!-- the working horse. builds rows of all directives starting with one   -->
-<!-- letter when done, it calls itself to catch the next letter           -->
-<!-- ==================================================================== -->
-<xsl:template name="reference-of-letter">
-<xsl:param name="letters-todo" />
-<xsl:param name="offset" />
-<xsl:param name="directives" />
-
-<xsl:variable name="letter" select="substring($letters-todo, 1, 1)" />
-
-<xsl:for-each
-    select="$directives[$letter=translate(substring(normalize-space(name), 1,1),
-                                          $lowercase,$uppercase)]">
-<xsl:sort select="name" />
-
-    <tr>
-        <xsl:if test="position() mod 2 = $offset">
-            <xsl:attribute name="class">odd</xsl:attribute>
-        </xsl:if>
-
-        <td>
-            <a href="{../name}.html#{translate(name, $uppercase, $lowercase)}">
-                <xsl:if test="position()=1">
-                    <xsl:attribute name="id">
-                        <xsl:value-of select="$letter" />
-                    </xsl:attribute>
-                    <xsl:attribute name="name">
-                        <xsl:value-of select="$letter" />
-                    </xsl:attribute>
-                </xsl:if>
-
-                <xsl:apply-templates select="syntax" />
-            </a>
-        </td>
-        <td>
-            <!-- if the default value contains (at least) one <br />, -->
-            <!-- this probably means that a short explanation follows -->
-            <!-- the actual default value. We cut off the string      -->
-            <!-- after the <br /> so it will not be shown here.       -->
-            <!-- (add the + character instead)                        -->
-            <xsl:variable name="default">
-                <xsl:choose>
-                <xsl:when test="count(default[count(br) &gt; 0]) &gt; 0">
-                    <xsl:value-of
-                        select="default/child::node()
-                                [count(preceding-sibling::*) = 0]" />
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:value-of select="default"/>
-                </xsl:otherwise>
-                </xsl:choose>
-            </xsl:variable>
-
-            <xsl:value-of select="substring(substring-after(concat($default,
-                                  ' '), name),1,20)" />
-            <xsl:if test="string-length(substring-after(concat($default, ' '),
-                              name)) &gt; 20
-                          or count(default[count(br) &gt; 0]) &gt; 0">
-                <xsl:text> +</xsl:text>
-            </xsl:if>
-        </td>
-        <td>
-            <xsl:if test="contextlist/context
-                          [normalize-space(.)='server config']">s</xsl:if>
-            <xsl:if test="contextlist/context
-                          [normalize-space(.)='virtual host']">v</xsl:if>
-            <xsl:if test="contextlist/context
-                          [normalize-space(.)='directory']">d</xsl:if>
-            <xsl:if test="contextlist/context
-                          [normalize-space(.)='.htaccess']">h</xsl:if>
-        </td>
-        <td>
-            <xsl:choose>
-            <xsl:when test="../status='Base'">B</xsl:when>
-            <xsl:when test="../status='MPM'">M</xsl:when>
-            <xsl:when test="../status='Core'">C</xsl:when>
-            <xsl:when test="../status='Extension'">E</xsl:when>
-            <xsl:when test="../status='Experimental'">X</xsl:when>
-            </xsl:choose>
-        </td>
-    </tr>
-    <tr>
-        <xsl:if test="position() mod 2 = $offset">
-            <xsl:attribute name="class">odd</xsl:attribute>
-        </xsl:if>
-
-        <td colspan="4" class="descr">
-            <xsl:choose>
-            <xsl:when test="string-length(normalize-space(description)) &gt; 0">
-                <xsl:apply-templates select="description"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:text>-</xsl:text>
-            </xsl:otherwise>
-            </xsl:choose>
-        </td>
-    </tr>&lf;
-</xsl:for-each> <!-- /directives -->
-
-<!-- call next letter, if there is -->
-<xsl:if test="string-length($letters-todo) &gt; 1">
-    <xsl:call-template name="reference-of-letter">
-        <xsl:with-param name="letters-todo"
-            select="substring($letters-todo, 2)" />
-        <xsl:with-param name="offset"
-            select="(count($directives[$letter=translate(substring(
-                    normalize-space(name), 1, 1), $lowercase, $uppercase)])
-                    + $offset) mod 2" />
-        <xsl:with-param name="directives" select="$directives" />
-    </xsl:call-template>
-</xsl:if>
-</xsl:template>
-<!-- /reference-of-letter -->
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/xsl/sitemap.xsl b/docs/manual/style/xsl/sitemap.xsl
deleted file mode 100644
index eaa2c413..00000000
--- a/docs/manual/style/xsl/sitemap.xsl
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY lf SYSTEM "util/lf.xml">
-]>
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-<!-- ==================================================================== -->
-<!-- <sitemap>                                                            -->
-<!-- Process an entire document into an HTML page                         -->
-<!-- ==================================================================== -->
-<xsl:template match="/sitemap">
-<html xml:lang="{$doclang}" lang="{$doclang}">
-    <xsl:call-template name="head" />&lf;
-
-    <body id="manual-page">&lf;
-        <xsl:call-template name="top" />&lf;
-
-        <div id="page-content">
-            <div id="preamble">        
-                <h1>
-                    <xsl:value-of select="title" />
-                </h1>&lf;
-
-                <xsl:call-template name="langavail" />&lf;
-
-                <xsl:apply-templates select="summary" />
-            </div>&lf; <!-- /#preamble -->
-          
-            <xsl:if test="(not($is-chm) and count(category) &gt; 1) or seealso">
-                <div id="quickview">
-                    <xsl:if test="not($is-chm) and count(category) &gt; 1">
-                        <ul id="toc">&lf;
-                        <xsl:for-each select="category">
-                            <xsl:choose>
-                            <xsl:when test="@id">
-                                <li>
-                                    <img src="{$path}/images/down.gif" alt="" />
-                                    <xsl:text> </xsl:text>
-                                    <a href="#{@id}">
-                                        <xsl:apply-templates
-                                            select="title" mode="print" />
-                                    </a>
-                                </li>&lf;
-                            </xsl:when>
-                            <xsl:otherwise>
-                                <li>
-                                    <img src="{$path}/images/down.gif" alt="" />
-                                    <xsl:text> </xsl:text>
-                                    <xsl:apply-templates
-                                        select="title" mode="print" />
-                                </li>&lf;
-                            </xsl:otherwise>
-                            </xsl:choose>
-                        </xsl:for-each>
-                        </ul>&lf;
-                    </xsl:if>
-
-                    <xsl:if test="seealso">
-                        <h3>
-                            <xsl:value-of select="$message
-                                                  [@id='seealso']" />
-                        </h3>&lf;
-
-                        <ul class="seealso">&lf;
-                        <xsl:for-each select="seealso">
-                            <li>
-                                <xsl:apply-templates />
-                            </li>&lf;
-                        </xsl:for-each>
-                        </ul>&lf;
-                    </xsl:if>
-	            </div>&lf; <!-- /#quickview -->
-            </xsl:if> <!-- have sidebar -->
-
-            <xsl:apply-templates select="category" />
-        </div>&lf; <!-- /#page-content -->
-
-        <xsl:call-template name="bottom" />&lf;
-    </body>
-</html>
-</xsl:template>
-<!-- /sitemap -->
-  
-
-<!-- ==================================================================== -->
-<!-- category/page                                                        -->
-<!-- ==================================================================== -->
-<xsl:template match="sitemap/category/page">
-<li>
-    <xsl:if test="@separate='yes'">
-        <xsl:attribute name="class">separate</xsl:attribute>
-    </xsl:if>
-
-    <xsl:choose>
-    <xsl:when test="@href">
-        <a href="{@href}">
-            <xsl:call-template name="helper.uri.fix">
-                <xsl:with-param name="uri" select="@href" />
-            </xsl:call-template>
-            <xsl:value-of select="." />
-        </a>
-    </xsl:when>
-    <xsl:otherwise>
-        <xsl:value-of select="." />
-    </xsl:otherwise>
-    </xsl:choose>
-</li>&lf;
-</xsl:template>
-<!-- /category/page -->
-
-
-<!-- ==================================================================== -->
-<!-- Process a sitemap category                                           -->
-<!-- ==================================================================== -->
-<xsl:template match="sitemap/category">
-<xsl:call-template name="toplink" />&lf;
-
-<div class="section">
-    <!-- Category title -->
-    <h2>
-        <xsl:choose>
-        <xsl:when test="@id">
-            <a id="{@id}" name="{@id}">
-                <xsl:apply-templates select="title" mode="print" />
-            </a>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:apply-templates select="title" mode="print" />
-        </xsl:otherwise>
-        </xsl:choose>
-    </h2>&lf;
-
-    <!-- category body -->
-    <ul>
-        <xsl:apply-templates select="page" />
-    </ul>
-      
-    <!-- optional ... -->
-    <xsl:if test="@id = 'modules'">
-        <xsl:apply-templates select="document($allmodules)/modulefilelist" />
-    </xsl:if>
-    &lf;
-</div> <!-- /.section -->
-</xsl:template>
-<!-- /category -->
-
-
-<!-- ==================================================================== -->
-<!-- category/modulefilelist                                              -->
-<!-- insert module list into sitemap                                      -->
-<!-- ==================================================================== -->
-<xsl:template match="modulefilelist">
-<xsl:variable name="translist">
-    <xsl:text>-</xsl:text>
-    <xsl:for-each select="modulefile">
-        <xsl:variable name="current" select="document(.)/modulesynopsis" />
-   
-        <xsl:text> </xsl:text>
-        <xsl:value-of select="$current/name" />
-        <xsl:text> </xsl:text>
-        <xsl:call-template name="module-translatename">
-            <xsl:with-param name="name" select="$current/name" />
-        </xsl:call-template>
-        <xsl:text> -</xsl:text>
-    </xsl:for-each>
-</xsl:variable>
-
-<ul>
-<li>
-    <a href="mod/core.html">
-        <xsl:value-of select="$message[@id='apachecore']" />
-    </a>
-</li>&lf;
-<li>
-    <a href="mod/mpm_common.html">
-        <xsl:value-of select="$message[@id='apachempmcommon']" />
-    </a>
-</li>&lf;
-
-<xsl:for-each select="modulefile">
-<xsl:sort select="substring-before(substring-after($translist, concat('- ',
-                  document(.)/modulesynopsis/name, ' ')), ' -')" />
-
-    <xsl:variable name="current" select="document(.)/modulesynopsis" />
-
-    <xsl:if test="$current/status='MPM' and $current/name!='mpm_common'">
-        <xsl:variable name="name" select="substring-before(substring-after(
-                        $translist, concat('- ', $current/name, ' ')), ' -')" />
-
-        <li>
-            <a href="mod/{$current/name}.html">
-                <xsl:value-of select="$message[@id='apachempm']" />
-                <xsl:text> </xsl:text>
-                <xsl:value-of select="$name" />
-            </a>
-        </li>&lf;
-    </xsl:if>
-</xsl:for-each>
-</ul>
-
-<ul>
-<xsl:for-each select="modulefile">
-<xsl:sort select="substring-before(substring-after($translist, concat('- ',
-                  document(.)/modulesynopsis/name, ' ')), ' -')"/>
-
-    <xsl:variable name="current" select="document(.)/modulesynopsis" />
-
-    <xsl:if test="$current/status!='MPM' and $current/status!='Core'">
-        <li>
-            <a href="mod/{$current/name}.html">
-                <xsl:value-of select="$message[@id='apachemodule']"/>
-                <xsl:text> </xsl:text>
-                <xsl:value-of select="$current/name"/>
-            </a>
-        </li>&lf;
-    </xsl:if>
-</xsl:for-each>
-</ul>
-</xsl:template>
-<!-- /category/modulefilelist -->
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/xsl/synopsis.xsl b/docs/manual/style/xsl/synopsis.xsl
deleted file mode 100644
index d0769012..00000000
--- a/docs/manual/style/xsl/synopsis.xsl
+++ /dev/null
@@ -1,508 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY lf SYSTEM "util/lf.xml">
-]>
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="http://www.w3.org/1999/xhtml">
-
-<!-- ==================================================================== -->
-<!-- <modulesynopsis>                                                     -->
-<!-- Process an entire document into an HTML page                         -->
-<!-- ==================================================================== -->
-<xsl:template match="modulesynopsis">
-<html xml:lang="{$doclang}" lang="{$doclang}">
-    <xsl:call-template name="head" />&lf;
-
-    <body>&lf;
-        <xsl:call-template name="top" />&lf;
-
-        <div id="page-content">&lf;
-            <div id="preamble">
-                <h1>
-                    <xsl:choose>
-                    <xsl:when test="status='Core'">
-                        <xsl:value-of select="$message
-                                              [@id='apachecore']" />
-                    </xsl:when>
-                    <xsl:when test="name='mpm_common'">
-                        <xsl:value-of select="$message
-                                              [@id='apachempmcommon']" />
-                    </xsl:when>
-                    <xsl:when test="status='MPM'">
-                        <xsl:value-of select="$message
-                                              [@id='apachempm']" />
-                        <xsl:text> </xsl:text>
-                        <xsl:call-template name="module-translatename">
-                            <xsl:with-param name="name" select="name" />
-                        </xsl:call-template>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:value-of select="$message
-                                              [@id='apachemodule']" />
-                        <xsl:text> </xsl:text>
-                        <xsl:value-of select="name" />
-                    </xsl:otherwise>
-                    </xsl:choose>
-                </h1>&lf;
-
-                <xsl:call-template name="langavail" />&lf;
-
-                <!-- Description and module-headers -->
-                <table class="module">
-                <tr>
-                    <th>
-                        <a href="module-dict.html#Description">
-                            <xsl:value-of select="$message
-                                                  [@id='description']" />
-                            <xsl:text>:</xsl:text>
-                        </a>
-                    </th>
-                    <td>
-                        <xsl:apply-templates select="description" />
-                    </td>
-                </tr>&lf;
-                <tr>
-                    <th>
-                        <a href="module-dict.html#Status">
-                            <xsl:value-of select="$message
-                                                  [@id='status']" />
-                            <xsl:text>:</xsl:text>
-                        </a>
-                    </th>
-                    <td>
-                        <xsl:value-of select="status" />
-                    </td>
-                </tr>
-
-                <xsl:if test="identifier">&lf;
-                <tr>
-                    <th>
-                        <a href="module-dict.html#ModuleIdentifier">
-                            <xsl:value-of select="$message
-                                                  [@id='moduleidentifier']" />
-                            <xsl:text>:</xsl:text>
-                        </a>
-                    </th>
-                    <td>
-                        <xsl:value-of select="identifier" />
-                    </td>
-                </tr>
-                </xsl:if>
-
-                <xsl:if test="sourcefile">&lf;
-                <tr>
-                    <th>
-                        <a href="module-dict.html#SourceFile">
-                            <xsl:value-of select="$message
-                                                  [@id='sourcefile']" />
-                            <xsl:text>:</xsl:text>
-                        </a>
-                    </th>
-                    <td>
-                        <xsl:value-of select="sourcefile" />
-                    </td>
-                </tr>
-                </xsl:if>
-
-                <xsl:if test="compatibility">&lf;
-                <tr>
-                    <th>
-                        <a href="module-dict.html#Compatibility">
-                            <xsl:value-of select="$message
-                                                  [@id='compatibility']" />
-                            <xsl:text>:</xsl:text>
-                        </a>
-                    </th>
-                    <td>
-                        <xsl:apply-templates select="compatibility" />
-                    </td>
-                </tr>
-                </xsl:if>
-                </table>&lf;
-
-                <!-- Summary of module features/usage (1 to 3 paragraphs, -->
-                <!-- optional)                                            -->
-                <xsl:if test="summary">
-                    <h3>
-                        <xsl:value-of select="$message
-                                              [@id='summary']" />
-                    </h3>&lf;
-
-                    <xsl:apply-templates select="summary" />
-                </xsl:if>
-            </div>&lf; <!-- /#preamble -->
-
-            <xsl:if test="not($is-chm) or seealso">
-                <div id="quickview">
-                    <xsl:if test="not($is-chm)">
-                        <h3 class="directives">
-                            <xsl:value-of select="$message
-                                                  [@id='directives']" />
-                        </h3>&lf;
-
-                        <xsl:choose>
-                        <xsl:when test="directivesynopsis">
-                            <ul id="toc">&lf;
-                            <xsl:for-each select="directivesynopsis">
-                            <xsl:sort select="name" />
-                                <xsl:variable name="lowername"
-                                    select="translate(name, $uppercase,
-                                                      $lowercase)" />
-
-                                <xsl:choose>
-                                <xsl:when test="not(@location)">
-                                    <li>
-                                        <img src="{$path}/images/down.gif"
-                                            alt="" />
-                                        <xsl:text> </xsl:text>
-                                        <a href="#{$lowername}">
-                                            <xsl:if test="@type='section'"
-                                                >&lt;</xsl:if>
-                                            <xsl:value-of select="name" />
-                                            <xsl:if test="@type='section'"
-                                                >&gt;</xsl:if>
-                                        </a>
-                                    </li>&lf;
-                                </xsl:when>
-                                <xsl:otherwise>
-                                    <xsl:variable name="lowerlocation"
-                                        select="translate(@location, $uppercase,
-                                                          $lowercase)" />
-                                    <li>
-                                        <img src="{$path}/images/right.gif"
-                                            alt="" />
-                                        <xsl:text> </xsl:text>
-                                        <a href="{$lowerlocation}.html#{
-                                                                   $lowername}">
-                                            <xsl:if test="@type='section'"
-                                                >&lt;</xsl:if>
-                                            <xsl:value-of select="name" />
-                                            <xsl:if test="@type='section'"
-                                                >&gt;</xsl:if>
-                                        </a>
-                                    </li>&lf;
-                                </xsl:otherwise>
-                                </xsl:choose>
-                            </xsl:for-each>
-                            </ul>&lf; <!-- /toc -->
-                        </xsl:when> <!-- have directives -->
-
-                        <xsl:otherwise>
-                            <p>
-                                <xsl:value-of select="$message
-                                                      [@id='nodirectives']" />
-                            </p>&lf;
-                        </xsl:otherwise>
-                        </xsl:choose>
-
-                        <xsl:if test="section">
-                            <h3>
-                                <xsl:value-of select="$message
-                                                      [@id='topics']" />
-                            </h3>&lf;
-
-                            <ul id="topics">&lf;
-                            <xsl:apply-templates
-                                select="section" mode="index" />
-                            </ul>
-                        </xsl:if>
-                    </xsl:if> <!-- /!is-chm -->
-
-                    <xsl:if test="seealso">
-	                    <h3>
-                            <xsl:value-of select="$message
-                                                  [@id='seealso']" />
-                        </h3>&lf;
-
-                        <ul class="seealso">&lf;
-                        <xsl:for-each select="seealso">
-                            <li>
-                                <xsl:apply-templates />
-                            </li>&lf;
-                        </xsl:for-each>
-                        </ul>
-                    </xsl:if>
-                </div> <!-- /#quickview -->
-            </xsl:if>&lf; <!-- have sidebar -->
-
-            <!-- Sections of documentation about the module as a whole -->
-            <xsl:apply-templates select="section" />&lf;
-
-            <!-- Directive documentation -->
-            <xsl:apply-templates select="directivesynopsis">
-                <xsl:sort select="name" />
-            </xsl:apply-templates>
-        </div>&lf; <!-- /#page-content -->
-
-        <xsl:call-template name="bottom" />&lf;
-    </body>
-</html>
-</xsl:template>
-<!-- /modulesynopsis -->
-
-
-<!-- ==================================================================== -->
-<!-- Directivesynopsis                                                    -->
-<!-- ==================================================================== -->
-<xsl:template match="directivesynopsis">
-<xsl:if test="not(@location)">
-    <xsl:call-template name="toplink" />&lf;
-
-    <div class="directive-section">
-        <xsl:variable name="lowername"
-            select="translate(name, $uppercase, $lowercase)" />
-
-        <!-- Directive heading gets both mixed case and lowercase      -->
-        <!-- anchors, and includes lt/gt only for "section" directives -->
-        <h2>
-            <a id="{name}" name="{name}">
-                <xsl:if test="@type='section'">&lt;</xsl:if>
-                <xsl:value-of select="name" />
-                <xsl:if test="@type='section'">&gt;</xsl:if>
-            </a>
-
-            <xsl:choose>
-            <xsl:when test="$message
-                            [@id='directive']/@replace-space-with">
-                <xsl:value-of select="$message
-                                      [@id='directive']/@replace-space-with"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:text> </xsl:text>
-            </xsl:otherwise>
-            </xsl:choose>
-
-            <a id="{$lowername}" name="{$lowername}">
-                <xsl:value-of select="$message[@id='directive']" />
-            </a>
-        </h2>&lf;
-
-        <!-- Directive header -->
-        <table class="directive">&lf;
-        <tr>
-            <th>
-                <a href="directive-dict.html#Description">
-                    <xsl:value-of select="$message
-                                          [@id='description']" />
-                    <xsl:text>:</xsl:text>
-                </a>
-            </th>
-            <td>
-                <xsl:apply-templates select="description" />
-            </td>
-        </tr>&lf;
-
-        <tr>
-            <th>
-                <a href="directive-dict.html#Syntax">
-                    <xsl:value-of select="$message[@id='syntax']" />
-                    <xsl:text>:</xsl:text>
-                </a>
-            </th>
-            <td>
-                <code>
-                    <xsl:apply-templates select="syntax" />
-                </code>
-            </td>
-        </tr>
-
-        <xsl:if test="default">&lf;
-        <tr>
-            <th>
-                <a href="directive-dict.html#Default">
-                    <xsl:value-of select="$message[@id='default']" />
-                    <xsl:text>:</xsl:text>
-                </a>
-            </th>
-            <td>
-                <code>
-                    <xsl:apply-templates select="default" />
-                </code>
-            </td>
-        </tr>
-        </xsl:if>&lf;
-
-        <tr>
-            <th>
-                <a href="directive-dict.html#Context">
-                    <xsl:value-of select="$message[@id='context']" />
-                    <xsl:text>:</xsl:text>
-                </a>
-            </th>
-            <td>
-                <xsl:apply-templates select="contextlist" />
-            </td>
-        </tr>
-
-        <xsl:if test="override">&lf;
-        <tr>
-            <th>
-                <a href="directive-dict.html#Override">
-                    <xsl:value-of select="$message[@id='override']"/>
-                    <xsl:text>:</xsl:text>
-                </a>
-            </th>
-            <td>
-                <xsl:value-of select="override" />
-            </td>
-        </tr>
-        </xsl:if>&lf;
-
-        <tr>
-            <th>
-                <a href="directive-dict.html#Status">
-                    <xsl:value-of select="$message[@id='status']" />
-                    <xsl:text>:</xsl:text>
-                </a>
-            </th>
-            <td>
-                <xsl:value-of select="../status" />
-            </td>
-        </tr>&lf;
-
-        <tr>
-            <th>
-                <a href="directive-dict.html#Module">
-                    <xsl:value-of select="$message[@id='module']" />
-                    <xsl:text>:</xsl:text>
-                </a>
-            </th>
-            <td>
-                <xsl:choose>
-                <xsl:when test="modulelist">
-                    <xsl:apply-templates select="modulelist" />
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:value-of select="../name" />
-                </xsl:otherwise>
-                </xsl:choose>
-            </td>
-        </tr>
-
-        <xsl:if test="compatibility">&lf;
-        <tr>
-            <th>
-                <a href="directive-dict.html#Compatibility">
-                    <xsl:value-of select="$message
-                                          [@id='compatibility']" />
-                    <xsl:text>:</xsl:text>
-                </a>
-            </th>
-            <td>
-                <xsl:apply-templates select="compatibility" />
-            </td>
-        </tr>
-        </xsl:if>&lf;
-        </table>
-
-        <xsl:apply-templates select="usage" />&lf;
-
-        <xsl:if test="seealso">
-            <h3>
-                <xsl:value-of select="$message[@id='seealso']" />
-            </h3>&lf;
-
-            <ul>&lf;
-            <xsl:for-each select="seealso">
-                <li>
-                    <xsl:apply-templates />
-                </li>&lf;
-            </xsl:for-each>
-            </ul>&lf;
-        </xsl:if>
-    </div>&lf; <!-- /.directive-section -->
-</xsl:if>
-</xsl:template>
-<!-- /directivesynopsis -->
-
-
-<!-- ==================================================================== -->
-<!-- <contextlist>                                                        -->
-<!-- ==================================================================== -->
-<xsl:template match="contextlist">
-<xsl:apply-templates select="context" />
-</xsl:template>
-<!-- /contextlist -->
-
-
-<!-- ==================================================================== -->
-<!-- <context>                                                            -->
-<!-- Each entry is separeted with a comma                                 -->
-<!-- ==================================================================== -->
-<xsl:template match="context">
-<xsl:choose>
-<xsl:when test="normalize-space(.) = 'server config'">
-    <xsl:value-of select="$message[@id='serverconfig']" />
-</xsl:when>
-<xsl:when test="normalize-space(.) = 'virtual host'">
-    <xsl:value-of select="$message[@id='virtualhost']" />
-</xsl:when>
-<xsl:when test="normalize-space(.) = 'directory'">
-    <xsl:value-of select="$message[@id='directory']" />
-</xsl:when>
-<xsl:when test="normalize-space(.) = '.htaccess'">
-    <xsl:value-of select="$message[@id='htaccess']" />
-</xsl:when>
-<xsl:otherwise> <!-- error -->
-    <xsl:message terminate="yes">
-        unknown context: <xsl:value-of select="." />
-    </xsl:message>
-</xsl:otherwise>
-</xsl:choose>
-
-<xsl:if test="position() != last()">
-    <xsl:text>, </xsl:text>
-</xsl:if>
-</xsl:template>
-<!-- /context -->
-
-
-<!-- ==================================================================== -->
-<!-- <modulelist>                                                         -->
-<!-- ==================================================================== -->
-<xsl:template match="modulelist">
-<xsl:for-each select="module">
-    <xsl:call-template name="module" />
-    <xsl:if test="position() != last()">
-        <xsl:text>, </xsl:text>
-    </xsl:if>
-</xsl:for-each>
-</xsl:template>
-<!-- /modulelist -->
-
-
-<!-- ==================================================================== -->
-<!-- modulesynopsis/compatibility                                         -->
-<!-- ==================================================================== -->
-<xsl:template match="modulesynopsis/compatibility">
-<xsl:apply-templates />
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-<!-- directivesynopsis/compatibility                                      -->
-<!-- ==================================================================== -->
-<xsl:template match="directivesynopsis/compatibility">
-<xsl:apply-templates />
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/xsl/typemap.xsl b/docs/manual/style/xsl/typemap.xsl
deleted file mode 100644
index 4429e7ab..00000000
--- a/docs/manual/style/xsl/typemap.xsl
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE xsl:stylesheet [
-    <!ENTITY lf SYSTEM "util/lf.xml">
-]>
-
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                  xmlns="">
-
-<xsl:output 
-  method="text"
-  encoding="utf-8"
-  indent="no"
-/>
-
-<!-- create nodeset for referencing later                                 -->
-<xsl:variable name="design" select="document('util/designations.xml')
-                                    /items/item" />
-
-<!-- Constants used for case translation -->
-<xsl:variable name="lowercase" select="'abcdefghijklmnopqrstuvwxyz'" />
-<xsl:variable name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'" />
-
-<!-- ==================================================================== -->
-<!-- <metafile>                                                           -->
-<!-- build typemap                                                        -->
-<!-- ==================================================================== -->
-<xsl:template match="/metafile">
-<xsl:apply-templates select="variants/variant" />
-</xsl:template>
-<!-- /metafile -->
-
-<!-- ==================================================================== -->
-<!-- <variant>                                                            -->
-<!-- ==================================================================== -->
-<xsl:template match="variant">
-<xsl:variable name="lang" select="translate(., $uppercase, $lowercase)" />
-<xsl:if test="not($design[translate(@lang, $uppercase, $lowercase) = $lang])">
-    <xsl:message terminate="yes">
-FATAL: missing designation data for language <xsl:value-of select="." />.
-The XSLT-Stylesheet won't work without modification.
-    </xsl:message>
-</xsl:if>
-
-<xsl:text>URI: </xsl:text>
-<xsl:value-of select="/metafile/basename" />
-<xsl:value-of select="$design[translate(@lang, $uppercase, $lowercase)
-                              = $lang]" />&lf;
-
-<xsl:text>Content-Language: </xsl:text>
-<xsl:value-of select="$design[translate(@lang, $uppercase, $lowercase)
-                              = $lang]/@lang" />&lf;
-
-<xsl:text>Content-type: text/html; charset=</xsl:text>
-<xsl:value-of select="$design[translate(@lang, $uppercase, $lowercase)
-                              = $lang]/@charset" />&lf;
-
-<xsl:if test="position() != last()">&lf;</xsl:if>
-</xsl:template>
-<!-- /variant -->
-
-</xsl:stylesheet>
diff --git a/docs/manual/style/xsl/util/modtrans.xsl b/docs/manual/style/xsl/util/modtrans.xsl
deleted file mode 100644
index 291f49ba..00000000
--- a/docs/manual/style/xsl/util/modtrans.xsl
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xsl:stylesheet version="1.0"
-              xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<xsl:template name="module-translatename">
-<xsl:param name="name" />
-
-<xsl:variable name="sname" select="translate($name, $lowercase, $uppercase)" />
-
-<xsl:choose>
-<xsl:when test="starts-with($sname, 'MOD_') or starts-with($sname, 'MPM_')">
-    <xsl:value-of select="substring($name, 5)" />
-</xsl:when>
-
-<xsl:when test="starts-with($sname, 'MPMT_')">
-    <xsl:value-of select="substring($name, 6)" />
-</xsl:when>
-
-<xsl:otherwise>
-    <xsl:value-of select="$name" />
-</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-<!-- /module-translatename -->
-
-</xsl:stylesheet>
diff --git a/docs/manual/suexec.html b/docs/manual/suexec.html
index 9d5e3a86..23d2e125 100644
--- a/docs/manual/suexec.html
+++ b/docs/manual/suexec.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: suexec.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: suexec.html.ja.euc-jp
+URI: suexec.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: suexec.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/suexec.html.en b/docs/manual/suexec.html.en
index ad40c574..208b1c7c 100644
--- a/docs/manual/suexec.html.en
+++ b/docs/manual/suexec.html.en
@@ -603,6 +603,6 @@
 <a href="./ja/suexec.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/suexec.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/suexec.html.ja.euc-jp b/docs/manual/suexec.html.ja.euc-jp
deleted file mode 100644
index 794b595b..00000000
--- a/docs/manual/suexec.html.ja.euc-jp
+++ /dev/null
@@ -1,611 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>suEXEC ¥µ¥Ý¡¼¥È - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>suEXEC ¥µ¥Ý¡¼¥È</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./en/suexec.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./ja/suexec.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/suexec.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-    <p><strong>suEXEC</strong>
-    µ¡Ç½¤Ë¤è¤ê¡¢Apache ¥æ¡¼¥¶¤Ï Web ¥µ¡¼¥Ð¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¥æ¡¼¥¶ ID ¤È¤Ï
-    °Û¤Ê¤ë¥æ¡¼¥¶ ID ¤Ç <strong>CGI</strong> ¥×¥í¥°¥é¥à¤ä <strong>SSI</strong> 
-    ¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£CGI ¥×¥í¥°¥é¥à¤Þ¤¿¤Ï SSI
-    ¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤¹¤ë¾ì¹ç¡¢Ä̾ï¤Ï web ¥µ¡¼¥Ð¤ÈƱ¤¸¥æ¡¼¥¶¤Ç¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
-    </p>
-
-    <p>ŬÀڤ˻ÈÍѤ¹¤ë¤È¡¢¤³¤Îµ¡Ç½¤Ë¤è¤ê¥æ¡¼¥¶¤¬¸ÄÊ̤ΠCGI
-    ¤ä SSI ¥×¥í¥°¥é¥à¤ò³«È¯¤·¼Â¹Ô¤¹¤ë¤³¤È¤ÇÀ¸¤¸¤ë¥»¥­¥å¥ê¥Æ¥£¾å¤Î´í¸±¤ò¡¢
-    ¤«¤Ê¤ê¸º¤é¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤·¤«¤·¡¢suEXEC ¤ÎÀßÄ꤬ÉÔŬÀÚ¤À¤È¡¢
-    ¿¤¯¤ÎÌäÂ꤬À¸¤¸¡¢¤¢¤Ê¤¿¤Î¥³¥ó¥Ô¥å¡¼¥¿¤Ë¿·¤·¤¤¥»¥­¥å¥ê¥Æ¥£¥Û¡¼¥ë¤ò
-    ºî¤Ã¤Æ¤·¤Þ¤¦²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£¤¢¤Ê¤¿¤¬ <em>setuid root</em>
-    ¤µ¤ì¤¿¥×¥í¥°¥é¥à¤È¡¢¤½¤ì¤é¤«¤éÀ¸¤¸¤ë¥»¥­¥å¥ê¥Æ¥£¾å¤ÎÌäÂê¤Î´ÉÍý¤Ë
-    ¾Ü¤·¤¯¤Ê¤¤¤è¤¦¤Ê¤é¡¢suEXEC ¤Î»ÈÍѤò¸¡Æ¤¤·¤Ê¤¤¤è¤¦¤Ë¶¯¤¯¿ä¾©¤·¤Þ¤¹¡£
-    </p>
-  </div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#before">»Ï¤á¤ëÁ°¤Ë</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#model">suEXEC ¥»¥­¥å¥ê¥Æ¥£¥â¥Ç¥ë</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#install">suEXEC
-    ¤ÎÀßÄê¤È¥¤¥ó¥¹¥È¡¼¥ë</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#enable">suEXEC
-    ¤ÎÍ­¸ú²½¤È̵¸ú²½</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#usage">suEXEC ¤Î»ÈÍÑ</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#debug">suEXEC ¤Î¥Ç¥Ð¥Ã¥°</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#jabberwock">¤È¤«¤²¤ËÃí°Õ: ·Ù¹ð¤È»öÎã</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="before" id="before">»Ï¤á¤ëÁ°¤Ë</a></h2>
-
-    <p>¤³¤Îʸ½ñ¤ÎÀèƬ¤ËÈô¤ÖÁ°¤Ë¡¢Apache
-    ¥°¥ë¡¼¥×¤È¤³¤Îʸ½ñ¤Ç¤Î²¾Äê¤òÃΤäƤª¤¯¤Ù¤­¤Ç¤·¤ç¤¦¡£
-    </p>
-
-    <p>Âè 1 ¤Ë¡¢¤¢¤Ê¤¿¤¬ <strong>setuid</strong> ¤È
-    <strong>setgid</strong> Áàºî¤¬²Äǽ¤Ê UNIX
-    ͳÍè¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ò»È¤Ã¤Æ¤¤¤ë¤³¤È¤òÁÛÄꤷ¤Æ¤¤¤Þ¤¹¡£
-    ¤³¤ì¤Ï¡¢¤¹¤Ù¤Æ¤Î¥³¥Þ¥ó¥ÉÎã¤Ë¤¢¤Æ¤Ï¤Þ¤ê¤Þ¤¹¡£
-    ¤½¤Î¾¤Î¥×¥é¥Ã¥È¥Û¡¼¥à¤Ç¤Ï¡¢¤â¤· suEXEC
-    ¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤¿¤È¤·¤Æ¤âÀßÄê¤Ï°Û¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>
-
-    <p>Âè 2 ¤Ë¡¢¤¢¤Ê¤¿¤¬»ÈÍÑÃæ¤Î¥³¥ó¥Ô¥å¡¼¥¿¤Î
-    ¥»¥­¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ë´ðËÜŪ¤Ê³µÇ°¤È¡¢¤½¤ì¤é¤Î´ÉÍý¤Ë¤Ä¤¤¤Æ¾Ü¤·¤¤¤³¤È¤ò
-    ÁÛÄꤷ¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï¡¢<strong>setuid/setgid</strong>
-    Áàºî¡¢¤¢¤Ê¤¿¤Î¥·¥¹¥Æ¥à¾å¤Ç¤Î¤½¤ÎÁàºî¤Ë¤è¤ëÍÍ¡¹¤Ê¸ú²Ì¡¢
-    ¥»¥­¥å¥ê¥Æ¥£¥ì¥Ù¥ë¤Ë¤Ä¤¤¤Æ¤¢¤Ê¤¿¤¬Íý²ò¤·¤Æ¤¤¤ë¤È¤¤¤¦¤³¤È¤ò´Þ¤ß¤Þ¤¹¡£
-    </p>
-
-    <p>Âè 3 ¤Ë¡¢<strong>²þ¤¤µ¤ì¤Æ¤¤¤Ê¤¤</strong> suEXEC
-    ¥³¡¼¥É¤Î»ÈÍѤòÁÛÄꤷ¤Æ¤¤¤Þ¤¹¡£suEXEC ¤Î¥³¡¼¥É¤Ï¡¢
-    ¿¤¯¤Î¥Ù¡¼¥¿¥Æ¥¹¥¿¤À¤±¤Ç¤Ê¤¯¡¢³«È¯¼Ô¤Ë¤è¤Ã¤Æ¤âÃí°Õ¿¼¤¯Àººº¤µ¤ì
-    ¥Æ¥¹¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤½¤ì¤é¤ÎÃí°Õ¤Ë¤è¤ê¡¢´Ê·é¤Ç¿®Íê¤Ç¤­¤ë°ÂÁ´¤Ê
-    ¥³¡¼¥É¤Î´ðÈפ¬Êݾڤµ¤ì¤Þ¤¹¡£¤³¤Î¥³¡¼¥É¤ò²þÊѤ¹¤ë¤³¤È¤Ç¡¢
-    ͽ´ü¤µ¤ì¤Ê¤¤ÌäÂê¤ä¿·¤·¤¤¥»¥­¥å¥ê¥Æ¥£¾å¤Î´í¸±¤¬À¸¤¸¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-    ¥»¥­¥å¥ê¥Æ¥£¥×¥í¥°¥é¥ß¥ó¥°¤Î¾ÜºÙ¤ËÄ̤¸¤Æ¤¤¤Æ¡¢
-    º£¸å¤Î¸¡Æ¤¤Î¤¿¤á¤ËÀ®²Ì¤ò Apache
-    ¥°¥ë¡¼¥×¤È¶¦Í­¤·¤è¤¦¤È»×¤¦¤Î¤Ç¤Ê¤±¤ì¤Ð¡¢suEXEC
-    ¥³¡¼¥É¤ÏÊѤ¨¤Ê¤¤¤³¤È¤ò <strong>¶¯¤¯</strong>¿ä¾©¤·¤Þ¤¹¡£</p>
-
-    <p>Âè 4 ¤Ë¡¢¤³¤ì¤¬ºÇ¸å¤Ç¤¹¤¬¡¢suEXEC ¤ò Apache
-    ¤Î¥Ç¥Õ¥©¥ë¥È¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ï<strong>´Þ¤á¤Ê¤¤</strong>¤³¤È¤¬
-    Apache ¥°¥ë¡¼¥×¤Ç·èÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ï¡¢suEXEC
-    ¤ÎÀßÄê¤Ë¤Ï´ÉÍý¼Ô¤Î¾ÜºÙ¤Ë¤ï¤¿¤ë¿µ½Å¤ÊÃí°Õ¤¬É¬ÍפÀ¤«¤é¤Ç¤¹¡£
-    suEXEC ¤ÎÍÍ¡¹¤ÊÀßÄê¤Ë¤Ä¤¤¤Æ¸¡Æ¤¤¬½ª¤ï¤ì¤Ð¡¢´ÉÍý¼Ô¤Ï suEXEC
-    ¤òÄ̾ï¤Î¥¤¥ó¥¹¥È¡¼¥ëÊýË¡¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤³¤ì¤é¤ÎÀßÄêÃͤϡ¢suEXEC
-    µ¡Ç½¤Î»ÈÍÑÃæ¤Ë¥·¥¹¥Æ¥à¥»¥­¥å¥ê¥Æ¥£¤òŬÀÚ¤ËÊݤĤ¿¤á¤Ë¡¢
-    ´ÉÍý¼Ô¤Ë¤è¤Ã¤Æ¿µ½Å¤Ë·èÄꤵ¤ì»ØÄꤵ¤ì¤ë¤³¤È¤¬É¬ÍפǤ¹¡£
-    ¤³¤Î¾ÜºÙ¤Ê¼ê½ç¤Ë¤è¤ê¡¢Apache ¥°¥ë¡¼¥×¤Ï¡¢suEXEC
-    ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ä¤¤¤Æ¡¢Ãí°Õ¿¼¤¯½½Ê¬¤Ë¸¡Æ¤¤·¤Æ¤½¤ì¤ò»ÈÍѤ¹¤ë¤³¤È¤ò
-    ·èÄꤷ¤¿¾ì¹ç¤Ë¸Â¤Ã¤Æ¤¤¤¿¤À¤­¤¿¤¤¤È¹Í¤¨¤Æ¤¤¤Þ¤¹¡£
-    </p>
-
-    <p>¤½¤ì¤Ç¤â¿Ê¤ß¤Þ¤¹¤«? ¤è¤í¤·¤¤¡£¤Ç¤Ï¡¢Àè¤Ø¿Ê¤ß¤Þ¤·¤ç¤¦!</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="model" id="model">suEXEC ¥»¥­¥å¥ê¥Æ¥£¥â¥Ç¥ë</a></h2>
-
-    <p>suEXEC ¤ÎÀßÄê¤È¥¤¥ó¥¹¥È¡¼¥ë¤ò»Ï¤á¤ëÁ°¤Ë¡¢
-    ¤Þ¤º¼ÂÁõ¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¥»¥­¥å¥ê¥Æ¥£¥â¥Ç¥ë¤Ë¤Ä¤¤¤ÆÏÀ¤¸¤Æ¤ª¤­¤Þ¤¹¡£
-    ¤½¤ì¤Ë¤Ï¡¢suEXEC ¤ÎÆâÉô¤Ç¹Ô¤Ê¤ï¤ì¤Æ¤¤¤ë¤³¤È¡¢
-    ¥·¥¹¥Æ¥à¤Î¥»¥­¥å¥ê¥Æ¥£¤òÊݾڤ¹¤ë¤¿¤á¤Ë·Ù¹ð¤µ¤ì¤ë¤³¤È¤ò
-    ¤è¤¯Íý²ò¤·¤Æ¤ª¤¤¤¿Êý¤¬¤è¤¤¤Ç¤·¤ç¤¦¡£</p>
-
-    <p><strong>suEXEC</strong> ¤Ï¡¢Apache web
-    ¥µ¡¼¥Ð¤«¤é¸Æ¤Ó½Ð¤µ¤ì¤ë setuid ¤µ¤ì¤¿ "wrapper"
-    ¥×¥í¥°¥é¥à¤¬´ðËܤȤʤäƤ¤¤Þ¤¹¡£À߷פ·¤¿ CGI¡¢¤Þ¤¿¤Ï SSI
-    ¥×¥í¥°¥é¥à¤Ø¤Î HTTP ¥ê¥¯¥¨¥¹¥È¤¬¤¢¤ë¤È¡¢¤³¤Î wrapper
-    ¤¬¸Æ¤Ó½Ð¤µ¤ì¤Þ¤¹¡£¤³¤Î¤è¤¦¤Ê¥ê¥¯¥¨¥¹¥È¤¬¤¢¤ë¤È¡¢Apache
-    ¤Ï¤½¤Î¥×¥í¥°¥é¥à¤¬¼Â¹Ô¤µ¤ì¤ëºÝ¤Î¥×¥í¥°¥é¥à̾¤È¥æ¡¼¥¶ ID ¤È¥°¥ë¡¼¥×
-    ID ¤ò»ØÄꤷ¤Æ suEXEC wrapper ¤ò¼Â¹Ô¤·¤Þ¤¹¡£
-    </p>
-
-    <p>¤½¤ì¤«¤é¡¢wrapper ¤ÏÀ®¸ù¤Þ¤¿¤Ï¼ºÇÔ¤ò·èÄꤹ¤ë¤¿¤á
-    °Ê²¼¤Î½èÍý¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£¤³¤ì¤é¤Î¾õÂ֤Τ¦¤Á°ì¤Ä¤Ç¤â¼ºÇÔ¤·¤¿¾ì¹ç¡¢
-    ¥×¥í¥°¥é¥à¤Ï¼ºÇÔ¤ò¥í¥°¤Ëµ­Ï¿¤·¤Æ¥¨¥é¡¼¤Ç½ªÎ»¤·¤Þ¤¹¡£
-    ¤½¤¦¤Ç¤Ê¤±¤ì¤Ð¡¢¸å¤Î½èÍý¤¬Â³¤±¤é¤ì¤Þ¤¹¡£</p>
-
-    <ol>
-      <li>
-        <strong>wrapper
-        ¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¥æ¡¼¥¶¤Ï¤³¤Î¥·¥¹¥Æ¥à¤ÎÀµÅö¤Ê¥æ¡¼¥¶¤«?</strong>
-
-        <p class="indent">
-          ¤³¤ì¤Ï¡¢wrapper ¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¥æ¡¼¥¶¤¬
-          ËÜÅö¤Ë¥·¥¹¥Æ¥à¤ÎÍøÍѼԤǤ¢¤ë¤³¤È¤òÊݾڤ¹¤ë¤¿¤á¤Ç¤¹¡£
-        </p>
-      </li>
-
-
-     <li>
-        <strong>wrapper ¤¬Å¬Àڤʿô¤Î°ú¿ô¤Ç¸Æ¤Ó½Ð¤µ¤ì¤¿¤«?</strong>
-
-
-        <p class="indent">
-          wrapper ¤ÏŬÀڤʿô¤Î°ú¿ô¤¬Í¿¤¨¤é¤ì¤¿¾ì¹ç¤Ë¤Î¤ß¼Â¹Ô¤µ¤ì¤Þ¤¹¡£
-          ŬÀڤʰú¿ô¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï Apache Web ¥µ¡¼¥Ð¤Ë²ò¼á¤µ¤ì¤Þ¤¹¡£
-          ŬÀڤʿô¤Î°ú¿ô¤ò¼õ¤±¼è¤é¤Ê¤±¤ì¤Ð¡¢¹¶·â¤ò¤µ¤ì¤¿¤«
-          ¤¢¤Ê¤¿¤Î Apache ¥Ð¥¤¥Ê¥ê¤Î suEXEC ¤ÎÉôʬ¤¬
-          ¤É¤³¤«¤ª¤«¤·¤¤²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
-        </p>
-      </li>
-
-      <li>
-        <strong>¤³¤ÎÀµÅö¤Ê¥æ¡¼¥¶¤Ï wrapper
-        ¤Î¼Â¹Ô¤òµö²Ä¤µ¤ì¤Æ¤¤¤ë¤«?</strong>
-
-        <p class="indent">
-          ¤³¤Î¥æ¡¼¥¶¤Ï wrapper ¼Â¹Ô¤òµö²Ä¤µ¤ì¤¿¥æ¡¼¥¶¤Ç¤¹¤«?
-          ¤¿¤À°ì¿Í¤Î¥æ¡¼¥¶ (Apache ¥æ¡¼¥¶) ¤À¤±¤¬¡¢
-          ¤³¤Î¥×¥í¥°¥é¥à¤Î¼Â¹Ô¤òµö²Ä¤µ¤ì¤Þ¤¹¡£
-        </p>
-      </li>
-
-      <li>
-        <strong>ÂоݤΠCGI, SSI ¥×¥í¥°¥é¥à¤¬°ÂÁ´¤Ç¤Ê¤¤³¬Áؤλ²¾È¤ò¤·¤Æ¤¤¤ë¤«?
-        </strong>
-
-        <p class="indent">
-          ÂоݤΠCGI, SSI ¥×¥í¥°¥é¥à¤¬ '/' ¤«¤é»Ï¤Þ¤ë¡¢¤Þ¤¿¤Ï
-          '..' ¤Ë¤è¤ë»²¾È¤ò¹Ô¤Ê¤Ã¤Æ¤¤¤Þ¤¹¤«? ¤³¤ì¤é¤Ïµö²Ä¤µ¤ì¤Þ¤»¤ó¡£
-          ÂÐ¾Ý¤Î¥×¥í¥°¥é¥à¤Ï suEXEC ¤Î¥É¥­¥å¥á¥ó¥È¥ë¡¼¥È
-          (²¼µ­¤Î <code>--with-suexec-docroot=<em>DIR</em></code> ¤ò»²¾È)
-          Æâ¤Ë¸ºß¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-        </p>
-      </li>
-
-      <li>
-        <strong>ÂоݤȤʤë¥æ¡¼¥¶Ì¾¤ÏÀµÅö¤Ê¤â¤Î¤«?</strong>
-
-        <p class="indent">
-          ÂоݤȤʤë¥æ¡¼¥¶Ì¾¤Ï¸ºß¤·¤Æ¤¤¤Þ¤¹¤«?
-        </p>
-      </li>
-
-      <li>
-        <strong>ÂоݤȤʤ륰¥ë¡¼¥×̾¤ÏÀµÅö¤Ê¤â¤Î¤«?</strong>
-
-        <p class="indent">
-          ÂоݤȤʤ륰¥ë¡¼¥×̾¤Ï¸ºß¤·¤Æ¤¤¤Þ¤¹¤«?
-        </p>
-      </li>
-
-      <li>
-        <strong>ÌÜŪ¤Î¥æ¡¼¥¶¤Ï¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¤Ï<em>¤Ê¤¤</em>¤«?
-        </strong>
-
-        <p class="indent">
-          º£¤Î¤È¤³¤í¡¢suEXEC ¤Ï <code><em>root</em></code> ¤Ë¤è¤ë CGI/SSI
-          ¥×¥í¥°¥é¥à¤Î¼Â¹Ô¤òµö²Ä¤·¤Æ¤¤¤Þ¤»¤ó¡£
-        </p>
-      </li>
-
-      <li>
-        <strong>ÂоݤȤʤë¥æ¡¼¥¶ ID ¤Ï¡¢ºÇ¾®¤Î ID
-        ÈÖ¹æ¤è¤ê¤â<em>Â礭¤¤</em>¤«?  </strong>
-
-        <p class="indent">
-          ºÇ¾®¥æ¡¼¥¶ ID ÈÖ¹æ¤ÏÀßÄê»þ¤Ë»ØÄꤵ¤ì¤Þ¤¹¡£¤³¤ì¤Ï¡¢
-          CGI/SSI ¥×¥í¥°¥é¥à¼Â¹Ô¤òµö²Ä¤µ¤ì¤ë¥æ¡¼¥¶ ID
-          ¤Î¤È¤ê¤¦¤ëºÇ¾®ÃͤǤ¹¡£¤³¤ì¤Ï
-          "system" ÍѤΥ¢¥«¥¦¥ó¥È¤òÊĤá½Ð¤¹¤Î¤ËÍ­¸ú¤Ç¤¹¡£
-        </p>
-      </li>
-
-      <li>
-        <strong>ÂоݤȤʤ륰¥ë¡¼¥×¤Ï¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Î¥°¥ë¡¼¥×¤Ç¤Ï
-        <em>¤Ê¤¤</em>¤«?</strong>
-
-        <p class="indent">
-         º£¤Î¤È¤³¤í¡¢suEXEC ¤Ï 'root' ¥°¥ë¡¼¥×¤Ë¤è¤ë CGI/SSI
-         ¥×¥í¥°¥é¥à¤Î¼Â¹Ô¤òµö²Ä¤·¤Æ¤¤¤Þ¤»¤ó¡£
-        </p>
-      </li>
-
-      <li>
-        <strong>ÂоݤȤʤ륰¥ë¡¼¥× ID ¤ÏºÇ¾®¤Î ID
-          ÈÖ¹æ¤è¤ê¤â<em>Â礭¤¤</em>¤«?</strong>
-
-        <p class="indent">
-          ºÇ¾®¥°¥ë¡¼¥× ID ÈÖ¹æ¤ÏÀßÄê»þ¤Ë»ØÄꤵ¤ì¤Þ¤¹¡£¤³¤ì¤Ï¡¢
-          CGI/SSI ¥×¥í¥°¥é¥à¼Â¹Ô¤òµö²Ä¤µ¤ì¤ë¥°¥ë¡¼¥×
-          ID ¤Î¤È¤ê¤¦¤ëºÇ¾®ÃͤǤ¹¡£
-          ¤³¤ì¤Ï "system" ÍѤΥ°¥ë¡¼¥×¤òÊĤá½Ð¤¹¤Î¤ËÍ­¸ú¤Ç¤¹¡£
-        </p>
-      </li>
-
-      <li>
-        <strong>wrapper ¤¬Àµ¾ï¤ËÂоݤȤʤë¥æ¡¼¥¶¤È¥°¥ë¡¼¥×¤Ë¤Ê¤ì¤ë¤«?
-        </strong>
-
-        <p class="indent">
-          ¤³¤³¤Ç¡¢setuid ¤È setgid
-          ¤Îµ¯Æ°¤Ë¤è¤ê¥×¥í¥°¥é¥à¤ÏÂоݤȤʤë¥æ¡¼¥¶¤È¥°¥ë¡¼¥×¤Ë¤Ê¤ê¤Þ¤¹¡£
-          ¥°¥ë¡¼¥×¥¢¥¯¥»¥¹¥ê¥¹¥È¤Ï¡¢
-          ¥æ¡¼¥¶¤¬Â°¤·¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥°¥ë¡¼¥×¤Ç½é´ü²½¤µ¤ì¤Þ¤¹¡£
-        </p>
-      </li>
-
-      <li>
-        <strong>CGI/SSI ¥×¥í¥°¥é¥à¤¬ÃÖ¤«¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ë°ÜÆ°
-        (change directory) ¤Ç¤­¤ë¤«?</strong>
-
-        <p class="indent">
-          ¥Ç¥£¥ì¥¯¥È¥ê¤¬Â¸ºß¤·¤Ê¤¤¤Ê¤é¡¢¤½¤Î¥Õ¥¡¥¤¥ë¤â¸ºß¤·¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-          ¥Ç¥£¥ì¥¯¥È¥ê¤Ë°ÜÆ°¤Ç¤­¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢¤ª¤½¤é¤¯Â¸ºß¤â¤·¤Ê¤¤¤Ç¤·¤ç¤¦¡£
-        </p>
-      </li>
-
-      <li>
-        <strong>¥Ç¥£¥ì¥¯¥È¥ê¤¬ Apache ¤Î¥É¥­¥å¥á¥ó¥È¥Ä¥ê¡¼Æâ¤Ë¤¢¤ë¤«?
-        </strong>
-
-        <p class="indent">
-          ¥ê¥¯¥¨¥¹¥È¤¬¥µ¡¼¥ÐÆâ¤Î¤â¤Î¤Ç¤¢¤ì¤Ð¡¢
-          Í׵ᤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤¬ suEXEC ¤Î¥É¥­¥å¥á¥ó¥È¥ë¡¼¥ÈÇÛ²¼¤Ë¤¢¤ê¤Þ¤¹¤«?
-          ¥ê¥¯¥¨¥¹¥È¤¬ UserDir ¤Î¤â¤Î¤Ç¤¢¤ì¤Ð¡¢Í׵ᤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤¬ suEXEC 
-          ¤Î¥æ¡¼¥¶¤Î¥É¥­¥å¥á¥ó¥È¥ë¡¼¥ÈÇÛ²¼¤Ë¤¢¤ê¤Þ¤¹¤«?
-          (<a href="#install">suEXEC ÀßÄꥪ¥×¥·¥ç¥ó</a> »²¾È)
-        </p>
-      </li>
-
-      <li>
-        <strong>¥Ç¥£¥ì¥¯¥È¥ê¤ò¾¤Î¥æ¡¼¥¶¤¬½ñ¤­¹þ¤á¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ
-        <em>¤¤¤Ê¤¤</em>¤«?</strong>
-
-        <p class="indent">
-          ¥Ç¥£¥ì¥¯¥È¥ê¤ò¾¥æ¡¼¥¶¤Ë³«Êü¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Þ¤¹¡£
-          ½êÍ­¥æ¡¼¥¶¤À¤±¤¬¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆâÍƤò²þÊѤǤ­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
-        </p>
-      </li>
-
-
-      <li>
-        <strong>ÂоݤȤʤë CGI/SSI ¥×¥í¥°¥é¥à¤Ï¸ºß¤¹¤ë¤«?</strong>
-
-        <p class="indent">
-          ¸ºß¤·¤Ê¤±¤ì¤Ð¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¡£
-        </p>
-      </li>
-
-      <li>
-        <strong>ÂоݤȤʤë CGI/SSI ¥×¥í¥°¥é¥à¥Õ¥¡¥¤¥ë¤¬Â¾¥¢¥«¥¦¥ó¥È¤«¤é
-        ½ñ¤­¹þ¤á¤ë¤è¤¦¤Ë¤Ê¤Ã¤Æ<em>¤¤¤Ê¤¤</em>¤«?</strong>
-
-        <p class="indent">
-          ½êÍ­¼Ô°Ê³°¤Ë¤Ï CGI/SSI ¥×¥í¥°¥é¥à¤òÊѹ¹¤¹¤ë¸¢¸Â¤ÏÍ¿¤¨¤é¤ì¤Þ¤»¤ó¡£
-        </p>
-      </li>
-
-
-      <li>
-        <strong>ÂоݤȤʤë CGI/SSI ¥×¥í¥°¥é¥à¤¬ setuid ¤Þ¤¿¤Ï setgid 
-        ¤µ¤ì¤Æ<em>¤¤¤Ê¤¤</em>¤«?</strong>
-
-        <p class="indent">
-          UID/GID ¤òºÆÅÙÊѹ¹¤·¤Æ¤Î¥×¥í¥°¥é¥à¼Â¹Ô¤Ï¤·¤Þ¤»¤ó
-        </p>
-      </li>
-
-
-      <li>
-        <strong>ÂоݤȤʤë¥æ¡¼¥¶/¥°¥ë¡¼¥×¤¬¥×¥í¥°¥é¥à¤Î
-        ¥æ¡¼¥¶/¥°¥ë¡¼¥×¤ÈƱ¤¸¤«?</strong>
-
-        <p class="indent">
-          ¥æ¡¼¥¶¤¬¤½¤Î¥Õ¥¡¥¤¥ë¤Î½êÍ­¼Ô¤Ç¤¹¤«?
-        </p>
-      </li>
-
-      <li>
-        <strong>°ÂÁ´¤ÊÆ°ºî¤òÊݾڤ¹¤ë¤¿¤á¤Î´Ä¶­ÊÑ¿ô¥¯¥ê¥¢¤¬²Äǽ¤«?
-        </strong>
-
-        <p class="indent">
-          suEXEC ¤Ï¡¢°ÂÁ´¤Ê´Ä¶­ÊÑ¿ô¤Î¥ê¥¹¥È
-          (¤³¤ì¤é¤ÏÀßÄê»þ¤ËºîÀ®¤µ¤ì¤Þ¤¹) Æâ¤ÎÊÑ¿ô¤È¤·¤ÆÅϤµ¤ì¤ë°ÂÁ´¤Ê
-          PATH ÊÑ¿ô (ÀßÄê»þ¤Ë»ØÄꤵ¤ì¤Þ¤¹) ¤òÀßÄꤹ¤ë¤³¤È¤Ç¡¢
-          ¥×¥í¥»¥¹¤Î´Ä¶­ÊÑ¿ô¤ò¥¯¥ê¥¢¤·¤Þ¤¹¡£
-        </p>
-      </li>
-
-
-      <li>
-        <strong>ÂоݤȤʤë CGI/SSI ¥×¥í¥°¥é¥à¤ò exec ¤·¤Æ¼Â¹Ô¤Ç¤­¤ë¤«?</strong>
-
-
-        <p class="indent">
-          ¤³¤³¤Ç suEXEC ¤¬½ªÎ»¤·¡¢ÂоݤȤʤë¥×¥í¥°¥é¥à¤¬³«»Ï¤µ¤ì¤Þ¤¹¡£
-        </p>
-      </li>
-    </ol>
-
-    <p>¤³¤³¤Þ¤Ç¤¬ suEXEC ¤Î wrapper
-    ¤Ë¤ª¤±¤ë¥»¥­¥å¥ê¥Æ¥£¥â¥Ç¥ë¤Îɸ½àŪ¤ÊÆ°ºî¤Ç¤¹¡£¤â¤¦¾¯¤·¸·½Å¤Ë
-    CGI/SSI À߷פˤĤ¤¤Æ¤Î¿·¤·¤¤À©¸Â¤äµ¬Äê¤ò¼è¤êÆþ¤ì¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¤¬¡¢
-    suEXEC ¤Ï¥»¥­¥å¥ê¥Æ¥£¤ËÃí°Õ¤·¤Æ¿µ½Å¤Ë¾¯¤·¤º¤Ä³«È¯¤µ¤ì¤Æ¤­¤Þ¤·¤¿¡£
-    </p>
-
-    <p>¤³¤Î¥»¥­¥å¥ê¥Æ¥£¥â¥Ç¥ë¤òÍѤ¤¤Æ
-    ¥µ¡¼¥ÐÀßÄê»þ¤Ë¤É¤Î¤è¤¦¤Ëµö¤¹¤³¤È¤òÀ©¸Â¤¹¤ë¤«¡¢¤Þ¤¿¡¢suEXEC
-    ¤òŬÀÚ¤ËÀßÄꤹ¤ë¤È¤É¤Î¤è¤¦¤Ê¥»¥­¥å¥ê¥Æ¥£¾å¤Î´í¸±¤òÈò¤±¤é¤ì¤ë¤«¤Ë
-    ´Ø¤¹¤ë¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢<a href="#jabberwock">"¤È¤«¤²¤ËÃí°Õ"
-    (Beware the Jabberwock)</a> ¤Î¾Ï¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-    </p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="install" id="install">suEXEC
-    ¤ÎÀßÄê¤È¥¤¥ó¥¹¥È¡¼¥ë</a></h2>
-
-    <p>¤³¤³¤«¤é³Ú¤·¤¯¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <p><strong>suEXEC
-    ÀßÄꥪ¥×¥·¥ç¥ó</strong><br />
-    </p>
-
-    <dl>
-      <dt><code>--enable-suexec</code></dt>
-
-      <dd>¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤º¡¢
-      Í­¸ú¤Ë¤Ï¤Ê¤é¤Ê¤¤ suEXEC µ¡Ç½¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£
-      suEXEC ¤ò»È¤¦¤è¤¦¤Ë APACI ¤ËÍ׵᤹¤ë¤Ë¤Ï¡¢<code>--enable-suexec</code>
-      ¥ª¥×¥·¥ç¥ó¤Ë¤¢¤ï¤»¤Æ¾¯¤Ê¤¯¤È¤â°ì¤Ä¤Ï <code>--with-suexec-xxxxx</code>
-      ¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</dd>
-
-      <dt><code>--with-suexec-bin=<em>PATH</em></code></dt>
-
-      <dd>¥»¥­¥å¥ê¥Æ¥£¾å¤ÎÍýͳ¤Ë¤è¤ê¡¢<code>suexec</code> ¥Ð¥¤¥Ê¥ê¤Î¥Ñ¥¹¤Ï¥µ¡¼¥Ð¤Ë
-      ¥Ï¡¼¥É¥³¡¼¥É¤µ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Î¥Ñ¥¹¤ò
-      ÊѤ¨¤¿¤¤¤È¤­¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£<em>Î㤨¤Ð</em>¡¢
-      <code>--with-suexec-bin=/usr/sbin/suexec</code> ¤Î¤è¤¦¤Ë¡£</dd>
-
-      <dt><code>--with-suexec-caller=<em>UID</em></code></dt>
-
-      <dd>Apache ¤òÄ̾ïÆ°ºî¤µ¤»¤ë<a href="mod/mpm_common.html#user">¥æ¡¼¥¶Ì¾</a>¤ò»ØÄꤷ¤Þ¤¹¡£
-      ¤³¤Î¥æ¡¼¥¶¤À¤±¤¬ suexec ¤Î¼Â¹Ô¤òµö²Ä¤µ¤ì¤¿¥æ¡¼¥¶¤Ë¤Ê¤ê¤Þ¤¹¡£</dd>
-
-      <dt><code>--with-suexec-userdir=<em>DIR</em></code></dt>
-
-      <dd>suEXEC ¤¬¥¢¥¯¥»¥¹¤òµö¤µ¤ì¤ë¥æ¡¼¥¶¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥êÇÛ²¼¤Î
-      ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤷ¤Þ¤¹¡£
-      ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ÎÁ´¼Â¹Ô¥Õ¥¡¥¤¥ë¤Ï¡¢"°ÂÁ´¤Ê"¥×¥í¥°¥é¥à¤Ë¤Ê¤ë¤è¤¦¡¢
-      suEXEC ¤¬¤½¤Î¥æ¡¼¥¶¤È¤·¤Æ¼Â¹Ô¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
-      "ñ½ã¤Ê" UserDir ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç 
-      (¤¹¤Ê¤ï¤Á "*" ¤ò´Þ¤Þ¤Ê¤¤¤â¤Î)¡¢¤³¤ì¤ÈƱ¤¸ÃͤòÀßÄꤹ¤Ù¤­¤Ç¤¹¡£
-      Userdir ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬¤½¤Î¥æ¡¼¥¶¤Î¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ëÆâ¤Î
-      ¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤ÈƱ¤¸¾ì½ê¤ò»Ø¤·¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢
-      suEXEC ¤ÏŬÀÚ¤ËÆ°ºî¤·¤Þ¤»¤ó¡£¥Ç¥Õ¥©¥ë¥È¤Ï "public_html" ¤Ç¤¹¡£
-      <br />
-      ³Æ UserDir ¤¬°Û¤Ê¤Ã¤¿²¾ÁÛ¥Û¥¹¥È¤òÀßÄꤷ¤Æ¤¤¤ë¾ì¹ç¡¢
-      ¤½¤ì¤é¤òÁ´¤Æ°ì¤Ä¤Î¿Æ¥Ç¥£¥ì¥¯¥È¥ê¤Ë´Þ¤á¤Æ¡¢
-      ¤½¤Î¿Æ¥Ç¥£¥ì¥¯¥È¥ê¤Î̾Á°¤ò¤³¤³¤Ç»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-      <strong>¤³¤Î¤è¤¦¤Ë»ØÄꤵ¤ì¤Ê¤±¤ì¤Ð "~userdir" cgi
-      ¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤¬Æ°ºî¤·¤Þ¤»¤ó¡£</strong></dd>
-
-      <dt><code>--with-suexec-docroot=<em>DIR</em></code></dt>
-
-      <dd>Apache ¤Î¥É¥­¥å¥á¥ó¥È¥ë¡¼¥È¤òÀßÄꤷ¤Þ¤¹¡£¤³¤ì¤¬ suEXEC
-      ¤ÎÆ°ºî¤Ç»ÈÍѤ¹¤ëÍ£°ì¤Î¥Ç¥£¥ì¥¯¥È¥ê³¬Áؤˤʤê¤Þ¤¹ (UserDir
-      ¤Î»ØÄê¤ÏÊÌ)¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï <code>--datedir</code> ¤Ë "/htdocs"
-      ¤È¤¤¤¦¥µ¥Õ¥£¥Ã¥¯¥¹¤ò¤Ä¤±¤¿¤â¤Î¤Ç¤¹¡£
-      "<code>--datadir=/home/apache</code>" ¤È¤·¤ÆÀßÄꤹ¤ë¤È¡¢
-      suEXEC wrapper ¤Ë¤È¤Ã¤Æ "/home/apache/htdocs"
-      ¤¬¥É¥­¥å¥á¥ó¥È¥ë¡¼¥È¤È¤·¤Æ»È¤ï¤ì¤Þ¤¹¡£</dd>
-
-      <dt><code>--with-suexec-uidmin=<em>UID</em></code></dt>
-
-      <dd>suEXEC ¤ÎÂоݥ桼¥¶¤È¤·¤Æµö¤µ¤ì¤ë UID ¤ÎºÇ¾®Ãͤò»ØÄꤷ¤Þ¤¹¡£
-      ÂçÄñ¤Î¥·¥¹¥Æ¥à¤Ç¤Ï 500 ¤« 100 ¤¬°ìÈÌŪ¤Ç¤¹¡£
-      ¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï 100 ¤Ç¤¹¡£</dd>
-
-      <dt><code>--with-suexec-gidmin=<em>GID</em></code></dt>
-
-      <dd>suEXEC ¤ÎÂоݥ°¥ë¡¼¥×¤È¤·¤Æµö¤µ¤ì¤ë GID
-      ¤ÎºÇ¾®Ãͤò»ØÄꤷ¤Þ¤¹¡£ÂçÄñ¤Î¥·¥¹¥Æ¥à¤Ç¤Ï 100 ¤¬°ìÈÌŪ¤Ê¤Î¤Ç¡¢
-      ¥Ç¥Õ¥©¥ë¥ÈÃͤȤ·¤Æ¤â 100 ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£</dd>
-
-      <dt><code>--with-suexec-logfile=<em>FILE</em></code></dt>
-
-      <dd>suEXEC ¤Î½èÍý¤È¥¨¥é¡¼¤¬µ­Ï¿¤µ¤ì¤ë¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤷ¤Þ¤¹¡£
-      (´Æºº¤ä¥Ç¥Ð¥Ã¥°ÌÜŪ¤ËÍ­ÍÑ)
-      ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥í¥°¥Õ¥¡¥¤¥ë¤Ï "suexec_log" ¤È¤¤¤¦Ì¾Á°¤Ç¡¢
-      ɸ½à¤Î¥í¥°¥Õ¥¡¥¤¥ë¥Ç¥£¥ì¥¯¥È¥ê (<code>--logfiledir</code>) ¤ËÃÖ¤«¤ì¤Þ¤¹¡£
-      </dd>
-
-      <dt><code>--with-suexec-safepath=<em>PATH</em></code></dt>
-
-      <dd>CGI ¼Â¹Ô¥Õ¥¡¥¤¥ë¤ËÅϤµ¤ì¤ë°ÂÁ´¤Ê PATH ´Ä¶­ÊÑ¿ô¤Ç¤¹¡£
-      ¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï "/usr/local/bin:/usr/bin:/bin" ¤Ç¤¹¡£
-      </dd>
-    </dl>
-
-    <p><strong>suEXEC wrapper
-    ¤Î¥³¥ó¥Ñ¥¤¥ë¤È¥¤¥ó¥¹¥È¡¼¥ë</strong><br />
-    <code>--enable-suexec</code> ¥ª¥×¥·¥ç¥ó¤Ç suEXEC µ¡Ç½¤òÍ­¸ú¤Ë¤¹¤ë¤È¡¢
-    "make" ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤¿»þ¤Ë <code>suexec</code> ¤Î¥Ð¥¤¥Ê¥ê (Apache ¼«ÂΤâ)
-    ¤¬¼«Æ°Åª¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£
-    <br />
-    ¤¹¤Ù¤Æ¤Î¹½À®Í×ÁǤ¬ºîÀ®¤µ¤ì¤ë¤È¡¢¤½¤ì¤é¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ï
-    <code>make install</code> ¥³¥Þ¥ó¥É¤¬¼Â¹Ô¤Ç¤­¤Þ¤¹¡£¥Ð¥¤¥Ê¥ê¥¤¥á¡¼¥¸¤Î <code>suexec</code>
-    ¤Ï <code>--sbindir</code> ¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£
-    ¥Ç¥Õ¥©¥ë¥È¤Î¾ì½ê¤Ï "/usr/local/apache/sbin/suexec" ¤Ç¤¹¡£<br />
-    ¥¤¥ó¥¹¥È¡¼¥ë»þ¤Ë¤Ï <strong><em>root</em></strong>
-    ¸¢¸Â¤¬É¬ÍפʤΤÇÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£wrapper ¤¬¥æ¡¼¥¶ ID
-    ¤òÀßÄꤹ¤ë¤¿¤á¤Ë¡¢½êÍ­¼Ô <code><em>root</em></code>
-    ¤Ç¤Î¥»¥Ã¥È¥æ¡¼¥¶ ID
-    ¥Ó¥Ã¥È¤ò¤½¤Î¥Õ¥¡¥¤¥ë¤Î¥â¡¼¥É¤ËÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-    </p>
-
-    <p><strong>°ÂÁ´¤Ê¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤òÀßÄꤹ¤ë</strong><br />
-    suEXEC ¥é¥Ã¥Ñ¡¼¤Ï¡¢<code>--with-suexec-caller</code> <code class="program"><a href="./programs/configure.html">configure</a></code> 
-    ¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤷ¤¿Àµ¤·¤¤¥æ¡¼¥¶¤Çµ¯Æ°¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Þ¤¹¤¬¡¢
-    ¥·¥¹¥Æ¥à¾å¤Ç¤³¤Î¥Á¥§¥Ã¥¯¤¬¹Ô¤Ê¤ï¤ì¤ëÁ°¤Ë¡¢
-    suEXEC ¤¬¸Æ¤Ö¥·¥¹¥Æ¥à¤ä¥é¥¤¥Ö¥é¥ê¤¬Àȼå¤Ç¤¢¤ë²ÄǽÀ­¤Ï»Ä¤ê¤Þ¤¹¡£Âй³ºö¤È¤·¤Æ¡¢
-    °ìÈ̤ËÎɤ¤½¬´·¤È¤â¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢
-    ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤ò»È¤Ã¤Æ
-    Apache ¤Î¼Â¹Ô»þ¤Î¥°¥ë¡¼¥×¤Î¤ß¤¬ suEXEC ¤ò¼Â¹Ô¤Ç¤­¤ë¤è¤¦¤Ë
-    ¤¹¤ë¤Î¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¥µ¡¼¥Ð¤¬ÀßÄꤵ¤ì¤Æ¤¤¤¿¤È¤·¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>
-    User www<br />
-    Group webgroup<br />
-</code></p></div>
-
-    <p><code class="program"><a href="./programs/suexec.html">suexec</a></code> ¤¬ "/usr/local/apache2/sbin/suexec" 
-    ¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤¿¾ì¹ç¡¢¼¡¤Î¤è¤¦¤ËÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>
-    chgrp webgroup /usr/local/apache2/bin/suexec<br />
-    chmod 4750 /usr/local/apache2/bin/suexec<br />
-</code></p></div>
-
-    <p>¤³¤ì¤Ç Apache ¤¬¼Â¹Ô¤µ¤ì¤ë¥°¥ë¡¼¥×¤Î¤ß¤¬ 
-    suEXEC ¥é¥Ã¥Ñ¡¼¤ò¼Â¹Ô¤Ç¤­¤ë¤È¤¤¤¦¤³¤È¤ò
-    ³Î¾Ú¤·¤Þ¤¹¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="enable" id="enable">suEXEC
-    ¤ÎÍ­¸ú²½¤È̵¸ú²½</a></h2>
-
-    <p>µ¯Æ°»þ¤Ë¡¢Apache ¤Ï <code>--sbindir</code>
-    ¥ª¥×¥·¥ç¥ó¤ÇÀßÄꤵ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ç
-    <code>suexec</code> ¤òõ¤·¤Þ¤¹
-    (¥Ç¥Õ¥©¥ë¥È¤Ï "/usr/local/apache/sbin/suexec") ¡£
-    ŬÀÚ¤ËÀßÄꤵ¤ì¤¿ suEXEC ¤¬¤ß¤Ä¤«¤ë¤È¡¢
-    ¥¨¥é¡¼¥í¥°¤Ë°Ê²¼¤Î¥á¥Ã¥»¡¼¥¸¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>
-    [notice] suEXEC mechanism enabled (wrapper: <var>/path/to/suexec</var>)
-</code></p></div>
-
-    <p>¥µ¡¼¥Ðµ¯Æ°»þ¤Ë¤³¤Î¥á¥Ã¥»¡¼¥¸¤¬½Ð¤Ê¤¤¾ì¹ç¡¢
-    ÂçÄñ¤Ï¥µ¡¼¥Ð¤¬ÁÛÄꤷ¤¿¾ì½ê¤Ç wrapper ¥×¥í¥°¥é¥à¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¤«¡¢
-    <em>setuid root</em> ¤È¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¤Ç¤¹¡£</p>
-
-    <p>suEXEC ¤Î»ÅÁȤߤò»ÈÍѤ¹¤ë¤Î¤¬½é¤á¤Æ¤Ç¡¢Apache ¤¬´û¤ËÆ°ºîÃæ¤Ç¤¢¤ì¤Ð¡¢
-    Apache ¤ò kill ¤·¤Æ¡¢ºÆµ¯Æ°¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£HUP ¥·¥°¥Ê¥ë¤ä
-    USR1 ¥·¥°¥Ê¥ë¤Ë¤è¤ëñ½ã¤ÊºÆµ¯Æ°¤Ç¤ÏÉÔ½½Ê¬¤Ç¤¹¡£</p>
-    <p>suEXEC ¤ò̵¸ú¤Ë¤¹¤ë¾ì¹ç¤Ï¡¢<code>suexec</code> ¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Æ¤«¤é
-    Apache ¤ò kill ¤·¤ÆºÆµ¯Æ°¤·¤Þ¤¹¡£
-    </p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="usage" id="usage">suEXEC ¤Î»ÈÍÑ</a></h2>
-
-    <p>CGI ¥×¥í¥°¥é¥à¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤¬ suEXEC ¥é¥Ã¥Ñ¡¼¤ò¸Æ¤Ö¤Î¤Ï¡¢
-    <code class="directive"><a href="./mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    ´Þ¤à¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤«¡¢<code class="module"><a href="./mod/mod_userdir.html">mod_userdir</a></code> ¤Ë¤è¤ê
-    ½èÍý¤µ¤ì¤¿¥ê¥¯¥¨¥¹¥È¤Î¾ì¹ç¤Ë¸Â¤ê¤Þ¤¹¡£</p>
-
-    <p><strong>²¾ÁÛ¥Û¥¹¥È:</strong><br />
-    suEXEC wrapper ¤Î»È¤¤Êý¤È¤·¤Æ¡¢
-    <code class="directive"><a href="./mod/core.html#virtualhost">VirtualHost</a></code> ÀßÄê¤Ç¤Î
-    <code class="directive"><a href="./mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÄ̤·¤¿¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò¥á¥¤¥ó¥µ¡¼¥Ð¤Î¥æ¡¼¥¶ ID
-    ¤È°Û¤Ê¤ë¤â¤Î¤Ë¤¹¤ë¤È¡¢CGI ¥ê¥½¡¼¥¹¤Ø¤Î¤¹¤Ù¤Æ¤Î¥ê¥¯¥¨¥¹¥È¤Ï¡¢¤½¤Î
-    <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> ¤Ç»ØÄꤵ¤ì¤¿ <em>User</em> ¤È
-    <em>Group</em> ¤È¤·¤Æ¼Â¹Ô¤µ¤ì¤Þ¤¹¡£<code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-    ¤Ç¤³¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢
-    ¥á¥¤¥ó¥µ¡¼¥Ð¤Î¥æ¡¼¥¶ ID ¤¬ÁÛÄꤵ¤ì¤Þ¤¹¡£</p>
-
-    <p><strong>¥æ¡¼¥¶¥Ç¥£¥ì¥¯¥È¥ê:</strong><br />
-    <code class="module"><a href="./mod/mod_userdir.html">mod_userdir</a></code> ¤Ë¤è¤ê½èÍý¤µ¤ì¤¿¥ê¥¯¥¨¥¹¥È¤Ï
-    ¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿¥æ¡¼¥¶¥Ç¥£¥ì¥¯¥È¥ê¤Î¥æ¡¼¥¶ ID ¤Ç CGI ¥×¥í¥°¥é¥à¤ò
-    ¼Â¹Ô¤¹¤ë¤¿¤á¤Ë suEXEC ¥é¥Ã¥Ñ¡¼¤ò¸Æ¤Ó¤Þ¤¹¡£
-    ¤³¤Îµ¡Ç½¤òÆ°ºî¤µ¤»¤ë¤¿¤á¤ËɬÍפʤ³¤È¤Ï¡¢CGI
-    ¤ò¤½¤Î¥æ¡¼¥¶¤Ç¼Â¹Ô¤Ç¤­¤ë¤³¤È¡¢¤½¤Î¥¹¥¯¥ê¥×¥È¤¬¾åµ­¤Î<a href="#model">¥»¥­¥å¥ê¥Æ¥£¸¡ºº</a>¤ò¥Ñ¥¹¤Ç¤­¤ë¤³¤È¤Ç¤¹¡£
-    <a href="#install">¥³¥ó¥Ñ¥¤¥ë
-     »þ¤Î¥ª¥×¥·¥ç¥ó</a> <code>--with-suexec-userdir</code> ¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="debug" id="debug">suEXEC ¤Î¥Ç¥Ð¥Ã¥°</a></h2>
-
-    <p>suEXEC wrapper ¤Ï¡¢¾åµ­¤Ç½Ò¤Ù¤¿ <code>--with-suexec-logfile</code>
-    ¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ë¥í¥°¾ðÊó¤òµ­Ï¿¤·¤Þ¤¹¡£
-    wrapper ¤òŬÀÚ¤ËÀßÄê¡¢¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Æ¤¤¤ë¤È»×¤¦¾ì¹ç¡¢
-    ¤É¤³¤Ç̤äƤ¤¤ë¤«¸«¤è¤¦¤È¤¹¤ë¤Ê¤é¤³¤Î¥í¥°¤È¥µ¡¼¥Ð¤Î
-    ¥¨¥é¡¼¥í¥°¤ò¸«¤ë¤È¤è¤¤¤Ç¤·¤ç¤¦¡£</p>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="jabberwock" id="jabberwock">¤È¤«¤²¤ËÃí°Õ: ·Ù¹ð¤È»öÎã</a></h2>
-
-    <p><strong>Ãí°Õ!</strong>
-    ¤³¤Î¾Ï¤Ï´°Á´¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¤³¤Î¾Ï¤ÎºÇ¿·²þÄûÈǤˤĤ¤¤Æ¤Ï¡¢
-    Apache ¥°¥ë¡¼¥×¤Î<a href="http://httpd.apache.org/docs/2.2/suexec.html">
-    ¥ª¥ó¥é¥¤¥ó¥É¥­¥å¥á¥ó¥È</a>ÈǤò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-    </p>
-
-    <p>¥µ¡¼¥Ð¤ÎÀßÄê¤ËÀ©¸Â¤ò¤â¤¦¤±¤ë wrapper ¤Ë¤Ä¤¤¤Æ¡¢
-    ¤¤¤¯¤Ä¤«¶½Ì£¿¼¤¤ÅÀ¤¬¤¢¤ê¤Þ¤¹¡£suEXEC ¤Ë´Ø¤¹¤ë "¥Ð¥°"
-    ¤òÊó¹ð¤¹¤ëÁ°¤Ë¤³¤ì¤é¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <ul>
-      <li><strong>suEXEC ¤Î¶½Ì£¿¼¤¤ÅÀ</strong></li>
-
-      <li>³¬Áع½Â¤¤ÎÀ©¸Â
-
-
-        <p class="indent">
-          ¥»¥­¥å¥ê¥Æ¥£¤È¸úΨ¤ÎÍýͳ¤«¤é¡¢<code>suEXEC</code> ¤ÎÁ´¤Æ¤Î¥ê¥¯¥¨¥¹¥È¤Ï
-          ²¾ÁÛ¥Û¥¹¥È¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ë¤ª¤±¤ëºÇ¾å°Ì¤Î¥É¥­¥å¥á¥ó¥È¥ë¡¼¥ÈÆ⤫¡¢
-          ¥æ¡¼¥¶¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ë¤ª¤±¤ë¸Ä¡¹¤Î¥æ¡¼¥¶¤ÎºÇ¾å°Ì¤Î
-          ¥É¥­¥å¥á¥ó¥È¥ë¡¼¥ÈÆâ¤Ë»Ä¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-          Î㤨¤Ð¡¢»Í¤Ä¤Î²¾ÁÛ¥Û¥¹¥È¤òÀßÄꤷ¤Æ¤¤¤ë¾ì¹ç¡¢
-          ²¾ÁÛ¥Û¥¹¥È¤Î suEXEC ¤ËÍ­Íø¤Ê¤è¤¦¤Ë¡¢¥á¥¤¥ó¤Î Apache
-          ¥É¥­¥å¥á¥ó¥È³¬Áؤγ°Â¦¤ËÁ´¤Æ¤Î²¾ÁÛ¥Û¥¹¥È¤Î¥É¥­¥å¥á¥ó¥È¥ë¡¼¥È¤ò
-          ¹½ÃÛ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£(Îã¤Ï¸åÆüµ­ºÜ)
-        </p>
-      </li>
-
-      <li>suEXEC ¤Î PATH ´Ä¶­ÊÑ¿ô
-
-
-        <p class="indent">
-          ¤³¤ì¤òÊѹ¹¤¹¤ë¤Î¤Ï´í¸±¤Ç¤¹¡£¤³¤Î»ØÄê¤Ë´Þ¤Þ¤ì¤ë³Æ¥Ñ¥¹¤¬
-          <strong>¿®Íê¤Ç¤­¤ë</strong>
-          ¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¢¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
-          À¤³¦¤«¤é¤Î¥¢¥¯¥»¥¹¤Ë¤è¤ê¡¢Ã¯¤«¤¬¥Û¥¹¥È¾å¤Ç¥È¥í¥¤¤ÎÌÚÇÏ
-          ¤ò¼Â¹Ô¤Ç¤­¤ë¤è¤¦¤Ë¤Ï¤·¤¿¤¯¤Ê¤¤¤Ç¤·¤ç¤¦¡£
-        </p>
-      </li>
-
-      <li>suEXEC ¥³¡¼¥É¤Î²þ¤
-
-
-        <p class="indent">
-          ·«¤êÊÖ¤·¤Þ¤¹¤¬¡¢²¿¤ò¤ä¤í¤¦¤È¤·¤Æ¤¤¤ë¤«ÇÄ°®¤»¤º¤Ë¤³¤ì¤ò¤ä¤ë¤È
-          <strong>Â礭¤ÊÌäÂê</strong>¤ò°ú¤­µ¯¤³¤·¤«¤Í¤Þ¤»¤ó¡£
-          ²Äǽ¤Ê¸Â¤êÈò¤±¤Æ¤¯¤À¤µ¤¤¡£
-        </p>
-      </li>
-    </ul>
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./en/suexec.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./ja/suexec.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/suexec.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/suexec.html.ja.utf8 b/docs/manual/suexec.html.ja.utf8
new file mode 100644
index 00000000..3ee1346a
--- /dev/null
+++ b/docs/manual/suexec.html.ja.utf8
@@ -0,0 +1,611 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>suEXEC サ�ート - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>suEXEC サ�ート</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./en/suexec.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./ja/suexec.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/suexec.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+
+    <p><strong>suEXEC</strong>
+    機能�より�Apache ユーザ� Web サー�を実行���るユーザ ID ��
+    異�るユーザ ID � <strong>CGI</strong> プログラムや <strong>SSI</strong> 
+    プログラムを実行�る�������。CGI プログラム��� SSI
+    プログラムを実行�る場��通常� web サー����ユーザ�実行�れ��。
+    </p>
+
+    <p>�切�使用�る����機能�よりユーザ�個別� CGI
+    や SSI プログラムを開発�実行�る���生�るセキュリティ上��険を�
+    ��り減ら��������。����suEXEC �設定���切���
+    多���題�生������コンピュータ�新��セキュリティホールを
+    作������能性��り��。���� <em>setuid root</em>
+    �れ�プログラム���れら�ら生�るセキュリティ上��題�管��
+    詳����よ��ら�suEXEC �使用を検討���よ��強�推奨���。
+    </p>
+  </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#before">始�る��</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#model">suEXEC セキュリティモデル</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#install">suEXEC
+    �設定�インストール</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#enable">suEXEC
+    �有効化�無効化</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#usage">suEXEC �使用</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#debug">suEXEC �デ�ッグ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#jabberwock">����注�: 警告�事例</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="before" id="before">始�る��</a></h2>
+
+    <p>��文書�先頭�飛����Apache
+    グループ���文書��仮定を知��������ょ�。
+    </p>
+
+    <p>第 1 ������ <strong>setuid</strong> �
+    <strong>setgid</strong> �作��能� UNIX
+    由��オペレーティングシステムを使���る��を想定�����。
+    �れ������コマンド例�����り��。
+    ��他�プラットホーム���も� suEXEC
+    �サ�ート�れ������も設定�異�る�も�れ��ん。</p>
+
+    <p>第 2 ������使用中�コンピュータ�
+    セキュリティ�関�る基本的�概念���れら�管�����詳����を
+    想定�����。�れ��<strong>setuid/setgid</strong>
+    �作�����システム上�����作�よる様々�効果�
+    セキュリティレベル���������解���る�����を����。
+    </p>
+
+    <p>第 3 ��<strong>改造�れ����</strong> suEXEC
+    コード�使用を想定�����。suEXEC �コード��
+    多��ベータテスタ������開発者�よ��も注�深�精査�れ
+    テスト�れ����。�れら�注��より�簡潔�信頼��る安全�
+    コード�基盤��証�れ��。��コードを改変�る����
+    予期�れ���題や新��セキュリティ上��険�生�る����り��。
+    セキュリティプログラミング�詳細�通�����
+    今後�検討�����果を Apache
+    グループ�共有�よ��������れ��suEXEC
+    コード�変�����を <strong>強�</strong>推奨���。</p>
+
+    <p>第 4 ���れ�最後����suEXEC を Apache
+    �デフォルトインストール��<strong>����</strong>���
+    Apache グループ�決定�れ����。�れ��suEXEC
+    �設定��管�者�詳細���る慎��注��必���ら��。
+    suEXEC �様々�設定����検討�終�れ��管�者� suEXEC
+    を通常�インストール方法�インストール�る�������。
+    �れら�設定値��suEXEC
+    機能�使用中�システムセキュリティを�切�������
+    管�者�よ��慎��決定�れ指定�れる���必���。
+    ��詳細�手順�より�Apache グループ��suEXEC
+    �インストール�����注�深��分�検討���れを使用�る��を
+    決定��場������������考�����。
+    </p>
+
+    <p>�れ�も進����? よ���。���先�進���ょ�!</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="model" id="model">suEXEC セキュリティモデル</a></h2>
+
+    <p>suEXEC �設定�インストールを始�る���
+    ��実装�よ�����るセキュリティモデル����論������。
+    �れ���suEXEC �内部�行��れ��る���
+    システム�セキュリティを�証�る���警告�れる��を
+    よ��解�����方�よ���ょ�。</p>
+
+    <p><strong>suEXEC</strong> ��Apache web
+    サー��ら呼�出�れる setuid �れ� "wrapper"
+    プログラム�基本�������。設計�� CGI���� SSI
+    プログラム�� HTTP リクエスト��る���� wrapper
+    �呼�出�れ��。��よ��リクエスト��る��Apache
+    ���プログラム�実行�れる際�プログラム��ユーザ ID �グループ
+    ID を指定�� suEXEC wrapper を実行���。
+    </p>
+
+    <p>�れ�ら�wrapper ��功���失敗を決定�る��
+    以下�処�を行����。�れら�状態���一��も失敗��場��
+    プログラム�失敗をログ�記録��エラー�終了���。
+    �����れ��後�処��続�られ��。</p>
+
+    <ol>
+      <li>
+        <strong>wrapper
+        を実行���るユーザ���システム�正当�ユーザ�?</strong>
+
+        <p class="indent">
+          �れ��wrapper を実行���るユーザ�
+          本当�システム�利用者��る��を�証�る����。
+        </p>
+      </li>
+
+
+     <li>
+        <strong>wrapper ��切�数�引数�呼�出�れ��?</strong>
+
+
+        <p class="indent">
+          wrapper ��切�数�引数�与�られ�場����実行�れ��。
+          �切�引数�フォーマット� Apache Web サー��解釈�れ��。
+          �切�数�引数を���ら��れ��攻撃を�れ��
+          ���� Apache �イナリ� suEXEC �部分�
+          ��������能性��り��。
+        </p>
+      </li>
+
+      <li>
+        <strong>��正当�ユーザ� wrapper
+        �実行を許��れ��る�?</strong>
+
+        <p class="indent">
+          ��ユーザ� wrapper 実行を許��れ�ユーザ���?
+          ��一人�ユーザ (Apache ユーザ) ����
+          ��プログラム�実行を許��れ��。
+        </p>
+      </li>
+
+      <li>
+        <strong>対象� CGI, SSI プログラム�安全���階層��照を���る�?
+        </strong>
+
+        <p class="indent">
+          対象� CGI, SSI プログラム� '/' �ら始�る����
+          '..' �よる�照を行�������? �れら�許��れ��ん。
+          対象�プログラム� suEXEC �ドキュメントルート
+          (下記� <code>--with-suexec-docroot=<em>DIR</em></code> を�照)
+          内�存在���れ��り��ん。
+        </p>
+      </li>
+
+      <li>
+        <strong>対象��るユーザ��正当�も��?</strong>
+
+        <p class="indent">
+          対象��るユーザ��存在������?
+        </p>
+      </li>
+
+      <li>
+        <strong>対象��るグループ��正当�も��?</strong>
+
+        <p class="indent">
+          対象��るグループ��存在������?
+        </p>
+      </li>
+
+      <li>
+        <strong>目的�ユーザ�スーパーユーザ��<em>��</em>�?
+        </strong>
+
+        <p class="indent">
+          今�����suEXEC � <code><em>root</em></code> �よる CGI/SSI
+          プログラム�実行を許������ん。
+        </p>
+      </li>
+
+      <li>
+        <strong>対象��るユーザ ID ��最�� ID
+        番�よりも<em>大��</em>�?  </strong>
+
+        <p class="indent">
+          最�ユーザ ID 番��設定時�指定�れ��。�れ��
+          CGI/SSI プログラム実行を許��れるユーザ ID
+          ��り�る最�値��。�れ�
+          "system" 用�アカウントを閉�出���有効��。
+        </p>
+      </li>
+
+      <li>
+        <strong>対象��るグループ�スーパーユーザ�グループ��
+        <em>��</em>�?</strong>
+
+        <p class="indent">
+         今�����suEXEC � 'root' グループ�よる CGI/SSI
+         プログラム�実行を許������ん。
+        </p>
+      </li>
+
+      <li>
+        <strong>対象��るグループ ID �最�� ID
+          番�よりも<em>大��</em>�?</strong>
+
+        <p class="indent">
+          最�グループ ID 番��設定時�指定�れ��。�れ��
+          CGI/SSI プログラム実行を許��れるグループ
+          ID ��り�る最�値��。
+          �れ� "system" 用�グループを閉�出���有効��。
+        </p>
+      </li>
+
+      <li>
+        <strong>wrapper �正常�対象��るユーザ�グループ��れる�?
+        </strong>
+
+        <p class="indent">
+          ����setuid � setgid
+          �起動�よりプログラム�対象��るユーザ�グループ��り��。
+          グループアクセスリスト��
+          ユーザ�属���る����グループ��期化�れ��。
+        </p>
+      </li>
+
+      <li>
+        <strong>CGI/SSI プログラム�置�れ��るディレクトリ�移動
+        (change directory) ��る�?</strong>
+
+        <p class="indent">
+          ディレクトリ�存在����ら���ファイルも存在����も�れ��ん。
+          ディレクトリ�移動�������れ����ら�存在も�����ょ�。
+        </p>
+      </li>
+
+      <li>
+        <strong>ディレクトリ� Apache �ドキュメントツリー内��る�?
+        </strong>
+
+        <p class="indent">
+          リクエスト�サー�内�も���れ��
+          �求�れ�ディレクトリ� suEXEC �ドキュメントルート�下��り���?
+          リクエスト� UserDir �も���れ���求�れ�ディレクトリ� suEXEC 
+          �ユーザ�ドキュメントルート�下��り���?
+          (<a href="#install">suEXEC 設定オプション</a> �照)
+        </p>
+      </li>
+
+      <li>
+        <strong>ディレクトリを他�ユーザ�書�込�るよ�����
+        <em>���</em>�?</strong>
+
+        <p class="indent">
+          ディレクトリを他ユーザ�開放���よ�����。
+          所有ユーザ�����ディレクトリ�内容を改変��るよ�����。
+        </p>
+      </li>
+
+
+      <li>
+        <strong>対象��る CGI/SSI プログラム�存在�る�?</strong>
+
+        <p class="indent">
+          存在���れ�実行����ん。
+        </p>
+      </li>
+
+      <li>
+        <strong>対象��る CGI/SSI プログラムファイル�他アカウント�ら
+        書�込�るよ�����<em>���</em>�?</strong>
+
+        <p class="indent">
+          所有者以外�� CGI/SSI プログラムを変更�る権��与�られ��ん。
+        </p>
+      </li>
+
+
+      <li>
+        <strong>対象��る CGI/SSI プログラム� setuid ��� setgid 
+        �れ�<em>���</em>�?</strong>
+
+        <p class="indent">
+          UID/GID を�度変更���プログラム実行����ん
+        </p>
+      </li>
+
+
+      <li>
+        <strong>対象��るユーザ/グループ�プログラム�
+        ユーザ/グループ����?</strong>
+
+        <p class="indent">
+          ユーザ���ファイル�所有者���?
+        </p>
+      </li>
+
+      <li>
+        <strong>安全�動作を�証�る���環境変数クリア��能�?
+        </strong>
+
+        <p class="indent">
+          suEXEC ��安全�環境変数�リスト
+          (�れら�設定時�作��れ��) 内�変数���渡�れる安全�
+          PATH 変数 (設定時�指定�れ��) を設定�る����
+          プロセス�環境変数をクリア���。
+        </p>
+      </li>
+
+
+      <li>
+        <strong>対象��る CGI/SSI プログラムを exec ��実行��る�?</strong>
+
+
+        <p class="indent">
+          ��� suEXEC �終了��対象��るプログラム�開始�れ��。
+        </p>
+      </li>
+    </ol>
+
+    <p>����� suEXEC � wrapper
+    ���るセキュリティモデル�標準的�動作��。も�少�厳��
+    CGI/SSI 設計�����新��制�や�定を�り入れる��も������
+    suEXEC �セキュリティ�注���慎��少���開発�れ�����。
+    </p>
+
+    <p>��セキュリティモデルを用��
+    サー�設定時���よ��許���を制��る�����suEXEC
+    を�切�設定�る���よ��セキュリティ上��険を��られる��
+    関�るより詳��情報������<a href="#jabberwock">"����注�"
+    (Beware the Jabberwock)</a> �章を�照������。
+    </p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="install" id="install">suEXEC
+    �設定�インストール</a></h2>
+
+    <p>���ら楽���り��。</p>
+
+    <p><strong>suEXEC
+    設定オプション</strong><br />
+    </p>
+
+    <dl>
+      <dt><code>--enable-suexec</code></dt>
+
+      <dd>��オプション��デフォルト��インストール�れ��
+      有効���ら�� suEXEC 機能を有効����。
+      suEXEC を使�よ�� APACI ��求�る���<code>--enable-suexec</code>
+      オプション�����少���も一�� <code>--with-suexec-xxxxx</code>
+      オプション�指定�れ��れ��り��ん。</dd>
+
+      <dt><code>--with-suexec-bin=<em>PATH</em></code></dt>
+
+      <dd>セキュリティ上��由�より�<code>suexec</code> �イナリ�パス�サー��
+      �ードコード�れ��る必���り��。デフォルト�パスを
+      変��������オプションを使������。<em>例��</em>�
+      <code>--with-suexec-bin=/usr/sbin/suexec</code> �よ��。</dd>
+
+      <dt><code>--with-suexec-caller=<em>UID</em></code></dt>
+
+      <dd>Apache を通常動作��る<a href="mod/mpm_common.html#user">ユーザ�</a>を指定���。
+      ��ユーザ��� suexec �実行を許��れ�ユーザ��り��。</dd>
+
+      <dt><code>--with-suexec-userdir=<em>DIR</em></code></dt>
+
+      <dd>suEXEC �アクセスを許�れるユーザホームディレクトリ�下�
+      サブディレクトリを指定���。
+      ��ディレクトリ以下�全実行ファイル��"安全�"プログラム��るよ��
+      suEXEC ���ユーザ���実行��るよ�����。
+      "�純�" UserDir ディレクティブを使���る場� 
+      (���� "*" を����も�)��れ���値を設定�����。
+      Userdir ディレクティブ���ユーザ�パスワードファイル内�
+      ホームディレクトリ���場所を指�����れ��
+      suEXEC ��切�動作���ん。デフォルト� "public_html" ��。
+      <br />
+      � UserDir �異���仮想ホストを設定���る場��
+      �れらを全�一��親ディレクトリ�����
+      ��親ディレクトリ���を���指定�る必���り��。
+      <strong>��よ��指定�れ��れ� "~userdir" cgi
+      ��リクエスト�動作���ん。</strong></dd>
+
+      <dt><code>--with-suexec-docroot=<em>DIR</em></code></dt>
+
+      <dd>Apache �ドキュメントルートを設定���。�れ� suEXEC
+      �動作�使用�る唯一�ディレクトリ階層��り�� (UserDir
+      �指定�別)。デフォルト�� <code>--datedir</code> � "/htdocs"
+      ���サフィックスを���も���。
+      "<code>--datadir=/home/apache</code>" ���設定�る��
+      suEXEC wrapper ���� "/home/apache/htdocs"
+      �ドキュメントルート���使�れ��。</dd>
+
+      <dt><code>--with-suexec-uidmin=<em>UID</em></code></dt>
+
+      <dd>suEXEC �対象ユーザ���許�れる UID �最�値を指定���。
+      大抵�システム�� 500 � 100 �一般的��。
+      デフォルト値� 100 ��。</dd>
+
+      <dt><code>--with-suexec-gidmin=<em>GID</em></code></dt>
+
+      <dd>suEXEC �対象グループ���許�れる GID
+      �最�値を指定���。大抵�システム�� 100 �一般的����
+      デフォルト値���も 100 �使�れ����。</dd>
+
+      <dt><code>--with-suexec-logfile=<em>FILE</em></code></dt>
+
+      <dd>suEXEC �処��エラー�記録�れるファイル�を指定���。
+      (監査やデ�ッグ目的�有用)
+      デフォルト��ログファイル� "suexec_log" �������
+      標準�ログファイルディレクトリ (<code>--logfiledir</code>) �置�れ��。
+      </dd>
+
+      <dt><code>--with-suexec-safepath=<em>PATH</em></code></dt>
+
+      <dd>CGI 実行ファイル�渡�れる安全� PATH 環境変数��。
+      デフォルト値� "/usr/local/bin:/usr/bin:/bin" ��。
+      </dd>
+    </dl>
+
+    <p><strong>suEXEC wrapper
+    �コンパイル�インストール</strong><br />
+    <code>--enable-suexec</code> オプション� suEXEC 機能を有効��る��
+    "make" コマンドを実行��時� <code>suexec</code> ��イナリ (Apache 自体も)
+    �自動的�作��れ��。
+    <br />
+    ����構��素�作��れる���れら�インストール��
+    <code>make install</code> コマンド�実行����。�イナリイメージ� <code>suexec</code>
+    � <code>--sbindir</code> オプション�指定�れ�ディレクトリ�インストール�れ��。
+    デフォルト�場所� "/usr/local/apache/sbin/suexec" ��。<br />
+    インストール時�� <strong><em>root</em></strong>
+    権��必����注�������。wrapper �ユーザ ID
+    を設定�る����所有者 <code><em>root</em></code>
+    ��セットユーザ ID
+    ビットを��ファイル�モード�設定���れ��り��ん。
+    </p>
+
+    <p><strong>安全�パーミッションを設定�る</strong><br />
+    suEXEC ラッパー��<code>--with-suexec-caller</code> <code class="program"><a href="./programs/configure.html">configure</a></code> 
+    オプション�指定��正��ユーザ�起動�れ��る��を確������
+    システム上����ェック�行��れる���
+    suEXEC �呼�システムやライブラリ�脆弱��る�能性�残り��。対抗策����
+    一般�良�習慣�も�れ������
+    ファイルシステムパーミッションを使��
+    Apache �実行時�グループ��� suEXEC を実行��るよ��
+    �る��良���ょ�。</p>
+
+    <p>�����次�よ��サー��設定�れ�������。</p>
+
+<div class="example"><p><code>
+    User www<br />
+    Group webgroup<br />
+</code></p></div>
+
+    <p><code class="program"><a href="./programs/suexec.html">suexec</a></code> � "/usr/local/apache2/sbin/suexec" 
+    �インストール�れ���場��次�よ��設定�る必���り��。</p>
+
+<div class="example"><p><code>
+    chgrp webgroup /usr/local/apache2/bin/suexec<br />
+    chmod 4750 /usr/local/apache2/bin/suexec<br />
+</code></p></div>
+
+    <p>�れ� Apache �実行�れるグループ��� 
+    suEXEC ラッパーを実行��る�����を
+    確証���。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="enable" id="enable">suEXEC
+    �有効化�無効化</a></h2>
+
+    <p>起動時��Apache � <code>--sbindir</code>
+    オプション�設定�れ�ディレクトリ�
+    <code>suexec</code> を探���
+    (デフォルト� "/usr/local/apache/sbin/suexec") 。
+    �切�設定�れ� suEXEC ����る��
+    エラーログ�以下�メッセージ�出力�れ��。</p>
+
+<div class="example"><p><code>
+    [notice] suEXEC mechanism enabled (wrapper: <var>/path/to/suexec</var>)
+</code></p></div>
+
+    <p>サー�起動時���メッセージ�出��場��
+    大抵�サー��想定��場所� wrapper プログラム�見��ら������
+    <em>setuid root</em> ���インストール�れ�������。</p>
+
+    <p>suEXEC �仕組�を使用�る�������Apache �既�動作中��れ��
+    Apache を kill ����起動���れ��り��ん。HUP シグナルや
+    USR1 シグナル�よる�純��起動����分��。</p>
+    <p>suEXEC を無効��る場���<code>suexec</code> ファイルを削除���ら
+    Apache を kill ���起動���。
+    </p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="usage" id="usage">suEXEC �使用</a></h2>
+
+    <p>CGI プログラム��リクエスト� suEXEC ラッパーを呼����
+    <code class="directive"><a href="./mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code> ディレクティブを
+    �む�ー�ャルホスト��リクエスト��<code class="module"><a href="./mod/mod_userdir.html">mod_userdir</a></code> �より
+    処��れ�リクエスト�場���り��。</p>
+
+    <p><strong>仮想ホスト:</strong><br />
+    suEXEC wrapper �使�方����
+    <code class="directive"><a href="./mod/core.html#virtualhost">VirtualHost</a></code> 設定��
+    <code class="directive"><a href="./mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code>
+    ディレクティブを通��も���り��。
+    ��ディレクティブをメインサー��ユーザ ID
+    �異�るも���る��CGI リソース������リクエスト����
+    <code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> �指定�れ� <em>User</em> �
+    <em>Group</em> ���実行�れ��。<code class="directive"><a href="./mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+    ���ディレクティブ�指定�れ����場��
+    メインサー��ユーザ ID �想定�れ��。</p>
+
+    <p><strong>ユーザディレクトリ:</strong><br />
+    <code class="module"><a href="./mod/mod_userdir.html">mod_userdir</a></code> �より処��れ�リクエスト�
+    リクエスト�れ�ユーザディレクトリ�ユーザ ID � CGI プログラムを
+    実行�る��� suEXEC ラッパーを呼���。
+    ��機能を動作��る���必������CGI
+    を��ユーザ�実行��る�����スクリプト�上記�<a href="#model">セキュリティ検査</a>をパス��る����。
+    <a href="#install">コンパイル
+     時�オプション</a> <code>--with-suexec-userdir</code> も�照������。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="debug" id="debug">suEXEC �デ�ッグ</a></h2>
+
+    <p>suEXEC wrapper ��上記�述�� <code>--with-suexec-logfile</code>
+    オプション�指定�れ�ファイル�ログ情報を記録���。
+    wrapper を�切�設定�インストール����る���場��
+    ���迷���る�見よ���る�ら��ログ�サー��
+    エラーログを見る�よ���ょ�。</p>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="jabberwock" id="jabberwock">����注�: 警告�事例</a></h2>
+
+    <p><strong>注�!</strong>
+    ��章�完全���り��ん。��章�最新改訂版������
+    Apache グループ�<a href="http://httpd.apache.org/docs/2.2/suexec.html">
+    オンラインドキュメント</a>版を�照������。
+    </p>
+
+    <p>サー��設定�制�をも��る wrapper �����
+    ����興味深�点��り��。suEXEC �関�る "�グ"
+    を報告�る���れらを確�������。</p>
+
+    <ul>
+      <li><strong>suEXEC �興味深�点</strong></li>
+
+      <li>階層構造�制�
+
+
+        <p class="indent">
+          セキュリティ�効率��由�ら�<code>suEXEC</code> �全��リクエスト�
+          仮想ホスト��リクエスト���る最上��ドキュメントルート内��
+          ユーザディレクトリ��リクエスト���る個々�ユーザ�最上��
+          ドキュメントルート内�残ら��れ��り��ん。
+          例���四��仮想ホストを設定���る場��
+          仮想ホスト� suEXEC �有利�よ���メイン� Apache
+          ドキュメント階層�外��全��仮想ホスト�ドキュメントルートを
+          構築�る必���り��。(例�後日記載)
+        </p>
+      </li>
+
+      <li>suEXEC � PATH 環境変数
+
+
+        <p class="indent">
+          �れを変更�る���険��。��指定���れる�パス�
+          <strong>信頼��る</strong>
+          ディレクトリ��る��を確�������。
+          世界�ら�アクセス�より�誰��ホスト上�トロイ�木馬
+          を実行��るよ����������ょ�。
+        </p>
+      </li>
+
+      <li>suEXEC コード�改造
+
+
+        <p class="indent">
+          繰り返�����何をや������る�把�����れをやる�
+          <strong>大���題</strong>を引�起������ん。
+          �能��り�������。
+        </p>
+      </li>
+    </ul>
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./en/suexec.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./ja/suexec.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/suexec.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/suexec.html.ko.euc-kr b/docs/manual/suexec.html.ko.euc-kr
index 1a26f2b4..1fa573b4 100644
--- a/docs/manual/suexec.html.ko.euc-kr
+++ b/docs/manual/suexec.html.ko.euc-kr
@@ -529,6 +529,6 @@
 <a href="./ja/suexec.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/suexec.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/upgrading.html b/docs/manual/upgrading.html
index 35b0339c..9c98d94a 100644
--- a/docs/manual/upgrading.html
+++ b/docs/manual/upgrading.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: upgrading.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -9,19 +11,3 @@ Content-type: text/html; charset=ISO-8859-1
 URI: upgrading.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
-
-URI: upgrading.html.ja.euc-jp
-Content-Language: ja
-Content-type: text/html; charset=EUC-JP
-
-URI: upgrading.html.ko.euc-kr
-Content-Language: ko
-Content-type: text/html; charset=EUC-KR
-
-URI: upgrading.html.pt-br
-Content-Language: pt-br
-Content-type: text/html; charset=ISO-8859-1
-
-URI: upgrading.html.ru.koi8-r
-Content-Language: ru
-Content-type: text/html; charset=KOI8-R
diff --git a/docs/manual/upgrading.html.de b/docs/manual/upgrading.html.de
index e36d4df2..1f8fd0c2 100644
--- a/docs/manual/upgrading.html.de
+++ b/docs/manual/upgrading.html.de
@@ -20,11 +20,7 @@
 <div class="toplang">
 <p><span>Verfügbare Sprachen: </span><a href="./de/upgrading.html" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
-<a href="./ru/upgrading.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a></p>
 </div>
 <div class="outofdate">Diese Übersetzung ist möglicherweise
             nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
@@ -111,12 +107,8 @@
 <div class="bottomlang">
 <p><span>Verfügbare Sprachen: </span><a href="./de/upgrading.html" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
-<a href="./ru/upgrading.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Module</a> | <a href="./mod/directives.html">Direktiven</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossar</a> | <a href="./sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index 2c6a176a..26e3019c 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -20,11 +20,7 @@
 <div class="toplang">
 <p><span>Available Languages: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
-<a href="./ru/upgrading.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a></p>
 </div>
 
   <p>In order to assist folks upgrading, we maintain a document
@@ -151,12 +147,8 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
-<a href="./ru/upgrading.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/upgrading.html.fr b/docs/manual/upgrading.html.fr
index eed93e49..8e831a48 100644
--- a/docs/manual/upgrading.html.fr
+++ b/docs/manual/upgrading.html.fr
@@ -20,11 +20,7 @@
 <div class="toplang">
 <p><span>Langues Disponibles: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
-<a href="./ru/upgrading.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./fr/upgrading.html" title="Français">&nbsp;fr&nbsp;</a></p>
 </div>
 
   <p>Afin d'assister les utilisateurs lors de leurs opérations de mise à
@@ -164,12 +160,8 @@ fonctionnalités de Apache 2.2</a></li></ul></div>
 <div class="bottomlang">
 <p><span>Langues Disponibles: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
-<a href="./ru/upgrading.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="./fr/upgrading.html" title="Français">&nbsp;fr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossaire</a> | <a href="./sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/upgrading.html.ja.euc-jp b/docs/manual/upgrading.html.ja.euc-jp
deleted file mode 100644
index d857b675..00000000
--- a/docs/manual/upgrading.html.ja.euc-jp
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>1.3 ¤«¤é 2.0 ¤Ø¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>1.3 ¤«¤é 2.0 ¤Ø¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/upgrading.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Portugu�«´s (Brasil)">&nbsp;pt-br&nbsp;</a> |
-<a href="./ru/upgrading.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-  <p>¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò´Êñ¤Ë¤¹¤ë¤¿¤á¤Ë¡¢´û¸¤Î Apache ¥æ¡¼¥¶¤Ë
-  Èó¾ï¤Ë½ÅÍפʾðÊó¤ò¤³¤Îʸ½ñ¤Ë¤Þ¤È¤á¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤Ïû¤¤
-  Ãí°Õ½ñ¤­¤È¤·¤Æ½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï
-  <a href="new_features_2_0.html">¿·µ¡Ç½</a>¤Îʸ½ñ¤ä
-  <code>src/CHANGES</code> ¥Õ¥¡¥¤¥ë¤Ç¸«¤Ä¤±¤é¤ì¤ë¤È»×¤¤¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#compile-time">¥³¥ó¥Ñ¥¤¥ë»þ¤ÎÀßÄê¤ÎÊѹ¹</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#run-time">¼Â¹Ô»þ¤ÎÀßÄê¤ÎÊѹ¹</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#misc">¤½¤Î¾¤ÎÊѹ¹</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#third-party">¥µ¡¼¥É¥Ñ¡¼¥Æ¥£¥â¥¸¥å¡¼¥ë</a></li>
-</ul><h3>»²¾È</h3><ul class="seealso"><li><a href="new_features_2_0.html">Apache 2.0 ¿·µ¡Ç½¤Î³µÍ×</a></li></ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="compile-time" id="compile-time">¥³¥ó¥Ñ¥¤¥ë»þ¤ÎÀßÄê¤ÎÊѹ¹</a></h2>
-    
-
-    <ul>
-      <li>Apache ¤Ï <a href="install.html">¥Ó¥ë¥É½èÍý¤ÎÀßÄê</a>
-      ¤Ë <code>autoconf</code> ¤È <code>libtool</code> ¤ò»È¤¦¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
-      ¤³¤Î¥·¥¹¥Æ¥à¤Ï Apache 1.3 ¤Î APACI ¥·¥¹¥Æ¥à¤È»÷¤Æ¤¤¤Þ¤¹¤¬¡¢
-      ¤Þ¤Ã¤¿¤¯Æ±¤¸¤È¤¤¤¦¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</li>
-
-      <li>Ä̾ï¤Î¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤«¤É¤¦¤«¤òÁªÂò¤Ç¤­¤ë¥â¥¸¥å¡¼¥ë·²¤Ë²Ã¤¨¤Æ¡¢
-      Apache 2.0 ¤Ï
-      ¥ê¥¯¥¨¥¹¥È½èÍý¤Î¼ç¤ÊÉôʬ¤ò <a href="mpm.html">¥Þ¥ë¥Á¥×¥í¥»¥Ã¥·¥ó¥°
-      ¥â¥¸¥å¡¼¥ë</a> (MPM) ¤Ë°ÜÆ°¤·¤Þ¤·¤¿¡£</li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="run-time" id="run-time">¼Â¹Ô»þ¤ÎÀßÄê¤ÎÊѹ¹</a></h2>
-    
-
-    <ul>
-      <li>Apache 1.3 ¤Î»þ¤Ë¥³¥¢¥µ¡¼¥Ð¤Ë¤¢¤Ã¤¿Â¿¤¯¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-      MPM ¤Ë°ÜÆ°¤·¤Þ¤·¤¿¡£¥µ¡¼¥Ð¤Ë Apache 1.3 ¤È¤Ç¤­¤ë¤À¤±Æ±¤¸¿¶¤ëÉñ¤¤¤ò
-      ¤µ¤»¤¿¤¤¾ì¹ç¤Ï¡¢<code class="module"><a href="./mod/prefork.html">prefork</a></code> MPM ¤ò
-      Áª¤ó¤Ç¤¯¤À¤µ¤¤¡£Â¾¤Î MPM ¤Ï¥×¥í¥»¥¹¤ÎºîÀ®¤ä¥ê¥¯¥¨¥¹¥È¤Î½èÍý¤Î
-      À©¸æ¤Ë°Û¤Ê¤Ã¤¿¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¤¤Þ¤¹¡£</li>
-
-      <li><a href="mod/mod_proxy.html">Proxy ¥â¥¸¥å¡¼¥ë</a> ¤Ï
-      HTTP/1.1 ¤ËÂбþ¤¹¤ë¤¿¤á¤ËºÆ¹½À®¤µ¤ì¤Þ¤·¤¿¡£½ÅÍפÊÊѹ¹ÅÀ¤È¤·¤Æ¤Ï¡¢
-      ¥×¥í¥­¥·¤Î¥¢¥¯¥»¥¹À©¸æ¤¬ <code>&lt;Directory proxy:&gt;</code> ¥Ö¥í¥Ã¥¯¤Î
-      Âå¤ï¤ê¤Ë <code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>
-      ¥Ö¥í¥Ã¥¯¤ËÃÖ¤«¤ì¤ë¤è¤¦¤Ë¤Ê¤Ã¤¿¡¢¤È¤¤¤¦¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£</li>
-
-      <li>¥â¥¸¥å¡¼¥ë¤ÎÃæ¤Ë¤Ï¡¢<code>PATH_INFO</code> (ËÜÅö¤Î¥Õ¥¡¥¤¥ë̾¤Î¸å¤Ë³¤¯
-      ¥Ñ¥¹¾ðÊó) ¤Î°·¤¤¤¬ÊѤï¤Ã¤¿¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£°ÊÁ°¤Ï¥Ï¥ó¥É¥é¤È¤·¤Æ
-      ¼ÂÁõ¤µ¤ì¤Æ¤¤¤¿¤â¤Î¤¬¥Õ¥£¥ë¥¿¤È¤·¤Æ¼ÂÁõ¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤Ã¤¿¤â¤Î¤Ï
-      <code>PATH_INFO</code> ¤Î¤¢¤ë¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±ÉÕ¤±¤Þ¤»¤ó¡£<a href="mod/mod_include.html">INCLUDES</a> ¤ä
-      <a href="http://www.php.net/">PHP</a> ¤Ê¤É¤Î¥Õ¥£¥ë¥¿¤Ï
-      ¥³¥¢¥Ï¥ó¥É¥é¤Î¾å¤Ë¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤¹¤Î¤Ç¡¢<code>PATH_INFO</code>
-      ÉÕ¤­¤Î¥ê¥¯¥¨¥¹¥È¤òµñÈݤ·¤Þ¤¹¡£
-      <code class="directive"><a href="./mod/core.html#acceptpathinfo">AcceptPathInfo</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ¥³¥¢¥Ï¥ó¥É¥é¤¬ <code>PATH_INFO</code>
-      ÉÕ¤­¤Î¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±ÉÕ¤±¤ë¤è¤¦¤Ë¤Ç¤­¡¢¤½¤ì¤Ë¤è¤Ã¤Æ SSI Åù¤Ç
-      <code>PATH_INFO</code> ¤ò»È¤¦µ¡Ç½¤òÉü³è¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</li>
-
-      <li><code class="directive"><a href="./mod/mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï <code>on</code> ¤â¤·¤¯¤Ï <code>off</code> ¤È¤¤¤¦°ú¿ô¤ò
-      ¼è¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£´û¤Ë¸ºß¤·¤Æ¤¤¤ë
-      <code class="directive">CacheNegotiatedDocs</code> ¤Ï
-      <code>CacheNegotiatedDocs on</code>
-      ¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</li>
-
-      <li>
-        <code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code>
-	¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¥Æ¥­¥¹¥È¥á¥Ã¥»¡¼¥¸¤ò
-        ¼¨¤¹¤¿¤á¤Ë°ú¿ô¤ÎºÇ½é¤Ë»È¤ï¤ì¤Æ¤¤¤¿°úÍÑÉä¤ò»È¤ï¤Ê¤¤¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
-        Âå¤ï¤ê¤Ë¡¢¥á¥Ã¥»¡¼¥¸¤òÆó½Å°úÍÑÉä¤Ç°Ï¤à¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-        Î㤨¤Ð¡¢´û¸¤Î
-
-        <div class="example"><p><code>
-          ErrorDocument 403 "Some Message
-        </code></p></div>
-        ¤Ï
-
-        <div class="example"><p><code>
-          ErrorDocument 403 "Some Message"
-        </code></p></div>
-
-        ¤ËÃÖ¤­´¹¤¨¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-        ÆóÈÖÌܤΰú¿ô¤Ï¡¢Í­¸ú¤Ê URL ¤ä¥Ñ¥¹Ì¾¤Ç¤Ê¤¤¸Â¤ê
-        ¥Æ¥­¥¹¥È¥á¥Ã¥»¡¼¥¸¤È¤·¤Æ°·¤ï¤ì¤Þ¤¹¡£
-      </li>
-
-      <li><code>AccessConfig</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È
-      <code>ResourceConfig</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ïºï½ü¤µ¤ì¤Þ¤·¤¿¡£
-      ¤³¤ì¤é¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏƱÅù¤Îµ¡Ç½¤ò»ý¤Ä
-      <code class="directive"><a href="./mod/core.html#include">Include</a></code> ¤Ç
-      ÃÖ¤­´¹¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ÀßÄê¥Õ¥¡¥¤¥ë¤Ë¼è¤ê¹þ¤àÂå¤ï¤ê¤Ë¡¢
-      ¾å¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤò»È¤Ã¤Æ¤¤¤¿¾ì¹ç¤Ï¡¢
-      <code>httpd.conf</code> ¤Ë <code>Include conf/access.conf</code> ¤È
-      <code>Include conf/srm.conf</code> ¤òÄɲ乤ëɬÍפ¬¤¢¤ë¤Ç¤·¤ç¤¦¡£
-      °ÊÁ°¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ë½çÈ֤Τ褦¤Ë Apache ¤¬ÀßÄê¥Õ¥¡¥¤¥ë¤ò
-      Æɤ߹þ¤à¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë¤Ï¡¢<code>httpd.conf</code> ¤ÎºÇ¸å¤Ë
-      <code>srm.conf</code>¡¢<code>access.conf</code> ¤Î½ç¤Ë¤½¤ì¤¾¤ì
-      <code class="directive"><a href="./mod/core.html#include">Include</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡£</li>
-
-      <li><code>BindAddress</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È <code>Port</code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ïºï½ü¤µ¤ì¤Þ¤·¤¿¡£Æ±Åù¤Îµ¡Ç½¤Ï¤è¤ê½ÀÆð¤Ê
-      <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤êÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡£</li>
-
-      <li><code>Port</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï Apache-1.3 ¤Ë¤Ï¼«¸Ê»²¾È URL ¤Ç
-      »È¤ï¤ì¤ë¥Ý¡¼¥ÈÈÖ¹æ¤òÀßÄꤹ¤ë¡¢¤È¤¤¤¦»ÈÍÑË¡¤â¤¢¤ê¤Þ¤·¤¿¡£
-      ¤³¤ì¤Ï Apache-2.0 ¤Ç¤Ï¿·¤·¤¤
-      <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code>
-      ¹½Ê¸¤Ë¤è¤Ã¤Æ¹Ô¤Ê¤¤¤Þ¤¹¡£°ì¤Ä¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç¥Û¥¹¥È̾<em>¤È</em>
-      ¼«¸Ê»²¾È URL ¤ÎξÊý¤òÀßÄê¤Ç¤­¤ë¤è¤¦¤Ë¹½Ê¸¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿¡£</li>
-
-      <li><code>ServerName</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ïºï½ü¤µ¤ì¤Þ¤·¤¿¡£
-      ¥ê¥¯¥¨¥¹¥È¤ò°·¤¦ÊýË¡¤Ï MPM ¤ÎÁªÂò¤Ë¤è¤ê·èÄꤵ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
-      ¸½»þÅÀ¤Ç¤Ï inetd ¤«¤éµ¯Æ°¤µ¤ì¤ë¤è¤¦¤ËÀ߷פµ¤ì¤¿ MPM ¤Ï¤¢¤ê¤Þ¤»¤ó¡£</li>
-
-      <li><code>AgentLog</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¡¢
-      <code>RefererLog</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¡¢
-      <code>RefererIgnore</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤òÄ󶡤·¤Æ¤¤¤¿
-      <code>mod_log_agent</code> ¤È <code>mod_log_referer</code>
-      ¥â¥¸¥å¡¼¥ë¤Ïºï½ü¤µ¤ì¤Þ¤·¤¿¡£
-      Agent ¥í¥°¤È refere ¥í¥°¤Ï <code class="directive">mod_log_config</code> ¤Î
-      <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê¼Â¸½²Äǽ¤Ç¤¹¡£</li>
-
-      <li><code>AddModule</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È <code>ClearModuleList</code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ïºï½ü¤µ¤ì¤Þ¤·¤¿¡£¤³¤ì¤é¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¡¢
-      ¥â¥¸¥å¡¼¥ë¤¬Àµ¤·¤¤½çÈ֤ǸƤФì¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ë»È¤ï¤ì¤Æ¤¤¤Þ¤·¤¿¡£
-      Apache 2.0 ¤Î¿· API ¤Ï¥â¥¸¥å¡¼¥ë¤¬ÌÀ¼¨Åª¤Ë½çÈÖ¤ò»ØÄê¤Ç¤­¤ë¤è¤¦¤Ë
-      ¤Ê¤Ã¤Æ¤ª¤ê¡¢¤³¤ì¤é¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏɬÍפʤ¯¤Ê¤ê¤Þ¤·¤¿¡£</li>
-
-      <li><code>FancyIndexing</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ïºï½ü¤µ¤ì¤Þ¤·¤¿¡£
-      Ʊ¤¸µ¡Ç½¤Ï <code class="directive"><a href="./mod/mod_autoindex.html#indexoptions">IndexOptions</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î <code>FancyIndexing</code> ¥ª¥×¥·¥ç¥ó¤Ç
-      ¼Â¸½¤Ç¤­¤Þ¤¹¡£</li>
-
-      <li><code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code> ¤Ë¤è¤ë MultiViews 
-      ¥³¥ó¥Æ¥ó¥È¥Í¥´¥·¥¨¡¼¥·¥ç¥óµ»½Ñ¤Ï¡¢
-      ¥Ç¥Õ¥©¥ë¥È¤Î¥Õ¥¡¥¤¥ë¥Þ¥Ã¥Á¥ó¥°¤¬¤è¤ê¸·Ì©¤Ê¤â¤Î¤ËÊѹ¹¤µ¤ì¤Þ¤·¤¿¡£
-      <em>¥Í¥´¥·¥¨¡¼¥È²Äǽ¤Ê</em>¥Õ¥¡¥¤¥ë¤Î¾ì¹ç¤Ë¤Î¤ßÁªÂò¤µ¤ì¤Þ¤¹¡£
-      °ÊÁ°¤ÎµóÆ°¤Ï¡¢<code class="directive"><a href="./mod/mod_mime.html#multiviewsmatch">MultiviewsMatch</a></code>
-      ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»ÈÍѤ¹¤ë¤³¤È¤ÇÉü³è¤Ç¤­¤Þ¤¹¡£</li>
-
-      <li>(<em>¥Ð¡¼¥¸¥ç¥ó 2.0.51 ¤«¤é</em>)
-      <p><code>ErrorHeader</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÏÉÔŬÀÚ¤Ê̾Á°
-      ¤À¤Ã¤¿¤¿¤á¤ËÇѻߤµ¤ì¡¢¤½¤Îµ¡Ç½¤Ï <code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ËÅý¹ç¤µ¤ì¤Þ¤·¤¿¡£
-      ˾¤ß¤ÎÆ°ºî¤òÆÀ¤ë¤¿¤á¤Ë¤Ï ErrorHeader ¤ÎÂå¤ï¤ê¤Ë</p>
-
-      <div class="example"><p><code>
-        Header always set foo bar
-      </code></p></div>
-
-      <p>¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</p></li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="misc" id="misc">¤½¤Î¾¤ÎÊѹ¹</a></h2>
-    
-
-    <ul>
-      <li>Apache 1.3 ¤Ç¼Â¸³Åª¤Ê¥â¥¸¥å¡¼¥ë¤À¤Ã¤¿
-      <code class="directive">mod_auth_digest</code> ¤Ï
-      ɸ½à¥â¥¸¥å¡¼¥ë¤Ë¤Ê¤ê¤Þ¤·¤¿¡£</li>
-
-      <li>Apache 1.3 ¤Ç¼Â¸³Åª¤Ê¥â¥¸¥å¡¼¥ë¤À¤Ã¤¿ <code>mod_mmap_static</code> ¤Ï
-      <code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code> ¤ÇÃÖ¤­´¹¤¨¤é¤ì¤Þ¤·¤¿¡£</li>
-
-      <li>Apache ¤ÎÇÛÉÛ¤ÏÆÈΩ¤·¤¿ <code>src</code> ¥Ç¥£¥ì¥¯¥È¥ê¤¬
-      ¤Ê¤¯¤Ê¤ë¤è¤¦¤Ë¡¢´°Á´¤ËºÆ¹½À®¤µ¤ì¤Þ¤·¤¿¡£¤½¤ÎÂå¤ï¤ê¤Ë¡¢
-      ¥½¡¼¥¹¤Ï¼ç¥Ç¥£¥ì¥¯¥È¥ê¤ËÏÀÍýŪ¤ËÇÛÃÖ¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¡¢
-      ¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤¿¥µ¡¼¥Ð¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ÏÊ̥ǥ£¥ì¥¯¥È¥ê¤Ø
-      ¹Ô¤Ê¤¦¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£</li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="third-party" id="third-party">¥µ¡¼¥É¥Ñ¡¼¥Æ¥£¥â¥¸¥å¡¼¥ë</a></h2>
-    
-
-    <p>Apache 2.0 ¤Î¥µ¡¼¥Ð API ¤Ë¤Ï¿¤¯¤ÎÊѹ¹¤¬²Ã¤¨¤é¤ì¤Þ¤·¤¿¡£
-    Apache 1.3 ÍѤδû¸¤Î¥â¥¸¥å¡¼¥ë¤Ï Apache 2.0 ¤Ç¤Ï½¤Àµ¤Ê¤·¤Ç¤Ï
-    Æ°¤­<strong>¤Þ¤»¤ó</strong>¡£¾ÜºÙ¤Ï <a href="developer/">³«È¯¼Ô¸þ¤±Ê¸½ñ</a> ¤Ë¤¢¤ê¤Þ¤¹¡£</p>
-  </div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/upgrading.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Portugu�«´s (Brasil)">&nbsp;pt-br&nbsp;</a> |
-<a href="./ru/upgrading.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/upgrading.html.ko.euc-kr b/docs/manual/upgrading.html.ko.euc-kr
deleted file mode 100644
index 34bb00d5..00000000
--- a/docs/manual/upgrading.html.ko.euc-kr
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="EUC-KR"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ko" xml:lang="ko"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>1.3¿¡¼­ 2.0À¸·Î ¾÷±×·¹À̵å - Apache HTTP Server</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p>
-<p class="apache">Apache HTTP Server Version 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="./">Version 2.2</a></div><div id="page-content"><div id="preamble"><h1>1.3¿¡¼­ 2.0À¸·Î ¾÷±×·¹À̵å</h1>
-<div class="toplang">
-<p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/upgrading.html" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Portugu&#234;s (Brasil)">&nbsp;pt-br&nbsp;</a> |
-<a href="./ru/upgrading.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
-</div>
-<div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
-            ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
-
-  <p>¿ì¸®´Â ±âÁ¸ ¾ÆÆÄÄ¡ »ç¿ëÀÚ°¡ ¾÷±×·¹À̵åÇÏ´Â °ÍÀ» µ½±âÀ§ÇØ
-  Áß¿äÇÑ Á¤º¸¸¦ ¾Ë·ÁÁÖ´Â ¹®¼­¸¦ Á¦°øÇÑ´Ù. ÀÌ ¹®¼­´Â °£´ÜÇÑ
-  ¿ä¾àÀ̹ǷÎ, <a href="new_features_2_0.html">»õ·Î¿î ±â´É</a>
-  ¹®¼­³ª <code>src/CHANGES</code> ÆÄÀÏ¿¡¼­ Á¤º¸¸¦ ã¾ÆºÁ¾ß
-  ÇÑ´Ù.</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#compile-time">ÄÄÆÄÀϽà ±¸¼º º¯È­</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#run-time">½ÇÇà½Ã ¼³Á¤ º¯È­</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#misc">±âŸ º¯È­</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#third-party">Á¦»ïÀÚ°¡ ¸¸µç ¸ðµâ</a></li>
-</ul><h3>Âü°í</h3><ul class="seealso"><li><a href="new_features_2_0.html">¾ÆÆÄÄ¡ 2.0ÀÇ »õ·Î¿î
-±â´É ¿ä¾à</a></li></ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="compile-time" id="compile-time">ÄÄÆÄÀϽà ±¸¼º º¯È­</a></h2>
-    
-
-    <ul>
-      <li>¾ÆÆÄÄ¡´Â ÀÌÁ¦ <a href="install.html">¾ÆÆÄÄ¡ ÄÄÆÄÀÏ°ú ¼³Ä¡</a>¸¦ À§ÇØ
-      <code>autoconf</code>¿Í <code>libtool</code> ½Ã½ºÅÛÀ»
-      »ç¿ëÇÑ´Ù. ÀÌ ½Ã½ºÅÛÀÇ »ç¿ë¹ýÀº Apache 1.3ÀÇ APACI ½Ã½ºÅÛ°ú
-      °°Áö´Â ¾ÊÁö¸¸ ºñ½ÁÇÏ´Ù.</li>
-
-      <li>ÄÄÆÄÀÏ ¿©ºÎ¸¦ ¼±ÅÃÇÒ ¸ðµâ¿Ü¿¡ Apache 2.0Àº ¿äûÀ»
-      ó¸®ÇÏ´Â ÁÖ¿ä ºÎºÐÀ» <a href="mpm.html">´ÙÁßó¸® ¸ðµâ
-      (Multi-Processing Modules)</a> (MPM)·Î ¿Å°å´Ù.</li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="run-time" id="run-time">½ÇÇà½Ã ¼³Á¤ º¯È­</a></h2>
-    
-
-    <ul>
-      <li>Apache 1.3¿¡¼­ ¼­¹ö Çٽɿ¡ ÀÖ¾ú´ø ¸¹Àº Áö½Ã¾îµéÀÌ
-      ÀÌÁ¦´Â MPM¿¡ ÀÖ´Ù. ¼­¹ö°¡ Apache 1.3°ú ÃÖ´ëÇÑ ºñ½ÁÇÏ°Ô
-      µ¿ÀÛÇÏ±æ ¹Ù¶õ´Ù¸é <code class="module"><a href="./mod/prefork.html">prefork</a></code> MPMÀ» ¼±ÅÃÇؾß
-      ÇÑ´Ù. ´Ù¸¥ MPMÀº ´Ù¸¥ Áö½Ã¾î¸¦ »ç¿ëÇÏ¿© ÇÁ·Î¼¼½º »ý¼º°ú
-      ¿äûÀÇ Ã³¸®¸¦ Á¶ÀýÇÑ´Ù.</li>
-
-      <li><a href="mod/mod_proxy.html">proxy ¸ðµâ</a>Àº HTTP/1.1¿¡
-      ¸ÂÃß¾î ¼öÁ¤µÇ¾ú´Ù. Áß¿äÇÑ º¯È­Áß Çϳª´Â ÀÌÁ¦ ÇÁ·Ï½Ã Á¢±ÙÁ¦¾î°¡
-      <code>&lt;Directory proxy:&gt;</code> ºí·ÏÀÌ ¾Æ´Ï¶ó
-      <code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>
-      ºí·Ï¿¡ À§Ä¡ÇÏ´Â Á¡ÀÌ´Ù.</li>
-
-      <li>¸î¸î ¸ðµâ¿¡¼­ <code>PATH_INFO</code> (ÁøÂ¥ °æ·Î¸í
-      µÚ¿¡ ³ª¿À´Â °æ·Î Á¤º¸) ó¸® ¹æ½ÄÀÌ º¯°æµÇ¾ú´Ù. Àü¿¡
-      Çڵ鷯¿´Áö¸¸ ÀÌÁ¦ ÇÊÅÍ·Î ±¸ÇöµÇ´Â ¸ðµâÀº ´õ ÀÌ»ó
-      <code>PATH_INFO</code>°¡ ÀÖ´Â ¿äûÀ» ¹Þ¾ÆµéÀÌÁö ¸øÇÑ´Ù.
-      <a href="mod/mod_include.html">INCLUDES</a>³ª <a href="http://www.php.net/">PHP</a>¿Í °°Àº ÇÊÅÍ´Â
-      core Çڵ鷯 À§¿¡ ±¸ÇöµÇ±â¶§¹®¿¡ <code>PATH_INFO</code>°¡
-      ÀÖ´Â ¿äûÀ» °ÅºÎÇÑ´Ù. core Çڵ鷯°¡ <code>PATH_INFO</code>°¡
-      ÀÖ´Â ¿äûÀ» ¹Þ¾ÆµéÀÌ°í server-side include¿¡¼­
-      <code>PATH_INFO</code>¸¦ »ç¿ëÇÏ°Ô ÇÏ·Á¸é, <code class="directive"><a href="./mod/core.html#acceptpathinfo">AcceptPathInfo</a></code> Áö½Ã¾î¸¦ »ç¿ëÇؾß
-      ÇÑ´Ù.</li>
-
-      <li><code class="directive"><a href="./mod/mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></code>
-      Áö½Ã¾î´Â ÀÌÁ¦ ¾Æ±Ô¸ÕÆ®·Î <code>on</code>°ú <code>off</code>¸¦
-      ¹Þ´Â´Ù. ±âÁ¸ÀÇ <code class="directive">CacheNegotiatedDocs</code>´Â
-      <code>CacheNegotiatedDocs on</code>À¸·Î ¼öÁ¤ÇØ¾ß ÇÑ´Ù.</li>
-
-      <li>
-        <code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code> Áö½Ã¾î´Â
-        ´õÀÌ»ó ¸Þ¼¼Áö¸¦ ³ªÅ¸³»´Â ¾Æ±Ô¸ÕÆ® ¾Õ¿¡ µû¿ÈÇ¥¸¦ »ç¿ëÇÏÁö
-        ¾Ê´Â´Ù. ´ë½Å ½Öµû¿ÈÇ¥·Î ¸Þ¼¼Áö¸¦ ¹­¾î¾ß ÇÑ´Ù. ¿¹¸¦ µé¾î °ú°Å
-
-        <div class="example"><p><code>
-          ErrorDocument 403 "Some Message
-        </code></p></div>
-        ´Â ´ÙÀ½°ú °°ÀÌ ¼öÁ¤ÇØ¾ß ÇÑ´Ù.
-
-        <div class="example"><p><code>
-          ErrorDocument 403 "Some Message"
-        </code></p></div>
-        µÎ¹ø° ¾Æ±Ô¸ÕÆ®°¡ À¯È¿ÇÑ URLÀ̳ª °æ·Î¸íÀÌ ¾Æ´Ï¶ó¸é ¸Þ¼¼Áö·Î
-        °£ÁÖÇÑ´Ù.
-      </li>
-
-      <li><code>AccessConfig</code>¿Í <code>ResourceConfig</code>
-      Áö½Ã¾î´Â »ç¶óÁ³´Ù. ±âÁ¸¿¡ »ç¿ëÇÏ´ø Áö½Ã¾î´Â °°Àº ±â´ÉÀ»
-      ÇÏ´Â <code class="directive"><a href="./mod/core.html#include">Include</a></code> Áö½Ã¾î·Î
-      ´ëüÇÒ ¼ö ÀÖ´Ù. °ú°Å¿¡ ¼³Á¤ÆÄÀÏ¿¡¼­ ÀÌ Áö½Ã¾îµéÀ» »ç¿ëÇÏÁö¾Ê°í
-      ÀÌ Áö½Ã¾îµéÀÇ ±âº»°ªÀ» »ç¿ëÇß´Ù¸é, <code>http.conf</code>¿¡
-      <code>Include conf/access.conf</code>¿Í <code>Include
-      conf/srm.conf</code>¸¦ Ãß°¡ÇÒ ÇÊ¿ä°¡ ÀÖ´Ù. ¾ÆÆÄÄ¡°¡ ÀÌÀü
-      Áö½Ã¾î¿Í °°Àº ¼ø¼­·Î ¼³Á¤ÆÄÀÏÀ» ÀаÔÇÏ·Á¸é
-      <code class="directive"><a href="./mod/core.html#include">Include</a></code> Áö½Ã¾î¸¦
-      <code>httpd.conf</code> ³¡¿¡ µÎ°í, <code>srm.conf</code>ÀÌ
-      <code>access.conf</code> ¾Õ¿¡ ³ª¿Í¾ß ÇÑ´Ù.</li>
-
-      <li><code>BindAddress</code>¿Í <code>Port</code> Áö½Ã¾î´Â
-      »ç¶óÁ³´Ù. ´õ À¯¿¬ÇÑ <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>
-      Áö½Ã¾î°¡ °°Àº ±â´ÉÀ» ÇÑ´Ù.</li>
-
-      <li>Apache-1.3¿¡¼­ <code>Port</code>´Â ÀÚ±âÂüÁ¶
-      URLÀÇ Æ÷Æ® ¹øÈ£¸¦ ¼³Á¤ÇÏ´Â Àϵµ Çß´Ù. Apache-2.0¿¡¼­ ÀÌ
-      ±â´ÉÀº »õ·Î¿î <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code>À¸·Î
-      ÇÑ´Ù. ÇÑ Áö½Ã¾î¿¡ È£½ºÆ®¸í<em>°ú</em> ÀÚ±âÂüÁ¶ URLÀ» À§ÇÑ
-      Æ÷Æ® ¹øÈ£¸¦ °°ÀÌ ¼³Á¤ÇÒ ¼ö ÀÖ´Ù.</li>
-
-      <li><code>ServerType</code> Áö½Ã¾î´Â »ç¶óÁ³´Ù. ¿äûÀ»
-      ¼­ºñ½ºÇÏ´Â ¹æ¹ýÀº ÀÌÁ¦ MPM ¼±Åÿ¡ ´Þ·È´Ù. ÇöÀç inetd¿¡¼­
-      ½ÃÀÛÇϵµ·Ï ¼³°èµÈ MPMÀº ¾ø´Ù.</li>
-
-      <li><code>AgentLog</code>, <code>RefererLog</code>,
-      <code>RefererIgnore</code> Áö½Ã¾î¸¦ Á¦°øÇÑ
-      <code>mod_log_agent</code>¿Í <code>mod_log_referer</code>
-      ¸ðµâÀÌ ¾ø¾îÁ³´Ù. agent ·Î±×¿Í referer ·Î±×´Â
-      <code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code>ÀÇ <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> Áö½Ã¾î¸¦
-      »ç¿ëÇÏ¿© °è¼Ó Á¦°øµÈ´Ù.</li>
-
-      <li><code>AddModule</code>°ú <code>ClearModuleList</code>
-      Áö½Ã¾î´Â »ç¶óÁ³´Ù. ÀÌ Áö½Ã¾îµéÀº ¸ðµâÀ» ¿Ã¹Ù¸¥ ¼ø¼­·Î
-      È°¼ºÈ­ÇÏ·Á°í »ç¿ëÇß´Ù. »õ·Î¿î Apache 2.0 API´Â ¸ðµâÀÌ
-      È°¼ºÈ­µÇ´Â ¼ø¼­¸¦ ¸í½ÃÀûÀ¸·Î ÁöÁ¤ÇÒ ¼ö À־, ÀÌ Áö½Ã¾îµéÀÌ
-      ÇÊ¿ä¾ø°Ô µÇ¾ú´Ù.</li>
-
-      <li><code>FancyIndexing</code> Áö½Ã¾î°¡ ¾ø¾îÁ³´Ù.
-      <code class="directive"><a href="./mod/mod_autoindex.html#indexoptions">IndexOptions</a></code>
-      Áö½Ã¾îÀÇ <code>FancyIndexing</code> ¿É¼ÇÀÌ °°Àº ±â´ÉÀ» ÇÑ´Ù.</li>
-
-      <li><code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code>ÀÇ MultiViews ³»¿ëÇù»óÀÌ
-      ´õ ¾ö°ÝÇÏ°Ô ±âº»ÆÄÀÏÀ» ã´Â´Ù. ³»¿ëÇù»óÀº <em>Çù»ó°¡´ÉÇÑ</em>
-      ÆÄÀÏ Áß¿¡¼­¸¸ ¼±ÅÃÇÑ´Ù. <code class="directive"><a href="./mod/mod_mime.html#multiviewsmatch">MultiviewsMatch</a></code> Áö½Ã¾î¸¦
-      »ç¿ëÇÏ¿© ÀÌÀü°ú °°ÀÌ µ¿ÀÛÇÏ°Ô ÇÒ ¼ö ÀÖ´Ù.</li>
-
-      <li>(<em>2.0.51 ¹öÀü ÀÌÈÄ</em>)
-      <p><code>ErrorHeader</code> Áö½Ã¾î´Â À߸øµÈ ¸íĪÀ¸·Î,
-      ÀÌ Áö½Ã¾î°¡ ´ã´çÇÑ ±â´ÉÀº <code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code> Áö½Ã¾î·Îµµ °¡´ÉÇÏ´Ù.
-      ¿øÇÏ´Â ±â´ÉÀ» À§ÇØ,</p>
-
-      <div class="example"><p><code>
-        Header always set ¾î¼°í Àú¼°í
-      </code></p></div>
-
-      <p>¿Í °°ÀÌ ¼³Á¤ÇÑ´Ù.</p></li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="misc" id="misc">±âŸ º¯È­</a></h2>
-    
-
-    <ul>
-      <li>Apache 1.3¿¡¼­ ½ÇÇèÀûÀÌ¿´´ø <code class="module"><a href="./mod/mod_auth_digest.html">mod_auth_digest</a></code>
-      ¸ðµâÀÌ ÀÌÁ¦ Ç¥ÁØ ¸ðµâÀÌ µÇ¾ú´Ù.</li>
-
-      <li>Apache 1.3¿¡¼­ ½ÇÇèÀûÀÌ¿´´ø <code>mod_mmap_static</code>
-      ¸ðµâÀÌ <code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code>·Î ´ëüµÇ¾ú´Ù.</li>
-
-      <li>¹èÆ÷º»ÀÌ ¿ÏÀüÈ÷ »õ·Î ±¸¼ºµÇ¾î ´õÀÌ»ó µ¶¸³µÈ <code>src</code>
-      µð·ºÅ丮°¡ ¾ø´Ù. ´ë½Å ¼Ò½º´Â ÁÖ ¹èÆ÷º» µð·ºÅ丮 ¾Æ·¡ ³í¸®ÀûÀ¸·Î
-      ±¸¼ºµÇÀÖ°í, ÄÄÆÄÀÏÇÑ ¼­¹ö´Â ´Ù¸¥ µð·ºÅ丮·Î ¼³Ä¡µÈ´Ù.</li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="third-party" id="third-party">Á¦»ïÀÚ°¡ ¸¸µç ¸ðµâ</a></h2>
-    
-
-    <p>Apache 2.0¿¡¼­ ¼­¹ö API°¡ ¸¹ÀÌ º¯°æµÇ¾ú´Ù. Apache 1.3 API¿¡
-    ¸ÂÃçÁø ±âÁ¸ ¸ðµâÀ» ¼öÁ¤¾øÀÌ Apache 2.0¿¡¼­ »ç¿ëÇÒ ¼ö
-    <strong>¾ø´Ù</strong>. ÀÚ¼¼ÇÑ Á¤º¸´Â <a href="developer/">°³¹ßÀÚ
-    ¹®¼­</a>¸¦ Âü°íÇ϶ó.</p>
-  </div></div>
-<div class="bottomlang">
-<p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/upgrading.html" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Portugu&#234;s (Brasil)">&nbsp;pt-br&nbsp;</a> |
-<a href="./ru/upgrading.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/upgrading.html.pt-br b/docs/manual/upgrading.html.pt-br
deleted file mode 100644
index 44eef029..00000000
--- a/docs/manual/upgrading.html.pt-br
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="pt-br" xml:lang="pt-br"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>Atualizando da versão 1.3 para 2.0 - Servidor HTTP Apache</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">Módulos</a> | <a href="./mod/directives.html">Diretrizes</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossário</a> | <a href="./sitemap.html">Mapa do site</a></p>
-<p class="apache">Servidor HTTP Apache Versão 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">Servidor HTTP</a> &gt; <a href="http://httpd.apache.org/docs/">Documentação</a> &gt; <a href="./">Versão 2.2</a></div><div id="page-content"><div id="preamble"><h1>Atualizando da versão 1.3 para 2.0</h1>
-<div class="toplang">
-<p><span>Línguas Disponíveis: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/upgrading.html" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
-<a href="./ru/upgrading.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
-</div>
-<div class="outofdate">Esta tradução pode estar desatualizada. 
-        Verifique a versão em Inglês para mudanças recentes.</div>
-
-  <p>Com a finalidade de ajudar as pessoas na atualização do servidor,
-  nós mantemos um documento que descreve informações críticas para
-  os usuários já existentes do Apache. Essas informações tem o
-  intuito de serem breves notas e você deverá encontrar mais
-  informações no documento <a href="new_features_2_0.html">Novas Funcionalidades</a>, ou no
-  arquivo <code>src/CHANGES</code>.</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#compile-time">Mudanças na Configuração em tempo de Compilação</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#run-time">Mudanças na Configuração em tempo de Execução</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#misc">Mudanças Gerais</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#third-party">Módulos de Terceiros</a></li>
-</ul><h3>Veja também</h3><ul class="seealso"><li><a href="new_features_2_0.html">Descrição das novas
-  funcionalidades do Apache 2.0</a></li></ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="compile-time" id="compile-time">Mudanças na Configuração em tempo de Compilação</a></h2>
-    
-
-    <ul>
-      <li>O Apache agora usa o sistema <code>autoconf</code>
-      e <code>libtool</code> para <a href="install.html">
-      configurar o processo de construção</a>.
-      A utilização desse sistema é similar, mas não o 
-      mesmo, a usar o sistema APACI do Apache 1.3</li>
-
-      <li>Além da seleção habitual de módulos que você 
-      pode escolher para compilar, o Apache 2.0 mudou a parte
-      principal de processamentos de pedidos para os <a href="mpm.html">Módulos Multi-Processamento</a> (MPMs).</li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="run-time" id="run-time">Mudanças na Configuração em tempo de Execução</a></h2>
-    
-
-    <ul>
-      <li>Muitas diretrizes que estavam no núcleo do servidor
-      no Apache 1.3 estão agora nos MPMs. Se você desejar que
-      o funcionamento do servidor seja o mais similar possível ao
-      do Apache 1.3, você deve selecionar o MPM <code class="module"><a href="./mod/prefork.html">prefork</a></code>. 
-      Os outros MPMs terão diretrizes diferentes para controlar
-      a criação de processos e o processamento de pedidos.</li>
-
-      <li>O <a href="mod/mod_proxy.html">módulo proxy</a> foi reconstruído
-      para o padrão HTTP/1.1. Ao longo das mudanças importantes,
-      o controle de acesso ao proxy agora fica dentro de um bloco
-      <code class="directive"><a href="./mod/mod_proxy.html#proxy">&lt;Proxy&gt;</a></code>,
-      ao invés de um bloco <code>&lt;Directory proxy:&gt;</code>.</li>
-
-      <li>A operação com <code>PATH_INFO</code> (informação de
-      caminho procedente depois do nome do arquivo verdadeiro) mudou
-      para alguns módulos. Módulos que eram previamente implementados
-      como manipuladores mas agora são implementados como filtros
-      não podem mais aceitar pedidos com <code>PATH_INFO</code>.
-      Filtros como <a href="mod/mod_include.html">INCLUDES</a>
-      ou <a href="http://www.php.net/">PHP</a> são implementados
-      no topo dos manipuladores principais, rejeitando pedidos
-      com <code>PATH_INFO</code>. Você pode usar a diretriz
-      <code class="directive"><a href="./mod/core.html#acceptpathinfo">AcceptPathInfo</a></code>
-      para forçar o manipulador principal a aceitar pedidos
-      com <code>PATH_INFO</code> e assim restaurar a habilidade
-      de usá-lo em inclusões por parte do servidor (SSI).</li>
-
-      <li>A diretriz <code class="directive"><a href="./mod/mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></code> agora aceita 
-      o argumento <code>on</code> ou <code>off</code>. Instâncias 
-      existentes de <code class="directive">CacheNegotiatedDocs</code> deverão 
-      ser substituídas por <code>CacheNegotiatedDocs on</code>.</li>
-
-      <li>
-        A diretriz <code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code>
-        não usa mais aspas no começo do argumento para indicar
-        mensagens de texto. Ao invés disso, você deve colocar
-        a mensagem inteira entre aspas. Por exemplo, instâncias
-        existentes de
-
-        <div class="example"><p><code>
-          ErrorDocument 403 "Alguma mensagem
-        </code></p></div>
-        devem ser substituídas por
-
-        <div class="example"><p><code>
-          ErrorDocument 403 "Alguma mensagem"
-        </code></p></div>
-
-        Contanto que o segundo argumento não seja uma
-        URL válida ou um caminho de arquivo, irá ser
-        tratado como uma mensagem de texto.
-      </li>
-
-      <li>As diretrizes <code>AccessConfig</code> e
-      <code>ResourceConfig</code> não existem mais.
-      Instâncias existentes dessas diretrizes podem ser substituídas
-      com a diretriz <code class="directive"><a href="./mod/core.html#include">Include</a></code>
-      que possui uma funcionalidade equivalente. Se você estava
-      fazendo uso dos valores padrões dessas diretrizes sem incluí-las
-      nos arquivos de configuração, você provavelmente terá 
-      que adicionar <code>Include conf/access.conf</code> e 
-      <code>Include conf/srm.conf</code> ao seu <code>httpd.conf</code>. 
-      Com o fim de assegurar que o Apache leia os arquivos de 
-      configuração na mesma ordem que as diretrizes velhas usavam, 
-      a diretriz <code class="directive"><a href="./mod/core.html#include">Include</a></code> deve ser colocada 
-      no final do <code>httpd.conf</code>, com uma entrada para 
-      <code>srm.conf</code> antes de <code>access.conf</code>.</li>
-
-      <li>As diretrizes <code>BindAddress</code> and <code>Port</code>
-      não existem mais. Uma funcionalidade equivalente é fornecida com
-      uma diretriz mais flexível <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>.</li>
-
-      <li>Outro uso da diretriz <code>Port</code> no Apache-1.3
-      era ajustar o número da porta usada em URLs auto-referenciáveis.
-      O equivalente no Apache-2.0 é a nova sintaxe <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code>: ela foi modificada para permitir que
-      sejam especificados ambos "hostname" <em>e</em> o número da porta
-      para URLs auto-referenciáveis em uma só diretriz.</li>
-
-      <li>A diretriz <code>ServerType</code> não existe mais.
-      O método usado para atender pedidos é determinado pela
-      seleção de MPM. Atualmente não existe nenhuma MPM projetada
-      para ser executada pelo inetd.</li>
-
-      <li>Os módulos <code>mod_log_agent</code> e <code>mod_log_referer</code>
-      que forneciam as diretrizes <code>AgentLog</code>, 
-      <code>RefererLog</code> e <code>RefererIgnore</code> foram removidas.
-      Registros de agentes e referências ainda estão disponíveis
-      usando a diretriz <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> do 
-      <code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code>.</li>
-
-      <li>As diretrizes <code>AddModule</code> e
-      <code>ClearModuleList</code> não existem mais.
-      Essas diretrizes eram usadas para garantir que módulos
-      pudessem ser habilitados na ordem correta. A nova API do
-      Apache 2.0 permite que os módulos especifiquem explicitamente
-      a sua ordem, eliminando a necessidade dessas diretrizes.</li>
-
-      <li>A diretriz <code>FancyIndexing</code> foi removida.
-      A mesma funcionalidade está disponível através da
-      opção <code>FancyIndexing</code> da diretriz <code class="directive"><a href="./mod/mod_autoindex.html#indexoptions">IndexOptions</a></code>.</li>
-
-      <li>A técnica de negociação de conteúdo (content-negotiation)
-      MultiViews fornecida pelo <code class="module"><a href="./mod/mod_negotiation.html">mod_negotiation</a></code>
-      se tornou mais rigorosa em sua combinação de arquivo
-      padrão. Ela irá selecionar apenas arquivos negociáveis
-      (<em>negotiable</em>). O comportamento antigo pode ser restaurado usando a
-      diretriz <code class="directive"><a href="./mod/mod_mime.html#multiviewsmatch">MultiviewsMatch</a></code>.</li>
-
-      <li>(<em>desde a versão 2.0.51</em>)
-      <p>A funcionalidade da diretriz <code>ErrorHeader</code>
-      foi colocada em conjunto com a diretriz <code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code>, já que era um
-      uso de um nome impróprio. Utilize</p>
-
-      <div class="example"><p><code>
-        Header always set foo bar
-      </code></p></div>
-
-      <p>para obter o comportamento desejado.</p></li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="misc" id="misc">Mudanças Gerais</a></h2>
-    
-
-    <ul>
-      <li>O módulo <code class="module"><a href="./mod/mod_auth_digest.html">mod_auth_digest</a></code>, que era
-      experimental no Apache 1.3, é agora um módulo padrão.</li>
-
-      <li>O módulo <code>mod_mmap_static</code>, que era experimental no
-      Apache 1.3, foi substituído com <code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code>.</li>
-
-      <li>A distribuição foi completamente reorganizada para
-      não conter mais um diretório <code>src</code> independente.
-      Em seu lugar, os fontes são organizados
-      logicamente no diretório principal da distribuição e
-      a instalação do servidor compilado deve ser direcionada
-      à um diretório separado.</li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="third-party" id="third-party">Módulos de Terceiros</a></h2>
-    
-
-    <p>Mudanças extensivas foram feitas na API do servidor
-    no Apache 2.0. Módulos existentes projetados para a API
-    do Apache 1.3, <strong>não</strong> funcionarão no Apache
-    2.0 sem modificações. Detalhes serão fornecidos na
-    <a href="developer/">documentação do desenvolvedor</a>.</p>
-  </div></div>
-<div class="bottomlang">
-<p><span>Línguas Disponíveis: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
-<a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/upgrading.html" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
-<a href="./ru/upgrading.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licenciado sob a <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">Módulos</a> | <a href="./mod/directives.html">Diretrizes</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossário</a> | <a href="./sitemap.html">Mapa do site</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/upgrading.html.ru.koi8-r b/docs/manual/upgrading.html.ru.koi8-r
deleted file mode 100644
index 25ca39e1..00000000
--- a/docs/manual/upgrading.html.ru.koi8-r
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="KOI8-R"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ru" xml:lang="ru"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>ðÅÒÅÈÏÄ ÏÔ ×ÅÒÓÉÉ 1.3 Ë ×ÅÒÓÉÉ 2.0 - HTTP ÓÅÒ×ÅÒ Apache</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">íÏÄÕÌÉ</a> | <a href="./mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="./sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p>
-<p class="apache">HTTP ÓÅÒ×ÅÒ Apache ×ÅÒÓÉÉ 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ÓÅÒ×ÅÒ</a> &gt; <a href="http://httpd.apache.org/docs/">äÏËÕÍÅÎÔÁÃÉÑ</a> &gt; <a href="./">÷ÅÒÓÉÑ 2.2</a></div><div id="page-content"><div id="preamble"><h1>ðÅÒÅÈÏÄ ÏÔ ×ÅÒÓÉÉ 1.3 Ë ×ÅÒÓÉÉ 2.0</h1>
-<div class="toplang">
-<p><span>äÏÓÔÕÐÎÙÅ ÑÚÙËÉ: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Portugu&#234;s (Brasil)">&nbsp;pt-br&nbsp;</a> |
-<a href="./ru/upgrading.html" title="Russian">&nbsp;ru&nbsp;</a></p>
-</div>
-<div class="outofdate">üÔÏÔ ÐÅÒÅ×ÏÄ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÒÅ×ÛÉÍ. óÍÏÔÒÉÔÅ
-            ÁÎÇÌÉÊÓËÕÀ ×ÅÒÓÉÀ ÄÌÑ ÏÚÎÁËÏÍÌÅÎÉÑ ÓÏ ×ÓÅÍÉ ÐÏÓÌÅÄÎÉÍÉ ÉÚÍÅÎÅÎÉÑÍÉ
-            × ÄÏËÕÍÅÎÔÅ.</div>
-
-  <p>üÔÏÔ ÄÏËÕÍÅÎÔ ÎÅÏÂÈÏÄÉÍ ÄÌÑ ÔÏÇÏ, ÞÔÏÂÙ ÐÏÍÏÞØ ÐÏÌØÚÏ×ÁÔÅÌÑÍ
-  ÐÅÒÅÊÔÉ Ë ÉÓÐÏÌØÚÏ×ÁÎÉÀ ÓÅÒ×ÅÒÁ ×ÅÒÓÉÉ 2.0. úÄÅÓØ ×Ù ÎÁÊÄÅÔÅ ÌÉÛØ
-  ËÒÁÔËÉÅ ÚÁÍÅÞÁÎÉÑ; ÂÏÌÅÅ ÐÏÄÒÏÂÎÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÎÏ×Ï××ÅÄÅÎÉÑÈ ÍÏÖÎÏ
-  ÎÁÊÔÉ ÌÉÂÏ × ÄÏËÕÍÅÎÔÅ <a href="new_features_2_0.html">îÏ×ÙÅ ×ÏÚÍÏÖÎÏÓÔÉ</a>, ÌÉÂÏ × ÆÁÊÌÅ <code>src/CHANGES</code>.</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#compile-time">éÚÍÅÎÅÎÉÑ × ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÓÂÏÒËÉ ÓÅÒ×ÅÒÁ</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#run-time">éÚÍÅÎÅÎÉÑ × ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÒÁÂÏÔÙ ÓÅÒ×ÅÒÁ</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#misc">äÒÕÇÉÅ ÉÚÍÅÎÅÎÉÑ</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#third-party">íÏÄÕÌÉ ÔÒÅÔØÉÈ ÆÉÒÍ</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="compile-time" id="compile-time">éÚÍÅÎÅÎÉÑ × ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÓÂÏÒËÉ ÓÅÒ×ÅÒÁ</a></h2>
-    
-
-    <ul>
-      <li>Apache ÔÅÐÅÒØ ÉÓÐÏÌØÚÕÅÔ ÓÉÓÔÅÍÕ <code>autoconf</code> É
-      <code>libtool</code> ÄÌÑ <a href="install.html">ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ ÐÒÏÃÅÓÓÁ ÓÂÏÒËÉ</a>.
-      éÓÐÏÌØÚÏ×ÁÎÉÅ ÜÔÏÊ ÓÉÓÔÅÍÙ ÐÏÈÏÖÅ ÎÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ
-      APACI × Apache 1.3, ÈÏÔÑ É ÎÅ Ñ×ÌÑÅÔÓÑ ÁÂÓÏÌÀÔÎÏ ÔÅÍ ÖÅ ÓÁÍÙÍ.</li>
-
-      <li>÷ ÄÏÂÁ×ÏË Ë ÏÂÙÞÎÏÍÕ ÓÐÉÓËÕ ÍÏÄÕÌÅÊ, ËÏÔÏÒÙÅ ×Ù ÍÏÖÅÔÅ
-      ×ÙÂÒÁÔØ ÐÒÉ ÓÂÏÒËÅ ÓÅÒ×ÅÒÁ, × Apache 2.0 ÐÏÑ×ÉÌÉÓØ <a href="mpm.html">ÍÕÌØÔÉ - ÐÒÏÃÅÓÓÎÙÅ ÍÏÄÕÌÉ</a> (íð - ÍÏÄÕÌÉ), × ËÏÔÏÒÙÈ ÔÅÐÅÒØ
-      ÓËÏÎÃÅÎÔÒÉÒÏ×ÁÎÁ ÏÓÎÏ×ÎÁÑ ÞÁÓÔØ ËÏÄÁ, ÏÔ×ÅÞÁÀÝÅÇÏ ÚÁ ÏÂÒÁÂÏÔËÕ
-      ÚÁÐÒÏÓÏ×.</li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="run-time" id="run-time">éÚÍÅÎÅÎÉÑ × ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÉ ÒÁÂÏÔÙ ÓÅÒ×ÅÒÁ</a></h2>
-    
-
-    <ul>
-      <li>íÎÏÇÉÅ ÉÚ ÔÅÈ ÄÉÒÅËÔÉ×, ËÏÔÏÒÙÅ ÏÂÓÌÕÖÉ×ÁÌÉÓØ ÑÄÒÏÍ ÓÅÒ×ÅÒÁ
-      Apache 1.3, ÔÅÐÅÒØ ÐÅÒÅÎÅÓÅÎÙ × ÍÕÌØÔÉ - ÐÒÏÃÅÓÓÎÙÅ ÍÏÄÕÌÉ. åÓÌÉ ×Ù
-      ÈÏÔÉÔÅ, ÞÔÏÂÙ ÐÏ×ÅÄÅÎÉÅ ÓÅÒ×ÅÒÁ ÂÙÌÏ ÎÁÉÂÏÌÅÅ ÐÒÉÂÌÉÖÅÎÏ Ë ÐÏ×ÅÄÅÎÉÀ
-      Apache 1.3, ÔÏ ÐÒÉ ÓÂÏÒËÅ ×Ù ÄÏÌÖÎÙ ×ÙÂÒÁÔØ íð-ÍÏÄÕÌØ <a href="mod/prefork.html">prefork</a>. äÒÕÇÉÅ íð-ÍÏÄÕÌÉ ÐÒÅÄÏÓÔÁ×ÌÑÀÔ
-      ÉÎÙÅ ÄÉÒÅËÔÉ×Ù, ÏÔ×ÅÞÁÀÝÉÅ ÚÁ ÒÁÂÏÔÕ ÐÒÏÃÅÓÓÏ× ÓÅÒ×ÅÒÁ É ÏÂÒÁÂÏÔËÕ
-      ÚÁÐÒÏÓÏ×.</li>
-
-      <li><a href="mod/mod_proxy.html">ðÒÏËÓÉ ÍÏÄÕÌØ</a> ÂÙÌ ÐÅÒÅÐÉÓÁÎ,
-      É ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÓÐÅÃÉÆÉËÁÃÉÀ HTTP/1.1. ïÄÎÉÍ ÉÚ ÎÁÉÂÏÌÅÅ
-      ×ÁÖÎÙÈ ÉÚÍÅÎÅÎÉÊ Ñ×ÌÑÅÔÓÑ ÔÏ, ÞÔÏ ÄÉÒÅËÔÉ×Ù, ËÏÎÔÒÏÌÉÒÕÀÝÉÅ ÒÁÂÏÔÕ
-      ÍÏÄÕÌÑ, ÔÅÐÅÒØ ÒÁÓÐÏÌÁÇÁÀÔÓÑ × ÓÅËÃÉÉ &lt;Proxy&gt;, Á ÎÅ ×
-      &lt;Directory proxy:&gt;, ËÁË ÜÔÏ ÂÙÌÏ ÒÁÎÅÅ.</li>
-
-      <li>ïÂÒÁÂÏÔËÁ PATH_INFO (ÐÕÔÅ×ÏÊ ÉÎÆÏÒÍÁÃÉÉ, ÓÌÅÄÕÀÝÅÊ ÚÁ
-      ÉÍÅÎÅÍ ÚÁÐÒÁÛÉ×ÁÅÍÏÇÏ ÄÏËÕÍÅÎÔÁ) ÉÚÍÅÎÉÌÁÓØ ÄÌÑ ÎÅËÏÔÏÒÙÈ ÍÏÄÕÌÅÊ.
-      íÏÄÕÌÉ, ËÏÔÏÒÙÅ ÒÁÎØÛÅ ÂÙÌÉ ÎÁÐÉÓÁÎÙ ËÁË ÏÂÒÁÂÏÔÞÉËÉ (handler), Á
-      ÔÅÐÅÒØ ×ÙÐÏÌÎÑÀÔ ÒÏÌØ ÆÉÌØÔÒÏ×, ÍÏÇÕÔ ÂÏÌÅÅ ÎÅ ÐÒÉÎÉÍÁÔØ ÚÁÐÒÏÓÙ,
-      ÓÏÄÅÒÖÁÝÉÅ PATH_INFO. ôÁËÉÅ ÆÉÌØÔÒÙ, ËÁË <a href="mod/mod_include.html">INCLUDES</a> ÒÅÁÌÉÚÏ×ÁÎÙ ÐÅÒ×ÙÍÉ × ÂÁÚÏ×ÏÍ
-      ÏÂÒÁÂÏÔÞÉËÅ, ÔÁËÉÍ ÏÂÒÁÚÏÍ ÏÎÉ ÎÅ ÍÏÇÕÔ ÐÒÉÎÉÍÁÔØ ÚÁÐÒÏÓÙ, ÓÏÄÅÒÖÁÝÉÅ
-      PATH_INFO. ÷Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÉÒÅËÔÉ×Õ <code class="directive"><a href="./mod/core.html#acceptpathinfo">AcceptPathInfo</a></code>, ÞÔÏÂÙ ÚÁÓÔÁ×ÉÔØ ÂÁÚÏ×ÙÊ
-      ÏÂÒÁÂÏÔÞÉË ÐÒÉÎÉÍÁÔØ ÐÏÄÏÂÎÙÅ ÚÁÐÒÏÓÙ, É ÔÁËÉÍ ÏÂÒÁÚÏÍ ×ÏÓÓÔÁÎÏ×ÉÔØ
-      ×ÏÚÍÏÖÎÏÓÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÑ PATH_INFO × ÄÏËÕÍÅÎÔÁÈ, ÉÓÐÏÌØÚÕÀÝÉÈ ×ËÌÀÞÅÎÉÑ
-      ÎÁ ÓÔÏÒÏÎÅ ÓÅÒ×ÅÒÁ (SSI).</li>
-
-      <li>äÉÒÅËÔÉ×Á <code class="directive"><a href="./mod/mod_negotiation.html#cachenegotiateddocs">CacheNegotiatedDocs</a></code>
-      ÔÅÐÅÒØ ÍÏÖÅÔ ÐÒÉÎÉÍÁÔØ ÁÒÇÕÍÅÎÔÙ <code>on</code> É
-      <code>off</code>. õÖÅ ÓÕÝÅÓÔ×ÕÀÝÉÅ ÜËÚÅÍÐÌÑÒÙ ÄÉÒÅËÔÉ×Ù
-      <code>CacheNegotiatedDocs</code> ÄÏÌÖÎÙ ÂÙÔØ ÚÁÍÅÎÅÎÙ ÎÁ
-      <code>CacheNegotiatedDocs on</code>.</li>
-
-      <li>
-        äÉÒÅËÔÉ×Á <code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code>
-        ÂÏÌÅÅ ÎÅ ÉÓÐÏÌØÚÕÅÔ ÏÔËÒÙ×ÁÀÝÕÀ ËÁ×ÙÞËÕ × ÎÁÞÁÌÅ ÁÒÇÕÍÅÎÔÁ
-        ÄÌÑ ÏÂÏÚÎÁÞÅÎÉÑ ÔÏÇÏ, ÞÔÏ ÁÒÇÕÍÅÎÔ Ñ×ÌÑÅÔÓÑ ÔÅËÓÔÏ×ÙÍ ÓÏÏÂÝÅÎÉÅÍ.
-        ÷ÍÅÓÔÏ ÜÔÏÇÏ ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ ÚÁËÌÀÞÁÔØ ×ÅÓØ ÔÅËÓÔ ÓÏÏÂÝÅÎÉÑ
-        × Ä×ÏÊÎÙÅ ËÁ×ÙÞËÉ. îÁÐÒÉÍÅÒ, ÓÕÝÅÓÔ×ÕÀÝÉÅ ÄÉÒÅËÔÉ×Ù
-
-        <div class="example"><p><code>
-          ErrorDocument 403 "îÅËÏÔÏÒÏÅ ÓÏÏÂÝÅÎÉÅ
-        </code></p></div>
-        ÄÏÌÖÎÙ ÂÙÔØ ÚÁÍÅÎÅÎÙ ÎÁ
-
-        <div class="example"><p><code>
-          ErrorDocument 403 "îÅËÏÔÏÒÏÅ ÓÏÏÂÝÅÎÉÅ"
-        </code></p></div>
-        åÓÌÉ ×ÔÏÒÏÊ ÁÒÇÕÍÅÎÔ ÎÅ Ñ×ÌÑÅÔÓÑ ÐÒÁ×ÉÌØÎÏ ÏÆÏÒÍÌÅÎÎÙÍ
-        ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ ÒÅÓÕÒÓÁ (URL) ÉÌÉ ÐÕÔÅ×ÙÍ ÉÍÅÎÅÍ, ÔÏ ÏÎ
-        ÂÕÄÅÔ ÉÎÔÅÒÐÒÅÔÉÒÏ×ÁÔØÓÑ ËÁË ÔÅËÓÔÏ×ÏÅ ÓÏÏÂÝÅÎÉÅ.
-      </li>
-
-      <li>äÉÒÅËÔÉ×Ù <code>AccessConfig</code> É
-      <code>ResourceConfig</code> ÂÏÌÅÅ ÎÅ ÓÕÝÅÓÔ×ÕÀÔ.
-      éÍÅÀÝÉÅÓÑ ÉÈ ËÏÐÉÉ ÍÏÇÕÔ ÂÙÔØ ÚÁÍÅÎÅÎÙ ÄÉÒÅËÔÉ×ÏÊ
-      <code class="directive"><a href="./mod/core.html#include">Include</a></code>, ËÏÔÏÒÁÑ ÉÍÅÅÔ
-      ÔÕ ÖÅ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔØ. åÓÌÉ ÐÒÅÖÄÅ ×Ù ÎÅ ×ËÌÀÞÁÌÉ ÉÈ × ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ
-      ÆÁÊÌÙ, ÔÅÍ ÓÁÍÙÍ ÉÓÐÏÌØÚÕÑ ÉÈ ÚÎÁÞÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ, ÔÏ ÓÅÊÞÁÓ,
-      ÄÌÑ ÄÏÓÔÉÖÅÎÉÑ ÔÏÇÏ ÖÅ ÒÅÚÕÌØÔÁÔÁ, ×ÁÍ ÎÁÄÏ
-      ÄÏÂÁ×ÉÔØ ÓÌÅÄÕÀÝÉÅ ÓÔÒÏËÉ × ÆÁÊÌ httpd.conf: <code>Include conf/access.conf</code> É <code>Include
-      conf/srm.conf</code>. äÌÑ ÔÏÇÏ ÞÔÏÂÙ ÂÙÔØ Õ×ÅÒÅÎÎÙÍ × ÔÏÍ, ÞÔÏ
-      Apache ÓÞÉÔÙ×ÁÅÔ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÅ ÆÁÊÌÙ ÉÍÅÎÎÏ × ÔÏÍ ÐÏÒÑÄËÅ,
-      ËÏÔÏÒÙÊ ÂÙÌ ÐÒÅÄÕÓÍÏÔÒÅÎ ÓÔÁÒÙÍÉ ÄÉÒÅËÔÉ×ÁÍÉ, ÎÁÄÏ ÐÏÍÅÓÔÉÔØ
-      ÄÉÒÅËÔÉ×Ù <code>Include</code> × ËÏÎÃÅ ÆÁÊÌÁ httpd.conf, ÐÒÉÞÅÍ
-      ÓÐÅÒ×Á ÔÕ, ÞÔÏ ×ËÌÀÞÁÅÔ <code>srm.conf</code>, Á ÚÁÔÅÍ ÔÕ, ÞÔÏ
-      ×ËÌÀÞÁÅÔ <code>access.conf</code>.</li>
-
-      <li>äÉÒÅËÔÉ×Ù <code>BindAddress</code> É <code>Port</code>
-      ÂÏÌÅÅ ÎÅ ÓÕÝÅÓÔ×ÕÀÔ. üË×É×ÁÌÅÎÔÎÁÑ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔØ ÐÒÅÄÏÓÔÁ×ÌÑÅÔÓÑ
-      ÂÏÌÅÅ ÇÉÂËÏÊ ÄÉÒÅËÔÉ×ÏÊ <code class="directive"><a href="./mod/mpm_common.html#listen">Listen</a></code>.
-      </li>
-
-      <li>÷ Apache 1.3 ÄÉÒÅËÔÉ×Á <code>Port</code>
-      ÉÓÐÏÌØÚÏ×ÁÌÁÓØ, ËÒÏÍÅ ×ÓÅÇÏ ÐÒÏÞÅÇÏ, ÄÌÑ ÔÏÇÏ ÞÔÏÂÙ ÓÅÒ×ÅÒ
-      ÍÏÇ ÆÏÒÍÉÒÏ×ÁÔØ ÐÒÁ×ÉÌØÎÙÅ ÓÓÙÌËÉ ÎÁ ÓÁÍÏÇÏ ÓÅÂÑ. ÷ Apache 2.0 ÄÌÑ
-      ÔÅÈ ÖÅ ÃÅÌÅÊ ÓÌÕÖÉÔ ÎÏ×ÙÊ ÓÉÎÔÁËÓÉÓ ÄÉÒÅËÔÉ×Ù <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code>: ÏÎ ÂÙÌ ÉÚÍÅÎÅÎ ÔÁËÉÍ ÏÂÒÁÚÏÍ, ÞÔÏ ÔÅÐÅÒØ
-      ÉÍÑ ÈÏÓÔÁ <em>É</em> ÎÏÍÅÒ ÐÏÒÔÁ ÍÏÖÎÏ ÕËÁÚÙ×ÁÔØ × ÏÄÎÏÊ ÜÔÏÊ ÄÉÒÅËÔÉ×Å.</li>
-
-      <li>äÉÒÅËÔÉ×Á <code>ServerType</code> ÂÏÌÅÅ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ.
-      íÅÔÏÄ ÏÂÒÁÂÏÔËÉ ÚÁÐÒÏÓÏ× ÔÅÐÅÒØ ÏÐÒÅÄÅÌÑÅÔÓÑ ÐÏÓÒÅÄÓÔ×ÏÍ
-      ×ÙÂÏÒÁ íð-ÍÏÄÕÌÑ. ÷ ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ ÎÅÔ ÔÁËÏÇÏ íð-ÍÏÄÕÌÑ,
-      ËÏÔÏÒÙÊ ÍÏÇ ÂÙ ÚÁÐÕÓËÁÔØÓÑ ÐÏÓÒÅÄÓÔ×ÏÍ ÄÅÍÏÎÁ inetd.</li>
-
-      <li>íÏÄÕÌÉ mod_log_agent É mod_log_referer, ËÏÔÏÒÙÅ ÐÒÅÄÏÓÔÁ×ÌÑÌÉ
-      ÔÁËÉÅ ÄÉÒÅËÔÉ×Ù, ËÁË <code>AgentLog</code>, <code>RefererLog</code>
-      É <code>RefererIgnore</code>, ÂÙÌÉ ÕÂÒÁÎÙ. ÷ÅÄÅÎÉÅ ÖÕÒÎÁÌÁ ÁÇÅÎÔÏ×
-      ÐÏÌØÚÏ×ÁÔÅÌÅÊ (agent logs) É ÏÔÐÒÁ×ÉÔÅÌÅÊ (referer logs) ÐÏ-ÐÒÅÖÎÅÍÕ
-      ×ÏÚÍÏÖÎÏ ÐÏÓÒÅÄÓÔ×ÏÍ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÄÉÒÅËÔÉ×Ù <code class="directive"><a href="./mod/mod_log_config.html#customlog">CustomLog</a></code> ÍÏÄÕÌÑ <code class="module"><a href="./mod/mod_log_config.html">mod_log_config</a></code>.</li>
-
-      <li>äÉÒÅËÔÉ×Ù <code>AddModule</code> É
-      <code>ClearModuleList</code> ÂÏÌÅÅ ÎÅ ÓÕÝÅÓÔ×ÕÀÔ. ïÎÉ ÉÓÐÏÌØÚÏ×ÁÌÉÓØ
-      ÄÌÑ ÏÂÅÓÐÅÞÅÎÉÑ ÐÒÁ×ÉÌØÎÏÇÏ ÐÏÒÑÄËÁ ÚÁÇÒÕÚËÉ ÍÏÄÕÌÅÊ. îÏ×ÙÊ API ÄÌÑ
-      Apache 2.0 ÐÏÚ×ÏÌÑÅÔ ÍÏÄÕÌÑÍ ÓÁÍÉÍ ÕËÁÚÙ×ÁÔØ ÐÏÒÑÄÏË ÉÈ ÚÁÇÒÕÚËÉ, ÞÔÏ
-      ÄÅÌÁÅÔ ÜÔÉ ÄÉÒÅËÔÉ×Ù ÎÅÎÕÖÎÙÍÉ.</li>
-
-      <li>äÉÒÅËÔÉ×Á <code>FancyIndexing</code> ÂÙÌÁ ÕÂÒÁÎÁ. åÅ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔØ
-      ÔÅÐÅÒØ ÏÂÅÓÐÅÞÉ×ÁÅÔÓÑ ÏÐÃÉÅÊ <code>FancyIndexing</code> × ÄÉÒÅËÔÉ×Å <code class="directive"><a href="./mod/mod_autoindex.html#indexoptions">IndexOptions</a></code></li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="misc" id="misc">äÒÕÇÉÅ ÉÚÍÅÎÅÎÉÑ</a></h2>
-    
-
-    <ul>
-      <li>ïÐÃÉÑ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ <code>httpd</code> <code> -S</code>,
-      ÐÏÚ×ÏÌÑ×ÛÁÑ ÒÁÓÐÅÞÁÔÙ×ÁÔØ ËÏÎÆÉÇÕÒÁÃÉÀ ×ÉÒÔÕÁÌØÎÙÈ ÈÏÓÔÏ×, ÔÅÐÅÒØ ÚÁÍÅÎÅÎÁ
-      ÏÐÃÉÅÊ <code>-t -D DUMP_VHOSTS</code>.</li>
-
-      <li>íÏÄÕÌØ <code class="module"><a href="./mod/mod_auth_digest.html">mod_auth_digest</a></code>, ËÏÔÏÒÙÊ ÉÍÅÌ ÜËÓÐÅÒÉÍÅÎÔÁÌØÎÙÊ ÓÔÁÔÕÓ ×
-      Apache 1.3, ÔÅÐÅÒØ Ñ×ÌÑÅÔÓÑ ÓÔÁÎÄÁÒÔÎÙÍ ÍÏÄÕÌÅÍ.</li>
-
-      <li>íÏÄÕÌØ <code>mod_mmap_static</code>, ËÏÔÏÒÙÊ ÉÍÅÌ ÜËÓÐÅÒÉÍÅÎÔÁÌØÎÙÊ ÓÔÁÔÕÓ ×
-      Apache 1.3, ÚÁÍÅÎÅÎ ÍÏÄÕÌÅÍ <code class="module"><a href="./mod/mod_file_cache.html">mod_file_cache</a></code>.</li>
-
-      <li>ïÒÇÁÎÉÚÁÃÉÑ ÄÉÓÔÒÉÂÕÔÉ×Á ÐÏÌÎÏÓÔØÀ ÉÚÍÅÎÅÎÁ É ÔÅÐÅÒØ
-      ÂÏÌÅÅ ÎÅ ÓÏÄÅÒÖÉÔ ÎÅÚÁ×ÉÓÉÍÏÇÏ ËÁÔÁÌÏÇÁ <code>src</code>. ÷ÍÅÓÔÏ ÜÔÏÇÏ
-      ÉÓÈÏÄÎÙÅ ËÏÄÙ ÌÏÇÉÞÅÓËÉ ÏÒÇÁÎÉÚÏ×ÁÎÙ × ÏÓÎÏ×ÎÏÍ ËÁÔÁÌÏÇÅ ÄÉÓÔÒÉÂÕÔÉ×Á, Á
-      ÕÓÔÁÎÏ×ËÁ ÓËÏÍÐÉÌÉÒÏ×ÁÎÎÏÇÏ ÓÅÒ×ÅÒÁ ÐÒÏÉÚ×ÏÄÉÔÓÑ × ÏÔÄÅÌØÎÙÊ ËÁÔÁÌÏÇ.</li>
-    </ul>
-  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="third-party" id="third-party">íÏÄÕÌÉ ÔÒÅÔØÉÈ ÆÉÒÍ</a></h2>
-    
-
-    <p>úÎÁÞÉÔÅÌØÎÙÅ ÉÚÍÅÎÅÎÉÑ ÂÙÌÉ ×ÎÅÓÅÎÙ × API ÄÌÑ Apache 2.0.
-    óÕÝÅÓÔ×ÕÀÝÉÅ ÍÏÄÕÌÉ, ÎÁÐÉÓÁÎÎÙÅ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ Apache 1.3 API,
-    <strong>ÎÅ</strong> ÂÕÄÕÔ ÒÁÂÏÔÁÔØ ÐÏÄ Apache 2.0, ÅÓÌÉ ÎÅ ×ÎÅÓÔÉ
-    × ÎÉÈ ÎÅÏÂÈÏÄÉÍÙÅ ÉÚÍÅÎÅÎÉÑ. âÏÌÅÅ ÐÏÄÒÏÂÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÐÏ ÜÔÏÍÕ ÐÏ×ÏÄÕ
-    ÄÏÓÔÕÐÎÁ × <a href="developer/">ÄÏËÕÍÅÎÔÁÃÉÉ ÄÌÑ ÒÁÚÒÁÂÏÔÞÉËÏ×</a>.</p>
-  </div></div>
-<div class="bottomlang">
-<p><span>äÏÓÔÕÐÎÙÅ ÑÚÙËÉ: </span><a href="./de/upgrading.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./fr/upgrading.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
-<a href="./ja/upgrading.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/upgrading.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="./pt-br/upgrading.html" hreflang="pt-br" rel="alternate" title="Portugu&#234;s (Brasil)">&nbsp;pt-br&nbsp;</a> |
-<a href="./ru/upgrading.html" title="Russian">&nbsp;ru&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">íÏÄÕÌÉ</a> | <a href="./mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="./sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/urlmapping.html b/docs/manual/urlmapping.html
index 5a9c3a92..b0c1d321 100644
--- a/docs/manual/urlmapping.html
+++ b/docs/manual/urlmapping.html
@@ -1,10 +1,12 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: urlmapping.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: urlmapping.html.ja.euc-jp
+URI: urlmapping.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: urlmapping.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/urlmapping.html.en b/docs/manual/urlmapping.html.en
index 6912ea46..47eb7776 100644
--- a/docs/manual/urlmapping.html.en
+++ b/docs/manual/urlmapping.html.en
@@ -54,6 +54,12 @@
     make up the basic document tree which will be visible from the
     web.</p>
 
+    <p>For example, if <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>
+    were set to <code>/var/www/html</code> then a request for
+    <code>http://www.example.com/fish/guppies.html</code> would result
+    in the file <code>/var/www/html/fish/guppies.html</code> being
+    served to the requesting client.</p>
+
     <p>Apache is also capable of <a href="vhosts/">Virtual
     Hosting</a>, where the server receives requests for more than one
     host. In this case, a different <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code> can be specified for each
@@ -62,6 +68,10 @@
     be used to dynamically determine the appropriate place from which
     to serve content based on the requested IP address or
     hostname.</p>
+
+    <p>The <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code> directive
+    is set in your main server configuration file
+    (<code>httpd.conf</code>) and, possibly, once per additional <a href="vhosts/">Virtual Host</a> you create.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="outside" id="outside">Files Outside the DocumentRoot</a></h2>
@@ -281,6 +291,6 @@ is available to rewrite links in HTML and XHTML.</p>
 <a href="./ja/urlmapping.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/urlmapping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/urlmapping.html.ja.euc-jp b/docs/manual/urlmapping.html.ja.euc-jp
deleted file mode 100644
index 8e890976..00000000
--- a/docs/manual/urlmapping.html.ja.euc-jp
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>URL ¤«¤é¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Î°ÌÃÖ¤Ø¤Î¥Þ¥Ã¥× - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="./images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="./images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="./">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>URL ¤«¤é¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Î°ÌÃ֤ؤΥޥå×</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="./en/urlmapping.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./ja/urlmapping.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/urlmapping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-    <p>¤³¤Îʸ½ñ¤Ï Apache ¤¬¥ê¥¯¥¨¥¹¥È¤Î URL ¤«¤éÁ÷¿®¤¹¤ë¥Õ¥¡¥¤¥ë¤Î
-    ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Î°ÌÃÖ¤ò·èÄꤹ¤ëÊýË¡¤òÀâÌÀ¤·¤Þ¤¹¡£</p>
-  </div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#related">´ØÏ¢¤¹¤ë¥â¥¸¥å¡¼¥ë¤È¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#documentroot">DocumentRoot</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#outside">DocumentRoot ³°¤Î¥Õ¥¡¥¤¥ë</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#user">¥æ¡¼¥¶¥Ç¥£¥ì¥¯¥È¥ê</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#redirect">URL ¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#proxy">¥ê¥Ð¡¼¥¹¥×¥í¥­¥·</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#rewrite">¥ê¥é¥¤¥È¥¨¥ó¥¸¥ó</a></li>
-<li><img alt="" src="./images/down.gif" /> <a href="#notfound">File Not Found</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="related" id="related">´ØÏ¢¤¹¤ë¥â¥¸¥å¡¼¥ë¤È¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-
-<table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_alias.html">mod_alias</a></code></li><li><code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li><li><code class="module"><a href="./mod/mod_userdir.html">mod_userdir</a></code></li><li><code class="module"><a href="./mod/mod_speling.html">mod_speling</a></code></li><li><code class="module"><a href="./mod/mod_vhost_alias.html">mod_vhost_alias</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_alias.html#alias">Alias</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#aliasmatch">AliasMatch</a></code></li><li><code class="directive"><a href="./mod/mod_speling.html#checkspelling">CheckSpelling</a></code></li><li><code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code></li><li><code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code></li><li><code class="directive"><a href="./mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxypass">ProxyPass</a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxypassreverse">ProxyPassReverse</a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain</a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#redirect">Redirect</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#redirectmatch">RedirectMatch</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritematch">RewriteMatch</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#scriptaliasmatch">ScriptAliasMatch</a></code></li><li><code class="directive"><a href="./mod/mod_userdir.html#userdir">UserDir</a></code></li></ul></td></tr></table>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="documentroot" id="documentroot">DocumentRoot</a></h2>
-
-    <p>¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ¤É¤Î¥Õ¥¡¥¤¥ë¤òÁ÷¿®¤¹¤ë¤«¤ò·èÄꤹ¤ë¤È¤­¤Î
-    Apache ¤Î¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤Ï¡¢¥ê¥¯¥¨¥¹¥È¤Î URL-Path (URL ¤Î¥Û¥¹¥È̾¤È
-    ¥Ý¡¼¥ÈÈÖ¹æ¤Î¸å¤Ë³¤¯Éôʬ) ¤ò¼è¤ê½Ð¤·¤ÆÀßÄê¥Õ¥¡¥¤¥ë¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ë
-    <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code> 
-    ¤ÎºÇ¸å¤ËÄɲ乤롢¤È¤¤¤¦¤â¤Î¤Ç¤¹¡£¤Ç¤¹¤«¤é¡¢
-    <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code> 
-    ¤Î²¼¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ä¥Õ¥¡¥¤¥ë¤¬¥¦¥§¥Ö¤«¤é¸«¤¨¤ë´ðËܤΥɥ­¥å¥á¥ó¥È¤ÎÌÚ¹½Â¤¤ò
-    ¤Ê¤·¤Þ¤¹¡£</p>
-
-    <p>Apache ¤Ë¤Ï¥µ¡¼¥Ð¤¬Ê£¿ô¤Î¥Û¥¹¥È¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±¼è¤ë
-    <a href="vhosts/">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a> ¤Îµ¡Ç½¤â¤¢¤ê¤Þ¤¹¡£
-    ¤³¤Î¾ì¹ç¡¢¤½¤ì¤¾¤ì¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ËÂФ·¤Æ°ã¤¦
-    <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>
-    ¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Þ¤¿¡¢<code class="module"><a href="./mod/mod_vhost_alias.html">mod_vhost_alias</a></code>
-    ¥â¥¸¥å¡¼¥ë¤Ë¤è¤êÄ󶡤µ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ¡¢
-    Á÷¿®¤¹¤ë¤¿¤á¤Î¥³¥ó¥Æ¥ó¥Ä¤Î¾ì½ê¤ò¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ IP
-    ¥¢¥É¥ì¥¹¤ä¥Û¥¹¥È̾¤«¤éưŪ¤Ë·è¤á¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="outside" id="outside">DocumentRoot ³°¤Î¥Õ¥¡¥¤¥ë</a></h2>
-
-    <p>¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Î¡¢
-    ¸·Ì©¤Ë¤Ï <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>
-    ¤Î²¼¤Ë¤Ï¤Ê¤¤Éôʬ¤Ø¤Î¥¦¥§¥Ö¥¢¥¯¥»¥¹¤òµö²Ä¤¹¤ëɬÍפ¬¤¢¤ë
-    ¾ì¹ç¤¬¤è¤¯¤¢¤ê¤Þ¤¹¡£Apache ¤Ï¤³¤Î¤¿¤á¤ËÊ£¿ô¤ÎÊýË¡¤òÍÑ°Õ¤·¤Æ¤¤¤Þ¤¹¡£
-    Unix ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¾¤ÎÉôʬ¤ò¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò
-    »È¤Ã¤Æ <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>
-    ¤Î²¼¤Ë»ý¤Ã¤Æ¤¯¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥»¥­¥å¥ê¥Æ¥£¾å¤ÎÍýͳ¤Ë¤è¤ê¡¢
-    Apache ¤Ï³ºÅö¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Î
-    <code class="directive"><a href="./mod/core.html#options">Options</a></code> ¤ÎÀßÄê¤Ë
-    <code>FollowSymLinks</code> ¤« <code>SymLinksIfOwnerMatch</code> ¤¬
-    ¤¢¤ë¾ì¹ç¤Ë¤Î¤ß¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò¤¿¤É¤ê¤Þ¤¹¡£</p>
-
-    <p>Âå¤ï¤ê¤ÎÊýË¡¤È¤·¤Æ¡¢<code class="directive"><a href="./mod/mod_alias.html#alias">Alias</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎǤ°Õ¤ÎÉôʬ¤ò¥¦¥§¥Ö¤Î¶õ´Ö¤Ë
-    ¥Þ¥Ã¥×¤Ç¤­¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢</p>
-
-<div class="example"><p><code>Alias /docs /var/web</code></p></div>
-
-    <p>¤È¤¤¤¦ÀßÄê¤Î¤È¤­¤Ï¡¢URL
-    <code>http://www.example.com/docs/dir/file.html</code> ¤Ë¤Ï
-    <code>/var/web/dir/file.html</code> ¤¬Á÷¿®¤µ¤ì¤Þ¤¹¡£
-    <code class="directive"><a href="./mod/mod_alias.html#scriptalias">ScriptAlias</a></code> ¤â¡¢
-    ÂоݤȤʤäƤ¤¤ë¥Ñ¥¹¤¬ <a class="glossarylink" href="./glossary.html#cgi" title="ÍѸ콸¤ò»²¾È">CGI</a>
-    ¥¹¥¯¥ê¥×¥È¤È¤·¤Æ°·¤ï¤ì¤ë¤È¤¤¤¦ÄɲäÎ
-    ¸ú²Ì°Ê³°¤ÏƱ¤¸¤è¤¦¤ËÆ°ºî¤·¤Þ¤¹¡£</p>
-
-    <p>¤â¤Ã¤È½ÀÆð¤ÊÀßÄ꤬ɬÍפʾõ¶·¤Ç¤Ï¡¢
-    <code class="directive"><a href="./mod/mod_alias.html#aliasmatch">AliasMatch</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ä
-    <code class="directive"><a href="./mod/mod_alias.html#scriptaliasmatch">ScriptAliasMatch</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö
-    ¤ò»È¤Ã¤Æ¶¯ÎϤÊ<a class="glossarylink" href="./glossary.html#regex" title="ÍѸ콸¤ò»²¾È">Àµµ¬É½¸½</a>¤Ë´ð¤Å¤¤¤¿¥Þ¥Ã¥Á¤È
-    ÃÖ´¹¤ò¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤¿¤È¤¨¤Ð¡¢</p>
-
-<div class="example"><p><code>ScriptAliasMatch ^/~([a-zA-Z0-9]+)/cgi-bin/(.+)
-      /home/$1/cgi-bin/$2</code></p></div>
-
-    <p>¤Ï <code>http://example.com/~user/cgi-bin/script.cgi</code> ¤Ø¤Î
-    ¥ê¥¯¥¨¥¹¥È¤ò <code>/home/user/cgi-bin/script.cgi</code> ¤È¤¤¤¦¥Ñ¥¹¤Ø
-    ¥Þ¥Ã¥×¤·¡¢¤³¤Î¥Þ¥Ã¥×¤Î·ë²Ì¤È¤·¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò CGI ¥¹¥¯¥ê¥×¥È¤È¤·¤Æ
-    °·¤¤¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="user" id="user">¥æ¡¼¥¶¥Ç¥£¥ì¥¯¥È¥ê</a></h2>
-
-    <p>ÅÁÅýŪ¤Ë Unix ¥·¥¹¥Æ¥à¤Ç¤Ï¥æ¡¼¥¶ <em>user</em> ¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤ò
-    <code>~user/</code> ¤È¤·¤Æ»²¾È¤Ç¤­¤Þ¤¹¡£<code class="module"><a href="./mod/mod_userdir.html">mod_userdir</a></code> 
-    ¥â¥¸¥å¡¼¥ë¤Ï¤³¤Î³µÇ°¤ò¥¦¥§¥Ö¤Ë³ÈÄ¥¤·¤Æ¡¢
-    ¤½¤ì¤¾¤ì¤Î¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Î¥Õ¥¡¥¤¥ë¤ò
-    °Ê²¼¤Î¤è¤¦¤Ê URL ¤ò»È¤Ã¤Æ¥¢¥¯¥»¥¹¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>http://www.example.com/~user/file.html</code></p></div>
-
-    <p>¥»¥­¥å¥ê¥Æ¥£¤Î´ÑÅÀ¤«¤é¡¢¥¦¥§¥Ö¤«¤é¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ø
-    ľÀÜ¥¢¥¯¥»¥¹¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¤³¤È¤ÏŬÀڤǤϤ¢¤ê¤Þ¤»¤ó¡£¤Ç¤¹¤«¤é¡¢
-    <code class="directive"><a href="./mod/mod_userdir.html#userdir">UserDir</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤Ï
-    ¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Î²¼¤Î¡¢¥¦¥§¥Ö¥Õ¥¡¥¤¥ë¤Î
-    ÃÖ¤«¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤Î
-    <code>Userdir public_html</code> ¤ò»È¤¦¤È¡¢¾å¤Î URL ¤Ï
-    <code>/home/user/public_html/file.html</code> ¤È¤¤¤¦¤è¤¦¤Ê¥Õ¥¡¥¤¥ë¤Ë
-    ¥Þ¥Ã¥×¤µ¤ì¤Þ¤¹¡£¤³¤³¤Ç¡¢<code>/home/user/</code> ¤Ï
-    <code>/etc/passwd</code> ¤Ç»ØÄꤵ¤ì¤Æ¤¤¤ë¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¹¡£</p>
-
-    <p><code class="directive"><a href="./mod/mod_userdir.html#userdir">Userdir</a></code> ¤Ë¤Ï¡¢
-    <code>/etc/passwd</code> ¤Ë¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Î°ÌÃÖ¤¬½ñ¤«¤ì¤Æ¤¤¤Ê¤¤
-    ¥·¥¹¥Æ¥à¤Ç¤â»È¤¦¤³¤È¤Î¤Ç¤­¤ë¾¤Î·Á¼°¤â¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>Ãæ¤Ë¤Ï¥·¥ó¥Ü¥ë "~" (<code>%7e</code> ¤Î¤è¤¦¤ËÉä¹æ²½¤µ¤ì¤ë¤³¤È¤¬Â¿¤¤)
-    ¤ò³Ê¹¥¤¬°­¤¤¤È»×¤Ã¤Æ¡¢¥æ¡¼¥¶¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òɽ¤¹¤¿¤á¤ËÊ̤Îʸ»úÎó¤Î
-    »ÈÍѤò¹¥¤à¿Í¤¬¤¤¤Þ¤¹¡£mod_userdir ¤Ï¤³¤Îµ¡Ç½¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó¡£
-    ¤·¤«¤·¡¢¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤¬µ¬Â§Åª¤Ê¹½À®¤Î¤È¤­¤Ï¡¢
-    <code class="directive"><a href="./mod/mod_alias.html#aliasmatch">AliasMatch</a></code> ¤ò»È¤Ã¤Æ˾¤ß¤Î
-    ¸ú²Ì¤òãÀ®¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
-    <code>http://www.example.com/upages/user/file.html</code> ¤¬
-    <code>/home/user/public_html/file.html</code> ¤Ë¥Þ¥Ã¥×¤µ¤ì¤ë¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï¡¢
-    °Ê²¼¤Î¤è¤¦¤Ë <code>AliasMatch</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤¤¤Þ¤¹:</p>
-
-<div class="example"><p><code>AliasMatch ^/upages/([a-zA-Z0-9]+)/?(.*)
-      /home/$1/public_html/$2</code></p></div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="redirect" id="redirect">URL ¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó</a></h2>
-
-    <p>¾å¤ÎÀá¤ÇÀâÌÀ¤·¤¿ÀßÄêÍѤΥǥ£¥ì¥¯¥Æ¥£¥Ö¤Ï Apache ¤Ë
-    ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎÆÃÄê¤Î¾ì½ê¤«¤é¥³¥ó¥Æ¥ó¥Ä¤ò¼è¤Ã¤Æ¤­¤Æ
-    ¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤êÊÖ¤¹¤è¤¦¤Ë¤·¤Þ¤¹¡£¤È¤­¤Ë¤Ï¡¢¤½¤ÎÂå¤ï¤ê¤Ë
-    ¥¯¥é¥¤¥¢¥ó¥È¤Ë¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿¥³¥ó¥Æ¥ó¥Ä¤ÏÊ̤ΠURL ¤Ë¤¢¤ë¤³¤È¤ò
-    ÃΤ餻¤Æ¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬¿·¤·¤¤ URL ¤Ø¿·¤·¤¤¥ê¥¯¥¨¥¹¥È¤ò¹Ô¤Ê¤¦¤è¤¦¤Ë
-    ¤¹¤ëÊý¤¬Ë¾¤Þ¤·¤¤¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤Ï<em>¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó</em>¤È
-    ¸Æ¤Ð¤ì¤Æ¤¤¤Æ¡¢<code class="directive"><a href="./mod/mod_alias.html#redirect">Redirect</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤è¤ê¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
-    <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code> ¤Î²¼¤Î¥Ç¥£¥ì¥¯¥È¥ê
-    <code>/foo/</code> ¤¬¿·¤·¤¤¥Ç¥£¥ì¥¯¥È¥ê <code>/bar/</code> ¤Ë°ÜÆ°¤·¤¿¤È¤­¤Ï¡¢
-    °Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¥¯¥é¥¤¥¢¥ó¥È¤¬¿·¤·¤¤¾ì½ê¤Î¥³¥ó¥Æ¥ó¥Ä¤ò¥ê¥¯¥¨¥¹¥È¤¹¤ë¤è¤¦¤Ë
-    »Ø¼¨¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:</p>
-
-<div class="example"><p><code>Redirect permanent /foo/
-      http://www.example.com/bar/</code></p></div>
-
-    <p>¤³¤ì¤Ï¡¢<code>/foo/</code> ¤Ç»Ï¤Þ¤ë¤¹¤Ù¤Æ¤Î URL-Path ¤ò¡¢
-    <code>www.example.com</code> ¥µ¡¼¥Ð¤Î <code>/bar/</code> ¤¬
-    <code>/foo/</code> ¤ËÃÖ´¹¤µ¤ì¤¿¤â¤Î¤Ë¥ê¥À¥¤¥ì¥¯¥È¤·¤Þ¤¹¡£
-    ¥µ¡¼¥Ð¤Ï¼«Ê¬¼«¿È¤Î¥µ¡¼¥Ð¤À¤±¤Ç¤Ê¤¯¡¢¤É¤Î¥µ¡¼¥Ð¤Ë¤Ç¤â¥¯¥é¥¤¥¢¥ó¥È¤ò
-    ¥ê¥À¥¤¥ì¥¯¥È¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>Apache ¤Ï¤è¤êÊ£»¨¤Ê½ñ¤­´¹¤¨¤ÎÌäÂê¤Î¤¿¤á¤Ë¡¢
-    <code class="directive"><a href="./mod/mod_alias.html#redirectmatch">RedirectMatch</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    Ä󶡤·¤Æ¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¥µ¥¤¥È¤Î¥Û¡¼¥à¥Ú¡¼¥¸¤ò°ã¤¦¥µ¥¤¥È¤Ë¥ê¥À¥¤¥ì¥¯¥È
-    ¤¹¤ë¤±¤ì¤É¡¢Â¾¤Î¥ê¥¯¥¨¥¹¥È¤Ï¤½¤Î¤Þ¤Þ°·¤¦¡¢¤È¤¤¤¦¤È¤­¤Ï°Ê²¼¤ÎÀßÄê¤ò
-    »È¤¤¤Þ¤¹:</p>
-
-<div class="example"><p><code>RedirectMatch permanent ^/$
-      http://www.example.com/startpage.html</code></p></div>
-
-    <p>¤¢¤ë¤¤¤Ï¡¢°ì»þŪ¤Ë¥µ¥¤¥È¤Î¤¹¤Ù¤Æ¤Î¥Ú¡¼¥¸¤ò¾¤Î¥µ¥¤¥È¤ÎÆÃÄê¤Î
-    ¥Ú¡¼¥¸¤Ø¥ê¥À¥¤¥ì¥¯¥È¤¹¤ë¤È¤­¤Ï¡¢°Ê²¼¤ò»È¤¤¤Þ¤¹:</p>
-
-<div class="example"><p><code>RedirectMatch temp .*
-      http://othersite.example.com/startpage.html</code></p></div>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="proxy" id="proxy">¥ê¥Ð¡¼¥¹¥×¥í¥­¥·</a></h2>
-
-<p>Apache ¤Ï±ó³ÖÃϤˤ¢¤ë¥É¥­¥å¥á¥ó¥È¤ò¥í¡¼¥«¥ë¤Î¥µ¡¼¥Ð¤Î URL ¶õ´Ö¤Ë
-»ý¤Ã¤Æ¤¯¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¤³¤Î¼êË¡¤Ï<em>¥ê¥Ð¡¼¥¹¥×¥í¥­¥·</em>¤È¸Æ¤Ð¤ì¤Æ¤¤¤Þ¤¹¡£
-¥¦¥§¥Ö¥µ¡¼¥Ð¤¬±ó³ÖÃϤΥɥ­¥å¥á¥ó¥È¤ò¼èÆÀ¤·¤Æ¥¯¥é¥¤¥¢¥ó¥È¤ËÁ÷¤êÊÖ¤¹¤Î¤¬
-¥×¥í¥­¥·¥µ¡¼¥Ð¤ÎÆ°ºî¤Î¤è¤¦¤Ë¸«¤¨¤ë¤«¤é¤Ç¤¹¡£¥¯¥é¥¤¥¢¥ó¥È¤Ë¤Ï¥É¥­¥å¥á¥ó¥È¤¬
-¥ê¥Ð¡¼¥¹¥×¥í¥­¥·¥µ¡¼¥Ð¤«¤éÁ÷¤é¤ì¤Æ¤­¤Æ¤¤¤ë¤è¤¦¤Ë¸«¤¨¤ëÅÀ¤¬Ä̾ï¤Î
-¥×¥í¥­¥·¤È¤Ï°Û¤Ê¤ê¤Þ¤¹¡£</p>
-
-<p>¼¡¤ÎÎã¤Ç¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤¬ <code>/foo/</code> ¥Ç¥£¥ì¥¯¥È¥ê¤Î²¼¤Ë¤¢¤ë
-¥É¥­¥å¥á¥ó¥È¤ò¥ê¥¯¥¨¥¹¥È¤¹¤ë¤È¡¢¥µ¡¼¥Ð¤¬ <code>internal.example.com</code> ¤Î
-<code>/bar/</code> ¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¼èÆÀ¤·¤Æ¡¢¤µ¤â¥í¡¼¥«¥ë¥µ¡¼¥Ð¤«¤é¤Î
-¥É¥­¥å¥á¥ó¥È¤Î¤è¤¦¤Ë¤·¤Æ¥¯¥é¥¤¥¢¥ó¥È¤ËÊÖ¤·¤Þ¤¹¡£</p>
-
-<div class="example"><p><code>
-ProxyPass /foo/ http://internal.example.com/bar/<br />
-ProxyPassReverse /foo/ http://internal.example.com/bar/<br />
-ProxyPassReverseCookieDomain internal.example.com public.example.com<br />
-ProxyPassReverseCookiePath /foo/ /bar/
-</code></p></div>
-
-<p><code class="directive"><a href="./mod/mod_proxy.html#proxypass">ProxyPass</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-¥µ¡¼¥Ð¤¬Å¬Àڤʥɥ­¥å¥á¥ó¥È¤ò¼èÆÀ¤¹¤ë¤è¤¦¤ËÀßÄꤷ¡¢
-<code class="directive"><a href="./mod/mod_proxy.html#proxypassreverse">ProxyPassReverse</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-<code>internal.example.com</code> ¤«¤é¤Î¥ê¥À¥¤¥ì¥¯¥È¤¬¥í¡¼¥«¥ë¥µ¡¼¥Ð¤Î
-ŬÀڤʥǥ£¥ì¥¯¥È¥ê¤ò»Ø¤¹¤è¤¦¤Ë½ñ¤­´¹¤¨¤Þ¤¹¡£
-ƱÍÍ¤Ë <code class="directive"><a href="./mod/mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain</a></code>
-¤È <code class="directive"><a href="./mod/mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath</a></code>
-¤Ç¥Ð¥Ã¥¯¥¨¥ó¥É¦¥µ¡¼¥Ð¤Îȯ¹Ô¤·¤¿ Cookie ¤ò½ñ¤­´¹¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-<p>¤¿¤À¤·¡¢¥É¥­¥å¥á¥ó¥È¤ÎÃæ¤Î¥ê¥ó¥¯¤Ï½ñ¤­´¹¤¨¤é¤ì¤Ê¤¤¡¢
-¤È¤¤¤¦¤³¤È¤ÏÃΤäƤª¤¤¤Æ¤¯¤À¤µ¤¤¡£
-¤Ç¤¹¤«¤é¡¢<code>internal.example.com</code> ¤Ø¤ÎÀäÂХѥ¹¤Ë¤è¤ë¥ê¥ó¥¯¤Ç¤Ï¡¢
-¥¯¥é¥¤¥¢¥ó¥È¤¬¥×¥í¥­¥·¥µ¡¼¥Ð¤òÈ´¤±½Ð¤·¤Æ <code>internal.example.com</code> ¤Ë
-ľÀܥꥯ¥¨¥¹¥È¤òÁ÷¤ë¡¢¤È¤¤¤¦¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£
-¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥â¥¸¥å¡¼¥ë¤Î <a href="http://apache.webthing.com/mod_proxy_html/">mod_proxy_html</a>
-¤Ï¡¢HTML ¤È XHTML Ãæ¤Î¥ê¥ó¥¯¤ò½ñ¤­´¹¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="rewrite" id="rewrite">¥ê¥é¥¤¥È¥¨¥ó¥¸¥ó</a></h2>
-
-    <p>¤è¤ê°ìÁض¯ÎϤÊÃÖ´¹¤¬É¬ÍפʤȤ­¤Ï¡¢<code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code>
-    ¤¬Ä󶡤¹¤ë¥ê¥é¥¤¥È¥¨¥ó¥¸¥ó¤¬Ìò¤ËΩ¤Ä¤Ç¤·¤ç¤¦¡£
-    ¤³¤Î¥â¥¸¥å¡¼¥ë¤Ë¤è¤êÄ󶡤µ¤ì¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï
-    ¥Ö¥é¥¦¥¶¤Î¼ïÎà¡¢¥ê¥¯¥¨¥¹¥È¸µ¤Î IP ¥¢¥É¥ì¥¹¤Ê¤É¤Î¥ê¥¯¥¨¥¹¥È¤ÎÆÃħ¤ò
-    »È¤Ã¤ÆÁ÷¤êÊÖ¤¹¥³¥ó¥Æ¥ó¥Ä¤Î¾ì½ê¤ò·è¤á¤Þ¤¹¡£¤µ¤é¤Ë¡¢<code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code>
-    ¤Ï³°Éô¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë¤ä¥×¥í¥°¥é¥à¤ò»È¤Ã¤Æ¥ê¥¯¥¨¥¹¥È¤Î°·¤¤Êý¤ò
-    ·è¤á¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¥ê¥é¥¤¥È¥¨¥ó¥¸¥ó¤Ï¾å¤Çµó¤²¤é¤ì¤Æ¤¤¤ë»°¤Ä¤Î¥Þ¥Ã¥Ô¥ó¥°
-    ¤¹¤Ù¤Æ¤ò¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹: ÆâÉô¤Î¥ê¥À¥¤¥ì¥¯¥È (¥¨¥¤¥ê¥¢¥¹)¡¢
-    ³°Éô¤Î¥ê¥À¥¤¥ì¥¯¥È¡¢¥×¥í¥­¥·¤Ç¤¹¡£mod_rewrite ¤ò»È¤¦Â¿¤¯¤Î¼ÂÍÑŪ¤ÊÎã¤Ï
-    <a href="misc/rewriteguide.html">URL ¥ê¥é¥¤¥È¥¬¥¤¥É</a>
-    ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="notfound" id="notfound">File Not Found</a></h2>
-
-    <p>ɬ¤º¡¢¥ê¥¯¥¨¥¹¥È¤µ¤ì¤¿ URL ¤ËÂбþ¤¹¤ë¥Õ¥¡¥¤¥ë¤¬¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë
-    ̵¤¤¤È¤¤¤¦¾ì¹ç¤¬È¯À¸¤·¤Þ¤¹¡£¤³¤ì¤¬µ¯¤³¤ë¤Î¤Ë¤Ï¤¤¤¯¤Ä¤«¤ÎÍýͳ¤¬¤¢¤ê¤Þ¤¹¡£
-    ¾ì¹ç¤Ë¤è¤Ã¤Æ¤Ï¡¢¥É¥­¥å¥á¥ó¥È¤òÊ̤ξì½ê¤Ë°ÜÆ°¤·¤¿·ë²Ì¤Ç¤¢¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤Î¾ì¹ç¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ë¥ê¥½¡¼¥¹¤Î¿·¤·¤¤°ÌÃÖ¤òÃΤ餻¤ë¤¿¤á¤Ë
-    <a href="#redirect">URL ¥ê¥À¥¤¥ì¥¯¥·¥ç¥ó</a>¤ò»È¤¦¤Î¤¬ºÇÁ±¤ÎÊýË¡¤Ç¤¹¡£
-    ¤½¤¦¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢¥ê¥½¡¼¥¹¤Ï¿·¤·¤¤°ÌÃ֤˰ÜÆ°¤·¤Æ¤¤¤ë¤±¤ì¤É¤â¡¢
-    ¸Å¤¤¥Ö¥Ã¥¯¥Þ¡¼¥¯¤ä¥ê¥ó¥¯¤¬Æ°ºî¤·Â³¤±¤ë¤è¤¦¤Ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>"File Not Found" ¥¨¥é¡¼¤Î¤â¤¦°ì¤Ä¤Î¤è¤¯¤¢¤ëÍýͳ¤Ï¡¢
-    ¥Ö¥é¥¦¥¶¤Ø¤ÎľÀÜÆþÎϤä HTML ¥ê¥ó¥¯¤«¤é¤Î¶öȯŪ¤Ê URL ¤ÎÆþÎϴְ㤤¤Ç¤¹¡£
-    Apache ¤Ï¤³¤ÎÌäÂê¤ò²þÁ±¤¹¤ë¤¿¤á¤Ë¡¢<code class="module"><a href="./mod/mod_speling.html">mod_speling</a></code>
-    ¥â¥¸¥å¡¼¥ë (°Õ¿ÞŪ¤ÊÄÖ¤ê´Ö°ã¤¤)
-    (ÌõÃí: Àµ¤·¤¯¤Ï spelling) ¤òÄ󶡤·¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥â¥¸¥å¡¼¥ë¤¬
-    »ÈÍѤµ¤ì¤Æ¤¤¤ë¤È¤­¤Ï¡¢"File Not Found" ¥¨¥é¡¼¤ò²£¼è¤ê¤·¤Æ¡¢
-    »÷¤¿¥Õ¥¡¥¤¥ë̾¤Î¥ê¥½¡¼¥¹¤òõ¤·¤Þ¤¹¡£¤â¤·°ì¤Ä¤À¤±¸«¤Ä¤«¤Ã¤¿¾ì¹ç¤Ï
-    mod_speling ¤Ï¥¯¥é¥¤¥¢¥ó¥È¤ËÀµ¤·¤¤°ÌÃÖ¤òÃΤ餻¤ë¤¿¤á¤Ë HTTP ¥ê¥À¥¤¥ì¥¯¥È¤ò
-    Á÷¤ê¤Þ¤¹¡£¤â¤·Ê£¿ô¤Î¡Ö¶á¤¤¡×¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç¤Ï¡¢¤½¤ì¤é
-    ÂåÂؤȤʤꤨ¤ë¤â¤Î¤Î¥ê¥¹¥È¤¬¥¯¥é¥¤¥¢¥ó¥È¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p>mod_speling ¤ÎÈó¾ï¤ËÍ­ÍѤʵ¡Ç½¤Ï¡¢Âçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤»¤º¤Ë
-    ¥Õ¥¡¥¤¥ë̾¤òÈæ³Ó¤¹¤ë¤â¤Î¤Ç¤¹¡£¤³¤ì¤Ï URL ¤È unix ¤Î
-    ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤¬Î¾Êý¤È¤âÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤¹¤ë¤â¤Î¤Ç¤¢¤ë¡¢
-    ¤È¤¤¤¦¤³¤È¤ò¥æ¡¼¥¶¤¬ÃΤé¤Ê¤¤¥·¥¹¥Æ¥à¤ÇÌò¤ËΩ¤Á¤Þ¤¹¡£¤¿¤À¤·¡¢
-    »þÀޤΠURL ÄûÀµÄøÅ٤ǺѤޤº¡¢mod_speling ¤ò¤è¤ê¿¤¯»ÈÍѤ¹¤ë¤È¡¢¥µ¡¼¥Ð¤Ë
-    ¤µ¤é¤Ê¤ëÉé²Ù¤¬¤«¤«¤ê¤Þ¤¹¡£¤¹¤Ù¤Æ¤Î¡ÖÀµ¤·¤¯¤Ê¤¤¡×¥ê¥¯¥¨¥¹¥È¤Î¸å¤Ë
-    URL ¤Î¥ê¥À¥¤¥ì¥¯¥È¤È¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î¿·¤·¤¤¥ê¥¯¥¨¥¹¥È¤¬¤¯¤ë¤³¤È¤Ë
-    ¤Ê¤ê¤Þ¤¹¤«¤é¡£</p>
-
-    <p>¥³¥ó¥Æ¥ó¥Ä¤Î°ÌÃÖ¤ò·è¤á¤è¤¦¤È¤¹¤ë¤¹¤Ù¤Æ¤Î»î¤ß¤¬¼ºÇÔ¤¹¤ë¤È¡¢
-    Apache ¤Ï¡¢HTTP ¥¹¥Æ¡¼¥¿¥¹¥³¡¼¥É 404 (file not found) ¤È¶¦¤Ë
-    ¥¨¥é¡¼¥Ú¡¼¥¸¤òÊÖ¤·¤Þ¤¹¡£¤³¤Î¥¨¥é¡¼¥Ú¡¼¥¸¤Î³°´Ñ¤Ï
-    <code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code> 
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÀ©¸æ¤µ¤ì¡¢
-    <a href="custom-error.html">¥«¥¹¥¿¥à¥¨¥é¡¼¥ì¥¹¥Ý¥ó¥¹</a> ¤Ç
-    ÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢½ÀÆð¤ÊÀßÄê¤ò¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./en/urlmapping.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="./ja/urlmapping.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="./ko/urlmapping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="./mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="./mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">ÍѸì</a> | <a href="./sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/urlmapping.html.ja.utf8 b/docs/manual/urlmapping.html.ja.utf8
new file mode 100644
index 00000000..236d0a72
--- /dev/null
+++ b/docs/manual/urlmapping.html.ja.utf8
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>URL �らファイルシステム上��置��マップ - Apache HTTP サー�</title>
+<link href="./style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="./style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="./style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="./images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="./images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="./">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>URL �らファイルシステム上��置��マップ</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="./en/urlmapping.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./ja/urlmapping.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/urlmapping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+
+    <p>��文書� Apache �リクエスト� URL �ら�信�るファイル�
+    ファイルシステム上��置を決定�る方法を説明���。</p>
+  </div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#related">関連�るモジュール�ディレクティブ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#documentroot">DocumentRoot</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#outside">DocumentRoot 外�ファイル</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#user">ユーザディレクトリ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#redirect">URL リダイレクション</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#proxy">リ�ースプロキシ</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#rewrite">リライトエンジン</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#notfound">File Not Found</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="related" id="related">関連�るモジュール�ディレクティブ</a></h2>
+
+<table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="./mod/mod_alias.html">mod_alias</a></code></li><li><code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li><li><code class="module"><a href="./mod/mod_userdir.html">mod_userdir</a></code></li><li><code class="module"><a href="./mod/mod_speling.html">mod_speling</a></code></li><li><code class="module"><a href="./mod/mod_vhost_alias.html">mod_vhost_alias</a></code></li></ul></td><td><ul><li><code class="directive"><a href="./mod/mod_alias.html#alias">Alias</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#aliasmatch">AliasMatch</a></code></li><li><code class="directive"><a href="./mod/mod_speling.html#checkspelling">CheckSpelling</a></code></li><li><code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code></li><li><code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code></li><li><code class="directive"><a href="./mod/core.html#options">Options</a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxypass">ProxyPass</a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxypassreverse">ProxyPassReverse</a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain</a></code></li><li><code class="directive"><a href="./mod/mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#redirect">Redirect</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#redirectmatch">RedirectMatch</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritematch">RewriteMatch</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#scriptalias">ScriptAlias</a></code></li><li><code class="directive"><a href="./mod/mod_alias.html#scriptaliasmatch">ScriptAliasMatch</a></code></li><li><code class="directive"><a href="./mod/mod_userdir.html#userdir">UserDir</a></code></li></ul></td></tr></table>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="documentroot" id="documentroot">DocumentRoot</a></h2>
+
+    <p>リクエスト�対����ファイルを�信�る�を決定�る���
+    Apache �デフォルト�動作��リクエスト� URL-Path (URL �ホスト��
+    �ート番��後�続�部分) を�り出��設定ファイル�指定�れ��る
+    <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code> 
+    �最後�追加�る����も���。���ら�
+    <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code> 
+    �下�ディレクトリやファイル�ウェブ�ら見�る基本�ドキュメント�木構造を
+    ����。</p>
+
+    <p>Apache ��サー��複数�ホスト��リクエストを���る
+    <a href="vhosts/">�ー�ャルホスト</a> �機能も�り��。
+    ��場���れ�れ��ー�ャルホスト�対����
+    <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>
+    を指定�る�������。���<code class="module"><a href="./mod/mod_vhost_alias.html">mod_vhost_alias</a></code>
+    モジュール�より�供�れるディレクティブを使���
+    �信�る���コンテンツ�場所をリクエスト�れ� IP
+    アドレスやホスト��ら動的�決�る��も����。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="outside" id="outside">DocumentRoot 外�ファイル</a></h2>
+
+    <p>ファイルシステム上��
+    厳密�� <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>
+    �下����部分��ウェブアクセスを許��る必���る
+    場��よ��り��。Apache ������複数�方法を用������。
+    Unix システム���ファイルシステム�他�部分をシンボリックリンクを
+    使�� <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code>
+    �下�����る�������。セキュリティ上��由�より�
+    Apache �該当�るディレクトリ�
+    <code class="directive"><a href="./mod/core.html#options">Options</a></code> �設定�
+    <code>FollowSymLinks</code> � <code>SymLinksIfOwnerMatch</code> �
+    �る場����シンボリックリンクを��り��。</p>
+
+    <p>代�り�方法����<code class="directive"><a href="./mod/mod_alias.html#alias">Alias</a></code>
+    ディレクティブを使��ファイルシステム�任��部分をウェブ�空間�
+    マップ����。�����</p>
+
+<div class="example"><p><code>Alias /docs /var/web</code></p></div>
+
+    <p>���設定�����URL
+    <code>http://www.example.com/docs/dir/file.html</code> ��
+    <code>/var/web/dir/file.html</code> ��信�れ��。
+    <code class="directive"><a href="./mod/mod_alias.html#scriptalias">ScriptAlias</a></code> も�
+    対象�����るパス� <a class="glossarylink" href="./glossary.html#cgi" title="用語集を�照">CGI</a>
+    スクリプト���扱�れる���追加�
+    効果以外���よ��動作���。</p>
+
+    <p>も��柔軟�設定�必��状����
+    <code class="directive"><a href="./mod/mod_alias.html#aliasmatch">AliasMatch</a></code> ディレクティブや
+    <code class="directive"><a href="./mod/mod_alias.html#scriptaliasmatch">ScriptAliasMatch</a></code> ディレクティブ
+    を使��強力�<a class="glossarylink" href="./glossary.html#regex" title="用語集を�照">正�表�</a>�基���マッ��
+    置�を行���������。
+    �����</p>
+
+<div class="example"><p><code>ScriptAliasMatch ^/~([a-zA-Z0-9]+)/cgi-bin/(.+)
+      /home/$1/cgi-bin/$2</code></p></div>
+
+    <p>� <code>http://example.com/~user/cgi-bin/script.cgi</code> ��
+    リクエストを <code>/home/user/cgi-bin/script.cgi</code> ���パス�
+    マップ����マップ��果����ファイルを CGI スクリプト���
+    扱���。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="user" id="user">ユーザディレクトリ</a></h2>
+
+    <p>�統的� Unix システム��ユーザ <em>user</em> �ホームディレクトリを
+    <code>~user/</code> ����照����。<code class="module"><a href="./mod/mod_userdir.html">mod_userdir</a></code> 
+    モジュール���概念をウェブ�拡張���
+    �れ�れ�ユーザ�ホームディレクトリ�ファイルを
+    以下�よ�� URL を使��アクセス��るよ�����。</p>
+
+<div class="example"><p><code>http://www.example.com/~user/file.html</code></p></div>
+
+    <p>セキュリティ�観点�ら�ウェブ�らユーザ�ホームディレクトリ�
+    直接アクセス��るよ���る����切���り��ん。���ら�
+    <code class="directive"><a href="./mod/mod_userdir.html#userdir">UserDir</a></code> ディレクティブ��
+    ユーザ�ホームディレクトリ�下��ウェブファイル�
+    置�れ��るディレクトリを指定���。デフォルト�設定�
+    <code>Userdir public_html</code> を使���上� URL �
+    <code>/home/user/public_html/file.html</code> ���よ��ファイル�
+    マップ�れ��。����<code>/home/user/</code> �
+    <code>/etc/passwd</code> �指定�れ��るユーザ�ホームディレクトリ��。</p>
+
+    <p><code class="directive"><a href="./mod/mod_userdir.html#userdir">Userdir</a></code> ���
+    <code>/etc/passwd</code> �ホームディレクトリ��置�書�れ����
+    システム�も使������る他�形�も�り��。</p>
+
+    <p>中��シンボル "~" (<code>%7e</code> �よ��符�化�れる���多�)
+    を格好�悪������ユーザ�ディレクトリを表����別�文字列�
+    使用を好む人����。mod_userdir ���機能をサ�ート�����ん。
+    ����ユーザ�ホームディレクトリ��則的�構������
+    <code class="directive"><a href="./mod/mod_alias.html#aliasmatch">AliasMatch</a></code> を使��望��
+    効果を���る�������。�����
+    <code>http://www.example.com/upages/user/file.html</code> �
+    <code>/home/user/public_html/file.html</code> �マップ�れるよ���る���
+    以下�よ�� <code>AliasMatch</code> ディレクティブを使���:</p>
+
+<div class="example"><p><code>AliasMatch ^/upages/([a-zA-Z0-9]+)/?(.*)
+      /home/$1/public_html/$2</code></p></div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="redirect" id="redirect">URL リダイレクション</a></h2>
+
+    <p>上�節�説明��設定用�ディレクティブ� Apache �
+    ファイルシステム�特定�場所�らコンテンツを�����
+    クライアント��り返�よ�����。�������代�り�
+    クライアント�リクエスト�れ�コンテンツ�別� URL ��る��を
+    知ら���クライアント�新�� URL �新��リクエストを行��よ��
+    �る方�望�������り��。�れ�<em>リダイレクション</em>�
+    呼�れ����<code class="directive"><a href="./mod/mod_alias.html#redirect">Redirect</a></code>
+    ディレクティブ�より実装�れ����。�����
+    <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code> �下�ディレクトリ
+    <code>/foo/</code> �新��ディレクトリ <code>/bar/</code> �移動������
+    以下�よ����クライアント�新��場所�コンテンツをリクエスト�るよ��
+    指示�る�������:</p>
+
+<div class="example"><p><code>Redirect permanent /foo/
+      http://www.example.com/bar/</code></p></div>
+
+    <p>�れ��<code>/foo/</code> �始�る���� URL-Path を�
+    <code>www.example.com</code> サー�� <code>/bar/</code> �
+    <code>/foo/</code> �置��れ�も��リダイレクト���。
+    サー��自分自身�サー���������サー���もクライアントを
+    リダイレクト�る�������。</p>
+
+    <p>Apache �より複雑�書�����題�����
+    <code class="directive"><a href="./mod/mod_alias.html#redirectmatch">RedirectMatch</a></code> ディレクティブを
+    �供�����。�����サイト�ホームページを��サイト�リダイレクト
+    �る�れ��他�リクエスト�����扱��������以下�設定を
+    使���:</p>
+
+<div class="example"><p><code>RedirectMatch permanent ^/$
+      http://www.example.com/startpage.html</code></p></div>
+
+    <p>�る���一時的�サイト�����ページを他�サイト�特定�
+    ページ�リダイレクト�る����以下を使���:</p>
+
+<div class="example"><p><code>RedirectMatch temp .*
+      http://othersite.example.com/startpage.html</code></p></div>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="proxy" id="proxy">リ�ースプロキシ</a></h2>
+
+<p>Apache ��隔地��るドキュメントをローカル�サー�� URL 空間�
+����る��も����。��手法�<em>リ�ースプロキシ</em>�呼�れ����。
+ウェブサー���隔地�ドキュメントを�得��クライアント��り返���
+プロキシサー��動作�よ��見�る�ら��。クライアント��ドキュメント�
+リ�ースプロキシサー��ら�られ����るよ��見�る点�通常�
+プロキシ��異�り��。</p>
+
+<p>次�例���クライアント� <code>/foo/</code> ディレクトリ�下��る
+ドキュメントをリクエスト�る��サー�� <code>internal.example.com</code> �
+<code>/bar/</code> ディレクトリ�ら�得����もローカルサー��ら�
+ドキュメント�よ����クライアント�返���。</p>
+
+<div class="example"><p><code>
+ProxyPass /foo/ http://internal.example.com/bar/<br />
+ProxyPassReverse /foo/ http://internal.example.com/bar/<br />
+ProxyPassReverseCookieDomain internal.example.com public.example.com<br />
+ProxyPassReverseCookiePath /foo/ /bar/
+</code></p></div>
+
+<p><code class="directive"><a href="./mod/mod_proxy.html#proxypass">ProxyPass</a></code> ディレクティブ�
+サー���切�ドキュメントを�得�るよ��設定��
+<code class="directive"><a href="./mod/mod_proxy.html#proxypassreverse">ProxyPassReverse</a></code> ディレクティブ�
+<code>internal.example.com</code> �ら�リダイレクト�ローカルサー��
+�切�ディレクトリを指�よ��書�����。
+�様� <code class="directive"><a href="./mod/mod_proxy.html#proxypassreversecookiedomain">ProxyPassReverseCookieDomain</a></code>
+� <code class="directive"><a href="./mod/mod_proxy.html#proxypassreversecookiepath">ProxyPassReverseCookiePath</a></code>
+��ックエンド�サー��発行�� Cookie を書���る�������。</p>
+<p>����ドキュメント�中�リンク�書���られ���
+������知���������。
+���ら�<code>internal.example.com</code> ��絶対パス�よるリンク���
+クライアント�プロキシサー�を抜�出�� <code>internal.example.com</code> �
+直接リクエストを�る��������り��。
+サードパーティ製モジュール� <a href="http://apache.webthing.com/mod_proxy_html/">mod_proxy_html</a>
+��HTML � XHTML 中�リンクを書���る�������。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="rewrite" id="rewrite">リライトエンジン</a></h2>
+
+    <p>より一層強力�置��必������<code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code>
+    ��供�るリライトエンジン�役�立���ょ�。
+    ��モジュール�より�供�れるディレクティブ�
+    ブラウザ�種類�リクエスト元� IP アドレス���リクエスト�特徴を
+    使���り返�コンテンツ�場所を決���。�ら��<code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code>
+    �外部�データベースファイルやプログラムを使��リクエスト�扱�方を
+    決�る��も����。リライトエンジン�上�挙�られ��る三��マッピング
+    ���を行���������: 内部�リダイレクト (エイリアス)�
+    外部�リダイレクト�プロキシ��。mod_rewrite を使�多��実用的�例�
+    <a href="misc/rewriteguide.html">URL リライトガイド</a>
+    �説明�れ����。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="notfound" id="notfound">File Not Found</a></h2>
+
+    <p>必��リクエスト�れ� URL �対応�るファイル�ファイルシステム�
+    無����場��発生���。�れ�起�る���������由��り��。
+    場��よ����ドキュメントを別�場所�移動���果��る����り��。
+    ��場���クライアント�リソース�新���置を知ら�る���
+    <a href="#redirect">URL リダイレクション</a>を使���最善�方法��。
+    ���る���よ���リソース�新���置�移動���る�れ�も�
+    ��ブックマークやリンク�動作�続�るよ���る�������。</p>
+
+    <p>"File Not Found" エラー�も�一��よ��る�由��
+    ブラウザ��直接入力や HTML リンク�ら��発的� URL �入力間����。
+    Apache ����題を改善�る����<code class="module"><a href="./mod/mod_speling.html">mod_speling</a></code>
+    モジュール (�図的�綴り間��)
+    (訳注: 正��� spelling) を�供�����。��モジュール�
+    使用�れ��る����"File Not Found" エラーを横�り���
+    似�ファイル��リソースを探���。も�一���見����場��
+    mod_speling �クライアント�正���置を知ら�る��� HTTP リダイレクトを
+    �り��。も�複数�「近��ファイル�見����場����れら
+    代替��り�るも��リスト�クライアント�表示�れ��。</p>
+
+    <p>mod_speling ��常�有用�機能��大文字�文字を区別���
+    ファイル�を比較�るも���。�れ� URL � unix �
+    ファイルシステム�両方�も大文字�文字を区別�るも���る�
+    �����をユーザ�知ら��システム�役�立���。����
+    時折� URL 訂正程度�済���mod_speling をより多�使用�る��サー��
+    �ら�る負����り��。����「正�����リクエスト�後�
+    URL �リダイレクト�クライアント�ら�新��リクエスト��る���
+    �り���ら。</p>
+
+    <p>コンテンツ��置を決�よ���る����試��失敗�る��
+    Apache ��HTTP ステータスコード 404 (file not found) �共�
+    エラーページを返���。��エラーページ�外観�
+    <code class="directive"><a href="./mod/core.html#errordocument">ErrorDocument</a></code> 
+    ディレクティブ�制御�れ�
+    <a href="custom-error.html">カスタムエラーレス�ンス</a> �
+    説明�れ��るよ���柔軟�設定を行���������。</p>
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="./en/urlmapping.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="./ja/urlmapping.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="./ko/urlmapping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="./mod/">モジュール</a> | <a href="./mod/directives.html">ディレクティブ</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">用語</a> | <a href="./sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/urlmapping.html.ko.euc-kr b/docs/manual/urlmapping.html.ko.euc-kr
index b15b02df..daf8ac4d 100644
--- a/docs/manual/urlmapping.html.ko.euc-kr
+++ b/docs/manual/urlmapping.html.ko.euc-kr
@@ -242,6 +242,6 @@ ProxyPassReverse /foo/ http://internal.example.com/bar/
 <a href="./ja/urlmapping.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/urlmapping.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="./mod/">¸ðµâ</a> | <a href="./mod/directives.html">Áö½Ã¾îµé</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">¿ë¾î</a> | <a href="./sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/details.html b/docs/manual/vhosts/details.html
index a15007e6..ed491518 100644
--- a/docs/manual/vhosts/details.html
+++ b/docs/manual/vhosts/details.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: details.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/vhosts/details.html.en b/docs/manual/vhosts/details.html.en
index d2931433..8d245e82 100644
--- a/docs/manual/vhosts/details.html.en
+++ b/docs/manual/vhosts/details.html.en
@@ -437,6 +437,6 @@
 <a href="../fr/vhosts/details.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ko/vhosts/details.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/details.html.fr b/docs/manual/vhosts/details.html.fr
index 7a2f7980..24f44047 100644
--- a/docs/manual/vhosts/details.html.fr
+++ b/docs/manual/vhosts/details.html.fr
@@ -454,6 +454,6 @@ de configuration</a></h2>
 <a href="../fr/vhosts/details.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ko/vhosts/details.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/details.html.ko.euc-kr b/docs/manual/vhosts/details.html.ko.euc-kr
index c0c3fcf6..5bf43e46 100644
--- a/docs/manual/vhosts/details.html.ko.euc-kr
+++ b/docs/manual/vhosts/details.html.ko.euc-kr
@@ -379,6 +379,6 @@
 <a href="../fr/vhosts/details.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="../ko/vhosts/details.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/examples.html b/docs/manual/vhosts/examples.html
index 0ed55e50..b065401d 100644
--- a/docs/manual/vhosts/examples.html
+++ b/docs/manual/vhosts/examples.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: examples.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
@@ -6,9 +8,9 @@ URI: examples.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: examples.html.ja.euc-jp
+URI: examples.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: examples.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/vhosts/examples.html.en b/docs/manual/vhosts/examples.html.en
index 6e6b180d..ca01c3ad 100644
--- a/docs/manual/vhosts/examples.html.en
+++ b/docs/manual/vhosts/examples.html.en
@@ -439,7 +439,7 @@
     <div class="example"><p><code>
     &lt;VirtualHost *:*&gt;<br />
         ProxyPreserveHost On<br />
-        ProxyPass / http://192.168.111.2<br />
+        ProxyPass / http://192.168.111.2/<br />
         ProxyPassReverse / http://192.168.111.2/<br />
         ServerName hostname.example.com<br />
     &lt;/VirtualHost&gt;
@@ -655,6 +655,6 @@
 <a href="../ja/vhosts/examples.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/vhosts/examples.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/examples.html.fr b/docs/manual/vhosts/examples.html.fr
index 1b646d54..da0c971a 100644
--- a/docs/manual/vhosts/examples.html.fr
+++ b/docs/manual/vhosts/examples.html.fr
@@ -23,6 +23,8 @@
 <a href="../ja/vhosts/examples.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/vhosts/examples.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
+<div class="outofdate">Cette traduction peut être périmée. Verifiez la version
+            Anglaise pour les changements récents.</div>
 
 
     <p>Le but de ce document est d'essayer de répondre aux questions 
@@ -674,6 +676,6 @@
 <a href="../ja/vhosts/examples.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/vhosts/examples.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/examples.html.ja.euc-jp b/docs/manual/vhosts/examples.html.ja.euc-jp
deleted file mode 100644
index 7da091c4..00000000
--- a/docs/manual/vhosts/examples.html.ja.euc-jp
+++ /dev/null
@@ -1,648 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎÎã - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></div><div id="page-content"><div id="preamble"><h1>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎÎã</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/vhosts/examples.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/vhosts/examples.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="../ja/vhosts/examples.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/examples.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-
-
-    <p>¤³¤Îʸ½ñ¤Ï¡¢¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎÀßÄê¤ÎºÝ¤Ë
-    ¤è¤¯¤¢¤ë¼ÁÌä¤ËÅú¤¨¤ë¤â¤Î¤Ç¤¹¡£ÁÛÄꤷ¤Æ¤¤¤ëÂÐ¾Ý¤Ï <a href="name-based.html">̾Á°¥Ù¡¼¥¹</a> ¤ä <a href="ip-based.html">IP ¥Ù¡¼¥¹</a> ¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò»È¤Ã¤Æ
-    °ì¤Ä¤Î¥µ¡¼¥Ð¤ÇÊ£¿ô¤Î¥¦¥§¥Ö¥µ¥¤¥È¤ò±¿ÍѤ·¤Æ¤¤¤ë¾õ¶·¤Ç¤¹¡£
-    </p>
-
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#purename">°ì¤Ä¤Î IP ¥¢¥É¥ì¥¹¤Ç¤¤¤¯¤Ä¤«¤Î̾Á°¥Ù¡¼¥¹¤Î
-    ¥¦¥§¥Ö¥µ¥¤¥È¤ò¼Â¹Ô¤¹¤ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#twoips">Ê£¿ô¤Î IP ¥¢¥É¥ì¥¹¤Î¤¢¤ë¥Û¥¹¥È¤Ç̾Á°¥Ù¡¼¥¹¤Î
-    ¥Û¥¹¥Æ¥£¥ó¥°¤ò¹Ô¤Ê¤¦</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#intraextra">°ã¤¦ IP ¥¢¥É¥ì¥¹ (Î㤨¤Ð¡¢ÆâÉô¤È³°Éô¥¢¥É¥ì¥¹)
-    ¤ÇƱ¤¸¥³¥ó¥Æ¥ó¥Ä¤òÁ÷¤ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#port">°ã¤¦¥Ý¡¼¥È¤Ç°ã¤¦¥µ¥¤¥È¤ò±¿±Ä¤¹¤ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#ip">IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥Æ¥£¥ó¥°</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#ipport">¥Ý¡¼¥È¥Ù¡¼¥¹¤È IP ¥Ù¡¼¥¹¤Îº®¤¶¤Ã¤¿
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#mixed">̾Á°¥Ù¡¼¥¹¤È IP ¥Ù¡¼¥¹¤òº®¤¼¤¿
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#proxy"><code>Virtual_host</code> ¤È
-    mod_proxy ¤òÊ»ÍѤ¹¤ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#default"><code>_default_</code> ¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò
-    »È¤¦</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#migrate">̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤«¤é IP ¥Ù¡¼¥¹¤Î
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë°Ü¹Ô¤¹¤ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#serverpath"><code>ServerPath</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    »È¤¦</a></li>
-</ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="purename" id="purename">°ì¤Ä¤Î IP ¥¢¥É¥ì¥¹¤Ç¤¤¤¯¤Ä¤«¤Î̾Á°¥Ù¡¼¥¹¤Î
-    ¥¦¥§¥Ö¥µ¥¤¥È¤ò¼Â¹Ô¤¹¤ë</a></h2>
-
-    <p>¥µ¡¼¥Ð¤Ï IP ¥¢¥É¥ì¥¹¤ò°ì¤Ä³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Æ¡¢DNS ¤Ç¥Þ¥·¥ó¤Ë
-    Ê£¿ô¤Î̾Á° (CNAME) ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥Þ¥·¥ó¤Ç
-    <code>www.example.com</code> ¤È <code>www.example.org</code>
-    ¤Î¤¿¤á¤Î¥¦¥§¥Ö¥µ¡¼¥Ð¤ò¼Â¹Ô¤µ¤»¤¿¤¤¤È¤·¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>Ãí</h3><p>
-          Apache ¥µ¡¼¥Ð¤ÎÀßÄê¤Ç¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎÀßÄê¤ò¤·¤¿¤À¤±¤Ç¡¢
-          ÃΤé¤Ê¤¤´Ö¤Ë¤½¤Î¥Û¥¹¥È̾¤ËÂбþ¤¹¤ë DNS ¤Î¥¨¥ó¥È¥ê¤¬
-          ºîÀ®¤µ¤ì¤¿¤ê¤Ï¤·¤Þ¤»¤ó¡£¤½¤Î¥µ¡¼¥Ð¤Î IP ¥¢¥É¥ì¥¹¤Ë²ò·è¤µ¤ì¤ë
-          ¤è¤¦¤Ë DNS ¤Ë̾Á°¤òÅÐÏ¿¤·¤Ê¤±¤ì¤Ð<em>¤Ê¤ê¤Þ¤»¤ó</em>¡£
-          ¤½¤¦¤Ç¤Ê¤¤¤Èï¤â¤¢¤Ê¤¿¤Î¥¦¥§¥Ö¥µ¥¤¥È¤ò¸«¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
-          ¥í¡¼¥«¥ë¤Ç¤Î¥Æ¥¹¥È¤Î¤¿¤á¤Ë <code>hosts</code> ¥Õ¥¡¥¤¥ë¤Ë
-          ¥¨¥ó¥È¥ê¤òÄɲ乤뤳¤È¤â¤Ç¤­¤Þ¤¹¤¬¡¢¤³¤Î¾ì¹ç¤Ï¤½¤Î
-          hosts ¥¨¥ó¥È¥ê¤Î¤¢¤ë¥Þ¥·¥ó¤«¤é¤·¤«Æ°ºî¤·¤Þ¤»¤ó¡£</p>
-    </div>
-
-    <div class="example"><h3>¥µ¡¼¥ÐÀßÄê</h3><p><code>
-    
-
-    # Ensure that Apache listens on port 80<br />
-    Listen 80<br />
-    <br />
-    # Listen for virtual host requests on all IP addresses<br />
-    NameVirtualHost *:80<br />
-    <br />
-    &lt;VirtualHost *:80&gt;<br />
-    <span class="indent">
-      DocumentRoot /www/example1<br />
-      ServerName www.example.com<br />
-      <br />
-      # Other directives here<br />
-      <br />
-    </span>
-    &lt;/VirtualHost&gt;<br />
-    <br />
-    &lt;VirtualHost *:80&gt;<br />
-    <span class="indent">
-      DocumentRoot /www/example2<br />
-      ServerName www.example.org<br />
-      <br />
-      # Other directives here<br />
-      <br />
-    </span>
-    &lt;/VirtualHost&gt;
-    </code></p></div>
-
-    <p>¥¢¥¹¥¿¥ê¥¹¥¯¤Ï¤¹¤Ù¤Æ¤Î¥¢¥É¥ì¥¹¤Ë¥Þ¥Ã¥Á¤·¤Þ¤¹¤Î¤Ç¡¢¼ç¥µ¡¼¥Ð¤Ï
-    ¥ê¥¯¥¨¥¹¥È¤ò°·¤¤¤Þ¤»¤ó¡£<code>www.example.com</code> ¤Ï
-    ºÇ½é¤Ë¤¢¤ë¤¿¤á¡¢Í¥Àè½ç°Ì¤Ï°ìÈֹ⤯¤Ê¤ê¡¢<cite>default</cite> ¤â¤·¤¯¤Ï
-    <cite>primary</cite>  ¤Î¥µ¡¼¥Ð¤È¹Í¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤Ä¤Þ¤ê¡¢¥ê¥¯¥¨¥¹¥È¤¬
-    ¤É¤Î <code>ServerName</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤â¥Þ¥Ã¥Á¤·¤Ê¤¤¾ì¹ç¡¢
-    °ìÈֺǽé¤Î <code>VirtualHost</code> ¤Ë¤è¤ê°·¤ï¤ì¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>Ãí</h3>
-
-          <p><code>*</code> ¤ò¥·¥¹¥Æ¥à¤Î¼ÂºÝ¤Î IP ¥¢¥É¥ì¥¹¤ËÃÖ¤­´¹¤¨¤ë
-          ¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¤½¤Î¾ì¹ç¤Ï <code>VirtualHost</code> ¤Î°ú¿ô¤Ï
-          <code>NameVirtualHost</code> ¤Î°ú¿ô¤ÈƱ¤¸¤Ë<em>¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó
-          </em>:</p>
-
-            <div class="example"><p><code>
-            NameVirtualHost 172.20.30.40<br />
-						<br />
-            &lt;VirtualHost 172.20.30.40&gt;<br />
- 		        # etc ...
-            </code></p></div>
-
-          <p>¤·¤«¤·¡¢IP ¥¢¥É¥ì¥¹¤¬Í½Â¬ÉÔ²Äǽ¤Ê¥·¥¹¥Æ¥à
-          ¡½¡½Î㤨¤Ð¥×¥í¥Ð¥¤¥À¤«¤éưŪ¤Ë IP ¥¢¥É¥ì¥¹¤ò¼èÆÀ¤·¤Æ²¿¤é¤«¤Î
-          ¥À¥¤¥Ê¥ß¥Ã¥¯ DNS ¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ê¤É¡½¡½¤Ë¤ª¤¤¤Æ¤Ï¡¢<code>*</code> 
-          »ØÄê¤Ï¤µ¤é¤ËÊØÍø¤Ç¤¹¡£<code>*</code> ¤Ï¤¹¤Ù¤Æ¤Î IP ¥¢¥É¥ì¥¹¤Ë
-          ¥Þ¥Ã¥Á¤·¤Þ¤¹¤Î¤Ç¡¢¤³¤ÎÀßÄê¤Ë¤·¤Æ¤ª¤±¤Ð IP ¥¢¥É¥ì¥¹¤¬Êѹ¹¤µ¤ì¤Æ¤â
-          ÀßÄêÊѹ¹¤»¤º¤ËÆ°ºî¤·¤Þ¤¹¡£</p>
-    </div>
-
-    <p>̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥Æ¥£¥ó¥°¤Ç¤Ï¤Û¤Ü¤¹¤Ù¤Æ¤Î¾õ¶·¤Ç¡¢
-    ¾åµ­¤ÎÀßÄê¤Ç´õ˾¤ÎÀßÄê¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤Ç¤·¤ç¤¦¡£
-    ¼ÂºÝ¤³¤ÎÀßÄ꤬ưºî¤·¤Ê¤¤¤Î¤Ï¡¢IP ¥¢¥É¥ì¥¹¤ä¥Ý¡¼¥È¤Î°ã¤¤¤Ë¤è¤Ã¤Æ
-    °ã¤¦¥³¥ó¥Æ¥ó¥Ä¤òÁ÷¤ë¤È¤­¤À¤±¤Ç¤¹¡£</p>
-
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="twoips" id="twoips">Ê£¿ô¤Î IP ¥¢¥É¥ì¥¹¤Î¤¢¤ë¥Û¥¹¥È¤Ç̾Á°¥Ù¡¼¥¹¤Î
-    ¥Û¥¹¥Æ¥£¥ó¥°¤ò¹Ô¤Ê¤¦</a></h2>
- 
-    <div class="note">
-    <h3>Ãí</h3><p>¤³¤³¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ëÊýË¡¤Ï IP ¥¢¥É¥ì¥¹¤¬
-    ²¿¸Ä¤¢¤Ã¤Æ¤âƱÍͤˤǤ­¤Þ¤¹¡£</p>
-    </div>
-
-    <p>¥µ¡¼¥Ð¤Ë¤ÏÆó¤Ä IP ¥¢¥É¥ì¥¹¤¬¤Ä¤¤¤Æ¤¤¤Þ¤¹¡£°ì¤ÄÌÜ
-    (<code>172.20.30.40</code>) ¤Ç¤Ï¼ç¥µ¡¼¥Ð 
-    <code>server.domain.com</code> ¤ò°·¤¤¡¢¤â¤¦°ìÊý
-    (<code>172.20.30.50</code>) ¤Ç¤ÏÆó¤Ä¤«¤½¤ì°Ê¾å¤Î¿ô¤Î
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò°·¤¤¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>¥µ¡¼¥Ð¤ÎÀßÄê</h3><p><code>
-    
-
-    Listen 80<br />
-		<br />
-    # This is the "main" server running on 172.20.30.40<br />
-    ServerName server.domain.com<br />
-    DocumentRoot /www/mainserver<br />
-		<br />
-    # This is the other address<br />
-    NameVirtualHost 172.20.30.50<br />
-		<br />
-    &lt;VirtualHost 172.20.30.50&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/example1<br />
-        ServerName www.example.com<br />
-   			<br />
-        # Other directives here ...<br />
-				<br />
-    </span>
-    &lt;/VirtualHost&gt;<br />
-		<br />
-    &lt;VirtualHost 172.20.30.50&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/example2<br />
-        ServerName www.example.org<br />
-				<br />
-        # Other directives here ...<br />
-				<br />
-    </span>
-    &lt;/VirtualHost&gt;
-    </code></p></div>
-
-    <p><code>172.20.30.50</code> °Ê³°¤Î¥¢¥É¥ì¥¹¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ï¼ç¥µ¡¼¥Ð
-    ¤¬°·¤¤¤Þ¤¹¡£<code>172.20.30.50</code> ¤Ø¤Î¡¢Ì¤ÃΤΥۥ¹¥È̾¤Þ¤¿¤Ï
-    <code>Host:</code> ¥Ø¥Ã¥À¤Ê¤·¤Î¥ê¥¯¥¨¥¹¥È¤Ï <code>www.example.com</code>
-    ¤¬°·¤¤¤Þ¤¹¡£</p>
-
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="intraextra" id="intraextra">°ã¤¦ IP ¥¢¥É¥ì¥¹ (Î㤨¤Ð¡¢ÆâÉô¤È³°Éô¥¢¥É¥ì¥¹)
-    ¤ÇƱ¤¸¥³¥ó¥Æ¥ó¥Ä¤òÁ÷¤ë</a></h2>
-
-    <p>¥µ¡¼¥Ð¥Þ¥·¥ó¤Ï IP ¥¢¥É¥ì¥¹¤òÆó¤Ä (<code>192.168.1.1</code>
-    ¤È <code>172.20.30.40</code>) »ý¤Ã¤Æ¤¤¤Þ¤¹¡£¤³¤Î¥Þ¥·¥ó¤ÏÆâÉô
-    (¥¤¥ó¥È¥é¥Í¥Ã¥È) ¤È ³°Éô (¥¤¥ó¥¿¡¼¥Í¥Ã¥È) ¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤Î´Ö¤Ë
-    ¤¢¤ê¤Þ¤¹¡£<code>server.example.com</code> ¤Ï¥Í¥Ã¥È¥ï¡¼¥¯¤Î³°¤«¤é¤Ï
-    ³°Éô¥¢¥É¥ì¥¹ (<code>172.20.30.40</code>) ¤È¤·¤Æ²ò·è¤µ¤ì¤Þ¤¹¤¬¡¢
-    ¥Í¥Ã¥È¥ï¡¼¥¯¤ÎÃ椫¤é¤ÏÆâÉô¥¢¥É¥ì¥¹ (<code>192.168.1.1</code>) 
-    ¤È¤·¤Æ²ò·è¤µ¤ì¤Þ¤¹¡£</p>
-
-    <p><code>VirtualHost</code> °ì¤Ä¤À¤±¤Ç¥µ¡¼¥Ð¤¬ÆâÉô¤Î¥ê¥¯¥¨¥¹¥È¤È
-    ³°Éô¤Î¥ê¥¯¥¨¥¹¥È¤ÎξÊý¤ËƱ¤¸¥³¥ó¥Æ¥ó¥Ä¤Ç±þÅú¤¹¤ë¤è¤¦¤Ë¤Ç¤­¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>¥µ¡¼¥Ð¤ÎÀßÄê</h3><p><code>
-    
-
-    NameVirtualHost 192.168.1.1<br />
-    NameVirtualHost 172.20.30.40<br />
-		<br />
-    &lt;VirtualHost 192.168.1.1 172.20.30.40&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/server1<br />
-        ServerName server.example.com<br />
-        ServerAlias server<br />
-    </span>
-    &lt;/VirtualHost&gt;
-    </code></p></div>
-
-    <p>¤³¤ì¤Ç¤É¤Á¤é¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤«¤é¤Î¥ê¥¯¥¨¥¹¥È¤âƱ¤¸ <code>VirtualHost</code>
-    ¤Ç°·¤ï¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>Ãí:</h3><p>ÆâÉô¥Í¥Ã¥È¥ï¡¼¥¯¤Ç¤Ï´°Á´¤Ê¥Û¥¹¥È̾¤Î
-          <code>server.example.com</code> ¤ÎÂå¤ï¤ê¤Ë¡¢Ã±¤Ë <code>server</code>
-          ¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-          <p>¾å¤ÎÎã¤Ç¤Ï¡¢IP ¥¢¥É¥ì¥¹¤Î¥ê¥¹¥È¤ò¡¢¤¹¤Ù¤Æ¤Î¥¢¥É¥ì¥¹¤Ë
-           Ʊ¤¸¥³¥ó¥Æ¥ó¥Ä¤Ç±þÅú¤¹¤ë <code>*</code> ¤ËÃÖ¤­´¹¤¨¤é¤ì¤Þ¤¹¡£</p>
-    </div>
-
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="port" id="port">°ã¤¦¥Ý¡¼¥È¤Ç°ã¤¦¥µ¥¤¥È¤ò±¿±Ä¤¹¤ë</a></h2>
-
-    <p>Ʊ¤¸ IP ¤ËÊ£¿ô¤Î¥É¥á¥¤¥ó¤¬¤¢¤ê¡¢¤µ¤é¤ËÊ£¿ô¤Î¥Ý¡¼¥È¤ò»È¤Ã¤Æ
-    ¥ê¥¯¥¨¥¹¥È¤ò°·¤¤¤¿¤¤¤È¤­¤¬¤¢¤ê¤Þ¤¹¡£"NameVirtualHost" ¥¿¥°¤ÎÃæ¤Ç
-    ¥Ý¡¼¥È¤òÄêµÁ¤¹¤ë¤³¤È¤Ç¡¢¤³¤ì¤òÆ°ºî¤µ¤»¤é¤ì¤Þ¤¹¡£
-    NameVirtualHost name:port ̵¤·¤ä Listen ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç
-    &lt;VirtualHost name:port&gt; ¤ò»È¤ª¤¦¤È¤·¤Æ¤â¡¢¤½¤ÎÀßÄê¤ÏÆ°ºî¤·¤Þ¤»¤ó¡£</p>
-
-    <div class="example"><h3>¥µ¡¼¥Ð¤ÎÀßÄê</h3><p><code>
-    
-
-    Listen 80<br />
-    Listen 8080<br />
-		<br />
-    NameVirtualHost 172.20.30.40:80<br />
-    NameVirtualHost 172.20.30.40:8080<br />
-		<br />
-    &lt;VirtualHost 172.20.30.40:80&gt;<br />
-    <span class="indent">
-        ServerName www.example.com<br />
-        DocumentRoot /www/domain-80<br />
-    </span>
-    &lt;/VirtualHost&gt;<br />
-		<br />
-    &lt;VirtualHost 172.20.30.40:8080&gt;<br />
-    <span class="indent">
-        ServerName www.example.com<br />
-        DocumentRoot /www/domain-8080<br />
-    </span>
-    &lt;/VirtualHost&gt;<br />
-		<br />
-    &lt;VirtualHost 172.20.30.40:80&gt;<br />
-    <span class="indent">
-        ServerName www.example.org<br />
-        DocumentRoot /www/otherdomain-80<br />
-    </span>
-    &lt;/VirtualHost&gt;<br />
-		<br />
-    &lt;VirtualHost 172.20.30.40:8080&gt;<br />
-    <span class="indent">
-        ServerName www.example.org<br />
-        DocumentRoot /www/otherdomain-8080<br />
-    </span>
-    &lt;/VirtualHost&gt;
-    </code></p></div>
-
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="ip" id="ip">IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥Æ¥£¥ó¥°</a></h2>
-
-    <p>¥µ¡¼¥Ð¤Ï <code>www.example.com</code> ¤È <code>www.example.org</code>
-    ¤Ë¤½¤ì¤¾¤ì²ò·è¤µ¤ì¤ë¡¢Æó¤Ä¤Î IP ¥¢¥É¥ì¥¹ (<code>172.20.30.40</code> ¤È
-    <code>172.20.30.50</code>) ¤¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>¥µ¡¼¥Ð¤ÎÀßÄê</h3><p><code>
-    
-
-    Listen 80<br />
-		<br />
-    &lt;VirtualHost 172.20.30.40&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/example1<br />
-        ServerName www.example.com<br />
-    </span>
-    &lt;/VirtualHost&gt;<br />
-		<br />
-    &lt;VirtualHost 172.20.30.50&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/example2<br />
-        ServerName www.example.org<br />
-    </span>
-    &lt;/VirtualHost&gt;
-    </code></p></div>
-
-    <p><code>&lt;VirtualHost&gt;</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î¤É¤ì¤Ç¤â
-    »ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¥¢¥É¥ì¥¹ (Î㤨¤Ð <code>localhost</code>) ¤Ï¡¢
-    ¼ç¥µ¡¼¥Ð¤¬¤¢¤ì¤Ð¤½¤³¤Ë¹Ô¤­¤Þ¤¹¡£</p>
-
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="ipport" id="ipport">¥Ý¡¼¥È¥Ù¡¼¥¹¤È IP ¥Ù¡¼¥¹¤Îº®¤¶¤Ã¤¿
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></h2>
-
-    <p>¥µ¡¼¥Ð¥Þ¥·¥ó¤Ï¤½¤ì¤¾¤ì <code>www.example.com</code> ¤È
-    <code>www.example.org</code> ¤Ë¤½¤ì¤¾¤ì²ò·è¤µ¤ì¤ë¡¢IP ¥¢¥É¥ì¥¹¤òÆó¤Ä
-    (<code>172.20.30.40</code> ¤È <code>172.20.30.50</code>) »ý¤Ã¤Æ¤¤¤Þ¤¹¡£
-    ¤É¤Á¤é¤â¥Ý¡¼¥È 80 ¤È 8080 ¤Ç¥Û¥¹¥È¤òÁö¤é¤»¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>¥µ¡¼¥Ð¤ÎÀßÄê</h3><p><code>
-    
-
-    Listen 172.20.30.40:80<br />
-    Listen 172.20.30.40:8080<br />
-    Listen 172.20.30.50:80<br />
-    Listen 172.20.30.50:8080<br />
-		<br />
-    &lt;VirtualHost 172.20.30.40:80&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/example1-80<br />
-        ServerName www.example.com<br />
-    </span>
-    &lt;/VirtualHost&gt;<br />
-		<br />
-    &lt;VirtualHost 172.20.30.40:8080&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/example1-8080<br />
-        ServerName www.example.com<br />
-		</span>
-    &lt;/VirtualHost&gt;<br />
-		<br />
-    &lt;VirtualHost 172.20.30.50:80&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/example2-80<br />
-        ServerName www.example.org<br />
-    </span>
-    &lt;/VirtualHost&gt;<br />
-		<br />
-    &lt;VirtualHost 172.20.30.50:8080&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/example2-8080<br />
-        ServerName www.example.org<br />
-    </span>
-    &lt;/VirtualHost&gt;
-    </code></p></div>
-
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="mixed" id="mixed">̾Á°¥Ù¡¼¥¹¤È IP ¥Ù¡¼¥¹¤òº®¤¼¤¿
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></h2>
-
-    <p>¤¤¤¯¤Ä¤«¤Î¥Þ¥·¥ó¤Ç¤Ï̾Á°¥Ù¡¼¥¹¤Î¡¢¤½¤Î¾¤Ç¤Ï IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë
-    ¥Û¥¹¥È¤ò¤·¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>¥µ¡¼¥Ð¤ÎÀßÄê</h3><p><code>
-    
-
-    Listen 80<br />
-		<br />
-    NameVirtualHost 172.20.30.40<br />
-		<br />
-    &lt;VirtualHost 172.20.30.40&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/example1<br />
-        ServerName www.example.com<br />
-    </span>
-    &lt;/VirtualHost&gt;<br />
-		<br />
-    &lt;VirtualHost 172.20.30.40&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/example2<br />
-        ServerName www.example.org<br />
-    </span>
-    &lt;/VirtualHost&gt;<br />
-		<br />
-    &lt;VirtualHost 172.20.30.40&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/example3<br />
-        ServerName www.example3.net<br />
-    </span>
-    &lt;/VirtualHost&gt;<br />
-		<br />
-    # IP-based<br />
-    &lt;VirtualHost 172.20.30.50&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/example4<br />
-        ServerName www.example4.edu<br />
-    </span>
-    &lt;/VirtualHost&gt;<br />
-		<br />
-    &lt;VirtualHost 172.20.30.60&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/example5<br />
-        ServerName www.example5.gov<br />
-    </span>
-    &lt;/VirtualHost&gt;
-    </code></p></div>
-
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="proxy" id="proxy"><code>Virtual_host</code> ¤È
-    mod_proxy ¤òÊ»ÍѤ¹¤ë</a></h2>
-
-    <p>¼¡¤ÎÎã¤Ï¡¢¥Õ¥í¥ó¥È¦¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ç¾¤Î¥Þ¥·¥ó¤Ø¥×¥í¥¯¥·¤·¤Þ¤¹¡£
-    Îã¤Ç¤Ï <code>192.168.111.2</code> ¤Î¥Þ¥·¥ó¤Ç¤Ï¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È̾¤Ï
-    Ʊ¤¸Ì¾Á°¤ÇÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£Ê£¿ô¤Î¥Û¥¹¥È̾¤ò°ìÂæ¤Î¥Þ¥·¥ó¤Ë¥×¥í¥¯¥·¤¹¤ë
-    ¾ì¹ç¤Ï¡¢<code class="directive"><a href="../mod/mod_proxy.html#proxypreservehost on">ProxyPreserveHost On</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ¡¢´õ˾¤Î¥Û¥¹¥È̾¤òÅϤ»¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
-    </p>
-
-    <div class="example"><p><code>
-    &lt;VirtualHost *:*&gt;<br />
-        ProxyPreserveHost On<br />
-        ProxyPass / http://192.168.111.2<br />
-        ProxyPassReverse / http://192.168.111.2/<br />
-        ServerName hostname.example.com<br />
-    &lt;/VirtualHost&gt;
-    </code></p></div>
-
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="default" id="default"><code>_default_</code> ¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò
-    »È¤¦</a></h2> 
-
-    <h3><a name="defaultallports" id="defaultallports">¤¹¤Ù¤Æ¤Î¥Ý¡¼¥È¤ËÂФ¹¤ë
-    <code>_default_</code> ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></h3>
-
-    <p>̤»ØÄê¤Î IP ¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¡¢<em>¤Ä¤Þ¤ê</em>¾¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë
-    »È¤ï¤ì¤Æ¤¤¤Ê¤¤¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤ÎÁȤ߹ç¤ï¤»¡¢¤Ø¤Î<em>¤¹¤Ù¤Æ¤Î</em>¥ê¥¯¥¨¥¹¥È¤ò
-    ¼õ¤±¼è¤ê¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>¥µ¡¼¥Ð¤ÎÀßÄê</h3><p><code>
-    
-
-    &lt;VirtualHost _default_:*&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/default<br />
-    </span>
-    &lt;/VirtualHost&gt;
-    </code></p></div>
-
-    <p>¤³¤Î¤è¤¦¤Ë¥ï¥¤¥ë¥É¥«¡¼¥É¤Î¥Ý¡¼¥È¤Ç¥Ç¥Õ¥©¥ë¥È¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò
-    »ØÄꤹ¤ë¤È¡¢¼ç¥µ¡¼¥Ð¤Ë¥ê¥¯¥¨¥¹¥È¤¬¹Ô¤¯¤Î¤òËɤ²¤Þ¤¹¡£</p>
-
-    <p>¥Ç¥Õ¥©¥ë¥È¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ï̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë
-    »È¤ï¤ì¤Æ¤¤¤ë¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤ÎÁȤËÁ÷¤é¤ì¤¿¥ê¥¯¥¨¥¹¥È¤ò°·¤¦¤³¤È¤Ï
-    ¤¢¤ê¤Þ¤»¤ó¡£¥ê¥¯¥¨¥¹¥È¤¬ÉÔÌÀ¤Ê <code>Host:</code> ¥Ø¥Ã¥À¤ä¤½¤Î
-    ¥Ø¥Ã¥À¤¬¤Ê¤«¤Ã¤¿¤ê¤¹¤ë¾ì¹ç¤Ï´ðËÜ̾Á°¥Ù¡¼¥¹¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È (¤½¤Î
-    ¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤ÇÀßÄê¥Õ¥¡¥¤¥ëÃæ¤ÇºÇ½é¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È) ¤Ë¤è¤ê
-    °·¤ï¤ì¤Þ¤¹¡£</p>
-
-    <p>¤É¤ó¤Ê¥ê¥¯¥¨¥¹¥È¤Ç¤â <code class="directive"><a href="../mod/mod_alias.html#aliasmatch">AliasMatch</a></code>
-    ¤ä <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> ¤ò»È¤Ã¤Æ
-    ñ°ì¤Î¾ðÊó¥Ú¡¼¥¸ (¤ä¥¹¥¯¥ê¥×¥È) ¤Ë½ñ¤­´¹¤¨¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-    
-
-    <h3><a name="defaultdifferentports" id="defaultdifferentports">°ã¤¦¥Ý¡¼¥È¤Î¤¿¤á¤Î
-    <code>_default_</code> ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></h3>
-
-    <p>°ì¤Ä¤á¤ÎÀßÄê¤È¤Û¤ÜƱ¤¸¤Ç¤¹¤¬¡¢¥µ¡¼¥Ð¤ÏÊ£¿ô¤Î¥Ý¡¼¥È¤ò listen ¤·¤Æ¤ª¤ê¡¢
-    80 È֥ݡ¼¥È¤ËÂФ·¤ÆÆó¤Ä¤á¤Î <code>_default_</code> ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò
-    ÀßÄꤷ¤¿¤¤¾ì¹ç¤Ç¤¹¡£</p>
-
-    <div class="example"><h3>¥µ¡¼¥Ð¤ÎÀßÄê</h3><p><code>
-    
-
-    &lt;VirtualHost _default_:80&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/default80<br />
-        # ...<br />
-    </span>
-    &lt;/VirtualHost&gt;<br />
-		<br />
-    &lt;VirtualHost _default_:*&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/default<br />
-        # ...<br />
-    </span>
-    &lt;/VirtualHost&gt;
-    </code></p></div>
-
-    <p>80 È֥ݡ¼¥È¤Î¥Ç¥Õ¥©¥ë¥È¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È (¥ï¥¤¥ë¥É¥«¡¼¥É¥Ý¡¼¥È¤Î
-    ¥Ç¥Õ¥©¥ë¥È¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤è¤ê¤âÁ°¤Ë½ñ¤«¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð<em>¤Ê¤ê¤Þ¤»¤ó</em>) ¤Ï
-    ̤»ØÄê¤Î IP ¥¢¥É¥ì¥¹¤ËÁ÷¤é¤ì¤¿¤¹¤Ù¤Æ¤Î¥ê¥¯¥¨¥¹¥È¤ò°·¤¤¤Þ¤¹¡£
-    ¼ç¥µ¡¼¥Ð¤Ï¥ê¥¯¥¨¥¹¥È¤ò°·¤¤¤Þ¤»¤ó¡£</p>
-    
-
-    <h3><a name="defaultoneport" id="defaultoneport">°ì¤Ä¤Î¥Ý¡¼¥È¤ËÂФ·¤Æ¤À¤±¤Î
-    <code>_default_</code> ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></h3>
-
-    <p>80 È֥ݡ¼¥È¤Ë¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤¬É¬Íפǡ¢Â¾¤Î
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ï¥Ç¥Õ¥©¥ë¥È¤¬É¬Íפʤ¤¾ì¹ç¤Ç¤¹¡£</p>
-
-    <div class="example"><h3>¥µ¡¼¥Ð¤ÎÀßÄê</h3><p><code>
-    
-
-    &lt;VirtualHost _default_:80&gt;<br />
-    DocumentRoot /www/default<br />
-    ...<br />
-    &lt;/VirtualHost&gt;
-    </code></p></div>
-
-    <p>80 È֥ݡ¼¥È¤Ø¤Î¥¢¥É¥ì¥¹Ì¤»ØÄê¤Î¥ê¥¯¥¨¥¹¥È¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥Ð¡¼¥Á¥ã¥ë
-    ¥Û¥¹¥È¤«¤éÁ÷¤é¤ì¤Þ¤¹¡£Â¾¤Î̤»ØÄê¤Î¥¢¥É¥ì¥¹¤È¥Ý¡¼¥È¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ï
-    ¼ç¥µ¡¼¥Ð¤«¤éÁ÷¤é¤ì¤Þ¤¹¡£</p>
-    
-
-  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="migrate" id="migrate">̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤«¤é IP ¥Ù¡¼¥¹¤Î
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë°Ü¹Ô¤¹¤ë</a></h2>
-
-    <p>¥Û¥¹¥È̾¤¬Ì¾Á° <code>www.example.org</code> ¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È
-    (<a href="#name">̾Á°¥Ù¡¼¥¹</a>¤ÎÎã¤Î 2 ÈÖÌܤÎÀßÄê) ¤¬ÀìÍѤΠIP ¥¢¥É¥ì¥¹¤ò
-    ÆÀ¤¿¤È¤·¤Þ¤¹¡£Ì¾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¸Å¤¤ IP ¥¢¥É¥ì¥¹¤ò
-    ¥­¥ã¥Ã¥·¥å¤·¤Æ¤¤¤ë¥Í¡¼¥à¥µ¡¼¥Ð¤ä¥×¥í¥­¥·¤Î¤¿¤á¤Ë°Ü¹Ô´ü´ÖÃæ¤ÏξÊý¤Î
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤òÄ󶡤·¤¿¤¤¤È¤·¤Þ¤¹¡£</p>
-
-    <p>Åú¤Ï´Êñ¤Ç¤¹¡£Ã±¤Ë¿·¤·¤¤ IP ¥¢¥É¥ì¥¹ (<code>172.20.30.50</code>)
-    ¤ò <code>VirtualHost</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ËÄɲ乤뤳¤È¤Ç
-    ¤Ç¤­¤Þ¤¹¡£</p>
-  
-    <div class="example"><h3>¥µ¡¼¥ÐÀßÄê</h3><p><code>
-    
-
-    Listen 80<br />
-    ServerName www.example.com<br />
-    DocumentRoot /www/example1<br />
-		<br />
-    NameVirtualHost 172.20.30.40<br />
-		<br />
-    &lt;VirtualHost 172.20.30.40 172.20.30.50&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/example2<br />
-        ServerName www.example.org<br />
-        # ...<br />
-    </span>
-    &lt;/VirtualHost&gt;<br />
-		<br />
-    &lt;VirtualHost 172.20.30.40&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/example3<br />
-        ServerName www.example.net<br />
-        ServerAlias *.example.net<br />
-        # ...<br />
-    </span>
-    &lt;/VirtualHost&gt;
-    </code></p></div>
-
-    <p>¤³¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ï¿·¤·¤¤¥¢¥É¥ì¥¹ (IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤È¤·¤Æ)
-    ¤È¸Å¤¤¥¢¥É¥ì¥¹(̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤È¤·¤Æ) ¤ÎξÊý¤«¤é
-    ¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¡£</p>
-
-    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="serverpath" id="serverpath"><code>ServerPath</code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    »È¤¦</a></h2>
-
-    <p>̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤¬Æó¤Ä¤¢¤ë¥µ¡¼¥Ð¤¬¤¢¤ë¤È¤·¤Þ¤¹¡£
-    Àµ¤·¤¤¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤òÆÀ¤ë¤¿¤á¤Ë¤Ï¥¯¥é¥¤¥¢¥ó¥È¤ÏÀµ¤·¤¤
-    <code>Host:</code> ¥Ø¥Ã¥À¤òÁ÷¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-    ¸Å¤¤ HTTP/1.0 ¤Ï¤½¤Î¤è¤¦¤Ê¥Ø¥Ã¥À¤òÁ÷¤é¤Ê¤¤¤Î¤Ç¡¢Apache ¤Ï¥¯¥é¥¤¥¢¥ó¥È¤¬
-    ¤É¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò°Õ¿Þ¤·¤¿¤Î¤«¤µ¤Ã¤Ñ¤ê¤ï¤«¤ê¤Þ¤»¤ó
-    (¤Ê¤Î¤Ç¡¢¼ç¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ç¥ê¥¯¥¨¥¹¥È¤ò°·¤¤¤Þ¤¹)¡£
-    ²Äǽ¤Ê¸Â¤ê¤Î²¼°Ì¸ß´¹À­¤òÆÀ¤ë¤¿¤á¡¢Ì¾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î
-    URL ÀÜƬ¼­¤Ø¤Î¥ê¥ó¥¯¤Î½ñ¤«¤ì¤¿¥Ú¡¼¥¸¤òÊÖ¤¹¡¢
-    ¼ç¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="example"><h3>¥µ¡¼¥Ð¤ÎÀßÄê</h3><p><code>
-    
-
-    NameVirtualHost 172.20.30.40<br />
-		<br />
-    &lt;VirtualHost 172.20.30.40&gt;<br />
-    <span class="indent">
-        # primary vhost<br />
-        DocumentRoot /www/subdomain<br />
-        RewriteEngine On<br />
-        RewriteRule ^/.* /www/subdomain/index.html<br />
-        # ...<br />
-    </span>
-    &lt;/VirtualHost&gt;<br />
-		<br />
-    &lt;VirtualHost 172.20.30.40&gt;<br />
-    DocumentRoot /www/subdomain/sub1<br />
-    <span class="indent">
-        ServerName www.sub1.domain.tld<br />
-        ServerPath /sub1/<br />
-        RewriteEngine On<br />
-        RewriteRule ^(/sub1/.*) /www/subdomain$1<br />
-        # ...<br />
-    </span>
-    &lt;/VirtualHost&gt;<br />
-		<br />
-    &lt;VirtualHost 172.20.30.40&gt;<br />
-    <span class="indent">
-        DocumentRoot /www/subdomain/sub2<br />
-        ServerName www.sub2.domain.tld<br />
-        ServerPath /sub2/<br />
-        RewriteEngine On<br />
-        RewriteRule ^(/sub2/.*) /www/subdomain$1<br />
-        # ...<br />
-    </span>
-    &lt;/VirtualHost&gt;
-    </code></p></div>
-
-    <p><code class="directive"><a href="../mod/core.html#serverpath">ServerPath</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÀßÄê¤Ë
-    ¤è¤ê¡¢URL <code>http://www.sub1.domain.tld/sub1/</code> ¤Ï
-    <em>¾ï¤Ë</em> sub1-vhost ¤Ë¤è¤ê°·¤ï¤ì¤Þ¤¹¡£URL
-    <code>http://www.sub1.domain.tld/</code> ¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ï
-    ¥¯¥é¥¤¥¢¥ó¥È¤¬Àµ¤·¤¤ <code>Host:</code> ¥Ø¥Ã¥À¤òÁ÷¤Ã¤¿¤È¤­¤Ë¤Î¤ß
-    sub1-vhost ¤«¤éÁ÷¤é¤ì¤Þ¤¹¡£<code>Host:</code> ¥Ø¥Ã¥À¤¬¤Ê¤±¤ì¤Ð
-    ¥¯¥é¥¤¥¢¥ó¥È¤Ï¼ç¥Û¥¹¥È¤Î¾ðÊó¥Ú¡¼¥¸¤òÆÀ¤Þ¤¹¡£</p>
-
-    <p>°ì¤Ä´ñ̯¤ÊÆ°ºî¤ò¤¹¤ëÅÀ¤¬¤¢¤ë¤³¤È¤Ï³Ð¤¨¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£
-    <code>http://www.sub2.domain.tld/sub1/</code> ¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤â
-    <code>Host:</code> ¥Ø¥Ã¥À¤¬¤Ê¤±¤ì¤Ð sub1-vhost ¤Ë¤è¤ê°·¤ï¤ì¤Þ¤¹¡£</p>
-
-    <p>Àµ¤·¤¤ <code>Host:</code> ¥Ø¥Ã¥À¤òÁ÷¤Ã¤¿¥¯¥é¥¤¥¢¥ó¥È¤Ï¤É¤Á¤é¤Î
-    URL¡¢<em>¤Ä¤Þ¤ê</em>ÀÜƬ¼­¤¬¤¢¤ëÊý¤â̵¤¤Êý¤â»È¤¨¤ë¤è¤¦¤Ë
-    <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬
-    »È¤ï¤ì¤Æ¤¤¤Þ¤¹¡£</p>
-  </div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/vhosts/examples.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/vhosts/examples.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="../ja/vhosts/examples.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/examples.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/examples.html.ja.utf8 b/docs/manual/vhosts/examples.html.ja.utf8
new file mode 100644
index 00000000..39b763b0
--- /dev/null
+++ b/docs/manual/vhosts/examples.html.ja.utf8
@@ -0,0 +1,650 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>�ー�ャルホスト�例 - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">�ー�ャルホスト</a></div><div id="page-content"><div id="preamble"><h1>�ー�ャルホスト�例</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/vhosts/examples.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/vhosts/examples.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/vhosts/examples.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/vhosts/examples.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+
+
+    <p>��文書���ー�ャルホスト�設定�際�
+    よ��る質��答�るも���。想定���る対象� <a href="name-based.html">��ベース</a> や <a href="ip-based.html">IP ベース</a> ��ー�ャルホストを使��
+    一��サー��複数�ウェブサイトを�用���る状���。
+    </p>
+
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#purename">一�� IP アドレス��������ベース�
+    ウェブサイトを実行�る</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#twoips">複数� IP アドレス��るホスト���ベース�
+    ホスティングを行��</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#intraextra">�� IP アドレス (例���内部�外部アドレス)
+    ���コンテンツを�る</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#port">���ート���サイトを�営�る</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ip">IP ベース��ー�ャルホスティング</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ipport">�ートベース� IP ベース�混���
+    �ー�ャルホスト</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#mixed">��ベース� IP ベースを混��
+    �ー�ャルホスト</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxy"><code>Virtual_host</code> �
+    mod_proxy を併用�る</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#default"><code>_default_</code> ��ー�ャルホストを
+    使�</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#migrate">��ベース��ー�ャルホスト�ら IP ベース�
+    �ー�ャルホスト�移行�る</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#serverpath"><code>ServerPath</code> ディレクティブを
+    使�</a></li>
+</ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="purename" id="purename">一�� IP アドレス��������ベース�
+    ウェブサイトを実行�る</a></h2>
+
+    <p>サー�� IP アドレスを一�割り当�られ����DNS �マシン�
+    複数��� (CNAME) �指定�れ����。��マシン�
+    <code>www.example.com</code> � <code>www.example.org</code>
+    ����ウェブサー�を実行��������。</p>
+
+    <div class="note"><h3>注</h3><p>
+          Apache サー��設定��ー�ャルホスト�設定を������
+          知ら��間���ホスト��対応�る DNS �エントリ�
+          作��れ�り����ん。��サー�� IP アドレス�解決�れる
+          よ�� DNS ���を登録���れ�<em>�り��ん</em>。
+          ������誰も����ウェブサイトを見る�������ん。
+          ローカル��テスト���� <code>hosts</code> ファイル�
+          エントリを追加�る��も��������場����
+          hosts エントリ��るマシン�ら��動作���ん。</p>
+    </div>
+
+    <div class="example"><h3>サー�設定</h3><p><code>
+    
+
+    # Ensure that Apache listens on port 80<br />
+    Listen 80<br />
+    <br />
+    # Listen for virtual host requests on all IP addresses<br />
+    NameVirtualHost *:80<br />
+    <br />
+    &lt;VirtualHost *:80&gt;<br />
+    <span class="indent">
+      DocumentRoot /www/example1<br />
+      ServerName www.example.com<br />
+      <br />
+      # Other directives here<br />
+      <br />
+    </span>
+    &lt;/VirtualHost&gt;<br />
+    <br />
+    &lt;VirtualHost *:80&gt;<br />
+    <span class="indent">
+      DocumentRoot /www/example2<br />
+      ServerName www.example.org<br />
+      <br />
+      # Other directives here<br />
+      <br />
+    </span>
+    &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    <p>アスタリスク�����アドレス�マッ�������主サー��
+    リクエストを扱���ん。<code>www.example.com</code> �
+    最���る���優先順��一番高��り�<cite>default</cite> も���
+    <cite>primary</cite>  �サー��考�る�������。��り�リクエスト�
+    �� <code>ServerName</code> ディレクティブ�もマッ����場��
+    一番最�� <code>VirtualHost</code> �より扱�れ��。</p>
+
+    <div class="note"><h3>注</h3>
+
+          <p><code>*</code> をシステム�実際� IP アドレス�置���る
+          ��も����。��場�� <code>VirtualHost</code> �引数�
+          <code>NameVirtualHost</code> �引数����<em>���れ��り��ん
+          </em>:</p>
+
+            <div class="example"><p><code>
+            NameVirtualHost 172.20.30.40<br />
+						<br />
+            &lt;VirtualHost 172.20.30.40&gt;<br />
+ 		        # etc ...
+            </code></p></div>
+
+          <p>����IP アドレス�予測��能�システム
+          ――例��プロ�イダ�ら動的� IP アドレスを�得��何ら��
+          ダイナミック DNS を使���る場���――������<code>*</code> 
+          指定��ら�便利��。<code>*</code> ����� IP アドレス�
+          マッ���������設定������ IP アドレス�変更�れ�も
+          設定変更���動作���。</p>
+    </div>
+
+    <p>��ベース��ー�ャルホスティング��������状���
+    上記�設定�希望�設定�����る����ょ�。
+    実際��設定�動作������IP アドレスや�ート����よ��
+    ��コンテンツを�る������。</p>
+
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="twoips" id="twoips">複数� IP アドレス��るホスト���ベース�
+    ホスティングを行��</a></h2>
+ 
+    <div class="note">
+    <h3>注</h3><p>���説明�れ��る方法� IP アドレス�
+    何個���も�様�����。</p>
+    </div>
+
+    <p>サー���二� IP アドレス�������。一�目
+    (<code>172.20.30.40</code>) ��主サー� 
+    <code>server.domain.com</code> を扱��も�一方
+    (<code>172.20.30.50</code>) ��二���れ以上�数�
+    �ー�ャルホストを扱���。</p>
+
+    <div class="example"><h3>サー��設定</h3><p><code>
+    
+
+    Listen 80<br />
+		<br />
+    # This is the "main" server running on 172.20.30.40<br />
+    ServerName server.domain.com<br />
+    DocumentRoot /www/mainserver<br />
+		<br />
+    # This is the other address<br />
+    NameVirtualHost 172.20.30.50<br />
+		<br />
+    &lt;VirtualHost 172.20.30.50&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/example1<br />
+        ServerName www.example.com<br />
+   			<br />
+        # Other directives here ...<br />
+				<br />
+    </span>
+    &lt;/VirtualHost&gt;<br />
+		<br />
+    &lt;VirtualHost 172.20.30.50&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/example2<br />
+        ServerName www.example.org<br />
+				<br />
+        # Other directives here ...<br />
+				<br />
+    </span>
+    &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    <p><code>172.20.30.50</code> 以外�アドレス��リクエスト�主サー�
+    �扱���。<code>172.20.30.50</code> ���未知�ホスト����
+    <code>Host:</code> ヘッダ���リクエスト� <code>www.example.com</code>
+    �扱���。</p>
+
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="intraextra" id="intraextra">�� IP アドレス (例���内部�外部アドレス)
+    ���コンテンツを�る</a></h2>
+
+    <p>サー�マシン� IP アドレスを二� (<code>192.168.1.1</code>
+    � <code>172.20.30.40</code>) ������。��マシン�内部
+    (イントラ�ット) � 外部 (インター�ット) ��ットワーク�間�
+    �り��。<code>server.example.com</code> ��ットワーク�外�ら�
+    外部アドレス (<code>172.20.30.40</code>) ���解決�れ����
+    �ットワーク�中�ら�内部アドレス (<code>192.168.1.1</code>) 
+    ���解決�れ��。</p>
+
+    <p><code>VirtualHost</code> 一����サー��内部�リクエスト�
+    外部�リクエスト�両方���コンテンツ�応答�るよ������。</p>
+
+    <div class="example"><h3>サー��設定</h3><p><code>
+    
+
+    NameVirtualHost 192.168.1.1<br />
+    NameVirtualHost 172.20.30.40<br />
+		<br />
+    &lt;VirtualHost 192.168.1.1 172.20.30.40&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/server1<br />
+        ServerName server.example.com<br />
+        ServerAlias server<br />
+    </span>
+    &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    <p>�れ���ら��ットワーク�ら�リクエストも�� <code>VirtualHost</code>
+    �扱�れるよ���り��。</p>
+
+    <div class="note"><h3>注:</h3><p>内部�ットワーク��完全�ホスト��
+          <code>server.example.com</code> �代�り���� <code>server</code>
+          を使��������。</p>
+
+          <p>上�例���IP アドレス�リストを�����アドレス�
+           ��コンテンツ�応答�る <code>*</code> �置���られ��。</p>
+    </div>
+
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="port" id="port">���ート���サイトを�営�る</a></h2>
+
+    <p>�� IP �複数�ドメイン��り��ら�複数��ートを使��
+    リクエストを扱�������り��。"NameVirtualHost" タグ�中�
+    �ートを定義�る�����れを動作��られ��。
+    NameVirtualHost name:port 無�や Listen ディレクティブ�
+    &lt;VirtualHost name:port&gt; を使�����も���設定�動作���ん。</p>
+
+    <div class="example"><h3>サー��設定</h3><p><code>
+    
+
+    Listen 80<br />
+    Listen 8080<br />
+		<br />
+    NameVirtualHost 172.20.30.40:80<br />
+    NameVirtualHost 172.20.30.40:8080<br />
+		<br />
+    &lt;VirtualHost 172.20.30.40:80&gt;<br />
+    <span class="indent">
+        ServerName www.example.com<br />
+        DocumentRoot /www/domain-80<br />
+    </span>
+    &lt;/VirtualHost&gt;<br />
+		<br />
+    &lt;VirtualHost 172.20.30.40:8080&gt;<br />
+    <span class="indent">
+        ServerName www.example.com<br />
+        DocumentRoot /www/domain-8080<br />
+    </span>
+    &lt;/VirtualHost&gt;<br />
+		<br />
+    &lt;VirtualHost 172.20.30.40:80&gt;<br />
+    <span class="indent">
+        ServerName www.example.org<br />
+        DocumentRoot /www/otherdomain-80<br />
+    </span>
+    &lt;/VirtualHost&gt;<br />
+		<br />
+    &lt;VirtualHost 172.20.30.40:8080&gt;<br />
+    <span class="indent">
+        ServerName www.example.org<br />
+        DocumentRoot /www/otherdomain-8080<br />
+    </span>
+    &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ip" id="ip">IP ベース��ー�ャルホスティング</a></h2>
+
+    <p>サー�� <code>www.example.com</code> � <code>www.example.org</code>
+    ��れ�れ解決�れる�二�� IP アドレス (<code>172.20.30.40</code> �
+    <code>172.20.30.50</code>) ��り��。</p>
+
+    <div class="example"><h3>サー��設定</h3><p><code>
+    
+
+    Listen 80<br />
+		<br />
+    &lt;VirtualHost 172.20.30.40&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/example1<br />
+        ServerName www.example.com<br />
+    </span>
+    &lt;/VirtualHost&gt;<br />
+		<br />
+    &lt;VirtualHost 172.20.30.50&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/example2<br />
+        ServerName www.example.org<br />
+    </span>
+    &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    <p><code>&lt;VirtualHost&gt;</code> ディレクティブ��れ�も
+    指定�れ����アドレス (例�� <code>localhost</code>) ��
+    主サー���れ����行���。</p>
+
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="ipport" id="ipport">�ートベース� IP ベース�混���
+    �ー�ャルホスト</a></h2>
+
+    <p>サー�マシン��れ�れ <code>www.example.com</code> �
+    <code>www.example.org</code> ��れ�れ解決�れる�IP アドレスを二�
+    (<code>172.20.30.40</code> � <code>172.20.30.50</code>) ������。
+    ��らも�ート 80 � 8080 �ホストを走ら���。</p>
+
+    <div class="example"><h3>サー��設定</h3><p><code>
+    
+
+    Listen 172.20.30.40:80<br />
+    Listen 172.20.30.40:8080<br />
+    Listen 172.20.30.50:80<br />
+    Listen 172.20.30.50:8080<br />
+		<br />
+    &lt;VirtualHost 172.20.30.40:80&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/example1-80<br />
+        ServerName www.example.com<br />
+    </span>
+    &lt;/VirtualHost&gt;<br />
+		<br />
+    &lt;VirtualHost 172.20.30.40:8080&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/example1-8080<br />
+        ServerName www.example.com<br />
+		</span>
+    &lt;/VirtualHost&gt;<br />
+		<br />
+    &lt;VirtualHost 172.20.30.50:80&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/example2-80<br />
+        ServerName www.example.org<br />
+    </span>
+    &lt;/VirtualHost&gt;<br />
+		<br />
+    &lt;VirtualHost 172.20.30.50:8080&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/example2-8080<br />
+        ServerName www.example.org<br />
+    </span>
+    &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="mixed" id="mixed">��ベース� IP ベースを混��
+    �ー�ャルホスト</a></h2>
+
+    <p>�����マシン����ベース����他�� IP ベース��ー�ャル
+    ホストを���。</p>
+
+    <div class="example"><h3>サー��設定</h3><p><code>
+    
+
+    Listen 80<br />
+		<br />
+    NameVirtualHost 172.20.30.40<br />
+		<br />
+    &lt;VirtualHost 172.20.30.40&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/example1<br />
+        ServerName www.example.com<br />
+    </span>
+    &lt;/VirtualHost&gt;<br />
+		<br />
+    &lt;VirtualHost 172.20.30.40&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/example2<br />
+        ServerName www.example.org<br />
+    </span>
+    &lt;/VirtualHost&gt;<br />
+		<br />
+    &lt;VirtualHost 172.20.30.40&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/example3<br />
+        ServerName www.example3.net<br />
+    </span>
+    &lt;/VirtualHost&gt;<br />
+		<br />
+    # IP-based<br />
+    &lt;VirtualHost 172.20.30.50&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/example4<br />
+        ServerName www.example4.edu<br />
+    </span>
+    &lt;/VirtualHost&gt;<br />
+		<br />
+    &lt;VirtualHost 172.20.30.60&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/example5<br />
+        ServerName www.example5.gov<br />
+    </span>
+    &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="proxy" id="proxy"><code>Virtual_host</code> �
+    mod_proxy を併用�る</a></h2>
+
+    <p>次�例��フロント���ー�ャルホスト�他�マシン�プロクシ���。
+    例�� <code>192.168.111.2</code> �マシン���ー�ャルホスト��
+    �����設定�れ����。複数�ホスト�を一��マシン�プロクシ�る
+    場���<code class="directive"><a href="../mod/mod_proxy.html#proxypreservehost on">ProxyPreserveHost On</a></code>
+    ディレクティブを使���希望�ホスト�を渡�るよ���り��。
+    </p>
+
+    <div class="example"><p><code>
+    &lt;VirtualHost *:*&gt;<br />
+        ProxyPreserveHost On<br />
+        ProxyPass / http://192.168.111.2<br />
+        ProxyPassReverse / http://192.168.111.2/<br />
+        ServerName hostname.example.com<br />
+    &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="default" id="default"><code>_default_</code> ��ー�ャルホストを
+    使�</a></h2> 
+
+    <h3><a name="defaultallports" id="defaultallports">�����ート�対�る
+    <code>_default_</code> �ー�ャルホスト</a></h3>
+
+    <p>未指定� IP アドレス��ート�<em>��り</em>他��ー�ャルホスト�
+    使�れ����アドレス��ート�組�������<em>����</em>リクエストを
+    ���り��。</p>
+
+    <div class="example"><h3>サー��設定</h3><p><code>
+    
+
+    &lt;VirtualHost _default_:*&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/default<br />
+    </span>
+    &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    <p>��よ��ワイルドカード��ート�デフォルト��ー�ャルホストを
+    指定�る��主サー��リクエスト�行��を防���。</p>
+
+    <p>デフォルト��ー�ャルホスト���ベース��ー�ャルホスト�
+    使�れ��るアドレス��ート�組��られ�リクエストを扱����
+    �り��ん。リクエスト��明� <code>Host:</code> ヘッダや��
+    ヘッダ�����り�る場��基本��ベース�ー�ャルホスト (��
+    アドレス��ート�設定ファイル中�最���ー�ャルホスト) �より
+    扱�れ��。</p>
+
+    <p>�ん�リクエスト�も <code class="directive"><a href="../mod/mod_alias.html#aliasmatch">AliasMatch</a></code>
+    や <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> を使��
+    �一�情報ページ (やスクリプト) �書���る�������。</p>
+    
+
+    <h3><a name="defaultdifferentports" id="defaultdifferentports">���ート����
+    <code>_default_</code> �ー�ャルホスト</a></h3>
+
+    <p>一���設定���������サー��複数��ートを listen ���り�
+    80 番�ート�対��二��� <code>_default_</code> �ー�ャルホストを
+    設定���場���。</p>
+
+    <div class="example"><h3>サー��設定</h3><p><code>
+    
+
+    &lt;VirtualHost _default_:80&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/default80<br />
+        # ...<br />
+    </span>
+    &lt;/VirtualHost&gt;<br />
+		<br />
+    &lt;VirtualHost _default_:*&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/default<br />
+        # ...<br />
+    </span>
+    &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    <p>80 番�ート�デフォルト�ー�ャルホスト (ワイルドカード�ート�
+    デフォルト�ー�ャルホストよりも��書�れ����れ�<em>�り��ん</em>) �
+    未指定� IP アドレス��られ�����リクエストを扱���。
+    主サー��リクエストを扱���ん。</p>
+    
+
+    <h3><a name="defaultoneport" id="defaultoneport">一���ート�対�����
+    <code>_default_</code> �ー�ャルホスト</a></h3>
+
+    <p>80 番�ート��デフォルト��ー�ャルホスト�必���他�
+    �ー�ャルホスト�デフォルト�必���場���。</p>
+
+    <div class="example"><h3>サー��設定</h3><p><code>
+    
+
+    &lt;VirtualHost _default_:80&gt;<br />
+    DocumentRoot /www/default<br />
+    ...<br />
+    &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    <p>80 番�ート��アドレス未指定�リクエスト�デフォルト��ー�ャル
+    ホスト�ら�られ��。他�未指定�アドレス��ート��リクエスト�
+    主サー��ら�られ��。</p>
+    
+
+  </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="migrate" id="migrate">��ベース��ー�ャルホスト�ら IP ベース�
+    �ー�ャルホスト�移行�る</a></h2>
+
+    <p>ホスト���� <code>www.example.org</code> ��ー�ャルホスト
+    (<a href="#name">��ベース</a>�例� 2 番目�設定) �専用� IP アドレスを
+    得�����。��ベース��ー�ャルホスト��� IP アドレスを
+    キャッシュ���る�ームサー�やプロキシ����移行期間中�両方�
+    �ー�ャルホストを�供�������。</p>
+
+    <p>答�簡���。��新�� IP アドレス (<code>172.20.30.50</code>)
+    を <code>VirtualHost</code> ディレクティブ�追加�る���
+    ����。</p>
+  
+    <div class="example"><h3>サー�設定</h3><p><code>
+    
+
+    Listen 80<br />
+    ServerName www.example.com<br />
+    DocumentRoot /www/example1<br />
+		<br />
+    NameVirtualHost 172.20.30.40<br />
+		<br />
+    &lt;VirtualHost 172.20.30.40 172.20.30.50&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/example2<br />
+        ServerName www.example.org<br />
+        # ...<br />
+    </span>
+    &lt;/VirtualHost&gt;<br />
+		<br />
+    &lt;VirtualHost 172.20.30.40&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/example3<br />
+        ServerName www.example.net<br />
+        ServerAlias *.example.net<br />
+        # ...<br />
+    </span>
+    &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    <p>���ー�ャルホスト�新��アドレス (IP ベース��ー�ャルホスト���)
+    ���アドレス(��ベース��ー�ャルホスト���) �両方�ら
+    アクセス����。</p>
+
+    </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="serverpath" id="serverpath"><code>ServerPath</code> ディレクティブを
+    使�</a></h2>
+
+    <p>��ベース��ー�ャルホスト�二��るサー���る����。
+    正���ー�ャルホストを得る����クライアント�正��
+    <code>Host:</code> ヘッダを�ら��れ��り��ん。
+    �� HTTP/1.0 ���よ��ヘッダを�ら�����Apache �クライアント�
+    ���ー�ャルホストを�図�������り��り��ん
+    (����主�ー�ャルホスト�リクエストを扱���)。
+    �能��り�下�互�性を得る�����ベース��ー�ャルホスト�
+    URL 接頭辞��リンク�書�れ�ページを返��
+    主�ー�ャルホスト�作��れ��。</p>
+
+    <div class="example"><h3>サー��設定</h3><p><code>
+    
+
+    NameVirtualHost 172.20.30.40<br />
+		<br />
+    &lt;VirtualHost 172.20.30.40&gt;<br />
+    <span class="indent">
+        # primary vhost<br />
+        DocumentRoot /www/subdomain<br />
+        RewriteEngine On<br />
+        RewriteRule ^/.* /www/subdomain/index.html<br />
+        # ...<br />
+    </span>
+    &lt;/VirtualHost&gt;<br />
+		<br />
+    &lt;VirtualHost 172.20.30.40&gt;<br />
+    DocumentRoot /www/subdomain/sub1<br />
+    <span class="indent">
+        ServerName www.sub1.domain.tld<br />
+        ServerPath /sub1/<br />
+        RewriteEngine On<br />
+        RewriteRule ^(/sub1/.*) /www/subdomain$1<br />
+        # ...<br />
+    </span>
+    &lt;/VirtualHost&gt;<br />
+		<br />
+    &lt;VirtualHost 172.20.30.40&gt;<br />
+    <span class="indent">
+        DocumentRoot /www/subdomain/sub2<br />
+        ServerName www.sub2.domain.tld<br />
+        ServerPath /sub2/<br />
+        RewriteEngine On<br />
+        RewriteRule ^(/sub2/.*) /www/subdomain$1<br />
+        # ...<br />
+    </span>
+    &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    <p><code class="directive"><a href="../mod/core.html#serverpath">ServerPath</a></code> ディレクティブ�設定�
+    より�URL <code>http://www.sub1.domain.tld/sub1/</code> �
+    <em>常�</em> sub1-vhost �より扱�れ��。URL
+    <code>http://www.sub1.domain.tld/</code> ��リクエスト�
+    クライアント�正�� <code>Host:</code> ヘッダを��������
+    sub1-vhost �ら�られ��。<code>Host:</code> ヘッダ���れ�
+    クライアント�主ホスト�情報ページを得��。</p>
+
+    <p>一�奇妙�動作を�る点��る���覚���������。
+    <code>http://www.sub2.domain.tld/sub1/</code> ��リクエストも
+    <code>Host:</code> ヘッダ���れ� sub1-vhost �より扱�れ��。</p>
+
+    <p>正�� <code>Host:</code> ヘッダを���クライアント���ら�
+    URL�<em>��り</em>接頭辞��る方も無�方も使�るよ��
+    <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> ディレクティブ�
+    使�れ����。</p>
+  </div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/vhosts/examples.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/vhosts/examples.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/vhosts/examples.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/vhosts/examples.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/examples.html.ko.euc-kr b/docs/manual/vhosts/examples.html.ko.euc-kr
index 4d333604..a1c0837f 100644
--- a/docs/manual/vhosts/examples.html.ko.euc-kr
+++ b/docs/manual/vhosts/examples.html.ko.euc-kr
@@ -624,6 +624,6 @@
 <a href="../ja/vhosts/examples.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/vhosts/examples.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/fd-limits.html b/docs/manual/vhosts/fd-limits.html
index 932c75d7..392fda66 100644
--- a/docs/manual/vhosts/fd-limits.html
+++ b/docs/manual/vhosts/fd-limits.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: fd-limits.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
@@ -6,9 +8,9 @@ URI: fd-limits.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: fd-limits.html.ja.euc-jp
+URI: fd-limits.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: fd-limits.html.ko.euc-kr
 Content-Language: ko
diff --git a/docs/manual/vhosts/fd-limits.html.en b/docs/manual/vhosts/fd-limits.html.en
index d369d0dd..51861bcc 100644
--- a/docs/manual/vhosts/fd-limits.html.en
+++ b/docs/manual/vhosts/fd-limits.html.en
@@ -123,6 +123,6 @@ Each file will be called <code>hostname.log</code>.</p>
 <a href="../ja/vhosts/fd-limits.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/vhosts/fd-limits.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/fd-limits.html.fr b/docs/manual/vhosts/fd-limits.html.fr
index 84a52255..88b658eb 100644
--- a/docs/manual/vhosts/fd-limits.html.fr
+++ b/docs/manual/vhosts/fd-limits.html.fr
@@ -136,6 +136,6 @@ nommé <code>nomduserveur.log</code>.</p>
 <a href="../ja/vhosts/fd-limits.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/vhosts/fd-limits.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/fd-limits.html.ja.euc-jp b/docs/manual/vhosts/fd-limits.html.ja.euc-jp
deleted file mode 100644
index 3672b09f..00000000
--- a/docs/manual/vhosts/fd-limits.html.ja.euc-jp
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Î¸Â³¦ - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page" class="no-sidebar"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></div><div id="page-content"><div id="preamble"><h1>¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Î¸Â³¦</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/vhosts/fd-limits.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/vhosts/fd-limits.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="../ja/vhosts/fd-limits.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/fd-limits.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-
-
-    <p>¤¿¤¯¤µ¤ó¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò±¿ÍѤ¹¤ë¾ì¹ç¡¢¤â¤·¡¢
-    ³Æ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤´¤È¤Ë°Û¤Ê¤ë¥í¥°¥Õ¥¡¥¤¥ë¤¬»ØÄꤷ¤Æ¤¢¤ë¤È¡¢
-    Apache ¤¬¥Õ¥¡¥¤¥ëµ­½Ò»Ò (<cite>¥Õ¥¡¥¤¥ë¥Ï¥ó¥É¥ë</cite>¤È¤â¸Æ¤Ð¤ì¤Þ¤¹)
-    ¤ò»È¤¤ÀڤäƤ·¤Þ¤¦¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£Apache ¤¬»ÈÍѤ¹¤ë¥Õ¥¡¥¤¥ë
-    µ­½Ò»Ò¤Î¿ô¤Ï¡¢³Æ¥¨¥é¡¼¥í¥°¥Õ¥¡¥¤¥ë¤Ë¤Ä¤­ 1 ¤Ä¡¢Â¾¤Î¥í¥°¥Õ¥¡¥¤¥ë¤Î
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¤Ä¤­ 1 ¤Ä¡¢¤µ¤é¤ËÆâÉô¤Ç»ÈÍѤ¹¤ë 10 ¤«¤é 20¡¢
-    ¤Î¹ç·×¤Ë¤Ê¤ê¤Þ¤¹¡£Unix ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ç¤Ï¥×¥í¥»¥¹¤´¤È¤Ë
-    »ÈÍѲÄǽ¤Ê¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Î¿ô¤òÀ©¸Â¤·¤Æ¤¤¤Þ¤¹¡£¤¿¤¤¤Æ¤¤¤Î¾ì¹ç¤Ï 64 ¤Ç¡¢
-    ÉáÄ̤ÏÂ礭¤ÊÃͤΥϡ¼¥É¥ê¥ß¥Ã¥È¤Þ¤ÇÁý¤ä¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p>Apache ¤ÏɬÍפ˱þ¤¸¤Æ¾å¸Â¤ò³ÈÂ礷¤è¤¦¤È»î¤ß¤Þ¤¹¤¬¡¢
-    °Ê²¼¤Î¤è¤¦¤Ê¾ì¹ç¤Ë¤Ï¤¦¤Þ¤¯¤¤¤«¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£</p>
-
-    <ol>
-      <li>ÍøÍѤ·¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤Ç <code>setrlimit()</code>
-      ¥·¥¹¥Æ¥à¥³¡¼¥ë¤¬Ä󶡤µ¤ì¤Æ¤¤¤Ê¤¤¡£</li>
-
-      <li>¥·¥¹¥Æ¥à¾å¤Ç <code>setrlimit</code>(RLIMIT_NOFILE) ¤¬Æ°ºî¤·¤Ê¤¤
-      (¤¿¤È¤¨¤Ð Solaris 2.3 ¤Î¤è¤¦¤Ë)¡£</li>
-
-      <li>Í׵ᤵ¤ì¤ë¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Î¿ô¤¬
-      ¥Ï¡¼¥É¥ê¥ß¥Ã¥È¤òĶ¤¨¤Æ¤·¤Þ¤¦¡£</li>
-      
-      <li>¥·¥¹¥Æ¥à¤Ë¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Ë´Ø¤·¤ÆÊ̤ÎÀ©¸Â¤¬Â¸ºß¤·¤Æ¤·¤Þ¤Ã¤Æ¤¤¤ë¡£
-      ¤¿¤È¤¨¤Ð¡¢stdio ¥¹¥È¥ê¡¼¥à¤Ç¤Ï¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤ò 256 °Ê¾å»È¤¨¤Ê¤¤
-      (Solaris 2)¡¢¤Ê¤É¡£</li>
-    </ol>
-
-        <p>ÌäÂ꤬ȯÀ¸¤·¤¿»þ¤Ë¼è¤êÆÀ¤ëÂнèÊýË¡¤Ï¼¡¤Î¤È¤ª¤ê:</p>
-
-    <ul>
-      <li>¥í¥°¥Õ¥¡¥¤¥ë¤Î¿ô¤ò¸º¤é¤¹¡£<code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-      ¥»¥¯¥·¥ç¥ó¤Ç¥í¥°¥Õ¥¡¥¤¥ë¤ò»ØÄꤻ¤º¡¢¥á¥¤¥ó¤Î¥í¥°¥Õ¥¡¥¤¥ë¤Ë¤Î¤ßµ­Ï¿¤¹¤ë¡£
-      (¤³¤ì¤Ë´Ø¤¹¤ë¾Ü¤·¤¤¾ðÊó¤Ï°Ê²¼¤Î<a href="#splitlogs">¥í¥°¥Õ¥¡¥¤¥ë¤Îʬ³ä</a>¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£)</li>
-
-      <li>
-        ¤â¤·¡¢Á°½Ò¤Î 1 ¤Þ¤¿¤Ï 2 ¤Î¾ì¹ç¤Ç¤¢¤ì¤Ð¡¢
-        Apache ¤òµ¯Æ°¤¹¤ëÁ°¤Ë¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤òÁý¤ä¤·¤Þ¤¹¡£
-        ¤¿¤È¤¨¤Ð¼¡¤Î¤è¤¦¤Ê¥¹¥¯¥ê¥×¥È¤ò»È¤¤¤Þ¤¹¡£
-
-        <div class="example"><p><code>
-          <code>#!/bin/sh<br />
-           ulimit -S -n 100<br />
-           exec httpd</code>
-        </code></p></div>
-      </li>
-    </ul>
-</div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="splitlogs" id="splitlogs">¥í¥°¥Õ¥¡¥¤¥ë¤Îʬ³ä</a></h2>
-
-<p>Ê£¿ô¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¥í¥°¤òƱ¤¸¥í¥°¥Õ¥¡¥¤¥ë¤Ë¼ý½¸¤·¤è¤¦¤È¤·¤Æ¤¤¤ë¤È¤­¤Ë¤Ï¡¢
-³Æ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë¤Ä¤¤¤ÆÅý·×Ū¤Ê²òÀϤò¼Â¹Ô¤¹¤ë¤¿¤á¤Ë¸å¤Ç¥í¥°¥Õ¥¡¥¤¥ë¤ò
-ʬ³ä¤·¤¿¤¯¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£¤³¤ì¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¼Â¸½¤Ç¤­¤Þ¤¹¡£</p>
-
-<p>¤Þ¤º¡¢¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¾ðÊó¤ò¥í¥°¤Î¥¨¥ó¥È¥ê¤ËÄɲ乤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-¤³¤ì¤Ï <code class="directive"><a href="../mod/mod_log_config.html#logformat">LogFormat</a></code>
-¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î <code>%v</code> ÊÑ¿ô¤ò»È¤¦¤³¤È¤Ç¤Ç¤­¤Þ¤¹¡£
-¤³¤ì¤ò¥í¥°¤Î¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤ÎÀèƬ¤ËÄɲä·¤Þ¤¹:</p>
-
-<div class="example"><p><code>
-LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost<br />
-CustomLog logs/multiple_vhost_log vhost
-</code></p></div>
-
-<p>¤³¤ì¤Ï common log format ¤Î¥í¥°¤òºîÀ®¤·¤Þ¤¹¤¬¡¢¤½¤ì¤¾¤ì¤Î¹Ô¤ÎÀèƬ¤Ë
-Àµµ¬²½¤µ¤ì¤¿¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î̾Á°
-(<code class="directive"><a href="../mod/core.html#servername">ServerName</a></code>
-¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¤â¤Î) ¤¬Éղ䵤ì¤Þ¤¹¡£
-(¥í¥°¥Õ¥¡¥¤¥ë¤Î¥«¥¹¥¿¥Þ¥¤¥º¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï <a href="../mod/mod_log_config.html#formats">Custom Log Formats</a> ¤ò
-Æɤó¤Ç¤¯¤À¤µ¤¤¡£)</p>
-
-<p>¥í¥°¥Õ¥¡¥¤¥ë¤ò³ÆÉôʬ (¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥ÈËè¤Ë 1 ¥Õ¥¡¥¤¥ë) ¤Ëʬ¤±¤¿¤¤¤È¤­¤Ï¡¢
-<code><a href="../programs/other.html">split-logfile</a></code>
-¤ò»È¤Ã¤Æ¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥×¥í¥°¥é¥à¤Ï Apache ÇÛÉۤΠ
-<code>support</code> ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ê¤Þ¤¹¡£</p>
-
-<p>°Ê²¼¤Î¤è¤¦¤Ê¥³¥Þ¥ó¥É¤Ç¤³¤Î¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤·¤Þ¤¹:</p>
-
-<div class="example"><p><code>
-split-logfile &lt; /logs/multiple_vhost_log
-</code></p></div>
-
-<p>¤³¤Î¥×¥í¥°¥é¥à¤Ï¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¥í¥°¥Õ¥¡¥¤¥ë¤Î̾Á°¤È¤È¤â¤Ë¼Â¹Ô¤µ¤ì¡¢
-¥í¥°¥Õ¥¡¥¤¥ë¤Ë¸½¤ì¤ë¤½¤ì¤¾¤ì¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥ÈËè¤Ë°ì¤Ä¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹¡£
-¤½¤ì¤¾¤ì¤Î¥Õ¥¡¥¤¥ë¤Ï <code>¥Û¥¹¥È̾.log</code> ¤È¤¤¤¦Ì¾Á°¤Ë¤Ê¤ê¤Þ¤¹¡£</p>
-
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/vhosts/fd-limits.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/vhosts/fd-limits.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="../ja/vhosts/fd-limits.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/fd-limits.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/fd-limits.html.ja.utf8 b/docs/manual/vhosts/fd-limits.html.ja.utf8
new file mode 100644
index 00000000..e0addfcf
--- /dev/null
+++ b/docs/manual/vhosts/fd-limits.html.ja.utf8
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>ファイル記述���界 - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page" class="no-sidebar"><div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">�ー�ャルホスト</a></div><div id="page-content"><div id="preamble"><h1>ファイル記述���界</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/vhosts/fd-limits.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/vhosts/fd-limits.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/vhosts/fd-limits.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/vhosts/fd-limits.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div>
+
+
+    <p>���ん��ー�ャルホストを�用�る場��も��
+    ��ー�ャルホスト���異�るログファイル�指定���る��
+    Apache �ファイル記述� (<cite>ファイル�ンドル</cite>�も呼�れ��)
+    を使�切���������り��。Apache �使用�るファイル
+    記述��数���エラーログファイル��� 1 ��他�ログファイル�
+    ディレクティブ��� 1 ���ら�内部�使用�る 10 �ら 20�
+    ��計��り��。Unix オペレーティングシステム��プロセス���
+    使用�能�ファイル記述��数を制������。�����場�� 64 ��
+    普通�大��値��ードリミット��増や��������。</p>
+
+    <p>Apache �必��応��上�を拡大�よ��試�����
+    以下�よ��場�����������も�れ��ん。</p>
+
+    <ol>
+      <li>利用���るシステム� <code>setrlimit()</code>
+      システムコール��供�れ����。</li>
+
+      <li>システム上� <code>setrlimit</code>(RLIMIT_NOFILE) �動作���
+      (���� Solaris 2.3 �よ��)。</li>
+
+      <li>�求�れるファイル記述��数�
+      �ードリミットを超�����。</li>
+      
+      <li>システム�ファイル記述��関��別�制��存在�������る。
+      �����stdio ストリーム��ファイル記述�を 256 以上使���
+      (Solaris 2)���。</li>
+    </ol>
+
+        <p>�題�発生��時��り得る対処方法�次���り:</p>
+
+    <ul>
+      <li>ログファイル�数を減ら�。<code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+      セクション�ログファイルを指定���メイン�ログファイル���記録�る。
+      (�れ�関�る詳��情報�以下�<a href="#splitlogs">ログファイル�分割</a>を読ん�����。)</li>
+
+      <li>
+        も���述� 1 ��� 2 �場���れ��
+        Apache を起動�る��ファイル記述�を増や���。
+        ����次�よ��スクリプトを使���。
+
+        <div class="example"><p><code>
+          <code>#!/bin/sh<br />
+           ulimit -S -n 100<br />
+           exec httpd</code>
+        </code></p></div>
+      </li>
+    </ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="splitlogs" id="splitlogs">ログファイル�分割</a></h2>
+
+<p>複数��ー�ャルホスト�ログを��ログファイル��集�よ�����る�����
+��ー�ャルホスト����統計的�解�を実行�る���後�ログファイルを
+分割����る�も�れ��ん。�れ�以下�よ����実�����。</p>
+
+<p>����ー�ャルホスト�情報をログ�エントリ�追加�る必���り��。
+�れ� <code class="directive"><a href="../mod/mod_log_config.html#logformat">LogFormat</a></code>
+ディレクティブ� <code>%v</code> 変数を使��������。
+�れをログ�フォーマット文字列�先頭�追加���:</p>
+
+<div class="example"><p><code>
+LogFormat "%v %h %l %u %t \"%r\" %&gt;s %b" vhost<br />
+CustomLog logs/multiple_vhost_log vhost
+</code></p></div>
+
+<p>�れ� common log format �ログを作�������れ�れ�行�先頭�
+正�化�れ��ー�ャルホスト���
+(<code class="directive"><a href="../mod/core.html#servername">ServerName</a></code>
+ディレクティブ�書�れ��るも�) �付加�れ��。
+(ログファイル�カスタマイズ�詳細����� <a href="../mod/mod_log_config.html#formats">Custom Log Formats</a> を
+読ん�����。)</p>
+
+<p>ログファイルを�部分 (�ー�ャルホスト毎� 1 ファイル) �分�������
+<code><a href="../programs/other.html">split-logfile</a></code>
+を使��行���������。プログラム� Apache �布� 
+<code>support</code> ディレクトリ��り��。</p>
+
+<p>以下�よ��コマンド���プログラムを実行���:</p>
+
+<div class="example"><p><code>
+split-logfile &lt; /logs/multiple_vhost_log
+</code></p></div>
+
+<p>��プログラム��ー�ャルホスト�ログファイル�����も�実行�れ�
+ログファイル��れる�れ�れ��ー�ャルホスト毎�一��ファイルを作����。
+�れ�れ�ファイル� <code>ホスト�.log</code> �������り��。</p>
+
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/vhosts/fd-limits.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/vhosts/fd-limits.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/vhosts/fd-limits.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/vhosts/fd-limits.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/fd-limits.html.ko.euc-kr b/docs/manual/vhosts/fd-limits.html.ko.euc-kr
index 19d2b2bf..ed541423 100644
--- a/docs/manual/vhosts/fd-limits.html.ko.euc-kr
+++ b/docs/manual/vhosts/fd-limits.html.ko.euc-kr
@@ -117,6 +117,6 @@ split-logfile &lt; /logs/multiple_vhost_log
 <a href="../ja/vhosts/fd-limits.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/vhosts/fd-limits.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/index.html b/docs/manual/vhosts/index.html
index 76ef9af7..07d53eaa 100644
--- a/docs/manual/vhosts/index.html
+++ b/docs/manual/vhosts/index.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: index.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -10,9 +12,9 @@ URI: index.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: index.html.ja.euc-jp
+URI: index.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: index.html.ko.euc-kr
 Content-Language: ko
@@ -21,3 +23,7 @@ Content-type: text/html; charset=EUC-KR
 URI: index.html.ru.koi8-r
 Content-Language: ru
 Content-type: text/html; charset=KOI8-R
+
+URI: index.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/vhosts/index.html.de b/docs/manual/vhosts/index.html.de
index f4fb614a..7fb1ace2 100644
--- a/docs/manual/vhosts/index.html.de
+++ b/docs/manual/vhosts/index.html.de
@@ -23,7 +23,8 @@
 <a href="../fr/vhosts/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>Der Begriff <cite>virtueller Host</cite> <span class="transnote">(<em>Anm.d.Ü.:</em> engl. 'virtual
@@ -103,8 +104,9 @@
 <a href="../fr/vhosts/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/index.html.en b/docs/manual/vhosts/index.html.en
index 2083ffa3..fc0c9c0b 100644
--- a/docs/manual/vhosts/index.html.en
+++ b/docs/manual/vhosts/index.html.en
@@ -23,7 +23,8 @@
 <a href="../fr/vhosts/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
 
@@ -103,8 +104,9 @@ hosts</a></li><li><a href="ip-based.html">IP-based virtual hosts</a></li><li><a
 <a href="../fr/vhosts/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/index.html.fr b/docs/manual/vhosts/index.html.fr
index e719f700..db80cdfd 100644
--- a/docs/manual/vhosts/index.html.fr
+++ b/docs/manual/vhosts/index.html.fr
@@ -23,7 +23,8 @@
 <a href="../fr/vhosts/" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
 
@@ -104,8 +105,9 @@
 <a href="../fr/vhosts/" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/index.html.ja.euc-jp b/docs/manual/vhosts/index.html.ja.euc-jp
deleted file mode 100644
index 221866e9..00000000
--- a/docs/manual/vhosts/index.html.ja.euc-jp
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>Apache ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥ÈÀâÌÀ½ñ - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="../"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥ÈÀâÌÀ½ñ</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../de/vhosts/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="../en/vhosts/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/vhosts/" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="../ja/vhosts/" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
-</div>
-
-
-    <p><cite>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</cite>¤È¤¤¤¦ÍѸì¤Ï¡¢1 Âæ¤Î¥Þ¥·¥ó¾å¤Ç
-    (<code>www.company1.com</code> and <code>www.company2.com</code> ¤Î¤è¤¦¤Ê)
-    Æó¤Ä°Ê¾å¤Î¥¦¥§¥Ö¥µ¥¤¥È¤ò°·¤¦±¿ÍÑÊýË¡¤Î¤³¤È¤ò»Ø¤·¤Þ¤¹¡£
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë¤Ï¡¢³Æ¥¦¥§¥Ö¥µ¥¤¥È¤Ë°ã¤¦ IP ¥¢¥É¥ì¥¹¤¬¤¢¤ë
-    ¡Ö<a href="ip-based.html">IP ¥Ù¡¼¥¹</a>¡×¤È¡¢¤½¤ì¤¾¤ì¤Î IP ¥¢¥É¥ì¥¹¤Ë
-    Ê£¿ô¤Î̾Á°¤¬¤¢¤ë¡Ö<a href="name-based.html">̾Á°¥Ù¡¼¥¹</a>¡×¤È¤¬¤¢¤ê¤Þ¤¹¡£
-    Ê£¿ô¤Î¥µ¥¤¥È¤¬ÊªÍýŪ¤ËƱ¤¸¥µ¡¼¥Ð¤Ç°·¤ï¤ì¤Æ¤¤¤ë¡¢¤È¤¤¤¦¤³¤È¤Ï¥¨¥ó¥É¥æ¡¼¥¶¤Ë¤Ï
-    ÌÀ¤é¤«¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</p>
-
-    <p>Apache ¤Ï¡¢Æä˼ê¤òÆþ¤ì¤Ê¤¤¾õÂÖ¤Ç IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È
-    ¤ò¥µ¥Ý¡¼¥È¤·¤¿ºÇ½é¤Î¥µ¡¼¥Ð¤Î°ì¤Ä¤Ç¤¹¡£¥Ð¡¼¥¸¥ç¥ó 1.1 °Ê¹ß¤Î Apache
-    ¤Ç¤Ï¡¢IP ¥Ù¡¼¥¹¤È¥Í¡¼¥à¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎξÊý¤ò¥µ¥Ý¡¼¥È
-    ¤·¤Æ¤¤¤Þ¤¹¡£¥Í¡¼¥à¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ï¡¢<em>¥Û¥¹¥È¥Ù¡¼¥¹</em>¤¢¤ë¤¤¤Ï
-    <em>Èó IP ¥Ù¡¼¥¹</em>¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤È¸Æ¤Ð¤ì¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¡£</p>
-
-    <p>°Ê²¼¤Î¥Ú¡¼¥¸¤Ç¤Ï¡¢Apache ¥Ð¡¼¥¸¥ç¥ó 1.3
-    °Ê¹ß¤Ç¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¥µ¥Ý¡¼¥È¤Ë¤Ä¤¤¤Æ¤Î¾ÜºÙ¤òÀâÌÀ¤·¤Þ¤¹¡£</p>
-
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#support">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¥µ¥Ý¡¼¥È</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#directives">ÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></li>
-</ul><h3>»²¾È</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_vhost_alias.html">mod_vhost_alias</a></code></li><li><a href="name-based.html">¥Í¡¼¥à¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></li><li><a href="ip-based.html">IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></li><li><a href="examples.html">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î°ìÈÌŪ¤ÊÀßÄêÎã</a></li><li><a href="fd-limits.html">¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Î¸Â³¦</a></li><li><a href="mass.html">ÂçÎ̤ΥС¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎÀßÄê</a></li><li><a href="details.html">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¥Þ¥Ã¥Á¥ó¥°¤Ë¤Ä¤¤¤Æ¤Î¾ÜºÙ</a></li></ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="support" id="support">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¥µ¥Ý¡¼¥È</a></h2>
-
-    <ul>
-      <li><a href="name-based.html">¥Í¡¼¥à¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a>
-      (°ì¤Ä¤Î IP ¥¢¥É¥ì¥¹¤ËÊ£¿ô¤Î¥¦¥§¥Ö¥µ¥¤¥È)</li>
-      <li><a href="ip-based.html">IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a>
-      (³Æ¥¦¥§¥Ö¥µ¥¤¥È¤Ë IP ¥¢¥É¥ì¥¹)</li>
-      <li><a href="examples.html">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î°ìÈÌŪ¤ÊÀßÄêÎã</a></li>
-      <li><a href="fd-limits.html">¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Î¸Â³¦</a>
-      (¤Þ¤¿¤Ï¡¢<em>¿²á¤®¤ë¥í¥°¥Õ¥¡¥¤¥ë</em>)</li>
-      <li><a href="mass.html">ÂçÎ̤ΥС¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎÀßÄê</a></li>
-      <li><a href="details.html">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¥Þ¥Ã¥Á¥ó¥°¤Ë¤Ä¤¤¤Æ¤Î¾ÜºÙ</a></li>
-    </ul>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="directives" id="directives">ÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a></h2>
-
-    <ul>
-      <li><code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li>
-      <li><code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code></li>
-      <li><code class="directive"><a href="../mod/core.html#servername">ServerName</a></code></li>
-      <li><code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code></li>
-      <li><code class="directive"><a href="../mod/core.html#serverpath">ServerPath</a></code></li>
-    </ul>
-
-    <p>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎÀßÄê¤Î¥Ç¥Ð¥Ã¥°¤ò¤¹¤ë¤Ë¤Ï
-    Apache ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¥¹¥¤¥Ã¥Á <code>-S</code> ¤¬ÊØÍø¤Ç¤¹¡£
-    ¤Ä¤Þ¤ê¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Þ¤¹:</p>
-
-    <div class="example"><p><code>
-    /usr/local/apache2/bin/httpd -S
-    </code></p></div>
-
-    <p>¤³¤Î¥³¥Þ¥ó¥É¤Ï Apache ¤¬ÀßÄê¥Õ¥¡¥¤¥ë¤ò¤É¤¦²òÀϤ·¤¿¤«¤Ë¤Ä¤¤¤Æ½ÐÎϤ·¤Þ¤¹¡£
-    IP ¥¢¥É¥ì¥¹¤È¥µ¡¼¥Ð̾¤òÃí°Õ¿¼¤¯Ä´¤Ù¤ì¤Ð¡¢
-    ÀßÄê¤Î´Ö°ã¤¤¤ò¸«¤Ä¤±¤ë½õ¤±¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£
-    (¾¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤Î¥ª¥×¥·¥ç¥ó¤Ï <code class="program"><a href="../programs/httpd.html">httpd</a></code>
-    ¥×¥í¥°¥é¥à¤ÎÀâÌÀʸ½ñ¤ò¸«¤Æ¤¯¤À¤µ¤¤)</p>
-
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../de/vhosts/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="../en/vhosts/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/vhosts/" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="../ja/vhosts/" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/index.html.ja.utf8 b/docs/manual/vhosts/index.html.ja.utf8
new file mode 100644
index 00000000..196e15e4
--- /dev/null
+++ b/docs/manual/vhosts/index.html.ja.utf8
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Apache �ー�ャルホスト説明書 - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="../"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache �ー�ャルホスト説明書</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../de/vhosts/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/vhosts/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/vhosts/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/vhosts/" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+
+    <p><cite>�ー�ャルホスト</cite>���用語��1 ��マシン上�
+    (<code>www.company1.com</code> and <code>www.company2.com</code> �よ��)
+    二�以上�ウェブサイトを扱��用方法���を指���。
+    �ー�ャルホスト����ウェブサイト��� IP アドレス��る
+    「<a href="ip-based.html">IP ベース</a>����れ�れ� IP アドレス�
+    複数�����る「<a href="name-based.html">��ベース</a>����り��。
+    複数�サイト�物�的���サー��扱�れ��る�������エンドユーザ��
+    明ら����り��ん。</p>
+
+    <p>Apache ��特�手を入れ��状態� IP ベース��ー�ャルホスト
+    をサ�ート��最��サー��一���。�ージョン 1.1 以�� Apache
+    ���IP ベース��ームベース��ー�ャルホスト�両方をサ�ート
+    �����。�ームベース��ー�ャルホスト��<em>ホストベース</em>�る��
+    <em>� IP ベース</em>��ー�ャルホスト�呼�れる��も�り��。</p>
+
+    <p>以下�ページ���Apache �ージョン 1.3
+    以����ー�ャルホスト�サ�ート�����詳細を説明���。</p>
+
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#support">�ー�ャルホスト�サ�ート</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#directives">設定ディレクティブ</a></li>
+</ul><h3>�照</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_vhost_alias.html">mod_vhost_alias</a></code></li><li><a href="name-based.html">�ームベース��ー�ャルホスト</a></li><li><a href="ip-based.html">IP ベース��ー�ャルホスト</a></li><li><a href="examples.html">�ー�ャルホスト�一般的�設定例</a></li><li><a href="fd-limits.html">ファイル記述���界</a></li><li><a href="mass.html">大���ー�ャルホスト�設定</a></li><li><a href="details.html">�ー�ャルホスト�マッ�ング�����詳細</a></li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="support" id="support">�ー�ャルホスト�サ�ート</a></h2>
+
+    <ul>
+      <li><a href="name-based.html">�ームベース��ー�ャルホスト</a>
+      (一�� IP アドレス�複数�ウェブサイト)</li>
+      <li><a href="ip-based.html">IP ベース��ー�ャルホスト</a>
+      (�ウェブサイト� IP アドレス)</li>
+      <li><a href="examples.html">�ー�ャルホスト�一般的�設定例</a></li>
+      <li><a href="fd-limits.html">ファイル記述���界</a>
+      (����<em>多��るログファイル</em>)</li>
+      <li><a href="mass.html">大���ー�ャルホスト�設定</a></li>
+      <li><a href="details.html">�ー�ャルホスト�マッ�ング�����詳細</a></li>
+    </ul>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="directives" id="directives">設定ディレクティブ</a></h2>
+
+    <ul>
+      <li><code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li>
+      <li><code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code></li>
+      <li><code class="directive"><a href="../mod/core.html#servername">ServerName</a></code></li>
+      <li><code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code></li>
+      <li><code class="directive"><a href="../mod/core.html#serverpath">ServerPath</a></code></li>
+    </ul>
+
+    <p>�ー�ャルホスト�設定�デ�ッグを�る��
+    Apache �コマンドラインスイッ� <code>-S</code> �便利��。
+    ��り�以下�コマンドを入力���:</p>
+
+    <div class="example"><p><code>
+    /usr/local/apache2/bin/httpd -S
+    </code></p></div>
+
+    <p>��コマンド� Apache �設定ファイルを��解��������出力���。
+    IP アドレス�サー��を注�深�調�れ��
+    設定�間��を見��る助���る��ょ�。
+    (他�コマンドライン�オプション� <code class="program"><a href="../programs/httpd.html">httpd</a></code>
+    プログラム�説明文書を見�����)</p>
+
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../de/vhosts/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/vhosts/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/vhosts/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/vhosts/" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/index.html.ko.euc-kr b/docs/manual/vhosts/index.html.ko.euc-kr
index 77a6badf..d586b4a6 100644
--- a/docs/manual/vhosts/index.html.ko.euc-kr
+++ b/docs/manual/vhosts/index.html.ko.euc-kr
@@ -23,7 +23,8 @@
 <a href="../fr/vhosts/" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/vhosts/" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
             ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
@@ -101,8 +102,9 @@
 <a href="../fr/vhosts/" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/vhosts/" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/index.html.ru.koi8-r b/docs/manual/vhosts/index.html.ru.koi8-r
index 8c9d8471..3ec80a15 100644
--- a/docs/manual/vhosts/index.html.ru.koi8-r
+++ b/docs/manual/vhosts/index.html.ru.koi8-r
@@ -23,7 +23,8 @@
 <a href="../fr/vhosts/" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/vhosts/" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/vhosts/" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 
 
@@ -98,8 +99,9 @@
 <a href="../fr/vhosts/" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
-<a href="../ru/vhosts/" title="Russian">&nbsp;ru&nbsp;</a></p>
+<a href="../ru/vhosts/" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/vhosts/" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">íÏÄÕÌÉ</a> | <a href="../mod/directives.html">äÉÒÅËÔÉ×Ù</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">çÌÏÓÓÁÒÉÊ</a> | <a href="../sitemap.html">ëÁÒÔÁ ÓÁÊÔÁ</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/index.html.tr.utf8 b/docs/manual/vhosts/index.html.tr.utf8
new file mode 100644
index 00000000..eb568935
--- /dev/null
+++ b/docs/manual/vhosts/index.html.tr.utf8
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Apache Sanal Konak Belgeleri - Apache HTTP Sunucusu</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="../"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="../">Sürüm 2.2</a></div><div id="page-content"><div id="preamble"><h1>Apache Sanal Konak Belgeleri</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="../de/vhosts/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/vhosts/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/vhosts/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/vhosts/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/vhosts/" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+
+    <p><cite>Sanal Konak</cite> (Virtual Host) terimi tek bir makine üzerinde
+      birden fazla sitenin (www.sirket1.dom, www.sirket2.dom gibi) barındırılma
+      uygulamasını betimler. Sanal konaklar, "<a href="ip-based.html">IP’ye
+      dayalı</a>" veya "<a href="name-based.html">isme dayalı</a>" olabilir;
+      birincisinde, her site ayrı bir IP adresinden sunulurken, ikincisinde her
+      IP adresinde birden fazla site sunulur. Olayda aynı fiziksel sunucu
+      kullanıldığı halde bu sunucu son kullanıcıya görünür değildir.</p>
+
+    <p>Apache yazılımsal olarak IP’ye dayalı sanal konakları destekleyen ilk
+      sunuculardan biridir. 1.1 sürümünden itibaren Apache hem IP’ye dayalı hem de
+      isme dayalı sanal konakları desteklemektedir. İsme dayalı sanal konaklara
+      bazen <em>konağa dayalı</em> sanal konaklar veya <em>IP’ye dayanmayan</em>
+      sanal konaklar da denmektedir.</p>
+
+    <p>Aşağıda, Apache’nin 1.3 sürümü ve sonrası için sanal konak desteğini bütün
+      ayrıntıları ile açıklayan belgeler listelenmiştir.</p>
+
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#support">Sanal Konak DesteÄŸi</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#directives">Yapılandırma Yönergeleri</a></li>
+</ul><h3>Ayrıca bakınız:</h3><ul class="seealso"><li><code class="module"><a href="../mod/mod_vhost_alias.html">mod_vhost_alias</a></code></li><li><a href="name-based.html">İsme Dayalı Sanal Konaklar</a></li><li><a href="ip-based.html">IP Adresine Dayalı Sanal Konaklar</a></li><li><a href="examples.html">Sanal Konak Örnekleri</a></li><li><a href="fd-limits.html">Dosya Tanıtıcı Sınırları</a></li><li><a href="mass.html">Kütlesel Sanal Konaklık</a></li><li><a href="details.html">Ayrıntılı olarak Konak Eşleme</a></li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="support" id="support">Sanal Konak DesteÄŸi</a></h2>
+
+    <ul>
+      <li><a href="name-based.html">İsme Dayalı Sanal Konaklar</a> (Her IP
+        adresinde birden fazla site)</li>
+      <li><a href="ip-based.html">IP Adresine Dayalı Sanal Konaklar</a> (Her site
+        için ayrı IP adresi)</li>
+      <li><a href="examples.html">Çok kullanılan sanal konak yapılandırma
+        örnekleri</a></li>
+      <li><a href="fd-limits.html">Dosya Tanıtıcı Sınırları</a> (veya,
+        <em>çok fazla günlük dosyası</em>)</li>
+      <li><a href="mass.html">Devingen olarak Yapılandırılan Kütlesel Sanal
+        Barındırma</a></li>
+      <li><a href="details.html">Konak EÅŸlemenin DerinliÄŸine Ä°ncelenmesi</a></li>
+    </ul>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="directives" id="directives">Yapılandırma Yönergeleri</a></h2>
+
+    <ul>
+      <li><code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li>
+      <li><code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code></li>
+      <li><code class="directive"><a href="../mod/core.html#servername">ServerName</a></code></li>
+      <li><code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code></li>
+      <li><code class="directive"><a href="../mod/core.html#serverpath">ServerPath</a></code></li>
+    </ul>
+
+    <p>Sanal konak yapılandırmanız üzerinde hata ayıklamaya çalışıyorsanız
+      Apache’nin <code>-S</code> komut satırı seçeneği şu şekilde çok işinize
+      yarayabilir:</p>
+
+    <div class="example"><p><code>
+    /usr/local/apache2/bin/httpd -S
+    </code></p></div>
+
+    <p>Bu komut, yapılandırma dosyasının Apache yorumunu dökümler. IP
+      adreslerinin ve sunucu isimlerinin dikkatli bir incelemesi, yapılandırma
+      yanlışlarınızı keşfetmenize yardımcı olabilir. (Diğer komut satırı
+      seçenekleri için <code class="program"><a href="../programs/httpd.html">httpd</a></code> programının belgelerine
+      bakınız.)</p>
+
+</div></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="../de/vhosts/" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/vhosts/" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/vhosts/" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/vhosts/" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/vhosts/" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../ru/vhosts/" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a> |
+<a href="../tr/vhosts/" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/ip-based.html b/docs/manual/vhosts/ip-based.html
index c18fe7e0..4bb60e08 100644
--- a/docs/manual/vhosts/ip-based.html
+++ b/docs/manual/vhosts/ip-based.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: ip-based.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
@@ -6,10 +8,14 @@ URI: ip-based.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: ip-based.html.ja.euc-jp
+URI: ip-based.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: ip-based.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: ip-based.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/vhosts/ip-based.html.en b/docs/manual/vhosts/ip-based.html.en
index 908b7dcc..be5cd1bf 100644
--- a/docs/manual/vhosts/ip-based.html.en
+++ b/docs/manual/vhosts/ip-based.html.en
@@ -21,7 +21,8 @@
 <p><span>Available Languages: </span><a href="../en/vhosts/ip-based.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/vhosts/ip-based.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/ip-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/ip-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#requirements">System requirements</a></li>
@@ -155,8 +156,9 @@
 <p><span>Available Languages: </span><a href="../en/vhosts/ip-based.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/vhosts/ip-based.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/ip-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/ip-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/ip-based.html.fr b/docs/manual/vhosts/ip-based.html.fr
index 118e2f1d..4bb3e821 100644
--- a/docs/manual/vhosts/ip-based.html.fr
+++ b/docs/manual/vhosts/ip-based.html.fr
@@ -21,7 +21,8 @@
 <p><span>Langues Disponibles: </span><a href="../en/vhosts/ip-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/vhosts/ip-based.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/ip-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/ip-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#requirements">Système requis</a></li>
@@ -175,8 +176,9 @@ résident pour des serveurs virtuels</a></h2>
 <p><span>Langues Disponibles: </span><a href="../en/vhosts/ip-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/vhosts/ip-based.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/ip-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/ip-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/ip-based.html.ja.euc-jp b/docs/manual/vhosts/ip-based.html.ja.euc-jp
deleted file mode 100644
index a9cdefeb..00000000
--- a/docs/manual/vhosts/ip-based.html.ja.euc-jp
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>Apache ¤Î IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¥µ¥Ý¡¼¥È - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></div><div id="page-content"><div id="preamble"><h1>Apache ¤Î IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¥µ¥Ý¡¼¥È</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/vhosts/ip-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/vhosts/ip-based.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="../ja/vhosts/ip-based.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#requirements">¥·¥¹¥Æ¥àÍ×·ï</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#howto">Apache ¤ÎÀßÄêÊýË¡</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#multiple">Ê£¿ô¥Ç¡¼¥â¥ó¤ÎÀßÄê</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#single">Ê£¿ô¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎÀßÄê¤ò¤·¤¿
-¥Ç¡¼¥â¥ó¤ò°ì¤ÄÀßÄꤹ¤ë</a></li>
-</ul><h3>»²¾È</h3><ul class="seealso"><li>
-<a href="name-based.html">̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¥µ¥Ý¡¼¥È</a>
-</li></ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="requirements" id="requirements">¥·¥¹¥Æ¥àÍ×·ï</a></h2>
-
-    <p><cite>IP ¥Ù¡¼¥¹</cite> ¤È¤¤¤¦Ì¾Á°¤¬¼¨¤¹¤è¤¦¤Ë¡¢¥µ¡¼¥Ð¤Ë¤Ï
-    <strong>IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤½¤ì¤¾¤ì¤Ë¤Ä¤­¡¢ÊÌ¡¹¤Î IP ¥¢¥É¥ì¥¹¤¬
-    ɬÍפǤ¹</strong>¡£Ê£¿ô¤ÎʪÍý¥³¥Í¥¯¥·¥ç¥ó¤ò»ý¤Ã¤Æ¤¤¤ë¥Þ¥·¥ó¤òÍÑ°Õ¤¹¤ë¤«¡¢
-    ºÇ¶á¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥Ð¡¼¥Á¥ã¥ë
-    ¥¤¥ó¥¿¥Õ¥§¡¼¥¹ (¾ÜºÙ¤Ï¥·¥¹¥Æ¥à¤ÎÀâÌÀ½ñ¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£¤¿¤¤¤Æ¤¤¤Ï
-    "ip ¥¨¥¤¥ê¥¢¥¹" ¤È¸Æ¤Ð¤ì¤Æ¤¤¤Æ¡¢ÀßÄê¤Ë¤ÏÉáÄÌ "ifconfig" ¥³¥Þ¥ó¥É¤ò
-    »È¤¤¤Þ¤¹) ¤ò»È¤¦¤«¤Ç¼Â¸½¤Ç¤­¤Þ¤¹¡£</p>
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="howto" id="howto">Apache ¤ÎÀßÄêÊýË¡</a></h2>
-
-    <p>Ê£¿ô¤Î¥Û¥¹¥È¤ò¥µ¥Ý¡¼¥È¤¹¤ë¤è¤¦¤Ë Apache ¤òÀßÄꤹ¤ëÊýË¡¤Ï
-    ÆóÄ̤ꤢ¤ê¤Þ¤¹¡£Ê̤Π<code class="program"><a href="../programs/httpd.html">httpd</a></code> ¥Ç¡¼¥â¥ó¤ò³Æ¥Û¥¹¥ÈËè¤Ë¼Â¹Ô¤¹¤ë¤«¡¢
-    ¤¹¤Ù¤Æ¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò¥µ¥Ý¡¼¥È¤¹¤ë¥Ç¡¼¥â¥ó¤ò°ì¤Ä¼Â¹Ô¤¹¤ë¤«¤Ç¤¹¡£</p>
-
-    <p>°Ê²¼¤Î¤È¤­¤Ë¤ÏÊ£¿ô¤Î¥Ç¡¼¥â¥ó¤ò»È¤¦¤ÈÎɤ¤¤Ç¤·¤ç¤¦:</p>
-
-    <ul>
-      <li>²ñ¼Ò1 ¤Ï¥¦¥§¥Ö·Ðͳ°Ê³°¤Ç¤Ï²ñ¼Ò2 ¤«¤é¤Ï¥Ç¡¼¥¿¤òÆɤޤ줿¤¯¤Ê¤¤¡¢
-      ¤È¤¤¤Ã¤¿¥»¥­¥å¥ê¥Æ¥£¤ÎʬΥ¤ÎÌäÂ꤬¤¢¤ë¤È¤­¡£¤³¤Î¾ì¹ç¡¢¤½¤ì¤¾¤ì
-      <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code>, <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code>, <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code>, <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> ¤ÎÀßÄ꤬°ã¤¦Æó¤Ä¤Î¥Ç¡¼¥â¥ó¤ò
-      ¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</li>
-
-      <li>¥Þ¥·¥ó¤Î¤¹¤Ù¤Æ¤Î IP ¥¨¥¤¥ê¥¢¥¹¤ò listen ¤¹¤ë¤À¤±¤Î
-      ¥á¥â¥ê¤È¥Õ¥¡¥¤¥ëµ­½Ò»Ò¤Î;͵¤¬¤¢¤ë¤È¤­¡£<code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code> ¤Ï¡Ö¥ï¥¤¥ë¥É¥«¡¼¥É¡×
-      ¥¢¥É¥ì¥¹¤«¡¢ÆÃÄê¤Î¥¢¥É¥ì¥¹¤Î¤ß¤ò listen ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¤Ç¤¹¤«¤é¡¢²¿¤é¤«¤ÎÍýͳ¤ÇÆÃÄê¤Î¥¢¥É¥ì¥¹¤ò listen ¤·¤Ê¤±¤Ð¤Ê¤é¤Ê¤¤
-      ¤È¤­¤Ï¡¢¤½¤ÎÆÃÄê¤Î¥¢¥É¥ì¥¹¤ò¤¹¤Ù¤Æ listen ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-      (¤¿¤À¤·¡¢°ì¤Ä¤Î <code class="program"><a href="../programs/httpd.html">httpd</a></code> ¤¬ N-1 ¸Ä¤Î¥¢¥É¥ì¥¹¤ò listen ¤·¡¢
-      Ê̤Π<code class="program"><a href="../programs/httpd.html">httpd</a></code> ¤¬»Ä¤ê¤Î¥¢¥É¥ì¥¹¤ò listen ¤¹¤ë¤È¤¤¤Ã¤¿¤³¤È¤Ï²Äǽ¤Ç¤¹¡£)</li>
-    </ul>
-
-    <p>°Ê²¼¤Î¤È¤­¤Ë¤ÏñÆȤΥǡ¼¥â¥ó¤ò»È¤¦¤ÈÎɤ¤¤Ç¤·¤ç¤¦:</p>
-
-    <ul>
-      <li>¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È´Ö¤Ç¤Î httpd ¤ÎÀßÄê¤ò¶¦Í­¤·¤Æ¤â¤è¤¤¤È¤­¡£</li>
-
-      <li>¥Þ¥·¥ó¤¬Â¿¤¯¤Î¥ê¥¯¥¨¥¹¥È¤ò°·¤¦¤¿¤á¡¢Ê̥ǡ¼¥â¥ó¤ò¼Â¹Ô¤¹¤ë¤³¤È¤Ë¤è¤ë
-      À­Ç½¤ÎÄã²¼¤Î±Æ¶Á¤¬Ãø¤·¤¤¤È¤­¡£</li>
-    </ul>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="multiple" id="multiple">Ê£¿ô¥Ç¡¼¥â¥ó¤ÎÀßÄê</a></h2>
-
-    <p>³Æ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ËÂФ·¤ÆÊ̤Π<code class="program"><a href="../programs/httpd.html">httpd</a></code> ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ò¹Ô¤Ê¤¤¤Þ¤¹¡£
-    ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Î <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code> 
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ¡¢
-    ³Æ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¥Ç¡¼¥â¥ó¤¬°·¤¦ IP ¥¢¥É¥ì¥¹ (¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È) 
-    ¤òÁªÂò¤·¤Þ¤¹¡£Î㤨¤Ð</p>
-
-    <div class="example"><p><code>
-    Listen www.smallco.com:80
-    </code></p></div>
-
-    <p>¤³¤³¤Ç¡¢¥Û¥¹¥È̾¤ÎÂå¤ï¤ê¤Ë IP ¥¢¥É¥ì¥¹¤ò»È¤¦Êý¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤ë¤³¤È¤Ë
-    Ãí°Õ¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤
-    (<a href="../dns-caveats.html">DNS ¤ÎÃí°Õ»ö¹à</a> »²¾È)¡£</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="single" id="single">Ê£¿ô¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎÀßÄê¤ò¤·¤¿
-¥Ç¡¼¥â¥ó¤ò°ì¤ÄÀßÄꤹ¤ë</a></h2>
-
-    <p>¤³¤Î¾ì¹ç¤Ï¡¢°ì¤Ä¤Î <code class="program"><a href="../programs/httpd.html">httpd</a></code> ¤¬¼ç¥µ¡¼¥Ð¤È¤¹¤Ù¤Æ¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¥ê¥¯¥¨¥¹¥È¤ò
-    ½èÍý¤·¤Þ¤¹¡£ÀßÄê¥Õ¥¡¥¤¥ë¤Î <code class="directive"><a href="../mod/core.html#virtualhost">VirtualHost</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò»È¤Ã¤Æ¡¢
-    <code class="directive"><a href="../mod/core.html#serveradmin">ServerAdmin</a></code>, <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code>, <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>, <code class="directive"><a href="../mod/core.html#errorlog">ErrorLog</a></code>, <code class="directive"><a href="../mod/mod_log_config.html#transferlog">TransferLog</a></code>
-    ¤ä <code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code>
-    ÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÃͤ¬³Æ¥Û¥¹¥ÈËè¤Ë°Û¤Ê¤ëÃͤËÀßÄꤵ¤ì¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£
-    Î㤨¤Ð</p>
-
-    <div class="example"><p><code>
-    &lt;VirtualHost www.smallco.com&gt;<br />
-    ServerAdmin webmaster@mail.smallco.com<br />
-    DocumentRoot /groups/smallco/www<br />
-    ServerName www.smallco.com<br />
-    ErrorLog /groups/smallco/logs/error_log<br />
-    TransferLog /groups/smallco/logs/access_log<br />
-    &lt;/VirtualHost&gt;<br />
-    <br />
-    &lt;VirtualHost www.baygroup.org&gt;<br />
-    ServerAdmin webmaster@mail.baygroup.org<br />
-    DocumentRoot /groups/baygroup/www<br />
-    ServerName www.baygroup.org<br />
-    ErrorLog /groups/baygroup/logs/error_log<br />
-    TransferLog /groups/baygroup/logs/access_log<br />
-    &lt;/VirtualHost&gt;
-    </code></p></div>
-
-    <p>¤³¤³¤Ç¡¢¥Û¥¹¥È̾¤ÎÂå¤ï¤ê¤Ë IP ¥¢¥É¥ì¥¹¤ò»È¤¦Êý¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤ë¤³¤È¤Ë
-    Ãí°Õ¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤
-    (<a href="../dns-caveats.html">DNS ¤ÎÃí°Õ»ö¹à</a> »²¾È)¡£</p>
-
-    <p>¥×¥í¥»¥¹À¸À®¤òÀ©¸æ¤¹¤ë¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ä¤½¤Î¾¤Î¤¤¤¯¤Ä¤«¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    ½ü¤¤¤Æ¡¢¤Û¤Ü<strong>¤¹¤Ù¤Æ</strong>¤ÎÀßÄê¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò VirtualHost
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÃæ¤Ë½ñ¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤¬ VirtualHost
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ÈÍѤǤ­¤ë¤«¤É¤¦¤«¤Ï <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Öº÷°ú</a>¤ò»È¤Ã¤Æ<a href="../mod/directive-dict.html#Context">¥³¥ó¥Æ¥­¥¹¥È</a>¤Î
-    Íó¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-    <p><a href="../suexec.html">suEXEC¥é¥Ã¥Ñ¡¼</a>¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-    <code class="directive"><a href="../mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò VirtualHost
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÃæ¤Ç»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</p>
-
-    <p><em>¥»¥­¥å¥ê¥Æ¥£:</em> ¥í¥°¥Õ¥¡¥¤¥ë¤ò½ñ¤¯¾ì½ê¤ò»ØÄꤹ¤ë¤È¤­¤Ï¡¢
-    Apache ¤òµ¯Æ°¤·¤¿¥æ¡¼¥¶°Ê³°¤¬¤½¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë½ñ¤­¹þ¤ß¸¢¸Â¤ò
-    »ý¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¥»¥­¥å¥ê¥Æ¥£¾å¤Î´í¸±¤¬¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-    ¾ÜºÙ¤Ï<a href="../misc/security_tips.html">¥»¥­¥å¥ê¥Æ¥£¤Î¤³¤Ä</a>¥É¥­¥å¥á¥ó¥È¤ò
-    »²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/vhosts/ip-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/vhosts/ip-based.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="../ja/vhosts/ip-based.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/ip-based.html.ja.utf8 b/docs/manual/vhosts/ip-based.html.ja.utf8
new file mode 100644
index 00000000..e01aca97
--- /dev/null
+++ b/docs/manual/vhosts/ip-based.html.ja.utf8
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Apache � IP ベース��ー�ャルホストサ�ート - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">�ー�ャルホスト</a></div><div id="page-content"><div id="preamble"><h1>Apache � IP ベース��ー�ャルホストサ�ート</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/vhosts/ip-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/vhosts/ip-based.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/vhosts/ip-based.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/ip-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#requirements">システム�件</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#howto">Apache �設定方法</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#multiple">複数デーモン�設定</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#single">複数��ー�ャルホスト�設定を��
+デーモンを一�設定�る</a></li>
+</ul><h3>�照</h3><ul class="seealso"><li>
+<a href="name-based.html">��ベース��ー�ャルホストサ�ート</a>
+</li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="requirements" id="requirements">システム�件</a></h2>
+
+    <p><cite>IP ベース</cite> ������示�よ���サー���
+    <strong>IP ベース��ー�ャルホスト�れ�れ����別々� IP アドレス�
+    必���</strong>。複数�物�コ�クションを����るマシンを用��る��
+    最近�オペレーティングシステム�サ�ート�れ��る�ー�ャル
+    インタフェース (詳細�システム�説明書を読ん�����。�����
+    "ip エイリアス" �呼�れ����設定��普通 "ifconfig" コマンドを
+    使���) を使���実�����。</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="howto" id="howto">Apache �設定方法</a></h2>
+
+    <p>複数�ホストをサ�ート�るよ�� Apache を設定�る方法�
+    二通り�り��。別� <code class="program"><a href="../programs/httpd.html">httpd</a></code> デーモンを�ホスト毎�実行�る��
+    �����ー�ャルホストをサ�ート�るデーモンを一�実行�る���。</p>
+
+    <p>以下�����複数�デーモンを使��良���ょ�:</p>
+
+    <ul>
+      <li>会社1 �ウェブ経由以外��会社2 �ら�データを読�れ�����
+      ����セキュリティ�分離��題��る��。��場���れ�れ
+      <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code>, <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code>, <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code>, <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> �設定���二��デーモンを
+      実行�る必���り��。</li>
+
+      <li>マシン����� IP エイリアスを listen �る���
+      メモリ�ファイル記述��余裕��る��。<code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code> �「ワイルドカード�
+      アドレス��特定�アドレス��を listen �る�������。
+      ���ら�何ら���由�特定�アドレスを listen �����ら��
+      ������特定�アドレスを��� listen �る必���り��。
+      (����一�� <code class="program"><a href="../programs/httpd.html">httpd</a></code> � N-1 個�アドレスを listen ��
+      別� <code class="program"><a href="../programs/httpd.html">httpd</a></code> �残り�アドレスを listen �る��������能��。)</li>
+    </ul>
+
+    <p>以下������独�デーモンを使��良���ょ�:</p>
+
+    <ul>
+      <li>�ー�ャルホスト間�� httpd �設定を共有��もよ���。</li>
+
+      <li>マシン�多��リクエストを扱����別デーモンを実行�る���よる
+      性能�低下�影響�著����。</li>
+    </ul>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="multiple" id="multiple">複数デーモン�設定</a></h2>
+
+    <p>��ー�ャルホスト�対��別� <code class="program"><a href="../programs/httpd.html">httpd</a></code> �インストールを行����。
+    設定ファイル中� <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code> 
+    ディレクティブを使���
+    �インストール�デーモン�扱� IP アドレス (�ー�ャルホスト) 
+    を�択���。例��</p>
+
+    <div class="example"><p><code>
+    Listen www.smallco.com:80
+    </code></p></div>
+
+    <p>����ホスト��代�り� IP アドレスを使�方�推奨�れ��る���
+    注����������
+    (<a href="../dns-caveats.html">DNS �注�事項</a> �照)。</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="single" id="single">複数��ー�ャルホスト�設定を��
+デーモンを一�設定�る</a></h2>
+
+    <p>��場���一�� <code class="program"><a href="../programs/httpd.html">httpd</a></code> �主サー�������ー�ャルホスト�リクエストを
+    処����。設定ファイル� <code class="directive"><a href="../mod/core.html#virtualhost">VirtualHost</a></code> ディレクティブを使���
+    <code class="directive"><a href="../mod/core.html#serveradmin">ServerAdmin</a></code>, <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code>, <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>, <code class="directive"><a href="../mod/core.html#errorlog">ErrorLog</a></code>, <code class="directive"><a href="../mod/mod_log_config.html#transferlog">TransferLog</a></code>
+    ã‚„ <code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code>
+    設定ディレクティブ�値��ホスト毎�異�る値�設定�れるよ�����。
+    例��</p>
+
+    <div class="example"><p><code>
+    &lt;VirtualHost www.smallco.com&gt;<br />
+    ServerAdmin webmaster@mail.smallco.com<br />
+    DocumentRoot /groups/smallco/www<br />
+    ServerName www.smallco.com<br />
+    ErrorLog /groups/smallco/logs/error_log<br />
+    TransferLog /groups/smallco/logs/access_log<br />
+    &lt;/VirtualHost&gt;<br />
+    <br />
+    &lt;VirtualHost www.baygroup.org&gt;<br />
+    ServerAdmin webmaster@mail.baygroup.org<br />
+    DocumentRoot /groups/baygroup/www<br />
+    ServerName www.baygroup.org<br />
+    ErrorLog /groups/baygroup/logs/error_log<br />
+    TransferLog /groups/baygroup/logs/access_log<br />
+    &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    <p>����ホスト��代�り� IP アドレスを使�方�推奨�れ��る���
+    注����������
+    (<a href="../dns-caveats.html">DNS �注�事項</a> �照)。</p>
+
+    <p>プロセス生�を制御�るディレクティブや��他������ディレクティブを
+    除�����<strong>���</strong>�設定ディレクティブを VirtualHost
+    ディレクティブ�中�書��������。ディレクティブ� VirtualHost
+    ディレクティブ�使用��る����� <a href="../mod/directives.html">ディレクティブ索引</a>を使��<a href="../mod/directive-dict.html#Context">コンテキスト</a>�
+    欄を調������。</p>
+
+    <p><a href="../suexec.html">suEXECラッパー</a>を使���る場���
+    <code class="directive"><a href="../mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code>
+    ディレクティブを VirtualHost
+    ディレクティブ�中�使用�る�������。</p>
+
+    <p><em>セキュリティ:</em> ログファイルを書�場所を指定�る����
+    Apache を起動��ユーザ以外���ディレクトリ�書�込�権�を
+    ����る場��セキュリティ上��険��る���注�������。
+    詳細�<a href="../misc/security_tips.html">セキュリティ���</a>ドキュメントを
+    �照������。</p>
+
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/vhosts/ip-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/vhosts/ip-based.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/vhosts/ip-based.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/ip-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/ip-based.html.ko.euc-kr b/docs/manual/vhosts/ip-based.html.ko.euc-kr
index 00cfa89a..ae151b27 100644
--- a/docs/manual/vhosts/ip-based.html.ko.euc-kr
+++ b/docs/manual/vhosts/ip-based.html.ko.euc-kr
@@ -21,7 +21,8 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/vhosts/ip-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/vhosts/ip-based.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/ip-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/ip-based.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/vhosts/ip-based.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/ip-based.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
             ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
@@ -145,8 +146,9 @@
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/vhosts/ip-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/vhosts/ip-based.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/ip-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/ip-based.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/vhosts/ip-based.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/ip-based.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/ip-based.html.tr.utf8 b/docs/manual/vhosts/ip-based.html.tr.utf8
new file mode 100644
index 00000000..2ed32a3f
--- /dev/null
+++ b/docs/manual/vhosts/ip-based.html.tr.utf8
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>Apache’de IP’ye Dayalı Sanal Konak Desteği - Apache HTTP Sunucusu</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="../">Sürüm 2.2</a> &gt; <a href="./">Sanal Konaklar</a></div><div id="page-content"><div id="preamble"><h1>Apache’de IP’ye Dayalı Sanal Konak Desteği</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="../en/vhosts/ip-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/vhosts/ip-based.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/vhosts/ip-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/ip-based.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#requirements">Sistem gereksinimleri</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#howto">Apache nasıl ayarlanır?</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#multiple">Çok sayıda sürecin yapılandırılması</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#single">Sanal konaklar tek bir sürecin yapılandırılması</a></li>
+</ul><h3>Ayrıca bakınız:</h3><ul class="seealso"><li>
+<a href="name-based.html">İsme Dayalı Sanal Konak Desteği</a>
+</li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="requirements" id="requirements">Sistem gereksinimleri</a></h2>
+
+    <p><cite>IP’ye dayalı</cite> deyince, sunucunun <strong>her IP’ye dayalı
+      sanal konak için ayrı bir IP adresi</strong>ne sahip olduğunu anlıyoruz.
+      Bunun olması için, makine ya çok sayıda ağ bağlantısına sahiptir ya da
+      makinede, günümüzde çoğu işletim sistemi tarafından desteklenen sanal
+      arabirimler kullanılıyordur. (Sanal arabirimlerle ilgili ayrıntılar için
+      sistem belgelerinize bakınız; bu konu genellikle IP rumuzları (ip aliases)
+      olarak geçer ve ayarlamak için genellikle "ifconfig" komutu
+      kullanılır.)</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="howto" id="howto">Apache nasıl ayarlanır?</a></h2>
+
+    <p>Çok sayıda konağı desteklemek üzere Apache iki şekilde
+      yapılandırılabilir. Ya her konak için ayrı bir <code class="program"><a href="../programs/httpd.html">httpd</a></code>
+      süreci çalıştırırsınız ya da tüm sanal konakları destekleyen tek bir
+      süreciniz olur.</p>
+
+    <p>Çok sayıda süreç kullanıyorsanız:</p>
+
+    <ul>
+      <li>Güvenli bölgeler oluşturmanız gerekiyordur. Örneğin, şirket2’deki hiç
+        kimse dosya sistemi üzerinden şirket1’e ait verileri okuyamasın, sadece
+        herkes gibi tarayıcı kullanarak okuyabilsin istenebilir.  Bu durumda,
+        <code class="directive"><a href="../mod/mpm_common.html#user">User</a></code>,
+        <code class="directive"><a href="../mod/mpm_common.html#group">Group</a></code>,
+        <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code> ve
+        <code class="directive"><a href="../mod/core.html#serverroot">ServerRoot</a></code> yönergeleri farklı
+        değerlerle yapılandırılmış iki ayrı süreç çalıştırmanız gerekir.</li>
+
+      <li>Makine üzerindeki her IP adresini dinlemek için gereken dosya tanıtıcı
+        ve bellek miktarını makul bir seviyede tutabilirsiniz. Bu sadece belli
+        adresleri dinleyerek veya çok sayıda adresle eşleşen adres kalıpları
+        kullanarak mümükün olabilir. Zaten, bir sebeple belli bir adresi dinleme
+        ihtiyacı duyarsanız, diğer tüm adresleri de ayrı ayrı dinlemeniz
+        gerekir. (Bir <code class="program"><a href="../programs/httpd.html">httpd</a></code> programı N-1 adresi dinlerken
+        diÄŸerleri kalan adresleri dinleyebilir.)</li>
+    </ul>
+
+    <p>Tek bir süreç kullanıyorsanız:</p>
+
+    <ul>
+      <li><code class="program"><a href="../programs/httpd.html">httpd</a></code> yapılandırmasının sanal konaklar arasında
+        paylaşılmasına izin veriliyor demektir.</li>
+
+      <li>Makine çok büyük miktarda isteği karşılayabilir ve ayrı ayrı
+        süreçlerin çalışmasından kaynaklanan önemli başarım kayıpları
+        yaÅŸanmaz.</li>
+    </ul>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="multiple" id="multiple">Çok sayıda sürecin yapılandırılması</a></h2>
+
+    <p>Her sanal konak için ayrı bir <code class="program"><a href="../programs/httpd.html">httpd</a></code> yapılandırması
+      oluşturulur. Her yapılandırmada, o süreç tarafından sunulacak IP adresi
+      (veya sanal konak) için <code class="directive"><a href="../mod/mpm_common.html#listen">Listen</a></code>
+      yönergesi kullanılır. Örnek:</p>
+
+    <div class="example"><p><code>
+    Listen www.birkobi.dom:80
+    </code></p></div>
+
+    <p>Burada konak ismi yerine IP adresi kullanmanız önerilir (ayrıntılar için
+      <a href="../dns-caveats.html">DNS ile ilgili konular</a> belgesine
+      bakınız).</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="single" id="single">Sanal konaklar tek bir sürecin yapılandırılması</a></h2>
+
+    <p>Bu durum için, ana sunucu ve sanal konakların tümüne gelen istekler tek
+      bir <code class="program"><a href="../programs/httpd.html">httpd</a></code> süreci tarafından karşılanır. Yapılandırma
+      dosyasında, her sanal konak için, farklı değerlere sahip <code class="directive"><a href="../mod/core.html#serveradmin">ServerAdmin</a></code>, <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code>, <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>, <code class="directive"><a href="../mod/core.html#errorlog">ErrorLog</a></code>ve<code class="directive"><a href="../mod/mod_log_config.html#transferlog">TransferLog</a></code>
+      veya <code class="directive"><a href="../mod/mod_log_config.html#customlog">CustomLog</a></code> yönergeleri
+      içeren ayrı birer <code class="directive"><a href="../mod/core.html#virtualhost">VirtualHost</a></code> bölümü
+      oluşturulur. Örnek:</p>
+
+    <div class="example"><p><code>
+    &lt;VirtualHost www.birkobi.dom&gt;
+    <span class="indent">
+      ServerAdmin bilgi@posta.birkobi.dom<br />
+      DocumentRoot /gruplar/birkobi/belgeler<br />
+      ServerName www.birkobi.dom<br />
+      ErrorLog /gruplar/birkobi/günlükler/hatalar.log<br />
+      TransferLog /gruplar/birkobi/günlükler/erisim.log
+    </span>
+    &lt;/VirtualHost&gt;<br />
+    <br />
+    &lt;VirtualHost www.digerkobi.dom&gt;
+    <span class="indent">
+      ServerAdmin bilgi@posta.digerkobi.dom<br />
+      DocumentRoot /gruplar/digerkobi/belgeler<br />
+      ServerName www.digerkobi.dom<br />
+      ErrorLog /gruplar/digerkobi/günlükler/hatalar.log<br />
+      TransferLog /gruplar/digerkobi/günlükler/erisim.log
+    </span>
+    &lt;/VirtualHost&gt;
+    </code></p></div>
+
+    <p>Burada konak isimlerinin yerlerine IP adreslerini kullanmanız önerilir
+      (ayrıntılar için <a href="../dns-caveats.html">DNS ile ilgili konular</a>
+      belgesine bakınız).</p>
+
+    <p>Süreç oluşturmayı denetleyen yönergeler ve bir kaç başka yönerge dışında
+      hemen hemen tüm yapılandırma yönergeleri <code class="directive"><a href="../mod/core.html#virtualhost">VirtualHost</a></code> bölümleri içinde kullanılabilir. Bir
+      yönergenin <code class="directive"><a href="../mod/core.html#virtualhost">VirtualHost</a></code> bölümlerinde
+      kullanılıp kullanılmayacağını öğrenmek için <a href="../mod/directives.html">yönerge dizinini</a> kullanarak yönergenin <a href="../mod/directive-dict.html#Context">Bağlam</a>’ına bakınız.</p>
+
+    <p><a href="../suexec.html">suEXEC sarmalayıcısı</a> kullanıldığı takdirde
+      <code class="directive"><a href="../mod/mod_suexec.html#suexecusergroup">SuexecUserGroup</a></code> yönergesi de
+      bir <code class="directive"><a href="../mod/core.html#virtualhost">VirtualHost</a></code> bölümü içinde
+      kullanılabilir.</p>
+
+    <p><em>GÜVENLİK:</em>Günlük dosyalarının yazılacağı yeri belirlerken,
+      Apache’yi başlatan kullanıcıdan başka kimsenin yazamayacağı bir yerin
+      seçilmesi bazı güvenlik risklerini ortadan kaldırmak bakımından önemlidir.
+      Ayrıntılar için <a href="../misc/security_tips.html">güvenlik ipuçları</a>
+      belgesine bakınız.</p>
+</div></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="../en/vhosts/ip-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/vhosts/ip-based.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/vhosts/ip-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/vhosts/ip-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/ip-based.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/mass.html b/docs/manual/vhosts/mass.html
index 6c05d28e..0ba07cc1 100644
--- a/docs/manual/vhosts/mass.html
+++ b/docs/manual/vhosts/mass.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: mass.html.en
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/vhosts/mass.html.en b/docs/manual/vhosts/mass.html.en
index 9074446b..71e6b40d 100644
--- a/docs/manual/vhosts/mass.html.en
+++ b/docs/manual/vhosts/mass.html.en
@@ -451,6 +451,6 @@ RewriteRule  ^/(.*)$                      %1/cgi-bin/$1
 <p><span>Available Languages: </span><a href="../en/vhosts/mass.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/vhosts/mass.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/mass.html.ko.euc-kr b/docs/manual/vhosts/mass.html.ko.euc-kr
index 5582b080..e80bd84a 100644
--- a/docs/manual/vhosts/mass.html.ko.euc-kr
+++ b/docs/manual/vhosts/mass.html.ko.euc-kr
@@ -418,6 +418,6 @@ RewriteRule  ^/(.*)$                      %1/cgi-bin/$1
 <p><span>°¡´ÉÇÑ ¾ð¾î: </span><a href="../en/vhosts/mass.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/vhosts/mass.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/name-based.html b/docs/manual/vhosts/name-based.html
index ceb5e666..47fc5d87 100644
--- a/docs/manual/vhosts/name-based.html
+++ b/docs/manual/vhosts/name-based.html
@@ -1,3 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
 URI: name-based.html.de
 Content-Language: de
 Content-type: text/html; charset=ISO-8859-1
@@ -10,10 +12,14 @@ URI: name-based.html.fr
 Content-Language: fr
 Content-type: text/html; charset=ISO-8859-1
 
-URI: name-based.html.ja.euc-jp
+URI: name-based.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: name-based.html.ko.euc-kr
 Content-Language: ko
 Content-type: text/html; charset=EUC-KR
+
+URI: name-based.html.tr.utf8
+Content-Language: tr
+Content-type: text/html; charset=UTF-8
diff --git a/docs/manual/vhosts/name-based.html.de b/docs/manual/vhosts/name-based.html.de
index a0e5ccbd..2a0726e3 100644
--- a/docs/manual/vhosts/name-based.html.de
+++ b/docs/manual/vhosts/name-based.html.de
@@ -22,7 +22,8 @@
 <a href="../en/vhosts/name-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/vhosts/name-based.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/name-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/name-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">Diese Übersetzung ist möglicherweise
             nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
@@ -264,8 +265,9 @@
 <a href="../en/vhosts/name-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/vhosts/name-based.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/name-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/name-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Module</a> | <a href="../mod/directives.html">Direktiven</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossar</a> | <a href="../sitemap.html">Seitenindex</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/name-based.html.en b/docs/manual/vhosts/name-based.html.en
index afc1f067..da0f26dc 100644
--- a/docs/manual/vhosts/name-based.html.en
+++ b/docs/manual/vhosts/name-based.html.en
@@ -22,7 +22,8 @@
 <a href="../en/vhosts/name-based.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/vhosts/name-based.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/name-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/name-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 
     <p>This document describes when and how to use name-based virtual hosts.</p>
@@ -239,8 +240,9 @@
 <a href="../en/vhosts/name-based.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/vhosts/name-based.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/name-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/name-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/name-based.html.fr b/docs/manual/vhosts/name-based.html.fr
index 53bcb862..972ed9c0 100644
--- a/docs/manual/vhosts/name-based.html.fr
+++ b/docs/manual/vhosts/name-based.html.fr
@@ -22,7 +22,8 @@
 <a href="../en/vhosts/name-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/vhosts/name-based.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/name-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/name-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">Cette traduction peut être périmée. Verifiez la version
             Anglaise pour les changements récents.</div>
@@ -293,8 +294,9 @@
 <a href="../en/vhosts/name-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/vhosts/name-based.html" title="Français">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/name-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/name-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Authorisé sous <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossaire</a> | <a href="../sitemap.html">Plan du site</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/name-based.html.ja.euc-jp b/docs/manual/vhosts/name-based.html.ja.euc-jp
deleted file mode 100644
index 34e256ca..00000000
--- a/docs/manual/vhosts/name-based.html.ja.euc-jp
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="EUC-JP"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È - Apache HTTP ¥µ¡¼¥Ð</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body id="manual-page"><div id="page-header">
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p>
-<p class="apache">Apache HTTP ¥µ¡¼¥Ð ¥Ð¡¼¥¸¥ç¥ó 2.2</p>
-<img alt="" src="../images/feather.gif" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP ¥µ¡¼¥Ð</a> &gt; <a href="http://httpd.apache.org/docs/">¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</a> &gt; <a href="../">¥Ð¡¼¥¸¥ç¥ó 2.2</a> &gt; <a href="./">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></div><div id="page-content"><div id="preamble"><h1>̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../de/vhosts/name-based.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="../en/vhosts/name-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/vhosts/name-based.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="../ja/vhosts/name-based.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div>
-<div class="outofdate">This translation may be out of date. Check the
-            English version for recent changes.</div>
-
-    <p>¤³¤Îʸ½ñ¤Ç¤Ï̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò¤É¤ó¤Ê¤È¤­¡¢
-    ¤É¤¦¤ä¤Ã¤Æ»È¤¦¤«¤òÀâÌÀ¤·¤Þ¤¹¡£</p>
-</div>
-<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#namevip">̾Á°¥Ù¡¼¥¹¤È IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎÈæ³Ó</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#using">̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤òÍøÍѤ¹¤ë</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#compat">¸Å¤¤¥Ö¥é¥¦¥¶¤È¤Î¸ß´¹À­</a></li>
-</ul><h3>»²¾È</h3><ul class="seealso"><li><a href="ip-based.html">¥Í¡¼¥à¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</a></li><li><a href="details.html">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¥Þ¥Ã¥Á¥ó¥°¤Ë¤Ä¤¤¤Æ¤Î¾ÜºÙ</a></li><li><a href="mass.html">ÂçÎ̤ΥС¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎưŪ¤ÊÀßÄê</a></li><li><a href="examples.html">¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î°ìÈÌŪ¤ÊÀßÄêÎã</a></li><li><a href="examples.html#serverpath">ServerPath ÀßÄêÎã</a></li></ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="namevip" id="namevip">̾Á°¥Ù¡¼¥¹¤È IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎÈæ³Ó</a></h2>
-
-    <p>IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ç¤Ï¡¢±þÅú¤¹¤ë
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ø¤Î¥³¥Í¥¯¥·¥ç¥ó¤ò·èÄꤹ¤ë¤¿¤á¤Ë IP
-    ¥¢¥É¥ì¥¹¤ò»ÈÍѤ·¤Þ¤¹¡£¤Ç¤¹¤«¤é¡¢¤½¤ì¤¾¤ì¤Î¥Û¥¹¥È¤Ë¸Ä¡¹¤Ë IP
-    ¥¢¥É¥ì¥¹¤¬É¬Íפˤʤê¤Þ¤¹¡£¤³¤ì¤ËÂФ·¤Æ̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ç¤Ï¡¢
-    ¥¯¥é¥¤¥¢¥ó¥È¤¬ HTTP ¥Ø¥Ã¥À¤Î°ìÉô¤È¤·¤Æ¥Û¥¹¥È̾¤ò¹ð¤²¤ë¡¢
-    ¤È¤¤¤¦¤³¤È¤Ë°Í¸¤·¤Þ¤¹¡£¤³¤Îµ»½Ñ¤ÇƱ°ì IP 
-    ¥¢¥É¥ì¥¹¤ò°Û¤Ê¤ë¿¿ô¤Î¥Û¥¹¥È¤Ç¶¦Í­¤·¤Æ¤¤¤Þ¤¹¡£</p>
-
-    <p>̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÏÄ̾ïñ½ã¤Ç¡¢¤½¤ì¤¾¤ì¤Î¥Û¥¹¥È̾¤È
-    ¤½¤ì¤ËÂбþ¤¹¤ëÀµ³Î¤Ê IP ¥¢¥É¥ì¥¹¤ò DNS ¤ÇÀßÄꤷ¡¢°Û¤Ê¤ë
-    ¥Û¥¹¥È̾¤ò¶èÊ̤¹¤ë¤è¤¦¤Ë Apache HTTP ¥µ¡¼¥Ð¤òÀßÄꤹ¤ë¤À¤±¤Ç¤¹¡£
-    ¤µ¤é¤Ë¡¢Ì¾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÏÉÔ­¤¹¤ë IP
-    ¥¢¥É¥ì¥¹¤Î¼ûÍפò´ËϤ·¤Þ¤¹¡£¤·¤¿¤¬¤Ã¤Æ¡¢IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò
-    ÁªÂò¤¹¤Ù¤­ÆÃÄê¤ÎÍýͳ¤¬¤Ê¤±¤ì¤Ð̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò»È¤¦¤Ù¤­¤Ç¤¹¡£
-    IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò»ÈÍѤ¹¤ë¤³¤È¤ò¹Íθ¤¹¤ëÍýͳ¤È¤·¤Æ¡¢</p>
-
-    <ul> 
-      <li>̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ËÂбþ¤·¤Æ¤¤¤Ê¤¤¸Å¤¤¥¯¥é¥¤¥¢¥ó¥È¤¬¤¢¤ë
-      ̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤¬Æ¯¤¯¤¿¤á¤Ë¤Ï¡¢¥¯¥é¥¤¥¢¥ó¥È¤Ï
-      HTTP ¥Û¥¹¥È¥Ø¥Ã¥À¤òÁ÷¤Ã¤Æ¤³¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-      ¤³¤ì¤Ï HTTP/1.1 ¤Î»ÅÍͤÇÍ׵ᤵ¤ì¤Æ¤¤¤Æ¡¢¤¹¤Ù¤Æ¤Î¸½ÂåŪ¤Ê
-      HTTP/1.0 ¥Ö¥é¥¦¥¶¤Ç¤â³ÈÄ¥¤È¤·¤Æ¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-      ¤È¤Æ¤â¸Å¤¤¥¯¥é¥¤¥¢¥ó¥È¤ò¥µ¥Ý¡¼¥È¤·¤Ä¤Ä¡¢Ì¾Á°¥Ù¡¼¥¹¤Î
-      ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò¹Ô¤¤¤¿¤¤¾ì¹ç¤Ï¡¢¤³¤Îʸ½ñ¤ÎºÇ¸å¤ÎÊý¤Ë
-      ½ñ¤«¤ì¤Æ¤¤¤ë²ò·èºö¤Ë¤Ê¤ë¤«¤â¤·¤ì¤Ê¤¤ÊýË¡¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£</li>
-
-      <li>̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ï SSL ¥×¥í¥È¥³¥ë¤ÎÆÃħ¤Ë¤è¤ê¡¢
-      SSL ¥»¥­¥å¥¢¥µ¡¼¥Ð¤Ë¤Ï»È¤¨¤Þ¤»¤ó¡£</li>
-
-      <li>¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ä¥Í¥Ã¥È¥ï¡¼¥¯ÁõÃ֤Τʤ«¤Ë¤Ï¡¢
-      Ê̤ΠIP ¥¢¥É¥ì¥¹¾å¤Ç¤Ê¤¤¾ì¹ç¡¢Ê£¿ô¤Î¥Û¥¹¥È¤òÊÌ°·¤¤¤Ç¤­¤Ê¤¤¤è¤¦¤Ê
-      ÂÓ°è´ÉÍý¤ÎÊýË¡¤ò¼ÂÁõ¤·¤Æ¤¤¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£</li>
-    </ul>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="using" id="using">̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤òÍøÍѤ¹¤ë</a></h2>
-
-<table class="related"><tr><th>´ØÏ¢¥â¥¸¥å¡¼¥ë</th><th>´ØÏ¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</th></tr><tr><td><ul><li><code class="module"><a href="../mod/core.html">core</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code></li><li><code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code></li><li><code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code></li><li><code class="directive"><a href="../mod/core.html#servername">ServerName</a></code></li><li><code class="directive"><a href="../mod/core.html#serverpath">ServerPath</a></code></li><li><code class="directive"><a href="../mod/core.html#virtualhost">VirtualHost</a></code></li><li><code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li></ul></td></tr></table>
-
-    <p>̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò»È¤¦¤Ë¤Ï¡¢¤½¤Î¥Û¥¹¥È¤Ø¤Î
-    ¥ê¥¯¥¨¥¹¥È¤ò¼õ¤±ÉÕ¤±¤ë¥µ¡¼¥Ð¤Î IP ¥¢¥É¥ì¥¹ (¤â¤·¤«¤·¤¿¤é¥Ý¡¼¥È¤â)
-    ¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-    ¤³¤ì¤Ï <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÀßÄꤷ¤Þ¤¹¡£Ä̾<code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> ¤Ç
-    <code>*</code> ¤Î°À­¤ò»È¤Ã¤Æ¥µ¡¼¥Ð¤ÎÁ´¤Æ¤Î IP ¥¢¥É¥ì¥¹¤ò»È¤¤¤Þ¤¹¡£
-    (Î㤨¤Ð SSL ¤Î»ÈÍѤʤɤÇ) Ê£¿ô¤Î¥Ý¡¼¥È¤ò»È¤¦¤³¤È¤ò·×²è¤·¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
-    °ú¿ô¤Ë <code>*:80</code> ¤Î¤è¤¦¤Ë¥Ý¡¼¥È¤â´Þ¤á¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-    <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç
-    IP ¥¢¥É¥ì¥¹¤ò½ñ¤¤¤Æ¤â¡¢
-    ¼«Æ°Åª¤Ë¥µ¡¼¥Ð¤¬¤½¤Î IP ¥¢¥É¥ì¥¹¤ò¥ê¥Ã¥¹¥ó¤¹¤ë¤È¤¤¤¦¤³¤È¤Ï¤Ê¤¤¤³¤È¤Ë
-    Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¾ÜºÙ¤Ï¡Ö<a href="../bind.html">Apache ¤Î»È¤¦¥¢¥É¥ì¥¹¤È
-    ¥Ý¡¼¥È¤òÀßÄꤹ¤ë</a>¡×¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£¤µ¤é¤Ë¡¢¤³¤³¤Ç»ØÄꤵ¤ì¤¿
-    IP ¥¢¥É¥ì¥¹¤ÏÁ´¤Æ¥µ¡¼¥Ð¤Î¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤È´ØÏ¢ÉÕ¤±¤é¤ì¤Æ
-    ¤¤¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-
-    <p>¼¡¤Ï¡¢°·¤¦¥Û¥¹¥È¤½¤ì¤¾¤ì¤ËÂФ·¤Æ <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> ¥Ö¥í¥Ã¥¯¤ò
-    ºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£<code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î°ú¿ô¤Ï <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î°ú¿ô¤ÈƱ¤¸¤Ë¤·¤Æ¤¯¤À¤µ¤¤ (¤¹¤Ê¤ï¤Á¡¢IP ¥¢¥É¥ì¥¹¤«¡¢Á´¤Æ¤Î¥¢¥É¥ì¥¹¤ò°ÕÌ£¤¹¤ë
-    <code>*</code>)¡£¤½¤ì¤¾¤ì¤Î <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÎÃæ¤Ë¤Ï¡¢ºÇÄã¸Â¡¢¤É¤Î¥Û¥¹¥È¤¬°·¤ï¤ì¤ë¤«¤ò¼¨¤¹ <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤È¡¢
-    ¤½¤Î¥Û¥¹¥ÈÍѤΥ³¥ó¥Æ¥ó¥Ä¤¬¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Î¤É¤³¤Ë¤¢¤ë¤«¤ò¼¨¤¹
-    <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò
-    ½ñ¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>¥á¥¤¥ó¥Û¥¹¥È¤Ï¤Ê¤¯¤Ê¤ê¤Þ¤¹</h3>
-        <p>´û¤Ë¤¢¤ë¥¦¥§¥Ö¥µ¡¼¥Ð¤Ë¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤òÄɲ乤ë¾ì¹ç¡¢
-        ´û¸¤Î¥¦¥§¥Ö¥µ¡¼¥Ð¤ËÂФ·¤Æ¤â <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-        ¥Ö¥í¥Ã¥¯¤òºî¤é¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£¤³¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î
-        <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> ¤È
-        <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
-        ¤Ï¡¢¥°¥í¡¼¥Ð¥ë¤Ê <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> ¤È
-        <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
-        ¤ÈƱ¤¸¤â¤Î¤Ë¤·¤Þ¤¹¡£¤Þ¤¿¡¢¤³¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤òÀßÄê¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ç
-        ÀèƬ¤ËÃÖ¤¤¤Æ¡¢¥Ç¥Õ¥©¥ë¥È¥Û¥¹¥È¤È¤·¤ÆÆ°ºî¤¹¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£</p>
-    </div>
-
-    <p>¤¿¤È¤¨¤Ð¡¢<code>www.domain.tld</code> ¤òÆ°¤«¤·¤Æ¤¤¤Æ¡¢
-    ¤µ¤é¤Ë¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È <code>www.otherdomain.tld</code>
-    ¤òÄɲ乤ë¤È¤·¤Þ¤·¤ç¤¦¡£¤³¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÏƱ°ì IP ¤ò»Ø¤·¤Æ¤¤¤ë¤È¤·¤Þ¤¹¡£
-    ¤½¤Î¤è¤¦¤Ê¾ì¹ç¤Ï¡¢<code>httpd.conf</code>
-    ¤Ë°Ê²¼¤Î¤è¤¦¤Ê¥³¡¼¥É¤òÄɲ乤ë¤À¤±¤Ç¤¹</p>
-
-    <div class="example"><p><code>
-        NameVirtualHost *:80<br />
-        <br />
-        &lt;VirtualHost *:80&gt;<br />
-        <span class="indent">
-            ServerName www.domain.tld<br />
-            ServerAlias domain.tld *.domain.tld<br />
-            DocumentRoot /www/domain<br />
-        </span>
-        &lt;/VirtualHost&gt;<br />
-        <br />
-        &lt;VirtualHost *:80&gt;<br />
-        <span class="indent">ServerName www.otherdomain.tld<br />
-            DocumentRoot /www/otherdomain<br />
-        </span>
-        &lt;/VirtualHost&gt;<br />
-    </code></p></div>
-
-    <p><code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> µÚ¤Ó
-    <code class="directive"><a href="../mod/core.html#virtualhost">VirtualHost</a></code> ¤Î¤É¤Á¤é¤Î¾ì¹ç¤â¡¢
-    * ¤ÎÉôʬ¤Ë¤ÏÌÀ¼¨Åª¤Ë IP ¥¢¥É¥ì¥¹¤ò»ØÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    Î㤨¤Ð¡¢¤¢¤ë IP ¥¢¥É¥ì¥¹¤Ç¤Ï̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò»È¤¤¤¿¤¤°ìÊý¤Ç¡¢
-    Ê̤ΠIP ¥¢¥É¥ì¥¹¤Ç¤Ï¡¢Â¾¤Î IP ¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ä
-    ÊÌÁȤÎ̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ò»È¤¤¤¿¤¤¾ì¹ç¡¢
-    ¤½¤¦ÀßÄꤹ¤ë¤³¤È¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£</p>
-
-    <p>Ê£¿ô¤Î̾Á°¤Ç¥µ¡¼¥Ð¥¢¥¯¥»¥¹¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤·¤¿¤¤¤³¤È¤â¿¤¤¤Ç¤·¤ç¤¦¡£
-    ¤³¤Î¤è¤¦¤Ê¤³¤È¤Ï¡¢<code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code> ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-    ¥»¥¯¥·¥ç¥ó¤Ëµ­½Ò¤¹¤ë¤³¤È¤Ç¼Â¸½¤Ç¤­¤Þ¤¹¡£
-    Î㤨¤Ð¾åµ­¤Î <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> ¤ÎÎã¤Ç¤¢¤ì¤Ð¡¢
-    ¼¡¤Î¤è¤¦¤Ë°ìÍ÷¤Ëµó¤²¤é¤ì¤¿Ì¾Á°¤¬¡¢
-    ¥æ¡¼¥¶¤¬Æ±°ì¤Î¥¦¥§¥Ö¥µ¥¤¥È¤È¤·¤ÆÌܤˤ·¤Æ»ÈÍѤǤ­¤ë¥µ¡¼¥Ð̾¤Ç¤¢¤ë¡¢
-    ¤È <code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ç»ØÄê¤Ç¤­¤Þ¤¹¡£</p> 
-
-    <div class="example"><p><code>
-        ServerAlias domain.tld *.domain.tld
-    </code></p></div>
-
-    <p><code>domain.tld</code> ¥É¥á¥¤¥ó¤Ø¤ÎÁ´¤Æ¤Î¥Û¥¹¥È¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ï
-    <code>www.domain.tld</code> ¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤¬½èÍý¤·¤Þ¤¹¡£
-    ̾Á°¤ò¥Þ¥Ã¥Á¤µ¤»¤ë¤¿¤á¤Ë¡¢¥ï¥¤¥ë¥É¥«¡¼¥Éʸ»ú * ¤ä ? 
-    ¤ò»ÈÍѤ¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¤â¤Á¤í¤ó»×¤¤¤Ä¤­¤Î̾Á°¤òºî¤Ã¤Æ¡¢
-    <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> ¤ä 
-    <code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code>
-    ¤Ë¤½¤Î̾Á°¤ò½ñ¤¯¤È¤¤¤Ã¤¿¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£¤Þ¤º¤Ï¡¢
-    ¤³¤ì¤é¤Î̾Á°¤¬ ¥µ¡¼¥Ð¤ËÉÕ¤±¤é¤ì¤¿ IP ¥¢¥É¥ì¥¹¤Ë¥Þ¥Ã¥×¤µ¤ì¤ë¤è¤¦¤Ë
-    DNS ¥µ¡¼¥Ð¤òŬÀÚ¤ËÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</p>
-
-    <p>ºÇ¸å¤Ë¡¢<code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> ¥³¥ó¥Æ¥Ê¤ÎÃæ¤Ë
-    ¾¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò½ñ¤¯¤³¤È¤Ç¡¢¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ÎÀßÄê¤òºÙ¤«¤¯Ä´À°
-    ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-    ¤Û¤È¤ó¤É¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ï¤³¤ì¤é¤Î¥³¥ó¥Æ¥Ê¤ËÀßÃÖ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Æ¡¢
-    Êѹ¹ÅÀ¤Ï¤½¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ËÂФ·¤Æ¤Î¤ßÍ­¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£
-    ¤É¤Î¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ò½ñ¤¯¤³¤È¤¬¤Ç¤­¤ë¤«¤Ï¡¢¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Î <a href="../mod/directive-dist.html#context">¥³¥ó¥Æ¥­¥¹¥È</a> ¤ò
-    Ä´¤Ù¤Æ¤¯¤À¤µ¤¤¡£<em>¼ç¥µ¡¼¥Ð¥³¥ó¥Æ¥­¥¹¥È</em>
-    (<code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-    ¥³¥ó¥Æ¥Ê¤Î³°) ¤ÎÀßÄêÍѥǥ£¥ì¥¯¥Æ¥£¥Ö¤Ï¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ç¤ÎÀßÄê¤Ç
-    ¾å½ñ¤­¤µ¤ì¤Ê¤¤¾ì¹ç¤Î¤ß»ÈÍѤµ¤ì¤Þ¤¹¡£</p>
-
-    <p>¥ê¥¯¥¨¥¹¥È¤¬Íè¤ë¤È¡¢¥µ¡¼¥Ð¤Ï¤Þ¤ººÇ½é¤Ë <code class="directive"><a href="../mod/core.html#namevirtualhost">&lt;NameVirtualHost&gt;</a></code>
-    ¤Ë¥Þ¥Ã¥Á¤¹¤ë IP ¥¢¥É¥ì¥¹¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£¥Þ¥Ã¥Á¤¹¤ì¤Ð
-    ¥Þ¥Ã¥Á¤·¤¿ IP ¥¢¥É¥ì¥¹¤Î <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
-    ¤Î¤½¤ì¤¾¤ì¤Î¥»¥¯¥·¥ç¥ó¤ÎÃ椫¤é 
-    <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> ¤«
-    <code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code> 
-    ¤ËÍ׵ᤵ¤ì¤¿¥Û¥¹¥È̾¤¬¤¢¤ë¤«Ãµ¤·¤Þ¤¹¡£
-    ¸«¤Ä¤«¤ì¤Ð¤½¤Î¥µ¡¼¥ÐÍѤÎÀßÄê¤ò»È¤¤¤Þ¤¹¡£¥Þ¥Ã¥Á¤¹¤ë¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È
-    ¤¬¸«¤Ä¤«¤é¤Ê¤±¤ì¤Ð¡¢¥Þ¥Ã¥Á¤·¤¿ IP ¥¢¥É¥ì¥¹¤Î 
-    <strong>¥ê¥¹¥È¤ÎºÇ½é¤Ë¤¢¤ë¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È</strong> ¤¬»È¤ï¤ì¤Þ¤¹¡£</p>
-
-    <p>·ë²Ì¤È¤·¤Æ¡¢¥ê¥¹¥È¤ÎºÇ½é¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤¬ <em>¥Ç¥Õ¥©¥ë¥È</em> ¤Î
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë¤Ê¤ê¤Þ¤¹¡£IP ¥¢¥É¥ì¥¹¤¬ <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤Ë¥Þ¥Ã¥Á¤·¤¿¾ì¹ç¤Ï¡¢<em>¥á¥¤¥ó¤Î¥µ¡¼¥Ð</em> ¤Î
-    <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> 
-    ¤Ï<strong>·è¤·¤Æ»È¤ï¤ì¤Þ¤»¤ó</strong>
-    ¤É¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Ë¤â¥Þ¥Ã¥Á¤·¤Ê¤¤¥ê¥¯¥¨¥¹¥È¤ËÂФ·¤Æ¡¢
-    ÆÃÊ̤ÊÀßÄê¤ò¤·¤¿¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤ÎºÇ½é¤Î
-    <code>&lt;VirtualHost&gt;</code> ¥³¥ó¥Æ¥Ê¤Ë¤½¤ì¤òµ­½Ò¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
-
-</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="compat" id="compat">¸Å¤¤¥Ö¥é¥¦¥¶¤È¤Î¸ß´¹À­</a></h2>
-
-    <p>°ÊÁ°½Ò¤Ù¤¿¤è¤¦¤Ë¡¢Ì¾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤¬Àµ¤·¤¯Æ°ºî¤¹¤ë
-    ¤¿¤á¤ËɬÍפʾðÊó¤òÁ÷¤Ã¤Æ¤³¤Ê¤¤¥¯¥é¥¤¥¢¥ó¥È¤¬°ÍÁ³¤È¤·¤Æ¸ºß¤·¤Æ¤¤¤Þ¤¹¡£
-    ¤½¤Î¤è¤¦¤Ê¥¯¥é¥¤¥¢¥ó¥È¤ËÂФ·¤Æ¤Ï¡¢³ºÅö¤¹¤ë IP ¥¢¥É¥ì¥¹¤Ë¤Ä¤¤¤Æ¡¢
-    °ìÈֺǽé¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È
-    (<cite>¥×¥é¥¤¥Þ¥ê</cite>¤Î̾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È)
-    ¤«¤é¥Ú¡¼¥¸¤¬Á÷¤êÊÖ¤µ¤ì¤Þ¤¹¡£</p>
-
-    <div class="note"><h3>¤É¤Î¤°¤é¤¤¸Å¤¤¤Î ?</h3>
-    <p>¡Ö¸Å¤¤¡×¤Èɽ¸½¤·¤Æ¤¤¤ë¾ì¹ç¡¢ËÜÅö¤Ë¸Å¤¤¤³¤È¤ò°ÕÌ£¤·¤Æ»È¤Ã¤Æ¤¤¤Þ¤¹¡£
-    ÉÔ¹¬¤Ë¤·¤Æº£¸½ºß¤Ç¤â¤³¤Î¤è¤¦¤Ê¸Å¤¤¥Ö¥é¥¦¥¶¤ËÁø¶ø¤¹¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-    ¸½ºß¤Î¥Ö¥é¥¦¥¶¤ÏÁ´¤Æ¡¢Ì¾Á°¥Ù¡¼¥¹¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤ËɬÍפÊ
-    <code>Host</code> ¥Ø¥Ã¥À¤òÁ÷¤ê¤Þ¤¹¡£</p>
-    </div>
-
-    <p><a href="../mod/core.html#serverpath"><code>ServerPath</code></a>
-    ¥Ç¥£¥ì¥¯¥Æ¥£¥Ö¤ÇÂн褬²Äǽ¤Ç¤¹¡£¤Á¤ç¤Ã¤ÈÉԳʹ¥¤Ç¤¹¤±¤ì¤É¤â¡£</p>
-
-    <p>ÀßÄêÎã</p>
-
-    <div class="example"><p><code>
-        NameVirtualHost 111.22.33.44<br />
-        <br />
-        &lt;VirtualHost 111.22.33.44&gt;<br />
-        <span class="indent">
-            ServerName www.domain.tld<br />
-            ServerPath /domain<br />
-            DocumentRoot /web/domain<br />
-        </span>
-        &lt;/VirtualHost&gt;<br />
-    </code></p></div>
-
-    <p>¤³¤ÎÎã¤Ë¤Ï¤É¤¦¤¤¤¦°ÕÌ£¤¬¤¢¤ë¤Ç¤·¤ç¤¦¤«? ¤³¤ì¤Ï
-    "<code>/domain</code>" ¤Ç»Ï¤Þ¤ë URI ¤Ø¤Î¥ê¥¯¥¨¥¹¥È¤Ï¤¹¤Ù¤Æ¡¢
-    ¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È <code>www.domain.tld</code> ¤Ç½èÍý¤µ¤ì¤ë¡¢
-    ¤È¤¤¤¦°ÕÌ£¤Ç¤¹¡£¤Ä¤Þ¤ê¡¢¤¹¤Ù¤Æ¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ç
-    <code>http://www.domain.tld/domain/</code> ¤Ç¥¢¥¯¥»¥¹¤Ç¤­¤ë¥Ú¡¼¥¸¤¬¡¢
-    <code>Host:</code> ¥Ø¥Ã¥À¤òÁ÷¤Ã¤Æ¤¯¤ë¥¯¥é¥¤¥¢¥ó¥È¤Ç¤¢¤ì¤Ð
-    <code>http://www.domain.tld/</code> ¤È¤·¤Æ¤â¥¢¥¯¥»¥¹¤Ç¤­¤ë¡¢
-    ¤È¤¤¤¦°ÕÌ£¤Ç¤¹¡£</p>
-
-    <p>¤³¤ì¤¬Æ°ºî¤¹¤ë¤è¤¦¤Ë¤¹¤ë¤Ë¤Ï¡¢
-    ¥×¥é¥¤¥Þ¥ê¤Î¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¥Ú¡¼¥¸¤Ë
-    <code>http://www.domain.tld/domain/</code> ¤Ø¤Î¥ê¥ó¥¯¤òÀßÃÖ¤·¤Þ¤¹¡£
-    ¤½¤·¤Æ¡¢¥Ð¡¼¥Á¥ã¥ë¥Û¥¹¥È¤Î¥Ú¡¼¥¸¤Ç¤Ï¡¢½ã¿è¤ÊÁêÂÐ¥ê¥ó¥¯ (<em>Îã:</em>
-    "<code>file.html</code>" ¤ä "<code>../icons/image.gif</code>")¡¢
-    ¤¢¤ë¤¤¤Ï <code>/domain/</code> ¤Ç»Ï¤Þ¤ë¥ê¥ó¥¯ (<em>Îã:</em>
-    "<code>http://www.domain.tld/domain/misc/file.html</code>" ¤ä
-    "<code>/domain/misc/file.html</code>") ¤À¤±¤òÀßÃÖ¤·¤Þ¤¹¡£</p>
-
-    <p>¤³¤ì¤Ë¤Ï¡¢´öʬ¤«¤Îµ¬Î§¤¬É¬ÍפȤʤê¤Þ¤¹¤¬¡¢
-    ¤³¤Î¤è¤¦¤Ê¥¬¥¤¥É¥é¥¤¥ó¤òÃé¼Â¤Ë¼é¤ë¤³¤È¤Ë¤è¤ê¡¢¤¿¤¤¤Æ¤¤¤Î¾ì¹ç¡¢
-    ¤¹¤Ù¤Æ¤Î¥Ö¥é¥¦¥¶¤Ç ¡½ ¿·¤·¤¤¥Ö¥é¥¦¥¶¤Ç¤â¸Å¤¤¤â¤Î¤Ç¤â ¡½
-    ºîÀ®¤·¤¿¥Ú¡¼¥¸¤¬¸«¤¨¤ë¤È¤¤¤¦¤³¤È¤òÊݾڤ·¤Þ¤¹¡£</p>
-
-</div></div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../de/vhosts/name-based.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
-<a href="../en/vhosts/name-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
-<a href="../fr/vhosts/name-based.html" hreflang="fr" rel="alternate" title="Fran�«®ais">&nbsp;fr&nbsp;</a> |
-<a href="../ja/vhosts/name-based.html" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
-</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">¥â¥¸¥å¡¼¥ë</a> | <a href="../mod/directives.html">¥Ç¥£¥ì¥¯¥Æ¥£¥Ö</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">ÍѸì</a> | <a href="../sitemap.html">¥µ¥¤¥È¥Þ¥Ã¥×</a></p></div>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/name-based.html.ja.utf8 b/docs/manual/vhosts/name-based.html.ja.utf8
new file mode 100644
index 00000000..1fb061cc
--- /dev/null
+++ b/docs/manual/vhosts/name-based.html.ja.utf8
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>��ベース��ー�ャルホスト - Apache HTTP サー�</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p>
+<p class="apache">Apache HTTP サー� �ージョン 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サー�</a> &gt; <a href="http://httpd.apache.org/docs/">ドキュメンテーション</a> &gt; <a href="../">�ージョン 2.2</a> &gt; <a href="./">�ー�ャルホスト</a></div><div id="page-content"><div id="preamble"><h1>��ベース��ー�ャルホスト</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../de/vhosts/name-based.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/vhosts/name-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/vhosts/name-based.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/vhosts/name-based.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/name-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+<div class="outofdate">This translation may be out of date. Check the
+            English version for recent changes.</div>
+
+    <p>��文書����ベース��ー�ャルホストを�ん����
+    ��や��使��を説明���。</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#namevip">��ベース� IP ベース��ー�ャルホスト�比較</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#using">��ベース��ー�ャルホストを利用�る</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#compat">��ブラウザ��互�性</a></li>
+</ul><h3>�照</h3><ul class="seealso"><li><a href="ip-based.html">�ームベース��ー�ャルホスト</a></li><li><a href="details.html">�ー�ャルホスト�マッ�ング�����詳細</a></li><li><a href="mass.html">大���ー�ャルホスト�動的�設定</a></li><li><a href="examples.html">�ー�ャルホスト�一般的�設定例</a></li><li><a href="examples.html#serverpath">ServerPath 設定例</a></li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="namevip" id="namevip">��ベース� IP ベース��ー�ャルホスト�比較</a></h2>
+
+    <p>IP ベース��ー�ャルホスト���応答�る
+    �ー�ャルホスト��コ�クションを決定�る��� IP
+    アドレスを使用���。���ら��れ�れ�ホスト�個々� IP
+    アドレス�必���り��。�れ�対����ベース��ー�ャルホスト���
+    クライアント� HTTP ヘッダ�一部���ホスト�を告�る�
+    �������存���。��技術��一 IP 
+    アドレスを異�る多数�ホスト�共有�����。</p>
+
+    <p>��ベース��ー�ャルホスト�通常�純���れ�れ�ホスト��
+    �れ�対応�る正確� IP アドレスを DNS �設定��異�る
+    ホスト�を区別�るよ�� Apache HTTP サー�を設定�る����。
+    �ら����ベース��ー�ャルホスト��足�る IP
+    アドレス�需�を緩和���。������IP ベース��ー�ャルホストを
+    �択���特定��由���れ���ベース��ー�ャルホストを使�����。
+    IP ベース��ー�ャルホストを使用�る��を考慮�る�由����</p>
+
+    <ul> 
+      <li>��ベース��ー�ャルホスト�対応�������クライアント��る
+      ��ベース��ー�ャルホスト��������クライアント�
+      HTTP ホストヘッダを������れ��り��ん。
+      �れ� HTTP/1.1 �仕様��求�れ���������代的�
+      HTTP/1.0 ブラウザ�も拡張���実装�れ����。
+      ��も��クライアントをサ�ート������ベース�
+      �ー�ャルホストを行���場�����文書�最後�方�
+      書�れ��る解決策��る�も�れ��方法を見�����。</li>
+
+      <li>��ベース��ー�ャルホスト� SSL プロトコル�特徴�より�
+      SSL セキュアサー���使���ん。</li>
+
+      <li>オペレーティングシステムや�ットワーク装置������
+      別� IP アドレス上���場��複数�ホストを別扱�����よ��
+      帯域管��方法を実装���るも���り��。</li>
+    </ul>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="using" id="using">��ベース��ー�ャルホストを利用�る</a></h2>
+
+<table class="related"><tr><th>関連モジュール</th><th>関連ディレクティブ</th></tr><tr><td><ul><li><code class="module"><a href="../mod/core.html">core</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code></li><li><code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code></li><li><code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code></li><li><code class="directive"><a href="../mod/core.html#servername">ServerName</a></code></li><li><code class="directive"><a href="../mod/core.html#serverpath">ServerPath</a></code></li><li><code class="directive"><a href="../mod/core.html#virtualhost">VirtualHost</a></code></li><li><code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li></ul></td></tr></table>
+
+    <p>��ベース��ー�ャルホストを使������ホスト��
+    リクエストを��付�るサー�� IP アドレス (も����ら�ートも)
+    を指定�る必���り��。
+    �れ� <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code>
+    ディレクティブ�設定���。通常�<code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> �
+    <code>*</code> �属性を使��サー��全�� IP アドレスを使���。
+    (例�� SSL �使用���) 複数��ートを使���を計画���る���れ��
+    引数� <code>*:80</code> �よ���ートも��るよ��������。
+    <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> ディレクティブ�
+    IP アドレスを書��も�
+    自動的�サー���� IP アドレスをリッスン�る�����������
+    注�������。詳細�「<a href="../bind.html">Apache �使�アドレス�
+    �ートを設定�る</a>�を読ん�����。�ら�����指定�れ�
+    IP アドレス�全�サー���ットワークインターフェース�関連付�られ�
+    ���れ��り��ん。</p>
+
+    <p>次��扱�ホスト�れ�れ�対�� <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> ブロックを
+    作�������。<code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+    ディレクティブ�引数� <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code>
+    ディレクティブ�引数���������� (�����IP アドレス��全��アドレスを�味�る
+    <code>*</code>)。�れ�れ� <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+    ディレクティブ�中���最低����ホスト�扱�れる�を示� <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> ディレクティブ��
+    ��ホスト用�コンテンツ�ファイルシステム上�����る�を示�
+    <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> ディレクティブを
+    書�必���り��。</p>
+
+    <div class="note"><h3>メインホスト����り��</h3>
+        <p>既��るウェブサー���ー�ャルホストを追加�る場��
+        既存�ウェブサー��対��も <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+        ブロックを作ら��れ��り��ん。���ー�ャルホスト�
+        <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> �
+        <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
+        ��グロー�ル� <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> �
+        <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code>
+        ���も�����。������ー�ャルホストを設定ファイル�中�
+        先頭�置���デフォルトホスト���動作�るよ�����。</p>
+    </div>
+
+    <p>�����<code>www.domain.tld</code> を動������
+    �ら��ー�ャルホスト <code>www.otherdomain.tld</code>
+    を追加�る����ょ�。���ー�ャルホスト��一 IP を指���る����。
+    ��よ��場���<code>httpd.conf</code>
+    �以下�よ��コードを追加�る����</p>
+
+    <div class="example"><p><code>
+        NameVirtualHost *:80<br />
+        <br />
+        &lt;VirtualHost *:80&gt;<br />
+        <span class="indent">
+            ServerName www.domain.tld<br />
+            ServerAlias domain.tld *.domain.tld<br />
+            DocumentRoot /www/domain<br />
+        </span>
+        &lt;/VirtualHost&gt;<br />
+        <br />
+        &lt;VirtualHost *:80&gt;<br />
+        <span class="indent">ServerName www.otherdomain.tld<br />
+            DocumentRoot /www/otherdomain<br />
+        </span>
+        &lt;/VirtualHost&gt;<br />
+    </code></p></div>
+
+    <p><code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> ��
+    <code class="directive"><a href="../mod/core.html#virtualhost">VirtualHost</a></code> ���ら�場�も�
+    * �部分��明示的� IP アドレスを指定�る�������。
+    例����る IP アドレス����ベース��ー�ャルホストを使���一方��
+    別� IP アドレス���他� IP ベース��ー�ャルホストや
+    別組���ベース��ー�ャルホストを使���場��
+    ��設定�る����る��ょ�。</p>
+
+    <p>複数����サー�アクセス���るよ�������も多���ょ�。
+    ��よ������<code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code> ディレクティブを <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+    セクション�記述�る���実�����。
+    例��上記� <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> �例��れ��
+    次�よ��一覧�挙�られ�����
+    ユーザ��一�ウェブサイト���目���使用��るサー����る�
+    � <code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code>
+    ディレクティブ�指定����。</p> 
+
+    <div class="example"><p><code>
+        ServerAlias domain.tld *.domain.tld
+    </code></p></div>
+
+    <p><code>domain.tld</code> ドメイン��全��ホスト��リクエスト�
+    <code>www.domain.tld</code> ��ー�ャルホスト�処����。
+    ��をマッ���る����ワイルドカード文字 * や ? 
+    を使用�る��も����。も��ん�������を作���
+    <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> ã‚„ 
+    <code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code>
+    �����を書������������ん。����
+    �れら���� サー��付�られ� IP アドレス�マップ�れるよ��
+    DNS サー�を�切�設定���れ��り��ん。</p>
+
+    <p>最後��<code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> コンテナ�中�
+    他�ディレクティブを書������ー�ャルホスト�設定を細��調整
+    �る�������。
+    ��ん��ディレクティブ��れら�コンテナ�設置�る�������
+    変更点����ー�ャルホスト�対����有効��り��。
+    ��ディレクティブを書������る���ディレクティブ� <a href="../mod/directive-dist.html#context">コンテキスト</a> を
+    調������。<em>主サー�コンテキスト</em>
+    (<code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+    コンテナ�外) �設定用ディレクティブ��ー�ャルホスト��設定�
+    上書��れ��場���使用�れ��。</p>
+
+    <p>リクエスト��る��サー����最�� <code class="directive"><a href="../mod/core.html#namevirtualhost">&lt;NameVirtualHost&gt;</a></code>
+    �マッ��る IP アドレス����を�ェック���。マッ��れ�
+    マッ��� IP アドレス� <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+    ��れ�れ�セクション�中�ら 
+    <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> �
+    <code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code> 
+    ��求�れ�ホスト���る�探���。
+    見��れ���サー�用�設定を使���。マッ��る�ー�ャルホスト
+    �見��ら��れ��マッ��� IP アドレス� 
+    <strong>リスト�最���る�ー�ャルホスト</strong> �使�れ��。</p>
+
+    <p>�果����リスト�最���ー�ャルホスト� <em>デフォルト</em> �
+    �ー�ャルホスト��り��。IP アドレス� <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code>
+    ディレクティブ�マッ���場���<em>メイン�サー�</em> �
+    <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> 
+    �<strong>決��使�れ��ん</strong>
+    ���ー�ャルホスト�もマッ����リクエスト�対���
+    特別�設定を������れ��設定ファイル中�最��
+    <code>&lt;VirtualHost&gt;</code> コンテナ��れを記述������。</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="compat" id="compat">��ブラウザ��互�性</a></h2>
+
+    <p>以�述��よ�����ベース��ー�ャルホスト�正��動作�る
+    ���必��情報を������クライアント��然���存在�����。
+    ��よ��クライアント�対����該当�る IP アドレス�����
+    一番最��設定�れ��る�ー�ャルホスト
+    (<cite>プライマリ</cite>���ベース��ー�ャルホスト)
+    �らページ��り返�れ��。</p>
+
+    <div class="note"><h3>���ら���� ?</h3>
+    <p>「����表����る場��本当�����を�味��使�����。
+    �幸���今�在�も��よ����ブラウザ����る����り��。
+    �在�ブラウザ�全����ベース��ー�ャルホスト�必��
+    <code>Host</code> ヘッダを�り��。</p>
+    </div>
+
+    <p><a href="../mod/core.html#serverpath"><code>ServerPath</code></a>
+    ディレクティブ�対処��能��。�ょ���格好���れ�も。</p>
+
+    <p>設定例</p>
+
+    <div class="example"><p><code>
+        NameVirtualHost 111.22.33.44<br />
+        <br />
+        &lt;VirtualHost 111.22.33.44&gt;<br />
+        <span class="indent">
+            ServerName www.domain.tld<br />
+            ServerPath /domain<br />
+            DocumentRoot /web/domain<br />
+        </span>
+        &lt;/VirtualHost&gt;<br />
+    </code></p></div>
+
+    <p>��例�������味��る��ょ��? �れ�
+    "<code>/domain</code>" �始�る URI ��リクエスト�����
+    �ー�ャルホスト <code>www.domain.tld</code> �処��れる�
+    ����味��。��り�����クライアント�
+    <code>http://www.domain.tld/domain/</code> �アクセス��るページ��
+    <code>Host:</code> ヘッダを����るクライアント��れ�
+    <code>http://www.domain.tld/</code> ���もアクセス��る�
+    ����味��。</p>
+
+    <p>�れ�動作�るよ���る���
+    プライマリ��ー�ャルホスト�ページ�
+    <code>http://www.domain.tld/domain/</code> ��リンクを設置���。
+    �����ー�ャルホスト�ページ���純粋�相対リンク (<em>例:</em>
+    "<code>file.html</code>" や "<code>../icons/image.gif</code>")�
+    �る�� <code>/domain/</code> �始�るリンク (<em>例:</em>
+    "<code>http://www.domain.tld/domain/misc/file.html</code>" ã‚„
+    "<code>/domain/misc/file.html</code>") ��を設置���。</p>
+
+    <p>�れ���幾分���律�必���り����
+    ��よ��ガイドラインを忠実�守る���より������場��
+    ����ブラウザ� ― 新��ブラウザ�も��も��も ―
+    作���ページ�見�る�����を�証���。</p>
+
+</div></div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../de/vhosts/name-based.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/vhosts/name-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/vhosts/name-based.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/vhosts/name-based.html" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/name-based.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">モジュール</a> | <a href="../mod/directives.html">ディレクティブ</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">用語</a> | <a href="../sitemap.html">サイトマップ</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/name-based.html.ko.euc-kr b/docs/manual/vhosts/name-based.html.ko.euc-kr
index d341e742..f60bcfd6 100644
--- a/docs/manual/vhosts/name-based.html.ko.euc-kr
+++ b/docs/manual/vhosts/name-based.html.ko.euc-kr
@@ -22,7 +22,8 @@
 <a href="../en/vhosts/name-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/vhosts/name-based.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/name-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/name-based.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/vhosts/name-based.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/name-based.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div>
 <div class="outofdate">ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù.
             ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.</div>
@@ -231,8 +232,9 @@
 <a href="../en/vhosts/name-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/vhosts/name-based.html" hreflang="fr" rel="alternate" title="Fran&#231;ais">&nbsp;fr&nbsp;</a> |
 <a href="../ja/vhosts/name-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
-<a href="../ko/vhosts/name-based.html" title="Korean">&nbsp;ko&nbsp;</a></p>
+<a href="../ko/vhosts/name-based.html" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/name-based.html" hreflang="tr" rel="alternate" title="T&#252;rk&#231;e">&nbsp;tr&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">¸ðµâ</a> | <a href="../mod/directives.html">Áö½Ã¾îµé</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">¿ë¾î</a> | <a href="../sitemap.html">»çÀÌÆ®¸Ê</a></p></div>
 </body></html>
\ No newline at end of file
diff --git a/docs/manual/vhosts/name-based.html.tr.utf8 b/docs/manual/vhosts/name-based.html.tr.utf8
new file mode 100644
index 00000000..696b8085
--- /dev/null
+++ b/docs/manual/vhosts/name-based.html.tr.utf8
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="tr" xml:lang="tr"><head><!--
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+              This file is generated from xml source: DO NOT EDIT
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+      -->
+<title>İsme Dayalı Sanal Konaklar - Apache HTTP Sunucusu</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body id="manual-page"><div id="page-header">
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p>
+<p class="apache">Apache HTTP Sunucusu Sürüm 2.2</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Sunucusu</a> &gt; <a href="http://httpd.apache.org/docs/">Belgeleme</a> &gt; <a href="../">Sürüm 2.2</a> &gt; <a href="./">Sanal Konaklar</a></div><div id="page-content"><div id="preamble"><h1>İsme Dayalı Sanal Konaklar</h1>
+<div class="toplang">
+<p><span>Mevcut Diller: </span><a href="../de/vhosts/name-based.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/vhosts/name-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/vhosts/name-based.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/vhosts/name-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/name-based.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div>
+
+    <p>Bu belgede isme dayalı sanal konakların ne zaman, nasıl kullanılacakları
+      açıklanmıştır.</p>
+</div>
+<div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#namevip">İsme dayalı ve IP’ye dayalı Sanal Konaklar</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#using">İsme Dayalı Sanal Konakların Kullanımı</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#compat">Artık Tarihe Karışmış Tarayıcılarla Uyumluluk</a></li>
+</ul><h3>Ayrıca bakınız:</h3><ul class="seealso"><li><a href="ip-based.html">IP Adresine Dayalı Sanal Konaklar</a></li><li><a href="details.html">Konak Eşlemenin Derinliğine İncelenmesi</a>
+</li><li><a href="mass.html">Devingen olarak Yapılandırılan Kütlesel Sanal
+Barındırma</a></li><li><a href="examples.html">Çok kullanılan sanal konak yapılandırma
+örnekleri</a></li><li><a href="examples.html#serverpath">ServerPath yapılandırma örneği</a>
+</li></ul></div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="namevip" id="namevip">İsme dayalı ve IP’ye dayalı Sanal Konaklar</a></h2>
+
+    <p>IP’ye dayalı sanal konaklarda sunulacak sanal konağı doğru tespit
+      edebilmek için bağlantının yapıldığı IP adresine bakılır. Bu bakımdan her
+      konak için ayrı bir IP adresine gereksinim vardır. İsme dayalı sanal
+      konaklarda ise sunucu, istemcinin HTTP başlığının bir parçası olarak
+      gönderdiği konak adını kullanır. Bu teknikte aynı IP adresini çok sayıda
+      farklı konak kullanabilir.</p>
+
+    <p>İsme dayalı sanal barındırma nispeten daha kolaydır, çünkü her konak
+      ismini doğru IP adresiyle eşlemek için DNS sunucunuzu yapılandırdıktan
+      sonra Apache HTTP sunucusunu farklı konak isimlerini tanıyacak şekilde
+      yapılandırmanız yeterli olur. İsme dayalı sanal barındırma ayrıca zaten
+      kıt olan IP adreslerine talebi de azaltır. Bu nedenle, IP’ye dayalı sanal
+      konakları kullanmanızı gerektirecek çok özel bir sebep olmadıkça isme
+      dayalı sanal konaklar kullanmalısınız. IP’ye dayalı sanal konakların
+      kullanımını gerektirebilecek bazı durumlar:</p>
+
+    <ul>
+        <li>Bazı tarihi istemciler isme dayalı sanal konaklarla uyumlu değildir.
+          İsme dayalı sanal konakların çalışması için istemcinin HTTP Host
+          başlığı göndermesi gerekir. Bu da HTTP/1.1 desteği gerektirir.
+          Günümüzdeki HTTP/1.0 istemcileri bir eklenti olarak HTTP/1.1’i de
+          desteklemektedir. Tarihi eser haline gelmiÅŸ HTTP/1.1 desteÄŸi
+          bulurmayan eski istemcileri hala isme dayalı sanal konaklarla
+          desteklemek isterseniz bu belgenin sonunda bunu mümkün kılabilecek bir
+          tekniÄŸe yer verilmiÅŸtir.</li>
+
+        <li>İsme dayalı sanal konaklar SSL portokolünün doğası gereğince SSL’li
+          güvenli sunucular için kullanılamazlar.</li>
+
+        <li>Bazı işletim sistemlerinin ve ağ donanımlarının gerçekleştirdiği
+          band genişliği yönetim teknikleri IP adresleri farklı olmadığı sürece
+          konaklar arasında ayrım yapamazlar.</li>
+    </ul>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="using" id="using">İsme Dayalı Sanal Konakların Kullanımı</a></h2>
+
+<table class="related"><tr><th>İlgili Modüller</th><th>İlgili Yönergeler</th></tr><tr><td><ul><li><code class="module"><a href="../mod/core.html">core</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code></li><li><code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code></li><li><code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code></li><li><code class="directive"><a href="../mod/core.html#servername">ServerName</a></code></li><li><code class="directive"><a href="../mod/core.html#serverpath">ServerPath</a></code></li><li><code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code></li></ul></td></tr></table>
+
+    <p>İsme dayalı sanal konakları kullanmak için, bu konaklar için istekleri
+      kabul edecek sunucuya IP adresini (ve muhtemelen portu da)
+      belirtmelisiniz. Bu işlem <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> yönergesiyle yapılır. Normal
+      şartlar altında sunucu üzerinde bütün IP adreslerinin kullanılması
+      gerekir; bunun için <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code>
+      yönergesine argüman olarak <code>*</code> belirtebilirsiniz. Çok sayıda
+      port kullanmayı planlıyorsanız (SSL çalıştırmak gibi), argümana
+      <code>*:80</code> şeklinde port ekleyebilirsiniz. Yalnız, <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> yönergesinde bir IP adresi
+      belirtmiÅŸ olmakla sunucunun kendiliÄŸinden o IP adresini dinlemeyeceÄŸine
+      dikkat ediniz. Bu konuda ayrıntılı bilgi edinmek için <a href="../bind.html">Apache’nin kullanacağı adreslerin ve portların
+      ayarlanması</a> belgesine bakınız. Ayrıca, sunucuda, burada belirttiğiniz
+      IP adresine sahip bir ağ arabirimi olmalıdır.</p>
+
+    <p>Sonraki adım sunacağınız her konak için ayrı bir <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> bölümü oluşturmaktır.
+      <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+      yönergesinin argümanı ile eşleşen bir <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> yönergesi tanımlanmış olmalıdır
+      (değer normalde "*:80" olacaktır). Her <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> bölümü içinde sunulan konağı
+      belirtmek üzere en azından bir adet <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> yönergesine ve konak içeriğinin dosya
+      sisteminde bulunduğu yeri gösteren bir <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> yönergesine
+      ihtiyacınız olacaktır.</p>
+
+    <div class="note"><h3>Ana konağı unutmayın</h3>
+        <p>Mevcut sitenize sanal konaklar eklerseniz, mevcut siteniz için de bir
+          <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> bölümü
+          oluşturmalısınız. Bu sanal konak bölümü içinde kullanacağınız
+          <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> ve <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> yönergelerinin argümanları, bu
+          yönergelerin  sunucu geneli için belirttiğiniz değerlerini
+          içermelidir. Bu sanal konağı yapılandırma dosyanızdaki ilk sanal konak
+          yapın ki, öntanımlı konak olsun.</p>
+    </div>
+
+    <p>Örnek olarak, <code>www.biralan.tld</code> adresinden sitenizi sunmakta
+      olduğunuzu ve bunun yanına aynı IP adresini kullanan
+      <code>www.digeralan.tld</code> sanal konağını eklemek istediğinizi
+      varsayalım. Bunun için <code>httpd.conf</code> dosyanıza basitçe şu
+      satırları ekleyebilirsiniz:</p>
+
+    <div class="example"><p><code>
+        NameVirtualHost *:80<br />
+        <br />
+        &lt;VirtualHost *:80&gt;<br />
+        <span class="indent">
+            ServerName www.biralan.tld<br />
+            ServerAlias biralan.tld *.biralan.tld<br />
+            DocumentRoot /siteler/biralan<br />
+        </span>
+        &lt;/VirtualHost&gt;<br />
+        <br />
+        &lt;VirtualHost *:80&gt;<br />
+        <span class="indent">ServerName www.digeralan.tld<br />
+            DocumentRoot /siteler/digeralan<br />
+        </span>
+        &lt;/VirtualHost&gt;<br />
+    </code></p></div>
+
+    <p>Ä°sterseniz, <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> ve
+      <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
+      yönergelerinde argüman olarak <code>*</code> yerine doğrudan bir IP adresi
+      belirtebilirsiniz. Hatta, daha sonra, isme dayalı sanal konakları bir IP
+      adresinden ve IP’ye dayalı olanları veya isme dayalı diğer bir sanal konak
+      grubunu diÄŸer IP adreslerinden sunmak isteyebilirsiniz.</p>
+
+    <p>Çoğu sunucunun birden fazla isim ile erişilebilir olması istenir. Bu,
+      <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> bölümü
+      içine bir <code class="directive"><a href="../mod/core.html#serveralias">ServerAlias</a></code> yönergesi
+      yerleştirmek suretiyle mümkün olur. Örneğin yukarıdaki örnekte,
+      kullanıcıların aynı siteye farklı isimlerle erişmelerini mümkün kılmak
+      için bölüm içine şu satırı ekleyebilirsiniz:</p>
+
+    <div class="example"><p><code>
+        ServerAlias biralan.tld *.biralan.tld
+    </code></p></div>
+
+    <p>Böylece <code>biralan.tld</code> alanındaki tüm konaklar için gelen
+      isteklere <code>www.biralan.tld</code> sanal konağından hizmet sunulmuş
+      olur. Konak isimleriyle eşleşmek üzere dosya ismi kalıp karakterleri
+      <code>*</code> ve <code>?</code> kullanılabilir. Şüphesiz bu isimleri sırf
+      <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> veya
+      <code>ServerAlias</code> yönergesinde belirtmiş olmakla bu isimleri
+      erişilebilir kılamazsınız. Öncelikle, bu isimleri sunucunuzdaki IP
+      adresleriyle eşlemek üzere yapılandıracağınız bir DNS sunucunuz
+      olmalıdır.</p>
+
+    <p>Son olarak, sanal konak yapılandırmanıza, <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> bölümlerinin içine başka yönergeler
+      yerleştirerek ince ayar çekebilirsiniz. Çoğu yönerge bu bölümlere
+      yerleştirilebilir ve sadece o sanal konakla ilgili yapılandırmayı
+      değiştirmek için kullanılabilir. Belli bir yönergenin sanal konak
+      bölümlerinde kullanılıp kullanılmayacağını yönergenin açıklamasında <a href="../mod/directive-dict.html#Context">Bağlam</a> satırına bakarak
+      öğrenebilirsiniz. <em>Ana sunucu bağlamındaki</em> (<code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> bölümleri dışındaki)
+      yapılandırma yönergelerinden sadece sanal konak bölümlerinde geçersiz
+      kılınmamış olanlar kullanılacaktır.</p>
+
+    <p>Sunucuya bir istek geldiğinde, sunucu önce IP adresiyle eşleşmesi olası
+      <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> bölümleri var mı diye
+      bakar. Varsa, IP adresini eşleştirmek için <code class="directive"><a href="../mod/core.html#namevirtualhost">NameVirtualHost</a></code> bölümlerine tek tek bakar ve
+      istenen konak ismi ile eşleşen bir <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> veya <code>ServerAlias</code> yönergesi bulmaya
+      çalışır. Bir tane bulduğunda, sunucu için onun yapılandırmasını kullanır.
+      Ä°simle eÅŸleÅŸen bir sanal konak bulamazsa IP adresiyle eÅŸleÅŸen <strong>ilk
+      sanal konağın</strong> yapılandırmasını kullanır.</p>
+
+    <p>Bir önkabul olarak yapılandırma dosyasında rastlanan ilk sanal konak
+      <em>öntanımlı</em> sanal konaktır. IP adresi bir sanal konakla eşleştiği
+      takdirde <em>ana sunucunun</em> <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> değeri <strong>asla</strong> kullanılmayacaktır.
+      Sanal konaklardan hiçbiriyle eşleşmeyen istekler için özel bir
+      yapılandırmanız olsun isterseniz, bu yapılandırmayı yapılandırma
+      dosyanızdaki ilk <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> bölümüne yerleştirmeniz
+      yetecektir.</p>
+
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="compat" id="compat">Artık Tarihe Karışmış Tarayıcılarla Uyumluluk</a></h2>
+
+    <p>Evvelce de bahsedildiği gibi, isme dayalı sanal konakların gerektiği gibi
+      çalışması için gerekli veriyi göndermeyen bazı istemciler vardır. Bu
+      istemcilere daima o IP adresinin yapılandırma dosyasındaki ilk sanal
+      konağının (isme dayalı <cite>başat</cite> sanal konak) sayfaları
+      gönderilir.</p>
+
+    <div class="note"><h3>Ne kadar eski?</h3>
+    <p>Lütfen dikkat edin, eski deyince gerçekten de antika demek istiyoruz.
+      Günümüzde bu tür tarayıcılara rastlamanız neredeyse imkansızdır. Günümüz
+      tarayıcılarının hepsi isme dayalı sanal konakların gerektirdiği
+      <code>Host</code> başlığını gönderirler.</p>
+    </div>
+
+    <p>Olayı fazla germeden <code class="directive"><a href="../mod/core.html#serverpath">ServerPath</a></code>
+      yönergesini kullanarak sorunun çevresinden dolanmak mümkündür:</p>
+
+    <p>Örnek yapılandırma:</p>
+
+    <div class="example"><p><code>
+        NameVirtualHost 111.22.33.44<br />
+        <br />
+        &lt;VirtualHost 111.22.33.44&gt;<br />
+        <span class="indent">
+            ServerName www.biralan.tld<br />
+            ServerPath /biralan<br />
+            DocumentRoot /siteler/biralan<br />
+        </span>
+        &lt;/VirtualHost&gt;<br />
+    </code></p></div>
+
+    <p>Bu ne anlama geliyor? Anlamı, "<code>/biralan</code>" ile başlayan her
+      URI isteği <code>www.biralan.tld</code> sanal konağı tarafından sunulacak,
+      demektir. Yani, tüm istemcilerin
+      <code>http://www.biralan.tld/biralan/</code> olarak eriÅŸtiÄŸi yere
+      <code>Host:</code> başlığı gönderen istemciler
+      <code>http://www.biralan.tld/</code> olarak eriÅŸirler.</p>
+
+    <p>Bunu gerçekleştirebilmek için başat sanal konağın baş sayfasına
+      <code>http://www.biralan.tld/biralan/</code> için bir bağ koyduktan sonra
+      sanal konağın sayfalarında ya tamamen göreli bağlar
+      ("<code>dosya.html</code>", "<code>../simgeler/resim.png</code>" gibi)
+      veya <code>/biralan/</code> ile öncelenmiş bağlar
+      ("<code>http://www.biralan.tld/biralan/muht/dosya.html</code>" veya
+      "<code>/biralan/muht/dosya.html</code>" gibi) kullanın.</p>
+
+    <p>Bu işlem biraz disiplin gerektirse de bu yazılanlara sıkı sıkıya bağlı
+      kalarak hem eski hem de yeni tarayıcıların sayfalarınızı doğru
+      görüntülemesini sağlamış olursunuz.</p>
+
+</div></div>
+<div class="bottomlang">
+<p><span>Mevcut Diller: </span><a href="../de/vhosts/name-based.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
+<a href="../en/vhosts/name-based.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/vhosts/name-based.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a> |
+<a href="../ja/vhosts/name-based.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
+<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
+<a href="../tr/vhosts/name-based.html" title="Türkçe">&nbsp;tr&nbsp;</a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br /><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a> altında lisanslıdır.</p>
+<p class="menu"><a href="../mod/">Modüller</a> | <a href="../mod/directives.html">Yönergeler</a> | <a href="../faq/">SSS</a> | <a href="../glossary.html">Terimler</a> | <a href="../sitemap.html">Site Haritası</a></p></div>
+</body></html>
\ No newline at end of file
diff --git a/httpd.spec b/httpd.spec
index d04ec50e..1e94c685 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -9,7 +9,7 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.8
+Version: 2.2.9
 Release: 1
 URL: http://httpd.apache.org/
 Vendor: Apache Software Foundation
diff --git a/include/ap_config_auto.h.in b/include/ap_config_auto.h.in
index 95323f08..fa084649 100644
--- a/include/ap_config_auto.h.in
+++ b/include/ap_config_auto.h.in
@@ -220,13 +220,6 @@
 /* Path to suexec binary */
 #undef SUEXEC_BIN
 
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-
 /* Define to 1 if on MINIX. */
 #undef _MINIX
 
@@ -237,6 +230,28 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 380346b2..2c226b6c 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -120,6 +120,14 @@
  * 20051115.9 (2.2.7)  Add ap_send_interim_response API
  * 20051115.10(2.2.7)  Added ap_mod_status_reqtail (minor)
  * 20051115.11(2.2.7)  Add *ftp_directory_charset to proxy_dir_conf
+ * 20051115.12(2.2.8)  Add optional function ap_logio_add_bytes_in() to mog_logio
+ * 20051115.13(2.2.9)  Add disablereuse and disablereuse_set
+ *                     to proxy_worker struct (minor)
+ * 20051115.14(2.2.9)  Add ap_proxy_ssl_connection_cleanup and
+ *                     add *scpool, *r and need_flush to proxy_conn_rec
+ *                     structure
+ * 20051115.15(2.2.9)  Add interpolate_env to proxy_dir_conf and
+ *                     introduce proxy_req_conf.
  *
  */
 
@@ -128,7 +136,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20051115
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 11                    /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 15                    /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
diff --git a/include/ap_release.h b/include/ap_release.h
index 1e505f06..af9b3233 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -45,7 +45,7 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 2
-#define AP_SERVER_PATCHLEVEL_NUMBER   8
+#define AP_SERVER_PATCHLEVEL_NUMBER   9
 #define AP_SERVER_DEVBUILD_BOOLEAN    0
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
diff --git a/include/http_core.h b/include/http_core.h
index 28f2856f..395ac421 100644
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -672,6 +672,9 @@ AP_DECLARE_HOOK(int, get_mgmt_items,
 APR_DECLARE_OPTIONAL_FN(void, ap_logio_add_bytes_out,
                         (conn_rec *c, apr_off_t bytes));
 
+APR_DECLARE_OPTIONAL_FN(void, ap_logio_add_bytes_in,
+                        (conn_rec *c, apr_off_t bytes));
+
 /* ----------------------------------------------------------------------
  *
  * ident lookups with mod_ident
diff --git a/include/httpd.h b/include/httpd.h
index 15e1f11d..542b6eaa 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -666,6 +666,8 @@ struct ap_method_list_t {
 #define LF '\n'
 #define CRLF "\r\n"
 #endif /* APR_CHARSET_EBCDIC */                                   
+/** Useful for common code with either platform charset. */
+#define CRLF_ASCII "\015\012"
 
 /**
  * @defgroup values_request_rec_body Possible values for request_rec.read_body 
diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index e2c057d2..3cdd0a26 100644
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -34,7 +34,10 @@ APACHE_MODULE(authz_owner, 'require file-owner' authorization control, , , most)
 
 dnl LDAP authentication module. This module has both the authn and authz
 dnl modules in one, so as to share the LDAP server config directives.
-APACHE_MODULE(authnz_ldap, LDAP based authentication, , , no)
+APACHE_MODULE(authnz_ldap, LDAP based authentication, , , no, [
+  MOD_AUTHNZ_LDAP_LDADD="`$apu_config --ldap-libs`" || MOD_AUTHNZ_LDAP_LDADD=""
+  AC_SUBST(MOD_AUTHNZ_LDAP_LDADD)
+])
 
 dnl - and just in case all of the above punt; a default handler to
 dnl keep the bad guys out.
diff --git a/modules/aaa/mod_authn_dbd.c b/modules/aaa/mod_authn_dbd.c
index 3bcde864..3341171e 100644
--- a/modules/aaa/mod_authn_dbd.c
+++ b/modules/aaa/mod_authn_dbd.c
@@ -98,24 +98,29 @@ static authn_status authn_dbd_password(request_rec *r, const char *user,
     ap_dbd_t *dbd = authn_dbd_acquire_fn(r);
     if (dbd == NULL) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                      "Error looking up %s in database", user);
+                      "Failed to acquire database connection to look up "
+                      "user '%s'", user);
         return AUTH_GENERAL_ERROR;
     }
 
     if (conf->user == NULL) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "No AuthDBDUserPWQuery has been specified.");
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                      "No AuthDBDUserPWQuery has been specified");
         return AUTH_GENERAL_ERROR;
     }
 
     statement = apr_hash_get(dbd->prepared, conf->user, APR_HASH_KEY_STRING);
     if (statement == NULL) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "A prepared statement could not be found for AuthDBDUserPWQuery, key '%s'.", conf->user);
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                      "A prepared statement could not be found for "
+                      "AuthDBDUserPWQuery with the key '%s'", conf->user);
         return AUTH_GENERAL_ERROR;
     }
     if (apr_dbd_pvselect(dbd->driver, r->pool, dbd->handle, &res, statement,
                               0, user, NULL) != 0) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                      "Error looking up %s in database", user);
+                      "Query execution error looking up '%s' "
+                      "in database", user);
         return AUTH_GENERAL_ERROR;
     }
     for (rv = apr_dbd_get_row(dbd->driver, r->pool, res, &row, -1);
@@ -123,12 +128,11 @@ static authn_status authn_dbd_password(request_rec *r, const char *user,
          rv = apr_dbd_get_row(dbd->driver, r->pool, res, &row, -1)) {
         if (rv != 0) {
             ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
-                      "Error looking up %s in database", user);
+                          "Error retrieving results while looking up '%s' "
+                          "in database", user);
             return AUTH_GENERAL_ERROR;
         }
         if (dbd_password == NULL) {
-            dbd_password = apr_dbd_get_entry(dbd->driver, row, 0);
-
 #if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
             /* add the rest of the columns to the environment */
             int i = 1;
@@ -155,6 +159,7 @@ static authn_status authn_dbd_password(request_rec *r, const char *user,
                 i++;
             }
 #endif
+            dbd_password = apr_dbd_get_entry(dbd->driver, row, 0);
         }
         /* we can't break out here or row won't get cleaned up */
     }
@@ -185,22 +190,27 @@ static authn_status authn_dbd_realm(request_rec *r, const char *user,
     ap_dbd_t *dbd = authn_dbd_acquire_fn(r);
     if (dbd == NULL) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                      "Error looking up %s in database", user);
+                      "Failed to acquire database connection to look up "
+                      "user '%s:%s'", user, realm);
         return AUTH_GENERAL_ERROR;
     }
     if (conf->realm == NULL) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "No AuthDBDUserRealmQuery has been specified.");
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                      "No AuthDBDUserRealmQuery has been specified");
         return AUTH_GENERAL_ERROR;
     }
     statement = apr_hash_get(dbd->prepared, conf->realm, APR_HASH_KEY_STRING);
     if (statement == NULL) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "A prepared statement could not be found for AuthDBDUserRealmQuery, key '%s'.", conf->realm);
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                      "A prepared statement could not be found for "
+                      "AuthDBDUserRealmQuery with the key '%s'", conf->realm);
         return AUTH_GENERAL_ERROR;
     }
     if (apr_dbd_pvselect(dbd->driver, r->pool, dbd->handle, &res, statement,
                               0, user, realm, NULL) != 0) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                      "Error looking up %s:%s in database", user, realm);
+                      "Query execution error looking up '%s:%s' "
+                      "in database", user, realm);
         return AUTH_GENERAL_ERROR;
     }
     for (rv = apr_dbd_get_row(dbd->driver, r->pool, res, &row, -1);
@@ -208,12 +218,11 @@ static authn_status authn_dbd_realm(request_rec *r, const char *user,
          rv = apr_dbd_get_row(dbd->driver, r->pool, res, &row, -1)) {
         if (rv != 0) {
             ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
-                      "Error looking up %s in database", user);
+                          "Error retrieving results while looking up '%s:%s' "
+                          "in database", user, realm);
             return AUTH_GENERAL_ERROR;
         }
         if (dbd_hash == NULL) {
-            dbd_hash = apr_dbd_get_entry(dbd->driver, row, 0);
-
 #if APU_MAJOR_VERSION > 1 || (APU_MAJOR_VERSION == 1 && APU_MINOR_VERSION >= 3)
             /* add the rest of the columns to the environment */
             int i = 1;
@@ -240,6 +249,7 @@ static authn_status authn_dbd_realm(request_rec *r, const char *user,
                 i++;
             }
 #endif
+            dbd_hash = apr_dbd_get_entry(dbd->driver, row, 0);
         }
         /* we can't break out here or row won't get cleaned up */
     }
diff --git a/modules/aaa/mod_authz_host.c b/modules/aaa/mod_authz_host.c
index 5b9ec338..a502951c 100644
--- a/modules/aaa/mod_authz_host.c
+++ b/modules/aaa/mod_authz_host.c
@@ -297,8 +297,9 @@ static int check_dir_access(request_rec *r)
     if (ret == HTTP_FORBIDDEN
         && (ap_satisfies(r) != SATISFY_ANY || !ap_some_auth_required(r))) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-            "client denied by server configuration: %s",
-            r->filename);
+            "client denied by server configuration: %s%s",
+            r->filename ? "" : "uri ",
+            r->filename ? r->filename : r->uri);
     }
 
     return ret;
diff --git a/modules/cache/cache_cache.c b/modules/cache/cache_cache.c
index 860800bb..4fc95d73 100644
--- a/modules/cache/cache_cache.c
+++ b/modules/cache/cache_cache.c
@@ -44,7 +44,7 @@ struct cache_cache_t  {
     cache_cache_free *free_entry;
 };
 
-CACHE_DECLARE(cache_cache_t *)cache_init(int max_entries,
+cache_cache_t* cache_init(int max_entries,
                                          apr_size_t max_size,
                                          cache_pqueue_get_priority get_pri,
                                          cache_pqueue_set_priority set_pri,
@@ -75,7 +75,7 @@ CACHE_DECLARE(cache_cache_t *)cache_init(int max_entries,
     return tmp;
 }
 
-CACHE_DECLARE(void) cache_free(cache_cache_t *c)
+void cache_free(cache_cache_t *c)
 {
     cache_pq_free(c->pq);
     cache_hash_free(c->ht);
@@ -83,12 +83,12 @@ CACHE_DECLARE(void) cache_free(cache_cache_t *c)
 }
 
 
-CACHE_DECLARE(void*) cache_find(cache_cache_t* c, const char *key)
+void* cache_find(cache_cache_t* c, const char *key)
 {
     return cache_hash_get(c->ht, key, CACHE_HASH_KEY_STRING);
 }
 
-CACHE_DECLARE(void) cache_update(cache_cache_t* c, void *entry)
+void cache_update(cache_cache_t* c, void *entry)
 {
     long old_priority;
     long new_priority;
@@ -99,7 +99,7 @@ CACHE_DECLARE(void) cache_update(cache_cache_t* c, void *entry)
     cache_pq_change_priority(c->pq, old_priority, new_priority, entry);
 }
 
-CACHE_DECLARE(void) cache_insert(cache_cache_t* c, void *entry)
+void cache_insert(cache_cache_t* c, void *entry)
 {
     void *ejected = NULL;
     long priority;
@@ -132,7 +132,7 @@ CACHE_DECLARE(void) cache_insert(cache_cache_t* c, void *entry)
     cache_hash_set(c->ht, c->key_entry(entry), CACHE_HASH_KEY_STRING, entry);
 }
 
-CACHE_DECLARE(void *) cache_pop(cache_cache_t *c)
+void* cache_pop(cache_cache_t *c)
 {
     void *entry;
 
@@ -150,7 +150,7 @@ CACHE_DECLARE(void *) cache_pop(cache_cache_t *c)
     return entry;
 }
 
-CACHE_DECLARE(apr_status_t) cache_remove(cache_cache_t *c, void *entry)
+apr_status_t cache_remove(cache_cache_t *c, void *entry)
 {
     apr_size_t entry_size = c->size_entry(entry);
     apr_status_t rc;
diff --git a/modules/cache/cache_cache.h b/modules/cache/cache_cache.h
index 042c5d50..e805cf20 100644
--- a/modules/cache/cache_cache.h
+++ b/modules/cache/cache_cache.h
@@ -57,7 +57,7 @@ typedef void cache_cache_free(void *a);
  * @param key_entry   callback to get the key of a entry
  * @param free_entry  callback to free an entry
  */
-CACHE_DECLARE(cache_cache_t *)cache_init(int max_entries, 
+cache_cache_t* cache_init(int max_entries, 
                                          apr_size_t max_size,
                                          cache_pqueue_get_priority get_pri,
                                          cache_pqueue_set_priority set_pri,
@@ -72,37 +72,37 @@ CACHE_DECLARE(cache_cache_t *)cache_init(int max_entries,
  * free up the cache
  * @param c the cache
  */
-CACHE_DECLARE(void) cache_free(cache_cache_t *c);
+void cache_free(cache_cache_t *c);
 /**
  * find a entry in the cache, incrementing the frequency if found
  * @param c the cache
  * @param key the key
  */
-CACHE_DECLARE(void*) cache_find(cache_cache_t* c, const char *key);
+void* cache_find(cache_cache_t* c, const char *key);
 /** 
  * insert a entry into the cache
  * @param c the cache
  * @param entry the entry
  */
-CACHE_DECLARE(void) cache_update(cache_cache_t* c, void *entry);
+void cache_update(cache_cache_t* c, void *entry);
 /** 
  * insert a entry into the cache
  * @param c the cache
  * @param entry the entry
  */
-CACHE_DECLARE(void) cache_insert(cache_cache_t* c, void *entry);
+void cache_insert(cache_cache_t* c, void *entry);
 /**
  * pop the lowest priority item off
  * @param c the cache
  * @returns the entry or NULL
  */
-CACHE_DECLARE(void *)cache_pop(cache_cache_t* c);
+void* cache_pop(cache_cache_t* c);
 /** 
  * remove an item from the cache 
  * @param c the cache
  * @param entry the actual entry (from a find)
  */
-CACHE_DECLARE(apr_status_t) cache_remove(cache_cache_t* c, void *entry);
+apr_status_t cache_remove(cache_cache_t* c, void *entry);
 #ifdef __cplusplus
 }
 #endif
diff --git a/modules/cache/cache_hash.c b/modules/cache/cache_hash.c
index 2ac26ec8..202cf9f7 100644
--- a/modules/cache/cache_hash.c
+++ b/modules/cache/cache_hash.c
@@ -80,7 +80,7 @@ static cache_hash_entry_t **alloc_array(cache_hash_t *ht, int max)
    return calloc(1, sizeof(*ht->array) * (max + 1));
 }
 
-CACHE_DECLARE(cache_hash_t *) cache_hash_make(apr_size_t size)
+cache_hash_t* cache_hash_make(apr_size_t size)
 {
     cache_hash_t *ht;
     ht = malloc(sizeof(cache_hash_t));
@@ -97,7 +97,7 @@ CACHE_DECLARE(cache_hash_t *) cache_hash_make(apr_size_t size)
     return ht;
 }
 
-CACHE_DECLARE(void) cache_hash_free(cache_hash_t *ht)
+void cache_hash_free(cache_hash_t *ht)
 {
     if (ht) {
         if (ht->array) {
@@ -110,7 +110,7 @@ CACHE_DECLARE(void) cache_hash_free(cache_hash_t *ht)
  * Hash iteration functions.
  */
 
-CACHE_DECLARE(cache_hash_index_t *) cache_hash_next(cache_hash_index_t *hi)
+cache_hash_index_t* cache_hash_next(cache_hash_index_t *hi)
 {
     hi->this = hi->next;
     while (!hi->this) {
@@ -122,7 +122,7 @@ CACHE_DECLARE(cache_hash_index_t *) cache_hash_next(cache_hash_index_t *hi)
     return hi;
 }
 
-CACHE_DECLARE(cache_hash_index_t *) cache_hash_first(cache_hash_t *ht)
+cache_hash_index_t* cache_hash_first(cache_hash_t *ht)
 {
     cache_hash_index_t *hi;
 
@@ -134,7 +134,7 @@ CACHE_DECLARE(cache_hash_index_t *) cache_hash_first(cache_hash_t *ht)
     return cache_hash_next(hi);
 }
 
-CACHE_DECLARE(void) cache_hash_this(cache_hash_index_t *hi,
+void cache_hash_this(cache_hash_index_t *hi,
                                   const void **key,
                                   apr_ssize_t *klen,
                                   void **val)
@@ -240,7 +240,7 @@ static cache_hash_entry_t **find_entry(cache_hash_t *ht,
     return hep;
 }
 
-CACHE_DECLARE(void *) cache_hash_get(cache_hash_t *ht,
+void* cache_hash_get(cache_hash_t *ht,
                                    const void *key,
                                    apr_ssize_t klen)
 {
@@ -252,7 +252,7 @@ CACHE_DECLARE(void *) cache_hash_get(cache_hash_t *ht,
         return NULL;
 }
 
-CACHE_DECLARE(void *) cache_hash_set(cache_hash_t *ht,
+void* cache_hash_set(cache_hash_t *ht,
                                      const void *key,
                                      apr_ssize_t klen,
                                      const void *val)
@@ -284,7 +284,7 @@ CACHE_DECLARE(void *) cache_hash_set(cache_hash_t *ht,
     return NULL;
 }
 
-CACHE_DECLARE(int) cache_hash_count(cache_hash_t *ht)
+int cache_hash_count(cache_hash_t *ht)
 {
     return ht->count;
 }
diff --git a/modules/cache/cache_hash.h b/modules/cache/cache_hash.h
index 4138aca7..13a5eb4c 100644
--- a/modules/cache/cache_hash.h
+++ b/modules/cache/cache_hash.h
@@ -59,7 +59,7 @@ typedef struct cache_hash_index_t cache_hash_index_t;
  * @param size 
  * @return The hash table just created
   */
-CACHE_DECLARE(cache_hash_t *) cache_hash_make(apr_size_t size);
+cache_hash_t* cache_hash_make(apr_size_t size);
 
 /**
  * Create a hash table.
@@ -70,7 +70,7 @@ CACHE_DECLARE(cache_hash_t *) cache_hash_make(apr_size_t size);
  *         not removed from the cache prior to calling cache_hash_free()
  *         will be unaccessable.
  */
-CACHE_DECLARE(void) cache_hash_free(cache_hash_t *ht);
+void cache_hash_free(cache_hash_t *ht);
 
 
 /**
@@ -82,7 +82,7 @@ CACHE_DECLARE(void) cache_hash_free(cache_hash_t *ht);
  * @remark If the value is NULL the hash entry is deleted.
  * @return The value of the deleted cache entry (so the caller can clean it up).
  */
-CACHE_DECLARE(void *) cache_hash_set(cache_hash_t *ht, const void *key,
+void* cache_hash_set(cache_hash_t *ht, const void *key,
                                      apr_ssize_t klen, const void *val);
 
 /**
@@ -92,7 +92,7 @@ CACHE_DECLARE(void *) cache_hash_set(cache_hash_t *ht, const void *key,
  * @param klen Length of the key. Can be CACHE_HASH_KEY_STRING to use the string length.
  * @return Returns NULL if the key is not present.
  */
-CACHE_DECLARE(void *) cache_hash_get(cache_hash_t *ht, const void *key,
+void* cache_hash_get(cache_hash_t *ht, const void *key,
                                    apr_ssize_t klen);
 
 /**
@@ -121,7 +121,7 @@ CACHE_DECLARE(void *) cache_hash_get(cache_hash_t *ht, const void *key,
  * progress at the same time.
  * </PRE>
   */
-CACHE_DECLARE(cache_hash_index_t *) cache_hash_first(cache_hash_t *ht);
+cache_hash_index_t* cache_hash_first(cache_hash_t *ht);
 
 /**
  * Continue iterating over the entries in a hash table.
@@ -129,7 +129,7 @@ CACHE_DECLARE(cache_hash_index_t *) cache_hash_first(cache_hash_t *ht);
  * @return a pointer to the updated iteration state.  NULL if there are no more  
  *         entries.
  */
-CACHE_DECLARE(cache_hash_index_t *) cache_hash_next(cache_hash_index_t *hi);
+cache_hash_index_t* cache_hash_next(cache_hash_index_t *hi);
 
 /**
  * Get the current entry's details from the iteration state.
@@ -140,7 +140,7 @@ CACHE_DECLARE(cache_hash_index_t *) cache_hash_next(cache_hash_index_t *hi);
  * @remark The return pointers should point to a variable that will be set to the
  *         corresponding data, or they may be NULL if the data isn't interesting.
  */
-CACHE_DECLARE(void) cache_hash_this(cache_hash_index_t *hi, const void **key, 
+void cache_hash_this(cache_hash_index_t *hi, const void **key, 
                                   apr_ssize_t *klen, void **val);
 
 /**
@@ -148,7 +148,7 @@ CACHE_DECLARE(void) cache_hash_this(cache_hash_index_t *hi, const void **key,
  * @param ht The hash table
  * @return The number of key/value pairs in the hash table.
  */
-CACHE_DECLARE(int) cache_hash_count(cache_hash_t *ht);
+int cache_hash_count(cache_hash_t *ht);
 
 
 /** @} */
diff --git a/modules/cache/cache_storage.c b/modules/cache/cache_storage.c
index 0ddf82dd..7b99f3ed 100644
--- a/modules/cache/cache_storage.c
+++ b/modules/cache/cache_storage.c
@@ -286,6 +286,13 @@ int cache_select(request_rec *r)
                 apr_table_unset(r->headers_in, "If-Range");
                 apr_table_unset(r->headers_in, "If-Unmodified-Since");
 
+                /*
+                 * Do not do Range requests with our own conditionals: If
+                 * we get 304 the Range does not matter and otherwise the
+                 * entity changed and we want to have the complete entity
+                 */
+                apr_table_unset(r->headers_in, "Range");
+
                 etag = apr_table_get(h->resp_hdrs, "ETag");
                 lastmod = apr_table_get(h->resp_hdrs, "Last-Modified");
 
diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c
index 75d35bd6..78770ffd 100644
--- a/modules/cache/cache_util.c
+++ b/modules/cache/cache_util.c
@@ -235,6 +235,14 @@ CACHE_DECLARE(int) ap_cache_check_freshness(cache_handle_t *h,
     cc_cresp = apr_table_get(h->resp_hdrs, "Cache-Control");
     expstr = apr_table_get(h->resp_hdrs, "Expires");
 
+    if (ap_cache_liststr(NULL, cc_cresp, "no-cache", NULL)) {
+        /*
+         * The cached entity contained Cache-Control: no-cache, so treat as
+         * stale causing revalidation
+         */
+        return 0;
+    }
+
     if ((agestr = apr_table_get(h->resp_hdrs, "Age"))) {
         age_c = apr_atoi64(agestr);
     }
diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 51341179..27df70d4 100644
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -613,6 +613,12 @@ static int cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
             cache->provider->remove_entity(cache->stale_handle);
             /* Treat the request as if it wasn't conditional. */
             cache->stale_handle = NULL;
+            /*
+             * Restore the original request headers as they may be needed
+             * by further output filters like the byterange filter to make
+             * the correct decisions.
+             */
+            r->headers_in = cache->stale_headers;
         }
     }
 
diff --git a/modules/cache/mod_cache.dsp b/modules/cache/mod_cache.dsp
index ba1653bf..40a1b34e 100644
--- a/modules/cache/mod_cache.dsp
+++ b/modules/cache/mod_cache.dsp
@@ -104,18 +104,6 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
 
-SOURCE=.\cache_cache.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cache_hash.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cache_pqueue.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\cache_storage.c
 # End Source File
 # Begin Source File
@@ -132,18 +120,6 @@ SOURCE=.\mod_cache.c
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=.\cache_cache.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cache_hash.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cache_pqueue.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\mod_cache.h
 # End Source File
 # End Group
diff --git a/modules/cache/mod_mem_cache.dsp b/modules/cache/mod_mem_cache.dsp
index 003e4efc..7b8ebbb9 100644
--- a/modules/cache/mod_mem_cache.dsp
+++ b/modules/cache/mod_mem_cache.dsp
@@ -99,14 +99,46 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma
 
 # Name "mod_mem_cache - Win32 Release"
 # Name "mod_mem_cache - Win32 Debug"
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\cache_cache.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\cache_hash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\cache_pqueue.h
+# End Source File
 # Begin Source File
 
 SOURCE=.\mod_cache.h
 # End Source File
+# End Group
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# Begin Source File
+
+SOURCE=.\cache_cache.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\cache_hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\cache_pqueue.c
+# End Source File
 # Begin Source File
 
 SOURCE=.\mod_mem_cache.c
 # End Source File
+# End Group
 # Begin Source File
 
 SOURCE=..\..\build\win32\httpd.rc
diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 24699bc0..c57bffb3 100644
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -2638,6 +2638,11 @@ static int dav_method_copymove(request_rec *r, int is_move)
                                   "Destination URI had an error.");
     }
 
+    if (dav_get_provider(lookup.rnew) == NULL) {
+        return dav_error_response(r, HTTP_METHOD_NOT_ALLOWED,
+                                  "DAV not enabled for Destination URI.");
+    }
+
     /* Resolve destination resource */
     err = dav_get_resource(lookup.rnew, 0 /* label_allowed */,
                            0 /* use_checked_in */, &resnew);
diff --git a/modules/filters/mod_charset_lite.c b/modules/filters/mod_charset_lite.c
index ed8ecbe5..a44ecc33 100644
--- a/modules/filters/mod_charset_lite.c
+++ b/modules/filters/mod_charset_lite.c
@@ -76,6 +76,8 @@ typedef struct charset_dir_t {
     const char *charset_default; /* how to ship on wire */
     /** module does ap_add_*_filter()? */
     enum {IA_INIT, IA_IMPADD, IA_NOIMPADD} implicit_add;
+    /** treat all mimetypes as text? */
+    enum {FX_INIT, FX_FORCE, FX_NOFORCE} force_xlate;
 } charset_dir_t;
 
 /* charset_filter_ctx_t is created for each filter instance; because the same
@@ -138,6 +140,8 @@ static void *merge_charset_dir_conf(apr_pool_t *p, void *basev, void *overridesv
         over->charset_source ? over->charset_source : base->charset_source;
     a->implicit_add =
         over->implicit_add != IA_INIT ? over->implicit_add : base->implicit_add;
+    a->force_xlate=
+        over->force_xlate != FX_INIT ? over->force_xlate : base->force_xlate;
     return a;
 }
 
@@ -176,6 +180,12 @@ static const char *add_charset_options(cmd_parms *cmd, void *in_dc,
     else if (!strcasecmp(flag, "NoImplicitAdd")) {
         dc->implicit_add = IA_NOIMPADD;
     }
+    if (!strcasecmp(flag, "TranslateAllMimeTypes")) {
+        dc->force_xlate = FX_FORCE;
+    }
+    else if (!strcasecmp(flag, "NoTranslateAllMimeTypes")) {
+        dc->force_xlate = FX_NOFORCE;
+    }
     else if (!strncasecmp(flag, "DebugLevel=", 11)) {
         dc->debug = atoi(flag + 11);
     }
@@ -803,7 +813,8 @@ static apr_status_t xlate_out_filter(ap_filter_t *f, apr_bucket_brigade *bb)
          */
             strcmp(mime_type, DIR_MAGIC_TYPE) == 0 ||
 #endif
-            strncasecmp(mime_type, "message/", 8) == 0) {
+            strncasecmp(mime_type, "message/", 8) == 0 || 
+            dc->force_xlate == FX_FORCE) {
 
             rv = apr_xlate_open(&ctx->xlate,
                                 dc->charset_default, dc->charset_source, f->r->pool);
@@ -1091,7 +1102,8 @@ static const command_rec cmds[] =
                     add_charset_options,
                     NULL,
                     OR_FILEINFO,
-                    "valid options: ImplicitAdd, NoImplicitAdd, DebugLevel=n"),
+                    "valid options: ImplicitAdd, NoImplicitAdd, TranslateAllMimeTypes, "
+                    "NoTranslateAllMimeTypes, DebugLevel=n"),
     {NULL}
 };
 
diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index db8b5faa..1c683880 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -3307,6 +3307,7 @@ static apr_status_t send_parsed_content(ap_filter_t *f, apr_bucket_brigade *bb)
             if (store) {
                 if (index) {
                     APR_BUCKET_REMOVE(b);
+                    apr_bucket_setaside(b, r->pool);
                     APR_BRIGADE_INSERT_TAIL(intern->tmp_bb, b);
                     b = newb;
                 }
@@ -3359,6 +3360,7 @@ static apr_status_t send_parsed_content(ap_filter_t *f, apr_bucket_brigade *bb)
             if (store) {
                 if (index) {
                     APR_BUCKET_REMOVE(b);
+                    apr_bucket_setaside(b, r->pool);
                     APR_BRIGADE_INSERT_TAIL(intern->tmp_bb, b);
                     b = newb;
                 }
@@ -3399,6 +3401,7 @@ static apr_status_t send_parsed_content(ap_filter_t *f, apr_bucket_brigade *bb)
             default:             /* partial match */
                 newb = APR_BUCKET_NEXT(b);
                 APR_BUCKET_REMOVE(b);
+                apr_bucket_setaside(b, r->pool);
                 APR_BRIGADE_INSERT_TAIL(intern->tmp_bb, b);
                 b = newb;
                 break;
diff --git a/modules/filters/mod_substitute.c b/modules/filters/mod_substitute.c
index 592d1404..ebe860d6 100644
--- a/modules/filters/mod_substitute.c
+++ b/modules/filters/mod_substitute.c
@@ -103,6 +103,7 @@ static void do_pattmatch(ap_filter_t *f, apr_bucket *inb,
                          apr_pool_t *tmp_pool)
 {
     int i;
+    int force_quick = 0;
     ap_regmatch_t regm[AP_MAX_REG_MATCH];
     apr_size_t bytes;
     apr_size_t len;
@@ -128,6 +129,13 @@ static void do_pattmatch(ap_filter_t *f, apr_bucket *inb,
     apr_pool_create(&tpool, tmp_pool);
     scratch = NULL;
     fbytes = 0;
+    /*
+     * Simple optimization. If we only have one pattern, then
+     * we can safely avoid the overhead of flattening
+     */
+    if (cfg->patterns->nelts == 1) {
+       force_quick = 1;
+    }
     for (i = 0; i < cfg->patterns->nelts; i++) {
         for (b = APR_BRIGADE_FIRST(mybb);
              b != APR_BRIGADE_SENTINEL(mybb);
@@ -147,7 +155,7 @@ static void do_pattmatch(ap_filter_t *f, apr_bucket *inb,
                     {
                         /* get offset into buff for pattern */
                         len = (apr_size_t) (repl - buff);
-                        if (script->flatten) {
+                        if (script->flatten && !force_quick) {
                             /*
                              * We are flattening the buckets here, meaning
                              * that we don't do the fast bucket splits.
@@ -181,7 +189,7 @@ static void do_pattmatch(ap_filter_t *f, apr_bucket *inb,
                         bytes -= len;
                         buff += len;
                     }
-                    if (script->flatten && s1) {
+                    if (script->flatten && s1 && !force_quick) {
                         /*
                          * we've finished looking at the bucket, so remove the
                          * old one and add in our new one
@@ -219,7 +227,7 @@ static void do_pattmatch(ap_filter_t *f, apr_bucket *inb,
                         /* first, grab the replacement string */
                         repl = ap_pregsub(tmp_pool, script->replacement, p,
                                           AP_MAX_REG_MATCH, regm);
-                        if (script->flatten) {
+                        if (script->flatten && !force_quick) {
                             SEDSCAT(s1, s2, tmp_pool, p, regm[0].rm_so, repl);
                         }
                         else {
@@ -236,7 +244,7 @@ static void do_pattmatch(ap_filter_t *f, apr_bucket *inb,
                          */
                         p += regm[0].rm_eo;
                     }
-                    if (script->flatten && s1) {
+                    if (script->flatten && s1 && !force_quick) {
                         s1 = apr_pstrcat(tmp_pool, s1, p, NULL);
                         tmp_b = apr_bucket_transient_create(s1, strlen(s1),
                                             f->r->connection->bucket_alloc);
@@ -488,7 +496,7 @@ static const char *set_pattern(cmd_parms *cmd, void *cfg, const char *line)
     subst_pattern_t *nscript;
     int is_pattern = 0;
     int ignore_case = 0;
-    int flatten = 0;
+    int flatten = 1;
     ap_regex_t *r = NULL;
 
     if (apr_tolower(*line) != 's') {
@@ -525,8 +533,10 @@ static const char *set_pattern(cmd_parms *cmd, void *cfg, const char *line)
             is_pattern = 1;
         else if (delim == 'f')
             flatten = 1;
+        else if (delim == 'q')
+            flatten = 0;
         else
-            return "Bad Substitute flag, only s///[inf] are supported";
+            return "Bad Substitute flag, only s///[infq] are supported";
         flags++;
     }
 
diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index db5c5048..edbdf7b7 100644
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -93,6 +93,15 @@ static const char *sockname;
 static pid_t parent_pid;
 static ap_unix_identity_t empty_ugid = { (uid_t)-1, (gid_t)-1, -1 };
 
+/* The APR other-child API doesn't tell us how the daemon exited
+ * (SIGSEGV vs. exit(1)).  The other-child maintenance function
+ * needs to decide whether to restart the daemon after a failure
+ * based on whether or not it exited due to a fatal startup error
+ * or something that happened at steady-state.  This exit status
+ * is unlikely to collide with exit signals.
+ */
+#define DAEMON_STARTUP_ERROR 254
+
 /* Read and discard the data in the brigade produced by a CGI script */
 static void discard_script_output(apr_bucket_brigade *bb);
 
@@ -256,9 +265,15 @@ static void cgid_maint(int reason, void *data, apr_wait_t status)
                 stopping = 0;
             }
             if (!stopping) {
-                ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
-                             "cgid daemon process died, restarting");
-                cgid_start(root_pool, root_server, proc);
+                if (status == DAEMON_STARTUP_ERROR) {
+                    ap_log_error(APLOG_MARK, APLOG_CRIT, 0, NULL,
+                                 "cgid daemon failed to initialize");
+                }
+                else {
+                    ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
+                                 "cgid daemon process died, restarting");
+                    cgid_start(root_pool, root_server, proc);
+                }
             }
             break;
         case APR_OC_REASON_RESTART:
@@ -560,6 +575,7 @@ static int cgid_server(void *data)
     apr_pool_t *ptrans;
     server_rec *main_server = data;
     apr_hash_t *script_hash = apr_hash_make(pcgi);
+    apr_status_t rv;
 
     apr_pool_create(&ptrans, pcgi);
 
@@ -594,6 +610,15 @@ static int cgid_server(void *data)
         return errno;
     }
 
+    /* Not all flavors of unix use the current umask for AF_UNIX perms */
+    rv = apr_file_perms_set(sockname, APR_FPROT_UREAD|APR_FPROT_UWRITE|APR_FPROT_UEXECUTE);
+    if (rv != APR_SUCCESS) {
+        ap_log_error(APLOG_MARK, APLOG_CRIT, rv, main_server,
+                     "Couldn't set permissions on unix domain socket %s",
+                     sockname);
+        return rv;
+    }
+
     if (listen(sd, DEFAULT_CGID_LISTENBACKLOG) < 0) {
         ap_log_error(APLOG_MARK, APLOG_ERR, errno, main_server,
                      "Couldn't listen on unix domain socket");
@@ -780,7 +805,7 @@ static int cgid_server(void *data)
             }
         }
     }
-    return -1;
+    return -1; /* should be <= 0 to distinguish from startup errors */
 }
 
 static int cgid_start(apr_pool_t *p, server_rec *main_server,
@@ -797,8 +822,7 @@ static int cgid_start(apr_pool_t *p, server_rec *main_server,
         if (pcgi == NULL) {
             apr_pool_create(&pcgi, p);
         }
-        cgid_server(main_server);
-        exit(-1);
+        exit(cgid_server(main_server) > 0 ? DAEMON_STARTUP_ERROR : -1);
     }
     procnew->pid = daemon_pid;
     procnew->err = procnew->in = procnew->out = NULL;
diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
index 7ad07ad6..9620fc9d 100644
--- a/modules/http/http_filters.c
+++ b/modules/http/http_filters.c
@@ -39,6 +39,7 @@
 #include "http_main.h"
 #include "http_request.h"
 #include "http_vhost.h"
+#include "http_connection.h"
 #include "http_log.h"           /* For errors detected in basic auth common
                                  * support code... */
 #include "apr_date.h"           /* For apr_date_parse_http and APR_DATE_BAD */
@@ -323,18 +324,23 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
             (ctx->state == BODY_LENGTH && ctx->remaining > 0)) &&
             f->r->expecting_100 && f->r->proto_num >= HTTP_VERSION(1,1) &&
             !(f->r->eos_sent || f->r->bytes_sent)) {
-            char *tmp;
+            if (!ap_is_HTTP_SUCCESS(f->r->status)) {
+                ctx->state = BODY_NONE;
+                ctx->eos_sent = 1;
+            } else {
+                char *tmp;
 
-            tmp = apr_pstrcat(f->r->pool, AP_SERVER_PROTOCOL, " ",
-                              ap_get_status_line(100), CRLF CRLF, NULL);
-            apr_brigade_cleanup(bb);
-            e = apr_bucket_pool_create(tmp, strlen(tmp), f->r->pool,
-                                       f->c->bucket_alloc);
-            APR_BRIGADE_INSERT_HEAD(bb, e);
-            e = apr_bucket_flush_create(f->c->bucket_alloc);
-            APR_BRIGADE_INSERT_TAIL(bb, e);
+                tmp = apr_pstrcat(f->r->pool, AP_SERVER_PROTOCOL, " ",
+                                  ap_get_status_line(100), CRLF CRLF, NULL);
+                apr_brigade_cleanup(bb);
+                e = apr_bucket_pool_create(tmp, strlen(tmp), f->r->pool,
+                                           f->c->bucket_alloc);
+                APR_BRIGADE_INSERT_HEAD(bb, e);
+                e = apr_bucket_flush_create(f->c->bucket_alloc);
+                APR_BRIGADE_INSERT_TAIL(bb, e);
 
-            ap_pass_brigade(f->c->output_filters, bb);
+                ap_pass_brigade(f->c->output_filters, bb);
+            }
         }
 
         /* We can't read the chunk until after sending 100 if required. */
@@ -420,6 +426,10 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
                           (APR_STATUS_IS_EAGAIN(rv)) )) {
                         return APR_EAGAIN;
                     }
+                    /* If we get an error, then leave */
+                    if (rv != APR_SUCCESS) {
+                        return rv;
+                    }
                     /*
                      * We really don't care whats on this line. If it is RFC
                      * compliant it should be only \r\n. If there is more
@@ -1047,12 +1057,23 @@ AP_DECLARE_NONSTD(int) ap_send_http_trace(request_rec *r)
     /* Now we recreate the request, and echo it back */
 
     bb = apr_brigade_create(r->pool, r->connection->bucket_alloc);
+#if APR_CHARSET_EBCDIC
+    {
+        char *tmp;
+        apr_size_t len;
+        len = strlen(r->the_request);
+        tmp = apr_pmemdup(r->pool, r->the_request, len);
+        ap_xlate_proto_to_ascii(tmp, len);
+        apr_brigade_putstrs(bb, NULL, NULL, tmp, CRLF_ASCII, NULL);
+    }
+#else
     apr_brigade_putstrs(bb, NULL, NULL, r->the_request, CRLF, NULL);
+#endif
     h.pool = r->pool;
     h.bb = bb;
     apr_table_do((int (*) (void *, const char *, const char *))
                  form_header_field, (void *) &h, r->headers_in, NULL);
-    apr_brigade_puts(bb, NULL, NULL, CRLF);
+    apr_brigade_puts(bb, NULL, NULL, CRLF_ASCII);
 
     /* If configured to accept a body, echo the body */
     if (bodylen) {
@@ -1082,6 +1103,7 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter(ap_filter_t *f,
     header_struct h;
     header_filter_ctx *ctx = f->ctx;
     const char *ctype;
+    ap_bucket_error *eb = NULL;
 
     AP_DEBUG_ASSERT(!r->main);
 
@@ -1099,13 +1121,23 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter(ap_filter_t *f,
          e != APR_BRIGADE_SENTINEL(b);
          e = APR_BUCKET_NEXT(e))
     {
-        if (AP_BUCKET_IS_ERROR(e)) {
-            ap_bucket_error *eb = e->data;
-
-            ap_die(eb->status, r);
-            return AP_FILTER_ERROR;
+        if (AP_BUCKET_IS_ERROR(e) && !eb) {
+            eb = e->data;
+            continue;
+        }
+        /*
+         * If we see an EOC bucket it is a signal that we should get out
+         * of the way doing nothing.
+         */
+        if (AP_BUCKET_IS_EOC(e)) {
+            ap_remove_output_filter(f);
+            return ap_pass_brigade(f->next, b);
         }
     }
+    if (eb) {
+        ap_die(eb->status, r);
+        return AP_FILTER_ERROR;
+    }
 
     if (r->assbackwards) {
         r->sent_bodyct = 1;
@@ -1169,10 +1201,22 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter(ap_filter_t *f,
 
     if (!apr_is_empty_array(r->content_languages)) {
         int i;
+        char *token;
         char **languages = (char **)(r->content_languages->elts);
-        for (i = 0; i < r->content_languages->nelts; ++i) {
-            apr_table_mergen(r->headers_out, "Content-Language", languages[i]);
+        const char *field = apr_table_get(r->headers_out, "Content-Language");
+
+        while (field && (token = ap_get_list_item(r->pool, &field)) != NULL) {
+            for (i = 0; i < r->content_languages->nelts; ++i) {
+                if (!strcasecmp(token, languages[i]))
+                    break;
+            }
+            if (i == r->content_languages->nelts) {
+                *((char **) apr_array_push(r->content_languages)) = token;
+            }
         }
+
+        field = apr_array_pstrcat(r->pool, r->content_languages, ',');
+        apr_table_setn(r->headers_out, "Content-Language", field);
     }
 
     /*
@@ -1524,13 +1568,24 @@ AP_DECLARE(long) ap_get_client_block(request_rec *r, char *buffer,
     return bufsiz;
 }
 
+/* Context struct for ap_http_outerror_filter */
+typedef struct {
+    int seen_eoc;
+} outerror_filter_ctx_t;
+
 /* Filter to handle any error buckets on output */
 apr_status_t ap_http_outerror_filter(ap_filter_t *f,
                                      apr_bucket_brigade *b)
 {
     request_rec *r = f->r;
+    outerror_filter_ctx_t *ctx = (outerror_filter_ctx_t *)(f->ctx);
     apr_bucket *e;
 
+    /* Create context if none is present */
+    if (!ctx) {
+        ctx = apr_pcalloc(r->pool, sizeof(outerror_filter_ctx_t));
+        f->ctx = ctx;
+    }
     for (e = APR_BRIGADE_FIRST(b);
          e != APR_BRIGADE_SENTINEL(b);
          e = APR_BUCKET_NEXT(e))
@@ -1544,6 +1599,40 @@ apr_status_t ap_http_outerror_filter(ap_filter_t *f,
                 /* stream aborted and we have not ended it yet */
                 r->connection->keepalive = AP_CONN_CLOSE;
             }
+            continue;
+        }
+        /* Detect EOC buckets and memorize this in the context. */
+        if (AP_BUCKET_IS_EOC(e)) {
+            ctx->seen_eoc = 1;
+        }
+    }
+    /*
+     * Remove all data buckets that are in a brigade after an EOC bucket
+     * was seen, as an EOC bucket tells us that no (further) resource
+     * and protocol data should go out to the client. OTOH meta buckets
+     * are still welcome as they might trigger needed actions down in
+     * the chain (e.g. in network filters like SSL).
+     * Remark 1: It is needed to dump ALL data buckets in the brigade
+     *           since an filter in between might have inserted data
+     *           buckets BEFORE the EOC bucket sent by the original
+     *           sender and we do NOT want this data to be sent.
+     * Remark 2: Dumping all data buckets here does not necessarily mean
+     *           that no further data is send to the client as:
+     *           1. Network filters like SSL can still be triggered via
+     *              meta buckets to talk with the client e.g. for a
+     *              clean shutdown.
+     *           2. There could be still data that was buffered before
+     *              down in the chain that gets flushed by a FLUSH or an
+     *              EOS bucket.
+     */
+    if (ctx->seen_eoc) {
+        for (e = APR_BRIGADE_FIRST(b);
+             e != APR_BRIGADE_SENTINEL(b);
+             e = APR_BUCKET_NEXT(e))
+        {
+            if (!APR_BUCKET_IS_METADATA(e)) {
+                APR_BUCKET_REMOVE(e);
+            }
         }
     }
 
diff --git a/modules/ldap/README.ldap b/modules/ldap/README.ldap
index 30ec5cc7..116707e0 100644
--- a/modules/ldap/README.ldap
+++ b/modules/ldap/README.ldap
@@ -38,7 +38,7 @@ Quick installation instructions (win32):
 3. Compile the two modules util_ldap and mod_authnz_ldap using the dsp files
 4. You get a mod_authnz_ldap.so and a mod_ldap.so module
 5. Put them in the modules directory, don't forget to copy the
-   nsldap32v50.dll somewhere where apache.exe will find it
+   nsldap32v50.dll somewhere where httpd.exe will find it
 6. Load the two modules in your httpd.conf, like below:
    LoadModule ldap_module modules/mod_ldap.so
    LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
diff --git a/modules/ldap/config.m4 b/modules/ldap/config.m4
index 25a92af4..a598d250 100644
--- a/modules/ldap/config.m4
+++ b/modules/ldap/config.m4
@@ -4,6 +4,9 @@ dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
 APACHE_MODPATH_INIT(ldap)
 
 ldap_objects="util_ldap.lo util_ldap_cache.lo util_ldap_cache_mgr.lo"
-APACHE_MODULE(ldap, LDAP caching and connection pooling services, $ldap_objects, , no)
+APACHE_MODULE(ldap, LDAP caching and connection pooling services, $ldap_objects, , no, [
+  MOD_LDAP_LDADD="`$apu_config --ldap-libs`" || MOD_LDAP_LDADD=""
+  AC_SUBST(MOD_LDAP_LDADD)
+])
 
 APACHE_MODPATH_FINISH
diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 2f651931..5ea50d0a 100644
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -212,7 +212,9 @@ static int uldap_connection_init(request_rec *r,
     int rc = 0, ldap_option = 0;
     int version  = LDAP_VERSION3;
     apr_ldap_err_t *result = NULL;
+#ifdef LDAP_OPT_NETWORK_TIMEOUT
     struct timeval timeOut = {10,0};    /* 10 second connection timeout */
+#endif
     util_ldap_state_t *st =
         (util_ldap_state_t *)ap_get_module_config(r->server->module_config,
         &ldap_module);
@@ -923,12 +925,10 @@ static int uldap_cache_checkuserid(request_rec *r, util_ldap_connection_t *ldc,
                 /* ...and entry is valid */
                 *binddn = apr_pstrdup(r->pool, search_nodep->dn);
                 if (attrs) {
-                    int i = 0, k = 0;
-                    while (attrs[k++]);
-                    *retvals = apr_pcalloc(r->pool, sizeof(char *) * k);
-                    while (search_nodep->vals[i]) {
+                    int i;
+                    *retvals = apr_pcalloc(r->pool, sizeof(char *) * search_nodep->numvals);
+                    for (i = 0; i < search_nodep->numvals; i++) {
                         (*retvals)[i] = apr_pstrdup(r->pool, search_nodep->vals[i]);
-                        i++;
                     }
                 }
                 LDAP_CACHE_UNLOCK();
@@ -1172,12 +1172,10 @@ static int uldap_cache_getuserdn(request_rec *r, util_ldap_connection_t *ldc,
                 /* ...and entry is valid */
                 *binddn = apr_pstrdup(r->pool, search_nodep->dn);
                 if (attrs) {
-                    int i = 0, k = 0;
-                    while (attrs[k++]);
-                    *retvals = apr_pcalloc(r->pool, sizeof(char *) * k);
-                    while (search_nodep->vals[i]) {
+                    int i;
+                    *retvals = apr_pcalloc(r->pool, sizeof(char *) * search_nodep->numvals);
+                    for (i = 0; i < search_nodep->numvals; i++) {
                         (*retvals)[i] = apr_pstrdup(r->pool, search_nodep->vals[i]);
-                        i++;
                     }
                 }
                 LDAP_CACHE_UNLOCK();
@@ -1773,9 +1771,11 @@ static const char *util_ldap_set_connection_timeout(cmd_parms *cmd,
                                                     void *dummy,
                                                     const char *ttl)
 {
+#ifdef LDAP_OPT_NETWORK_TIMEOUT
     util_ldap_state_t *st =
         (util_ldap_state_t *)ap_get_module_config(cmd->server->module_config,
                                                   &ldap_module);
+#endif
     const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
 
     if (err != NULL) {
diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index 72bf5018..cd468be1 100644
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -90,7 +90,9 @@
  * %...l:  remote logname (from identd, if supplied)
  * %...{Foobar}n:  The contents of note "Foobar" from another module.
  * %...{Foobar}o:  The contents of Foobar: header line(s) in the reply.
- * %...p:  the port the request was served to
+ * %...p:  the canonical port for the server
+ * %...{format}p: the canonical port for the server, or the actual local
+ *                or remote port
  * %...P:  the process ID of the child that serviced the request.
  * %...{format}P: the process ID or thread ID of the child/thread that
  *                serviced the request
@@ -633,8 +635,22 @@ static const char *log_virtual_host(request_rec *r, char *a)
 
 static const char *log_server_port(request_rec *r, char *a)
 {
-    return apr_psprintf(r->pool, "%u",
-                        r->server->port ? r->server->port : ap_default_port(r));
+    apr_port_t port;
+
+    if (*a == '\0' || !strcasecmp(a, "canonical")) {
+        port = r->server->port ? r->server->port : ap_default_port(r);
+    }
+    else if (!strcasecmp(a, "remote")) {
+        port = r->connection->remote_addr->port;
+    }
+    else if (!strcasecmp(a, "local")) {
+        port = r->connection->local_addr->port;
+    }
+    else {
+        /* bogus format */
+        return a;
+    }
+    return apr_itoa(r->pool, (int)port);
 }
 
 /* This respects the setting of UseCanonicalName so that
diff --git a/modules/loggers/mod_log_forensic.c b/modules/loggers/mod_log_forensic.c
index 3fad35a7..f44f0b46 100644
--- a/modules/loggers/mod_log_forensic.c
+++ b/modules/loggers/mod_log_forensic.c
@@ -195,8 +195,8 @@ static int log_before(request_rec *r)
     if (!(id = apr_table_get(r->subprocess_env, "UNIQUE_ID"))) {
         /* we make the assumption that we can't go through all the PIDs in
            under 1 second */
-        id = apr_psprintf(r->pool, "%x:%lx:%x", getpid(), time(NULL),
-                          apr_atomic_inc32(&next_id));
+        id = apr_psprintf(r->pool, "%" APR_PID_T_FMT ":%lx:%x", getpid(), 
+                          time(NULL), apr_atomic_inc32(&next_id));
     }
     ap_set_module_config(r->request_config, &log_forensic_module, (char *)id);
 
diff --git a/modules/loggers/mod_logio.c b/modules/loggers/mod_logio.c
index 91db4f65..bc4d416c 100644
--- a/modules/loggers/mod_logio.c
+++ b/modules/loggers/mod_logio.c
@@ -66,6 +66,16 @@ static void ap_logio_add_bytes_out(conn_rec *c, apr_off_t bytes){
 }
 
 /*
+ * Optional function for modules to adjust bytes_in
+ */
+
+static void ap_logio_add_bytes_in(conn_rec *c, apr_off_t bytes){
+    logio_config_t *cf = ap_get_module_config(c->conn_config, &logio_module);
+
+    cf->bytes_in += bytes;
+}
+
+/*
  * Format items...
  */
 
@@ -178,6 +188,7 @@ static void register_hooks(apr_pool_t *p)
                               AP_FTYPE_NETWORK - 1);
 
     APR_REGISTER_OPTIONAL_FN(ap_logio_add_bytes_out);
+    APR_REGISTER_OPTIONAL_FN(ap_logio_add_bytes_in);
 }
 
 module AP_MODULE_DECLARE_DATA logio_module =
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index e4d0e5d8..72860d95 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -227,6 +227,8 @@ typedef struct {
     char *(*func)(request_rec *,   /* function pointer for internal maps  */
                   char *);
     char **argv;                   /* argv of the external rewrite map    */
+    const char *checkfile2;        /* filename to check for map existence
+                                      NULL if only one file               */
 } rewritemap_entry;
 
 /* special pattern types for RewriteCond */
@@ -1551,6 +1553,21 @@ static char *lookup_map(request_rec *r, char *name, char *key)
             ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
                           "mod_rewrite: can't access DBM RewriteMap file %s",
                           s->checkfile);
+        }
+        else if(s->checkfile2 != NULL) {
+            apr_finfo_t st2;
+
+            rv = apr_stat(&st2, s->checkfile2, APR_FINFO_MIN, r->pool);
+            if (rv != APR_SUCCESS) {
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                              "mod_rewrite: can't access DBM RewriteMap "
+                              "file %s", s->checkfile2);
+            }
+            else if(st2.mtime > st.mtime) {
+                st.mtime = st2.mtime;
+            }
+        }
+        if(rv != APR_SUCCESS) {
             rewritelog((r, 1, NULL,
                         "can't open DBM RewriteMap file, see error log"));
             return NULL;
@@ -2822,6 +2839,7 @@ static const char *cmd_rewritemap(cmd_parms *cmd, void *dconf, const char *a1,
         newmap->type      = MAPTYPE_TXT;
         newmap->datafile  = fname;
         newmap->checkfile = fname;
+        newmap->checkfile2= NULL;
         newmap->cachename = apr_psprintf(cmd->pool, "%pp:%s",
                                          (void *)cmd->server, a1);
     }
@@ -2834,11 +2852,11 @@ static const char *cmd_rewritemap(cmd_parms *cmd, void *dconf, const char *a1,
         newmap->type      = MAPTYPE_RND;
         newmap->datafile  = fname;
         newmap->checkfile = fname;
+        newmap->checkfile2= NULL;
         newmap->cachename = apr_psprintf(cmd->pool, "%pp:%s",
                                          (void *)cmd->server, a1);
     }
     else if (strncasecmp(a2, "dbm", 3) == 0) {
-        const char *ignored_fname;
         apr_status_t rv;
 
         newmap->type = MAPTYPE_DBM;
@@ -2873,7 +2891,7 @@ static const char *cmd_rewritemap(cmd_parms *cmd, void *dconf, const char *a1,
 
         rv = apr_dbm_get_usednames_ex(cmd->pool, newmap->dbmtype,
                                       newmap->datafile, &newmap->checkfile,
-                                      &ignored_fname);
+                                      &newmap->checkfile2);
         if (rv != APR_SUCCESS) {
             return apr_pstrcat(cmd->pool, "RewriteMap: dbm type ",
                                newmap->dbmtype, " is invalid", NULL);
@@ -2892,12 +2910,14 @@ static const char *cmd_rewritemap(cmd_parms *cmd, void *dconf, const char *a1,
         newmap->type      = MAPTYPE_PRG;
         newmap->datafile  = NULL;
         newmap->checkfile = newmap->argv[0];
+        newmap->checkfile2= NULL;
         newmap->cachename = NULL;
     }
     else if (strncasecmp(a2, "int:", 4) == 0) {
         newmap->type      = MAPTYPE_INT;
         newmap->datafile  = NULL;
         newmap->checkfile = NULL;
+        newmap->checkfile2= NULL;
         newmap->cachename = NULL;
         newmap->func      = (char *(*)(request_rec *,char *))
                             apr_hash_get(mapfunc_hash, a2+4, strlen(a2+4));
@@ -2915,6 +2935,7 @@ static const char *cmd_rewritemap(cmd_parms *cmd, void *dconf, const char *a1,
         newmap->type      = MAPTYPE_TXT;
         newmap->datafile  = fname;
         newmap->checkfile = fname;
+        newmap->checkfile2= NULL;
         newmap->cachename = apr_psprintf(cmd->pool, "%pp:%s",
                                          (void *)cmd->server, a1);
     }
@@ -4034,7 +4055,6 @@ static int pre_config(apr_pool_t *pconf,
     APR_OPTIONAL_FN_TYPE(ap_register_rewrite_mapfunc) *map_pfn_register;
 
     /* register int: rewritemap handlers */
-    mapfunc_hash = apr_hash_make(pconf);
     map_pfn_register = APR_RETRIEVE_OPTIONAL_FN(ap_register_rewrite_mapfunc);
     if (map_pfn_register) {
         map_pfn_register("tolower", rewrite_mapfunc_tolower);
@@ -4287,6 +4307,10 @@ static int hook_uri2file(request_rec *r)
                 return HTTP_FORBIDDEN;
             }
 
+            if (rulestatus == ACTION_NOESCAPE) {
+                apr_table_setn(r->notes, "proxy-nocanon", "1");
+            }
+
             /* make sure the QUERY_STRING and
              * PATH_INFO parts get incorporated
              */
@@ -4829,6 +4853,10 @@ static void register_hooks(apr_pool_t *p)
      */
     static const char * const aszPre[]={ "mod_proxy.c", NULL };
 
+    /* make the hashtable before registering the function, so that
+     * other modules are prevented from accessing uninitialized memory.
+     */
+    mapfunc_hash = apr_hash_make(p);
     APR_REGISTER_OPTIONAL_FN(ap_register_rewrite_mapfunc);
 
     ap_hook_handler(handler_redirect, NULL, NULL, APR_HOOK_MIDDLE);
diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c
index 270b47ee..78f58b07 100644
--- a/modules/mappers/mod_speling.c
+++ b/modules/mappers/mod_speling.c
@@ -225,12 +225,6 @@ static int check_speling(request_rec *r)
         return DECLINED;
     }
 
-    /* we default to reject path info (same as core handler) */
-    if ((r->used_path_info != AP_REQ_ACCEPT_PATH_INFO) &&
-        r->path_info && *r->path_info) {
-        return DECLINED;
-    }
-
     /*
      * The request should end up looking like this:
      * r->uri: /correct-url/mispelling/more
diff --git a/modules/metadata/mod_headers.c b/modules/metadata/mod_headers.c
index e139b5db..d35c44f1 100644
--- a/modules/metadata/mod_headers.c
+++ b/modules/metadata/mod_headers.c
@@ -33,7 +33,10 @@
  *     add    - add this header, possible resulting in two or more
  *              headers with the same name
  *     append - append this text onto any existing header of this same
+ *     merge  - merge this text onto any existing header of this same,
+ *              avoiding duplicate values
  *     unset  - remove this header
+ *      edit  - transform the header value according to a regexp
  *
  * Where action is unset, the third argument (value) should not be given.
  * The header name can include the colon, or not.
@@ -88,6 +91,7 @@ typedef enum {
     hdr_add = 'a',              /* add header (could mean multiple hdrs) */
     hdr_set = 's',              /* set (replace old value) */
     hdr_append = 'm',           /* append (merge into any old value) */
+    hdr_merge = 'g',            /* merge (merge, but avoid duplicates) */
     hdr_unset = 'u',            /* unset header */
     hdr_echo = 'e',             /* echo headers from request to response */
     hdr_edit = 'r'              /* change value by regexp */
@@ -394,6 +398,8 @@ static APR_INLINE const char *header_inout_cmd(cmd_parms *cmd,
         new->action = hdr_add;
     else if (!strcasecmp(action, "append"))
         new->action = hdr_append;
+    else if (!strcasecmp(action, "merge"))
+        new->action = hdr_merge;
     else if (!strcasecmp(action, "unset"))
         new->action = hdr_unset;
     else if (!strcasecmp(action, "echo"))
@@ -401,8 +407,8 @@ static APR_INLINE const char *header_inout_cmd(cmd_parms *cmd,
     else if (!strcasecmp(action, "edit"))
         new->action = hdr_edit;
     else
-        return "first argument must be 'add', 'set', 'append', 'unset', "
-               "'echo' or 'edit'.";
+        return "first argument must be 'add', 'set', 'append', 'merge', "
+               "'unset', 'echo', or 'edit'.";
 
     if (new->action == hdr_edit) {
         if (subs == NULL) {
@@ -610,6 +616,46 @@ static void do_headers_fixup(request_rec *r, apr_table_t *headers,
         case hdr_append:
             apr_table_mergen(headers, hdr->header, process_tags(hdr, r));
             break;
+        case hdr_merge:
+            val = apr_table_get(headers, hdr->header);
+            if (val == NULL) {
+                apr_table_addn(headers, hdr->header, process_tags(hdr, r));
+            } else {
+                char *new_val = process_tags(hdr, r);
+                apr_size_t new_val_len = strlen(new_val);
+                int tok_found = 0;
+
+                /* modified version of logic in ap_get_token() */
+                while (*val) {
+                    const char *tok_start;
+
+                    while (*val && apr_isspace(*val))
+                        ++val;
+
+                    tok_start = val;
+
+                    while (*val && *val != ',') {
+                        if (*val++ == '"')
+                            while (*val)
+                                if (*val++ == '"')
+                                    break;
+                    }
+
+                    if (new_val_len == (apr_size_t)(val - tok_start)
+                        && !strncmp(tok_start, new_val, new_val_len)) {
+                        tok_found = 1;
+                        break;
+                    }
+
+                    if (*val)
+                        ++val;
+                }
+
+                if (!tok_found) {
+                    apr_table_mergen(headers, hdr->header, new_val);
+                }
+            }
+            break;
         case hdr_set:
             apr_table_setn(headers, hdr->header, process_tags(hdr, r));
             break;
diff --git a/modules/metadata/mod_unique_id.c b/modules/metadata/mod_unique_id.c
index 27e18d53..a78e0206 100644
--- a/modules/metadata/mod_unique_id.c
+++ b/modules/metadata/mod_unique_id.c
@@ -304,7 +304,7 @@ static int gen_unique_id(request_rec *r)
     new_unique_id.pid = cur_unique_id.pid;
     new_unique_id.counter = cur_unique_id.counter;
 
-    new_unique_id.stamp = htonl((unsigned int)r->request_time);
+    new_unique_id.stamp = htonl((unsigned int)apr_time_sec(r->request_time));
     new_unique_id.thread_index = htonl((unsigned int)r->connection->id);
 
     /* we'll use a temporal buffer to avoid uuencoding the possible internal
diff --git a/modules/proxy/ajp.h b/modules/proxy/ajp.h
index 8c022fb3..8327e8d4 100644
--- a/modules/proxy/ajp.h
+++ b/modules/proxy/ajp.h
@@ -147,6 +147,7 @@ struct ajp_msg
 #define AJP_MSG_BUFFER_SZ           8192
 #define AJP_MAX_BUFFER_SZ           65536
 #define AJP13_MAX_SEND_BODY_SZ      (AJP_MAX_BUFFER_SZ - AJP_HEADER_SZ)
+#define AJP_PING_PONG_SZ            128
 
 /** Send a request from web server to container*/
 #define CMD_AJP13_FORWARD_REQUEST   (unsigned char)2
diff --git a/modules/proxy/ajp_utils.c b/modules/proxy/ajp_utils.c
index 5a0e8772..780aeb48 100644
--- a/modules/proxy/ajp_utils.c
+++ b/modules/proxy/ajp_utils.c
@@ -31,7 +31,7 @@ apr_status_t ajp_handle_cping_cpong(apr_socket_t *sock,
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                          "Into ajp_handle_cping_cpong");
 
-    rc = ajp_msg_create(r->pool, AJP_HEADER_SZ_LEN+1, &msg);
+    rc = ajp_msg_create(r->pool, AJP_PING_PONG_SZ, &msg);
     if (rc != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                "ajp_handle_cping_cpong: ajp_msg_create failed");
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index de48638b..00bcfeba 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -168,6 +168,15 @@ static const char *set_worker_param(apr_pool_t *p,
             return "KeepAlive must be On|Off";
         worker->keepalive_set = 1;
     }
+    else if (!strcasecmp(key, "disablereuse")) {
+        if (!strcasecmp(val, "on"))
+            worker->disablereuse = 1;
+        else if (!strcasecmp(val, "off"))
+            worker->disablereuse = 0;
+        else
+            return "DisableReuse must be On|Off";
+        worker->disablereuse_set = 1;
+    }
     else if (!strcasecmp(key, "route")) {
         /* Worker route.
          */
@@ -432,6 +441,59 @@ static int proxy_detect(request_rec *r)
     return DECLINED;
 }
 
+static const char *proxy_interpolate(request_rec *r, const char *str)
+{
+    /* Interpolate an env str in a configuration string
+     * Syntax ${var} --> value_of(var)
+     * Method: replace one var, and recurse on remainder of string
+     * Nothing clever here, and crap like nested vars may do silly things
+     * but we'll at least avoid sending the unwary into a loop
+     */
+    const char *start;
+    const char *end;
+    const char *var;
+    const char *val;
+    const char *firstpart;
+
+    start = ap_strstr_c(str, "${");
+    if (start == NULL) {
+        return str;
+    }
+    end = ap_strchr_c(start+2, '}');
+    if (end == NULL) {
+        return str;
+    }
+    /* OK, this is syntax we want to interpolate.  Is there such a var ? */
+    var = apr_pstrndup(r->pool, start+2, end-(start+2));
+    val = apr_table_get(r->subprocess_env, var);
+    firstpart = apr_pstrndup(r->pool, str, (start-str));
+
+    if (val == NULL) {
+        return apr_pstrcat(r->pool, firstpart,
+                           proxy_interpolate(r, end+1), NULL);
+    }
+    else {
+        return apr_pstrcat(r->pool, firstpart, val,
+                           proxy_interpolate(r, end+1), NULL);
+    }
+}
+static apr_array_header_t *proxy_vars(request_rec *r,
+                                      apr_array_header_t *hdr)
+{
+    int i;
+    apr_array_header_t *ret = apr_array_make(r->pool, hdr->nelts,
+                                             sizeof (struct proxy_alias));
+    struct proxy_alias *old = (struct proxy_alias *) hdr->elts;
+
+    for (i = 0; i < hdr->nelts; ++i) {
+        struct proxy_alias *newcopy = apr_array_push(ret);
+        newcopy->fake = (old[i].flags & PROXYPASS_INTERPOLATE)
+                        ? proxy_interpolate(r, old[i].fake) : old[i].fake;
+        newcopy->real = (old[i].flags & PROXYPASS_INTERPOLATE)
+                        ? proxy_interpolate(r, old[i].real) : old[i].real;
+    }
+    return ret;
+}
 static int proxy_trans(request_rec *r)
 {
     void *sconf = r->server->module_config;
@@ -439,6 +501,10 @@ static int proxy_trans(request_rec *r)
     (proxy_server_conf *) ap_get_module_config(sconf, &proxy_module);
     int i, len;
     struct proxy_alias *ent = (struct proxy_alias *) conf->aliases->elts;
+    proxy_dir_conf *dconf = ap_get_module_config(r->per_dir_config,
+                                                 &proxy_module);
+    const char *fake;
+    const char *real;
     ap_regmatch_t regm[AP_MAX_REG_MATCH];
     ap_regmatch_t reg1[AP_MAX_REG_MATCH];
     char *found = NULL;
@@ -459,9 +525,18 @@ static int proxy_trans(request_rec *r)
     for (i = 0; i < conf->aliases->nelts; i++) {
         unsigned int nocanon = ent[i].flags & PROXYPASS_NOCANON;
         const char *use_uri = nocanon ? r->unparsed_uri : r->uri;
+        if ((dconf->interpolate_env == 1)
+            && (ent[i].flags & PROXYPASS_INTERPOLATE)) {
+            fake = proxy_interpolate(r, ent[i].fake);
+            real = proxy_interpolate(r, ent[i].real);
+        }
+        else {
+            fake = ent[i].fake;
+            real = ent[i].real;
+        }
         if (ent[i].regex) {
             if (!ap_regexec(ent[i].regex, r->uri, AP_MAX_REG_MATCH, regm, 0)) {
-                if ((ent[i].real[0] == '!') && (ent[i].real[1] == '\0')) {
+                if ((real[0] == '!') && (real[1] == '\0')) {
                     return DECLINED;
                 }
                 /* test that we haven't reduced the URI */
@@ -470,8 +545,7 @@ static int proxy_trans(request_rec *r)
                     mismatch = 1;
                     use_uri = r->uri;
                 }
-                found = ap_pregsub(r->pool, ent[i].real, use_uri,
-                                   AP_MAX_REG_MATCH,
+                found = ap_pregsub(r->pool, real, use_uri, AP_MAX_REG_MATCH,
                                    (use_uri == r->uri) ? regm : reg1);
                 /* Note: The strcmp() below catches cases where there
                  * was no regex substitution. This is so cases like:
@@ -486,20 +560,20 @@ static int proxy_trans(request_rec *r)
                  *
                  * which may be confusing.
                  */
-                if (found && strcmp(found, ent[i].real)) {
+                if (found && strcmp(found, real)) {
                     found = apr_pstrcat(r->pool, "proxy:", found, NULL);
                 }
                 else {
-                    found = apr_pstrcat(r->pool, "proxy:", ent[i].real,
+                    found = apr_pstrcat(r->pool, "proxy:", real,
                                         use_uri, NULL);
                 }
             }
         }
         else {
-            len = alias_match(r->uri, ent[i].fake);
+            len = alias_match(r->uri, fake);
 
-            if (len > 0) {
-                if ((ent[i].real[0] == '!') && (ent[i].real[1] == '\0')) {
+            if (len != 0) {
+                if ((real[0] == '!') && (real[1] == '\0')) {
                     return DECLINED;
                 }
                 if (nocanon
@@ -507,7 +581,7 @@ static int proxy_trans(request_rec *r)
                     mismatch = 1;
                     use_uri = r->uri;
                 }
-                found = apr_pstrcat(r->pool, "proxy:", ent[i].real,
+                found = apr_pstrcat(r->pool, "proxy:", real,
                                     use_uri + len, NULL);
             }
         }
@@ -591,6 +665,7 @@ static int proxy_map_location(request_rec *r)
 
     return OK;
 }
+
 /* -------------------------------------------------------------- */
 /* Fixup the filename */
 
@@ -601,6 +676,8 @@ static int proxy_fixup(request_rec *r)
 {
     char *url, *p;
     int access_status;
+    proxy_dir_conf *dconf = ap_get_module_config(r->per_dir_config,
+                                                 &proxy_module);
 
     if (!r->proxyreq || !r->filename || strncmp(r->filename, "proxy:", 6) != 0)
         return DECLINED;
@@ -608,6 +685,17 @@ static int proxy_fixup(request_rec *r)
     /* XXX: Shouldn't we try this before we run the proxy_walk? */
     url = &r->filename[6];
 
+    if ((dconf->interpolate_env == 1) && (r->proxyreq == PROXYREQ_REVERSE)) {
+        /* create per-request copy of reverse proxy conf,
+         * and interpolate vars in it
+         */
+        proxy_req_conf *rconf = apr_palloc(r->pool, sizeof(proxy_req_conf));
+        ap_set_module_config(r->request_config, &proxy_module, rconf);
+        rconf->raliases = proxy_vars(r, dconf->raliases);
+        rconf->cookie_paths = proxy_vars(r, dconf->cookie_paths);
+        rconf->cookie_domains = proxy_vars(r, dconf->cookie_domains);
+    }
+
     /* canonicalise each specific scheme */
     if ((access_status = proxy_run_canon_handler(r, url))) {
         return access_status;
@@ -830,12 +918,41 @@ static int proxy_handler(request_rec *r)
                                                              ents[i].hostname,
                                                              ents[i].port);
 
-                    /* an error or success */
-                    if (access_status != DECLINED &&
-                        access_status != HTTP_BAD_GATEWAY) {
-                        goto cleanup;
+                    /* Did the scheme handler process the request? */
+                    if (access_status != DECLINED) {
+                        const char *cl_a;
+                        char *end;
+                        apr_off_t cl;
+
+                        /*
+                         * An fatal error or success, so no point in
+                         * retrying with a direct connection.
+                         */
+                        if (access_status != HTTP_BAD_GATEWAY) {
+                            goto cleanup;
+                        }
+                        cl_a = apr_table_get(r->headers_in, "Content-Length");
+                        if (cl_a) {
+                            apr_strtoff(&cl, cl_a, &end, 0);
+                            /*
+                             * The request body is of length > 0. We cannot
+                             * retry with a direct connection since we already
+                             * sent (parts of) the request body to the proxy
+                             * and do not have any longer.
+                             */
+                            if (cl > 0) {
+                                goto cleanup;
+                            }
+                        }
+                        /*
+                         * Transfer-Encoding was set as input header, so we had
+                         * a request body. We cannot retry with a direct
+                         * connection for the same reason as above.
+                         */
+                        if (apr_table_get(r->headers_in, "Transfer-Encoding")) {
+                            goto cleanup;
+                        }
                     }
-                    /* we failed to talk to the upstream proxy */
                 }
             }
         }
@@ -1002,6 +1119,7 @@ static void *create_proxy_dir_config(apr_pool_t *p, char *dummy)
     new->cookie_domains = apr_array_make(p, 10, sizeof(struct proxy_alias));
     new->cookie_path_str = apr_strmatch_precompile(p, "path=", 0);
     new->cookie_domain_str = apr_strmatch_precompile(p, "domain=", 0);
+    new->interpolate_env = -1; /* unset */
 
     return (void *) new;
 }
@@ -1024,6 +1142,8 @@ static void *merge_proxy_dir_config(apr_pool_t *p, void *basev, void *addv)
         = apr_array_append(p, base->cookie_domains, add->cookie_domains);
     new->cookie_path_str = base->cookie_path_str;
     new->cookie_domain_str = base->cookie_domain_str;
+    new->interpolate_env = (add->interpolate_env == -1) ? base->interpolate_env
+                                                        : add->interpolate_env;
     new->ftp_directory_charset = add->ftp_directory_charset ?
                                  add->ftp_directory_charset :
                                  base->ftp_directory_charset;
@@ -1140,6 +1260,9 @@ static const char *
         else if (!strcasecmp(word,"nocanon")) {
             flags |= PROXYPASS_NOCANON;
         }
+        else if (!strcasecmp(word,"interpolate")) {
+            flags |= PROXYPASS_INTERPOLATE;
+        }
         else {
             char *val = strchr(word, '=');
             if (!val) {
@@ -1237,31 +1360,41 @@ static const char *
 }
 
 
-static const char *
-    add_pass_reverse(cmd_parms *cmd, void *dconf, const char *f, const char *r)
+static const char * add_pass_reverse(cmd_parms *cmd, void *dconf, const char *f,
+                                     const char *r, const char *i)
 {
     proxy_dir_conf *conf = dconf;
     struct proxy_alias *new;
-
-    if (r!=NULL && cmd->path == NULL ) {
-        new = apr_array_push(conf->raliases);
-        new->fake = f;
-        new->real = r;
-    } else if (r==NULL && cmd->path != NULL) {
-        new = apr_array_push(conf->raliases);
-        new->fake = cmd->path;
-        new->real = f;
-    } else {
-        if ( r == NULL)
+    const char *fake;
+    const char *real;
+    const char *interp;
+
+    if (cmd->path == NULL) {
+        fake = f;
+        real = r;
+        interp = i;
+        if (r == NULL || !strcasecmp(r, "interpolate")) {
             return "ProxyPassReverse needs a path when not defined in a location";
-        else
+        }
+    }
+    else {
+        fake = cmd->path;
+        real = f;
+        if (r && strcasecmp(r, "interpolate")) {
             return "ProxyPassReverse can not have a path when defined in a location";
+        }
+        interp = r;
     }
 
+    new = apr_array_push(conf->raliases);
+    new->fake = fake;
+    new->real = real;
+    new->flags = interp ? PROXYPASS_INTERPOLATE : 0;
+
     return NULL;
 }
-static const char*
-    cookie_path(cmd_parms *cmd, void *dconf, const char *f, const char *r)
+static const char* cookie_path(cmd_parms *cmd, void *dconf, const char *f,
+                               const char *r, const char *interp)
 {
     proxy_dir_conf *conf = dconf;
     struct proxy_alias *new;
@@ -1269,11 +1402,12 @@ static const char*
     new = apr_array_push(conf->cookie_paths);
     new->fake = f;
     new->real = r;
+    new->flags = interp ? PROXYPASS_INTERPOLATE : 0;
 
     return NULL;
 }
-static const char*
-    cookie_domain(cmd_parms *cmd, void *dconf, const char *f, const char *r)
+static const char* cookie_domain(cmd_parms *cmd, void *dconf, const char *f,
+                                 const char *r, const char *interp)
 {
     proxy_dir_conf *conf = dconf;
     struct proxy_alias *new;
@@ -1281,7 +1415,7 @@ static const char*
     new = apr_array_push(conf->cookie_domains);
     new->fake = f;
     new->real = r;
-
+    new->flags = interp ? PROXYPASS_INTERPOLATE : 0;
     return NULL;
 }
 
@@ -1902,15 +2036,18 @@ static const command_rec proxy_cmds[] =
      "a scheme, partial URL or '*' and a proxy server"),
     AP_INIT_TAKE2("ProxyRemoteMatch", add_proxy_regex, NULL, RSRC_CONF,
      "a regex pattern and a proxy server"),
+    AP_INIT_FLAG("ProxyPassInterpolateEnv", ap_set_flag_slot,
+        (void*)APR_OFFSETOF(proxy_dir_conf, interpolate_env),
+        RSRC_CONF|ACCESS_CONF, "Interpolate Env Vars in reverse Proxy") ,
     AP_INIT_RAW_ARGS("ProxyPass", add_pass_noregex, NULL, RSRC_CONF|ACCESS_CONF,
      "a virtual path and a URL"),
     AP_INIT_RAW_ARGS("ProxyPassMatch", add_pass_regex, NULL, RSRC_CONF|ACCESS_CONF,
      "a virtual path and a URL"),
-    AP_INIT_TAKE12("ProxyPassReverse", add_pass_reverse, NULL, RSRC_CONF|ACCESS_CONF,
+    AP_INIT_TAKE123("ProxyPassReverse", add_pass_reverse, NULL, RSRC_CONF|ACCESS_CONF,
      "a virtual path and a URL for reverse proxy behaviour"),
-    AP_INIT_TAKE2("ProxyPassReverseCookiePath", cookie_path, NULL,
+    AP_INIT_TAKE23("ProxyPassReverseCookiePath", cookie_path, NULL,
        RSRC_CONF|ACCESS_CONF, "Path rewrite rule for proxying cookies"),
-    AP_INIT_TAKE2("ProxyPassReverseCookieDomain", cookie_domain, NULL,
+    AP_INIT_TAKE23("ProxyPassReverseCookieDomain", cookie_domain, NULL,
        RSRC_CONF|ACCESS_CONF, "Domain rewrite rule for proxying cookies"),
     AP_INIT_ITERATE("ProxyBlock", set_proxy_exclude, NULL, RSRC_CONF,
      "A list of names, hosts or domains to which the proxy will not connect"),
diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 3944104e..fdb48bf3 100644
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -110,6 +110,7 @@ struct proxy_remote {
 };
 
 #define PROXYPASS_NOCANON 0x01
+#define PROXYPASS_INTERPOLATE 0x02
 struct proxy_alias {
     const char  *real;
     const char  *fake;
@@ -213,14 +214,24 @@ typedef struct {
     const apr_strmatch_pattern* cookie_path_str;
     const apr_strmatch_pattern* cookie_domain_str;
     const char *ftp_directory_charset;
+    int interpolate_env;
 } proxy_dir_conf;
 
+/* if we interpolate env vars per-request, we'll need a per-request
+ * copy of the reverse proxy config
+ */
+typedef struct {
+    apr_array_header_t *raliases;
+    apr_array_header_t* cookie_paths;
+    apr_array_header_t* cookie_domains;
+} proxy_req_conf;
+
 typedef struct {
     conn_rec     *connection;
     const char   *hostname;
     apr_port_t   port;
     int          is_ssl;
-    apr_pool_t   *pool;     /* Subpool used for creating socket */
+    apr_pool_t   *pool;     /* Subpool for hostname and addr data */
     apr_socket_t *sock;     /* Connection socket */
     apr_sockaddr_t *addr;   /* Preparsed remote address info */
     apr_uint32_t flags;     /* Conection flags */
@@ -231,6 +242,11 @@ typedef struct {
 #if APR_HAS_THREADS
     int          inreslist; /* connection in apr_reslist? */
 #endif
+    apr_pool_t   *scpool;   /* Subpool used for socket and connection data */
+    request_rec  *r;        /* Request record of the frontend request
+                             * which the backend currently answers. */
+    int          need_flush;/* Flag to decide whether we need to flush the
+                             * filter chain or not */
 } proxy_conn_rec;
 
 typedef struct {
@@ -337,6 +353,8 @@ struct proxy_worker {
     apr_interval_time_t ping_timeout;
     char ping_timeout_set;
     char            retry_set;
+    char            disablereuse;
+    char            disablereuse_set;
 };
 
 /*
@@ -473,6 +491,8 @@ PROXY_DECLARE(apr_status_t) ap_proxy_string_read(conn_rec *c, apr_bucket_brigade
 PROXY_DECLARE(void) ap_proxy_table_unmerge(apr_pool_t *p, apr_table_t *t, char *key);
 /* DEPRECATED (will be replaced with ap_proxy_connect_backend */
 PROXY_DECLARE(int) ap_proxy_connect_to_backend(apr_socket_t **, const char *, apr_sockaddr_t *, const char *, proxy_server_conf *, server_rec *, apr_pool_t *);
+PROXY_DECLARE(apr_status_t) ap_proxy_ssl_connection_cleanup(proxy_conn_rec *conn,
+                                                            request_rec *r);
 PROXY_DECLARE(int) ap_proxy_ssl_enable(conn_rec *c);
 PROXY_DECLARE(int) ap_proxy_ssl_disable(conn_rec *c);
 PROXY_DECLARE(int) ap_proxy_conn_is_https(conn_rec *c);
diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c
index bad2b26e..80a6e0ab 100644
--- a/modules/proxy/mod_proxy_ajp.c
+++ b/modules/proxy/mod_proxy_ajp.c
@@ -29,7 +29,8 @@ module AP_MODULE_DECLARE_DATA proxy_ajp_module;
  */
 static int proxy_ajp_canon(request_rec *r, char *url)
 {
-    char *host, *path, *search, sport[7];
+    char *host, *path, sport[7];
+    char *search = NULL;
     const char *err;
     apr_port_t port = AJP13_DEF_PORT;
 
@@ -57,23 +58,18 @@ static int proxy_ajp_canon(request_rec *r, char *url)
     }
 
     /*
-     * now parse path/search args, according to rfc1738
-     *
-     * N.B. if this isn't a true proxy request, then the URL _path_
-     * has already been decoded.  True proxy requests have
-     * r->uri == r->unparsed_uri, and no others have that property.
+     * now parse path/search args, according to rfc1738:
+     * process the path. With proxy-noncanon set (by
+     * mod_proxy) we use the raw, unparsed uri
      */
-    if (r->uri == r->unparsed_uri) {
-        search = strchr(url, '?');
-        if (search != NULL)
-            *(search++) = '\0';
+    if (apr_table_get(r->notes, "proxy-nocanon")) {
+        path = url;   /* this is the raw path */
     }
-    else
+    else {
+        path = ap_proxy_canonenc(r->pool, url, strlen(url), enc_path, 0,
+                                 r->proxyreq);
         search = r->args;
-
-    /* process path */
-    path = ap_proxy_canonenc(r->pool, url, strlen(url), enc_path, 0,
-                             r->proxyreq);
+    }
     if (path == NULL)
         return HTTP_BAD_REQUEST;
 
@@ -89,6 +85,37 @@ static int proxy_ajp_canon(request_rec *r, char *url)
     return OK;
 }
 
+#define METHOD_NON_IDEMPOTENT       0
+#define METHOD_IDEMPOTENT           1
+#define METHOD_IDEMPOTENT_WITH_ARGS 2
+
+static int is_idempotent(request_rec *r)
+{
+    /*
+     * RFC2616 (9.1.2): GET, HEAD, PUT, DELETE, OPTIONS, TRACE are considered
+     * idempotent. Hint: HEAD requests use M_GET as method number as well.
+     */
+    switch (r->method_number) {
+        case M_GET:
+        case M_DELETE:
+        case M_PUT:
+        case M_OPTIONS:
+        case M_TRACE:
+            /*
+             * If the request has arguments it might have side-effects and thus
+             * it might be undesirable to resent it to a backend again
+             * automatically.
+             */
+            if (r->args) {
+                return METHOD_IDEMPOTENT_WITH_ARGS;
+            }
+            return METHOD_IDEMPOTENT;
+        /* Everything else is not considered idempotent. */
+        default:
+            return METHOD_NON_IDEMPOTENT;
+    }
+}
+
 /*
  * XXX: AJP Auto Flushing
  *
@@ -122,7 +149,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
     apr_bucket_brigade *input_brigade;
     apr_bucket_brigade *output_brigade;
     ajp_msg_t *msg;
-    apr_size_t bufsiz;
+    apr_size_t bufsiz = 0;
     char *buff;
     apr_uint16_t size;
     const char *tenc;
@@ -138,6 +165,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
     proxy_server_conf *psf =
     ap_get_module_config(r->server->module_config, &proxy_module);
     apr_size_t maxsize = AJP_MSG_BUFFER_SZ;
+    int send_body = 0;
 
     if (psf->io_buffer_size_set)
        maxsize = psf->io_buffer_size;
@@ -161,8 +189,17 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
                      conn->worker->hostname);
         if (status == AJP_EOVERFLOW)
             return HTTP_BAD_REQUEST;
-        else
-            return HTTP_SERVICE_UNAVAILABLE;
+        else {
+            /*
+             * This is only non fatal when the method is idempotent. In this
+             * case we can dare to retry it with a different worker if we are
+             * a balancer member.
+             */
+            if (is_idempotent(r) == METHOD_IDEMPOTENT) {
+                return HTTP_SERVICE_UNAVAILABLE;
+            }
+            return HTTP_INTERNAL_SERVER_ERROR;
+        }
     }
 
     /* allocate an AJP message to store the data of the buckets */
@@ -231,9 +268,14 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
                              "proxy: send failed to %pI (%s)",
                              conn->worker->cp->addr,
                              conn->worker->hostname);
-                return HTTP_SERVICE_UNAVAILABLE;
+                /*
+                 * It is fatal when we failed to send a (part) of the request
+                 * body.
+                 */
+                return HTTP_INTERNAL_SERVER_ERROR;
             }
             conn->worker->s->transferred += bufsiz;
+            send_body = 1;
         }
     }
 
@@ -249,7 +291,16 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
                      "proxy: read response failed from %pI (%s)",
                      conn->worker->cp->addr,
                      conn->worker->hostname);
-        return HTTP_SERVICE_UNAVAILABLE;
+        /*
+         * This is only non fatal when we have not sent (parts) of a possible
+         * request body so far (we do not store it and thus cannot sent it
+         * again) and the method is idempotent. In this case we can dare to
+         * retry it with a different worker if we are a balancer member.
+         */
+        if (!send_body && (is_idempotent(r) == METHOD_IDEMPOTENT)) {
+            return HTTP_SERVICE_UNAVAILABLE;
+        }
+        return HTTP_INTERNAL_SERVER_ERROR;
     }
     /* parse the reponse */
     result = ajp_parse_type(r, conn->data);
diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index d2ae88bb..bcc47cfc 100644
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -23,12 +23,16 @@
 #include "ap_mpm.h"
 #include "apr_version.h"
 #include "apr_hooks.h"
+#include "apr_uuid.h"
 
 module AP_MODULE_DECLARE_DATA proxy_balancer_module;
 
+static char balancer_nonce[APR_UUID_FORMATTED_LENGTH + 1];
+
 static int proxy_balancer_canon(request_rec *r, char *url)
 {
-    char *host, *path, *search;
+    char *host, *path;
+    char *search = NULL;
     const char *err;
     apr_port_t port = 0;
 
@@ -52,21 +56,19 @@ static int proxy_balancer_canon(request_rec *r, char *url)
                       url, err);
         return HTTP_BAD_REQUEST;
     }
-    /* now parse path/search args, according to rfc1738 */
-    /* N.B. if this isn't a true proxy request, then the URL _path_
-     * has already been decoded.  True proxy requests have r->uri
-     * == r->unparsed_uri, and no others have that property.
+    /*
+     * now parse path/search args, according to rfc1738:
+     * process the path. With proxy-noncanon set (by
+     * mod_proxy) we use the raw, unparsed uri
      */
-    if (r->uri == r->unparsed_uri) {
-        search = strchr(url, '?');
-        if (search != NULL)
-            *(search++) = '\0';
+    if (apr_table_get(r->notes, "proxy-nocanon")) {
+        path = url;   /* this is the raw path */
     }
-    else
+    else {
+        path = ap_proxy_canonenc(r->pool, url, strlen(url), enc_path, 0,
+                                 r->proxyreq);
         search = r->args;
-
-    /* process path */
-    path = ap_proxy_canonenc(r->pool, url, strlen(url), enc_path, 0, r->proxyreq);
+    }
     if (path == NULL)
         return HTTP_BAD_REQUEST;
 
@@ -589,6 +591,31 @@ static void recalc_factors(proxy_balancer *balancer)
     }
 }
 
+/* post_config hook: */
+static int balancer_init(apr_pool_t *p, apr_pool_t *plog,
+                         apr_pool_t *ptemp, server_rec *s)
+{
+    void *data;
+    const char *userdata_key = "mod_proxy_balancer_init";
+    apr_uuid_t uuid;
+
+    /* balancer_init() will be called twice during startup.  So, only
+     * set up the static data the second time through. */
+    apr_pool_userdata_get(&data, userdata_key, s->process->pool);
+    if (!data) {
+        apr_pool_userdata_set((const void *)1, userdata_key,
+                               apr_pool_cleanup_null, s->process->pool);
+        return OK;
+    }
+
+    /* Retrieve a UUID and store the nonce for the lifetime of
+     * the process. */
+    apr_uuid_get(&uuid);
+    apr_uuid_format(balancer_nonce, &uuid);
+
+    return OK;
+}
+
 /* Manages the loadfactors and member status
  */
 static int balancer_handler(request_rec *r)
@@ -631,6 +658,14 @@ static int balancer_handler(request_rec *r)
                 return HTTP_BAD_REQUEST;
         }
     }
+    
+    /* Check that the supplied nonce matches this server's nonce;
+     * otherwise ignore all parameters, to prevent a CSRF attack. */
+    if ((name = apr_table_get(params, "nonce")) == NULL 
+        || strcmp(balancer_nonce, name) != 0) {
+        apr_table_clear(params);
+    }
+
     if ((name = apr_table_get(params, "b")))
         bsel = ap_proxy_get_balancer(r->pool, conf,
             apr_pstrcat(r->pool, "balancer://", name, NULL));
@@ -762,6 +797,7 @@ static int balancer_handler(request_rec *r)
                 ap_rvputs(r, "<tr>\n<td><a href=\"", r->uri, "?b=",
                           balancer->name + sizeof("balancer://") - 1, "&w=",
                           ap_escape_uri(r->pool, worker->name),
+                          "&nonce=", balancer_nonce, 
                           "\">", NULL);
                 ap_rvputs(r, worker->name, "</a></td>", NULL);
                 ap_rvputs(r, "<td>", ap_escape_html(r->pool, worker->s->route),
@@ -825,6 +861,8 @@ static int balancer_handler(request_rec *r)
             ap_rvputs(r, "<input type=hidden name=\"b\" ", NULL);
             ap_rvputs(r, "value=\"", bsel->name + sizeof("balancer://") - 1,
                       "\">\n</form>\n", NULL);
+            ap_rvputs(r, "<input type=hidden name=\"nonce\" value=\"", 
+                      balancer_nonce, "\">\n", NULL);
             ap_rputs("<hr />\n", r);
         }
         ap_rputs(ap_psignature("",r), r);
@@ -1063,6 +1101,7 @@ static void ap_proxy_balancer_register_hook(apr_pool_t *p)
      */
     static const char *const aszPred[] = { "mpm_winnt.c", "mod_proxy.c", NULL};
      /* manager handler */
+    ap_hook_post_config(balancer_init, NULL, NULL, APR_HOOK_MIDDLE);
     ap_hook_handler(balancer_handler, NULL, NULL, APR_HOOK_FIRST);
     ap_hook_child_init(child_init, aszPred, NULL, APR_HOOK_MIDDLE);
     proxy_hook_pre_request(proxy_balancer_pre_request, NULL, NULL, APR_HOOK_FIRST);
diff --git a/modules/proxy/mod_proxy_ftp.c b/modules/proxy/mod_proxy_ftp.c
index 3cacac6e..75a2054e 100644
--- a/modules/proxy/mod_proxy_ftp.c
+++ b/modules/proxy/mod_proxy_ftp.c
@@ -314,6 +314,7 @@ static apr_status_t proxy_send_dir_filter(ap_filter_t *f,
         /* basedir is either "", or "/%2f" for the "squid %2f hack" */
         const char *basedir = "";  /* By default, path is relative to the $HOME dir */
         char *wildcard = NULL;
+        const char *escpath;
 
         /* Save "scheme://site" prefix without password */
         site = apr_uri_unparse(p, &f->r->parsed_uri, APR_URI_UNP_OMITPASSWORD | APR_URI_UNP_OMITPATHINFO);
@@ -350,13 +351,14 @@ static apr_status_t proxy_send_dir_filter(ap_filter_t *f,
         str = (basedir[0] != '\0') ? "<a href=\"/%2f/\">%2f</a>/" : "";
 
         /* print "ftp://host/" */
+        escpath = ap_escape_html(p, path);
         str = apr_psprintf(p, DOCTYPE_HTML_3_2
                 "<html>\n <head>\n  <title>%s%s%s</title>\n"
+                "<base href=\"%s%s%s\">\n"
                 " </head>\n"
                 " <body>\n  <h2>Directory of "
                 "<a href=\"/\">%s</a>/%s",
-                site, basedir, ap_escape_html(p, path),
-                site, str);
+                site, basedir, escpath, site, basedir, escpath, site, str);
 
         APR_BRIGADE_INSERT_TAIL(out, apr_bucket_pool_create(str, strlen(str),
                                                           p, c->bucket_alloc));
@@ -959,6 +961,7 @@ static int proxy_ftp_handler(request_rec *r, proxy_worker *worker,
         }
         /* TODO: see if ftp could use determine_connection */
         backend->addr = connect_addr;
+        backend->r = r;
         ap_set_module_config(c->conn_config, &proxy_ftp_module, backend);
     }
 
diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index e5f654bb..3ca21895 100644
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -33,7 +33,8 @@ static apr_status_t ap_proxy_http_cleanup(const char *scheme,
  */
 static int proxy_http_canon(request_rec *r, char *url)
 {
-    char *host, *path, *search, sport[7];
+    char *host, *path, sport[7];
+    char *search = NULL;
     const char *err;
     const char *scheme;
     apr_port_t port, def_port;
@@ -67,21 +68,11 @@ static int proxy_http_canon(request_rec *r, char *url)
         return HTTP_BAD_REQUEST;
     }
 
-    /* now parse path/search args, according to rfc1738 */
-    /* N.B. if this isn't a true proxy request, then the URL _path_
-     * has already been decoded.  True proxy requests have r->uri
-     * == r->unparsed_uri, and no others have that property.
-     */
-    if (r->uri == r->unparsed_uri) {
-        search = strchr(url, '?');
-        if (search != NULL)
-            *(search++) = '\0';
-    }
-    else
-        search = r->args;
-
-    /* process path */
-    /* In a reverse proxy, our URL has been processed, so canonicalise
+    /*
+     * now parse path/search args, according to rfc1738:
+     * process the path.
+     *
+     * In a reverse proxy, our URL has been processed, so canonicalise
      * unless proxy-nocanon is set to say it's raw
      * In a forward proxy, we have and MUST NOT MANGLE the original.
      */
@@ -94,6 +85,7 @@ static int proxy_http_canon(request_rec *r, char *url)
         else {
             path = ap_proxy_canonenc(r->pool, url, strlen(url),
                                      enc_path, 0, r->proxyreq);
+            search = r->args;
         }
         break;
     case PROXYREQ_PROXY:
@@ -259,7 +251,7 @@ static void terminate_headers(apr_bucket_alloc_t *bucket_alloc,
     APR_BRIGADE_INSERT_TAIL(header_brigade, e);
 }
 
-static apr_status_t pass_brigade(apr_bucket_alloc_t *bucket_alloc,
+static int pass_brigade(apr_bucket_alloc_t *bucket_alloc,
                                  request_rec *r, proxy_conn_rec *conn,
                                  conn_rec *origin, apr_bucket_brigade *bb,
                                  int flush)
@@ -279,22 +271,27 @@ static apr_status_t pass_brigade(apr_bucket_alloc_t *bucket_alloc,
         ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,
                      "proxy: pass request body failed to %pI (%s)",
                      conn->addr, conn->hostname);
-        return status;
+        if (origin->aborted) { 
+            return APR_STATUS_IS_TIMEUP(status) ? HTTP_GATEWAY_TIME_OUT : HTTP_BAD_GATEWAY;
+        }
+        else { 
+            return HTTP_BAD_REQUEST; 
+        }
     }
     apr_brigade_cleanup(bb);
-    return APR_SUCCESS;
+    return OK;
 }
 
 #define MAX_MEM_SPOOL 16384
 
-static apr_status_t stream_reqbody_chunked(apr_pool_t *p,
+static int stream_reqbody_chunked(apr_pool_t *p,
                                            request_rec *r,
                                            proxy_conn_rec *p_conn,
                                            conn_rec *origin,
                                            apr_bucket_brigade *header_brigade,
                                            apr_bucket_brigade *input_brigade)
 {
-    int seen_eos = 0;
+    int seen_eos = 0, rv = OK;
     apr_size_t hdr_len;
     apr_off_t bytes;
     apr_status_t status;
@@ -352,7 +349,7 @@ static apr_status_t stream_reqbody_chunked(apr_pool_t *p,
              */
             status = ap_save_brigade(NULL, &bb, &input_brigade, p);
             if (status != APR_SUCCESS) {
-                return status;
+                return HTTP_INTERNAL_SERVER_ERROR;
             }
 
             header_brigade = NULL;
@@ -362,9 +359,9 @@ static apr_status_t stream_reqbody_chunked(apr_pool_t *p,
         }
 
         /* The request is flushed below this loop with chunk EOS header */
-        status = pass_brigade(bucket_alloc, r, p_conn, origin, bb, 0);
-        if (status != APR_SUCCESS) {
-            return status;
+        rv = pass_brigade(bucket_alloc, r, p_conn, origin, bb, 0);
+        if (rv != OK) {
+            return rv;
         }
 
         if (seen_eos) {
@@ -376,7 +373,7 @@ static apr_status_t stream_reqbody_chunked(apr_pool_t *p,
                                 HUGE_STRING_LEN);
 
         if (status != APR_SUCCESS) {
-            return status;
+            return HTTP_BAD_REQUEST;
         }
     }
 
@@ -403,11 +400,11 @@ static apr_status_t stream_reqbody_chunked(apr_pool_t *p,
     APR_BRIGADE_INSERT_TAIL(bb, e);
 
     /* Now we have headers-only, or the chunk EOS mark; flush it */
-    status = pass_brigade(bucket_alloc, r, p_conn, origin, bb, 1);
-    return status;
+    rv = pass_brigade(bucket_alloc, r, p_conn, origin, bb, 1);
+    return rv;
 }
 
-static apr_status_t stream_reqbody_cl(apr_pool_t *p,
+static int stream_reqbody_cl(apr_pool_t *p,
                                       request_rec *r,
                                       proxy_conn_rec *p_conn,
                                       conn_rec *origin,
@@ -415,7 +412,7 @@ static apr_status_t stream_reqbody_cl(apr_pool_t *p,
                                       apr_bucket_brigade *input_brigade,
                                       const char *old_cl_val)
 {
-    int seen_eos = 0;
+    int seen_eos = 0, rv = 0;
     apr_status_t status = APR_SUCCESS;
     apr_bucket_alloc_t *bucket_alloc = r->connection->bucket_alloc;
     apr_bucket_brigade *bb;
@@ -428,7 +425,7 @@ static apr_status_t stream_reqbody_cl(apr_pool_t *p,
         add_cl(p, bucket_alloc, header_brigade, old_cl_val);
         if (APR_SUCCESS != (status = apr_strtoff(&cl_val, old_cl_val, NULL,
                                                  0))) {
-            return status;
+            return HTTP_INTERNAL_SERVER_ERROR;
         }
     }
     terminate_headers(bucket_alloc, header_brigade);
@@ -476,7 +473,7 @@ static apr_status_t stream_reqbody_cl(apr_pool_t *p,
              */
             status = ap_save_brigade(NULL, &bb, &input_brigade, p);
             if (status != APR_SUCCESS) {
-                return status;
+                return HTTP_INTERNAL_SERVER_ERROR;
             }
 
             header_brigade = NULL;
@@ -486,9 +483,9 @@ static apr_status_t stream_reqbody_cl(apr_pool_t *p,
         }
 
         /* Once we hit EOS, we are ready to flush. */
-        status = pass_brigade(bucket_alloc, r, p_conn, origin, bb, seen_eos);
-        if (status != APR_SUCCESS) {
-            return status;
+        rv = pass_brigade(bucket_alloc, r, p_conn, origin, bb, seen_eos);
+        if (rv != OK) {
+            return rv ;
         }
 
         if (seen_eos) {
@@ -500,7 +497,7 @@ static apr_status_t stream_reqbody_cl(apr_pool_t *p,
                                 HUGE_STRING_LEN);
 
         if (status != APR_SUCCESS) {
-            return status;
+            return HTTP_BAD_REQUEST;
         }
     }
 
@@ -508,7 +505,7 @@ static apr_status_t stream_reqbody_cl(apr_pool_t *p,
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                      "proxy: client %s given Content-Length did not match"
                      " number of body bytes read", r->connection->remote_ip);
-        return APR_EOF;
+        return HTTP_BAD_REQUEST;
     }
 
     if (header_brigade) {
@@ -516,12 +513,13 @@ static apr_status_t stream_reqbody_cl(apr_pool_t *p,
          * body; send it now with the flush flag
          */
         bb = header_brigade;
-        status = pass_brigade(bucket_alloc, r, p_conn, origin, bb, 1);
+        return(pass_brigade(bucket_alloc, r, p_conn, origin, bb, 1));
     }
-    return status;
+
+    return OK;
 }
 
-static apr_status_t spool_reqbody_cl(apr_pool_t *p,
+static int spool_reqbody_cl(apr_pool_t *p,
                                      request_rec *r,
                                      proxy_conn_rec *p_conn,
                                      conn_rec *origin,
@@ -562,7 +560,7 @@ static apr_status_t spool_reqbody_cl(apr_pool_t *p,
                 if (status != APR_SUCCESS) {
                     ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,
                                  "proxy: search for temporary directory failed");
-                    return status;
+                    return HTTP_INTERNAL_SERVER_ERROR;
                 }
                 apr_filepath_merge(&template, temp_dir,
                                    "modproxy.tmp.XXXXXX",
@@ -572,7 +570,7 @@ static apr_status_t spool_reqbody_cl(apr_pool_t *p,
                     ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,
                                  "proxy: creation of temporary file in directory %s failed",
                                  temp_dir);
-                    return status;
+                    return HTTP_INTERNAL_SERVER_ERROR;
                 }
             }
             for (e = APR_BRIGADE_FIRST(input_brigade);
@@ -592,7 +590,7 @@ static apr_status_t spool_reqbody_cl(apr_pool_t *p,
                     ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,
                                  "proxy: write to temporary file %s failed",
                                  tmpfile_name);
-                    return status;
+                    return HTTP_INTERNAL_SERVER_ERROR;
                 }
                 AP_DEBUG_ASSERT(bytes_read == bytes_written);
                 fsize += bytes_written;
@@ -612,7 +610,7 @@ static apr_status_t spool_reqbody_cl(apr_pool_t *p,
              */
             status = ap_save_brigade(NULL, &body_brigade, &input_brigade, p);
             if (status != APR_SUCCESS) {
-                return status;
+                return HTTP_INTERNAL_SERVER_ERROR;
             }
 
         }
@@ -628,7 +626,7 @@ static apr_status_t spool_reqbody_cl(apr_pool_t *p,
                                 HUGE_STRING_LEN);
 
         if (status != APR_SUCCESS) {
-            return status;
+            return HTTP_BAD_REQUEST;
         }
     }
 
@@ -662,12 +660,11 @@ static apr_status_t spool_reqbody_cl(apr_pool_t *p,
         APR_BRIGADE_INSERT_TAIL(header_brigade, e);
     }
     /* This is all a single brigade, pass with flush flagged */
-    status = pass_brigade(bucket_alloc, r, p_conn, origin, header_brigade, 1);
-    return status;
+    return(pass_brigade(bucket_alloc, r, p_conn, origin, header_brigade, 1));
 }
 
 static
-apr_status_t ap_proxy_http_request(apr_pool_t *p, request_rec *r,
+int ap_proxy_http_request(apr_pool_t *p, request_rec *r,
                                    proxy_conn_rec *p_conn, conn_rec *origin,
                                    proxy_server_conf *conf,
                                    apr_uri_t *uri,
@@ -690,7 +687,7 @@ apr_status_t ap_proxy_http_request(apr_pool_t *p, request_rec *r,
     const char *old_te_val = NULL;
     apr_off_t bytes_read = 0;
     apr_off_t bytes;
-    int force10;
+    int force10, rv;
     apr_table_t *headers_in_copy;
 
     header_brigade = apr_brigade_create(p, origin->bucket_alloc);
@@ -932,7 +929,7 @@ apr_status_t ap_proxy_http_request(apr_pool_t *p, request_rec *r,
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                      "proxy: %s Transfer-Encoding is not supported",
                      old_te_val);
-        return APR_EINVAL;
+        return HTTP_INTERNAL_SERVER_ERROR;
     }
 
     if (old_cl_val && old_te_val) {
@@ -965,7 +962,7 @@ apr_status_t ap_proxy_http_request(apr_pool_t *p, request_rec *r,
                          " from %s (%s)",
                          p_conn->addr, p_conn->hostname ? p_conn->hostname: "",
                          c->remote_ip, c->remote_host ? c->remote_host: "");
-            return status;
+            return HTTP_BAD_REQUEST;
         }
 
         apr_brigade_length(temp_brigade, 1, &bytes);
@@ -987,7 +984,7 @@ apr_status_t ap_proxy_http_request(apr_pool_t *p, request_rec *r,
                          " to %pI (%s) from %s (%s)",
                          p_conn->addr, p_conn->hostname ? p_conn->hostname: "",
                          c->remote_ip, c->remote_host ? c->remote_host: "");
-            return status;
+            return HTTP_INTERNAL_SERVER_ERROR;
         }
 
     /* Ensure we don't hit a wall where we have a buffer too small
@@ -1101,37 +1098,38 @@ skip_body:
     /* send the request body, if any. */
     switch(rb_method) {
     case RB_STREAM_CHUNKED:
-        status = stream_reqbody_chunked(p, r, p_conn, origin, header_brigade,
+        rv = stream_reqbody_chunked(p, r, p_conn, origin, header_brigade,
                                         input_brigade);
         break;
     case RB_STREAM_CL:
-        status = stream_reqbody_cl(p, r, p_conn, origin, header_brigade,
+        rv = stream_reqbody_cl(p, r, p_conn, origin, header_brigade,
                                    input_brigade, old_cl_val);
         break;
     case RB_SPOOL_CL:
-        status = spool_reqbody_cl(p, r, p_conn, origin, header_brigade,
+        rv = spool_reqbody_cl(p, r, p_conn, origin, header_brigade,
                                   input_brigade, (old_cl_val != NULL)
                                               || (old_te_val != NULL)
                                               || (bytes_read > 0));
         break;
     default:
         /* shouldn't be possible */
-        status = APR_EINVAL;
+        rv = HTTP_INTERNAL_SERVER_ERROR ;
         break;
     }
 
-    if (status != APR_SUCCESS) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,
+    if (rv != OK) {
+        /* apr_errno value has been logged in lower level method */
+        ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                      "proxy: pass request body failed to %pI (%s)"
                      " from %s (%s)",
                      p_conn->addr,
                      p_conn->hostname ? p_conn->hostname: "",
                      c->remote_ip,
                      c->remote_host ? c->remote_host: "");
-        return status;
+        return rv;
     }
 
-    return APR_SUCCESS;
+    return OK;
 }
 
 static void process_proxy_header(request_rec* r, proxy_dir_conf* c,
@@ -1309,6 +1307,16 @@ apr_status_t ap_proxygetline(apr_bucket_brigade *bb, char *s, int n, request_rec
     return rv;
 }
 
+/*
+ * Limit the number of interim respones we sent back to the client. Otherwise
+ * we suffer from a memory build up. Besides there is NO sense in sending back
+ * an unlimited number of interim responses to the client. Thus if we cross
+ * this limit send back a 502 (Bad Gateway).
+ */
+#ifndef AP_MAX_INTERIM_RESPONSES
+#define AP_MAX_INTERIM_RESPONSES 10
+#endif
+
 static
 apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
                                             proxy_conn_rec *backend,
@@ -1323,14 +1331,15 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
     apr_bucket *e;
     apr_bucket_brigade *bb, *tmp_bb;
     int len, backasswards;
-    int interim_response; /* non-zero whilst interim 1xx responses
-                           * are being read. */
+    int interim_response = 0; /* non-zero whilst interim 1xx responses
+                               * are being read. */
     int pread_len = 0;
     apr_table_t *save_table;
     int backend_broke = 0;
     static const char *hop_by_hop_hdrs[] =
         {"Keep-Alive", "Proxy-Authenticate", "TE", "Trailer", "Upgrade", NULL};
     int i;
+    const char *te = NULL;
 
     bb = apr_brigade_create(p, c->bucket_alloc);
 
@@ -1358,6 +1367,56 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
             ap_log_rerror(APLOG_MARK, APLOG_ERR, rc, r,
                           "proxy: error reading status line from remote "
                           "server %s", backend->hostname);
+            /*
+             * If we are a reverse proxy request shutdown the connection
+             * WITHOUT ANY response to trigger a retry by the client
+             * if allowed (as for idempotent requests).
+             * BUT currently we should not do this if the request is the
+             * first request on a keepalive connection as browsers like
+             * seamonkey only display an empty page in this case and do
+             * not do a retry.
+             */
+            if (r->proxyreq == PROXYREQ_REVERSE && c->keepalives) {
+                apr_bucket *eos;
+
+                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+                              "proxy: Closing connection to client because"
+                              " reading from backend server %s failed. Number"
+                              " of keepalives %i", backend->hostname, 
+                              c->keepalives);
+                ap_proxy_backend_broke(r, bb);
+                /*
+                 * Add an EOC bucket to signal the ap_http_header_filter
+                 * that it should get out of our way, BUT ensure that the
+                 * EOC bucket is inserted BEFORE an EOS bucket in bb as
+                 * some resource filters like mod_deflate pass everything
+                 * up to the EOS down the chain immediately and sent the
+                 * remainder of the brigade later (or even never). But in
+                 * this case the ap_http_header_filter does not get out of
+                 * our way soon enough.
+                 */
+                e = ap_bucket_eoc_create(c->bucket_alloc);
+                eos = APR_BRIGADE_LAST(bb);
+                while ((APR_BRIGADE_SENTINEL(bb) != eos)
+                       && !APR_BUCKET_IS_EOS(eos)) {
+                    eos = APR_BUCKET_PREV(eos);
+                }
+                if (eos == APR_BRIGADE_SENTINEL(bb)) {
+                    APR_BRIGADE_INSERT_TAIL(bb, e);
+                }
+                else {
+                    APR_BUCKET_INSERT_BEFORE(eos, e);
+                }
+                ap_pass_brigade(r->output_filters, bb);
+                /* Need to return OK to avoid sending an error message */
+                return OK;
+            }
+            else if (!c->keepalives) {
+                     ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+                                   "proxy: NOT Closing connection to client"
+                                   " although reading from backend server %s"
+                                   " failed.", backend->hostname);
+            }
             return ap_proxyerror(r, HTTP_BAD_GATEWAY,
                                  "Error reading from remote server");
         }
@@ -1461,6 +1520,11 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
                 backend->close += 1;
             }
 
+            /*
+             * Save a possible Transfer-Encoding header as we need it later for
+             * ap_http_filter to know where to end.
+             */
+            te = apr_table_get(r->headers_out, "Transfer-Encoding");
             /* strip connection listed hop-by-hop headers from response */
             backend->close += ap_proxy_liststr(apr_table_get(r->headers_out,
                                                              "Connection"),
@@ -1469,7 +1533,9 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
             if ((buf = apr_table_get(r->headers_out, "Content-Type"))) {
                 ap_set_content_type(r, apr_pstrdup(p, buf));
             }
-            ap_proxy_pre_http_request(origin,rp);
+            if (!ap_is_HTTP_INFO(r->status)) {
+                ap_proxy_pre_http_request(origin, rp);
+            }
 
             /* Clear hop-by-hop headers */
             for (i=0; hop_by_hop_hdrs[i]; ++i) {
@@ -1518,7 +1584,12 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
             backend->close += 1;
         }
 
-        interim_response = ap_is_HTTP_INFO(r->status);
+        if (ap_is_HTTP_INFO(r->status)) {
+            interim_response++;
+        }
+        else {
+            interim_response = 0;
+        }
         if (interim_response) {
             /* RFC2616 tells us to forward this.
              *
@@ -1601,6 +1672,14 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
              * ap_http_filter to know where to end.
              */
             rp->headers_in = apr_table_copy(r->pool, r->headers_out);
+            /*
+             * Restore Transfer-Encoding header from response if we saved
+             * one before and there is none left. We need it for the
+             * ap_http_filter. See above.
+             */
+            if (te && !apr_table_get(rp->headers_in, "Transfer-Encoding")) {
+                apr_table_add(rp->headers_in, "Transfer-Encoding", te);
+            }
 
             apr_table_unset(r->headers_out,"Transfer-Encoding");
 
@@ -1711,7 +1790,15 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
 
             apr_brigade_cleanup(bb);
         }
-    } while (interim_response);
+    } while (interim_response && (interim_response < AP_MAX_INTERIM_RESPONSES));
+
+    /* See define of AP_MAX_INTERIM_RESPONSES for why */
+    if (interim_response >= AP_MAX_INTERIM_RESPONSES) {
+        return ap_proxyerror(r, HTTP_BAD_GATEWAY,
+                             apr_psprintf(p, 
+                             "Too many (%d) interim responses from origin server",
+                             interim_response));
+    }
 
     /* If our connection with the client is to be aborted, return DONE. */
     if (c->aborted || backend_broke) {
@@ -1830,14 +1917,9 @@ static int proxy_http_handler(request_rec *r, proxy_worker *worker,
 
 
     backend->is_ssl = is_ssl;
-    /*
-     * TODO: Currently we cannot handle persistent SSL backend connections,
-     * because we recreate backend->connection for each request and thus
-     * try to initialize an already existing SSL connection. This does
-     * not work.
-     */
-    if (is_ssl)
-        backend->close_on_recycle = 1;
+    if (is_ssl) {
+        ap_proxy_ssl_connection_cleanup(backend, r);
+    }
 
     /* Step One: Determine Who To Connect To */
     if ((status = ap_proxy_determine_connection(p, r, conf, worker, backend,
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 910f3610..e8309e46 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -332,16 +332,16 @@ PROXY_DECLARE(const char *)
 
 PROXY_DECLARE(request_rec *)ap_proxy_make_fake_req(conn_rec *c, request_rec *r)
 {
-    request_rec *rp = apr_pcalloc(c->pool, sizeof(*r));
+    request_rec *rp = apr_pcalloc(r->pool, sizeof(*r));
 
-    rp->pool            = c->pool;
+    rp->pool            = r->pool;
     rp->status          = HTTP_OK;
 
-    rp->headers_in      = apr_table_make(c->pool, 50);
-    rp->subprocess_env  = apr_table_make(c->pool, 50);
-    rp->headers_out     = apr_table_make(c->pool, 12);
-    rp->err_headers_out = apr_table_make(c->pool, 5);
-    rp->notes           = apr_table_make(c->pool, 5);
+    rp->headers_in      = apr_table_make(r->pool, 50);
+    rp->subprocess_env  = apr_table_make(r->pool, 50);
+    rp->headers_out     = apr_table_make(r->pool, 12);
+    rp->err_headers_out = apr_table_make(r->pool, 5);
+    rp->notes           = apr_table_make(r->pool, 5);
 
     rp->server = r->server;
     rp->proxyreq = r->proxyreq;
@@ -352,7 +352,7 @@ PROXY_DECLARE(request_rec *)ap_proxy_make_fake_req(conn_rec *c, request_rec *r)
     rp->proto_output_filters  = c->output_filters;
     rp->proto_input_filters   = c->input_filters;
 
-    rp->request_config  = ap_create_request_config(c->pool);
+    rp->request_config  = ap_create_request_config(r->pool);
     proxy_run_create_req(r, rp);
 
     return rp;
@@ -1041,6 +1041,7 @@ PROXY_DECLARE(void) ap_proxy_table_unmerge(apr_pool_t *p, apr_table_t *t, char *
 PROXY_DECLARE(const char *) ap_proxy_location_reverse_map(request_rec *r,
                               proxy_dir_conf *conf, const char *url)
 {
+    proxy_req_conf *rconf;
     struct proxy_alias *ent;
     int i, l1, l2;
     char *u;
@@ -1049,12 +1050,67 @@ PROXY_DECLARE(const char *) ap_proxy_location_reverse_map(request_rec *r,
      * XXX FIXME: Make sure this handled the ambiguous case of the :<PORT>
      * after the hostname
      */
+    if (r->proxyreq != PROXYREQ_REVERSE) {
+        return url;
+    }
 
     l1 = strlen(url);
-    ent = (struct proxy_alias *)conf->raliases->elts;
+    if (conf->interpolate_env == 1) {
+        rconf = ap_get_module_config(r->request_config, &proxy_module);
+        ent = (struct proxy_alias *)rconf->raliases->elts;
+    }
+    else {
+        ent = (struct proxy_alias *)conf->raliases->elts;
+    }
     for (i = 0; i < conf->raliases->nelts; i++) {
-        l2 = strlen(ent[i].real);
-        if (l1 >= l2 && strncasecmp(ent[i].real, url, l2) == 0) {
+        proxy_server_conf *sconf = (proxy_server_conf *)
+            ap_get_module_config(r->server->module_config, &proxy_module);
+        proxy_balancer *balancer;
+        const char *real;
+        real = ent[i].real;
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+                         "ppr: real: %s", real);
+        /*
+         * First check if mapping against a balancer and see
+         * if we have such a entity. If so, then we need to
+         * find the particulars of the actual worker which may
+         * or may not be the right one... basically, we need
+         * to find which member actually handled this request.
+         */
+        if ((strncasecmp(real, "balancer:", 9) == 0) &&
+            (balancer = ap_proxy_get_balancer(r->pool, sconf, real))) {
+            int n;
+            proxy_worker *worker;
+            worker = (proxy_worker *)balancer->workers->elts;
+            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+                         "ppr: checking balancer: %s",
+                         balancer->name);
+            for (n = 0; n < balancer->workers->nelts; n++) {
+                if (worker->port) {
+                    u = apr_psprintf(r->pool, "%s://%s:%d/", worker->scheme,
+                                     worker->hostname, worker->port);
+                }
+                else {
+                    u = apr_psprintf(r->pool, "%s://%s/", worker->scheme,
+                                     worker->hostname);
+                }
+                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+                         "ppr: matching member (%s) and URL (%s)",
+                         u, url);
+
+                l2 = strlen(u);
+                if (l1 >= l2 && strncasecmp(u, url, l2) == 0) {
+                    u = apr_pstrcat(r->pool, ent[i].fake, &url[l2], NULL);
+                    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+                         "ppr: matched member (%s)", u);
+                    return ap_construct_url(r->pool, u, r);
+                }
+                worker++;
+            }
+        }
+
+        l2 = strlen(real);
+        if (l1 >= l2 && strncasecmp(real, url, l2) == 0) {
             u = apr_pstrcat(r->pool, ent[i].fake, &url[l2], NULL);
             return ap_construct_url(r->pool, u, r);
         }
@@ -1073,6 +1129,8 @@ PROXY_DECLARE(const char *) ap_proxy_location_reverse_map(request_rec *r,
 PROXY_DECLARE(const char *) ap_proxy_cookie_reverse_map(request_rec *r,
                               proxy_dir_conf *conf, const char *str)
 {
+    proxy_req_conf *rconf = ap_get_module_config(r->request_config,
+                                                 &proxy_module);
     struct proxy_alias *ent;
     size_t len = strlen(str);
     const char *newpath = NULL;
@@ -1087,6 +1145,10 @@ PROXY_DECLARE(const char *) ap_proxy_cookie_reverse_map(request_rec *r,
     int pdiff = 0;
     char *ret;
 
+    if (r->proxyreq != PROXYREQ_REVERSE) {
+        return str;
+    }
+
    /*
     * Find the match and replacement, but save replacing until we've done
     * both path and domain so we know the new strlen
@@ -1097,7 +1159,12 @@ PROXY_DECLARE(const char *) ap_proxy_cookie_reverse_map(request_rec *r,
         pathe = ap_strchr_c(pathp, ';');
         l1 = pathe ? (pathe - pathp) : strlen(pathp);
         pathe = pathp + l1 ;
-        ent = (struct proxy_alias *)conf->cookie_paths->elts;
+        if (conf->interpolate_env == 1) {
+            ent = (struct proxy_alias *)rconf->cookie_paths->elts;
+        }
+        else {
+            ent = (struct proxy_alias *)conf->cookie_paths->elts;
+        }
         for (i = 0; i < conf->cookie_paths->nelts; i++) {
             l2 = strlen(ent[i].fake);
             if (l1 >= l2 && strncmp(ent[i].fake, pathp, l2) == 0) {
@@ -1114,7 +1181,12 @@ PROXY_DECLARE(const char *) ap_proxy_cookie_reverse_map(request_rec *r,
         domaine = ap_strchr_c(domainp, ';');
         l1 = domaine ? (domaine - domainp) : strlen(domainp);
         domaine = domainp + l1;
-        ent = (struct proxy_alias *)conf->cookie_domains->elts;
+        if (conf->interpolate_env == 1) {
+            ent = (struct proxy_alias *)rconf->cookie_domains->elts;
+        }
+        else {
+            ent = (struct proxy_alias *)conf->cookie_domains->elts;
+        }
         for (i = 0; i < conf->cookie_domains->nelts; i++) {
             l2 = strlen(ent[i].fake);
             if (l1 >= l2 && strncasecmp(ent[i].fake, domainp, l2) == 0) {
@@ -1323,6 +1395,7 @@ static void init_conn_pool(apr_pool_t *p, proxy_worker *worker)
      * it can be disabled.
      */
     apr_pool_create(&pool, p);
+    apr_pool_tag(pool, "proxy_worker_cp");
     /*
      * Alloc from the same pool as worker.
      * proxy_conn_pool is permanently attached to the worker.
@@ -1550,6 +1623,9 @@ static apr_status_t connection_cleanup(void *theconn)
 {
     proxy_conn_rec *conn = (proxy_conn_rec *)theconn;
     proxy_worker *worker = conn->worker;
+    apr_bucket_brigade *bb;
+    conn_rec *c;
+    request_rec *r;
 
     /*
      * If the connection pool is NULL the worker
@@ -1570,13 +1646,67 @@ static apr_status_t connection_cleanup(void *theconn)
     }
 #endif
 
+    r = conn->r;
+    if (conn->need_flush && r && (r->bytes_sent || r->eos_sent)) {
+        /*
+         * We need to ensure that buckets that may have been buffered in the
+         * network filters get flushed to the network. This is needed since
+         * these buckets have been created with the bucket allocator of the
+         * backend connection. This allocator either gets destroyed if
+         * conn->close is set or the worker address is not reusable which
+         * causes the connection to the backend to be closed or it will be used
+         * again by another frontend connection that wants to recycle the
+         * backend connection.
+         * In this case we could run into nasty race conditions (e.g. if the
+         * next user of the backend connection destroys the allocator before we
+         * sent the buckets to the network).
+         *
+         * Remark 1: Only do this if buckets where sent down the chain before
+         * that could still be buffered in the network filter. This is the case
+         * if we have sent an EOS bucket or if we actually sent buckets with
+         * data down the chain. In all other cases we either have not sent any
+         * buckets at all down the chain or we only sent meta buckets that are
+         * not EOS buckets down the chain. The only meta bucket that remains in
+         * this case is the flush bucket which would have removed all possibly
+         * buffered buckets in the network filter.
+         * If we sent a flush bucket in the case where not ANY buckets were
+         * sent down the chain, we break error handling which happens AFTER us.
+         *
+         * Remark 2: Doing a setaside does not help here as the buckets remain
+         * created by the wrong allocator in this case.
+         *
+         * Remark 3: Yes, this creates a possible performance penalty in the case
+         * of pipelined requests as we may send only a small amount of data over
+         * the wire.
+         */
+        c = r->connection;
+        bb = apr_brigade_create(r->pool, c->bucket_alloc);
+        if (r->eos_sent) {
+            /*
+             * If we have already sent an EOS bucket send directly to the
+             * connection based filters. We just want to flush the buckets
+             * if something hasn't been sent to the network yet.
+             */
+            ap_fflush(c->output_filters, bb);
+        }
+        else {
+            ap_fflush(r->output_filters, bb);
+        }
+        apr_brigade_destroy(bb);
+        conn->r = NULL;
+        conn->need_flush = 0;
+    }
+
     /* determine if the connection need to be closed */
-    if (conn->close_on_recycle || conn->close) {
+    if (conn->close_on_recycle || conn->close || worker->disablereuse ||
+        !worker->is_address_reusable) {
         apr_pool_t *p = conn->pool;
-        apr_pool_clear(conn->pool);
-        memset(conn, 0, sizeof(proxy_conn_rec));
+        apr_pool_clear(p);
+        conn = apr_pcalloc(p, sizeof(proxy_conn_rec));
         conn->pool = p;
         conn->worker = worker;
+        apr_pool_create(&(conn->scpool), p);
+        apr_pool_tag(conn->scpool, "proxy_conn_scpool");
     }
 #if APR_HAS_THREADS
     if (worker->hmax && worker->cp->res) {
@@ -1593,11 +1723,54 @@ static apr_status_t connection_cleanup(void *theconn)
     return APR_SUCCESS;
 }
 
+static void socket_cleanup(proxy_conn_rec *conn)
+{
+    conn->sock = NULL;
+    conn->connection = NULL;
+    apr_pool_clear(conn->scpool);
+}
+
+PROXY_DECLARE(apr_status_t) ap_proxy_ssl_connection_cleanup(proxy_conn_rec *conn,
+                                                            request_rec *r)
+{
+    apr_bucket_brigade *bb;
+    apr_status_t rv;
+
+    /*
+     * If we have an existing SSL connection it might be possible that the
+     * server sent some SSL message we have not read so far (e.g. a SSL
+     * shutdown message if the server closed the keepalive connection while
+     * the connection was held unused in our pool).
+     * So ensure that if present (=> APR_NONBLOCK_READ) it is read and
+     * processed. We don't expect any data to be in the returned brigade.
+     */
+    if (conn->sock && conn->connection) {
+        bb = apr_brigade_create(r->pool, r->connection->bucket_alloc);
+        rv = ap_get_brigade(conn->connection->input_filters, bb,
+                            AP_MODE_READBYTES, APR_NONBLOCK_READ,
+                            HUGE_STRING_LEN);
+        if ((rv != APR_SUCCESS) && !APR_STATUS_IS_EAGAIN(rv)) {
+            socket_cleanup(conn);
+        }
+        if (!APR_BRIGADE_EMPTY(bb)) {
+            apr_off_t len;
+
+            rv = apr_brigade_length(bb, 0, &len);
+            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r,
+                          "proxy: SSL cleanup brigade contained %"
+                          APR_OFF_T_FMT " bytes of data.", len);
+        }
+        apr_brigade_destroy(bb);
+    }
+    return APR_SUCCESS;
+}
+
 /* reslist constructor */
 static apr_status_t connection_constructor(void **resource, void *params,
                                            apr_pool_t *pool)
 {
     apr_pool_t *ctx;
+    apr_pool_t *scpool;
     proxy_conn_rec *conn;
     proxy_worker *worker = (proxy_worker *)params;
 
@@ -1607,9 +1780,20 @@ static apr_status_t connection_constructor(void **resource, void *params,
      * when disconnecting from backend.
      */
     apr_pool_create(&ctx, pool);
-    conn = apr_pcalloc(pool, sizeof(proxy_conn_rec));
+    apr_pool_tag(ctx, "proxy_conn_pool");
+    /*
+     * Create another subpool that manages the data for the
+     * socket and the connection member of the proxy_conn_rec struct as we
+     * destroy this data more frequently than other data in the proxy_conn_rec
+     * struct like hostname and addr (at least in the case where we have
+     * keepalive connections that timed out).
+     */
+    apr_pool_create(&scpool, ctx);
+    apr_pool_tag(scpool, "proxy_conn_scpool");
+    conn = apr_pcalloc(ctx, sizeof(proxy_conn_rec));
 
     conn->pool   = ctx;
+    conn->scpool = scpool;
     conn->worker = worker;
 #if APR_HAS_THREADS
     conn->inreslist = 1;
@@ -1725,8 +1909,13 @@ PROXY_DECLARE(apr_status_t) ap_proxy_initialize_worker(proxy_worker *worker, ser
     if (!worker->retry_set) {
         worker->retry = apr_time_from_sec(PROXY_WORKER_DEFAULT_RETRY);
     }
-    /* By default address is reusable */
-    worker->is_address_reusable = 1;
+    /* By default address is reusable unless DisableReuse is set */
+    if (worker->disablereuse) {
+        worker->is_address_reusable = 0;
+    }
+    else {
+        worker->is_address_reusable = 1;
+    }
 
 #if APR_HAS_THREADS
     ap_mpm_query(AP_MPMQ_MAX_THREADS, &mpm_threads);
@@ -1873,11 +2062,6 @@ PROXY_DECLARE(int) ap_proxy_release_connection(const char *proxy_function,
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
                  "proxy: %s: has released connection for (%s)",
                  proxy_function, conn->worker->hostname);
-    /* If there is a connection kill it's cleanup */
-    if (conn->connection) {
-        apr_pool_cleanup_kill(conn->connection->pool, conn, connection_cleanup);
-        conn->connection = NULL;
-    }
     connection_cleanup(conn);
 
     return OK;
@@ -1899,6 +2083,8 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r,
     apr_status_t err = APR_SUCCESS;
     apr_status_t uerr = APR_SUCCESS;
 
+    conn->r = r;
+
     /*
      * Break up the URL to determine the host to connect to
      */
@@ -1938,7 +2124,8 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r,
      *
      * TODO: Handle this much better...
      */
-    if (!conn->hostname || !worker->is_address_reusable ||
+    if (!conn->hostname || !worker->is_address_reusable || 
+         worker->disablereuse ||
          (r->connection->keepalives &&
          (r->proxyreq == PROXYREQ_PROXY || r->proxyreq == PROXYREQ_REVERSE) &&
          (strcasecmp(conn->hostname, uri->hostname) != 0) ) ) {
@@ -1950,14 +2137,7 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r,
             conn->hostname = apr_pstrdup(conn->pool, uri->hostname);
             conn->port = uri->port;
         }
-        if (conn->sock) {
-            apr_socket_close(conn->sock);
-            conn->sock = NULL;
-        }
-        if (conn->connection) {
-            apr_pool_cleanup_kill(conn->connection->pool, conn, connection_cleanup);
-            conn->connection = NULL;
-        }
+        socket_cleanup(conn);
         err = apr_sockaddr_info_get(&(conn->addr),
                                     conn->hostname, APR_UNSPEC,
                                     conn->port, 0,
@@ -2101,14 +2281,8 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
         (proxy_server_conf *) ap_get_module_config(sconf, &proxy_module);
 
     if (conn->sock) {
-        /*
-         * This increases the connection pool size
-         * but the number of dropped connections is
-         * relatively small compared to connection lifetime
-         */
         if (!(connected = is_socket_connected(conn->sock))) {
-            apr_socket_close(conn->sock);
-            conn->sock = NULL;
+            socket_cleanup(conn);
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
                          "proxy: %s: backend socket is disconnected.",
                          proxy_function);
@@ -2117,7 +2291,7 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
     while (backend_addr && !connected) {
         if ((rv = apr_socket_create(&newsock, backend_addr->family,
                                 SOCK_STREAM, APR_PROTO_TCP,
-                                conn->pool)) != APR_SUCCESS) {
+                                conn->scpool)) != APR_SUCCESS) {
             loglevel = backend_addr->next ? APLOG_DEBUG : APLOG_ERR;
             ap_log_error(APLOG_MARK, loglevel, rv, s,
                          "proxy: %s: error creating fam %d socket for target %s",
@@ -2132,6 +2306,7 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
             backend_addr = backend_addr->next;
             continue;
         }
+        conn->connection = NULL;
 
 #if !defined(TPF) && !defined(BEOS)
         if (worker->recv_buffer_size > 0 &&
@@ -2221,13 +2396,25 @@ PROXY_DECLARE(int) ap_proxy_connection_create(const char *proxy_function,
     apr_sockaddr_t *backend_addr = conn->addr;
     int rc;
     apr_interval_time_t current_timeout;
+    apr_bucket_alloc_t *bucket_alloc;
+
+    if (conn->connection) {
+        return OK;
+    }
 
     /*
+     * We need to flush the buckets before we return the connection to the
+     * connection pool. See comment in connection_cleanup for why this is
+     * needed.
+     */
+    conn->need_flush = 1;
+    bucket_alloc = apr_bucket_alloc_create(conn->scpool);
+    /*
      * The socket is now open, create a new backend server connection
      */
-    conn->connection = ap_run_create_connection(c->pool, s, conn->sock,
-                                                c->id, c->sbh,
-                                                c->bucket_alloc);
+    conn->connection = ap_run_create_connection(conn->scpool, s, conn->sock,
+                                                0, NULL,
+                                                bucket_alloc);
 
     if (!conn->connection) {
         /*
@@ -2239,17 +2426,9 @@ PROXY_DECLARE(int) ap_proxy_connection_create(const char *proxy_function,
                      "new connection to %pI (%s)", proxy_function,
                      backend_addr, conn->hostname);
         /* XXX: Will be closed when proxy_conn is closed */
-        apr_socket_close(conn->sock);
-        conn->sock = NULL;
+        socket_cleanup(conn);
         return HTTP_INTERNAL_SERVER_ERROR;
     }
-    /*
-     * register the connection cleanup to client connection
-     * so that the connection can be closed or reused
-     */
-    apr_pool_cleanup_register(c->pool, (void *)conn,
-                              connection_cleanup,
-                              apr_pool_cleanup_null);
 
     /* For ssl connection to backend */
     if (conn->is_ssl) {
diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index 01d5b43b..ff690167 100644
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -227,17 +227,18 @@ static apr_status_t ssl_cleanup_pre_config(void *data)
 #if HAVE_ENGINE_LOAD_BUILTIN_ENGINES
     ENGINE_cleanup();
 #endif
-#ifdef HAVE_OPENSSL
-#if OPENSSL_VERSION_NUMBER >= 0x00907001
-    CRYPTO_cleanup_all_ex_data();
-#endif
-#endif
     ERR_remove_state(0);
 
     /* Don't call ERR_free_strings here; ERR_load_*_strings only
      * actually load the error strings once per process due to static
      * variable abuse in OpenSSL. */
 
+    /* Also don't call CRYPTO_cleanup_all_ex_data here; any registered
+     * ex_data indices may have been cached in static variables in
+     * OpenSSL; removing them may cause havoc.  Notably, with OpenSSL
+     * versions >= 0.9.8f, COMP_CTX cleanups would not be run, which
+     * could result in a per-connection memory leak (!). */
+
     /*
      * TODO: determine somewhere we can safely shove out diagnostics
      *       (when enabled) at this late stage in the game:
diff --git a/server/core.c b/server/core.c
index 0e479b0c..3b1b01b7 100644
--- a/server/core.c
+++ b/server/core.c
@@ -1356,8 +1356,8 @@ static const char *set_override(cmd_parms *cmd, void *d_, const char *l)
     /* Throw a warning if we're in <Location> or <Files> */
     if (ap_check_cmd_context(cmd, NOT_IN_LOCATION | NOT_IN_FILES)) {
         ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server,
-                     "Useless use of AllowOverride in line %d.",
-                     cmd->directive->line_num);
+                     "Useless use of AllowOverride in line %d of %s.",
+                     cmd->directive->line_num, cmd->directive->filename);
     }
 
     d->override = OR_NONE;
@@ -1458,7 +1458,7 @@ static const char *set_options(cmd_parms *cmd, void *d_, const char *l)
             return apr_pstrcat(cmd->pool, "Illegal option ", w, NULL);
         }
 
-        if (!(cmd->override_opts & opt) && opt != OPT_NONE) {
+        if ( (cmd->override_opts & opt) != opt ) {
             return apr_pstrcat(cmd->pool, "Option ", w, " not allowed here", NULL);
         }
         else if (action == '-') {
diff --git a/server/gen_test_char.c b/server/gen_test_char.c
index 587583ae..59947d58 100644
--- a/server/gen_test_char.c
+++ b/server/gen_test_char.c
@@ -90,8 +90,8 @@ int main(int argc, char *argv[])
             flags |= T_OS_ESCAPE_PATH;
         }
 
-        /* these are the "tspecials" from RFC2068 */
-        if (c && (apr_iscntrl(c) || strchr(" \t()<>@,;:\\/[]?={}", c))) {
+        /* these are the "tspecials" (RFC2068) or "separators" (RFC2616) */
+        if (c && (apr_iscntrl(c) || strchr(" \t()<>@,;:\\\"/[]?={}", c))) {
             flags |= T_HTTP_TOKEN_STOP;
         }
 
diff --git a/server/listen.c b/server/listen.c
index f679f058..d1e6da8e 100644
--- a/server/listen.c
+++ b/server/listen.c
@@ -377,14 +377,22 @@ static int open_listeners(apr_pool_t *pool)
         }
         else {
 #if APR_HAVE_IPV6
+            ap_listen_rec *cur;
             int v6only_setting;
+            int skip = 0;
 
             /* If we have the unspecified IPv4 address (0.0.0.0) and
              * the unspecified IPv6 address (::) is next, we need to
              * swap the order of these in the list. We always try to
              * bind to IPv6 first, then IPv4, since an IPv6 socket
              * might be able to receive IPv4 packets if V6ONLY is not
-             * enabled, but never the other way around. */
+             * enabled, but never the other way around.
+             * Note: In some configurations, the unspecified IPv6 address
+             * could be even later in the list.  This logic only corrects
+             * the situation where it is next in the list, such as when
+             * apr_sockaddr_info_get() returns an IPv4 and an IPv6 address,
+             * in that order.
+             */
             if (lr->next != NULL
                 && IS_INADDR_ANY(lr->bind_addr)
                 && lr->bind_addr->port == lr->next->bind_addr->port
@@ -402,26 +410,32 @@ static int open_listeners(apr_pool_t *pool)
                 lr = next;
             }
 
-            /* If we are trying to bind to 0.0.0.0 and the previous listener
+            /* If we are trying to bind to 0.0.0.0 and a previous listener
              * was :: on the same port and in turn that socket does not have
              * the IPV6_V6ONLY flag set; we must skip the current attempt to
              * listen (which would generate an error). IPv4 will be handled
              * on the established IPv6 socket.
              */
-            if (previous != NULL
-                && IS_INADDR_ANY(lr->bind_addr)
-                && lr->bind_addr->port == previous->bind_addr->port
-                && IS_IN6ADDR_ANY(previous->bind_addr)
-                && apr_socket_opt_get(previous->sd, APR_IPV6_V6ONLY,
-                                      &v6only_setting) == APR_SUCCESS
-                && v6only_setting == 0) {
-
-                /* Remove the current listener from the list */
-                previous->next = lr->next;
-                lr = previous; /* maintain current value of previous after
-                                * post-loop expression is evaluated
-                                */
-                continue;
+            if (IS_INADDR_ANY(lr->bind_addr)) {
+                for (cur = ap_listeners; cur != lr; cur = cur->next) {
+                    if (lr->bind_addr->port == cur->bind_addr->port
+                        && IS_IN6ADDR_ANY(cur->bind_addr)
+                        && apr_socket_opt_get(cur->sd, APR_IPV6_V6ONLY,
+                                              &v6only_setting) == APR_SUCCESS
+                        && v6only_setting == 0) {
+
+                        /* Remove the current listener from the list */
+                        previous->next = lr->next;
+                        lr = previous; /* maintain current value of previous after
+                                        * post-loop expression is evaluated
+                                        */
+                        skip = 1;
+                        break;
+                    }
+                }
+                if (skip) {
+                    continue;
+                }
             }
 #endif
             if (make_sock(pool, lr) == APR_SUCCESS) {
diff --git a/server/mpm/experimental/event/fdqueue.c b/server/mpm/experimental/event/fdqueue.c
index c0ef9bbb..5a1baa94 100644
--- a/server/mpm/experimental/event/fdqueue.c
+++ b/server/mpm/experimental/event/fdqueue.c
@@ -194,10 +194,16 @@ void ap_push_pool(fd_queue_info_t * queue_info,
                                                           (*new_recycle));
         new_recycle->pool = pool_to_recycle;
         for (;;) {
-            new_recycle->next = queue_info->recycled_pools;
+            /*
+             * Save queue_info->recycled_pool in local variable next because
+             * new_recycle->next can be changed after apr_atomic_casptr
+             * function call. For gory details see PR 44402.
+             */
+            struct recycled_pool *next = queue_info->recycled_pools;
+            new_recycle->next = next;
             if (apr_atomic_casptr
                 ((volatile void **) &(queue_info->recycled_pools),
-                 new_recycle, new_recycle->next) == new_recycle->next) {
+                 new_recycle, next) == next) {
                 break;
             }
         }
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index d3c93a63..3849c222 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -536,7 +536,10 @@ static void child_main(int child_num_arg)
 
     bucket_alloc = apr_bucket_alloc_create(pchild);
 
-    while (!die_now) {
+    /* die_now is set when AP_SIG_GRACEFUL is received in the child;
+     * shutdown_pending is set when SIGTERM is received when running
+     * in single process mode.  */
+    while (!die_now && !shutdown_pending) {
         conn_rec *current_conn;
         void *csd;
 
@@ -577,6 +580,12 @@ static void child_main(int child_num_arg)
                         if (one_process && shutdown_pending) {
                             return;
                         }
+                        else if (die_now) {
+                            /* In graceful stop/restart; drop the mutex
+                             * and terminate the child. */
+                            SAFE_ACCEPT(accept_mutex_off());
+                            clean_child_exit(0);
+                        }
                         continue;
                     }
                     /* Single Unix documents select as returning errnos
@@ -587,6 +596,7 @@ static void child_main(int child_num_arg)
                      */
                     ap_log_error(APLOG_MARK, APLOG_ERR, status,
                                  ap_server_conf, "apr_pollset_poll: (listen)");
+                    SAFE_ACCEPT(accept_mutex_off());
                     clean_child_exit(1);
                 }
 
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 120adfc0..52c4ff9c 100644
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -618,7 +618,6 @@ static int create_process(apr_pool_t *p, HANDLE *child_proc, HANDLE *child_exit_
     /* These NEVER change for the lifetime of this parent
      */
     static char **args = NULL;
-    static char **env = NULL;
     static char pidbuf[28];
 
     apr_status_t rv;
@@ -630,11 +629,13 @@ static int create_process(apr_pool_t *p, HANDLE *child_proc, HANDLE *child_exit_
     HANDLE waitlist[2];  /* see waitlist_e */
     char *cmd;
     char *cwd;
+    char **env;
+    int envc;
 
     apr_pool_create_ex(&ptemp, p, NULL, NULL);
 
     /* Build the command line. Should look something like this:
-     * C:/apache/bin/apache.exe -f ap_server_confname
+     * C:/apache/bin/httpd.exe -f ap_server_confname
      * First, get the path to the executable...
      */
     apr_procattr_create(&attr, ptemp);
@@ -680,7 +681,8 @@ static int create_process(apr_pool_t *p, HANDLE *child_proc, HANDLE *child_exit_
     }
 
     /* httpd-2.0/2.2 specific to work around apr_proc_create bugs */
-    if (((rv = apr_file_open_stdout(&child_out, p))
+    /* set "NUL" as sysout for the child */
+    if (((rv = apr_file_open(&child_out, "NUL", APR_WRITE | APR_READ, APR_OS_DEFAULT,p)) 
             != APR_SUCCESS) ||
         ((rv = apr_procattr_child_out_set(attr, child_out, NULL))
             != APR_SUCCESS)) {
@@ -714,21 +716,15 @@ static int create_process(apr_pool_t *p, HANDLE *child_proc, HANDLE *child_exit_
         return -1;
     }
 
-    if (!env)
-    {
-        /* Build the env array, only once since it won't change
-         * for the lifetime of this parent process.
-         */
-        int envc;
-        for (envc = 0; _environ[envc]; ++envc) {
-            ;
-        }
-        env = malloc((envc + 2) * sizeof (char*));
-        memcpy(env, _environ, envc * sizeof (char*));
-        apr_snprintf(pidbuf, sizeof(pidbuf), "AP_PARENT_PID=%i", parent_pid);
-        env[envc] = pidbuf;
-        env[envc + 1] = NULL;
+    /* Build the env array */
+    for (envc = 0; _environ[envc]; ++envc) {
+        ;
     }
+    env = apr_palloc(ptemp, (envc + 2) * sizeof (char*));  
+    memcpy(env, _environ, envc * sizeof (char*));
+    apr_snprintf(pidbuf, sizeof(pidbuf), "AP_PARENT_PID=%i", parent_pid);
+    env[envc] = pidbuf;
+    env[envc + 1] = NULL;
 
     rv = apr_proc_create(&new_child, cmd, args, env, attr, ptemp);
     if (rv != APR_SUCCESS) {
@@ -740,7 +736,7 @@ static int create_process(apr_pool_t *p, HANDLE *child_proc, HANDLE *child_exit_
         CloseHandle(new_child.hproc);
         return -1;
     }
-
+    apr_file_close(child_out);
     ap_log_error(APLOG_MARK, APLOG_NOTICE, APR_SUCCESS, ap_server_conf,
                  "Parent: Created child process %d", new_child.pid);
 
@@ -1435,26 +1431,6 @@ static int winnt_pre_config(apr_pool_t *pconf_, apr_pool_t *plog, apr_pool_t *pt
                      service_name);
         exit(APEXIT_INIT);
     }
-    else if (!one_process && !ap_my_generation) {
-        /* Open a null handle to soak stdout in this process.
-         * We need to emulate apr_proc_detach, unix performs this
-         * same check in the pre_config hook (although it is
-         * arguably premature).  Services already fixed this.
-         */
-        apr_file_t *nullfile;
-        apr_status_t rv;
-        apr_pool_t *pproc = apr_pool_parent_get(pconf);
-
-        if ((rv = apr_file_open(&nullfile, "NUL",
-                                APR_READ | APR_WRITE, APR_OS_DEFAULT,
-                                pproc)) == APR_SUCCESS) {
-            apr_file_t *nullstdout;
-            if (apr_file_open_stdout(&nullstdout, pproc)
-                    == APR_SUCCESS)
-                apr_file_dup2(nullstdout, nullfile, pproc);
-            apr_file_close(nullfile);
-        }
-    }
 
     /* Win9x: disable AcceptEx */
     if (osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
@@ -1594,10 +1570,6 @@ static int winnt_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pt
                     }
                 }
             }
-            else /* ! -k runservice */
-            {
-                mpm_start_console_handler();
-            }
 
             /* Create the start mutex, as an unnamed object for security.
              * Ths start mutex is used during a restart to prevent more than
@@ -1613,6 +1585,12 @@ static int winnt_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pt
                 return HTTP_INTERNAL_SERVER_ERROR;
             }
         }
+        /* Always reset our console handler to be the first, even on a restart
+        *  because some modules (e.g. mod_perl) might have set a console 
+        *  handler to terminate the process.
+        */
+        if (strcasecmp(signal_arg, "runservice"))
+            mpm_start_console_handler();
     }
     else /* parent_pid != my_pid */
     {
diff --git a/server/mpm/worker/fdqueue.c b/server/mpm/worker/fdqueue.c
index 8be7c9fa..d46dd536 100644
--- a/server/mpm/worker/fdqueue.c
+++ b/server/mpm/worker/fdqueue.c
@@ -94,10 +94,14 @@ apr_status_t ap_queue_info_set_idle(fd_queue_info_t *queue_info,
                                                          sizeof(*new_recycle));
         new_recycle->pool = pool_to_recycle;
         for (;;) {
-            new_recycle->next = queue_info->recycled_pools;
+            /* Save queue_info->recycled_pool in local variable next because
+             * new_recycle->next can be changed after apr_atomic_casptr
+             * function call. For gory details see PR 44402.
+             */
+            struct recycled_pool *next = queue_info->recycled_pools;
+            new_recycle->next = next;
             if (apr_atomic_casptr((volatile void**)&(queue_info->recycled_pools),
-                                  new_recycle, new_recycle->next) ==
-                new_recycle->next) {
+                                  new_recycle, next) == next) {
                 break;
             }
         }
@@ -184,6 +188,14 @@ apr_status_t ap_queue_info_wait_for_idler(fd_queue_info_t *queue_info,
     apr_atomic_dec32(&(queue_info->idlers));
 
     /* Atomically pop a pool from the recycled list */
+
+    /* This function is safe only as long as it is single threaded because
+     * it reaches into the queue and accesses "next" which can change.
+     * We are OK today because it is only called from the listener thread.
+     * cas-based pushes do not have the same limitation - any number can
+     * happen concurrently with a single cas-based pop.
+     */
+
     for (;;) {
         struct recycled_pool *first_pool = queue_info->recycled_pools;
         if (first_pool == NULL) {
diff --git a/server/request.c b/server/request.c
index 92e91547..fe4026a3 100644
--- a/server/request.c
+++ b/server/request.c
@@ -152,14 +152,10 @@ AP_DECLARE(int) ap_process_request_internal(request_rec *r)
         return access_status;
     }
 
-    /* Excluding file-specific requests with no 'true' URI...
+    /* Rerun the location walk, which overrides any map_to_storage config.
      */
-    if (!file_req) {
-        /* Rerun the location walk, which overrides any map_to_storage config.
-         */
-        if ((access_status = ap_location_walk(r))) {
-            return access_status;
-        }
+    if ((access_status = ap_location_walk(r))) {
+        return access_status;
     }
 
     /* Only on the main request! */
diff --git a/server/scoreboard.c b/server/scoreboard.c
index 0f657131..060de5ca 100644
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -118,8 +118,7 @@ void ap_init_scoreboard(void *shared_score)
 
     ap_calc_scoreboard_size();
     ap_scoreboard_image =
-        calloc(1, sizeof(scoreboard) + server_limit * sizeof(worker_score *) +
-               server_limit * lb_limit * sizeof(lb_score *));
+        calloc(1, sizeof(scoreboard) + server_limit * sizeof(worker_score *));
     more_storage = shared_score;
     ap_scoreboard_image->global = (global_score *)more_storage;
     more_storage += sizeof(global_score);
@@ -344,6 +343,9 @@ AP_DECLARE(void) ap_increment_counts(ap_sb_handle_t *sb, request_rec *r)
 {
     worker_score *ws;
 
+    if (!sb)
+        return;
+
     ws = &ap_scoreboard_image->servers[sb->child_num][sb->thread_num];
 
 #ifdef HAVE_TIMES
@@ -471,6 +473,9 @@ AP_DECLARE(int) ap_update_child_status_from_indexes(int child_num,
 AP_DECLARE(int) ap_update_child_status(ap_sb_handle_t *sbh, int status,
                                       request_rec *r)
 {
+    if (!sbh)
+        return -1;
+
     return ap_update_child_status_from_indexes(sbh->child_num, sbh->thread_num,
                                                status, r);
 }
@@ -479,6 +484,9 @@ void ap_time_process_request(ap_sb_handle_t *sbh, int status)
 {
     worker_score *ws;
 
+    if (!sbh)
+        return;
+
     if (sbh->child_num < 0) {
         return;
     }
diff --git a/srclib/apr-util/CHANGES b/srclib/apr-util/CHANGES
index 97f55c70..fb5c8b5a 100644
--- a/srclib/apr-util/CHANGES
+++ b/srclib/apr-util/CHANGES
@@ -1,65 +1,80 @@
                                                      -*- coding: utf-8 -*-
+Changes with APR-util 1.3.0
 
-Changes with APR-util 1.2.12
+  *) apr_reslist: destroy all resources in apr_cleanup (don't give up on error).
+     PR 45086 [Nick Kew]
 
-  *) Wakeup threads waiting for a reslist resource after a resource was
-     invalidated. [Ruediger Pluem]
+  *) Add apr_brigade_split_ex for reusing existing brigades in situation where
+     brigades need to be split often during the lifetime of a pool.
+     [Ruediger Pluem]
 
-  *) Fix GMT offset for several date formats and add a new format.
-     [Maxime Petazzoni <maxime.petazzoni bulix.org>]
+  *) Amend apr_reslist to expire resources whose idle time exceeds ttl.
+     PR 42841 [Tom Donovan, Nick Kew, Ruediger Pluem]
 
-  *) Numerous fixes to the test/ framework, including better handling of
-     long size_t comparisons and more consistent Makefile.(in|win) setup
-     for authoring new tests.  [William Rowe]
+  *) Modularize ldap's stub with the dbd dso modular structure, and teach
+     the apu dso's to respect the system specific shared lib path var.
+     To link to an application without ldap libs, query 
+     `apu-1-config --avoid-ldap --libs` (in addition to the usual linker
+     queries for compiling and linking).  [William Rowe]
 
-  *) Win32 build fixes including a Makefile.win scheme, fixes for 64P
-     model x86_64 compiles and VC8 builds.  [William Rowe]
+  *) Support building DBD drivers as DSOs by default; use --disable-util-dso
+     flag to configure to use static link.  [Joe Orton, Bojan Smojver]
 
-  *) Type mismatch between apr_datum_t and GDBM's datum type could
-     yield a corrupt apr_datum_t when reading from a GDBM database.
-     PR 43025.  [Björn Wiberg <Bjorn.Wiberg its.uu.se>, Davi Arnaut]
+  *) All DBD drivers now count rows from 1, which affects PostgreSQL and MySQL
+     drivers in particular. Using row number zero is an error.
+     [Bojan Smojver]
 
-  *) Add the #define APR_LDAP_SIZELIMIT that is set appropriately
-     for the LDAP SDK that is being used. Also include ZOS as an
-     LDAP Platform.
-     PR 37814.  [David Jones <oscaremma gmail com>, Davi Arnaut]
+  *) Add support for OpenLDAP's ability to support a directory of
+     certificate authorities. [Eric Covener]
 
-  *) Fix exported LDFLAGS with new expat detection.  PR 43337.
-     [Justin Erenkrantz]
+  *) Better error detection for bucket allocation failures.
+     [Jim Jagielski]
 
-  *) Add MySQL DBD driver [Nick Kew, Bojan Smojver]
+  *) Ensure that the LDAP code can compile cleanly on platforms that do
+     not define the LDAP_OPT_REFHOPLIMIT symbol, most specifically Windows.
+     [Victor <victorjss@gmail.com>, Graham Leggett]
 
-Changes with APR-util 1.2.10
+  *) Fix the setting of LDAP_OPT_SSL on Win2k, which expects a pointer to
+     the value LDAP_OPT_ON, and not the value itself. XP works with both.
+     [Victor <victorjss@gmail.com>]
 
-  *) Support BerkeleyDB 4.6.  [Arfrever Frehtes Taifersar Arahesis]
+  *) Fix a regression in apr_brigade_partition that causes integer overflows
+     on systems where apr_off_t > apr_size_t.  [Ruediger Pluem]
 
-  *) Test improvements to validate testmd4 and testdbm, unattended.
-     [Bojan Smojver]
+  *) Ensure that apr_uri_unparse does not add scheme to URI if
+     APR_URI_UNP_OMITSITEPART flag is set. PR 44044
+     [Michael Clark <michael metaparadigm.com>]
+
+  *) Add an LDAP rebind implementation so that authentication can be
+     carried through referrals. [Paul J. Reder]
+
+  *) Fix the make test target in the spec file. [Graham Leggett]
 
-Changes with APR-util 1.2.9
+  *) Introduce apr_dbd_open_ex() [Bojan Smojver]
 
-  *) Ensure that an apr_reslist shrinks back to SMAX via the TTL by
-     reorganising the resource list from a queue to a stack.
-     PR 40348.  [Christian BOITEL <christian_boitel yahoo.fr>]
+  *) Make md5 hash files portable between EBCDIC and ASCII platforms  
+     [David Jones]
 
-  *) Fix Solaris 2.8+ fdatasync() detection. The fdatasync() function
-     is marked as part of the Realtime library functions.
-     PR 37343.  [Davi Arnaut]
+  *) Add limited apr_dbd_freetds driver (MSSQL and Sybase) [Nick Kew]
 
-  *) Change configure's expat detection to use standard linker-based
-     tests, fixing build on e.g. biarch Linux systems.  PR 28205.
-     [Joe Orton, Ruediger Pluem]     
+  *) Commit relicensed apr_dbd_mysql driver to /trunk/  [Nick Kew]
+
+  *) Support BerkeleyDB 4.6.  [Arfrever Frehtes Taifersar Arahesis]
+
+  *) Support Tivoli ITDS LDAP client library.  [Paul Reder]
 
   *) Portably implement testdate's long-time constants to solve
      compilation faults where #LL isn't valid.  [Curt Arnold]
 
-  *) APR_FIND_APU macro no longer checks /usr/local/apache2/.
-     PR 42089.  [Colm MacCárthaigh]
+  *) Use buffered I/O with SDBM.  [Joe Schaefer]
 
-  *) Fix handling of attribute namespaces in apr_xml_to_text() when
-     a namespace map is provided.  PR 41908.  [Joe Orton]
+  *) Unify parsing of prepared statements and add binary argument functions
+     to DBD [Bojan Smojver with help from many on the APR list]
 
-Changes with APR-util 1.2.8
+  *) Rewrite detection of expat in configure to fix build on e.g. biarch
+     Linux platforms.  PR 28205.  [Joe Orton]
+
+  *) Add apr_thread_pool implementation.  [Henry Jen <henryjen ztune.net>]
 
   *) Add support for Berkeley DB 4.5 to the configure scripts.
      [Garrett Rooney]
@@ -67,18 +82,52 @@ Changes with APR-util 1.2.8
   *) Allow apr_queue.h to be included before other APR headers.
      PR 40891 [Henry Jen <henryjen ztune.net>]
 
+  *) Fix precedence problem in error checking for sdbm dbm back end.
+     PR 40659 [Larry Cipriani <lvc lucent.com>]
+
+  *) Add an apr_reslist_acquired_count, for determining how many outstanding
+     resources there are in a reslist.  [Ryan Phillips <ryan trolocsis.com>]
+
   *) Provide folding in autogenerated .manifest files for Win32 builders
      using VisualStudio 2005  [William Rowe]
 
+  *) Implement DBD transaction modes
+     [Bojan Smojver with help from many on the APR list]
+
   *) Implement prepared statement support in SQLite3 DBD driver
      [Bojan Smojver]
 
-  *) Fix to ensure that "deprecated" LDAP interfaces are still 
-     exposed if using OpenLDAP 2.3.  [Joe Orton]
+  *) Add get (column) name to apr_dbd API
+     [Bojan Smojver <bojan rexursive.com>] and
+     [Chris Darroch <chrisd pearsoncmg com>]
+
+  *) Make the DBD autoconf-glue use LDFLAGS instead of LIBS in several
+     places, fixing some configure issues on Solaris.
+     [Henry Jen <henryjen ztune.net>]
+
+  *) Make apr_dbd.h work as a stand alone header, without needing other
+     files to be included before it. [Henry Jen <henryjen ztune.net>]
+
+  *) On platforms that use autoconf stop automatically linking against
+     apr-iconv when an apr-iconv source dir is found in ../apr-iconv.
+     Instead, add a --with-apr-iconv option to configure that lets you
+     specify the relative path to your apr-iconv source directory.
+     [Garrett Rooney]
+
+  *) APR_FIND_APU macro now supports customisable detailed checks on
+     each installed apr-util. [Justin Erenkrantz, Colm MacCárthaigh]
+
+  *) APR_FIND_APU macro no longer checks /usr/local/apache2/
+     [Colm MacCárthaigh]
+
+  *) Add apr_dbd_oracle driver [Nick Kew and Chris Darroch]
+
+Changes with APR-util 1.2.8
 
-  *) Fix incorrect byte order and incorrect timestamp type
-     in the fallback UUID generator used when no external UUID
-     generator is detected by APR.  PR 37342.  [Max Bowsher]
+  *) Fix incorrect byte order (PR 37342) and incorrect timestamp type
+     in the fallback UUID generator used when no external UUID generator
+     is detected by APR.
+     [Max Bowsher]
 
 Changes with APR-util 1.2.7
 
diff --git a/srclib/apr-util/LICENSE b/srclib/apr-util/LICENSE
index 2813d260..7771972d 100644
--- a/srclib/apr-util/LICENSE
+++ b/srclib/apr-util/LICENSE
@@ -402,3 +402,42 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ====================================================================
+
+For the ldap/apr_ldap_url.c component:
+
+/* Portions Copyright 1998-2002 The OpenLDAP Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.  A copy of this license is available at
+ * http://www.OpenLDAP.org/license.html or in file LICENSE in the
+ * top-level directory of the distribution.
+ *
+ * OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+ *
+ * Individual files and/or contributed packages may be copyright by
+ * other parties and subject to additional restrictions.
+ *
+ * This work is derived from the University of Michigan LDAP v3.3
+ * distribution.  Information concerning this software is available
+ * at: http://www.umich.edu/~dirsvcs/ldap/
+ *
+ * This work also contains materials derived from public sources.
+ *
+ * Additional information about OpenLDAP can be obtained at:
+ *     http://www.openldap.org/
+ */
+
+/*
+ * Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
+
diff --git a/srclib/apr-util/Makefile.in b/srclib/apr-util/Makefile.in
index c33574ed..0241e573 100644
--- a/srclib/apr-util/Makefile.in
+++ b/srclib/apr-util/Makefile.in
@@ -22,13 +22,28 @@ APU_CONFIG = apu-$(APRUTIL_MAJOR_VERSION)-config
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
-TARGETS = $(TARGET_LIB) aprutil.exp
+APU_MODULES = @APU_MODULES@
+LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -rpath $(APU_DSO_LIBDIR)
+APU_DSO_LIBDIR = @APU_DSO_LIBDIR@
+
+LT_VERSION = @APU_LTVERSION@
+
+EXTRA_OBJECTS = @EXTRA_OBJECTS@
+
+LDADD_dbd_pgsql = @LDADD_dbd_pgsql@
+LDADD_dbd_oracle = @LDADD_dbd_oracle@
+LDADD_dbd_sqlite2 = @LDADD_dbd_sqlite2@
+LDADD_dbd_sqlite3 = @LDADD_dbd_sqlite3@
+LDADD_dbd_mysql = @LDADD_dbd_mysql@
+LDADD_ldap = @LDADD_ldap@
+
+TARGETS = $(TARGET_LIB) aprutil.exp apu-config.out $(APU_MODULES)
 
 # bring in rules.mk for standard functionality
 @INCLUDE_RULES@
 @INCLUDE_OUTPUTS@
 
-CLEAN_SUBDIRS = test @APR_ICONV_DIR@
+CLEAN_SUBDIRS = test @APR_ICONV_DIR@ @APR_XML_DIR@
 
 CLEAN_TARGETS = exports.c export_vars.c aprutil.exp .make.dirs apu-config.out
 DISTCLEAN_TARGETS = config.cache config.log config.status libtool \
@@ -53,7 +68,7 @@ top_blddir=@abs_builddir@
 apu-config.out: $(APU_CONFIG)
 	sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@
 
-install: $(TARGET_LIB) apu-config.out
+install: $(TARGETS) install-modules
 	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
 		     $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
 	for f in $(top_srcdir)/include/*.h $(top_blddir)/include/*.h; do \
@@ -67,8 +82,16 @@ install: $(TARGET_LIB) apu-config.out
 	$(INSTALL_DATA) aprutil.exp $(DESTDIR)$(libdir)
 	$(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG)
 
-$(TARGET_LIB): $(OBJECTS)
-	$(LINK) @lib_target@ $(ALL_LIBS) $(APRUTIL_LDFLAGS) $(APRUTIL_LIBS)
+$(TARGET_LIB): $(OBJECTS) $(EXTRA_OBJECTS)
+	$(LINK) @lib_target@ $(EXTRA_OBJECTS) $(ALL_LIBS) $(APRUTIL_LDFLAGS) $(APRUTIL_LIBS)
+
+install-modules: install-modules-@APU_HAVE_MODULES@
+
+install-modules-no:
+
+install-modules-yes: $(APU_MODULES)
+	$(APR_MKDIR) $(DESTDIR)$(APU_DSO_LIBDIR)
+	@for m in $(APU_MODULES); do $(LIBTOOL) $(LT_LTFLAGS) $(LTFLAGS) --mode=install $(INSTALL) -m 755 $$m $(DESTDIR)$(APU_DSO_LIBDIR); done
 
 exports.c: $(HEADERS)
 	$(APR_MKEXPORT) $(HEADERS) > $@
@@ -88,4 +111,6 @@ dox:
 
 test: check
 check: $(TARGET_LIB)
-	cd test && $(MAKE) check
+	cd test && $(MAKE) all check
+
+.PHONY: install-modules install-modules-yes install-modules-no dox test check
diff --git a/srclib/apr-util/Makefile.win b/srclib/apr-util/Makefile.win
index ba2c55a0..0a20714d 100644
--- a/srclib/apr-util/Makefile.win
+++ b/srclib/apr-util/Makefile.win
@@ -18,8 +18,8 @@
 #
 #     ARCH="Win32 Release"
 #     ARCH="Win32 Debug"
-#     ARCH="Win32 ReleaseNT"
-#     ARCH="Win32 DebugNT"
+#     ARCH="Win32 Release9x"
+#     ARCH="Win32 Debug9x"
 #     ARCH="x64 Release"
 #     ARCH="x64 Debug"
 #
@@ -28,9 +28,15 @@
 # is only expected to work if the defaults (../apr, ../apr-iconv 
 # and ../apr-util) are used, or if they are built with USEMAK=1.
 #
-#     APR_PATH=..\apr-1.2.12
-#     API_PATH=..\apr-iconv-1.2.1
-#     APU_PATH=..\apr-util-1.2.12
+#     APR_PATH=..\apr-1.3.0
+#     API_PATH=..\apr-iconv-1.3.0
+#     APU_PATH=..\apr-util-1.3.0
+#
+# Provide a DBD_LIST argument after configuring LIB and INCLUDE with
+# the SDK paths of the corresponding client support libraries.
+# Note that at this time, none of these are supported on win32, per say.
+#
+#     DBD_LIST="sqlite3 pgsql oracle mysql freetds"
 #
 # For example;
 #
@@ -54,7 +60,8 @@ USEDSW=1
 
 PREFIX=..\apr-dist
 
-!IF [$(COMSPEC) /c cl /nologo /? | find "x64" >NUL ] == 0
+!IF [$(COMSPEC) /c cl /nologo /? \
+	| $(SystemRoot)\System32\find.exe "x64" >NUL ] == 0
 ARCH=x64 Release
 !ELSE
 ARCH=Win32 Release
@@ -69,7 +76,7 @@ APU_PATH=..\apr-util
 !MESSAGE API_PATH    = $(API_PATH)  (apr-iconv)
 !MESSAGE APU_PATH    = $(APU_PATH)  (apr-util)
 !MESSAGE PREFIX      = $(PREFIX)  (install path)
-
+!MESSAGE DBD_LIST    = $(DBD_LIST)
 
 # Utility and Translation things, nothing here for the user
 #
@@ -85,18 +92,18 @@ ARCHPATH=Debug
 LIBSPATH=LibD
 ARCHOSPATH=Debug
 LIBSOSPATH=LibD
-!ELSEIF "$(ARCH)" == "Win32 ReleaseNT"
-SLNARCH=ReleaseNT|Win32
+!ELSEIF "$(ARCH)" == "Win32 Release9x"
+SLNARCH=Release9x|Win32
 ARCHPATH=Release
 LIBSPATH=LibR
-ARCHOSPATH=NT\Release
-LIBSOSPATH=NT\LibR
-!ELSEIF "$(ARCH)" == "Win32 DebugNT"
-SLNARCH=DebugNT|Win32
+ARCHOSPATH=9x\Release
+LIBSOSPATH=9x\LibR
+!ELSEIF "$(ARCH)" == "Win32 Debug9x"
+SLNARCH=Debug9x|Win32
 ARCHPATH=Debug
 LIBSPATH=LibD
-ARCHOSPATH=NT\Debug
-LIBSOSPATH=NT\LibD
+ARCHOSPATH=9x\Debug
+LIBSOSPATH=9x\LibD
 !ELSEIF "$(ARCH)" == "x64 Release"
 SLNARCH=Release|x64
 ARCHPATH=x64\Release
@@ -157,8 +164,8 @@ buildall:
 	 $(MAKE) $(MAKEOPT) -f apr.mak         CFG="apr - $(ARCH)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f libapr.mak      CFG="libapr - $(ARCH)" RECURSE=0 $(CTARGET)
 	 cd build
-	  $(MAKE) $(MAKEOPT) -f apr_app.mak     CFG="apr_app - $(ARCH)" RECURSE=0 $(CTARGET)
-	  $(MAKE) $(MAKEOPT) -f libapr_app.mak  CFG="libapr_app - $(ARCH)" RECURSE=0 $(CTARGET)
+	  $(MAKE) $(MAKEOPT) -f apr_app.mak    CFG="apr_app - $(ARCH)" RECURSE=0 $(CTARGET)
+	  $(MAKE) $(MAKEOPT) -f libapr_app.mak CFG="libapr_app - $(ARCH)" RECURSE=0 $(CTARGET)
 	 cd ..
 	cd $(API_PATH)
 	 $(MAKE) $(MAKEOPT) -f apriconv.mak    CFG="apriconv - $(ARCH)" RECURSE=0 $(CTARGET)
@@ -180,43 +187,70 @@ buildall:
 	cd ..\..\..
 	 $(MAKE) $(MAKEOPT) -f aprutil.mak     CFG="aprutil - $(ARCH)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f libaprutil.mak  CFG="libaprutil - $(ARCH)" RECURSE=0 $(CTARGET)
+        cd ldap
+	 $(MAKE) $(MAKEOPT) -f apr_ldap.mak    CFG="apr_ldap - $(ARCH)" RECURSE=0 $(CTARGET)
+        cd ..
+        cd dbd
+	  for %d in ($(DBD_LIST)) do \
+	    $(MAKE) $(MAKEOPT) -f apr_dbd_%d.mak CFG="apr_dbd_%d - $(ARCH)" RECURSE=0 $(CTARGET)
+        cd ..
 
 !ELSEIF $(USESLN) == 1
 
 clean:
+	-for %d in ($(DBD_LIST)) do \
+	  devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_dbd_%d
+	-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_ldap
 	-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libaprutil
-	-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libapr_app
 	-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project aprutil
-	-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_app
 	cd $(API_PATH)
-	 $(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
+	  -$(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
 		BUILD_MODE="$(ARCH)" BIND_MODE=shared API_SOURCE=.
 	cd $(APU_PATH)
+	-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libapriconv
+	-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apriconv
+	-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libapr_app
+	-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr_app
+	-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project libapr
+	-devenv aprutil.sln /useenv /clean "$(SLNARCH)" /project apr
 
 buildall:
 	devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_app
-	devenv aprutil.sln /useenv /build "$(SLNARCH)" /project aprutil
 	devenv aprutil.sln /useenv /build "$(SLNARCH)" /project libapr_app
+	devenv aprutil.sln /useenv /build "$(SLNARCH)" /project aprutil
 	devenv aprutil.sln /useenv /build "$(SLNARCH)" /project libaprutil
+	devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_ldap
+	for %d in ($(DBD_LIST)) do \
+	  devenv aprutil.sln /useenv /build "$(SLNARCH)" /project apr_dbd_%d
 
 !ELSE
 #	$(USEDSP) == 1
 
 clean:
+	-for %d in ($(DBD_LIST)) do \
+	  msdev aprutil.dsw /USEENV /MAKE "apr_dbd_%d - $(ARCH)" /CLEAN
+	-msdev aprutil.dsw /USEENV /MAKE "apr_ldap - $(ARCH)" /CLEAN
 	-msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)" /CLEAN
-	-msdev aprutil.dsw /USEENV /MAKE "libapr_app - $(ARCH)" /CLEAN
 	-msdev aprutil.dsw /USEENV /MAKE "aprutil - $(ARCH)" /CLEAN
-	-msdev aprutil.dsw /USEENV /MAKE "apr_app - $(ARCH)" /CLEAN
 	cd $(API_PATH)
 	 $(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
 		BUILD_MODE="$(ARCH)" BIND_MODE=shared API_SOURCE=.
 	cd $(APU_PATH)
+	-msdev aprutil.dsw /USEENV /MAKE "libapriconv - $(ARCH)" /CLEAN
+	-msdev aprutil.dsw /USEENV /MAKE "apriconv - $(ARCH)" /CLEAN
+	-msdev aprutil.dsw /USEENV /MAKE "libapr_app - $(ARCH)" /CLEAN
+	-msdev aprutil.dsw /USEENV /MAKE "apr_app - $(ARCH)" /CLEAN
+	-msdev aprutil.dsw /USEENV /MAKE "libapr - $(ARCH)" /CLEAN
+	-msdev aprutil.dsw /USEENV /MAKE "apr - $(ARCH)" /CLEAN
 
 buildall:
 	@msdev aprutil.dsw /USEENV /MAKE "apr_app - $(ARCH)"
 	@msdev aprutil.dsw /USEENV /MAKE "aprutil - $(ARCH)"
 	@msdev aprutil.dsw /USEENV /MAKE "libapr_app - $(ARCH)"
 	@msdev aprutil.dsw /USEENV /MAKE "libaprutil - $(ARCH)"
+	@msdev aprutil.dsw /USEENV /MAKE "apr_ldap - $(ARCH)"
+	@for %d in ($(DBD_LIST)) do \
+	  msdev aprutil.dsw /USEENV /MAKE "apr_dbd_%d - $(ARCH)"
 
 !ENDIF
 
@@ -271,6 +305,12 @@ install:
 	copy $(API_PATH)\$(ARCHPATH)\libapriconv-1.pdb	"$(PREFIX)\bin\" <.y
 	copy $(APU_PATH)\$(ARCHPATH)\libaprutil-1.dll	"$(PREFIX)\bin\" <.y
 	copy $(APU_PATH)\$(ARCHPATH)\libaprutil-1.pdb	"$(PREFIX)\bin\" <.y
+	copy $(APU_PATH)\ldap\$(ARCHPATH)\apr_ldap-1.dll "$(PREFIX)\bin\" <.y
+	copy $(APU_PATH)\ldap\$(ARCHPATH)\apr_ldap-1.pdb "$(PREFIX)\bin\" <.y
+	for %d in ($(DBD_LIST)) do ( \
+	  copy $(APU_PATH)\dbd\$(ARCHPATH)\apr_dbd_%d-1.dll "$(PREFIX)\bin\" <.y && \
+	  copy $(APU_PATH)\dbd\$(ARCHPATH)\apr_dbd_%d-1.pdb "$(PREFIX)\bin\" <.y \
+	)
 	xcopy $(API_PATH)\$(ARCHPATH)\iconv\*.so  "$(PREFIX)\bin\iconv\" /d < .a
 	xcopy $(API_PATH)\$(ARCHPATH)\iconv\*.pdb "$(PREFIX)\bin\iconv\" /d < .a
 	del .y
diff --git a/srclib/apr-util/NOTICE b/srclib/apr-util/NOTICE
index 9ccc9d79..5ba1ad19 100644
--- a/srclib/apr-util/NOTICE
+++ b/srclib/apr-util/NOTICE
@@ -1,3 +1,6 @@
+Apache Portable Runtime Utility Library
+Copyright 2008 The Apache Software Foundation.
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
diff --git a/srclib/apr-util/NWGNUmakefile b/srclib/apr-util/NWGNUmakefile
index 39c57383..f5f9aa96 100644
--- a/srclib/apr-util/NWGNUmakefile
+++ b/srclib/apr-util/NWGNUmakefile
@@ -248,9 +248,11 @@ FILES_lib_objs = \
 	$(OBJDIR)/apr_dbd.o \
 	$(OBJDIR)/apr_dbm_berkeleydb.o \
 	$(OBJDIR)/apr_dbm_sdbm.o \
+	$(OBJDIR)/apu_dso.o \
 	$(OBJDIR)/apr_hooks.o \
 	$(OBJDIR)/apr_md4.o \
 	$(OBJDIR)/apr_md5.o \
+	$(OBJDIR)/apr_memcache.o \
 	$(OBJDIR)/apr_queue.o \
 	$(OBJDIR)/apr_reslist.o \
 	$(OBJDIR)/apr_rmm.o \
@@ -285,7 +287,7 @@ install :: nlms FORCE
 # Any specialized rules here
 #
 
-vpath %.c buckets:crypto:dbd:dbm:dbm/sdbm:encoding:hooks:ldap:misc:strmatch:uri:xlate:xml
+vpath %.c buckets:crypto:dbd:dbm:dbm/sdbm:encoding:hooks:ldap:memcache:misc:strmatch:uri:xlate:xml
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined
diff --git a/srclib/apr-util/README b/srclib/apr-util/README
new file mode 100644
index 00000000..7a482ef4
--- /dev/null
+++ b/srclib/apr-util/README
@@ -0,0 +1,29 @@
+Cryptographic Software Notice
+-----------------------------
+This distribution includes cryptographic software.  The country in 
+which you currently reside may have restrictions on the import, 
+possession, use, and/or re-export to another country, of 
+encryption software.  BEFORE using any encryption software, please 
+check your country's laws, regulations and policies concerning the
+import, possession, or use, and re-export of encryption software, to 
+see if this is permitted.  See http://www.wassenaar.org/ for more
+information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and
+Security (BIS), has classified this software as Export Commodity 
+Control Number (ECCN) 5D002.C.1, which includes information security
+software using or performing cryptographic functions with asymmetric
+algorithms.  The form and manner of this Apache Software Foundation
+distribution makes it eligible for export under the License Exception
+ENC Technology Software Unrestricted (TSU) exception (see the BIS 
+Export Administration Regulations, Section 740.13) for both object 
+code and source code.
+
+The following provides more details on the included cryptographic
+software:
+
+  APR-Util provides an abstract interface for SSL encrypted LDAP (ldaps
+  and STARTTLS style) connections, which can be powered by OpenLDAP,
+  Netscape LDAP SDK, Mozilla LDAP SDK, or other platform specific ldap
+  interfaces.
+
diff --git a/srclib/apr-util/README.MySQL b/srclib/apr-util/README.MySQL
index e3af3488..1833e98d 100644
--- a/srclib/apr-util/README.MySQL
+++ b/srclib/apr-util/README.MySQL
@@ -1,3 +1,5 @@
 As of apr-util version 1.2.11, MySQL DBD driver is shipped as part of the
-distribution. However, unless you specify --with-mysql option to configure,
-MySQL DBD driver will NOT be built to avoid ABI breakage.
+distribution.  However, to avoid licensing incompatibilities, it is not
+built by default.  To enable MySQL support, use the --with-mysql option,
+but be aware that the MySQL license may introduce licensing implications
+for your compiled code.
diff --git a/srclib/apr-util/apr-util.pc.in b/srclib/apr-util/apr-util.pc.in
index 9e3cda6a..5b146af3 100644
--- a/srclib/apr-util/apr-util.pc.in
+++ b/srclib/apr-util/apr-util.pc.in
@@ -9,5 +9,5 @@ Description: Companion library for APR
 Version: @APRUTIL_DOTTED_VERSION@
 # assume that apr-util requires libapr of same major version
 Requires: apr-@APRUTIL_MAJOR_VERSION@
-Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @APRUTIL_EXPORT_LIBS@
+Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@ @APRUTIL_EXPORT_LIBS@
 Cflags: -I${includedir}
diff --git a/srclib/apr-util/aprutil.dsp b/srclib/apr-util/aprutil.dsp
index 9fd6d2db..37e995be 100644
--- a/srclib/apr-util/aprutil.dsp
+++ b/srclib/apr-util/aprutil.dsp
@@ -223,10 +223,18 @@ SOURCE=.\dbd\apr_dbd.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\dbd\apr_dbd_freetds.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\dbd\apr_dbd_mysql.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\dbd\apr_dbd_oracle.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\dbd\apr_dbd_pgsql.c
 # End Source File
 # Begin Source File
@@ -283,11 +291,27 @@ SOURCE=.\ldap\apr_ldap_init.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\ldap\apr_ldap_option.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ldap\apr_ldap_rebind.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ldap\apr_ldap_stub.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\ldap\apr_ldap_url.c
 # End Source File
+# End Group
+# Begin Group "memcache"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\ldap\apr_ldap_option.c
+SOURCE=.\memcache\apr_memcache.c
 # End Source File
 # End Group
 # Begin Group "misc"
@@ -299,6 +323,10 @@ SOURCE=.\misc\apr_date.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\misc\apu_dso.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\misc\apr_queue.c
 # End Source File
 # Begin Source File
@@ -311,6 +339,10 @@ SOURCE=.\misc\apr_rmm.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\misc\apr_thread_pool.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\misc\apu_version.c
 # End Source File
 # End Group
@@ -691,6 +723,10 @@ SOURCE=.\include\apr_md5.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\apr_memcache.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\apr_optional.h
 # End Source File
 # Begin Source File
@@ -723,6 +759,10 @@ SOURCE=.\include\apr_strmatch.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\apr_thread_pool.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\apr_uri.h
 # End Source File
 # Begin Source File
diff --git a/srclib/apr-util/aprutil.dsw b/srclib/apr-util/aprutil.dsw
index a96e3a05..b225b8b9 100644
--- a/srclib/apr-util/aprutil.dsw
+++ b/srclib/apr-util/aprutil.dsw
@@ -30,6 +30,132 @@ Package=<4>
 
 ###############################################################################
 
+Project: "apr_dbd_freetds"=".\dbd\apr_dbd_freetds.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_dbd_mysql"=".\dbd\apr_dbd_mysql.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_dbd_oracle"=".\dbd\apr_dbd_oracle.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_dbd_pgsql"=".\dbd\apr_dbd_pgsql.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_dbd_sqlite2"=".\dbd\apr_dbd_sqlite2.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_dbd_sqlite3"=".\dbd\apr_dbd_sqlite3.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "apr_ldap"=".\ldap\apr_ldap.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "apriconv"="..\apr-iconv\apriconv.dsp" - Package Owner=<4>
 
 Package=<5>
diff --git a/srclib/apr-util/apu-config.in b/srclib/apr-util/apu-config.in
index cb28dc25..f1371381 100644
--- a/srclib/apr-util/apu-config.in
+++ b/srclib/apr-util/apu-config.in
@@ -30,6 +30,7 @@ includedir="@includedir@"
 LIBS="@APRUTIL_EXPORT_LIBS@"
 INCLUDES="@APRUTIL_INCLUDES@"
 LDFLAGS="@APRUTIL_LDFLAGS@"
+LDAP_LIBS="@LDADD_ldap@"
 
 APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
 
@@ -53,6 +54,8 @@ Known values for OPTION are:
   --includedir      print location where headers are installed
   --ldflags         print linker flags
   --libs            print library information
+  --avoid-ldap      do not include ldap library information with --libs
+  --ldap-libs       print additional library information to link with ldap
   --srcdir          print APR-util source directory
   --link-ld         print link switch(es) for linking to APR-util
   --link-libtool    print the libtool inputs for linking to APR-util
@@ -109,8 +112,14 @@ while test $# -gt 0; do
     echo $bindir
     exit 0
     ;;
+    --avoid-ldap)
+    LDAP_LIBS=""
+    ;;
     --libs)
-    flags="$flags $LIBS"
+    flags="$flags $LDAP_LIBS $LIBS"
+    ;;
+    --ldap-libs)
+    flags="$flags $LDAP_LIBS"
     ;;
     --includedir)
     if test "$location" = "installed"; then
diff --git a/srclib/apr-util/buckets/apr_brigade.c b/srclib/apr-util/buckets/apr_brigade.c
index b5d938a9..a5c392d1 100644
--- a/srclib/apr-util/buckets/apr_brigade.c
+++ b/srclib/apr-util/buckets/apr_brigade.c
@@ -29,12 +29,6 @@
 #include <sys/uio.h>
 #endif
 
-/* TODO: ~((apr_size_t)0) appears to be the best way to quickly 
- * represent  MAX_APR_SIZE_T for any CPU we support.  Move this
- * out as APR_MAX_SIZE_T to our public headers...
- */
-#define MAX_APR_SIZE_T (~((apr_size_t)0))
-
 static apr_status_t brigade_cleanup(void *data) 
 {
     return apr_brigade_cleanup(data);
@@ -74,13 +68,18 @@ APU_DECLARE(apr_bucket_brigade *) apr_brigade_create(apr_pool_t *p,
     return b;
 }
 
-APU_DECLARE(apr_bucket_brigade *) apr_brigade_split(apr_bucket_brigade *b,
-                                                    apr_bucket *e)
+APU_DECLARE(apr_bucket_brigade *) apr_brigade_split_ex(apr_bucket_brigade *b,
+                                                       apr_bucket *e,
+                                                       apr_bucket_brigade *a)
 {
-    apr_bucket_brigade *a;
     apr_bucket *f;
 
-    a = apr_brigade_create(b->p, b->bucket_alloc);
+    if (!a) {
+        a = apr_brigade_create(b->p, b->bucket_alloc);
+    }
+    else if (!APR_BRIGADE_EMPTY(a)) {
+        apr_brigade_cleanup(a);
+    }
     /* Return an empty brigade if there is nothing left in 
      * the first brigade to split off 
      */
@@ -96,6 +95,12 @@ APU_DECLARE(apr_bucket_brigade *) apr_brigade_split(apr_bucket_brigade *b,
     return a;
 }
 
+APU_DECLARE(apr_bucket_brigade *) apr_brigade_split(apr_bucket_brigade *b,
+                                                    apr_bucket *e)
+{
+    return apr_brigade_split_ex(b, e, NULL);
+}
+
 APU_DECLARE(apr_status_t) apr_brigade_partition(apr_bucket_brigade *b,
                                                 apr_off_t point,
                                                 apr_bucket **after_point)
@@ -103,6 +108,7 @@ APU_DECLARE(apr_status_t) apr_brigade_partition(apr_bucket_brigade *b,
     apr_bucket *e;
     const char *s;
     apr_size_t len;
+    apr_uint64_t point64;
     apr_status_t rv;
 
     if (point < 0) {
@@ -114,17 +120,25 @@ APU_DECLARE(apr_status_t) apr_brigade_partition(apr_bucket_brigade *b,
         return APR_SUCCESS;
     }
 
+    /*
+     * Try to reduce the following casting mess: We know that point will be
+     * larger equal 0 now and forever and thus that point (apr_off_t) and
+     * apr_size_t will fit into apr_uint64_t in any case.
+     */
+    point64 = (apr_uint64_t)point;
+
     APR_BRIGADE_CHECK_CONSISTENCY(b);
 
     for (e = APR_BRIGADE_FIRST(b);
          e != APR_BRIGADE_SENTINEL(b);
          e = APR_BUCKET_NEXT(e))
     {
-        /* For an unknown length bucket, while 'point' is beyond the possible
+        /* For an unknown length bucket, while 'point64' is beyond the possible
          * size contained in apr_size_t, read and continue...
          */
-        if ((e->length == (apr_size_t)(-1)) && (point > MAX_APR_SIZE_T)) {
-            /* point is too far out to simply split this bucket,
+        if ((e->length == (apr_size_t)(-1))
+            && (point64 > (apr_uint64_t)APR_SIZE_MAX)) {
+            /* point64 is too far out to simply split this bucket,
              * we must fix this bucket's size and keep going... */
             rv = apr_bucket_read(e, &s, &len, APR_BLOCK_READ);
             if (rv != APR_SUCCESS) {
@@ -132,14 +146,15 @@ APU_DECLARE(apr_status_t) apr_brigade_partition(apr_bucket_brigade *b,
                 return rv;
             }
         }
-        else if (((apr_size_t)point < e->length) || (e->length == (apr_size_t)(-1))) {
-            /* We already consumed buckets where point is beyond 
-             * our interest ( point > MAX_APR_SIZE_T ), above.
-             * Here point falls between 0 and MAX_APR_SIZE_T 
+        else if ((point64 < (apr_uint64_t)e->length)
+                 || (e->length == (apr_size_t)(-1))) {
+            /* We already consumed buckets where point64 is beyond
+             * our interest ( point64 > APR_SIZE_MAX ), above.
+             * Here point falls between 0 and APR_SIZE_MAX
              * and is within this bucket, or this bucket's len
              * is undefined, so now we are ready to split it.
              * First try to split the bucket natively... */
-            if ((rv = apr_bucket_split(e, (apr_size_t)point)) 
+            if ((rv = apr_bucket_split(e, (apr_size_t)point64)) 
                     != APR_ENOTIMPL) {
                 *after_point = APR_BUCKET_NEXT(e);
                 return rv;
@@ -156,17 +171,17 @@ APU_DECLARE(apr_status_t) apr_brigade_partition(apr_bucket_brigade *b,
             /* this assumes that len == e->length, which is okay because e
              * might have been morphed by the apr_bucket_read() above, but
              * if it was, the length would have been adjusted appropriately */
-            if ((apr_size_t)point < e->length) {
-                rv = apr_bucket_split(e, (apr_size_t)point);
+            if (point64 < (apr_uint64_t)e->length) {
+                rv = apr_bucket_split(e, (apr_size_t)point64);
                 *after_point = APR_BUCKET_NEXT(e);
                 return rv;
             }
         }
-        if (point == e->length) {
+        if (point64 == (apr_uint64_t)e->length) {
             *after_point = APR_BUCKET_NEXT(e);
             return APR_SUCCESS;
         }
-        point -= e->length;
+        point64 -= (apr_uint64_t)e->length;
     }
     *after_point = APR_BRIGADE_SENTINEL(b); 
     return APR_INCOMPLETE;
@@ -177,6 +192,7 @@ APU_DECLARE(apr_status_t) apr_brigade_length(apr_bucket_brigade *bb,
 {
     apr_off_t total = 0;
     apr_bucket *bkt;
+    apr_status_t status = APR_SUCCESS;
 
     for (bkt = APR_BRIGADE_FIRST(bb);
          bkt != APR_BRIGADE_SENTINEL(bb);
@@ -185,16 +201,15 @@ APU_DECLARE(apr_status_t) apr_brigade_length(apr_bucket_brigade *bb,
         if (bkt->length == (apr_size_t)(-1)) {
             const char *ignore;
             apr_size_t len;
-            apr_status_t status;
 
             if (!read_all) {
-                *length = -1;
-                return APR_SUCCESS;
+                total = -1;
+                break;
             }
 
             if ((status = apr_bucket_read(bkt, &ignore, &len,
                                           APR_BLOCK_READ)) != APR_SUCCESS) {
-                return status;
+                break;
             }
         }
 
@@ -202,7 +217,7 @@ APU_DECLARE(apr_status_t) apr_brigade_length(apr_bucket_brigade *bb,
     }
 
     *length = total;
-    return APR_SUCCESS;
+    return status;
 }
 
 APU_DECLARE(apr_status_t) apr_brigade_flatten(apr_bucket_brigade *bb,
@@ -335,6 +350,7 @@ APU_DECLARE(apr_status_t) apr_brigade_to_iovec(apr_bucket_brigade *b,
     apr_bucket *e;
     struct iovec *orig;
     apr_size_t iov_len;
+    const char *iov_base;
     apr_status_t rv;
 
     orig = vec;
@@ -346,11 +362,12 @@ APU_DECLARE(apr_status_t) apr_brigade_to_iovec(apr_bucket_brigade *b,
         if (left-- == 0)
             break;
 
-        rv = apr_bucket_read(e, (const char **)&vec->iov_base, &iov_len,
-                             APR_NONBLOCK_READ);
+        rv = apr_bucket_read(e, &iov_base, &iov_len, APR_NONBLOCK_READ);
         if (rv != APR_SUCCESS)
             return rv;
-        vec->iov_len = iov_len; /* set indirectly in case size differs */
+        /* Set indirectly since types differ: */
+        vec->iov_len = iov_len;
+        vec->iov_base = (void *)iov_base;
         ++vec;
     }
 
@@ -657,7 +674,7 @@ APU_DECLARE(apr_status_t) apr_brigade_vprintf(apr_bucket_brigade *b,
     /* the cast, in order of appearance */
     struct brigade_vprintf_data_t vd;
     char buf[APR_BUCKET_BUFF_SIZE];
-    apr_size_t written;
+    int written;
 
     vd.vbuff.curpos = buf;
     vd.vbuff.endpos = buf + APR_BUCKET_BUFF_SIZE;
diff --git a/srclib/apr-util/buckets/apr_buckets_alloc.c b/srclib/apr-util/buckets/apr_buckets_alloc.c
index 76031c76..60f42dea 100644
--- a/srclib/apr-util/buckets/apr_buckets_alloc.c
+++ b/srclib/apr-util/buckets/apr_buckets_alloc.c
@@ -85,6 +85,9 @@ APU_DECLARE_NONSTD(apr_bucket_alloc_t *) apr_bucket_alloc_create_ex(
     apr_memnode_t *block;
 
     block = apr_allocator_alloc(allocator, ALLOC_AMT);
+    if (!block) {
+        return NULL;
+    }
     list = (apr_bucket_alloc_t *)block->first_avail;
     list->pool = NULL;
     list->allocator = allocator;
@@ -127,6 +130,9 @@ APU_DECLARE_NONSTD(void *) apr_bucket_alloc(apr_size_t size,
             endp = active->first_avail + SMALL_NODE_SIZE;
             if (endp >= active->endp) {
                 list->blocks = apr_allocator_alloc(list->allocator, ALLOC_AMT);
+                if (!list->blocks) {
+                    return NULL;
+                }
                 list->blocks->next = active;
                 active = list->blocks;
                 endp = active->first_avail + SMALL_NODE_SIZE;
@@ -140,6 +146,9 @@ APU_DECLARE_NONSTD(void *) apr_bucket_alloc(apr_size_t size,
     }
     else {
         apr_memnode_t *memnode = apr_allocator_alloc(list->allocator, size);
+        if (!memnode) {
+            return NULL;
+        }
         node = (node_header_t *)memnode->first_avail;
         node->alloc = list;
         node->memnode = memnode;
diff --git a/srclib/apr-util/build-outputs.mk b/srclib/apr-util/build-outputs.mk
index cc4ee01d..296a8254 100644
--- a/srclib/apr-util/build-outputs.mk
+++ b/srclib/apr-util/build-outputs.mk
@@ -18,36 +18,34 @@ crypto/apr_md5.lo: crypto/apr_md5.c .make.dirs include/apr_xlate.h include/apr_m
 crypto/apr_sha1.lo: crypto/apr_sha1.c .make.dirs include/apr_xlate.h include/apr_sha1.h include/apr_base64.h
 crypto/getuuid.lo: crypto/getuuid.c .make.dirs include/apr_uuid.h include/apr_md5.h include/apr_xlate.h
 crypto/uuid.lo: crypto/uuid.c .make.dirs include/apr_uuid.h
-dbm/apr_dbm.lo: dbm/apr_dbm.c .make.dirs include/apr_dbm.h
-dbm/apr_dbm_berkeleydb.lo: dbm/apr_dbm_berkeleydb.c .make.dirs 
-dbm/apr_dbm_gdbm.lo: dbm/apr_dbm_gdbm.c .make.dirs 
-dbm/apr_dbm_ndbm.lo: dbm/apr_dbm_ndbm.c .make.dirs 
-dbm/apr_dbm_sdbm.lo: dbm/apr_dbm_sdbm.c .make.dirs include/apr_sdbm.h
+dbm/apr_dbm.lo: dbm/apr_dbm.c .make.dirs include/apr_dbm.h include/private/apr_dbm_private.h
+dbm/apr_dbm_berkeleydb.lo: dbm/apr_dbm_berkeleydb.c .make.dirs include/apr_dbm.h include/private/apr_dbm_private.h
+dbm/apr_dbm_gdbm.lo: dbm/apr_dbm_gdbm.c .make.dirs include/apr_dbm.h include/private/apr_dbm_private.h
+dbm/apr_dbm_ndbm.lo: dbm/apr_dbm_ndbm.c .make.dirs include/apr_dbm.h include/private/apr_dbm_private.h
+dbm/apr_dbm_sdbm.lo: dbm/apr_dbm_sdbm.c .make.dirs include/apr_sdbm.h include/apr_dbm.h include/private/apr_dbm_private.h
 dbm/sdbm/sdbm.lo: dbm/sdbm/sdbm.c .make.dirs include/apr_sdbm.h
 dbm/sdbm/sdbm_hash.lo: dbm/sdbm/sdbm_hash.c .make.dirs include/apr_sdbm.h
 dbm/sdbm/sdbm_lock.lo: dbm/sdbm/sdbm_lock.c .make.dirs include/apr_sdbm.h
 dbm/sdbm/sdbm_pair.lo: dbm/sdbm/sdbm_pair.c .make.dirs include/apr_sdbm.h
 encoding/apr_base64.lo: encoding/apr_base64.c .make.dirs include/apr_base64.h include/apr_xlate.h
 hooks/apr_hooks.lo: hooks/apr_hooks.c .make.dirs include/apr_optional_hooks.h include/apr_optional.h include/apr_hooks.h
-ldap/apr_ldap_init.lo: ldap/apr_ldap_init.c .make.dirs 
-ldap/apr_ldap_option.lo: ldap/apr_ldap_option.c .make.dirs 
+ldap/apr_ldap_stub.lo: ldap/apr_ldap_stub.c .make.dirs include/private/apu_internal.h include/apu_version.h
 ldap/apr_ldap_url.lo: ldap/apr_ldap_url.c .make.dirs 
 misc/apr_date.lo: misc/apr_date.c .make.dirs include/apr_date.h
 misc/apr_queue.lo: misc/apr_queue.c .make.dirs include/apr_queue.h
 misc/apr_reslist.lo: misc/apr_reslist.c .make.dirs include/apr_reslist.h
 misc/apr_rmm.lo: misc/apr_rmm.c .make.dirs include/apr_rmm.h include/apr_anylock.h
+misc/apr_thread_pool.lo: misc/apr_thread_pool.c .make.dirs include/apr_thread_pool.h
+misc/apu_dso.lo: misc/apu_dso.c .make.dirs include/private/apu_internal.h include/apu_version.h
 misc/apu_version.lo: misc/apu_version.c .make.dirs include/apu_version.h
+memcache/apr_memcache.lo: memcache/apr_memcache.c .make.dirs include/apr_memcache.h include/apr_reslist.h include/apr_buckets.h
 uri/apr_uri.lo: uri/apr_uri.c .make.dirs include/apr_uri.h
 xml/apr_xml.lo: xml/apr_xml.c .make.dirs include/apr_xml.h include/apr_xlate.h
 strmatch/apr_strmatch.lo: strmatch/apr_strmatch.c .make.dirs include/apr_strmatch.h
 xlate/xlate.lo: xlate/xlate.c .make.dirs include/apr_xlate.h
-dbd/apr_dbd.lo: dbd/apr_dbd.c .make.dirs include/apr_dbd.h
-dbd/apr_dbd_mysql.lo: dbd/apr_dbd_mysql.c .make.dirs include/apu_version.h include/apr_buckets.h
-dbd/apr_dbd_pgsql.lo: dbd/apr_dbd_pgsql.c .make.dirs 
-dbd/apr_dbd_sqlite2.lo: dbd/apr_dbd_sqlite2.c .make.dirs 
-dbd/apr_dbd_sqlite3.lo: dbd/apr_dbd_sqlite3.c .make.dirs 
+dbd/apr_dbd.lo: dbd/apr_dbd.c .make.dirs include/private/apu_internal.h include/apu_version.h include/private/apr_dbd_internal.h include/apr_dbd.h
 
-OBJECTS_all = buckets/apr_brigade.lo buckets/apr_buckets.lo buckets/apr_buckets_alloc.lo buckets/apr_buckets_eos.lo buckets/apr_buckets_file.lo buckets/apr_buckets_flush.lo buckets/apr_buckets_heap.lo buckets/apr_buckets_mmap.lo buckets/apr_buckets_pipe.lo buckets/apr_buckets_pool.lo buckets/apr_buckets_refcount.lo buckets/apr_buckets_simple.lo buckets/apr_buckets_socket.lo crypto/apr_md4.lo crypto/apr_md5.lo crypto/apr_sha1.lo crypto/getuuid.lo crypto/uuid.lo dbm/apr_dbm.lo dbm/apr_dbm_berkeleydb.lo dbm/apr_dbm_gdbm.lo dbm/apr_dbm_ndbm.lo dbm/apr_dbm_sdbm.lo dbm/sdbm/sdbm.lo dbm/sdbm/sdbm_hash.lo dbm/sdbm/sdbm_lock.lo dbm/sdbm/sdbm_pair.lo encoding/apr_base64.lo hooks/apr_hooks.lo ldap/apr_ldap_init.lo ldap/apr_ldap_option.lo ldap/apr_ldap_url.lo misc/apr_date.lo misc/apr_queue.lo misc/apr_reslist.lo misc/apr_rmm.lo misc/apu_version.lo uri/apr_uri.lo xml/apr_xml.lo strmatch/apr_strmatch.lo xlate/xlate.lo dbd/apr_dbd.lo dbd/apr_dbd_mysql.lo dbd/apr_dbd_pgsql.lo dbd/apr_dbd_sqlite2.lo dbd/apr_dbd_sqlite3.lo
+OBJECTS_all = buckets/apr_brigade.lo buckets/apr_buckets.lo buckets/apr_buckets_alloc.lo buckets/apr_buckets_eos.lo buckets/apr_buckets_file.lo buckets/apr_buckets_flush.lo buckets/apr_buckets_heap.lo buckets/apr_buckets_mmap.lo buckets/apr_buckets_pipe.lo buckets/apr_buckets_pool.lo buckets/apr_buckets_refcount.lo buckets/apr_buckets_simple.lo buckets/apr_buckets_socket.lo crypto/apr_md4.lo crypto/apr_md5.lo crypto/apr_sha1.lo crypto/getuuid.lo crypto/uuid.lo dbm/apr_dbm.lo dbm/apr_dbm_berkeleydb.lo dbm/apr_dbm_gdbm.lo dbm/apr_dbm_ndbm.lo dbm/apr_dbm_sdbm.lo dbm/sdbm/sdbm.lo dbm/sdbm/sdbm_hash.lo dbm/sdbm/sdbm_lock.lo dbm/sdbm/sdbm_pair.lo encoding/apr_base64.lo hooks/apr_hooks.lo ldap/apr_ldap_stub.lo ldap/apr_ldap_url.lo misc/apr_date.lo misc/apr_queue.lo misc/apr_reslist.lo misc/apr_rmm.lo misc/apr_thread_pool.lo misc/apu_dso.lo misc/apu_version.lo memcache/apr_memcache.lo uri/apr_uri.lo xml/apr_xml.lo strmatch/apr_strmatch.lo xlate/xlate.lo dbd/apr_dbd.lo
 
 OBJECTS_unix = $(OBJECTS_all)
 
@@ -59,11 +57,57 @@ OBJECTS_os2 = $(OBJECTS_all)
 
 OBJECTS_os390 = $(OBJECTS_all)
 
-HEADERS = $(top_srcdir)/include/apr_anylock.h $(top_srcdir)/include/apr_base64.h $(top_srcdir)/include/apr_buckets.h $(top_srcdir)/include/apr_date.h $(top_srcdir)/include/apr_dbd.h $(top_srcdir)/include/apr_dbm.h $(top_srcdir)/include/apr_hooks.h $(top_srcdir)/include/apr_ldap_init.h $(top_srcdir)/include/apr_ldap_option.h $(top_srcdir)/include/apr_ldap_url.h $(top_srcdir)/include/apr_md4.h $(top_srcdir)/include/apr_md5.h $(top_srcdir)/include/apr_optional.h $(top_srcdir)/include/apr_optional_hooks.h $(top_srcdir)/include/apr_queue.h $(top_srcdir)/include/apr_reslist.h $(top_srcdir)/include/apr_rmm.h $(top_srcdir)/include/apr_sdbm.h $(top_srcdir)/include/apr_sha1.h $(top_srcdir)/include/apr_strmatch.h $(top_srcdir)/include/apr_uri.h $(top_srcdir)/include/apr_uuid.h $(top_srcdir)/include/apr_xlate.h $(top_srcdir)/include/apr_xml.h $(top_srcdir)/include/apu_version.h
+OBJECTS_win32 = $(OBJECTS_all)
+
+HEADERS = $(top_srcdir)/include/apr_anylock.h $(top_srcdir)/include/apr_base64.h $(top_srcdir)/include/apr_buckets.h $(top_srcdir)/include/apr_date.h $(top_srcdir)/include/apr_dbd.h $(top_srcdir)/include/apr_dbm.h $(top_srcdir)/include/apr_hooks.h $(top_srcdir)/include/apr_ldap_init.h $(top_srcdir)/include/apr_ldap_option.h $(top_srcdir)/include/apr_ldap_rebind.h $(top_srcdir)/include/apr_ldap_url.h $(top_srcdir)/include/apr_md4.h $(top_srcdir)/include/apr_md5.h $(top_srcdir)/include/apr_memcache.h $(top_srcdir)/include/apr_optional.h $(top_srcdir)/include/apr_optional_hooks.h $(top_srcdir)/include/apr_queue.h $(top_srcdir)/include/apr_reslist.h $(top_srcdir)/include/apr_rmm.h $(top_srcdir)/include/apr_sdbm.h $(top_srcdir)/include/apr_sha1.h $(top_srcdir)/include/apr_strmatch.h $(top_srcdir)/include/apr_thread_pool.h $(top_srcdir)/include/apr_uri.h $(top_srcdir)/include/apr_uuid.h $(top_srcdir)/include/apr_xlate.h $(top_srcdir)/include/apr_xml.h $(top_srcdir)/include/apu_version.h $(top_srcdir)/include/private/apr_dbd_internal.h $(top_srcdir)/include/private/apr_dbm_private.h $(top_srcdir)/include/private/apu_internal.h
+
+SOURCE_DIRS = xml dbd dbm encoding hooks buckets misc crypto uri strmatch memcache dbm/sdbm ldap xlate $(EXTRA_SOURCE_DIRS)
+
+ldap/apr_ldap_init.lo: ldap/apr_ldap_init.c .make.dirs include/private/apu_internal.h
+ldap/apr_ldap_option.lo: ldap/apr_ldap_option.c .make.dirs 
+ldap/apr_ldap_rebind.lo: ldap/apr_ldap_rebind.c .make.dirs include/apr_ldap_rebind.h
+OBJECTS_ldap = ldap/apr_ldap_init.lo ldap/apr_ldap_option.lo ldap/apr_ldap_rebind.lo
+MODULE_ldap = ldap/apr_ldap.la
+ldap/apr_ldap.la: ldap/apr_ldap_init.lo ldap/apr_ldap_option.lo ldap/apr_ldap_rebind.lo
+	$(LINK_MODULE) -o $@ $(OBJECTS_ldap) $(LDADD_ldap)
+
+dbd/apr_dbd_pgsql.lo: dbd/apr_dbd_pgsql.c .make.dirs include/private/apr_dbd_internal.h include/apr_buckets.h include/apr_dbd.h
+OBJECTS_dbd_pgsql = dbd/apr_dbd_pgsql.lo
+MODULE_dbd_pgsql = dbd/apr_dbd_pgsql.la
+dbd/apr_dbd_pgsql.la: dbd/apr_dbd_pgsql.lo
+	$(LINK_MODULE) -o $@ $(OBJECTS_dbd_pgsql) $(LDADD_dbd_pgsql)
+
+dbd/apr_dbd_sqlite2.lo: dbd/apr_dbd_sqlite2.c .make.dirs include/private/apr_dbd_internal.h include/apr_buckets.h include/apr_dbd.h
+OBJECTS_dbd_sqlite2 = dbd/apr_dbd_sqlite2.lo
+MODULE_dbd_sqlite2 = dbd/apr_dbd_sqlite2.la
+dbd/apr_dbd_sqlite2.la: dbd/apr_dbd_sqlite2.lo
+	$(LINK_MODULE) -o $@ $(OBJECTS_dbd_sqlite2) $(LDADD_dbd_sqlite2)
+
+dbd/apr_dbd_sqlite3.lo: dbd/apr_dbd_sqlite3.c .make.dirs include/private/apr_dbd_internal.h include/apr_buckets.h include/apr_dbd.h
+OBJECTS_dbd_sqlite3 = dbd/apr_dbd_sqlite3.lo
+MODULE_dbd_sqlite3 = dbd/apr_dbd_sqlite3.la
+dbd/apr_dbd_sqlite3.la: dbd/apr_dbd_sqlite3.lo
+	$(LINK_MODULE) -o $@ $(OBJECTS_dbd_sqlite3) $(LDADD_dbd_sqlite3)
+
+dbd/apr_dbd_oracle.lo: dbd/apr_dbd_oracle.c .make.dirs include/private/apr_dbd_internal.h include/apr_buckets.h include/apr_dbd.h
+OBJECTS_dbd_oracle = dbd/apr_dbd_oracle.lo
+MODULE_dbd_oracle = dbd/apr_dbd_oracle.la
+dbd/apr_dbd_oracle.la: dbd/apr_dbd_oracle.lo
+	$(LINK_MODULE) -o $@ $(OBJECTS_dbd_oracle) $(LDADD_dbd_oracle)
+
+dbd/apr_dbd_mysql.lo: dbd/apr_dbd_mysql.c .make.dirs include/private/apr_dbd_internal.h include/apu_version.h include/apr_buckets.h include/apr_dbd.h
+OBJECTS_dbd_mysql = dbd/apr_dbd_mysql.lo
+MODULE_dbd_mysql = dbd/apr_dbd_mysql.la
+dbd/apr_dbd_mysql.la: dbd/apr_dbd_mysql.lo
+	$(LINK_MODULE) -o $@ $(OBJECTS_dbd_mysql) $(LDADD_dbd_mysql)
 
-SOURCE_DIRS = xml dbd dbm encoding hooks buckets misc crypto uri strmatch dbm/sdbm ldap xlate $(EXTRA_SOURCE_DIRS)
+dbd/apr_dbd_freetds.lo: dbd/apr_dbd_freetds.c .make.dirs include/private/apr_dbd_internal.h include/apr_dbd.h
+OBJECTS_dbd_freetds = dbd/apr_dbd_freetds.lo
+MODULE_dbd_freetds = dbd/apr_dbd_freetds.la
+dbd/apr_dbd_freetds.la: dbd/apr_dbd_freetds.lo
+	$(LINK_MODULE) -o $@ $(OBJECTS_dbd_freetds) $(LDADD_dbd_freetds)
 
-BUILD_DIRS = buckets crypto dbd dbm dbm/sdbm encoding hooks ldap misc strmatch uri xlate xml
+BUILD_DIRS = buckets crypto dbd dbm dbm/sdbm encoding hooks ldap memcache misc strmatch uri xlate xml
 
 .make.dirs: $(srcdir)/build-outputs.mk
 	@for d in $(BUILD_DIRS); do test -d $$d || mkdir $$d; done
diff --git a/srclib/apr-util/build.conf b/srclib/apr-util/build.conf
index 066009fd..abc8449a 100644
--- a/srclib/apr-util/build.conf
+++ b/srclib/apr-util/build.conf
@@ -12,21 +12,55 @@ paths =
   dbm/sdbm/*.c
   encoding/*.c
   hooks/*.c
-  ldap/*.c
+  ldap/apr_ldap_stub.c
+  ldap/apr_ldap_url.c
   misc/*.c
+  memcache/*.c
   uri/apr_uri.c
   xml/*.c
   strmatch/*.c
   xlate/*.c
-  dbd/*.c
+  dbd/apr_dbd.c
 
 # we have no platform-specific subdirs
 platform_dirs =
 
 # the public headers
-headers = include/*.h
+headers = include/*.h include/private/*.h
+
+modules = ldap dbd_pgsql dbd_sqlite2 dbd_sqlite3 dbd_oracle dbd_mysql dbd_freetds
 
 # gen_uri_delim.c
 
 # we have a recursive makefile for the test files (for now)
 # test/*.c
+
+[dbd_pgsql]
+paths = dbd/apr_dbd_pgsql.c
+target = dbd/apr_dbd_pgsql.la
+
+[dbd_sqlite2]
+paths = dbd/apr_dbd_sqlite2.c
+target = dbd/apr_dbd_sqlite2.la
+
+[dbd_sqlite3]
+paths = dbd/apr_dbd_sqlite3.c
+target = dbd/apr_dbd_sqlite3.la
+
+[dbd_oracle]
+paths = dbd/apr_dbd_oracle.c
+target = dbd/apr_dbd_oracle.la
+
+[dbd_mysql]
+paths = dbd/apr_dbd_mysql.c
+target = dbd/apr_dbd_mysql.la
+
+[dbd_freetds]
+paths = dbd/apr_dbd_freetds.c
+target = dbd/apr_dbd_freetds.la
+
+[ldap]
+paths = ldap/apr_ldap_init.c \
+        ldap/apr_ldap_option.c \
+        ldap/apr_ldap_rebind.c
+target = ldap/apr_ldap.la
diff --git a/srclib/apr-util/build/apr_common.m4 b/srclib/apr-util/build/apr_common.m4
index caae9bfa..2afb4666 100644
--- a/srclib/apr-util/build/apr_common.m4
+++ b/srclib/apr-util/build/apr_common.m4
@@ -23,7 +23,7 @@ dnl APR_CONFIG_NICE(filename)
 dnl
 dnl Saves a snapshot of the configure command-line for later reuse
 dnl
-AC_DEFUN(APR_CONFIG_NICE,[
+AC_DEFUN([APR_CONFIG_NICE], [
   rm -f $1
   cat >$1<<EOF
 #! /bin/sh
@@ -80,7 +80,7 @@ EOF
 
 dnl APR_MKDIR_P_CHECK(fallback-mkdir-p)
 dnl checks whether mkdir -p works
-AC_DEFUN(APR_MKDIR_P_CHECK,[
+AC_DEFUN([APR_MKDIR_P_CHECK], [
   AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[
     test -d conftestdir && rm -rf conftestdir
     mkdir -p conftestdir/somedir >/dev/null 2>&1
@@ -118,7 +118,7 @@ dnl
 dnl Trying to optimize this is left as an exercise to the reader who wants
 dnl to put up with more autoconf craziness.  I give up.
 dnl
-AC_DEFUN(APR_SUBDIR_CONFIG, [
+AC_DEFUN([APR_SUBDIR_CONFIG], [
   # save our work to this point; this allows the sub-package to use it
   AC_CACHE_SAVE
 
@@ -161,8 +161,8 @@ changequote([, ])dnl
   # autoconf doesn't add --silent to ac_configure_args; explicitly pass it
   test "x$silent" = "xyes" && apr_configure_args="$apr_configure_args --silent"
 
-  dnl The eval makes quoting arguments work - specifically $2 where the
-  dnl quoting mechanisms used is "" rather than [].
+  dnl The eval makes quoting arguments work - specifically the second argument
+  dnl where the quoting mechanisms used is "" rather than [].
   dnl
   dnl We need to execute another shell because some autoconf/shell combinations
   dnl will choke after doing repeated APR_SUBDIR_CONFIG()s.  (Namely Solaris
@@ -186,7 +186,7 @@ dnl APR_SAVE_THE_ENVIRONMENT(variable_name)
 dnl
 dnl Stores the variable (usually a Makefile macro) for later restoration
 dnl
-AC_DEFUN(APR_SAVE_THE_ENVIRONMENT,[
+AC_DEFUN([APR_SAVE_THE_ENVIRONMENT], [
   apr_ste_save_$1="$$1"
 ])dnl
 
@@ -198,7 +198,7 @@ dnl has added to the variable, moving the new bits to prefix_variable_name
 dnl and restoring the original variable contents.  This makes it possible
 dnl for a user to override configure when it does something stupid.
 dnl
-AC_DEFUN(APR_RESTORE_THE_ENVIRONMENT,[
+AC_DEFUN([APR_RESTORE_THE_ENVIRONMENT], [
 if test "x$apr_ste_save_$1" = "x"; then
   $2$1="$$1"
   $1=
@@ -222,7 +222,7 @@ dnl APR_SETIFNULL(variable, value)
 dnl
 dnl  Set variable iff it's currently null
 dnl
-AC_DEFUN(APR_SETIFNULL,[
+AC_DEFUN([APR_SETIFNULL], [
   if test -z "$$1"; then
     test "x$silent" != "xyes" && echo "  setting $1 to \"$2\""
     $1="$2"
@@ -234,7 +234,7 @@ dnl APR_SETVAR(variable, value)
 dnl
 dnl  Set variable no matter what
 dnl
-AC_DEFUN(APR_SETVAR,[
+AC_DEFUN([APR_SETVAR], [
   test "x$silent" != "xyes" && echo "  forcing $1 to \"$2\""
   $1="$2"
 ])dnl
@@ -244,7 +244,7 @@ dnl APR_ADDTO(variable, value)
 dnl
 dnl  Add value to variable
 dnl
-AC_DEFUN(APR_ADDTO,[
+AC_DEFUN([APR_ADDTO], [
   if test "x$$1" = "x"; then
     test "x$silent" != "xyes" && echo "  setting $1 to \"$2\""
     $1="$2"
@@ -271,7 +271,7 @@ dnl APR_REMOVEFROM(variable, value)
 dnl
 dnl Remove a value from a variable
 dnl
-AC_DEFUN(APR_REMOVEFROM,[
+AC_DEFUN([APR_REMOVEFROM], [
   if test "x$$1" = "x$2"; then
     test "x$silent" != "xyes" && echo "  nulling $1"
     $1=""
@@ -295,7 +295,7 @@ AC_DEFUN(APR_REMOVEFROM,[
 dnl
 dnl APR_CHECK_DEFINE_FILES( symbol, header_file [header_file ...] )
 dnl
-AC_DEFUN(APR_CHECK_DEFINE_FILES,[
+AC_DEFUN([APR_CHECK_DEFINE_FILES], [
   AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
     ac_cv_define_$1=no
     for curhdr in $2
@@ -317,7 +317,7 @@ YES_IS_DEFINED
 dnl
 dnl APR_CHECK_DEFINE(symbol, header_file)
 dnl
-AC_DEFUN(APR_CHECK_DEFINE,[
+AC_DEFUN([APR_CHECK_DEFINE], [
   AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
     AC_EGREP_CPP(YES_IS_DEFINED, [
 #include <$2>
@@ -334,7 +334,7 @@ YES_IS_DEFINED
 dnl
 dnl APR_CHECK_APR_DEFINE( symbol )
 dnl
-AC_DEFUN(APR_CHECK_APR_DEFINE,[
+AC_DEFUN([APR_CHECK_APR_DEFINE], [
 apr_old_cppflags=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $INCLUDES"
 AC_EGREP_CPP(YES_IS_DEFINED, [
@@ -450,12 +450,12 @@ dnl
 dnl A variant of AC_CHECK_SIZEOF which allows the checking of
 dnl sizes of non-builtin types
 dnl
-AC_DEFUN(APR_CHECK_SIZEOF_EXTENDED,
-[changequote(<<,>>)dnl
-dnl The name to #define
+AC_DEFUN([APR_CHECK_SIZEOF_EXTENDED],
+[changequote(<<, >>)dnl
+dnl The name to #define.
 define(<<AC_TYPE_NAME>>, translit(sizeof_$2, [a-z *], [A-Z_P]))dnl
-dnl The cache variable
-define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$2, [ *],[<p>]))dnl
+dnl The cache variable name.
+define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$2, [ *], [_p]))dnl
 changequote([, ])dnl
 AC_MSG_CHECKING(size of $2)
 AC_CACHE_VAL(AC_CV_NAME,
@@ -463,7 +463,7 @@ AC_CACHE_VAL(AC_CV_NAME,
 $1
 main()
 {
-  FILE *f=fopen("conftestval","w");
+  FILE *f=fopen("conftestval", "w");
   if (!f) exit(1);
   fprintf(f, "%d\n", sizeof($2));
   exit(0);
@@ -511,7 +511,7 @@ dnl  for failure), or it returns a pointer to the error
 dnl  string.
 dnl
 dnl
-AC_DEFUN(APR_CHECK_STRERROR_R_RC,[
+AC_DEFUN([APR_CHECK_STRERROR_R_RC], [
 AC_MSG_CHECKING(for type of return code from strerror_r)
 AC_TRY_RUN([
 #include <errno.h>
@@ -546,7 +546,7 @@ dnl  Decide if d_fileno or d_ino are available in the dirent
 dnl  structure on this platform.  Single UNIX Spec says d_ino,
 dnl  BSD uses d_fileno.  Undef to find the real beast.
 dnl
-AC_DEFUN(APR_CHECK_DIRENT_INODE, [
+AC_DEFUN([APR_CHECK_DIRENT_INODE], [
 AC_CACHE_CHECK([for inode member of struct dirent], apr_cv_dirent_inode, [
 apr_cv_dirent_inode=no
 AC_TRY_COMPILE([
@@ -584,7 +584,7 @@ dnl  on this platform.  Not part of the Single UNIX Spec.
 dnl  Note that this is worthless without DT_xxx macros, so
 dnl  look for one while we are at it.
 dnl
-AC_DEFUN(APR_CHECK_DIRENT_TYPE,[
+AC_DEFUN([APR_CHECK_DIRENT_TYPE], [
 AC_CACHE_CHECK([for file type member of struct dirent], apr_cv_dirent_type,[
 apr_cv_dirent_type=no
 AC_TRY_COMPILE([
@@ -633,7 +633,7 @@ dnl  by changing all "/" to "_" in the HEADER-FILE and dropping
 dnl  all "." and "-" chars. If the 3rd parameter is "yes" then instead of
 dnl  setting to 1 or 0, we set FLAG-TO-SET to yes or no.
 dnl  
-AC_DEFUN(APR_FLAG_HEADERS,[
+AC_DEFUN([APR_FLAG_HEADERS], [
 AC_CHECK_HEADERS($1)
 for aprt_i in $1
 do
@@ -654,7 +654,7 @@ dnl  we use what's provided as FLAG-TO-SET. If the 3rd parameter
 dnl  is "yes" then instead of setting to 1 or 0, we set FLAG-TO-SET
 dnl  to yes or no.
 dnl
-AC_DEFUN(APR_FLAG_FUNCS,[
+AC_DEFUN([APR_FLAG_FUNCS], [
 AC_CHECK_FUNCS($1)
 for aprt_j in $1
 do
@@ -679,7 +679,7 @@ dnl baz='${bar}/3'
 dnl APR_EXPAND_VAR(fraz, $baz)
 dnl   $fraz is now "1/2/3"
 dnl 
-AC_DEFUN(APR_EXPAND_VAR,[
+AC_DEFUN([APR_EXPAND_VAR], [
 ap_last=
 ap_cur="$2"
 while test "x${ap_cur}" != "x${ap_last}";
@@ -698,7 +698,7 @@ dnl Example:
 dnl orig_path="${prefix}/bar"
 dnl APR_PATH_RELATIVE(final_path, $orig_path, $prefix)
 dnl    $final_path now contains "bar"
-AC_DEFUN(APR_PATH_RELATIVE,[
+AC_DEFUN([APR_PATH_RELATIVE], [
 ap_stripped=`echo $2 | sed -e "s#^$3##"`
 # check if the stripping was successful
 if test "x$2" != "x${ap_stripped}"; then
@@ -716,12 +716,12 @@ dnl AC_HELP_STRING, so let's try to call it if we can.
 dnl Note: this define must be on one line so that it can be properly returned
 dnl as the help string.  When using this macro with a multi-line RHS, ensure
 dnl that you surround the macro invocation with []s
-AC_DEFUN(APR_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[  ][$1] substr([                       ],len($1))[$2])])
+AC_DEFUN([APR_HELP_STRING], [ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[  ][$1] substr([                       ],len($1))[$2])])
 
 dnl
 dnl APR_LAYOUT(configlayout, layoutname [, extravars])
 dnl
-AC_DEFUN(APR_LAYOUT,[
+AC_DEFUN([APR_LAYOUT], [
   if test ! -f $srcdir/config.layout; then
     echo "** Error: Layout file $srcdir/config.layout not found"
     echo "** Error: Cannot use undefined layout '$LAYOUT'"
@@ -784,7 +784,7 @@ AC_DEFUN(APR_LAYOUT,[
 dnl
 dnl APR_ENABLE_LAYOUT(default layout name [, extra vars])
 dnl
-AC_DEFUN(APR_ENABLE_LAYOUT,[
+AC_DEFUN([APR_ENABLE_LAYOUT], [
 AC_ARG_ENABLE(layout,
 [  --enable-layout=LAYOUT],[
   LAYOUT=$enableval
@@ -805,7 +805,7 @@ dnl APR_PARSE_ARGUMENTS
 dnl a reimplementation of autoconf's argument parser,
 dnl used here to allow us to co-exist layouts and argument based
 dnl set ups.
-AC_DEFUN(APR_PARSE_ARGUMENTS,[
+AC_DEFUN([APR_PARSE_ARGUMENTS], [
 ac_prev=
 # Retrieve the command-line arguments.  The eval is needed because
 # the arguments are quoted to preserve accuracy.
@@ -931,7 +931,7 @@ dnl APR_CHECK_DEPEND
 dnl
 dnl Determine what program we can use to generate .deps-style dependencies
 dnl
-AC_DEFUN(APR_CHECK_DEPEND,[
+AC_DEFUN([APR_CHECK_DEPEND], [
 dnl Try to determine what depend program we can use
 dnl All GCC-variants should have -MM.
 dnl If not, then we can check on those, too.
@@ -974,4 +974,3 @@ AC_TRY_COMPILE(AC_INCLUDES_DEFAULT, [
 ], [apr_cvname=yes
 $3], [apr_cvname=no])])
 ])
-
diff --git a/srclib/apr-util/build/apu-conf.m4 b/srclib/apr-util/build/apu-conf.m4
index 157980b8..6ea75ffd 100644
--- a/srclib/apr-util/build/apu-conf.m4
+++ b/srclib/apr-util/build/apu-conf.m4
@@ -191,8 +191,7 @@ AC_DEFUN([APU_FIND_LDAPLIB], [
     unset ac_cv_lib_${ldaplib}___ldap_init
     AC_CHECK_LIB(${ldaplib}, ldap_init, 
       [
-        APR_ADDTO(APRUTIL_EXPORT_LIBS,[-l${ldaplib} ${extralib}])
-        APR_ADDTO(APRUTIL_LIBS,[-l${ldaplib} ${extralib}])
+        LDADD_ldap="-l${ldaplib} ${extralib}"
         AC_CHECK_LIB(${ldaplib}, ldapssl_client_init, apu_has_ldapssl_client_init="1", , ${extralib})
         AC_CHECK_LIB(${ldaplib}, ldapssl_client_deinit, apu_has_ldapssl_client_deinit="1", , ${extralib})
         AC_CHECK_LIB(${ldaplib}, ldapssl_add_trusted_cert, apu_has_ldapssl_add_trusted_cert="1", , ${extralib})
@@ -227,8 +226,10 @@ apu_has_ldap_novell="0"
 apu_has_ldap_microsoft="0"
 apu_has_ldap_netscape="0"
 apu_has_ldap_mozilla="0"
+apu_has_ldap_tivoli="0"
 apu_has_ldap_zos="0"
 apu_has_ldap_other="0"
+LDADD_ldap=""
 
 AC_ARG_WITH(ldap-include,[  --with-ldap-include=path  path to ldap include files with trailing slash])
 AC_ARG_WITH(ldap-lib,[  --with-ldap-lib=path    path to ldap lib file])
@@ -329,11 +330,17 @@ dnl The iPlanet C SDK 5.0 is as yet untested...
                                            apr_cv_ldap_toolkit="Mozilla"])
         fi
         if test "x$apr_cv_ldap_toolkit" = "x"; then
+          AC_EGREP_CPP([International Business Machines], [$lber_h
+                       $ldap_h
+                       LDAP_VENDOR_NAME], [apu_has_ldap_tivoli="1"
+                                           apr_cv_ldap_toolkit="Tivoli"])
+        fi
+        if test "x$apr_cv_ldap_toolkit" = "x"; then
           case "$host" in
           *-ibm-os390)
             AC_EGREP_CPP([IBM], [$lber_h
                                  $ldap_h], [apu_has_ldap_zos="1"
-                                            apr_cv_ldap_toolkit="zOS"])
+                                            apr_cv_ldap_toolkit="z/OS"])
             ;;
           esac
         fi
@@ -366,8 +373,10 @@ AC_SUBST(apu_has_ldap_novell)
 AC_SUBST(apu_has_ldap_microsoft)
 AC_SUBST(apu_has_ldap_netscape)
 AC_SUBST(apu_has_ldap_mozilla)
+AC_SUBST(apu_has_ldap_tivoli)
 AC_SUBST(apu_has_ldap_zos)
 AC_SUBST(apu_has_ldap_other)
+AC_SUBST(LDADD_ldap)
 
 ])
 
diff --git a/srclib/apr-util/build/dbd.m4 b/srclib/apr-util/build/dbd.m4
index 2cc18fc0..ad6d7ffd 100644
--- a/srclib/apr-util/build/dbd.m4
+++ b/srclib/apr-util/build/dbd.m4
@@ -24,99 +24,125 @@ dnl
 AC_DEFUN([APU_CHECK_DBD], [
   apu_have_pgsql=0
 
-  AC_ARG_WITH([pgsql],
-    APR_HELP_STRING([--with-pgsql=DIR], [specify PostgreSQL location]),
+  old_libs="$LIBS"
+  old_cppflags="$CPPFLAGS"
+  old_ldflags="$LDFLAGS"
+
+  AC_ARG_WITH([pgsql], APR_HELP_STRING([--with-pgsql=DIR], [specify PostgreSQL location]),
   [
-    apu_have_pgsql=0
     if test "$withval" = "yes"; then
+      AC_PATH_PROG([PGSQL_CONFIG],[pg_config])
+      if test "x$PGSQL_CONFIG" != 'x'; then
+        pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
+        pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
+        pgsql_LIBS="`$PGSQL_CONFIG --libs`"
+
+        APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS])
+        APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])
+        APR_ADDTO(LIBS, [$pgsql_LIBS])
+      fi
+
       AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
       if test "$apu_have_pgsql" = "0"; then
         AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
       fi
+      if test "$apu_have_pgsql" != "0" && test "x$PGSQL_CONFIG" != 'x'; then
+        APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS])
+      fi
     elif test "$withval" = "no"; then
-      apu_have_pgsql=0
+      :
     else
-      old_cppflags="$CPPFLAGS"
-      old_ldflags="$LDFLAGS"
-
-      pgsql_CPPFLAGS="-I$withval/include"
-      pgsql_LDFLAGS="-L$withval/lib "
+      AC_PATH_PROG([PGSQL_CONFIG],[pg_config],,[$withval/bin])
+      if test "x$PGSQL_CONFIG" != 'x'; then
+        pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
+        pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
+        pgsql_LIBS="`$PGSQL_CONFIG --libs`"
+      else
+        pgsql_CPPFLAGS="-I$withval/include"
+        pgsql_LDFLAGS="-L$withval/lib "
+      fi
 
       APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS])
       APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])
+      APR_ADDTO(LIBS, [$pgsql_LIBS])
 
       AC_MSG_NOTICE(checking for pgsql in $withval)
       AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
-      if test "$apu_have_pgsql" != "0"; then
-        APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-        APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
-      fi
       if test "$apu_have_pgsql" != "1"; then
         AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
-        if test "$apu_have_pgsql" != "0"; then
-          APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/postgresql])
-          APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-        fi
       fi
-
-      CPPFLAGS="$old_cppflags"
-      LDFLAGS="$old_ldflags"
+      if test "$apu_have_pgsql" != "0"; then
+        APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS])
+      fi
     fi
   ], [
-    apu_have_pgsql=0
+    AC_PATH_PROG([PGSQL_CONFIG],[pg_config])
+    if test "x$PGSQL_CONFIG" != 'x'; then
+      pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
+      pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
+      pgsql_LIBS="`$PGSQL_CONFIG --libs`"
+
+      APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS])
+      APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])
+      APR_ADDTO(LIBS, [$pgsql_LIBS])
+    fi
+
     AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
+    if test "$apu_have_pgsql" = "0"; then
+      AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
+    fi
+    if test "$apu_have_pgsql" != "0" && test "x$PGSQL_CONFIG" != 'x'; then
+      APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS])
+    fi
   ])
   AC_SUBST(apu_have_pgsql)
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_pgsql" = "1"; then
-    APR_ADDTO(APRUTIL_EXPORT_LIBS,[-lpq])
-    APR_ADDTO(APRUTIL_LIBS,[-lpq])
+    LDADD_dbd_pgsql="$pgsql_LDFLAGS -lpq $pgsql_LIBS"
   fi
+  AC_SUBST(LDADD_dbd_pgsql)
+
+  LIBS="$old_libs"
+  CPPFLAGS="$old_cppflags"
+  LDFLAGS="$old_ldflags"
 ])
 dnl
 AC_DEFUN([APU_CHECK_DBD_MYSQL], [
   apu_have_mysql=0
 
-  AC_ARG_WITH([mysql],
-    APR_HELP_STRING([--with-mysql=DIR], [specify MySQL location (disabled by default)]),
+  old_libs="$LIBS"
+  old_cppflags="$CPPFLAGS"
+  old_ldflags="$LDFLAGS"
+
+  AC_ARG_WITH([mysql], APR_HELP_STRING([--with-mysql=DIR], [enable MySQL DBD driver]),
   [
-    apu_have_mysql=0
     if test "$withval" = "yes"; then
-      old_cppflags="$CPPFLAGS"
-      old_ldflags="$LDFLAGS"
-
       AC_PATH_PROG([MYSQL_CONFIG],[mysql_config])
       if test "x$MYSQL_CONFIG" != 'x'; then
         mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
-        mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r`"
+        mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`"
+        mysql_LIBS="`$MYSQL_CONFIG --libs_r`"
 
         APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS])
-        APR_ADDTO(LDFLAGS, [$mysql_LDFLAGS])
+        APR_ADDTO(LIBS, [$mysql_LIBS])
       fi
 
       AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
       if test "$apu_have_mysql" = "0"; then
         AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
-      else
-        if test "x$MYSQL_CONFIG" != 'x'; then
-          APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS])
-          APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS])
-        fi
       fi
-
-      CPPFLAGS="$old_cppflags"
-      LDFLAGS="$old_ldflags"
+      if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then
+        APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
+      fi
     elif test "$withval" = "no"; then
-      apu_have_mysql=0
+      :
     else
-      old_cppflags="$CPPFLAGS"
-      old_ldflags="$LDFLAGS"
-
       AC_PATH_PROG([MYSQL_CONFIG],[mysql_config],,[$withval/bin])
       if test "x$MYSQL_CONFIG" != 'x'; then
         mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
-        mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r`"
+        mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`"
+        mysql_LIBS="`$MYSQL_CONFIG --libs_r`"
       else
         mysql_CPPFLAGS="-I$withval/include"
         mysql_LDFLAGS="-L$withval/lib "
@@ -124,24 +150,17 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [
 
       APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS])
       APR_ADDTO(LDFLAGS, [$mysql_LDFLAGS])
+      APR_ADDTO(LIBS, [$mysql_LIBS])
 
       AC_MSG_NOTICE(checking for mysql in $withval)
       AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
-      if test "$apu_have_mysql" != "0"; then
-        APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS])
-        APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS])
-      fi
 
       if test "$apu_have_mysql" != "1"; then
         AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
-        if test "$apu_have_mysql" != "0"; then
-          APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/mysql])
-          APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-        fi
       fi
-
-      CPPFLAGS="$old_cppflags"
-      LDFLAGS="$old_ldflags"
+      if test "$apu_have_mysql" != "0"; then
+        APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
+      fi
     fi
   ])
 
@@ -150,26 +169,29 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_mysql" = "1"; then
-    APR_ADDTO(APRUTIL_EXPORT_LIBS,[-lmysqlclient_r])
-    APR_ADDTO(APRUTIL_LIBS,[-lmysqlclient_r])
+    LDADD_dbd_mysql="$mysql_LDFLAGS -lmysqlclient_r $mysql_LIBS"
   fi
+  AC_SUBST(LDADD_dbd_mysql)
+
+  LIBS="$old_libs"
+  CPPFLAGS="$old_cppflags"
+  LDFLAGS="$old_ldflags"
 ])
 dnl
 AC_DEFUN([APU_CHECK_DBD_SQLITE3], [
   apu_have_sqlite3=0
 
-  AC_ARG_WITH([sqlite3],
-    APR_HELP_STRING([--with-sqlite3=DIR], [enable sqlite3 DBD driver]),
+  old_libs="$LIBS"
+  old_cppflags="$CPPFLAGS"
+  old_ldflags="$LDFLAGS"
+
+  AC_ARG_WITH([sqlite3], APR_HELP_STRING([--with-sqlite3=DIR], [enable sqlite3 DBD driver]),
   [
-    apu_have_sqlite3=0
     if test "$withval" = "yes"; then
       AC_CHECK_HEADERS(sqlite3.h, AC_CHECK_LIB(sqlite3, sqlite3_open, [apu_have_sqlite3=1]))
     elif test "$withval" = "no"; then
-      apu_have_sqlite3=0
+      :
     else
-      old_cppflags="$CPPFLAGS"
-      old_ldflags="$LDFLAGS"
-
       sqlite3_CPPFLAGS="-I$withval/include"
       sqlite3_LDFLAGS="-L$withval/lib "
 
@@ -179,15 +201,10 @@ AC_DEFUN([APU_CHECK_DBD_SQLITE3], [
       AC_MSG_NOTICE(checking for sqlite3 in $withval)
       AC_CHECK_HEADERS(sqlite3.h, AC_CHECK_LIB(sqlite3, sqlite3_open, [apu_have_sqlite3=1]))
       if test "$apu_have_sqlite3" != "0"; then
-        APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-        APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
+        APR_ADDTO(APRUTIL_PRIV_INCLUDES, [-I$withval/include])
       fi
-
-      CPPFLAGS="$old_cppflags"
-      LDFLAGS="$old_ldflags"
     fi
   ], [
-    apu_have_sqlite3=0
     AC_CHECK_HEADERS(sqlite3.h, AC_CHECK_LIB(sqlite3, sqlite3_open, [apu_have_sqlite3=1]))
   ])
 
@@ -196,26 +213,29 @@ AC_DEFUN([APU_CHECK_DBD_SQLITE3], [
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_sqlite3" = "1"; then
-    APR_ADDTO(APRUTIL_EXPORT_LIBS,[-lsqlite3])
-    APR_ADDTO(APRUTIL_LIBS,[-lsqlite3])
+    LDADD_dbd_sqlite3="$sqlite3_LDFLAGS -lsqlite3"
   fi
+  AC_SUBST(LDADD_dbd_sqlite3)
+
+  LIBS="$old_libs"
+  CPPFLAGS="$old_cppflags"
+  LDFLAGS="$old_ldflags"
 ])
 dnl
 AC_DEFUN([APU_CHECK_DBD_SQLITE2], [
   apu_have_sqlite2=0
 
-  AC_ARG_WITH([sqlite2],
-    APR_HELP_STRING([--with-sqlite2=DIR], [enable sqlite2 DBD driver]),        
+  old_libs="$LIBS"
+  old_cppflags="$CPPFLAGS"
+  old_ldflags="$LDFLAGS"
+
+  AC_ARG_WITH([sqlite2], APR_HELP_STRING([--with-sqlite2=DIR], [enable sqlite2 DBD driver]),
   [
-    apu_have_sqlite2=0
     if test "$withval" = "yes"; then
       AC_CHECK_HEADERS(sqlite.h, AC_CHECK_LIB(sqlite, sqlite_open, [apu_have_sqlite2=1]))
     elif test "$withval" = "no"; then
-      apu_have_sqlite2=0
+      :
     else
-      old_cppflags="$CPPFLAGS"
-      old_ldflags="$LDFLAGS"
-
       sqlite2_CPPFLAGS="-I$withval/include"
       sqlite2_LDFLAGS="-L$withval/lib "
 
@@ -225,15 +245,10 @@ AC_DEFUN([APU_CHECK_DBD_SQLITE2], [
       AC_MSG_NOTICE(checking for sqlite2 in $withval)
       AC_CHECK_HEADERS(sqlite.h, AC_CHECK_LIB(sqlite, sqlite_open, [apu_have_sqlite2=1]))
       if test "$apu_have_sqlite2" != "0"; then
-        APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-        APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
+        APR_ADDTO(APRUTIL_PRIV_INCLUDES, [-I$withval/include])
       fi
-
-      CPPFLAGS="$old_cppflags"
-      LDFLAGS="$old_ldflags"
     fi
   ], [
-    apu_have_sqlite2=0
     AC_CHECK_HEADERS(sqlite.h, AC_CHECK_LIB(sqlite, sqlite_open, [apu_have_sqlite2=1]))
   ])
 
@@ -242,9 +257,133 @@ AC_DEFUN([APU_CHECK_DBD_SQLITE2], [
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_sqlite2" = "1"; then
-    APR_ADDTO(APRUTIL_EXPORT_LIBS,[-lsqlite])
-    APR_ADDTO(APRUTIL_LIBS,[-lsqlite])
+    LDADD_dbd_sqlite2="$sqlite2_LDFLAGS -lsqlite"
   fi
+  AC_SUBST(LDADD_dbd_sqlite2)
+
+  LIBS="$old_libs"
+  CPPFLAGS="$old_cppflags"
+  LDFLAGS="$old_ldflags"
+])
+dnl
+AC_DEFUN([APU_CHECK_DBD_ORACLE], [
+  apu_have_oracle=0
+
+  old_libs="$LIBS"
+  old_cppflags="$CPPFLAGS"
+  old_ldflags="$LDFLAGS"
+
+  AC_ARG_WITH([oracle-include],
+    APR_HELP_STRING([--with-oracle-include=DIR], [path to Oracle include files]))
+  AC_ARG_WITH([oracle], 
+    APR_HELP_STRING([--with-oracle=DIR], [enable Oracle DBD driver; giving ORACLE_HOME as DIR]),
+  [
+    if test "$withval" = "yes"; then
+      if test -n "$with_oracle_include"; then
+        oracle_CPPFLAGS="$CPPFLAGS -I$with_oracle_include"
+        APR_ADDTO(APRUTIL_PRIV_INCLUDES, [-I$with_oracle_include])
+      fi
+
+      APR_ADDTO(CPPFLAGS, [$oracle_CPPFLAGS])
+
+      AC_CHECK_HEADERS(oci.h, AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1],[
+        unset ac_cv_lib_clntsh_OCIEnvCreate
+        oracle_LIBS="-lnnz10"
+        APR_ADDTO(LIBS, [$oracle_LIBS])
+        AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1])
+      ]))
+    elif test "$withval" = "no"; then
+      :
+    else
+      if test -n "$with_oracle_include"; then
+        oracle_CPPFLAGS="$CPPFLAGS -I$with_oracle_include"
+        APR_ADDTO(APRUTIL_PRIV_INCLUDES, [-I$with_oracle_include])
+      else
+        oracle_CPPFLAGS="-I$withval/rdbms/demo -I$withval/rdbms/public"
+      fi
+      oracle_LDFLAGS="-L$withval/lib "
+
+      APR_ADDTO(CPPFLAGS, [$oracle_CPPFLAGS])
+      APR_ADDTO(LDFLAGS, [$oracle_LDFLAGS])
+
+      AC_MSG_NOTICE(checking for oracle in $withval)
+      AC_CHECK_HEADERS(oci.h, AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1],[
+        unset ac_cv_lib_clntsh_OCIEnvCreate
+        oracle_LIBS="-lnnz10"
+        APR_ADDTO(LIBS, [$oracle_LIBS])
+        AC_CHECK_LIB(clntsh, OCIEnvCreate, [apu_have_oracle=1])
+      ]))
+      if test "$apu_have_oracle" != "0"; then
+        oracle_LDFLAGS="$oracle_LDFLAGS -R$withval/lib"
+        if test -z "$with_oracle_include"; then
+          APR_ADDTO(APRUTIL_PRIV_INCLUDES, [-I$withval/rdbms/demo])
+          APR_ADDTO(APRUTIL_PRIV_INCLUDES, [-I$withval/rdbms/public])
+        fi
+      fi
+    fi
+  ])
+
+  AC_SUBST(apu_have_oracle)
+
+  dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
+  dnl we know the library is there.
+  if test "$apu_have_oracle" = "1"; then
+    LDADD_dbd_oracle="$oracle_LDFLAGS -lclntsh $oracle_LIBS"
+  fi
+  AC_SUBST(LDADD_dbd_oracle)
+
+  LIBS="$old_libs"
+  CPPFLAGS="$old_cppflags"
+  LDFLAGS="$old_ldflags"
+])
+
+dnl
+AC_DEFUN([APU_CHECK_DBD_FREETDS], [
+  apu_have_freetds=0
+
+  old_libs="$LIBS"
+  old_cppflags="$CPPFLAGS"
+  old_ldflags="$LDFLAGS"
+
+  AC_ARG_WITH([freetds], 
+    APR_HELP_STRING([--with-freetds=DIR], [specify FreeTDS location]),
+  [
+    if test "$withval" = "yes"; then
+      AC_CHECK_HEADERS(sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1]))
+    elif test "$withval" = "no"; then
+      :
+    else
+      sybdb_CPPFLAGS="-I$withval/include"
+      sybdb_LDFLAGS="-L$withval/lib "
+
+      APR_ADDTO(CPPFLAGS, [$sybdb_CPPFLAGS])
+      APR_ADDTO(LDFLAGS, [$sybdb_LDFLAGS])
+
+      AC_MSG_NOTICE(checking for freetds in $withval)
+      AC_CHECK_HEADERS(sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1]))
+      if test "$apu_have_freetds" != "0"; then
+        APR_ADDTO(APRUTIL_PRIV_INCLUDES, [-I$withval/include])
+      fi
+    fi
+  ], [
+    AC_CHECK_HEADERS(sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1]))
+  ])
+
+  AC_SUBST(apu_have_freetds)
+
+  dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
+  dnl we know the library is there.
+  if test "$apu_have_freetds" = "1"; then
+    LDADD_dbd_freetds="$sybdb_LDFLAGS -lsybdb"
+    dnl Erm, I needed pcreposix, but I think that dependency has gone
+    dnl from the current code
+    dnl LDADD_dbd_freetds="$LDADD_dbd_freetds -lsybdb -lpcreposix"
+  fi
+  AC_SUBST(LDADD_dbd_freetds)
+
+  LIBS="$old_libs"
+  CPPFLAGS="$old_cppflags"
+  LDFLAGS="$old_ldflags"
 ])
 dnl
 
diff --git a/srclib/apr-util/build/dbm.m4 b/srclib/apr-util/build/dbm.m4
index 85f1cb54..c9d1792d 100644
--- a/srclib/apr-util/build/dbm.m4
+++ b/srclib/apr-util/build/dbm.m4
@@ -232,6 +232,7 @@ AC_DEFUN([APU_TRY_BERKELEY_DB],
     LIBS="$LIBS -l$apu_try_berkeley_db_libname"
     AC_TRY_RUN(
       [
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -569,7 +570,7 @@ AC_DEFUN([APU_CHECK_DB], [
     fi
     ;;
   db45)
-    APU_CHECK_DB44("$check_places")
+    APU_CHECK_DB45("$check_places")
     if test "$apu_db_version" != "4"; then
       AC_MSG_ERROR(Berkeley db4 not found)
     fi
@@ -649,10 +650,9 @@ AC_DEFUN([APU_CHECK_DBM], [
   apu_db_header=db.h                # default so apu_select_dbm.h is syntactically correct
   apu_db_version=0
 
-  AC_ARG_WITH(dbm, [
-    --with-dbm=DBM          choose the DBM type to use.
-      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46}
-  ], [
+  AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46}])],
+  [
     if test "$withval" = "yes"; then
       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
         One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46])
@@ -663,17 +663,18 @@ AC_DEFUN([APU_CHECK_DBM], [
   ])
 
   dnl We don't pull in GDBM unless the user asks for it, since it's GPL
-  AC_ARG_WITH([gdbm], [
-    --with-gdbm=DIR          specify GDBM location
-  ], [
+  AC_ARG_WITH([gdbm], [APR_HELP_STRING([--with-gdbm=DIR], [enable GDBM support])],
+  [
     apu_have_gdbm=0
     if test "$withval" = "yes"; then
       AC_CHECK_HEADER(gdbm.h, AC_CHECK_LIB(gdbm, gdbm_open, [apu_have_gdbm=1]))
     elif test "$withval" = "no"; then
       apu_have_gdbm=0
     else
-      CPPFLAGS="-I$withval/include"
-      LIBS="-L$withval/lib "
+      saved_cppflags="$CPPFLAGS"
+      saved_ldflags="$LDFLAGS"
+      CPPFLAGS="$CPPFLAGS -I$withval/include"
+      LDFLAGS="$LDFLAGS -L$withval/lib "
 
       AC_MSG_CHECKING(checking for gdbm in $withval)
       AC_CHECK_HEADER(gdbm.h, AC_CHECK_LIB(gdbm, gdbm_open, [apu_have_gdbm=1]))
@@ -681,17 +682,18 @@ AC_DEFUN([APU_CHECK_DBM], [
         APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
         APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
       fi
+      CPPFLAGS="$saved_cppflags"
+      LDFLAGS="$saved_ldflags"
     fi
   ])
 
-  AC_ARG_WITH([ndbm], [
-    --with-ndbm=PATH 
-      Find the NDBM header and library in \`PATH/include' and 
-      \`PATH/lib'.  If PATH is of the form \`HEADER:LIB', then search 
+  AC_ARG_WITH([ndbm], [APR_HELP_STRING([--with-ndbm=PATH], [
+      Find the NDBM header and library in `PATH/include' and 
+      `PATH/lib'.  If PATH is of the form `HEADER:LIB', then search 
       for header files in HEADER, and the library in LIB.  If you omit
-      the \`=PATH' part completely, the configure script will search
-      for NDBM in a number of standard places.
-  ], [
+      the `=PATH' part completely, the configure script will search
+      for NDBM in a number of standard places.])],
+  [
     apu_have_ndbm=0
     if test "$withval" = "yes"; then
       AC_MSG_CHECKING(checking for ndbm in the usual places)
@@ -758,14 +760,13 @@ AC_DEFUN([APU_CHECK_DBM], [
   dnl Note that we only do this if the user requested it, since the Sleepycat
   dnl license is viral and requires distribution of source along with programs
   dnl that use it.
-  AC_ARG_WITH([berkeley-db], [
-    --with-berkeley-db=PATH
-      Find the Berkeley DB header and library in \`PATH/include' and
-      \`PATH/lib'.  If PATH is of the form \`HEADER:LIB', then search
+  AC_ARG_WITH([berkeley-db], [APR_HELP_STRING([--with-berkeley-db=PATH],
+      [Find the Berkeley DB header and library in `PATH/include' and
+      `PATH/lib'.  If PATH is of the form `HEADER:LIB', then search
       for header files in HEADER, and the library in LIB.  If you omit
-      the \`=PATH' part completely, the configure script will search
-      for Berkeley DB in a number of standard places.
-  ], [
+      the `=PATH' part completely, the configure script will search
+      for Berkeley DB in a number of standard places.])],
+  [
     if test "$withval" = "yes"; then
       apu_want_db=1
       user_places=""
diff --git a/srclib/apr-util/build/dso.m4 b/srclib/apr-util/build/dso.m4
new file mode 100644
index 00000000..0bbad829
--- /dev/null
+++ b/srclib/apr-util/build/dso.m4
@@ -0,0 +1,74 @@
+dnl -------------------------------------------------------- -*- autoconf -*-
+dnl Licensed to the Apache Software Foundation (ASF) under one or more
+dnl contributor license agreements.  See the NOTICE file distributed with
+dnl this work for additional information regarding copyright ownership.
+dnl The ASF licenses this file to You under the Apache License, Version 2.0
+dnl (the "License"); you may not use this file except in compliance with
+dnl the License.  You may obtain a copy of the License at
+dnl
+dnl     http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
+
+dnl
+dnl DSO module
+dnl
+
+AC_DEFUN([APU_CHECK_UTIL_DSO], [
+
+  AC_ARG_ENABLE([util-dso], 
+     APR_HELP_STRING([--disable-util-dso],
+       [disable DSO build of modular components (dbd, ldap)]))
+
+  if test "$enable_util_dso" = "no"; then
+     # Statically link the DBD drivers:
+
+     objs=
+     test $apu_have_oracle = 1 && objs="$objs dbd/apr_dbd_oracle.lo"
+     test $apu_have_pgsql = 1 && objs="$objs dbd/apr_dbd_pgsql.lo"
+     test $apu_have_mysql = 1 && objs="$objs dbd/apr_dbd_mysql.lo"
+     test $apu_have_sqlite2 = 1 && objs="$objs dbd/apr_dbd_sqlite2.lo"
+     test $apu_have_sqlite3 = 1 && objs="$objs dbd/apr_dbd_sqlite3.lo"
+     test $apu_have_freetds = 1 && objs="$objs dbd/apr_dbd_freetds.lo"
+     test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_init.lo"
+     test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_option.lo"
+     test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_rebind.lo"
+     EXTRA_OBJECTS="$EXTRA_OBJECTS $objs"
+
+     # Use libtool *.la for mysql if available
+     if test $apu_have_mysql = 1; then
+       for flag in $LDADD_dbd_mysql
+       do
+         dir=`echo $flag | grep "^-L" | sed s:-L::`
+         if test "x$dir" != 'x'; then
+           if test -f "$dir/libmysqlclient_r.la"; then
+             LDADD_dbd_mysql=$dir/libmysqlclient_r.la
+             break
+           fi
+         fi
+       done
+     fi
+
+     APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds"
+     APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_ldap"
+     APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds"
+     APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_ldap"
+  else
+     AC_DEFINE([APU_DSO_BUILD], 1, [Define if modular components are built as DSOs])
+     
+     dsos=
+     test $apu_have_oracle = 1 && dsos="$dsos dbd/apr_dbd_oracle.la"
+     test $apu_have_pgsql = 1 && dsos="$dsos dbd/apr_dbd_pgsql.la"
+     test $apu_have_mysql = 1 && dsos="$dsos dbd/apr_dbd_mysql.la"
+     test $apu_have_sqlite2 = 1 && dsos="$dsos dbd/apr_dbd_sqlite2.la"
+     test $apu_have_sqlite3 = 1 && dsos="$dsos dbd/apr_dbd_sqlite3.la"
+     test $apu_have_freetds = 1 && dsos="$dsos dbd/apr_dbd_freetds.la"
+     test $apu_has_ldap = 1 && dsos="$dsos ldap/apr_ldap.la"
+
+     APU_MODULES="$APU_MODULES $dsos"
+  fi
+])
diff --git a/srclib/apr-util/build/find_apr.m4 b/srclib/apr-util/build/find_apr.m4
index 048cb7bf..88f64a7e 100644
--- a/srclib/apr-util/build/find_apr.m4
+++ b/srclib/apr-util/build/find_apr.m4
@@ -22,7 +22,8 @@ dnl library. It provides a standardized mechanism for using APR. It supports
 dnl embedding APR into the application source, or locating an installed
 dnl copy of APR.
 dnl
-dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors)
+dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors,
+dnl              detailed-check)
 dnl
 dnl   where srcdir is the location of the bundled APR source directory, or
 dnl   empty if source is not bundled.
@@ -39,6 +40,14 @@ dnl   If multiple versions are specified, and --with-apr=PREFIX or the
 dnl   implicit installed search are used, then the first (leftmost) version
 dnl   in the list that is found will be used.  Currently defaults to [0 1].
 dnl
+dnl   where detailed-check is an M4 macro which sets the apr_acceptable to
+dnl   either "yes" or "no". The macro will be invoked for each installed
+dnl   copy of APR found, with the apr_config variable set appropriately.
+dnl   Only installed copies of APR which are considered acceptable by
+dnl   this macro will be considered found. If no installed copies are
+dnl   considered acceptable by this macro, apr_found will be set to either
+dnl   either "no" or "reconfig".
+dnl
 dnl Sets the following variables on exit:
 dnl
 dnl   apr_found : "yes", "no", "reconfig"
@@ -89,8 +98,8 @@ AC_DEFUN([APR_FIND_APR], [
 
   AC_MSG_CHECKING(for APR)
   AC_ARG_WITH(apr,
-  [  --with-apr=PATH         prefix for installed APR, path to APR build tree,
-                          or the full path to apr-config],
+  [  --with-apr=PATH         prefix for installed APR or the full path to 
+                             apr-config],
   [
     if test "$withval" = "no" || test "$withval" = "yes"; then
       AC_MSG_ERROR([--with-apr requires a directory or file to be provided])
@@ -101,16 +110,28 @@ AC_DEFUN([APR_FIND_APR], [
       for lookdir in "$withval/bin" "$withval"
       do
         if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then
-          apr_found="yes"
           apr_config="$lookdir/$apr_temp_apr_config_file"
+          ifelse([$5], [], [], [
+          apr_acceptable="yes"
+          $5
+          if test "$apr_acceptable" != "yes"; then
+            AC_MSG_WARN([Found APR in $apr_config, but we think it is considered unacceptable])
+            continue
+          fi])
+          apr_found="yes"
           break 2
         fi
       done
     done
 
     if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
-      apr_found="yes"
       apr_config="$withval"
+      ifelse([$5], [], [apr_found="yes"], [
+          apr_acceptable="yes"
+          $5
+          if test "$apr_acceptable" = "yes"; then
+                apr_found="yes"
+          fi])
     fi
 
     dnl if --with-apr is used, it is a fatal error for its argument
@@ -124,15 +145,29 @@ AC_DEFUN([APR_FIND_APR], [
       for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
       do
         if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then
-          apr_found="yes"
           apr_config="$apr_temp_apr_config_file"
+          ifelse([$5], [], [], [
+          apr_acceptable="yes"
+          $5
+          if test "$apr_acceptable" != "yes"; then
+            AC_MSG_WARN([skipped APR at $apr_config, version not acceptable])
+            continue
+          fi])
+          apr_found="yes"
           break
         else
           dnl look in some standard places
           for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
             if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
-              apr_found="yes"
               apr_config="$lookdir/bin/$apr_temp_apr_config_file"
+              ifelse([$5], [], [], [
+              apr_acceptable="yes"
+              $5
+              if test "$apr_acceptable" != "yes"; then
+                AC_MSG_WARN([skipped APR at $apr_config, version not acceptable])
+                continue
+              fi])
+              apr_found="yes"
               break 2
             fi
           done
diff --git a/srclib/apr-util/build/find_apu.m4 b/srclib/apr-util/build/find_apu.m4
index 4ee01e68..dfa4e0e2 100644
--- a/srclib/apr-util/build/find_apu.m4
+++ b/srclib/apr-util/build/find_apu.m4
@@ -22,7 +22,8 @@ dnl library. It provides a standardized mechanism for using APU. It supports
 dnl embedding APU into the application source, or locating an installed
 dnl copy of APU.
 dnl
-dnl APR_FIND_APU(srcdir, builddir, implicit-install-check, acceptable-majors)
+dnl APR_FIND_APU(srcdir, builddir, implicit-install-check, acceptable-majors,
+dnl              detailed-check)
 dnl
 dnl   where srcdir is the location of the bundled APU source directory, or
 dnl   empty if source is not bundled.
@@ -39,6 +40,14 @@ dnl   If multiple versions are specified, and --with-apr-util=PREFIX or the
 dnl   implicit installed search are used, then the first (leftmost) version
 dnl   in the list that is found will be used.  Currently defaults to [0 1].
 dnl
+dnl   where detailed-check is an M4 macro which sets the apu_acceptable to
+dnl   either "yes" or "no". The macro will be invoked for each installed
+dnl   copy of APU found, with the apu_config variable set appropriately.
+dnl   Only installed copies of APU which are considered acceptable by
+dnl   this macro will be considered found. If no installed copies are
+dnl   considered acceptable by this macro, apu_found will be set to either
+dnl   either "no" or "reconfig".
+dnl
 dnl Sets the following variables on exit:
 dnl
 dnl   apu_found : "yes", "no", "reconfig"
@@ -99,8 +108,8 @@ AC_DEFUN([APR_FIND_APU], [
 
   AC_MSG_CHECKING(for APR-util)
   AC_ARG_WITH(apr-util,
-  [  --with-apr-util=PATH    prefix for installed APU, path to APU build tree,
-                          or the full path to apu-config],
+  [  --with-apr-util=PATH    prefix for installed APU or the full path to 
+                             apu-config],
   [
     if test "$withval" = "no" || test "$withval" = "yes"; then
       AC_MSG_ERROR([--with-apr-util requires a directory or file to be provided])
@@ -111,16 +120,28 @@ AC_DEFUN([APR_FIND_APU], [
       for lookdir in "$withval/bin" "$withval"
       do
         if $TEST_X "$lookdir/$apu_temp_apu_config_file"; then
-          apu_found="yes"
           apu_config="$lookdir/$apu_temp_apu_config_file"
+          ifelse([$5], [], [], [
+          apu_acceptable="yes"
+          $5
+          if test "$apu_acceptable" != "yes"; then
+            AC_MSG_WARN([Found APU in $apu_config, but it is considered unacceptable])
+            continue
+          fi])
+          apu_found="yes"
           break 2
         fi
       done
     done
 
     if test "$apu_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
-      apu_found="yes"
       apu_config="$withval"
+      ifelse([$5], [], [apu_found="yes"], [
+          apu_acceptable="yes"
+          $5
+          if test "$apu_acceptable" = "yes"; then
+                apu_found="yes"
+          fi])
     fi
 
     dnl if --with-apr-util is used, it is a fatal error for its argument
@@ -133,15 +154,29 @@ AC_DEFUN([APR_FIND_APU], [
       for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
       do
         if $apu_temp_apu_config_file --help > /dev/null 2>&1 ; then
+          apu_config="$apu_temp_apu_config_file" 
+          ifelse([$5], [], [], [
+          apu_acceptable="yes"
+          $5
+          if test "$apu_acceptable" != "yes"; then
+            AC_MSG_WARN([skipped APR-util at $apu_config, version not acceptable])
+            continue
+          fi])
           apu_found="yes"
-          apu_config="$apu_temp_apu_config_file"
           break
         else
           dnl look in some standard places (apparently not in builtin/default)
           for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
             if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
-              apu_found="yes"
               apu_config="$lookdir/bin/$apu_temp_apu_config_file"
+              ifelse([$5], [], [], [
+              apu_acceptable="yes"
+              $5
+              if test "$apu_acceptable" != "yes"; then
+                AC_MSG_WARN([skipped APR-util at $apu_config, version not acceptable])
+                continue
+              fi])
+              apu_found="yes"
               break 2
             fi
           done
diff --git a/srclib/apr-util/build/nw_apu_export.inc b/srclib/apr-util/build/nw_apu_export.inc
new file mode 100644
index 00000000..f2105b34
--- /dev/null
+++ b/srclib/apr-util/build/nw_apu_export.inc
@@ -0,0 +1,40 @@
+
+/* Must include apu.h first so that we can undefine
+    the standard prototypes macros after it messes with
+    them. */
+#include "apu.h"
+
+#undef APU_DECLARE
+#undef APU_DECLARE_NONSTD
+#undef APU_DECLARE_DATA
+
+/* Preprocess all of the standard APR headers. */
+#include "apr_anylock.h"
+#include "apr_base64.h"
+#include "apr_buckets.h"
+#include "apr_date.h"
+#include "apr_dbd.h"
+#include "apr_dbm.h"
+#include "apr_hooks.h"
+#include "apr_ldap.h"
+#include "apr_ldap_init.h"
+#include "apr_ldap_option.h"
+#include "apr_ldap_rebind.h"
+#include "apr_ldap_url.h"
+#include "apr_md4.h"
+#include "apr_md5.h"
+#include "apr_memcache.h"
+#include "apr_optional.h"
+#include "apr_optional_hooks.h"
+#include "apr_queue.h"
+#include "apr_reslist.h"
+#include "apr_rmm.h"
+#include "apr_sdbm.h"
+#include "apr_sha1.h"
+#include "apr_strmatch.h"
+#include "apr_uri.h"
+#include "apr_uuid.h"
+#include "apr_xlate.h"
+#include "apr_xml.h"
+#include "apu_version.h"
+#include "apu_want.h"
diff --git a/srclib/apr-util/build/rpm/apr-util.spec.in b/srclib/apr-util/build/rpm/apr-util.spec.in
index b7157682..3b9ef811 100644
--- a/srclib/apr-util/build/rpm/apr-util.spec.in
+++ b/srclib/apr-util/build/rpm/apr-util.spec.in
@@ -45,7 +45,7 @@ make %{?_smp_mflags} && make dox
 %check
 # Run non-interactive tests
 pushd test
-make %{?_smp_mflags} testall CFLAGS=-fno-strict-aliasing
+make %{?_smp_mflags} all CFLAGS=-fno-strict-aliasing
 ./testall -v || exit 1
 popd
 
diff --git a/srclib/apr-util/buildconf b/srclib/apr-util/buildconf
index 3a8467a1..cb4ae46b 100755
--- a/srclib/apr-util/buildconf
+++ b/srclib/apr-util/buildconf
@@ -79,7 +79,7 @@ else
 fi
 
 #
-# Generate build-outputs.mk for the build systme
+# Generate build-outputs.mk for the build system
 #
 echo "Generating 'make' outputs ..."
 $apr_src_dir/build/gen-build.py make
diff --git a/srclib/apr-util/configure b/srclib/apr-util/configure
index 7b1c89cb..0cb32a11 100755
--- a/srclib/apr-util/configure
+++ b/srclib/apr-util/configure
@@ -1,28 +1,32 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60.
+# Generated by GNU Autoconf 2.62.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
 
 
 # PATH needs CR
@@ -33,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -59,8 +91,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -83,7 +113,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -96,17 +126,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -128,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -154,7 +177,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -215,7 +238,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; }
 else
   as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
@@ -233,19 +256,20 @@ IFS=$as_save_IFS
 	 # Try only shells that exist, to save several forks.
 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
 
 :
 _ASEOF
@@ -253,19 +277,20 @@ _ASEOF
   CONFIG_SHELL=$as_shell
 	       as_have_required=yes
 	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
 
 :
 (as_func_return () {
@@ -335,10 +360,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -407,9 +432,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -445,7 +471,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -473,7 +499,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -486,19 +511,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -512,19 +540,28 @@ else
   as_mkdir_p=false
 fi
 
-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -565,36 +602,36 @@ ac_unique_file="export_vars.sh.in"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
-#if HAVE_STDINT_H
+#ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
@@ -657,6 +694,7 @@ abs_srcdir
 abs_builddir
 APRUTIL_DOTTED_VERSION
 APRUTIL_MAJOR_VERSION
+APU_LTVERSION
 CC
 CFLAGS
 LDFLAGS
@@ -667,6 +705,7 @@ OBJEXT
 APR_INCLUDES
 APR_LIBS
 APR_BUILD_DIR
+apr_shlibpath_var
 APR_ICONV_DIR
 CPP
 GREP
@@ -688,8 +727,10 @@ apu_has_ldap_novell
 apu_has_ldap_microsoft
 apu_has_ldap_netscape
 apu_has_ldap_mozilla
+apu_has_ldap_tivoli
 apu_has_ldap_zos
 apu_has_ldap_other
+LDADD_ldap
 apu_use_sdbm
 apu_use_gdbm
 apu_use_ndbm
@@ -700,17 +741,30 @@ apu_have_ndbm
 apu_have_db
 apu_db_header
 apu_db_version
+PGSQL_CONFIG
 apu_have_pgsql
+LDADD_dbd_pgsql
 MYSQL_CONFIG
 apu_have_mysql
+LDADD_dbd_mysql
 apu_have_sqlite3
+LDADD_dbd_sqlite3
 apu_have_sqlite2
+LDADD_dbd_sqlite2
+apu_have_oracle
+LDADD_dbd_oracle
+apu_have_freetds
+LDADD_dbd_freetds
 APR_XML_DIR
 have_iconv
 have_apr_iconv
 so_ext
 lib_target
 APRUTIL_LIBNAME
+APU_HAVE_MODULES
+APU_DSO_LIBDIR
+APU_MODULES
+EXTRA_OBJECTS
 APRUTIL_EXPORT_LIBS
 APRUTIL_PRIV_INCLUDES
 APRUTIL_INCLUDES
@@ -721,12 +775,36 @@ INCLUDE_OUTPUTS
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_layout
+with_apr
+with_apr_iconv
+with_ldap_include
+with_ldap_lib
+with_ldap
+with_dbm
+with_gdbm
+with_ndbm
+with_berkeley_db
+with_pgsql
+with_mysql
+with_sqlite3
+with_sqlite2
+with_oracle_include
+with_oracle
+with_freetds
+with_expat
+with_iconv
+enable_util_dso
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
 CC
 CFLAGS
 LDFLAGS
+LIBS
 CPPFLAGS
 CPP'
 
@@ -734,6 +812,8 @@ CPP'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -832,13 +912,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -851,13 +939,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1048,22 +1144,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1083,7 +1195,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1092,16 +1204,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1110,22 +1222,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1140,7 +1268,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1156,10 +1284,10 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1167,12 +1295,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1199,12 +1327,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1253,9 +1381,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1265,25 +1393,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1300,45 +1428,45 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-layout=LAYOUT
+  --disable-util-dso      disable DSO build of modular components (dbd, ldap)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-apr=PATH         prefix for installed APR, path to APR build tree,
-                          or the full path to apr-config
+  --with-apr=PATH         prefix for installed APR or the full path to
+                             apr-config
+  --with-apr-iconv=DIR    relative path to apr-iconv source
   --with-ldap-include=path  path to ldap include files with trailing slash
   --with-ldap-lib=path    path to ldap lib file
   --with-ldap=library     ldap library to use
-
-    --with-dbm=DBM          choose the DBM type to use.
-      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46}
-
-
-    --with-gdbm=DIR          specify GDBM location
-
-
-    --with-ndbm=PATH
-      Find the NDBM header and library in \`PATH/include' and
-      \`PATH/lib'.  If PATH is of the form \`HEADER:LIB', then search
-      for header files in HEADER, and the library in LIB.  If you omit
-      the \`=PATH' part completely, the configure script will search
-      for NDBM in a number of standard places.
-
-
-    --with-berkeley-db=PATH
-      Find the Berkeley DB header and library in \`PATH/include' and
-      \`PATH/lib'.  If PATH is of the form \`HEADER:LIB', then search
-      for header files in HEADER, and the library in LIB.  If you omit
-      the \`=PATH' part completely, the configure script will search
-      for Berkeley DB in a number of standard places.
-
+  --with-dbm=DBM          choose the DBM type to use.
+                          DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46}
+  --with-gdbm=DIR         enable GDBM support
+  --with-ndbm=PATH        Find the NDBM header and library in `PATH/include'
+                          and `PATH/lib'. If PATH is of the form `HEADER:LIB',
+                          then search for header files in HEADER, and the
+                          library in LIB. If you omit the `=PATH' part
+                          completely, the configure script will search for
+                          NDBM in a number of standard places.
+  --with-berkeley-db=PATH Find the Berkeley DB header and library in
+                          `PATH/include' and `PATH/lib'. If PATH is of the
+                          form `HEADER:LIB', then search for header files in
+                          HEADER, and the library in LIB. If you omit the
+                          `=PATH' part completely, the configure script will
+                          search for Berkeley DB in a number of standard
+                          places.
   --with-pgsql=DIR        specify PostgreSQL location
-  --with-mysql=DIR        specify MySQL location (disabled by default)
+  --with-mysql=DIR        enable MySQL DBD driver
   --with-sqlite3=DIR      enable sqlite3 DBD driver
   --with-sqlite2=DIR      enable sqlite2 DBD driver
+  --with-oracle-include=DIR
+                          path to Oracle include files
+  --with-oracle=DIR       enable Oracle DBD driver; giving ORACLE_HOME as DIR
+  --with-freetds=DIR      specify FreeTDS location
   --with-expat=DIR        specify Expat location, or 'builtin'
   --with-iconv=DIR        path to iconv installation
 
@@ -1347,6 +1475,7 @@ Some influential environment variables:
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
@@ -1361,15 +1490,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1405,7 +1536,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1415,10 +1546,10 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1429,7 +1560,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
 
@@ -1465,7 +1596,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1500,7 +1631,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1552,11 +1683,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1586,9 +1718,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1603,9 +1735,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1621,8 +1753,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1664,21 +1796,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1688,16 +1823,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1711,29 +1846,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1743,10 +1887,10 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1793,8 +1937,8 @@ for ac_dir in build "$srcdir"/build; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in build \"$srcdir\"/build" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in build \"$srcdir\"/build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in build \"$srcdir\"/build" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in build \"$srcdir\"/build" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1976,6 +2120,12 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
+
+
+
+
+
+
   rm -f config.nice
   cat >config.nice<<EOF
 #! /bin/sh
@@ -2054,34 +2204,34 @@ fi
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
 if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -2098,27 +2248,27 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
 if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -2135,27 +2285,27 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
 if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$target_alias" = x; then
   ac_cv_target=$ac_cv_host
 else
   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-echo "$as_me: error: invalid value of canonical target" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
+$as_echo "$as_me: error: invalid value of canonical target" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 target=$ac_cv_target
@@ -2192,11 +2342,12 @@ test -n "$target_alias" &&
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -2215,7 +2366,7 @@ case $as_dir/ in
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2225,17 +2376,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -2248,8 +2411,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -2276,10 +2439,10 @@ top_builddir="$abs_builddir"
 
 
 
-  { echo "$as_me:$LINENO: checking for working mkdir -p" >&5
-echo $ECHO_N "checking for working mkdir -p... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for working mkdir -p" >&5
+$as_echo_n "checking for working mkdir -p... " >&6; }
 if test "${ac_cv_mkdir_p+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     test -d conftestdir && rm -rf conftestdir
@@ -2292,8 +2455,8 @@ else
     rm -rf conftestdir
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_mkdir_p" >&5
-echo "${ECHO_T}$ac_cv_mkdir_p" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_mkdir_p" >&5
+$as_echo "$ac_cv_mkdir_p" >&6; }
   if test "$ac_cv_mkdir_p" = "yes"; then
       mkdir_p="mkdir -p"
   else
@@ -2306,6 +2469,9 @@ version_hdr="$abs_srcdir/include/apu_version.h"
 APRUTIL_MAJOR_VERSION="`$get_version major $version_hdr APU`"
 APRUTIL_DOTTED_VERSION="`$get_version all $version_hdr APU`"
 
+APU_LTVERSION="-version-info `$get_version libtool $version_hdr APU`"
+
+
 
 
 
@@ -2383,10 +2549,10 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for chosen layout" >&5
-echo $ECHO_N "checking for chosen layout... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $layout_name" >&5
-echo "${ECHO_T}$layout_name" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for chosen layout" >&5
+$as_echo_n "checking for chosen layout... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $layout_name" >&5
+$as_echo "$layout_name" >&6; }
 
 
 ac_prev=
@@ -2503,8 +2669,8 @@ do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { { echo "$as_me:$LINENO: error: expected an absolute path for --$ac_var: $ac_val" >&5
-echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2;}
+    *)  { { $as_echo "$as_me:$LINENO: error: expected an absolute path for --$ac_var: $ac_val" >&5
+$as_echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -2519,10 +2685,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2533,9 +2699,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2546,11 +2712,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2559,10 +2725,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2573,9 +2739,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2586,11 +2752,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2598,10 +2764,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -2616,10 +2782,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2630,9 +2796,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2643,11 +2809,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2656,10 +2822,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2671,13 +2837,13 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2700,11 +2866,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2715,10 +2881,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2729,9 +2895,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2742,11 +2908,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2759,10 +2925,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2773,9 +2939,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2786,11 +2952,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2802,10 +2968,10 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -2817,44 +2983,48 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2873,27 +3043,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -2904,21 +3069,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
-for ac_file in $ac_files
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2942,24 +3108,28 @@ done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
 else
-  echo "$as_me: failed program was:" >&5
+  ac_file=''
+fi
+
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2968,49 +3138,51 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -3019,31 +3191,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3066,40 +3238,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3125,37 +3298,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -3165,15 +3322,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -3200,37 +3361,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -3255,37 +3400,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -3311,37 +3440,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3356,8 +3469,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3373,10 +3486,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -3447,37 +3560,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3493,15 +3590,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -3564,10 +3661,10 @@ if test "x$apu_preload_done" != "xyes" ; then
     apu_crypt_threadsafe="1"
   fi
 
-        { echo "$as_me:$LINENO: checking for library containing fdatasync" >&5
-echo $ECHO_N "checking for library containing fdatasync... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for library containing fdatasync" >&5
+$as_echo_n "checking for library containing fdatasync... " >&6; }
 if test "${ac_cv_search_fdatasync+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -3605,43 +3702,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_fdatasync=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_fdatasync+set}" = set; then
   break
@@ -3655,8 +3740,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_fdatasync" >&5
-echo "${ECHO_T}$ac_cv_search_fdatasync" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_fdatasync" >&5
+$as_echo "$ac_cv_search_fdatasync" >&6; }
 ac_res=$ac_cv_search_fdatasync
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -3711,15 +3796,15 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for APR" >&5
-echo $ECHO_N "checking for APR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for APR" >&5
+$as_echo_n "checking for APR... " >&6; }
 
 # Check whether --with-apr was given.
 if test "${with_apr+set}" = set; then
   withval=$with_apr;
     if test "$withval" = "no" || test "$withval" = "yes"; then
-      { { echo "$as_me:$LINENO: error: --with-apr requires a directory or file to be provided" >&5
-echo "$as_me: error: --with-apr requires a directory or file to be provided" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: --with-apr requires a directory or file to be provided" >&5
+$as_echo "$as_me: error: --with-apr requires a directory or file to be provided" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
@@ -3728,21 +3813,22 @@ echo "$as_me: error: --with-apr requires a directory or file to be provided" >&2
       for lookdir in "$withval/bin" "$withval"
       do
         if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then
-          apr_found="yes"
           apr_config="$lookdir/$apr_temp_apr_config_file"
+
+          apr_found="yes"
           break 2
         fi
       done
     done
 
     if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
-      apr_found="yes"
       apr_config="$withval"
+      apr_found="yes"
     fi
 
             if test "$apr_found" != "yes"; then
-      { { echo "$as_me:$LINENO: error: the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." >&5
-echo "$as_me: error: the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." >&2;}
+      { { $as_echo "$as_me:$LINENO: error: the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." >&5
+$as_echo "$as_me: error: the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." >&2;}
    { (exit 1); exit 1; }; }
     fi
 
@@ -3752,14 +3838,16 @@ else
       for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
       do
         if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then
-          apr_found="yes"
           apr_config="$apr_temp_apr_config_file"
+
+          apr_found="yes"
           break
         else
                     for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
             if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
-              apr_found="yes"
               apr_config="$lookdir/bin/$apr_temp_apr_config_file"
+
+              apr_found="yes"
               break 2
             fi
           done
@@ -3772,8 +3860,8 @@ else
       apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"/include/apr_version.h\"`"
       case $apr_bundled_major in
         "")
-          { { echo "$as_me:$LINENO: error: failed to find major version of bundled APR" >&5
-echo "$as_me: error: failed to find major version of bundled APR" >&2;}
+          { { $as_echo "$as_me:$LINENO: error: failed to find major version of bundled APR" >&5
+$as_echo "$as_me: error: failed to find major version of bundled APR" >&2;}
    { (exit 1); exit 1; }; }
         ;;
         0)
@@ -3793,12 +3881,12 @@ echo "$as_me: error: failed to find major version of bundled APR" >&2;}
 fi
 
 
-  { echo "$as_me:$LINENO: result: $apr_found" >&5
-echo "${ECHO_T}$apr_found" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $apr_found" >&5
+$as_echo "$apr_found" >&6; }
 
   if test "$apr_found" = "no"; then
-    { { echo "$as_me:$LINENO: error: APR could not be located. Please use the --with-apr option." >&5
-echo "$as_me: error: APR could not be located. Please use the --with-apr option." >&2;}
+    { { $as_echo "$as_me:$LINENO: error: APR could not be located. Please use the --with-apr option." >&5
+$as_echo "$as_me: error: APR could not be located. Please use the --with-apr option." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
@@ -3870,8 +3958,15 @@ echo "$as_me: error: APR could not be located. Please use the --with-apr option.
     done
   fi
 
+apr_shlibpath_var=`$apr_config --shlib-path-var`
+
 
-if test -d ../apr-iconv; then
+
+# Check whether --with-apr-iconv was given.
+if test "${with_apr_iconv+set}" = set; then
+  withval=$with_apr_iconv;  apu_apriconv_dir="$withval"
+    if test "$apu_apriconv_dir" != "no"; then
+      if test -d "$apu_apriconv_dir"; then
 
   # save our work to this point; this allows the sub-package to use it
   cat >confcache <<\_ACEOF
@@ -3901,11 +3996,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -3938,22 +4034,22 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
 
-  echo "configuring package in ../apr-iconv now"
+  echo "configuring package in "$apu_apriconv_dir" now"
   ac_popdir=`pwd`
-  apr_config_subdirs="../apr-iconv"
-  test -d ../apr-iconv || $mkdir_p ../apr-iconv
-  ac_abs_srcdir=`(cd $srcdir/../apr-iconv && pwd)`
-  cd ../apr-iconv
+  apr_config_subdirs=""$apu_apriconv_dir""
+  test -d "$apu_apriconv_dir" || $mkdir_p "$apu_apriconv_dir"
+  ac_abs_srcdir=`(cd $srcdir/"$apu_apriconv_dir" && pwd)`
+  cd "$apu_apriconv_dir"
 
       # A "../" for each directory in /$config_subdirs.
       ac_dots=`echo $apr_config_subdirs|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
@@ -3985,11 +4081,18 @@ rm -f confcache
   # autoconf doesn't add --silent to ac_configure_args; explicitly pass it
   test "x$silent" = "xyes" && apr_configure_args="$apr_configure_args --silent"
 
-              if eval $SHELL $ac_abs_srcdir/configure $apr_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir
+              if eval $SHELL $ac_abs_srcdir/configure $apr_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_abs_srcdir $apache_apr_flags \
+                             --prefix=$prefix \
+                             --exec-prefix=$exec_prefix \
+                             --libdir=$libdir \
+                             --includedir=$includedir \
+                             --bindir=$bindir \
+                             --datadir=$datadir \
+                             --with-installbuilddir=$installbuilddir
   then :
-    echo "../apr-iconv configured properly"
+    echo ""$apu_apriconv_dir" configured properly"
   else
-    echo "configure failed for ../apr-iconv"
+    echo "configure failed for "$apu_apriconv_dir""
     exit 1
   fi
 
@@ -4000,42 +4103,50 @@ rm -f confcache
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
 
-  APRUTIL_EXPORT_LIBS="$abs_srcdir/../apr-iconv/lib/libapriconv.la $APRUTIL_EXPORT_LIBS"
-  APRUTIL_INCLUDES="-I$abs_srcdir/../apr-iconv/include $APRUTIL_INCLUDES"
-  APR_ICONV_DIR=../apr-iconv
-else
-  APR_ICONV_DIR=""
+        APRUTIL_EXPORT_LIBS="$abs_srcdir/$apu_apriconv_dir/lib/libapriconv.la \
+                             $APRUTIL_EXPORT_LIBS"
+        APRUTIL_INCLUDES="-I$abs_srcdir/apu_apriconv_dir/include \
+                          $APRUTIL_INCLUDES"
+        APR_ICONV_DIR="$apu_apriconv_dir"
+      else
+       APR_ICONV_DIR=""
+      fi
+    else
+      APR_ICONV_DIR=""
+    fi
+
 fi
 
 
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -4067,27 +4178,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4111,28 +4216,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4157,8 +4256,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -4186,27 +4285,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4230,28 +4323,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4267,9 +4354,9 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -4281,42 +4368,37 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4331,74 +4413,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4413,40 +4481,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4473,37 +4532,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -4595,37 +4638,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -4647,11 +4693,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4669,37 +4715,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -4707,12 +4737,14 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4738,8 +4770,10 @@ apu_has_ldap_novell="0"
 apu_has_ldap_microsoft="0"
 apu_has_ldap_netscape="0"
 apu_has_ldap_mozilla="0"
+apu_has_ldap_tivoli="0"
 apu_has_ldap_zos="0"
 apu_has_ldap_other="0"
+LDADD_ldap=""
 
 
 # Check whether --with-ldap-include was given.
@@ -4817,11 +4851,11 @@ if test "${with_ldap+set}" = set; then
     extralib="-lnspr4 -lplc4 -lplds4 -liutil50 -llber50 -lldif50 -lnss3 -lprldap50 -lssl3 -lssldap50"
     unset ac_cv_lib_${ldaplib}_ldap_init
     unset ac_cv_lib_${ldaplib}___ldap_init
-    as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_init in -l${ldaplib}... $ECHO_C" >&6; }
+    as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -4853,98 +4887,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_EXPORT_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
-
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_init in -l${ldaplib}... $ECHO_C" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
+
+        LDADD_ldap="-l${ldaplib} ${extralib}"
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -4976,58 +4959,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_deinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_deinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -5059,58 +5032,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_deinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_add_trusted_cert in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_add_trusted_cert in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -5142,58 +5105,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_add_trusted_cert="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_start_tls_s in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_start_tls_s in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -5225,58 +5178,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_start_tls_s="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_sslinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_sslinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -5308,58 +5251,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_sslinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_init in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -5391,58 +5324,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_install_routines in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_install_routines in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -5474,50 +5397,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_install_routines="1"
 fi
 
@@ -5533,11 +5446,11 @@ fi
     extralib="-lnspr3 -lplc3 -lplds3"
     unset ac_cv_lib_${ldaplib}_ldap_init
     unset ac_cv_lib_${ldaplib}___ldap_init
-    as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_init in -l${ldaplib}... $ECHO_C" >&6; }
+    as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -5569,98 +5482,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_EXPORT_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
-
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_init in -l${ldaplib}... $ECHO_C" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
+
+        LDADD_ldap="-l${ldaplib} ${extralib}"
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -5692,58 +5554,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_deinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_deinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -5775,58 +5627,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_deinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_add_trusted_cert in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_add_trusted_cert in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -5858,58 +5700,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_add_trusted_cert="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_start_tls_s in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_start_tls_s in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -5941,58 +5773,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_start_tls_s="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_sslinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_sslinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -6024,58 +5846,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_sslinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_init in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -6107,58 +5919,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_install_routines in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_install_routines in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -6190,50 +5992,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_install_routines="1"
 fi
 
@@ -6249,11 +6041,11 @@ fi
     extralib=
     unset ac_cv_lib_${ldaplib}_ldap_init
     unset ac_cv_lib_${ldaplib}___ldap_init
-    as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_init in -l${ldaplib}... $ECHO_C" >&6; }
+    as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -6285,98 +6077,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_EXPORT_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
-
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_init in -l${ldaplib}... $ECHO_C" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
+
+        LDADD_ldap="-l${ldaplib} ${extralib}"
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -6408,58 +6149,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_deinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_deinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -6491,58 +6222,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_deinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_add_trusted_cert in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_add_trusted_cert in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -6574,58 +6295,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_add_trusted_cert="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_start_tls_s in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_start_tls_s in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -6657,58 +6368,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_start_tls_s="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_sslinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_sslinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -6740,58 +6441,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_sslinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_init in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -6823,58 +6514,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_install_routines in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_install_routines in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -6906,50 +6587,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_install_routines="1"
 fi
 
@@ -6965,11 +6636,11 @@ fi
     extralib=
     unset ac_cv_lib_${ldaplib}_ldap_init
     unset ac_cv_lib_${ldaplib}___ldap_init
-    as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_init in -l${ldaplib}... $ECHO_C" >&6; }
+    as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -7001,98 +6672,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_EXPORT_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
-
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_init in -l${ldaplib}... $ECHO_C" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
+
+        LDADD_ldap="-l${ldaplib} ${extralib}"
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -7124,58 +6744,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_deinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_deinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -7207,58 +6817,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_deinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_add_trusted_cert in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_add_trusted_cert in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -7290,58 +6890,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_add_trusted_cert="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_start_tls_s in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_start_tls_s in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -7373,58 +6963,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_start_tls_s="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_sslinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_sslinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -7456,58 +7036,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_sslinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_init in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -7539,58 +7109,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_install_routines in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_install_routines in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -7622,50 +7182,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_install_routines="1"
 fi
 
@@ -7681,11 +7231,11 @@ fi
     extralib=
     unset ac_cv_lib_${ldaplib}_ldap_init
     unset ac_cv_lib_${ldaplib}___ldap_init
-    as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_init in -l${ldaplib}... $ECHO_C" >&6; }
+    as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -7717,98 +7267,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_EXPORT_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
-
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_init in -l${ldaplib}... $ECHO_C" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
+
+        LDADD_ldap="-l${ldaplib} ${extralib}"
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -7840,58 +7339,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_deinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_deinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -7923,58 +7412,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_deinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_add_trusted_cert in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_add_trusted_cert in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -8006,58 +7485,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_add_trusted_cert="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_start_tls_s in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_start_tls_s in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -8089,58 +7558,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_start_tls_s="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_sslinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_sslinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -8172,58 +7631,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_sslinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_init in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -8255,58 +7704,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_install_routines in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_install_routines in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -8338,50 +7777,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_install_routines="1"
 fi
 
@@ -8397,11 +7826,11 @@ fi
     extralib="-lldapx -lldapssl -lldapgss -lgssapi_krb5"
     unset ac_cv_lib_${ldaplib}_ldap_init
     unset ac_cv_lib_${ldaplib}___ldap_init
-    as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_init in -l${ldaplib}... $ECHO_C" >&6; }
+    as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -8433,98 +7862,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_EXPORT_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
-
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_init in -l${ldaplib}... $ECHO_C" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
+
+        LDADD_ldap="-l${ldaplib} ${extralib}"
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -8556,58 +7934,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_deinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_deinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -8639,58 +8007,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_deinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_add_trusted_cert in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_add_trusted_cert in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -8722,58 +8080,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_add_trusted_cert="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_start_tls_s in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_start_tls_s in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -8805,58 +8153,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_start_tls_s="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_sslinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_sslinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -8888,58 +8226,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_sslinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_init in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -8971,58 +8299,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_install_routines in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_install_routines in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -9054,50 +8372,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_install_routines="1"
 fi
 
@@ -9113,11 +8421,11 @@ fi
     extralib="-lldapx -lldapssl -lldapgss -lgss -lresolv -lsocket"
     unset ac_cv_lib_${ldaplib}_ldap_init
     unset ac_cv_lib_${ldaplib}___ldap_init
-    as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_init in -l${ldaplib}... $ECHO_C" >&6; }
+    as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -9149,98 +8457,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_EXPORT_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
-
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_init in -l${ldaplib}... $ECHO_C" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
+
+        LDADD_ldap="-l${ldaplib} ${extralib}"
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -9272,58 +8529,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_deinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_deinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -9355,58 +8602,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_deinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_add_trusted_cert in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_add_trusted_cert in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -9438,58 +8675,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_add_trusted_cert="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_start_tls_s in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_start_tls_s in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -9521,58 +8748,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_start_tls_s="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_sslinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_sslinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -9604,58 +8821,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_sslinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_init in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -9687,58 +8894,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_install_routines in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_install_routines in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -9770,50 +8967,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_install_routines="1"
 fi
 
@@ -9829,11 +9016,11 @@ fi
     extralib="-llber"
     unset ac_cv_lib_${ldaplib}_ldap_init
     unset ac_cv_lib_${ldaplib}___ldap_init
-    as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_init in -l${ldaplib}... $ECHO_C" >&6; }
+    as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -9865,98 +9052,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_EXPORT_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
-
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_init in -l${ldaplib}... $ECHO_C" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
+
+        LDADD_ldap="-l${ldaplib} ${extralib}"
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -9988,58 +9124,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_deinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_deinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -10071,58 +9197,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_deinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_add_trusted_cert in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_add_trusted_cert in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -10154,58 +9270,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_add_trusted_cert="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_start_tls_s in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_start_tls_s in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -10237,58 +9343,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_start_tls_s="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_sslinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_sslinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -10320,58 +9416,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_sslinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_init in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -10403,58 +9489,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_install_routines in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_install_routines in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -10486,50 +9562,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_install_routines="1"
 fi
 
@@ -10545,11 +9611,11 @@ fi
     extralib="-llber -lresolv"
     unset ac_cv_lib_${ldaplib}_ldap_init
     unset ac_cv_lib_${ldaplib}___ldap_init
-    as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_init in -l${ldaplib}... $ECHO_C" >&6; }
+    as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -10581,98 +9647,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_EXPORT_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
-
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_init in -l${ldaplib}... $ECHO_C" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
+
+        LDADD_ldap="-l${ldaplib} ${extralib}"
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -10704,58 +9719,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_deinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_deinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -10787,58 +9792,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_deinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_add_trusted_cert in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_add_trusted_cert in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -10870,58 +9865,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_add_trusted_cert="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_start_tls_s in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_start_tls_s in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -10953,58 +9938,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_start_tls_s="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_sslinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_sslinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -11036,58 +10011,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_sslinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_init in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -11119,58 +10084,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_install_routines in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_install_routines in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -11202,50 +10157,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_install_routines="1"
 fi
 
@@ -11261,11 +10206,11 @@ fi
     extralib="-llber -lresolv -lsocket -lnsl"
     unset ac_cv_lib_${ldaplib}_ldap_init
     unset ac_cv_lib_${ldaplib}___ldap_init
-    as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_init in -l${ldaplib}... $ECHO_C" >&6; }
+    as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -11297,98 +10242,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_EXPORT_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
-
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_init in -l${ldaplib}... $ECHO_C" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
+
+        LDADD_ldap="-l${ldaplib} ${extralib}"
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -11420,58 +10314,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_deinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_deinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -11503,58 +10387,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_deinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_add_trusted_cert in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_add_trusted_cert in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -11586,58 +10460,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_add_trusted_cert="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_start_tls_s in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_start_tls_s in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -11669,58 +10533,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_start_tls_s="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_sslinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_sslinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -11752,58 +10606,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_sslinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_init in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -11835,58 +10679,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_install_routines in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_install_routines in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -11918,50 +10752,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_install_routines="1"
 fi
 
@@ -11977,11 +10801,11 @@ fi
     extralib="-ldl -lpthread"
     unset ac_cv_lib_${ldaplib}_ldap_init
     unset ac_cv_lib_${ldaplib}___ldap_init
-    as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_init in -l${ldaplib}... $ECHO_C" >&6; }
+    as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -12013,98 +10837,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_EXPORT_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
-
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_init in -l${ldaplib}... $ECHO_C" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
+
+        LDADD_ldap="-l${ldaplib} ${extralib}"
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -12136,58 +10909,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_deinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_deinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -12219,58 +10982,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_deinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_add_trusted_cert in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_add_trusted_cert in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -12302,58 +11055,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_add_trusted_cert="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_start_tls_s in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_start_tls_s in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -12385,58 +11128,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_start_tls_s="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_sslinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_sslinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -12468,58 +11201,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_sslinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_init in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -12551,58 +11274,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_install_routines in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_install_routines in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -12634,50 +11347,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_install_routines="1"
 fi
 
@@ -12694,11 +11397,11 @@ fi
     extralib=
     unset ac_cv_lib_${ldaplib}_ldap_init
     unset ac_cv_lib_${ldaplib}___ldap_init
-    as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_init in -l${ldaplib}... $ECHO_C" >&6; }
+    as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -12730,98 +11433,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_EXPORT_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
-
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_init in -l${ldaplib}... $ECHO_C" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
+
+        LDADD_ldap="-l${ldaplib} ${extralib}"
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -12853,58 +11505,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_deinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_deinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -12936,58 +11578,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_deinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_add_trusted_cert in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_add_trusted_cert in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -13019,58 +11651,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_add_trusted_cert="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_start_tls_s in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_start_tls_s in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -13102,58 +11724,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_start_tls_s="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_sslinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_sslinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -13185,58 +11797,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_sslinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_init in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -13268,58 +11870,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_install_routines in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_install_routines in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -13351,50 +11943,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_install_routines="1"
 fi
 
@@ -13410,11 +11992,11 @@ fi
     extralib="-lresolv"
     unset ac_cv_lib_${ldaplib}_ldap_init
     unset ac_cv_lib_${ldaplib}___ldap_init
-    as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_init in -l${ldaplib}... $ECHO_C" >&6; }
+    as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -13446,98 +12028,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_EXPORT_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
-
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_init in -l${ldaplib}... $ECHO_C" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
+
+        LDADD_ldap="-l${ldaplib} ${extralib}"
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -13569,58 +12100,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_deinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_deinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -13652,58 +12173,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_deinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_add_trusted_cert in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_add_trusted_cert in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -13735,58 +12246,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_add_trusted_cert="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_start_tls_s in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_start_tls_s in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -13818,58 +12319,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_start_tls_s="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_sslinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_sslinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -13901,58 +12392,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_sslinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_init in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -13984,58 +12465,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_install_routines in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_install_routines in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -14067,50 +12538,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_install_routines="1"
 fi
 
@@ -14126,11 +12587,11 @@ fi
     extralib="-lresolv -lsocket -lnsl"
     unset ac_cv_lib_${ldaplib}_ldap_init
     unset ac_cv_lib_${ldaplib}___ldap_init
-    as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_init in -l${ldaplib}... $ECHO_C" >&6; }
+    as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -14162,98 +12623,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_EXPORT_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
-
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_init in -l${ldaplib}... $ECHO_C" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
+
+        LDADD_ldap="-l${ldaplib} ${extralib}"
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -14285,58 +12695,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_deinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_deinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -14368,58 +12768,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_deinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_add_trusted_cert in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_add_trusted_cert in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -14451,58 +12841,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_add_trusted_cert="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_start_tls_s in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_start_tls_s in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -14534,58 +12914,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_start_tls_s="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_sslinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_sslinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -14617,58 +12987,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_sslinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_init in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -14700,58 +13060,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_install_routines in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_install_routines in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -14783,50 +13133,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_install_routines="1"
 fi
 
@@ -14842,11 +13182,11 @@ fi
     extralib="-ldl -lpthread"
     unset ac_cv_lib_${ldaplib}_ldap_init
     unset ac_cv_lib_${ldaplib}___ldap_init
-    as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_init in -l${ldaplib}... $ECHO_C" >&6; }
+    as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -14878,98 +13218,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_EXPORT_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-l${ldaplib} ${extralib}\""
-    APRUTIL_LIBS="-l${ldaplib} ${extralib}"
-  else
-    apr_addto_bugger="-l${ldaplib} ${extralib}"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
-
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_init in -l${ldaplib}... $ECHO_C" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
+
+        LDADD_ldap="-l${ldaplib} ${extralib}"
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -15001,58 +13290,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_client_deinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_client_deinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_client_deinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_client_deinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -15084,58 +13363,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_client_deinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_add_trusted_cert in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_add_trusted_cert" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_add_trusted_cert in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_add_trusted_cert in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -15167,58 +13436,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_add_trusted_cert="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_start_tls_s in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_start_tls_s" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_start_tls_s in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -15250,58 +13509,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_start_tls_s="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldap_sslinit in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldap_sslinit" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldap_sslinit in -l${ldaplib}" >&5
+$as_echo_n "checking for ldap_sslinit in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -15333,58 +13582,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldap_sslinit="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_init in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_init" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_init in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_init in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -15416,58 +13655,48 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_init="1"
 fi
 
-        as_ac_Lib=`echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
-echo $ECHO_N "checking for ldapssl_install_routines in -l${ldaplib}... $ECHO_C" >&6; }
+        as_ac_Lib=`$as_echo "ac_cv_lib_${ldaplib}''_ldapssl_install_routines" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for ldapssl_install_routines in -l${ldaplib}" >&5
+$as_echo_n "checking for ldapssl_install_routines in -l${ldaplib}... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l${ldaplib} ${extralib} $LIBS"
@@ -15499,50 +13728,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   apu_has_ldapssl_install_routines="1"
 fi
 
@@ -15554,14 +13773,14 @@ fi
 
     fi
 
-    test ${apu_has_ldap} != "1" && { { echo "$as_me:$LINENO: error: could not find an LDAP library" >&5
-echo "$as_me: error: could not find an LDAP library" >&2;}
+    test ${apu_has_ldap} != "1" && { { $as_echo "$as_me:$LINENO: error: could not find an LDAP library" >&5
+$as_echo "$as_me: error: could not find an LDAP library" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking for ber_init in -llber" >&5
-echo $ECHO_N "checking for ber_init in -llber... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ber_init in -llber" >&5
+$as_echo_n "checking for ber_init in -llber... " >&6; }
 if test "${ac_cv_lib_lber_ber_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-llber  $LIBS"
@@ -15593,48 +13812,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_lber_ber_init=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_lber_ber_init=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_lber_ber_init" >&5
-echo "${ECHO_T}$ac_cv_lib_lber_ber_init" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lber_ber_init" >&5
+$as_echo "$ac_cv_lib_lber_ber_init" >&6; }
 if test $ac_cv_lib_lber_ber_init = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLBER 1
@@ -15648,20 +13855,21 @@ fi
 
 for ac_header in lber.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -15677,49 +13885,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -15733,76 +13925,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  lber_h="#include <lber.h>"
 fi
@@ -15813,10 +14001,10 @@ done
     # Solaris has a problem in <ldap.h> which prevents it from
     # being included by itself.  Check for <ldap.h> manually,
     # including lber.h first.
-    { echo "$as_me:$LINENO: checking for ldap.h" >&5
-echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for ldap.h" >&5
+$as_echo_n "checking for ldap.h... " >&6; }
 if test "${apr_cv_hdr_ldap_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -15835,27 +14023,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   apr_cv_hdr_ldap_h=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   apr_cv_hdr_ldap_h=no
@@ -15863,8 +14045,8 @@ fi
 
 rm -f conftest.err conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_hdr_ldap_h" >&5
-echo "${ECHO_T}$apr_cv_hdr_ldap_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_hdr_ldap_h" >&5
+$as_echo "$apr_cv_hdr_ldap_h" >&6; }
     if test "$apr_cv_hdr_ldap_h" = "yes"; then
       ldap_h="#include <ldap.h>"
 
@@ -15877,20 +14059,21 @@ _ACEOF
 
 for ac_header in ldap_ssl.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -15906,49 +14089,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -15962,76 +14129,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  ldap_ssl_h="#include <ldap_ssl.h>"
 fi
@@ -16040,10 +14203,10 @@ done
 
 
     if test "$apr_cv_hdr_ldap_h" = "yes"; then
-      { echo "$as_me:$LINENO: checking for LDAP toolkit" >&5
-echo $ECHO_N "checking for LDAP toolkit... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for LDAP toolkit" >&5
+$as_echo_n "checking for LDAP toolkit... " >&6; }
 if test "${apr_cv_ldap_toolkit+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
         if test "x$apr_cv_ldap_toolkit" = "x"; then
@@ -16161,6 +14324,25 @@ rm -f conftest*
 
         fi
         if test "x$apr_cv_ldap_toolkit" = "x"; then
+          cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$lber_h
+                       $ldap_h
+                       LDAP_VENDOR_NAME
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "International Business Machines" >/dev/null 2>&1; then
+  apu_has_ldap_tivoli="1"
+                                           apr_cv_ldap_toolkit="Tivoli"
+fi
+rm -f conftest*
+
+        fi
+        if test "x$apr_cv_ldap_toolkit" = "x"; then
           case "$host" in
           *-ibm-os390)
             cat >conftest.$ac_ext <<_ACEOF
@@ -16175,7 +14357,7 @@ _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "IBM" >/dev/null 2>&1; then
   apu_has_ldap_zos="1"
-                                            apr_cv_ldap_toolkit="zOS"
+                                            apr_cv_ldap_toolkit="z/OS"
 fi
 rm -f conftest*
 
@@ -16188,8 +14370,8 @@ rm -f conftest*
         fi
 
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_ldap_toolkit" >&5
-echo "${ECHO_T}$apr_cv_ldap_toolkit" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_ldap_toolkit" >&5
+$as_echo "$apr_cv_ldap_toolkit" >&6; }
     fi
 
     CPPFLAGS=$save_cppflags
@@ -16221,6 +14403,8 @@ fi
 
 
 
+
+
   apu_use_sdbm=0
   apu_use_ndbm=0
   apu_use_gdbm=0
@@ -16238,9 +14422,9 @@ fi
 if test "${with_dbm+set}" = set; then
   withval=$with_dbm;
     if test "$withval" = "yes"; then
-      { { echo "$as_me:$LINENO: error: --with-dbm needs to specify a DBM type to use.
+      { { $as_echo "$as_me:$LINENO: error: --with-dbm needs to specify a DBM type to use.
         One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46" >&5
-echo "$as_me: error: --with-dbm needs to specify a DBM type to use.
+$as_echo "$as_me: error: --with-dbm needs to specify a DBM type to use.
         One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46" >&2;}
    { (exit 1); exit 1; }; }
     fi
@@ -16260,17 +14444,17 @@ if test "${with_gdbm+set}" = set; then
     apu_have_gdbm=0
     if test "$withval" = "yes"; then
       if test "${ac_cv_header_gdbm_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for gdbm.h" >&5
-echo $ECHO_N "checking for gdbm.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for gdbm.h" >&5
+$as_echo_n "checking for gdbm.h... " >&6; }
 if test "${ac_cv_header_gdbm_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_gdbm_h" >&5
-echo "${ECHO_T}$ac_cv_header_gdbm_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_gdbm_h" >&5
+$as_echo "$ac_cv_header_gdbm_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking gdbm.h usability" >&5
-echo $ECHO_N "checking gdbm.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking gdbm.h usability" >&5
+$as_echo_n "checking gdbm.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16286,49 +14470,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking gdbm.h presence" >&5
-echo $ECHO_N "checking gdbm.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking gdbm.h presence" >&5
+$as_echo_n "checking gdbm.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16342,77 +14510,71 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: gdbm.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: gdbm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gdbm.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: gdbm.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gdbm.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: gdbm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gdbm.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: gdbm.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: gdbm.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: gdbm.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gdbm.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: gdbm.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gdbm.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: gdbm.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gdbm.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: gdbm.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gdbm.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: gdbm.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gdbm.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: gdbm.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for gdbm.h" >&5
-echo $ECHO_N "checking for gdbm.h... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: gdbm.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: gdbm.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gdbm.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: gdbm.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gdbm.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: gdbm.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gdbm.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: gdbm.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gdbm.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: gdbm.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gdbm.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: gdbm.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for gdbm.h" >&5
+$as_echo_n "checking for gdbm.h... " >&6; }
 if test "${ac_cv_header_gdbm_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_gdbm_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_gdbm_h" >&5
-echo "${ECHO_T}$ac_cv_header_gdbm_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_gdbm_h" >&5
+$as_echo "$ac_cv_header_gdbm_h" >&6; }
 
 fi
 if test $ac_cv_header_gdbm_h = yes; then
-  { echo "$as_me:$LINENO: checking for gdbm_open in -lgdbm" >&5
-echo $ECHO_N "checking for gdbm_open in -lgdbm... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for gdbm_open in -lgdbm" >&5
+$as_echo_n "checking for gdbm_open in -lgdbm... " >&6; }
 if test "${ac_cv_lib_gdbm_gdbm_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgdbm  $LIBS"
@@ -16444,48 +14606,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_gdbm_gdbm_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_gdbm_gdbm_open=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_gdbm_open" >&5
-echo "${ECHO_T}$ac_cv_lib_gdbm_gdbm_open" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_gdbm_open" >&5
+$as_echo "$ac_cv_lib_gdbm_gdbm_open" >&6; }
 if test $ac_cv_lib_gdbm_gdbm_open = yes; then
   apu_have_gdbm=1
 fi
@@ -16496,23 +14646,25 @@ fi
     elif test "$withval" = "no"; then
       apu_have_gdbm=0
     else
-      CPPFLAGS="-I$withval/include"
-      LIBS="-L$withval/lib "
+      saved_cppflags="$CPPFLAGS"
+      saved_ldflags="$LDFLAGS"
+      CPPFLAGS="$CPPFLAGS -I$withval/include"
+      LDFLAGS="$LDFLAGS -L$withval/lib "
 
-      { echo "$as_me:$LINENO: checking checking for gdbm in $withval" >&5
-echo $ECHO_N "checking checking for gdbm in $withval... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking checking for gdbm in $withval" >&5
+$as_echo_n "checking checking for gdbm in $withval... " >&6; }
       if test "${ac_cv_header_gdbm_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for gdbm.h" >&5
-echo $ECHO_N "checking for gdbm.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for gdbm.h" >&5
+$as_echo_n "checking for gdbm.h... " >&6; }
 if test "${ac_cv_header_gdbm_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_gdbm_h" >&5
-echo "${ECHO_T}$ac_cv_header_gdbm_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_gdbm_h" >&5
+$as_echo "$ac_cv_header_gdbm_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking gdbm.h usability" >&5
-echo $ECHO_N "checking gdbm.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking gdbm.h usability" >&5
+$as_echo_n "checking gdbm.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16528,49 +14680,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking gdbm.h presence" >&5
-echo $ECHO_N "checking gdbm.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking gdbm.h presence" >&5
+$as_echo_n "checking gdbm.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16584,77 +14720,71 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: gdbm.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: gdbm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gdbm.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: gdbm.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gdbm.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: gdbm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gdbm.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: gdbm.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: gdbm.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: gdbm.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gdbm.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: gdbm.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gdbm.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: gdbm.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gdbm.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: gdbm.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gdbm.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: gdbm.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gdbm.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: gdbm.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for gdbm.h" >&5
-echo $ECHO_N "checking for gdbm.h... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: gdbm.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: gdbm.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gdbm.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: gdbm.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gdbm.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: gdbm.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gdbm.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: gdbm.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gdbm.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: gdbm.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: gdbm.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: gdbm.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for gdbm.h" >&5
+$as_echo_n "checking for gdbm.h... " >&6; }
 if test "${ac_cv_header_gdbm_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_gdbm_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_gdbm_h" >&5
-echo "${ECHO_T}$ac_cv_header_gdbm_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_gdbm_h" >&5
+$as_echo "$ac_cv_header_gdbm_h" >&6; }
 
 fi
 if test $ac_cv_header_gdbm_h = yes; then
-  { echo "$as_me:$LINENO: checking for gdbm_open in -lgdbm" >&5
-echo $ECHO_N "checking for gdbm_open in -lgdbm... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for gdbm_open in -lgdbm" >&5
+$as_echo_n "checking for gdbm_open in -lgdbm... " >&6; }
 if test "${ac_cv_lib_gdbm_gdbm_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgdbm  $LIBS"
@@ -16686,48 +14816,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_gdbm_gdbm_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_gdbm_gdbm_open=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_gdbm_open" >&5
-echo "${ECHO_T}$ac_cv_lib_gdbm_gdbm_open" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_gdbm_open" >&5
+$as_echo "$ac_cv_lib_gdbm_gdbm_open" >&6; }
 if test $ac_cv_lib_gdbm_gdbm_open = yes; then
   apu_have_gdbm=1
 fi
@@ -16779,6 +14897,8 @@ fi
   fi
 
       fi
+      CPPFLAGS="$saved_cppflags"
+      LDFLAGS="$saved_ldflags"
     fi
 
 fi
@@ -16790,8 +14910,8 @@ if test "${with_ndbm+set}" = set; then
   withval=$with_ndbm;
     apu_have_ndbm=0
     if test "$withval" = "yes"; then
-      { echo "$as_me:$LINENO: checking checking for ndbm in the usual places" >&5
-echo $ECHO_N "checking checking for ndbm in the usual places... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking checking for ndbm in the usual places" >&5
+$as_echo_n "checking checking for ndbm in the usual places... " >&6; }
       apu_want_ndbm=1
       NDBM_INC=""
       NDBM_LDFLAGS=""
@@ -16803,14 +14923,14 @@ echo $ECHO_N "checking checking for ndbm in the usual places... $ECHO_C" >&6; }
         *":"*)
           NDBM_INC="-I`echo $withval |sed -e 's/:.*$//'`"
           NDBM_LDFLAGS="-L`echo $withval |sed -e 's/^.*://'`"
-          { echo "$as_me:$LINENO: checking checking for ndbm includes with $NDBM_INC libs with $NDBM_LDFLAGS " >&5
-echo $ECHO_N "checking checking for ndbm includes with $NDBM_INC libs with $NDBM_LDFLAGS ... $ECHO_C" >&6; }
+          { $as_echo "$as_me:$LINENO: checking checking for ndbm includes with $NDBM_INC libs with $NDBM_LDFLAGS " >&5
+$as_echo_n "checking checking for ndbm includes with $NDBM_INC libs with $NDBM_LDFLAGS ... " >&6; }
         ;;
         *)
           NDBM_INC="-I$withval/include"
           NDBM_LDFLAGS="-L$withval/lib"
-          { echo "$as_me:$LINENO: checking checking for ndbm includes in $withval" >&5
-echo $ECHO_N "checking checking for ndbm includes in $withval... $ECHO_C" >&6; }
+          { $as_echo "$as_me:$LINENO: checking checking for ndbm includes in $withval" >&5
+$as_echo_n "checking checking for ndbm includes in $withval... " >&6; }
         ;;
       esac
     fi
@@ -16821,17 +14941,17 @@ echo $ECHO_N "checking checking for ndbm includes in $withval... $ECHO_C" >&6; }
     LDFLAGS="$LDFLAGS $NDBM_LDFLAGS"
         if test "$apu_want_ndbm" != "0"; then
       if test "${ac_cv_header_ndbm_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for ndbm.h" >&5
-echo $ECHO_N "checking for ndbm.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ndbm.h" >&5
+$as_echo_n "checking for ndbm.h... " >&6; }
 if test "${ac_cv_header_ndbm_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ndbm_h" >&5
-echo "${ECHO_T}$ac_cv_header_ndbm_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ndbm_h" >&5
+$as_echo "$ac_cv_header_ndbm_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking ndbm.h usability" >&5
-echo $ECHO_N "checking ndbm.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking ndbm.h usability" >&5
+$as_echo_n "checking ndbm.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16847,49 +14967,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking ndbm.h presence" >&5
-echo $ECHO_N "checking ndbm.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking ndbm.h presence" >&5
+$as_echo_n "checking ndbm.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -16903,77 +15007,71 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: ndbm.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ndbm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ndbm.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ndbm.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ndbm.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: ndbm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ndbm.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: ndbm.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: ndbm.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ndbm.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ndbm.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ndbm.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ndbm.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ndbm.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ndbm.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ndbm.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ndbm.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ndbm.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ndbm.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ndbm.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for ndbm.h" >&5
-echo $ECHO_N "checking for ndbm.h... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: ndbm.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: ndbm.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ndbm.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: ndbm.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ndbm.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: ndbm.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ndbm.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: ndbm.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ndbm.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: ndbm.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: ndbm.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: ndbm.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for ndbm.h" >&5
+$as_echo_n "checking for ndbm.h... " >&6; }
 if test "${ac_cv_header_ndbm_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_ndbm_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ndbm_h" >&5
-echo "${ECHO_T}$ac_cv_header_ndbm_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ndbm_h" >&5
+$as_echo "$ac_cv_header_ndbm_h" >&6; }
 
 fi
 if test $ac_cv_header_ndbm_h = yes; then
-  { echo "$as_me:$LINENO: checking for dbm_open in -lc" >&5
-echo $ECHO_N "checking for dbm_open in -lc... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dbm_open in -lc" >&5
+$as_echo_n "checking for dbm_open in -lc... " >&6; }
 if test "${ac_cv_lib_c_dbm_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
@@ -17005,55 +15103,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_c_dbm_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_c_dbm_open=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_dbm_open" >&5
-echo "${ECHO_T}$ac_cv_lib_c_dbm_open" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_dbm_open" >&5
+$as_echo "$ac_cv_lib_c_dbm_open" >&6; }
 if test $ac_cv_lib_c_dbm_open = yes; then
   apu_have_ndbm=1;apu_ndbm_lib=c
 else
-  { echo "$as_me:$LINENO: checking for dbm_open in -ldbm" >&5
-echo $ECHO_N "checking for dbm_open in -ldbm... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dbm_open in -ldbm" >&5
+$as_echo_n "checking for dbm_open in -ldbm... " >&6; }
 if test "${ac_cv_lib_dbm_dbm_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbm  $LIBS"
@@ -17085,55 +15171,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dbm_dbm_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dbm_dbm_open=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dbm_dbm_open" >&5
-echo "${ECHO_T}$ac_cv_lib_dbm_dbm_open" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dbm_dbm_open" >&5
+$as_echo "$ac_cv_lib_dbm_dbm_open" >&6; }
 if test $ac_cv_lib_dbm_dbm_open = yes; then
   apu_have_ndbm=1;apu_ndbm_lib=dbm
 else
-  { echo "$as_me:$LINENO: checking for dbm_open in -ldb" >&5
-echo $ECHO_N "checking for dbm_open in -ldb... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dbm_open in -ldb" >&5
+$as_echo_n "checking for dbm_open in -ldb... " >&6; }
 if test "${ac_cv_lib_db_dbm_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldb  $LIBS"
@@ -17165,55 +15239,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_db_dbm_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_db_dbm_open=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_db_dbm_open" >&5
-echo "${ECHO_T}$ac_cv_lib_db_dbm_open" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_db_dbm_open" >&5
+$as_echo "$ac_cv_lib_db_dbm_open" >&6; }
 if test $ac_cv_lib_db_dbm_open = yes; then
   apu_have_ndbm=1;apu_ndbm_lib=db
 else
-  { echo "$as_me:$LINENO: checking for __db_ndbm_open in -ldb" >&5
-echo $ECHO_N "checking for __db_ndbm_open in -ldb... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for __db_ndbm_open in -ldb" >&5
+$as_echo_n "checking for __db_ndbm_open in -ldb... " >&6; }
 if test "${ac_cv_lib_db___db_ndbm_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldb  $LIBS"
@@ -17245,48 +15307,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_db___db_ndbm_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_db___db_ndbm_open=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_db___db_ndbm_open" >&5
-echo "${ECHO_T}$ac_cv_lib_db___db_ndbm_open" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_db___db_ndbm_open" >&5
+$as_echo "$ac_cv_lib_db___db_ndbm_open" >&6; }
 if test $ac_cv_lib_db___db_ndbm_open = yes; then
   apu_have_ndbm=1;apu_ndbm_lib=db
 fi
@@ -17350,8 +15400,8 @@ fi
 
         fi
       elif test "$withval" != "yes"; then
-        { { echo "$as_me:$LINENO: error: NDBM not found in the specified directory" >&5
-echo "$as_me: error: NDBM not found in the specified directory" >&2;}
+        { { $as_echo "$as_me:$LINENO: error: NDBM not found in the specified directory" >&5
+$as_echo "$as_me: error: NDBM not found in the specified directory" >&2;}
    { (exit 1); exit 1; }; }
       fi
     fi
@@ -17443,10 +15493,10 @@ if test "${with_berkeley_db+set}" = set; then
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -17455,10 +15505,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -17468,20 +15518,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -17497,49 +15548,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -17553,74 +15588,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -17632,10 +15663,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -17659,6 +15690,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -17703,29 +15735,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -17739,14 +15774,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -17778,50 +15813,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -17829,11 +15854,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -17865,50 +15890,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -18099,10 +16114,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -18111,10 +16126,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -18124,20 +16139,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -18153,49 +16169,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -18209,74 +16209,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -18288,10 +16284,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -18315,6 +16311,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -18359,29 +16356,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -18395,14 +16395,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -18434,50 +16434,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -18485,11 +16475,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -18521,50 +16511,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -18755,10 +16735,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -18767,10 +16747,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -18780,20 +16760,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -18809,49 +16790,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -18865,74 +16830,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -18944,10 +16905,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -18971,6 +16932,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -19015,29 +16977,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -19051,14 +17016,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -19090,50 +17055,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -19141,11 +17096,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -19177,50 +17132,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -19411,10 +17356,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -19423,10 +17368,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -19436,20 +17381,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -19465,49 +17411,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -19521,74 +17451,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -19600,10 +17526,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -19627,6 +17553,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -19671,29 +17598,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -19707,14 +17637,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -19746,50 +17676,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -19797,11 +17717,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -19833,50 +17753,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -20067,10 +17977,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -20079,10 +17989,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -20092,20 +18002,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -20121,49 +18032,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -20177,74 +18072,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -20256,10 +18147,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -20283,6 +18174,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -20327,29 +18219,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -20363,14 +18258,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -20402,50 +18297,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -20453,11 +18338,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -20489,50 +18374,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -20723,10 +18598,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -20735,10 +18610,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -20748,20 +18623,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -20777,49 +18653,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -20833,74 +18693,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -20912,10 +18768,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -20939,6 +18795,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -20983,29 +18840,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -21019,14 +18879,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -21058,50 +18918,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -21109,11 +18959,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -21145,50 +18995,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -21379,10 +19219,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -21391,10 +19231,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -21404,20 +19244,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -21433,49 +19274,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -21489,74 +19314,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -21568,10 +19389,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -21595,6 +19416,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -21639,29 +19461,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -21675,14 +19500,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -21714,50 +19539,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -21765,11 +19580,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -21801,50 +19616,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -22035,10 +19840,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -22047,10 +19852,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -22060,20 +19865,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -22089,49 +19895,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -22145,74 +19935,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test "3" = "3" -o "3" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -22224,10 +20010,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -22251,6 +20037,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -22295,29 +20082,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -22331,14 +20121,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test "3" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -22370,50 +20160,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -22421,11 +20201,11 @@ else
 fi
 
           elif test "3" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -22457,50 +20237,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -22691,10 +20461,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -22703,10 +20473,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -22716,20 +20486,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -22745,49 +20516,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -22801,74 +20556,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test "2" = "3" -o "2" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -22880,10 +20631,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -22907,6 +20658,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -22951,29 +20703,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -22987,14 +20742,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test "2" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -23026,50 +20781,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -23077,11 +20822,11 @@ else
 fi
 
           elif test "2" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -23113,50 +20858,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -23347,10 +21082,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -23359,10 +21094,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -23372,20 +21107,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23401,49 +21137,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -23457,74 +21177,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test "1" = "3" -o "1" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -23536,10 +21252,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -23563,6 +21279,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -23607,29 +21324,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -23643,14 +21363,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test "1" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -23682,50 +21402,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -23733,11 +21443,11 @@ else
 fi
 
           elif test "1" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -23769,50 +21479,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -24003,10 +21703,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -24015,10 +21715,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -24028,20 +21728,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -24057,49 +21758,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -24113,74 +21798,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test "1" = "3" -o "1" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -24192,10 +21873,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -24219,6 +21900,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -24263,29 +21945,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -24299,14 +21984,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test "1" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -24338,50 +22023,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -24389,11 +22064,11 @@ else
 fi
 
           elif test "1" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -24425,50 +22100,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -24620,19 +22285,19 @@ fi
       fi
     fi
   fi
-  { echo "$as_me:$LINENO: checking for Berkeley DB" >&5
-echo $ECHO_N "checking for Berkeley DB... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for Berkeley DB" >&5
+$as_echo_n "checking for Berkeley DB... " >&6; }
   if test "$apu_have_db" = "1"; then
-    { echo "$as_me:$LINENO: result: found db$apu_db_version" >&5
-echo "${ECHO_T}found db$apu_db_version" >&6; }
+    { $as_echo "$as_me:$LINENO: result: found db$apu_db_version" >&5
+$as_echo "found db$apu_db_version" >&6; }
   else
-    { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+    { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
   fi
 
     if test "$apu_have_db" = "0"; then
-      { { echo "$as_me:$LINENO: error: Berkeley db requested" >&5
-echo "$as_me: error: Berkeley db requested" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: Berkeley db requested" >&5
+$as_echo "$as_me: error: Berkeley db requested" >&2;}
    { (exit but not found); exit but not found; }; }
     fi
     ;;
@@ -24685,10 +22350,10 @@ echo "$as_me: error: Berkeley db requested" >&2;}
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -24697,10 +22362,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -24710,20 +22375,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -24739,49 +22405,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -24795,74 +22445,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test "1" = "3" -o "1" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -24874,10 +22520,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -24901,6 +22547,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -24945,29 +22592,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -24981,14 +22631,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test "1" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -25020,50 +22670,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -25071,11 +22711,11 @@ else
 fi
 
           elif test "1" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -25107,50 +22747,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -25293,8 +22923,8 @@ fi
   fi
 
     if test "$apu_db_version" != "1"; then
-      { { echo "$as_me:$LINENO: error: Berkeley db1 not found" >&5
-echo "$as_me: error: Berkeley db1 not found" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: Berkeley db1 not found" >&5
+$as_echo "$as_me: error: Berkeley db1 not found" >&2;}
    { (exit 1); exit 1; }; }
     fi
     ;;
@@ -25347,10 +22977,10 @@ echo "$as_me: error: Berkeley db1 not found" >&2;}
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -25359,10 +22989,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -25372,20 +23002,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25401,49 +23032,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25457,74 +23072,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test "1" = "3" -o "1" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -25536,10 +23147,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -25563,6 +23174,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -25607,29 +23219,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -25643,14 +23258,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test "1" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -25682,50 +23297,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -25733,11 +23338,11 @@ else
 fi
 
           elif test "1" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -25769,50 +23374,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -25955,8 +23550,8 @@ fi
   fi
 
     if test "$apu_db_version" != "185"; then
-      { { echo "$as_me:$LINENO: error: Berkeley db185 not found" >&5
-echo "$as_me: error: Berkeley db185 not found" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: Berkeley db185 not found" >&5
+$as_echo "$as_me: error: Berkeley db185 not found" >&2;}
    { (exit 1); exit 1; }; }
     fi
     ;;
@@ -26009,10 +23604,10 @@ echo "$as_me: error: Berkeley db185 not found" >&2;}
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -26021,10 +23616,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -26034,20 +23629,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26063,49 +23659,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26119,74 +23699,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test "2" = "3" -o "2" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -26198,10 +23774,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -26225,6 +23801,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -26269,29 +23846,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -26305,14 +23885,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test "2" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -26344,50 +23924,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -26395,11 +23965,11 @@ else
 fi
 
           elif test "2" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -26431,50 +24001,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -26617,8 +24177,8 @@ fi
   fi
 
     if test "$apu_db_version" != "2"; then
-      { { echo "$as_me:$LINENO: error: Berkeley db2 not found" >&5
-echo "$as_me: error: Berkeley db2 not found" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: Berkeley db2 not found" >&5
+$as_echo "$as_me: error: Berkeley db2 not found" >&2;}
    { (exit 1); exit 1; }; }
     fi
     ;;
@@ -26671,10 +24231,10 @@ echo "$as_me: error: Berkeley db2 not found" >&2;}
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -26683,10 +24243,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -26696,20 +24256,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26725,49 +24286,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26781,74 +24326,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test "3" = "3" -o "3" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -26860,10 +24401,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -26887,6 +24428,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -26931,29 +24473,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -26967,14 +24512,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test "3" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -27006,50 +24551,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -27057,11 +24592,11 @@ else
 fi
 
           elif test "3" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -27093,50 +24628,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -27279,8 +24804,8 @@ fi
   fi
 
     if test "$apu_db_version" != "3"; then
-      { { echo "$as_me:$LINENO: error: Berkeley db3 not found" >&5
-echo "$as_me: error: Berkeley db3 not found" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: Berkeley db3 not found" >&5
+$as_echo "$as_me: error: Berkeley db3 not found" >&2;}
    { (exit 1); exit 1; }; }
     fi
     ;;
@@ -27333,10 +24858,10 @@ echo "$as_me: error: Berkeley db3 not found" >&2;}
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -27345,10 +24870,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -27358,20 +24883,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27387,49 +24913,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27443,74 +24953,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -27522,10 +25028,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -27549,6 +25055,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -27593,29 +25100,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -27629,14 +25139,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -27668,50 +25178,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -27719,11 +25219,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -27755,50 +25255,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -27941,8 +25431,8 @@ fi
   fi
 
     if test "$apu_db_version" != "4"; then
-      { { echo "$as_me:$LINENO: error: Berkeley db4 not found" >&5
-echo "$as_me: error: Berkeley db4 not found" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: Berkeley db4 not found" >&5
+$as_echo "$as_me: error: Berkeley db4 not found" >&2;}
    { (exit 1); exit 1; }; }
     fi
     ;;
@@ -27995,10 +25485,10 @@ echo "$as_me: error: Berkeley db4 not found" >&2;}
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -28007,10 +25497,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -28020,20 +25510,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28049,49 +25540,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28105,74 +25580,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -28184,10 +25655,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -28211,6 +25682,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -28255,29 +25727,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -28291,14 +25766,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -28330,50 +25805,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -28381,11 +25846,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -28417,50 +25882,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -28603,8 +26058,8 @@ fi
   fi
 
     if test "$apu_db_version" != "4"; then
-      { { echo "$as_me:$LINENO: error: Berkeley db4 not found" >&5
-echo "$as_me: error: Berkeley db4 not found" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: Berkeley db4 not found" >&5
+$as_echo "$as_me: error: Berkeley db4 not found" >&2;}
    { (exit 1); exit 1; }; }
     fi
     ;;
@@ -28657,10 +26112,10 @@ echo "$as_me: error: Berkeley db4 not found" >&2;}
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -28669,10 +26124,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -28682,20 +26137,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28711,49 +26167,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28767,74 +26207,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -28846,10 +26282,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -28873,6 +26309,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -28917,29 +26354,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -28953,14 +26393,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -28992,50 +26432,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -29043,11 +26473,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -29079,50 +26509,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -29265,8 +26685,8 @@ fi
   fi
 
     if test "$apu_db_version" != "4"; then
-      { { echo "$as_me:$LINENO: error: Berkeley db4 not found" >&5
-echo "$as_me: error: Berkeley db4 not found" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: Berkeley db4 not found" >&5
+$as_echo "$as_me: error: Berkeley db4 not found" >&2;}
    { (exit 1); exit 1; }; }
     fi
     ;;
@@ -29319,10 +26739,10 @@ echo "$as_me: error: Berkeley db4 not found" >&2;}
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -29331,10 +26751,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -29344,20 +26764,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29373,49 +26794,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29429,74 +26834,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -29508,10 +26909,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -29535,6 +26936,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -29579,29 +26981,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -29615,14 +27020,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -29654,50 +27059,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -29705,11 +27100,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -29741,50 +27136,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -29927,8 +27312,8 @@ fi
   fi
 
     if test "$apu_db_version" != "4"; then
-      { { echo "$as_me:$LINENO: error: Berkeley db4 not found" >&5
-echo "$as_me: error: Berkeley db4 not found" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: Berkeley db4 not found" >&5
+$as_echo "$as_me: error: Berkeley db4 not found" >&2;}
    { (exit 1); exit 1; }; }
     fi
     ;;
@@ -29981,10 +27366,10 @@ echo "$as_me: error: Berkeley db4 not found" >&2;}
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -29993,10 +27378,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -30006,20 +27391,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -30035,49 +27421,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -30091,74 +27461,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -30170,10 +27536,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -30197,6 +27563,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -30241,29 +27608,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -30277,14 +27647,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -30316,50 +27686,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -30367,11 +27727,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -30403,50 +27763,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -30589,8 +27939,8 @@ fi
   fi
 
     if test "$apu_db_version" != "4"; then
-      { { echo "$as_me:$LINENO: error: Berkeley db4 not found" >&5
-echo "$as_me: error: Berkeley db4 not found" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: Berkeley db4 not found" >&5
+$as_echo "$as_me: error: Berkeley db4 not found" >&2;}
    { (exit 1); exit 1; }; }
     fi
     ;;
@@ -30598,19 +27948,19 @@ echo "$as_me: error: Berkeley db4 not found" >&2;}
 
   places="$check_places"
   if test -z "$places"; then
-    places="std /usr/local/BerkeleyDB.4.4 /boot/home/config"
+    places="std /usr/local/BerkeleyDB.4.5 /boot/home/config"
   fi
 
   bdb_version="4"
-  if test ""4"" != "-1"; then
-    bdb_version="$bdb_version."4""
+  if test ""5"" != "-1"; then
+    bdb_version="$bdb_version."5""
     if test ""-1"" != "-1"; then
       bdb_version="$bdb_version."-1""
     fi
   fi
   bdb_places="$places"
-  bdb_default_search_headers="db44/db.h db4/db.h db.h"
-  bdb_default_search_lib_names="db-4.4 db4-4.4 db44 db4 db"
+  bdb_default_search_headers="db45/db.h db4/db.h db.h"
+  bdb_default_search_lib_names="db-4.5 db4-4.5 db45 db4 db"
 
 
   apu_have_db=0
@@ -30643,10 +27993,10 @@ echo "$as_me: error: Berkeley db4 not found" >&2;}
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -30655,10 +28005,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -30668,20 +28018,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -30697,49 +28048,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -30753,74 +28088,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -30828,21 +28159,21 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
             # changes if the user runs `configure' with a different set of
             # switches.
 
-            cache_id="`echo apu_cv_check_berkeley_db_"4"_"4"_"-1"_${bdb_header}_${bdb_libname}_in_${bdb_place} \
+            cache_id="`echo apu_cv_check_berkeley_db_"4"_"5"_"-1"_${bdb_header}_${bdb_libname}_in_${bdb_place} \
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
     apu_try_berkeley_db_save_libs="$LIBS"
 
     apu_check_berkeley_db_major="4"
-    apu_check_berkeley_db_minor="4"
+    apu_check_berkeley_db_minor="5"
     apu_check_berkeley_db_patch="-1"
     apu_try_berkeley_db_header=$bdb_header
     apu_try_berkeley_db_libname=$bdb_libname
@@ -30859,6 +28190,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -30903,29 +28235,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -30939,14 +28274,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -30978,50 +28313,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -31029,11 +28354,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -31065,50 +28390,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -31251,8 +28566,8 @@ fi
   fi
 
     if test "$apu_db_version" != "4"; then
-      { { echo "$as_me:$LINENO: error: Berkeley db4 not found" >&5
-echo "$as_me: error: Berkeley db4 not found" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: Berkeley db4 not found" >&5
+$as_echo "$as_me: error: Berkeley db4 not found" >&2;}
    { (exit 1); exit 1; }; }
     fi
     ;;
@@ -31305,10 +28620,10 @@ echo "$as_me: error: Berkeley db4 not found" >&2;}
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -31317,10 +28632,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -31330,20 +28645,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -31359,49 +28675,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -31415,74 +28715,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -31494,10 +28790,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -31521,6 +28817,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -31565,29 +28862,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -31601,14 +28901,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -31640,50 +28940,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -31691,11 +28981,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -31727,50 +29017,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -31913,8 +29193,8 @@ fi
   fi
 
     if test "$apu_db_version" != "4"; then
-      { { echo "$as_me:$LINENO: error: Berkeley db4 not found" >&5
-echo "$as_me: error: Berkeley db4 not found" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: Berkeley db4 not found" >&5
+$as_echo "$as_me: error: Berkeley db4 not found" >&2;}
    { (exit 1); exit 1; }; }
     fi
     ;;
@@ -31970,10 +29250,10 @@ echo "$as_me: error: Berkeley db4 not found" >&2;}
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -31982,10 +29262,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -31995,20 +29275,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -32024,49 +29305,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -32080,74 +29345,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -32159,10 +29420,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -32186,6 +29447,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -32230,29 +29492,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -32266,14 +29531,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -32305,50 +29570,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -32356,11 +29611,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -32392,50 +29647,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -32626,10 +29871,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -32638,10 +29883,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -32651,20 +29896,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -32680,49 +29926,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -32736,74 +29966,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -32815,10 +30041,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -32842,6 +30068,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -32886,29 +30113,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -32922,14 +30152,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -32961,50 +30191,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -33012,11 +30232,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -33048,50 +30268,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -33282,10 +30492,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -33294,10 +30504,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -33307,20 +30517,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -33336,49 +30547,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -33392,74 +30587,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -33471,10 +30662,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -33498,6 +30689,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -33542,29 +30734,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -33578,14 +30773,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -33617,50 +30812,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -33668,11 +30853,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -33704,50 +30889,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -33938,10 +31113,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -33950,10 +31125,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -33963,20 +31138,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -33992,49 +31168,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -34048,74 +31208,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -34127,10 +31283,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -34154,6 +31310,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -34198,29 +31355,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -34234,14 +31394,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -34273,50 +31433,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -34324,11 +31474,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -34360,50 +31510,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -34594,10 +31734,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -34606,10 +31746,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -34619,20 +31759,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -34648,49 +31789,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -34704,74 +31829,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -34783,10 +31904,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -34810,6 +31931,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -34854,29 +31976,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -34890,14 +32015,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -34929,50 +32054,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -34980,11 +32095,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -35016,50 +32131,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -35250,10 +32355,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -35262,10 +32367,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -35275,20 +32380,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -35304,49 +32410,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -35360,74 +32450,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -35439,10 +32525,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -35466,6 +32552,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -35510,29 +32597,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -35546,14 +32636,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -35585,50 +32675,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -35636,11 +32716,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -35672,50 +32752,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -35906,10 +32976,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -35918,10 +32988,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -35931,20 +33001,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -35960,49 +33031,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -36016,74 +33071,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test ""4"" = "3" -o ""4"" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -36095,10 +33146,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -36122,6 +33173,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -36166,29 +33218,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -36202,14 +33257,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test ""4"" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -36241,50 +33296,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -36292,11 +33337,11 @@ else
 fi
 
           elif test ""4"" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -36328,50 +33373,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -36562,10 +33597,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -36574,10 +33609,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -36587,20 +33622,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -36616,49 +33652,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -36672,74 +33692,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test "3" = "3" -o "3" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -36751,10 +33767,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -36778,6 +33794,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -36822,29 +33839,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -36858,14 +33878,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test "3" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -36897,50 +33917,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -36948,11 +33958,11 @@ else
 fi
 
           elif test "3" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -36984,50 +33994,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -37218,10 +34218,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -37230,10 +34230,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -37243,20 +34243,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -37272,49 +34273,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -37328,74 +34313,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test "2" = "3" -o "2" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -37407,10 +34388,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -37434,6 +34415,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -37478,29 +34460,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -37514,14 +34499,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test "2" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -37553,50 +34538,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -37604,11 +34579,11 @@ else
 fi
 
           elif test "2" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -37640,50 +34615,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -37874,10 +34839,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -37886,10 +34851,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -37899,20 +34864,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -37928,49 +34894,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -37984,74 +34934,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test "1" = "3" -o "1" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -38063,10 +35009,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -38090,6 +35036,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -38134,29 +35081,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -38170,14 +35120,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test "1" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -38209,50 +35159,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -38260,11 +35200,11 @@ else
 fi
 
           elif test "1" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -38296,50 +35236,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -38530,10 +35460,10 @@ fi
           LDFLAGS="$LDFLAGS -L$bdb_place/lib"
           CPPFLAGS="$CPPFLAGS -I$bdb_place/include"
         else
-          { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $bdb_place... $ECHO_C" >&6; }
-          { echo "$as_me:$LINENO: result: directory not found" >&5
-echo "${ECHO_T}directory not found" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $bdb_place" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $bdb_place... " >&6; }
+          { $as_echo "$as_me:$LINENO: result: directory not found" >&5
+$as_echo "directory not found" >&6; }
           continue
         fi
         description="$bdb_place"
@@ -38542,10 +35472,10 @@ echo "${ECHO_T}directory not found" >&6; }
 
     # Since there is no AC_MSG_NOTICE in autoconf 2.13, we use this
     # trick to display a message instead.
-    { echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
-echo $ECHO_N "checking for Berkeley DB $bdb_version in $description... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for Berkeley DB $bdb_version in $description" >&5
+$as_echo_n "checking for Berkeley DB $bdb_version in $description... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
 
     for bdb_libname in $bdb_default_search_lib_names; do
       for bdb_header in $bdb_default_search_headers; do
@@ -38555,20 +35485,21 @@ echo "${ECHO_T}" >&6; }
                  | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
         unset $cache_id
-        as_ac_Header=`echo "ac_cv_header_$bdb_header" | $as_tr_sh`
+        as_ac_Header=`$as_echo "ac_cv_header_$bdb_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $bdb_header usability" >&5
-echo $ECHO_N "checking $bdb_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header usability" >&5
+$as_echo_n "checking $bdb_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -38584,49 +35515,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $bdb_header presence" >&5
-echo $ECHO_N "checking $bdb_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $bdb_header presence" >&5
+$as_echo_n "checking $bdb_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -38640,74 +35555,70 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $bdb_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $bdb_header" >&5
-echo $ECHO_N "checking for $bdb_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $bdb_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $bdb_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $bdb_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $bdb_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $bdb_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $bdb_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $bdb_header" >&5
+$as_echo_n "checking for $bdb_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
 
           if test "1" = "3" -o "1" = "4"; then
             # We generate a separate cache variable for each prefix and libname
@@ -38719,10 +35630,10 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
                      | sed -e 's/[^a-zA-Z0-9_]/_/g'`"
 
 
-            { echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
-echo $ECHO_N "checking for -l$bdb_libname... $ECHO_C" >&6; }
+            { $as_echo "$as_me:$LINENO: checking for -l$bdb_libname" >&5
+$as_echo_n "checking for -l$bdb_libname... " >&6; }
                                     if { as_var=$cache_id; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -38746,6 +35657,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <$apu_try_berkeley_db_header>
 main ()
@@ -38790,29 +35702,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apu_try_berkeley_db=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apu_try_berkeley_db=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -38826,14 +35741,14 @@ fi
 fi
 
             result="`eval echo '$'$cache_id`"
-            { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
+            { $as_echo "$as_me:$LINENO: result: $result" >&5
+$as_echo "$result" >&6; }
           elif test "1" = "1"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
-echo $ECHO_N "checking for dbopen in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_dbopen" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for dbopen in -l$bdb_libname" >&5
+$as_echo_n "checking for dbopen in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -38865,50 +35780,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -38916,11 +35821,11 @@ else
 fi
 
           elif test "1" = "2"; then
-            as_ac_Lib=`echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
-echo $ECHO_N "checking for db_open in -l$bdb_libname... $ECHO_C" >&6; }
+            as_ac_Lib=`$as_echo "ac_cv_lib_$bdb_libname''_db_open" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for db_open in -l$bdb_libname" >&5
+$as_echo_n "checking for db_open in -l$bdb_libname... " >&6; }
 if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$bdb_libname  $LIBS"
@@ -38952,50 +35857,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Lib=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Lib'}
+		 $as_echo "$as_val"'` = yes; then
   result=yes
 else
   result=no
@@ -39147,22 +36042,22 @@ fi
       fi
     fi
   fi
-  { echo "$as_me:$LINENO: checking for Berkeley DB" >&5
-echo $ECHO_N "checking for Berkeley DB... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for Berkeley DB" >&5
+$as_echo_n "checking for Berkeley DB... " >&6; }
   if test "$apu_have_db" = "1"; then
-    { echo "$as_me:$LINENO: result: found db$apu_db_version" >&5
-echo "${ECHO_T}found db$apu_db_version" >&6; }
+    { $as_echo "$as_me:$LINENO: result: found db$apu_db_version" >&5
+$as_echo "found db$apu_db_version" >&6; }
   else
-    { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+    { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
   fi
 
     ;;
   esac
 
       if test "$apu_have_db" = "0"; then
-        { { echo "$as_me:$LINENO: error: Berkeley DB not found." >&5
-echo "$as_me: error: Berkeley DB not found." >&2;}
+        { { $as_echo "$as_me:$LINENO: error: Berkeley DB not found." >&5
+$as_echo "$as_me: error: Berkeley DB not found." >&2;}
    { (exit 1); exit 1; }; }
       fi
     fi
@@ -39240,18 +36135,18 @@ fi
       apu_use_sdbm=1
       ;;
     *)
-      { { echo "$as_me:$LINENO: error: --with-dbm=$look_for is an unknown DBM type.
+      { { $as_echo "$as_me:$LINENO: error: --with-dbm=$look_for is an unknown DBM type.
         Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46" >&5
-echo "$as_me: error: --with-dbm=$look_for is an unknown DBM type.
+$as_echo "$as_me: error: --with-dbm=$look_for is an unknown DBM type.
         Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46" >&2;}
    { (exit 1); exit 1; }; }
       ;;
   esac
 
-        { echo "$as_me:$LINENO: checking for default DBM" >&5
-echo $ECHO_N "checking for default DBM... $ECHO_C" >&6; }
-  { echo "$as_me:$LINENO: result: $apu_default_dbm" >&5
-echo "${ECHO_T}$apu_default_dbm" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for default DBM" >&5
+$as_echo_n "checking for default DBM... " >&6; }
+  { $as_echo "$as_me:$LINENO: result: $apu_default_dbm" >&5
+$as_echo "$apu_default_dbm" >&6; }
 
 
 
@@ -39447,29 +36342,143 @@ echo "${ECHO_T}$apu_default_dbm" >&6; }
 
   apu_have_pgsql=0
 
+  old_libs="$LIBS"
+  old_cppflags="$CPPFLAGS"
+  old_ldflags="$LDFLAGS"
+
 
 # Check whether --with-pgsql was given.
 if test "${with_pgsql+set}" = set; then
   withval=$with_pgsql;
-    apu_have_pgsql=0
     if test "$withval" = "yes"; then
+      # Extract the first word of "pg_config", so it can be a program name with args.
+set dummy pg_config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PGSQL_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $PGSQL_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PGSQL_CONFIG="$PGSQL_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PGSQL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PGSQL_CONFIG=$ac_cv_path_PGSQL_CONFIG
+if test -n "$PGSQL_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $PGSQL_CONFIG" >&5
+$as_echo "$PGSQL_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+      if test "x$PGSQL_CONFIG" != 'x'; then
+        pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
+        pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
+        pgsql_LIBS="`$PGSQL_CONFIG --libs`"
+
+
+  if test "x$CPPFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"$pgsql_CPPFLAGS\""
+    CPPFLAGS="$pgsql_CPPFLAGS"
+  else
+    apr_addto_bugger="$pgsql_CPPFLAGS"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $CPPFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $i"
+      fi
+    done
+  fi
+
+
+  if test "x$LDFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"$pgsql_LDFLAGS\""
+    LDFLAGS="$pgsql_LDFLAGS"
+  else
+    apr_addto_bugger="$pgsql_LDFLAGS"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $LDFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
+        LDFLAGS="$LDFLAGS $i"
+      fi
+    done
+  fi
+
+
+  if test "x$LIBS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting LIBS to \"$pgsql_LIBS\""
+    LIBS="$pgsql_LIBS"
+  else
+    apr_addto_bugger="$pgsql_LIBS"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $LIBS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
+        LIBS="$LIBS $i"
+      fi
+    done
+  fi
+
+      fi
+
 
 for ac_header in libpq-fe.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -39485,49 +36494,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -39541,81 +36534,77 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
- { echo "$as_me:$LINENO: checking for PQsendQueryPrepared in -lpq" >&5
-echo $ECHO_N "checking for PQsendQueryPrepared in -lpq... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for PQsendQueryPrepared in -lpq" >&5
+$as_echo_n "checking for PQsendQueryPrepared in -lpq... " >&6; }
 if test "${ac_cv_lib_pq_PQsendQueryPrepared+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
@@ -39647,48 +36636,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_pq_PQsendQueryPrepared=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_pq_PQsendQueryPrepared=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendQueryPrepared" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQsendQueryPrepared" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendQueryPrepared" >&5
+$as_echo "$ac_cv_lib_pq_PQsendQueryPrepared" >&6; }
 if test $ac_cv_lib_pq_PQsendQueryPrepared = yes; then
   apu_have_pgsql=1
 fi
@@ -39701,20 +36678,21 @@ done
 
 for ac_header in postgresql/libpq-fe.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -39730,49 +36708,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -39786,81 +36748,77 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
- { echo "$as_me:$LINENO: checking for PQsendQueryPrepared in -lpq" >&5
-echo $ECHO_N "checking for PQsendQueryPrepared in -lpq... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for PQsendQueryPrepared in -lpq" >&5
+$as_echo_n "checking for PQsendQueryPrepared in -lpq... " >&6; }
 if test "${ac_cv_lib_pq_PQsendQueryPrepared+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
@@ -39892,48 +36850,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_pq_PQsendQueryPrepared=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_pq_PQsendQueryPrepared=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendQueryPrepared" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQsendQueryPrepared" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendQueryPrepared" >&5
+$as_echo "$ac_cv_lib_pq_PQsendQueryPrepared" >&6; }
 if test $ac_cv_lib_pq_PQsendQueryPrepared = yes; then
   apu_have_pgsql=1
 fi
@@ -39943,14 +36889,80 @@ fi
 done
 
       fi
+      if test "$apu_have_pgsql" != "0" && test "x$PGSQL_CONFIG" != 'x'; then
+
+  if test "x$APRUTIL_PRIV_INCLUDES" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_PRIV_INCLUDES to \"$pgsql_CPPFLAGS\""
+    APRUTIL_PRIV_INCLUDES="$pgsql_CPPFLAGS"
+  else
+    apr_addto_bugger="$pgsql_CPPFLAGS"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $APRUTIL_PRIV_INCLUDES; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_PRIV_INCLUDES"
+        APRUTIL_PRIV_INCLUDES="$APRUTIL_PRIV_INCLUDES $i"
+      fi
+    done
+  fi
+
+      fi
     elif test "$withval" = "no"; then
-      apu_have_pgsql=0
+      :
     else
-      old_cppflags="$CPPFLAGS"
-      old_ldflags="$LDFLAGS"
+      # Extract the first word of "pg_config", so it can be a program name with args.
+set dummy pg_config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PGSQL_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $PGSQL_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PGSQL_CONFIG="$PGSQL_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $withval/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PGSQL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PGSQL_CONFIG=$ac_cv_path_PGSQL_CONFIG
+if test -n "$PGSQL_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $PGSQL_CONFIG" >&5
+$as_echo "$PGSQL_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-      pgsql_CPPFLAGS="-I$withval/include"
-      pgsql_LDFLAGS="-L$withval/lib "
+
+      if test "x$PGSQL_CONFIG" != 'x'; then
+        pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
+        pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
+        pgsql_LIBS="`$PGSQL_CONFIG --libs`"
+      else
+        pgsql_CPPFLAGS="-I$withval/include"
+        pgsql_LDFLAGS="-L$withval/lib "
+      fi
 
 
   if test "x$CPPFLAGS" = "x"; then
@@ -39995,25 +37007,47 @@ done
   fi
 
 
-      { echo "$as_me:$LINENO: checking for pgsql in $withval" >&5
-echo "$as_me: checking for pgsql in $withval" >&6;}
+  if test "x$LIBS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting LIBS to \"$pgsql_LIBS\""
+    LIBS="$pgsql_LIBS"
+  else
+    apr_addto_bugger="$pgsql_LIBS"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $LIBS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
+        LIBS="$LIBS $i"
+      fi
+    done
+  fi
+
+
+      { $as_echo "$as_me:$LINENO: checking for pgsql in $withval" >&5
+$as_echo "$as_me: checking for pgsql in $withval" >&6;}
 
 for ac_header in libpq-fe.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -40029,49 +37063,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -40085,81 +37103,77 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
- { echo "$as_me:$LINENO: checking for PQsendQueryPrepared in -lpq" >&5
-echo $ECHO_N "checking for PQsendQueryPrepared in -lpq... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for PQsendQueryPrepared in -lpq" >&5
+$as_echo_n "checking for PQsendQueryPrepared in -lpq... " >&6; }
 if test "${ac_cv_lib_pq_PQsendQueryPrepared+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
@@ -40191,48 +37205,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_pq_PQsendQueryPrepared=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_pq_PQsendQueryPrepared=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendQueryPrepared" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQsendQueryPrepared" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendQueryPrepared" >&5
+$as_echo "$ac_cv_lib_pq_PQsendQueryPrepared" >&6; }
 if test $ac_cv_lib_pq_PQsendQueryPrepared = yes; then
   apu_have_pgsql=1
 fi
@@ -40241,68 +37243,25 @@ fi
 
 done
 
-      if test "$apu_have_pgsql" != "0"; then
-
-  if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib\""
-    APRUTIL_LDFLAGS="-L$withval/lib"
-  else
-    apr_addto_bugger="-L$withval/lib"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LDFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LDFLAGS"
-        APRUTIL_LDFLAGS="$APRUTIL_LDFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_INCLUDES" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_INCLUDES to \"-I$withval/include\""
-    APRUTIL_INCLUDES="-I$withval/include"
-  else
-    apr_addto_bugger="-I$withval/include"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_INCLUDES; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_INCLUDES"
-        APRUTIL_INCLUDES="$APRUTIL_INCLUDES $i"
-      fi
-    done
-  fi
-
-      fi
       if test "$apu_have_pgsql" != "1"; then
 
 for ac_header in postgresql/libpq-fe.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -40318,49 +37277,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -40374,81 +37317,77 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
- { echo "$as_me:$LINENO: checking for PQsendQueryPrepared in -lpq" >&5
-echo $ECHO_N "checking for PQsendQueryPrepared in -lpq... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for PQsendQueryPrepared in -lpq" >&5
+$as_echo_n "checking for PQsendQueryPrepared in -lpq... " >&6; }
 if test "${ac_cv_lib_pq_PQsendQueryPrepared+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
@@ -40480,48 +37419,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_pq_PQsendQueryPrepared=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_pq_PQsendQueryPrepared=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendQueryPrepared" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQsendQueryPrepared" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendQueryPrepared" >&5
+$as_echo "$ac_cv_lib_pq_PQsendQueryPrepared" >&6; }
 if test $ac_cv_lib_pq_PQsendQueryPrepared = yes; then
   apu_have_pgsql=1
 fi
@@ -40530,76 +37457,162 @@ fi
 
 done
 
-        if test "$apu_have_pgsql" != "0"; then
+      fi
+      if test "$apu_have_pgsql" != "0"; then
 
-  if test "x$APRUTIL_INCLUDES" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_INCLUDES to \"-I$withval/include/postgresql\""
-    APRUTIL_INCLUDES="-I$withval/include/postgresql"
+  if test "x$APRUTIL_PRIV_INCLUDES" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_PRIV_INCLUDES to \"$pgsql_CPPFLAGS\""
+    APRUTIL_PRIV_INCLUDES="$pgsql_CPPFLAGS"
   else
-    apr_addto_bugger="-I$withval/include/postgresql"
+    apr_addto_bugger="$pgsql_CPPFLAGS"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
-      for j in $APRUTIL_INCLUDES; do
+      for j in $APRUTIL_PRIV_INCLUDES; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_INCLUDES"
-        APRUTIL_INCLUDES="$APRUTIL_INCLUDES $i"
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_PRIV_INCLUDES"
+        APRUTIL_PRIV_INCLUDES="$APRUTIL_PRIV_INCLUDES $i"
       fi
     done
   fi
 
+      fi
+    fi
 
-  if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib\""
-    APRUTIL_LDFLAGS="-L$withval/lib"
+else
+
+    # Extract the first word of "pg_config", so it can be a program name with args.
+set dummy pg_config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PGSQL_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $PGSQL_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PGSQL_CONFIG="$PGSQL_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PGSQL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PGSQL_CONFIG=$ac_cv_path_PGSQL_CONFIG
+if test -n "$PGSQL_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $PGSQL_CONFIG" >&5
+$as_echo "$PGSQL_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    if test "x$PGSQL_CONFIG" != 'x'; then
+      pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
+      pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
+      pgsql_LIBS="`$PGSQL_CONFIG --libs`"
+
+
+  if test "x$CPPFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"$pgsql_CPPFLAGS\""
+    CPPFLAGS="$pgsql_CPPFLAGS"
   else
-    apr_addto_bugger="-L$withval/lib"
+    apr_addto_bugger="$pgsql_CPPFLAGS"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
-      for j in $APRUTIL_LDFLAGS; do
+      for j in $CPPFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LDFLAGS"
-        APRUTIL_LDFLAGS="$APRUTIL_LDFLAGS $i"
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
+
+  if test "x$LDFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"$pgsql_LDFLAGS\""
+    LDFLAGS="$pgsql_LDFLAGS"
+  else
+    apr_addto_bugger="$pgsql_LDFLAGS"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $LDFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
         fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
+        LDFLAGS="$LDFLAGS $i"
       fi
+    done
+  fi
 
-      CPPFLAGS="$old_cppflags"
-      LDFLAGS="$old_ldflags"
-    fi
 
-else
+  if test "x$LIBS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting LIBS to \"$pgsql_LIBS\""
+    LIBS="$pgsql_LIBS"
+  else
+    apr_addto_bugger="$pgsql_LIBS"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $LIBS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
+        LIBS="$LIBS $i"
+      fi
+    done
+  fi
+
+    fi
 
-    apu_have_pgsql=0
 
 for ac_header in libpq-fe.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -40615,49 +37628,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -40671,81 +37668,77 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
- { echo "$as_me:$LINENO: checking for PQsendQueryPrepared in -lpq" >&5
-echo $ECHO_N "checking for PQsendQueryPrepared in -lpq... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for PQsendQueryPrepared in -lpq" >&5
+$as_echo_n "checking for PQsendQueryPrepared in -lpq... " >&6; }
 if test "${ac_cv_lib_pq_PQsendQueryPrepared+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
@@ -40777,48 +37770,250 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_pq_PQsendQueryPrepared=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_pq_PQsendQueryPrepared=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendQueryPrepared" >&5
+$as_echo "$ac_cv_lib_pq_PQsendQueryPrepared" >&6; }
+if test $ac_cv_lib_pq_PQsendQueryPrepared = yes; then
+  apu_have_pgsql=1
+fi
+
+fi
+
+done
+
+    if test "$apu_have_pgsql" = "0"; then
+
+for ac_header in postgresql/libpq-fe.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ { $as_echo "$as_me:$LINENO: checking for PQsendQueryPrepared in -lpq" >&5
+$as_echo_n "checking for PQsendQueryPrepared in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQsendQueryPrepared+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpq  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char PQsendQueryPrepared ();
+int
+main ()
+{
+return PQsendQueryPrepared ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_pq_PQsendQueryPrepared=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_pq_PQsendQueryPrepared=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendQueryPrepared" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQsendQueryPrepared" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendQueryPrepared" >&5
+$as_echo "$ac_cv_lib_pq_PQsendQueryPrepared" >&6; }
 if test $ac_cv_lib_pq_PQsendQueryPrepared = yes; then
   apu_have_pgsql=1
 fi
@@ -40827,73 +38022,61 @@ fi
 
 done
 
+    fi
+    if test "$apu_have_pgsql" != "0" && test "x$PGSQL_CONFIG" != 'x'; then
 
-fi
-
-
-      if test "$apu_have_pgsql" = "1"; then
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-lpq\""
-    APRUTIL_EXPORT_LIBS="-lpq"
+  if test "x$APRUTIL_PRIV_INCLUDES" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_PRIV_INCLUDES to \"$pgsql_CPPFLAGS\""
+    APRUTIL_PRIV_INCLUDES="$pgsql_CPPFLAGS"
   else
-    apr_addto_bugger="-lpq"
+    apr_addto_bugger="$pgsql_CPPFLAGS"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
+      for j in $APRUTIL_PRIV_INCLUDES; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_PRIV_INCLUDES"
+        APRUTIL_PRIV_INCLUDES="$APRUTIL_PRIV_INCLUDES $i"
       fi
     done
   fi
 
+    fi
+
+fi
 
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-lpq\""
-    APRUTIL_LIBS="-lpq"
-  else
-    apr_addto_bugger="-lpq"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
 
+      if test "$apu_have_pgsql" = "1"; then
+    LDADD_dbd_pgsql="$pgsql_LDFLAGS -lpq $pgsql_LIBS"
   fi
 
 
+  LIBS="$old_libs"
+  CPPFLAGS="$old_cppflags"
+  LDFLAGS="$old_ldflags"
+
+
   apu_have_mysql=0
 
+  old_libs="$LIBS"
+  old_cppflags="$CPPFLAGS"
+  old_ldflags="$LDFLAGS"
+
 
 # Check whether --with-mysql was given.
 if test "${with_mysql+set}" = set; then
   withval=$with_mysql;
-    apu_have_mysql=0
     if test "$withval" = "yes"; then
-      old_cppflags="$CPPFLAGS"
-      old_ldflags="$LDFLAGS"
-
       # Extract the first word of "mysql_config", so it can be a program name with args.
 set dummy mysql_config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_MYSQL_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MYSQL_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -40906,9 +38089,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MYSQL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -40920,17 +38103,18 @@ esac
 fi
 MYSQL_CONFIG=$ac_cv_path_MYSQL_CONFIG
 if test -n "$MYSQL_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $MYSQL_CONFIG" >&5
-echo "${ECHO_T}$MYSQL_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MYSQL_CONFIG" >&5
+$as_echo "$MYSQL_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
       if test "x$MYSQL_CONFIG" != 'x'; then
         mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
-        mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r`"
+        mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[^ ]\+//g'`"
+        mysql_LIBS="`$MYSQL_CONFIG --libs_r`"
 
 
   if test "x$CPPFLAGS" = "x"; then
@@ -40954,22 +38138,22 @@ fi
   fi
 
 
-  if test "x$LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"$mysql_LDFLAGS\""
-    LDFLAGS="$mysql_LDFLAGS"
+  if test "x$LIBS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting LIBS to \"$mysql_LIBS\""
+    LIBS="$mysql_LIBS"
   else
-    apr_addto_bugger="$mysql_LDFLAGS"
+    apr_addto_bugger="$mysql_LIBS"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
-      for j in $LDFLAGS; do
+      for j in $LIBS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
-        LDFLAGS="$LDFLAGS $i"
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
+        LIBS="$LIBS $i"
       fi
     done
   fi
@@ -40979,20 +38163,21 @@ fi
 
 for ac_header in mysql.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -41008,49 +38193,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -41064,81 +38233,77 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
- { echo "$as_me:$LINENO: checking for mysql_init in -lmysqlclient_r" >&5
-echo $ECHO_N "checking for mysql_init in -lmysqlclient_r... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for mysql_init in -lmysqlclient_r" >&5
+$as_echo_n "checking for mysql_init in -lmysqlclient_r... " >&6; }
 if test "${ac_cv_lib_mysqlclient_r_mysql_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmysqlclient_r  $LIBS"
@@ -41170,48 +38335,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_mysqlclient_r_mysql_init=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_mysqlclient_r_mysql_init=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_r_mysql_init" >&5
-echo "${ECHO_T}$ac_cv_lib_mysqlclient_r_mysql_init" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_r_mysql_init" >&5
+$as_echo "$ac_cv_lib_mysqlclient_r_mysql_init" >&6; }
 if test $ac_cv_lib_mysqlclient_r_mysql_init = yes; then
   apu_have_mysql=1
 fi
@@ -41224,20 +38377,21 @@ done
 
 for ac_header in mysql/mysql.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -41253,49 +38407,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -41309,81 +38447,77 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
- { echo "$as_me:$LINENO: checking for mysql_init in -lmysqlclient_r" >&5
-echo $ECHO_N "checking for mysql_init in -lmysqlclient_r... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for mysql_init in -lmysqlclient_r" >&5
+$as_echo_n "checking for mysql_init in -lmysqlclient_r... " >&6; }
 if test "${ac_cv_lib_mysqlclient_r_mysql_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmysqlclient_r  $LIBS"
@@ -41415,48 +38549,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_mysqlclient_r_mysql_init=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_mysqlclient_r_mysql_init=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_r_mysql_init" >&5
-echo "${ECHO_T}$ac_cv_lib_mysqlclient_r_mysql_init" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_r_mysql_init" >&5
+$as_echo "$ac_cv_lib_mysqlclient_r_mysql_init" >&6; }
 if test $ac_cv_lib_mysqlclient_r_mysql_init = yes; then
   apu_have_mysql=1
 fi
@@ -41465,67 +38587,39 @@ fi
 
 done
 
-      else
-        if test "x$MYSQL_CONFIG" != 'x'; then
-
-  if test "x$APRUTIL_INCLUDES" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_INCLUDES to \"$mysql_CPPFLAGS\""
-    APRUTIL_INCLUDES="$mysql_CPPFLAGS"
-  else
-    apr_addto_bugger="$mysql_CPPFLAGS"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_INCLUDES; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_INCLUDES"
-        APRUTIL_INCLUDES="$APRUTIL_INCLUDES $i"
       fi
-    done
-  fi
+      if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then
 
-
-  if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"$mysql_LDFLAGS\""
-    APRUTIL_LDFLAGS="$mysql_LDFLAGS"
+  if test "x$APRUTIL_PRIV_INCLUDES" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_PRIV_INCLUDES to \"$mysql_CPPFLAGS\""
+    APRUTIL_PRIV_INCLUDES="$mysql_CPPFLAGS"
   else
-    apr_addto_bugger="$mysql_LDFLAGS"
+    apr_addto_bugger="$mysql_CPPFLAGS"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
-      for j in $APRUTIL_LDFLAGS; do
+      for j in $APRUTIL_PRIV_INCLUDES; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LDFLAGS"
-        APRUTIL_LDFLAGS="$APRUTIL_LDFLAGS $i"
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_PRIV_INCLUDES"
+        APRUTIL_PRIV_INCLUDES="$APRUTIL_PRIV_INCLUDES $i"
       fi
     done
   fi
 
-        fi
       fi
-
-      CPPFLAGS="$old_cppflags"
-      LDFLAGS="$old_ldflags"
     elif test "$withval" = "no"; then
-      apu_have_mysql=0
+      :
     else
-      old_cppflags="$CPPFLAGS"
-      old_ldflags="$LDFLAGS"
-
       # Extract the first word of "mysql_config", so it can be a program name with args.
 set dummy mysql_config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_MYSQL_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MYSQL_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -41538,9 +38632,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MYSQL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -41552,17 +38646,18 @@ esac
 fi
 MYSQL_CONFIG=$ac_cv_path_MYSQL_CONFIG
 if test -n "$MYSQL_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $MYSQL_CONFIG" >&5
-echo "${ECHO_T}$MYSQL_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MYSQL_CONFIG" >&5
+$as_echo "$MYSQL_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
       if test "x$MYSQL_CONFIG" != 'x'; then
         mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
-        mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r`"
+        mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[^ ]\+//g'`"
+        mysql_LIBS="`$MYSQL_CONFIG --libs_r`"
       else
         mysql_CPPFLAGS="-I$withval/include"
         mysql_LDFLAGS="-L$withval/lib "
@@ -41611,25 +38706,47 @@ fi
   fi
 
 
-      { echo "$as_me:$LINENO: checking for mysql in $withval" >&5
-echo "$as_me: checking for mysql in $withval" >&6;}
+  if test "x$LIBS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting LIBS to \"$mysql_LIBS\""
+    LIBS="$mysql_LIBS"
+  else
+    apr_addto_bugger="$mysql_LIBS"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $LIBS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
+        LIBS="$LIBS $i"
+      fi
+    done
+  fi
+
+
+      { $as_echo "$as_me:$LINENO: checking for mysql in $withval" >&5
+$as_echo "$as_me: checking for mysql in $withval" >&6;}
 
 for ac_header in mysql.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -41645,49 +38762,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -41701,81 +38802,77 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
- { echo "$as_me:$LINENO: checking for mysql_init in -lmysqlclient_r" >&5
-echo $ECHO_N "checking for mysql_init in -lmysqlclient_r... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for mysql_init in -lmysqlclient_r" >&5
+$as_echo_n "checking for mysql_init in -lmysqlclient_r... " >&6; }
 if test "${ac_cv_lib_mysqlclient_r_mysql_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmysqlclient_r  $LIBS"
@@ -41807,48 +38904,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_mysqlclient_r_mysql_init=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_mysqlclient_r_mysql_init=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_r_mysql_init" >&5
-echo "${ECHO_T}$ac_cv_lib_mysqlclient_r_mysql_init" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_r_mysql_init" >&5
+$as_echo "$ac_cv_lib_mysqlclient_r_mysql_init" >&6; }
 if test $ac_cv_lib_mysqlclient_r_mysql_init = yes; then
   apu_have_mysql=1
 fi
@@ -41857,69 +38942,26 @@ fi
 
 done
 
-      if test "$apu_have_mysql" != "0"; then
-
-  if test "x$APRUTIL_INCLUDES" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_INCLUDES to \"$mysql_CPPFLAGS\""
-    APRUTIL_INCLUDES="$mysql_CPPFLAGS"
-  else
-    apr_addto_bugger="$mysql_CPPFLAGS"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_INCLUDES; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_INCLUDES"
-        APRUTIL_INCLUDES="$APRUTIL_INCLUDES $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"$mysql_LDFLAGS\""
-    APRUTIL_LDFLAGS="$mysql_LDFLAGS"
-  else
-    apr_addto_bugger="$mysql_LDFLAGS"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LDFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LDFLAGS"
-        APRUTIL_LDFLAGS="$APRUTIL_LDFLAGS $i"
-      fi
-    done
-  fi
-
-      fi
 
       if test "$apu_have_mysql" != "1"; then
 
 for ac_header in mysql/mysql.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -41935,49 +38977,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -41991,81 +39017,77 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
- { echo "$as_me:$LINENO: checking for mysql_init in -lmysqlclient_r" >&5
-echo $ECHO_N "checking for mysql_init in -lmysqlclient_r... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for mysql_init in -lmysqlclient_r" >&5
+$as_echo_n "checking for mysql_init in -lmysqlclient_r... " >&6; }
 if test "${ac_cv_lib_mysqlclient_r_mysql_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmysqlclient_r  $LIBS"
@@ -42097,48 +39119,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_mysqlclient_r_mysql_init=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_mysqlclient_r_mysql_init=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_r_mysql_init" >&5
-echo "${ECHO_T}$ac_cv_lib_mysqlclient_r_mysql_init" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_r_mysql_init" >&5
+$as_echo "$ac_cv_lib_mysqlclient_r_mysql_init" >&6; }
 if test $ac_cv_lib_mysqlclient_r_mysql_init = yes; then
   apu_have_mysql=1
 fi
@@ -42147,54 +39157,30 @@ fi
 
 done
 
-        if test "$apu_have_mysql" != "0"; then
-
-  if test "x$APRUTIL_INCLUDES" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_INCLUDES to \"-I$withval/include/mysql\""
-    APRUTIL_INCLUDES="-I$withval/include/mysql"
-  else
-    apr_addto_bugger="-I$withval/include/mysql"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_INCLUDES; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_INCLUDES"
-        APRUTIL_INCLUDES="$APRUTIL_INCLUDES $i"
       fi
-    done
-  fi
-
+      if test "$apu_have_mysql" != "0"; then
 
-  if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib\""
-    APRUTIL_LDFLAGS="-L$withval/lib"
+  if test "x$APRUTIL_PRIV_INCLUDES" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_PRIV_INCLUDES to \"$mysql_CPPFLAGS\""
+    APRUTIL_PRIV_INCLUDES="$mysql_CPPFLAGS"
   else
-    apr_addto_bugger="-L$withval/lib"
+    apr_addto_bugger="$mysql_CPPFLAGS"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
-      for j in $APRUTIL_LDFLAGS; do
+      for j in $APRUTIL_PRIV_INCLUDES; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LDFLAGS"
-        APRUTIL_LDFLAGS="$APRUTIL_LDFLAGS $i"
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_PRIV_INCLUDES"
+        APRUTIL_PRIV_INCLUDES="$APRUTIL_PRIV_INCLUDES $i"
       fi
     done
   fi
 
-        fi
       fi
-
-      CPPFLAGS="$old_cppflags"
-      LDFLAGS="$old_ldflags"
     fi
 
 fi
@@ -42203,76 +39189,44 @@ fi
 
 
       if test "$apu_have_mysql" = "1"; then
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-lmysqlclient_r\""
-    APRUTIL_EXPORT_LIBS="-lmysqlclient_r"
-  else
-    apr_addto_bugger="-lmysqlclient_r"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
-      fi
-    done
+    LDADD_dbd_mysql="$mysql_LDFLAGS -lmysqlclient_r $mysql_LIBS"
   fi
 
 
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-lmysqlclient_r\""
-    APRUTIL_LIBS="-lmysqlclient_r"
-  else
-    apr_addto_bugger="-lmysqlclient_r"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
-
-  fi
+  LIBS="$old_libs"
+  CPPFLAGS="$old_cppflags"
+  LDFLAGS="$old_ldflags"
 
 
   apu_have_sqlite3=0
 
+  old_libs="$LIBS"
+  old_cppflags="$CPPFLAGS"
+  old_ldflags="$LDFLAGS"
+
 
 # Check whether --with-sqlite3 was given.
 if test "${with_sqlite3+set}" = set; then
   withval=$with_sqlite3;
-    apu_have_sqlite3=0
     if test "$withval" = "yes"; then
 
 for ac_header in sqlite3.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -42288,49 +39242,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -42344,81 +39282,77 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
- { echo "$as_me:$LINENO: checking for sqlite3_open in -lsqlite3" >&5
-echo $ECHO_N "checking for sqlite3_open in -lsqlite3... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for sqlite3_open in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; }
 if test "${ac_cv_lib_sqlite3_sqlite3_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
@@ -42450,48 +39384,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_sqlite3_sqlite3_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_sqlite3_sqlite3_open=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
-echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
 if test $ac_cv_lib_sqlite3_sqlite3_open = yes; then
   apu_have_sqlite3=1
 fi
@@ -42501,11 +39423,8 @@ fi
 done
 
     elif test "$withval" = "no"; then
-      apu_have_sqlite3=0
+      :
     else
-      old_cppflags="$CPPFLAGS"
-      old_ldflags="$LDFLAGS"
-
       sqlite3_CPPFLAGS="-I$withval/include"
       sqlite3_LDFLAGS="-L$withval/lib "
 
@@ -42552,25 +39471,26 @@ done
   fi
 
 
-      { echo "$as_me:$LINENO: checking for sqlite3 in $withval" >&5
-echo "$as_me: checking for sqlite3 in $withval" >&6;}
+      { $as_echo "$as_me:$LINENO: checking for sqlite3 in $withval" >&5
+$as_echo "$as_me: checking for sqlite3 in $withval" >&6;}
 
 for ac_header in sqlite3.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -42586,49 +39506,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -42642,81 +39546,77 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
- { echo "$as_me:$LINENO: checking for sqlite3_open in -lsqlite3" >&5
-echo $ECHO_N "checking for sqlite3_open in -lsqlite3... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for sqlite3_open in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; }
 if test "${ac_cv_lib_sqlite3_sqlite3_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
@@ -42748,48 +39648,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_sqlite3_sqlite3_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_sqlite3_sqlite3_open=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
-echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
 if test $ac_cv_lib_sqlite3_sqlite3_open = yes; then
   apu_have_sqlite3=1
 fi
@@ -42800,73 +39688,49 @@ done
 
       if test "$apu_have_sqlite3" != "0"; then
 
-  if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib\""
-    APRUTIL_LDFLAGS="-L$withval/lib"
-  else
-    apr_addto_bugger="-L$withval/lib"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LDFLAGS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LDFLAGS"
-        APRUTIL_LDFLAGS="$APRUTIL_LDFLAGS $i"
-      fi
-    done
-  fi
-
-
-  if test "x$APRUTIL_INCLUDES" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_INCLUDES to \"-I$withval/include\""
-    APRUTIL_INCLUDES="-I$withval/include"
+  if test "x$APRUTIL_PRIV_INCLUDES" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_PRIV_INCLUDES to \"-I$withval/include\""
+    APRUTIL_PRIV_INCLUDES="-I$withval/include"
   else
     apr_addto_bugger="-I$withval/include"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
-      for j in $APRUTIL_INCLUDES; do
+      for j in $APRUTIL_PRIV_INCLUDES; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_INCLUDES"
-        APRUTIL_INCLUDES="$APRUTIL_INCLUDES $i"
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_PRIV_INCLUDES"
+        APRUTIL_PRIV_INCLUDES="$APRUTIL_PRIV_INCLUDES $i"
       fi
     done
   fi
 
       fi
-
-      CPPFLAGS="$old_cppflags"
-      LDFLAGS="$old_ldflags"
     fi
 
 else
 
-    apu_have_sqlite3=0
 
 for ac_header in sqlite3.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -42882,49 +39746,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -42938,81 +39786,77 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
- { echo "$as_me:$LINENO: checking for sqlite3_open in -lsqlite3" >&5
-echo $ECHO_N "checking for sqlite3_open in -lsqlite3... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for sqlite3_open in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; }
 if test "${ac_cv_lib_sqlite3_sqlite3_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
@@ -43044,48 +39888,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_sqlite3_sqlite3_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_sqlite3_sqlite3_open=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
-echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
 if test $ac_cv_lib_sqlite3_sqlite3_open = yes; then
   apu_have_sqlite3=1
 fi
@@ -43101,76 +39933,44 @@ fi
 
 
       if test "$apu_have_sqlite3" = "1"; then
-
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-lsqlite3\""
-    APRUTIL_EXPORT_LIBS="-lsqlite3"
-  else
-    apr_addto_bugger="-lsqlite3"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
-      fi
-    done
+    LDADD_dbd_sqlite3="$sqlite3_LDFLAGS -lsqlite3"
   fi
 
 
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-lsqlite3\""
-    APRUTIL_LIBS="-lsqlite3"
-  else
-    apr_addto_bugger="-lsqlite3"
-    for i in $apr_addto_bugger; do
-      apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
-        if test "x$i" = "x$j"; then
-          apr_addto_duplicate="1"
-          break
-        fi
-      done
-      if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
-      fi
-    done
-  fi
-
-  fi
+  LIBS="$old_libs"
+  CPPFLAGS="$old_cppflags"
+  LDFLAGS="$old_ldflags"
 
 
   apu_have_sqlite2=0
 
+  old_libs="$LIBS"
+  old_cppflags="$CPPFLAGS"
+  old_ldflags="$LDFLAGS"
+
 
 # Check whether --with-sqlite2 was given.
 if test "${with_sqlite2+set}" = set; then
   withval=$with_sqlite2;
-    apu_have_sqlite2=0
     if test "$withval" = "yes"; then
 
 for ac_header in sqlite.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43186,49 +39986,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43242,81 +40026,77 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
- { echo "$as_me:$LINENO: checking for sqlite_open in -lsqlite" >&5
-echo $ECHO_N "checking for sqlite_open in -lsqlite... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for sqlite_open in -lsqlite" >&5
+$as_echo_n "checking for sqlite_open in -lsqlite... " >&6; }
 if test "${ac_cv_lib_sqlite_sqlite_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite  $LIBS"
@@ -43348,48 +40128,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_sqlite_sqlite_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_sqlite_sqlite_open=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_open" >&5
-echo "${ECHO_T}$ac_cv_lib_sqlite_sqlite_open" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_open" >&5
+$as_echo "$ac_cv_lib_sqlite_sqlite_open" >&6; }
 if test $ac_cv_lib_sqlite_sqlite_open = yes; then
   apu_have_sqlite2=1
 fi
@@ -43399,11 +40167,8 @@ fi
 done
 
     elif test "$withval" = "no"; then
-      apu_have_sqlite2=0
+      :
     else
-      old_cppflags="$CPPFLAGS"
-      old_ldflags="$LDFLAGS"
-
       sqlite2_CPPFLAGS="-I$withval/include"
       sqlite2_LDFLAGS="-L$withval/lib "
 
@@ -43450,25 +40215,26 @@ done
   fi
 
 
-      { echo "$as_me:$LINENO: checking for sqlite2 in $withval" >&5
-echo "$as_me: checking for sqlite2 in $withval" >&6;}
+      { $as_echo "$as_me:$LINENO: checking for sqlite2 in $withval" >&5
+$as_echo "$as_me: checking for sqlite2 in $withval" >&6;}
 
 for ac_header in sqlite.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43484,49 +40250,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43540,81 +40290,77 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
- { echo "$as_me:$LINENO: checking for sqlite_open in -lsqlite" >&5
-echo $ECHO_N "checking for sqlite_open in -lsqlite... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for sqlite_open in -lsqlite" >&5
+$as_echo_n "checking for sqlite_open in -lsqlite... " >&6; }
 if test "${ac_cv_lib_sqlite_sqlite_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite  $LIBS"
@@ -43646,48 +40392,276 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_sqlite_sqlite_open=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_sqlite_sqlite_open=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_open" >&5
+$as_echo "$ac_cv_lib_sqlite_sqlite_open" >&6; }
+if test $ac_cv_lib_sqlite_sqlite_open = yes; then
+  apu_have_sqlite2=1
+fi
+
+fi
+
+done
+
+      if test "$apu_have_sqlite2" != "0"; then
+
+  if test "x$APRUTIL_PRIV_INCLUDES" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_PRIV_INCLUDES to \"-I$withval/include\""
+    APRUTIL_PRIV_INCLUDES="-I$withval/include"
+  else
+    apr_addto_bugger="-I$withval/include"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $APRUTIL_PRIV_INCLUDES; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_PRIV_INCLUDES"
+        APRUTIL_PRIV_INCLUDES="$APRUTIL_PRIV_INCLUDES $i"
+      fi
+    done
+  fi
+
+      fi
+    fi
+
+else
+
+
+for ac_header in sqlite.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ { $as_echo "$as_me:$LINENO: checking for sqlite_open in -lsqlite" >&5
+$as_echo_n "checking for sqlite_open in -lsqlite... " >&6; }
+if test "${ac_cv_lib_sqlite_sqlite_open+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsqlite  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sqlite_open ();
+int
+main ()
+{
+return sqlite_open ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_sqlite_sqlite_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_sqlite_sqlite_open=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_open" >&5
-echo "${ECHO_T}$ac_cv_lib_sqlite_sqlite_open" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_open" >&5
+$as_echo "$ac_cv_lib_sqlite_sqlite_open" >&6; }
 if test $ac_cv_lib_sqlite_sqlite_open = yes; then
   apu_have_sqlite2=1
 fi
@@ -43696,75 +40670,104 @@ fi
 
 done
 
-      if test "$apu_have_sqlite2" != "0"; then
 
-  if test "x$APRUTIL_LDFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LDFLAGS to \"-L$withval/lib\""
-    APRUTIL_LDFLAGS="-L$withval/lib"
+fi
+
+
+
+
+      if test "$apu_have_sqlite2" = "1"; then
+    LDADD_dbd_sqlite2="$sqlite2_LDFLAGS -lsqlite"
+  fi
+
+
+  LIBS="$old_libs"
+  CPPFLAGS="$old_cppflags"
+  LDFLAGS="$old_ldflags"
+
+
+  apu_have_oracle=0
+
+  old_libs="$LIBS"
+  old_cppflags="$CPPFLAGS"
+  old_ldflags="$LDFLAGS"
+
+
+# Check whether --with-oracle-include was given.
+if test "${with_oracle_include+set}" = set; then
+  withval=$with_oracle_include;
+fi
+
+
+# Check whether --with-oracle was given.
+if test "${with_oracle+set}" = set; then
+  withval=$with_oracle;
+    if test "$withval" = "yes"; then
+      if test -n "$with_oracle_include"; then
+        oracle_CPPFLAGS="$CPPFLAGS -I$with_oracle_include"
+
+  if test "x$APRUTIL_PRIV_INCLUDES" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_PRIV_INCLUDES to \"-I$with_oracle_include\""
+    APRUTIL_PRIV_INCLUDES="-I$with_oracle_include"
   else
-    apr_addto_bugger="-L$withval/lib"
+    apr_addto_bugger="-I$with_oracle_include"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
-      for j in $APRUTIL_LDFLAGS; do
+      for j in $APRUTIL_PRIV_INCLUDES; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LDFLAGS"
-        APRUTIL_LDFLAGS="$APRUTIL_LDFLAGS $i"
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_PRIV_INCLUDES"
+        APRUTIL_PRIV_INCLUDES="$APRUTIL_PRIV_INCLUDES $i"
       fi
     done
   fi
 
+      fi
 
-  if test "x$APRUTIL_INCLUDES" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_INCLUDES to \"-I$withval/include\""
-    APRUTIL_INCLUDES="-I$withval/include"
+
+  if test "x$CPPFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"$oracle_CPPFLAGS\""
+    CPPFLAGS="$oracle_CPPFLAGS"
   else
-    apr_addto_bugger="-I$withval/include"
+    apr_addto_bugger="$oracle_CPPFLAGS"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
-      for j in $APRUTIL_INCLUDES; do
+      for j in $CPPFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_INCLUDES"
-        APRUTIL_INCLUDES="$APRUTIL_INCLUDES $i"
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
-      fi
-
-      CPPFLAGS="$old_cppflags"
-      LDFLAGS="$old_ldflags"
-    fi
-
-else
 
-    apu_have_sqlite2=0
 
-for ac_header in sqlite.h
+for ac_header in oci.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43780,49 +40783,417 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ { $as_echo "$as_me:$LINENO: checking for OCIEnvCreate in -lclntsh" >&5
+$as_echo_n "checking for OCIEnvCreate in -lclntsh... " >&6; }
+if test "${ac_cv_lib_clntsh_OCIEnvCreate+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lclntsh  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char OCIEnvCreate ();
+int
+main ()
+{
+return OCIEnvCreate ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_clntsh_OCIEnvCreate=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_clntsh_OCIEnvCreate=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCIEnvCreate" >&5
+$as_echo "$ac_cv_lib_clntsh_OCIEnvCreate" >&6; }
+if test $ac_cv_lib_clntsh_OCIEnvCreate = yes; then
+  apu_have_oracle=1
+else
+
+        unset ac_cv_lib_clntsh_OCIEnvCreate
+        oracle_LIBS="-lnnz10"
+
+  if test "x$LIBS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting LIBS to \"$oracle_LIBS\""
+    LIBS="$oracle_LIBS"
+  else
+    apr_addto_bugger="$oracle_LIBS"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $LIBS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
+        LIBS="$LIBS $i"
+      fi
+    done
+  fi
+
+        { $as_echo "$as_me:$LINENO: checking for OCIEnvCreate in -lclntsh" >&5
+$as_echo_n "checking for OCIEnvCreate in -lclntsh... " >&6; }
+if test "${ac_cv_lib_clntsh_OCIEnvCreate+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lclntsh  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char OCIEnvCreate ();
+int
+main ()
+{
+return OCIEnvCreate ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_clntsh_OCIEnvCreate=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_clntsh_OCIEnvCreate=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCIEnvCreate" >&5
+$as_echo "$ac_cv_lib_clntsh_OCIEnvCreate" >&6; }
+if test $ac_cv_lib_clntsh_OCIEnvCreate = yes; then
+  apu_have_oracle=1
+fi
+
+
+fi
+
+fi
+
+done
+
+    elif test "$withval" = "no"; then
+      :
+    else
+      if test -n "$with_oracle_include"; then
+        oracle_CPPFLAGS="$CPPFLAGS -I$with_oracle_include"
+
+  if test "x$APRUTIL_PRIV_INCLUDES" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_PRIV_INCLUDES to \"-I$with_oracle_include\""
+    APRUTIL_PRIV_INCLUDES="-I$with_oracle_include"
+  else
+    apr_addto_bugger="-I$with_oracle_include"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $APRUTIL_PRIV_INCLUDES; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_PRIV_INCLUDES"
+        APRUTIL_PRIV_INCLUDES="$APRUTIL_PRIV_INCLUDES $i"
+      fi
+    done
+  fi
+
+      else
+        oracle_CPPFLAGS="-I$withval/rdbms/demo -I$withval/rdbms/public"
+      fi
+      oracle_LDFLAGS="-L$withval/lib "
+
+
+  if test "x$CPPFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"$oracle_CPPFLAGS\""
+    CPPFLAGS="$oracle_CPPFLAGS"
+  else
+    apr_addto_bugger="$oracle_CPPFLAGS"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $CPPFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $i"
+      fi
+    done
+  fi
+
+
+  if test "x$LDFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"$oracle_LDFLAGS\""
+    LDFLAGS="$oracle_LDFLAGS"
+  else
+    apr_addto_bugger="$oracle_LDFLAGS"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $LDFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
+        LDFLAGS="$LDFLAGS $i"
+      fi
+    done
+  fi
+
+
+      { $as_echo "$as_me:$LINENO: checking for oracle in $withval" >&5
+$as_echo "$as_me: checking for oracle in $withval" >&6;}
+
+for ac_header in oci.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43836,84 +41207,80 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
- { echo "$as_me:$LINENO: checking for sqlite_open in -lsqlite" >&5
-echo $ECHO_N "checking for sqlite_open in -lsqlite... $ECHO_C" >&6; }
-if test "${ac_cv_lib_sqlite_sqlite_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:$LINENO: checking for OCIEnvCreate in -lclntsh" >&5
+$as_echo_n "checking for OCIEnvCreate in -lclntsh... " >&6; }
+if test "${ac_cv_lib_clntsh_OCIEnvCreate+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsqlite  $LIBS"
+LIBS="-lclntsh  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43927,11 +41294,11 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
-char sqlite_open ();
+char OCIEnvCreate ();
 int
 main ()
 {
-return sqlite_open ();
+return OCIEnvCreate ();
   ;
   return 0;
 }
@@ -43942,107 +41309,946 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_clntsh_OCIEnvCreate=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_clntsh_OCIEnvCreate=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCIEnvCreate" >&5
+$as_echo "$ac_cv_lib_clntsh_OCIEnvCreate" >&6; }
+if test $ac_cv_lib_clntsh_OCIEnvCreate = yes; then
+  apu_have_oracle=1
+else
+
+        unset ac_cv_lib_clntsh_OCIEnvCreate
+        oracle_LIBS="-lnnz10"
+
+  if test "x$LIBS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting LIBS to \"$oracle_LIBS\""
+    LIBS="$oracle_LIBS"
+  else
+    apr_addto_bugger="$oracle_LIBS"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $LIBS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
+        LIBS="$LIBS $i"
+      fi
+    done
+  fi
+
+        { $as_echo "$as_me:$LINENO: checking for OCIEnvCreate in -lclntsh" >&5
+$as_echo_n "checking for OCIEnvCreate in -lclntsh... " >&6; }
+if test "${ac_cv_lib_clntsh_OCIEnvCreate+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lclntsh  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char OCIEnvCreate ();
+int
+main ()
+{
+return OCIEnvCreate ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_clntsh_OCIEnvCreate=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_clntsh_OCIEnvCreate=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCIEnvCreate" >&5
+$as_echo "$ac_cv_lib_clntsh_OCIEnvCreate" >&6; }
+if test $ac_cv_lib_clntsh_OCIEnvCreate = yes; then
+  apu_have_oracle=1
+fi
+
+
+fi
+
+fi
+
+done
+
+      if test "$apu_have_oracle" != "0"; then
+        oracle_LDFLAGS="$oracle_LDFLAGS -R$withval/lib"
+        if test -z "$with_oracle_include"; then
+
+  if test "x$APRUTIL_PRIV_INCLUDES" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_PRIV_INCLUDES to \"-I$withval/rdbms/demo\""
+    APRUTIL_PRIV_INCLUDES="-I$withval/rdbms/demo"
+  else
+    apr_addto_bugger="-I$withval/rdbms/demo"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $APRUTIL_PRIV_INCLUDES; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_PRIV_INCLUDES"
+        APRUTIL_PRIV_INCLUDES="$APRUTIL_PRIV_INCLUDES $i"
+      fi
+    done
+  fi
+
+
+  if test "x$APRUTIL_PRIV_INCLUDES" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_PRIV_INCLUDES to \"-I$withval/rdbms/public\""
+    APRUTIL_PRIV_INCLUDES="-I$withval/rdbms/public"
+  else
+    apr_addto_bugger="-I$withval/rdbms/public"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $APRUTIL_PRIV_INCLUDES; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_PRIV_INCLUDES"
+        APRUTIL_PRIV_INCLUDES="$APRUTIL_PRIV_INCLUDES $i"
+      fi
+    done
+  fi
+
+        fi
+      fi
+    fi
+
+fi
+
+
+
+
+      if test "$apu_have_oracle" = "1"; then
+    LDADD_dbd_oracle="$oracle_LDFLAGS -lclntsh $oracle_LIBS"
+  fi
+
+
+  LIBS="$old_libs"
+  CPPFLAGS="$old_cppflags"
+  LDFLAGS="$old_ldflags"
+
+
+  apu_have_freetds=0
+
+  old_libs="$LIBS"
+  old_cppflags="$CPPFLAGS"
+  old_ldflags="$LDFLAGS"
+
+
+# Check whether --with-freetds was given.
+if test "${with_freetds+set}" = set; then
+  withval=$with_freetds;
+    if test "$withval" = "yes"; then
+
+for ac_header in sybdb.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_sqlite_sqlite_open=yes
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_sqlite_sqlite_open=no
+	ac_header_compiler=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite_sqlite_open" >&5
-echo "${ECHO_T}$ac_cv_lib_sqlite_sqlite_open" >&6; }
-if test $ac_cv_lib_sqlite_sqlite_open = yes; then
-  apu_have_sqlite2=1
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
 fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ { $as_echo "$as_me:$LINENO: checking for tdsdbopen in -lsybdb" >&5
+$as_echo_n "checking for tdsdbopen in -lsybdb... " >&6; }
+if test "${ac_cv_lib_sybdb_tdsdbopen+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsybdb  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-done
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tdsdbopen ();
+int
+main ()
+{
+return tdsdbopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_sybdb_tdsdbopen=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_cv_lib_sybdb_tdsdbopen=no
+fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sybdb_tdsdbopen" >&5
+$as_echo "$ac_cv_lib_sybdb_tdsdbopen" >&6; }
+if test $ac_cv_lib_sybdb_tdsdbopen = yes; then
+  apu_have_freetds=1
 fi
 
+fi
 
+done
 
+    elif test "$withval" = "no"; then
+      :
+    else
+      sybdb_CPPFLAGS="-I$withval/include"
+      sybdb_LDFLAGS="-L$withval/lib "
 
-      if test "$apu_have_sqlite2" = "1"; then
 
-  if test "x$APRUTIL_EXPORT_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_EXPORT_LIBS to \"-lsqlite\""
-    APRUTIL_EXPORT_LIBS="-lsqlite"
+  if test "x$CPPFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"$sybdb_CPPFLAGS\""
+    CPPFLAGS="$sybdb_CPPFLAGS"
   else
-    apr_addto_bugger="-lsqlite"
+    apr_addto_bugger="$sybdb_CPPFLAGS"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
-      for j in $APRUTIL_EXPORT_LIBS; do
+      for j in $CPPFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_EXPORT_LIBS"
-        APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $i"
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $i"
       fi
     done
   fi
 
 
-  if test "x$APRUTIL_LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"-lsqlite\""
-    APRUTIL_LIBS="-lsqlite"
+  if test "x$LDFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"$sybdb_LDFLAGS\""
+    LDFLAGS="$sybdb_LDFLAGS"
   else
-    apr_addto_bugger="-lsqlite"
+    apr_addto_bugger="$sybdb_LDFLAGS"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
-      for j in $APRUTIL_LIBS; do
+      for j in $LDFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_LIBS"
-        APRUTIL_LIBS="$APRUTIL_LIBS $i"
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
+        LDFLAGS="$LDFLAGS $i"
       fi
     done
   fi
 
+
+      { $as_echo "$as_me:$LINENO: checking for freetds in $withval" >&5
+$as_echo "$as_me: checking for freetds in $withval" >&6;}
+
+for ac_header in sybdb.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ { $as_echo "$as_me:$LINENO: checking for tdsdbopen in -lsybdb" >&5
+$as_echo_n "checking for tdsdbopen in -lsybdb... " >&6; }
+if test "${ac_cv_lib_sybdb_tdsdbopen+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsybdb  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tdsdbopen ();
+int
+main ()
+{
+return tdsdbopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_sybdb_tdsdbopen=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_sybdb_tdsdbopen=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sybdb_tdsdbopen" >&5
+$as_echo "$ac_cv_lib_sybdb_tdsdbopen" >&6; }
+if test $ac_cv_lib_sybdb_tdsdbopen = yes; then
+  apu_have_freetds=1
+fi
+
+fi
+
+done
+
+      if test "$apu_have_freetds" != "0"; then
+
+  if test "x$APRUTIL_PRIV_INCLUDES" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting APRUTIL_PRIV_INCLUDES to \"-I$withval/include\""
+    APRUTIL_PRIV_INCLUDES="-I$withval/include"
+  else
+    apr_addto_bugger="-I$withval/include"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $APRUTIL_PRIV_INCLUDES; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to APRUTIL_PRIV_INCLUDES"
+        APRUTIL_PRIV_INCLUDES="$APRUTIL_PRIV_INCLUDES $i"
+      fi
+    done
   fi
 
+      fi
+    fi
+
+else
+
+
+for ac_header in sybdb.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ { $as_echo "$as_me:$LINENO: checking for tdsdbopen in -lsybdb" >&5
+$as_echo_n "checking for tdsdbopen in -lsybdb... " >&6; }
+if test "${ac_cv_lib_sybdb_tdsdbopen+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsybdb  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tdsdbopen ();
+int
+main ()
+{
+return tdsdbopen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_sybdb_tdsdbopen=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_sybdb_tdsdbopen=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sybdb_tdsdbopen" >&5
+$as_echo "$ac_cv_lib_sybdb_tdsdbopen" >&6; }
+if test $ac_cv_lib_sybdb_tdsdbopen = yes; then
+  apu_have_freetds=1
+fi
+
+fi
+
+done
+
+
+fi
+
+
+
+
+      if test "$apu_have_freetds" = "1"; then
+    LDADD_dbd_freetds="$sybdb_LDFLAGS -lsybdb"
+              fi
+
+
+  LIBS="$old_libs"
+  CPPFLAGS="$old_cppflags"
+  LDFLAGS="$old_ldflags"
+
 
 
 save_cppflags="$CPPFLAGS"
@@ -44059,12 +42265,12 @@ apu_try_builtin_expat=1
 if test "${with_expat+set}" = set; then
   withval=$with_expat;
   if test "$withval" = "yes"; then
-    { { echo "$as_me:$LINENO: error: a directory must be specified for --with-expat" >&5
-echo "$as_me: error: a directory must be specified for --with-expat" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: a directory must be specified for --with-expat" >&5
+$as_echo "$as_me: error: a directory must be specified for --with-expat" >&2;}
    { (exit 1); exit 1; }; }
   elif test "$withval" = "no"; then
-    { { echo "$as_me:$LINENO: error: Expat cannot be disabled (at this time)" >&5
-echo "$as_me: error: Expat cannot be disabled (at this time)" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Expat cannot be disabled (at this time)" >&5
+$as_echo "$as_me: error: Expat cannot be disabled (at this time)" >&2;}
    { (exit 1); exit 1; }; }
   elif test "$withval" = "builtin"; then
     apu_try_external_expat=0
@@ -44167,10 +42373,10 @@ if test $apu_try_external_expat = 1; then
 
 
 
-{ echo "$as_me:$LINENO: checking Expat 1.95.x" >&5
-echo $ECHO_N "checking Expat 1.95.x... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking Expat 1.95.x" >&5
+$as_echo_n "checking Expat 1.95.x... " >&6; }
 if test "${apu_cv_expat_system+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   apu_expat_LIBS=$LIBS
@@ -44197,49 +42403,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   apu_cv_expat_system=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	apu_cv_expat_system=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$apu_expat_LIBS
 
 fi
-{ echo "$as_me:$LINENO: result: $apu_cv_expat_system" >&5
-echo "${ECHO_T}$apu_cv_expat_system" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apu_cv_expat_system" >&5
+$as_echo "$apu_cv_expat_system" >&6; }
 
 if test $apu_cv_expat_system = yes; then
 
@@ -44258,10 +42452,10 @@ fi
 
   if test $apu_has_expat = 0; then
 
-{ echo "$as_me:$LINENO: checking old Debian-packaged expat" >&5
-echo $ECHO_N "checking old Debian-packaged expat... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking old Debian-packaged expat" >&5
+$as_echo_n "checking old Debian-packaged expat... " >&6; }
 if test "${apu_cv_expat_debian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   apu_expat_LIBS=$LIBS
@@ -44288,49 +42482,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   apu_cv_expat_debian=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	apu_cv_expat_debian=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$apu_expat_LIBS
 
 fi
-{ echo "$as_me:$LINENO: result: $apu_cv_expat_debian" >&5
-echo "${ECHO_T}$apu_cv_expat_debian" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apu_cv_expat_debian" >&5
+$as_echo "$apu_cv_expat_debian" >&6; }
 
 if test $apu_cv_expat_debian = yes; then
 
@@ -44350,10 +42532,10 @@ fi
 
   if test $apu_has_expat = 0; then
 
-{ echo "$as_me:$LINENO: checking old FreeBSD-packaged expat" >&5
-echo $ECHO_N "checking old FreeBSD-packaged expat... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking old FreeBSD-packaged expat" >&5
+$as_echo_n "checking old FreeBSD-packaged expat... " >&6; }
 if test "${apu_cv_expat_freebsd+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   apu_expat_LIBS=$LIBS
@@ -44380,49 +42562,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   apu_cv_expat_freebsd=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	apu_cv_expat_freebsd=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$apu_expat_LIBS
 
 fi
-{ echo "$as_me:$LINENO: result: $apu_cv_expat_freebsd" >&5
-echo "${ECHO_T}$apu_cv_expat_freebsd" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apu_cv_expat_freebsd" >&5
+$as_echo "$apu_cv_expat_freebsd" >&6; }
 
 if test $apu_cv_expat_freebsd = yes; then
 
@@ -44442,10 +42612,10 @@ fi
 
   if test $apu_has_expat = 0; then
 
-{ echo "$as_me:$LINENO: checking Expat 1.0/1.1" >&5
-echo $ECHO_N "checking Expat 1.0/1.1... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking Expat 1.0/1.1" >&5
+$as_echo_n "checking Expat 1.0/1.1... " >&6; }
 if test "${apu_cv_expat_1011+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   apu_expat_LIBS=$LIBS
@@ -44472,49 +42642,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   apu_cv_expat_1011=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	apu_cv_expat_1011=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$apu_expat_LIBS
 
 fi
-{ echo "$as_me:$LINENO: result: $apu_cv_expat_1011" >&5
-echo "${ECHO_T}$apu_cv_expat_1011" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apu_cv_expat_1011" >&5
+$as_echo "$apu_cv_expat_1011" >&6; }
 
 if test $apu_cv_expat_1011 = yes; then
 
@@ -44577,10 +42735,10 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking Expat 1.95.x in /usr/local" >&5
-echo $ECHO_N "checking Expat 1.95.x in /usr/local... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking Expat 1.95.x in /usr/local" >&5
+$as_echo_n "checking Expat 1.95.x in /usr/local... " >&6; }
 if test "${apu_cv_expat_usrlocal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   apu_expat_LIBS=$LIBS
@@ -44607,49 +42765,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   apu_cv_expat_usrlocal=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	apu_cv_expat_usrlocal=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LIBS=$apu_expat_LIBS
 
 fi
-{ echo "$as_me:$LINENO: result: $apu_cv_expat_usrlocal" >&5
-echo "${ECHO_T}$apu_cv_expat_usrlocal" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apu_cv_expat_usrlocal" >&5
+$as_echo "$apu_cv_expat_usrlocal" >&6; }
 
 if test $apu_cv_expat_usrlocal = yes; then
 
@@ -44782,11 +42928,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -44819,12 +42966,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -44869,16 +43016,16 @@ rm -f confcache
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -45036,8 +43183,8 @@ if test "${with_iconv+set}" = set; then
     done
   fi
 
-        { echo "$as_me:$LINENO: result: using apr-iconv" >&5
-echo "${ECHO_T}using apr-iconv" >&6; }
+        { $as_echo "$as_me:$LINENO: result: using apr-iconv" >&5
+$as_echo "using apr-iconv" >&6; }
       elif test -f "$apu_iconv_dir/include/iconv.h"; then
         have_apr_iconv="0"
         have_iconv="1"
@@ -45091,17 +43238,17 @@ fi
 
 if test "$want_iconv" = "1" -a "$have_apr_iconv" != "1"; then
   if test "${ac_cv_header_iconv_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for iconv.h" >&5
-echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for iconv.h" >&5
+$as_echo_n "checking for iconv.h... " >&6; }
 if test "${ac_cv_header_iconv_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5
-echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5
+$as_echo "$ac_cv_header_iconv_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking iconv.h usability" >&5
-echo $ECHO_N "checking iconv.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking iconv.h usability" >&5
+$as_echo_n "checking iconv.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -45117,49 +43264,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking iconv.h presence" >&5
-echo $ECHO_N "checking iconv.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking iconv.h presence" >&5
+$as_echo_n "checking iconv.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -45173,70 +43304,64 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: iconv.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: iconv.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: iconv.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: iconv.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: iconv.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: iconv.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: iconv.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: iconv.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: iconv.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: iconv.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: iconv.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: iconv.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: iconv.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for iconv.h" >&5
-echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: iconv.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: iconv.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: iconv.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: iconv.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: iconv.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: iconv.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: iconv.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: iconv.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: iconv.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: iconv.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: iconv.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for iconv.h" >&5
+$as_echo_n "checking for iconv.h... " >&6; }
 if test "${ac_cv_header_iconv_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_iconv_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5
-echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5
+$as_echo "$ac_cv_header_iconv_h" >&6; }
 
 fi
 if test $ac_cv_header_iconv_h = yes; then
@@ -45269,37 +43394,24 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
    have_iconv="1"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -45354,34 +43466,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 
   if test "x$APRUTIL_LIBS" = "x"; then
@@ -45427,13 +43526,14 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 
       have_iconv="1"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	 have_iconv="0"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
 
@@ -45461,7 +43561,8 @@ rm -f core conftest.err conftest.$ac_objext \
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
 
@@ -45475,8 +43576,8 @@ fi
 if test "$want_iconv" = "1" -a "$apu_iconv_dir" != "unknown"; then
   if test "$have_iconv" != "1"; then
     if test "$have_apr_iconv" != "1"; then
-      { { echo "$as_me:$LINENO: error: iconv support requested, but not found" >&5
-echo "$as_me: error: iconv support requested, but not found" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: iconv support requested, but not found" >&5
+$as_echo "$as_me: error: iconv support requested, but not found" >&2;}
    { (exit 1); exit 1; }; }
     fi
   fi
@@ -45566,8 +43667,8 @@ fi
 
 if test "$have_iconv" = "1"; then
 
-{ echo "$as_me:$LINENO: checking for type of inbuf parameter to iconv" >&5
-echo $ECHO_N "checking for type of inbuf parameter to iconv... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for type of inbuf parameter to iconv" >&5
+$as_echo_n "checking for type of inbuf parameter to iconv... " >&6; }
 if test "x$apu_iconv_inbuf_const" = "x"; then
     apr_save_CFLAGS=$CFLAGS
  CFLAGS="$CFLAGS $CFLAGS_WARN"
@@ -45593,37 +43694,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   apu_iconv_inbuf_const="0"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	apu_iconv_inbuf_const="1"
@@ -45643,8 +43728,8 @@ _ACEOF
 else
     msg="char **"
 fi
-{ echo "$as_me:$LINENO: result: $msg" >&5
-echo "${ECHO_T}$msg" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $msg" >&5
+$as_echo "$msg" >&6; }
 
 fi
 
@@ -45653,20 +43738,21 @@ fi
 
 for ac_header in iconv.h langinfo.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -45682,49 +43768,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -45738,76 +43808,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -45829,11 +43895,11 @@ done
 
 for ac_func in nl_langinfo
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -45886,51 +43952,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -45947,10 +44003,10 @@ do
 done
 
 
-  { echo "$as_me:$LINENO: checking for CODESET in langinfo.h" >&5
-echo $ECHO_N "checking for CODESET in langinfo.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for CODESET in langinfo.h" >&5
+$as_echo_n "checking for CODESET in langinfo.h... " >&6; }
 if test "${ac_cv_define_CODESET+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
@@ -45976,8 +44032,8 @@ rm -f conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_define_CODESET" >&5
-echo "${ECHO_T}$ac_cv_define_CODESET" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_CODESET" >&5
+$as_echo "$ac_cv_define_CODESET" >&6; }
   if test "$ac_cv_define_CODESET" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -45991,10 +44047,71 @@ _ACEOF
 
 
 
-{ echo "$as_me:$LINENO: checking for library containing crypt" >&5
-echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6; }
+
+
+  # Check whether --enable-util-dso was given.
+if test "${enable_util_dso+set}" = set; then
+  enableval=$enable_util_dso;
+fi
+
+
+  if test "$enable_util_dso" = "no"; then
+     # Statically link the DBD drivers:
+
+     objs=
+     test $apu_have_oracle = 1 && objs="$objs dbd/apr_dbd_oracle.lo"
+     test $apu_have_pgsql = 1 && objs="$objs dbd/apr_dbd_pgsql.lo"
+     test $apu_have_mysql = 1 && objs="$objs dbd/apr_dbd_mysql.lo"
+     test $apu_have_sqlite2 = 1 && objs="$objs dbd/apr_dbd_sqlite2.lo"
+     test $apu_have_sqlite3 = 1 && objs="$objs dbd/apr_dbd_sqlite3.lo"
+     test $apu_have_freetds = 1 && objs="$objs dbd/apr_dbd_freetds.lo"
+     test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_init.lo"
+     test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_option.lo"
+     test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_rebind.lo"
+     EXTRA_OBJECTS="$EXTRA_OBJECTS $objs"
+
+     # Use libtool *.la for mysql if available
+     if test $apu_have_mysql = 1; then
+       for flag in $LDADD_dbd_mysql
+       do
+         dir=`echo $flag | grep "^-L" | sed s:-L::`
+         if test "x$dir" != 'x'; then
+           if test -f "$dir/libmysqlclient_r.la"; then
+             LDADD_dbd_mysql=$dir/libmysqlclient_r.la
+             break
+           fi
+         fi
+       done
+     fi
+
+     APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds"
+     APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_ldap"
+     APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds"
+     APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_ldap"
+  else
+
+cat >>confdefs.h <<\_ACEOF
+#define APU_DSO_BUILD 1
+_ACEOF
+
+
+     dsos=
+     test $apu_have_oracle = 1 && dsos="$dsos dbd/apr_dbd_oracle.la"
+     test $apu_have_pgsql = 1 && dsos="$dsos dbd/apr_dbd_pgsql.la"
+     test $apu_have_mysql = 1 && dsos="$dsos dbd/apr_dbd_mysql.la"
+     test $apu_have_sqlite2 = 1 && dsos="$dsos dbd/apr_dbd_sqlite2.la"
+     test $apu_have_sqlite3 = 1 && dsos="$dsos dbd/apr_dbd_sqlite3.la"
+     test $apu_have_freetds = 1 && dsos="$dsos dbd/apr_dbd_freetds.la"
+     test $apu_has_ldap = 1 && dsos="$dsos ldap/apr_ldap.la"
+
+     APU_MODULES="$APU_MODULES $dsos"
+  fi
+
+
+{ $as_echo "$as_me:$LINENO: checking for library containing crypt" >&5
+$as_echo_n "checking for library containing crypt... " >&6; }
 if test "${ac_cv_search_crypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -46032,43 +44149,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_crypt=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_crypt+set}" = set; then
   break
@@ -46082,16 +44187,16 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
-echo "${ECHO_T}$ac_cv_search_crypt" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
+$as_echo "$ac_cv_search_crypt" >&6; }
 ac_res=$ac_cv_search_crypt
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ echo "$as_me:$LINENO: checking if system crypt() function is threadsafe" >&5
-echo $ECHO_N "checking if system crypt() function is threadsafe... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if system crypt() function is threadsafe" >&5
+$as_echo_n "checking if system crypt() function is threadsafe... " >&6; }
 if test "x$apu_crypt_threadsafe" = "x1"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -46102,17 +44207,17 @@ _ACEOF
 else
   msg="no"
 fi
-{ echo "$as_me:$LINENO: result: $msg" >&5
-echo "${ECHO_T}$msg" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $msg" >&5
+$as_echo "$msg" >&6; }
 
 
 for ac_func in crypt_r
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -46165,51 +44270,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
   crypt_r="1"
 else
@@ -46220,10 +44315,10 @@ done
 if test "$crypt_r" = "1"; then
 
 
-{ echo "$as_me:$LINENO: checking style of crypt_r" >&5
-echo $ECHO_N "checking style of crypt_r... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking style of crypt_r" >&5
+$as_echo_n "checking style of crypt_r... " >&6; }
 if test "${apr_cv_crypt_r_style+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -46247,37 +44342,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   apr_cv_crypt_r_style=cryptd
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -46302,37 +44381,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   apr_cv_crypt_r_style=struct_crypt_data
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	apr_cv_crypt_r_style=none
@@ -46343,8 +44406,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_crypt_r_style" >&5
-echo "${ECHO_T}$apr_cv_crypt_r_style" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_crypt_r_style" >&5
+$as_echo "$apr_cv_crypt_r_style" >&6; }
 
 if test "$apr_cv_crypt_r_style" = "cryptd"; then
 
@@ -46370,6 +44433,35 @@ lib_target=$APR_LIB_TARGET
 APRUTIL_LIBNAME="aprutil${libsuffix}"
 
 
+# Set up destination directory for DSOs.
+APU_DSO_LIBDIR="\${libdir}/apr-util-${APRUTIL_MAJOR_VERSION}"
+# Set APU_HAVE_MODULES appropriately for the Makefile
+if test -n "$APU_MODULES"; then
+   APU_HAVE_MODULES=yes
+else
+   APU_HAVE_MODULES=no
+fi
+# Define expanded libdir for apu_config.h
+
+ap_last=
+ap_cur="$APU_DSO_LIBDIR"
+while test "x${ap_cur}" != "x${ap_last}";
+do
+  ap_last="${ap_cur}"
+  ap_cur=`eval "echo ${ap_cur}"`
+done
+abs_dso_libdir="${ap_cur}"
+
+
+cat >>confdefs.h <<_ACEOF
+#define APU_DSO_LIBDIR "$abs_dso_libdir"
+_ACEOF
+
+
+
+
+
+
 
   if test "x$APRUTIL_LIBS" = "x"; then
     test "x$silent" != "xyes" && echo "  setting APRUTIL_LIBS to \"$APR_LIBS\""
@@ -46465,11 +44557,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -46502,12 +44595,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -46523,7 +44616,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -46536,11 +44629,12 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -46553,24 +44647,28 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
 
 
 # PATH needs CR
@@ -46581,17 +44679,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -46607,8 +44733,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -46631,7 +44755,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -46644,17 +44768,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -46676,7 +44793,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -46727,7 +44844,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -46755,7 +44872,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -46768,19 +44884,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -46794,19 +44913,28 @@ else
   as_mkdir_p=false
 fi
 
-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -46822,7 +44950,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -46835,7 +44963,7 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -46843,7 +44971,7 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -46851,14 +44979,14 @@ current configuration.
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
+  -V, --version    print version number and configuration settings, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+                   instantiate the configuration file FILE
   --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -46872,24 +45000,24 @@ $config_commands
 Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.60,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.62,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -46911,30 +45039,36 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
+    { $as_echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -46953,27 +45087,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -46983,7 +45119,7 @@ APRUTIL_MAJOR_VERSION=$APRUTIL_MAJOR_VERSION
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -47002,8 +45138,8 @@ do
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -47044,228 +45180,143 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
 
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-APU_CONFIG_LOCATION!$APU_CONFIG_LOCATION$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-target!$target$ac_delim
-target_cpu!$target_cpu$ac_delim
-target_vendor!$target_vendor$ac_delim
-target_os!$target_os$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-LT_NO_INSTALL!$LT_NO_INSTALL$ac_delim
-top_builddir!$top_builddir$ac_delim
-abs_srcdir!$abs_srcdir$ac_delim
-abs_builddir!$abs_builddir$ac_delim
-APRUTIL_DOTTED_VERSION!$APRUTIL_DOTTED_VERSION$ac_delim
-APRUTIL_MAJOR_VERSION!$APRUTIL_MAJOR_VERSION$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-APR_INCLUDES!$APR_INCLUDES$ac_delim
-APR_LIBS!$APR_LIBS$ac_delim
-APR_BUILD_DIR!$APR_BUILD_DIR$ac_delim
-APR_ICONV_DIR!$APR_ICONV_DIR$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-ldap_h!$ldap_h$ac_delim
-lber_h!$lber_h$ac_delim
-ldap_ssl_h!$ldap_ssl_h$ac_delim
-apu_has_ldapssl_client_init!$apu_has_ldapssl_client_init$ac_delim
-apu_has_ldapssl_client_deinit!$apu_has_ldapssl_client_deinit$ac_delim
-apu_has_ldapssl_add_trusted_cert!$apu_has_ldapssl_add_trusted_cert$ac_delim
-apu_has_ldap_start_tls_s!$apu_has_ldap_start_tls_s$ac_delim
-apu_has_ldapssl_init!$apu_has_ldapssl_init$ac_delim
-apu_has_ldap_sslinit!$apu_has_ldap_sslinit$ac_delim
-apu_has_ldapssl_install_routines!$apu_has_ldapssl_install_routines$ac_delim
-apu_has_ldap!$apu_has_ldap$ac_delim
-apu_has_ldap_openldap!$apu_has_ldap_openldap$ac_delim
-apu_has_ldap_solaris!$apu_has_ldap_solaris$ac_delim
-apu_has_ldap_novell!$apu_has_ldap_novell$ac_delim
-apu_has_ldap_microsoft!$apu_has_ldap_microsoft$ac_delim
-apu_has_ldap_netscape!$apu_has_ldap_netscape$ac_delim
-apu_has_ldap_mozilla!$apu_has_ldap_mozilla$ac_delim
-apu_has_ldap_zos!$apu_has_ldap_zos$ac_delim
-apu_has_ldap_other!$apu_has_ldap_other$ac_delim
-apu_use_sdbm!$apu_use_sdbm$ac_delim
-apu_use_gdbm!$apu_use_gdbm$ac_delim
-apu_use_ndbm!$apu_use_ndbm$ac_delim
-apu_use_db!$apu_use_db$ac_delim
-apu_have_sdbm!$apu_have_sdbm$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
 fi
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-apu_have_gdbm!$apu_have_gdbm$ac_delim
-apu_have_ndbm!$apu_have_ndbm$ac_delim
-apu_have_db!$apu_have_db$ac_delim
-apu_db_header!$apu_db_header$ac_delim
-apu_db_version!$apu_db_version$ac_delim
-apu_have_pgsql!$apu_have_pgsql$ac_delim
-MYSQL_CONFIG!$MYSQL_CONFIG$ac_delim
-apu_have_mysql!$apu_have_mysql$ac_delim
-apu_have_sqlite3!$apu_have_sqlite3$ac_delim
-apu_have_sqlite2!$apu_have_sqlite2$ac_delim
-APR_XML_DIR!$APR_XML_DIR$ac_delim
-have_iconv!$have_iconv$ac_delim
-have_apr_iconv!$have_apr_iconv$ac_delim
-so_ext!$so_ext$ac_delim
-lib_target!$lib_target$ac_delim
-APRUTIL_LIBNAME!$APRUTIL_LIBNAME$ac_delim
-APRUTIL_EXPORT_LIBS!$APRUTIL_EXPORT_LIBS$ac_delim
-APRUTIL_PRIV_INCLUDES!$APRUTIL_PRIV_INCLUDES$ac_delim
-APRUTIL_INCLUDES!$APRUTIL_INCLUDES$ac_delim
-APRUTIL_LDFLAGS!$APRUTIL_LDFLAGS$ac_delim
-APRUTIL_LIBS!$APRUTIL_LIBS$ac_delim
-INCLUDE_RULES!$INCLUDE_RULES$ac_delim
-INCLUDE_OUTPUTS!$INCLUDE_OUTPUTS$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 25; then
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+  print line
+}
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -47281,19 +45332,133 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    prefix = substr(line, 1, index(line, defundef) - 1)
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", line, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -47322,26 +45487,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -47351,7 +45528,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -47377,7 +45554,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -47386,7 +45563,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -47407,17 +45584,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -47457,12 +45634,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -47471,13 +45649,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -47491,15 +45670,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -47509,123 +45689,62 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
  ;;
 
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -47644,6 +45763,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -47665,4 +45789,8 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
diff --git a/srclib/apr-util/configure.in b/srclib/apr-util/configure.in
index 13d61bd7..37a591f5 100644
--- a/srclib/apr-util/configure.in
+++ b/srclib/apr-util/configure.in
@@ -15,6 +15,7 @@ sinclude(build/apr_common.m4)
 sinclude(build/find_apr.m4)
 sinclude(build/dbm.m4)
 sinclude(build/dbd.m4)
+sinclude(build/dso.m4)
 
 dnl Generate ./config.nice for reproducing runs of configure
 dnl 
@@ -68,8 +69,11 @@ version_hdr="$abs_srcdir/include/apu_version.h"
 APRUTIL_MAJOR_VERSION="`$get_version major $version_hdr APU`"
 APRUTIL_DOTTED_VERSION="`$get_version all $version_hdr APU`"
 
+APU_LTVERSION="-version-info `$get_version libtool $version_hdr APU`"
+
 AC_SUBST(APRUTIL_DOTTED_VERSION)
 AC_SUBST(APRUTIL_MAJOR_VERSION)
+AC_SUBST(APU_LTVERSION)
 
 echo "APR-util Version: ${APRUTIL_DOTTED_VERSION}"
 
@@ -106,20 +110,39 @@ APR_SETIFNULL(CC, `$apr_config --cc`)
 APR_SETIFNULL(CPP, `$apr_config --cpp`)
 APR_ADDTO(CFLAGS, `$apr_config --cflags`)
 APR_ADDTO(CPPFLAGS, `$apr_config --cppflags`)
+apr_shlibpath_var=`$apr_config --shlib-path-var`
+AC_SUBST(apr_shlibpath_var)
 
 dnl
 dnl  Find the APR-ICONV directory.
 dnl
-if test -d ../apr-iconv; then
-  APR_SUBDIR_CONFIG(../apr-iconv,
-                    [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir],
-                    [--enable-layout=*|\'--enable-layout=*])
-  APRUTIL_EXPORT_LIBS="$abs_srcdir/../apr-iconv/lib/libapriconv.la $APRUTIL_EXPORT_LIBS"
-  APRUTIL_INCLUDES="-I$abs_srcdir/../apr-iconv/include $APRUTIL_INCLUDES"
-  APR_ICONV_DIR=../apr-iconv
-else
-  APR_ICONV_DIR=""
-fi
+AC_ARG_WITH(apr-iconv,
+            [  --with-apr-iconv=DIR    relative path to apr-iconv source],
+  [ apu_apriconv_dir="$withval"
+    if test "$apu_apriconv_dir" != "no"; then
+      if test -d "$apu_apriconv_dir"; then
+        APR_SUBDIR_CONFIG("$apu_apriconv_dir",
+                          [$apache_apr_flags \
+                             --prefix=$prefix \
+                             --exec-prefix=$exec_prefix \
+                             --libdir=$libdir \
+                             --includedir=$includedir \
+                             --bindir=$bindir \
+                             --datadir=$datadir \
+                             --with-installbuilddir=$installbuilddir],
+                          [--enable-layout=*|\'--enable-layout=*])
+        APRUTIL_EXPORT_LIBS="$abs_srcdir/$apu_apriconv_dir/lib/libapriconv.la \
+                             $APRUTIL_EXPORT_LIBS"
+        APRUTIL_INCLUDES="-I$abs_srcdir/apu_apriconv_dir/include \
+                          $APRUTIL_INCLUDES"
+        APR_ICONV_DIR="$apu_apriconv_dir"
+      else
+       APR_ICONV_DIR=""
+      fi
+    else
+      APR_ICONV_DIR=""
+    fi
+  ])
 AC_SUBST(APR_ICONV_DIR)
 
 dnl Find LDAP library
@@ -132,9 +155,14 @@ APU_CHECK_DBD
 APU_CHECK_DBD_MYSQL
 APU_CHECK_DBD_SQLITE3
 APU_CHECK_DBD_SQLITE2
+APU_CHECK_DBD_ORACLE
+APU_CHECK_DBD_FREETDS
 APU_FIND_EXPAT
 APU_FIND_ICONV
 
+dnl Enable DSO build; must be last:
+APU_CHECK_UTIL_DSO
+
 AC_SEARCH_LIBS(crypt, crypt ufc)
 AC_MSG_CHECKING(if system crypt() function is threadsafe)
 if test "x$apu_crypt_threadsafe" = "x1"; then
@@ -158,6 +186,23 @@ AC_SUBST(lib_target)
 APRUTIL_LIBNAME="aprutil${libsuffix}"
 AC_SUBST(APRUTIL_LIBNAME)
 
+# Set up destination directory for DSOs.
+APU_DSO_LIBDIR="\${libdir}/apr-util-${APRUTIL_MAJOR_VERSION}"
+# Set APU_HAVE_MODULES appropriately for the Makefile
+if test -n "$APU_MODULES"; then 
+   APU_HAVE_MODULES=yes
+else
+   APU_HAVE_MODULES=no
+fi
+# Define expanded libdir for apu_config.h
+APR_EXPAND_VAR(abs_dso_libdir, $APU_DSO_LIBDIR)
+AC_DEFINE_UNQUOTED([APU_DSO_LIBDIR], ["$abs_dso_libdir"],
+                   [Define to be absolute path to DSO directory])
+AC_SUBST(APU_HAVE_MODULES)
+AC_SUBST(APU_DSO_LIBDIR)
+AC_SUBST(APU_MODULES)
+AC_SUBST(EXTRA_OBJECTS)
+
 dnl
 dnl Prep all the flags and stuff for compilation and export to other builds
 dnl
diff --git a/srclib/apr-util/crypto/apr_md5.c b/srclib/apr-util/crypto/apr_md5.c
index 313896f3..691cc878 100644
--- a/srclib/apr-util/crypto/apr_md5.c
+++ b/srclib/apr-util/crypto/apr_md5.c
@@ -102,7 +102,7 @@ static void Encode(unsigned char *output, const apr_uint32_t *input,
 static void Decode(apr_uint32_t *output, const unsigned char *input,
                    unsigned int len);
 
-static unsigned char PADDING[64] =
+static const unsigned char PADDING[64] =
 {
     0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -112,6 +112,8 @@ static unsigned char PADDING[64] =
 #if APR_CHARSET_EBCDIC
 static apr_xlate_t *xlate_ebcdic_to_ascii; /* used in apr_md5_encode() */
 #endif
+#define DO_XLATE 0
+#define SKIP_XLATE 1
 
 /* F, G, H and I are basic MD5 functions.
  */
@@ -195,11 +197,12 @@ APU_DECLARE(apr_status_t) apr_md5_set_xlate(apr_md5_ctx_t *context,
  * operation, processing another message block, and updating the
  * context.
  */
-APU_DECLARE(apr_status_t) apr_md5_update(apr_md5_ctx_t *context,
-                                         const void *_input,
-                                         apr_size_t inputLen)
+static apr_status_t md5_update_buffer(apr_md5_ctx_t *context,
+                                      const void *vinput,
+                                      apr_size_t inputLen,
+                                      int xlate_buffer)
 {
-    const unsigned char *input = _input;
+    const unsigned char *input = vinput;
     unsigned int i, idx, partLen;
 #if APR_HAS_XLATE
     apr_size_t inbytes_left, outbytes_left;
@@ -234,7 +237,7 @@ APU_DECLARE(apr_status_t) apr_md5_update(apr_md5_ctx_t *context,
     memcpy(&context->buffer[idx], &input[i], inputLen - i);
 #else /*APR_HAS_XLATE*/
     if (inputLen >= partLen) {
-        if (context->xlate) {
+        if (context->xlate && (xlate_buffer == DO_XLATE)) {
             inbytes_left = outbytes_left = partLen;
             apr_xlate_conv_buffer(context->xlate, (const char *)input, 
                                   &inbytes_left,
@@ -247,7 +250,7 @@ APU_DECLARE(apr_status_t) apr_md5_update(apr_md5_ctx_t *context,
         MD5Transform(context->state, context->buffer);
 
         for (i = partLen; i + 63 < inputLen; i += 64) {
-            if (context->xlate) {
+            if (context->xlate && (xlate_buffer == DO_XLATE)) {
                 unsigned char inp_tmp[64];
                 inbytes_left = outbytes_left = 64;
                 apr_xlate_conv_buffer(context->xlate, (const char *)&input[i], 
@@ -266,7 +269,7 @@ APU_DECLARE(apr_status_t) apr_md5_update(apr_md5_ctx_t *context,
         i = 0;
 
     /* Buffer remaining input */
-    if (context->xlate) {
+    if (context->xlate && (xlate_buffer == DO_XLATE)) {
         inbytes_left = outbytes_left = inputLen - i;
         apr_xlate_conv_buffer(context->xlate, (const char *)&input[i], 
                               &inbytes_left, (char *)&context->buffer[idx], 
@@ -279,6 +282,16 @@ APU_DECLARE(apr_status_t) apr_md5_update(apr_md5_ctx_t *context,
     return APR_SUCCESS;
 }
 
+/* MD5 block update operation. API with the default setting 
+ * for EBCDIC translations
+ */  
+APU_DECLARE(apr_status_t) apr_md5_update(apr_md5_ctx_t *context,
+                                         const void *input,
+                                         apr_size_t inputLen)
+{
+    return md5_update_buffer(context, input, inputLen, DO_XLATE);
+}
+
 /* MD5 finalization. Ends an MD5 message-digest operation, writing the
  * the message digest and zeroizing the context.
  */
@@ -553,13 +566,16 @@ APU_DECLARE(apr_status_t) apr_md5_encode(const char *pw, const char *salt,
      * Then just as many characters of the MD5(pw, salt, pw)
      */
     apr_md5_init(&ctx1);
+#if APR_CHARSET_EBCDIC
+    apr_md5_set_xlate(&ctx1, xlate_ebcdic_to_ascii);
+#endif
     apr_md5_update(&ctx1, pw, strlen(pw));
     apr_md5_update(&ctx1, sp, sl);
     apr_md5_update(&ctx1, pw, strlen(pw));
     apr_md5_final(final, &ctx1);
     for (pl = strlen(pw); pl > 0; pl -= APR_MD5_DIGESTSIZE) {
-        apr_md5_update(&ctx, final, 
-                      (pl > APR_MD5_DIGESTSIZE) ? APR_MD5_DIGESTSIZE : pl);
+        md5_update_buffer(&ctx, final,
+                      (pl > APR_MD5_DIGESTSIZE) ? APR_MD5_DIGESTSIZE : pl, SKIP_XLATE);
     }
 
     /*
@@ -572,7 +588,7 @@ APU_DECLARE(apr_status_t) apr_md5_encode(const char *pw, const char *salt,
      */
     for (i = strlen(pw); i != 0; i >>= 1) {
         if (i & 1) {
-            apr_md5_update(&ctx, final, 1);
+            md5_update_buffer(&ctx, final, 1, SKIP_XLATE);
         }
         else {
             apr_md5_update(&ctx, pw, 1);
@@ -596,11 +612,18 @@ APU_DECLARE(apr_status_t) apr_md5_encode(const char *pw, const char *salt,
      */
     for (i = 0; i < 1000; i++) {
         apr_md5_init(&ctx1);
+         /*
+          * apr_md5_final clears out ctx1.xlate at the end of each loop,
+          * so need to to set it each time through
+          */
+#if APR_CHARSET_EBCDIC
+        apr_md5_set_xlate(&ctx1, xlate_ebcdic_to_ascii);
+#endif
         if (i & 1) {
             apr_md5_update(&ctx1, pw, strlen(pw));
         }
         else {
-            apr_md5_update(&ctx1, final, APR_MD5_DIGESTSIZE);
+            md5_update_buffer(&ctx1, final, APR_MD5_DIGESTSIZE, SKIP_XLATE);
         }
         if (i % 3) {
             apr_md5_update(&ctx1, sp, sl);
@@ -611,7 +634,7 @@ APU_DECLARE(apr_status_t) apr_md5_encode(const char *pw, const char *salt,
         }
 
         if (i & 1) {
-            apr_md5_update(&ctx1, final, APR_MD5_DIGESTSIZE);
+            md5_update_buffer(&ctx1, final, APR_MD5_DIGESTSIZE, SKIP_XLATE);
         }
         else {
             apr_md5_update(&ctx1, pw, strlen(pw));
diff --git a/srclib/apr-util/crypto/getuuid.c b/srclib/apr-util/crypto/getuuid.c
index 0cb324bb..d973c0f9 100644
--- a/srclib/apr-util/crypto/getuuid.c
+++ b/srclib/apr-util/crypto/getuuid.c
@@ -102,7 +102,7 @@ static void get_random_info(unsigned char node[NODE_LENGTH])
 static void get_pseudo_node_identifier(unsigned char *node)
 {
     get_random_info(node);
-    node[0] |= 0x01;                    /* this designates a random node ID */
+    node[0] |= 0x01;                    /* this designates a random multicast node ID */
 }
 
 static void get_system_time(apr_uint64_t *uuid_time)
@@ -131,7 +131,7 @@ static int true_random(void)
 
     /* crap. this isn't crypto quality, but it will be Good Enough */
 
-    get_system_time(&time_now);
+    time_now = apr_time_now();
     srand((unsigned int)(((time_now >> 32) ^ time_now) & 0xffffffff));
 
     return rand() & 0x0FFFF;
diff --git a/srclib/apr-util/dbd/NWGNUdbdfreetds b/srclib/apr-util/dbd/NWGNUdbdfreetds
new file mode 100644
index 00000000..91472f57
--- /dev/null
+++ b/srclib/apr-util/dbd/NWGNUdbdfreetds
@@ -0,0 +1,295 @@
+#
+# Declare the sub-directories to be built here
+#
+
+SUBDIRS = \
+	$(EOLIST)
+
+#
+# Get the 'head' of the build environment.  This includes default targets and
+# paths to tools
+#
+
+ifndef EnvironmentDefined
+include $(APR_WORK)\build\NWGNUhead.inc
+endif
+
+#include $(APR)\build\NWGNUcustom.inc
+
+#
+# build this level's files
+
+#
+# Make sure all needed macro's are defined
+#
+
+# LINK_STATIC = 1
+
+# for now defined here - should finally go into build/NWGNUenvironment.inc
+FREETDS_INC = $(FREETDSSDK)/include
+FREETDS_IMP = $(FREETDSSDK)/lib/libfreetds.imp
+FREETDS_LIB = $(FREETDSSDK)/lib/libfreetds.lib
+FREETDS_NLM = libfreetds
+
+#
+# These directories will be at the beginning of the include list, followed by
+# INCDIRS
+#
+XINCDIRS	+= \
+			$(APR)/include/arch/netware \
+			$(APR)/include \
+			$(APRUTIL)/include \
+			$(APRUTIL)/include/private \
+			$(APR) \
+			$(FREETDS_INC) \
+			$(EOLIST)
+
+#
+# These flags will come after CFLAGS
+#
+XCFLAGS		+= \
+			$(EOLIST)
+
+#
+# These defines will come after DEFINES
+#
+XDEFINES	+= \
+			-DAPU_HAVE_FREETDS=1 \
+			$(EOLIST)
+
+#
+# These flags will be added to the link.opt file
+#
+XLFLAGS		+= \
+			$(EOLIST)
+
+ifdef LINK_STATIC
+XLFLAGS		+= \
+			-l $(FREETDSSDK)/lib \
+			$(EOLIST)
+endif
+
+#
+# These values will be appended to the correct variables based on the value of
+# RELEASE
+#
+ifeq "$(RELEASE)" "debug"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "noopt"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "release"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+#
+# These are used by the link target if an NLM is being generated
+# This is used by the link 'name' directive to name the nlm.  If left blank
+# TARGET_nlm (see below) will be used.
+#
+NLM_NAME	= dbdfreetds
+
+#
+# This is used by the link '-desc ' directive.
+# If left blank, NLM_NAME will be used.
+#
+NLM_DESCRIPTION	= Apache Portability Runtime Library $(VERSION_STR) DBD FreeTDS Driver Module
+
+#
+# This is used by the '-threadname' directive.  If left blank,
+# NLM_NAME Thread will be used.
+#
+NLM_THREAD_NAME	= dbdfreetds
+
+#
+# If this is specified, it will override VERSION value in
+# $(AP_WORK)\build\NWGNUenvironment.inc
+#
+NLM_VERSION	=
+
+#
+# If this is specified, it will override the default of 64K
+#
+NLM_STACK_SIZE	= 8192
+
+
+#
+# If this is specified it will be used by the link '-entry' directive
+#
+NLM_ENTRY_SYM	= _LibCPrelude
+
+#
+# If this is specified it will be used by the link '-exit' directive
+#
+NLM_EXIT_SYM	= _LibCPostlude
+
+#
+# If this is specified it will be used by the link '-check' directive
+#
+NLM_CHECK_SYM	=
+
+#
+# If these are specified it will be used by the link '-flags' directive
+#
+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION
+
+#
+# If this is specified it will be linked in with the XDCData option in the def
+# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled
+# by setting APACHE_UNIPROC in the environment
+#
+XDCDATA		=
+
+#
+# If there is an NLM target, put it here
+#
+TARGET_nlm = \
+	$(OBJDIR)\$(NLM_NAME).nlm \
+	$(EOLIST)
+
+#
+# If there is an LIB target, put it here
+#
+TARGET_lib = \
+	$(EOLIST)
+
+#
+# These are the OBJ files needed to create the NLM target above.
+# Paths must all use the '/' character
+#
+FILES_nlm_objs = \
+	$(OBJDIR)/apr_dbd_freetds.o \
+	$(EOLIST)
+
+#
+# These are the LIB files needed to create the NLM target above.
+# These will be added as a library command in the link.opt file.
+#
+FILES_nlm_libs = \
+	libcpre.o \
+	$(EOLIST)
+
+ifeq ($(LINK_STATIC),1)
+FILES_nlm_libs += \
+	$(FREETDS_LIB) \
+	$(EOLIST)
+endif
+
+#
+# These are the modules that the above NLM target depends on to load.
+# These will be added as a module command in the link.opt file.
+#
+FILES_nlm_modules = \
+	aprlib \
+	libc \
+	$(EOLIST)
+
+ifneq ($(LINK_STATIC),1)
+FILES_nlm_modules += \
+	$(FREETDS_NLM) \
+	$(EOLIST)
+endif
+
+#
+# If the nlm has a msg file, put it's path here
+#
+FILE_nlm_msg =
+
+#
+# If the nlm has a hlp file put it's path here
+#
+FILE_nlm_hlp =
+
+#
+# If this is specified, it will override $(NWOS)\copyright.txt.
+#
+FILE_nlm_copyright =
+
+#
+# Any additional imports go here
+#
+FILES_nlm_Ximports = \
+	@$(APR)/aprlib.imp \
+	@libc.imp \
+	$(EOLIST)
+
+ifneq ($(LINK_STATIC),1)
+FILES_nlm_Ximports += \
+	@$(FREETDS_IMP) \
+	$(EOLIST)
+endif
+
+#
+# Any symbols exported to here
+#
+FILES_nlm_exports = \
+	apr_dbd_freetds_driver \
+	$(EOLIST)
+
+#
+# These are the OBJ files needed to create the LIB target above.
+# Paths must all use the '/' character
+#
+FILES_lib_objs = \
+	$(EOLIST)
+
+#
+# implement targets and dependancies (leave this section alone)
+#
+
+libs :: $(OBJDIR) $(TARGET_lib)
+
+nlms :: libs $(TARGET_nlm)
+
+#
+# Updated this target to create necessary directories and copy files to the
+# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+#
+install :: nlms FORCE
+
+#
+# Any specialized rules here
+#
+
+#
+# Include the 'tail' makefile that has targets that depend on variables defined
+# in this makefile
+#
+
+include $(APR_WORK)\build\NWGNUtail.inc
+
+
+
diff --git a/srclib/apr-util/dbd/NWGNUdbdmysql b/srclib/apr-util/dbd/NWGNUdbdmysql
index cc207e20..5f8bb121 100644
--- a/srclib/apr-util/dbd/NWGNUdbdmysql
+++ b/srclib/apr-util/dbd/NWGNUdbdmysql
@@ -1,296 +1,296 @@
-#

-# Declare the sub-directories to be built here

-#

-

-SUBDIRS = \

-	$(EOLIST)

-

-#

-# Get the 'head' of the build environment.  This includes default targets and

-# paths to tools

-#

-

-ifndef EnvironmentDefined

-include $(APR_WORK)\build\NWGNUhead.inc

-endif

-

-#include $(APR)\build\NWGNUcustom.inc

-

-#

-# build this level's files

-

-#

-# Make sure all needed macro's are defined

-#

-

-# LINK_STATIC = 1

-

-# for now defined here - should finally go into build/NWGNUenvironment.inc

-MYSQL_INC = $(MYSQLSDK)/include

-MYSQL_IMP = $(MYSQLSDK)/lib/libmysql.imp

-MYSQL_LIB = $(MYSQLSDK)/lib/libmysqlclient_r.lib $(MYSQLSDK)/lib/libz.lib

-MYSQL_NLM = libmysql

-

-#

-# These directories will be at the beginning of the include list, followed by

-# INCDIRS

-#

-XINCDIRS	+= \

-			$(APR)/include/arch/netware \

-			$(APR)/include \

-			$(APRUTIL)/include \

-			$(APRUTIL)/include/private \

-			$(APR) \

-			$(MYSQL_INC) \

-			$(EOLIST)

-

-#

-# These flags will come after CFLAGS

-#

-XCFLAGS		+= \

-			$(EOLIST)

-

-#

-# These defines will come after DEFINES

-#

-XDEFINES	+= \

-			-DAPU_HAVE_MYSQL=1 \

-			-DHAVE_MYSQL_H \

-			$(EOLIST)

-

-#

-# These flags will be added to the link.opt file

-#

-XLFLAGS		+= \

-			$(EOLIST)

-

-ifdef LINK_STATIC

-XLFLAGS		+= \

-			-l $(MYSQLSDK)/lib \

-			$(EOLIST)

-endif

-

-#

-# These values will be appended to the correct variables based on the value of

-# RELEASE

-#

-ifeq "$(RELEASE)" "debug"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-ifeq "$(RELEASE)" "noopt"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-ifeq "$(RELEASE)" "release"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-#

-# These are used by the link target if an NLM is being generated

-# This is used by the link 'name' directive to name the nlm.  If left blank

-# TARGET_nlm (see below) will be used.

-#

-NLM_NAME	= dbdmysql

-

-#

-# This is used by the link '-desc ' directive.

-# If left blank, NLM_NAME will be used.

-#

-NLM_DESCRIPTION	= Apache Portability Runtime Library $(VERSION_STR) DBD MySQL Driver Module

-

-#

-# This is used by the '-threadname' directive.  If left blank,

-# NLM_NAME Thread will be used.

-#

-NLM_THREAD_NAME	= dbdmysql

-

-#

-# If this is specified, it will override VERSION value in

-# $(AP_WORK)\build\NWGNUenvironment.inc

-#

-NLM_VERSION	=

-

-#

-# If this is specified, it will override the default of 64K

-#

-NLM_STACK_SIZE	= 8192

-

-

-#

-# If this is specified it will be used by the link '-entry' directive

-#

-NLM_ENTRY_SYM	= _LibCPrelude

-

-#

-# If this is specified it will be used by the link '-exit' directive

-#

-NLM_EXIT_SYM	= _LibCPostlude

-

-#

-# If this is specified it will be used by the link '-check' directive

-#

-NLM_CHECK_SYM	=

-

-#

-# If these are specified it will be used by the link '-flags' directive

-#

-NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION

-

-#

-# If this is specified it will be linked in with the XDCData option in the def

-# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled

-# by setting APACHE_UNIPROC in the environment

-#

-XDCDATA		=

-

-#

-# If there is an NLM target, put it here

-#

-TARGET_nlm = \

-	$(OBJDIR)\$(NLM_NAME).nlm \

-	$(EOLIST)

-

-#

-# If there is an LIB target, put it here

-#

-TARGET_lib = \

-	$(EOLIST)

-

-#

-# These are the OBJ files needed to create the NLM target above.

-# Paths must all use the '/' character

-#

-FILES_nlm_objs = \

-	$(OBJDIR)/apr_dbd_mysql.o \

-	$(EOLIST)

-

-#

-# These are the LIB files needed to create the NLM target above.

-# These will be added as a library command in the link.opt file.

-#

-FILES_nlm_libs = \

-	libcpre.o \

-	$(EOLIST)

-

-ifeq ($(LINK_STATIC),1)

-FILES_nlm_libs += \

-	$(MYSQL_LIB) \

-	$(EOLIST)

-endif

-

-#

-# These are the modules that the above NLM target depends on to load.

-# These will be added as a module command in the link.opt file.

-#

-FILES_nlm_modules = \

-	aprlib \

-	libc \

-	$(EOLIST)

-

-ifneq ($(LINK_STATIC),1)

-FILES_nlm_modules += \

-	$(MYSQL_NLM) \

-	$(EOLIST)

-endif

-

-#

-# If the nlm has a msg file, put it's path here

-#

-FILE_nlm_msg =

-

-#

-# If the nlm has a hlp file put it's path here

-#

-FILE_nlm_hlp =

-

-#

-# If this is specified, it will override $(NWOS)\copyright.txt.

-#

-FILE_nlm_copyright =

-

-#

-# Any additional imports go here

-#

-FILES_nlm_Ximports = \

-	@$(APR)/aprlib.imp \

-	@libc.imp \

-	$(EOLIST)

-

-ifneq ($(LINK_STATIC),1)

-FILES_nlm_Ximports += \

-	@$(MYSQL_IMP) \

-	$(EOLIST)

-endif

-

-#

-# Any symbols exported to here

-#

-FILES_nlm_exports = \

-	apr_dbd_mysql_driver \

-	$(EOLIST)

-

-#

-# These are the OBJ files needed to create the LIB target above.

-# Paths must all use the '/' character

-#

-FILES_lib_objs = \

-	$(EOLIST)

-

-#

-# implement targets and dependancies (leave this section alone)

-#

-

-libs :: $(OBJDIR) $(TARGET_lib)

-

-nlms :: libs $(TARGET_nlm)

-

-#

-# Updated this target to create necessary directories and copy files to the

-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)

-#

-install :: nlms FORCE

-

-#

-# Any specialized rules here

-#

-

-#

-# Include the 'tail' makefile that has targets that depend on variables defined

-# in this makefile

-#

-

-include $(APR_WORK)\build\NWGNUtail.inc

-

-

-

+#
+# Declare the sub-directories to be built here
+#
+
+SUBDIRS = \
+	$(EOLIST)
+
+#
+# Get the 'head' of the build environment.  This includes default targets and
+# paths to tools
+#
+
+ifndef EnvironmentDefined
+include $(APR_WORK)\build\NWGNUhead.inc
+endif
+
+#include $(APR)\build\NWGNUcustom.inc
+
+#
+# build this level's files
+
+#
+# Make sure all needed macro's are defined
+#
+
+# LINK_STATIC = 1
+
+# for now defined here - should finally go into build/NWGNUenvironment.inc
+MYSQL_INC = $(MYSQLSDK)/include
+MYSQL_IMP = $(MYSQLSDK)/lib/libmysql.imp
+MYSQL_LIB = $(MYSQLSDK)/lib/libmysqlclient_r.lib $(MYSQLSDK)/lib/libz.lib
+MYSQL_NLM = libmysql
+
+#
+# These directories will be at the beginning of the include list, followed by
+# INCDIRS
+#
+XINCDIRS	+= \
+			$(APR)/include/arch/netware \
+			$(APR)/include \
+			$(APRUTIL)/include \
+			$(APRUTIL)/include/private \
+			$(APR) \
+			$(MYSQL_INC) \
+			$(EOLIST)
+
+#
+# These flags will come after CFLAGS
+#
+XCFLAGS		+= \
+			$(EOLIST)
+
+#
+# These defines will come after DEFINES
+#
+XDEFINES	+= \
+			-DAPU_HAVE_MYSQL=1 \
+			-DHAVE_MYSQL_H \
+			$(EOLIST)
+
+#
+# These flags will be added to the link.opt file
+#
+XLFLAGS		+= \
+			$(EOLIST)
+
+ifdef LINK_STATIC
+XLFLAGS		+= \
+			-l $(MYSQLSDK)/lib \
+			$(EOLIST)
+endif
+
+#
+# These values will be appended to the correct variables based on the value of
+# RELEASE
+#
+ifeq "$(RELEASE)" "debug"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "noopt"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "release"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+#
+# These are used by the link target if an NLM is being generated
+# This is used by the link 'name' directive to name the nlm.  If left blank
+# TARGET_nlm (see below) will be used.
+#
+NLM_NAME	= dbdmysql
+
+#
+# This is used by the link '-desc ' directive.
+# If left blank, NLM_NAME will be used.
+#
+NLM_DESCRIPTION	= Apache Portability Runtime Library $(VERSION_STR) DBD MySQL Driver Module
+
+#
+# This is used by the '-threadname' directive.  If left blank,
+# NLM_NAME Thread will be used.
+#
+NLM_THREAD_NAME	= dbdmysql
+
+#
+# If this is specified, it will override VERSION value in
+# $(AP_WORK)\build\NWGNUenvironment.inc
+#
+NLM_VERSION	=
+
+#
+# If this is specified, it will override the default of 64K
+#
+NLM_STACK_SIZE	= 8192
+
+
+#
+# If this is specified it will be used by the link '-entry' directive
+#
+NLM_ENTRY_SYM	= _LibCPrelude
+
+#
+# If this is specified it will be used by the link '-exit' directive
+#
+NLM_EXIT_SYM	= _LibCPostlude
+
+#
+# If this is specified it will be used by the link '-check' directive
+#
+NLM_CHECK_SYM	=
+
+#
+# If these are specified it will be used by the link '-flags' directive
+#
+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION
+
+#
+# If this is specified it will be linked in with the XDCData option in the def
+# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled
+# by setting APACHE_UNIPROC in the environment
+#
+XDCDATA		=
+
+#
+# If there is an NLM target, put it here
+#
+TARGET_nlm = \
+	$(OBJDIR)\$(NLM_NAME).nlm \
+	$(EOLIST)
+
+#
+# If there is an LIB target, put it here
+#
+TARGET_lib = \
+	$(EOLIST)
+
+#
+# These are the OBJ files needed to create the NLM target above.
+# Paths must all use the '/' character
+#
+FILES_nlm_objs = \
+	$(OBJDIR)/apr_dbd_mysql.o \
+	$(EOLIST)
+
+#
+# These are the LIB files needed to create the NLM target above.
+# These will be added as a library command in the link.opt file.
+#
+FILES_nlm_libs = \
+	libcpre.o \
+	$(EOLIST)
+
+ifeq ($(LINK_STATIC),1)
+FILES_nlm_libs += \
+	$(MYSQL_LIB) \
+	$(EOLIST)
+endif
+
+#
+# These are the modules that the above NLM target depends on to load.
+# These will be added as a module command in the link.opt file.
+#
+FILES_nlm_modules = \
+	aprlib \
+	libc \
+	$(EOLIST)
+
+ifneq ($(LINK_STATIC),1)
+FILES_nlm_modules += \
+	$(MYSQL_NLM) \
+	$(EOLIST)
+endif
+
+#
+# If the nlm has a msg file, put it's path here
+#
+FILE_nlm_msg =
+
+#
+# If the nlm has a hlp file put it's path here
+#
+FILE_nlm_hlp =
+
+#
+# If this is specified, it will override $(NWOS)\copyright.txt.
+#
+FILE_nlm_copyright =
+
+#
+# Any additional imports go here
+#
+FILES_nlm_Ximports = \
+	@$(APR)/aprlib.imp \
+	@libc.imp \
+	$(EOLIST)
+
+ifneq ($(LINK_STATIC),1)
+FILES_nlm_Ximports += \
+	@$(MYSQL_IMP) \
+	$(EOLIST)
+endif
+
+#
+# Any symbols exported to here
+#
+FILES_nlm_exports = \
+	apr_dbd_mysql_driver \
+	$(EOLIST)
+
+#
+# These are the OBJ files needed to create the LIB target above.
+# Paths must all use the '/' character
+#
+FILES_lib_objs = \
+	$(EOLIST)
+
+#
+# implement targets and dependancies (leave this section alone)
+#
+
+libs :: $(OBJDIR) $(TARGET_lib)
+
+nlms :: libs $(TARGET_nlm)
+
+#
+# Updated this target to create necessary directories and copy files to the
+# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+#
+install :: nlms FORCE
+
+#
+# Any specialized rules here
+#
+
+#
+# Include the 'tail' makefile that has targets that depend on variables defined
+# in this makefile
+#
+
+include $(APR_WORK)\build\NWGNUtail.inc
+
+
+
diff --git a/srclib/apr-util/dbd/NWGNUdbdpgsql b/srclib/apr-util/dbd/NWGNUdbdpgsql
index e90665cd..d1360cfc 100644
--- a/srclib/apr-util/dbd/NWGNUdbdpgsql
+++ b/srclib/apr-util/dbd/NWGNUdbdpgsql
@@ -1,296 +1,296 @@
-#

-# Declare the sub-directories to be built here

-#

-

-SUBDIRS = \

-	$(EOLIST)

-

-#

-# Get the 'head' of the build environment.  This includes default targets and

-# paths to tools

-#

-

-ifndef EnvironmentDefined

-include $(APR_WORK)\build\NWGNUhead.inc

-endif

-

-#include $(APR)\build\NWGNUcustom.inc

-

-#

-# build this level's files

-

-#

-# Make sure all needed macro's are defined

-#

-

-# LINK_STATIC = 1

-

-# for now defined here - should finally go into build/NWGNUenvironment.inc

-PGSQL_INC = $(PGSQLSDK)/inc

-PGSQL_IMP = $(PGSQLSDK)/imp/libpq.imp

-PGSQL_LIB = $(PGSQLSDK)/lib/libpq.lib

-PGSQL_NLM = libpq

-

-#

-# These directories will be at the beginning of the include list, followed by

-# INCDIRS

-#

-XINCDIRS	+= \

-			$(APR)/include/arch/netware \

-			$(APR)/include \

-			$(APRUTIL)/include \

-			$(APRUTIL)/include/private \

-			$(APR) \

-			$(PGSQL_INC) \

-			$(EOLIST)

-

-#

-# These flags will come after CFLAGS

-#

-XCFLAGS		+= \

-			$(EOLIST)

-

-#

-# These defines will come after DEFINES

-#

-XDEFINES	+= \

-			-DAPU_HAVE_PGSQL=1 \

-			-DHAVE_LIBPQ_FE_H \

-			$(EOLIST)

-

-#

-# These flags will be added to the link.opt file

-#

-XLFLAGS		+= \

-			$(EOLIST)

-

-ifdef LINK_STATIC

-XLFLAGS		+= \

-			-l $(PGSQLSDK)/lib \

-			$(EOLIST)

-endif

-

-#

-# These values will be appended to the correct variables based on the value of

-# RELEASE

-#

-ifeq "$(RELEASE)" "debug"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-ifeq "$(RELEASE)" "noopt"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-ifeq "$(RELEASE)" "release"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-#

-# These are used by the link target if an NLM is being generated

-# This is used by the link 'name' directive to name the nlm.  If left blank

-# TARGET_nlm (see below) will be used.

-#

-NLM_NAME	= dbdpgsql

-

-#

-# This is used by the link '-desc ' directive.

-# If left blank, NLM_NAME will be used.

-#

-NLM_DESCRIPTION	= Apache Portability Runtime Library $(VERSION_STR) DBD PostgreSQL Driver Module

-

-#

-# This is used by the '-threadname' directive.  If left blank,

-# NLM_NAME Thread will be used.

-#

-NLM_THREAD_NAME	= dbdpgsql

-

-#

-# If this is specified, it will override VERSION value in

-# $(AP_WORK)\build\NWGNUenvironment.inc

-#

-NLM_VERSION	=

-

-#

-# If this is specified, it will override the default of 64K

-#

-NLM_STACK_SIZE	= 8192

-

-

-#

-# If this is specified it will be used by the link '-entry' directive

-#

-NLM_ENTRY_SYM	= _LibCPrelude

-

-#

-# If this is specified it will be used by the link '-exit' directive

-#

-NLM_EXIT_SYM	= _LibCPostlude

-

-#

-# If this is specified it will be used by the link '-check' directive

-#

-NLM_CHECK_SYM	=

-

-#

-# If these are specified it will be used by the link '-flags' directive

-#

-NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION

-

-#

-# If this is specified it will be linked in with the XDCData option in the def

-# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled

-# by setting APACHE_UNIPROC in the environment

-#

-XDCDATA		=

-

-#

-# If there is an NLM target, put it here

-#

-TARGET_nlm = \

-	$(OBJDIR)\$(NLM_NAME).nlm \

-	$(EOLIST)

-

-#

-# If there is an LIB target, put it here

-#

-TARGET_lib = \

-	$(EOLIST)

-

-#

-# These are the OBJ files needed to create the NLM target above.

-# Paths must all use the '/' character

-#

-FILES_nlm_objs = \

-	$(OBJDIR)/apr_dbd_pgsql.o \

-	$(EOLIST)

-

-#

-# These are the LIB files needed to create the NLM target above.

-# These will be added as a library command in the link.opt file.

-#

-FILES_nlm_libs = \

-	libcpre.o \

-	$(EOLIST)

-

-ifeq ($(LINK_STATIC),1)

-FILES_nlm_libs += \

-	$(PGSQL_LIB) \

-	$(EOLIST)

-endif

-

-#

-# These are the modules that the above NLM target depends on to load.

-# These will be added as a module command in the link.opt file.

-#

-FILES_nlm_modules = \

-	aprlib \

-	libc \

-	$(EOLIST)

-

-ifneq ($(LINK_STATIC),1)

-FILES_nlm_modules += \

-	$(PGSQL_NLM) \

-	$(EOLIST)

-endif

-

-#

-# If the nlm has a msg file, put it's path here

-#

-FILE_nlm_msg =

-

-#

-# If the nlm has a hlp file put it's path here

-#

-FILE_nlm_hlp =

-

-#

-# If this is specified, it will override $(NWOS)\copyright.txt.

-#

-FILE_nlm_copyright =

-

-#

-# Any additional imports go here

-#

-FILES_nlm_Ximports = \

-	@$(APR)/aprlib.imp \

-	@libc.imp \

-	$(EOLIST)

-

-ifneq ($(LINK_STATIC),1)

-FILES_nlm_Ximports += \

-	@$(PGSQL_IMP) \

-	$(EOLIST)

-endif

-

-#

-# Any symbols exported to here

-#

-FILES_nlm_exports = \

-	apr_dbd_pgsql_driver \

-	$(EOLIST)

-

-#

-# These are the OBJ files needed to create the LIB target above.

-# Paths must all use the '/' character

-#

-FILES_lib_objs = \

-	$(EOLIST)

-

-#

-# implement targets and dependancies (leave this section alone)

-#

-

-libs :: $(OBJDIR) $(TARGET_lib)

-

-nlms :: libs $(TARGET_nlm)

-

-#

-# Updated this target to create necessary directories and copy files to the

-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)

-#

-install :: nlms FORCE

-

-#

-# Any specialized rules here

-#

-

-#

-# Include the 'tail' makefile that has targets that depend on variables defined

-# in this makefile

-#

-

-include $(APR_WORK)\build\NWGNUtail.inc

-

-

-

+#
+# Declare the sub-directories to be built here
+#
+
+SUBDIRS = \
+	$(EOLIST)
+
+#
+# Get the 'head' of the build environment.  This includes default targets and
+# paths to tools
+#
+
+ifndef EnvironmentDefined
+include $(APR_WORK)\build\NWGNUhead.inc
+endif
+
+#include $(APR)\build\NWGNUcustom.inc
+
+#
+# build this level's files
+
+#
+# Make sure all needed macro's are defined
+#
+
+# LINK_STATIC = 1
+
+# for now defined here - should finally go into build/NWGNUenvironment.inc
+PGSQL_INC = $(PGSQLSDK)/inc
+PGSQL_IMP = $(PGSQLSDK)/imp/libpq.imp
+PGSQL_LIB = $(PGSQLSDK)/lib/libpq.lib
+PGSQL_NLM = libpq
+
+#
+# These directories will be at the beginning of the include list, followed by
+# INCDIRS
+#
+XINCDIRS	+= \
+			$(APR)/include/arch/netware \
+			$(APR)/include \
+			$(APRUTIL)/include \
+			$(APRUTIL)/include/private \
+			$(APR) \
+			$(PGSQL_INC) \
+			$(EOLIST)
+
+#
+# These flags will come after CFLAGS
+#
+XCFLAGS		+= \
+			$(EOLIST)
+
+#
+# These defines will come after DEFINES
+#
+XDEFINES	+= \
+			-DAPU_HAVE_PGSQL=1 \
+			-DHAVE_LIBPQ_FE_H \
+			$(EOLIST)
+
+#
+# These flags will be added to the link.opt file
+#
+XLFLAGS		+= \
+			$(EOLIST)
+
+ifdef LINK_STATIC
+XLFLAGS		+= \
+			-l $(PGSQLSDK)/lib \
+			$(EOLIST)
+endif
+
+#
+# These values will be appended to the correct variables based on the value of
+# RELEASE
+#
+ifeq "$(RELEASE)" "debug"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "noopt"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "release"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+#
+# These are used by the link target if an NLM is being generated
+# This is used by the link 'name' directive to name the nlm.  If left blank
+# TARGET_nlm (see below) will be used.
+#
+NLM_NAME	= dbdpgsql
+
+#
+# This is used by the link '-desc ' directive.
+# If left blank, NLM_NAME will be used.
+#
+NLM_DESCRIPTION	= Apache Portability Runtime Library $(VERSION_STR) DBD PostgreSQL Driver Module
+
+#
+# This is used by the '-threadname' directive.  If left blank,
+# NLM_NAME Thread will be used.
+#
+NLM_THREAD_NAME	= dbdpgsql
+
+#
+# If this is specified, it will override VERSION value in
+# $(AP_WORK)\build\NWGNUenvironment.inc
+#
+NLM_VERSION	=
+
+#
+# If this is specified, it will override the default of 64K
+#
+NLM_STACK_SIZE	= 8192
+
+
+#
+# If this is specified it will be used by the link '-entry' directive
+#
+NLM_ENTRY_SYM	= _LibCPrelude
+
+#
+# If this is specified it will be used by the link '-exit' directive
+#
+NLM_EXIT_SYM	= _LibCPostlude
+
+#
+# If this is specified it will be used by the link '-check' directive
+#
+NLM_CHECK_SYM	=
+
+#
+# If these are specified it will be used by the link '-flags' directive
+#
+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION
+
+#
+# If this is specified it will be linked in with the XDCData option in the def
+# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled
+# by setting APACHE_UNIPROC in the environment
+#
+XDCDATA		=
+
+#
+# If there is an NLM target, put it here
+#
+TARGET_nlm = \
+	$(OBJDIR)\$(NLM_NAME).nlm \
+	$(EOLIST)
+
+#
+# If there is an LIB target, put it here
+#
+TARGET_lib = \
+	$(EOLIST)
+
+#
+# These are the OBJ files needed to create the NLM target above.
+# Paths must all use the '/' character
+#
+FILES_nlm_objs = \
+	$(OBJDIR)/apr_dbd_pgsql.o \
+	$(EOLIST)
+
+#
+# These are the LIB files needed to create the NLM target above.
+# These will be added as a library command in the link.opt file.
+#
+FILES_nlm_libs = \
+	libcpre.o \
+	$(EOLIST)
+
+ifeq ($(LINK_STATIC),1)
+FILES_nlm_libs += \
+	$(PGSQL_LIB) \
+	$(EOLIST)
+endif
+
+#
+# These are the modules that the above NLM target depends on to load.
+# These will be added as a module command in the link.opt file.
+#
+FILES_nlm_modules = \
+	aprlib \
+	libc \
+	$(EOLIST)
+
+ifneq ($(LINK_STATIC),1)
+FILES_nlm_modules += \
+	$(PGSQL_NLM) \
+	$(EOLIST)
+endif
+
+#
+# If the nlm has a msg file, put it's path here
+#
+FILE_nlm_msg =
+
+#
+# If the nlm has a hlp file put it's path here
+#
+FILE_nlm_hlp =
+
+#
+# If this is specified, it will override $(NWOS)\copyright.txt.
+#
+FILE_nlm_copyright =
+
+#
+# Any additional imports go here
+#
+FILES_nlm_Ximports = \
+	@$(APR)/aprlib.imp \
+	@libc.imp \
+	$(EOLIST)
+
+ifneq ($(LINK_STATIC),1)
+FILES_nlm_Ximports += \
+	@$(PGSQL_IMP) \
+	$(EOLIST)
+endif
+
+#
+# Any symbols exported to here
+#
+FILES_nlm_exports = \
+	apr_dbd_pgsql_driver \
+	$(EOLIST)
+
+#
+# These are the OBJ files needed to create the LIB target above.
+# Paths must all use the '/' character
+#
+FILES_lib_objs = \
+	$(EOLIST)
+
+#
+# implement targets and dependancies (leave this section alone)
+#
+
+libs :: $(OBJDIR) $(TARGET_lib)
+
+nlms :: libs $(TARGET_nlm)
+
+#
+# Updated this target to create necessary directories and copy files to the
+# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+#
+install :: nlms FORCE
+
+#
+# Any specialized rules here
+#
+
+#
+# Include the 'tail' makefile that has targets that depend on variables defined
+# in this makefile
+#
+
+include $(APR_WORK)\build\NWGNUtail.inc
+
+
+
diff --git a/srclib/apr-util/dbd/NWGNUdbdsqli2 b/srclib/apr-util/dbd/NWGNUdbdsqli2
index 7aa95c90..38b8dd20 100644
--- a/srclib/apr-util/dbd/NWGNUdbdsqli2
+++ b/srclib/apr-util/dbd/NWGNUdbdsqli2
@@ -1,295 +1,295 @@
-#

-# Declare the sub-directories to be built here

-#

-

-SUBDIRS = \

-	$(EOLIST)

-

-#

-# Get the 'head' of the build environment.  This includes default targets and

-# paths to tools

-#

-

-ifndef EnvironmentDefined

-include $(APR_WORK)\build\NWGNUhead.inc

-endif

-

-#include $(APR)\build\NWGNUcustom.inc

-

-#

-# build this level's files

-

-#

-# Make sure all needed macro's are defined

-#

-

-# LINK_STATIC = 1

-

-# for now defined here - should finally go into build/NWGNUenvironment.inc

-SQLITE2_INC = $(SQLITE2SDK)/src

-SQLITE2_IMP = $(SQLITE2SDK)/lsqlite2.imp

-SQLITE2_LIB = $(SQLITE2SDK)/lsqlite2.lib

-SQLITE2_NLM = lsqlite2

-

-#

-# These directories will be at the beginning of the include list, followed by

-# INCDIRS

-#

-XINCDIRS	+= \

-			$(APR)/include/arch/netware \

-			$(APR)/include \

-			$(APRUTIL)/include \

-			$(APRUTIL)/include/private \

-			$(APR) \

-			$(SQLITE2_INC) \

-			$(EOLIST)

-

-#

-# These flags will come after CFLAGS

-#

-XCFLAGS		+= \

-			$(EOLIST)

-

-#

-# These defines will come after DEFINES

-#

-XDEFINES	+= \

-			-DAPU_HAVE_SQLITE2=1 \

-			$(EOLIST)

-

-#

-# These flags will be added to the link.opt file

-#

-XLFLAGS		+= \

-			$(EOLIST)

-

-ifdef LINK_STATIC

-XLFLAGS		+= \

-			-l $(SQLITE2SDK) \

-			$(EOLIST)

-endif

-

-#

-# These values will be appended to the correct variables based on the value of

-# RELEASE

-#

-ifeq "$(RELEASE)" "debug"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-ifeq "$(RELEASE)" "noopt"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-ifeq "$(RELEASE)" "release"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-#

-# These are used by the link target if an NLM is being generated

-# This is used by the link 'name' directive to name the nlm.  If left blank

-# TARGET_nlm (see below) will be used.

-#

-NLM_NAME	= dbdsqli2

-

-#

-# This is used by the link '-desc ' directive.

-# If left blank, NLM_NAME will be used.

-#

-NLM_DESCRIPTION	= Apache Portability Runtime Library $(VERSION_STR) DBD SQLite2 Driver Module

-

-#

-# This is used by the '-threadname' directive.  If left blank,

-# NLM_NAME Thread will be used.

-#

-NLM_THREAD_NAME	= dbdsqli2

-

-#

-# If this is specified, it will override VERSION value in

-# $(AP_WORK)\build\NWGNUenvironment.inc

-#

-NLM_VERSION	=

-

-#

-# If this is specified, it will override the default of 64K

-#

-NLM_STACK_SIZE	= 8192

-

-

-#

-# If this is specified it will be used by the link '-entry' directive

-#

-NLM_ENTRY_SYM	= _LibCPrelude

-

-#

-# If this is specified it will be used by the link '-exit' directive

-#

-NLM_EXIT_SYM	= _LibCPostlude

-

-#

-# If this is specified it will be used by the link '-check' directive

-#

-NLM_CHECK_SYM	=

-

-#

-# If these are specified it will be used by the link '-flags' directive

-#

-NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION

-

-#

-# If this is specified it will be linked in with the XDCData option in the def

-# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled

-# by setting APACHE_UNIPROC in the environment

-#

-XDCDATA		=

-

-#

-# If there is an NLM target, put it here

-#

-TARGET_nlm = \

-	$(OBJDIR)\$(NLM_NAME).nlm \

-	$(EOLIST)

-

-#

-# If there is an LIB target, put it here

-#

-TARGET_lib = \

-	$(EOLIST)

-

-#

-# These are the OBJ files needed to create the NLM target above.

-# Paths must all use the '/' character

-#

-FILES_nlm_objs = \

-	$(OBJDIR)/apr_dbd_sqlite2.o \

-	$(EOLIST)

-

-#

-# These are the LIB files needed to create the NLM target above.

-# These will be added as a library command in the link.opt file.

-#

-FILES_nlm_libs = \

-	libcpre.o \

-	$(EOLIST)

-

-ifeq ($(LINK_STATIC),1)

-FILES_nlm_libs += \

-	$(SQLITE2_LIB) \

-	$(EOLIST)

-endif

-

-#

-# These are the modules that the above NLM target depends on to load.

-# These will be added as a module command in the link.opt file.

-#

-FILES_nlm_modules = \

-	aprlib \

-	libc \

-	$(EOLIST)

-

-ifneq ($(LINK_STATIC),1)

-FILES_nlm_modules += \

-	$(SQLITE2_NLM) \

-	$(EOLIST)

-endif

-

-#

-# If the nlm has a msg file, put it's path here

-#

-FILE_nlm_msg =

-

-#

-# If the nlm has a hlp file put it's path here

-#

-FILE_nlm_hlp =

-

-#

-# If this is specified, it will override $(NWOS)\copyright.txt.

-#

-FILE_nlm_copyright =

-

-#

-# Any additional imports go here

-#

-FILES_nlm_Ximports = \

-	@$(APR)/aprlib.imp \

-	@libc.imp \

-	$(EOLIST)

-

-ifneq ($(LINK_STATIC),1)

-FILES_nlm_Ximports += \

-	@$(SQLITE2_IMP) \

-	$(EOLIST)

-endif

-

-#

-# Any symbols exported to here

-#

-FILES_nlm_exports = \

-	apr_dbd_sqlite2_driver \

-	$(EOLIST)

-

-#

-# These are the OBJ files needed to create the LIB target above.

-# Paths must all use the '/' character

-#

-FILES_lib_objs = \

-	$(EOLIST)

-

-#

-# implement targets and dependancies (leave this section alone)

-#

-

-libs :: $(OBJDIR) $(TARGET_lib)

-

-nlms :: libs $(TARGET_nlm)

-

-#

-# Updated this target to create necessary directories and copy files to the

-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)

-#

-install :: nlms FORCE

-

-#

-# Any specialized rules here

-#

-

-#

-# Include the 'tail' makefile that has targets that depend on variables defined

-# in this makefile

-#

-

-include $(APR_WORK)\build\NWGNUtail.inc

-

-

-

+#
+# Declare the sub-directories to be built here
+#
+
+SUBDIRS = \
+	$(EOLIST)
+
+#
+# Get the 'head' of the build environment.  This includes default targets and
+# paths to tools
+#
+
+ifndef EnvironmentDefined
+include $(APR_WORK)\build\NWGNUhead.inc
+endif
+
+#include $(APR)\build\NWGNUcustom.inc
+
+#
+# build this level's files
+
+#
+# Make sure all needed macro's are defined
+#
+
+# LINK_STATIC = 1
+
+# for now defined here - should finally go into build/NWGNUenvironment.inc
+SQLITE2_INC = $(SQLITE2SDK)/src
+SQLITE2_IMP = $(SQLITE2SDK)/lsqlite2.imp
+SQLITE2_LIB = $(SQLITE2SDK)/lsqlite2.lib
+SQLITE2_NLM = lsqlite2
+
+#
+# These directories will be at the beginning of the include list, followed by
+# INCDIRS
+#
+XINCDIRS	+= \
+			$(APR)/include/arch/netware \
+			$(APR)/include \
+			$(APRUTIL)/include \
+			$(APRUTIL)/include/private \
+			$(APR) \
+			$(SQLITE2_INC) \
+			$(EOLIST)
+
+#
+# These flags will come after CFLAGS
+#
+XCFLAGS		+= \
+			$(EOLIST)
+
+#
+# These defines will come after DEFINES
+#
+XDEFINES	+= \
+			-DAPU_HAVE_SQLITE2=1 \
+			$(EOLIST)
+
+#
+# These flags will be added to the link.opt file
+#
+XLFLAGS		+= \
+			$(EOLIST)
+
+ifdef LINK_STATIC
+XLFLAGS		+= \
+			-l $(SQLITE2SDK) \
+			$(EOLIST)
+endif
+
+#
+# These values will be appended to the correct variables based on the value of
+# RELEASE
+#
+ifeq "$(RELEASE)" "debug"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "noopt"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "release"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+#
+# These are used by the link target if an NLM is being generated
+# This is used by the link 'name' directive to name the nlm.  If left blank
+# TARGET_nlm (see below) will be used.
+#
+NLM_NAME	= dbdsqli2
+
+#
+# This is used by the link '-desc ' directive.
+# If left blank, NLM_NAME will be used.
+#
+NLM_DESCRIPTION	= Apache Portability Runtime Library $(VERSION_STR) DBD SQLite2 Driver Module
+
+#
+# This is used by the '-threadname' directive.  If left blank,
+# NLM_NAME Thread will be used.
+#
+NLM_THREAD_NAME	= dbdsqli2
+
+#
+# If this is specified, it will override VERSION value in
+# $(AP_WORK)\build\NWGNUenvironment.inc
+#
+NLM_VERSION	=
+
+#
+# If this is specified, it will override the default of 64K
+#
+NLM_STACK_SIZE	= 8192
+
+
+#
+# If this is specified it will be used by the link '-entry' directive
+#
+NLM_ENTRY_SYM	= _LibCPrelude
+
+#
+# If this is specified it will be used by the link '-exit' directive
+#
+NLM_EXIT_SYM	= _LibCPostlude
+
+#
+# If this is specified it will be used by the link '-check' directive
+#
+NLM_CHECK_SYM	=
+
+#
+# If these are specified it will be used by the link '-flags' directive
+#
+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION
+
+#
+# If this is specified it will be linked in with the XDCData option in the def
+# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled
+# by setting APACHE_UNIPROC in the environment
+#
+XDCDATA		=
+
+#
+# If there is an NLM target, put it here
+#
+TARGET_nlm = \
+	$(OBJDIR)\$(NLM_NAME).nlm \
+	$(EOLIST)
+
+#
+# If there is an LIB target, put it here
+#
+TARGET_lib = \
+	$(EOLIST)
+
+#
+# These are the OBJ files needed to create the NLM target above.
+# Paths must all use the '/' character
+#
+FILES_nlm_objs = \
+	$(OBJDIR)/apr_dbd_sqlite2.o \
+	$(EOLIST)
+
+#
+# These are the LIB files needed to create the NLM target above.
+# These will be added as a library command in the link.opt file.
+#
+FILES_nlm_libs = \
+	libcpre.o \
+	$(EOLIST)
+
+ifeq ($(LINK_STATIC),1)
+FILES_nlm_libs += \
+	$(SQLITE2_LIB) \
+	$(EOLIST)
+endif
+
+#
+# These are the modules that the above NLM target depends on to load.
+# These will be added as a module command in the link.opt file.
+#
+FILES_nlm_modules = \
+	aprlib \
+	libc \
+	$(EOLIST)
+
+ifneq ($(LINK_STATIC),1)
+FILES_nlm_modules += \
+	$(SQLITE2_NLM) \
+	$(EOLIST)
+endif
+
+#
+# If the nlm has a msg file, put it's path here
+#
+FILE_nlm_msg =
+
+#
+# If the nlm has a hlp file put it's path here
+#
+FILE_nlm_hlp =
+
+#
+# If this is specified, it will override $(NWOS)\copyright.txt.
+#
+FILE_nlm_copyright =
+
+#
+# Any additional imports go here
+#
+FILES_nlm_Ximports = \
+	@$(APR)/aprlib.imp \
+	@libc.imp \
+	$(EOLIST)
+
+ifneq ($(LINK_STATIC),1)
+FILES_nlm_Ximports += \
+	@$(SQLITE2_IMP) \
+	$(EOLIST)
+endif
+
+#
+# Any symbols exported to here
+#
+FILES_nlm_exports = \
+	apr_dbd_sqlite2_driver \
+	$(EOLIST)
+
+#
+# These are the OBJ files needed to create the LIB target above.
+# Paths must all use the '/' character
+#
+FILES_lib_objs = \
+	$(EOLIST)
+
+#
+# implement targets and dependancies (leave this section alone)
+#
+
+libs :: $(OBJDIR) $(TARGET_lib)
+
+nlms :: libs $(TARGET_nlm)
+
+#
+# Updated this target to create necessary directories and copy files to the
+# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+#
+install :: nlms FORCE
+
+#
+# Any specialized rules here
+#
+
+#
+# Include the 'tail' makefile that has targets that depend on variables defined
+# in this makefile
+#
+
+include $(APR_WORK)\build\NWGNUtail.inc
+
+
+
diff --git a/srclib/apr-util/dbd/NWGNUdbdsqli3 b/srclib/apr-util/dbd/NWGNUdbdsqli3
index 81bd4dbb..77cc5758 100644
--- a/srclib/apr-util/dbd/NWGNUdbdsqli3
+++ b/srclib/apr-util/dbd/NWGNUdbdsqli3
@@ -1,297 +1,297 @@
-#

-# Declare the sub-directories to be built here

-#

-

-SUBDIRS = \

-	$(EOLIST)

-

-#

-# Get the 'head' of the build environment.  This includes default targets and

-# paths to tools

-#

-

-ifndef EnvironmentDefined

-include $(APR_WORK)\build\NWGNUhead.inc

-endif

-

-#include $(APR)\build\NWGNUcustom.inc

-

-#

-# build this level's files

-

-#

-# Make sure all needed macro's are defined

-#

-

-# LINK_STATIC = 1

-

-# for now defined here - should finally go into build/NWGNUenvironment.inc

-SQLITE3_INC = $(SQLITE3SDK)/src

-SQLITE3_IMP = $(SQLITE3SDK)/lsqlite3.imp

-SQLITE3_LIB = $(SQLITE3SDK)/lsqlite3.lib

-SQLITE3_NLM = lsqlite3

-

-#

-# These directories will be at the beginning of the include list, followed by

-# INCDIRS

-#

-XINCDIRS	+= \

-			$(APR)/include/arch/netware \

-			$(APR)/include \

-			$(APRUTIL)/include \

-			$(APRUTIL)/include/private \

-			$(APR) \

-			$(SQLITE3_INC) \

-			$(EOLIST)

-

-#

-# These flags will come after CFLAGS

-#

-XCFLAGS		+= \

-			$(EOLIST)

-

-#

-# These defines will come after DEFINES

-#

-XDEFINES	+= \

-			-DAPU_HAVE_SQLITE3=1 \

-			$(EOLIST)

-

-#

-# These flags will be added to the link.opt file

-#

-XLFLAGS		+= \

-			$(EOLIST)

-

-ifdef LINK_STATIC

-XLFLAGS		+= \

-			-l $(SQLITE3SDK) \

-			$(EOLIST)

-endif

-

-#

-# These values will be appended to the correct variables based on the value of

-# RELEASE

-#

-ifeq "$(RELEASE)" "debug"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-ifeq "$(RELEASE)" "noopt"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-ifeq "$(RELEASE)" "release"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-#

-# These are used by the link target if an NLM is being generated

-# This is used by the link 'name' directive to name the nlm.  If left blank

-# TARGET_nlm (see below) will be used.

-#

-NLM_NAME	= dbdsqli3

-

-#

-# This is used by the link '-desc ' directive.

-# If left blank, NLM_NAME will be used.

-#

-NLM_DESCRIPTION	= Apache Portability Runtime Library $(VERSION_STR) DBD SQLite3 Driver Module

-

-#

-# This is used by the '-threadname' directive.  If left blank,

-# NLM_NAME Thread will be used.

-#

-NLM_THREAD_NAME	= dbdsqli3

-

-#

-# If this is specified, it will override VERSION value in

-# $(AP_WORK)\build\NWGNUenvironment.inc

-#

-NLM_VERSION	=

-

-#

-# If this is specified, it will override the default of 64K

-#

-NLM_STACK_SIZE	= 8192

-

-

-#

-# If this is specified it will be used by the link '-entry' directive

-#

-NLM_ENTRY_SYM	= _LibCPrelude

-

-#

-# If this is specified it will be used by the link '-exit' directive

-#

-NLM_EXIT_SYM	= _LibCPostlude

-

-#

-# If this is specified it will be used by the link '-check' directive

-#

-NLM_CHECK_SYM	=

-

-#

-# If these are specified it will be used by the link '-flags' directive

-#

-NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION

-

-#

-# If this is specified it will be linked in with the XDCData option in the def

-# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled

-# by setting APACHE_UNIPROC in the environment

-#

-XDCDATA		=

-

-#

-# If there is an NLM target, put it here

-#

-TARGET_nlm = \

-	$(OBJDIR)\$(NLM_NAME).nlm \

-	$(EOLIST)

-

-#

-# If there is an LIB target, put it here

-#

-TARGET_lib = \

-	$(EOLIST)

-

-#

-# These are the OBJ files needed to create the NLM target above.

-# Paths must all use the '/' character

-#

-FILES_nlm_objs = \

-	$(OBJDIR)/apr_dbd_sqlite3.o \

-	$(EOLIST)

-

-#

-# These are the LIB files needed to create the NLM target above.

-# These will be added as a library command in the link.opt file.

-#

-FILES_nlm_libs = \

-	libcpre.o \

-	$(EOLIST)

-

-ifeq ($(LINK_STATIC),1)

-FILES_nlm_libs += \

-	$(SQLITE3_LIB) \

-	$(EOLIST)

-endif

-

-#

-# These are the modules that the above NLM target depends on to load.

-# These will be added as a module command in the link.opt file.

-#

-FILES_nlm_modules = \

-	aprlib \

-	libc \

-	$(EOLIST)

-

-ifneq ($(LINK_STATIC),1)

-FILES_nlm_modules += \

-	$(SQLITE3_NLM) \

-	$(EOLIST)

-endif

-

-#

-# If the nlm has a msg file, put it's path here

-#

-FILE_nlm_msg =

-

-#

-# If the nlm has a hlp file put it's path here

-#

-FILE_nlm_hlp =

-

-#

-# If this is specified, it will override $(NWOS)\copyright.txt.

-#

-FILE_nlm_copyright =

-

-#

-# Any additional imports go here

-#

-FILES_nlm_Ximports = \

-	@$(APR)/aprlib.imp \

-	@libc.imp \

-	apr_dbd_mutex_lock \

-	apr_dbd_mutex_unlock \

-	$(EOLIST)

-

-ifneq ($(LINK_STATIC),1)

-FILES_nlm_Ximports += \

-	@$(SQLITE3_IMP) \

-	$(EOLIST)

-endif

-

-#

-# Any symbols exported to here

-#

-FILES_nlm_exports = \

-	apr_dbd_sqlite3_driver \

-	$(EOLIST)

-

-#

-# These are the OBJ files needed to create the LIB target above.

-# Paths must all use the '/' character

-#

-FILES_lib_objs = \

-	$(EOLIST)

-

-#

-# implement targets and dependancies (leave this section alone)

-#

-

-libs :: $(OBJDIR) $(TARGET_lib)

-

-nlms :: libs $(TARGET_nlm)

-

-#

-# Updated this target to create necessary directories and copy files to the

-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)

-#

-install :: nlms FORCE

-

-#

-# Any specialized rules here

-#

-

-#

-# Include the 'tail' makefile that has targets that depend on variables defined

-# in this makefile

-#

-

-include $(APR_WORK)\build\NWGNUtail.inc

-

-

-

+#
+# Declare the sub-directories to be built here
+#
+
+SUBDIRS = \
+	$(EOLIST)
+
+#
+# Get the 'head' of the build environment.  This includes default targets and
+# paths to tools
+#
+
+ifndef EnvironmentDefined
+include $(APR_WORK)\build\NWGNUhead.inc
+endif
+
+#include $(APR)\build\NWGNUcustom.inc
+
+#
+# build this level's files
+
+#
+# Make sure all needed macro's are defined
+#
+
+# LINK_STATIC = 1
+
+# for now defined here - should finally go into build/NWGNUenvironment.inc
+SQLITE3_INC = $(SQLITE3SDK)/src
+SQLITE3_IMP = $(SQLITE3SDK)/lsqlite3.imp
+SQLITE3_LIB = $(SQLITE3SDK)/lsqlite3.lib
+SQLITE3_NLM = lsqlite3
+
+#
+# These directories will be at the beginning of the include list, followed by
+# INCDIRS
+#
+XINCDIRS	+= \
+			$(APR)/include/arch/netware \
+			$(APR)/include \
+			$(APRUTIL)/include \
+			$(APRUTIL)/include/private \
+			$(APR) \
+			$(SQLITE3_INC) \
+			$(EOLIST)
+
+#
+# These flags will come after CFLAGS
+#
+XCFLAGS		+= \
+			$(EOLIST)
+
+#
+# These defines will come after DEFINES
+#
+XDEFINES	+= \
+			-DAPU_HAVE_SQLITE3=1 \
+			$(EOLIST)
+
+#
+# These flags will be added to the link.opt file
+#
+XLFLAGS		+= \
+			$(EOLIST)
+
+ifdef LINK_STATIC
+XLFLAGS		+= \
+			-l $(SQLITE3SDK) \
+			$(EOLIST)
+endif
+
+#
+# These values will be appended to the correct variables based on the value of
+# RELEASE
+#
+ifeq "$(RELEASE)" "debug"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "noopt"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "release"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+#
+# These are used by the link target if an NLM is being generated
+# This is used by the link 'name' directive to name the nlm.  If left blank
+# TARGET_nlm (see below) will be used.
+#
+NLM_NAME	= dbdsqli3
+
+#
+# This is used by the link '-desc ' directive.
+# If left blank, NLM_NAME will be used.
+#
+NLM_DESCRIPTION	= Apache Portability Runtime Library $(VERSION_STR) DBD SQLite3 Driver Module
+
+#
+# This is used by the '-threadname' directive.  If left blank,
+# NLM_NAME Thread will be used.
+#
+NLM_THREAD_NAME	= dbdsqli3
+
+#
+# If this is specified, it will override VERSION value in
+# $(AP_WORK)\build\NWGNUenvironment.inc
+#
+NLM_VERSION	=
+
+#
+# If this is specified, it will override the default of 64K
+#
+NLM_STACK_SIZE	= 8192
+
+
+#
+# If this is specified it will be used by the link '-entry' directive
+#
+NLM_ENTRY_SYM	= _LibCPrelude
+
+#
+# If this is specified it will be used by the link '-exit' directive
+#
+NLM_EXIT_SYM	= _LibCPostlude
+
+#
+# If this is specified it will be used by the link '-check' directive
+#
+NLM_CHECK_SYM	=
+
+#
+# If these are specified it will be used by the link '-flags' directive
+#
+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION
+
+#
+# If this is specified it will be linked in with the XDCData option in the def
+# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled
+# by setting APACHE_UNIPROC in the environment
+#
+XDCDATA		=
+
+#
+# If there is an NLM target, put it here
+#
+TARGET_nlm = \
+	$(OBJDIR)\$(NLM_NAME).nlm \
+	$(EOLIST)
+
+#
+# If there is an LIB target, put it here
+#
+TARGET_lib = \
+	$(EOLIST)
+
+#
+# These are the OBJ files needed to create the NLM target above.
+# Paths must all use the '/' character
+#
+FILES_nlm_objs = \
+	$(OBJDIR)/apr_dbd_sqlite3.o \
+	$(EOLIST)
+
+#
+# These are the LIB files needed to create the NLM target above.
+# These will be added as a library command in the link.opt file.
+#
+FILES_nlm_libs = \
+	libcpre.o \
+	$(EOLIST)
+
+ifeq ($(LINK_STATIC),1)
+FILES_nlm_libs += \
+	$(SQLITE3_LIB) \
+	$(EOLIST)
+endif
+
+#
+# These are the modules that the above NLM target depends on to load.
+# These will be added as a module command in the link.opt file.
+#
+FILES_nlm_modules = \
+	aprlib \
+	libc \
+	$(EOLIST)
+
+ifneq ($(LINK_STATIC),1)
+FILES_nlm_modules += \
+	$(SQLITE3_NLM) \
+	$(EOLIST)
+endif
+
+#
+# If the nlm has a msg file, put it's path here
+#
+FILE_nlm_msg =
+
+#
+# If the nlm has a hlp file put it's path here
+#
+FILE_nlm_hlp =
+
+#
+# If this is specified, it will override $(NWOS)\copyright.txt.
+#
+FILE_nlm_copyright =
+
+#
+# Any additional imports go here
+#
+FILES_nlm_Ximports = \
+	@$(APR)/aprlib.imp \
+	@libc.imp \
+	apr_dbd_mutex_lock \
+	apr_dbd_mutex_unlock \
+	$(EOLIST)
+
+ifneq ($(LINK_STATIC),1)
+FILES_nlm_Ximports += \
+	@$(SQLITE3_IMP) \
+	$(EOLIST)
+endif
+
+#
+# Any symbols exported to here
+#
+FILES_nlm_exports = \
+	apr_dbd_sqlite3_driver \
+	$(EOLIST)
+
+#
+# These are the OBJ files needed to create the LIB target above.
+# Paths must all use the '/' character
+#
+FILES_lib_objs = \
+	$(EOLIST)
+
+#
+# implement targets and dependancies (leave this section alone)
+#
+
+libs :: $(OBJDIR) $(TARGET_lib)
+
+nlms :: libs $(TARGET_nlm)
+
+#
+# Updated this target to create necessary directories and copy files to the
+# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+#
+install :: nlms FORCE
+
+#
+# Any specialized rules here
+#
+
+#
+# Include the 'tail' makefile that has targets that depend on variables defined
+# in this makefile
+#
+
+include $(APR_WORK)\build\NWGNUtail.inc
+
+
+
diff --git a/srclib/apr-util/dbd/NWGNUmakefile b/srclib/apr-util/dbd/NWGNUmakefile
index bf04fc8e..fb4b9ad7 100644
--- a/srclib/apr-util/dbd/NWGNUmakefile
+++ b/srclib/apr-util/dbd/NWGNUmakefile
@@ -1,259 +1,262 @@
-#

-# Declare the sub-directories to be built here

-#

-

-SUBDIRS = \

-	$(EOLIST)

-

-#

-# Get the 'head' of the build environment.  This includes default targets and

-# paths to tools

-#

-

-include $(APR_WORK)\build\NWGNUhead.inc

-

-#

-# build this level's files

-

-#

-# Make sure all needed macro's are defined

-#

-

-#

-# These directories will be at the beginning of the include list, followed by

-# INCDIRS

-#

-XINCDIRS	+= \

-			$(EOLIST)

-

-#

-# These flags will come after CFLAGS

-#

-XCFLAGS		+= \

-			$(EOLIST)

-

-#

-# These defines will come after DEFINES

-#

-XDEFINES	+= \

-			$(EOLIST)

-

-#

-# These flags will be added to the link.opt file

-#

-XLFLAGS		+= \

-			$(EOLIST)

-

-#

-# These values will be appended to the correct variables based on the value of

-# RELEASE

-#

-ifeq "$(RELEASE)" "debug"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-ifeq "$(RELEASE)" "noopt"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-ifeq "$(RELEASE)" "release"

-XINCDIRS	+= \

-			$(EOLIST)

-

-XCFLAGS		+= \

-			$(EOLIST)

-

-XDEFINES	+= \

-			$(EOLIST)

-

-XLFLAGS		+= \

-			$(EOLIST)

-endif

-

-#

-# These are used by the link target if an NLM is being generated

-# This is used by the link 'name' directive to name the nlm.  If left blank

-# TARGET_nlm (see below) will be used.

-#

-NLM_NAME	=

-

-#

-# This is used by the link '-desc ' directive.

-# If left blank, NLM_NAME will be used.

-#

-NLM_DESCRIPTION	=

-

-#

-# This is used by the '-threadname' directive.  If left blank,

-# NLM_NAME Thread will be used.

-#

-NLM_THREAD_NAME	=

-

-#

-# If this is specified, it will override VERSION value in

-# $(AP_WORK)\build\NWGNUenvironment.inc

-#

-NLM_VERSION	=

-

-#

-# If this is specified, it will override the default of 64K

-#

-NLM_STACK_SIZE	=

-

-

-#

-# If this is specified it will be used by the link '-entry' directive

-#

-NLM_ENTRY_SYM	=

-

-#

-# If this is specified it will be used by the link '-exit' directive

-#

-NLM_EXIT_SYM	=

-

-#

-# If this is specified it will be used by the link '-check' directive

-#

-NLM_CHECK_SYM	=

-

-#

-# If these are specified it will be used by the link '-flags' directive

-#

-NLM_FLAGS	=

-

-#

-# If this is specified it will be linked in with the XDCData option in the def

-# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled

-# by setting APACHE_UNIPROC in the environment

-#

-XDCDATA		=

-

-#

-# If there is an NLM target, put it here

-#

-TARGET_nlm = \

-	$(EOLIST)

-

-ifeq "$(APU_HAVE_MYSQL)" "1"

-ifeq "$(wildcard apr_dbd_mysql.c)" "apr_dbd_mysql.c"

-TARGET_nlm += $(OBJDIR)/dbdmysql.nlm $(OBJDIR)/dbdmysql.nlm $(EOLIST)

-endif

-endif

-ifeq "$(APU_HAVE_PGSQL)" "1"

-TARGET_nlm += $(OBJDIR)/dbdpgsql.nlm $(OBJDIR)/dbdpgsql.nlm $(EOLIST)

-endif

-ifeq "$(APU_HAVE_SQLITE2)" "1"

-TARGET_nlm += $(OBJDIR)/dbdsqli2.nlm $(OBJDIR)/dbdsqli2.nlm $(EOLIST)

-endif

-ifeq "$(APU_HAVE_SQLITE3)" "1"

-TARGET_nlm += $(OBJDIR)/dbdsqli3.nlm $(OBJDIR)/dbdsqli3.nlm $(EOLIST)

-endif

-

-#

-# If there is an LIB target, put it here

-#

-TARGET_lib = \

-	$(EOLIST)

-

-#

-# These are the OBJ files needed to create the NLM target above.

-# Paths must all use the '/' character

-#

-FILES_nlm_objs = \

-	$(EOLIST)

-

-#

-# These are the LIB files needed to create the NLM target above.

-# These will be added as a library command in the link.opt file.

-#

-FILES_nlm_libs = \

-	$(EOLIST)

-

-#

-# These are the modules that the above NLM target depends on to load.

-# These will be added as a module command in the link.opt file.

-#

-FILES_nlm_modules = \

-	$(EOLIST)

-

-#

-# If the nlm has a msg file, put it's path here

-#

-FILE_nlm_msg =

-

-#

-# If the nlm has a hlp file put it's path here

-#

-FILE_nlm_hlp =

-

-#

-# If this is specified, it will override $(NWOS)\copyright.txt.

-#

-FILE_nlm_copyright =

-

-#

-# Any additional imports go here

-#

-FILES_nlm_Ximports = \

-	$(EOLIST)

-

-#

-# Any symbols exported to here

-#

-FILES_nlm_exports = \

-	$(EOLIST)

-

-#

-# These are the OBJ files needed to create the LIB target above.

-# Paths must all use the '/' character

-#

-FILES_lib_objs = \

-	$(EOLIST)

-

-#

-# implement targets and dependancies (leave this section alone)

-#

-

-libs :: $(OBJDIR) $(TARGET_lib)

-

-nlms :: libs $(TARGET_nlm)

-

-#

-# Updated this target to create necessary directories and copy files to the

-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)

-#

-install :: nlms $(INSTDIRS) FORCE

-	copy $(OBJDIR)\*.nlm $(INSTALLBASE)

-

-#

-# Any specialized rules here

-#

-

-#

-# Include the 'tail' makefile that has targets that depend on variables defined

-# in this makefile

-#

-

-include $(APR_WORK)\build\NWGNUtail.inc

-

-

+#
+# Declare the sub-directories to be built here
+#
+
+SUBDIRS = \
+	$(EOLIST)
+
+#
+# Get the 'head' of the build environment.  This includes default targets and
+# paths to tools
+#
+
+include $(APR_WORK)\build\NWGNUhead.inc
+
+#
+# build this level's files
+
+#
+# Make sure all needed macro's are defined
+#
+
+#
+# These directories will be at the beginning of the include list, followed by
+# INCDIRS
+#
+XINCDIRS	+= \
+			$(EOLIST)
+
+#
+# These flags will come after CFLAGS
+#
+XCFLAGS		+= \
+			$(EOLIST)
+
+#
+# These defines will come after DEFINES
+#
+XDEFINES	+= \
+			$(EOLIST)
+
+#
+# These flags will be added to the link.opt file
+#
+XLFLAGS		+= \
+			$(EOLIST)
+
+#
+# These values will be appended to the correct variables based on the value of
+# RELEASE
+#
+ifeq "$(RELEASE)" "debug"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "noopt"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+ifeq "$(RELEASE)" "release"
+XINCDIRS	+= \
+			$(EOLIST)
+
+XCFLAGS		+= \
+			$(EOLIST)
+
+XDEFINES	+= \
+			$(EOLIST)
+
+XLFLAGS		+= \
+			$(EOLIST)
+endif
+
+#
+# These are used by the link target if an NLM is being generated
+# This is used by the link 'name' directive to name the nlm.  If left blank
+# TARGET_nlm (see below) will be used.
+#
+NLM_NAME	=
+
+#
+# This is used by the link '-desc ' directive.
+# If left blank, NLM_NAME will be used.
+#
+NLM_DESCRIPTION	=
+
+#
+# This is used by the '-threadname' directive.  If left blank,
+# NLM_NAME Thread will be used.
+#
+NLM_THREAD_NAME	=
+
+#
+# If this is specified, it will override VERSION value in
+# $(AP_WORK)\build\NWGNUenvironment.inc
+#
+NLM_VERSION	=
+
+#
+# If this is specified, it will override the default of 64K
+#
+NLM_STACK_SIZE	=
+
+
+#
+# If this is specified it will be used by the link '-entry' directive
+#
+NLM_ENTRY_SYM	=
+
+#
+# If this is specified it will be used by the link '-exit' directive
+#
+NLM_EXIT_SYM	=
+
+#
+# If this is specified it will be used by the link '-check' directive
+#
+NLM_CHECK_SYM	=
+
+#
+# If these are specified it will be used by the link '-flags' directive
+#
+NLM_FLAGS	=
+
+#
+# If this is specified it will be linked in with the XDCData option in the def
+# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled
+# by setting APACHE_UNIPROC in the environment
+#
+XDCDATA		=
+
+#
+# If there is an NLM target, put it here
+#
+TARGET_nlm = \
+	$(EOLIST)
+
+ifeq "$(APU_HAVE_MYSQL)" "1"
+ifeq "$(wildcard apr_dbd_mysql.c)" "apr_dbd_mysql.c"
+TARGET_nlm += $(OBJDIR)/dbdmysql.nlm $(OBJDIR)/dbdmysql.nlm $(EOLIST)
+endif
+endif
+ifeq "$(APU_HAVE_PGSQL)" "1"
+TARGET_nlm += $(OBJDIR)/dbdpgsql.nlm $(OBJDIR)/dbdpgsql.nlm $(EOLIST)
+endif
+ifeq "$(APU_HAVE_SQLITE2)" "1"
+TARGET_nlm += $(OBJDIR)/dbdsqli2.nlm $(OBJDIR)/dbdsqli2.nlm $(EOLIST)
+endif
+ifeq "$(APU_HAVE_SQLITE3)" "1"
+TARGET_nlm += $(OBJDIR)/dbdsqli3.nlm $(OBJDIR)/dbdsqli3.nlm $(EOLIST)
+endif
+ifeq "$(APU_HAVE_FREETDS)" "1"
+TARGET_nlm += $(OBJDIR)/dbdfreetds.nlm $(OBJDIR)/dbdfreetds.nlm $(EOLIST)
+endif
+
+#
+# If there is an LIB target, put it here
+#
+TARGET_lib = \
+	$(EOLIST)
+
+#
+# These are the OBJ files needed to create the NLM target above.
+# Paths must all use the '/' character
+#
+FILES_nlm_objs = \
+	$(EOLIST)
+
+#
+# These are the LIB files needed to create the NLM target above.
+# These will be added as a library command in the link.opt file.
+#
+FILES_nlm_libs = \
+	$(EOLIST)
+
+#
+# These are the modules that the above NLM target depends on to load.
+# These will be added as a module command in the link.opt file.
+#
+FILES_nlm_modules = \
+	$(EOLIST)
+
+#
+# If the nlm has a msg file, put it's path here
+#
+FILE_nlm_msg =
+
+#
+# If the nlm has a hlp file put it's path here
+#
+FILE_nlm_hlp =
+
+#
+# If this is specified, it will override $(NWOS)\copyright.txt.
+#
+FILE_nlm_copyright =
+
+#
+# Any additional imports go here
+#
+FILES_nlm_Ximports = \
+	$(EOLIST)
+
+#
+# Any symbols exported to here
+#
+FILES_nlm_exports = \
+	$(EOLIST)
+
+#
+# These are the OBJ files needed to create the LIB target above.
+# Paths must all use the '/' character
+#
+FILES_lib_objs = \
+	$(EOLIST)
+
+#
+# implement targets and dependancies (leave this section alone)
+#
+
+libs :: $(OBJDIR) $(TARGET_lib)
+
+nlms :: libs $(TARGET_nlm)
+
+#
+# Updated this target to create necessary directories and copy files to the
+# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+#
+install :: nlms $(INSTDIRS) FORCE
+	copy $(OBJDIR)\*.nlm $(INSTALLBASE)
+
+#
+# Any specialized rules here
+#
+
+#
+# Include the 'tail' makefile that has targets that depend on variables defined
+# in this makefile
+#
+
+include $(APR_WORK)\build\NWGNUtail.inc
+
+
diff --git a/srclib/apr-util/dbd/apr_dbd.c b/srclib/apr-util/dbd/apr_dbd.c
index 4eed3918..b16cc5e5 100644
--- a/srclib/apr-util/dbd/apr_dbd.c
+++ b/srclib/apr-util/dbd/apr_dbd.c
@@ -14,30 +14,55 @@
  * limitations under the License.
  */
 
+#include <ctype.h>
 #include <stdio.h>
 
+#include "apu_config.h"
 #include "apu.h"
+
 #include "apr_pools.h"
-#include "apr_dbd_internal.h"
-#include "apr_dbd.h"
-#include "apr_hash.h"
-#include "apr_thread_mutex.h"
 #include "apr_dso.h"
 #include "apr_strings.h"
+#include "apr_hash.h"
+#include "apr_thread_mutex.h"
+
+#include "apu_internal.h"
+#include "apr_dbd_internal.h"
+#include "apr_dbd.h"
+#include "apu_version.h"
 
 static apr_hash_t *drivers = NULL;
 
 #define CLEANUP_CAST (apr_status_t (*)(void*))
 
-/* Once the autofoo supports building it for dynamic load, we can use
- * #define APR_DSO_BUILD APR_HAS_DSO
- */
-
-#if APR_DSO_BUILD
 #if APR_HAS_THREADS
+/* deprecated, but required for existing providers.  Existing and new
+ * providers should be refactored to use a provider-specific mutex so
+ * that different providers do not block one another. 
+ * In APR 1.3 this is no longer used for dso module loading, and
+ * apu_dso_mutex_[un]lock is used instead.
+ * In APR 2.0 this should become entirely local to libaprutil-2.so and
+ * no longer be exported.
+ */
 static apr_thread_mutex_t* mutex = NULL;
-#endif
+APU_DECLARE(apr_status_t) apr_dbd_mutex_lock()
+{
+    return apr_thread_mutex_lock(mutex);
+}
+APU_DECLARE(apr_status_t) apr_dbd_mutex_unlock()
+{
+    return apr_thread_mutex_unlock(mutex);
+}
 #else
+APU_DECLARE(apr_status_t) apr_dbd_mutex_lock() {
+    return APR_SUCCESS;
+}
+APU_DECLARE(apr_status_t) apr_dbd_mutex_unlock() {
+    return APR_SUCCESS;
+}
+#endif
+
+#if !APU_DSO_BUILD
 #define DRIVER_LOAD(name,driver,pool) \
     {   \
         extern const apr_dbd_driver_t driver; \
@@ -62,23 +87,28 @@ static apr_status_t apr_dbd_term(void *ptr)
 APU_DECLARE(apr_status_t) apr_dbd_init(apr_pool_t *pool)
 {
     apr_status_t ret = APR_SUCCESS;
+    apr_pool_t *parent;
 
     if (drivers != NULL) {
         return APR_SUCCESS;
     }
-    drivers = apr_hash_make(pool);
-    apr_pool_cleanup_register(pool, NULL, apr_dbd_term,
-                              apr_pool_cleanup_null);
 
-#if APR_DSO_BUILD
+    /* Top level pool scope, need process-scope lifetime */
+    for (parent = pool;  parent; parent = apr_pool_parent_get(pool))
+         pool = parent;
+
+    /* deprecate in 2.0 - permit implicit initialization */
+    apu_dso_init(pool);
+
+    drivers = apr_hash_make(pool);
 
 #if APR_HAS_THREADS
     ret = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, pool);
     /* This already registers a pool cleanup */
 #endif
 
-#else
-
+#if !APU_DSO_BUILD
+    /* Load statically-linked drivers: */
 #if APU_HAVE_MYSQL
     DRIVER_LOAD("mysql", apr_dbd_mysql_driver, pool);
 #endif
@@ -91,88 +121,110 @@ APU_DECLARE(apr_status_t) apr_dbd_init(apr_pool_t *pool)
 #if APU_HAVE_SQLITE2
     DRIVER_LOAD("sqlite2", apr_dbd_sqlite2_driver, pool);
 #endif
+#if APU_HAVE_ORACLE
+    DRIVER_LOAD("oracle", apr_dbd_oracle_driver, pool);
+#endif
 #if APU_HAVE_SOME_OTHER_BACKEND
     DRIVER_LOAD("firebird", apr_dbd_other_driver, pool);
 #endif
-#endif
+#endif /* APU_DSO_BUILD */
+
+    apr_pool_cleanup_register(pool, NULL, apr_dbd_term,
+                              apr_pool_cleanup_null);
+
     return ret;
 }
+
 APU_DECLARE(apr_status_t) apr_dbd_get_driver(apr_pool_t *pool, const char *name,
                                              const apr_dbd_driver_t **driver)
 {
-#if APR_DSO_BUILD
-    char path[80];
-    apr_dso_handle_t *dlhandle = NULL;
+#if APU_DSO_BUILD
+    char modname[32];
+    char symname[34];
+    apr_dso_handle_sym_t symbol;
 #endif
     apr_status_t rv;
 
-   *driver = apr_hash_get(drivers, name, APR_HASH_KEY_STRING);
-    if (*driver) {
-        return APR_SUCCESS;
+    rv = apu_dso_mutex_lock();
+    if (rv) {
+        return rv;
     }
 
-#if APR_DSO_BUILD
-
-#if APR_HAS_THREADS
-    rv = apr_thread_mutex_lock(mutex);
-    if (rv != APR_SUCCESS) {
-        goto unlock;
-    }
     *driver = apr_hash_get(drivers, name, APR_HASH_KEY_STRING);
     if (*driver) {
-        goto unlock;
+        apu_dso_mutex_unlock();
+        return APR_SUCCESS;
     }
-#endif
 
-#ifdef WIN32
-    apr_snprintf(path, sizeof path, "apr_dbd_%s.dll", name);
-#elif defined(NETWARE)
-    apr_snprintf(path, sizeof path, "dbd%s.nlm", name);
+#if APU_DSO_BUILD
+    /* The driver DSO must have exactly the same lifetime as the
+     * drivers hash table; ignore the passed-in pool */
+    pool = apr_hash_pool_get(drivers);
+
+#if defined(NETWARE)
+    apr_snprintf(modname, sizeof(modname), "dbd%s.nlm", name);
+#elif defined(WIN32)
+    apr_snprintf(modname, sizeof(modname), 
+                 "apr_dbd_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", name);
 #else
-    apr_snprintf(path, sizeof path, "apr_dbd_%s.so", name);
+    apr_snprintf(modname, sizeof(modname), 
+                 "apr_dbd_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".so", name);
 #endif
-    rv = apr_dso_load(&dlhandle, path, pool);
-    if (rv != APR_SUCCESS) { /* APR_EDSOOPEN */
-        goto unlock;
-    }
-    apr_snprintf(path, sizeof path, "apr_dbd_%s_driver", name);
-    rv = apr_dso_sym((void*)driver, dlhandle, path);
-    if (rv != APR_SUCCESS) { /* APR_ESYMNOTFOUND */
-        apr_dso_unload(dlhandle);
+    apr_snprintf(symname, sizeof(symname), "apr_dbd_%s_driver", name);
+    rv = apu_dso_load(&symbol, modname, symname, pool);
+    if (rv != APR_SUCCESS) { /* APR_EDSOOPEN or APR_ESYMNOTFOUND? */
+        if (rv == APR_EINIT) { /* previously loaded?!? */
+            apr_hash_set(drivers, name, APR_HASH_KEY_STRING, *driver);
+            rv = APR_SUCCESS;
+        }
         goto unlock;
     }
+    *driver = symbol;
     if ((*driver)->init) {
         (*driver)->init(pool);
     }
+    name = apr_pstrdup(pool, name);
     apr_hash_set(drivers, name, APR_HASH_KEY_STRING, *driver);
 
 unlock:
-#if APR_HAS_THREADS
-    apr_thread_mutex_unlock(mutex);
-#endif
+    apu_dso_mutex_unlock();
 
-#else	/* APR_DSO_BUILD - so if it wasn't already loaded, it's NOTIMPL */
+#else /* not builtin and !APR_HAS_DSO => not implemented */
     rv = APR_ENOTIMPL;
 #endif
 
     return rv;
 }
-APU_DECLARE(apr_status_t) apr_dbd_open(const apr_dbd_driver_t *driver,
-                                       apr_pool_t *pool, const char *params,
-                                       apr_dbd_t **handle)
+
+APU_DECLARE(apr_status_t) apr_dbd_open_ex(const apr_dbd_driver_t *driver,
+                                          apr_pool_t *pool, const char *params,
+                                          apr_dbd_t **handle,
+                                          const char **error)
 {
     apr_status_t rv;
-    *handle = (driver->open)(pool, params);
+    *handle = (driver->open)(pool, params, error);
     if (*handle == NULL) {
         return APR_EGENERAL;
     }
     rv = apr_dbd_check_conn(driver, pool, *handle);
     if ((rv != APR_SUCCESS) && (rv != APR_ENOTIMPL)) {
+        /* XXX: rv is APR error code, but apr_dbd_error() takes int! */
+        if (error) {
+            *error = apr_dbd_error(driver, *handle, rv);
+        }
         apr_dbd_close(driver, *handle);
         return APR_EGENERAL;
     }
     return APR_SUCCESS;
 }
+
+APU_DECLARE(apr_status_t) apr_dbd_open(const apr_dbd_driver_t *driver,
+                                       apr_pool_t *pool, const char *params,
+                                       apr_dbd_t **handle)
+{
+    return apr_dbd_open_ex(driver,pool,params,handle,NULL);
+}
+
 APU_DECLARE(int) apr_dbd_transaction_start(const apr_dbd_driver_t *driver,
                                            apr_pool_t *pool, apr_dbd_t *handle,
                                            apr_dbd_transaction_t **trans)
@@ -185,6 +237,7 @@ APU_DECLARE(int) apr_dbd_transaction_start(const apr_dbd_driver_t *driver,
     }
     return ret;
 }
+
 APU_DECLARE(int) apr_dbd_transaction_end(const apr_dbd_driver_t *driver,
                                          apr_pool_t *pool,
                                          apr_dbd_transaction_t *trans)
@@ -193,97 +246,243 @@ APU_DECLARE(int) apr_dbd_transaction_end(const apr_dbd_driver_t *driver,
     return driver->end_transaction(trans);
 }
 
+APU_DECLARE(int) apr_dbd_transaction_mode_get(const apr_dbd_driver_t *driver,
+                                              apr_dbd_transaction_t *trans)
+{
+    return driver->transaction_mode_get(trans);
+}
+
+APU_DECLARE(int) apr_dbd_transaction_mode_set(const apr_dbd_driver_t *driver,
+                                              apr_dbd_transaction_t *trans,
+                                              int mode)
+{
+    return driver->transaction_mode_set(trans, mode);
+}
+
 APU_DECLARE(apr_status_t) apr_dbd_close(const apr_dbd_driver_t *driver,
                                         apr_dbd_t *handle)
 {
     return driver->close(handle);
 }
+
 APU_DECLARE(const char*) apr_dbd_name(const apr_dbd_driver_t *driver)
 {
     return driver->name;
 }
+
 APU_DECLARE(void*) apr_dbd_native_handle(const apr_dbd_driver_t *driver,
                                          apr_dbd_t *handle)
 {
     return driver->native_handle(handle);
 }
-APU_DECLARE(int) apr_dbd_check_conn(const apr_dbd_driver_t *driver, apr_pool_t *pool,
+
+APU_DECLARE(int) apr_dbd_check_conn(const apr_dbd_driver_t *driver,
+                                    apr_pool_t *pool,
                                     apr_dbd_t *handle)
 {
     return driver->check_conn(pool, handle);
 }
-APU_DECLARE(int) apr_dbd_set_dbname(const apr_dbd_driver_t *driver, apr_pool_t *pool,
-                                   apr_dbd_t *handle, const char *name)
+
+APU_DECLARE(int) apr_dbd_set_dbname(const apr_dbd_driver_t *driver,
+                                    apr_pool_t *pool,
+                                    apr_dbd_t *handle, const char *name)
 {
     return driver->set_dbname(pool,handle,name);
 }
-APU_DECLARE(int) apr_dbd_query(const apr_dbd_driver_t *driver, apr_dbd_t *handle,
+
+APU_DECLARE(int) apr_dbd_query(const apr_dbd_driver_t *driver,
+                               apr_dbd_t *handle,
                                int *nrows, const char *statement)
 {
     return driver->query(handle,nrows,statement);
 }
-APU_DECLARE(int) apr_dbd_select(const apr_dbd_driver_t *driver, apr_pool_t *pool,
+
+APU_DECLARE(int) apr_dbd_select(const apr_dbd_driver_t *driver,
+                                apr_pool_t *pool,
                                 apr_dbd_t *handle, apr_dbd_results_t **res,
                                 const char *statement, int random)
 {
     return driver->select(pool,handle,res,statement,random);
 }
+
 APU_DECLARE(int) apr_dbd_num_cols(const apr_dbd_driver_t *driver,
                                   apr_dbd_results_t *res)
 {
     return driver->num_cols(res);
 }
+
 APU_DECLARE(int) apr_dbd_num_tuples(const apr_dbd_driver_t *driver,
                                     apr_dbd_results_t *res)
 {
     return driver->num_tuples(res);
 }
-APU_DECLARE(int) apr_dbd_get_row(const apr_dbd_driver_t *driver, apr_pool_t *pool,
+
+APU_DECLARE(int) apr_dbd_get_row(const apr_dbd_driver_t *driver,
+                                 apr_pool_t *pool,
                                  apr_dbd_results_t *res, apr_dbd_row_t **row,
                                  int rownum)
 {
     return driver->get_row(pool,res,row,rownum);
 }
+
 APU_DECLARE(const char*) apr_dbd_get_entry(const apr_dbd_driver_t *driver,
                                            apr_dbd_row_t *row, int col)
 {
     return driver->get_entry(row,col);
 }
+
+APU_DECLARE(const char*) apr_dbd_get_name(const apr_dbd_driver_t *driver,
+                                          apr_dbd_results_t *res, int col)
+{
+    return driver->get_name(res,col);
+}
+
 APU_DECLARE(const char*) apr_dbd_error(const apr_dbd_driver_t *driver,
                                        apr_dbd_t *handle, int errnum)
 {
     return driver->error(handle,errnum);
 }
+
 APU_DECLARE(const char*) apr_dbd_escape(const apr_dbd_driver_t *driver,
                                         apr_pool_t *pool, const char *string,
                                         apr_dbd_t *handle)
 {
     return driver->escape(pool,string,handle);
 }
-APU_DECLARE(int) apr_dbd_prepare(const apr_dbd_driver_t *driver, apr_pool_t *pool,
+
+APU_DECLARE(int) apr_dbd_prepare(const apr_dbd_driver_t *driver,
+                                 apr_pool_t *pool,
                                  apr_dbd_t *handle, const char *query,
                                  const char *label,
                                  apr_dbd_prepared_t **statement)
 {
-    return driver->prepare(pool,handle,query,label,statement);
+    size_t qlen;
+    int i, nargs = 0, nvals = 0;
+    char *p, *pq;
+    const char *q;
+    apr_dbd_type_e *t;
+
+    if (!driver->pformat) {
+        return APR_ENOTIMPL;
+    }
+
+    /* find the number of parameters in the query */
+    for (q = query; *q; q++) {
+        if (q[0] == '%') {
+            if (isalpha(q[1])) {
+                nargs++;
+            } else if (q[1] == '%') {
+                q++;
+            }
+        }
+    }
+    nvals = nargs;
+
+    qlen = strlen(query) +
+           nargs * (strlen(driver->pformat) + sizeof(nargs) * 3 + 2) + 1;
+    pq = apr_palloc(pool, qlen);
+    t = apr_pcalloc(pool, sizeof(*t) * nargs);
+
+    for (p = pq, q = query, i = 0; *q; q++) {
+        if (q[0] == '%') {
+            if (isalpha(q[1])) {
+                switch (q[1]) {
+                case 'd': t[i] = APR_DBD_TYPE_INT;   break;
+                case 'u': t[i] = APR_DBD_TYPE_UINT;  break;
+                case 'f': t[i] = APR_DBD_TYPE_FLOAT; break;
+                case 'h':
+                    switch (q[2]) {
+                    case 'h':
+                        switch (q[3]){
+                        case 'd': t[i] = APR_DBD_TYPE_TINY;  q += 2; break;
+                        case 'u': t[i] = APR_DBD_TYPE_UTINY; q += 2; break;
+                        }
+                        break;
+                    case 'd': t[i] = APR_DBD_TYPE_SHORT;  q++; break;
+                    case 'u': t[i] = APR_DBD_TYPE_USHORT; q++; break;
+                    }
+                    break;
+                case 'l':
+                    switch (q[2]) {
+                    case 'l':
+                        switch (q[3]){
+                        case 'd': t[i] = APR_DBD_TYPE_LONGLONG;  q += 2; break;
+                        case 'u': t[i] = APR_DBD_TYPE_ULONGLONG; q += 2; break;
+                        }
+                        break;
+                    case 'd': t[i] = APR_DBD_TYPE_LONG;   q++; break;
+                    case 'u': t[i] = APR_DBD_TYPE_ULONG;  q++; break;
+                    case 'f': t[i] = APR_DBD_TYPE_DOUBLE; q++; break;
+                    }
+                    break;
+                case 'p':
+                    if (q[2] == 'D') {
+                        switch (q[3]) {
+                        case 't': t[i] = APR_DBD_TYPE_TEXT;       q += 2; break;
+                        case 'i': t[i] = APR_DBD_TYPE_TIME;       q += 2; break;
+                        case 'd': t[i] = APR_DBD_TYPE_DATE;       q += 2; break;
+                        case 'a': t[i] = APR_DBD_TYPE_DATETIME;   q += 2; break;
+                        case 's': t[i] = APR_DBD_TYPE_TIMESTAMP;  q += 2; break;
+                        case 'z': t[i] = APR_DBD_TYPE_ZTIMESTAMP; q += 2; break;
+                        case 'b': t[i] = APR_DBD_TYPE_BLOB;       q += 2; break;
+                        case 'c': t[i] = APR_DBD_TYPE_CLOB;       q += 2; break;
+                        case 'n': t[i] = APR_DBD_TYPE_NULL;       q += 2; break;
+                        }
+                    } 
+                    break;
+                }
+                q++;
+
+                switch (t[i]) {
+                case APR_DBD_TYPE_NONE: /* by default, we expect strings */
+                    t[i] = APR_DBD_TYPE_STRING;
+                    break;
+                case APR_DBD_TYPE_BLOB:
+                case APR_DBD_TYPE_CLOB: /* three (3) more values passed in */
+                    nvals += 3;
+                    break;
+                default:
+                    break;
+                }
+
+                /* insert database specific parameter reference */
+                p += apr_snprintf(p, qlen - (p - pq), driver->pformat, ++i);
+            } else if (q[1] == '%') { /* reduce %% to % */
+                *p++ = *q++;
+            } else {
+                *p++ = *q;
+            }
+        } else {
+            *p++ = *q;
+        }
+    }
+    *p = '\0';
+
+    return driver->prepare(pool,handle,pq,label,nargs,nvals,t,statement);
 }
-APU_DECLARE(int) apr_dbd_pquery(const apr_dbd_driver_t *driver, apr_pool_t *pool,
+
+APU_DECLARE(int) apr_dbd_pquery(const apr_dbd_driver_t *driver,
+                                apr_pool_t *pool,
                                 apr_dbd_t *handle, int *nrows,
-                                apr_dbd_prepared_t *statement, int nargs,
-                                const char **args)
+                                apr_dbd_prepared_t *statement,
+                                int nargs, const char **args)
 {
-    return driver->pquery(pool,handle,nrows,statement,nargs,args);
+    return driver->pquery(pool,handle,nrows,statement,args);
 }
-APU_DECLARE(int) apr_dbd_pselect(const apr_dbd_driver_t *driver, apr_pool_t *pool,
+
+APU_DECLARE(int) apr_dbd_pselect(const apr_dbd_driver_t *driver,
+                                 apr_pool_t *pool,
                                  apr_dbd_t *handle, apr_dbd_results_t **res,
                                  apr_dbd_prepared_t *statement, int random,
                                  int nargs, const char **args)
 {
-    return driver->pselect(pool,handle,res,statement,random,nargs,args);
+    return driver->pselect(pool,handle,res,statement,random,args);
 }
-APU_DECLARE(int) apr_dbd_pvquery(const apr_dbd_driver_t *driver, apr_pool_t *pool,
-                                 apr_dbd_t *handle, int *nrows,
-                                 apr_dbd_prepared_t *statement,...)
+
+APU_DECLARE_NONSTD(int) apr_dbd_pvquery(const apr_dbd_driver_t *driver,
+                                        apr_pool_t *pool,
+                                        apr_dbd_t *handle, int *nrows,
+                                        apr_dbd_prepared_t *statement, ...)
 {
     int ret;
     va_list args;
@@ -292,9 +491,12 @@ APU_DECLARE(int) apr_dbd_pvquery(const apr_dbd_driver_t *driver, apr_pool_t *poo
     va_end(args);
     return ret;
 }
-APU_DECLARE(int) apr_dbd_pvselect(const apr_dbd_driver_t *driver, apr_pool_t *pool,
-                                  apr_dbd_t *handle, apr_dbd_results_t **res,
-                                  apr_dbd_prepared_t *statement, int random,...)
+
+APU_DECLARE_NONSTD(int) apr_dbd_pvselect(const apr_dbd_driver_t *driver,
+                                         apr_pool_t *pool, apr_dbd_t *handle,
+                                         apr_dbd_results_t **res,
+                                         apr_dbd_prepared_t *statement,
+                                         int random, ...)
 {
     int ret;
     va_list args;
@@ -303,3 +505,55 @@ APU_DECLARE(int) apr_dbd_pvselect(const apr_dbd_driver_t *driver, apr_pool_t *po
     va_end(args);
     return ret;
 }
+
+APU_DECLARE(int) apr_dbd_pbquery(const apr_dbd_driver_t *driver,
+                                 apr_pool_t *pool,
+                                 apr_dbd_t *handle, int *nrows,
+                                 apr_dbd_prepared_t *statement,
+                                 const void **args)
+{
+    return driver->pbquery(pool,handle,nrows,statement,args);
+}
+
+APU_DECLARE(int) apr_dbd_pbselect(const apr_dbd_driver_t *driver,
+                                  apr_pool_t *pool,
+                                  apr_dbd_t *handle, apr_dbd_results_t **res,
+                                  apr_dbd_prepared_t *statement, int random,
+                                  const void **args)
+{
+    return driver->pbselect(pool,handle,res,statement,random,args);
+}
+
+APU_DECLARE_NONSTD(int) apr_dbd_pvbquery(const apr_dbd_driver_t *driver,
+                                         apr_pool_t *pool,
+                                         apr_dbd_t *handle, int *nrows,
+                                         apr_dbd_prepared_t *statement, ...)
+{
+    int ret;
+    va_list args;
+    va_start(args, statement);
+    ret = driver->pvbquery(pool,handle,nrows,statement,args);
+    va_end(args);
+    return ret;
+}
+
+APU_DECLARE_NONSTD(int) apr_dbd_pvbselect(const apr_dbd_driver_t *driver,
+                                          apr_pool_t *pool, apr_dbd_t *handle,
+                                          apr_dbd_results_t **res,
+                                          apr_dbd_prepared_t *statement,
+                                          int random, ...)
+{
+    int ret;
+    va_list args;
+    va_start(args, random);
+    ret = driver->pvbselect(pool,handle,res,statement,random,args);
+    va_end(args);
+    return ret;
+}
+
+APU_DECLARE(apr_status_t) apr_dbd_datum_get(const apr_dbd_driver_t *driver,
+                                            apr_dbd_row_t *row, int col,
+                                            apr_dbd_type_e type, void *data)
+{
+    return driver->datum_get(row,col,type,data);
+}
diff --git a/srclib/apr-util/dbd/apr_dbd_freetds.c b/srclib/apr-util/dbd/apr_dbd_freetds.c
new file mode 100644
index 00000000..f458f1c0
--- /dev/null
+++ b/srclib/apr-util/dbd/apr_dbd_freetds.c
@@ -0,0 +1,795 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apu.h"
+#include "apu_config.h"
+
+/* COMPILE_STUBS: compile stubs for unimplemented functions.
+ *
+ * This is required to compile in /trunk/, but can be
+ * undefined to compile a driver for httpd-2.2 and other
+ * APR-1.2 applications
+ */
+#define COMPILE_STUBS
+
+#if APU_HAVE_FREETDS
+
+#include <ctype.h>
+#include <stdlib.h>
+
+#include "apr_strings.h"
+#include "apr_lib.h"
+
+#include "apr_pools.h"
+#include "apr_dbd_internal.h"
+
+#include <sybdb.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <regex.h>
+
+/* This probably needs to change for different applications */
+#define MAX_COL_LEN 256
+
+typedef struct freetds_cell_t {
+    int type;
+    DBINT len;
+    BYTE *data;
+} freetds_cell_t;
+
+struct apr_dbd_transaction_t {
+    int mode;
+    int errnum;
+    apr_dbd_t *handle;
+};
+
+struct apr_dbd_t {
+    DBPROCESS *proc;
+    apr_dbd_transaction_t *trans;
+    apr_pool_t *pool;
+    const char *params;
+    RETCODE err;
+};
+
+struct apr_dbd_results_t {
+    int random;
+    size_t ntuples;
+    size_t sz;
+    apr_pool_t *pool;
+    DBPROCESS *proc;
+};
+
+struct apr_dbd_row_t {
+    apr_dbd_results_t *res;
+    BYTE buf[MAX_COL_LEN];
+};
+
+struct apr_dbd_prepared_t {
+    int nargs;
+    regex_t **taint;
+    int *sz;
+    char *fmt;
+};
+
+#define dbd_freetds_is_success(x) (x == SUCCEED)
+
+static int labelnum = 0; /* FIXME */
+static regex_t dbd_freetds_find_arg;
+
+/* execute a query that doesn't return a result set, mop up,
+ * and return and APR-flavoured status
+ */
+static RETCODE freetds_exec(DBPROCESS *proc, const char *query,
+                            int want_results, int *nrows)
+{
+    /* TBD */
+    RETCODE rv = dbcmd(proc, query);
+    if (rv != SUCCEED) {
+        return rv;
+    }
+    rv = dbsqlexec(proc);
+    if (rv != SUCCEED) {
+        return rv;
+    }
+    if (!want_results) {
+        while (dbresults(proc) != NO_MORE_RESULTS) {
+            ++*nrows;
+        }
+    }
+    return SUCCEED;
+}
+static apr_status_t clear_result(void *data)
+{
+    /* clear cursor */
+    return (dbcanquery((DBPROCESS*)data) == SUCCEED)
+            ? APR_SUCCESS
+            : APR_EGENERAL;
+}
+
+static int dbd_freetds_select(apr_pool_t *pool, apr_dbd_t *sql,
+                              apr_dbd_results_t **results,
+                              const char *query, int seek)
+{
+    apr_dbd_results_t *res;
+    int i;
+    if (sql->trans && (sql->trans->errnum != SUCCEED)) {
+        return 1;
+    }
+    /* the core of this is
+     * dbcmd(proc, query);
+     * dbsqlexec(proc);
+     * while (dbnextrow(dbproc) != NO_MORE_ROWS) {
+     *     do things
+     * }
+     *
+     * Ignore seek
+     */
+
+    sql->err = freetds_exec(sql->proc, query, 1, NULL);
+    if (!dbd_freetds_is_success(sql->err)) {
+        if (sql->trans) {
+            sql->trans->errnum = sql->err;
+        }
+        return 1;
+    }
+
+    sql->err = dbresults(sql->proc);
+    if (sql->err != SUCCEED) {
+        if (sql->trans) {
+            sql->trans->errnum = sql->err;
+        }
+        return 1;
+    }
+
+    if (!*results) {
+        *results = apr_pcalloc(pool, sizeof(apr_dbd_results_t));
+    }
+    res = *results;
+    res->proc = sql->proc;
+    res->random = seek;
+    res->pool = pool;
+    res->ntuples = dblastrow(sql->proc);
+    res->sz = dbnumcols(sql->proc);
+    apr_pool_cleanup_register(pool, sql->proc, clear_result,
+                              apr_pool_cleanup_null);
+
+#if 0
+    /* Now we have a result set.  We need to bind to its vars */
+    res->vars = apr_palloc(pool, res->sz * sizeof(freetds_cell_t*));
+    for (i=1; i <= res->sz; ++i) {
+        freetds_cell_t *cell = &res->vars[i-1];
+        cell->type = dbcoltype(sql->proc, i);
+        cell->len = dbcollen(sql->proc, i);
+        cell->data = apr_palloc(pool, cell->len);
+        sql->err = dbbind(sql->proc, i, /*cell->type */ STRINGBIND, cell->len, cell->data);
+        if (sql->err != SUCCEED) {
+            fprintf(stderr, "dbbind error: %d, %d, %d", i, cell->type, cell->len);
+        }
+        if ((sql->err != SUCCEED) && (sql->trans != NULL)) {
+            sql->trans->errnum = sql->err;
+        }
+    }
+#endif
+    return (sql->err == SUCCEED) ? 0 : 1;
+}
+static const char *dbd_untaint(apr_pool_t *pool, regex_t *rx, const char *val)
+{
+    regmatch_t match[1];
+    if (rx == NULL) {
+        /* no untaint expression */
+        return val;
+    }
+    if (regexec(rx, val, 1, match, 0) == 0) {
+        return apr_pstrndup(pool, val+match[0].rm_so,
+                            match[0].rm_eo - match[0].rm_so);
+    }
+    return "";
+}
+static const char *dbd_statement(apr_pool_t *pool,
+                                 apr_dbd_prepared_t *stmt,
+                                 int nargs, const char **args)
+{
+    int i;
+    int len;
+    const char *var;
+    char *ret;
+    const char *p_in;
+    char *p_out;
+    char *q;
+   
+    /* compute upper bound on length (since untaint shrinks) */
+    len  = strlen(stmt->fmt) +1;
+    for (i=0; i<nargs; ++i) {
+        len += strlen(args[i]) - 2;
+    }
+    i = 0;
+    p_in = stmt->fmt;
+    p_out = ret = apr_palloc(pool, len);
+    /* FIXME silly bug - this'll catch %%s */
+    while (q = strstr(p_in, "%s"), q != NULL) {
+        len = q-p_in;
+        strncpy(p_out, p_in, len);
+        p_in += len;
+        p_out += len;
+        var = dbd_untaint(pool, stmt->taint[i], args[i]);
+        len = strlen(var);
+        strncpy(p_out, var, len);
+        p_in += 2;
+        p_out += len;
+        ++i;
+    }
+    strcpy(p_out, p_in);
+    return ret;
+}
+static int dbd_freetds_pselect(apr_pool_t *pool, apr_dbd_t *sql,
+                               apr_dbd_results_t **results,
+                               apr_dbd_prepared_t *statement,
+                               int seek, int nargs, const char **values)
+{
+    const char *query = dbd_statement(pool, statement, nargs, values);
+    return dbd_freetds_select(pool, sql, results, query, seek);
+}
+static int dbd_freetds_pvselect(apr_pool_t *pool, apr_dbd_t *sql,
+                                apr_dbd_results_t **results,
+                                apr_dbd_prepared_t *statement,
+                                int seek, va_list args)
+{
+    const char **values;
+    int i;
+
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+
+    values = apr_palloc(pool, sizeof(*values) * statement->nargs);
+
+    for (i = 0; i < statement->nargs; i++) {
+        values[i] = va_arg(args, const char*);
+    }
+
+    return dbd_freetds_pselect(pool, sql, results, statement, seek,
+                               statement->nargs, values);
+}
+static int dbd_freetds_query(apr_dbd_t *sql, int *nrows, const char *query);
+static int dbd_freetds_pquery(apr_pool_t *pool, apr_dbd_t *sql,
+                              int *nrows, apr_dbd_prepared_t *statement,
+                              int nargs, const char **values)
+{
+    const char *query = dbd_statement(pool, statement, nargs, values);
+    return dbd_freetds_query(sql, nrows, query);
+}
+static int dbd_freetds_pvquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
+                               apr_dbd_prepared_t *statement, va_list args)
+{
+    const char **values;
+    int i;
+
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+
+    values = apr_palloc(pool, sizeof(*values) * statement->nargs);
+
+    for (i = 0; i < statement->nargs; i++) {
+        values[i] = va_arg(args, const char*);
+    }
+    return dbd_freetds_pquery(pool, sql, nrows, statement,
+                              statement->nargs, values);
+}
+
+static int dbd_freetds_get_row(apr_pool_t *pool, apr_dbd_results_t *res,
+                               apr_dbd_row_t **rowp, int rownum)
+{
+    RETCODE rv = 0;
+    apr_dbd_row_t *row = *rowp;
+    int sequential = ((rownum >= 0) && res->random) ? 0 : 1;
+
+    if (row == NULL) {
+        row = apr_palloc(pool, sizeof(apr_dbd_row_t));
+        *rowp = row;
+        row->res = res;
+    }
+    /*
+    else {
+        if ( sequential ) {
+            ++row->n;
+        }
+        else {
+            row->n = rownum;
+        }
+    }
+    */
+    if (sequential) {
+        rv = dbnextrow(res->proc);
+    }
+    else {
+        rv = (rownum >= 0) ? dbgetrow(res->proc, rownum) : NO_MORE_ROWS;
+    }
+    switch (rv) {
+    case SUCCEED: return 0;
+    case REG_ROW: return 0;
+    case NO_MORE_ROWS:
+        apr_pool_cleanup_run(pool, res->proc, clear_result);
+        *rowp = NULL;
+        return -1;
+    case FAIL: return 1;
+    case BUF_FULL: return 2; /* FIXME */
+    default: return 3;
+    }
+
+    return 0;
+}
+
+static const char *dbd_freetds_get_entry(const apr_dbd_row_t *row, int n)
+{
+    /* FIXME: support different data types */
+    /* this fails - bind gets some vars but not others
+    return (const char*)row->res->vars[n].data;
+     */
+    DBPROCESS* proc = row->res->proc;
+    BYTE *ptr = dbdata(proc, n+1);
+    int t = dbcoltype(proc, n+1);
+    int l = dbcollen(proc, n+1);
+    if (dbwillconvert(t, SYBCHAR)) {
+      dbconvert(proc, t, ptr, l, SYBCHAR, row->buf, -1);
+      return (const char*)row->buf;
+    }
+    return ptr;
+}
+
+static const char *dbd_freetds_error(apr_dbd_t *sql, int n)
+{
+    /* XXX this doesn't seem to exist in the API ??? */
+    return apr_psprintf(sql->pool, "Error %d", sql->err);
+}
+
+static int dbd_freetds_query(apr_dbd_t *sql, int *nrows, const char *query)
+{
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+    *nrows = 0;
+    sql->err = freetds_exec(sql->proc, query, 0, nrows);
+
+    if (sql->err != SUCCEED) {
+        if (sql->trans) {
+            sql->trans->errnum = sql->err;
+        }
+        return 1;
+    }
+    return 0;
+}
+
+static const char *dbd_freetds_escape(apr_pool_t *pool, const char *arg,
+                                      apr_dbd_t *sql)
+{
+    return arg;
+}
+
+static apr_status_t freetds_regfree(void *rx)
+{
+    regfree((regex_t*)rx);
+    return APR_SUCCESS;
+}
+static int recurse_args(apr_pool_t *pool, int n, const char *query,
+                        apr_dbd_prepared_t *stmt, int offs)
+{
+
+    /* we only support %s arguments for now */
+    int ret;
+    char arg[256];
+    regmatch_t matches[3];
+    if (regexec(&dbd_freetds_find_arg, query, 3, matches, 0) != 0) {
+        /* No more args */
+        stmt->nargs = n;
+        stmt->taint = apr_palloc(pool, n*sizeof(regex_t*));
+        stmt->sz = apr_palloc(pool, n*sizeof(int));
+        ret = 0;
+    }
+    else {
+        int i;
+        int sz = 0;
+        int len = matches[1].rm_eo - matches[1].rm_so - 2;
+        if (len > 255) {
+            return 9999;
+        }
+
+        ret = recurse_args(pool, n+1, query+matches[0].rm_eo,
+                           stmt, offs+matches[0].rm_eo);
+
+        memmove(stmt->fmt + offs + matches[1].rm_so,
+                stmt->fmt + offs + matches[0].rm_eo-1,
+                strlen(stmt->fmt+offs+matches[0].rm_eo)+2);
+
+        /* compile untaint to a regex if found */
+        if (matches[1].rm_so == -1) {
+            stmt->taint[n] = NULL;
+        }
+        else {
+            strncpy(arg, query+matches[1].rm_so+1,
+                    matches[1].rm_eo - matches[1].rm_so - 2);
+            arg[matches[1].rm_eo - matches[1].rm_so - 2] = '\0';
+            stmt->taint[n] = apr_palloc(pool, sizeof(regex_t));
+            if (regcomp(stmt->taint[n], arg, REG_ICASE|REG_EXTENDED) != 0) {
+                ++ret;
+            }
+            else {
+                apr_pool_cleanup_register(pool, stmt->taint[n], freetds_regfree,
+                                          apr_pool_cleanup_null);
+            }
+        }
+
+        /* record length if specified */
+        for (i=matches[2].rm_so; i<matches[2].rm_eo; ++i) {
+            sz = 10*sz + (query[i]-'\0');
+        }
+    }
+    return ret;
+}
+
+static int dbd_freetds_prepare(apr_pool_t *pool, apr_dbd_t *sql,
+                             const char *query, const char *label,
+                             apr_dbd_prepared_t **statement)
+{
+    apr_dbd_prepared_t *stmt;
+
+    if (label == NULL) {
+        label = apr_psprintf(pool, "%d", labelnum++);
+    }
+
+    if (!*statement) {
+        *statement = apr_palloc(pool, sizeof(apr_dbd_prepared_t));
+    }
+    stmt = *statement;
+
+#if 0
+    /* count args */
+    stmt->fmt = apr_pstrdup(pool, query);
+    stmt->fmt = recurse_args(pool, 0, query, stmt, stmt->fmt);
+
+    /* overestimate by a byte or two to simplify */
+    len = strlen("CREATE PROC apr.")
+            + strlen(label)
+            + stmt->nargs * strlen(" @arg1 varchar(len1),")
+            + strlen(" AS begin ")
+            + strlen(stmt->fmt)
+            + strlen(" end "); /* extra byte for terminator */
+
+    pquery = apr_pcalloc(pool, len);
+    sprintf(pquery, "CREATE PROC apr.%s", label);
+    for (i=0; i<stmt->nargs; ++i) {
+        sprintf(pquery+strlen(pquery), " @arg%d varchar(%d)", i, stmt->sz[i]);
+        if (i < stmt->nargs-1) {
+            pquery[strlen(pquery)] = ',';
+        }
+    }
+    strcat(pquery, " AS BEGIN ");
+    strcat(pquery, stmt->fmt);
+    strcat(pquery, " END");
+
+    return (freetds_exec(sql->proc, pquery, 0, &i) == SUCCEED) ? 0 : 1;
+#else
+    stmt->fmt = apr_pstrdup(pool, query);
+    return recurse_args(pool, 0, query, stmt, 0);
+#endif
+
+}
+
+static int dbd_freetds_start_transaction(apr_pool_t *pool, apr_dbd_t *handle,
+                                         apr_dbd_transaction_t **trans)
+{
+    int dummy;
+
+    /* XXX handle recursive transactions here */
+
+    handle->err = freetds_exec(handle->proc, "BEGIN TRANSACTION", 0, &dummy);
+
+    if (dbd_freetds_is_success(handle->err)) {
+        if (!*trans) {
+            *trans = apr_pcalloc(pool, sizeof(apr_dbd_transaction_t));
+        }
+        (*trans)->handle = handle;
+        handle->trans = *trans;
+        return 0;
+    }
+
+    return 1;
+}
+
+static int dbd_freetds_end_transaction(apr_dbd_transaction_t *trans)
+{
+    int dummy;
+    if (trans) {
+        /* rollback on error or explicit rollback request */
+        if (trans->errnum) {
+            trans->errnum = 0;
+            trans->handle->err = freetds_exec(trans->handle->proc,
+                                              "ROLLBACK", 0, &dummy);
+        }
+        else {
+            trans->handle->err = freetds_exec(trans->handle->proc,
+                                              "COMMIT", 0, &dummy);
+        }
+        trans->handle->trans = NULL;
+    }
+    return (trans->handle->err == SUCCEED) ? 0 : 1;
+}
+
+static DBPROCESS *freetds_open(apr_pool_t *pool, const char *params,
+                               const char **error)
+{
+    char *server = NULL;
+    DBPROCESS *process;
+    LOGINREC *login;
+    static const char *delims = " \r\n\t;|,";
+    char *ptr;
+    char *key;
+    char *value;
+    int vlen;
+    int klen;
+    char *buf;
+    char *databaseName = NULL;
+
+    /* FIXME - this uses malloc */
+    /* FIXME - pass error message back to the caller in case of failure */
+    login = dblogin();
+    if (login == NULL) {
+        return NULL;
+    }
+    /* now set login properties */
+    for (ptr = strchr(params, '='); ptr; ptr = strchr(ptr, '=')) {
+        /* don't dereference memory that may not belong to us */
+        if (ptr == params) {
+            ++ptr;
+            continue;
+        }
+        for (key = ptr-1; isspace(*key); --key);
+        klen = 0;
+        while (isalpha(*key)) {
+            --key;
+            ++klen;
+        }
+        ++key;
+        for (value = ptr+1; isspace(*value); ++value);
+
+        vlen = strcspn(value, delims);
+        buf = apr_pstrndup(pool, value, vlen);        /* NULL-terminated copy */
+
+        if (!strncasecmp(key, "username", klen)) {
+            DBSETLUSER(login, buf);
+        }
+        else if (!strncasecmp(key, "password", klen)) {
+            DBSETLPWD(login, buf);
+        }
+        else if (!strncasecmp(key, "appname", klen)) {
+            DBSETLAPP(login, buf);
+        }
+        else if (!strncasecmp(key, "dbname", klen)) {
+            databaseName = buf;
+        }
+        else if (!strncasecmp(key, "host", klen)) {
+            DBSETLHOST(login, buf);
+        }
+        else if (!strncasecmp(key, "charset", klen)) {
+            DBSETLCHARSET(login, buf);
+        }
+        else if (!strncasecmp(key, "lang", klen)) {
+            DBSETLNATLANG(login, buf);
+        }
+        else if (!strncasecmp(key, "server", klen)) {
+            server = buf;
+        }
+        else {
+            /* unknown param */
+        }
+        ptr = value+vlen;
+    }
+
+    process = dbopen(login, server);
+
+    fprintf(stderr, "databaseName [%s]\n", databaseName);
+
+    if (databaseName != NULL)
+    {
+        dbuse(process, databaseName);
+    }
+ 
+    dbloginfree(login);
+    if (process == NULL) {
+        return NULL;
+    }
+
+    return process;
+}
+static apr_dbd_t *dbd_freetds_open(apr_pool_t *pool, const char *params,
+                                   const char **error)
+{
+    apr_dbd_t *sql;
+    /* FIXME - pass error message back to the caller in case of failure */
+    DBPROCESS *process = freetds_open(pool, params, error);
+    if (process == NULL) {
+        return NULL;
+    }
+    sql = apr_palloc (pool, sizeof (apr_dbd_t));
+    sql->pool = pool;
+    sql->proc = process;
+    sql->params = params;
+    return sql;
+}
+
+static apr_status_t dbd_freetds_close(apr_dbd_t *handle)
+{
+    dbclose(handle->proc);
+    return APR_SUCCESS;
+}
+
+static apr_status_t dbd_freetds_check_conn(apr_pool_t *pool,
+                                           apr_dbd_t *handle)
+{
+    if (dbdead(handle->proc)) {
+        /* try again */
+        dbclose(handle->proc);
+        handle->proc = freetds_open(handle->pool, handle->params);
+        if (!handle->proc || dbdead(handle->proc)) {
+            return APR_EGENERAL;
+        }
+    }
+    /* clear it, in case this is called in error handling */
+    dbcancel(handle->proc);
+    return APR_SUCCESS;
+}
+
+static int dbd_freetds_select_db(apr_pool_t *pool, apr_dbd_t *handle,
+                               const char *name)
+{
+    /* ouch, it's declared int.  But we can use APR 0/nonzero */
+    return (dbuse(handle->proc, (char*)name) == SUCCEED) ? APR_SUCCESS : APR_EGENERAL;
+}
+
+static void *dbd_freetds_native(apr_dbd_t *handle)
+{
+    return handle->proc;
+}
+
+static int dbd_freetds_num_cols(apr_dbd_results_t* res)
+{
+    return res->sz;
+}
+
+static int dbd_freetds_num_tuples(apr_dbd_results_t* res)
+{
+    if (res->random) {
+        return res->ntuples;
+    }
+    else {
+        return -1;
+    }
+}
+
+static apr_status_t freetds_term(void *dummy)
+{
+    dbexit();
+    regfree(&dbd_freetds_find_arg);
+    return APR_SUCCESS;
+}
+static void dbd_freetds_init(apr_pool_t *pool)
+{
+    int rv = regcomp(&dbd_freetds_find_arg,
+                     "%(\\{[^}]*\\})?([0-9]*)[A-Za-z]", REG_EXTENDED);
+    if (rv != 0) {
+        char errmsg[256];
+        regerror(rv, &dbd_freetds_find_arg, errmsg, 256);
+        fprintf(stderr, "regcomp failed: %s\n", errmsg);
+    }
+    dbinit();
+    apr_pool_cleanup_register(pool, NULL, freetds_term, apr_pool_cleanup_null);
+}
+
+#ifdef COMPILE_STUBS
+/* get_name is the only one of these that is implemented */
+static const char *dbd_freetds_get_name(const apr_dbd_results_t *res, int n)
+{
+    return (const char*) dbcolname(res->proc, n+1); /* numbering starts at 1 */
+}
+
+/* These are stubs: transaction modes not implemented here */
+#define DBD_NOTIMPL APR_ENOTIMPL;
+static int dbd_freetds_transaction_mode_get(apr_dbd_transaction_t *trans)
+{
+    return trans ? trans->mode : APR_DBD_TRANSACTION_COMMIT;
+}
+
+static int dbd_freetds_transaction_mode_set(apr_dbd_transaction_t *trans,
+                                            int mode)
+{
+    if (trans) {
+        trans->mode = mode & TXN_MODE_BITS;
+        return trans->mode;
+    }
+    return APR_DBD_TRANSACTION_COMMIT;
+}
+static int dbd_freetds_pvbquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
+                                apr_dbd_prepared_t *statement, va_list args)
+{
+    return DBD_NOTIMPL;
+}
+static int dbd_freetds_pbquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
+                               apr_dbd_prepared_t * statement,
+                               const void **values)
+{
+    return DBD_NOTIMPL;
+}
+
+static int dbd_freetds_pvbselect(apr_pool_t *pool, apr_dbd_t *sql,
+                                 apr_dbd_results_t **results,
+                                 apr_dbd_prepared_t *statement,
+                                 int seek, va_list args)
+{
+    return DBD_NOTIMPL;
+}
+static int dbd_freetds_pbselect(apr_pool_t *pool, apr_dbd_t *sql,
+                                apr_dbd_results_t **results,
+                                apr_dbd_prepared_t *statement,
+                                int seek, const void **values)
+{
+    return DBD_NOTIMPL;
+}
+static apr_status_t dbd_freetds_datum_get(const apr_dbd_row_t *row, int n,
+                                          apr_dbd_type_e type, void *data)
+{
+    return APR_ENOTIMPL;
+}
+#endif
+
+APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_freetds_driver = {
+    "freetds",
+    dbd_freetds_init,
+    dbd_freetds_native,
+    dbd_freetds_open,
+    dbd_freetds_check_conn,
+    dbd_freetds_close,
+    dbd_freetds_select_db,
+    dbd_freetds_start_transaction,
+    dbd_freetds_end_transaction,
+    dbd_freetds_query,
+    dbd_freetds_select,
+    dbd_freetds_num_cols,
+    dbd_freetds_num_tuples,
+    dbd_freetds_get_row,
+    dbd_freetds_get_entry,
+    dbd_freetds_error,
+    dbd_freetds_escape,
+    dbd_freetds_prepare,
+    dbd_freetds_pvquery,
+    dbd_freetds_pvselect,
+    dbd_freetds_pquery,
+    dbd_freetds_pselect,
+    /* this is only implemented to support httpd/2.2 standard usage,
+     * as in the original DBD implementation.  Everything else is NOTIMPL.
+     */
+#ifdef COMPILE_STUBS
+    dbd_freetds_get_name,
+    dbd_freetds_transaction_mode_get,
+    dbd_freetds_transaction_mode_set,
+    "",
+    dbd_freetds_pvbquery,
+    dbd_freetds_pvbselect,
+    dbd_freetds_pbquery,
+    dbd_freetds_pbselect,
+    dbd_freetds_datum_get
+#endif
+};
+#endif
diff --git a/srclib/apr-util/dbd/apr_dbd_freetds.dsp b/srclib/apr-util/dbd/apr_dbd_freetds.dsp
new file mode 100644
index 00000000..0d5be7f3
--- /dev/null
+++ b/srclib/apr-util/dbd/apr_dbd_freetds.dsp
@@ -0,0 +1,207 @@
+# Microsoft Developer Studio Project File - Name="apr_dbd_freetds" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=apr_dbd_freetds - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_freetds.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_freetds.mak" CFG="apr_dbd_freetds - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_dbd_freetds - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_freetds - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_freetds - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_freetds - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "apr_dbd_freetds - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_FREETDS=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_freetds_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"Release/apr_dbd_freetds-1.res" /d DLL_NAME="apr_dbd_freetds" /d "NDEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libTDS.lib /nologo /base:"0x6EF00000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libTDS.lib /nologo /base:"0x6EF00000" /subsystem:windows /dll /incremental:no /debug /out:"Release\apr_dbd_freetds-1.dll" /pdb:"Release\apr_dbd_freetds-1.pdb" /implib:"Release\apr_dbd_freetds-1.lib" /MACHINE:X86 /opt:ref
+# Begin Special Build Tool
+TargetPath=Release\apr_dbd_freetds-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_freetds - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_FREETDS=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_freetds_src" /FD /EHsc /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"Debug/apr_dbd_freetds-1.res" /d DLL_NAME="apr_dbd_freetds" /d "_DEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libTDS.lib /nologo /base:"0x6EF00000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libTDS.lib /nologo /base:"0x6EF00000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\apr_dbd_freetds-1.dll" /pdb:"Debug\apr_dbd_freetds-1.pdb" /implib:"Debug\apr_dbd_freetds-1.lib" /MACHINE:X86
+# Begin Special Build Tool
+TargetPath=Debug\apr_dbd_freetds-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "x64\Release"
+# PROP BASE Intermediate_Dir "x64\Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "x64\Release"
+# PROP Intermediate_Dir "x64\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_FREETDS=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_freetds_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"x64/Release/apr_dbd_freetds-1.res" /d DLL_NAME="apr_dbd_freetds" /d "NDEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libTDS.lib /nologo /base:"0x6EF00000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libTDS.lib /nologo /base:"0x6EF00000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\apr_dbd_freetds-1.dll" /pdb:"x64\Release\apr_dbd_freetds-1.pdb" /implib:"x64\Release\apr_dbd_freetds-1.lib" /MACHINE:X64 /opt:ref
+# Begin Special Build Tool
+TargetPath=x64\Release\apr_dbd_freetds-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_freetds - x64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "x64\Debug"
+# PROP BASE Intermediate_Dir "x64\Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "x64\Debug"
+# PROP Intermediate_Dir "x64\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_FREETDS=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_freetds_src" /FD /EHsc /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"x64/Debug/apr_dbd_freetds-1.res" /d DLL_NAME="apr_dbd_freetds" /d "_DEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libTDS.lib /nologo /base:"0x6EF00000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libTDS.lib /nologo /base:"0x6EF00000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\apr_dbd_freetds-1.dll" /pdb:"x64\Debug\apr_dbd_freetds-1.pdb" /implib:"x64\Debug\apr_dbd_freetds-1.lib" /MACHINE:X64
+# Begin Special Build Tool
+TargetPath=x64\Debug\apr_dbd_freetds-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "apr_dbd_freetds - Win32 Release"
+# Name "apr_dbd_freetds - Win32 Debug"
+# Name "apr_dbd_freetds - x64 Release"
+# Name "apr_dbd_freetds - x64 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\apr_dbd_freetds.c
+# End Source File
+# End Group
+# Begin Group "Public Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\apr_dbd.h
+# End Source File
+# End Group
+# Begin Group "Internal Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\private\apu_config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\private\apu_dbd_internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\private\apu_internal.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\libaprutil.rc
+# End Source File
+# End Target
+# End Project
diff --git a/srclib/apr-util/dbd/apr_dbd_mysql.c b/srclib/apr-util/dbd/apr_dbd_mysql.c
index 65b862e6..6ecd30e7 100644
--- a/srclib/apr-util/dbd/apr_dbd_mysql.c
+++ b/srclib/apr-util/dbd/apr_dbd_mysql.c
@@ -43,9 +43,13 @@
 
 struct apr_dbd_prepared_t {
     MYSQL_STMT* stmt;
+    int nargs;
+    int nvals;
+    apr_dbd_type_e *types;
 };
 
 struct apr_dbd_transaction_t {
+    int mode;
     int errnum;
     apr_dbd_t *handle;
 };
@@ -61,12 +65,149 @@ struct apr_dbd_results_t {
     MYSQL_RES *res;
     MYSQL_STMT *statement;
     MYSQL_BIND *bind;
+    apr_pool_t *pool;
 };
 struct apr_dbd_row_t {
     MYSQL_ROW row;
     apr_dbd_results_t *res;
+    unsigned long *len;
+};
+
+/* MySQL specific bucket for BLOB types */
+typedef struct apr_bucket_lob apr_bucket_lob;
+/**
+ * A bucket referring to a MySQL BLOB
+ */
+struct apr_bucket_lob {
+    /** Number of buckets using this memory */
+    apr_bucket_refcount  refcount;
+    /** The row this bucket refers to */
+    const apr_dbd_row_t *row;
+    /** The column this bucket refers to */
+    int col;
+    /** The pool into which any needed structures should
+     *  be created while reading from this bucket */
+    apr_pool_t *readpool;
 };
 
+static void lob_bucket_destroy(void *data);
+static apr_status_t lob_bucket_read(apr_bucket *e, const char **str,
+                                    apr_size_t *len, apr_read_type_e block);
+static apr_bucket *apr_bucket_lob_make(apr_bucket *b,
+                                       const apr_dbd_row_t *row, int col,
+                                       apr_off_t offset, apr_size_t len,
+                                       apr_pool_t *p);
+static apr_bucket *apr_bucket_lob_create(const apr_dbd_row_t *row, int col,
+                                         apr_off_t offset,
+                                         apr_size_t len, apr_pool_t *p,
+                                         apr_bucket_alloc_t *list);
+
+static const apr_bucket_type_t apr_bucket_type_lob = {
+    "LOB", 5, APR_BUCKET_DATA,
+    lob_bucket_destroy,
+    lob_bucket_read,
+    apr_bucket_setaside_notimpl,
+    apr_bucket_shared_split,
+    apr_bucket_shared_copy
+};
+
+static void lob_bucket_destroy(void *data)
+{
+    apr_bucket_lob *f = data;
+
+    if (apr_bucket_shared_destroy(f)) {
+        /* no need to destroy database objects here; it will get
+         * done automatically when the pool gets cleaned up */
+        apr_bucket_free(f);
+    }
+}
+
+static apr_status_t lob_bucket_read(apr_bucket *e, const char **str,
+                                    apr_size_t *len, apr_read_type_e block)
+{
+    apr_bucket_lob *a = e->data;
+    const apr_dbd_row_t *row = a->row;
+    apr_dbd_results_t *res = row->res;
+    int col = a->col;
+    apr_bucket *b = NULL;
+    int rv;
+    apr_size_t blength = e->length;  /* bytes remaining in file past offset */
+    apr_off_t boffset = e->start;
+    MYSQL_BIND *bind = &res->bind[col];
+
+    *str = NULL;  /* in case we die prematurely */
+
+    /* fetch from offset if not at the beginning */
+    if (boffset > 0) {
+        rv = mysql_stmt_fetch_column(res->statement, bind, col, boffset);
+        if (rv != 0) {
+            return APR_EGENERAL;
+        }
+    }
+    blength -= blength > bind->buffer_length ? bind->buffer_length : blength;
+    *len = e->length - blength;
+    *str = bind->buffer;
+
+    /* allocate new buffer, since we used this one for the bucket */
+    bind->buffer = apr_palloc(res->pool, bind->buffer_length);
+
+    /*
+     * Change the current bucket to refer to what we read,
+     * even if we read nothing because we hit EOF.
+     */
+    apr_bucket_pool_make(e, *str, *len, res->pool);
+
+    /* If we have more to read from the field, then create another bucket */
+    if (blength > 0) {
+        /* for efficiency, we can just build a new apr_bucket struct
+         * to wrap around the existing LOB bucket */
+        b = apr_bucket_alloc(sizeof(*b), e->list);
+        b->start  = boffset + *len;
+        b->length = blength;
+        b->data   = a;
+        b->type   = &apr_bucket_type_lob;
+        b->free   = apr_bucket_free;
+        b->list   = e->list;
+        APR_BUCKET_INSERT_AFTER(e, b);
+    }
+    else {
+        lob_bucket_destroy(a);
+    }
+
+    return APR_SUCCESS;
+}
+
+static apr_bucket *apr_bucket_lob_make(apr_bucket *b,
+                                       const apr_dbd_row_t *row, int col,
+                                       apr_off_t offset, apr_size_t len,
+                                       apr_pool_t *p)
+{
+    apr_bucket_lob *f;
+
+    f = apr_bucket_alloc(sizeof(*f), b->list);
+    f->row = row;
+    f->col = col;
+    f->readpool = p;
+
+    b = apr_bucket_shared_make(b, f, offset, len);
+    b->type = &apr_bucket_type_lob;
+
+    return b;
+}
+
+static apr_bucket *apr_bucket_lob_create(const apr_dbd_row_t *row, int col,
+                                         apr_off_t offset,
+                                         apr_size_t len, apr_pool_t *p,
+                                         apr_bucket_alloc_t *list)
+{
+    apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
+
+    APR_BUCKET_INIT(b);
+    b->free = apr_bucket_free;
+    b->list = list;
+    return apr_bucket_lob_make(b, row, col, offset, len, p);
+}
+
 static apr_status_t free_result(void *data)
 {
     mysql_free_result(data);
@@ -90,6 +231,7 @@ static int dbd_mysql_select(apr_pool_t *pool, apr_dbd_t *sql,
             }
             (*results)->random = seek;
             (*results)->statement = NULL;
+            (*results)->pool = pool;
             if (seek) {
                 (*results)->res = mysql_store_result(sql->conn);
             }
@@ -103,12 +245,21 @@ static int dbd_mysql_select(apr_pool_t *pool, apr_dbd_t *sql,
         ret = mysql_errno(sql->conn);
     }
     
-    if (sql->trans) {
+    if (TXN_NOTICE_ERRORS(sql->trans)) {
         sql->trans->errnum = ret;
     }
     return ret;
 }
 
+static const char *dbd_mysql_get_name(const apr_dbd_results_t *res, int n)
+{
+    if ((n < 0) || (n >= mysql_num_fields(res->res))) {
+        return NULL;
+    }
+
+    return mysql_fetch_fields(res->res)[n].name;
+}
+
 static int dbd_mysql_get_row(apr_pool_t *pool, apr_dbd_results_t *res,
                              apr_dbd_row_t **row, int rownum)
 {
@@ -117,8 +268,11 @@ static int dbd_mysql_get_row(apr_pool_t *pool, apr_dbd_results_t *res,
 
     if (res->statement) {
         if (res->random) {
-            if (rownum >= 0) {
-                mysql_stmt_data_seek(res->statement, (my_ulonglong)rownum);
+            if (rownum > 0) {
+                mysql_stmt_data_seek(res->statement, (my_ulonglong) --rownum);
+            }
+            else {
+                return -1; /* invalid row */
             }
         }
         ret = mysql_stmt_fetch(res->statement);
@@ -136,8 +290,11 @@ static int dbd_mysql_get_row(apr_pool_t *pool, apr_dbd_results_t *res,
     }
     else {
         if (res->random) {
-            if (rownum >= 0) {
-                mysql_data_seek(res->res, (my_ulonglong) rownum);
+            if (rownum > 0) {
+                mysql_data_seek(res->res, (my_ulonglong) --rownum);
+            }
+            else {
+                return -1; /* invalid row */
             }
         }
         r = mysql_fetch_row(res->res);
@@ -151,6 +308,7 @@ static int dbd_mysql_get_row(apr_pool_t *pool, apr_dbd_results_t *res,
         }
         (*row)->row = r;
         (*row)->res = res;
+        (*row)->len = mysql_fetch_lengths(res->res);
     }
     else {
         apr_pool_cleanup_run(pool, res->res, free_result);
@@ -208,6 +366,158 @@ static const char *dbd_mysql_get_entry(const apr_dbd_row_t *row, int n)
 }
 #endif
 
+static apr_status_t dbd_mysql_datum_get(const apr_dbd_row_t *row, int n,
+                                        apr_dbd_type_e type, void *data)
+{
+    if (row->res->statement) {
+        MYSQL_BIND *bind = &row->res->bind[n];
+        unsigned long len = *bind->length;
+
+        if (mysql_stmt_fetch_column(row->res->statement, bind, n, 0) != 0) {
+            return APR_EGENERAL;
+        }
+
+        if (*bind->is_null) {
+            return APR_ENOENT;
+        }
+
+        switch (type) {
+        case APR_DBD_TYPE_TINY:
+            *(char*)data = atoi(bind->buffer);
+            break;
+        case APR_DBD_TYPE_UTINY:
+            *(unsigned char*)data = atoi(bind->buffer);
+            break;
+        case APR_DBD_TYPE_SHORT:
+            *(short*)data = atoi(bind->buffer);
+            break;
+        case APR_DBD_TYPE_USHORT:
+            *(unsigned short*)data = atoi(bind->buffer);
+            break;
+        case APR_DBD_TYPE_INT:
+            *(int*)data = atoi(bind->buffer);
+            break;
+        case APR_DBD_TYPE_UINT:
+            *(unsigned int*)data = atoi(bind->buffer);
+            break;
+        case APR_DBD_TYPE_LONG:
+            *(long*)data = atol(bind->buffer);
+            break;
+        case APR_DBD_TYPE_ULONG:
+            *(unsigned long*)data = atol(bind->buffer);
+            break;
+        case APR_DBD_TYPE_LONGLONG:
+            *(apr_int64_t*)data = apr_atoi64(bind->buffer);
+            break;
+        case APR_DBD_TYPE_ULONGLONG:
+            *(apr_uint64_t*)data = apr_atoi64(bind->buffer);
+            break;
+        case APR_DBD_TYPE_FLOAT:
+            *(float*)data = atof(bind->buffer);
+            break;
+        case APR_DBD_TYPE_DOUBLE:
+            *(double*)data = atof(bind->buffer);
+            break;
+        case APR_DBD_TYPE_STRING:
+        case APR_DBD_TYPE_TEXT:
+        case APR_DBD_TYPE_TIME:
+        case APR_DBD_TYPE_DATE:
+        case APR_DBD_TYPE_DATETIME:
+        case APR_DBD_TYPE_TIMESTAMP:
+        case APR_DBD_TYPE_ZTIMESTAMP:
+            *((char*)bind->buffer+bind->buffer_length-1) = '\0';
+            *(char**)data = bind->buffer;
+            break;
+        case APR_DBD_TYPE_BLOB:
+        case APR_DBD_TYPE_CLOB:
+            {
+            apr_bucket *e;
+            apr_bucket_brigade *b = (apr_bucket_brigade*)data;
+
+            e = apr_bucket_lob_create(row, n, 0, len,
+                                      row->res->pool, b->bucket_alloc);
+            APR_BRIGADE_INSERT_TAIL(b, e);
+            }
+            break;
+        case APR_DBD_TYPE_NULL:
+            *(void**)data = NULL;
+            break;
+        default:
+            return APR_EGENERAL;
+        }
+    }
+    else {
+        if (row->row[n] == NULL) {
+            return APR_ENOENT;
+        }
+
+        switch (type) {
+        case APR_DBD_TYPE_TINY:
+            *(char*)data = atoi(row->row[n]);
+            break;
+        case APR_DBD_TYPE_UTINY:
+            *(unsigned char*)data = atoi(row->row[n]);
+            break;
+        case APR_DBD_TYPE_SHORT:
+            *(short*)data = atoi(row->row[n]);
+            break;
+        case APR_DBD_TYPE_USHORT:
+            *(unsigned short*)data = atoi(row->row[n]);
+            break;
+        case APR_DBD_TYPE_INT:
+            *(int*)data = atoi(row->row[n]);
+            break;
+        case APR_DBD_TYPE_UINT:
+            *(unsigned int*)data = atoi(row->row[n]);
+            break;
+        case APR_DBD_TYPE_LONG:
+            *(long*)data = atol(row->row[n]);
+            break;
+        case APR_DBD_TYPE_ULONG:
+            *(unsigned long*)data = atol(row->row[n]);
+            break;
+        case APR_DBD_TYPE_LONGLONG:
+            *(apr_int64_t*)data = apr_atoi64(row->row[n]);
+            break;
+        case APR_DBD_TYPE_ULONGLONG:
+            *(apr_uint64_t*)data = apr_atoi64(row->row[n]);
+            break;
+        case APR_DBD_TYPE_FLOAT:
+            *(float*)data = atof(row->row[n]);
+            break;
+        case APR_DBD_TYPE_DOUBLE:
+            *(double*)data = atof(row->row[n]);
+            break;
+        case APR_DBD_TYPE_STRING:
+        case APR_DBD_TYPE_TEXT:
+        case APR_DBD_TYPE_TIME:
+        case APR_DBD_TYPE_DATE:
+        case APR_DBD_TYPE_DATETIME:
+        case APR_DBD_TYPE_TIMESTAMP:
+        case APR_DBD_TYPE_ZTIMESTAMP:
+            *(char**)data = row->row[n];
+            break;
+        case APR_DBD_TYPE_BLOB:
+        case APR_DBD_TYPE_CLOB:
+            {
+            apr_bucket *e;
+            apr_bucket_brigade *b = (apr_bucket_brigade*)data;
+
+            e = apr_bucket_pool_create(row->row[n], row->len[n],
+                                       row->res->pool, b->bucket_alloc);
+            APR_BRIGADE_INSERT_TAIL(b, e);
+            }
+            break;
+        case APR_DBD_TYPE_NULL:
+            *(void**)data = NULL;
+            break;
+        default:
+            return APR_EGENERAL;
+        }
+    }
+    return 0;
+}
+
 static const char *dbd_mysql_error(apr_dbd_t *sql, int n)
 {
     return mysql_error(sql->conn);
@@ -224,7 +534,7 @@ static int dbd_mysql_query(apr_dbd_t *sql, int *nrows, const char *query)
         ret = mysql_errno(sql->conn);
     }
     *nrows = mysql_affected_rows(sql->conn);
-    if (sql->trans) {
+    if (TXN_NOTICE_ERRORS(sql->trans)) {
         sql->trans->errnum = ret;
     }
     return ret;
@@ -247,32 +557,12 @@ static apr_status_t stmt_close(void *data)
 
 static int dbd_mysql_prepare(apr_pool_t *pool, apr_dbd_t *sql,
                              const char *query, const char *label,
+                             int nargs, int nvals, apr_dbd_type_e *types,
                              apr_dbd_prepared_t **statement)
 {
     /* Translate from apr_dbd to native query format */
-    char *myquery = apr_pstrdup(pool, query);
-    char *p = myquery;
-    const char *q;
     int ret;
-    for (q = query; *q; ++q) {
-        if (q[0] == '%') {
-            if (isalpha(q[1])) {
-                *p++ = '?';
-                ++q;
-            }
-            else if (q[1] == '%') {
-                /* reduce %% to % */
-                *p++ = *q++;
-            }
-            else {
-                *p++ = *q;
-            }
-        }
-        else {
-            *p++ = *q;
-        }
-    } 
-    *p = 0;
+
     if (!*statement) {
         *statement = apr_palloc(pool, sizeof(apr_dbd_prepared_t));
     }
@@ -281,44 +571,64 @@ static int dbd_mysql_prepare(apr_pool_t *pool, apr_dbd_t *sql,
     if ((*statement)->stmt) {
         apr_pool_cleanup_register(pool, (*statement)->stmt,
                                   stmt_close, apr_pool_cleanup_null);
-        ret = mysql_stmt_prepare((*statement)->stmt, myquery, strlen(myquery));
+        ret = mysql_stmt_prepare((*statement)->stmt, query, strlen(query));
 
         if (ret != 0) {
             ret = mysql_stmt_errno((*statement)->stmt);
         }
 
+        (*statement)->nargs = nargs;
+        (*statement)->nvals = nvals;
+        (*statement)->types = types;
+
         return ret;
     }
 
     return CR_OUT_OF_MEMORY;
 }
 
-static int dbd_mysql_pquery(apr_pool_t *pool, apr_dbd_t *sql,
-                            int *nrows, apr_dbd_prepared_t *statement,
-                            int nargs, const char **values)
+static void dbd_mysql_bind(apr_dbd_prepared_t *statement,
+                           const char **values, MYSQL_BIND *bind)
 {
-    MYSQL_BIND *bind;
-    char *arg;
-    int ret;
-    int i;
-    my_bool is_null = FALSE;
+    int i, j;
 
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-    nargs = mysql_stmt_param_count(statement->stmt);
-
-    bind = apr_palloc(pool, nargs*sizeof(MYSQL_BIND));
-    for (i=0; i < nargs; ++i) {
-        arg = (char*)values[i];
-        bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-        bind[i].buffer = arg;
-        bind[i].buffer_length = strlen(arg);
+    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
         bind[i].length = &bind[i].buffer_length;
-        bind[i].is_null = &is_null;
         bind[i].is_unsigned = 0;
+        bind[i].is_null = NULL;
+
+        if (values[j] == NULL) {
+            bind[i].buffer_type = MYSQL_TYPE_NULL;
+        }
+        else {
+            switch (statement->types[i]) {
+            case APR_DBD_TYPE_BLOB:
+            case APR_DBD_TYPE_CLOB:
+                bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
+                bind[i].buffer = (void*)values[j];
+                bind[i].buffer_length = atol(values[++j]);
+
+                /* skip table and column */
+                j += 2;
+                break;
+            default:
+                bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
+                bind[i].buffer = (void*)values[j];
+                bind[i].buffer_length = strlen(values[j]);
+                break;
+            }
+        }
     }
 
+    return;
+}
+
+static int dbd_mysql_pquery_internal(apr_pool_t *pool, apr_dbd_t *sql,
+                                     int *nrows, apr_dbd_prepared_t *statement,
+                                     MYSQL_BIND *bind)
+{
+    int ret;
+
     ret = mysql_stmt_bind_param(statement->stmt, bind);
     if (ret != 0) {
         *nrows = 0;
@@ -331,90 +641,65 @@ static int dbd_mysql_pquery(apr_pool_t *pool, apr_dbd_t *sql,
         }
         *nrows = mysql_stmt_affected_rows(statement->stmt);
     }
-    if (sql->trans) {
-        sql->trans->errnum = ret;
-    }
+
     return ret;
 }
 
-static int dbd_mysql_pvquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
-                             apr_dbd_prepared_t *statement, va_list args)
+static int dbd_mysql_pquery(apr_pool_t *pool, apr_dbd_t *sql,
+                            int *nrows, apr_dbd_prepared_t *statement,
+                            const char **values)
 {
     MYSQL_BIND *bind;
-    char *arg;
     int ret;
-    int nargs = 0;
-    int i;
-    my_bool is_null = FALSE;
 
     if (sql->trans && sql->trans->errnum) {
         return sql->trans->errnum;
     }
-    nargs = mysql_stmt_param_count(statement->stmt);
 
-    bind = apr_palloc(pool, nargs*sizeof(MYSQL_BIND));
-    for (i=0; i < nargs; ++i) {
-        arg = va_arg(args, char*);
-        bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-        bind[i].buffer = arg;
-        bind[i].buffer_length = strlen(arg);
-        bind[i].length = &bind[i].buffer_length;
-        bind[i].is_null = &is_null;
-        bind[i].is_unsigned = 0;
-    }
+    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
 
-    ret = mysql_stmt_bind_param(statement->stmt, bind);
-    if (ret != 0) {
-        *nrows = 0;
-        ret = mysql_stmt_errno(statement->stmt);
-    }
-    else {
-        ret = mysql_stmt_execute(statement->stmt);
-        if (ret != 0) {
-            ret = mysql_stmt_errno(statement->stmt);
-        }
-        *nrows = mysql_stmt_affected_rows(statement->stmt);
-    }
-    if (sql->trans) {
+    dbd_mysql_bind(statement, values, bind);
+
+    ret = dbd_mysql_pquery_internal(pool, sql, nrows, statement, bind);
+
+    if (TXN_NOTICE_ERRORS(sql->trans)) {
         sql->trans->errnum = ret;
     }
     return ret;
 }
 
-static int dbd_mysql_pselect(apr_pool_t *pool, apr_dbd_t *sql,
-                             apr_dbd_results_t **res,
-                             apr_dbd_prepared_t *statement, int random,
-                             int nargs, const char **args)
+static int dbd_mysql_pvquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
+                             apr_dbd_prepared_t *statement, va_list args)
 {
+    const char **values;
     int i;
-    int nfields;
-    char *arg;
-    my_bool is_null = FALSE;
-    my_bool *is_nullr;
-#if MYSQL_VERSION_ID >= 50000
-    my_bool *error;
-#endif
-    int ret;
-    unsigned long *length, maxlen;
-    MYSQL_BIND *bind;
 
     if (sql->trans && sql->trans->errnum) {
         return sql->trans->errnum;
     }
 
-    nargs = mysql_stmt_param_count(statement->stmt);
-    bind = apr_palloc(pool, nargs*sizeof(MYSQL_BIND));
+    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
 
-    for (i=0; i < nargs; ++i) {
-        arg = (char*)args[i];
-        bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-        bind[i].buffer = arg;
-        bind[i].buffer_length = strlen(arg);
-        bind[i].length = &bind[i].buffer_length;
-        bind[i].is_null = &is_null;
-        bind[i].is_unsigned = 0;
+    for (i = 0; i < statement->nvals; i++) {
+        values[i] = va_arg(args, const char*);
     }
 
+    return dbd_mysql_pquery(pool, sql, nrows, statement, values);
+}
+
+static int dbd_mysql_pselect_internal(apr_pool_t *pool, apr_dbd_t *sql,
+                                      apr_dbd_results_t **res,
+                                      apr_dbd_prepared_t *statement,
+                                      int random, MYSQL_BIND *bind)
+{
+    int nfields, i;
+    my_bool *is_nullr;
+#if MYSQL_VERSION_ID >= 50000
+    my_bool *error;
+#endif
+    int ret;
+    unsigned long *length, maxlen;
+
     ret = mysql_stmt_bind_param(statement->stmt, bind);
     if (ret == 0) {
         ret = mysql_stmt_execute(statement->stmt);
@@ -425,6 +710,7 @@ static int dbd_mysql_pselect(apr_pool_t *pool, apr_dbd_t *sql,
             (*res)->random = random;
             (*res)->statement = statement->stmt;
             (*res)->res = mysql_stmt_result_metadata(statement->stmt);
+            (*res)->pool = pool;
             apr_pool_cleanup_register(pool, (*res)->res,
                                       free_result, apr_pool_cleanup_null);
             nfields = mysql_num_fields((*res)->res);
@@ -438,7 +724,12 @@ static int dbd_mysql_pselect(apr_pool_t *pool, apr_dbd_t *sql,
                 for ( i = 0; i < nfields; ++i ) {
                     maxlen = ((*res)->res->fields[i].length < sql->fldsz ?
                               (*res)->res->fields[i].length : sql->fldsz) + 1;
-                    (*res)->bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
+                    if ((*res)->res->fields[i].type == MYSQL_TYPE_BLOB) {
+                        (*res)->bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
+                    }
+                    else {
+                        (*res)->bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
+                    }
                     (*res)->bind[i].buffer_length = maxlen;
                     (*res)->bind[i].length = &length[i];
                     (*res)->bind[i].buffer = apr_palloc(pool, maxlen);
@@ -457,7 +748,29 @@ static int dbd_mysql_pselect(apr_pool_t *pool, apr_dbd_t *sql,
     if (ret != 0) {
         ret = mysql_stmt_errno(statement->stmt);
     }
-    if (sql->trans) {
+
+    return ret;
+}
+
+static int dbd_mysql_pselect(apr_pool_t *pool, apr_dbd_t *sql,
+                             apr_dbd_results_t **res,
+                             apr_dbd_prepared_t *statement, int random,
+                             const char **args)
+{
+    int ret;
+    MYSQL_BIND *bind;
+
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+
+    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
+
+    dbd_mysql_bind(statement, args, bind);
+
+    ret = dbd_mysql_pselect_internal(pool, sql,  res, statement, random, bind);
+
+    if (TXN_NOTICE_ERRORS(sql->trans)) {
         sql->trans->errnum = ret;
     }
     return ret;
@@ -468,89 +781,246 @@ static int dbd_mysql_pvselect(apr_pool_t *pool, apr_dbd_t *sql,
                               apr_dbd_prepared_t *statement, int random,
                               va_list args)
 {
+    const char **values;
     int i;
-    int nfields;
-    char *arg;
-    my_bool is_null = FALSE;
-    my_bool *is_nullr;
-#if MYSQL_VERSION_ID >= 50000
-    my_bool *error;
-#endif
-    int ret;
-    unsigned long *length, maxlen;
-    int nargs;
-    MYSQL_BIND *bind;
 
     if (sql->trans && sql->trans->errnum) {
         return sql->trans->errnum;
     }
 
-    nargs = mysql_stmt_param_count(statement->stmt);
-    bind = apr_palloc(pool, nargs*sizeof(MYSQL_BIND));
+    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
 
-    for (i=0; i < nargs; ++i) {
-        arg = va_arg(args, char*);
-        bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-        bind[i].buffer = arg;
-        bind[i].buffer_length = strlen(arg);
-        bind[i].length = &bind[i].buffer_length;
-        bind[i].is_null = &is_null;
-        bind[i].is_unsigned = 0;
+    for (i = 0; i < statement->nvals; i++) {
+        values[i] = va_arg(args, const char*);
     }
 
-    ret = mysql_stmt_bind_param(statement->stmt, bind);
-    if (ret == 0) {
-        ret = mysql_stmt_execute(statement->stmt);
-        if (!ret) {
-            if (!*res) {
-                *res = apr_pcalloc(pool, sizeof(apr_dbd_results_t));
+    return dbd_mysql_pselect(pool, sql, res, statement, random, values);
+}
+
+static void dbd_mysql_bbind(apr_pool_t *pool, apr_dbd_prepared_t *statement,
+                            const void **values, MYSQL_BIND *bind)
+{
+    void *arg;
+    int i, j;
+    apr_dbd_type_e type;
+
+    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
+        arg = (void *)values[j];
+
+        bind[i].length = &bind[i].buffer_length;
+        bind[i].is_null = NULL;
+
+        type = (arg == NULL ? APR_DBD_TYPE_NULL : statement->types[i]);
+        switch (type) {
+        case APR_DBD_TYPE_TINY:
+            bind[i].buffer = arg;
+            bind[i].buffer_type = MYSQL_TYPE_TINY;
+            bind[i].is_unsigned = 0;
+            break;
+        case APR_DBD_TYPE_UTINY:
+            bind[i].buffer = arg;
+            bind[i].buffer_type = MYSQL_TYPE_TINY;
+            bind[i].is_unsigned = 1;
+            break;
+        case APR_DBD_TYPE_SHORT:
+            bind[i].buffer = arg;
+            bind[i].buffer_type = MYSQL_TYPE_SHORT;
+            bind[i].is_unsigned = 0;
+            break;
+        case APR_DBD_TYPE_USHORT:
+            bind[i].buffer = arg;
+            bind[i].buffer_type = MYSQL_TYPE_SHORT;
+            bind[i].is_unsigned = 1;
+            break;
+        case APR_DBD_TYPE_INT:
+            bind[i].buffer = arg;
+            bind[i].buffer_type = MYSQL_TYPE_LONG;
+            bind[i].is_unsigned = 0;
+            break;
+        case APR_DBD_TYPE_UINT:
+            bind[i].buffer = arg;
+            bind[i].buffer_type = MYSQL_TYPE_LONG;
+            bind[i].is_unsigned = 1;
+            break;
+        case APR_DBD_TYPE_LONG:
+            if (sizeof(int) == sizeof(long)) {
+                bind[i].buffer = arg;
             }
-            (*res)->random = random;
-            (*res)->statement = statement->stmt;
-            (*res)->res = mysql_stmt_result_metadata(statement->stmt);
-            apr_pool_cleanup_register(pool, (*res)->res,
-                                      free_result, apr_pool_cleanup_null);
-            nfields = mysql_num_fields((*res)->res);
-            if (!(*res)->bind) {
-                (*res)->bind = apr_palloc(pool, nfields*sizeof(MYSQL_BIND));
-                length = apr_pcalloc(pool, nfields*sizeof(unsigned long));
-#if MYSQL_VERSION_ID >= 50000
-                error = apr_palloc(pool, nfields*sizeof(my_bool));
-#endif
-                is_nullr = apr_pcalloc(pool, nfields*sizeof(my_bool));
-                for ( i = 0; i < nfields; ++i ) {
-                    maxlen = ((*res)->res->fields[i].length < sql->fldsz ?
-                              (*res)->res->fields[i].length : sql->fldsz) + 1;
-                    (*res)->bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
-                    (*res)->bind[i].buffer_length = maxlen;
-                    (*res)->bind[i].length = &length[i];
-                    (*res)->bind[i].buffer = apr_palloc(pool, maxlen);
-                    (*res)->bind[i].is_null = is_nullr+i;
-#if MYSQL_VERSION_ID >= 50000
-                    (*res)->bind[i].error = error+i;
-#endif
-                }
+            else {
+                bind[i].buffer = apr_palloc(pool, sizeof(int));
+                *(int*)bind[i].buffer = *(long*)arg;
             }
-            ret = mysql_stmt_bind_result(statement->stmt, (*res)->bind);
-            if (!ret) {
-                ret = mysql_stmt_store_result(statement->stmt);
+            bind[i].buffer_type = MYSQL_TYPE_LONG;
+            bind[i].is_unsigned = 0;
+            break;
+        case APR_DBD_TYPE_ULONG:
+            if (sizeof(unsigned int) == sizeof(unsigned long)) {
+                bind[i].buffer = arg;
             }
+            else {
+                bind[i].buffer = apr_palloc(pool, sizeof(unsigned int));
+                *(unsigned int*)bind[i].buffer = *(unsigned long*)arg;
+            }
+            bind[i].buffer_type = MYSQL_TYPE_LONG;
+            bind[i].is_unsigned = 1;
+            break;
+        case APR_DBD_TYPE_LONGLONG:
+            if (sizeof(long long) == sizeof(apr_int64_t)) {
+                bind[i].buffer = arg;
+            }
+            else {
+                bind[i].buffer = apr_palloc(pool, sizeof(long long));
+                *(long long*)bind[i].buffer = *(apr_int64_t*)arg;
+            }
+            bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
+            bind[i].is_unsigned = 0;
+            break;
+        case APR_DBD_TYPE_ULONGLONG:
+            if (sizeof(unsigned long long) == sizeof(apr_uint64_t)) {
+                bind[i].buffer = arg;
+            }
+            else {
+                bind[i].buffer = apr_palloc(pool, sizeof(unsigned long long));
+                *(unsigned long long*)bind[i].buffer = *(apr_uint64_t*)arg;
+            }
+            bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
+            bind[i].is_unsigned = 1;
+            break;
+        case APR_DBD_TYPE_FLOAT:
+            bind[i].buffer = arg;
+            bind[i].buffer_type = MYSQL_TYPE_FLOAT;
+            bind[i].is_unsigned = 0;
+            break;
+        case APR_DBD_TYPE_DOUBLE:
+            bind[i].buffer = arg;
+            bind[i].buffer_type = MYSQL_TYPE_DOUBLE;
+            bind[i].is_unsigned = 0;
+            break;
+        case APR_DBD_TYPE_STRING:
+        case APR_DBD_TYPE_TEXT:
+        case APR_DBD_TYPE_TIME:
+        case APR_DBD_TYPE_DATE:
+        case APR_DBD_TYPE_DATETIME:
+        case APR_DBD_TYPE_TIMESTAMP:
+        case APR_DBD_TYPE_ZTIMESTAMP:
+            bind[i].buffer = arg;
+            bind[i].buffer_type = MYSQL_TYPE_VAR_STRING;
+            bind[i].is_unsigned = 0;
+            bind[i].buffer_length = strlen((const char *)arg);
+            break;
+        case APR_DBD_TYPE_BLOB:
+        case APR_DBD_TYPE_CLOB:
+            bind[i].buffer = (void *)arg;
+            bind[i].buffer_type = MYSQL_TYPE_LONG_BLOB;
+            bind[i].is_unsigned = 0;
+            bind[i].buffer_length = *(apr_size_t*)values[++j];
+
+            /* skip table and column */
+            j += 2;
+            break;
+        case APR_DBD_TYPE_NULL:
+        default:
+            bind[i].buffer_type = MYSQL_TYPE_NULL;
+            break;
         }
     }
-    if (ret != 0) {
-        ret = mysql_stmt_errno(statement->stmt);
+
+    return;
+}
+
+static int dbd_mysql_pbquery(apr_pool_t *pool, apr_dbd_t *sql,
+                             int *nrows, apr_dbd_prepared_t *statement,
+                             const void **values)
+{
+    MYSQL_BIND *bind;
+    int ret;
+
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+
+    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
+
+    dbd_mysql_bbind(pool, statement, values, bind);
+
+    ret = dbd_mysql_pquery_internal(pool, sql, nrows, statement, bind);
+
+    if (TXN_NOTICE_ERRORS(sql->trans)) {
+        sql->trans->errnum = ret;
+    }
+    return ret;
+}
+
+static int dbd_mysql_pvbquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
+                              apr_dbd_prepared_t *statement, va_list args)
+{
+    const void **values;
+    int i;
+
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+
+    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
+
+    for (i = 0; i < statement->nvals; i++) {
+        values[i] = va_arg(args, const void*);
+    }
+
+    return dbd_mysql_pbquery(pool, sql, nrows, statement, values);
+}
+
+static int dbd_mysql_pbselect(apr_pool_t *pool, apr_dbd_t *sql,
+                              apr_dbd_results_t **res,
+                              apr_dbd_prepared_t *statement, int random,
+                              const void **args)
+{
+    int ret;
+    MYSQL_BIND *bind;
+
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
     }
-    if (sql->trans) {
+
+    bind = apr_palloc(pool, statement->nargs * sizeof(MYSQL_BIND));
+
+    dbd_mysql_bbind(pool, statement, args, bind);
+
+    ret = dbd_mysql_pselect_internal(pool, sql,  res, statement, random, bind);
+
+    if (TXN_NOTICE_ERRORS(sql->trans)) {
         sql->trans->errnum = ret;
     }
     return ret;
 }
 
+static int dbd_mysql_pvbselect(apr_pool_t *pool, apr_dbd_t *sql,
+                               apr_dbd_results_t **res,
+                               apr_dbd_prepared_t *statement, int random,
+                               va_list args)
+{
+    const void **values;
+    int i;
+
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+
+    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
+
+    for (i = 0; i < statement->nvals; i++) {
+        values[i] = va_arg(args, const void*);
+    }
+
+    return dbd_mysql_pbselect(pool, sql, res, statement, random, values);
+}
+
 static int dbd_mysql_end_transaction(apr_dbd_transaction_t *trans)
 {
     int ret = -1;
     if (trans) {
-        if (trans->errnum) {
+        /* rollback on error or explicit rollback request */
+        if (trans->errnum || TXN_DO_ROLLBACK(trans)) {
             trans->errnum = 0;
             ret = mysql_rollback(trans->handle->conn);
         }
@@ -583,7 +1053,25 @@ static int dbd_mysql_transaction(apr_pool_t *pool, apr_dbd_t *handle,
     return (*trans)->errnum;
 }
 
-static apr_dbd_t *dbd_mysql_open(apr_pool_t *pool, const char *params)
+static int dbd_mysql_transaction_mode_get(apr_dbd_transaction_t *trans)
+{
+    if (!trans)
+        return APR_DBD_TRANSACTION_COMMIT;
+
+    return trans->mode;
+}
+
+static int dbd_mysql_transaction_mode_set(apr_dbd_transaction_t *trans,
+                                          int mode)
+{
+    if (!trans)
+        return APR_DBD_TRANSACTION_COMMIT;
+
+    return trans->mode = (mode & TXN_MODE_BITS);
+}
+
+static apr_dbd_t *dbd_mysql_open(apr_pool_t *pool, const char *params,
+                                 const char **error)
 {
     static const char *const delims = " \r\n\t;|,";
     const char *ptr;
@@ -621,6 +1109,11 @@ static apr_dbd_t *dbd_mysql_open(apr_pool_t *pool, const char *params)
         return NULL;
     }
     for (ptr = strchr(params, '='); ptr; ptr = strchr(ptr, '=')) {
+        /* don't dereference memory that may not belong to us */
+        if (ptr == params) {
+            ++ptr;
+            continue;
+        }
         for (key = ptr-1; isspace(*key); --key);
         klen = 0;
         while (isalpha(*key)) {
@@ -669,6 +1162,9 @@ static apr_dbd_t *dbd_mysql_open(apr_pool_t *pool, const char *params)
                                    fields[5].value, flags);
 
     if(real_conn == NULL) {
+        if (error) {
+            *error = apr_pstrdup(pool, mysql_error(sql->conn));
+        }
         mysql_close(sql->conn);
         return NULL;
     }
@@ -739,11 +1235,11 @@ static void dbd_mysql_init(apr_pool_t *pool)
 {
     my_init();
     mysql_thread_init();
-
+   
     /* FIXME: this is a guess; find out what it really does */ 
     apr_pool_cleanup_register(pool, NULL, thread_end, apr_pool_cleanup_null);
 }
-APU_DECLARE_DATA const apr_dbd_driver_t apr_dbd_mysql_driver = {
+APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_mysql_driver = {
     "mysql",
     dbd_mysql_init,
     dbd_mysql_native,
@@ -765,7 +1261,16 @@ APU_DECLARE_DATA const apr_dbd_driver_t apr_dbd_mysql_driver = {
     dbd_mysql_pvquery,
     dbd_mysql_pvselect,
     dbd_mysql_pquery,
-    dbd_mysql_pselect
+    dbd_mysql_pselect,
+    dbd_mysql_get_name,
+    dbd_mysql_transaction_mode_get,
+    dbd_mysql_transaction_mode_set,
+    "?",
+    dbd_mysql_pvbquery,
+    dbd_mysql_pvbselect,
+    dbd_mysql_pbquery,
+    dbd_mysql_pbselect,
+    dbd_mysql_datum_get
 };
 
 #endif
diff --git a/srclib/apr-util/dbd/apr_dbd_mysql.dsp b/srclib/apr-util/dbd/apr_dbd_mysql.dsp
new file mode 100644
index 00000000..31e2b26b
--- /dev/null
+++ b/srclib/apr-util/dbd/apr_dbd_mysql.dsp
@@ -0,0 +1,207 @@
+# Microsoft Developer Studio Project File - Name="apr_dbd_mysql" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=apr_dbd_mysql - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_mysql.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_mysql.mak" CFG="apr_dbd_mysql - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_dbd_mysql - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_mysql - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_mysql - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_mysql - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "apr_dbd_mysql - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"Release/apr_dbd_mysql-1.res" /d DLL_NAME="apr_dbd_mysql" /d "NDEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib mysqlclient.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib mysqlclient.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug /out:"Release\apr_dbd_mysql-1.dll" /pdb:"Release\apr_dbd_mysql-1.pdb" /implib:"Release\apr_dbd_mysql-1.lib" /MACHINE:X86 /opt:ref
+# Begin Special Build Tool
+TargetPath=Release\apr_dbd_mysql-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_mysql - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /EHsc /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"Debug/apr_dbd_mysql-1.res" /d DLL_NAME="apr_dbd_mysql" /d "_DEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib mysqlclient.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib mysqlclient.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\apr_dbd_mysql-1.dll" /pdb:"Debug\apr_dbd_mysql-1.pdb" /implib:"Debug\apr_dbd_mysql-1.lib" /MACHINE:X86
+# Begin Special Build Tool
+TargetPath=Debug\apr_dbd_mysql-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "x64\Release"
+# PROP BASE Intermediate_Dir "x64\Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "x64\Release"
+# PROP Intermediate_Dir "x64\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"x64/Release/apr_dbd_mysql-1.res" /d DLL_NAME="apr_dbd_mysql" /d "NDEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib mysqlclient.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib mysqlclient.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\apr_dbd_mysql-1.dll" /pdb:"x64\Release\apr_dbd_mysql-1.pdb" /implib:"x64\Release\apr_dbd_mysql-1.lib" /MACHINE:X64 /opt:ref
+# Begin Special Build Tool
+TargetPath=x64\Release\apr_dbd_mysql-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_mysql - x64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "x64\Debug"
+# PROP BASE Intermediate_Dir "x64\Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "x64\Debug"
+# PROP Intermediate_Dir "x64\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_MYSQL=1 /D "HAVE_MYSQL_H" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_mysql_src" /FD /EHsc /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"x64/Debug/apr_dbd_mysql-1.res" /d DLL_NAME="apr_dbd_mysql" /d "_DEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib mysqlclient.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib mysqlclient.lib /nologo /base:"0x6EF50000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\apr_dbd_mysql-1.dll" /pdb:"x64\Debug\apr_dbd_mysql-1.pdb" /implib:"x64\Debug\apr_dbd_mysql-1.lib" /MACHINE:X64
+# Begin Special Build Tool
+TargetPath=x64\Debug\apr_dbd_mysql-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "apr_dbd_mysql - Win32 Release"
+# Name "apr_dbd_mysql - Win32 Debug"
+# Name "apr_dbd_mysql - x64 Release"
+# Name "apr_dbd_mysql - x64 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\apr_dbd_mysql.c
+# End Source File
+# End Group
+# Begin Group "Public Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\apr_dbd.h
+# End Source File
+# End Group
+# Begin Group "Internal Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\private\apu_config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\private\apu_dbd_internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\private\apu_internal.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\libaprutil.rc
+# End Source File
+# End Target
+# End Project
diff --git a/srclib/apr-util/dbd/apr_dbd_oracle.c b/srclib/apr-util/dbd/apr_dbd_oracle.c
new file mode 100644
index 00000000..3c5613fb
--- /dev/null
+++ b/srclib/apr-util/dbd/apr_dbd_oracle.c
@@ -0,0 +1,2219 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Developed initially by Nick Kew and Chris Darroch.
+ * Contributed to the APR project by kind permission of
+ * Pearson Education Core Technology Group (CTG),
+ * formerly Central Media Group (CMG).
+ */
+
+/* apr_dbd_oracle - a painful attempt
+ *
+ * Based first on the documentation at
+ * http://download-west.oracle.com/docs/cd/B10501_01/appdev.920/a96584/toc.htm
+ *
+ * Those docs have a lot of internal inconsistencies, contradictions, etc
+ * So I've snarfed the demo programs (from Oracle 8, not included in
+ * the current downloadable oracle), and used code from them.
+ *
+ * Why do cdemo81.c and cdemo82.c do the same thing in very different ways?
+ * e.g. cdemo82 releases all its handle on shutdown; cdemo81 doesn't
+ *
+ * All the ORA* functions return a "sword".  Some of them are documented;
+ * others aren't.  So I've adopted a policy of using switch statements
+ * everywhere, even when we're not doing anything with the return values.
+ *
+ * This makes no attempt at performance tuning, such as setting
+ * prefetch cache size.  We need some actual performance data
+ * to make that meaningful.  Input from someone with experience
+ * as a sysop using oracle would be a good start.
+ */
+
+/* shut compiler up */
+#ifdef DEBUG
+#define int_errorcode int errorcode
+#else
+#define int_errorcode
+#endif
+
+#include "apu.h"
+
+#if APU_HAVE_ORACLE
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <oci.h>
+
+#include "apr_strings.h"
+#include "apr_time.h"
+#include "apr_hash.h"
+#include "apr_buckets.h"
+
+#define TRANS_TIMEOUT 30
+#define MAX_ARG_LEN 256 /* in line with other apr_dbd drivers.  We alloc this
+                         * lots of times, so a large value gets hungry.
+                         * Should really make it configurable
+                         */
+#define DEFAULT_LONG_SIZE 4096
+#define DBD_ORACLE_MAX_COLUMNS 256
+#define NUMERIC_FIELD_SIZE 32
+
+#define CHECK_CONN_QUERY "SELECT 1 FROM dual"
+
+#define ERR_BUF_SIZE 200
+
+#ifdef DEBUG
+#include <stdio.h>
+#endif
+
+#include "apr_dbd_internal.h"
+
+/* declarations */
+static const char *dbd_oracle_error(apr_dbd_t *sql, int n);
+static int dbd_oracle_prepare(apr_pool_t *pool, apr_dbd_t *sql,
+                              const char *query, const char *label,
+                              int nargs, int nvals, apr_dbd_type_e *types,
+                              apr_dbd_prepared_t **statement);
+static int outputParams(apr_dbd_t*, apr_dbd_prepared_t*);
+static int dbd_oracle_pselect(apr_pool_t *pool, apr_dbd_t *sql,
+                              apr_dbd_results_t **results,
+                              apr_dbd_prepared_t *statement,
+                              int seek, const char **values);
+static int dbd_oracle_pquery(apr_pool_t *pool, apr_dbd_t *sql,
+                             int *nrows, apr_dbd_prepared_t *statement,
+                             const char **values);
+static int dbd_oracle_start_transaction(apr_pool_t *pool, apr_dbd_t *sql,
+                                        apr_dbd_transaction_t **trans);
+static int dbd_oracle_end_transaction(apr_dbd_transaction_t *trans);
+
+struct apr_dbd_transaction_t {
+    int mode;
+    enum { TRANS_NONE, TRANS_ERROR, TRANS_1, TRANS_2 } status;
+    apr_dbd_t *handle;
+    OCITrans *trans;
+    OCISnapshot *snapshot1;
+    OCISnapshot *snapshot2;
+};
+
+struct apr_dbd_results_t {
+    apr_pool_t *pool;
+    apr_dbd_t* handle;
+    unsigned int rownum;
+    int seek;
+    int nrows;
+    apr_dbd_prepared_t *statement;
+};
+
+struct apr_dbd_t {
+    sword status;
+    OCIError *err;
+    OCIServer *svr;
+    OCISvcCtx *svc;
+    OCISession *auth;
+    apr_dbd_transaction_t* trans;
+    apr_pool_t *pool;
+    char buf[ERR_BUF_SIZE]; /* for error messages */
+    apr_size_t long_size;
+    apr_dbd_prepared_t *check_conn_stmt;
+};
+
+struct apr_dbd_row_t {
+    int n;
+    apr_dbd_results_t *res;
+    apr_pool_t *pool;
+};
+
+typedef struct {
+    apr_dbd_type_e type;
+    sb2 ind;
+    sb4 len;
+    OCIBind *bind;
+    union {
+        void *raw;
+        char *sval;
+        int ival;
+        unsigned int uval;
+        double fval;
+        OCILobLocator *lobval;
+    } value;
+} bind_arg;
+
+typedef struct {
+    int type;
+    sb2 ind;
+    ub2 len;         /* length of actual output */
+    OCIDefine *defn;
+    apr_size_t sz;   /* length of buf for output */
+    union {
+        void *raw;
+        char *sval;
+        OCILobLocator *lobval;
+    } buf;
+    const char *name;
+} define_arg;
+
+struct apr_dbd_prepared_t {
+    OCIStmt *stmt;
+    int nargs;
+    int nvals;
+    bind_arg *args;
+    int nout;
+    define_arg *out;
+    apr_dbd_t *handle;
+    apr_pool_t *pool;
+    int type;
+};
+
+/* AFAICT from the docs, the OCIEnv thingey can be used async
+ * across threads, so lets have a global one.
+ *
+ * We'll need shorter-lived envs to deal with requests and connections
+ *
+ * Hmmm, that doesn't work: we don't have a usermem framework.
+ * OK, forget about using APR pools here, until we figure out
+ * the right way to do it (if such a thing exists).
+ */
+static OCIEnv *dbd_oracle_env = NULL;
+
+/* Oracle specific bucket for BLOB/CLOB types */
+typedef struct apr_bucket_lob apr_bucket_lob;
+/**
+ * A bucket referring to a Oracle BLOB/CLOB
+ */
+struct apr_bucket_lob {
+    /** Number of buckets using this memory */
+    apr_bucket_refcount  refcount;
+    /** The row this bucket refers to */
+    const apr_dbd_row_t *row;
+    /** The column this bucket refers to */
+    int col;
+    /** The pool into which any needed structures should
+     *  be created while reading from this bucket */
+    apr_pool_t *readpool;
+};
+
+static void lob_bucket_destroy(void *data);
+static apr_status_t lob_bucket_read(apr_bucket *e, const char **str,
+                                    apr_size_t *len, apr_read_type_e block);
+static apr_bucket *apr_bucket_lob_make(apr_bucket *b,
+                                       const apr_dbd_row_t *row, int col,
+                                       apr_off_t offset, apr_size_t len,
+                                       apr_pool_t *p);
+static apr_bucket *apr_bucket_lob_create(const apr_dbd_row_t *row, int col,
+                                         apr_off_t offset,
+                                         apr_size_t len, apr_pool_t *p,
+                                         apr_bucket_alloc_t *list);
+
+static const apr_bucket_type_t apr_bucket_type_lob = {
+    "LOB", 5, APR_BUCKET_DATA,
+    lob_bucket_destroy,
+    lob_bucket_read,
+    apr_bucket_setaside_notimpl,
+    apr_bucket_shared_split,
+    apr_bucket_shared_copy
+};
+
+static void lob_bucket_destroy(void *data)
+{
+    apr_bucket_lob *f = data;
+
+    if (apr_bucket_shared_destroy(f)) {
+        /* no need to destroy database objects here; it will get
+         * done automatically when the pool gets cleaned up */
+        apr_bucket_free(f);
+    }
+}
+
+static apr_status_t lob_bucket_read(apr_bucket *e, const char **str,
+                                    apr_size_t *len, apr_read_type_e block)
+{
+    apr_bucket_lob *a = e->data;
+    const apr_dbd_row_t *row = a->row;
+    apr_dbd_results_t *res = row->res;
+    int col = a->col;
+    apr_bucket *b = NULL;
+    apr_size_t blength = e->length;  /* bytes remaining in file past offset */
+    apr_off_t boffset = e->start;
+    define_arg *val = &res->statement->out[col];
+    apr_dbd_t *sql = res->handle;
+/* Only with 10g, unfortunately
+    oraub8 length = APR_BUCKET_BUFF_SIZE;
+*/
+    ub4 length = APR_BUCKET_BUFF_SIZE;
+    char *buf = NULL;
+
+    *str = NULL;  /* in case we die prematurely */
+
+    /* fetch from offset if not at the beginning */
+    buf = apr_palloc(row->pool, APR_BUCKET_BUFF_SIZE);
+    sql->status = OCILobRead(sql->svc, sql->err, val->buf.lobval,
+                             &length, 1 + boffset,
+                             (dvoid*) buf, APR_BUCKET_BUFF_SIZE,
+                             NULL, NULL, 0, SQLCS_IMPLICIT);
+/* Only with 10g, unfortunately
+    sql->status = OCILobRead2(sql->svc, sql->err, val->buf.lobval,
+                              &length, NULL, 1 + boffset,
+                              (dvoid*) buf, APR_BUCKET_BUFF_SIZE,
+                              OCI_ONE_PIECE, NULL, NULL, 0, SQLCS_IMPLICIT);
+*/
+    if (sql->status != OCI_SUCCESS) {
+        return APR_EGENERAL;
+    }
+    blength -= length;
+    *len = length;
+    *str = buf;
+
+    /*
+     * Change the current bucket to refer to what we read,
+     * even if we read nothing because we hit EOF.
+     */
+    apr_bucket_pool_make(e, *str, *len, res->pool);
+
+    /* If we have more to read from the field, then create another bucket */
+    if (blength > 0) {
+        /* for efficiency, we can just build a new apr_bucket struct
+         * to wrap around the existing LOB bucket */
+        b = apr_bucket_alloc(sizeof(*b), e->list);
+        b->start  = boffset + *len;
+        b->length = blength;
+        b->data   = a;
+        b->type   = &apr_bucket_type_lob;
+        b->free   = apr_bucket_free;
+        b->list   = e->list;
+        APR_BUCKET_INSERT_AFTER(e, b);
+    }
+    else {
+        lob_bucket_destroy(a);
+    }
+
+    return APR_SUCCESS;
+}
+
+static apr_bucket *apr_bucket_lob_make(apr_bucket *b,
+                                       const apr_dbd_row_t *row, int col,
+                                       apr_off_t offset, apr_size_t len,
+                                       apr_pool_t *p)
+{
+    apr_bucket_lob *f;
+
+    f = apr_bucket_alloc(sizeof(*f), b->list);
+    f->row = row;
+    f->col = col;
+    f->readpool = p;
+
+    b = apr_bucket_shared_make(b, f, offset, len);
+    b->type = &apr_bucket_type_lob;
+
+    return b;
+}
+
+static apr_bucket *apr_bucket_lob_create(const apr_dbd_row_t *row, int col,
+                                         apr_off_t offset,
+                                         apr_size_t len, apr_pool_t *p,
+                                         apr_bucket_alloc_t *list)
+{
+    apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
+
+    APR_BUCKET_INIT(b);
+    b->free = apr_bucket_free;
+    b->list = list;
+    return apr_bucket_lob_make(b, row, col, offset, len, p);
+}
+
+static apr_status_t dbd_free_lobdesc(void *lob)
+{
+    switch (OCIDescriptorFree(lob, OCI_DTYPE_LOB)) {
+    case OCI_SUCCESS:
+        return APR_SUCCESS;
+    default:
+        return APR_EGENERAL;
+    }
+}
+
+static apr_status_t dbd_free_snapshot(void *snap)
+{
+    switch (OCIDescriptorFree(snap, OCI_DTYPE_SNAP)) {
+    case OCI_SUCCESS:
+        return APR_SUCCESS;
+    default:
+        return APR_EGENERAL;
+    }
+}
+
+static void dbd_oracle_init(apr_pool_t *pool)
+{
+    if (dbd_oracle_env == NULL) {
+        /* Sadly, OCI_SHARED seems to be impossible to use, due to
+         * various Oracle bugs.  See, for example, Oracle MetaLink bug 2972890
+         * and PHP bug http://bugs.php.net/bug.php?id=23733
+         */
+#ifdef OCI_NEW_LENGTH_SEMANTICS
+        OCIEnvCreate(&dbd_oracle_env, OCI_THREADED|OCI_NEW_LENGTH_SEMANTICS,
+                     NULL, NULL, NULL, NULL, 0, NULL);
+#else
+        OCIEnvCreate(&dbd_oracle_env, OCI_THREADED,
+                     NULL, NULL, NULL, NULL, 0, NULL);
+#endif
+    }
+}
+
+static apr_dbd_t *dbd_oracle_open(apr_pool_t *pool, const char *params,
+                                  const char **error)
+{
+    apr_dbd_t *ret = apr_pcalloc(pool, sizeof(apr_dbd_t));
+    int errorcode;
+
+    char *BLANK = "";
+    struct {
+        const char *field;
+        char *value;
+    } fields[] = {
+        {"user", BLANK},
+        {"pass", BLANK},
+        {"dbname", BLANK},
+        {"server", BLANK},
+        {NULL, NULL}
+    };
+    int i;
+    const char *ptr;
+    const char *key;
+    size_t klen;
+    const char *value;
+    size_t vlen;
+    static const char *const delims = " \r\n\t;|,";
+
+    ret->pool = pool;
+    ret->long_size = DEFAULT_LONG_SIZE;
+
+    /* snitch parsing from the MySQL driver */
+    for (ptr = strchr(params, '='); ptr; ptr = strchr(ptr, '=')) {
+        /* don't dereference memory that may not belong to us */
+        if (ptr == params) {
+            ++ptr;
+            continue;
+        }
+        for (key = ptr-1; isspace(*key); --key);
+        klen = 0;
+        while (isalpha(*key)) {
+            if (key == params) {
+                /* Don't parse off the front of the params */
+                --key;
+                ++klen;
+                break;
+            }
+            --key;
+            ++klen;
+        }
+        ++key;
+        for (value = ptr+1; isspace(*value); ++value);
+        vlen = strcspn(value, delims);
+        for (i=0; fields[i].field != NULL; ++i) {
+            if (!strncasecmp(fields[i].field, key, klen)) {
+                fields[i].value = apr_pstrndup(pool, value, vlen);
+                break;
+            }
+        }
+        ptr = value+vlen;
+    }
+
+    ret->status = OCIHandleAlloc(dbd_oracle_env, (dvoid**)&ret->err,
+                                 OCI_HTYPE_ERROR, 0, NULL);
+    switch (ret->status) {
+    default:
+#ifdef DEBUG
+        printf("ret->status is %d\n", ret->status);
+        break;
+#else
+        return NULL;
+#endif
+    case OCI_SUCCESS:
+        break;
+    }
+
+    ret->status = OCIHandleAlloc(dbd_oracle_env, (dvoid**)&ret->svr,
+                                 OCI_HTYPE_SERVER, 0, NULL);
+    switch (ret->status) {
+    default:
+#ifdef DEBUG
+        OCIErrorGet(ret->err, 1, NULL, &errorcode, ret->buf,
+                    sizeof(ret->buf), OCI_HTYPE_ERROR);
+        printf("OPEN ERROR %d (alloc svr): %s\n", ret->status, ret->buf);
+        break;
+#else
+        if (error) {
+            *error = apr_pcalloc(pool, ERR_BUF_SIZE);
+            OCIErrorGet(ret->err, 1, NULL, &errorcode, (unsigned char*)(*error),
+                        ERR_BUF_SIZE, OCI_HTYPE_ERROR);
+        }
+        return NULL;
+#endif
+    case OCI_SUCCESS:
+        break;
+    }
+
+    ret->status = OCIHandleAlloc(dbd_oracle_env, (dvoid**)&ret->svc,
+                                 OCI_HTYPE_SVCCTX, 0, NULL);
+    switch (ret->status) {
+    default:
+#ifdef DEBUG
+        OCIErrorGet(ret->err, 1, NULL, &errorcode, ret->buf,
+                    sizeof(ret->buf), OCI_HTYPE_ERROR);
+        printf("OPEN ERROR %d (alloc svc): %s\n", ret->status, ret->buf);
+        break;
+#else
+        if (error) {
+            *error = apr_pcalloc(pool, ERR_BUF_SIZE);
+            OCIErrorGet(ret->err, 1, NULL, &errorcode, (unsigned char*)(*error),
+                        ERR_BUF_SIZE, OCI_HTYPE_ERROR);
+        }
+        return NULL;
+#endif
+    case OCI_SUCCESS:
+        break;
+    }
+
+/* All the examples use the #else */
+#if CAN_DO_LOGIN
+    ret->status = OCILogon(dbd_oracle_env, ret->err, &ret->svc, fields[0].value,
+                     strlen(fields[0].value), fields[1].value,
+                     strlen(fields[1].value), fields[2].value,
+                     strlen(fields[2].value));
+    switch (ret->status) {
+    default:
+#ifdef DEBUG
+        OCIErrorGet(ret->err, 1, NULL, &errorcode, ret->buf,
+                    sizeof(ret->buf), OCI_HTYPE_ERROR);
+        printf("OPEN ERROR: %s\n", ret->buf);
+        break;
+#else
+        if (error) {
+            *error = apr_pcalloc(pool, ERR_BUF_SIZE);
+            OCIErrorGet(ret->err, 1, NULL, &errorcode, (unsigned char*)(*error),
+                        ERR_BUF_SIZE, OCI_HTYPE_ERROR);
+        }
+        return NULL;
+#endif
+    case OCI_SUCCESS:
+        break;
+    }
+#else
+    ret->status = OCIServerAttach(ret->svr, ret->err, (text*) fields[3].value,
+                                  strlen(fields[3].value), OCI_DEFAULT);
+    switch (ret->status) {
+    default:
+#ifdef DEBUG
+        OCIErrorGet(ret->err, 1, NULL, &errorcode, ret->buf,
+                    sizeof(ret->buf), OCI_HTYPE_ERROR);
+        printf("OPEN ERROR %d (server attach): %s\n", ret->status, ret->buf);
+        break;
+#else
+        if (error) {
+            *error = apr_pcalloc(pool, ERR_BUF_SIZE);
+            OCIErrorGet(ret->err, 1, NULL, &errorcode, (unsigned char*)(*error),
+                        ERR_BUF_SIZE, OCI_HTYPE_ERROR);
+        }
+        return NULL;
+#endif
+    case OCI_SUCCESS:
+        break;
+    }
+    ret->status = OCIAttrSet(ret->svc, OCI_HTYPE_SVCCTX, ret->svr, 0,
+                        OCI_ATTR_SERVER, ret->err);
+    switch (ret->status) {
+    default:
+#ifdef DEBUG
+        OCIErrorGet(ret->err, 1, NULL, &errorcode, ret->buf,
+                    sizeof(ret->buf), OCI_HTYPE_ERROR);
+        printf("OPEN ERROR %d (attr set): %s\n", ret->status, ret->buf);
+        break;
+#else
+        if (error) {
+            *error = apr_pcalloc(pool, ERR_BUF_SIZE);
+            OCIErrorGet(ret->err, 1, NULL, &errorcode, (unsigned char*)(*error),
+                        ERR_BUF_SIZE, OCI_HTYPE_ERROR);
+        }
+        return NULL;
+#endif
+    case OCI_SUCCESS:
+        break;
+    }
+    ret->status = OCIHandleAlloc(dbd_oracle_env, (dvoid**)&ret->auth,
+                            OCI_HTYPE_SESSION, 0, NULL);
+    switch (ret->status) {
+    default:
+#ifdef DEBUG
+        OCIErrorGet(ret->err, 1, NULL, &errorcode, ret->buf,
+                    sizeof(ret->buf), OCI_HTYPE_ERROR);
+        printf("OPEN ERROR %d (alloc auth): %s\n", ret->status, ret->buf);
+        break;
+#else
+        if (error) {
+            *error = apr_pcalloc(pool, ERR_BUF_SIZE);
+            OCIErrorGet(ret->err, 1, NULL, &errorcode, (unsigned char*)(*error),
+                        ERR_BUF_SIZE, OCI_HTYPE_ERROR);
+        }
+        return NULL;
+#endif
+    case OCI_SUCCESS:
+        break;
+    }
+    ret->status = OCIAttrSet(ret->auth, OCI_HTYPE_SESSION, fields[0].value,
+                        strlen(fields[0].value), OCI_ATTR_USERNAME, ret->err);
+    switch (ret->status) {
+    default:
+#ifdef DEBUG
+        OCIErrorGet(ret->err, 1, NULL, &errorcode, ret->buf,
+                    sizeof(ret->buf), OCI_HTYPE_ERROR);
+        printf("OPEN ERROR %d (attr username): %s\n", ret->status, ret->buf);
+        break;
+#else
+        if (error) {
+            *error = apr_pcalloc(pool, ERR_BUF_SIZE);
+            OCIErrorGet(ret->err, 1, NULL, &errorcode, (unsigned char*)(*error),
+                        ERR_BUF_SIZE, OCI_HTYPE_ERROR);
+        }
+        return NULL;
+#endif
+    case OCI_SUCCESS:
+        break;
+    }
+    ret->status = OCIAttrSet(ret->auth, OCI_HTYPE_SESSION, fields[1].value,
+                        strlen(fields[1].value), OCI_ATTR_PASSWORD, ret->err);
+    switch (ret->status) {
+    default:
+#ifdef DEBUG
+        OCIErrorGet(ret->err, 1, NULL, &errorcode, ret->buf,
+                    sizeof(ret->buf), OCI_HTYPE_ERROR);
+        printf("OPEN ERROR %d (attr password): %s\n", ret->status, ret->buf);
+        break;
+#else
+        if (error) {
+            *error = apr_pcalloc(pool, ERR_BUF_SIZE);
+            OCIErrorGet(ret->err, 1, NULL, &errorcode, (unsigned char*)(*error),
+                        ERR_BUF_SIZE, OCI_HTYPE_ERROR);
+        }
+        return NULL;
+#endif
+    case OCI_SUCCESS:
+        break;
+    }
+    ret->status = OCISessionBegin(ret->svc, ret->err, ret->auth,
+                             OCI_CRED_RDBMS, OCI_DEFAULT);
+    switch (ret->status) {
+    default:
+#ifdef DEBUG
+        OCIErrorGet(ret->err, 1, NULL, &errorcode, ret->buf,
+                    sizeof(ret->buf), OCI_HTYPE_ERROR);
+        printf("OPEN ERROR %d (session begin): %s\n", ret->status, ret->buf);
+        break;
+#else
+        if (error) {
+            *error = apr_pcalloc(pool, ERR_BUF_SIZE);
+            OCIErrorGet(ret->err, 1, NULL, &errorcode, (unsigned char*)(*error),
+                        ERR_BUF_SIZE, OCI_HTYPE_ERROR);
+        }
+        return NULL;
+#endif
+    case OCI_SUCCESS:
+        break;
+    }
+    ret->status = OCIAttrSet(ret->svc, OCI_HTYPE_SVCCTX, ret->auth, 0,
+                        OCI_ATTR_SESSION, ret->err);
+    switch (ret->status) {
+    default:
+#ifdef DEBUG
+        OCIErrorGet(ret->err, 1, NULL, &errorcode, ret->buf,
+                    sizeof(ret->buf), OCI_HTYPE_ERROR);
+        printf("OPEN ERROR %d (attr session): %s\n", ret->status, ret->buf);
+#else
+        if (error) {
+            *error = apr_pcalloc(pool, ERR_BUF_SIZE);
+            OCIErrorGet(ret->err, 1, NULL, &errorcode, (unsigned char*)(*error),
+                        ERR_BUF_SIZE, OCI_HTYPE_ERROR);
+        }
+        return NULL;
+#endif
+        break;
+    case OCI_SUCCESS:
+        break;
+    }
+#endif
+
+    if(dbd_oracle_prepare(pool, ret, CHECK_CONN_QUERY, NULL, 0, 0, NULL,
+                          &ret->check_conn_stmt) != 0) {
+        return NULL;
+    }
+
+    return ret;
+}
+
+#ifdef EXPORT_NATIVE_FUNCS
+static apr_size_t dbd_oracle_long_size_set(apr_dbd_t *sql,
+                                           apr_size_t long_size)
+{
+    apr_size_t old_size = sql->long_size;
+    sql->long_size = long_size;
+    return old_size;
+}
+#endif
+
+static const char *dbd_oracle_get_name(const apr_dbd_results_t *res, int n)
+{
+    define_arg *val = &res->statement->out[n];
+
+    if ((n < 0) || (n >= res->statement->nout)) {
+        return NULL;
+    }
+    return val->name;
+}
+
+static int dbd_oracle_get_row(apr_pool_t *pool, apr_dbd_results_t *res,
+                              apr_dbd_row_t **rowp, int rownum)
+{
+    apr_dbd_row_t *row = *rowp;
+    apr_dbd_t *sql = res->handle;
+    int_errorcode;
+
+    if (row == NULL) {
+        row = apr_palloc(pool, sizeof(apr_dbd_row_t));
+        *rowp = row;
+        row->res = res;
+        /* Oracle starts counting at 1 according to the docs */
+        row->n = res->seek ? rownum : 1;
+        row->pool = pool;
+    }
+    else {
+        if (res->seek) {
+            row->n = rownum;
+        }
+        else {
+            ++row->n;
+        }
+    }
+
+    if (res->seek) {
+        sql->status = OCIStmtFetch2(res->statement->stmt, res->handle->err, 1,
+                                    OCI_FETCH_ABSOLUTE, row->n, OCI_DEFAULT);
+    }
+    else {
+        sql->status = OCIStmtFetch2(res->statement->stmt, res->handle->err, 1,
+                                    OCI_FETCH_NEXT, 0, OCI_DEFAULT);
+    }
+    switch (sql->status) {
+    case OCI_SUCCESS:
+        (*rowp)->res = res;
+        return 0;
+    case OCI_NO_DATA:
+        return -1;
+    case OCI_ERROR:
+#ifdef DEBUG
+        OCIErrorGet(sql->err, 1, NULL, &errorcode,
+                    sql->buf, sizeof(sql->buf), OCI_HTYPE_ERROR);
+        printf("Execute error %d: %s\n", sql->status, sql->buf);
+#endif
+        /* fallthrough */
+    default:
+        return 1;
+    }
+    return 0;
+}
+
+static const char *dbd_oracle_error(apr_dbd_t *sql, int n)
+{
+    /* This is ugly.  Needs us to pass in a buffer of unknown size.
+     * Either we put it on the handle, or we have to keep allocing/copying
+     */
+    sb4 errorcode;
+
+    switch (sql->status) {
+    case OCI_SUCCESS:
+        return "OCI_SUCCESS";
+    case OCI_SUCCESS_WITH_INFO:
+        return "OCI_SUCCESS_WITH_INFO";
+    case OCI_NEED_DATA:
+        return "OCI_NEED_DATA";
+    case OCI_NO_DATA:
+        return "OCI_NO_DATA";
+    case OCI_INVALID_HANDLE:
+        return "OCI_INVALID_HANDLE";
+    case OCI_STILL_EXECUTING:
+        return "OCI_STILL_EXECUTING";
+    case OCI_CONTINUE:
+        return "OCI_CONTINUE";
+    }
+
+    switch (OCIErrorGet(sql->err, 1, NULL, &errorcode,
+                        (text*) sql->buf, sizeof(sql->buf), OCI_HTYPE_ERROR)) {
+    case OCI_SUCCESS:
+        return sql->buf; 
+    default:
+        return "internal error: OCIErrorGet failed";
+    }
+}
+
+static apr_status_t freeStatement(void *statement)
+{
+    int rv = APR_SUCCESS;
+    OCIStmt *stmt = ((apr_dbd_prepared_t*)statement)->stmt;
+
+#ifdef PREPARE2
+    OCIError *err;
+
+    if (OCIHandleAlloc(dbd_oracle_env, (dvoid**)&err, OCI_HTYPE_ERROR,
+                       0, NULL) != OCI_SUCCESS) {
+        return APR_EGENERAL;
+    }
+    if (OCIStmtRelease(stmt, err, NULL, 0, OCI_DEFAULT) != OCI_SUCCESS) {
+        rv = APR_EGENERAL;
+    }
+    if (OCIHandleFree(err, OCI_HTYPE_ERROR) != OCI_SUCCESS) {
+        rv = APR_EGENERAL;
+    }
+#else
+    if (OCIHandleFree(stmt, OCI_HTYPE_STMT) != OCI_SUCCESS) {
+        rv = APR_EGENERAL;
+    }
+#endif
+
+    return rv;
+}
+
+static int dbd_oracle_select(apr_pool_t *pool, apr_dbd_t *sql,
+                             apr_dbd_results_t **results,
+                             const char *query, int seek)
+{
+    int ret = 0;
+    apr_dbd_prepared_t *statement = NULL;
+
+    ret = dbd_oracle_prepare(pool, sql, query, NULL, 0, 0, NULL, &statement);
+    if (ret != 0) {
+        return ret;
+    }
+
+    ret = dbd_oracle_pselect(pool, sql, results, statement, seek, NULL);
+    if (ret != 0) {
+        return ret;
+    }
+
+    return ret;
+}
+
+static int dbd_oracle_query(apr_dbd_t *sql, int *nrows, const char *query)
+{
+    int ret = 0;
+    apr_pool_t *pool;
+    apr_dbd_prepared_t *statement = NULL;
+
+    if (sql->trans && sql->trans->status == TRANS_ERROR) {
+        return 1;
+    }
+
+    /* make our own pool so that APR allocations don't linger and so that
+     * both Stmt and LOB handles are cleaned up (LOB handles may be
+     * allocated when preparing APR_DBD_TYPE_CLOB/BLOBs)
+     */
+    apr_pool_create(&pool, sql->pool);
+
+    ret = dbd_oracle_prepare(pool, sql, query, NULL, 0, 0, NULL, &statement);
+    if (ret == 0) {
+        ret = dbd_oracle_pquery(pool, sql, nrows, statement, NULL);
+        if (ret == 0) {
+            sql->status = OCIAttrGet(statement->stmt, OCI_HTYPE_STMT,
+                                     nrows, 0, OCI_ATTR_ROW_COUNT,
+                                     sql->err);
+        }
+    }
+
+    apr_pool_destroy(pool);
+
+    return ret;
+}
+
+static const char *dbd_oracle_escape(apr_pool_t *pool, const char *arg,
+                                     apr_dbd_t *sql)
+{
+    return arg;        /* OCI has no concept of string escape */
+}
+
+static int dbd_oracle_prepare(apr_pool_t *pool, apr_dbd_t *sql,
+                              const char *query, const char *label,
+                              int nargs, int nvals, apr_dbd_type_e *types,
+                              apr_dbd_prepared_t **statement)
+{
+    int ret = 0;
+    int i;
+    apr_dbd_prepared_t *stmt ;
+
+    if (*statement == NULL) {
+        *statement = apr_pcalloc(pool, sizeof(apr_dbd_prepared_t));
+    }
+    stmt = *statement;
+    stmt->handle = sql;
+    stmt->pool = pool;
+    stmt->nargs = nargs;
+    stmt->nvals = nvals;
+
+    /* populate our own args, if any */
+    if (nargs > 0) {
+        stmt->args = apr_pcalloc(pool, nargs*sizeof(bind_arg));
+        for (i = 0; i < nargs; i++) {
+            stmt->args[i].type = types[i];
+        }
+    }
+
+    sql->status = OCIHandleAlloc(dbd_oracle_env, (dvoid**) &stmt->stmt,
+                                 OCI_HTYPE_STMT, 0, NULL);
+    if (sql->status != OCI_SUCCESS) {
+        return 1;
+    }
+
+    sql->status = OCIStmtPrepare(stmt->stmt, sql->err, (text*) query,
+                                 strlen(query), OCI_NTV_SYNTAX, OCI_DEFAULT);
+    if (sql->status != OCI_SUCCESS) {
+        OCIHandleFree(stmt->stmt, OCI_HTYPE_STMT);
+        return 1;
+    }
+
+    apr_pool_cleanup_register(pool, stmt, freeStatement,
+                              apr_pool_cleanup_null);
+
+    /* Perl gets statement type here */
+    sql->status = OCIAttrGet(stmt->stmt, OCI_HTYPE_STMT, &stmt->type, 0,
+                             OCI_ATTR_STMT_TYPE, sql->err);
+    if (sql->status != OCI_SUCCESS) {
+        return 1;
+    }
+
+/* Perl sets PREFETCH_MEMORY here, but the docs say there's a working default */
+#if 0
+    sql->status = OCIAttrSet(stmt->stmt, OCI_HTYPE_STMT, &prefetch_size,
+                             sizeof(prefetch_size), OCI_ATTR_PREFETCH_MEMORY,
+                             sql->err);
+    if (sql->status != OCI_SUCCESS) {
+        return 1;
+    }
+#endif
+
+    if (stmt->type == OCI_STMT_SELECT) {
+        ret = outputParams(sql, stmt);
+    }
+    return ret;
+}
+
+static void dbd_oracle_bind(apr_dbd_prepared_t *statement, const char **values)
+{
+    OCIStmt *stmt = statement->stmt;
+    apr_dbd_t *sql = statement->handle;
+    int i, j;
+    sb2 null_ind = -1;
+
+    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
+        if (values[j] == NULL) {
+            sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                       sql->err, i + 1,
+                                       NULL, 0, SQLT_STR,
+                                       &null_ind, NULL,
+                                       (ub2) 0, (ub4) 0,
+                                       (ub4 *) 0, OCI_DEFAULT);
+        }
+        else {
+            switch (statement->args[i].type) {
+            case APR_DBD_TYPE_BLOB:
+                {
+                char *data = (char *)values[j];
+                int size = atoi((char*)values[++j]);
+
+                /* skip table and column for now */
+                j += 2;
+
+                sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                           sql->err, i + 1,
+                                           data, size, SQLT_LBI,
+                                           &statement->args[i].ind,
+                                           NULL,
+                                           (ub2) 0, (ub4) 0,
+                                           (ub4 *) 0, OCI_DEFAULT);
+                }
+                break;
+            case APR_DBD_TYPE_CLOB:
+                {
+                char *data = (char *)values[j];
+                int size = atoi((char*)values[++j]);
+
+                /* skip table and column for now */
+                j += 2;
+
+                sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                           sql->err, i + 1,
+                                           data, size, SQLT_LNG,
+                                           &statement->args[i].ind,
+                                           NULL,
+                                           (ub2) 0, (ub4) 0,
+                                           (ub4 *) 0, OCI_DEFAULT);
+                }
+                break;
+            default:
+                sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                           sql->err, i + 1,
+                                           (dvoid*) values[j],
+                                           strlen(values[j]) + 1,
+                                           SQLT_STR,
+                                           &statement->args[i].ind,
+                                           NULL,
+                                           (ub2) 0, (ub4) 0,
+                                           (ub4 *) 0, OCI_DEFAULT);
+                break;
+            }
+        }
+
+        if (sql->status != OCI_SUCCESS) {
+            return;
+        }
+    }
+
+    return;
+}
+
+static int outputParams(apr_dbd_t *sql, apr_dbd_prepared_t *stmt)
+{
+    OCIParam *parms;
+    int i;
+    ub2 paramtype[DBD_ORACLE_MAX_COLUMNS];
+    ub2 paramsize[DBD_ORACLE_MAX_COLUMNS];
+    const char *paramname[DBD_ORACLE_MAX_COLUMNS];
+    ub4 paramnamelen[DBD_ORACLE_MAX_COLUMNS];
+    int_errorcode;
+
+    /* Perl uses 0 where we used 1 */
+    sql->status = OCIStmtExecute(sql->svc, stmt->stmt, sql->err, 0, 0,
+                                 NULL, NULL, OCI_DESCRIBE_ONLY);
+    switch (sql->status) {
+    case OCI_SUCCESS:
+    case OCI_SUCCESS_WITH_INFO:
+        break;
+    case OCI_ERROR:
+#ifdef DEBUG
+        OCIErrorGet(sql->err, 1, NULL, &errorcode,
+                    sql->buf, sizeof(sql->buf), OCI_HTYPE_ERROR);
+        printf("Describing prepared statement: %s\n", sql->buf);
+#endif
+    default:
+        return 1;
+    }
+    while (sql->status == OCI_SUCCESS) {
+        sql->status = OCIParamGet(stmt->stmt, OCI_HTYPE_STMT,
+                                  sql->err, (dvoid**)&parms, stmt->nout+1);
+        switch (sql->status) {
+        case OCI_SUCCESS:
+            sql->status = OCIAttrGet(parms, OCI_DTYPE_PARAM,
+                                     &paramtype[stmt->nout],
+                                     0, OCI_ATTR_DATA_TYPE, sql->err);
+            sql->status = OCIAttrGet(parms, OCI_DTYPE_PARAM,
+                                     &paramsize[stmt->nout],
+                                     0, OCI_ATTR_DATA_SIZE, sql->err);
+            sql->status = OCIAttrGet(parms, OCI_DTYPE_PARAM,
+                                     &paramname[stmt->nout],
+                                     &paramnamelen[stmt->nout],
+                                     OCI_ATTR_NAME, sql->err);
+            ++stmt->nout;
+        }
+    }
+    switch (sql->status) {
+    case OCI_SUCCESS:
+        break;
+    case OCI_ERROR:
+        break;        /* this is what we expect at end-of-loop */
+    default:
+        return 1;
+    }
+
+    /* OK, the above works.  We have the params; now OCIDefine them */
+    stmt->out = apr_palloc(stmt->pool, stmt->nout*sizeof(define_arg));
+    for (i=0; i<stmt->nout; ++i) {
+        stmt->out[i].type = paramtype[i];
+        stmt->out[i].len = stmt->out[i].sz = paramsize[i];
+        stmt->out[i].name = apr_pstrmemdup(stmt->pool,
+                                           paramname[i], paramnamelen[i]);
+        switch (stmt->out[i].type) {
+        default:
+            switch (stmt->out[i].type) {
+            case SQLT_NUM:           /* 2: numeric, Perl worst case=130+38+3 */
+                stmt->out[i].sz = 171;
+                break;
+            case SQLT_CHR:           /* 1: char */
+            case SQLT_AFC:           /* 96: ANSI fixed char */
+                stmt->out[i].sz *= 4; /* ugh, wasteful UCS-4 handling */
+                break;
+            case SQLT_DAT:           /* 12: date, depends on NLS date format */
+                stmt->out[i].sz = 75;
+                break;
+            case SQLT_BIN:           /* 23: raw binary, perhaps UTF-16? */
+                stmt->out[i].sz *= 2;
+                break;
+            case SQLT_RID:           /* 11: rowid */
+            case SQLT_RDD:           /* 104: rowid descriptor */
+                stmt->out[i].sz = 20;
+                break;
+            case SQLT_TIMESTAMP:     /* 187: timestamp */
+            case SQLT_TIMESTAMP_TZ:  /* 188: timestamp with time zone */
+            case SQLT_INTERVAL_YM:   /* 189: interval year-to-month */
+            case SQLT_INTERVAL_DS:   /* 190: interval day-to-second */
+            case SQLT_TIMESTAMP_LTZ: /* 232: timestamp with local time zone */
+                stmt->out[i].sz = 75;
+                break;
+            default:
+#ifdef DEBUG
+                printf("Unsupported data type: %d\n", stmt->out[i].type);
+#endif
+                break;
+            }
+            ++stmt->out[i].sz;
+            stmt->out[i].buf.raw = apr_palloc(stmt->pool, stmt->out[i].sz);
+            sql->status = OCIDefineByPos(stmt->stmt, &stmt->out[i].defn,
+                                         sql->err, i+1,
+                                         stmt->out[i].buf.sval,
+                                         stmt->out[i].sz, SQLT_STR,
+                                         &stmt->out[i].ind, &stmt->out[i].len,
+                                         0, OCI_DEFAULT);
+            break;
+        case SQLT_LNG: /* 8: long */
+            stmt->out[i].sz = sql->long_size * 4 + 4; /* ugh, UCS-4 handling */
+            stmt->out[i].buf.raw = apr_palloc(stmt->pool, stmt->out[i].sz);
+            sql->status = OCIDefineByPos(stmt->stmt, &stmt->out[i].defn,
+                                         sql->err, i+1,
+                                         stmt->out[i].buf.raw,
+                                         stmt->out[i].sz, SQLT_LVC,
+                                         &stmt->out[i].ind, NULL,
+                                         0, OCI_DEFAULT);
+            break;
+        case SQLT_LBI: /* 24: long binary, perhaps UTF-16? */
+            stmt->out[i].sz = sql->long_size * 2 + 4; /* room for int prefix */
+            stmt->out[i].buf.raw = apr_palloc(stmt->pool, stmt->out[i].sz);
+            sql->status = OCIDefineByPos(stmt->stmt, &stmt->out[i].defn,
+                                         sql->err, i+1,
+                                         stmt->out[i].buf.raw,
+                                         stmt->out[i].sz, SQLT_LVB,
+                                         &stmt->out[i].ind, NULL,
+                                         0, OCI_DEFAULT);
+            break;
+        case SQLT_BLOB: /* 113 */
+        case SQLT_CLOB: /* 112 */
+/*http://download-west.oracle.com/docs/cd/B10501_01/appdev.920/a96584/oci05bnd.htm#434937*/
+            sql->status = OCIDescriptorAlloc(dbd_oracle_env,
+                                             (dvoid**)&stmt->out[i].buf.lobval,
+                                             OCI_DTYPE_LOB, 0, NULL);
+            apr_pool_cleanup_register(stmt->pool, stmt->out[i].buf.lobval,
+                                      dbd_free_lobdesc,
+                                      apr_pool_cleanup_null);
+            sql->status = OCIDefineByPos(stmt->stmt, &stmt->out[i].defn,
+                                         sql->err, i+1,
+                                         (dvoid*) &stmt->out[i].buf.lobval,
+                                         -1, stmt->out[i].type,
+                                         &stmt->out[i].ind, &stmt->out[i].len,
+                                         0, OCI_DEFAULT);
+            break;
+        }
+        switch (sql->status) {
+        case OCI_SUCCESS:
+            break;
+        default:
+            return 1;
+        }
+    }
+    return 0;
+}
+
+static int dbd_oracle_pquery(apr_pool_t *pool, apr_dbd_t *sql,
+                             int *nrows, apr_dbd_prepared_t *statement,
+                             const char **values)
+{
+    OCISnapshot *oldsnapshot = NULL;
+    OCISnapshot *newsnapshot = NULL;
+    apr_dbd_transaction_t* trans = sql->trans;
+    int exec_mode;
+    int_errorcode;
+
+    if (trans) {
+        switch (trans->status) {
+        case TRANS_ERROR:
+            return -1;
+        case TRANS_NONE:
+            trans = NULL;
+            break;
+        case TRANS_1:
+            oldsnapshot = trans->snapshot1;
+            newsnapshot = trans->snapshot2;
+            trans->status = TRANS_2;
+            break;
+        case TRANS_2:
+            oldsnapshot = trans->snapshot2;
+            newsnapshot = trans->snapshot1;
+            trans->status = TRANS_1;
+            break;
+        }
+        exec_mode = OCI_DEFAULT;
+    }
+    else {
+        exec_mode = OCI_COMMIT_ON_SUCCESS;
+    }
+
+    dbd_oracle_bind(statement, values);
+
+    sql->status = OCIStmtExecute(sql->svc, statement->stmt, sql->err, 1, 0,
+                                 oldsnapshot, newsnapshot, exec_mode);
+    switch (sql->status) {
+    case OCI_SUCCESS:
+        break;
+    case OCI_ERROR:
+#ifdef DEBUG
+        OCIErrorGet(sql->err, 1, NULL, &errorcode,
+                    sql->buf, sizeof(sql->buf), OCI_HTYPE_ERROR);
+        printf("Execute error %d: %s\n", sql->status, sql->buf);
+#endif
+        /* fallthrough */
+    default:
+        if (TXN_NOTICE_ERRORS(trans)) {
+            trans->status = TRANS_ERROR;
+        }
+        return 1;
+    }
+
+    sql->status = OCIAttrGet(statement->stmt, OCI_HTYPE_STMT, nrows, 0,
+                             OCI_ATTR_ROW_COUNT, sql->err);
+    return 0;
+}
+
+static int dbd_oracle_pvquery(apr_pool_t *pool, apr_dbd_t *sql,
+                              int *nrows, apr_dbd_prepared_t *statement,
+                              va_list args)
+{
+    const char **values;
+    int i;
+
+    if (sql->trans && sql->trans->status == TRANS_ERROR) {
+        return -1;
+    }
+
+    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
+
+    for (i = 0; i < statement->nvals; i++) {
+        values[i] = va_arg(args, const char*);
+    }
+
+    return dbd_oracle_pquery(pool, sql, nrows, statement, values);
+}
+
+static int dbd_oracle_pselect(apr_pool_t *pool, apr_dbd_t *sql,
+                              apr_dbd_results_t **results,
+                              apr_dbd_prepared_t *statement,
+                              int seek, const char **values)
+{
+    int exec_mode = seek ? OCI_STMT_SCROLLABLE_READONLY : OCI_DEFAULT;
+    OCISnapshot *oldsnapshot = NULL;
+    OCISnapshot *newsnapshot = NULL;
+    apr_dbd_transaction_t* trans = sql->trans;
+    int_errorcode;
+
+    if (trans) {
+        switch (trans->status) {
+        case TRANS_ERROR:
+            return 1;
+        case TRANS_NONE:
+            trans = NULL;
+            break;
+        case TRANS_1:
+            oldsnapshot = trans->snapshot1;
+            newsnapshot = trans->snapshot2;
+            trans->status = TRANS_2;
+            break;
+        case TRANS_2:
+            oldsnapshot = trans->snapshot2;
+            newsnapshot = trans->snapshot1;
+            trans->status = TRANS_1;
+            break;
+        }
+    }
+
+    dbd_oracle_bind(statement, values);
+
+    sql->status = OCIStmtExecute(sql->svc, statement->stmt, sql->err, 0, 0,
+                                 oldsnapshot, newsnapshot, exec_mode);
+    switch (sql->status) {
+    case OCI_SUCCESS:
+        break;
+    case OCI_ERROR:
+#ifdef DEBUG
+        OCIErrorGet(sql->err, 1, NULL, &errorcode,
+                    sql->buf, sizeof(sql->buf), OCI_HTYPE_ERROR);
+        printf("Executing prepared statement: %s\n", sql->buf);
+#endif
+        /* fallthrough */
+    default:
+        if (TXN_NOTICE_ERRORS(trans)) {
+            trans->status = TRANS_ERROR;
+        }
+        return 1;
+    }
+
+    if (!*results) {
+        *results = apr_palloc(pool, sizeof(apr_dbd_results_t));
+    }
+    (*results)->handle = sql;
+    (*results)->statement = statement;
+    (*results)->seek = seek;
+    (*results)->rownum = seek ? 0 : -1;
+    (*results)->pool = pool;
+
+    return 0;
+}
+
+static int dbd_oracle_pvselect(apr_pool_t *pool, apr_dbd_t *sql,
+                               apr_dbd_results_t **results,
+                               apr_dbd_prepared_t *statement,
+                               int seek, va_list args)
+{
+    const char **values;
+    int i;
+
+    if (sql->trans && sql->trans->status == TRANS_ERROR) {
+        return -1;
+    }
+
+    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
+
+    for (i = 0; i < statement->nvals; i++) {
+        values[i] = va_arg(args, const char*);
+    }
+
+    return dbd_oracle_pselect(pool, sql, results, statement, seek, values);
+}
+
+static void dbd_oracle_bbind(apr_dbd_prepared_t * statement,
+                             const void **values)
+{
+    OCIStmt *stmt = statement->stmt;
+    apr_dbd_t *sql = statement->handle;
+    int i, j;
+    sb2 null_ind = -1;
+    apr_dbd_type_e type;
+
+    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
+        type = (values[j] == NULL ? APR_DBD_TYPE_NULL
+                                  : statement->args[i].type);
+
+        switch (type) {
+        case APR_DBD_TYPE_TINY:
+            statement->args[i].value.ival = *(char*)values[j];
+            sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                       sql->err, i + 1,
+                                       &statement->args[i].value.ival,
+                                       sizeof(statement->args[i].value.ival),
+                                       SQLT_INT,
+                                       &statement->args[i].ind, NULL,
+                                       (ub2) 0, (ub4) 0,
+                                       (ub4 *) 0, OCI_DEFAULT);
+            break;
+        case APR_DBD_TYPE_UTINY:
+            statement->args[i].value.uval = *(unsigned char*)values[j];
+            sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                       sql->err, i + 1,
+                                       &statement->args[i].value.uval,
+                                       sizeof(statement->args[i].value.uval),
+                                       SQLT_UIN,
+                                       &statement->args[i].ind, NULL,
+                                       (ub2) 0, (ub4) 0,
+                                       (ub4 *) 0, OCI_DEFAULT);
+            break;
+        case APR_DBD_TYPE_SHORT:
+            statement->args[i].value.ival = *(short*)values[j];
+            sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                       sql->err, i + 1,
+                                       &statement->args[i].value.ival,
+                                       sizeof(statement->args[i].value.ival),
+                                       SQLT_INT,
+                                       &statement->args[i].ind, NULL,
+                                       (ub2) 0, (ub4) 0,
+                                       (ub4 *) 0, OCI_DEFAULT);
+            break;
+        case APR_DBD_TYPE_USHORT:
+            statement->args[i].value.uval = *(unsigned short*)values[j];
+            sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                       sql->err, i + 1,
+                                       &statement->args[i].value.uval,
+                                       sizeof(statement->args[i].value.uval),
+                                       SQLT_UIN,
+                                       &statement->args[i].ind, NULL,
+                                       (ub2) 0, (ub4) 0,
+                                       (ub4 *) 0, OCI_DEFAULT);
+            break;
+        case APR_DBD_TYPE_INT:
+            statement->args[i].value.ival = *(int*)values[j];
+            sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                       sql->err, i + 1,
+                                       &statement->args[i].value.ival,
+                                       sizeof(statement->args[i].value.ival),
+                                       SQLT_INT,
+                                       &statement->args[i].ind, NULL,
+                                       (ub2) 0, (ub4) 0,
+                                       (ub4 *) 0, OCI_DEFAULT);
+            break;
+        case APR_DBD_TYPE_UINT:
+            statement->args[i].value.uval = *(unsigned int*)values[j];
+            sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                       sql->err, i + 1,
+                                       &statement->args[i].value.uval,
+                                       sizeof(statement->args[i].value.uval),
+                                       SQLT_UIN,
+                                       &statement->args[i].ind, NULL,
+                                       (ub2) 0, (ub4) 0,
+                                       (ub4 *) 0, OCI_DEFAULT);
+            break;
+        case APR_DBD_TYPE_LONG:
+            statement->args[i].value.sval =
+                apr_psprintf(statement->pool, "%ld", *(long*)values[j]);
+            sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                       sql->err, i + 1,
+                                       statement->args[i].value.sval,
+                                       strlen(statement->args[i].value.sval)+1,
+                                       SQLT_STR,
+                                       &statement->args[i].ind, NULL,
+                                       (ub2) 0, (ub4) 0,
+                                       (ub4 *) 0, OCI_DEFAULT);
+            break;
+        case APR_DBD_TYPE_ULONG:
+            statement->args[i].value.sval =
+                apr_psprintf(statement->pool, "%lu",
+                                              *(unsigned long*)values[j]);
+            sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                       sql->err, i + 1,
+                                       statement->args[i].value.sval,
+                                       strlen(statement->args[i].value.sval)+1,
+                                       SQLT_STR,
+                                       &statement->args[i].ind, NULL,
+                                       (ub2) 0, (ub4) 0,
+                                       (ub4 *) 0, OCI_DEFAULT);
+            break;
+        case APR_DBD_TYPE_LONGLONG:
+            statement->args[i].value.sval =
+                apr_psprintf(statement->pool, "%" APR_INT64_T_FMT,
+                                              *(apr_int64_t*)values[j]);
+            sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                       sql->err, i + 1,
+                                       statement->args[i].value.sval,
+                                       strlen(statement->args[i].value.sval)+1,
+                                       SQLT_STR,
+                                       &statement->args[i].ind, NULL,
+                                       (ub2) 0, (ub4) 0,
+                                       (ub4 *) 0, OCI_DEFAULT);
+            break;
+        case APR_DBD_TYPE_ULONGLONG:
+            statement->args[i].value.sval =
+                apr_psprintf(statement->pool, "%" APR_UINT64_T_FMT,
+                                              *(apr_uint64_t*)values[j]);
+            sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                       sql->err, i + 1,
+                                       statement->args[i].value.sval,
+                                       strlen(statement->args[i].value.sval)+1,
+                                       SQLT_UIN,
+                                       &statement->args[i].ind, NULL,
+                                       (ub2) 0, (ub4) 0,
+                                       (ub4 *) 0, OCI_DEFAULT);
+            break;
+        case APR_DBD_TYPE_FLOAT:
+            statement->args[i].value.fval = *(float*)values[j];
+            sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                       sql->err, i + 1,
+                                       &statement->args[i].value.fval,
+                                       sizeof(statement->args[i].value.fval),
+                                       SQLT_FLT,
+                                       &statement->args[i].ind, NULL,
+                                       (ub2) 0, (ub4) 0,
+                                       (ub4 *) 0, OCI_DEFAULT);
+            break;
+        case APR_DBD_TYPE_DOUBLE:
+            statement->args[i].value.fval = *(double*)values[j];
+            sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                       sql->err, i + 1,
+                                       &statement->args[i].value.fval,
+                                       sizeof(statement->args[i].value.fval),
+                                       SQLT_FLT,
+                                       &statement->args[i].ind, NULL,
+                                       (ub2) 0, (ub4) 0,
+                                       (ub4 *) 0, OCI_DEFAULT);
+            break;
+        case APR_DBD_TYPE_STRING:
+        case APR_DBD_TYPE_TEXT:
+        case APR_DBD_TYPE_TIME:
+        case APR_DBD_TYPE_DATE:
+        case APR_DBD_TYPE_DATETIME:
+        case APR_DBD_TYPE_TIMESTAMP:
+        case APR_DBD_TYPE_ZTIMESTAMP:
+            sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                       sql->err, i + 1,
+                                       (dvoid*) values[j],
+                                       strlen(values[j]) + 1,
+                                       SQLT_STR,
+                                       &statement->args[i].ind, NULL,
+                                       (ub2) 0, (ub4) 0,
+                                       (ub4 *) 0, OCI_DEFAULT);
+            break;
+        case APR_DBD_TYPE_BLOB:
+            {
+            char *data = (char *)values[j];
+            apr_size_t size = *(apr_size_t*)values[++j];
+
+            /* skip table and column for now */
+            j += 2;
+
+            sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                       sql->err, i + 1,
+                                       data, size, SQLT_LBI,
+                                       &statement->args[i].ind,
+                                       NULL,
+                                       (ub2) 0, (ub4) 0,
+                                       (ub4 *) 0, OCI_DEFAULT);
+            }
+            break;
+        case APR_DBD_TYPE_CLOB:
+            {
+            char *data = (char *)values[j];
+            apr_size_t size = *(apr_size_t*)values[++j];
+
+            /* skip table and column for now */
+            j += 2;
+
+            sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                       sql->err, i + 1,
+                                       data, size, SQLT_LNG,
+                                       &statement->args[i].ind,
+                                       NULL,
+                                       (ub2) 0, (ub4) 0,
+                                       (ub4 *) 0, OCI_DEFAULT);
+            }
+            break;
+        case APR_DBD_TYPE_NULL:
+        default:
+            sql->status = OCIBindByPos(stmt, &statement->args[i].bind,
+                                       sql->err, i + 1,
+                                       NULL, 0, SQLT_STR,
+                                       &null_ind, NULL,
+                                       (ub2) 0, (ub4) 0,
+                                       (ub4 *) 0, OCI_DEFAULT);
+            break;
+        }
+
+        if (sql->status != OCI_SUCCESS) {
+            return;
+        }
+    }
+
+    return;
+}
+
+static int dbd_oracle_pbquery(apr_pool_t * pool, apr_dbd_t * sql,
+                              int *nrows, apr_dbd_prepared_t * statement,
+                              const void **values)
+{
+    OCISnapshot *oldsnapshot = NULL;
+    OCISnapshot *newsnapshot = NULL;
+    apr_dbd_transaction_t* trans = sql->trans;
+    int exec_mode;
+    int_errorcode;
+
+    if (trans) {
+        switch (trans->status) {
+        case TRANS_ERROR:
+            return -1;
+        case TRANS_NONE:
+            trans = NULL;
+            break;
+        case TRANS_1:
+            oldsnapshot = trans->snapshot1;
+            newsnapshot = trans->snapshot2;
+            trans->status = TRANS_2;
+            break;
+        case TRANS_2:
+            oldsnapshot = trans->snapshot2;
+            newsnapshot = trans->snapshot1;
+            trans->status = TRANS_1;
+            break;
+        }
+        exec_mode = OCI_DEFAULT;
+    }
+    else {
+        exec_mode = OCI_COMMIT_ON_SUCCESS;
+    }
+
+    dbd_oracle_bbind(statement, values);
+
+    sql->status = OCIStmtExecute(sql->svc, statement->stmt, sql->err, 1, 0,
+                                 oldsnapshot, newsnapshot, exec_mode);
+    switch (sql->status) {
+    case OCI_SUCCESS:
+        break;
+    case OCI_ERROR:
+#ifdef DEBUG
+        OCIErrorGet(sql->err, 1, NULL, &errorcode,
+                    sql->buf, sizeof(sql->buf), OCI_HTYPE_ERROR);
+        printf("Execute error %d: %s\n", sql->status, sql->buf);
+#endif
+        /* fallthrough */
+    default:
+        if (TXN_NOTICE_ERRORS(trans)) {
+            trans->status = TRANS_ERROR;
+        }
+        return 1;
+    }
+
+    sql->status = OCIAttrGet(statement->stmt, OCI_HTYPE_STMT, nrows, 0,
+                             OCI_ATTR_ROW_COUNT, sql->err);
+    return 0;
+}
+
+static int dbd_oracle_pvbquery(apr_pool_t * pool, apr_dbd_t * sql,
+                               int *nrows, apr_dbd_prepared_t * statement,
+                               va_list args)
+{
+    const void **values;
+    int i;
+
+    if (sql->trans && sql->trans->status == TRANS_ERROR) {
+        return -1;
+    }
+
+    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
+
+    for (i = 0; i < statement->nvals; i++) {
+        values[i] = va_arg(args, const void*);
+    }
+
+    return dbd_oracle_pbquery(pool, sql, nrows, statement, values);
+}
+
+static int dbd_oracle_pbselect(apr_pool_t * pool, apr_dbd_t * sql,
+                               apr_dbd_results_t ** results,
+                               apr_dbd_prepared_t * statement,
+                               int seek, const void **values)
+{
+    int exec_mode = seek ? OCI_STMT_SCROLLABLE_READONLY : OCI_DEFAULT;
+    OCISnapshot *oldsnapshot = NULL;
+    OCISnapshot *newsnapshot = NULL;
+    apr_dbd_transaction_t* trans = sql->trans;
+    int_errorcode;
+
+    if (trans) {
+        switch (trans->status) {
+        case TRANS_ERROR:
+            return 1;
+        case TRANS_NONE:
+            trans = NULL;
+            break;
+        case TRANS_1:
+            oldsnapshot = trans->snapshot1;
+            newsnapshot = trans->snapshot2;
+            trans->status = TRANS_2;
+            break;
+        case TRANS_2:
+            oldsnapshot = trans->snapshot2;
+            newsnapshot = trans->snapshot1;
+            trans->status = TRANS_1;
+            break;
+        }
+    }
+
+    dbd_oracle_bbind(statement, values);
+
+    sql->status = OCIStmtExecute(sql->svc, statement->stmt, sql->err, 0, 0,
+                                 oldsnapshot, newsnapshot, exec_mode);
+    switch (sql->status) {
+    case OCI_SUCCESS:
+        break;
+    case OCI_ERROR:
+#ifdef DEBUG
+        OCIErrorGet(sql->err, 1, NULL, &errorcode,
+                    sql->buf, sizeof(sql->buf), OCI_HTYPE_ERROR);
+        printf("Executing prepared statement: %s\n", sql->buf);
+#endif
+        /* fallthrough */
+    default:
+        if (TXN_NOTICE_ERRORS(trans)) {
+            trans->status = TRANS_ERROR;
+        }
+        return 1;
+    }
+
+    if (!*results) {
+        *results = apr_palloc(pool, sizeof(apr_dbd_results_t));
+    }
+    (*results)->handle = sql;
+    (*results)->statement = statement;
+    (*results)->seek = seek;
+    (*results)->rownum = seek ? 0 : -1;
+    (*results)->pool = pool;
+
+    return 0;
+}
+
+static int dbd_oracle_pvbselect(apr_pool_t * pool, apr_dbd_t * sql,
+                                apr_dbd_results_t ** results,
+                                apr_dbd_prepared_t * statement, int seek,
+                                va_list args)
+{
+    const void **values;
+    int i;
+
+    if (sql->trans && sql->trans->status == TRANS_ERROR) {
+        return -1;
+    }
+
+    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
+
+    for (i = 0; i < statement->nvals; i++) {
+        values[i] = va_arg(args, const void*);
+    }
+
+    return dbd_oracle_pbselect(pool, sql, results, statement, seek, values);
+}
+
+static int dbd_oracle_start_transaction(apr_pool_t *pool, apr_dbd_t *sql,
+                                        apr_dbd_transaction_t **trans)
+{
+    int ret = 0;
+    int_errorcode;
+    if (*trans) {
+        dbd_oracle_end_transaction(*trans);
+    }
+    else {
+        *trans = apr_pcalloc(pool, sizeof(apr_dbd_transaction_t));
+        OCIHandleAlloc(dbd_oracle_env, (dvoid**)&(*trans)->trans,
+                       OCI_HTYPE_TRANS, 0, 0);
+        OCIAttrSet(sql->svc, OCI_HTYPE_SVCCTX, (*trans)->trans, 0,
+                   OCI_ATTR_TRANS, sql->err);
+    }
+
+
+    sql->status = OCITransStart(sql->svc, sql->err, TRANS_TIMEOUT,
+                                OCI_TRANS_NEW);
+    switch (sql->status) {
+    case OCI_ERROR:
+#ifdef DEBUG
+        OCIErrorGet(sql->err, 1, NULL, &errorcode, sql->buf,
+                    sizeof(sql->buf), OCI_HTYPE_ERROR);
+        printf("Transaction: %s\n", sql->buf);
+#endif
+        ret = 1;
+        break;
+    case OCI_SUCCESS:
+        (*trans)->handle = sql;
+        (*trans)->status = TRANS_1;
+        sql->trans = *trans;
+        switch (OCIDescriptorAlloc(dbd_oracle_env,
+                                   (dvoid**)&(*trans)->snapshot1,
+                                   OCI_DTYPE_SNAP, 0, NULL)) {
+        case OCI_SUCCESS:
+            apr_pool_cleanup_register(pool, (*trans)->snapshot1,
+                                      dbd_free_snapshot, apr_pool_cleanup_null);
+            break;
+        case OCI_INVALID_HANDLE:
+            ret = 1;
+            break;
+        }
+        switch (OCIDescriptorAlloc(dbd_oracle_env,
+                                   (dvoid**)&(*trans)->snapshot2,
+                                   OCI_DTYPE_SNAP, 0, NULL)) {
+        case OCI_SUCCESS:
+            apr_pool_cleanup_register(pool, (*trans)->snapshot2,
+                                      dbd_free_snapshot, apr_pool_cleanup_null);
+            break;
+        case OCI_INVALID_HANDLE:
+            ret = 1;
+            break;
+        }
+        break;
+    default:
+        ret = 1;
+        break;
+    }
+    return ret;
+}
+
+static int dbd_oracle_end_transaction(apr_dbd_transaction_t *trans)
+{
+    int ret = 1;             /* no transaction is an error cond */
+    sword status;
+    apr_dbd_t *handle = trans->handle;
+    if (trans) {
+        switch (trans->status) {
+        case TRANS_NONE:     /* No trans is an error here */
+            status = OCI_ERROR;
+            break;
+        case TRANS_ERROR:
+            status = OCITransRollback(handle->svc, handle->err, OCI_DEFAULT);
+            break;
+        default:
+            /* rollback on explicit rollback request */
+            if (TXN_DO_ROLLBACK(trans)) {
+                status = OCITransRollback(handle->svc, handle->err, OCI_DEFAULT);
+            } else {
+                status = OCITransCommit(handle->svc, handle->err, OCI_DEFAULT);
+            }
+            break;
+        }
+
+        handle->trans = NULL;
+
+        switch (status) {
+        case OCI_SUCCESS:
+            ret = 0;
+            break;
+        default:
+            ret = 3;
+            break;
+        }
+    }
+    return ret;
+}
+
+static int dbd_oracle_transaction_mode_get(apr_dbd_transaction_t *trans)
+{
+    if (!trans)
+        return APR_DBD_TRANSACTION_COMMIT;
+
+    return trans->mode;
+}
+
+static int dbd_oracle_transaction_mode_set(apr_dbd_transaction_t *trans,
+                                           int mode)
+{
+    if (!trans)
+        return APR_DBD_TRANSACTION_COMMIT;
+
+    return trans->mode = (mode & TXN_MODE_BITS);
+}
+
+/* This doesn't work for BLOB because of NULLs, but it can fake it
+ * if the BLOB is really a string
+ */
+static const char *dbd_oracle_get_entry(const apr_dbd_row_t *row, int n)
+{
+    ub4 len = 0;
+    ub1 csform = 0;
+    ub2 csid = 0;
+    apr_size_t buflen = 0;
+    char *buf = NULL;
+    define_arg *val = &row->res->statement->out[n];
+    apr_dbd_t *sql = row->res->handle;
+    int_errorcode;
+
+    if ((n < 0) || (n >= row->res->statement->nout) || (val->ind == -1)) {
+        return NULL;
+    }
+
+    switch (val->type) {
+    case SQLT_BLOB:
+    case SQLT_CLOB:
+        sql->status = OCILobGetLength(sql->svc, sql->err, val->buf.lobval,
+                                      &len);
+        switch (sql->status) {
+        case OCI_SUCCESS:
+        case OCI_SUCCESS_WITH_INFO:
+            if (len == 0) {
+                buf = "";
+            }
+            break;
+        case OCI_ERROR:
+#ifdef DEBUG
+            OCIErrorGet(sql->err, 1, NULL, &errorcode,
+                        sql->buf, sizeof(sql->buf), OCI_HTYPE_ERROR);
+            printf("Finding LOB length: %s\n", sql->buf);
+            break;
+#endif
+        default:
+            break;
+        }
+
+        if (len == 0) {
+            break;
+        }
+
+        if (val->type == APR_DBD_TYPE_CLOB) {
+#if 1
+            /* Is this necessary, or can it be defaulted? */
+            sql->status = OCILobCharSetForm(dbd_oracle_env, sql->err,
+                                            val->buf.lobval, &csform);
+            if (sql->status == OCI_SUCCESS) {
+                sql->status = OCILobCharSetId(dbd_oracle_env, sql->err,
+                                              val->buf.lobval, &csid);
+            }
+            switch (sql->status) {
+            case OCI_SUCCESS:
+            case OCI_SUCCESS_WITH_INFO:
+                buflen = (len+1) * 4; /* ugh, wasteful UCS-4 handling */
+                /* zeroise all - where the string ends depends on charset */
+                buf = apr_pcalloc(row->pool, buflen);
+                break;
+#ifdef DEBUG
+            case OCI_ERROR:
+                OCIErrorGet(sql->err, 1, NULL, &errorcode,
+                            sql->buf, sizeof(sql->buf), OCI_HTYPE_ERROR);
+                printf("Reading LOB character set: %s\n", sql->buf);
+                break; /*** XXX?? ***/
+#endif
+            default:
+                break; /*** XXX?? ***/
+            }
+#else   /* ignore charset */
+            buflen = (len+1) * 4; /* ugh, wasteful UCS-4 handling */
+            /* zeroise all - where the string ends depends on charset */
+            buf = apr_pcalloc(row->pool, buflen);
+#endif
+        } else {
+            /* BUG: this'll only work if the BLOB looks like a string */
+            buflen = len;
+            buf = apr_palloc(row->pool, buflen+1);
+            buf[buflen] = 0;
+        }
+
+        if (!buf) {
+            break;
+        }
+
+        sql->status = OCILobRead(sql->svc, sql->err, val->buf.lobval,
+                                 &len, 1, (dvoid*) buf, buflen,
+                                 NULL, NULL, csid, csform);
+        switch (sql->status) {
+        case OCI_SUCCESS:
+        case OCI_SUCCESS_WITH_INFO:
+            break;
+#ifdef DEBUG
+        case OCI_ERROR:
+            OCIErrorGet(sql->err, 1, NULL, &errorcode,
+                        sql->buf, sizeof(sql->buf), OCI_HTYPE_ERROR);
+            printf("Reading LOB: %s\n", sql->buf);
+            buf = NULL; /*** XXX?? ***/
+            break;
+#endif
+        default:
+            buf = NULL; /*** XXX?? ***/
+            break;
+        }
+
+        break;
+    case SQLT_LNG:
+    case SQLT_LBI:
+        /* raw is struct { ub4 len; char *buf; } */
+        len = *(ub4*) val->buf.raw;
+        buf = apr_pstrndup(row->pool, val->buf.sval + sizeof(ub4), len);
+        break;
+    default:
+        buf = apr_pstrndup(row->pool, val->buf.sval, val->len);
+        break;
+    }
+    return (const char*) buf;
+}
+
+/* XXX Should this use Oracle proper API instead of calling get_entry()? */
+static apr_status_t dbd_oracle_datum_get(const apr_dbd_row_t *row, int n,
+                                         apr_dbd_type_e type, void *data)
+{
+    define_arg *val = &row->res->statement->out[n];
+    const char *entry;
+
+    if ((n < 0) || (n >= row->res->statement->nout)) {
+        return APR_EGENERAL;
+    }
+
+    if(val->ind == -1) {
+        return APR_ENOENT;
+    }
+
+    switch (type) {
+    case APR_DBD_TYPE_TINY:
+        entry = dbd_oracle_get_entry(row, n);
+        if (entry == NULL) {
+            return APR_ENOENT;
+        }
+        *(char*)data = atoi(entry);
+        break;
+    case APR_DBD_TYPE_UTINY:
+        entry = dbd_oracle_get_entry(row, n);
+        if (entry == NULL) {
+            return APR_ENOENT;
+        }
+        *(unsigned char*)data = atoi(entry);
+        break;
+    case APR_DBD_TYPE_SHORT:
+        entry = dbd_oracle_get_entry(row, n);
+        if (entry == NULL) {
+            return APR_ENOENT;
+        }
+        *(short*)data = atoi(entry);
+        break;
+    case APR_DBD_TYPE_USHORT:
+        entry = dbd_oracle_get_entry(row, n);
+        if (entry == NULL) {
+            return APR_ENOENT;
+        }
+        *(unsigned short*)data = atoi(entry);
+        break;
+    case APR_DBD_TYPE_INT:
+        entry = dbd_oracle_get_entry(row, n);
+        if (entry == NULL) {
+            return APR_ENOENT;
+        }
+        *(int*)data = atoi(entry);
+        break;
+    case APR_DBD_TYPE_UINT:
+        entry = dbd_oracle_get_entry(row, n);
+        if (entry == NULL) {
+            return APR_ENOENT;
+        }
+        *(unsigned int*)data = atoi(entry);
+        break;
+    case APR_DBD_TYPE_LONG:
+        entry = dbd_oracle_get_entry(row, n);
+        if (entry == NULL) {
+            return APR_ENOENT;
+        }
+        *(long*)data = atol(entry);
+        break;
+    case APR_DBD_TYPE_ULONG:
+        entry = dbd_oracle_get_entry(row, n);
+        if (entry == NULL) {
+            return APR_ENOENT;
+        }
+        *(unsigned long*)data = atol(entry);
+        break;
+    case APR_DBD_TYPE_LONGLONG:
+        entry = dbd_oracle_get_entry(row, n);
+        if (entry == NULL) {
+            return APR_ENOENT;
+        }
+        *(apr_int64_t*)data = apr_atoi64(entry);
+        break;
+    case APR_DBD_TYPE_ULONGLONG:
+        entry = dbd_oracle_get_entry(row, n);
+        if (entry == NULL) {
+            return APR_ENOENT;
+        }
+        *(apr_uint64_t*)data = apr_atoi64(entry);
+        break;
+    case APR_DBD_TYPE_FLOAT:
+        entry = dbd_oracle_get_entry(row, n);
+        if (entry == NULL) {
+            return APR_ENOENT;
+        }
+        *(float*)data = atof(entry);
+        break;
+    case APR_DBD_TYPE_DOUBLE:
+        entry = dbd_oracle_get_entry(row, n);
+        if (entry == NULL) {
+            return APR_ENOENT;
+        }
+        *(double*)data = atof(entry);
+        break;
+    case APR_DBD_TYPE_STRING:
+    case APR_DBD_TYPE_TEXT:
+    case APR_DBD_TYPE_TIME:
+    case APR_DBD_TYPE_DATE:
+    case APR_DBD_TYPE_DATETIME:
+    case APR_DBD_TYPE_TIMESTAMP:
+    case APR_DBD_TYPE_ZTIMESTAMP:
+        entry = dbd_oracle_get_entry(row, n);
+        if (entry == NULL) {
+            return APR_ENOENT;
+        }
+        *(char**)data = (char*)entry;
+        break;
+    case APR_DBD_TYPE_BLOB:
+    case APR_DBD_TYPE_CLOB:
+        {
+        apr_bucket *e;
+        apr_bucket_brigade *b = (apr_bucket_brigade*)data;
+        apr_dbd_t *sql = row->res->handle;
+        ub4 len = 0;
+
+        switch (val->type) {
+        case SQLT_BLOB:
+        case SQLT_CLOB:
+            sql->status = OCILobGetLength(sql->svc, sql->err,
+                                          val->buf.lobval, &len);
+            switch(sql->status) {
+            case OCI_SUCCESS:
+            case OCI_SUCCESS_WITH_INFO:
+                if (len == 0) {
+                    e = apr_bucket_eos_create(b->bucket_alloc);
+                }
+                else {
+                    e = apr_bucket_lob_create(row, n, 0, len,
+                                              row->pool, b->bucket_alloc);
+                }
+                break;
+            default:
+                return APR_ENOENT;
+            }
+            break;
+        default:
+            entry = dbd_oracle_get_entry(row, n);
+            if (entry == NULL) {
+                return APR_ENOENT;
+            }
+            e = apr_bucket_pool_create(entry, strlen(entry),
+                                       row->pool, b->bucket_alloc);
+            break;
+        }
+        APR_BRIGADE_INSERT_TAIL(b, e);
+        }
+        break;
+    case APR_DBD_TYPE_NULL:
+        *(void**)data = NULL;
+        break;
+    default:
+        return APR_EGENERAL;
+    }
+
+    return APR_SUCCESS;
+}
+
+static apr_status_t dbd_oracle_close(apr_dbd_t *handle)
+{
+    /* FIXME: none of the oracle docs/examples say anything about
+     * closing/releasing handles.  Which seems unlikely ...
+     */
+
+    /* OK, let's grab from cdemo again.
+     * cdemo81 does nothing; cdemo82 does OCIHandleFree on the handles
+     */
+    switch (OCISessionEnd(handle->svc, handle->err, handle->auth,
+            (ub4)OCI_DEFAULT)) {
+    default:
+        break;
+    }
+    switch (OCIServerDetach(handle->svr, handle->err, (ub4) OCI_DEFAULT )) {
+    default:
+        break;
+    }
+    /* does OCISessionEnd imply this? */
+    switch (OCIHandleFree((dvoid *) handle->auth, (ub4) OCI_HTYPE_SESSION)) {
+    default:
+        break;
+    }
+    switch (OCIHandleFree((dvoid *) handle->svr, (ub4) OCI_HTYPE_SERVER)) {
+    default:
+        break;
+    }
+    switch (OCIHandleFree((dvoid *) handle->svc, (ub4) OCI_HTYPE_SVCCTX)) {
+    default:
+        break;
+    }
+    switch (OCIHandleFree((dvoid *) handle->err, (ub4) OCI_HTYPE_ERROR)) {
+    default:
+        break;
+    }
+    return APR_SUCCESS;
+}
+
+static apr_status_t dbd_oracle_check_conn(apr_pool_t *pool, apr_dbd_t *sql)
+{
+    apr_dbd_results_t *res = NULL;
+    apr_dbd_row_t *row = NULL;
+    
+    if(dbd_oracle_pselect(pool, sql, &res, sql->check_conn_stmt,
+                          0, NULL) != 0) {
+        return APR_EGENERAL;
+    }
+    
+    if(dbd_oracle_get_row(pool, res, &row, -1) != 0) {
+        return APR_EGENERAL;
+    }
+    
+    if(dbd_oracle_get_row(pool, res, &row, -1) != -1) {
+        return APR_EGENERAL;
+    }
+
+    return APR_SUCCESS;
+}
+
+static int dbd_oracle_select_db(apr_pool_t *pool, apr_dbd_t *handle,
+                                const char *name)
+{
+    /* FIXME: need to find this in the docs */
+    return APR_ENOTIMPL;
+}
+
+static void *dbd_oracle_native(apr_dbd_t *handle)
+{
+    /* FIXME: can we do anything better?  Oracle doesn't seem to have
+     * a concept of a handle in the sense we use it.
+     */
+    return dbd_oracle_env;
+}
+
+static int dbd_oracle_num_cols(apr_dbd_results_t* res)
+{
+    return res->statement->nout;
+}
+
+static int dbd_oracle_num_tuples(apr_dbd_results_t* res)
+{
+    if (!res->seek) {
+        return -1;
+    }
+    if (res->nrows >= 0) {
+        return res->nrows;
+    }
+    res->handle->status = OCIAttrGet(res->statement->stmt, OCI_HTYPE_STMT,
+                                     &res->nrows, 0, OCI_ATTR_ROW_COUNT,
+                                     res->handle->err);
+    return res->nrows;
+}
+
+APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_oracle_driver = {
+    "oracle",
+    dbd_oracle_init,
+    dbd_oracle_native,
+    dbd_oracle_open,
+    dbd_oracle_check_conn,
+    dbd_oracle_close,
+    dbd_oracle_select_db,
+    dbd_oracle_start_transaction,
+    dbd_oracle_end_transaction,
+    dbd_oracle_query,
+    dbd_oracle_select,
+    dbd_oracle_num_cols,
+    dbd_oracle_num_tuples,
+    dbd_oracle_get_row,
+    dbd_oracle_get_entry,
+    dbd_oracle_error,
+    dbd_oracle_escape,
+    dbd_oracle_prepare,
+    dbd_oracle_pvquery,
+    dbd_oracle_pvselect,
+    dbd_oracle_pquery,
+    dbd_oracle_pselect,
+    dbd_oracle_get_name,
+    dbd_oracle_transaction_mode_get,
+    dbd_oracle_transaction_mode_set,
+    ":apr%d",
+    dbd_oracle_pvbquery,
+    dbd_oracle_pvbselect,
+    dbd_oracle_pbquery,
+    dbd_oracle_pbselect,
+    dbd_oracle_datum_get
+};
+#endif
diff --git a/srclib/apr-util/dbd/apr_dbd_oracle.dsp b/srclib/apr-util/dbd/apr_dbd_oracle.dsp
new file mode 100644
index 00000000..583debbd
--- /dev/null
+++ b/srclib/apr-util/dbd/apr_dbd_oracle.dsp
@@ -0,0 +1,207 @@
+# Microsoft Developer Studio Project File - Name="apr_dbd_oracle" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=apr_dbd_oracle - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_oracle.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_oracle.mak" CFG="apr_dbd_oracle - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_dbd_oracle - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_oracle - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_oracle - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_oracle - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "apr_dbd_oracle - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_ORACLE=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_oracle_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"Release/apr_dbd_oracle-1.res" /d DLL_NAME="apr_dbd_oracle" /d "NDEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib oci.lib /nologo /base:"0x6EF40000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib oci.lib /nologo /base:"0x6EF40000" /subsystem:windows /dll /incremental:no /debug /out:"Release\apr_dbd_oracle-1.dll" /pdb:"Release\apr_dbd_oracle-1.pdb" /implib:"Release\apr_dbd_oracle-1.lib" /MACHINE:X86 /opt:ref
+# Begin Special Build Tool
+TargetPath=Release\apr_dbd_oracle-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_oracle - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_ORACLE=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_oracle_src" /FD /EHsc /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"Debug/apr_dbd_oracle-1.res" /d DLL_NAME="apr_dbd_oracle" /d "_DEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib oci.lib /nologo /base:"0x6EF40000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib oci.lib /nologo /base:"0x6EF40000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\apr_dbd_oracle-1.dll" /pdb:"Debug\apr_dbd_oracle-1.pdb" /implib:"Debug\apr_dbd_oracle-1.lib" /MACHINE:X86
+# Begin Special Build Tool
+TargetPath=Debug\apr_dbd_oracle-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "x64\Release"
+# PROP BASE Intermediate_Dir "x64\Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "x64\Release"
+# PROP Intermediate_Dir "x64\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_ORACLE=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_oracle_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"x64/Release/apr_dbd_oracle-1.res" /d DLL_NAME="apr_dbd_oracle" /d "NDEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib oci.lib /nologo /base:"0x6EF40000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib oci.lib /nologo /base:"0x6EF40000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\apr_dbd_oracle-1.dll" /pdb:"x64\Release\apr_dbd_oracle-1.pdb" /implib:"x64\Release\apr_dbd_oracle-1.lib" /MACHINE:X64 /opt:ref
+# Begin Special Build Tool
+TargetPath=x64\Release\apr_dbd_oracle-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_oracle - x64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "x64\Debug"
+# PROP BASE Intermediate_Dir "x64\Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "x64\Debug"
+# PROP Intermediate_Dir "x64\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_ORACLE=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_oracle_src" /FD /EHsc /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"x64/Debug/apr_dbd_oracle-1.res" /d DLL_NAME="apr_dbd_oracle" /d "_DEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib oci.lib /nologo /base:"0x6EF40000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib oci.lib /nologo /base:"0x6EF40000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\apr_dbd_oracle-1.dll" /pdb:"x64\Debug\apr_dbd_oracle-1.pdb" /implib:"x64\Debug\apr_dbd_oracle-1.lib" /MACHINE:X64
+# Begin Special Build Tool
+TargetPath=x64\Debug\apr_dbd_oracle-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "apr_dbd_oracle - Win32 Release"
+# Name "apr_dbd_oracle - Win32 Debug"
+# Name "apr_dbd_oracle - x64 Release"
+# Name "apr_dbd_oracle - x64 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\apr_dbd_oracle.c
+# End Source File
+# End Group
+# Begin Group "Public Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\apr_dbd.h
+# End Source File
+# End Group
+# Begin Group "Internal Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\private\apu_config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\private\apu_dbd_internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\private\apu_internal.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\libaprutil.rc
+# End Source File
+# End Target
+# End Project
diff --git a/srclib/apr-util/dbd/apr_dbd_pgsql.c b/srclib/apr-util/dbd/apr_dbd_pgsql.c
index 2fc28ac7..15a8f0b5 100644
--- a/srclib/apr-util/dbd/apr_dbd_pgsql.c
+++ b/srclib/apr-util/dbd/apr_dbd_pgsql.c
@@ -31,12 +31,12 @@
 
 #include "apr_strings.h"
 #include "apr_time.h"
+#include "apr_buckets.h"
 
 #include "apr_dbd_internal.h"
 
-#define QUERY_MAX_ARGS 40
-
 struct apr_dbd_transaction_t {
+    int mode;
     int errnum;
     apr_dbd_t *handle;
 };
@@ -53,6 +53,7 @@ struct apr_dbd_results_t {
     size_t ntuples;
     size_t sz;
     size_t index;
+    apr_pool_t *pool;
 };
 
 struct apr_dbd_row_t {
@@ -64,6 +65,8 @@ struct apr_dbd_prepared_t {
     const char *name;
     int prepared;
     int nargs;
+    int nvals;
+    apr_dbd_type_e *types;
 };
 
 #define dbd_pgsql_is_success(x) (((x) == PGRES_EMPTY_QUERY) \
@@ -86,6 +89,19 @@ static int dbd_pgsql_select(apr_pool_t *pool, apr_dbd_t *sql,
         return sql->trans->errnum;
     }
     if (seek) { /* synchronous query */
+        if (TXN_IGNORE_ERRORS(sql->trans)) {
+            PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
+            if (res) {
+                ret = PQresultStatus(res);
+                PQclear(res);
+                if (!dbd_pgsql_is_success(ret)) {
+                    sql->trans->errnum = ret;
+                    return PGRES_FATAL_ERROR;
+                }
+            } else {
+                return sql->trans->errnum = PGRES_FATAL_ERROR;
+            }
+        }
         res = PQexec(sql->conn, query);
         if (res) {
             ret = PQresultStatus(res);
@@ -98,10 +114,38 @@ static int dbd_pgsql_select(apr_pool_t *pool, apr_dbd_t *sql,
             ret = PGRES_FATAL_ERROR;
         }
         if (ret != 0) {
-            if (sql->trans) {
+            if (TXN_IGNORE_ERRORS(sql->trans)) {
+                PGresult *res = PQexec(sql->conn,
+                                       "ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
+                if (res) {
+                    ret = PQresultStatus(res);
+                    PQclear(res);
+                    if (!dbd_pgsql_is_success(ret)) {
+                        sql->trans->errnum = ret;
+                        return PGRES_FATAL_ERROR;
+                    }
+                } else {
+                    return sql->trans->errnum = PGRES_FATAL_ERROR;
+                }
+            } else if (TXN_NOTICE_ERRORS(sql->trans)){
                 sql->trans->errnum = ret;
             }
             return ret;
+        } else {
+            if (TXN_IGNORE_ERRORS(sql->trans)) {
+                PGresult *res = PQexec(sql->conn,
+                                       "RELEASE SAVEPOINT APR_DBD_TXN_SP");
+                if (res) {
+                    ret = PQresultStatus(res);
+                    PQclear(res);
+                    if (!dbd_pgsql_is_success(ret)) {
+                        sql->trans->errnum = ret;
+                        return PGRES_FATAL_ERROR;
+                    }
+                } else {
+                    return sql->trans->errnum = PGRES_FATAL_ERROR;
+                }
+            }
         }
         if (!*results) {
             *results = apr_pcalloc(pool, sizeof(apr_dbd_results_t));
@@ -110,25 +154,73 @@ static int dbd_pgsql_select(apr_pool_t *pool, apr_dbd_t *sql,
         (*results)->ntuples = PQntuples(res);
         (*results)->sz = PQnfields(res);
         (*results)->random = seek;
+        (*results)->pool = pool;
         apr_pool_cleanup_register(pool, res, clear_result,
                                   apr_pool_cleanup_null);
     }
     else {
+        if (TXN_IGNORE_ERRORS(sql->trans)) {
+            PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
+            if (res) {
+                ret = PQresultStatus(res);
+                PQclear(res);
+                if (!dbd_pgsql_is_success(ret)) {
+                    sql->trans->errnum = ret;
+                    return PGRES_FATAL_ERROR;
+                }
+            } else {
+                return sql->trans->errnum = PGRES_FATAL_ERROR;
+            }
+        }
         if (PQsendQuery(sql->conn, query) == 0) {
-            if (sql->trans) {
+            if (TXN_IGNORE_ERRORS(sql->trans)) {
+                PGresult *res = PQexec(sql->conn,
+                                       "ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
+                if (res) {
+                    ret = PQresultStatus(res);
+                    PQclear(res);
+                    if (!dbd_pgsql_is_success(ret)) {
+                        sql->trans->errnum = ret;
+                        return PGRES_FATAL_ERROR;
+                    }
+                } else {
+                    return sql->trans->errnum = PGRES_FATAL_ERROR;
+                }
+            } else if (TXN_NOTICE_ERRORS(sql->trans)){
                 sql->trans->errnum = 1;
             }
             return 1;
+        } else {
+            if (TXN_IGNORE_ERRORS(sql->trans)) {
+                PGresult *res = PQexec(sql->conn,
+                                       "RELEASE SAVEPOINT APR_DBD_TXN_SP");
+                if (res) {
+                    ret = PQresultStatus(res);
+                    PQclear(res);
+                    if (!dbd_pgsql_is_success(ret)) {
+                        sql->trans->errnum = ret;
+                        return PGRES_FATAL_ERROR;
+                    }
+                } else {
+                    return sql->trans->errnum = PGRES_FATAL_ERROR;
+                }
+            }
         }
         if (*results == NULL) {
             *results = apr_pcalloc(pool, sizeof(apr_dbd_results_t));
         }
         (*results)->random = seek;
         (*results)->handle = sql->conn;
+        (*results)->pool = pool;
     }
     return 0;
 }
 
+static const char *dbd_pgsql_get_name(const apr_dbd_results_t *res, int n)
+{
+    return (res->res ? PQfname(res->res, n) : NULL);
+}
+
 static int dbd_pgsql_get_row(apr_pool_t *pool, apr_dbd_results_t *res,
                              apr_dbd_row_t **rowp, int rownum)
 {
@@ -139,14 +231,29 @@ static int dbd_pgsql_get_row(apr_pool_t *pool, apr_dbd_results_t *res,
         row = apr_palloc(pool, sizeof(apr_dbd_row_t));
         *rowp = row;
         row->res = res;
-        row->n = sequential ? 0 : rownum;
+        if ( sequential ) {
+            row->n = 0;
+        }
+        else {
+            if (rownum > 0) {
+                row->n = --rownum;
+            }
+            else {
+                return -1; /* invalid row */
+            }
+        }
     }
     else {
         if ( sequential ) {
             ++row->n;
         }
         else {
-            row->n = rownum;
+            if (rownum > 0) {
+                row->n = --rownum;
+            }
+            else {
+                return -1; /* invalid row */
+            }
         }
     }
 
@@ -198,6 +305,81 @@ static const char *dbd_pgsql_get_entry(const apr_dbd_row_t *row, int n)
     return PQgetvalue(row->res->res, row->n, n);
 }
 
+static apr_status_t dbd_pgsql_datum_get(const apr_dbd_row_t *row, int n,
+                                        apr_dbd_type_e type, void *data)
+{
+    if (PQgetisnull(row->res->res, row->n, n)) {
+        return APR_ENOENT;
+    }
+
+    switch (type) {
+    case APR_DBD_TYPE_TINY:
+        *(char*)data = atoi(PQgetvalue(row->res->res, row->n, n));
+        break;
+    case APR_DBD_TYPE_UTINY:
+        *(unsigned char*)data = atoi(PQgetvalue(row->res->res, row->n, n));
+        break;
+    case APR_DBD_TYPE_SHORT:
+        *(short*)data = atoi(PQgetvalue(row->res->res, row->n, n));
+        break;
+    case APR_DBD_TYPE_USHORT:
+        *(unsigned short*)data = atoi(PQgetvalue(row->res->res, row->n, n));
+        break;
+    case APR_DBD_TYPE_INT:
+        *(int*)data = atoi(PQgetvalue(row->res->res, row->n, n));
+        break;
+    case APR_DBD_TYPE_UINT:
+        *(unsigned int*)data = atoi(PQgetvalue(row->res->res, row->n, n));
+        break;
+    case APR_DBD_TYPE_LONG:
+        *(long*)data = atol(PQgetvalue(row->res->res, row->n, n));
+        break;
+    case APR_DBD_TYPE_ULONG:
+        *(unsigned long*)data = atol(PQgetvalue(row->res->res, row->n, n));
+        break;
+    case APR_DBD_TYPE_LONGLONG:
+        *(apr_int64_t*)data = apr_atoi64(PQgetvalue(row->res->res, row->n, n));
+        break;
+    case APR_DBD_TYPE_ULONGLONG:
+        *(apr_uint64_t*)data = apr_atoi64(PQgetvalue(row->res->res, row->n, n));
+        break;
+    case APR_DBD_TYPE_FLOAT:
+        *(float*)data = atof(PQgetvalue(row->res->res, row->n, n));
+        break;
+    case APR_DBD_TYPE_DOUBLE:
+        *(double*)data = atof(PQgetvalue(row->res->res, row->n, n));
+        break;
+    case APR_DBD_TYPE_STRING:
+    case APR_DBD_TYPE_TEXT:
+    case APR_DBD_TYPE_TIME:
+    case APR_DBD_TYPE_DATE:
+    case APR_DBD_TYPE_DATETIME:
+    case APR_DBD_TYPE_TIMESTAMP:
+    case APR_DBD_TYPE_ZTIMESTAMP:
+        *(char**)data = PQgetvalue(row->res->res, row->n, n);
+        break;
+    case APR_DBD_TYPE_BLOB:
+    case APR_DBD_TYPE_CLOB:
+        {
+        apr_bucket *e;
+        apr_bucket_brigade *b = (apr_bucket_brigade*)data;
+
+        e = apr_bucket_pool_create(PQgetvalue(row->res->res, row->n, n),
+                                   PQgetlength(row->res->res, row->n, n),
+                                   row->res->pool, b->bucket_alloc);
+        APR_BRIGADE_INSERT_TAIL(b, e);
+        }
+        break;
+    case APR_DBD_TYPE_NULL:
+        *(void**)data = NULL;
+        break;
+    default:
+        return APR_EGENERAL;
+    }
+
+    return APR_SUCCESS;
+}
+
 static const char *dbd_pgsql_error(apr_dbd_t *sql, int n)
 {
     return PQerrorMessage(sql->conn);
@@ -210,6 +392,21 @@ static int dbd_pgsql_query(apr_dbd_t *sql, int *nrows, const char *query)
     if (sql->trans && sql->trans->errnum) {
         return sql->trans->errnum;
     }
+
+    if (TXN_IGNORE_ERRORS(sql->trans)) {
+        PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
+        if (res) {
+            ret = PQresultStatus(res);
+            PQclear(res);
+            if (!dbd_pgsql_is_success(ret)) {
+                sql->trans->errnum = ret;
+                return PGRES_FATAL_ERROR;
+            }
+        } else {
+            return sql->trans->errnum = PGRES_FATAL_ERROR;
+        }
+    }
+
     res = PQexec(sql->conn, query);
     if (res) {
         ret = PQresultStatus(res);
@@ -223,9 +420,43 @@ static int dbd_pgsql_query(apr_dbd_t *sql, int *nrows, const char *query)
     else {
         ret = PGRES_FATAL_ERROR;
     }
-    if (sql->trans) {
-        sql->trans->errnum = ret;
+    
+    if (ret != 0){
+        if (TXN_IGNORE_ERRORS(sql->trans)) {
+            PGresult *res = PQexec(sql->conn,
+                                   "ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
+            if (res) {
+                ret = PQresultStatus(res);
+                PQclear(res);
+                if (!dbd_pgsql_is_success(ret)) {
+                    sql->trans->errnum = ret;
+                    return PGRES_FATAL_ERROR;
+                }
+            } else {
+                sql->trans->errnum = ret;
+                return PGRES_FATAL_ERROR;
+            }
+        } else if (TXN_NOTICE_ERRORS(sql->trans)){
+            sql->trans->errnum = ret;
+        }
+    } else {
+        if (TXN_IGNORE_ERRORS(sql->trans)) {
+            PGresult *res = PQexec(sql->conn,
+                                   "RELEASE SAVEPOINT APR_DBD_TXN_SP");
+            if (res) {
+                ret = PQresultStatus(res);
+                PQclear(res);
+                if (!dbd_pgsql_is_success(ret)) {
+                    sql->trans->errnum = ret;
+                    return PGRES_FATAL_ERROR;
+                }
+            } else {
+                sql->trans->errnum = ret;
+                return PGRES_FATAL_ERROR;
+            }
+        }
     }
+
     return ret;
 }
 
@@ -233,85 +464,95 @@ static const char *dbd_pgsql_escape(apr_pool_t *pool, const char *arg,
                                     apr_dbd_t *sql)
 {
     size_t len = strlen(arg);
-    char *ret = apr_palloc(pool, 2*(len + 1));
+    char *ret = apr_palloc(pool, 2*len + 2);
     PQescapeString(ret, arg, len);
     return ret;
 }
 
 static int dbd_pgsql_prepare(apr_pool_t *pool, apr_dbd_t *sql,
                              const char *query, const char *label,
+                             int nargs, int nvals, apr_dbd_type_e *types,
                              apr_dbd_prepared_t **statement)
 {
     char *sqlcmd;
     char *sqlptr;
-    size_t length;
+    size_t length, qlen;
     size_t i = 0;
-    const char *args[QUERY_MAX_ARGS];
+    const char **args;
     size_t alen;
     int ret;
     PGresult *res;
-    char *pgquery;
-    char *pgptr;
 
     if (!*statement) {
         *statement = apr_palloc(pool, sizeof(apr_dbd_prepared_t));
     }
-    (*statement)->nargs = 0;
-    /* Translate from apr_dbd to native query format */
-    for (sqlptr = (char*)query; *sqlptr; ++sqlptr) {
-        if (sqlptr[0] == '%') {
-            if (isalpha(sqlptr[1])) {
-                ++(*statement)->nargs;
-            }
-            else if (sqlptr[1] == '%') {
-                ++sqlptr;
-            }
-        }
-    }
-    length = strlen(query) + 1;
-    if ((*statement)->nargs > 8) {
-        length += (*statement)->nargs - 8;
-    }
-    pgptr = pgquery = apr_palloc(pool, length) ;
-
-    for (sqlptr = (char*)query; *sqlptr; ++sqlptr) {
-        if ((sqlptr[0] == '%') && isalpha(sqlptr[1])) {
-            *pgptr++ = '$';
-            if (i < 9) {
-                *pgptr++ = '1' + i;
-            }
-            else {
-                *pgptr++ = '0' + ((i+1)/10);
-                *pgptr++ = '0' + ((i+1)%10);
-            }
-            switch (*++sqlptr) {
-            case 'd':
-                args[i] = "integer";
-                break;
-            case 's':
-                args[i] = "varchar";
-                break;
-            default:
-                args[i] = "varchar";
-                break;
-            }
-            length += 1 + strlen(args[i]);
-            ++i;
-        }
-        else if ((sqlptr[0] == '%') && (sqlptr[1] == '%')) {
-            /* reduce %% to % */
-            *pgptr++ = *sqlptr++;
-        }
-        else {
-            *pgptr++ = *sqlptr;
+    (*statement)->nargs = nargs;
+    (*statement)->nvals = nvals;
+    (*statement)->types = types;
+
+    args = apr_palloc(pool, nargs * sizeof(*args));
+
+    qlen = strlen(query);
+    length = qlen + 1;
+
+    for (i = 0; i < nargs; i++) {
+        switch (types[i]) {
+        case APR_DBD_TYPE_TINY: 
+        case APR_DBD_TYPE_UTINY: 
+        case APR_DBD_TYPE_SHORT: 
+        case APR_DBD_TYPE_USHORT:
+            args[i] = "smallint";
+            break;
+        case APR_DBD_TYPE_INT: 
+        case APR_DBD_TYPE_UINT:
+            args[i] = "integer";
+            break;
+        case APR_DBD_TYPE_LONG: 
+        case APR_DBD_TYPE_ULONG:   
+        case APR_DBD_TYPE_LONGLONG: 
+        case APR_DBD_TYPE_ULONGLONG:
+            args[i] = "bigint";
+            break;
+        case APR_DBD_TYPE_FLOAT:
+            args[i] = "real";
+            break;
+        case APR_DBD_TYPE_DOUBLE:
+            args[i] = "double precision";
+            break;
+        case APR_DBD_TYPE_TEXT:
+            args[i] = "text";
+            break;
+        case APR_DBD_TYPE_TIME:
+            args[i] = "time";
+            break;
+        case APR_DBD_TYPE_DATE:
+            args[i] = "date";
+            break;
+        case APR_DBD_TYPE_DATETIME:
+        case APR_DBD_TYPE_TIMESTAMP:
+            args[i] = "timestamp";
+            break;
+        case APR_DBD_TYPE_ZTIMESTAMP:
+            args[i] = "timestamp with time zone";
+            break;
+        case APR_DBD_TYPE_BLOB:
+        case APR_DBD_TYPE_CLOB:
+            args[i] = "bytea";
+            break;
+        case APR_DBD_TYPE_NULL:
+            args[i] = "varchar"; /* XXX Eh? */
+            break;
+        default:
+            args[i] = "varchar";
+            break;
         }
+        length += 1 + strlen(args[i]);
     }
-    *pgptr = 0;
 
     if (!label) {
         /* don't really prepare; use in execParams instead */
         (*statement)->prepared = 0;
-        (*statement)->name = apr_pstrdup(pool, pgquery);
+        (*statement)->name = apr_pstrdup(pool, query);
         return 0;
     }
     (*statement)->name = apr_pstrdup(pool, label);
@@ -325,10 +566,10 @@ static int dbd_pgsql_prepare(apr_pool_t *pool, apr_dbd_t *sql,
     length = strlen(label);
     memcpy(sqlptr, label, length);
     sqlptr += length;
-    if ((*statement)->nargs > 0) {
+    if (nargs > 0) {
         memcpy(sqlptr, " (",2);
         sqlptr += 2;
-        for (i=0; i < (*statement)->nargs; ++i) {
+        for (i=0; i < nargs; ++i) {
             alen = strlen(args[i]);
             memcpy(sqlptr, args[i], alen);
             sqlptr += alen;
@@ -338,8 +579,8 @@ static int dbd_pgsql_prepare(apr_pool_t *pool, apr_dbd_t *sql,
     }
     memcpy(sqlptr, " AS ", 4);
     sqlptr += 4;
-    memcpy(sqlptr, pgquery, strlen(pgquery));
-    sqlptr += strlen(pgquery);
+    memcpy(sqlptr, query, qlen);
+    sqlptr += qlen;
     *sqlptr = 0;
 
     res = PQexec(sql->conn, sqlcmd);
@@ -359,43 +600,139 @@ static int dbd_pgsql_prepare(apr_pool_t *pool, apr_dbd_t *sql,
     return ret;
 }
 
-static int dbd_pgsql_pquery(apr_pool_t *pool, apr_dbd_t *sql,
-                            int *nrows, apr_dbd_prepared_t *statement,
-                            int nargs, const char **values)
+static int dbd_pgsql_pquery_internal(apr_pool_t *pool, apr_dbd_t *sql,
+                                     int *nrows, apr_dbd_prepared_t *statement,
+                                     const char **values,
+                                     const int *len, const int *fmt)
 {
     int ret;
     PGresult *res;
 
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
+    if (TXN_IGNORE_ERRORS(sql->trans)) {
+        PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
+        if (res) {
+            ret = PQresultStatus(res);
+            PQclear(res);
+            if (!dbd_pgsql_is_success(ret)) {
+                sql->trans->errnum = ret;
+                return PGRES_FATAL_ERROR;
+            }
+        } else {
+            return sql->trans->errnum = PGRES_FATAL_ERROR;
+        }
     }
 
     if (statement->prepared) {
-        res = PQexecPrepared(sql->conn, statement->name, nargs, values, 0, 0,
-                             0);
+        res = PQexecPrepared(sql->conn, statement->name, statement->nargs,
+                             values, len, fmt, 0);
     }
     else {
-        res = PQexecParams(sql->conn, statement->name, nargs, 0, values, 0, 0,
-                           0);
+        res = PQexecParams(sql->conn, statement->name, statement->nargs, 0,
+                           values, len, fmt, 0);
     }
     if (res) {
         ret = PQresultStatus(res);
         if (dbd_pgsql_is_success(ret)) {
             ret = 0;
         }
-	*nrows = atoi(PQcmdTuples(res));
+        *nrows = atoi(PQcmdTuples(res));
         PQclear(res);
     }
     else {
         ret = PGRES_FATAL_ERROR;
     }
 
-    if (sql->trans) {
-        sql->trans->errnum = ret;
+    if (ret != 0){
+        if (TXN_IGNORE_ERRORS(sql->trans)) {
+            PGresult *res = PQexec(sql->conn,
+                                   "ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
+            if (res) {
+                ret = PQresultStatus(res);
+                PQclear(res);
+                if (!dbd_pgsql_is_success(ret)) {
+                    sql->trans->errnum = ret;
+                    return PGRES_FATAL_ERROR;
+                }
+            } else {
+                sql->trans->errnum = ret;
+                return PGRES_FATAL_ERROR;
+            }
+        } else if (TXN_NOTICE_ERRORS(sql->trans)){
+            sql->trans->errnum = ret;
+        }
+    } else {
+        if (TXN_IGNORE_ERRORS(sql->trans)) {
+            PGresult *res = PQexec(sql->conn,
+                                   "RELEASE SAVEPOINT APR_DBD_TXN_SP");
+            if (res) {
+                ret = PQresultStatus(res);
+                PQclear(res);
+                if (!dbd_pgsql_is_success(ret)) {
+                    sql->trans->errnum = ret;
+                    return PGRES_FATAL_ERROR;
+                }
+            } else {
+                sql->trans->errnum = ret;
+                return PGRES_FATAL_ERROR;
+            }
+        }
     }
+
     return ret;
 }
 
+static void dbd_pgsql_bind(apr_dbd_prepared_t *statement,
+                           const char **values,
+                           const char **val, int *len, int *fmt)
+{
+    int i, j;
+
+    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
+        if (values[j] == NULL) {
+            val[i] = NULL;
+        }
+        else {
+            switch (statement->types[i]) {
+            case APR_DBD_TYPE_BLOB:
+            case APR_DBD_TYPE_CLOB:
+                val[i] = (char *)values[j];
+                len[i] = atoi(values[++j]);
+                fmt[i] = 1;
+
+                /* skip table and column */
+                j += 2;
+                break;
+            default:
+                val[i] = values[j];
+                break;
+            }
+        }
+    }
+
+    return;
+}
+
+static int dbd_pgsql_pquery(apr_pool_t *pool, apr_dbd_t *sql,
+                            int *nrows, apr_dbd_prepared_t *statement,
+                            const char **values)
+{
+    int *len, *fmt;
+    const char **val;
+
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+
+    val = apr_palloc(pool, sizeof(*val) * statement->nargs);
+    len = apr_pcalloc(pool, sizeof(*len) * statement->nargs);
+    fmt = apr_pcalloc(pool, sizeof(*fmt) * statement->nargs);
+
+    dbd_pgsql_bind(statement, values, val, len, fmt);
+
+    return dbd_pgsql_pquery_internal(pool, sql, nrows, statement,
+                                     val, len, fmt);
+}
+
 static int dbd_pgsql_pvquery(apr_pool_t *pool, apr_dbd_t *sql,
                              int *nrows, apr_dbd_prepared_t *statement,
                              va_list args)
@@ -407,37 +744,47 @@ static int dbd_pgsql_pvquery(apr_pool_t *pool, apr_dbd_t *sql,
         return sql->trans->errnum;
     }
 
-    values = apr_palloc(pool, sizeof(*values) * statement->nargs);
+    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
 
-    for (i = 0; i < statement->nargs; i++) {
-        values[i] = apr_pstrdup(pool, va_arg(args, const char*));
+    for (i = 0; i < statement->nvals; i++) {
+        values[i] = va_arg(args, const char*);
     }
 
-    return dbd_pgsql_pquery(pool, sql, nrows, statement,
-                            statement->nargs, values);
+    return dbd_pgsql_pquery(pool, sql, nrows, statement, values);
 }
 
-static int dbd_pgsql_pselect(apr_pool_t *pool, apr_dbd_t *sql,
-                             apr_dbd_results_t **results,
-                             apr_dbd_prepared_t *statement,
-                             int seek, int nargs, const char **values)
+static int dbd_pgsql_pselect_internal(apr_pool_t *pool, apr_dbd_t *sql,
+                                      apr_dbd_results_t **results,
+                                      apr_dbd_prepared_t *statement,
+                                      int seek, const char **values,
+                                      const int *len, const int *fmt)
 {
     PGresult *res;
     int rv;
     int ret = 0;
 
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
-    }
-
     if (seek) { /* synchronous query */
+        if (TXN_IGNORE_ERRORS(sql->trans)) {
+            PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
+            if (res) {
+                ret = PQresultStatus(res);
+                PQclear(res);
+                if (!dbd_pgsql_is_success(ret)) {
+                    sql->trans->errnum = ret;
+                    return PGRES_FATAL_ERROR;
+                }
+            } else {
+                sql->trans->errnum = ret;
+                return PGRES_FATAL_ERROR;
+            }
+        }
         if (statement->prepared) {
-            res = PQexecPrepared(sql->conn, statement->name, nargs, values, 0,
-                                 0, 0);
+            res = PQexecPrepared(sql->conn, statement->name, statement->nargs,
+                                 values, len, fmt, 0);
         }
         else {
-            res = PQexecParams(sql->conn, statement->name, nargs, 0, values, 0,
-                               0, 0);
+            res = PQexecParams(sql->conn, statement->name, statement->nargs, 0,
+                               values, len, fmt, 0);
         }
         if (res) {
             ret = PQresultStatus(res);
@@ -452,10 +799,40 @@ static int dbd_pgsql_pselect(apr_pool_t *pool, apr_dbd_t *sql,
             ret = PGRES_FATAL_ERROR;
         }
         if (ret != 0) {
-            if (sql->trans) {
+            if (TXN_IGNORE_ERRORS(sql->trans)) {
+                PGresult *res = PQexec(sql->conn,
+                                       "ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
+                if (res) {
+                    ret = PQresultStatus(res);
+                    PQclear(res);
+                    if (!dbd_pgsql_is_success(ret)) {
+                        sql->trans->errnum = ret;
+                        return PGRES_FATAL_ERROR;
+                    }
+                } else {
+                    sql->trans->errnum = ret;
+                    return PGRES_FATAL_ERROR;
+                }
+            } else if (TXN_NOTICE_ERRORS(sql->trans)){
                 sql->trans->errnum = ret;
             }
             return ret;
+        } else {
+            if (TXN_IGNORE_ERRORS(sql->trans)) {
+                PGresult *res = PQexec(sql->conn,
+                                       "RELEASE SAVEPOINT APR_DBD_TXN_SP");
+                if (res) {
+                    ret = PQresultStatus(res);
+                    PQclear(res);
+                    if (!dbd_pgsql_is_success(ret)) {
+                        sql->trans->errnum = ret;
+                        return PGRES_FATAL_ERROR;
+                    }
+                } else {
+                    sql->trans->errnum = ret;
+                    return PGRES_FATAL_ERROR;
+                }
+            }
         }
         if (!*results) {
             *results = apr_pcalloc(pool, sizeof(apr_dbd_results_t));
@@ -464,37 +841,102 @@ static int dbd_pgsql_pselect(apr_pool_t *pool, apr_dbd_t *sql,
         (*results)->ntuples = PQntuples(res);
         (*results)->sz = PQnfields(res);
         (*results)->random = seek;
+        (*results)->pool = pool;
         apr_pool_cleanup_register(pool, res, clear_result,
                                   apr_pool_cleanup_null);
     }
     else {
+        if (TXN_IGNORE_ERRORS(sql->trans)) {
+            PGresult *res = PQexec(sql->conn, "SAVEPOINT APR_DBD_TXN_SP");
+            if (res) {
+                ret = PQresultStatus(res);
+                PQclear(res);
+                if (!dbd_pgsql_is_success(ret)) {
+                    sql->trans->errnum = ret;
+                    return PGRES_FATAL_ERROR;
+                }
+            } else {
+                sql->trans->errnum = ret;
+                return PGRES_FATAL_ERROR;
+            }
+        }
         if (statement->prepared) {
-            rv = PQsendQueryPrepared(sql->conn, statement->name, nargs, values,
-                                     0, 0, 0);
+            rv = PQsendQueryPrepared(sql->conn, statement->name,
+                                     statement->nargs, values, len, fmt, 0);
         }
         else {
-            rv = PQsendQueryParams(sql->conn, statement->name, nargs, 0,
-                                   values, 0, 0, 0);
+            rv = PQsendQueryParams(sql->conn, statement->name,
+                                   statement->nargs, 0, values, len, fmt, 0);
         }
         if (rv == 0) {
-            if (sql->trans) {
+            if (TXN_IGNORE_ERRORS(sql->trans)) {
+                PGresult *res = PQexec(sql->conn,
+                                       "ROLLBACK TO SAVEPOINT APR_DBD_TXN_SP");
+                if (res) {
+                    ret = PQresultStatus(res);
+                    PQclear(res);
+                    if (!dbd_pgsql_is_success(ret)) {
+                        sql->trans->errnum = ret;
+                        return PGRES_FATAL_ERROR;
+                    }
+                } else {
+                    sql->trans->errnum = ret;
+                    return PGRES_FATAL_ERROR;
+                }
+            } else if (TXN_NOTICE_ERRORS(sql->trans)){
                 sql->trans->errnum = 1;
             }
             return 1;
+        } else {
+            if (TXN_IGNORE_ERRORS(sql->trans)) {
+                PGresult *res = PQexec(sql->conn,
+                                       "RELEASE SAVEPOINT APR_DBD_TXN_SP");
+                if (res) {
+                    ret = PQresultStatus(res);
+                    PQclear(res);
+                    if (!dbd_pgsql_is_success(ret)) {
+                        sql->trans->errnum = ret;
+                        return PGRES_FATAL_ERROR;
+                    }
+                } else {
+                    sql->trans->errnum = ret;
+                    return PGRES_FATAL_ERROR;
+                }
+            }
         }
         if (!*results) {
             *results = apr_pcalloc(pool, sizeof(apr_dbd_results_t));
         }
         (*results)->random = seek;
         (*results)->handle = sql->conn;
+        (*results)->pool = pool;
     }
 
-    if (sql->trans) {
-        sql->trans->errnum = ret;
-    }
     return ret;
 }
 
+static int dbd_pgsql_pselect(apr_pool_t *pool, apr_dbd_t *sql,
+                             apr_dbd_results_t **results,
+                             apr_dbd_prepared_t *statement,
+                             int seek, const char **values)
+{
+    int *len, *fmt;
+    const char **val;
+
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+
+    val = apr_palloc(pool, sizeof(*val) * statement->nargs);
+    len = apr_pcalloc(pool, sizeof(*len) * statement->nargs);
+    fmt = apr_pcalloc(pool, sizeof(*fmt) * statement->nargs);
+
+    dbd_pgsql_bind(statement, values, val, len, fmt);
+
+    return dbd_pgsql_pselect_internal(pool, sql, results, statement,
+                                      seek, val, len, fmt);
+}
+
 static int dbd_pgsql_pvselect(apr_pool_t *pool, apr_dbd_t *sql,
                               apr_dbd_results_t **results,
                               apr_dbd_prepared_t *statement,
@@ -507,14 +949,174 @@ static int dbd_pgsql_pvselect(apr_pool_t *pool, apr_dbd_t *sql,
         return sql->trans->errnum;
     }
 
-    values = apr_palloc(pool, sizeof(*values) * statement->nargs);
+    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
+
+    for (i = 0; i < statement->nvals; i++) {
+        values[i] = va_arg(args, const char*);
+    }
+
+    return dbd_pgsql_pselect(pool, sql, results, statement, seek, values);
+}
+
+static void dbd_pgsql_bbind(apr_pool_t *pool, apr_dbd_prepared_t * statement,
+                            const void **values,
+                            const char **val, int *len, int *fmt)
+{
+    int i, j;
+    apr_dbd_type_e type;
+
+    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
+        type = (values[j] == NULL ? APR_DBD_TYPE_NULL : statement->types[i]);
+
+        switch (type) {
+        case APR_DBD_TYPE_TINY:
+            val[i] = apr_itoa(pool, *(char*)values[j]);
+            break;
+        case APR_DBD_TYPE_UTINY:
+            val[i] = apr_itoa(pool, *(unsigned char*)values[j]);
+            break;
+        case APR_DBD_TYPE_SHORT:
+            val[i] = apr_itoa(pool, *(short*)values[j]);
+            break;
+        case APR_DBD_TYPE_USHORT:
+            val[i] = apr_itoa(pool, *(unsigned short*)values[j]);
+            break;
+        case APR_DBD_TYPE_INT:
+            val[i] = apr_itoa(pool, *(int*)values[j]);
+            break;
+        case APR_DBD_TYPE_UINT:
+            val[i] = apr_itoa(pool, *(unsigned int*)values[j]);
+            break;
+        case APR_DBD_TYPE_LONG:
+            val[i] = apr_ltoa(pool, *(long*)values[j]);
+            break;
+        case APR_DBD_TYPE_ULONG:
+            val[i] = apr_ltoa(pool, *(unsigned long*)values[j]);
+            break;
+        case APR_DBD_TYPE_LONGLONG:
+            val[i] = apr_psprintf(pool, "%" APR_INT64_T_FMT,
+                                  *(apr_int64_t*)values[j]);
+            break;
+        case APR_DBD_TYPE_ULONGLONG:
+            val[i] = apr_psprintf(pool, "%" APR_UINT64_T_FMT,
+                                  *(apr_uint64_t*)values[j]);
+            break;
+        case APR_DBD_TYPE_FLOAT:
+            val[i] = apr_psprintf(pool, "%f", *(float*)values[j]);
+            break;
+        case APR_DBD_TYPE_DOUBLE:
+            val[i] = apr_psprintf(pool, "%lf", *(double*)values[j]);
+            break;
+        case APR_DBD_TYPE_STRING:
+        case APR_DBD_TYPE_TEXT:
+        case APR_DBD_TYPE_TIME:
+        case APR_DBD_TYPE_DATE:
+        case APR_DBD_TYPE_DATETIME:
+        case APR_DBD_TYPE_TIMESTAMP:
+        case APR_DBD_TYPE_ZTIMESTAMP:
+            val[i] = values[j];
+            break;
+        case APR_DBD_TYPE_BLOB:
+        case APR_DBD_TYPE_CLOB:
+            val[i] = (char*)values[j];
+            len[i] = *(apr_size_t*)values[++j];
+            fmt[i] = 1;
+
+            /* skip table and column */
+            j += 2;
+            break;
+        case APR_DBD_TYPE_NULL:
+        default:
+            val[i] = NULL;
+            break;
+        }
+    }
+
+    return;
+}
+
+static int dbd_pgsql_pbquery(apr_pool_t * pool, apr_dbd_t * sql,
+                             int *nrows, apr_dbd_prepared_t * statement,
+                             const void **values)
+{
+    int *len, *fmt;
+    const char **val;
+
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+
+    val = apr_palloc(pool, sizeof(*val) * statement->nargs);
+    len = apr_pcalloc(pool, sizeof(*len) * statement->nargs);
+    fmt = apr_pcalloc(pool, sizeof(*fmt) * statement->nargs);
+
+    dbd_pgsql_bbind(pool, statement, values, val, len, fmt);
+
+    return dbd_pgsql_pquery_internal(pool, sql, nrows, statement,
+                                     val, len, fmt);
+}
+
+static int dbd_pgsql_pvbquery(apr_pool_t * pool, apr_dbd_t * sql,
+                              int *nrows, apr_dbd_prepared_t * statement,
+                              va_list args)
+{
+    const void **values;
+    int i;
+
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+
+    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
+
+    for (i = 0; i < statement->nvals; i++) {
+        values[i] = va_arg(args, const void*);
+    }
+
+    return dbd_pgsql_pbquery(pool, sql, nrows, statement, values);
+}
+
+static int dbd_pgsql_pbselect(apr_pool_t * pool, apr_dbd_t * sql,
+                              apr_dbd_results_t ** results,
+                              apr_dbd_prepared_t * statement,
+                              int seek, const void **values)
+{
+    int *len, *fmt;
+    const char **val;
+
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+
+    val = apr_palloc(pool, sizeof(*val) * statement->nargs);
+    len = apr_pcalloc(pool, sizeof(*len) * statement->nargs);
+    fmt = apr_pcalloc(pool, sizeof(*fmt) * statement->nargs);
+
+    dbd_pgsql_bbind(pool, statement, values, val, len, fmt);
+
+    return dbd_pgsql_pselect_internal(pool, sql, results, statement,
+                                      seek, val, len, fmt);
+}
+
+static int dbd_pgsql_pvbselect(apr_pool_t * pool, apr_dbd_t * sql,
+                               apr_dbd_results_t ** results,
+                               apr_dbd_prepared_t * statement, int seek,
+                               va_list args)
+{
+    const void **values;
+    int i;
+
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+
+    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
 
-    for (i = 0; i < statement->nargs; i++) {
-        values[i] = apr_pstrdup(pool, va_arg(args, const char*));
+    for (i = 0; i < statement->nvals; i++) {
+        values[i] = va_arg(args, const void*);
     }
 
-    return dbd_pgsql_pselect(pool, sql, results, statement,
-                             seek, statement->nargs, values) ;
+    return dbd_pgsql_pbselect(pool, sql, results, statement, seek, values);
 }
 
 static int dbd_pgsql_start_transaction(apr_pool_t *pool, apr_dbd_t *handle,
@@ -549,7 +1151,8 @@ static int dbd_pgsql_end_transaction(apr_dbd_transaction_t *trans)
     PGresult *res;
     int ret = -1;                /* no transaction is an error cond */
     if (trans) {
-        if (trans->errnum) {
+        /* rollback on error or explicit rollback request */
+        if (trans->errnum || TXN_DO_ROLLBACK(trans)) {
             trans->errnum = 0;
             res = PQexec(trans->handle->conn, "ROLLBACK");
         }
@@ -571,7 +1174,25 @@ static int dbd_pgsql_end_transaction(apr_dbd_transaction_t *trans)
     return ret;
 }
 
-static apr_dbd_t *dbd_pgsql_open(apr_pool_t *pool, const char *params)
+static int dbd_pgsql_transaction_mode_get(apr_dbd_transaction_t *trans)
+{
+    if (!trans)
+        return APR_DBD_TRANSACTION_COMMIT;
+
+    return trans->mode;
+}
+
+static int dbd_pgsql_transaction_mode_set(apr_dbd_transaction_t *trans,
+                                          int mode)
+{
+    if (!trans)
+        return APR_DBD_TRANSACTION_COMMIT;
+
+    return trans->mode = (mode & TXN_MODE_BITS);
+}
+
+static apr_dbd_t *dbd_pgsql_open(apr_pool_t *pool, const char *params,
+                                 const char **error)
 {
     apr_dbd_t *sql;
     
@@ -582,6 +1203,9 @@ static apr_dbd_t *dbd_pgsql_open(apr_pool_t *pool, const char *params)
      * liable to segfault, so just close it out now.  it would be nice
      * if we could give an indication of why we failed to connect... */
     if (PQstatus(conn) != CONNECTION_OK) {
+        if (error) {
+            *error = apr_pstrdup(pool, PQerrorMessage(conn));
+        }
         PQfinish(conn);
         return NULL;
     }
@@ -637,7 +1261,7 @@ static int dbd_pgsql_num_tuples(apr_dbd_results_t* res)
     }
 }
 
-APU_DECLARE_DATA const apr_dbd_driver_t apr_dbd_pgsql_driver = {
+APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_pgsql_driver = {
     "pgsql",
     NULL,
     dbd_pgsql_native,
@@ -660,5 +1284,14 @@ APU_DECLARE_DATA const apr_dbd_driver_t apr_dbd_pgsql_driver = {
     dbd_pgsql_pvselect,
     dbd_pgsql_pquery,
     dbd_pgsql_pselect,
+    dbd_pgsql_get_name,
+    dbd_pgsql_transaction_mode_get,
+    dbd_pgsql_transaction_mode_set,
+    "$%d",
+    dbd_pgsql_pvbquery,
+    dbd_pgsql_pvbselect,
+    dbd_pgsql_pbquery,
+    dbd_pgsql_pbselect,
+    dbd_pgsql_datum_get
 };
 #endif
diff --git a/srclib/apr-util/dbd/apr_dbd_pgsql.dsp b/srclib/apr-util/dbd/apr_dbd_pgsql.dsp
new file mode 100644
index 00000000..8a5d17b9
--- /dev/null
+++ b/srclib/apr-util/dbd/apr_dbd_pgsql.dsp
@@ -0,0 +1,207 @@
+# Microsoft Developer Studio Project File - Name="apr_dbd_pgsql" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=apr_dbd_pgsql - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_pgsql.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_pgsql.mak" CFG="apr_dbd_pgsql - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_dbd_pgsql - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_pgsql - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_pgsql - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_pgsql - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "apr_dbd_pgsql - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_PGSQL=1 /D "HAVE_LIBPQ_FE_H" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_pgsql_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"Release/apr_dbd_pgsql-1.res" /d DLL_NAME="apr_dbd_pgsql" /d "NDEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libpq.lib /nologo /base:"0x6EF30000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libpq.lib /nologo /base:"0x6EF30000" /subsystem:windows /dll /incremental:no /debug /out:"Release\apr_dbd_pgsql-1.dll" /pdb:"Release\apr_dbd_pgsql-1.pdb" /implib:"Release\apr_dbd_pgsql-1.lib" /MACHINE:X86 /opt:ref
+# Begin Special Build Tool
+TargetPath=Release\apr_dbd_pgsql-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_PGSQL=1 /D "HAVE_LIBPQ_FE_H" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_pgsql_src" /FD /EHsc /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"Debug/apr_dbd_pgsql-1.res" /d DLL_NAME="apr_dbd_pgsql" /d "_DEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libpq.lib /nologo /base:"0x6EF30000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libpq.lib /nologo /base:"0x6EF30000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\apr_dbd_pgsql-1.dll" /pdb:"Debug\apr_dbd_pgsql-1.pdb" /implib:"Debug\apr_dbd_pgsql-1.lib" /MACHINE:X86
+# Begin Special Build Tool
+TargetPath=Debug\apr_dbd_pgsql-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "x64\Release"
+# PROP BASE Intermediate_Dir "x64\Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "x64\Release"
+# PROP Intermediate_Dir "x64\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_PGSQL=1 /D "HAVE_LIBPQ_FE_H" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_pgsql_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"x64/Release/apr_dbd_pgsql-1.res" /d DLL_NAME="apr_dbd_pgsql" /d "NDEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libpq.lib /nologo /base:"0x6EF30000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libpq.lib /nologo /base:"0x6EF30000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\apr_dbd_pgsql-1.dll" /pdb:"x64\Release\apr_dbd_pgsql-1.pdb" /implib:"x64\Release\apr_dbd_pgsql-1.lib" /MACHINE:X64 /opt:ref
+# Begin Special Build Tool
+TargetPath=x64\Release\apr_dbd_pgsql-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_pgsql - x64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "x64\Debug"
+# PROP BASE Intermediate_Dir "x64\Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "x64\Debug"
+# PROP Intermediate_Dir "x64\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_PGSQL=1 /D "HAVE_LIBPQ_FE_H" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_pgsql_src" /FD /EHsc /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"x64/Debug/apr_dbd_pgsql-1.res" /d DLL_NAME="apr_dbd_pgsql" /d "_DEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libpq.lib /nologo /base:"0x6EF30000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib libpq.lib /nologo /base:"0x6EF30000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\apr_dbd_pgsql-1.dll" /pdb:"x64\Debug\apr_dbd_pgsql-1.pdb" /implib:"x64\Debug\apr_dbd_pgsql-1.lib" /MACHINE:X64
+# Begin Special Build Tool
+TargetPath=x64\Debug\apr_dbd_pgsql-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "apr_dbd_pgsql - Win32 Release"
+# Name "apr_dbd_pgsql - Win32 Debug"
+# Name "apr_dbd_pgsql - x64 Release"
+# Name "apr_dbd_pgsql - x64 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\apr_dbd_pgsql.c
+# End Source File
+# End Group
+# Begin Group "Public Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\apr_dbd.h
+# End Source File
+# End Group
+# Begin Group "Internal Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\private\apu_config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\private\apu_dbd_internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\private\apu_internal.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\libaprutil.rc
+# End Source File
+# End Target
+# End Project
diff --git a/srclib/apr-util/dbd/apr_dbd_sqlite2.c b/srclib/apr-util/dbd/apr_dbd_sqlite2.c
index 6907be7b..132ccc4c 100644
--- a/srclib/apr-util/dbd/apr_dbd_sqlite2.c
+++ b/srclib/apr-util/dbd/apr_dbd_sqlite2.c
@@ -25,10 +25,12 @@
 
 #include "apr_strings.h"
 #include "apr_time.h"
+#include "apr_buckets.h"
 
 #include "apr_dbd_internal.h"
 
 struct apr_dbd_transaction_t {
+    int mode;
     int errnum;
     apr_dbd_t *handle;
 };
@@ -46,6 +48,7 @@ struct apr_dbd_results_t {
     size_t ntuples;
     size_t sz;
     size_t index;
+    apr_pool_t *pool;
 };
 
 struct apr_dbd_row_t {
@@ -100,6 +103,7 @@ static int dbd_sqlite_select(apr_pool_t * pool, apr_dbd_t * sql,
         (*results)->ntuples = tuples;
         (*results)->sz = fields;
         (*results)->random = seek;
+        (*results)->pool = pool;
 
         if (tuples > 0)
             apr_pool_cleanup_register(pool, result, free_table,
@@ -108,12 +112,23 @@ static int dbd_sqlite_select(apr_pool_t * pool, apr_dbd_t * sql,
         ret = 0;
     }
     else {
-        sql->trans->errnum = ret;
+        if (TXN_NOTICE_ERRORS(sql->trans)) {
+            sql->trans->errnum = ret;
+        }
     }
 
     return ret;
 }
 
+static const char *dbd_sqlite_get_name(const apr_dbd_results_t *res, int n)
+{
+    if ((n < 0) || (n >= res->sz)) {
+        return NULL;
+    }
+
+    return res->res[n];
+}
+
 static int dbd_sqlite_get_row(apr_pool_t * pool, apr_dbd_results_t * res,
                               apr_dbd_row_t ** rowp, int rownum)
 {
@@ -175,6 +190,84 @@ static const char *dbd_sqlite_get_entry(const apr_dbd_row_t * row, int n)
     return row->data[n];
 }
 
+static apr_status_t dbd_sqlite_datum_get(const apr_dbd_row_t *row, int n,
+                                         apr_dbd_type_e type, void *data)
+{
+    if ((n < 0) || (n >= row->res->sz)) {
+      return APR_EGENERAL;
+    }
+
+    if (row->data[n] == NULL) {
+        return APR_ENOENT;
+    }
+
+    switch (type) {
+    case APR_DBD_TYPE_TINY:
+        *(char*)data = atoi(row->data[n]);
+        break;
+    case APR_DBD_TYPE_UTINY:
+        *(unsigned char*)data = atoi(row->data[n]);
+        break;
+    case APR_DBD_TYPE_SHORT:
+        *(short*)data = atoi(row->data[n]);
+        break;
+    case APR_DBD_TYPE_USHORT:
+        *(unsigned short*)data = atoi(row->data[n]);
+        break;
+    case APR_DBD_TYPE_INT:
+        *(int*)data = atoi(row->data[n]);
+        break;
+    case APR_DBD_TYPE_UINT:
+        *(unsigned int*)data = atoi(row->data[n]);
+        break;
+    case APR_DBD_TYPE_LONG:
+        *(long*)data = atol(row->data[n]);
+        break;
+    case APR_DBD_TYPE_ULONG:
+        *(unsigned long*)data = atol(row->data[n]);
+        break;
+    case APR_DBD_TYPE_LONGLONG:
+        *(apr_int64_t*)data = apr_atoi64(row->data[n]);
+        break;
+    case APR_DBD_TYPE_ULONGLONG:
+        *(apr_uint64_t*)data = apr_atoi64(row->data[n]);
+        break;
+    case APR_DBD_TYPE_FLOAT:
+        *(float*)data = atof(row->data[n]);
+        break;
+    case APR_DBD_TYPE_DOUBLE:
+        *(double*)data = atof(row->data[n]);
+        break;
+    case APR_DBD_TYPE_STRING:
+    case APR_DBD_TYPE_TEXT:
+    case APR_DBD_TYPE_TIME:
+    case APR_DBD_TYPE_DATE:
+    case APR_DBD_TYPE_DATETIME:
+    case APR_DBD_TYPE_TIMESTAMP:
+    case APR_DBD_TYPE_ZTIMESTAMP:
+        *(char**)data = row->data[n];
+        break;
+    case APR_DBD_TYPE_BLOB:
+    case APR_DBD_TYPE_CLOB:
+        {
+        apr_bucket *e;
+        apr_bucket_brigade *b = (apr_bucket_brigade*)data;
+
+        e = apr_bucket_pool_create(row->data[n],strlen(row->data[n]),
+                                   row->res->pool, b->bucket_alloc);
+        APR_BRIGADE_INSERT_TAIL(b, e);
+        }
+        break;
+    case APR_DBD_TYPE_NULL:
+        *(void**)data = NULL;
+        break;
+    default:
+        return APR_EGENERAL;
+    }
+
+    return APR_SUCCESS;
+}
+
 static const char *dbd_sqlite_error(apr_dbd_t * sql, int n)
 {
     return sql->errmsg;
@@ -205,7 +298,7 @@ static int dbd_sqlite_query(apr_dbd_t * sql, int *nrows, const char *query)
         ret = 0;
     }
 
-    if (sql->trans) {
+    if (TXN_NOTICE_ERRORS(sql->trans)) {
         sql->trans->errnum = ret;
     }
 
@@ -228,6 +321,7 @@ static const char *dbd_sqlite_escape(apr_pool_t * pool, const char *arg,
 
 static int dbd_sqlite_prepare(apr_pool_t * pool, apr_dbd_t * sql,
                               const char *query, const char *label,
+                              int nargs, int nvals, apr_dbd_type_e *types,
                               apr_dbd_prepared_t ** statement)
 {
     return APR_ENOTIMPL;
@@ -235,7 +329,7 @@ static int dbd_sqlite_prepare(apr_pool_t * pool, apr_dbd_t * sql,
 
 static int dbd_sqlite_pquery(apr_pool_t * pool, apr_dbd_t * sql,
                              int *nrows, apr_dbd_prepared_t * statement,
-                             int nargs, const char **values)
+                             const char **values)
 {
     return APR_ENOTIMPL;
 }
@@ -250,7 +344,7 @@ static int dbd_sqlite_pvquery(apr_pool_t * pool, apr_dbd_t * sql,
 static int dbd_sqlite_pselect(apr_pool_t * pool, apr_dbd_t * sql,
                               apr_dbd_results_t ** results,
                               apr_dbd_prepared_t * statement,
-                              int seek, int nargs, const char **values)
+                              int seek, const char **values)
 {
     return APR_ENOTIMPL;
 }
@@ -263,6 +357,36 @@ static int dbd_sqlite_pvselect(apr_pool_t * pool, apr_dbd_t * sql,
     return APR_ENOTIMPL;
 }
 
+static int dbd_sqlite_pbquery(apr_pool_t * pool, apr_dbd_t * sql,
+                              int *nrows, apr_dbd_prepared_t * statement,
+                              const void **values)
+{
+    return APR_ENOTIMPL;
+}
+
+static int dbd_sqlite_pvbquery(apr_pool_t * pool, apr_dbd_t * sql,
+                               int *nrows, apr_dbd_prepared_t * statement,
+                               va_list args)
+{
+    return APR_ENOTIMPL;
+}
+
+static int dbd_sqlite_pbselect(apr_pool_t * pool, apr_dbd_t * sql,
+                               apr_dbd_results_t ** results,
+                               apr_dbd_prepared_t * statement,
+                               int seek, const void **values)
+{
+    return APR_ENOTIMPL;
+}
+
+static int dbd_sqlite_pvbselect(apr_pool_t * pool, apr_dbd_t * sql,
+                                apr_dbd_results_t ** results,
+                                apr_dbd_prepared_t * statement, int seek,
+                                va_list args)
+{
+    return APR_ENOTIMPL;
+}
+
 static int dbd_sqlite_start_transaction(apr_pool_t * pool, apr_dbd_t * handle,
                                         apr_dbd_transaction_t ** trans)
 {
@@ -288,7 +412,8 @@ static int dbd_sqlite_end_transaction(apr_dbd_transaction_t * trans)
     int ret = -1;               /* no transaction is an error cond */
 
     if (trans) {
-        if (trans->errnum) {
+        /* rollback on error or explicit rollback request */
+        if (trans->errnum || TXN_DO_ROLLBACK(trans)) {
             trans->errnum = 0;
             ret =
                 dbd_sqlite_query(trans->handle, &rows,
@@ -304,7 +429,31 @@ static int dbd_sqlite_end_transaction(apr_dbd_transaction_t * trans)
     return ret;
 }
 
-static apr_dbd_t *dbd_sqlite_open(apr_pool_t * pool, const char *params_)
+static int dbd_sqlite_transaction_mode_get(apr_dbd_transaction_t *trans)
+{
+    if (!trans)
+        return APR_DBD_TRANSACTION_COMMIT;
+
+    return trans->mode;
+}
+
+static int dbd_sqlite_transaction_mode_set(apr_dbd_transaction_t *trans,
+                                           int mode)
+{
+    if (!trans)
+        return APR_DBD_TRANSACTION_COMMIT;
+
+    return trans->mode = (mode & TXN_MODE_BITS);
+}
+
+static apr_status_t error_free(void *data)
+{
+    free(data);
+    return APR_SUCCESS;
+}
+
+static apr_dbd_t *dbd_sqlite_open(apr_pool_t * pool, const char *params_,
+                                  const char **error)
 {
     apr_dbd_t *sql;
     sqlite *conn = NULL;
@@ -323,7 +472,19 @@ static apr_dbd_t *dbd_sqlite_open(apr_pool_t * pool, const char *params_)
             iperms = atoi(perm);
     }
 
-    conn = sqlite_open(params, iperms, NULL);
+    if (error) {
+        *error = NULL;
+
+        conn = sqlite_open(params, iperms, (char **)error);
+
+        if (*error) {
+            apr_pool_cleanup_register(pool, *error, error_free,
+                                      apr_pool_cleanup_null);
+        }
+    }
+    else {
+        conn = sqlite_open(params, iperms, NULL);
+    }
 
     sql = apr_pcalloc(pool, sizeof(*sql));
     sql->conn = conn;
@@ -369,7 +530,7 @@ static int dbd_sqlite_num_tuples(apr_dbd_results_t * res)
     return res->ntuples;
 }
 
-APU_DECLARE_DATA const apr_dbd_driver_t apr_dbd_sqlite2_driver = {
+APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_sqlite2_driver = {
     "sqlite2",
     NULL,
     dbd_sqlite_native,
@@ -392,5 +553,14 @@ APU_DECLARE_DATA const apr_dbd_driver_t apr_dbd_sqlite2_driver = {
     dbd_sqlite_pvselect,
     dbd_sqlite_pquery,
     dbd_sqlite_pselect,
+    dbd_sqlite_get_name,
+    dbd_sqlite_transaction_mode_get,
+    dbd_sqlite_transaction_mode_set,
+    NULL,
+    dbd_sqlite_pvbquery,
+    dbd_sqlite_pvbselect,
+    dbd_sqlite_pbquery,
+    dbd_sqlite_pbselect,
+    dbd_sqlite_datum_get
 };
 #endif
diff --git a/srclib/apr-util/dbd/apr_dbd_sqlite2.dsp b/srclib/apr-util/dbd/apr_dbd_sqlite2.dsp
new file mode 100644
index 00000000..02f3570b
--- /dev/null
+++ b/srclib/apr-util/dbd/apr_dbd_sqlite2.dsp
@@ -0,0 +1,207 @@
+# Microsoft Developer Studio Project File - Name="apr_dbd_sqlite2" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=apr_dbd_sqlite2 - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_sqlite2.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_sqlite2.mak" CFG="apr_dbd_sqlite2 - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_dbd_sqlite2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_sqlite2 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_sqlite2 - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_sqlite2 - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_SQLITE2=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_sqlite2_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"Release/apr_dbd_sqlite2-1.res" /d DLL_NAME="apr_dbd_sqlite2" /d "NDEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite2.lib /nologo /base:"0x6EF10000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite2.lib /nologo /base:"0x6EF10000" /subsystem:windows /dll /incremental:no /debug /out:"Release\apr_dbd_sqlite2-1.dll" /pdb:"Release\apr_dbd_sqlite2-1.pdb" /implib:"Release\apr_dbd_sqlite2-1.lib" /MACHINE:X86 /opt:ref
+# Begin Special Build Tool
+TargetPath=Release\apr_dbd_sqlite2-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_SQLITE2=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_sqlite2_src" /FD /EHsc /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"Debug/apr_dbd_sqlite2-1.res" /d DLL_NAME="apr_dbd_sqlite2" /d "_DEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite2.lib /nologo /base:"0x6EF10000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite2.lib /nologo /base:"0x6EF10000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\apr_dbd_sqlite2-1.dll" /pdb:"Debug\apr_dbd_sqlite2-1.pdb" /implib:"Debug\apr_dbd_sqlite2-1.lib" /MACHINE:X86
+# Begin Special Build Tool
+TargetPath=Debug\apr_dbd_sqlite2-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "x64\Release"
+# PROP BASE Intermediate_Dir "x64\Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "x64\Release"
+# PROP Intermediate_Dir "x64\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_SQLITE2=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_sqlite2_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"x64/Release/apr_dbd_sqlite2-1.res" /d DLL_NAME="apr_dbd_sqlite2" /d "NDEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite2.lib /nologo /base:"0x6EF10000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite2.lib /nologo /base:"0x6EF10000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\apr_dbd_sqlite2-1.dll" /pdb:"x64\Release\apr_dbd_sqlite2-1.pdb" /implib:"x64\Release\apr_dbd_sqlite2-1.lib" /MACHINE:X64 /opt:ref
+# Begin Special Build Tool
+TargetPath=x64\Release\apr_dbd_sqlite2-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite2 - x64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "x64\Debug"
+# PROP BASE Intermediate_Dir "x64\Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "x64\Debug"
+# PROP Intermediate_Dir "x64\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_SQLITE2=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_sqlite2_src" /FD /EHsc /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"x64/Debug/apr_dbd_sqlite2-1.res" /d DLL_NAME="apr_dbd_sqlite2" /d "_DEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite2.lib /nologo /base:"0x6EF10000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite2.lib /nologo /base:"0x6EF10000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\apr_dbd_sqlite2-1.dll" /pdb:"x64\Debug\apr_dbd_sqlite2-1.pdb" /implib:"x64\Debug\apr_dbd_sqlite2-1.lib" /MACHINE:X64
+# Begin Special Build Tool
+TargetPath=x64\Debug\apr_dbd_sqlite2-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "apr_dbd_sqlite2 - Win32 Release"
+# Name "apr_dbd_sqlite2 - Win32 Debug"
+# Name "apr_dbd_sqlite2 - x64 Release"
+# Name "apr_dbd_sqlite2 - x64 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\apr_dbd_sqlite2.c
+# End Source File
+# End Group
+# Begin Group "Public Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\apr_dbd.h
+# End Source File
+# End Group
+# Begin Group "Internal Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\private\apu_config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\private\apu_dbd_internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\private\apu_internal.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\libaprutil.rc
+# End Source File
+# End Target
+# End Project
diff --git a/srclib/apr-util/dbd/apr_dbd_sqlite3.c b/srclib/apr-util/dbd/apr_dbd_sqlite3.c
index 32073fcb..3467a616 100644
--- a/srclib/apr-util/dbd/apr_dbd_sqlite3.c
+++ b/srclib/apr-util/dbd/apr_dbd_sqlite3.c
@@ -25,6 +25,7 @@
 
 #include "apr_strings.h"
 #include "apr_time.h"
+#include "apr_buckets.h"
 
 #include "apr_dbd_internal.h"
 
@@ -32,6 +33,7 @@
 #define MAX_RETRY_SLEEP 100000
 
 struct apr_dbd_transaction_t {
+    int mode;
     int errnum;
     apr_dbd_t *handle;
 };
@@ -39,9 +41,6 @@ struct apr_dbd_transaction_t {
 struct apr_dbd_t {
     sqlite3 *conn;
     apr_dbd_transaction_t *trans;
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *mutex;
-#endif
     apr_pool_t *pool;
     apr_dbd_prepared_t *prep;
 };
@@ -69,21 +68,25 @@ struct apr_dbd_results_t {
     size_t sz;
     int tuples;
     char **col_names;
+    apr_pool_t *pool;
 };
 
 struct apr_dbd_prepared_t {
     sqlite3_stmt *stmt;
     apr_dbd_prepared_t *next;
+    int nargs;
+    int nvals;
+    apr_dbd_type_e *types;
 };
 
-#define dbd_sqlite3_is_success(x) (((x) == SQLITE_DONE ) \
-		|| ((x) == SQLITE_OK ))
+#define dbd_sqlite3_is_success(x) (((x) == SQLITE_DONE) || ((x) == SQLITE_OK))
 
-static int dbd_sqlite3_select(apr_pool_t * pool, apr_dbd_t * sql, apr_dbd_results_t ** results, const char *query, int seek)
+static int dbd_sqlite3_select_internal(apr_pool_t *pool,
+                                       apr_dbd_t *sql,
+                                       apr_dbd_results_t **results,
+                                       sqlite3_stmt *stmt, int seek)
 {
-    sqlite3_stmt *stmt = NULL;
-    const char *tail = NULL;
-    int i, ret, retry_count = 0;
+    int i, ret, retry_count = 0, column_count;
     size_t num_tuples = 0;
     int increment = 0;
     apr_dbd_row_t *row = NULL;
@@ -91,112 +94,126 @@ static int dbd_sqlite3_select(apr_pool_t * pool, apr_dbd_t * sql, apr_dbd_result
     apr_dbd_column_t *column;
     char *hold = NULL;
 
-    if (sql->trans && sql->trans->errnum) {
-        return sql->trans->errnum;
+    column_count = sqlite3_column_count(stmt);
+    if (!*results) {
+        *results = apr_pcalloc(pool, sizeof(apr_dbd_results_t));
     }
-
-#if APR_HAS_THREADS
-    apr_thread_mutex_lock(sql->mutex);
-#endif
-
-    ret = sqlite3_prepare(sql->conn, query, strlen(query), &stmt, &tail);
-    if (!dbd_sqlite3_is_success(ret)) {
-#if APR_HAS_THREADS
-        apr_thread_mutex_unlock(sql->mutex);
-#endif
-        return ret;
-    } else {
-        int column_count;
-        column_count = sqlite3_column_count(stmt);
-        if (!*results) {
-            *results = apr_pcalloc(pool, sizeof(apr_dbd_results_t));
-        }
-        (*results)->stmt = stmt;
-        (*results)->sz = column_count;
-        (*results)->random = seek;
-        (*results)->next_row = 0;
-        (*results)->tuples = 0;
-        (*results)->col_names = apr_pcalloc(pool,
-                                            column_count * sizeof(char *));
-        do {
-            ret = sqlite3_step(stmt);
-            if (ret == SQLITE_BUSY) {
-                if (retry_count++ > MAX_RETRY_COUNT) {
-                    ret = SQLITE_ERROR;
-                } else {
-#if APR_HAS_THREADS
-                    apr_thread_mutex_unlock(sql->mutex);
-#endif
-                    apr_sleep(MAX_RETRY_SLEEP);
-#if APR_HAS_THREADS
-                    apr_thread_mutex_lock(sql->mutex);
-#endif
+    (*results)->stmt = stmt;
+    (*results)->sz = column_count;
+    (*results)->random = seek;
+    (*results)->next_row = 0;
+    (*results)->tuples = 0;
+    (*results)->col_names = apr_pcalloc(pool, column_count * sizeof(char *));
+    (*results)->pool = pool;
+    do {
+        ret = sqlite3_step(stmt);
+        if (ret == SQLITE_BUSY) {
+            if (retry_count++ > MAX_RETRY_COUNT) {
+                ret = SQLITE_ERROR;
+            } else {
+                apr_dbd_mutex_unlock();
+                apr_sleep(MAX_RETRY_SLEEP);
+                apr_dbd_mutex_lock();
+            }
+        } else if (ret == SQLITE_ROW) {
+            int length;
+            apr_dbd_column_t *col;
+            row = apr_palloc(pool, sizeof(apr_dbd_row_t));
+            row->res = *results;
+            increment = sizeof(apr_dbd_column_t *);
+            length = increment * (*results)->sz;
+            row->columns = apr_palloc(pool, length);
+            row->columnCount = column_count;
+            for (i = 0; i < (*results)->sz; i++) {
+                column = apr_palloc(pool, sizeof(apr_dbd_column_t));
+                row->columns[i] = column;
+                /* copy column name once only */
+                if ((*results)->col_names[i] == NULL) {
+                    (*results)->col_names[i] =
+                        apr_pstrdup(pool, sqlite3_column_name(stmt, i));
                 }
-            } else if (ret == SQLITE_ROW) {
-                int length;
-                apr_dbd_column_t *col;
-                row = apr_palloc(pool, sizeof(apr_dbd_row_t));
-                row->res = *results;
-                increment = sizeof(apr_dbd_column_t *);
-                length = increment * (*results)->sz;
-                row->columns = apr_palloc(pool, length);
-                row->columnCount = column_count;
-                for (i = 0; i < (*results)->sz; i++) {
-                    column = apr_palloc(pool, sizeof(apr_dbd_column_t));
-                    row->columns[i] = column;
-                    /* copy column name once only */
-                    if ((*results)->col_names[i] == NULL) {
-                      (*results)->col_names[i] =
-                          apr_pstrdup(pool, sqlite3_column_name(stmt, i));
+                column->name = (*results)->col_names[i];
+                column->size = sqlite3_column_bytes(stmt, i);
+                column->type = sqlite3_column_type(stmt, i);
+                column->value = NULL;
+                switch (column->type) {
+                case SQLITE_FLOAT:
+                case SQLITE_INTEGER:
+                case SQLITE_TEXT:
+                    hold = (char *) sqlite3_column_text(stmt, i);
+                    if (hold) {
+                        column->value = apr_pstrmemdup(pool, hold,
+                                                       column->size);
                     }
-                    column->name = (*results)->col_names[i];
-                    column->size = sqlite3_column_bytes(stmt, i);
-                    column->type = sqlite3_column_type(stmt, i);
-                    column->value = NULL;
-                    switch (column->type) {
-                    case SQLITE_FLOAT:
-                    case SQLITE_INTEGER:
-                    case SQLITE_TEXT:
-                        hold = NULL;
-                        hold = (char *) sqlite3_column_text(stmt, i);
-                        if (hold) {
-                            column->value = apr_palloc(pool, column->size + 1);
-                            strncpy(column->value, hold, column->size + 1);
-                        }
-                        break;
-                    case SQLITE_BLOB:
-                        break;
-                    case SQLITE_NULL:
-                        break;
+                    break;
+                case SQLITE_BLOB:
+                    hold = (char *) sqlite3_column_blob(stmt, i);
+                    if (hold) {
+                        column->value = apr_pstrmemdup(pool, hold,
+                                                       column->size);
                     }
-                    col = row->columns[i];
+                    break;
+                case SQLITE_NULL:
+                    break;
                 }
-                row->rownum = num_tuples++;
-                row->next_row = 0;
-                (*results)->tuples = num_tuples;
-                if ((*results)->next_row == 0) {
-                    (*results)->next_row = row;
-                }
-                if (lastrow != 0) {
-                    lastrow->next_row = row;
-                }
-                lastrow = row;
-            } else if (ret == SQLITE_DONE) {
-                ret = SQLITE_OK;
+                col = row->columns[i];
+            }
+            row->rownum = num_tuples++;
+            row->next_row = 0;
+            (*results)->tuples = num_tuples;
+            if ((*results)->next_row == 0) {
+                (*results)->next_row = row;
+            }
+            if (lastrow != 0) {
+                lastrow->next_row = row;
             }
-        } while (ret == SQLITE_ROW || ret == SQLITE_BUSY);
+            lastrow = row;
+        }
+    } while (ret == SQLITE_ROW || ret == SQLITE_BUSY);
+
+    if (dbd_sqlite3_is_success(ret)) {
+        ret = 0;
     }
-    ret = sqlite3_finalize(stmt);
-#if APR_HAS_THREADS
-    apr_thread_mutex_unlock(sql->mutex);
-#endif
+    return ret;
+}
+
+static int dbd_sqlite3_select(apr_pool_t *pool, apr_dbd_t *sql,
+                              apr_dbd_results_t **results, const char *query,
+                              int seek)
+{
+    sqlite3_stmt *stmt = NULL;
+    const char *tail = NULL;
+    int ret;
 
-    if (sql->trans) {
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+
+    apr_dbd_mutex_lock();
+
+    ret = sqlite3_prepare(sql->conn, query, strlen(query), &stmt, &tail);
+    if (dbd_sqlite3_is_success(ret)) {
+        ret = dbd_sqlite3_select_internal(pool, sql, results, stmt, seek);
+    }
+    sqlite3_finalize(stmt);
+
+    apr_dbd_mutex_unlock();
+
+    if (TXN_NOTICE_ERRORS(sql->trans)) {
         sql->trans->errnum = ret;
     }
     return ret;
 }
 
+static const char *dbd_sqlite3_get_name(const apr_dbd_results_t *res, int n)
+{
+    if ((n < 0) || (n >= res->sz)) {
+        return NULL;
+    }
+
+    return res->col_names[n];
+}
+
 static int dbd_sqlite3_get_row(apr_pool_t *pool, apr_dbd_results_t *res,
                                apr_dbd_row_t **rowp, int rownum)
 {
@@ -236,11 +253,113 @@ static const char *dbd_sqlite3_get_entry(const apr_dbd_row_t *row, int n)
     return value;
 }
 
+static apr_status_t dbd_sqlite3_datum_get(const apr_dbd_row_t *row, int n,
+                                          apr_dbd_type_e type, void *data)
+{
+    if ((n < 0) || (n >= row->res->sz)) {
+      return APR_EGENERAL;
+    }
+
+    if (row->columns[n]->type == SQLITE_NULL) {
+        return APR_ENOENT;
+    }
+
+    switch (type) {
+    case APR_DBD_TYPE_TINY:
+        *(char*)data = atoi(row->columns[n]->value);
+        break;
+    case APR_DBD_TYPE_UTINY:
+        *(unsigned char*)data = atoi(row->columns[n]->value);
+        break;
+    case APR_DBD_TYPE_SHORT:
+        *(short*)data = atoi(row->columns[n]->value);
+        break;
+    case APR_DBD_TYPE_USHORT:
+        *(unsigned short*)data = atoi(row->columns[n]->value);
+        break;
+    case APR_DBD_TYPE_INT:
+        *(int*)data = atoi(row->columns[n]->value);
+        break;
+    case APR_DBD_TYPE_UINT:
+        *(unsigned int*)data = atoi(row->columns[n]->value);
+        break;
+    case APR_DBD_TYPE_LONG:
+        *(long*)data = atol(row->columns[n]->value);
+        break;
+    case APR_DBD_TYPE_ULONG:
+        *(unsigned long*)data = atol(row->columns[n]->value);
+        break;
+    case APR_DBD_TYPE_LONGLONG:
+        *(apr_int64_t*)data = apr_atoi64(row->columns[n]->value);
+        break;
+    case APR_DBD_TYPE_ULONGLONG:
+        *(apr_uint64_t*)data = apr_atoi64(row->columns[n]->value);
+        break;
+    case APR_DBD_TYPE_FLOAT:
+        *(float*)data = atof(row->columns[n]->value);
+        break;
+    case APR_DBD_TYPE_DOUBLE:
+        *(double*)data = atof(row->columns[n]->value);
+        break;
+    case APR_DBD_TYPE_STRING:
+    case APR_DBD_TYPE_TEXT:
+    case APR_DBD_TYPE_TIME:
+    case APR_DBD_TYPE_DATE:
+    case APR_DBD_TYPE_DATETIME:
+    case APR_DBD_TYPE_TIMESTAMP:
+    case APR_DBD_TYPE_ZTIMESTAMP:
+        *(char**)data = row->columns[n]->value;
+        break;
+    case APR_DBD_TYPE_BLOB:
+    case APR_DBD_TYPE_CLOB:
+        {
+        apr_bucket *e;
+        apr_bucket_brigade *b = (apr_bucket_brigade*)data;
+
+        e = apr_bucket_pool_create(row->columns[n]->value,
+                                   row->columns[n]->size,
+                                   row->res->pool, b->bucket_alloc);
+        APR_BRIGADE_INSERT_TAIL(b, e);
+        }
+        break;
+    case APR_DBD_TYPE_NULL:
+        *(void**)data = NULL;
+        break;
+    default:
+        return APR_EGENERAL;
+    }
+
+    return APR_SUCCESS;
+}
+
 static const char *dbd_sqlite3_error(apr_dbd_t *sql, int n)
 {
     return sqlite3_errmsg(sql->conn);
 }
 
+static int dbd_sqlite3_query_internal(apr_dbd_t *sql, sqlite3_stmt *stmt,
+                                      int *nrows)
+{
+    int ret = -1, retry_count = 0;
+
+    while(retry_count++ <= MAX_RETRY_COUNT) {
+        ret = sqlite3_step(stmt);
+        if (ret != SQLITE_BUSY)
+            break;
+
+        apr_dbd_mutex_unlock();
+        apr_sleep(MAX_RETRY_SLEEP);
+        apr_dbd_mutex_lock();
+    }
+
+    *nrows = sqlite3_changes(sql->conn);
+
+    if (dbd_sqlite3_is_success(ret)) {
+        ret = 0;
+    }
+    return ret;
+}
+
 static int dbd_sqlite3_query(apr_dbd_t *sql, int *nrows, const char *query)
 {
     sqlite3_stmt *stmt = NULL;
@@ -252,46 +371,25 @@ static int dbd_sqlite3_query(apr_dbd_t *sql, int *nrows, const char *query)
     }
 
     length = strlen(query);
-#if APR_HAS_THREADS
-    apr_thread_mutex_lock(sql->mutex);
-#endif
+    apr_dbd_mutex_lock();
 
     do {
-        int retry_count = 0;
-
         ret = sqlite3_prepare(sql->conn, query, length, &stmt, &tail);
         if (ret != SQLITE_OK) {
             sqlite3_finalize(stmt);
             break;
         }
 
-        while(retry_count++ <= MAX_RETRY_COUNT) {
-            ret = sqlite3_step(stmt);
-            if (ret != SQLITE_BUSY)
-                break;
-
-#if APR_HAS_THREADS
-            apr_thread_mutex_unlock(sql->mutex);
-#endif
-            apr_sleep(MAX_RETRY_SLEEP);
-#if APR_HAS_THREADS
-            apr_thread_mutex_lock(sql->mutex);
-#endif
-        }
+        ret = dbd_sqlite3_query_internal(sql, stmt, nrows);
 
-        *nrows = sqlite3_changes(sql->conn);
         sqlite3_finalize(stmt);
         length -= (tail - query);
         query = tail;
     } while (length > 0);
 
-    if (dbd_sqlite3_is_success(ret)) {
-        ret = 0;
-    }
-#if APR_HAS_THREADS
-    apr_thread_mutex_unlock(sql->mutex);
-#endif
-    if (sql->trans) {
+    apr_dbd_mutex_unlock();
+
+    if (TXN_NOTICE_ERRORS(sql->trans)) {
         sql->trans->errnum = ret;
     }
     return ret;
@@ -314,44 +412,25 @@ static const char *dbd_sqlite3_escape(apr_pool_t *pool, const char *arg,
 
 static int dbd_sqlite3_prepare(apr_pool_t *pool, apr_dbd_t *sql,
                                const char *query, const char *label,
+                               int nargs, int nvals, apr_dbd_type_e *types,
                                apr_dbd_prepared_t **statement)
 {
     sqlite3_stmt *stmt;
-    char *p, *slquery = apr_pstrdup(pool, query);
-    const char *tail = NULL, *q;
+    const char *tail = NULL;
     int ret;
 
-    for (p = slquery, q = query; *q; ++q) {
-        if (q[0] == '%') {
-            if (isalpha(q[1])) {
-                *p++ = '?';
-                ++q;
-            }
-            else if (q[1] == '%') {
-                /* reduce %% to % */
-                *p++ = *q++;
-            }
-            else {
-                *p++ = *q;
-            }
-        }
-        else {
-            *p++ = *q;
-        }
-    }
-    *p = 0;
-
-#if APR_HAS_THREADS
-    apr_thread_mutex_lock(sql->mutex);
-#endif
+    apr_dbd_mutex_lock();
 
-    ret = sqlite3_prepare(sql->conn, slquery, strlen(query), &stmt, &tail);
+    ret = sqlite3_prepare(sql->conn, query, strlen(query), &stmt, &tail);
     if (ret == SQLITE_OK) {
         apr_dbd_prepared_t *prep; 
 
         prep = apr_pcalloc(sql->pool, sizeof(*prep));
         prep->stmt = stmt;
         prep->next = sql->prep;
+        prep->nargs = nargs;
+        prep->nvals = nvals;
+        prep->types = types;
 
         /* link new statement to the handle */
         sql->prep = prep;
@@ -361,64 +440,72 @@ static int dbd_sqlite3_prepare(apr_pool_t *pool, apr_dbd_t *sql,
         sqlite3_finalize(stmt);
     }
    
-#if APR_HAS_THREADS
-    apr_thread_mutex_unlock(sql->mutex);
-#endif
+    apr_dbd_mutex_unlock();
 
     return ret;
 }
 
+static void dbd_sqlite3_bind(apr_dbd_prepared_t *statement, const char **values)
+{
+    sqlite3_stmt *stmt = statement->stmt;
+    int i, j;
+
+    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
+        if (values[j] == NULL) {
+            sqlite3_bind_null(stmt, i + 1);
+        }
+        else {
+            switch (statement->types[i]) {
+            case APR_DBD_TYPE_BLOB:
+            case APR_DBD_TYPE_CLOB:
+                {
+                char *data = (char *)values[j];
+                int size = atoi((char*)values[++j]);
+
+                /* skip table and column */
+                j += 2;
+
+                sqlite3_bind_blob(stmt, i + 1, data, size, SQLITE_STATIC);
+                }
+                break;
+            default:
+                sqlite3_bind_text(stmt, i + 1, values[j],
+                                  strlen(values[j]), SQLITE_STATIC);
+                break;
+            }
+        }
+    }
+
+    return;
+}
+
 static int dbd_sqlite3_pquery(apr_pool_t *pool, apr_dbd_t *sql,
                               int *nrows, apr_dbd_prepared_t *statement,
-                              int nargs, const char **values)
+                              const char **values)
 {
     sqlite3_stmt *stmt = statement->stmt;
-    int ret = -1, retry_count = 0, i;
+    int ret = -1;
 
     if (sql->trans && sql->trans->errnum) {
         return sql->trans->errnum;
     }
 
-#if APR_HAS_THREADS
-    apr_thread_mutex_lock(sql->mutex);
-#endif
+    apr_dbd_mutex_lock();
 
     ret = sqlite3_reset(stmt);
     if (ret == SQLITE_OK) {
-        for (i=0; i < nargs; i++) {
-            sqlite3_bind_text(stmt, i + 1, values[i], strlen(values[i]),
-                              SQLITE_STATIC);
-        }
-
-        while(retry_count++ <= MAX_RETRY_COUNT) {
-            ret = sqlite3_step(stmt);
-            if (ret != SQLITE_BUSY)
-                break;
-
-#if APR_HAS_THREADS
-            apr_thread_mutex_unlock(sql->mutex);
-#endif
-            apr_sleep(MAX_RETRY_SLEEP);
-#if APR_HAS_THREADS
-            apr_thread_mutex_lock(sql->mutex);
-#endif
-        }
+        dbd_sqlite3_bind(statement, values);
 
-        *nrows = sqlite3_changes(sql->conn);
+        ret = dbd_sqlite3_query_internal(sql, stmt, nrows);
 
         sqlite3_reset(stmt);
     }
 
-    if (dbd_sqlite3_is_success(ret)) {
-        ret = 0;
-    }
-#if APR_HAS_THREADS
-    apr_thread_mutex_unlock(sql->mutex);
-#endif
-    if (sql->trans) {
+    apr_dbd_mutex_unlock();
+
+    if (TXN_NOTICE_ERRORS(sql->trans)) {
         sql->trans->errnum = ret;
     }
-
     return ret;
 }
 
@@ -426,139 +513,47 @@ static int dbd_sqlite3_pvquery(apr_pool_t *pool, apr_dbd_t *sql, int *nrows,
                                apr_dbd_prepared_t *statement, va_list args)
 {
     const char **values;
-    int i, nargs;
+    int i;
 
     if (sql->trans && sql->trans->errnum) {
         return sql->trans->errnum;
     }
 
-    nargs = sqlite3_bind_parameter_count(statement->stmt);
-    values = apr_palloc(pool, sizeof(*values) * nargs);
+    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
 
-    for (i = 0; i < nargs; i++) {
-        values[i] = apr_pstrdup(pool, va_arg(args, const char*));
+    for (i = 0; i < statement->nvals; i++) {
+        values[i] = va_arg(args, const char*);
     }
 
-    return dbd_sqlite3_pquery(pool, sql, nrows, statement, nargs, values);
+    return dbd_sqlite3_pquery(pool, sql, nrows, statement, values);
 }
 
 static int dbd_sqlite3_pselect(apr_pool_t *pool, apr_dbd_t *sql,
                                apr_dbd_results_t **results,
                                apr_dbd_prepared_t *statement, int seek,
-                               int nargs, const char **values)
+                               const char **values)
 {
     sqlite3_stmt *stmt = statement->stmt;
-    int i, ret, retry_count = 0;
-    size_t num_tuples = 0;
-    int increment = 0;
-    apr_dbd_row_t *row = NULL;
-    apr_dbd_row_t *lastrow = NULL;
-    apr_dbd_column_t *column;
-    char *hold = NULL;
+    int ret;
 
     if (sql->trans && sql->trans->errnum) {
         return sql->trans->errnum;
     }
 
-#if APR_HAS_THREADS
-    apr_thread_mutex_lock(sql->mutex);
-#endif
+    apr_dbd_mutex_lock();
 
     ret = sqlite3_reset(stmt);
     if (ret == SQLITE_OK) {
-        int column_count;
+        dbd_sqlite3_bind(statement, values);
 
-        for (i=0; i < nargs; i++) {
-            sqlite3_bind_text(stmt, i + 1, values[i], strlen(values[i]),
-                              SQLITE_STATIC);
-        }
-
-        column_count = sqlite3_column_count(stmt);
-        if (!*results) {
-            *results = apr_pcalloc(pool, sizeof(apr_dbd_results_t));
-        }
-        (*results)->stmt = stmt;
-        (*results)->sz = column_count;
-        (*results)->random = seek;
-        (*results)->next_row = 0;
-        (*results)->tuples = 0;
-        (*results)->col_names = apr_pcalloc(pool,
-                                            column_count * sizeof(char *));
-        do {
-            ret = sqlite3_step(stmt);
-            if (ret == SQLITE_BUSY) {
-                if (retry_count++ > MAX_RETRY_COUNT) {
-                    ret = SQLITE_ERROR;
-                } else {
-#if APR_HAS_THREADS
-                    apr_thread_mutex_unlock(sql->mutex);
-#endif
-                    apr_sleep(MAX_RETRY_SLEEP);
-#if APR_HAS_THREADS
-                    apr_thread_mutex_lock(sql->mutex);
-#endif
-                }
-            } else if (ret == SQLITE_ROW) {
-                int length;
-                apr_dbd_column_t *col;
-                row = apr_palloc(pool, sizeof(apr_dbd_row_t));
-                row->res = *results;
-                increment = sizeof(apr_dbd_column_t *);
-                length = increment * (*results)->sz;
-                row->columns = apr_palloc(pool, length);
-                row->columnCount = column_count;
-                for (i = 0; i < (*results)->sz; i++) {
-                    column = apr_palloc(pool, sizeof(apr_dbd_column_t));
-                    row->columns[i] = column;
-                    /* copy column name once only */
-                    if ((*results)->col_names[i] == NULL) {
-                      (*results)->col_names[i] =
-                          apr_pstrdup(pool, sqlite3_column_name(stmt, i));
-                    }
-                    column->name = (*results)->col_names[i];
-                    column->size = sqlite3_column_bytes(stmt, i);
-                    column->type = sqlite3_column_type(stmt, i);
-                    column->value = NULL;
-                    switch (column->type) {
-                    case SQLITE_FLOAT:
-                    case SQLITE_INTEGER:
-                    case SQLITE_TEXT:
-                        hold = NULL;
-                        hold = (char *) sqlite3_column_text(stmt, i);
-                        if (hold) {
-                            column->value = apr_palloc(pool, column->size + 1);
-                            strncpy(column->value, hold, column->size + 1);
-                        }
-                        break;
-                    case SQLITE_BLOB:
-                        break;
-                    case SQLITE_NULL:
-                        break;
-                    }
-                    col = row->columns[i];
-                }
-                row->rownum = num_tuples++;
-                row->next_row = 0;
-                (*results)->tuples = num_tuples;
-                if ((*results)->next_row == 0) {
-                    (*results)->next_row = row;
-                }
-                if (lastrow != 0) {
-                    lastrow->next_row = row;
-                }
-                lastrow = row;
-            } else if (ret == SQLITE_DONE) {
-                ret = SQLITE_OK;
-            }
-        } while (ret == SQLITE_ROW || ret == SQLITE_BUSY);
+        ret = dbd_sqlite3_select_internal(pool, sql, results, stmt, seek);
 
         sqlite3_reset(stmt);
     }
-#if APR_HAS_THREADS
-    apr_thread_mutex_unlock(sql->mutex);
-#endif
 
-    if (sql->trans) {
+    apr_dbd_mutex_unlock();
+
+    if (TXN_NOTICE_ERRORS(sql->trans)) {
         sql->trans->errnum = ret;
     }
     return ret;
@@ -570,21 +565,200 @@ static int dbd_sqlite3_pvselect(apr_pool_t *pool, apr_dbd_t *sql,
                                 va_list args)
 {
     const char **values;
-    int i, nargs;
+    int i;
 
     if (sql->trans && sql->trans->errnum) {
         return sql->trans->errnum;
     }
 
-    nargs = sqlite3_bind_parameter_count(statement->stmt);
-    values = apr_palloc(pool, sizeof(*values) * nargs);
+    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
 
-    for (i = 0; i < nargs; i++) {
-        values[i] = apr_pstrdup(pool, va_arg(args, const char*));
+    for (i = 0; i < statement->nvals; i++) {
+        values[i] = va_arg(args, const char*);
     }
 
-    return dbd_sqlite3_pselect(pool, sql, results, statement,
-                               seek, nargs, values);
+    return dbd_sqlite3_pselect(pool, sql, results, statement, seek, values);
+}
+
+static void dbd_sqlite3_bbind(apr_dbd_prepared_t * statement,
+                              const void **values)
+{
+    sqlite3_stmt *stmt = statement->stmt;
+    int i, j;
+    apr_dbd_type_e type;
+
+    for (i = 0, j = 0; i < statement->nargs; i++, j++) {
+        type = (values[j] == NULL ? APR_DBD_TYPE_NULL : statement->types[i]);
+
+        switch (type) {
+        case APR_DBD_TYPE_TINY:
+            sqlite3_bind_int(stmt, i + 1, *(char*)values[j]);
+            break;
+        case APR_DBD_TYPE_UTINY:
+            sqlite3_bind_int(stmt, i + 1, *(unsigned char*)values[j]);
+            break;
+        case APR_DBD_TYPE_SHORT:
+            sqlite3_bind_int(stmt, i + 1, *(short*)values[j]);
+            break;
+        case APR_DBD_TYPE_USHORT:
+            sqlite3_bind_int(stmt, i + 1, *(unsigned short*)values[j]);
+            break;
+        case APR_DBD_TYPE_INT:
+            sqlite3_bind_int(stmt, i + 1, *(int*)values[j]);
+            break;
+        case APR_DBD_TYPE_UINT:
+            sqlite3_bind_int(stmt, i + 1, *(unsigned int*)values[j]);
+            break;
+        case APR_DBD_TYPE_LONG:
+            sqlite3_bind_int64(stmt, i + 1, *(long*)values[j]);
+            break;
+        case APR_DBD_TYPE_ULONG:
+            sqlite3_bind_int64(stmt, i + 1, *(unsigned long*)values[j]);
+            break;
+        case APR_DBD_TYPE_LONGLONG:
+            sqlite3_bind_int64(stmt, i + 1, *(apr_int64_t*)values[j]);
+            break;
+        case APR_DBD_TYPE_ULONGLONG:
+            sqlite3_bind_int64(stmt, i + 1, *(apr_uint64_t*)values[j]);
+            break;
+        case APR_DBD_TYPE_FLOAT:
+            sqlite3_bind_double(stmt, i + 1, *(float*)values[j]);
+            break;
+        case APR_DBD_TYPE_DOUBLE:
+            sqlite3_bind_double(stmt, i + 1, *(double*)values[j]);
+            break;
+        case APR_DBD_TYPE_STRING:
+        case APR_DBD_TYPE_TEXT:
+        case APR_DBD_TYPE_TIME:
+        case APR_DBD_TYPE_DATE:
+        case APR_DBD_TYPE_DATETIME:
+        case APR_DBD_TYPE_TIMESTAMP:
+        case APR_DBD_TYPE_ZTIMESTAMP:
+            sqlite3_bind_text(stmt, i + 1, values[j], strlen(values[j]),
+                              SQLITE_STATIC);
+            break;
+        case APR_DBD_TYPE_BLOB:
+        case APR_DBD_TYPE_CLOB:
+            {
+            char *data = (char*)values[j];
+            apr_size_t size = *(apr_size_t*)values[++j];
+
+            sqlite3_bind_blob(stmt, i + 1, data, size, SQLITE_STATIC);
+
+            /* skip table and column */
+            j += 2;
+            }
+            break;
+        case APR_DBD_TYPE_NULL:
+        default:
+            sqlite3_bind_null(stmt, i + 1);
+            break;
+        }
+    }
+
+    return;
+}
+
+static int dbd_sqlite3_pbquery(apr_pool_t * pool, apr_dbd_t * sql,
+                               int *nrows, apr_dbd_prepared_t * statement,
+                               const void **values)
+{
+    sqlite3_stmt *stmt = statement->stmt;
+    int ret = -1;
+
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+
+    apr_dbd_mutex_lock();
+
+    ret = sqlite3_reset(stmt);
+    if (ret == SQLITE_OK) {
+        dbd_sqlite3_bbind(statement, values);
+
+        ret = dbd_sqlite3_query_internal(sql, stmt, nrows);
+
+        sqlite3_reset(stmt);
+    }
+
+    apr_dbd_mutex_unlock();
+
+    if (TXN_NOTICE_ERRORS(sql->trans)) {
+        sql->trans->errnum = ret;
+    }
+    return ret;
+}
+
+static int dbd_sqlite3_pvbquery(apr_pool_t * pool, apr_dbd_t * sql,
+                                int *nrows, apr_dbd_prepared_t * statement,
+                                va_list args)
+{
+    const void **values;
+    int i;
+
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+
+    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
+
+    for (i = 0; i < statement->nvals; i++) {
+        values[i] = va_arg(args, const void*);
+    }
+
+    return dbd_sqlite3_pbquery(pool, sql, nrows, statement, values);
+}
+
+static int dbd_sqlite3_pbselect(apr_pool_t * pool, apr_dbd_t * sql,
+                                apr_dbd_results_t ** results,
+                                apr_dbd_prepared_t * statement,
+                                int seek, const void **values)
+{
+    sqlite3_stmt *stmt = statement->stmt;
+    int ret;
+
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+
+    apr_dbd_mutex_lock();
+
+    ret = sqlite3_reset(stmt);
+    if (ret == SQLITE_OK) {
+        dbd_sqlite3_bbind(statement, values);
+
+        ret = dbd_sqlite3_select_internal(pool, sql, results, stmt, seek);
+
+        sqlite3_reset(stmt);
+    }
+
+    apr_dbd_mutex_unlock();
+
+    if (TXN_NOTICE_ERRORS(sql->trans)) {
+        sql->trans->errnum = ret;
+    }
+    return ret;
+}
+
+static int dbd_sqlite3_pvbselect(apr_pool_t * pool, apr_dbd_t * sql,
+                                 apr_dbd_results_t ** results,
+                                 apr_dbd_prepared_t * statement, int seek,
+                                 va_list args)
+{
+    const void **values;
+    int i;
+
+    if (sql->trans && sql->trans->errnum) {
+        return sql->trans->errnum;
+    }
+
+    values = apr_palloc(pool, sizeof(*values) * statement->nvals);
+
+    for (i = 0; i < statement->nvals; i++) {
+        values[i] = va_arg(args, const void*);
+    }
+
+    return dbd_sqlite3_pbselect(pool, sql, results, statement, seek, values);
 }
 
 static int dbd_sqlite3_start_transaction(apr_pool_t *pool,
@@ -594,7 +768,7 @@ static int dbd_sqlite3_start_transaction(apr_pool_t *pool,
     int ret = 0;
     int nrows = 0;
 
-    ret = dbd_sqlite3_query(handle, &nrows, "BEGIN");
+    ret = dbd_sqlite3_query(handle, &nrows, "BEGIN IMMEDIATE");
     if (!*trans) {
         *trans = apr_pcalloc(pool, sizeof(apr_dbd_transaction_t));
         (*trans)->handle = handle;
@@ -610,7 +784,8 @@ static int dbd_sqlite3_end_transaction(apr_dbd_transaction_t *trans)
     int nrows = 0;
 
     if (trans) {
-        if (trans->errnum) {
+        /* rollback on error or explicit rollback request */
+        if (trans->errnum || TXN_DO_ROLLBACK(trans)) {
             trans->errnum = 0;
             ret = dbd_sqlite3_query(trans->handle, &nrows, "ROLLBACK");
         } else {
@@ -622,16 +797,36 @@ static int dbd_sqlite3_end_transaction(apr_dbd_transaction_t *trans)
     return ret;
 }
 
-static apr_dbd_t *dbd_sqlite3_open(apr_pool_t *pool, const char *params)
+static int dbd_sqlite3_transaction_mode_get(apr_dbd_transaction_t *trans)
+{
+    if (!trans)
+        return APR_DBD_TRANSACTION_COMMIT;
+
+    return trans->mode;
+}
+
+static int dbd_sqlite3_transaction_mode_set(apr_dbd_transaction_t *trans,
+                                            int mode)
+{
+    if (!trans)
+        return APR_DBD_TRANSACTION_COMMIT;
+
+    return trans->mode = (mode & TXN_MODE_BITS);
+}
+
+static apr_dbd_t *dbd_sqlite3_open(apr_pool_t *pool, const char *params,
+                                   const char **error)
 {
     apr_dbd_t *sql = NULL;
     sqlite3 *conn = NULL;
-    apr_status_t res;
     int sqlres;
     if (!params)
         return NULL;
     sqlres = sqlite3_open(params, &conn);
     if (sqlres != SQLITE_OK) {
+        if (error) {
+            *error = apr_pstrdup(pool, sqlite3_errmsg(conn));
+        }
         sqlite3_close(conn);
         return NULL;
     }
@@ -640,14 +835,6 @@ static apr_dbd_t *dbd_sqlite3_open(apr_pool_t *pool, const char *params)
     sql->conn = conn;
     sql->pool = pool;
     sql->trans = NULL;
-#if APR_HAS_THREADS
-    /* Create a mutex */
-    res = apr_thread_mutex_create(&sql->mutex, APR_THREAD_MUTEX_DEFAULT,
-                                  pool);
-    if (res != APR_SUCCESS) {
-        return NULL;
-    }
-#endif
 
     return sql;
 }
@@ -663,9 +850,6 @@ static apr_status_t dbd_sqlite3_close(apr_dbd_t *handle)
     }
 
     sqlite3_close(handle->conn);
-#if APR_HAS_THREADS
-    apr_thread_mutex_destroy(handle->mutex);
-#endif
     return APR_SUCCESS;
 }
 
@@ -696,7 +880,7 @@ static int dbd_sqlite3_num_tuples(apr_dbd_results_t *res)
     return res->tuples;
 }
 
-APU_DECLARE_DATA const apr_dbd_driver_t apr_dbd_sqlite3_driver = {
+APU_MODULE_DECLARE_DATA const apr_dbd_driver_t apr_dbd_sqlite3_driver = {
     "sqlite3",
     NULL,
     dbd_sqlite3_native,
@@ -719,5 +903,14 @@ APU_DECLARE_DATA const apr_dbd_driver_t apr_dbd_sqlite3_driver = {
     dbd_sqlite3_pvselect,
     dbd_sqlite3_pquery,
     dbd_sqlite3_pselect,
+    dbd_sqlite3_get_name,
+    dbd_sqlite3_transaction_mode_get,
+    dbd_sqlite3_transaction_mode_set,
+    "?",
+    dbd_sqlite3_pvbquery,
+    dbd_sqlite3_pvbselect,
+    dbd_sqlite3_pbquery,
+    dbd_sqlite3_pbselect,
+    dbd_sqlite3_datum_get
 };
 #endif
diff --git a/srclib/apr-util/dbd/apr_dbd_sqlite3.dsp b/srclib/apr-util/dbd/apr_dbd_sqlite3.dsp
new file mode 100644
index 00000000..d5b1be2c
--- /dev/null
+++ b/srclib/apr-util/dbd/apr_dbd_sqlite3.dsp
@@ -0,0 +1,207 @@
+# Microsoft Developer Studio Project File - Name="apr_dbd_sqlite3" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=apr_dbd_sqlite3 - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_sqlite3.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_dbd_sqlite3.mak" CFG="apr_dbd_sqlite3 - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_dbd_sqlite3 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_sqlite3 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_sqlite3 - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_dbd_sqlite3 - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"Release/apr_dbd_sqlite3-1.res" /d DLL_NAME="apr_dbd_sqlite3" /d "NDEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /debug /out:"Release\apr_dbd_sqlite3-1.dll" /pdb:"Release\apr_dbd_sqlite3-1.pdb" /implib:"Release\apr_dbd_sqlite3-1.lib" /MACHINE:X86 /opt:ref
+# Begin Special Build Tool
+TargetPath=Release\apr_dbd_sqlite3-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /EHsc /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"Debug/apr_dbd_sqlite3-1.res" /d DLL_NAME="apr_dbd_sqlite3" /d "_DEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\apr_dbd_sqlite3-1.dll" /pdb:"Debug\apr_dbd_sqlite3-1.pdb" /implib:"Debug\apr_dbd_sqlite3-1.lib" /MACHINE:X86
+# Begin Special Build Tool
+TargetPath=Debug\apr_dbd_sqlite3-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "x64\Release"
+# PROP BASE Intermediate_Dir "x64\Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "x64\Release"
+# PROP Intermediate_Dir "x64\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"x64/Release/apr_dbd_sqlite3-1.res" /d DLL_NAME="apr_dbd_sqlite3" /d "NDEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\apr_dbd_sqlite3-1.dll" /pdb:"x64\Release\apr_dbd_sqlite3-1.pdb" /implib:"x64\Release\apr_dbd_sqlite3-1.lib" /MACHINE:X64 /opt:ref
+# Begin Special Build Tool
+TargetPath=x64\Release\apr_dbd_sqlite3-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_dbd_sqlite3 - x64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "x64\Debug"
+# PROP BASE Intermediate_Dir "x64\Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "x64\Debug"
+# PROP Intermediate_Dir "x64\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DBD_DSO_BUILD" /D APU_HAVE_SQLITE3=1 /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_dbd_sqlite3_src" /FD /EHsc /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"x64/Debug/apr_dbd_sqlite3-1.res" /d DLL_NAME="apr_dbd_sqlite3" /d "_DEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib sqlite3.lib /nologo /base:"0x6EF20000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\apr_dbd_sqlite3-1.dll" /pdb:"x64\Debug\apr_dbd_sqlite3-1.pdb" /implib:"x64\Debug\apr_dbd_sqlite3-1.lib" /MACHINE:X64
+# Begin Special Build Tool
+TargetPath=x64\Debug\apr_dbd_sqlite3-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "apr_dbd_sqlite3 - Win32 Release"
+# Name "apr_dbd_sqlite3 - Win32 Debug"
+# Name "apr_dbd_sqlite3 - x64 Release"
+# Name "apr_dbd_sqlite3 - x64 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\apr_dbd_sqlite3.c
+# End Source File
+# End Group
+# Begin Group "Public Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\apr_dbd.h
+# End Source File
+# End Group
+# Begin Group "Internal Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\private\apu_config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\private\apu_dbd_internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\private\apu_internal.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\libaprutil.rc
+# End Source File
+# End Target
+# End Project
diff --git a/srclib/apr-util/dbm/apr_dbm_gdbm.c b/srclib/apr-util/dbm/apr_dbm_gdbm.c
index f0baee8d..e5462c47 100644
--- a/srclib/apr-util/dbm/apr_dbm_gdbm.c
+++ b/srclib/apr-util/dbm/apr_dbm_gdbm.c
@@ -14,50 +14,18 @@
  * limitations under the License.
  */
 
+#include "apu.h"
 #include "apr_strings.h"
 
 #if APR_HAVE_STDLIB_H
 #include <stdlib.h>     /* for free() */
 #endif
 
-#include "apu.h"
-
-#if APU_HAVE_GDBM 
+#if APU_HAVE_GDBM
 #include "apr_dbm_private.h"
 
 #include <gdbm.h>
 
-/* this is used in a few places to define a noop "function". it is needed
-   to stop "no effect" warnings from GCC. */
-#define NOOP_FUNCTION if (0) ; else
-
-/* ### define defaults for now; these will go away in a while */
-#define REGISTER_CLEANUP(dbm, pdatum) NOOP_FUNCTION
-#define SET_FILE(pdb, f) ((pdb)->file = (f))
-
-typedef GDBM_FILE real_file_t;
-
-typedef datum *cvt_datum_t;
-#define CONVERT_DATUM(cvt, pinput) ((cvt) = (datum *)(pinput))
-
-typedef datum result_datum_t;
-#define RETURN_DATUM(poutput, rd) ((poutput)->dptr = (rd).dptr, (poutput)->dsize = (apr_size_t) (rd).dsize)
-
-#define APR_DBM_CLOSE(f)        gdbm_close(f)
-#define APR_DBM_FETCH(f, k, v)  ((v) = gdbm_fetch(f, *(k)), APR_SUCCESS)
-#define APR_DBM_STORE(f, k, v)  g2s(gdbm_store(f, *(k), *(v), GDBM_REPLACE))
-#define APR_DBM_DELETE(f, k)    g2s(gdbm_delete(f, *(k)))
-#define APR_DBM_FIRSTKEY(f, k)  ((k) = gdbm_firstkey(f), APR_SUCCESS)
-#define APR_DBM_NEXTKEY(f, k, nk) ((nk) = gdbm_nextkey(f, *(k)), APR_SUCCESS)
-#define APR_DBM_FREEDPTR(dptr)  ((dptr) ? free(dptr) : 0)
-
-#undef REGISTER_CLEANUP
-#define REGISTER_CLEANUP(dbm, pdatum) \
-    if ((pdatum)->dptr) \
-        apr_pool_cleanup_register((dbm)->pool, (pdatum)->dptr, \
-                             datum_cleanup, apr_pool_cleanup_null); \
-    else
-
 #define APR_DBM_DBMODE_RO       GDBM_READER
 #define APR_DBM_DBMODE_RW       GDBM_WRITER
 #define APR_DBM_DBMODE_RWCREATE GDBM_WRCREAT
@@ -111,7 +79,7 @@ static apr_status_t vt_gdbm_open(apr_dbm_t **pdb, const char *pathname,
                                  apr_int32_t mode, apr_fileperms_t perm,
                                  apr_pool_t *pool)
 {
-    real_file_t file;
+    GDBM_FILE file;
     int dbmode;
 
     *pdb = NULL;
@@ -133,19 +101,18 @@ static apr_status_t vt_gdbm_open(apr_dbm_t **pdb, const char *pathname,
         return APR_EINVAL;
     }
 
-    {
-        /* Note: stupid cast to get rid of "const" on the pathname */
-        file = gdbm_open((char *) pathname, 0, dbmode,
-                         apr_posix_perms2mode(perm), NULL);
-        if (file == NULL)
-            return APR_EGENERAL;      /* ### need a better error */
-    }
+    /* Note: stupid cast to get rid of "const" on the pathname */
+    file = gdbm_open((char *) pathname, 0, dbmode, apr_posix_perms2mode(perm),
+                     NULL);
+
+    if (file == NULL)
+        return APR_EGENERAL;      /* ### need a better error */
 
     /* we have an open database... return it */
     *pdb = apr_pcalloc(pool, sizeof(**pdb));
     (*pdb)->pool = pool;
     (*pdb)->type = &apr_dbm_type_gdbm;
-    SET_FILE(*pdb, file);
+    (*pdb)->file = file;
 
     /* ### register a cleanup to close the DBM? */
 
@@ -154,86 +121,105 @@ static apr_status_t vt_gdbm_open(apr_dbm_t **pdb, const char *pathname,
 
 static void vt_gdbm_close(apr_dbm_t *dbm)
 {
-    APR_DBM_CLOSE(dbm->file);
+    gdbm_close(dbm->file);
 }
 
 static apr_status_t vt_gdbm_fetch(apr_dbm_t *dbm, apr_datum_t key,
-                                  apr_datum_t * pvalue)
+                                  apr_datum_t *pvalue)
 {
-    apr_status_t rv;
-    cvt_datum_t ckey;
-    result_datum_t rd;
+    datum kd, rd;
+
+    kd.dptr = key.dptr;
+    kd.dsize = key.dsize;
 
-    CONVERT_DATUM(ckey, &key);
-    rv = APR_DBM_FETCH(dbm->file, ckey, rd);
-    RETURN_DATUM(pvalue, rd);
+    rd = gdbm_fetch(dbm->file, kd);
 
-    REGISTER_CLEANUP(dbm, pvalue);
+    pvalue->dptr = rd.dptr;
+    pvalue->dsize = rd.dsize;
+
+    if (pvalue->dptr)
+        apr_pool_cleanup_register(dbm->pool, pvalue->dptr, datum_cleanup,
+                                  apr_pool_cleanup_null);
 
     /* store the error info into DBM, and return a status code. Also, note
        that *pvalue should have been cleared on error. */
-    return set_error(dbm, rv);
+    return set_error(dbm, APR_SUCCESS);
 }
 
 static apr_status_t vt_gdbm_store(apr_dbm_t *dbm, apr_datum_t key,
                                   apr_datum_t value)
 {
-    apr_status_t rv;
-    cvt_datum_t ckey;
-    cvt_datum_t cvalue;
+    int rc;
+    datum kd, vd;
+
+    kd.dptr = key.dptr;
+    kd.dsize = key.dsize;
 
-    CONVERT_DATUM(ckey, &key);
-    CONVERT_DATUM(cvalue, &value);
-    rv = APR_DBM_STORE(dbm->file, ckey, cvalue);
+    vd.dptr = value.dptr;
+    vd.dsize = value.dsize;
+
+    rc = gdbm_store(dbm->file, kd, vd, GDBM_REPLACE);
 
     /* store any error info into DBM, and return a status code. */
-    return set_error(dbm, rv);
+    return set_error(dbm, g2s(rc));
 }
 
 static apr_status_t vt_gdbm_del(apr_dbm_t *dbm, apr_datum_t key)
 {
-    apr_status_t rv;
-    cvt_datum_t ckey;
+    int rc;
+    datum kd;
+
+    kd.dptr = key.dptr;
+    kd.dsize = key.dsize;
 
-    CONVERT_DATUM(ckey, &key);
-    rv = APR_DBM_DELETE(dbm->file, ckey);
+    rc = gdbm_delete(dbm->file, kd);
 
     /* store any error info into DBM, and return a status code. */
-    return set_error(dbm, rv);
+    return set_error(dbm, g2s(rc));
 }
 
 static int vt_gdbm_exists(apr_dbm_t *dbm, apr_datum_t key)
 {
-    datum *ckey = (datum *)&key;
+    datum kd;
+
+    kd.dptr = key.dptr;
+    kd.dsize = key.dsize;
 
-    return gdbm_exists(dbm->file, *ckey) != 0;
+    return gdbm_exists(dbm->file, kd) != 0;
 }
 
-static apr_status_t vt_gdbm_firstkey(apr_dbm_t *dbm, apr_datum_t * pkey)
+static apr_status_t vt_gdbm_firstkey(apr_dbm_t *dbm, apr_datum_t *pkey)
 {
-    apr_status_t rv;
-    result_datum_t rd;
+    datum rd;
 
-    rv = APR_DBM_FIRSTKEY(dbm->file, rd);
-    RETURN_DATUM(pkey, rd);
+    rd = gdbm_firstkey(dbm->file);
 
-    REGISTER_CLEANUP(dbm, pkey);
+    pkey->dptr = rd.dptr;
+    pkey->dsize = rd.dsize;
+
+    if (pkey->dptr)
+        apr_pool_cleanup_register(dbm->pool, pkey->dptr, datum_cleanup,
+                                  apr_pool_cleanup_null);
 
     /* store any error info into DBM, and return a status code. */
-    return set_error(dbm, rv);
+    return set_error(dbm, APR_SUCCESS);
 }
 
-static apr_status_t vt_gdbm_nextkey(apr_dbm_t *dbm, apr_datum_t * pkey)
+static apr_status_t vt_gdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey)
 {
-    apr_status_t rv;
-    cvt_datum_t ckey;
-    result_datum_t rd;
+    datum kd, rd;
+
+    kd.dptr = pkey->dptr;
+    kd.dsize = pkey->dsize;
 
-    CONVERT_DATUM(ckey, pkey);
-    rv = APR_DBM_NEXTKEY(dbm->file, ckey, rd);
-    RETURN_DATUM(pkey, rd);
+    rd = gdbm_nextkey(dbm->file, kd);
 
-    REGISTER_CLEANUP(dbm, pkey);
+    pkey->dptr = rd.dptr;
+    pkey->dsize = rd.dsize;
+
+    if (pkey->dptr)
+        apr_pool_cleanup_register(dbm->pool, pkey->dptr, datum_cleanup,
+                                  apr_pool_cleanup_null);
 
     /* store any error info into DBM, and return a status code. */
     return set_error(dbm, APR_SUCCESS);
@@ -251,10 +237,8 @@ static void vt_gdbm_usednames(apr_pool_t *pool, const char *pathname,
     *used2 = NULL;
 }
 
-
 APU_DECLARE_DATA const apr_dbm_type_t apr_dbm_type_gdbm = {
     "gdbm",
-
     vt_gdbm_open,
     vt_gdbm_close,
     vt_gdbm_fetch,
diff --git a/srclib/apr-util/dbm/apr_dbm_ndbm.c b/srclib/apr-util/dbm/apr_dbm_ndbm.c
index c4bcfcf7..42ddbed3 100644
--- a/srclib/apr-util/dbm/apr_dbm_ndbm.c
+++ b/srclib/apr-util/dbm/apr_dbm_ndbm.c
@@ -22,7 +22,7 @@
 
 #include "apu.h"
 
-#if APU_HAVE_NDBM 
+#if APU_HAVE_NDBM
 #include "apr_dbm_private.h"
 
 #include <ndbm.h>
@@ -30,10 +30,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-/* this is used in a few places to define a noop "function". it is needed
-   to stop "no effect" warnings from GCC. */
-#define NOOP_FUNCTION if (0) ; else
-
 #define APR_DBM_DBMODE_RO       O_RDONLY
 #define APR_DBM_DBMODE_RW       O_RDWR
 #define APR_DBM_DBMODE_RWCREATE (O_RDWR|O_CREAT)
@@ -122,14 +118,17 @@ static void vt_ndbm_close(apr_dbm_t *dbm)
 }
 
 static apr_status_t vt_ndbm_fetch(apr_dbm_t *dbm, apr_datum_t key,
-                                  apr_datum_t * pvalue)
+                                  apr_datum_t *pvalue)
 {
-    datum *ckey;
-    datum rd;
+    datum kd, rd;
+
+    kd.dptr = key.dptr;
+    kd.dsize = key.dsize;
+
+    rd = dbm_fetch(dbm->file, kd);
 
-    ckey = (datum*)&key;
-    rd = dbm_fetch(dbm->file, *ckey);
-    *pvalue = *(apr_datum_t*)&rd;
+    pvalue->dptr = rd.dptr;
+    pvalue->dsize = rd.dsize;
 
     /* store the error info into DBM, and return a status code. Also, note
        that *pvalue should have been cleared on error. */
@@ -139,59 +138,71 @@ static apr_status_t vt_ndbm_fetch(apr_dbm_t *dbm, apr_datum_t key,
 static apr_status_t vt_ndbm_store(apr_dbm_t *dbm, apr_datum_t key,
                                   apr_datum_t value)
 {
-    apr_status_t rv;
-    datum *ckey;
-    datum *cvalue;
+    int rc;
+    datum kd, vd;
 
-    ckey =  (datum*)&key;
-    cvalue = (datum*)&value;
-    rv = ndbm2s( dbm_store( dbm->file, *ckey, *cvalue, DBM_REPLACE));
+    kd.dptr = key.dptr;
+    kd.dsize = key.dsize;
+
+    vd.dptr = value.dptr;
+    vd.dsize = value.dsize;
+
+    rc = dbm_store(dbm->file, kd, vd, DBM_REPLACE);
 
     /* store any error info into DBM, and return a status code. */
-    return set_error(dbm, rv);
+    return set_error(dbm, ndbm2s(rc));
 }
 
 static apr_status_t vt_ndbm_del(apr_dbm_t *dbm, apr_datum_t key)
 {
-    apr_status_t rv;
-    datum *ckey;
+    int rc;
+    datum kd;
 
-    ckey = (datum*)&key;
-    rv = ndbm2s( dbm_delete(dbm->file, *ckey));
+    kd.dptr = key.dptr;
+    kd.dsize = key.dsize;
+
+    rc = dbm_delete(dbm->file, kd);
 
     /* store any error info into DBM, and return a status code. */
-    return set_error(dbm, rv);
+    return set_error(dbm, ndbm2s(rc));
 }
 
 static int vt_ndbm_exists(apr_dbm_t *dbm, apr_datum_t key)
 {
-    datum *ckey = (datum *)&key;
-    datum value;
+    datum kd, rd;
+
+    kd.dptr = key.dptr;
+    kd.dsize = key.dsize;
 
-    value = dbm_fetch( dbm->file, *ckey);
+    rd = dbm_fetch(dbm->file, kd);
 
-    return value.dptr != NULL;
+    return rd.dptr != NULL;
 }
 
-static apr_status_t vt_ndbm_firstkey(apr_dbm_t *dbm, apr_datum_t * pkey)
+static apr_status_t vt_ndbm_firstkey(apr_dbm_t *dbm, apr_datum_t *pkey)
 {
     datum rd;
 
     rd = dbm_firstkey(dbm->file);
-    *pkey = *(apr_datum_t*)&rd;
+
+    pkey->dptr = rd.dptr;
+    pkey->dsize = rd.dsize;
 
     /* store any error info into DBM, and return a status code. */
     return set_error(dbm, APR_SUCCESS);
 }
 
-static apr_status_t vt_ndbm_nextkey(apr_dbm_t *dbm, apr_datum_t * pkey)
+static apr_status_t vt_ndbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey)
 {
-    datum *ckey;
-    datum rd;
+    datum kd, rd;
+
+    kd.dptr = pkey->dptr;
+    kd.dsize = pkey->dsize;
 
-    ckey = (datum*)pkey;
     rd = dbm_nextkey(dbm->file);
-    *pkey = *(apr_datum_t*)&rd;
+
+    pkey->dptr = rd.dptr;
+    pkey->dsize = rd.dsize;
 
     /* store any error info into DBM, and return a status code. */
     return set_error(dbm, APR_SUCCESS);
@@ -209,10 +220,8 @@ static void vt_ndbm_usednames(apr_pool_t *pool, const char *pathname,
     *used2 = NULL;
 }
 
-
 APU_DECLARE_DATA const apr_dbm_type_t apr_dbm_type_ndbm = {
     "ndbm",
-
     vt_ndbm_open,
     vt_ndbm_close,
     vt_ndbm_fetch,
@@ -224,4 +233,5 @@ APU_DECLARE_DATA const apr_dbm_type_t apr_dbm_type_ndbm = {
     vt_ndbm_freedatum,
     vt_ndbm_usednames
 };
+
 #endif /* APU_HAVE_NDBM  */
diff --git a/srclib/apr-util/dbm/apr_dbm_sdbm.c b/srclib/apr-util/dbm/apr_dbm_sdbm.c
index f99b3805..032c08cd 100644
--- a/srclib/apr-util/dbm/apr_dbm_sdbm.c
+++ b/srclib/apr-util/dbm/apr_dbm_sdbm.c
@@ -24,39 +24,9 @@
 #if APU_HAVE_SDBM
 
 #include "apr_dbm_private.h"
-
 #include "apr_sdbm.h"
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>  /* For abort() */
-#endif
-
-/* this is used in a few places to define a noop "function". it is needed
-   to stop "no effect" warnings from GCC. */
-#define NOOP_FUNCTION if (0) ; else
-
-/* ### define defaults for now; these will go away in a while */
-#define REGISTER_CLEANUP(dbm, pdatum) NOOP_FUNCTION
-#define SET_FILE(pdb, f) ((pdb)->file = (f))
-
-typedef apr_sdbm_t *real_file_t;
-
-typedef apr_sdbm_datum_t cvt_datum_t;
-#define CONVERT_DATUM(cvt, pinput) \
-        ((cvt).dptr = (pinput)->dptr, (cvt).dsize = (int)(pinput)->dsize)
 
-typedef apr_sdbm_datum_t result_datum_t;
-#define RETURN_DATUM(poutput, rd) \
-        ((poutput)->dptr = (rd).dptr, (poutput)->dsize = (rd).dsize)
-
-#define APR_DBM_CLOSE(f)        apr_sdbm_close(f)
-#define APR_DBM_FETCH(f, k, v)  apr_sdbm_fetch(f, &(v), (k))
-#define APR_DBM_STORE(f, k, v)  apr_sdbm_store(f, (k), (v), APR_SDBM_REPLACE)
-#define APR_DBM_DELETE(f, k)    apr_sdbm_delete(f, (k))
-#define APR_DBM_FIRSTKEY(f, k)  apr_sdbm_firstkey(f, &(k))
-#define APR_DBM_NEXTKEY(f, k, nk) apr_sdbm_nextkey(f, &(nk))
-#define APR_DBM_FREEDPTR(dptr)  NOOP_FUNCTION
-
-#define APR_DBM_DBMODE_RO       APR_READ
+#define APR_DBM_DBMODE_RO       (APR_READ | APR_BUFFERED)
 #define APR_DBM_DBMODE_RW       (APR_READ | APR_WRITE)
 #define APR_DBM_DBMODE_RWCREATE (APR_READ | APR_WRITE | APR_CREATE)
 #define APR_DBM_DBMODE_RWTRUNC  (APR_READ | APR_WRITE | APR_CREATE | \
@@ -64,19 +34,15 @@ typedef apr_sdbm_datum_t result_datum_t;
 
 static apr_status_t set_error(apr_dbm_t *dbm, apr_status_t dbm_said)
 {
-    apr_status_t rv = APR_SUCCESS;
-
-    /* ### ignore whatever the DBM said (dbm_said); ask it explicitly */
+    dbm->errcode = dbm_said;
 
-    if ((dbm->errcode = dbm_said) == APR_SUCCESS) {
+    if (dbm_said != APR_SUCCESS) {
+        dbm->errmsg = apr_psprintf(dbm->pool, "%pm", &dbm_said);
+    } else {
         dbm->errmsg = NULL;
     }
-    else {
-        dbm->errmsg = "I/O error occurred.";
-        rv = APR_EGENERAL;        /* ### need something better */
-    }
 
-    return rv;
+    return dbm_said;
 }
 
 /* --------------------------------------------------------------------------
@@ -88,7 +54,7 @@ static apr_status_t vt_sdbm_open(apr_dbm_t **pdb, const char *pathname,
                                  apr_int32_t mode, apr_fileperms_t perm,
                                  apr_pool_t *pool)
 {
-    real_file_t file;
+    apr_sdbm_t *file;
     int dbmode;
 
     *pdb = NULL;
@@ -122,7 +88,7 @@ static apr_status_t vt_sdbm_open(apr_dbm_t **pdb, const char *pathname,
     *pdb = apr_pcalloc(pool, sizeof(**pdb));
     (*pdb)->pool = pool;
     (*pdb)->type = &apr_dbm_type_sdbm;
-    SET_FILE(*pdb, file);
+    (*pdb)->file = file;
 
     /* ### register a cleanup to close the DBM? */
 
@@ -131,21 +97,22 @@ static apr_status_t vt_sdbm_open(apr_dbm_t **pdb, const char *pathname,
 
 static void vt_sdbm_close(apr_dbm_t *dbm)
 {
-    APR_DBM_CLOSE(dbm->file);
+    apr_sdbm_close(dbm->file);
 }
 
 static apr_status_t vt_sdbm_fetch(apr_dbm_t *dbm, apr_datum_t key,
-                                  apr_datum_t * pvalue)
+                                  apr_datum_t *pvalue)
 {
     apr_status_t rv;
-    cvt_datum_t ckey;
-    result_datum_t rd;
+    apr_sdbm_datum_t kd, rd;
+
+    kd.dptr = key.dptr;
+    kd.dsize = (int)key.dsize;
 
-    CONVERT_DATUM(ckey, &key);
-    rv = APR_DBM_FETCH(dbm->file, ckey, rd);
-    RETURN_DATUM(pvalue, rd);
+    rv = apr_sdbm_fetch(dbm->file, &rd, kd);
 
-    REGISTER_CLEANUP(dbm, pvalue);
+    pvalue->dptr = rd.dptr;
+    pvalue->dsize = rd.dsize;
 
     /* store the error info into DBM, and return a status code. Also, note
        that *pvalue should have been cleared on error. */
@@ -156,12 +123,15 @@ static apr_status_t vt_sdbm_store(apr_dbm_t *dbm, apr_datum_t key,
                                   apr_datum_t value)
 {
     apr_status_t rv;
-    cvt_datum_t ckey;
-    cvt_datum_t cvalue;
+    apr_sdbm_datum_t kd, vd;
 
-    CONVERT_DATUM(ckey, &key);
-    CONVERT_DATUM(cvalue, &value);
-    rv = APR_DBM_STORE(dbm->file, ckey, cvalue);
+    kd.dptr = key.dptr;
+    kd.dsize = (int)key.dsize;
+
+    vd.dptr = value.dptr;
+    vd.dsize = (int)value.dsize;
+
+    rv = apr_sdbm_store(dbm->file, kd, vd, APR_SDBM_REPLACE);
 
     /* store any error info into DBM, and return a status code. */
     return set_error(dbm, rv);
@@ -170,10 +140,12 @@ static apr_status_t vt_sdbm_store(apr_dbm_t *dbm, apr_datum_t key,
 static apr_status_t vt_sdbm_del(apr_dbm_t *dbm, apr_datum_t key)
 {
     apr_status_t rv;
-    cvt_datum_t ckey;
+    apr_sdbm_datum_t kd;
+
+    kd.dptr = key.dptr;
+    kd.dsize = (int)key.dsize;
 
-    CONVERT_DATUM(ckey, &key);
-    rv = APR_DBM_DELETE(dbm->file, ckey);
+    rv = apr_sdbm_delete(dbm->file, kd);
 
     /* store any error info into DBM, and return a status code. */
     return set_error(dbm, rv);
@@ -182,47 +154,42 @@ static apr_status_t vt_sdbm_del(apr_dbm_t *dbm, apr_datum_t key)
 static int vt_sdbm_exists(apr_dbm_t *dbm, apr_datum_t key)
 {
     int exists;
-    apr_sdbm_datum_t ckey;
+    apr_sdbm_datum_t vd, kd;
 
-    CONVERT_DATUM(ckey, &key);
+    kd.dptr = key.dptr;
+    kd.dsize = (int)key.dsize;
 
-    {
-        apr_sdbm_datum_t value;
-        if (apr_sdbm_fetch(dbm->file, &value, ckey) != APR_SUCCESS) {
-            exists = 0;
-        }
-        else
-            exists = value.dptr != NULL;
-    }
+    if (apr_sdbm_fetch(dbm->file, &vd, kd) != APR_SUCCESS)
+        exists = 0;
+    else
+        exists = vd.dptr != NULL;
 
     return exists;
 }
 
-static apr_status_t vt_sdbm_firstkey(apr_dbm_t *dbm, apr_datum_t * pkey)
+static apr_status_t vt_sdbm_firstkey(apr_dbm_t *dbm, apr_datum_t *pkey)
 {
     apr_status_t rv;
-    result_datum_t rd;
+    apr_sdbm_datum_t rd;
 
-    rv = APR_DBM_FIRSTKEY(dbm->file, rd);
-    RETURN_DATUM(pkey, rd);
+    rv = apr_sdbm_firstkey(dbm->file, &rd);
 
-    REGISTER_CLEANUP(dbm, pkey);
+    pkey->dptr = rd.dptr;
+    pkey->dsize = rd.dsize;
 
     /* store any error info into DBM, and return a status code. */
     return set_error(dbm, rv);
 }
 
-static apr_status_t vt_sdbm_nextkey(apr_dbm_t *dbm, apr_datum_t * pkey)
+static apr_status_t vt_sdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey)
 {
     apr_status_t rv;
-    cvt_datum_t ckey;
-    result_datum_t rd;
+    apr_sdbm_datum_t rd;
 
-    CONVERT_DATUM(ckey, pkey);
-    rv = APR_DBM_NEXTKEY(dbm->file, ckey, rd);
-    RETURN_DATUM(pkey, rd);
+    rv = apr_sdbm_nextkey(dbm->file, &rd);
 
-    REGISTER_CLEANUP(dbm, pkey);
+    pkey->dptr = rd.dptr;
+    pkey->dsize = rd.dsize;
 
     /* store any error info into DBM, and return a status code. */
     return set_error(dbm, APR_SUCCESS);
@@ -230,28 +197,17 @@ static apr_status_t vt_sdbm_nextkey(apr_dbm_t *dbm, apr_datum_t * pkey)
 
 static void vt_sdbm_freedatum(apr_dbm_t *dbm, apr_datum_t data)
 {
-    APR_DBM_FREEDPTR(data.dptr);
 }
 
 static void vt_sdbm_usednames(apr_pool_t *pool, const char *pathname,
                               const char **used1, const char **used2)
 {
-    char *work;
-
-    /* ### this could be optimized by computing strlen() once and using
-       ### memcpy and pmemdup instead. but why bother? */
-
     *used1 = apr_pstrcat(pool, pathname, APR_SDBM_DIRFEXT, NULL);
-    *used2 = work = apr_pstrdup(pool, *used1);
-
-    /* we know the extension is 4 characters */
-    memcpy(&work[strlen(work) - 4], APR_SDBM_PAGFEXT, 4);
+    *used2 = apr_pstrcat(pool, pathname, APR_SDBM_PAGFEXT, NULL);
 }
 
-
 APU_DECLARE_DATA const apr_dbm_type_t apr_dbm_type_sdbm = {
     "sdbm",
-
     vt_sdbm_open,
     vt_sdbm_close,
     vt_sdbm_fetch,
diff --git a/srclib/apr-util/dbm/sdbm/sdbm.c b/srclib/apr-util/dbm/sdbm/sdbm.c
index 787f235c..9dfcc4bc 100644
--- a/srclib/apr-util/dbm/sdbm/sdbm.c
+++ b/srclib/apr-util/dbm/sdbm/sdbm.c
@@ -50,14 +50,10 @@ static apr_status_t makroom(apr_sdbm_t *, long, int);
 #define bad(x)		((x).dptr == NULL || (x).dsize <= 0)
 #define exhash(item)	sdbm_hash((item).dptr, (item).dsize)
 
-/* ### Does anything need these externally? */
-#define sdbm_dirfno(db)	((db)->dirf)
-#define sdbm_pagfno(db)	((db)->pagf)
-
 #define OFF_PAG(off)	(apr_off_t) (off) * PBLKSIZ
 #define OFF_DIR(off)	(apr_off_t) (off) * DBLKSIZ
 
-static long masks[] = {
+static const long masks[] = {
         000000000000, 000000000001, 000000000003, 000000000007,
         000000000017, 000000000037, 000000000077, 000000000177,
         000000000377, 000000000777, 000000001777, 000000003777,
@@ -560,8 +556,8 @@ static apr_status_t getnext(apr_sdbm_datum_t *key, apr_sdbm_t *db)
         db->keyptr = 0;
         if (db->pagbno != db->blkptr++) {
             apr_off_t off = OFF_PAG(db->blkptr);
-            if ((status = apr_file_seek(db->pagf, APR_SET, &off) 
-                        != APR_SUCCESS))
+            if ((status = apr_file_seek(db->pagf, APR_SET, &off))
+                        != APR_SUCCESS)
                 return status;
         }
 
diff --git a/srclib/apr-util/dbm/sdbm/sdbm_lock.c b/srclib/apr-util/dbm/sdbm/sdbm_lock.c
index b2a30112..7d62ffd6 100644
--- a/srclib/apr-util/dbm/sdbm/sdbm_lock.c
+++ b/srclib/apr-util/dbm/sdbm/sdbm_lock.c
@@ -21,12 +21,13 @@
 #include "sdbm_private.h"
 #include "sdbm_tune.h"
 
-/* NOTE: this function blocks until it acquires the lock */
+/* NOTE: this function may block until it acquires the lock */
 APU_DECLARE(apr_status_t) apr_sdbm_lock(apr_sdbm_t *db, int type)
 {
     apr_status_t status;
+    int lock_type = type & APR_FLOCK_TYPEMASK;
 
-    if (!(type == APR_FLOCK_SHARED || type == APR_FLOCK_EXCLUSIVE))
+    if (!(lock_type == APR_FLOCK_SHARED || lock_type == APR_FLOCK_EXCLUSIVE))
         return APR_EINVAL;
 
     if (db->flags & SDBM_EXCLUSIVE_LOCK) {
diff --git a/srclib/apr-util/docs/doxygen.conf b/srclib/apr-util/docs/doxygen.conf
index dc49609d..e9ba149b 100644
--- a/srclib/apr-util/docs/doxygen.conf
+++ b/srclib/apr-util/docs/doxygen.conf
@@ -14,6 +14,8 @@ EXPAND_ONLY_PREDEF=YES
 PREDEFINED="APU_DECLARE(x)=x" \
            "APU_DECLARE_NONSTD(x)=x" \
            "APU_DECLARE_DATA" \
+           "APU_MODULE_DECLARE_DATA" \
+           "APU_DECLARE_LDAP(x)=x" \
            "APR_HAS_MMAP" \
            "APR_HAS_THREADS" \
            "APR_HAS_XLATE" \
diff --git a/srclib/apr-util/include/apr_buckets.h b/srclib/apr-util/include/apr_buckets.h
index 8983a372..6ee97f2c 100644
--- a/srclib/apr-util/include/apr_buckets.h
+++ b/srclib/apr-util/include/apr_buckets.h
@@ -679,13 +679,32 @@ APU_DECLARE(apr_status_t) apr_brigade_destroy(apr_bucket_brigade *b);
 APU_DECLARE(apr_status_t) apr_brigade_cleanup(void *data);
 
 /**
- * Split a bucket brigade into two, such that the given bucket is the
- * first in the new bucket brigade. This function is useful when a
- * filter wants to pass only the initial part of a brigade to the next
- * filter.
+ * Move the buckets from the tail end of the existing brigade @param b into
+ * the brigade @param a. If @param a is NULL a new brigade is created. Buckets
+ * from @param e to the last bucket (inclusively) of brigade @param b are moved
+ * from @param b to the returned brigade @param a.
  * @param b The brigade to split
- * @param e The first element of the new brigade
+ * @param e The first bucket to move
+ * @param a The brigade which should be used for the result or NULL if
+ *          a new brigade should be created.
+ * @return The brigade supplied in @param a or a new one if @param a was NULL.
+ * @warning Note that this function allocates a new brigade if @param a is
+ * NULL so memory consumption should be carefully considered.
+ */
+APU_DECLARE(apr_bucket_brigade *) apr_brigade_split_ex(apr_bucket_brigade *b,
+                                                       apr_bucket *e,
+                                                       apr_bucket_brigade *a);
+
+/**
+ * Create a new bucket brigade and move the buckets from the tail end
+ * of an existing brigade into the new brigade.  Buckets from 
+ * @param e to the last bucket (inclusively) of brigade @param b
+ * are moved from @param b to the returned brigade.
+ * @param b The brigade to split 
+ * @param e The first bucket to move
  * @return The new brigade
+ * @warning Note that this function always allocates a new brigade
+ * so memory consumption should be carefully considered.
  */
 APU_DECLARE(apr_bucket_brigade *) apr_brigade_split(apr_bucket_brigade *b,
                                                     apr_bucket *e);
@@ -710,8 +729,9 @@ APU_DECLARE(apr_status_t) apr_brigade_partition(apr_bucket_brigade *b,
  * Return the total length of the brigade.
  * @param bb The brigade to compute the length of
  * @param read_all Read unknown-length buckets to force a size
- * @param length Returns the length of the brigade, or -1 if the brigade has
- *               buckets of indeterminate length and read_all is 0.
+ * @param length Returns the length of the brigade (up to the end, or up
+ *               to a bucket read error), or -1 if the brigade has buckets
+ *               of indeterminate length and read_all is 0.
  */
 APU_DECLARE(apr_status_t) apr_brigade_length(apr_bucket_brigade *bb,
                                              int read_all,
@@ -968,7 +988,16 @@ APU_DECLARE_NONSTD(void) apr_bucket_free(void *block);
     } while (0)
 
 /**
- * read the data from the bucket
+ * Read the data from the bucket.
+ * 
+ * If it is not practical to return all
+ * the data in the bucket, the current bucket is split and replaced by
+ * two buckets, the first representing the data returned in this call,
+ * and the second representing the rest of the data as yet unread. The
+ * original bucket will become the first bucket after this call.
+ * 
+ * (It is assumed that the bucket is a member of a brigade when this
+ * function is called).
  * @param e The bucket to read from
  * @param str The location to store the data in
  * @param len The amount of data read
@@ -985,7 +1014,12 @@ APU_DECLARE_NONSTD(void) apr_bucket_free(void *block);
 #define apr_bucket_setaside(e,p) (e)->type->setaside(e,p)
 
 /**
- * Split one bucket in two.
+ * Split one bucket in two at the point provided.
+ * 
+ * Once split, the original bucket becomes the first of the two new buckets.
+ * 
+ * (It is assumed that the bucket is a member of a brigade when this
+ * function is called).
  * @param e The bucket to split
  * @param point The offset to split the bucket at
  */
@@ -1426,6 +1460,12 @@ APU_DECLARE(apr_bucket *) apr_bucket_pipe_make(apr_bucket *b,
  *          while reading from this file bucket
  * @param list The freelist from which this bucket should be allocated
  * @return The new bucket, or NULL if allocation failed
+ * @remark If the file is truncated such that the segment of the file
+ * referenced by the bucket no longer exists, an attempt to read
+ * from the bucket will fail with APR_EOF. 
+ * @remark apr_brigade_insert_file() should generally be used to
+ * insert files into brigades, since that function can correctly
+ * handle large file issues.
  */
 APU_DECLARE(apr_bucket *) apr_bucket_file_create(apr_file_t *fd,
                                                  apr_off_t offset,
diff --git a/srclib/apr-util/include/apr_dbd.h b/srclib/apr-util/include/apr_dbd.h
index 3fd19e1c..0e25d024 100644
--- a/srclib/apr-util/include/apr_dbd.h
+++ b/srclib/apr-util/include/apr_dbd.h
@@ -21,6 +21,9 @@
 #ifndef APR_DBD_H
 #define APR_DBD_H
 
+#include "apu.h"
+#include "apr_pools.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -35,6 +38,46 @@ extern "C" {
  * @{
  */
 
+/**
+ * Mapping of C to SQL types, used for prepared statements.
+ * @remarks
+ * For apr_dbd_p[v]query/select functions, in and out parameters are always
+ * const char * (i.e. regular nul terminated strings). LOB types are passed
+ * with four (4) arguments: payload, length, table and column, all as const
+ * char *, where table and column are reserved for future use by Oracle.
+ * @remarks
+ * For apr_dbd_p[v]bquery/select functions, in and out parameters are
+ * described next to each enumeration constant and are generally native binary
+ * types or some APR data type. LOB types are passed with four (4) arguments:
+ * payload (char*), length (apr_size_t*), table (char*) and column (char*).
+ * Table and column are reserved for future use by Oracle.
+ */
+typedef enum {
+    APR_DBD_TYPE_NONE,
+    APR_DBD_TYPE_TINY,       /**< \%hhd : in, out: char* */
+    APR_DBD_TYPE_UTINY,      /**< \%hhu : in, out: unsigned char* */
+    APR_DBD_TYPE_SHORT,      /**< \%hd  : in, out: short* */
+    APR_DBD_TYPE_USHORT,     /**< \%hu  : in, out: unsigned short* */
+    APR_DBD_TYPE_INT,        /**< \%d   : in, out: int* */
+    APR_DBD_TYPE_UINT,       /**< \%u   : in, out: unsigned int* */
+    APR_DBD_TYPE_LONG,       /**< \%ld  : in, out: long* */
+    APR_DBD_TYPE_ULONG,      /**< \%lu  : in, out: unsigned long* */
+    APR_DBD_TYPE_LONGLONG,   /**< \%lld : in, out: apr_int64_t* */
+    APR_DBD_TYPE_ULONGLONG,  /**< \%llu : in, out: apr_uint64_t* */
+    APR_DBD_TYPE_FLOAT,      /**< \%f   : in, out: float* */
+    APR_DBD_TYPE_DOUBLE,     /**< \%lf  : in, out: double* */
+    APR_DBD_TYPE_STRING,     /**< \%s   : in: char*, out: char** */
+    APR_DBD_TYPE_TEXT,       /**< \%pDt : in: char*, out: char** */
+    APR_DBD_TYPE_TIME,       /**< \%pDi : in: char*, out: char** */
+    APR_DBD_TYPE_DATE,       /**< \%pDd : in: char*, out: char** */
+    APR_DBD_TYPE_DATETIME,   /**< \%pDa : in: char*, out: char** */
+    APR_DBD_TYPE_TIMESTAMP,  /**< \%pDs : in: char*, out: char** */
+    APR_DBD_TYPE_ZTIMESTAMP, /**< \%pDz : in: char*, out: char** */
+    APR_DBD_TYPE_BLOB,       /**< \%pDb : in: char* apr_size_t* char* char*, out: apr_bucket_brigade* */
+    APR_DBD_TYPE_CLOB,       /**< \%pDc : in: char* apr_size_t* char* char*, out: apr_bucket_brigade* */
+    APR_DBD_TYPE_NULL        /**< \%pDn : in: void*, out: void** */
+} apr_dbd_type_e;
+
 /* These are opaque structs.  Instantiation is up to each backend */
 typedef struct apr_dbd_driver_t apr_dbd_driver_t;
 typedef struct apr_dbd_t apr_dbd_t;
@@ -62,12 +105,13 @@ APU_DECLARE(apr_status_t) apr_dbd_init(apr_pool_t *pool);
 APU_DECLARE(apr_status_t) apr_dbd_get_driver(apr_pool_t *pool, const char *name,
                                              const apr_dbd_driver_t **driver);
 
-/** apr_dbd_open: open a connection to a backend
+/** apr_dbd_open_ex: open a connection to a backend
  *
  *  @param pool - working pool
  *  @param params - arguments to driver (implementation-dependent)
  *  @param handle - pointer to handle to return
  *  @param driver - driver struct.
+ *  @param error - descriptive error.
  *  @return APR_SUCCESS for success
  *  @return APR_EGENERAL if driver exists but connection failed
  *  @remarks PostgreSQL: the params is passed directly to the PQconnectdb()
@@ -78,6 +122,9 @@ APU_DECLARE(apr_status_t) apr_dbd_get_driver(apr_pool_t *pool, const char *name,
  *  @remarks SQLite3: the params is passed directly to the sqlite3_open()
  *  function as a filename to be opened (check SQLite3 documentation for more
  *  details).
+ *  @remarks Oracle: the params can have "user", "pass", "dbname" and "server"
+ *  keys, each followed by an equal sign and a value. Such key/value pairs can
+ *  be delimited by space, CR, LF, tab, semicolon, vertical bar or comma.
  *  @remarks MySQL: the params can have "host", "port", "user", "pass",
  *  "dbname", "sock", "flags" "fldsz" and "group" keys, each followed by an
  *  equal sign and a value. Such key/value pairs can be delimited by space,
@@ -88,6 +135,24 @@ APU_DECLARE(apr_status_t) apr_dbd_get_driver(apr_pool_t *pool, const char *name,
  *  this value is 1 MB. The value associated with "group" determines which
  *  group from configuration file to use (see MYSQL_READ_DEFAULT_GROUP option
  *  of mysql_options() in MySQL manual).
+ *  @remarks FreeTDS: the params can have "username", "password", "appname",
+ *  "dbname", "host", "charset", "lang" and "server" keys, each followed by an
+ *  equal sign and a value.
+ */
+APU_DECLARE(apr_status_t) apr_dbd_open_ex(const apr_dbd_driver_t *driver,
+                                          apr_pool_t *pool, const char *params,
+                                          apr_dbd_t **handle,
+                                          const char **error);
+
+/** apr_dbd_open: open a connection to a backend
+ *
+ *  @param pool - working pool
+ *  @param params - arguments to driver (implementation-dependent)
+ *  @param handle - pointer to handle to return
+ *  @param driver - driver struct.
+ *  @return APR_SUCCESS for success
+ *  @return APR_EGENERAL if driver exists but connection failed
+ *  @see apr_dbd_open_ex
  */
 APU_DECLARE(apr_status_t) apr_dbd_open(const apr_dbd_driver_t *driver,
                                        apr_pool_t *pool, const char *params,
@@ -148,9 +213,12 @@ APU_DECLARE(int) apr_dbd_set_dbname(const apr_dbd_driver_t *driver, apr_pool_t *
  *  @param handle - the db connection
  *  @param trans - ptr to a transaction.  May be null on entry
  *  @return 0 for success or error code
- *  @remarks If any of the query/select calls during a transaction return
- *  non-zero status code, the transaction will inherit this code and any
- *  further query/select calls will fail immediately.
+ *  @remarks Note that transaction modes, set by calling
+ *  apr_dbd_transaction_mode_set(), will affect all query/select calls within
+ *  a transaction. By default, any error in query/select during a transaction
+ *  will cause the transaction to inherit the error code and any further
+ *  query/select calls will fail immediately. Put transaction in "ignore
+ *  errors" mode to avoid that. Use "rollback" mode to do explicit rollback.
  */
 APU_DECLARE(int) apr_dbd_transaction_start(const apr_dbd_driver_t *driver,
                                            apr_pool_t *pool,
@@ -170,6 +238,30 @@ APU_DECLARE(int) apr_dbd_transaction_end(const apr_dbd_driver_t *driver,
                                          apr_pool_t *pool,
                                          apr_dbd_transaction_t *trans);
 
+#define APR_DBD_TRANSACTION_COMMIT        0x00  /**< commit the transaction */
+#define APR_DBD_TRANSACTION_ROLLBACK      0x01  /**< rollback the transaction */
+#define APR_DBD_TRANSACTION_IGNORE_ERRORS 0x02  /**< ignore transaction errors */
+
+/** apr_dbd_transaction_mode_get: get the mode of transaction
+ *
+ *  @param driver - the driver
+ *  @param trans  - the transaction
+ *  @return mode of transaction
+ */
+APU_DECLARE(int) apr_dbd_transaction_mode_get(const apr_dbd_driver_t *driver,
+                                              apr_dbd_transaction_t *trans);
+
+/** apr_dbd_transaction_mode_set: set the mode of transaction
+ *
+ *  @param driver - the driver
+ *  @param trans  - the transaction
+ *  @param mode   - new mode of the transaction
+ *  @return the mode of transaction in force after the call
+ */
+APU_DECLARE(int) apr_dbd_transaction_mode_set(const apr_dbd_driver_t *driver,
+                                              apr_dbd_transaction_t *trans,
+                                              int mode);
+
 /** apr_dbd_query: execute an SQL query that doesn't return a result set
  *
  *  @param driver - the driver
@@ -222,8 +314,8 @@ APU_DECLARE(int) apr_dbd_num_tuples(const apr_dbd_driver_t *driver,
  *  @param pool - pool to allocate the row
  *  @param res - result set pointer
  *  @param row - pointer to row pointer.  May point to NULL on entry
- *  @param rownum - row number, or -1 for "next row".  Ignored if random
- *                  access is not supported.
+ *  @param rownum - row number (counting from 1), or -1 for "next row".
+ *                  Ignored if random access is not supported.
  *  @return 0 for success, -1 for rownum out of range or data finished
  */
 APU_DECLARE(int) apr_dbd_get_row(const apr_dbd_driver_t *driver, apr_pool_t *pool,
@@ -240,6 +332,17 @@ APU_DECLARE(int) apr_dbd_get_row(const apr_dbd_driver_t *driver, apr_pool_t *poo
 APU_DECLARE(const char*) apr_dbd_get_entry(const apr_dbd_driver_t *driver,
                                            apr_dbd_row_t *row, int col);
 
+/** apr_dbd_get_name: get an entry name from a result set
+ *
+ *  @param driver - the driver
+ *  @param res - result set pointer
+ *  @param col - entry number
+ *  @return name of the entry, or NULL if col is out of bounds.
+ */
+APU_DECLARE(const char*) apr_dbd_get_name(const apr_dbd_driver_t *driver,
+                                          apr_dbd_results_t *res, int col);
+
+
 /** apr_dbd_error: get current error message (if any)
  *
  *  @param driver - the driver
@@ -274,12 +377,22 @@ APU_DECLARE(const char*) apr_dbd_escape(const apr_dbd_driver_t *driver,
  *                 (eg within a Request in httpd)
  *  @param statement - statement to prepare.  May point to null on entry.
  *  @return 0 for success or error code
- *  @remarks To specify parameters of the prepared query, use %s in place of
- *  database specific parameter syntax (e.g. for PostgreSQL, this would be $1,
- *  $2, for SQLite3 this would be ? etc.). For instance: "SELECT name FROM
- *  customers WHERE name=%s" would be a query that this function understands.
- *  Some drivers may support different data types using printf-like format:
- *  for example %d (e.g. PostgreSQL) or %f for numeric data.
+ *  @remarks To specify parameters of the prepared query, use \%s, \%d etc.
+ *  (see below for full list) in place of database specific parameter syntax
+ *  (e.g.  for PostgreSQL, this would be $1, $2, for SQLite3 this would be ?
+ *  etc.).  For instance: "SELECT name FROM customers WHERE name=%s" would be
+ *  a query that this function understands.
+ *  @remarks Here is the full list of format specifiers that this function
+ *  understands and what they map to in SQL: \%hhd (TINY INT), \%hhu (UNSIGNED
+ *  TINY INT), \%hd (SHORT), \%hu (UNSIGNED SHORT), \%d (INT), \%u (UNSIGNED
+ *  INT), \%ld (LONG), \%lu (UNSIGNED LONG), \%lld (LONG LONG), \%llu
+ *  (UNSIGNED LONG LONG), \%f (FLOAT, REAL), \%lf (DOUBLE PRECISION), \%s
+ *  (VARCHAR), \%pDt (TEXT), \%pDi (TIME), \%pDd (DATE), \%pDa (DATETIME),
+ *  \%pDs (TIMESTAMP), \%pDz (TIMESTAMP WITH TIME ZONE), \%pDb (BLOB), \%pDc
+ *  (CLOB) and \%pDn (NULL). Not all databases have support for all these
+ *  types, so the underlying driver will attempt the "best match" where
+ *  possible. A \% followed by any letter not in the above list will be
+ *  interpreted as VARCHAR (i.e. \%s).
  */
 APU_DECLARE(int) apr_dbd_prepare(const apr_dbd_driver_t *driver, apr_pool_t *pool,
                                  apr_dbd_t *handle, const char *query,
@@ -294,7 +407,7 @@ APU_DECLARE(int) apr_dbd_prepare(const apr_dbd_driver_t *driver, apr_pool_t *poo
  *  @param handle - the connection
  *  @param nrows - number of rows affected.
  *  @param statement - the prepared statement to execute
- *  @param nargs - number of args to prepared statement
+ *  @param nargs - ignored (for backward compatibility only)
  *  @param args - args to prepared statement
  *  @return 0 for success or error code
  */
@@ -311,7 +424,7 @@ APU_DECLARE(int) apr_dbd_pquery(const apr_dbd_driver_t *driver, apr_pool_t *pool
  *  @param res - pointer to query results.  May point to NULL on entry
  *  @param statement - the prepared statement to execute
  *  @param random - Whether to support random-access to results
- *  @param nargs - number of args to prepared statement
+ *  @param nargs - ignored (for backward compatibility only)
  *  @param args - args to prepared statement
  *  @return 0 for success or error code
  */
@@ -330,9 +443,10 @@ APU_DECLARE(int) apr_dbd_pselect(const apr_dbd_driver_t *driver, apr_pool_t *poo
  *  @param ... - varargs list
  *  @return 0 for success or error code
  */
-APU_DECLARE(int) apr_dbd_pvquery(const apr_dbd_driver_t *driver, apr_pool_t *pool,
-                                 apr_dbd_t *handle, int *nrows,
-                                 apr_dbd_prepared_t *statement, ...);
+APU_DECLARE_NONSTD(int) apr_dbd_pvquery(const apr_dbd_driver_t *driver, 
+                                        apr_pool_t *pool,
+                                        apr_dbd_t *handle, int *nrows,
+                                        apr_dbd_prepared_t *statement, ...);
 
 /** apr_dbd_pvselect: select using a prepared statement + args
  *
@@ -345,10 +459,88 @@ APU_DECLARE(int) apr_dbd_pvquery(const apr_dbd_driver_t *driver, apr_pool_t *poo
  *  @param ... - varargs list
  *  @return 0 for success or error code
  */
-APU_DECLARE(int) apr_dbd_pvselect(const apr_dbd_driver_t *driver, apr_pool_t *pool,
+APU_DECLARE_NONSTD(int) apr_dbd_pvselect(const apr_dbd_driver_t *driver,
+                                         apr_pool_t *pool, apr_dbd_t *handle,
+                                         apr_dbd_results_t **res,
+                                         apr_dbd_prepared_t *statement,
+                                         int random, ...);
+
+/** apr_dbd_pbquery: query using a prepared statement + binary args
+ *
+ *  @param driver - the driver
+ *  @param pool - working pool
+ *  @param handle - the connection
+ *  @param nrows - number of rows affected.
+ *  @param statement - the prepared statement to execute
+ *  @param args - binary args to prepared statement
+ *  @return 0 for success or error code
+ */
+APU_DECLARE(int) apr_dbd_pbquery(const apr_dbd_driver_t *driver,
+                                 apr_pool_t *pool, apr_dbd_t *handle,
+                                 int *nrows, apr_dbd_prepared_t *statement,
+                                 const void **args);
+
+/** apr_dbd_pbselect: select using a prepared statement + binary args
+ *
+ *  @param driver - the driver
+ *  @param pool - working pool
+ *  @param handle - the connection
+ *  @param res - pointer to query results.  May point to NULL on entry
+ *  @param statement - the prepared statement to execute
+ *  @param random - Whether to support random-access to results
+ *  @param args - binary args to prepared statement
+ *  @return 0 for success or error code
+ */
+APU_DECLARE(int) apr_dbd_pbselect(const apr_dbd_driver_t *driver,
+                                  apr_pool_t *pool,
                                   apr_dbd_t *handle, apr_dbd_results_t **res,
                                   apr_dbd_prepared_t *statement, int random,
-                                  ...);
+                                  const void **args);
+
+/** apr_dbd_pvbquery: query using a prepared statement + binary args
+ *
+ *  @param driver - the driver
+ *  @param pool - working pool
+ *  @param handle - the connection
+ *  @param nrows - number of rows affected.
+ *  @param statement - the prepared statement to execute
+ *  @param ... - varargs list of binary args
+ *  @return 0 for success or error code
+ */
+APU_DECLARE_NONSTD(int) apr_dbd_pvbquery(const apr_dbd_driver_t *driver,
+                                         apr_pool_t *pool,
+                                         apr_dbd_t *handle, int *nrows,
+                                         apr_dbd_prepared_t *statement, ...);
+
+/** apr_dbd_pvbselect: select using a prepared statement + binary args
+ *
+ *  @param driver - the driver
+ *  @param pool - working pool
+ *  @param handle - the connection
+ *  @param res - pointer to query results.  May point to NULL on entry
+ *  @param statement - the prepared statement to execute
+ *  @param random - Whether to support random-access to results
+ *  @param ... - varargs list of binary args
+ *  @return 0 for success or error code
+ */
+APU_DECLARE_NONSTD(int) apr_dbd_pvbselect(const apr_dbd_driver_t *driver,
+                                          apr_pool_t *pool, apr_dbd_t *handle,
+                                          apr_dbd_results_t **res,
+                                          apr_dbd_prepared_t *statement,
+                                          int random, ...);
+
+/** apr_dbd_datum_get: get a binary entry from a row
+ *
+ *  @param driver - the driver
+ *  @param row - row pointer
+ *  @param col - entry number
+ *  @param type - type of data to get
+ *  @param data - pointer to data, allocated by the caller
+ *  @return APR_SUCCESS on success, APR_ENOENT if data is NULL or APR_EGENERAL
+ */
+APU_DECLARE(apr_status_t) apr_dbd_datum_get(const apr_dbd_driver_t *driver,
+                                            apr_dbd_row_t *row, int col,
+                                            apr_dbd_type_e type, void *data);
 
 /** @} */
 
diff --git a/srclib/apr-util/include/apr_ldap.h.in b/srclib/apr-util/include/apr_ldap.h.in
index d66f1fd6..c757e061 100644
--- a/srclib/apr-util/include/apr_ldap.h.in
+++ b/srclib/apr-util/include/apr_ldap.h.in
@@ -40,6 +40,7 @@
 #define APR_HAS_MOZILLA_LDAPSDK   @apu_has_ldap_mozilla@
 #define APR_HAS_OPENLDAP_LDAPSDK  @apu_has_ldap_openldap@
 #define APR_HAS_MICROSOFT_LDAPSDK @apu_has_ldap_microsoft@
+#define APR_HAS_TIVOLI_LDAPSDK    @apu_has_ldap_tivoli@
 #define APR_HAS_ZOS_LDAPSDK       @apu_has_ldap_zos@
 #define APR_HAS_OTHER_LDAPSDK     @apu_has_ldap_other@
 
@@ -57,7 +58,11 @@
  * apr_ldap_url_parse*() functions have been rewritten specifically for
  * APR, so the APR_HAS_LDAP_URL_PARSE macro is forced to zero.
  */
+#if APR_HAS_TIVOLI_LDAPSDK
+#define APR_HAS_LDAP_SSL 0
+#else
 #define APR_HAS_LDAP_SSL 1
+#endif
 #define APR_HAS_LDAP_URL_PARSE      0
 
 #if APR_HAS_OPENLDAP_LDAPSDK && !defined(LDAP_DEPRECATED) 
@@ -98,7 +103,7 @@
  * For ldap function calls that input a size limit on the number of returned elements
  * Some SDKs do not have the define for LDAP_DEFAULT_LIMIT (-1) or LDAP_NO_LIMIT (0)
  */
-#if APR_HAS_ZOS_LDAPSDK
+#if APR_HAS_ZOS_LDAPSDK || APR_HAS_MICROSOFT_LDAPSDK
 #define APR_LDAP_SIZELIMIT LDAP_NO_LIMIT
 #else
 #ifdef LDAP_DEFAULT_LIMIT
@@ -146,9 +151,42 @@ typedef struct apr_ldap_err_t {
 }
 #endif
 
+/* The MS SDK returns LDAP_UNAVAILABLE when the backend has closed the connection
+ * between LDAP calls. Protect with APR_HAS_MICROSOFT_LDAPSDK in case someone 
+ * manually chooses another SDK on Windows 
+ */
+#if APR_HAS_MICROSOFT_LDAPSDK
+#define APR_LDAP_IS_SERVER_DOWN(s)    ((s) == LDAP_SERVER_DOWN \
+                                    || (s) == LDAP_UNAVAILABLE)
+#else
+#define APR_LDAP_IS_SERVER_DOWN(s)    ((s) == LDAP_SERVER_DOWN)
+#endif
+
+/* These symbols are not actually exported in a DSO build, but mapped into
+ * a private exported function array for apr_ldap_stub to bind dynamically.
+ * Rename them appropriately to protect the global namespace.
+ */
+#ifdef APU_DSO_LDAP_BUILD
+
+#define apr_ldap_info apr__ldap_info
+#define apr_ldap_init apr__ldap_init
+#define apr_ldap_ssl_init apr__ldap_ssl_init
+#define apr_ldap_ssl_deinit apr__ldap_ssl_deinit
+#define apr_ldap_get_option apr__ldap_get_option
+#define apr_ldap_set_option apr__ldap_set_option
+#define apr_ldap_rebind_init apr__ldap_rebind_init
+#define apr_ldap_rebind_add apr__ldap_rebind_add
+#define apr_ldap_rebind_remove apr__ldap_rebind_remove
+
+#define APU_DECLARE_LDAP(type) type
+#else
+#define APU_DECLARE_LDAP(type) APU_DECLARE(type)
+#endif
+
 #include "apr_ldap_url.h"
 #include "apr_ldap_init.h"
 #include "apr_ldap_option.h"
+#include "apr_ldap_rebind.h"
 
 /** @} */
 #endif /* APR_HAS_LDAP */
diff --git a/srclib/apr-util/include/apr_ldap.hnw b/srclib/apr-util/include/apr_ldap.hnw
index 105dfff0..c93014ae 100644
--- a/srclib/apr-util/include/apr_ldap.hnw
+++ b/srclib/apr-util/include/apr_ldap.hnw
@@ -66,6 +66,7 @@
 
 #ifdef GENEXPORTS
 #define LDAP_VERSION_MAX 3
+#define LDAP_INSUFFICIENT_ACCESS
 #else
 #include <lber.h>
 #include <ldap.h>
@@ -123,9 +124,33 @@ typedef struct apr_ldap_err_t {
 }
 #endif
 
+#define APR_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN)
+
+/* These symbols are not actually exported in a DSO build, but mapped into
+ * a private exported function array for apr_ldap_stub to bind dynamically.
+ * Rename them appropriately to protect the global namespace.
+ */
+#ifdef APU_DSO_LDAP_BUILD
+
+#define apr_ldap_info apr__ldap_info
+#define apr_ldap_init apr__ldap_init
+#define apr_ldap_ssl_init apr__ldap_ssl_init
+#define apr_ldap_ssl_deinit apr__ldap_ssl_deinit
+#define apr_ldap_get_option apr__ldap_get_option
+#define apr_ldap_set_option apr__ldap_set_option
+#define apr_ldap_rebind_init apr__ldap_rebind_init
+#define apr_ldap_rebind_add apr__ldap_rebind_add
+#define apr_ldap_rebind_remove apr__ldap_rebind_remove
+
+#define APU_DECLARE_LDAP(type) type
+#else
+#define APU_DECLARE_LDAP(type) APU_DECLARE(type)
+#endif
+
 #include "apr_ldap_url.h"
 #include "apr_ldap_init.h"
 #include "apr_ldap_option.h"
+#include "apr_ldap_rebind.h"
 
 /** @} */
 #endif /* APR_HAS_LDAP */
diff --git a/srclib/apr-util/include/apr_ldap.hw b/srclib/apr-util/include/apr_ldap.hw
index 57b11639..a5893764 100644
--- a/srclib/apr-util/include/apr_ldap.hw
+++ b/srclib/apr-util/include/apr_ldap.hw
@@ -40,6 +40,8 @@
 #define APR_HAS_MOZILLA_LDAPSDK     0
 #define APR_HAS_OPENLDAP_LDAPSDK    0
 #define APR_HAS_MICROSOFT_LDAPSDK   1
+#define APR_HAS_TIVOLI_LDAPSDK      0
+#define APR_HAS_ZOS_LDAPSDK         0
 #define APR_HAS_OTHER_LDAPSDK       0
 
 
@@ -56,9 +58,19 @@
  * apr_ldap_url_parse*() functions have been rewritten specifically for
  * APR, so the APR_HAS_LDAP_URL_PARSE macro is forced to zero.
  */
+#if APR_HAS_TIVOLI_LDAPSDK
+#define APR_HAS_LDAP_SSL 0
+#else
 #define APR_HAS_LDAP_SSL 1
+#endif
 #define APR_HAS_LDAP_URL_PARSE 0
 
+#if APR_HAS_OPENLDAP_LDAPSDK && !defined(LDAP_DEPRECATED) 
+/* Ensure that the "deprecated" interfaces are still exposed
+ * with OpenLDAP >= 2.3; these were exposed by default in earlier
+ * releases. */
+#define LDAP_DEPRECATED 1
+#endif
 
 /*
  * Include the standard LDAP header files.
@@ -91,8 +103,25 @@
  * For ldap function calls that input a size limit on the number of returned elements
  * Some SDKs do not have the define for LDAP_DEFAULT_LIMIT (-1) or LDAP_NO_LIMIT (0)
  */
+#if APR_HAS_ZOS_LDAPSDK || APR_HAS_MICROSOFT_LDAPSDK 
 #define APR_LDAP_SIZELIMIT LDAP_NO_LIMIT
+#else
+#ifdef LDAP_DEFAULT_LIMIT
+#define APR_LDAP_SIZELIMIT LDAP_DEFAULT_LIMIT
+#else
+#define APR_LDAP_SIZELIMIT -1 /* equivalent to LDAP_DEFAULT_LIMIT */
+#endif
+#endif
 
+/*
+ * z/OS is missing some defines
+ */
+#ifndef LDAP_VERSION_MAX
+#define LDAP_VERSION_MAX  LDAP_VERSION
+#endif
+#if APR_HAS_ZOS_LDAPSDK
+#define LDAP_VENDOR_NAME "IBM z/OS"
+#endif
 
 /* Note: Macros defining const casting has been removed in APR v1.0,
  * pending real support for LDAP v2.0 toolkits.
@@ -122,9 +151,42 @@ typedef struct apr_ldap_err_t {
 }
 #endif
 
+/* The MS SDK returns LDAP_UNAVAILABLE when the backend has closed the connection
+ * between LDAP calls. Protect with APR_HAS_MICROSOFT_LDAPSDK in case someone 
+ * manually chooses another SDK on Windows 
+ */
+#if APR_HAS_MICROSOFT_LDAPSDK
+#define APR_LDAP_IS_SERVER_DOWN(s)    ((s) == LDAP_SERVER_DOWN \
+                                    || (s) == LDAP_UNAVAILABLE)
+#else
+#define APR_LDAP_IS_SERVER_DOWN(s)    ((s) == LDAP_SERVER_DOWN)
+#endif
+
+/* These symbols are not actually exported in a DSO build, but mapped into
+ * a private exported function array for apr_ldap_stub to bind dynamically.
+ * Rename them appropriately to protect the global namespace.
+ */
+#ifdef APU_DSO_LDAP_BUILD
+
+#define apr_ldap_info apr__ldap_info
+#define apr_ldap_init apr__ldap_init
+#define apr_ldap_ssl_init apr__ldap_ssl_init
+#define apr_ldap_ssl_deinit apr__ldap_ssl_deinit
+#define apr_ldap_get_option apr__ldap_get_option
+#define apr_ldap_set_option apr__ldap_set_option
+#define apr_ldap_rebind_init apr__ldap_rebind_init
+#define apr_ldap_rebind_add apr__ldap_rebind_add
+#define apr_ldap_rebind_remove apr__ldap_rebind_remove
+
+#define APU_DECLARE_LDAP(type) type
+#else
+#define APU_DECLARE_LDAP(type) APU_DECLARE(type)
+#endif
+
 #include "apr_ldap_url.h"
 #include "apr_ldap_init.h"
 #include "apr_ldap_option.h"
+#include "apr_ldap_rebind.h"
 
 /** @} */
 #endif /* APR_HAS_LDAP */
diff --git a/srclib/apr-util/include/apr_ldap_init.h b/srclib/apr-util/include/apr_ldap_init.h
index 2120262c..1736aacd 100644
--- a/srclib/apr-util/include/apr_ldap_init.h
+++ b/srclib/apr-util/include/apr_ldap_init.h
@@ -35,6 +35,35 @@
 extern "C" {
 #endif /* __cplusplus */
 
+
+/**
+ * Macro to detect security related return values.
+ */
+#if defined(LDAP_INSUFFICIENT_ACCESS)
+#define APU_LDAP_INSUFFICIENT_ACCESS LDAP_INSUFFICIENT_ACCESS
+#elif defined(LDAP_INSUFFICIENT_RIGHTS)
+#define APU_LDAP_INSUFFICIENT_ACCESS LDAP_INSUFFICIENT_RIGHTS
+#elif defined(APR_HAS_MICROSOFT_LDAPSDK)
+/* The macros above fail to contemplate that LDAP_RETCODE values
+ * may be represented by an enum.  autoconf tests would be much
+ * more robust.
+ */
+#define APU_LDAP_INSUFFICIENT_ACCESS LDAP_INSUFFICIENT_RIGHTS
+#else
+#error The security return codes must be added to support this LDAP toolkit.
+#endif
+
+#if defined(LDAP_SECURITY_ERROR)
+#define APU_LDAP_SECURITY_ERROR LDAP_SECURITY_ERROR
+#else
+#define APU_LDAP_SECURITY_ERROR(n)	\
+    (LDAP_INAPPROPRIATE_AUTH == n) ? 1 \
+    : (LDAP_INVALID_CREDENTIALS == n) ? 1 \
+    : (APU_LDAP_INSUFFICIENT_ACCESS == n) ? 1 \
+    : 0
+#endif
+
+
 /**
  * APR LDAP SSL Initialise function
  *
@@ -58,10 +87,10 @@ extern "C" {
  * apr_ldap_set_option() APR_LDAP_OPT_TLS_CERT option for details.
  * @param result_err The returned result
  */
-APU_DECLARE(int) apr_ldap_ssl_init(apr_pool_t *pool,
-                                   const char *cert_auth_file,
-                                   int cert_file_type,
-                                   apr_ldap_err_t **result_err);
+APU_DECLARE_LDAP(int) apr_ldap_ssl_init(apr_pool_t *pool,
+                                        const char *cert_auth_file,
+                                        int cert_file_type,
+                                        apr_ldap_err_t **result_err);
 
 /**
  * APR LDAP SSL De-Initialise function
@@ -72,7 +101,7 @@ APU_DECLARE(int) apr_ldap_ssl_init(apr_pool_t *pool,
  * @todo currently we do not check whether apr_ldap_ssl_init()
  * has been called first - we probably should.
  */
-APU_DECLARE(int) apr_ldap_ssl_deinit(void);
+APU_DECLARE_LDAP(int) apr_ldap_ssl_deinit(void);
 
 /**
  * APR LDAP initialise function
@@ -108,12 +137,12 @@ APU_DECLARE(int) apr_ldap_ssl_deinit(void);
  * @param secure The security mode to set
  * @param result_err The returned result
  */
-APU_DECLARE(int) apr_ldap_init(apr_pool_t *pool,
-                               LDAP **ldap,
-                               const char *hostname,
-                               int portno,
-                               int secure,
-                               apr_ldap_err_t **result_err);
+APU_DECLARE_LDAP(int) apr_ldap_init(apr_pool_t *pool,
+                                    LDAP **ldap,
+                                    const char *hostname,
+                                    int portno,
+                                    int secure,
+                                    apr_ldap_err_t **result_err);
 
 /**
  * APR LDAP info function
@@ -123,8 +152,8 @@ APU_DECLARE(int) apr_ldap_init(apr_pool_t *pool,
  * @param pool The pool to use
  * @param result_err The returned result
  */
-APU_DECLARE(int) apr_ldap_info(apr_pool_t *pool,
-                               apr_ldap_err_t **result_err);
+APU_DECLARE_LDAP(int) apr_ldap_info(apr_pool_t *pool,
+                                    apr_ldap_err_t **result_err);
 
 #ifdef __cplusplus
 }
diff --git a/srclib/apr-util/include/apr_ldap_option.h b/srclib/apr-util/include/apr_ldap_option.h
index 32041329..69f746c4 100644
--- a/srclib/apr-util/include/apr_ldap_option.h
+++ b/srclib/apr-util/include/apr_ldap_option.h
@@ -56,6 +56,16 @@ extern "C" {
  * all servers are considered trusted.
  */
 #define APR_LDAP_OPT_VERIFY_CERT 0x6ffd
+/**
+ * Set the LDAP library to indicate if referrals should be chased during
+ * LDAP searches.
+ */
+#define APR_LDAP_OPT_REFERRALS 0x6ffc
+/**
+ * Set the LDAP library to indicate a maximum number of referral hops to
+ * chase before giving up on the search.
+ */
+#define APR_LDAP_OPT_REFHOPLIMIT 0x6ffb
 
 /**
  * Structures for the apr_set_option() cases
@@ -137,6 +147,11 @@ extern "C" {
 #define APR_LDAP_CERT_TYPE_PFX      13
 /** PKCS#12 encoded private key */
 #define APR_LDAP_KEY_TYPE_PFX       14
+/** Openldap directory full of base64-encoded cert 
+ * authorities with hashes in corresponding .0 directory
+ */
+#define APR_LDAP_CA_TYPE_CACERTDIR_BASE64 15
+
 
 /**
  * Certificate structure.
@@ -200,11 +215,11 @@ struct apr_ldap_opt_tls_cert_t {
  * @param result_err The apr_ldap_err_t structure contained detailed results
  *        of the operation.
  */
-APU_DECLARE(int) apr_ldap_get_option(apr_pool_t *pool,
-                                     LDAP *ldap,
-                                     int option,
-                                     void *outvalue,
-                                     apr_ldap_err_t **result_err);
+APU_DECLARE_LDAP(int) apr_ldap_get_option(apr_pool_t *pool,
+                                          LDAP *ldap,
+                                          int option,
+                                          void *outvalue,
+                                          apr_ldap_err_t **result_err);
 
 /**
  * APR LDAP set option function
@@ -222,11 +237,11 @@ APU_DECLARE(int) apr_ldap_get_option(apr_pool_t *pool,
  * @param result_err The apr_ldap_err_t structure contained detailed results
  *        of the operation.
  */
-APU_DECLARE(int) apr_ldap_set_option(apr_pool_t *pool,
-                                     LDAP *ldap,
-                                     int option,
-                                     const void *invalue,
-                                     apr_ldap_err_t **result_err);
+APU_DECLARE_LDAP(int) apr_ldap_set_option(apr_pool_t *pool,
+                                          LDAP *ldap,
+                                          int option,
+                                          const void *invalue,
+                                          apr_ldap_err_t **result_err);
 
 #ifdef __cplusplus
 }
diff --git a/srclib/apr-util/include/apr_ldap_rebind.h b/srclib/apr-util/include/apr_ldap_rebind.h
new file mode 100644
index 00000000..e1ee8043
--- /dev/null
+++ b/srclib/apr-util/include/apr_ldap_rebind.h
@@ -0,0 +1,87 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * The APR LDAP rebind functions provide an implementation of
+ * a rebind procedure that can be used to allow clients to chase referrals,
+ * using the same credentials used to log in originally.
+ *
+ * Use of this implementation is optional.
+ *
+ * @file apu_ldap_rebind.h
+ * @brief Apache LDAP library
+ */
+
+#ifndef APU_LDAP_REBIND_H
+#define APU_LDAP_REBIND_H
+
+/*
+ * Handle the case when LDAP is enabled
+ */
+#if APR_HAS_LDAP
+
+/**
+ * APR LDAP initialize rebind lock
+ *
+ * This function creates the lock for controlling access to the xref list..
+ * @param pool Pool to use when creating the xref_lock.
+ */
+APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_init(apr_pool_t *pool);
+
+
+/**
+ * APR LDAP rebind_add function
+ *
+ * This function creates a cross reference entry for the specified ldap
+ * connection. The rebind callback function will look up this ldap 
+ * connection so it can retrieve the bindDN and bindPW for use in any 
+ * binds while referrals are being chased.
+ *
+ * This function will add the callback to the LDAP handle passed in.
+ *
+ * A cleanup is registered within the pool provided to remove this
+ * entry when the pool is removed. Alternatively apr_ldap_rebind_remove()
+ * can be called to explicitly remove the entry at will.
+ *
+ * @param pool The pool to use
+ * @param ld The LDAP connectionhandle
+ * @param bindDN The bind DN to be used for any binds while chasing 
+ *               referrals on this ldap connection.
+ * @param bindPW The bind Password to be used for any binds while 
+ *               chasing referrals on this ldap connection.
+ */
+APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_add(apr_pool_t *pool,
+                                                   LDAP *ld,
+                                                   const char *bindDN,
+                                                   const char *bindPW);
+
+/**
+ * APR LDAP rebind_remove function
+ *
+ * This function removes the rebind cross reference entry for the
+ * specified ldap connection.
+ *
+ * If not explicitly removed, this function will be called automatically
+ * when the pool is cleaned up.
+ *
+ * @param ld The LDAP connectionhandle
+ */
+APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_remove(LDAP *ld);
+
+#endif /* APR_HAS_LDAP */
+
+#endif /* APU_LDAP_REBIND_H */
+
diff --git a/srclib/apr-util/include/apr_memcache.h b/srclib/apr-util/include/apr_memcache.h
new file mode 100644
index 00000000..499d2800
--- /dev/null
+++ b/srclib/apr-util/include/apr_memcache.h
@@ -0,0 +1,446 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef APR_MEMCACHE_H
+#define APR_MEMCACHE_H
+
+/**
+ * @file apr_memcache.h
+ * @brief Client interface for memcached
+ * @remark To use this interface you must have a separate memcached
+ * server running. See the memcached website at http://www.danga.com/memcached/
+ * for more information.
+ */
+
+#include "apr.h"
+#include "apr_pools.h"
+#include "apr_time.h"
+#include "apr_strings.h"
+#include "apr_network_io.h"
+#include "apr_ring.h"
+#include "apr_buckets.h"
+#include "apr_reslist.h"
+#include "apr_hash.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * @defgroup APR_Util_MC Memcached Client Routines
+ * @ingroup APR_Util
+ * @{
+ */
+
+/** Specifies the status of a memcached server */
+typedef enum
+{
+    APR_MC_SERVER_LIVE, /**< Server is alive and responding to requests */
+    APR_MC_SERVER_DEAD  /**< Server is not responding to requests */
+} apr_memcache_server_status_t;
+
+/** Opaque memcache client connection object */
+typedef struct apr_memcache_conn_t apr_memcache_conn_t;
+
+/** Memcache Server Info Object */
+typedef struct apr_memcache_server_t apr_memcache_server_t;
+struct apr_memcache_server_t
+{
+    const char *host; /**< Hostname of this Server */
+    apr_port_t port; /**< Port of this Server */
+    apr_memcache_server_status_t status; /**< @see apr_memcache_server_status_t */
+#if APR_HAS_THREADS || defined(DOXYGEN)
+    apr_reslist_t *conns; /**< Resource list of actual client connections */
+#else
+    apr_memcache_conn_t *conn;
+#endif
+    apr_pool_t *p; /** Pool to use for private allocations */
+#if APR_HAS_THREADS
+    apr_thread_mutex_t *lock;
+#endif
+    apr_time_t btime;
+};
+
+/* Custom hash callback function prototype, user for server selection.
+* @param baton user selected baton
+* @param data data to hash
+* @param data_len length of data
+*/
+typedef apr_uint32_t (*apr_memcache_hash_func)(void *baton,
+                                               const char *data,
+                                               const apr_size_t data_len);
+
+typedef struct apr_memcache_t apr_memcache_t;
+
+/* Custom Server Select callback function prototype.
+* @param baton user selected baton
+* @param mc memcache instance, use mc->live_servers to select a node
+* @param hash hash of the selected key.
+*/
+typedef apr_memcache_server_t* (*apr_memcache_server_func)(void *baton,
+                                                 apr_memcache_t *mc,
+                                                 const apr_uint32_t hash);
+
+/** Container for a set of memcached servers */
+struct apr_memcache_t
+{
+    apr_uint32_t flags; /**< Flags, Not currently used */
+    apr_uint16_t nalloc; /**< Number of Servers Allocated */
+    apr_uint16_t ntotal; /**< Number of Servers Added */
+    apr_memcache_server_t **live_servers; /**< Array of Servers */
+    apr_pool_t *p; /** Pool to use for allocations */
+    void *hash_baton;
+    apr_memcache_hash_func hash_func;
+    void *server_baton;
+    apr_memcache_server_func server_func;
+};
+
+/** Returned Data from a multiple get */
+typedef struct
+{
+    apr_status_t status;
+    const char* key;
+    apr_size_t len;
+    char *data;
+    apr_uint16_t flags;
+} apr_memcache_value_t;
+
+/**
+ * Creates a crc32 hash used to split keys between servers
+ * @param data Data to be hashed
+ * @param data_len Length of the data to use
+ * @return crc32 hash of data
+ * @remark The crc32 hash is not compatible with old memcached clients.
+ */
+APU_DECLARE(apr_uint32_t) apr_memcache_hash(apr_memcache_t *mc,
+                                            const char *data,
+                                            const apr_size_t data_len);
+
+/**
+ * Pure CRC32 Hash. Used by some clients.
+ */
+APU_DECLARE(apr_uint32_t) apr_memcache_hash_crc32(void *baton,
+                                                  const char *data,
+                                                  const apr_size_t data_len);
+
+/**
+ * hash compatible with the standard Perl Client.
+ */
+APU_DECLARE(apr_uint32_t) apr_memcache_hash_default(void *baton,
+                                                    const char *data,
+                                                    const apr_size_t data_len);
+
+/**
+ * Picks a server based on a hash
+ * @param mc The memcache client object to use
+ * @param hash Hashed value of a Key
+ * @return server that controls specified hash
+ * @see apr_memcache_hash
+ */
+APU_DECLARE(apr_memcache_server_t *) apr_memcache_find_server_hash(apr_memcache_t *mc, 
+                                                                   const apr_uint32_t hash);
+
+/**
+ * server selection compatible with the standard Perl Client.
+ */
+APU_DECLARE(apr_memcache_server_t *)
+apr_memcache_find_server_hash_default(void *baton,
+                                      apr_memcache_t *mc, 
+                                      const apr_uint32_t hash);
+
+/**
+ * Adds a server to a client object
+ * @param mc The memcache client object to use
+ * @param ms Server to add
+ * @remark Adding servers is not thread safe, and should be done once at startup.
+ * @warning Changing servers after startup may cause keys to go to
+ * different servers.
+ */
+APU_DECLARE(apr_status_t) apr_memcache_add_server(apr_memcache_t *mc,
+                                                  apr_memcache_server_t *server);
+
+
+/**
+ * Finds a Server object based on a hostname/port pair
+ * @param mc The memcache client object to use
+ * @param host Hostname of the server
+ * @param port Port of the server
+ * @return Server with matching Hostname and Port, or NULL if none was found.
+ */
+APU_DECLARE(apr_memcache_server_t *) apr_memcache_find_server(apr_memcache_t *mc,
+                                                              const char *host,
+                                                              apr_port_t port);
+
+/**
+ * Enables a Server for use again
+ * @param mc The memcache client object to use
+ * @param ms Server to Activate
+ */
+APU_DECLARE(apr_status_t) apr_memcache_enable_server(apr_memcache_t *mc,
+                                                     apr_memcache_server_t *ms);
+
+
+/**
+ * Disable a Server
+ * @param mc The memcache client object to use
+ * @param ms Server to Disable
+ */
+APU_DECLARE(apr_status_t) apr_memcache_disable_server(apr_memcache_t *mc,
+                                                      apr_memcache_server_t *ms);
+
+/**
+ * Creates a new Server Object
+ * @param p Pool to use
+ * @param host hostname of the server
+ * @param port port of the server
+ * @param min  minimum number of client sockets to open
+ * @param smax soft maximum number of client connections to open
+ * @param max  hard maximum number of client connections
+ * @param ttl  time to live in seconds of a client connection
+ * @param ns   location of the new server object
+ * @see apr_reslist_create
+ * @remark min, smax, and max are only used when APR_HAS_THREADS
+ */
+APU_DECLARE(apr_status_t) apr_memcache_server_create(apr_pool_t *p,
+                                                     const char *host,
+                                                     apr_port_t port,
+                                                     apr_uint32_t min,
+                                                     apr_uint32_t smax,
+                                                     apr_uint32_t max,
+                                                     apr_uint32_t ttl,
+                                                     apr_memcache_server_t **ns);
+/**
+ * Creates a new memcached client object
+ * @param p Pool to use
+ * @param max_servers maximum number of servers
+ * @param flags Not currently used
+ * @param mc   location of the new memcache client object
+ */
+APU_DECLARE(apr_status_t) apr_memcache_create(apr_pool_t *p,
+                                              apr_uint16_t max_servers,
+                                              apr_uint32_t flags,
+                                              apr_memcache_t **mc);
+
+/**
+ * Gets a value from the server, allocating the value out of p
+ * @param mc client to use
+ * @param p Pool to use
+ * @param key null terminated string containing the key
+ * @param baton location of the allocated value
+ * @param len   length of data at baton
+ * @param flags any flags set by the client for this key
+ * @return 
+ */
+APU_DECLARE(apr_status_t) apr_memcache_getp(apr_memcache_t *mc, 
+                                            apr_pool_t *p,
+                                            const char* key,
+                                            char **baton,
+                                            apr_size_t *len,
+                                            apr_uint16_t *flags);
+
+
+/**
+ * Add a key to a hash for a multiget query
+ *  if the hash (*value) is NULL it will be created
+ * @param data_pool pool from where the hash and their items are created from
+ * @param key null terminated string containing the key
+ * @param values hash of keys and values that this key will be added to
+ * @return
+ */
+APU_DECLARE(void) 
+apr_memcache_add_multget_key(apr_pool_t *data_pool,
+                             const char* key,
+                             apr_hash_t **values);
+
+/**
+ * Gets multiple values from the server, allocating the values out of p
+ * @param mc client to use
+ * @param temp_pool Pool used for tempoary allocations. May be cleared inside this
+ *        call.
+ * @param data_pool Pool used to allocate data for the returned values.
+ * @param values hash of apr_memcache_value_t keyed by strings, contains the
+ *        result of the multiget call.
+ * @return
+ */
+APU_DECLARE(apr_status_t)
+apr_memcache_multgetp(apr_memcache_t *mc,
+                      apr_pool_t *temp_pool,
+                      apr_pool_t *data_pool,
+                      apr_hash_t *values);
+
+/**
+ * Sets a value by key on the server
+ * @param mc client to use
+ * @param key   null terminated string containing the key
+ * @param baton data to store on the server
+ * @param len   length of data at baton
+ * @param timeout time in seconds for the data to live on the server
+ * @param flags any flags set by the client for this key
+ */
+APU_DECLARE(apr_status_t) apr_memcache_set(apr_memcache_t *mc,
+                                           const char *key,
+                                           char *baton,
+                                           const apr_size_t data_size,
+                                           apr_uint32_t timeout,
+                                           apr_uint16_t flags);
+
+/**
+ * Adds value by key on the server
+ * @param mc client to use
+ * @param key   null terminated string containing the key
+ * @param baton data to store on the server
+ * @param len   length of data at baton
+ * @param timeout time for the data to live on the server
+ * @param flags any flags set by the client for this key
+ * @return APR_SUCCESS if the key was added, APR_EEXIST if the key 
+ * already exists on the server.
+ */
+APU_DECLARE(apr_status_t) apr_memcache_add(apr_memcache_t *mc,
+                                           const char *key,
+                                           char *baton,
+                                           const apr_size_t data_size,
+                                           apr_uint32_t timeout,
+                                           apr_uint16_t flags);
+
+/**
+ * Replaces value by key on the server
+ * @param mc client to use
+ * @param key   null terminated string containing the key
+ * @param baton data to store on the server
+ * @param len   length of data at baton
+ * @param timeout time for the data to live on the server
+ * @param flags any flags set by the client for this key
+ * @return APR_SUCCESS if the key was added, APR_EEXIST if the key 
+ * did not exist on the server.
+ */
+APU_DECLARE(apr_status_t) apr_memcache_replace(apr_memcache_t *mc,
+                                               const char *key,
+                                               char *data,
+                                               const apr_size_t data_size,
+                                               apr_uint32_t timeout,
+                                               apr_uint16_t flags);
+/**
+ * Deletes a key from a server
+ * @param mc client to use
+ * @param key   null terminated string containing the key
+ * @param timeout time for the delete to stop other clients from adding
+ */
+APU_DECLARE(apr_status_t) apr_memcache_delete(apr_memcache_t *mc,
+                                              const char *key,
+                                              apr_uint32_t timeout);
+
+/**
+ * Increments a value
+ * @param mc client to use
+ * @param key   null terminated string containing the key
+ * @param n     number to increment by
+ * @param nv    new value after incrmenting
+ */
+APU_DECLARE(apr_status_t) apr_memcache_incr(apr_memcache_t *mc, 
+                                            const char *key,
+                                            apr_int32_t n,
+                                            apr_uint32_t *nv);
+
+/**
+ * Decrements a value
+ * @param mc client to use
+ * @param key   null terminated string containing the key
+ * @param n     number to decrement by
+ * @param nv    new value after decrementing
+ */
+APU_DECLARE(apr_status_t) apr_memcache_decr(apr_memcache_t *mc, 
+                                            const char *key,
+                                            apr_int32_t n,
+                                            apr_uint32_t *new_value);
+
+/**
+ * Query a server's version
+ * @param ms    server to query
+ * @param p     Pool to allocate answer from
+ * @param baton location to store server version string
+ * @param len   length of the server version string
+ */
+APU_DECLARE(apr_status_t) apr_memcache_version(apr_memcache_server_t *ms,
+                                               apr_pool_t *p,
+                                               char **baton);
+
+typedef struct
+{
+    /** Version string of this server */
+    const char *version;
+    /** Process id of this server process */
+    apr_uint32_t pid;
+    /** Number of seconds this server has been running */
+    apr_uint32_t uptime;
+    /** current UNIX time according to the server */
+    apr_time_t time;
+    /** The size of a pointer on the current machine */
+    apr_uint32_t pointer_size;
+    /** Accumulated user time for this process */
+    apr_time_t rusage_user;
+    /** Accumulated system time for this process */
+    apr_time_t rusage_system;
+    /** Current number of items stored by the server */
+    apr_uint32_t curr_items;
+    /** Total number of items stored by this server */
+    apr_uint32_t total_items;
+    /** Current number of bytes used by this server to store items */
+    apr_uint64_t bytes;
+    /** Number of open connections */
+    apr_uint32_t curr_connections;
+    /** Total number of connections opened since the server started running */
+    apr_uint32_t total_connections;
+    /** Number of connection structures allocated by the server */
+    apr_uint32_t connection_structures;
+    /** Cumulative number of retrieval requests */
+    apr_uint32_t cmd_get;
+    /** Cumulative number of storage requests */
+    apr_uint32_t cmd_set;
+    /** Number of keys that have been requested and found present */
+    apr_uint32_t get_hits;
+    /** Number of items that have been requested and not found */
+    apr_uint32_t get_misses;
+    /** Number of items removed from cache because they passed their
+        expiration time */
+    apr_uint64_t evictions;
+    /** Total number of bytes read by this server */
+    apr_uint64_t bytes_read;
+    /** Total number of bytes sent by this server */
+    apr_uint64_t bytes_written;
+    /** Number of bytes this server is allowed to use for storage. */
+    apr_uint32_t limit_maxbytes;
+    /** Number of threads the server is running (if built with threading) */
+    apr_uint32_t threads; 
+} apr_memcache_stats_t;
+
+/**
+ * Query a server for statistics
+ * @param ms    server to query
+ * @param p     Pool to allocate answer from
+ * @param stats location of the new statistics structure
+ */
+APU_DECLARE(apr_status_t) apr_memcache_stats(apr_memcache_server_t *ms, 
+                                             apr_pool_t *p,
+                                             apr_memcache_stats_t **stats);
+
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APR_MEMCACHE_H */
diff --git a/srclib/apr-util/include/apr_reslist.h b/srclib/apr-util/include/apr_reslist.h
index e7025939..39e8398b 100644
--- a/srclib/apr-util/include/apr_reslist.h
+++ b/srclib/apr-util/include/apr_reslist.h
@@ -125,6 +125,12 @@ APU_DECLARE(void) apr_reslist_timeout_set(apr_reslist_t *reslist,
                                           apr_interval_time_t timeout);
 
 /**
+ * Return the number of outstanding resources.
+ * @param reslist The resource list.
+ */
+APU_DECLARE(apr_uint32_t) apr_reslist_acquired_count(apr_reslist_t *reslist);
+
+/**
  * Invalidate a resource in the pool - e.g. a database connection
  * that returns a "lost connection" error and can't be restored.
  * Use this instead of apr_reslist_release if the resource is bad.
diff --git a/srclib/apr-util/include/apr_sdbm.h b/srclib/apr-util/include/apr_sdbm.h
index d5a5cbf1..5759508b 100644
--- a/srclib/apr-util/include/apr_sdbm.h
+++ b/srclib/apr-util/include/apr_sdbm.h
@@ -50,6 +50,7 @@ typedef struct {
     /** pointer to the data stored/retrieved */
     char *dptr;
     /** size of data */
+    /* apr_ssize_t for release 2.0??? */
     int dsize;
 } apr_sdbm_datum_t;
 
diff --git a/srclib/apr-util/include/apr_thread_pool.h b/srclib/apr-util/include/apr_thread_pool.h
new file mode 100644
index 00000000..cbf382b3
--- /dev/null
+++ b/srclib/apr-util/include/apr_thread_pool.h
@@ -0,0 +1,299 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership.  The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License.  You may obtain a copy of
+ * the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#ifndef APU_THREAD_POOL_H
+#define APU_THREAD_POOL_H
+
+#include "apu.h"
+#include "apr_thread_proc.h"
+
+/**
+ * @file apr_thread_pool.h
+ * @brief APR Thread Pool Library
+
+ * @remarks This library implements a thread pool using apr_thread_t. A thread
+ * pool is a set of threads that can be created in advance or on demand until a
+ * maximum number. When a task is scheduled, the thread pool will find an idle
+ * thread to handle the task. In case all existing threads are busy and the
+ * number of tasks in the queue is higher than the adjustable threshold, the
+ * pool will try to create a new thread to serve the task if the maximum number
+ * has not been reached. Otherwise, the task will be put into a queue based on
+ * priority, which can be valued from 0 to 255, with higher values being served
+ * first. If there are tasks with the same priority, the new task might be put at
+ * the top or at the bottom - it depends on which function is used to put the task.
+ *
+ * @remarks There may be the case where the thread pool can use up to the maximum
+ * number of threads at peak load, but having those threads idle afterwards. A
+ * maximum number of idle threads can be set so that the extra idling threads will
+ * be terminated to save system resources.
+ */
+#if APR_HAS_THREADS
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * @defgroup APR_Util_TP Thread Pool routines
+ * @ingroup APR_Util
+ * @{
+ */
+
+/** Opaque Thread Pool structure. */
+typedef struct apr_thread_pool apr_thread_pool_t;
+
+#define APR_THREAD_TASK_PRIORITY_LOWEST 0
+#define APR_THREAD_TASK_PRIORITY_LOW 63
+#define APR_THREAD_TASK_PRIORITY_NORMAL 127
+#define APR_THREAD_TASK_PRIORITY_HIGH 191
+#define APR_THREAD_TASK_PRIORITY_HIGHEST 255
+
+/**
+ * Create a thread pool
+ * @param me The pointer in which to return the newly created apr_thread_pool
+ * object, or NULL if thread pool creation fails.
+ * @param init_threads The number of threads to be created initially, this number
+ * will also be used as the initial value for the maximum number of idle threads.
+ * @param max_threads The maximum number of threads that can be created
+ * @param pool The pool to use
+ * @return APR_SUCCESS if the thread pool was created successfully. Otherwise,
+ * the error code.
+ */
+APU_DECLARE(apr_status_t) apr_thread_pool_create(apr_thread_pool_t **me,
+                                                 apr_size_t init_threads,
+                                                 apr_size_t max_threads,
+                                                 apr_pool_t *pool);
+
+/**
+ * Destroy the thread pool and stop all the threads
+ * @return APR_SUCCESS if all threads are stopped.
+ */
+APU_DECLARE(apr_status_t) apr_thread_pool_destroy(apr_thread_pool_t *me);
+
+/**
+ * Schedule a task to the bottom of the tasks of same priority.
+ * @param me The thread pool
+ * @param func The task function
+ * @param param The parameter for the task function
+ * @param priority The priority of the task.
+ * @param owner Owner of this task.
+ * @return APR_SUCCESS if the task had been scheduled successfully
+ */
+APU_DECLARE(apr_status_t) apr_thread_pool_push(apr_thread_pool_t *me,
+                                               apr_thread_start_t func,
+                                               void *param,
+                                               apr_byte_t priority,
+                                               void *owner);
+/**
+ * Schedule a task to be run after a delay
+ * @param me The thread pool
+ * @param func The task function
+ * @param param The parameter for the task function
+ * @param time Time in microseconds
+ * @param owner Owner of this task.
+ * @return APR_SUCCESS if the task had been scheduled successfully
+ */
+APU_DECLARE(apr_status_t) apr_thread_pool_schedule(apr_thread_pool_t *me,
+                                                   apr_thread_start_t func,
+                                                   void *param,
+                                                   apr_interval_time_t time,
+                                                   void *owner);
+
+/**
+ * Schedule a task to the top of the tasks of same priority.
+ * @param me The thread pool
+ * @param func The task function
+ * @param param The parameter for the task function
+ * @param priority The priority of the task.
+ * @param owner Owner of this task.
+ * @return APR_SUCCESS if the task had been scheduled successfully
+ */
+APU_DECLARE(apr_status_t) apr_thread_pool_top(apr_thread_pool_t *me,
+                                              apr_thread_start_t func,
+                                              void *param,
+                                              apr_byte_t priority,
+                                              void *owner);
+
+/**
+ * Cancel tasks submitted by the owner. If there is any task from the owner that
+ * is currently running, the function will spin until the task finished.
+ * @param me The thread pool
+ * @param owner Owner of the task
+ * @return APR_SUCCESS if the task has been cancelled successfully
+ * @note The task function should not be calling cancel, otherwise the function
+ * may get stuck forever. The function assert if it detect such a case.
+ */
+APU_DECLARE(apr_status_t) apr_thread_pool_tasks_cancel(apr_thread_pool_t *me,
+                                                       void *owner);
+
+/**
+ * Get the current number of tasks waiting in the queue
+ * @param me The thread pool
+ * @return Number of tasks in the queue
+ */
+APU_DECLARE(apr_size_t) apr_thread_pool_tasks_count(apr_thread_pool_t *me);
+
+/**
+ * Get the current number of scheduled tasks waiting in the queue
+ * @param me The thread pool
+ * @return Number of scheduled tasks in the queue
+ */
+APU_DECLARE(apr_size_t) apr_thread_pool_scheduled_tasks_count(apr_thread_pool_t *me);
+
+/**
+ * Get the current number of threads
+ * @param me The thread pool
+ * @return Total number of threads
+ */
+APU_DECLARE(apr_size_t) apr_thread_pool_threads_count(apr_thread_pool_t *me);
+
+/**
+ * Get the current number of busy threads
+ * @param me The thread pool
+ * @return Number of busy threads
+ */
+APU_DECLARE(apr_size_t) apr_thread_pool_busy_count(apr_thread_pool_t *me);
+
+/**
+ * Get the current number of idle threads
+ * @param me The thread pool
+ * @return Number of idle threads
+ */
+APU_DECLARE(apr_size_t) apr_thread_pool_idle_count(apr_thread_pool_t *me);
+
+/**
+ * Access function for the maximum number of idle threads. Number of current
+ * idle threads will be reduced to the new limit.
+ * @param me The thread pool
+ * @param cnt The number
+ * @return The number of threads that were stopped.
+ */
+APU_DECLARE(apr_size_t) apr_thread_pool_idle_max_set(apr_thread_pool_t *me,
+                                                     apr_size_t cnt);
+
+/**
+ * Get number of tasks that have run
+ * @param me The thread pool
+ * @return Number of tasks that have run
+ */
+APU_DECLARE(apr_size_t)
+    apr_thread_pool_tasks_run_count(apr_thread_pool_t * me);
+
+/**
+ * Get high water mark of the number of tasks waiting to run
+ * @param me The thread pool
+ * @return High water mark of tasks waiting to run
+ */
+APU_DECLARE(apr_size_t)
+    apr_thread_pool_tasks_high_count(apr_thread_pool_t * me);
+
+/**
+ * Get high water mark of the number of threads
+ * @param me The thread pool
+ * @return High water mark of threads in thread pool
+ */
+APU_DECLARE(apr_size_t)
+    apr_thread_pool_threads_high_count(apr_thread_pool_t * me);
+
+/**
+ * Get the number of idle threads that were destroyed after timing out
+ * @param me The thread pool
+ * @return Number of idle threads that timed out
+ */
+APU_DECLARE(apr_size_t)
+    apr_thread_pool_threads_idle_timeout_count(apr_thread_pool_t * me);
+
+/**
+ * Access function for the maximum number of idle threads
+ * @param me The thread pool
+ * @return The current maximum number
+ */
+APU_DECLARE(apr_size_t) apr_thread_pool_idle_max_get(apr_thread_pool_t *me);
+
+/**
+ * Access function for the maximum number of threads.
+ * @param me The thread pool
+ * @param cnt Number of threads
+ * @return The original maximum number of threads
+ */
+APU_DECLARE(apr_size_t) apr_thread_pool_thread_max_set(apr_thread_pool_t *me,
+                                                       apr_size_t cnt);
+
+/**
+ * Access function for the maximum wait time (in microseconds) of an
+ * idling thread that exceeds the maximum number of idling threads.
+ * A non-zero value allows for the reaping of idling threads to shrink
+ * over time.  Which helps reduce thrashing.
+ * @param me The thread pool
+ * @param timeout The number of microseconds an idle thread should wait
+ * till it reaps itself
+ * @return The original maximum wait time
+ */
+APU_DECLARE(apr_interval_time_t)
+    apr_thread_pool_idle_wait_set(apr_thread_pool_t * me,
+                                  apr_interval_time_t timeout);
+
+/**
+ * Access function for the maximum wait time (in microseconds) of an
+ * idling thread that exceeds the maximum number of idling threads
+ * @param me The thread pool
+ * @return The current maximum wait time
+ */
+APU_DECLARE(apr_interval_time_t)
+    apr_thread_pool_idle_wait_get(apr_thread_pool_t * me);
+
+/**
+ * Access function for the maximum number of threads
+ * @param me The thread pool
+ * @return The current maximum number
+ */
+APU_DECLARE(apr_size_t) apr_thread_pool_thread_max_get(apr_thread_pool_t *me);
+
+/**
+ * Access function for the threshold of tasks in queue to trigger a new thread.
+ * @param me The thread pool
+ * @param cnt The new threshold
+ * @return The original threshold
+ */
+APU_DECLARE(apr_size_t) apr_thread_pool_threshold_set(apr_thread_pool_t *me,
+                                                      apr_size_t val);
+
+/**
+ * Access function for the threshold of tasks in queue to trigger a new thread.
+ * @param me The thread pool
+ * @return The current threshold
+ */
+APU_DECLARE(apr_size_t) apr_thread_pool_threshold_get(apr_thread_pool_t * me);
+
+/**
+ * Get owner of the task currently been executed by the thread.
+ * @param thd The thread is executing a task
+ * @param owner Pointer to receive owner of the task.
+ * @return APR_SUCCESS if the owner is retrieved successfully
+ */
+APU_DECLARE(apr_status_t) apr_thread_pool_task_owner_get(apr_thread_t *thd,
+                                                         void **owner);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APR_HAS_THREADS */
+#endif /* !APR_THREAD_POOL_H */
diff --git a/srclib/apr-util/include/apu.h.in b/srclib/apr-util/include/apu.h.in
index 13e6a6d4..42573b63 100644
--- a/srclib/apr-util/include/apu.h.in
+++ b/srclib/apr-util/include/apu.h.in
@@ -47,25 +47,41 @@
  * use the most appropriate calling convention.  Public APR functions with 
  * variable arguments must use APU_DECLARE_NONSTD().
  *
- * @deffunc APU_DECLARE(rettype) apr_func(args);
+ * @fn APU_DECLARE(rettype) apr_func(args);
  */
 #define APU_DECLARE(type)            type
 /**
  * The public APR-UTIL functions using variable arguments are declared with 
  * APU_DECLARE_NONSTD(), as they must use the C language calling convention.
  *
- * @deffunc APU_DECLARE_NONSTD(rettype) apr_func(args, ...);
+ * @fn APU_DECLARE_NONSTD(rettype) apr_func(args, ...);
  */
 #define APU_DECLARE_NONSTD(type)     type
 /**
  * The public APR-UTIL variables are declared with APU_DECLARE_DATA.
  * This assures the appropriate indirection is invoked at compile time.
  *
- * @deffunc APU_DECLARE_DATA type apr_variable;
- * @tip APU_DECLARE_DATA extern type apr_variable; syntax is required for
+ * @fn APU_DECLARE_DATA type apr_variable;
+ * @note APU_DECLARE_DATA extern type apr_variable; syntax is required for
  * declarations within headers to properly import the variable.
  */
 #define APU_DECLARE_DATA
+
+#if !defined(WIN32) || defined(APU_MODULE_DECLARE_STATIC)
+/**
+ * Declare a dso module's exported module structure as APU_MODULE_DECLARE_DATA.
+ *
+ * Unless APU_MODULE_DECLARE_STATIC is defined at compile time, symbols 
+ * declared with APU_MODULE_DECLARE_DATA are always exported.
+ * @code
+ * module APU_MODULE_DECLARE_DATA mod_tag
+ * @endcode
+ */
+#define APU_MODULE_DECLARE_DATA
+#else
+#define APU_MODULE_DECLARE_DATA           __declspec(dllexport)
+#endif
+
 /*
  * we always have SDBM (it's in our codebase)
  */
@@ -76,12 +92,13 @@
 
 #if APU_HAVE_DB
 #define APU_HAVE_DB_VERSION    @apu_db_version@
-#endif /* APU_HAVE_DB */
+#endif
 
 #define APU_HAVE_PGSQL         @apu_have_pgsql@
 #define APU_HAVE_MYSQL         @apu_have_mysql@
 #define APU_HAVE_SQLITE3       @apu_have_sqlite3@
 #define APU_HAVE_SQLITE2       @apu_have_sqlite2@
+#define APU_HAVE_ORACLE        @apu_have_oracle@
 
 #define APU_HAVE_APR_ICONV     @have_apr_iconv@
 #define APU_HAVE_ICONV         @have_iconv@
diff --git a/srclib/apr-util/include/apu.hnw b/srclib/apr-util/include/apu.hnw
index ced27a43..ce0f9d92 100644
--- a/srclib/apr-util/include/apu.hnw
+++ b/srclib/apr-util/include/apu.hnw
@@ -49,41 +49,66 @@
  * use the most appropriate calling convention.  Public APR functions with 
  * variable arguments must use APU_DECLARE_NONSTD().
  *
- * @deffunc APU_DECLARE(rettype) apr_func(args);
+ * @fn APU_DECLARE(rettype) apr_func(args);
  */
 #define APU_DECLARE(type)            type
 /**
  * The public APR-UTIL functions using variable arguments are declared with 
  * APU_DECLARE_NONSTD(), as they must use the C language calling convention.
  *
- * @deffunc APU_DECLARE_NONSTD(rettype) apr_func(args, ...);
+ * @fn APU_DECLARE_NONSTD(rettype) apr_func(args, ...);
  */
 #define APU_DECLARE_NONSTD(type)     type
 /**
  * The public APR-UTIL variables are declared with APU_DECLARE_DATA.
  * This assures the appropriate indirection is invoked at compile time.
  *
- * @deffunc APU_DECLARE_DATA type apr_variable;
- * @tip APU_DECLARE_DATA extern type apr_variable; syntax is required for
+ * @fn APU_DECLARE_DATA type apr_variable;
+ * @note APU_DECLARE_DATA extern type apr_variable; syntax is required for
  * declarations within headers to properly import the variable.
  */
 #define APU_DECLARE_DATA
+
+/**
+ * Declare a dso module's exported module structure as APU_MODULE_DECLARE_DATA.
+ *
+ * Unless APU_MODULE_DECLARE_STATIC is defined at compile time, symbols 
+ * declared with APU_MODULE_DECLARE_DATA are always exported.
+ * @code
+ * module APU_MODULE_DECLARE_DATA mod_tag
+ * @endcode
+ */
+#define APU_MODULE_DECLARE_DATA
+
 /*
  * we always have SDBM (it's in our codebase)
  */
 #define APU_HAVE_SDBM   1
-#define APU_HAVE_NDBM   0
 #define APU_HAVE_GDBM   0
+#define APU_HAVE_NDBM   0
 #define APU_HAVE_DB     0
 
-#define APU_HAVE_APR_ICONV     0
-#define APU_HAVE_ICONV         1
-#define APR_HAS_XLATE          (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
+#if APU_HAVE_DB
+#define APU_HAVE_DB_VERSION     0
+#endif
 
 /* 
- * Hack to enable dynamic loads within apr_dbd
+ * we allways enable dynamic driver loads within apr_dbd
  */
-#define APR_DSO_BUILD APR_HAS_DSO
+#define APU_DSO_BUILD           0
+
+#if !APU_DSO_BUILD
+#define APU_HAVE_PGSQL          0
+#define APU_HAVE_MYSQL          0
+#define APU_HAVE_SQLITE3        0
+#define APU_HAVE_SQLITE2        0
+#define APU_HAVE_ORACLE         0
+#define APU_HAVE_FREETDS        0
+#endif
+
+#define APU_HAVE_APR_ICONV      0
+#define APU_HAVE_ICONV          1
+#define APR_HAS_XLATE           (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
 
 #endif /* APU_H */
 #endif /* NETWARE */
diff --git a/srclib/apr-util/include/apu.hw b/srclib/apr-util/include/apu.hw
index 0a912bcf..d6210767 100644
--- a/srclib/apr-util/include/apu.hw
+++ b/srclib/apr-util/include/apu.hw
@@ -15,22 +15,20 @@
  */
 
 /* 
- * Note: This is a Windows specific version of apu.h. It is renamed to
- * apu.h at the start of a Windows build.
+ * apu.h is duplicated from apu.hw at build time -- do not edit apu.h
  */
 /* @file apu.h
  * @brief APR-Utility main file
  */
-
-#ifdef WIN32
-#ifndef APU_H
-#define APU_H
 /**
  * @defgroup APR_Util APR Utility Functions
  * @{
  */
 
 
+#ifndef APU_H
+#define APU_H
+
 /**
  * APU_DECLARE_EXPORT is defined when building the APR-UTIL dynamic library,
  * so that all public symbols are exported.
@@ -50,22 +48,22 @@
  * use the most appropriate calling convention.  Public APR functions with 
  * variable arguments must use APU_DECLARE_NONSTD().
  *
- * @deffunc APU_DECLARE(rettype) apr_func(args);
+ * @fn APU_DECLARE(rettype) apr_func(args);
  */
 #define APU_DECLARE(type)            type
 /**
  * The public APR-UTIL functions using variable arguments are declared with 
  * APU_DECLARE_NONSTD(), as they must use the C language calling convention.
  *
- * @deffunc APU_DECLARE_NONSTD(rettype) apr_func(args, ...);
+ * @fn APU_DECLARE_NONSTD(rettype) apr_func(args, ...);
  */
 #define APU_DECLARE_NONSTD(type)     type
 /**
  * The public APR-UTIL variables are declared with APU_DECLARE_DATA.
  * This assures the appropriate indirection is invoked at compile time.
  *
- * @deffunc APU_DECLARE_DATA type apr_variable;
- * @tip extern APU_DECLARE_DATA type apr_variable; syntax is required for
+ * @fn APU_DECLARE_DATA type apr_variable;
+ * @note extern APU_DECLARE_DATA type apr_variable; syntax is required for
  * declarations within headers to properly import the variable.
  */
 #define APU_DECLARE_DATA
@@ -82,28 +80,46 @@
 #define APU_DECLARE_NONSTD(type)     __declspec(dllimport) type __cdecl
 #define APU_DECLARE_DATA             __declspec(dllimport)
 #endif
-/** @} */
+
+#if !defined(WIN32) || defined(APU_MODULE_DECLARE_STATIC)
+/**
+ * Declare a dso module's exported module structure as APU_MODULE_DECLARE_DATA.
+ *
+ * Unless APU_MODULE_DECLARE_STATIC is defined at compile time, symbols 
+ * declared with APU_MODULE_DECLARE_DATA are always exported.
+ * @code
+ * module APU_MODULE_DECLARE_DATA mod_tag
+ * @endcode
+ */
+#define APU_MODULE_DECLARE_DATA
+#else
+#define APU_MODULE_DECLARE_DATA           __declspec(dllexport)
+#endif
+
 /*
  * we always have SDBM (it's in our codebase)
  */
-#define APU_HAVE_SDBM   1
-#define APU_HAVE_NDBM   0
-#define APU_HAVE_GDBM   0
-#define APU_HAVE_DB     0
+#define APU_HAVE_SDBM    1
+#define APU_HAVE_GDBM    0
+#define APU_HAVE_NDBM    0
+#define APU_HAVE_DB      0
 
 #if APU_HAVE_DB
-#define APU_HAVE_DB_VERSION    UNKNOWN
+#define APU_HAVE_DB_VERSION     0
 #endif
 
-#define APU_HAVE_PGSQL         0
-#define APU_HAVE_MYSQL         0
-#define APU_HAVE_SQLITE2       0
-#define APU_HAVE_SQLITE3       0
-#define APU_HAVE_ORACLE        0
+#ifndef APU_DBD_DSO_BUILD
+#define APU_HAVE_PGSQL          0
+#define APU_HAVE_MYSQL          0
+#define APU_HAVE_SQLITE3        0
+#define APU_HAVE_SQLITE2        0
+#define APU_HAVE_ORACLE         0
+#define APU_HAVE_FREETDS        0
+#endif
 
-#define APU_HAVE_APR_ICONV     1
-#define APU_HAVE_ICONV         0
-#define APR_HAS_XLATE          (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
+#define APU_HAVE_APR_ICONV      1
+#define APU_HAVE_ICONV          0
+#define APR_HAS_XLATE           (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
 
 #endif /* APU_H */
-#endif /* WIN32 */
+/** @} */
diff --git a/srclib/apr-util/include/apu_version.h b/srclib/apr-util/include/apu_version.h
index f39d3b40..f4e0e27e 100644
--- a/srclib/apr-util/include/apu_version.h
+++ b/srclib/apr-util/include/apu_version.h
@@ -53,13 +53,13 @@
  * Minor API changes that do not cause binary compatibility problems.
  * Reset to 0 when upgrading APU_MAJOR_VERSION
  */
-#define APU_MINOR_VERSION       2
+#define APU_MINOR_VERSION       3
 
 /** patch level 
  * The Patch Level never includes API changes, simply bug fixes.
  * Reset to 0 when upgrading APR_MINOR_VERSION
  */
-#define APU_PATCH_VERSION      12
+#define APU_PATCH_VERSION       0
 
 /** 
  * The symbol APU_IS_DEV_VERSION is only defined for internal,
diff --git a/srclib/apr-util/include/private/apr_dbd_internal.h b/srclib/apr-util/include/private/apr_dbd_internal.h
index 1769d466..671ffb21 100644
--- a/srclib/apr-util/include/private/apr_dbd_internal.h
+++ b/srclib/apr-util/include/private/apr_dbd_internal.h
@@ -29,6 +29,17 @@
 extern "C" {
 #endif
 
+#define TXN_IGNORE_ERRORS(t) \
+  ((t) && ((t)->mode & APR_DBD_TRANSACTION_IGNORE_ERRORS))
+#define TXN_NOTICE_ERRORS(t) \
+  ((t) && !((t)->mode & APR_DBD_TRANSACTION_IGNORE_ERRORS))
+
+#define TXN_DO_COMMIT(t)   (!((t)->mode & APR_DBD_TRANSACTION_ROLLBACK))
+#define TXN_DO_ROLLBACK(t) ((t)->mode & APR_DBD_TRANSACTION_ROLLBACK)
+
+#define TXN_MODE_BITS \
+  (APR_DBD_TRANSACTION_ROLLBACK|APR_DBD_TRANSACTION_IGNORE_ERRORS)
+
 struct apr_dbd_driver_t {
     /** name */
     const char *name;
@@ -51,10 +62,12 @@ struct apr_dbd_driver_t {
      *  a lifetime other than a request
      *
      *  @param pool - a pool to use for error messages (if any).
-     *  @param s - server rec managing the underlying connection/pool.
+     *  @param params - connection parameters.
+     *  @param error - descriptive error.
      *  @return database handle, or NULL on error.
      */
-    apr_dbd_t *(*open)(apr_pool_t *pool, const char *params);
+    apr_dbd_t *(*open)(apr_pool_t *pool, const char *params,
+                       const char **error);
 
     /** check_conn: check status of a database connection
      *
@@ -82,9 +95,9 @@ struct apr_dbd_driver_t {
 
     /** transaction: start a transaction.  May be a no-op.
      *
-     *  @param pool - a pool to use for error messages (if any).
+     *  @param pool   - a pool to use for error messages (if any).
      *  @param handle - the connection
-     *  @param transaction - ptr to a transaction.  May be null on entry
+     *  @param trans  - ptr to a transaction.  May be null on entry
      *  @return 0 for success or error code
      */
     int (*start_transaction)(apr_pool_t *pool, apr_dbd_t *handle,
@@ -94,7 +107,7 @@ struct apr_dbd_driver_t {
      *  (commit on success, rollback on error).
      *  May be a no-op.
      *
-     *  @param transaction - the transaction.
+     *  @param trans - the transaction.
      *  @return 0 for success or error code
      */
     int (*end_transaction)(apr_dbd_transaction_t *trans);
@@ -185,11 +198,15 @@ struct apr_dbd_driver_t {
      *  @param label - A label for the prepared statement.
      *                 use NULL for temporary prepared statements
      *                 (eg within a Request in httpd)
+     *  @param nargs - number of parameters in the query
+     *  @param nvals - number of values passed in p[b]query/select
+     *  @param types - pointer to an array with types of parameters
      *  @param statement - statement to prepare.  May point to null on entry.
      *  @return 0 for success or error code
      */
     int (*prepare)(apr_pool_t *pool, apr_dbd_t *handle, const char *query,
-                   const char *label, apr_dbd_prepared_t **statement);
+                   const char *label, int nargs, int nvals,
+                   apr_dbd_type_e *types, apr_dbd_prepared_t **statement);
 
     /** pvquery: query using a prepared statement + args
      *
@@ -223,13 +240,11 @@ struct apr_dbd_driver_t {
      *  @param handle - the connection
      *  @param nrows - number of rows affected.
      *  @param statement - the prepared statement to execute
-     *  @param nargs - number of args to prepared statement
      *  @param args - args to prepared statement
      *  @return 0 for success or error code
      */
     int (*pquery)(apr_pool_t *pool, apr_dbd_t *handle, int *nrows,
-                  apr_dbd_prepared_t *statement, int nargs,
-                  const char **args);
+                  apr_dbd_prepared_t *statement, const char **args);
 
     /** pselect: select using a prepared statement + args
      *
@@ -238,17 +253,110 @@ struct apr_dbd_driver_t {
      *  @param res - pointer to query results.  May point to NULL on entry
      *  @param statement - the prepared statement to execute
      *  @param random - Whether to support random-access to results
-     *  @param nargs - number of args to prepared statement
      *  @param args - args to prepared statement
      *  @return 0 for success or error code
      */
     int (*pselect)(apr_pool_t *pool, apr_dbd_t *handle,
                    apr_dbd_results_t **res, apr_dbd_prepared_t *statement,
-                   int random, int nargs, const char **args);
+                   int random, const char **args);
+
+  
+    /** get_name: get a column title from a result set
+     *
+     *  @param res - result set pointer
+     *  @param col - entry number
+     *  @return param name, or NULL if col is out of bounds.
+     */
+    const char* (*get_name)(const apr_dbd_results_t *res, int col);
+
+    /** transaction_mode_get: get the mode of transaction
+     *
+     *  @param trans - the transaction.
+     *  @return mode of transaction
+     */
+    int (*transaction_mode_get)(apr_dbd_transaction_t *trans);
+
+    /** transaction_mode_set: get the mode of transaction
+     *
+     *  @param trans - the transaction.
+     *  @param mode  - new mode of the transaction
+     *  @return the mode of transaction in force after the call
+     */
+    int (*transaction_mode_set)(apr_dbd_transaction_t *trans, int mode);
 
+    /** format of prepared statement parameters */
+    const char *pformat;
+
+    /** pvbquery: query using a prepared statement + binary args
+     *
+     *  @param pool - working pool
+     *  @param handle - the connection
+     *  @param nrows - number of rows affected.
+     *  @param statement - the prepared statement to execute
+     *  @param args - binary args to prepared statement
+     *  @return 0 for success or error code
+     */
+    int (*pvbquery)(apr_pool_t *pool, apr_dbd_t *handle, int *nrows,
+                    apr_dbd_prepared_t *statement, va_list args);
 
+    /** pvbselect: select using a prepared statement + binary args
+     *
+     *  @param pool - working pool
+     *  @param handle - the connection
+     *  @param res - pointer to query results.  May point to NULL on entry
+     *  @param statement - the prepared statement to execute
+     *  @param random - Whether to support random-access to results
+     *  @param args - binary args to prepared statement
+     *  @return 0 for success or error code
+     */
+    int (*pvbselect)(apr_pool_t *pool, apr_dbd_t *handle,
+                     apr_dbd_results_t **res,
+                     apr_dbd_prepared_t *statement, int random, va_list args);
+
+    /** pbquery: query using a prepared statement + binary args
+     *
+     *  @param pool - working pool
+     *  @param handle - the connection
+     *  @param nrows - number of rows affected.
+     *  @param statement - the prepared statement to execute
+     *  @param args - binary args to prepared statement
+     *  @return 0 for success or error code
+     */
+    int (*pbquery)(apr_pool_t *pool, apr_dbd_t *handle, int *nrows,
+                   apr_dbd_prepared_t *statement,const void **args);
+
+    /** pbselect: select using a prepared statement + binary args
+     *
+     *  @param pool - working pool
+     *  @param handle - the connection
+     *  @param res - pointer to query results.  May point to NULL on entry
+     *  @param statement - the prepared statement to execute
+     *  @param random - Whether to support random-access to results
+     *  @param args - binary args to prepared statement
+     *  @return 0 for success or error code
+     */
+    int (*pbselect)(apr_pool_t *pool, apr_dbd_t *handle,
+                    apr_dbd_results_t **res, apr_dbd_prepared_t *statement,
+                    int random, const void **args);
+  
+    /** datum_get: get a binary entry from a row
+     *
+     *  @param row - row pointer
+     *  @param col - entry number
+     *  @param type - type of data to get
+     *  @param data - pointer to data, allocated by the caller
+     *  @return APR_SUCCESS, an error code on error or if col is out of bounds
+     */
+    apr_status_t (*datum_get)(const apr_dbd_row_t *row, int col,
+                              apr_dbd_type_e type, void *data);
 };
 
+/* Export mutex lock/unlock for drivers that need it 
+ * deprecated; create a per-dbd mutex within the (*init) function
+ * to avoid blocking other providers running on other threads
+ */
+APU_DECLARE(apr_status_t) apr_dbd_mutex_lock(void);
+APU_DECLARE(apr_status_t) apr_dbd_mutex_unlock(void);
 
 #ifdef __cplusplus
 }
diff --git a/srclib/apr-util/include/private/apu_config.h.in b/srclib/apr-util/include/private/apu_config.h.in
index 1c65b912..5537832c 100644
--- a/srclib/apr-util/include/private/apu_config.h.in
+++ b/srclib/apr-util/include/private/apu_config.h.in
@@ -3,6 +3,12 @@
 /* Define if the system crypt() function is threadsafe */
 #undef APU_CRYPT_THREADSAFE
 
+/* Define if modular components are built as DSOs */
+#undef APU_DSO_BUILD
+
+/* Define to be absolute path to DSO directory */
+#undef APU_DSO_LIBDIR
+
 /* Define if the inbuf parm to iconv() is const char ** */
 #undef APU_ICONV_INBUF_CONST
 
@@ -57,6 +63,9 @@
 /* Define to 1 if you have the `nl_langinfo' function. */
 #undef HAVE_NL_LANGINFO
 
+/* Define to 1 if you have the <oci.h> header file. */
+#undef HAVE_OCI_H
+
 /* Define to 1 if you have the <postgresql/libpq-fe.h> header file. */
 #undef HAVE_POSTGRESQL_LIBPQ_FE_H
 
@@ -78,6 +87,9 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
+/* Define to 1 if you have the <sybdb.h> header file. */
+#undef HAVE_SYBDB_H
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
diff --git a/srclib/apr-util/include/private/apu_config.hnw b/srclib/apr-util/include/private/apu_config.hnw
index a92da1bf..86b95dec 100644
--- a/srclib/apr-util/include/private/apu_config.hnw
+++ b/srclib/apr-util/include/private/apu_config.hnw
@@ -1,50 +1,50 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more

- * contributor license agreements.  See the NOTICE file distributed with

- * this work for additional information regarding copyright ownership.

- * The ASF licenses this file to You under the Apache License, Version 2.0

- * (the "License"); you may not use this file except in compliance with

- * the License.  You may obtain a copy of the License at

- *

- *     http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-

-/* 

- * Note: This is a NetWare specific version of apu_config.hnw. It is copied

- * as apu_config.h at the start of a NetWare build.

- */

-

-#ifdef NETWARE

-

-#ifndef APU_CONFIG_H

-#define APU_CONFIG_H

-

-/*

- * NetWare does not have GDBM, and we always use the bundled (new) Expat

- */

-

-/* Define if you have the gdbm library (-lgdbm). */

-/* #undef HAVE_LIBGDBM */

-

-/* define if Expat 1.0 or 1.1 was found */

-/* #undef APR_HAVE_OLD_EXPAT */

-

-/* NetWare uses its own ICONV implementation. */

-#define HAVE_ICONV_H 1

-

-/*

- * check for newer NDKs which use now correctly 'const char*' with iconv.

- */

-#include <ndkvers.h>

-#if (CURRENT_NDK_THRESHOLD >= 705110000)

-#define APU_ICONV_INBUF_CONST

-#endif

-

-#endif /* APU_CONFIG_H */

-#endif /* NETWARE */

-

+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* 
+ * Note: This is a NetWare specific version of apu_config.hnw. It is copied
+ * as apu_config.h at the start of a NetWare build.
+ */
+
+#ifdef NETWARE
+
+#ifndef APU_CONFIG_H
+#define APU_CONFIG_H
+
+/*
+ * NetWare does not have GDBM, and we always use the bundled (new) Expat
+ */
+
+/* Define if you have the gdbm library (-lgdbm). */
+/* #undef HAVE_LIBGDBM */
+
+/* define if Expat 1.0 or 1.1 was found */
+/* #undef APR_HAVE_OLD_EXPAT */
+
+/* NetWare uses its own ICONV implementation. */
+#define HAVE_ICONV_H 1
+
+/*
+ * check for newer NDKs which use now correctly 'const char*' with iconv.
+ */
+#include <ndkvers.h>
+#if (CURRENT_NDK_THRESHOLD >= 705110000)
+#define APU_ICONV_INBUF_CONST
+#endif
+
+#endif /* APU_CONFIG_H */
+#endif /* NETWARE */
+
diff --git a/srclib/apr-util/include/private/apu_config.hw b/srclib/apr-util/include/private/apu_config.hw
index 72cea511..015dd526 100644
--- a/srclib/apr-util/include/private/apu_config.hw
+++ b/srclib/apr-util/include/private/apu_config.hw
@@ -24,6 +24,13 @@
 #ifndef APU_CONFIG_H
 #define APU_CONFIG_H
 
+/* Compile win32 with DSO support for .dll builds */
+#ifdef APU_DECLARE_STATIC
+#define APU_DSO_BUILD           0
+#else
+#define APU_DSO_BUILD           1
+#endif
+
 /*
  * Windows does not have GDBM, and we always use the bundled (new) Expat
  */
diff --git a/srclib/apr-util/include/private/apu_internal.h b/srclib/apr-util/include/private/apu_internal.h
new file mode 100644
index 00000000..c23498e1
--- /dev/null
+++ b/srclib/apr-util/include/private/apu_internal.h
@@ -0,0 +1,73 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr.h"
+#include "apr_dso.h"
+#include "apu.h"
+
+#ifndef APU_INTERNAL_H
+#define APU_INTERNAL_H
+
+#if APU_DSO_BUILD
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* For modular dso loading, an internal interlock to allow us to
+ * continue to initialize modules by multiple threads, the caller
+ * of apu_dso_load must lock first, and not unlock until any init
+ * finalization is complete.
+ */ 
+apr_status_t apu_dso_init(apr_pool_t *pool);
+
+apr_status_t apu_dso_mutex_lock(void);
+apr_status_t apu_dso_mutex_unlock(void);
+
+apr_status_t apu_dso_load(apr_dso_handle_sym_t *dsoptr, const char *module,
+                          const char *modsym, apr_pool_t *pool);
+
+#if APR_HAS_LDAP
+
+/* For LDAP internal builds, wrap our LDAP namespace */
+
+struct apr__ldap_dso_fntable {
+    int (*info)(apr_pool_t *pool, apr_ldap_err_t **result_err);
+    int (*init)(apr_pool_t *pool, LDAP **ldap, const char *hostname,
+                int portno, int secure, apr_ldap_err_t **result_err);
+    int (*ssl_init)(apr_pool_t *pool, const char *cert_auth_file,
+                    int cert_file_type, apr_ldap_err_t **result_err);
+    int (*ssl_deinit)(void);
+    int (*get_option)(apr_pool_t *pool, LDAP *ldap, int option,
+                      void *outvalue, apr_ldap_err_t **result_err);
+    int (*set_option)(apr_pool_t *pool, LDAP *ldap, int option,
+                      const void *invalue, apr_ldap_err_t **result_err);
+    apr_status_t (*rebind_init)(apr_pool_t *pool);
+    apr_status_t (*rebind_add)(apr_pool_t *pool, LDAP *ld,
+                               const char *bindDN, const char *bindPW);
+    apr_status_t (*rebind_remove)(LDAP *ld);
+};
+
+#endif /* APR_HAS_LDAP */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* APU_DSO_BUILD */
+
+#endif /* APU_INTERNAL_H */
+
diff --git a/srclib/apr-util/include/private/apu_select_dbm.hnw b/srclib/apr-util/include/private/apu_select_dbm.hnw
deleted file mode 100644
index baa6c144..00000000
--- a/srclib/apr-util/include/private/apu_select_dbm.hnw
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more

- * contributor license agreements.  See the NOTICE file distributed with

- * this work for additional information regarding copyright ownership.

- * The ASF licenses this file to You under the Apache License, Version 2.0

- * (the "License"); you may not use this file except in compliance with

- * the License.  You may obtain a copy of the License at

- *

- *     http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-

-#ifndef APU_SELECT_DBM_H

-#define APU_SELECT_DBM_H

-

-/*

-** The following macros control what features APRUTIL will use

-*/

-#define APU_USE_SDBM    1

-#define APU_USE_GDBM    0

-#define APU_USE_NDBM    0

-#define APU_USE_DB      0

-

-#endif	/* !APU_SELECT_DBM_H */

diff --git a/srclib/apr-util/ldap/NWGNUmakefile b/srclib/apr-util/ldap/NWGNUmakefile
index a0ecc3ba..3e8bbdad 100644
--- a/srclib/apr-util/ldap/NWGNUmakefile
+++ b/srclib/apr-util/ldap/NWGNUmakefile
@@ -27,6 +27,7 @@ XINCDIRS	+= \
 			$(APR)/include \
 			$(APR)/include/arch/NetWare \
 			$(APRUTIL)/include \
+			$(APRUTIL)/include/private \
 			$(LDAPSDK)/inc \
 			$(EOLIST)
 
@@ -231,6 +232,7 @@ FILES_lib_objs = \
 	$(OBJDIR)/apr_ldap_init.o \
 	$(OBJDIR)/apr_ldap_option.o \
 	$(OBJDIR)/apr_ldap_url.o \
+	$(OBJDIR)/apr_ldap_rebind.o \
 	$(EOLIST)
 
 #
diff --git a/srclib/apr-util/ldap/apr_ldap.dsp b/srclib/apr-util/ldap/apr_ldap.dsp
new file mode 100644
index 00000000..095e3af5
--- /dev/null
+++ b/srclib/apr-util/ldap/apr_ldap.dsp
@@ -0,0 +1,227 @@
+# Microsoft Developer Studio Project File - Name="apr_ldap" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=apr_ldap - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_ldap.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr_ldap.mak" CFG="apr_ldap - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr_ldap - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_ldap - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_ldap - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "apr_ldap - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "apr_ldap - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_ldap_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"Release/apr_ldap-1.res" /d DLL_NAME="apr_ldap" /d "NDEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /debug /out:"Release\apr_ldap-1.dll" /pdb:"Release\apr_ldap-1.pdb" /implib:"Release\apr_ldap-1.lib" /MACHINE:X86 /opt:ref
+# Begin Special Build Tool
+TargetPath=Release\apr_ldap-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_ldap - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_ldap_src" /FD /EHsc /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"Debug/apr_ldap-1.res" /d DLL_NAME="apr_ldap" /d "_DEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\apr_ldap-1.dll" /pdb:"Debug\apr_ldap-1.pdb" /implib:"Debug\apr_ldap-1.lib" /MACHINE:X86
+# Begin Special Build Tool
+TargetPath=Debug\apr_ldap-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_ldap - x64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "x64\Release"
+# PROP BASE Intermediate_Dir "x64\Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "x64\Release"
+# PROP Intermediate_Dir "x64\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "../include" /I "../../apr/include" /I "../include/private" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_ldap_src" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"x64/Release/apr_ldap-1.res" /d DLL_NAME="apr_ldap" /d "NDEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\apr_ldap-1.dll" /pdb:"x64\Release\apr_ldap-1.pdb" /implib:"x64\Release\apr_ldap-1.lib" /MACHINE:X64 /opt:ref
+# Begin Special Build Tool
+TargetPath=x64\Release\apr_ldap-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "apr_ldap - x64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "x64\Debug"
+# PROP BASE Intermediate_Dir "x64\Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "x64\Debug"
+# PROP Intermediate_Dir "x64\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "../include" /I "../../apr/include" /I "../include/private" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\apr_ldap_src" /FD /EHsc /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"x64/Debug/apr_ldap-1.res" /d DLL_NAME="apr_ldap" /d "_DEBUG" /d "APU_VERSION_ONLY" /I "../include" /I "../../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EEB0000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\apr_ldap-1.dll" /pdb:"x64\Debug\apr_ldap-1.pdb" /implib:"x64\Debug\apr_ldap-1.lib" /MACHINE:X64
+# Begin Special Build Tool
+TargetPath=x64\Debug\apr_ldap-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ENDIF 
+
+# Begin Target
+
+# Name "apr_ldap - Win32 Release"
+# Name "apr_ldap - Win32 Debug"
+# Name "apr_ldap - x64 Release"
+# Name "apr_ldap - x64 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\apr_ldap_init.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\apr_ldap_option.c
+# End Source File 
+# Begin Source File
+
+SOURCE=.\apr_ldap_rebind.c
+# End Source File
+# End Group
+# Begin Group "Public Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\apr_ldap.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\apr_ldap_init.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\apr_ldap_option.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\apr_ldap_rebind.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\apr_ldap_url.h
+# End Source File
+# End Group
+# Begin Group "Internal Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\private\apu_config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\private\apu_internal.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\libaprutil.rc
+# End Source File
+# End Target
+# End Project
diff --git a/srclib/apr-util/ldap/apr_ldap_init.c b/srclib/apr-util/ldap/apr_ldap_init.c
index 767faade..458f281b 100644
--- a/srclib/apr-util/ldap/apr_ldap_init.c
+++ b/srclib/apr-util/ldap/apr_ldap_init.c
@@ -24,7 +24,14 @@
 
 #include "apr.h"
 #include "apu.h"
+#include "apu_config.h"
+
+#if APU_DSO_BUILD
+#define APU_DSO_LDAP_BUILD
+#endif
+
 #include "apr_ldap.h"
+#include "apu_internal.h"
 #include "apr_errno.h"
 #include "apr_pools.h"
 #include "apr_strings.h"
@@ -49,10 +56,11 @@
  * will return APR_EGENERAL. Further LDAP specific error information
  * can be found in result_err.
  */
-APU_DECLARE(int) apr_ldap_ssl_init(apr_pool_t *pool,
-                                   const char *cert_auth_file,
-                                   int cert_file_type,
-                                   apr_ldap_err_t **result_err) {
+APU_DECLARE_LDAP(int) apr_ldap_ssl_init(apr_pool_t *pool,
+                                        const char *cert_auth_file,
+                                        int cert_file_type,
+                                        apr_ldap_err_t **result_err)
+{
 
     apr_ldap_err_t *result = (apr_ldap_err_t *)apr_pcalloc(pool, sizeof(apr_ldap_err_t));
     *result_err = result;
@@ -105,7 +113,8 @@ APU_DECLARE(int) apr_ldap_ssl_init(apr_pool_t *pool,
  * @todo currently we do not check whether apr_ldap_ssl_init()
  * has been called first - should we?
  */
-APU_DECLARE(int) apr_ldap_ssl_deinit(void) {
+APU_DECLARE_LDAP(int) apr_ldap_ssl_deinit(void)
+{
 
 #if APR_HAS_LDAP_SSL && APR_HAS_LDAPSSL_CLIENT_DEINIT
     ldapssl_client_deinit();
@@ -135,12 +144,13 @@ APU_DECLARE(int) apr_ldap_ssl_deinit(void) {
  * APR_LDAP_SSL: SSL encryption (ldaps://)
  * APR_LDAP_STARTTLS: Force STARTTLS on ldap://
  */
-APU_DECLARE(int) apr_ldap_init(apr_pool_t *pool,
-                               LDAP **ldap,
-                               const char *hostname,
-                               int portno,
-                               int secure,
-                               apr_ldap_err_t **result_err) {
+APU_DECLARE_LDAP(int) apr_ldap_init(apr_pool_t *pool,
+                                    LDAP **ldap,
+                                    const char *hostname,
+                                    int portno,
+                                    int secure,
+                                    apr_ldap_err_t **result_err)
+{
 
     apr_ldap_err_t *result = (apr_ldap_err_t *)apr_pcalloc(pool, sizeof(apr_ldap_err_t));
     *result_err = result;
@@ -174,7 +184,8 @@ APU_DECLARE(int) apr_ldap_init(apr_pool_t *pool,
  * This function returns a string describing the LDAP toolkit
  * currently in use. The string is placed inside result_err->reason.
  */
-APU_DECLARE(int) apr_ldap_info(apr_pool_t *pool, apr_ldap_err_t **result_err)
+APU_DECLARE_LDAP(int) apr_ldap_info(apr_pool_t *pool,
+                                    apr_ldap_err_t **result_err)
 {
     apr_ldap_err_t *result = (apr_ldap_err_t *)apr_pcalloc(pool, sizeof(apr_ldap_err_t));
     *result_err = result;
@@ -186,4 +197,23 @@ APU_DECLARE(int) apr_ldap_info(apr_pool_t *pool, apr_ldap_err_t **result_err)
     
 }
 
+#if APU_DSO_BUILD
+
+/* For DSO builds, export the table of entry points into the apr_ldap DSO
+ * See include/private/apu_internal.h for the corresponding declarations
+ */
+APU_MODULE_DECLARE_DATA struct apr__ldap_dso_fntable apr__ldap_fns = {
+    apr_ldap_info,
+    apr_ldap_init,
+    apr_ldap_ssl_init,
+    apr_ldap_ssl_deinit,
+    apr_ldap_get_option,
+    apr_ldap_set_option,
+    apr_ldap_rebind_init,
+    apr_ldap_rebind_add,
+    apr_ldap_rebind_remove
+};
+
+#endif /* APU_DSO_BUILD */
+
 #endif /* APR_HAS_LDAP */
diff --git a/srclib/apr-util/ldap/apr_ldap_option.c b/srclib/apr-util/ldap/apr_ldap_option.c
index 15d216a2..8692dcdd 100644
--- a/srclib/apr-util/ldap/apr_ldap_option.c
+++ b/srclib/apr-util/ldap/apr_ldap_option.c
@@ -23,6 +23,12 @@
 
 #include "apr.h"
 #include "apu.h"
+#include "apu_config.h"
+
+#if APU_DSO_BUILD
+#define APU_DSO_LDAP_BUILD
+#endif
+
 #include "apr_ldap.h"
 #include "apr_errno.h"
 #include "apr_pools.h"
@@ -42,11 +48,11 @@ static void option_set_tls(apr_pool_t *pool, LDAP *ldap, const void *invalue,
  * This function gets option values from a given LDAP session if
  * one was specified.
  */
-APU_DECLARE(int) apr_ldap_get_option(apr_pool_t *pool,
-                                     LDAP *ldap,
-                                     int option,
-                                     void *outvalue,
-                                     apr_ldap_err_t **result_err)
+APU_DECLARE_LDAP(int) apr_ldap_get_option(apr_pool_t *pool,
+                                          LDAP *ldap,
+                                          int option,
+                                          void *outvalue,
+                                          apr_ldap_err_t **result_err)
 {
     apr_ldap_err_t *result;
 
@@ -80,11 +86,11 @@ APU_DECLARE(int) apr_ldap_get_option(apr_pool_t *pool,
  * will try and apply legacy functions to achieve the same effect,
  * depending on the platform.
  */
-APU_DECLARE(int) apr_ldap_set_option(apr_pool_t *pool,
-                                     LDAP *ldap,
-                                     int option,
-                                     const void *invalue,
-                                     apr_ldap_err_t **result_err)
+APU_DECLARE_LDAP(int) apr_ldap_set_option(apr_pool_t *pool,
+                                          LDAP *ldap,
+                                          int option,
+                                          const void *invalue,
+                                          apr_ldap_err_t **result_err)
 {
     apr_ldap_err_t *result;
 
@@ -144,6 +150,44 @@ APU_DECLARE(int) apr_ldap_set_option(apr_pool_t *pool,
             result->reason = "LDAP: Could not set verify mode";
         }
         break;
+
+    case APR_LDAP_OPT_REFERRALS:
+        /* Setting this option is supported on at least TIVOLI_SDK and OpenLDAP. Folks
+         * who know the NOVELL, NETSCAPE, MOZILLA, and SOLARIS SDKs should note here if
+         * the SDK at least tolerates this option being set, or add an elif to handle
+         * special cases (i.e. different LDAP_OPT_X value).
+         */
+        result->rc = ldap_set_option(ldap, LDAP_OPT_REFERRALS, (void *)invalue);
+
+        if (result->rc != LDAP_SUCCESS) {
+            result->reason = "Unable to set LDAP_OPT_REFERRALS.";
+          return(result->rc);
+        }
+        break;
+
+    case APR_LDAP_OPT_REFHOPLIMIT:
+#if !defined(LDAP_OPT_REFHOPLIMIT) || APR_HAS_NOVELL_LDAPSDK
+        /* If the LDAP_OPT_REFHOPLIMIT symbol is missing, assume that the
+         * particular LDAP library has a reasonable default. So far certain
+         * versions of the OpenLDAP SDK miss this symbol (but default to 5),
+         * and the Microsoft SDK misses the symbol (the default is not known).
+         */
+        result->rc = LDAP_SUCCESS;
+#else
+        /* Setting this option is supported on at least TIVOLI_SDK. Folks who know
+         * the NOVELL, NETSCAPE, MOZILLA, and SOLARIS SDKs should note here if
+         * the SDK at least tolerates this option being set, or add an elif to handle
+         * special cases so an error isn't returned if there is a perfectly good
+         * default value that just can't be changed (like openLDAP).
+         */
+        result->rc = ldap_set_option(ldap, LDAP_OPT_REFHOPLIMIT, (void *)invalue);
+#endif
+
+        if (result->rc != LDAP_SUCCESS) {
+            result->reason = "Unable to set LDAP_OPT_REFHOPLIMIT.";
+          return(result->rc);
+        }
+        break;
         
     default:
         /* set the option specified using the native LDAP function */
@@ -179,10 +223,10 @@ APU_DECLARE(int) apr_ldap_set_option(apr_pool_t *pool,
 static void option_set_tls(apr_pool_t *pool, LDAP *ldap, const void *invalue,
                           apr_ldap_err_t *result)
 {
-    int tls = * (const int *)invalue;
-
 #if APR_HAS_LDAP_SSL /* compiled with ssl support */
 
+    int tls = * (const int *)invalue;
+
     /* Netscape/Mozilla/Solaris SDK */
 #if APR_HAS_NETSCAPE_LDAPSDK || APR_HAS_SOLARIS_LDAPSDK || APR_HAS_MOZILLA_LDAPSK
 #if APR_HAS_LDAPSSL_INSTALL_ROUTINES
@@ -289,7 +333,8 @@ static void option_set_tls(apr_pool_t *pool, LDAP *ldap, const void *invalue,
     /* Microsoft SDK */
 #if APR_HAS_MICROSOFT_LDAPSDK
     if (tls == APR_LDAP_NONE) {
-        result->rc = ldap_set_option(ldap, LDAP_OPT_SSL, LDAP_OPT_OFF);
+        ULONG ul = (ULONG) LDAP_OPT_OFF;
+        result->rc = ldap_set_option(ldap, LDAP_OPT_SSL, &ul);
         if (result->rc != LDAP_SUCCESS) {
             result->reason = "LDAP: an attempt to set LDAP_OPT_SSL off "
                              "failed.";
@@ -297,7 +342,8 @@ static void option_set_tls(apr_pool_t *pool, LDAP *ldap, const void *invalue,
         }
     }
     else if (tls == APR_LDAP_SSL) {
-        result->rc = ldap_set_option(ldap, LDAP_OPT_SSL, LDAP_OPT_ON);
+        ULONG ul = (ULONG) LDAP_OPT_ON;
+        result->rc = ldap_set_option(ldap, LDAP_OPT_SSL, &ul);
         if (result->rc != LDAP_SUCCESS) {
             result->reason = "LDAP: an attempt to set LDAP_OPT_SSL on "
                              "failed.";
@@ -350,12 +396,11 @@ static void option_set_tls(apr_pool_t *pool, LDAP *ldap, const void *invalue,
 static void option_set_cert(apr_pool_t *pool, LDAP *ldap,
                            const void *invalue, apr_ldap_err_t *result)
 {
+#if APR_HAS_LDAP_SSL
     apr_array_header_t *certs = (apr_array_header_t *)invalue;
     struct apr_ldap_opt_tls_cert_t *ents = (struct apr_ldap_opt_tls_cert_t *)certs->elts;
     int i = 0;
 
-#if APR_HAS_LDAP_SSL
-
     /* Netscape/Mozilla/Solaris SDK */
 #if APR_HAS_NETSCAPE_LDAPSDK || APR_HAS_SOLARIS_LDAPSDK || APR_HAS_MOZILLA_LDAPSDK
 #if APR_HAS_LDAPSSL_CLIENT_INIT
@@ -551,6 +596,13 @@ static void option_set_cert(apr_pool_t *pool, LDAP *ldap,
                                          (void *)ents[i].path);
             result->msg = ldap_err2string(result->rc);
             break;
+#ifdef LDAP_OPT_X_TLS_CACERTDIR
+        case APR_LDAP_CA_TYPE_CACERTDIR_BASE64:
+            result->rc = ldap_set_option(ldap, LDAP_OPT_X_TLS_CACERTDIR,
+                                         (void *)ents[i].path);
+            result->msg = ldap_err2string(result->rc);
+            break;
+#endif
         default:
             result->rc = -1;
             result->reason = "LDAP: The OpenLDAP SDK only understands the "
diff --git a/srclib/apr-util/ldap/apr_ldap_rebind.c b/srclib/apr-util/ldap/apr_ldap_rebind.c
new file mode 100644
index 00000000..e0a6c8cc
--- /dev/null
+++ b/srclib/apr-util/ldap/apr_ldap_rebind.c
@@ -0,0 +1,333 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*  apr_ldap_rebind.c -- LDAP rebind callbacks for referrals
+ *
+ *  The LDAP SDK allows a callback to be set to enable rebinding
+ *  for referral processing.
+ *
+ */
+
+#include "apr.h"
+#include "apu.h"
+#include "apu_config.h"
+
+#if APU_DSO_BUILD
+#define APU_DSO_LDAP_BUILD
+#endif
+
+#include "apr_ldap.h"
+#include "apr_errno.h"
+#include "apr_strings.h"
+#include "apr_ldap_rebind.h"
+
+#include "stdio.h"
+
+#if APR_HAS_LDAP
+
+/* Used to store information about connections for use in the referral rebind callback. */
+struct apr_ldap_rebind_entry {
+    apr_pool_t *pool;
+    LDAP *index;
+    const char *bindDN;
+    const char *bindPW;
+    struct apr_ldap_rebind_entry *next;
+};
+typedef struct apr_ldap_rebind_entry apr_ldap_rebind_entry_t;
+
+
+#ifdef NETWARE
+#include "apr_private.h"
+#define get_apd                 APP_DATA* apd = (APP_DATA*)get_app_data(gLibId);
+#define apr_ldap_xref_lock      ((apr_thread_mutex_t *)(apd->gs_ldap_xref_lock))
+#define xref_head               ((apr_ldap_rebind_entry_t *)(apd->gs_xref_head))
+#else
+#if APR_HAS_THREADS
+static apr_thread_mutex_t *apr_ldap_xref_lock = NULL;
+#endif
+static apr_ldap_rebind_entry_t *xref_head = NULL;
+#endif
+
+static int apr_ldap_rebind_set_callback(LDAP *ld);
+static apr_status_t apr_ldap_rebind_remove_helper(void *data);
+
+/* APR utility routine used to create the xref_lock. */
+APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_init(apr_pool_t *pool)
+{
+    apr_status_t retcode = APR_SUCCESS;
+
+#ifdef NETWARE
+    get_apd
+#endif
+
+#if APR_HAS_THREADS
+    if (apr_ldap_xref_lock == NULL) {
+        retcode = apr_thread_mutex_create(&apr_ldap_xref_lock, APR_THREAD_MUTEX_DEFAULT, pool);
+    }
+#endif
+
+    return(retcode);
+}
+
+
+APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_add(apr_pool_t *pool,
+                                                   LDAP *ld, 
+                                                   const char *bindDN, 
+                                                   const char *bindPW)
+{
+    apr_status_t retcode = APR_SUCCESS;
+    apr_ldap_rebind_entry_t *new_xref;
+
+#ifdef NETWARE
+    get_apd
+#endif
+
+    new_xref = (apr_ldap_rebind_entry_t *)apr_pcalloc(pool, sizeof(apr_ldap_rebind_entry_t));
+    if (new_xref) {
+        new_xref->pool = pool;
+        new_xref->index = ld;
+        if (bindDN) {
+            new_xref->bindDN = apr_pstrdup(pool, bindDN);
+        }
+        if (bindPW) {
+            new_xref->bindPW = apr_pstrdup(pool, bindPW);
+        }
+    
+#if APR_HAS_THREADS
+       apr_thread_mutex_lock(apr_ldap_xref_lock);
+#endif
+    
+        new_xref->next = xref_head;
+        xref_head = new_xref;
+    
+#if APR_HAS_THREADS
+        apr_thread_mutex_unlock(apr_ldap_xref_lock);
+#endif
+    }
+    else {
+        return(APR_ENOMEM);
+    }
+
+    retcode = apr_ldap_rebind_set_callback(ld);
+    if (APR_SUCCESS != retcode) {
+        apr_ldap_rebind_remove(ld);
+        return retcode;
+    }
+
+    apr_pool_cleanup_register(pool, ld,
+                              apr_ldap_rebind_remove_helper,
+                              apr_pool_cleanup_null);
+
+    return(APR_SUCCESS);
+}
+
+
+APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_remove(LDAP *ld)
+{
+    apr_ldap_rebind_entry_t *tmp_xref, *prev = NULL;
+
+#ifdef NETWARE
+    get_apd
+#endif
+
+#if APR_HAS_THREADS
+    apr_thread_mutex_lock(apr_ldap_xref_lock);
+#endif
+    tmp_xref = xref_head;
+
+    while ((tmp_xref) && (tmp_xref->index != ld)) {
+        prev = tmp_xref;
+        tmp_xref = tmp_xref->next;
+    }
+
+    if (tmp_xref) {
+        if (tmp_xref == xref_head) {
+            xref_head = xref_head->next;
+        }
+        else {
+            prev->next = tmp_xref->next;
+        }
+
+        /* tmp_xref and its contents were pool allocated so they don't need to be freed here. */
+
+        /* remove the cleanup, just in case this was done manually */
+        apr_pool_cleanup_kill(tmp_xref->pool, tmp_xref->index,
+                              apr_ldap_rebind_remove_helper);
+    }
+
+#if APR_HAS_THREADS
+    apr_thread_mutex_unlock(apr_ldap_xref_lock);
+#endif
+    return APR_SUCCESS;
+}
+
+
+static apr_status_t apr_ldap_rebind_remove_helper(void *data)
+{
+    LDAP *ld = (LDAP *)data;
+    apr_ldap_rebind_remove(ld);
+    return APR_SUCCESS;
+}
+
+
+static apr_ldap_rebind_entry_t *apr_ldap_rebind_lookup(LDAP *ld)
+{
+    apr_ldap_rebind_entry_t *tmp_xref, *match = NULL;
+
+#ifdef NETWARE
+    get_apd
+#endif
+
+#if APR_HAS_THREADS
+    apr_thread_mutex_lock(apr_ldap_xref_lock);
+#endif
+    tmp_xref = xref_head;
+
+    while (tmp_xref) {
+        if (tmp_xref->index == ld) {
+            match = tmp_xref;
+            tmp_xref = NULL;
+        }
+        else {
+            tmp_xref = tmp_xref->next;
+        }
+    }
+
+#if APR_HAS_THREADS
+    apr_thread_mutex_unlock(apr_ldap_xref_lock);
+#endif
+
+    return (match);
+}
+
+#if APR_HAS_TIVOLI_LDAPSDK
+
+/* LDAP_rebindproc() Tivoli LDAP style
+ *     Rebind callback function. Called when chasing referrals. See API docs.
+ * ON ENTRY:
+ *     ld       Pointer to an LDAP control structure. (input only)
+ *     binddnp  Pointer to an Application DName used for binding (in *or* out)
+ *     passwdp  Pointer to the password associated with the DName (in *or* out)
+ *     methodp  Pointer to the Auth method (output only)
+ *     freeit   Flag to indicate if this is a lookup or a free request (input only)
+ */
+static int LDAP_rebindproc(LDAP *ld, char **binddnp, char **passwdp, int *methodp, int freeit)
+{
+    if (!freeit) {
+        apr_ldap_rebind_entry_t *my_conn;
+
+        *methodp = LDAP_AUTH_SIMPLE;
+        my_conn = apr_ldap_rebind_lookup(ld);
+
+        if ((my_conn) && (my_conn->bindDN != NULL)) {
+            *binddnp = strdup(my_conn->bindDN);
+            *passwdp = strdup(my_conn->bindPW);
+        } else {
+            *binddnp = NULL;
+            *passwdp = NULL;
+        }
+    } else {
+        if (*binddnp) {
+            free(*binddnp);
+        }
+        if (*passwdp) {
+            free(*passwdp);
+        }
+    }
+
+    return LDAP_SUCCESS;
+}
+
+static int apr_ldap_rebind_set_callback(LDAP *ld)
+{
+    ldap_set_rebind_proc(ld, (LDAPRebindProc)LDAP_rebindproc);
+    return APR_SUCCESS;
+}
+
+#elif APR_HAS_OPENLDAP_LDAPSDK
+
+/* LDAP_rebindproc() openLDAP V3 style
+ * ON ENTRY:
+ *     ld       Pointer to an LDAP control structure. (input only)
+ *     url      Unused in this routine
+ *     request  Unused in this routine
+ *     msgid    Unused in this routine
+ *     params   Unused in this routine
+ */
+static int LDAP_rebindproc(LDAP *ld, LDAP_CONST char *url, ber_tag_t request, ber_int_t msgid, void *params)
+{
+    apr_ldap_rebind_entry_t *my_conn;
+    const char *bindDN = NULL;
+    const char *bindPW = NULL;
+
+    my_conn = apr_ldap_rebind_lookup(ld);
+
+    if ((my_conn) && (my_conn->bindDN != NULL)) {
+        bindDN = my_conn->bindDN;
+        bindPW = my_conn->bindPW;
+    }
+
+    return (ldap_bind_s(ld, bindDN, bindPW, LDAP_AUTH_SIMPLE));
+}
+
+static int apr_ldap_rebind_set_callback(LDAP *ld)
+{
+    ldap_set_rebind_proc(ld, LDAP_rebindproc, NULL);
+    return APR_SUCCESS;
+}
+
+#elif APR_HAS_NOVELL_LDAPSDK
+
+/* LDAP_rebindproc() openLDAP V3 style
+ * ON ENTRY:
+ *     ld       Pointer to an LDAP control structure. (input only)
+ *     url      Unused in this routine
+ *     request  Unused in this routine
+ *     msgid    Unused in this routine
+ */
+static int LDAP_rebindproc(LDAP *ld, LDAP_CONST char *url, int request, ber_int_t msgid)
+{
+
+    apr_ldap_rebind_entry_t *my_conn;
+    const char *bindDN = NULL;
+    const char *bindPW = NULL;
+
+    my_conn = apr_ldap_rebind_lookup(ld);
+
+    if ((my_conn) && (my_conn->bindDN != NULL)) {
+        bindDN = my_conn->bindDN;
+        bindPW = my_conn->bindPW;
+    }
+
+    return (ldap_bind_s(ld, bindDN, bindPW, LDAP_AUTH_SIMPLE));
+}
+
+static int apr_ldap_rebind_set_callback(LDAP *ld)
+{
+    ldap_set_rebind_proc(ld, LDAP_rebindproc);
+    return APR_SUCCESS;
+}
+
+#else         /* Implementation not recognised */
+
+static int apr_ldap_rebind_set_callback(LDAP *ld)
+{
+    return APR_ENOTIMPL;
+}
+
+#endif
+
+#endif       /* APR_HAS_LDAP */
diff --git a/srclib/apr-util/ldap/apr_ldap_stub.c b/srclib/apr-util/ldap/apr_ldap_stub.c
new file mode 100644
index 00000000..24bb0d28
--- /dev/null
+++ b/srclib/apr-util/ldap/apr_ldap_stub.c
@@ -0,0 +1,147 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr.h"
+#include "apu.h"
+#include "apu_config.h"
+#include "apr_ldap.h"
+#include "apu_internal.h"
+#include "apr_dso.h"
+#include "apr_errno.h"
+#include "apr_pools.h"
+#include "apr_strings.h"
+#include "apu_version.h"
+
+#if APR_HAS_LDAP
+
+#if APU_DSO_BUILD
+
+static struct apr__ldap_dso_fntable *lfn = NULL;
+
+static apr_status_t load_ldap(apr_pool_t *pool)
+{
+    char *modname;
+    apr_dso_handle_sym_t symbol;
+    apr_status_t rv;
+
+    /* deprecate in 2.0 - permit implicit initialization */
+    apu_dso_init(pool);
+
+    rv = apu_dso_mutex_lock();
+    if (rv) {
+        return rv;
+    }
+
+#if defined(NETWARE)
+    modname = "aprldap.nlm";
+#elif defined(WIN32)
+    modname = "apr_ldap-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll";
+#else
+    modname = "apr_ldap-" APU_STRINGIFY(APU_MAJOR_VERSION) ".so";
+#endif
+    rv = apu_dso_load(&symbol, modname, "apr__ldap_fns", pool);
+    if (rv == APR_SUCCESS) {
+        lfn = symbol;
+    }
+    apu_dso_mutex_unlock();
+
+    return rv;
+}
+
+#define LOAD_LDAP_STUB(pool, failres) \
+    if (!lfn && (load_ldap(pool) != APR_SUCCESS)) \
+        return failres;
+
+APU_DECLARE_LDAP(int) apr_ldap_info(apr_pool_t *pool,
+                                    apr_ldap_err_t **result_err)
+{
+    LOAD_LDAP_STUB(pool, -1);
+    return lfn->info(pool, result_err);
+}
+
+APU_DECLARE_LDAP(int) apr_ldap_init(apr_pool_t *pool,
+                                    LDAP **ldap,
+                                    const char *hostname,
+                                    int portno,
+                                    int secure,
+                                    apr_ldap_err_t **result_err)
+{
+    LOAD_LDAP_STUB(pool, -1);
+    return lfn->init(pool, ldap, hostname, portno, secure, result_err);
+}
+
+APU_DECLARE_LDAP(int) apr_ldap_ssl_init(apr_pool_t *pool,
+                                        const char *cert_auth_file,
+                                        int cert_file_type,
+                                        apr_ldap_err_t **result_err)
+{
+    LOAD_LDAP_STUB(pool, -1);
+    return lfn->ssl_init(pool, cert_auth_file, cert_file_type, result_err);
+}
+
+APU_DECLARE_LDAP(int) apr_ldap_ssl_deinit(void)
+{
+    if (!lfn)
+        return -1;
+    return lfn->ssl_deinit();
+}
+
+APU_DECLARE_LDAP(int) apr_ldap_get_option(apr_pool_t *pool,
+                                          LDAP *ldap,
+                                          int option,
+                                          void *outvalue,
+                                          apr_ldap_err_t **result_err)
+{
+    LOAD_LDAP_STUB(pool, -1);
+    return lfn->get_option(pool, ldap, option, outvalue, result_err);
+}
+
+APU_DECLARE_LDAP(int) apr_ldap_set_option(apr_pool_t *pool,
+                                          LDAP *ldap,
+                                          int option,
+                                          const void *invalue,
+                                          apr_ldap_err_t **result_err)
+{
+    LOAD_LDAP_STUB(pool, -1);
+    return lfn->set_option(pool, ldap, option, invalue, result_err);
+}
+
+APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_init(apr_pool_t *pool)
+{
+    LOAD_LDAP_STUB(pool, APR_EGENERAL);
+    return lfn->rebind_init(pool);
+}
+
+APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_add(apr_pool_t *pool,
+                                                   LDAP *ld,
+                                                   const char *bindDN,
+                                                   const char *bindPW)
+{
+    LOAD_LDAP_STUB(pool, APR_EGENERAL);
+    return lfn->rebind_add(pool, ld, bindDN, bindPW);
+}
+
+APU_DECLARE_LDAP(apr_status_t) apr_ldap_rebind_remove(LDAP *ld)
+{
+    if (!lfn)
+        return APR_EGENERAL;
+    return lfn->rebind_remove(ld);
+}
+
+#endif /* APU_DSO_BUILD */
+
+#endif /* APR_HAS_LDAP */
+
diff --git a/srclib/apr-util/libaprutil.dsp b/srclib/apr-util/libaprutil.dsp
index bc9afeb1..5af58cd9 100644
--- a/srclib/apr-util/libaprutil.dsp
+++ b/srclib/apr-util/libaprutil.dsp
@@ -54,8 +54,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"Release\libaprutil-1.dll" /pdb:"Release\libaprutil-1.pdb" /implib:"Release\libaprutil-1.lib" /MACHINE:X86 /opt:ref
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"Release\libaprutil-1.dll" /pdb:"Release\libaprutil-1.pdb" /implib:"Release\libaprutil-1.lib" /MACHINE:X86 /opt:ref
 # Begin Special Build Tool
 TargetPath=Release\libaprutil-1.dll
 SOURCE="$(InputPath)"
@@ -86,8 +86,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\libaprutil-1.dll" /pdb:"Debug\libaprutil-1.pdb" /implib:"Debug\libaprutil-1.lib" /MACHINE:X86
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"Debug\libaprutil-1.dll" /pdb:"Debug\libaprutil-1.pdb" /implib:"Debug\libaprutil-1.lib" /MACHINE:X86
 # Begin Special Build Tool
 TargetPath=Debug\libaprutil-1.dll
 SOURCE="$(InputPath)"
@@ -118,8 +118,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\libaprutil-1.dll" /pdb:"x64\Release\libaprutil-1.pdb" /implib:"x64\Release\libaprutil-1.lib" /MACHINE:X64 /opt:ref
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Release\libaprutil-1.dll" /pdb:"x64\Release\libaprutil-1.pdb" /implib:"x64\Release\libaprutil-1.lib" /MACHINE:X64 /opt:ref
 # Begin Special Build Tool
 TargetPath=x64\Release\libaprutil-1.dll
 SOURCE="$(InputPath)"
@@ -150,8 +150,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\libaprutil-1.dll" /pdb:"x64\Debug\libaprutil-1.pdb" /implib:"x64\Debug\libaprutil-1.lib" /MACHINE:X64
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE60000" /subsystem:windows /dll /incremental:no /debug /out:"x64\Debug\libaprutil-1.dll" /pdb:"x64\Debug\libaprutil-1.pdb" /implib:"x64\Debug\libaprutil-1.lib" /MACHINE:X64
 # Begin Special Build Tool
 TargetPath=x64\Debug\libaprutil-1.dll
 SOURCE="$(InputPath)"
@@ -258,19 +258,33 @@ SOURCE=.\dbd\apr_dbd.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\dbd\apr_dbd_freetds.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
 SOURCE=.\dbd\apr_dbd_mysql.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\dbd\apr_dbd_oracle.c
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
 SOURCE=.\dbd\apr_dbd_pgsql.c
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
 SOURCE=.\dbd\apr_dbd_sqlite2.c
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
 SOURCE=.\dbd\apr_dbd_sqlite3.c
+# PROP Exclude_From_Build 1
 # End Source File
 # End Group
 # Begin Group "dbm"
@@ -315,15 +329,34 @@ SOURCE=.\hooks\apr_hooks.c
 # Begin Source File
 
 SOURCE=.\ldap\apr_ldap_init.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\ldap\apr_ldap_option.c
+# PROP Exclude_From_Build 1
+# End Source File 
+# Begin Source File
+
+SOURCE=.\ldap\apr_ldap_rebind.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\ldap\apr_ldap_stub.c
 # End Source File
 # Begin Source File
 
 SOURCE=.\ldap\apr_ldap_url.c
 # End Source File
+# End Group
+# Begin Group "memcache"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\ldap\apr_ldap_option.c
-# End Source File 
+SOURCE=.\memcache\apr_memcache.c
+# End Source File
 # End Group
 # Begin Group "misc"
 
@@ -334,6 +367,10 @@ SOURCE=.\misc\apr_date.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\misc\apu_dso.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\misc\apr_queue.c
 # End Source File
 # Begin Source File
@@ -346,6 +383,10 @@ SOURCE=.\misc\apr_rmm.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\misc\apr_thread_pool.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\misc\apu_version.c
 # End Source File
 # End Group
@@ -726,6 +767,10 @@ SOURCE=.\include\apr_md5.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\apr_memcache.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\apr_optional.h
 # End Source File
 # Begin Source File
@@ -758,6 +803,10 @@ SOURCE=.\include\apr_strmatch.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\apr_thread_pool.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\apr_uri.h
 # End Source File
 # Begin Source File
diff --git a/srclib/apr-util/libaprutil.rc b/srclib/apr-util/libaprutil.rc
index 06a527f6..bd10644f 100644
--- a/srclib/apr-util/libaprutil.rc
+++ b/srclib/apr-util/libaprutil.rc
@@ -1,23 +1,29 @@
 #include "apu_version.h"
 
-#define APU_COPYRIGHT "Copyright 2000-2005 The Apache Software " \
+#define APU_COPYRIGHT "Copyright (c) 2008 The Apache Software " \
                       "Foundation or its licensors, as applicable."
 
-#define APU_LICENSE "Licensed under the Apache License, Version 2.0 " \
-                    "(the ""License""); you may not use this file except " \
-                    "in compliance with the License.  You may obtain a " \
-                    "copy of the License at\r\n\r\n" \
-                    "http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n" \
-                    "Unless required by applicable law or agreed to in " \
-                    "writing, software distributed under the License is " \
-                    "distributed on an ""AS IS"" BASIS, WITHOUT " \
-                    "WARRANTIES OR CONDITIONS OF ANY KIND, either " \
-                    "express or implied.  See the License for the " \
-                    "specific language governing permissions and " \
-                    "limitations under the License."
+#define APU_LICENSE \
+  "Licensed to the Apache Software Foundation (ASF) under one or more " \
+  "contributor license agreements.  See the NOTICE file distributed with " \
+  "this work for additional information regarding copyright ownership.  " \
+  "The ASF licenses this file to You under the Apache License, Version 2.0 " \
+  "(the ""License""); you may not use this file except in compliance with " \
+  "the License.  You may obtain a copy of the License at\r\n\r\n" \
+  "http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n" \
+  "Unless required by applicable law or agreed to in writing, software " \
+  "distributed under the License is distributed on an ""AS IS"" BASIS, " \
+  "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  " \
+  "See the License for the specific language governing permissions and " \
+  "limitations under the License."
 
+#ifdef DLL_NAME
+#define APU_DLL_BASENAME APU_STRINGIFY(DLL_NAME) "-" APU_STRINGIFY(APU_MAJOR_VERSION)
+#define APU_DLL_DESCRIPTION "Apache Portable Runtime " APU_STRINGIFY(DLL_NAME) " Module"
+#else
 #define APU_DLL_BASENAME "libaprutil-" APU_STRINGIFY(APU_MAJOR_VERSION)
-
+#define APU_DLL_DESCRIPTION "Apache Portable Runtime Utility Library"
+#endif
 
 1 VERSIONINFO
  FILEVERSION APU_VERSION_STRING_CSV,0
@@ -50,7 +56,7 @@ BEGIN
     BEGIN
     VALUE "Comments", APU_LICENSE "\0"
       VALUE "CompanyName", "Apache Software Foundation\0"
-      VALUE "FileDescription", "Apache Portable Runtime Library\0"
+      VALUE "FileDescription", APU_DLL_DESCRIPTION "\0"
       VALUE "FileVersion", APU_VERSION_STRING "\0"
       VALUE "InternalName", APU_DLL_BASENAME "\0"
       VALUE "LegalCopyright", APU_COPYRIGHT "\0"
diff --git a/srclib/apr-util/memcache/apr_memcache.c b/srclib/apr-util/memcache/apr_memcache.c
new file mode 100644
index 00000000..3d0988e0
--- /dev/null
+++ b/srclib/apr-util/memcache/apr_memcache.c
@@ -0,0 +1,1664 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr_memcache.h"
+#include "apr_poll.h"
+#include "apr_version.h"
+#include <stdlib.h>
+
+#define BUFFER_SIZE 512
+struct apr_memcache_conn_t
+{
+    char *buffer;
+    apr_size_t blen;
+    apr_pool_t *p;
+    apr_socket_t *sock;
+    apr_bucket_alloc_t *balloc;
+    apr_bucket_brigade *bb;
+    apr_bucket_brigade *tb;
+    apr_memcache_server_t *ms;
+};                                                          
+
+/* Strings for Client Commands */
+
+#define MC_EOL "\r\n"
+#define MC_EOL_LEN (sizeof(MC_EOL)-1)
+
+#define MC_WS " "
+#define MC_WS_LEN (sizeof(MC_WS)-1)
+
+#define MC_GET "get "
+#define MC_GET_LEN (sizeof(MC_GET)-1)
+
+#define MC_SET "set "
+#define MC_SET_LEN (sizeof(MC_SET)-1)
+
+#define MC_ADD "add "
+#define MC_ADD_LEN (sizeof(MC_ADD)-1)
+
+#define MC_REPLACE "replace "
+#define MC_REPLACE_LEN (sizeof(MC_REPLACE)-1)
+
+#define MC_DELETE "delete "
+#define MC_DELETE_LEN (sizeof(MC_DELETE)-1)
+
+#define MC_INCR "incr "
+#define MC_INCR_LEN (sizeof(MC_INCR)-1)
+
+#define MC_DECR "decr "
+#define MC_DECR_LEN (sizeof(MC_DECR)-1)
+
+#define MC_VERSION "version"
+#define MC_VERSION_LEN (sizeof(MC_VERSION)-1)
+
+#define MC_STATS "stats"
+#define MC_STATS_LEN (sizeof(MC_STATS)-1)
+
+#define MC_QUIT "quit"
+#define MC_QUIT_LEN (sizeof(MC_QUIT)-1)
+
+/* Strings for Server Replies */
+
+#define MS_STORED "STORED"
+#define MS_STORED_LEN (sizeof(MS_STORED)-1)
+
+#define MS_NOT_STORED "NOT_STORED"
+#define MS_NOT_STORED_LEN (sizeof(MS_NOT_STORED)-1)
+
+#define MS_DELETED "DELETED"
+#define MS_DELETED_LEN (sizeof(MS_DELETED)-1)
+
+#define MS_NOT_FOUND "NOT_FOUND"
+#define MS_NOT_FOUND_LEN (sizeof(MS_NOT_FOUND)-1)
+
+#define MS_VALUE "VALUE"
+#define MS_VALUE_LEN (sizeof(MS_VALUE)-1)
+
+#define MS_ERROR "ERROR"
+#define MS_ERROR_LEN (sizeof(MS_ERROR)-1)
+
+#define MS_VERSION "VERSION"
+#define MS_VERSION_LEN (sizeof(MS_VERSION)-1)
+
+#define MS_STAT "STAT"
+#define MS_STAT_LEN (sizeof(MS_STAT)-1)
+
+#define MS_END "END"
+#define MS_END_LEN (sizeof(MS_END)-1)
+
+/** Server and Query Structure for a multiple get */
+struct cache_server_query_t {
+    apr_memcache_server_t* ms;
+    apr_memcache_conn_t* conn;
+    struct iovec* query_vec;
+    apr_int32_t query_vec_count;
+};
+
+#define MULT_GET_TIMEOUT 50000
+
+static apr_status_t make_server_dead(apr_memcache_t *mc, apr_memcache_server_t *ms)
+{
+#if APR_HAS_THREADS
+    apr_thread_mutex_lock(ms->lock);
+#endif
+    ms->status = APR_MC_SERVER_DEAD;
+    ms->btime = apr_time_now();
+#if APR_HAS_THREADS
+    apr_thread_mutex_unlock(ms->lock);
+#endif
+    return APR_SUCCESS;
+}
+
+static apr_status_t make_server_live(apr_memcache_t *mc, apr_memcache_server_t *ms)
+{
+    ms->status = APR_MC_SERVER_LIVE; 
+    return APR_SUCCESS;
+}
+
+
+APU_DECLARE(apr_status_t) apr_memcache_add_server(apr_memcache_t *mc, apr_memcache_server_t *ms)
+{
+    apr_status_t rv = APR_SUCCESS;
+
+    if(mc->ntotal >= mc->nalloc) {
+        return APR_ENOMEM;
+    }
+
+    mc->live_servers[mc->ntotal] = ms;
+    mc->ntotal++;
+    make_server_live(mc, ms);
+    return rv;
+}
+
+static apr_status_t mc_version_ping(apr_memcache_server_t *ms);
+
+APU_DECLARE(apr_memcache_server_t *) 
+apr_memcache_find_server_hash(apr_memcache_t *mc, const apr_uint32_t hash)
+{
+    if (mc->server_func) {
+        return mc->server_func(mc->server_baton, mc, hash);
+    }
+    else {
+        return apr_memcache_find_server_hash_default(NULL, mc, hash);
+    }
+}   
+
+APU_DECLARE(apr_memcache_server_t *) 
+apr_memcache_find_server_hash_default(void *baton, apr_memcache_t *mc,
+                                      const apr_uint32_t hash)
+{
+    apr_memcache_server_t *ms = NULL;
+    apr_uint32_t h = hash ? hash : 1;
+    apr_uint32_t i = 0;
+    apr_time_t curtime = 0;
+   
+    if(mc->ntotal == 0) {
+        return NULL;
+    }
+
+    do {
+        ms = mc->live_servers[h % mc->ntotal];
+        if(ms->status == APR_MC_SERVER_LIVE) {
+            break;
+        }
+        else {
+            if (curtime == 0) {
+                curtime = apr_time_now();
+            }
+#if APR_HAS_THREADS
+            apr_thread_mutex_lock(ms->lock);
+#endif
+            /* Try the the dead server, every 5 seconds */
+            if (curtime - ms->btime >  apr_time_from_sec(5)) {
+                if (mc_version_ping(ms) == APR_SUCCESS) {
+                    ms->btime = curtime;
+                    make_server_live(mc, ms);
+#if APR_HAS_THREADS
+                    apr_thread_mutex_unlock(ms->lock);
+#endif
+                    break;
+                }
+            }
+#if APR_HAS_THREADS
+            apr_thread_mutex_unlock(ms->lock);
+#endif
+        }
+        h++;
+        i++;
+    } while(i < mc->ntotal);
+
+    if (i == mc->ntotal) {
+        ms = NULL;
+    }
+
+    return ms;
+}
+
+APU_DECLARE(apr_memcache_server_t *) apr_memcache_find_server(apr_memcache_t *mc, const char *host, apr_port_t port)
+{
+    int i;
+
+    for (i = 0; i < mc->ntotal; i++) {
+        if (strcmp(mc->live_servers[i]->host, host) == 0
+            && mc->live_servers[i]->port == port) {
+
+            return mc->live_servers[i];
+        }
+    }
+
+    return NULL;
+}
+
+static apr_status_t ms_find_conn(apr_memcache_server_t *ms, apr_memcache_conn_t **conn) 
+{
+#if APR_HAS_THREADS
+    return apr_reslist_acquire(ms->conns, (void **)conn);
+#else
+    *conn = ms->conn;
+    return APR_SUCCESS;
+#endif
+}
+
+static apr_status_t ms_bad_conn(apr_memcache_server_t *ms, apr_memcache_conn_t *conn) 
+{
+#if APR_HAS_THREADS
+    return apr_reslist_invalidate(ms->conns, conn);
+#else
+    return APR_SUCCESS;
+#endif
+}
+
+static apr_status_t ms_release_conn(apr_memcache_server_t *ms, apr_memcache_conn_t *conn) 
+{
+#if APR_HAS_THREADS
+    return apr_reslist_release(ms->conns, conn);
+#else
+    return APR_SUCCESS;
+#endif
+}
+
+APU_DECLARE(apr_status_t) apr_memcache_enable_server(apr_memcache_t *mc, apr_memcache_server_t *ms)
+{
+    apr_status_t rv = APR_SUCCESS;
+
+    if (ms->status == APR_MC_SERVER_LIVE) {
+        return rv;
+    }
+
+    rv = make_server_live(mc, ms);
+    return rv;
+}
+
+APU_DECLARE(apr_status_t) apr_memcache_disable_server(apr_memcache_t *mc, apr_memcache_server_t *ms)
+{
+    return make_server_dead(mc, ms);
+}
+
+static apr_status_t conn_connect(apr_memcache_conn_t *conn)
+{
+    apr_status_t rv = APR_SUCCESS;
+    apr_sockaddr_t *sa;
+
+    rv = apr_sockaddr_info_get(&sa, conn->ms->host, APR_INET, conn->ms->port, 0, conn->p);
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
+    rv = apr_socket_timeout_set(conn->sock, 1 * APR_USEC_PER_SEC);
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
+    rv = apr_socket_connect(conn->sock, sa);
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
+    rv = apr_socket_timeout_set(conn->sock, -1);
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
+    return rv;
+}
+
+
+static apr_status_t
+mc_conn_construct(void **conn_, void *params, apr_pool_t *pool)
+{
+    apr_status_t rv = APR_SUCCESS;
+    apr_memcache_conn_t *conn;
+    apr_bucket *e;
+    apr_pool_t *np;
+    apr_memcache_server_t *ms = params;
+
+    rv = apr_pool_create(&np, pool);
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
+    conn = apr_palloc(np, sizeof( apr_memcache_conn_t ));
+
+    conn->p = np;
+
+    rv = apr_socket_create(&conn->sock, APR_INET, SOCK_STREAM, 0, np);
+
+    if (rv != APR_SUCCESS) {
+        apr_pool_destroy(np);
+        return rv;
+    }
+
+    conn->balloc = apr_bucket_alloc_create(conn->p);
+    conn->bb = apr_brigade_create(conn->p, conn->balloc);
+    conn->tb = apr_brigade_create(conn->p, conn->balloc);
+    conn->buffer = apr_palloc(conn->p, BUFFER_SIZE);
+    conn->blen = 0;
+    conn->ms = ms;
+
+    e = apr_bucket_socket_create(conn->sock, conn->balloc);
+    APR_BRIGADE_INSERT_TAIL(conn->bb, e);
+
+    rv = conn_connect(conn);
+    if (rv != APR_SUCCESS) {
+        apr_pool_destroy(np);
+    }
+    else {
+        *conn_ = conn;
+    }
+    
+    return rv;
+}
+
+static apr_status_t
+mc_conn_destruct(void *conn_, void *params, apr_pool_t *pool)
+{
+    apr_memcache_conn_t *conn = (apr_memcache_conn_t*)conn_;
+    struct iovec vec[2];
+    apr_size_t written;
+    
+    /* send a quit message to the memcached server to be nice about it. */
+    vec[0].iov_base = MC_QUIT;
+    vec[0].iov_len = MC_QUIT_LEN;
+
+    vec[1].iov_base = MC_EOL;
+    vec[1].iov_len = MC_EOL_LEN;
+    
+    /* Return values not checked, since we just want to make it go away. */
+    apr_socket_sendv(conn->sock, vec, 2, &written);
+    apr_socket_close(conn->sock);
+    
+    return APR_SUCCESS;
+}
+
+APU_DECLARE(apr_status_t) apr_memcache_server_create(apr_pool_t *p, 
+                                                     const char *host, apr_port_t port, 
+                                                     apr_uint32_t min, apr_uint32_t smax,
+                                                     apr_uint32_t max, apr_uint32_t ttl,
+                                                     apr_memcache_server_t **ms)
+{
+    apr_status_t rv = APR_SUCCESS;
+    apr_memcache_server_t *server;
+    apr_pool_t *np;
+
+    rv = apr_pool_create(&np, p);
+
+    server = apr_palloc(np, sizeof(apr_memcache_server_t));
+
+    server->p = np;
+    server->host = apr_pstrdup(np, host);
+    server->port = port;
+    server->status = APR_MC_SERVER_DEAD;
+#if APR_HAS_THREADS
+    rv = apr_thread_mutex_create(&server->lock, APR_THREAD_MUTEX_DEFAULT, np);
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
+    rv = apr_reslist_create(&server->conns, 
+                               min,                     /* hard minimum */
+                               smax,                    /* soft maximum */
+                               max,                     /* hard maximum */
+                               ttl,                     /* Time to live */
+                               mc_conn_construct,       /* Make a New Connection */
+                               mc_conn_destruct,        /* Kill Old Connection */
+                               server, np);
+#else
+    rv = mc_conn_construct((void**)&(server->conn), server, np);
+#endif
+
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
+    *ms = server;
+
+    return rv;
+}
+
+APU_DECLARE(apr_status_t) apr_memcache_create(apr_pool_t *p,
+                                              apr_uint16_t max_servers, apr_uint32_t flags,
+                                              apr_memcache_t **memcache) 
+{
+    apr_status_t rv = APR_SUCCESS;
+    apr_memcache_t *mc;
+    
+    mc = apr_palloc(p, sizeof(apr_memcache_t));
+    mc->p = p;
+    mc->nalloc = max_servers;
+    mc->ntotal = 0;
+    mc->live_servers = apr_palloc(p, mc->nalloc * sizeof(struct apr_memcache_server_t *));
+    mc->hash_func = NULL;
+    mc->hash_baton = NULL;
+    mc->server_func = NULL;
+    mc->server_baton = NULL;
+    *memcache = mc;
+    return rv;
+}
+
+
+/* The crc32 functions and data was originally written by Spencer
+ * Garrett <srg@quick.com> and was gleaned from the PostgreSQL source
+ * tree via the files contrib/ltree/crc32.[ch] and from FreeBSD at
+ * src/usr.bin/cksum/crc32.c.
+ */ 
+
+static const apr_uint32_t crc32tab[256] = {
+  0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
+  0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
+  0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+  0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
+  0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
+  0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+  0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
+  0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
+  0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+  0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+  0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
+  0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+  0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
+  0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+  0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+  0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
+  0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
+  0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+  0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
+  0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+  0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+  0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
+  0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
+  0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+  0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
+  0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
+  0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+  0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
+  0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
+  0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+  0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
+  0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
+  0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+  0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
+  0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
+  0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+  0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
+  0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
+  0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+  0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+  0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
+  0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+  0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
+  0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
+  0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+  0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
+  0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
+  0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+  0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
+  0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+  0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+  0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
+  0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
+  0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+  0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
+  0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
+  0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+  0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
+  0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
+  0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+  0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,
+  0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
+  0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+  0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d,
+};
+
+APU_DECLARE(apr_uint32_t) apr_memcache_hash_crc32(void *baton, 
+                                                  const char *data,
+                                                  const apr_size_t data_len)
+{
+    apr_uint32_t i;
+    apr_uint32_t crc;
+    crc = ~0;
+    
+    for (i = 0; i < data_len; i++)
+        crc = (crc >> 8) ^ crc32tab[(crc ^ (data[i])) & 0xff];
+    
+    return ~crc;
+}
+
+APU_DECLARE(apr_uint32_t) apr_memcache_hash_default(void *baton, 
+                                                    const char *data,
+                                                    const apr_size_t data_len)
+{
+    /* The default Perl Client doesn't actually use just crc32 -- it shifts it again
+     * like this....
+     */
+    return ((apr_memcache_hash_crc32(baton, data, data_len) >> 16) & 0x7fff);
+}
+
+APU_DECLARE(apr_uint32_t) apr_memcache_hash(apr_memcache_t *mc,
+                                            const char *data,
+                                            const apr_size_t data_len)
+{
+    if (mc->hash_func) {
+        return mc->hash_func(mc->hash_baton, data, data_len);
+    }
+    else {
+        return apr_memcache_hash_default(NULL, data, data_len);
+    }
+}
+
+static apr_status_t get_server_line(apr_memcache_conn_t *conn)
+{
+    apr_size_t bsize = BUFFER_SIZE;
+    apr_status_t rv = APR_SUCCESS;
+
+    rv = apr_brigade_split_line(conn->tb, conn->bb, APR_BLOCK_READ, BUFFER_SIZE);
+
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
+    rv = apr_brigade_flatten(conn->tb, conn->buffer, &bsize);
+
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
+    conn->blen = bsize;
+    conn->buffer[bsize] = '\0';
+
+    return apr_brigade_cleanup(conn->tb);
+}
+
+static apr_status_t storage_cmd_write(apr_memcache_t *mc,
+                                      char *cmd,
+                                      const apr_size_t cmd_size,
+                                      const char *key,
+                                      char *data,
+                                      const apr_size_t data_size,
+                                      apr_uint32_t timeout,
+                                      apr_uint16_t flags)
+{
+    apr_uint32_t hash;
+    apr_memcache_server_t *ms;
+    apr_memcache_conn_t *conn;
+    apr_status_t rv;
+    apr_size_t written;
+    struct iovec vec[5];
+    apr_size_t klen;
+
+    apr_size_t key_size = strlen(key);
+
+    hash = apr_memcache_hash(mc, key, key_size);
+
+    ms = apr_memcache_find_server_hash(mc, hash);
+
+    if (ms == NULL)
+        return APR_NOTFOUND;
+
+    rv = ms_find_conn(ms, &conn);
+
+    if (rv != APR_SUCCESS) {
+        apr_memcache_disable_server(mc, ms);
+        return rv;
+    }
+
+    /* <command name> <key> <flags> <exptime> <bytes>\r\n<data>\r\n */
+
+    vec[0].iov_base = cmd;
+    vec[0].iov_len  = cmd_size;
+
+    vec[1].iov_base = (void*)key;
+    vec[1].iov_len  = key_size;
+
+    klen = apr_snprintf(conn->buffer, BUFFER_SIZE, " %u %u %" APR_SIZE_T_FMT " " MC_EOL,
+                        flags, timeout, data_size);
+
+    vec[2].iov_base = conn->buffer;
+    vec[2].iov_len  = klen;
+
+    vec[3].iov_base = data;
+    vec[3].iov_len  = data_size;
+
+    vec[4].iov_base = MC_EOL;
+    vec[4].iov_len  = MC_EOL_LEN;
+
+    rv = apr_socket_sendv(conn->sock, vec, 5, &written);
+
+    if (rv != APR_SUCCESS) {
+        ms_bad_conn(ms, conn);
+        apr_memcache_disable_server(mc, ms);
+        return rv;
+    }
+
+    rv = get_server_line(conn);
+
+    if (rv != APR_SUCCESS) {
+        ms_bad_conn(ms, conn);
+        apr_memcache_disable_server(mc, ms);
+        return rv;
+    }
+
+    if (strcmp(conn->buffer, MS_STORED MC_EOL) == 0) {
+        rv = APR_SUCCESS;
+    }
+    else if (strcmp(conn->buffer, MS_NOT_STORED MC_EOL) == 0) {
+        rv = APR_EEXIST;
+    }
+    else {
+        rv = APR_EGENERAL;
+    }
+
+    ms_release_conn(ms, conn);
+
+    return rv;
+}
+
+APU_DECLARE(apr_status_t)
+apr_memcache_set(apr_memcache_t *mc,
+                 const char *key,
+                 char *data,
+                 const apr_size_t data_size,
+                 apr_uint32_t timeout,
+                 apr_uint16_t flags)
+{
+    return storage_cmd_write(mc,
+                           MC_SET, MC_SET_LEN,
+                           key,
+                           data, data_size,
+                           timeout, flags);
+}
+
+APU_DECLARE(apr_status_t)
+apr_memcache_add(apr_memcache_t *mc,
+                 const char *key,
+                 char *data,
+                 const apr_size_t data_size,
+                 apr_uint32_t timeout,
+                 apr_uint16_t flags)
+{
+    return storage_cmd_write(mc, 
+                           MC_ADD, MC_ADD_LEN,
+                           key,
+                           data, data_size,
+                           timeout, flags);
+}
+
+APU_DECLARE(apr_status_t)
+apr_memcache_replace(apr_memcache_t *mc,
+                 const char *key,
+                 char *data,
+                 const apr_size_t data_size,
+                 apr_uint32_t timeout,
+                 apr_uint16_t flags)
+{
+    return storage_cmd_write(mc,
+                           MC_REPLACE, MC_REPLACE_LEN,
+                           key,
+                           data, data_size,
+                           timeout, flags);
+
+}
+
+APU_DECLARE(apr_status_t)
+apr_memcache_getp(apr_memcache_t *mc,
+                  apr_pool_t *p,
+                  const char *key,
+                  char **baton,
+                  apr_size_t *new_length,
+                  apr_uint16_t *flags_)
+{
+    apr_status_t rv;
+    apr_memcache_server_t *ms;
+    apr_memcache_conn_t *conn;
+    apr_uint32_t hash;
+    apr_size_t written;
+    apr_size_t klen = strlen(key);
+    struct iovec vec[3];
+
+    hash = apr_memcache_hash(mc, key, klen);
+    ms = apr_memcache_find_server_hash(mc, hash);
+    if (ms == NULL)
+        return APR_NOTFOUND;
+    
+    rv = ms_find_conn(ms, &conn);
+
+    if (rv != APR_SUCCESS) {
+        apr_memcache_disable_server(mc, ms);
+        return rv;
+    }
+
+    /* get <key>[ <key>[...]]\r\n */
+    vec[0].iov_base = MC_GET;
+    vec[0].iov_len  = MC_GET_LEN;
+
+    vec[1].iov_base = (void*)key;
+    vec[1].iov_len  = klen;
+
+    vec[2].iov_base = MC_EOL;
+    vec[2].iov_len  = MC_EOL_LEN;
+
+    rv = apr_socket_sendv(conn->sock, vec, 3, &written);
+
+    if (rv != APR_SUCCESS) {
+        ms_bad_conn(ms, conn);
+        apr_memcache_disable_server(mc, ms);
+        return rv;
+    }
+
+    rv = get_server_line(conn);
+    if (rv != APR_SUCCESS) {
+        ms_bad_conn(ms, conn);
+        apr_memcache_disable_server(mc, ms);
+        return rv;
+    }
+
+    if (strncmp(MS_VALUE, conn->buffer, MS_VALUE_LEN) == 0) {
+        char *flags;
+        char *length;
+        char *start;
+        char *last;
+        apr_size_t len = 0;
+
+        start = conn->buffer;
+        flags = apr_strtok(conn->buffer, " ", &last);
+        flags = apr_strtok(NULL, " ", &last);
+        flags = apr_strtok(NULL, " ", &last);
+
+        if (flags_) {
+            *flags_ = atoi(flags);
+        }
+
+        length = apr_strtok(NULL, " ", &last);
+        if (length) {
+            len = atoi(length);
+        }
+
+        if (len < 0)  {
+            *new_length = 0;
+            *baton = NULL;
+        }
+        else {
+            apr_bucket_brigade *bbb;
+            apr_bucket *e;
+
+            /* eat the trailing \r\n */
+            rv = apr_brigade_partition(conn->bb, len+2, &e);
+
+            if (rv != APR_SUCCESS) {
+                ms_bad_conn(ms, conn);
+                apr_memcache_disable_server(mc, ms);
+                return rv;
+            }
+            
+            bbb = apr_brigade_split(conn->bb, e);
+
+            rv = apr_brigade_pflatten(conn->bb, baton, &len, p);
+
+            if (rv != APR_SUCCESS) {
+                ms_bad_conn(ms, conn);
+                apr_memcache_disable_server(mc, ms);
+                return rv;
+            }
+
+            rv = apr_brigade_destroy(conn->bb);
+            if (rv != APR_SUCCESS) {
+                ms_bad_conn(ms, conn);
+                apr_memcache_disable_server(mc, ms);
+                return rv;
+            }
+
+            conn->bb = bbb;
+
+            *new_length = len - 2;
+            (*baton)[*new_length] = '\0';
+        }
+        
+        rv = get_server_line(conn);
+        if (rv != APR_SUCCESS) {
+            ms_bad_conn(ms, conn);
+            apr_memcache_disable_server(mc, ms);
+            return rv;
+        }
+
+        if (strncmp(MS_END, conn->buffer, MS_END_LEN) != 0) {
+            rv = APR_EGENERAL;
+        }
+    }
+    else if (strncmp(MS_END, conn->buffer, MS_END_LEN) == 0) {
+        rv = APR_NOTFOUND;
+    }
+    else {
+        rv = APR_EGENERAL;
+    }
+
+    ms_release_conn(ms, conn);
+
+    return rv;
+}
+
+APU_DECLARE(apr_status_t)
+apr_memcache_delete(apr_memcache_t *mc,
+                    const char *key,
+                    apr_uint32_t timeout)
+{
+    apr_status_t rv;
+    apr_memcache_server_t *ms;
+    apr_memcache_conn_t *conn;
+    apr_uint32_t hash;
+    apr_size_t written;
+    struct iovec vec[3];
+    apr_size_t klen = strlen(key);
+
+    hash = apr_memcache_hash(mc, key, klen);
+    ms = apr_memcache_find_server_hash(mc, hash);
+    if (ms == NULL)
+        return APR_NOTFOUND;
+    
+    rv = ms_find_conn(ms, &conn);
+
+    if (rv != APR_SUCCESS) {
+        apr_memcache_disable_server(mc, ms);
+        return rv;
+    }
+
+    /* delete <key> <time>\r\n */
+    vec[0].iov_base = MC_DELETE;
+    vec[0].iov_len  = MC_DELETE_LEN;
+
+    vec[1].iov_base = (void*)key;
+    vec[1].iov_len  = klen;
+
+    klen = apr_snprintf(conn->buffer, BUFFER_SIZE, " %u" MC_EOL, timeout);
+
+    vec[2].iov_base = conn->buffer;
+    vec[2].iov_len  = klen;
+
+    rv = apr_socket_sendv(conn->sock, vec, 3, &written);
+
+    if (rv != APR_SUCCESS) {
+        ms_bad_conn(ms, conn);
+        apr_memcache_disable_server(mc, ms);
+        return rv;
+    }
+
+    rv = get_server_line(conn);
+    if (rv != APR_SUCCESS) {
+        ms_bad_conn(ms, conn);
+        apr_memcache_disable_server(mc, ms);
+        return rv;
+    }
+
+    if (strncmp(MS_DELETED, conn->buffer, MS_DELETED_LEN) == 0) {
+        rv = APR_SUCCESS;
+    }
+    else if (strncmp(MS_NOT_FOUND, conn->buffer, MS_NOT_FOUND_LEN) == 0) {
+        rv = APR_NOTFOUND;
+    }
+    else {
+        rv = APR_EGENERAL;
+    }
+
+    ms_release_conn(ms, conn);
+
+    return rv;
+}
+
+static apr_status_t num_cmd_write(apr_memcache_t *mc,
+                                      char *cmd,
+                                      const apr_uint32_t cmd_size,
+                                      const char *key,
+                                      const apr_int32_t inc,
+                                      apr_uint32_t *new_value)
+{
+    apr_status_t rv;
+    apr_memcache_server_t *ms;
+    apr_memcache_conn_t *conn;
+    apr_uint32_t hash;
+    apr_size_t written;
+    struct iovec vec[3];
+    apr_size_t klen = strlen(key);
+
+    hash = apr_memcache_hash(mc, key, klen);
+    ms = apr_memcache_find_server_hash(mc, hash);
+    if (ms == NULL)
+        return APR_NOTFOUND;
+    
+    rv = ms_find_conn(ms, &conn);
+
+    if (rv != APR_SUCCESS) {
+        apr_memcache_disable_server(mc, ms);
+        return rv;
+    }
+
+    /* <cmd> <key> <value>\r\n */
+    vec[0].iov_base = cmd;
+    vec[0].iov_len  = cmd_size;
+
+    vec[1].iov_base = (void*)key;
+    vec[1].iov_len  = klen;
+
+    klen = apr_snprintf(conn->buffer, BUFFER_SIZE, " %u" MC_EOL, inc);
+
+    vec[2].iov_base = conn->buffer;
+    vec[2].iov_len  = klen;
+
+    rv = apr_socket_sendv(conn->sock, vec, 3, &written);
+
+    if (rv != APR_SUCCESS) {
+        ms_bad_conn(ms, conn);
+        apr_memcache_disable_server(mc, ms);
+        return rv;
+    }
+
+    rv = get_server_line(conn);
+    if (rv != APR_SUCCESS) {
+        ms_bad_conn(ms, conn);
+        apr_memcache_disable_server(mc, ms);
+        return rv;
+    }
+
+    if (strncmp(MS_ERROR, conn->buffer, MS_ERROR_LEN) == 0) {
+        rv = APR_EGENERAL;
+    }
+    else if (strncmp(MS_NOT_FOUND, conn->buffer, MS_NOT_FOUND_LEN) == 0) {
+        rv = APR_NOTFOUND;
+    }
+    else {
+        if (new_value) {
+            *new_value = atoi(conn->buffer);
+        }
+        rv = APR_SUCCESS;
+    }
+
+    ms_release_conn(ms, conn);
+
+    return rv;
+}
+
+APU_DECLARE(apr_status_t)
+apr_memcache_incr(apr_memcache_t *mc,
+                    const char *key,
+                    apr_int32_t inc,
+                    apr_uint32_t *new_value)
+{
+    return num_cmd_write(mc,
+                         MC_INCR,
+                         MC_INCR_LEN,
+                         key,
+                         inc, 
+                         new_value);
+}
+
+
+APU_DECLARE(apr_status_t)
+apr_memcache_decr(apr_memcache_t *mc,
+                    const char *key,
+                    apr_int32_t inc,
+                    apr_uint32_t *new_value)
+{
+    return num_cmd_write(mc,
+                         MC_DECR,
+                         MC_DECR_LEN,
+                         key,
+                         inc, 
+                         new_value);
+}
+
+
+
+APU_DECLARE(apr_status_t)
+apr_memcache_version(apr_memcache_server_t *ms,
+                  apr_pool_t *p,
+                  char **baton)
+{
+    apr_status_t rv;
+    apr_memcache_conn_t *conn;
+    apr_size_t written;
+    struct iovec vec[2];
+
+    rv = ms_find_conn(ms, &conn);
+
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
+    /* version\r\n */
+    vec[0].iov_base = MC_VERSION;
+    vec[0].iov_len  = MC_VERSION_LEN;
+
+    vec[1].iov_base = MC_EOL;
+    vec[1].iov_len  = MC_EOL_LEN;
+
+    rv = apr_socket_sendv(conn->sock, vec, 2, &written);
+
+    if (rv != APR_SUCCESS) {
+        ms_bad_conn(ms, conn);
+        return rv;
+    }
+
+    rv = get_server_line(conn);
+    if (rv != APR_SUCCESS) {
+        ms_bad_conn(ms, conn);
+        return rv;
+    }
+
+    if (strncmp(MS_VERSION, conn->buffer, MS_VERSION_LEN) == 0) {
+        *baton = apr_pstrmemdup(p, conn->buffer+MS_VERSION_LEN+1, 
+                                conn->blen - MS_VERSION_LEN - 2);
+        rv = APR_SUCCESS;
+    }
+    else {
+        rv = APR_EGENERAL;
+    }
+
+    ms_release_conn(ms, conn);
+
+    return rv;
+}
+
+apr_status_t mc_version_ping(apr_memcache_server_t *ms)
+{
+    apr_status_t rv;
+    apr_size_t written;
+    struct iovec vec[2];
+    apr_memcache_conn_t *conn;
+
+    rv = ms_find_conn(ms, &conn);
+
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
+    /* version\r\n */
+    vec[0].iov_base = MC_VERSION;
+    vec[0].iov_len  = MC_VERSION_LEN;
+
+    vec[1].iov_base = MC_EOL;
+    vec[1].iov_len  = MC_EOL_LEN;
+
+    rv = apr_socket_sendv(conn->sock, vec, 2, &written);
+
+    if (rv != APR_SUCCESS) {
+        ms_bad_conn(ms, conn);
+        return rv;
+    }
+
+    rv = get_server_line(conn);
+    ms_release_conn(ms, conn);
+    return rv;
+}
+
+
+APU_DECLARE(void) 
+apr_memcache_add_multget_key(apr_pool_t *data_pool,
+                             const char* key,
+                             apr_hash_t **values)
+{
+    apr_memcache_value_t* value;
+    apr_size_t klen = strlen(key);
+
+    /* create the value hash if need be */
+    if (!*values) {
+        *values = apr_hash_make(data_pool);
+    }
+
+    /* init key and add it to the value hash */
+    value = apr_pcalloc(data_pool, sizeof(apr_memcache_value_t));
+
+    value->status = APR_NOTFOUND;
+    value->key = apr_pstrdup(data_pool, key);
+
+    apr_hash_set(*values, value->key, klen, value);
+}
+
+static void mget_conn_result(int up,
+                             apr_status_t rv,
+                             apr_memcache_t *mc,
+                             apr_memcache_server_t *ms,
+                             apr_memcache_conn_t *conn,
+                             struct cache_server_query_t *server_query,
+                             apr_hash_t *values,
+                             apr_hash_t *server_queries)
+{
+    apr_int32_t j;
+    apr_memcache_value_t* value;
+    
+    if (!up) {
+        ms_bad_conn(ms, conn);
+        apr_memcache_disable_server(mc, ms);
+    }
+    
+    for (j = 1; j < server_query->query_vec_count ; j+=2) {
+        if (server_query->query_vec[j].iov_base) {
+            value = apr_hash_get(values, server_query->query_vec[j].iov_base,
+                                 strlen(server_query->query_vec[j].iov_base));
+            
+            if (value->status == APR_NOTFOUND) {
+                value->status = rv;
+            }
+        }
+    }
+
+    ms_release_conn(ms, conn);
+    
+    apr_hash_set(server_queries, &ms, sizeof(ms), NULL);
+}
+
+APU_DECLARE(apr_status_t)
+apr_memcache_multgetp(apr_memcache_t *mc,
+                      apr_pool_t *temp_pool,
+                      apr_pool_t *data_pool,
+                      apr_hash_t *values)
+{
+    apr_status_t rv;
+    apr_memcache_server_t* ms;
+    apr_memcache_conn_t* conn;
+    apr_uint32_t hash;
+    apr_size_t written;
+    apr_size_t klen;
+
+    apr_memcache_value_t* value;
+    apr_hash_index_t* value_hash_index;
+
+    /* this is a little over aggresive, but beats multiple loops
+     * to figure out how long each vector needs to be per-server.
+     */
+    apr_int32_t veclen = 2 + 2 * apr_hash_count(values) - 1; /* get <key>[<space><key>...]\r\n */
+    apr_int32_t i, j;
+    apr_int32_t queries_sent;
+    apr_int32_t queries_recvd;
+
+    apr_hash_t * server_queries = apr_hash_make(temp_pool);
+    struct cache_server_query_t* server_query;
+    apr_hash_index_t * query_hash_index;
+
+    apr_pollset_t* pollset;
+    const apr_pollfd_t* activefds;
+    apr_pollfd_t* pollfds;
+
+
+    /* build all the queries */
+    value_hash_index = apr_hash_first(temp_pool, values);
+    while (value_hash_index) {
+        void *v;
+        apr_hash_this(value_hash_index, NULL, NULL, &v);
+        value = v;
+        value_hash_index = apr_hash_next(value_hash_index);
+        klen = strlen(value->key);
+
+        hash = apr_memcache_hash(mc, value->key, klen);
+        ms = apr_memcache_find_server_hash(mc, hash);
+        if (ms == NULL) {
+            continue;
+        }
+
+        server_query = apr_hash_get(server_queries, &ms, sizeof(ms));
+
+        if (!server_query) {
+            rv = ms_find_conn(ms, &conn);
+
+            if (rv != APR_SUCCESS) {
+                apr_memcache_disable_server(mc, ms);
+                value->status = rv;
+                continue;
+            }
+
+            server_query = apr_pcalloc(temp_pool,sizeof(struct cache_server_query_t));
+
+            apr_hash_set(server_queries, &ms, sizeof(ms), server_query);
+
+            server_query->ms = ms;
+            server_query->conn = conn;
+            server_query->query_vec = apr_pcalloc(temp_pool, sizeof(struct iovec)*veclen);
+
+            /* set up the first key */
+            server_query->query_vec[0].iov_base = MC_GET;
+            server_query->query_vec[0].iov_len  = MC_GET_LEN;
+
+            server_query->query_vec[1].iov_base = (void*)(value->key);
+            server_query->query_vec[1].iov_len  = klen;
+
+            server_query->query_vec[2].iov_base = MC_EOL;
+            server_query->query_vec[2].iov_len  = MC_EOL_LEN;
+
+            server_query->query_vec_count = 3;
+        }
+        else {
+            j = server_query->query_vec_count - 1;
+
+            server_query->query_vec[j].iov_base = MC_WS;
+            server_query->query_vec[j].iov_len  = MC_WS_LEN;
+            j++;
+
+            server_query->query_vec[j].iov_base = (void*)(value->key);
+            server_query->query_vec[j].iov_len  = klen;
+            j++;
+
+            server_query->query_vec[j].iov_base = MC_EOL;
+            server_query->query_vec[j].iov_len  = MC_EOL_LEN;
+            j++;
+
+           server_query->query_vec_count = j;
+        }
+    }
+
+    /* create polling structures */
+    pollfds = apr_pcalloc(temp_pool, apr_hash_count(server_queries) * sizeof(apr_pollfd_t));
+    
+    rv = apr_pollset_create(&pollset, apr_hash_count(server_queries), temp_pool, 0);
+
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
+    /* send all the queries */
+    queries_sent = 0;
+    query_hash_index = apr_hash_first(temp_pool, server_queries);
+
+    while (query_hash_index) {
+        void *v;
+        apr_hash_this(query_hash_index, NULL, NULL, &v);
+        server_query = v;
+        query_hash_index = apr_hash_next(query_hash_index);
+
+        conn = server_query->conn;
+        ms = server_query->ms;
+
+        for (i = 0, rv = APR_SUCCESS; i < veclen && rv == APR_SUCCESS; i += APR_MAX_IOVEC_SIZE) {
+            rv = apr_socket_sendv(conn->sock, &(server_query->query_vec[i]),
+                                  veclen-i>APR_MAX_IOVEC_SIZE ? APR_MAX_IOVEC_SIZE : veclen-i , &written);
+        }
+
+        if (rv != APR_SUCCESS) {
+            mget_conn_result(FALSE, rv, mc, ms, conn,
+                             server_query, values, server_queries);
+            continue;
+        }
+
+        pollfds[queries_sent].desc_type = APR_POLL_SOCKET;
+        pollfds[queries_sent].reqevents = APR_POLLIN;
+        pollfds[queries_sent].p = temp_pool;
+        pollfds[queries_sent].desc.s = conn->sock;
+        pollfds[queries_sent].client_data = (void *)server_query;
+        apr_pollset_add (pollset, &pollfds[queries_sent]);
+
+        queries_sent++;
+    }
+
+    while (queries_sent) {
+        rv = apr_pollset_poll(pollset, MULT_GET_TIMEOUT, &queries_recvd, &activefds);
+
+        if (rv != APR_SUCCESS) {
+            /* timeout */
+            queries_sent = 0;
+            continue;
+        }
+        for (i = 0; i < queries_recvd; i++) {
+            server_query = activefds[i].client_data;
+            conn = server_query->conn;
+            ms = server_query->ms;
+
+           rv = get_server_line(conn);
+
+           if (rv != APR_SUCCESS) {
+               apr_pollset_remove (pollset, &activefds[i]);
+               mget_conn_result(FALSE, rv, mc, ms, conn,
+                                server_query, values, server_queries);
+               queries_sent--;
+               continue;
+           }
+
+           if (strncmp(MS_VALUE, conn->buffer, MS_VALUE_LEN) == 0) {
+               char *key;
+               char *flags;
+               char *length;
+               char *start;
+               char *last;
+               char *data;
+               apr_size_t len = 0;
+
+               start = conn->buffer;
+               key = apr_strtok(conn->buffer, " ", &last); /* just the VALUE, ignore */
+               key = apr_strtok(NULL, " ", &last);
+               flags = apr_strtok(NULL, " ", &last);
+
+
+               length = apr_strtok(NULL, " ", &last);
+               if (length) {
+                   len = atoi(length);
+               }
+
+               value = apr_hash_get(values, key, strlen(key));
+
+               
+               if (value) {
+                   if (len > 0)  {
+                       apr_bucket_brigade *bbb;
+                       apr_bucket *e;
+                       
+                       /* eat the trailing \r\n */
+                       rv = apr_brigade_partition(conn->bb, len+2, &e);
+                       
+                       if (rv != APR_SUCCESS) {
+                           apr_pollset_remove (pollset, &activefds[i]);
+                           mget_conn_result(FALSE, rv, mc, ms, conn,
+                                            server_query, values, server_queries);
+                           queries_sent--;
+                           continue;
+                       }
+                       
+                       bbb = apr_brigade_split(conn->bb, e);
+                       
+                       rv = apr_brigade_pflatten(conn->bb, &data, &len, data_pool);
+                       
+                       if (rv != APR_SUCCESS) {
+                           apr_pollset_remove (pollset, &activefds[i]);
+                           mget_conn_result(FALSE, rv, mc, ms, conn,
+                                            server_query, values, server_queries);
+                           queries_sent--;
+                           continue;
+                       }
+                       
+                       rv = apr_brigade_destroy(conn->bb);
+                       if (rv != APR_SUCCESS) {
+                           apr_pollset_remove (pollset, &activefds[i]);
+                           mget_conn_result(FALSE, rv, mc, ms, conn,
+                                            server_query, values, server_queries);
+                           queries_sent--;
+                           continue;
+                       }
+                       
+                       conn->bb = bbb;
+                       
+                       value->len = len - 2;
+                       data[value->len] = '\0';
+                       value->data = data;
+                   }
+                   
+                   value->status = rv;
+                   value->flags = atoi(flags);
+                   
+                   /* stay on the server */
+                   i--;
+                   
+               }
+               else {
+                   /* TODO: Server Sent back a key I didn't ask for or my
+                    *       hash is corrupt */
+               }
+           }
+           else if (strncmp(MS_END, conn->buffer, MS_END_LEN) == 0) {
+               /* this connection is done */
+               apr_pollset_remove (pollset, &activefds[i]);
+               ms_release_conn(ms, conn);
+               apr_hash_set(server_queries, &ms, sizeof(ms), NULL);
+               
+               queries_sent--;
+           }
+           else {
+               /* unknown reply? */
+               rv = APR_EGENERAL;
+           }
+           
+        } /* /for */
+    } /* /while */
+    
+    query_hash_index = apr_hash_first(temp_pool, server_queries);
+    while (query_hash_index) {
+        void *v;
+        apr_hash_this(query_hash_index, NULL, NULL, &v);
+        server_query = v;
+        query_hash_index = apr_hash_next(query_hash_index);
+        
+        conn = server_query->conn;
+        ms = server_query->ms;
+        
+        mget_conn_result(TRUE, rv, mc, ms, conn,
+                         server_query, values, server_queries);
+        continue;
+    }
+    
+    apr_pool_clear(temp_pool);
+    apr_pollset_destroy(pollset);
+    return APR_SUCCESS;
+    
+}
+
+
+
+/**
+ * Define all of the strings for stats
+ */
+
+#define STAT_pid MS_STAT " pid "
+#define STAT_pid_LEN (sizeof(STAT_pid)-1)
+
+#define STAT_uptime MS_STAT " uptime "
+#define STAT_uptime_LEN (sizeof(STAT_uptime)-1)
+
+#define STAT_time MS_STAT " time "
+#define STAT_time_LEN (sizeof(STAT_time)-1)
+
+#define STAT_version MS_STAT " version "
+#define STAT_version_LEN (sizeof(STAT_version)-1)
+
+#define STAT_pointer_size MS_STAT " pointer_size "
+#define STAT_pointer_size_LEN (sizeof(STAT_pointer_size)-1)
+
+#define STAT_rusage_user MS_STAT " rusage_user "
+#define STAT_rusage_user_LEN (sizeof(STAT_rusage_user)-1)
+
+#define STAT_rusage_system MS_STAT " rusage_system "
+#define STAT_rusage_system_LEN (sizeof(STAT_rusage_system)-1)
+
+#define STAT_curr_items MS_STAT " curr_items "
+#define STAT_curr_items_LEN (sizeof(STAT_curr_items)-1)
+
+#define STAT_total_items MS_STAT " total_items "
+#define STAT_total_items_LEN (sizeof(STAT_total_items)-1)
+
+#define STAT_bytes MS_STAT " bytes "
+#define STAT_bytes_LEN (sizeof(STAT_bytes)-1)
+
+#define STAT_curr_connections MS_STAT " curr_connections "
+#define STAT_curr_connections_LEN (sizeof(STAT_curr_connections)-1)
+
+#define STAT_total_connections MS_STAT " total_connections "
+#define STAT_total_connections_LEN (sizeof(STAT_total_connections)-1)
+
+#define STAT_connection_structures MS_STAT " connection_structures "
+#define STAT_connection_structures_LEN (sizeof(STAT_connection_structures)-1)
+
+#define STAT_cmd_get MS_STAT " cmd_get "
+#define STAT_cmd_get_LEN (sizeof(STAT_cmd_get)-1)
+
+#define STAT_cmd_set MS_STAT " cmd_set "
+#define STAT_cmd_set_LEN (sizeof(STAT_cmd_set)-1)
+
+#define STAT_get_hits MS_STAT " get_hits "
+#define STAT_get_hits_LEN (sizeof(STAT_get_hits)-1)
+
+#define STAT_get_misses MS_STAT " get_misses "
+#define STAT_get_misses_LEN (sizeof(STAT_get_misses)-1)
+
+#define STAT_evictions MS_STAT " evictions "
+#define STAT_evictions_LEN (sizeof(STAT_evictions)-1)
+
+#define STAT_bytes_read MS_STAT " bytes_read "
+#define STAT_bytes_read_LEN (sizeof(STAT_bytes_read)-1)
+
+#define STAT_bytes_written MS_STAT " bytes_written "
+#define STAT_bytes_written_LEN (sizeof(STAT_bytes_written)-1)
+
+#define STAT_limit_maxbytes MS_STAT " limit_maxbytes "
+#define STAT_limit_maxbytes_LEN (sizeof(STAT_limit_maxbytes)-1)
+
+#define STAT_threads MS_STAT " threads "
+#define STAT_threads_LEN (sizeof(STAT_threads)-1)
+
+static const char *stat_read_string(apr_pool_t *p, char *buf, apr_size_t len)
+{
+    /* remove trailing \r\n and null char */
+    return apr_pstrmemdup(p, buf, len-2);
+}
+
+static apr_uint32_t stat_read_uint32(apr_pool_t *p, char *buf, apr_size_t  len)
+{
+    buf[len-2] = '\0';
+    return atoi(buf);
+}
+
+static apr_uint64_t stat_read_uint64(apr_pool_t *p, char *buf, apr_size_t  len)
+{
+    buf[len-2] = '\0';
+    return apr_atoi64(buf);
+}
+
+static apr_time_t stat_read_time(apr_pool_t *p, char *buf, apr_size_t  len)
+{
+    buf[len-2] = '\0';
+    return apr_time_from_sec(atoi(buf));
+}
+
+static apr_time_t stat_read_rtime(apr_pool_t *p, char *buf, apr_size_t  len)
+{
+    char *tok;
+    char *secs;
+    char *usecs;
+    const char *sep = ":";
+
+    buf[len-2] = '\0';
+
+    secs = apr_strtok(buf, sep, &tok);
+    if (secs == NULL) {
+        sep = ".";
+        secs = apr_strtok(buf, sep, &tok);
+    }
+    usecs = apr_strtok(NULL, sep, &tok);
+    if (secs && usecs) {
+        return apr_time_make(atoi(secs), atoi(usecs));
+    }
+    else {
+        return apr_time_make(0, 0);
+    }
+}
+
+/**
+ * I got tired of Typing. Meh. 
+ *
+ * TODO: Convert it to static tables to make it cooler.
+ */
+
+#define mc_stat_cmp(name) \
+    strncmp(STAT_ ## name, conn->buffer, STAT_ ## name ## _LEN) == 0
+
+#define mc_stat_str(name) \
+    stat_read_string(p, conn->buffer + name, \
+                     conn->blen - name)
+
+#define mc_stat_uint32(name) \
+    stat_read_uint32(p, conn->buffer + name, \
+                     conn->blen - name)
+
+#define mc_stat_uint64(name) \
+    stat_read_uint64(p, conn->buffer + name, \
+                     conn->blen - name)
+
+#define mc_stat_time(name) \
+    stat_read_time(p, conn->buffer + name, \
+                     conn->blen - name)
+
+#define mc_stat_rtime(name) \
+    stat_read_rtime(p, conn->buffer + name, \
+                     conn->blen - name)
+
+
+#define mc_do_stat(name, type) \
+    if (mc_stat_cmp(name)) { \
+        stats-> name = mc_stat_ ## type ((STAT_ ## name ## _LEN)); \
+    } 
+
+static void update_stats(apr_pool_t *p, apr_memcache_conn_t *conn, 
+                         apr_memcache_stats_t *stats)
+{
+
+    mc_do_stat(version, str)
+    else mc_do_stat(pid, uint32)
+    else mc_do_stat(uptime, uint32)
+    else mc_do_stat(pointer_size, uint32)
+    else mc_do_stat(time, time)
+    else mc_do_stat(rusage_user, rtime)
+    else mc_do_stat(rusage_system, rtime)
+    else mc_do_stat(curr_items, uint32)
+    else mc_do_stat(total_items, uint32)
+    else mc_do_stat(bytes, uint64)
+    else mc_do_stat(curr_connections, uint32)
+    else mc_do_stat(total_connections, uint32)
+    else mc_do_stat(connection_structures, uint32)
+    else mc_do_stat(cmd_get, uint32)
+    else mc_do_stat(cmd_set, uint32)
+    else mc_do_stat(get_hits, uint32)
+    else mc_do_stat(get_misses, uint32)
+    else mc_do_stat(evictions, uint64)
+    else mc_do_stat(bytes_read, uint64)
+    else mc_do_stat(bytes_written, uint64)
+    else mc_do_stat(limit_maxbytes, uint32)
+    else mc_do_stat(threads, uint32)
+}
+
+APU_DECLARE(apr_status_t)
+apr_memcache_stats(apr_memcache_server_t *ms,
+                  apr_pool_t *p,
+                  apr_memcache_stats_t **stats) 
+{
+    apr_memcache_stats_t *ret;
+    apr_status_t rv;
+    apr_memcache_conn_t *conn;
+    apr_size_t written;
+    struct iovec vec[2];
+
+    rv = ms_find_conn(ms, &conn);
+
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
+    /* version\r\n */
+    vec[0].iov_base = MC_STATS;
+    vec[0].iov_len  = MC_STATS_LEN;
+
+    vec[1].iov_base = MC_EOL;
+    vec[1].iov_len  = MC_EOL_LEN;
+
+    rv = apr_socket_sendv(conn->sock, vec, 2, &written);
+
+    if (rv != APR_SUCCESS) {
+        ms_bad_conn(ms, conn);
+        return rv;
+    }
+
+    ret = apr_pcalloc(p, sizeof(apr_memcache_stats_t));
+
+    do {
+        rv = get_server_line(conn);
+        if (rv != APR_SUCCESS) {
+            ms_bad_conn(ms, conn);
+            return rv;
+        }
+
+        if (strncmp(MS_END, conn->buffer, MS_END_LEN) == 0) {
+            rv = APR_SUCCESS;
+            break;
+        }
+        else if (strncmp(MS_STAT, conn->buffer, MS_STAT_LEN) == 0) {
+            update_stats(p, conn, ret);
+            continue;
+        }
+        else {
+            rv = APR_EGENERAL;
+            break;
+        }
+
+    } while(1);
+
+    ms_release_conn(ms, conn);
+
+    if (stats) {
+        *stats = ret;
+    }
+
+    return rv;
+}
+
diff --git a/srclib/apr-util/misc/apr_reslist.c b/srclib/apr-util/misc/apr_reslist.c
index 058fc7d3..14b7e6c4 100644
--- a/srclib/apr-util/misc/apr_reslist.c
+++ b/srclib/apr-util/misc/apr_reslist.c
@@ -137,18 +137,20 @@ static apr_status_t destroy_resource(apr_reslist_t *reslist, apr_res_t *res)
 
 static apr_status_t reslist_cleanup(void *data_)
 {
-    apr_status_t rv;
+    apr_status_t rv = APR_SUCCESS;
     apr_reslist_t *rl = data_;
     apr_res_t *res;
 
     apr_thread_mutex_lock(rl->listlock);
 
     while (rl->nidle > 0) {
+        apr_status_t rv1;
         res = pop_resource(rl);
         rl->ntotal--;
-        rv = destroy_resource(rl, res);
-        if (rv != APR_SUCCESS) {
-            return rv;
+        rv1 = destroy_resource(rl, res);
+        if (rv1 != APR_SUCCESS) {
+            rv = rv1;  /* loses info in the unlikely event of
+                        * multiple *different* failures */
         }
         free_container(rl, res);
     }
@@ -159,7 +161,7 @@ static apr_status_t reslist_cleanup(void *data_)
     apr_thread_mutex_destroy(rl->listlock);
     apr_thread_cond_destroy(rl->avail);
 
-    return APR_SUCCESS;
+    return rv;
 }
 
 /**
@@ -292,13 +294,26 @@ APU_DECLARE(apr_status_t) apr_reslist_acquire(apr_reslist_t *reslist,
 {
     apr_status_t rv;
     apr_res_t *res;
+    apr_time_t now;
 
     apr_thread_mutex_lock(reslist->listlock);
     /* If there are idle resources on the available list, use
      * them right away. */
-    if (reslist->nidle > 0) {
+    now = apr_time_now();
+    while (reslist->nidle > 0) {
         /* Pop off the first resource */
         res = pop_resource(reslist);
+        if (reslist->ttl && (now - res->freed >= reslist->ttl)) {
+            /* this res is expired - kill it */
+            reslist->ntotal--;
+            rv = destroy_resource(reslist, res);
+            free_container(reslist, res);
+            if (rv != APR_SUCCESS) {
+                apr_thread_mutex_unlock(reslist->listlock);
+                return rv;  /* FIXME: this might cause unnecessary fails */
+            }
+            continue;
+        }
         *resource = res->opaque;
         free_container(reslist, res);
         apr_thread_mutex_unlock(reslist->listlock);
@@ -306,8 +321,7 @@ APU_DECLARE(apr_status_t) apr_reslist_acquire(apr_reslist_t *reslist,
     }
     /* If we've hit our max, block until we're allowed to create
      * a new one, or something becomes free. */
-    else while (reslist->ntotal >= reslist->hmax
-                && reslist->nidle <= 0) {
+    while (reslist->ntotal >= reslist->hmax && reslist->nidle <= 0) {
         if (reslist->timeout) {
             if ((rv = apr_thread_cond_timedwait(reslist->avail, 
                 reslist->listlock, reslist->timeout)) != APR_SUCCESS) {
@@ -315,8 +329,9 @@ APU_DECLARE(apr_status_t) apr_reslist_acquire(apr_reslist_t *reslist,
                 return rv;
             }
         }
-        else
+        else {
             apr_thread_cond_wait(reslist->avail, reslist->listlock);
+        }
     }
     /* If we popped out of the loop, first try to see if there
      * are new resources available for immediate use. */
@@ -363,6 +378,17 @@ APU_DECLARE(void) apr_reslist_timeout_set(apr_reslist_t *reslist,
     reslist->timeout = timeout;
 }
 
+APU_DECLARE(apr_uint32_t) apr_reslist_acquired_count(apr_reslist_t *reslist)
+{
+    apr_uint32_t count;
+
+    apr_thread_mutex_lock(reslist->listlock);
+    count = reslist->ntotal - reslist->nidle;
+    apr_thread_mutex_unlock(reslist->listlock);
+
+    return count;
+}
+
 APU_DECLARE(apr_status_t) apr_reslist_invalidate(apr_reslist_t *reslist,
                                                  void *resource)
 {
diff --git a/srclib/apr-util/misc/apr_thread_pool.c b/srclib/apr-util/misc/apr_thread_pool.c
new file mode 100644
index 00000000..0cbdd2df
--- /dev/null
+++ b/srclib/apr-util/misc/apr_thread_pool.c
@@ -0,0 +1,961 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership.  The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License.  You may obtain a copy of
+ * the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+#include <assert.h>
+#include "apr_thread_pool.h"
+#include "apr_ring.h"
+#include "apr_thread_cond.h"
+#include "apr_portable.h"
+
+#if APR_HAS_THREADS
+
+#define TASK_PRIORITY_SEGS 4
+#define TASK_PRIORITY_SEG(x) (((x)->dispatch.priority & 0xFF) / 64)
+
+typedef struct apr_thread_pool_task
+{
+    APR_RING_ENTRY(apr_thread_pool_task) link;
+    apr_thread_start_t func;
+    void *param;
+    void *owner;
+    union
+    {
+        apr_byte_t priority;
+        apr_time_t time;
+    } dispatch;
+} apr_thread_pool_task_t;
+
+APR_RING_HEAD(apr_thread_pool_tasks, apr_thread_pool_task);
+
+struct apr_thread_list_elt
+{
+    APR_RING_ENTRY(apr_thread_list_elt) link;
+    apr_thread_t *thd;
+    volatile void *current_owner;
+    volatile enum { TH_RUN, TH_STOP, TH_PROBATION } state;
+};
+
+APR_RING_HEAD(apr_thread_list, apr_thread_list_elt);
+
+struct apr_thread_pool
+{
+    apr_pool_t *pool;
+    volatile apr_size_t thd_max;
+    volatile apr_size_t idle_max;
+    volatile apr_interval_time_t idle_wait;
+    volatile apr_size_t thd_cnt;
+    volatile apr_size_t idle_cnt;
+    volatile apr_size_t task_cnt;
+    volatile apr_size_t scheduled_task_cnt;
+    volatile apr_size_t threshold;
+    volatile apr_size_t tasks_run;
+    volatile apr_size_t tasks_high;
+    volatile apr_size_t thd_high;
+    volatile apr_size_t thd_timed_out;
+    struct apr_thread_pool_tasks *tasks;
+    struct apr_thread_pool_tasks *scheduled_tasks;
+    struct apr_thread_list *busy_thds;
+    struct apr_thread_list *idle_thds;
+    apr_thread_mutex_t *lock;
+    apr_thread_mutex_t *cond_lock;
+    apr_thread_cond_t *cond;
+    volatile int terminated;
+    struct apr_thread_pool_tasks *recycled_tasks;
+    struct apr_thread_list *recycled_thds;
+    apr_thread_pool_task_t *task_idx[TASK_PRIORITY_SEGS];
+};
+
+static apr_status_t thread_pool_construct(apr_thread_pool_t * me,
+                                          apr_size_t init_threads,
+                                          apr_size_t max_threads)
+{
+    apr_status_t rv;
+    int i;
+
+    me->thd_max = max_threads;
+    me->idle_max = init_threads;
+    me->threshold = init_threads / 2;
+    rv = apr_thread_mutex_create(&me->lock, APR_THREAD_MUTEX_NESTED,
+                                 me->pool);
+    if (APR_SUCCESS != rv) {
+        return rv;
+    }
+    rv = apr_thread_mutex_create(&me->cond_lock, APR_THREAD_MUTEX_UNNESTED,
+                                 me->pool);
+    if (APR_SUCCESS != rv) {
+        apr_thread_mutex_destroy(me->lock);
+        return rv;
+    }
+    rv = apr_thread_cond_create(&me->cond, me->pool);
+    if (APR_SUCCESS != rv) {
+        apr_thread_mutex_destroy(me->lock);
+        apr_thread_mutex_destroy(me->cond_lock);
+        return rv;
+    }
+    me->tasks = apr_palloc(me->pool, sizeof(*me->tasks));
+    if (!me->tasks) {
+        goto CATCH_ENOMEM;
+    }
+    APR_RING_INIT(me->tasks, apr_thread_pool_task, link);
+    me->scheduled_tasks = apr_palloc(me->pool, sizeof(*me->scheduled_tasks));
+    if (!me->scheduled_tasks) {
+        goto CATCH_ENOMEM;
+    }
+    APR_RING_INIT(me->scheduled_tasks, apr_thread_pool_task, link);
+    me->recycled_tasks = apr_palloc(me->pool, sizeof(*me->recycled_tasks));
+    if (!me->recycled_tasks) {
+        goto CATCH_ENOMEM;
+    }
+    APR_RING_INIT(me->recycled_tasks, apr_thread_pool_task, link);
+    me->busy_thds = apr_palloc(me->pool, sizeof(*me->busy_thds));
+    if (!me->busy_thds) {
+        goto CATCH_ENOMEM;
+    }
+    APR_RING_INIT(me->busy_thds, apr_thread_list_elt, link);
+    me->idle_thds = apr_palloc(me->pool, sizeof(*me->idle_thds));
+    if (!me->idle_thds) {
+        goto CATCH_ENOMEM;
+    }
+    APR_RING_INIT(me->idle_thds, apr_thread_list_elt, link);
+    me->recycled_thds = apr_palloc(me->pool, sizeof(*me->recycled_thds));
+    if (!me->recycled_thds) {
+        goto CATCH_ENOMEM;
+    }
+    APR_RING_INIT(me->recycled_thds, apr_thread_list_elt, link);
+    me->thd_cnt = me->idle_cnt = me->task_cnt = me->scheduled_task_cnt = 0;
+    me->tasks_run = me->tasks_high = me->thd_high = me->thd_timed_out = 0;
+    me->idle_wait = 0;
+    me->terminated = 0;
+    for (i = 0; i < TASK_PRIORITY_SEGS; i++) {
+        me->task_idx[i] = NULL;
+    }
+    goto FINAL_EXIT;
+  CATCH_ENOMEM:
+    rv = APR_ENOMEM;
+    apr_thread_mutex_destroy(me->lock);
+    apr_thread_mutex_destroy(me->cond_lock);
+    apr_thread_cond_destroy(me->cond);
+  FINAL_EXIT:
+    return rv;
+}
+
+/*
+ * NOTE: This function is not thread safe by itself. Caller should hold the lock
+ */
+static apr_thread_pool_task_t *pop_task(apr_thread_pool_t * me)
+{
+    apr_thread_pool_task_t *task = NULL;
+    int seg;
+
+    /* check for scheduled tasks */
+    if (me->scheduled_task_cnt > 0) {
+        task = APR_RING_FIRST(me->scheduled_tasks);
+        assert(task != NULL);
+        assert(task !=
+               APR_RING_SENTINEL(me->scheduled_tasks, apr_thread_pool_task,
+                                 link));
+        /* if it's time */
+        if (task->dispatch.time <= apr_time_now()) {
+            --me->scheduled_task_cnt;
+            APR_RING_REMOVE(task, link);
+            return task;
+        }
+    }
+    /* check for normal tasks if we're not returning a scheduled task */
+    if (me->task_cnt == 0) {
+        return NULL;
+    }
+
+    task = APR_RING_FIRST(me->tasks);
+    assert(task != NULL);
+    assert(task != APR_RING_SENTINEL(me->tasks, apr_thread_pool_task, link));
+    --me->task_cnt;
+    seg = TASK_PRIORITY_SEG(task);
+    if (task == me->task_idx[seg]) {
+        me->task_idx[seg] = APR_RING_NEXT(task, link);
+        if (me->task_idx[seg] == APR_RING_SENTINEL(me->tasks,
+                                                   apr_thread_pool_task, link)
+            || TASK_PRIORITY_SEG(me->task_idx[seg]) != seg) {
+            me->task_idx[seg] = NULL;
+        }
+    }
+    APR_RING_REMOVE(task, link);
+    return task;
+}
+
+static apr_interval_time_t waiting_time(apr_thread_pool_t * me)
+{
+    apr_thread_pool_task_t *task = NULL;
+
+    task = APR_RING_FIRST(me->scheduled_tasks);
+    assert(task != NULL);
+    assert(task !=
+           APR_RING_SENTINEL(me->scheduled_tasks, apr_thread_pool_task,
+                             link));
+    return task->dispatch.time - apr_time_now();
+}
+
+/*
+ * NOTE: This function is not thread safe by itself. Caller should hold the lock
+ */
+static struct apr_thread_list_elt *elt_new(apr_thread_pool_t * me,
+                                           apr_thread_t * t)
+{
+    struct apr_thread_list_elt *elt;
+
+    if (APR_RING_EMPTY(me->recycled_thds, apr_thread_list_elt, link)) {
+        elt = apr_pcalloc(me->pool, sizeof(*elt));
+        if (NULL == elt) {
+            return NULL;
+        }
+    }
+    else {
+        elt = APR_RING_FIRST(me->recycled_thds);
+        APR_RING_REMOVE(elt, link);
+    }
+
+    APR_RING_ELEM_INIT(elt, link);
+    elt->thd = t;
+    elt->current_owner = NULL;
+    elt->state = TH_RUN;
+    return elt;
+}
+
+/*
+ * The worker thread function. Take a task from the queue and perform it if
+ * there is any. Otherwise, put itself into the idle thread list and waiting
+ * for signal to wake up.
+ * The thread terminate directly by detach and exit when it is asked to stop
+ * after finishing a task. Otherwise, the thread should be in idle thread list
+ * and should be joined.
+ */
+static void *APR_THREAD_FUNC thread_pool_func(apr_thread_t * t, void *param)
+{
+    apr_status_t rv = APR_SUCCESS;
+    apr_thread_pool_t *me = param;
+    apr_thread_pool_task_t *task = NULL;
+    apr_interval_time_t wait;
+    struct apr_thread_list_elt *elt;
+
+    apr_thread_mutex_lock(me->lock);
+    elt = elt_new(me, t);
+    if (!elt) {
+        apr_thread_mutex_unlock(me->lock);
+        apr_thread_exit(t, APR_ENOMEM);
+    }
+
+    while (!me->terminated && elt->state != TH_STOP) {
+        /* Test if not new element, it is awakened from idle */
+        if (APR_RING_NEXT(elt, link) != elt) {
+            --me->idle_cnt;
+            APR_RING_REMOVE(elt, link);
+        }
+
+        APR_RING_INSERT_TAIL(me->busy_thds, elt, apr_thread_list_elt, link);
+        task = pop_task(me);
+        while (NULL != task && !me->terminated) {
+            ++me->tasks_run;
+            elt->current_owner = task->owner;
+            apr_thread_mutex_unlock(me->lock);
+            apr_thread_data_set(task, "apr_thread_pool_task", NULL, t);
+            task->func(t, task->param);
+            apr_thread_mutex_lock(me->lock);
+            APR_RING_INSERT_TAIL(me->recycled_tasks, task,
+                                 apr_thread_pool_task, link);
+            elt->current_owner = NULL;
+            if (TH_STOP == elt->state) {
+                break;
+            }
+            task = pop_task(me);
+        }
+        assert(NULL == elt->current_owner);
+        if (TH_STOP != elt->state)
+            APR_RING_REMOVE(elt, link);
+
+        /* Test if a busy thread been asked to stop, which is not joinable */
+        if ((me->idle_cnt >= me->idle_max
+             && !(me->scheduled_task_cnt && 0 >= me->idle_max)
+             && !me->idle_wait)
+            || me->terminated || elt->state != TH_RUN) {
+            --me->thd_cnt;
+            if ((TH_PROBATION == elt->state) && me->idle_wait)
+                ++me->thd_timed_out;
+            APR_RING_INSERT_TAIL(me->recycled_thds, elt,
+                                 apr_thread_list_elt, link);
+            apr_thread_mutex_unlock(me->lock);
+            apr_thread_detach(t);
+            apr_thread_exit(t, APR_SUCCESS);
+            return NULL;        /* should not be here, safe net */
+        }
+
+        /* busy thread become idle */
+        ++me->idle_cnt;
+        APR_RING_INSERT_TAIL(me->idle_thds, elt, apr_thread_list_elt, link);
+
+        /* 
+         * If there is a scheduled task, always scheduled to perform that task.
+         * Since there is no guarantee that current idle threads are scheduled
+         * for next scheduled task.
+         */
+        if (me->scheduled_task_cnt)
+            wait = waiting_time(me);
+        else if (me->idle_cnt > me->idle_max) {
+            wait = me->idle_wait;
+            elt->state = TH_PROBATION;
+        }
+        else
+            wait = -1;
+
+        apr_thread_mutex_unlock(me->lock);
+        apr_thread_mutex_lock(me->cond_lock);
+        if (wait >= 0) {
+            rv = apr_thread_cond_timedwait(me->cond, me->cond_lock, wait);
+        }
+        else {
+            rv = apr_thread_cond_wait(me->cond, me->cond_lock);
+        }
+        apr_thread_mutex_unlock(me->cond_lock);
+        apr_thread_mutex_lock(me->lock);
+    }
+
+    /* idle thread been asked to stop, will be joined */
+    --me->thd_cnt;
+    apr_thread_mutex_unlock(me->lock);
+    apr_thread_exit(t, APR_SUCCESS);
+    return NULL;                /* should not be here, safe net */
+}
+
+static apr_status_t thread_pool_cleanup(void *me)
+{
+    apr_thread_pool_t *_self = me;
+
+    _self->terminated = 1;
+    apr_thread_pool_idle_max_set(_self, 0);
+    while (_self->thd_cnt) {
+        apr_sleep(20 * 1000);   /* spin lock with 20 ms */
+    }
+    apr_thread_mutex_destroy(_self->lock);
+    apr_thread_mutex_destroy(_self->cond_lock);
+    apr_thread_cond_destroy(_self->cond);
+    return APR_SUCCESS;
+}
+
+APU_DECLARE(apr_status_t) apr_thread_pool_create(apr_thread_pool_t ** me,
+                                                 apr_size_t init_threads,
+                                                 apr_size_t max_threads,
+                                                 apr_pool_t * pool)
+{
+    apr_thread_t *t;
+    apr_status_t rv = APR_SUCCESS;
+
+    *me = apr_pcalloc(pool, sizeof(**me));
+    if (!*me) {
+        return APR_ENOMEM;
+    }
+
+    (*me)->pool = pool;
+
+    rv = thread_pool_construct(*me, init_threads, max_threads);
+    if (APR_SUCCESS != rv) {
+        *me = NULL;
+        return rv;
+    }
+    apr_pool_cleanup_register(pool, *me, thread_pool_cleanup,
+                              apr_pool_cleanup_null);
+
+    while (init_threads) {
+        rv = apr_thread_create(&t, NULL, thread_pool_func, *me, (*me)->pool);
+        if (APR_SUCCESS != rv) {
+            break;
+        }
+        ++(*me)->thd_cnt;
+        if ((*me)->thd_cnt > (*me)->thd_high)
+            (*me)->thd_high = (*me)->thd_cnt;
+        --init_threads;
+    }
+
+    return rv;
+}
+
+APU_DECLARE(apr_status_t) apr_thread_pool_destroy(apr_thread_pool_t * me)
+{
+    return apr_pool_cleanup_run(me->pool, me, thread_pool_cleanup);
+}
+
+/*
+ * NOTE: This function is not thread safe by itself. Caller should hold the lock
+ */
+static apr_thread_pool_task_t *task_new(apr_thread_pool_t * me,
+                                        apr_thread_start_t func,
+                                        void *param, apr_byte_t priority,
+                                        void *owner, apr_time_t time)
+{
+    apr_thread_pool_task_t *t;
+
+    if (APR_RING_EMPTY(me->recycled_tasks, apr_thread_pool_task, link)) {
+        t = apr_pcalloc(me->pool, sizeof(*t));
+        if (NULL == t) {
+            return NULL;
+        }
+    }
+    else {
+        t = APR_RING_FIRST(me->recycled_tasks);
+        APR_RING_REMOVE(t, link);
+    }
+
+    APR_RING_ELEM_INIT(t, link);
+    t->func = func;
+    t->param = param;
+    t->owner = owner;
+    if (time > 0) {
+        t->dispatch.time = apr_time_now() + time;
+    }
+    else {
+        t->dispatch.priority = priority;
+    }
+    return t;
+}
+
+/*
+ * Test it the task is the only one within the priority segment. 
+ * If it is not, return the first element with same or lower priority. 
+ * Otherwise, add the task into the queue and return NULL.
+ *
+ * NOTE: This function is not thread safe by itself. Caller should hold the lock
+ */
+static apr_thread_pool_task_t *add_if_empty(apr_thread_pool_t * me,
+                                            apr_thread_pool_task_t * const t)
+{
+    int seg;
+    int next;
+    apr_thread_pool_task_t *t_next;
+
+    seg = TASK_PRIORITY_SEG(t);
+    if (me->task_idx[seg]) {
+        assert(APR_RING_SENTINEL(me->tasks, apr_thread_pool_task, link) !=
+               me->task_idx[seg]);
+        t_next = me->task_idx[seg];
+        while (t_next->dispatch.priority > t->dispatch.priority) {
+            t_next = APR_RING_NEXT(t_next, link);
+            if (APR_RING_SENTINEL(me->tasks, apr_thread_pool_task, link) ==
+                t_next) {
+                return t_next;
+            }
+        }
+        return t_next;
+    }
+
+    for (next = seg - 1; next >= 0; next--) {
+        if (me->task_idx[next]) {
+            APR_RING_INSERT_BEFORE(me->task_idx[next], t, link);
+            break;
+        }
+    }
+    if (0 > next) {
+        APR_RING_INSERT_TAIL(me->tasks, t, apr_thread_pool_task, link);
+    }
+    me->task_idx[seg] = t;
+    return NULL;
+}
+
+/*
+*   schedule a task to run in "time" microseconds. Find the spot in the ring where
+*   the time fits. Adjust the short_time so the thread wakes up when the time is reached.
+*/
+static apr_status_t schedule_task(apr_thread_pool_t *me,
+                                  apr_thread_start_t func, void *param,
+                                  void *owner, apr_interval_time_t time)
+{
+    apr_thread_pool_task_t *t;
+    apr_thread_pool_task_t *t_loc;
+    apr_thread_t *thd;
+    apr_status_t rv = APR_SUCCESS;
+    apr_thread_mutex_lock(me->lock);
+
+    t = task_new(me, func, param, 0, owner, time);
+    if (NULL == t) {
+        apr_thread_mutex_unlock(me->lock);
+        return APR_ENOMEM;
+    }
+    t_loc = APR_RING_FIRST(me->scheduled_tasks);
+    while (NULL != t_loc) {
+        /* if the time is less than the entry insert ahead of it */
+        if (t->dispatch.time < t_loc->dispatch.time) {
+            ++me->scheduled_task_cnt;
+            APR_RING_INSERT_BEFORE(t_loc, t, link);
+            break;
+        }
+        else {
+            t_loc = APR_RING_NEXT(t_loc, link);
+            if (t_loc ==
+                APR_RING_SENTINEL(me->scheduled_tasks, apr_thread_pool_task,
+                                  link)) {
+                ++me->scheduled_task_cnt;
+                APR_RING_INSERT_TAIL(me->scheduled_tasks, t,
+                                     apr_thread_pool_task, link);
+                break;
+            }
+        }
+    }
+    /* there should be at least one thread for scheduled tasks */
+    if (0 == me->thd_cnt) {
+        rv = apr_thread_create(&thd, NULL, thread_pool_func, me, me->pool);
+        if (APR_SUCCESS == rv) {
+            ++me->thd_cnt;
+            if (me->thd_cnt > me->thd_high)
+                me->thd_high = me->thd_cnt;
+        }
+    }
+    apr_thread_mutex_unlock(me->lock);
+    apr_thread_mutex_lock(me->cond_lock);
+    apr_thread_cond_signal(me->cond);
+    apr_thread_mutex_unlock(me->cond_lock);
+    return rv;
+}
+
+static apr_status_t add_task(apr_thread_pool_t *me, apr_thread_start_t func,
+                             void *param, apr_byte_t priority, int push,
+                             void *owner)
+{
+    apr_thread_pool_task_t *t;
+    apr_thread_pool_task_t *t_loc;
+    apr_thread_t *thd;
+    apr_status_t rv = APR_SUCCESS;
+
+    apr_thread_mutex_lock(me->lock);
+
+    t = task_new(me, func, param, priority, owner, 0);
+    if (NULL == t) {
+        apr_thread_mutex_unlock(me->lock);
+        return APR_ENOMEM;
+    }
+
+    t_loc = add_if_empty(me, t);
+    if (NULL == t_loc) {
+        goto FINAL_EXIT;
+    }
+
+    if (push) {
+        while (APR_RING_SENTINEL(me->tasks, apr_thread_pool_task, link) !=
+               t_loc && t_loc->dispatch.priority >= t->dispatch.priority) {
+            t_loc = APR_RING_NEXT(t_loc, link);
+        }
+    }
+    APR_RING_INSERT_BEFORE(t_loc, t, link);
+    if (!push) {
+        if (t_loc == me->task_idx[TASK_PRIORITY_SEG(t)]) {
+            me->task_idx[TASK_PRIORITY_SEG(t)] = t;
+        }
+    }
+
+  FINAL_EXIT:
+    me->task_cnt++;
+    if (me->task_cnt > me->tasks_high)
+        me->tasks_high = me->task_cnt;
+    if (0 == me->thd_cnt || (0 == me->idle_cnt && me->thd_cnt < me->thd_max &&
+                             me->task_cnt > me->threshold)) {
+        rv = apr_thread_create(&thd, NULL, thread_pool_func, me, me->pool);
+        if (APR_SUCCESS == rv) {
+            ++me->thd_cnt;
+            if (me->thd_cnt > me->thd_high)
+                me->thd_high = me->thd_cnt;
+        }
+    }
+    apr_thread_mutex_unlock(me->lock);
+
+    apr_thread_mutex_lock(me->cond_lock);
+    apr_thread_cond_signal(me->cond);
+    apr_thread_mutex_unlock(me->cond_lock);
+
+    return rv;
+}
+
+APU_DECLARE(apr_status_t) apr_thread_pool_push(apr_thread_pool_t *me,
+                                               apr_thread_start_t func,
+                                               void *param,
+                                               apr_byte_t priority,
+                                               void *owner)
+{
+    return add_task(me, func, param, priority, 1, owner);
+}
+
+APU_DECLARE(apr_status_t) apr_thread_pool_schedule(apr_thread_pool_t *me,
+                                                   apr_thread_start_t func,
+                                                   void *param,
+                                                   apr_interval_time_t time,
+                                                   void *owner)
+{
+    return schedule_task(me, func, param, owner, time);
+}
+
+APU_DECLARE(apr_status_t) apr_thread_pool_top(apr_thread_pool_t *me,
+                                              apr_thread_start_t func,
+                                              void *param,
+                                              apr_byte_t priority,
+                                              void *owner)
+{
+    return add_task(me, func, param, priority, 0, owner);
+}
+
+static apr_status_t remove_scheduled_tasks(apr_thread_pool_t *me,
+                                           void *owner)
+{
+    apr_thread_pool_task_t *t_loc;
+    apr_thread_pool_task_t *next;
+
+    t_loc = APR_RING_FIRST(me->scheduled_tasks);
+    while (t_loc !=
+           APR_RING_SENTINEL(me->scheduled_tasks, apr_thread_pool_task,
+                             link)) {
+        next = APR_RING_NEXT(t_loc, link);
+        /* if this is the owner remove it */
+        if (t_loc->owner == owner) {
+            --me->scheduled_task_cnt;
+            APR_RING_REMOVE(t_loc, link);
+        }
+        t_loc = next;
+    }
+    return APR_SUCCESS;
+}
+
+static apr_status_t remove_tasks(apr_thread_pool_t *me, void *owner)
+{
+    apr_thread_pool_task_t *t_loc;
+    apr_thread_pool_task_t *next;
+    int seg;
+
+    t_loc = APR_RING_FIRST(me->tasks);
+    while (t_loc != APR_RING_SENTINEL(me->tasks, apr_thread_pool_task, link)) {
+        next = APR_RING_NEXT(t_loc, link);
+        if (t_loc->owner == owner) {
+            --me->task_cnt;
+            seg = TASK_PRIORITY_SEG(t_loc);
+            if (t_loc == me->task_idx[seg]) {
+                me->task_idx[seg] = APR_RING_NEXT(t_loc, link);
+                if (me->task_idx[seg] == APR_RING_SENTINEL(me->tasks,
+                                                           apr_thread_pool_task,
+                                                           link)
+                    || TASK_PRIORITY_SEG(me->task_idx[seg]) != seg) {
+                    me->task_idx[seg] = NULL;
+                }
+            }
+            APR_RING_REMOVE(t_loc, link);
+        }
+        t_loc = next;
+    }
+    return APR_SUCCESS;
+}
+
+static void wait_on_busy_threads(apr_thread_pool_t *me, void *owner)
+{
+#ifndef NDEBUG
+    apr_os_thread_t *os_thread;
+#endif
+    struct apr_thread_list_elt *elt;
+    apr_thread_mutex_lock(me->lock);
+    elt = APR_RING_FIRST(me->busy_thds);
+    while (elt != APR_RING_SENTINEL(me->busy_thds, apr_thread_list_elt, link)) {
+        if (elt->current_owner != owner) {
+            elt = APR_RING_NEXT(elt, link);
+            continue;
+        }
+#ifndef NDEBUG
+        /* make sure the thread is not the one calling tasks_cancel */
+        apr_os_thread_get(&os_thread, elt->thd);
+#ifdef WIN32
+        /* hack for apr win32 bug */
+        assert(!apr_os_thread_equal(apr_os_thread_current(), os_thread));
+#else
+        assert(!apr_os_thread_equal(apr_os_thread_current(), *os_thread));
+#endif
+#endif
+        while (elt->current_owner == owner) {
+            apr_thread_mutex_unlock(me->lock);
+            apr_sleep(200 * 1000);
+            apr_thread_mutex_lock(me->lock);
+        }
+        elt = APR_RING_FIRST(me->busy_thds);
+    }
+    apr_thread_mutex_unlock(me->lock);
+    return;
+}
+
+APU_DECLARE(apr_status_t) apr_thread_pool_tasks_cancel(apr_thread_pool_t *me,
+                                                       void *owner)
+{
+    apr_status_t rv = APR_SUCCESS;
+
+    apr_thread_mutex_lock(me->lock);
+    if (me->task_cnt > 0) {
+        rv = remove_tasks(me, owner);
+    }
+    if (me->scheduled_task_cnt > 0) {
+        rv = remove_scheduled_tasks(me, owner);
+    }
+    apr_thread_mutex_unlock(me->lock);
+    wait_on_busy_threads(me, owner);
+
+    return rv;
+}
+
+APU_DECLARE(apr_size_t) apr_thread_pool_tasks_count(apr_thread_pool_t *me)
+{
+    return me->task_cnt;
+}
+
+APU_DECLARE(apr_size_t)
+    apr_thread_pool_scheduled_tasks_count(apr_thread_pool_t *me)
+{
+    return me->scheduled_task_cnt;
+}
+
+APU_DECLARE(apr_size_t) apr_thread_pool_threads_count(apr_thread_pool_t *me)
+{
+    return me->thd_cnt;
+}
+
+APU_DECLARE(apr_size_t) apr_thread_pool_busy_count(apr_thread_pool_t *me)
+{
+    return me->thd_cnt - me->idle_cnt;
+}
+
+APU_DECLARE(apr_size_t) apr_thread_pool_idle_count(apr_thread_pool_t *me)
+{
+    return me->idle_cnt;
+}
+
+APU_DECLARE(apr_size_t)
+    apr_thread_pool_tasks_run_count(apr_thread_pool_t * me)
+{
+    return me->tasks_run;
+}
+
+APU_DECLARE(apr_size_t)
+    apr_thread_pool_tasks_high_count(apr_thread_pool_t * me)
+{
+    return me->tasks_high;
+}
+
+APU_DECLARE(apr_size_t)
+    apr_thread_pool_threads_high_count(apr_thread_pool_t * me)
+{
+    return me->thd_high;
+}
+
+APU_DECLARE(apr_size_t)
+    apr_thread_pool_threads_idle_timeout_count(apr_thread_pool_t * me)
+{
+    return me->thd_timed_out;
+}
+
+
+APU_DECLARE(apr_size_t) apr_thread_pool_idle_max_get(apr_thread_pool_t *me)
+{
+    return me->idle_max;
+}
+
+APU_DECLARE(apr_interval_time_t)
+    apr_thread_pool_idle_wait_get(apr_thread_pool_t * me)
+{
+    return me->idle_wait;
+}
+
+/*
+ * This function stop extra idle threads to the cnt.
+ * @return the number of threads stopped
+ * NOTE: There could be busy threads become idle during this function
+ */
+static struct apr_thread_list_elt *trim_threads(apr_thread_pool_t *me,
+                                                apr_size_t *cnt, int idle)
+{
+    struct apr_thread_list *thds;
+    apr_size_t n, n_dbg, i;
+    struct apr_thread_list_elt *head, *tail, *elt;
+
+    apr_thread_mutex_lock(me->lock);
+    if (idle) {
+        thds = me->idle_thds;
+        n = me->idle_cnt;
+    }
+    else {
+        thds = me->busy_thds;
+        n = me->thd_cnt - me->idle_cnt;
+    }
+    if (n <= *cnt) {
+        apr_thread_mutex_unlock(me->lock);
+        *cnt = 0;
+        return NULL;
+    }
+    n -= *cnt;
+
+    head = APR_RING_FIRST(thds);
+    for (i = 0; i < *cnt; i++) {
+        head = APR_RING_NEXT(head, link);
+    }
+    tail = APR_RING_LAST(thds);
+    if (idle) {
+        APR_RING_UNSPLICE(head, tail, link);
+        me->idle_cnt = *cnt;
+    }
+
+    n_dbg = 0;
+    for (elt = head; elt != tail; elt = APR_RING_NEXT(elt, link)) {
+        elt->state = TH_STOP;
+        n_dbg++;
+    }
+    elt->state = TH_STOP;
+    n_dbg++;
+    assert(n == n_dbg);
+    *cnt = n;
+
+    apr_thread_mutex_unlock(me->lock);
+
+    APR_RING_PREV(head, link) = NULL;
+    APR_RING_NEXT(tail, link) = NULL;
+    return head;
+}
+
+static apr_size_t trim_idle_threads(apr_thread_pool_t *me, apr_size_t cnt)
+{
+    apr_size_t n_dbg;
+    struct apr_thread_list_elt *elt, *head, *tail;
+    apr_status_t rv;
+
+    elt = trim_threads(me, &cnt, 1);
+
+    apr_thread_mutex_lock(me->cond_lock);
+    apr_thread_cond_broadcast(me->cond);
+    apr_thread_mutex_unlock(me->cond_lock);
+
+    n_dbg = 0;
+    if (NULL != (head = elt)) {
+        while (elt) {
+            tail = elt;
+            apr_thread_join(&rv, elt->thd);
+            elt = APR_RING_NEXT(elt, link);
+            ++n_dbg;
+        }
+        apr_thread_mutex_lock(me->lock);
+        APR_RING_SPLICE_TAIL(me->recycled_thds, head, tail,
+                             apr_thread_list_elt, link);
+        apr_thread_mutex_unlock(me->lock);
+    }
+    assert(cnt == n_dbg);
+
+    return cnt;
+}
+
+/* don't join on busy threads for performance reasons, who knows how long will
+ * the task takes to perform
+ */
+static apr_size_t trim_busy_threads(apr_thread_pool_t *me, apr_size_t cnt)
+{
+    trim_threads(me, &cnt, 0);
+    return cnt;
+}
+
+APU_DECLARE(apr_size_t) apr_thread_pool_idle_max_set(apr_thread_pool_t *me,
+                                                     apr_size_t cnt)
+{
+    me->idle_max = cnt;
+    cnt = trim_idle_threads(me, cnt);
+    return cnt;
+}
+
+APU_DECLARE(apr_interval_time_t)
+    apr_thread_pool_idle_wait_set(apr_thread_pool_t * me,
+                                  apr_interval_time_t timeout)
+{
+    apr_interval_time_t oldtime;
+
+    oldtime = me->idle_wait;
+    me->idle_wait = timeout;
+
+    return oldtime;
+}
+
+APU_DECLARE(apr_size_t) apr_thread_pool_thread_max_get(apr_thread_pool_t *me)
+{
+    return me->thd_max;
+}
+
+/*
+ * This function stop extra working threads to the new limit.
+ * NOTE: There could be busy threads become idle during this function
+ */
+APU_DECLARE(apr_size_t) apr_thread_pool_thread_max_set(apr_thread_pool_t *me,
+                                                       apr_size_t cnt)
+{
+    unsigned int n;
+
+    me->thd_max = cnt;
+    if (0 == cnt || me->thd_cnt <= cnt) {
+        return 0;
+    }
+
+    n = me->thd_cnt - cnt;
+    if (n >= me->idle_cnt) {
+        trim_busy_threads(me, n - me->idle_cnt);
+        trim_idle_threads(me, 0);
+    }
+    else {
+        trim_idle_threads(me, me->idle_cnt - n);
+    }
+    return n;
+}
+
+APU_DECLARE(apr_size_t) apr_thread_pool_threshold_get(apr_thread_pool_t *me)
+{
+    return me->threshold;
+}
+
+APU_DECLARE(apr_size_t) apr_thread_pool_threshold_set(apr_thread_pool_t *me,
+                                                      apr_size_t val)
+{
+    apr_size_t ov;
+
+    ov = me->threshold;
+    me->threshold = val;
+    return ov;
+}
+
+APU_DECLARE(apr_status_t) apr_thread_pool_task_owner_get(apr_thread_t *thd,
+                                                         void **owner)
+{
+    apr_status_t rv;
+    apr_thread_pool_task_t *task;
+    void *data;
+
+    rv = apr_thread_data_get(&data, "apr_thread_pool_task", thd);
+    if (rv != APR_SUCCESS) {
+        return rv;
+    }
+
+    task = data;
+    if (!task) {
+        *owner = NULL;
+        return APR_BADARG;
+    }
+
+    *owner = task->owner;
+    return APR_SUCCESS;
+}
+
+#endif /* APR_HAS_THREADS */
+
+/* vim: set ts=4 sw=4 et cin tw=80: */
diff --git a/srclib/apr-util/misc/apu_dso.c b/srclib/apr-util/misc/apu_dso.c
new file mode 100644
index 00000000..fb1ca758
--- /dev/null
+++ b/srclib/apr-util/misc/apu_dso.c
@@ -0,0 +1,180 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <ctype.h>
+#include <stdio.h>
+
+#include "apu_config.h"
+#include "apu.h"
+
+#include "apr_pools.h"
+#include "apr_tables.h"
+#include "apr_dso.h"
+#include "apr_strings.h"
+#include "apr_hash.h"
+#include "apr_file_io.h"
+#include "apr_env.h"
+
+#include "apu_internal.h"
+#include "apu_version.h"
+
+
+#if APR_HAS_THREADS
+static apr_thread_mutex_t* mutex = NULL;
+#endif
+static apr_hash_t *dsos = NULL;
+
+
+#if APR_HAS_THREADS && APU_DSO_BUILD
+apr_status_t apu_dso_mutex_lock()
+{
+    return apr_thread_mutex_lock(mutex);
+}
+apr_status_t apu_dso_mutex_unlock()
+{
+    return apr_thread_mutex_unlock(mutex);
+}
+#else
+apr_status_t apu_dso_mutex_lock() {
+    return APR_SUCCESS;
+}
+apr_status_t apu_dso_mutex_unlock() {
+    return APR_SUCCESS;
+}
+#endif
+
+#define CLEANUP_CAST (apr_status_t (*)(void*))
+
+
+static apr_status_t apu_dso_term(void *ptr)
+{
+    /* set statics to NULL so init can work again */
+    dsos = NULL;
+#if APR_HAS_THREADS
+    mutex = NULL;
+#endif
+
+    /* Everything else we need is handled by cleanups registered
+     * when we created mutexes and loaded DSOs
+     */
+    return APR_SUCCESS;
+}
+
+apr_status_t apu_dso_init(apr_pool_t *pool)
+{
+    apr_status_t ret = APR_SUCCESS;
+#if APU_DSO_BUILD
+    apr_pool_t *global;
+    apr_pool_t *parent;
+
+    if (dsos != NULL) {
+        return APR_SUCCESS;
+    }
+
+    /* Top level pool scope, need process-scope lifetime */
+    for (parent = global = pool; parent; parent = apr_pool_parent_get(global))
+         global = parent;
+
+    dsos = apr_hash_make(global);
+
+#if APR_HAS_THREADS
+    ret = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, global);
+    /* This already registers a pool cleanup */
+#endif
+
+    apr_pool_cleanup_register(global, NULL, apu_dso_term,
+                              apr_pool_cleanup_null);
+
+#endif /* APU_DSO_BUILD */
+    return ret;
+}
+
+apr_status_t apu_dso_load(apr_dso_handle_sym_t *dsoptr, const char *module,
+                          const char *modsym, apr_pool_t *pool)
+{
+#if !APU_DSO_BUILD
+    return APR_ENOTIMPL;
+#else
+    apr_dso_handle_t *dlhandle = NULL;
+    char *pathlist;
+    char path[APR_PATH_MAX + 1];
+    apr_array_header_t *paths;
+    apr_pool_t *global;
+    apr_status_t rv = APR_EDSOOPEN;
+    char *eos = NULL;
+    int i;
+
+    *dsoptr = apr_hash_get(dsos, module, APR_HASH_KEY_STRING);
+    if (*dsoptr) {
+        return APR_EINIT;
+    }
+
+    /* The driver DSO must have exactly the same lifetime as the
+     * drivers hash table; ignore the passed-in pool */
+    global = apr_hash_pool_get(dsos);
+
+    /* Retrieve our path search list or prepare for a single search */
+    if ((apr_env_get(&pathlist, APR_DSOPATH, pool) != APR_SUCCESS)
+          || (apr_filepath_list_split(&paths, pathlist, pool) != APR_SUCCESS))
+        paths = apr_array_make(pool, 1, sizeof(char*));
+
+#if defined(APU_DSO_LIBDIR)
+    /* Always search our prefix path, but on some platforms such as
+     * win32 this may be left undefined
+     */
+    (*((char **)apr_array_push(paths))) = APU_DSO_LIBDIR;
+#endif
+
+    for (i = 0; i < paths->nelts; ++i)
+    {
+#if defined(WIN32)
+        /* Use win32 dso search semantics and attempt to
+         * load the relative lib on the first pass.
+         */
+        if (!eos) {
+            eos = path;
+            --i;
+        }
+        else
+#endif
+        {
+            eos = apr_cpystrn(path, ((char**)paths->elts)[i], sizeof(path));
+            if ((eos > path) && (eos - path < sizeof(path) - 1))
+                *(eos++) = '/';
+        }
+        apr_cpystrn(eos, module, sizeof(path) - (eos - path));
+
+        rv = apr_dso_load(&dlhandle, path, global);
+        if (rv == APR_SUCCESS) { /* APR_EDSOOPEN */
+            break;
+        }
+    }
+
+    if (rv != APR_SUCCESS) /* APR_ESYMNOTFOUND */
+        return rv;
+
+    rv = apr_dso_sym(dsoptr, dlhandle, modsym);
+    if (rv != APR_SUCCESS) { /* APR_ESYMNOTFOUND */
+        apr_dso_unload(dlhandle);
+    }
+    else {
+        module = apr_pstrdup(global, module);
+        apr_hash_set(dsos, module, APR_HASH_KEY_STRING, *dsoptr);
+    }
+    return rv;
+#endif /* APU_DSO_BUILD */
+}
+
diff --git a/srclib/apr-util/test/Makefile.in b/srclib/apr-util/test/Makefile.in
index 97a97635..9b6890a8 100644
--- a/srclib/apr-util/test/Makefile.in
+++ b/srclib/apr-util/test/Makefile.in
@@ -16,11 +16,10 @@ STDTEST_PORTABLE = testall dbd
 
 TESTS = teststrmatch.lo testuri.lo testuuid.lo testbuckets.lo testpass.lo \
 	testmd4.lo testmd5.lo testldap.lo testdate.lo testdbm.lo testdbd.lo \
-	testxml.lo testrmm.lo testreslist.lo testqueue.lo testxlate.lo
+	testxml.lo testrmm.lo testreslist.lo testqueue.lo testxlate.lo \
+	testmemcache.lo 
 
-OTHER_PROGRAMS = 
-
-PROGRAMS = $(STDTEST_PORTABLE) $(OTHER_PROGRAMS)
+PROGRAMS = $(STDTEST_PORTABLE)
 
 TARGETS = $(PROGRAMS)
 
@@ -48,7 +47,7 @@ testutil.lo: $(srcdir)/abts.c $(srcdir)/abts.h $(srcdir)/abts_tests.h \
 
 OBJECTS_testall = abts.lo testutil.lo $(TESTS) $(LOCAL_LIBS)
 testall: $(OBJECTS_testall)
-	$(LINK_PROG) $(OBJECTS_testall) $(APRUTIL_LIBS)
+	$(LINK_PROG) $(OBJECTS_testall) $(APRUTIL_LIBS) @LDADD_ldap@
 # For VPATH builds; where we have no ./data, copy us some data
 # if we wait until 'make check', then 'make; ./testall' fails;
 	if test ! -d "./data"; then cp -r $(srcdir)/data data; fi
@@ -58,22 +57,32 @@ dbd: $(OBJECTS_dbd)
 	$(LINK_PROG) $(OBJECTS_dbd) $(APRUTIL_LIBS)
 
 check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
+	teststatus=0; \
+	progfailed=""; \
 	for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \
 	        if test "$$prog" = 'dbd'; then \
 			for driver in sqlite2 sqlite3; do \
+				@apr_shlibpath_var@="`echo "../dbd/.libs:../ldap/.libs:$$@apr_shlibpath_var@" | sed -e 's/::*$$//'`" \
 				./$$prog $$driver; \
-				if test $$? = 255; then \
-					echo "$$prog $$driver failed"; \
-					break; \
+				status=$$?; \
+				if test $$status != 0; then \
+					teststatus=$$status; \
+					progfailed="$$progfailed '$$prog $$driver'"; \
 				fi; \
 			done; \
 	        else \
+			@apr_shlibpath_var@="`echo "../dbd/.libs:../ldap/.libs:$$@apr_shlibpath_var@" | sed -e 's/::*$$//'`" \
 			./$$prog; \
-			if test $$? = 255; then \
-				echo "$$prog failed"; \
-				break; \
+			status=$$?; \
+			if test $$status != 0; then \
+				teststatus=$$status; \
+				progfailed="$$progfailed $$prog"; \
 			fi; \
 		fi; \
-	done
+	done; \
+	if test $$teststatus != 0; then \
+		echo "Programs failed:$$progfailed"; \
+	fi; \
+	exit $$teststatus
 
 # DO NOT REMOVE
diff --git a/srclib/apr-util/test/Makefile.win b/srclib/apr-util/test/Makefile.win
index e9b44b3a..3ad98dd3 100644
--- a/srclib/apr-util/test/Makefile.win
+++ b/srclib/apr-util/test/Makefile.win
@@ -13,6 +13,8 @@
 # OUTDIR
 #   the library path of the libraries, and also the path within test/
 #   where all of the tests for that library will be built
+# APROUTDIR
+#   The library path of apr (if different from OUTDIR)
 # APR_PATH
 #   relative or absolute path to locate apr libs and includes
 # API_PATH
@@ -22,8 +24,6 @@
 MODEL=dynamic
 !ENDIF
 
-APROUTDIR=OUTDIR
-
 !IFNDEF OUTDIR
 !IF "$(MODEL)" == "static"
 OUTDIR=LibR
@@ -31,7 +31,8 @@ OUTDIR=LibR
 OUTDIR=Release
 !ENDIF
 
-!IF [$(COMSPEC) /c cl /nologo /? | find "x64" >NUL ] == 0
+!IF [$(COMSPEC) /c cl /nologo /? \
+	| $(SystemRoot)\System32\find.exe "x64" >NUL ] == 0
 OUTDIR=x64\$(OUTDIR)
 !ENDIF
 !ENDIF
@@ -57,18 +58,20 @@ ALL_TESTS = $(INTDIR)\teststrmatch.obj $(INTDIR)\testuri.obj \
 	$(INTDIR)\testbuckets.obj $(INTDIR)\testpass.obj \
 	$(INTDIR)\testmd4.obj $(INTDIR)\testmd5.obj \
 	$(INTDIR)\testldap.obj $(INTDIR)\testdbd.obj \
-	$(OUTDIR)\testdbm.obj $(OUTDIR)\testreslist.obj \
-	$(OUTDIR)\testxml.obj $(OUTDIR)\testqueue.obj \
-	$(OUTDIR)\testrmm.obj $(OUTDIR)\testxlate.obj \
-	$(OUTDIR)\testdate.obj
+	$(INTDIR)\testdbm.obj $(INTDIR)\testreslist.obj \
+	$(INTDIR)\testxml.obj $(INTDIR)\testqueue.obj \
+	$(INTDIR)\testrmm.obj $(INTDIR)\testxlate.obj \
+	$(INTDIR)\testdate.obj $(INTDIR)\testmemcache.obj
 
 CLEAN_DATA = manyfile.bin testfile.txt data\sqlite*.db
 
 CLEAN_BUILDDIRS = Debug Release LibD LibR 9x x64
 
-PROGRAMS = $(OUTDIR)\testall.exe
+PROGRAMS = \
+	$(OUTDIR)\testall.exe
 
-OTHER_PROGRAMS = $(OUTDIR)\dbd.exe
+OTHER_PROGRAMS = \
+	$(OUTDIR)\dbd.exe
 
 # bring in rules.mk for standard functionality
 ALL: $(PROGRAMS) $(OTHER_PROGRAMS)
@@ -84,13 +87,11 @@ APROUTDIR=$(OUTDIR)
 !IF "$(MODEL)" == "static"
 PROGRAM_DEPENDENCIES = \
 	$(APR_PATH)\$(APROUTDIR)\apr-1.lib \
-	$(API_PATH)\$(OUTDIR)\apriconv-1.lib \
 	..\$(OUTDIR)\aprutil-1.lib 
 STATIC_CFLAGS = /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC
 !ELSE
 PROGRAM_DEPENDENCIES = \
 	$(APR_PATH)\$(APROUTDIR)\libapr-1.lib \
-	$(API_PATH)\$(OUTDIR)\libapriconv-1.lib \
 	..\$(OUTDIR)\libaprutil-1.lib 
 STATIC_CFLAGS = 
 !ENDIF
@@ -147,7 +148,9 @@ cleanall:
 	    @if EXIST %d\. rmdir /s /q %d
 
 
-PATH=$(OUTDIR);..\$(OUTDIR);$(API_PATH)\$(OUTDIR);$(APR_PATH)\$(APROUTDIR);$(PATH)
+!IF "$(MODEL)" != "static"
+PATH=$(OUTDIR);..\$(OUTDIR);..\ldap\$(OUTDIR);..\dbd\$(OUTDIR);$(API_PATH)\$(OUTDIR);$(APR_PATH)\$(APROUTDIR);$(PATH)
+!ENDIF
 APR_ICONV1_PATH=$(API_PATH)\$(OUTDIR)\iconv
 
 check: $(PROGRAMS) $(OTHER_PROGRAMS)
@@ -156,7 +159,7 @@ check: $(PROGRAMS) $(OTHER_PROGRAMS)
 	)
 	echo Testing dbd sqlite2 && $(OUTDIR)\dbd.exe sqlite2 || echo Failed
 	echo Testing dbd sqlite3 && $(OUTDIR)\dbd.exe sqlite3 || echo Failed
-	
+
 checkall: check
 
 # DO NOT REMOVE
diff --git a/srclib/apr-util/test/abts.c b/srclib/apr-util/test/abts.c
index 596ad0a2..9aa2e2a9 100644
--- a/srclib/apr-util/test/abts.c
+++ b/srclib/apr-util/test/abts.c
@@ -1,8 +1,9 @@
-/* Copyright 2000-2004 Ryan Bloom
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -11,9 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
- * Portions of this file were taken from testall.c in the APR test suite,
- * written by members of the Apache Software Foundation.
  */
 
 #include "abts.h"
@@ -411,9 +409,10 @@ int main(int argc, const char *const argv[]) {
 
     for (i = 0; i < (sizeof(alltests) / sizeof(struct testlist *)); i++) {
         suite = alltests[i].func(suite);
+        apr_pool_clear(p);
     }
 
     rv = report(suite);
     return rv;
 }
-       
+
diff --git a/srclib/apr-util/test/abts.h b/srclib/apr-util/test/abts.h
index 3ae41d26..a31def76 100644
--- a/srclib/apr-util/test/abts.h
+++ b/srclib/apr-util/test/abts.h
@@ -1,8 +1,9 @@
-/* Copyright 2000-2004 Ryan Bloom
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -92,10 +93,6 @@ void abts_assert(abts_case *tc, const char *message, int condition, int lineno);
 #define ABTS_NOT_IMPL(a, b)         abts_not_impl(a, b, __LINE__);
 #define ABTS_ASSERT(a, b, c)        abts_assert(a, b, c, __LINE__);
 
-abts_suite *run_tests(abts_suite *suite);
-abts_suite *run_tests1(abts_suite *suite);
-
-
 #endif
 
 #ifdef __cplusplus
diff --git a/srclib/apr-util/test/abts_tests.h b/srclib/apr-util/test/abts_tests.h
index ca157bbb..040d02db 100644
--- a/srclib/apr-util/test/abts_tests.h
+++ b/srclib/apr-util/test/abts_tests.h
@@ -33,6 +33,7 @@ const struct testlist {
     {testldap},
     {testdbd},
     {testdate},
+    {testmemcache},
     {testxml},
     {testxlate},
     {testrmm},
diff --git a/srclib/apr-util/test/dbd.c b/srclib/apr-util/test/dbd.c
index b5ae9630..61f49ab6 100644
--- a/srclib/apr-util/test/dbd.c
+++ b/srclib/apr-util/test/dbd.c
@@ -122,7 +122,7 @@ static int select_sequential(apr_pool_t* pool, apr_dbd_t* handle,
     for (rv = apr_dbd_get_row(driver, pool, res, &row, -1);
          rv == 0;
          rv = apr_dbd_get_row(driver, pool, res, &row, -1)) {
-        printf("ROW %d:	", i++) ;
+        printf("ROW %d:	", ++i) ;
         for (n = 0; n < apr_dbd_num_cols(driver, res); ++n) {
             entry = apr_dbd_get_entry(driver, row, n);
             if (entry == NULL) {
@@ -295,7 +295,7 @@ static int test_pselect(apr_pool_t* pool, apr_dbd_t* handle,
     for (rv = apr_dbd_get_row(driver, pool, res, &row, -1);
          rv == 0;
          rv = apr_dbd_get_row(driver, pool, res, &row, -1)) {
-        printf("ROW %d:	", i++) ;
+        printf("ROW %d:	", ++i) ;
         for (n = 0; n < apr_dbd_num_cols(driver, res); ++n) {
             entry = apr_dbd_get_entry(driver, row, n);
             if (entry == NULL) {
diff --git a/srclib/apr-util/test/testall.dsw b/srclib/apr-util/test/testall.dsw
index a3f5c2a3..1ae1ab63 100644
--- a/srclib/apr-util/test/testall.dsw
+++ b/srclib/apr-util/test/testall.dsw
@@ -30,6 +30,24 @@ Package=<4>
 
 ###############################################################################
 
+Project: "apr_ldap"="..\ldap\apr_ldap.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "apriconv"="..\..\apr-iconv\apriconv.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -213,6 +231,9 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
+    Project_Dep_Name apr_ldap
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name libapr
     End Project Dependency
     Begin Project Dependency
diff --git a/srclib/apr-util/test/testbuckets.c b/srclib/apr-util/test/testbuckets.c
index 6c23a771..6c3653ff 100644
--- a/srclib/apr-util/test/testbuckets.c
+++ b/srclib/apr-util/test/testbuckets.c
@@ -315,7 +315,8 @@ static void test_insertfile(abts_case *tc, void *ctx)
 
     ABTS_ASSERT(tc, "open test file",
                 apr_file_open(&f, TIF_FNAME,
-                              APR_WRITE|APR_TRUNCATE|APR_CREATE,
+                              APR_FOPEN_WRITE | APR_FOPEN_TRUNCATE
+                            | APR_FOPEN_CREATE | APR_FOPEN_SPARSE,
                               APR_OS_DEFAULT, p) == APR_SUCCESS);
 
     if (apr_file_trunc(f, bignum)) {
diff --git a/srclib/apr-util/test/testdbd.c b/srclib/apr-util/test/testdbd.c
index fd9a7874..e7d16428 100644
--- a/srclib/apr-util/test/testdbd.c
+++ b/srclib/apr-util/test/testdbd.c
@@ -183,7 +183,7 @@ static void test_dbd_sqlite2(abts_case *tc, void *data)
     ABTS_ASSERT(tc, "failed to fetch driver", rv == APR_SUCCESS);
     ABTS_PTR_NOTNULL(tc, driver);
 
-    ABTS_STR_EQUAL(tc, apr_dbd_name(driver), "sqlite2");
+    ABTS_STR_EQUAL(tc, "sqlite2", apr_dbd_name(driver));
 
     rv = apr_dbd_open(driver, pool, "data/sqlite2.db:600", &handle);
     ABTS_ASSERT(tc, "failed to open database", rv == APR_SUCCESS);
@@ -205,7 +205,7 @@ static void test_dbd_sqlite3(abts_case *tc, void *data)
     ABTS_ASSERT(tc, "failed to fetch driver", rv == APR_SUCCESS);
     ABTS_PTR_NOTNULL(tc, driver);
 
-    ABTS_STR_EQUAL(tc, apr_dbd_name(driver), "sqlite3");
+    ABTS_STR_EQUAL(tc, "sqlite3", apr_dbd_name(driver));
 
     rv = apr_dbd_open(driver, pool, "data/sqlite3.db", &handle);
     ABTS_ASSERT(tc, "failed to open database", rv == APR_SUCCESS);
diff --git a/srclib/apr-util/test/testdbm.c b/srclib/apr-util/test/testdbm.c
index fc64c5dc..89d8d2f9 100644
--- a/srclib/apr-util/test/testdbm.c
+++ b/srclib/apr-util/test/testdbm.c
@@ -67,13 +67,13 @@ static void test_dbm_store(abts_case *tc, apr_dbm_t *db, dbm_table_t *table)
 
     for (; i >= NUM_TABLE_ROWS/2; i--) {
         rv = apr_dbm_store(db, table[i].key, table[i].val);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
         table[i].deleted = FALSE;
     }
 
     for (i = 0; i < NUM_TABLE_ROWS/2; i++) {
         rv = apr_dbm_store(db, table[i].key, table[i].val);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
         table[i].deleted = FALSE;
     }
 }
@@ -88,12 +88,12 @@ static void test_dbm_fetch(abts_case *tc, apr_dbm_t *db, dbm_table_t *table)
         memset(&val, 0, sizeof(val));
         rv = apr_dbm_fetch(db, table[i].key, &val);
         if (!table[i].deleted) {
-            ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
-            ABTS_INT_EQUAL(tc, (int)table[i].val.dsize, (int)val.dsize);
+            ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+            ABTS_INT_EQUAL(tc, table[i].val.dsize, val.dsize);
             ABTS_INT_EQUAL(tc, 0, memcmp(table[i].val.dptr, val.dptr, val.dsize));
             apr_dbm_freedatum(db, val);
         } else {
-            ABTS_INT_EQUAL(tc, 0, (int)val.dsize);
+            ABTS_INT_EQUAL(tc, 0, val.dsize);
         }
     }
 }
@@ -108,7 +108,7 @@ static void test_dbm_delete(abts_case *tc, apr_dbm_t *db, dbm_table_t *table)
         if (i & 1)
             continue;
         rv = apr_dbm_delete(db, table[i].key);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
         table[i].deleted = TRUE;
     }
 }
@@ -135,7 +135,7 @@ static void test_dbm_traversal(abts_case *tc, apr_dbm_t *db, dbm_table_t *table)
     apr_datum_t key;
 
     rv = apr_dbm_firstkey(db, &key);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     do {
         if (key.dptr == NULL || key.dsize == 0)
@@ -146,19 +146,19 @@ static void test_dbm_traversal(abts_case *tc, apr_dbm_t *db, dbm_table_t *table)
                 continue;
             if (memcmp(table[i].key.dptr, key.dptr, key.dsize))
                 continue;
-            ABTS_INT_EQUAL(tc, table[i].deleted, 0);
-            ABTS_INT_EQUAL(tc, table[i].visited, 0);
+            ABTS_INT_EQUAL(tc, 0, table[i].deleted);
+            ABTS_INT_EQUAL(tc, 0, table[i].visited);
             table[i].visited++;
         }
 
         rv = apr_dbm_nextkey(db, &key);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     } while (1);
 
     for (i = 0; i < NUM_TABLE_ROWS; i++) {
         if (table[i].deleted)
             continue;
-        ABTS_INT_EQUAL(tc, table[i].visited, 1);
+        ABTS_INT_EQUAL(tc, 1, table[i].visited);
         table[i].visited = 0;
     }
 }
@@ -172,7 +172,7 @@ static void test_dbm(abts_case *tc, void *data)
     const char *file = apr_pstrcat(p, "data/test-", type, NULL);
 
     rv = apr_dbm_open_ex(&db, type, file, APR_DBM_RWCREATE, APR_OS_DEFAULT, p);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     if (rv != APR_SUCCESS)
         return;
@@ -188,7 +188,7 @@ static void test_dbm(abts_case *tc, void *data)
     apr_dbm_close(db);
 
     rv = apr_dbm_open_ex(&db, type, file, APR_DBM_READONLY, APR_OS_DEFAULT, p);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     if (rv != APR_SUCCESS)
         return;
diff --git a/srclib/apr-util/test/testmd4.c b/srclib/apr-util/test/testmd4.c
index 345650e5..53a33614 100644
--- a/srclib/apr-util/test/testmd4.c
+++ b/srclib/apr-util/test/testmd4.c
@@ -95,7 +95,7 @@ static void test_md4sum(abts_case *tc, void *data)
         unsigned char digest[APR_MD4_DIGESTSIZE];
         const void *string = md4sums[count].string;
         const void *sum = md4sums[count].md4sum;
-        apr_size_t len = strlen(string);
+        unsigned int len = strlen(string);
 
         ABTS_ASSERT(tc, "apr_md4_init", (apr_md4_init(&context) == 0));
         ABTS_ASSERT(tc, "apr_md4_update", 
diff --git a/srclib/apr-util/test/testmd5.c b/srclib/apr-util/test/testmd5.c
index 5f8241a8..5189993b 100644
--- a/srclib/apr-util/test/testmd5.c
+++ b/srclib/apr-util/test/testmd5.c
@@ -55,7 +55,7 @@ static void test_md5sum(abts_case *tc, void *data)
         unsigned char digest[APR_MD5_DIGESTSIZE];
         const void *string = md5sums[count].string;
         const void *sum = md5sums[count].digest;
-        apr_size_t len = strlen(string);
+        unsigned int len = strlen(string);
 
         ABTS_ASSERT(tc, "apr_md5_init", (apr_md5_init(&context) == 0));
         ABTS_ASSERT(tc, "apr_md5_update", 
diff --git a/srclib/apr-util/test/testmemcache.c b/srclib/apr-util/test/testmemcache.c
new file mode 100644
index 00000000..bcdf02e8
--- /dev/null
+++ b/srclib/apr-util/test/testmemcache.c
@@ -0,0 +1,622 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "testutil.h"
+#include "apr.h"
+#include "apu.h"
+#include "apr_general.h"
+#include "apr_strings.h"
+#include "apr_hash.h"
+#include "apr_memcache.h"
+#include "apr_network_io.h"
+
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h>		/* for exit() */
+#endif
+
+#define HOST "localhost"
+#define PORT 11211
+
+/* the total number of items to use for set/get testing */
+#define TDATA_SIZE 3000
+
+/* some smaller subset of TDATA_SIZE used for multiget testing */
+#define TDATA_SET 100
+
+/* our custom hash function just returns this all the time */
+#define HASH_FUNC_RESULT 510
+
+/* all keys will be prefixed with this */
+const char prefix[] = "testmemcache";
+
+/* text for values we store */
+const char txt[] =
+"Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Duis at"
+"lacus in ligula hendrerit consectetuer. Vestibulum tristique odio"
+"iaculis leo. In massa arcu, ultricies a, laoreet nec, hendrerit non,"
+"neque. Nulla sagittis sapien ac risus. Morbi ligula dolor, vestibulum"
+"nec, viverra id, placerat dapibus, arcu. Curabitur egestas feugiat"
+"tellus. Donec dignissim. Nunc ante. Curabitur id lorem. In mollis"
+"tortor sit amet eros auctor dapibus. Proin nulla sem, tristique in,"
+"convallis id, iaculis feugiat cras amet.";
+
+/*
+ * this datatype is for our custom server determination function. this might
+ * be useful if you don't want to rely on simply hashing keys to determine
+ * where a key belongs, but instead want to write something fancy, or use some
+ * other kind of configuration data, i.e. a hash plus some data about a 
+ * namespace, or whatever. see my_server_func, and test_memcache_user_funcs
+ * for the examples.
+ */
+typedef struct {
+  const char *someval;
+  apr_uint32_t which_server;
+} my_hash_server_baton;
+
+
+/* this could do something fancy and return some hash result. 
+ * for simplicity, just return the same value, so we can test it later on.
+ * if you wanted to use some external hashing library or functions for
+ * consistent hashing, for example, this would be a good place to do it.
+ */
+apr_uint32_t my_hash_func(void *baton, const char *data,
+                          apr_size_t data_len)
+{
+
+  return HASH_FUNC_RESULT;
+}
+
+/*
+ * a fancy function to determine which server to use given some kind of data
+ * and a hash value. this example actually ignores the hash value itself
+ * and pulls some number from the *baton, which is a struct that has some 
+ * kind of meaningful stuff in it.
+ */
+apr_memcache_server_t *my_server_func(void *baton, 
+                                      apr_memcache_t *mc,
+                                      const apr_uint32_t hash)
+{
+  apr_memcache_server_t *ms = NULL;
+  my_hash_server_baton *mhsb = (my_hash_server_baton *)baton;
+
+  if(mc->ntotal == 0) {
+    return NULL;
+  } 
+
+  if(mc->ntotal < mhsb->which_server) {
+    return NULL;
+  }
+
+  ms = mc->live_servers[mhsb->which_server - 1];
+
+  return ms;
+}
+
+apr_uint16_t firsttime = 0;
+int randval(apr_uint32_t high)
+{
+    apr_uint32_t i = 0;
+    double d = 0;
+
+    if (firsttime == 0) {
+	srand((unsigned) (getpid()));
+	firsttime = 1;
+    }
+
+    d = (double) rand() / ((double) RAND_MAX + 1);
+    i = (int) (d * (high - 0 + 1));
+
+    return i > 0 ? i : 1;
+}
+
+/*
+ * general test to make sure we can create the memcache struct and add
+ * some servers, but not more than we tell it we can add
+ */
+
+static void test_memcache_create(abts_case * tc, void *data)
+{
+  apr_pool_t *pool = p;
+  apr_status_t rv;
+  apr_memcache_t *memcache;
+  apr_memcache_server_t *server, *s;
+  apr_uint32_t max_servers = 10;
+  apr_uint32_t i;
+  apr_uint32_t hash;
+
+  rv = apr_memcache_create(pool, max_servers, 0, &memcache);
+  ABTS_ASSERT(tc, "memcache create failed", rv == APR_SUCCESS);
+  
+  for (i = 1; i <= max_servers; i++) {
+    apr_port_t port;
+    
+    port = PORT + i;
+    rv =
+      apr_memcache_server_create(pool, HOST, PORT + i, 0, 1, 1, 60, &server);
+    ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
+    
+    rv = apr_memcache_add_server(memcache, server);
+    ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
+    
+    s = apr_memcache_find_server(memcache, HOST, port);
+    ABTS_PTR_EQUAL(tc, server, s);
+    
+    rv = apr_memcache_disable_server(memcache, s);
+    ABTS_ASSERT(tc, "server disable failed", rv == APR_SUCCESS);
+    
+    rv = apr_memcache_enable_server(memcache, s);
+    ABTS_ASSERT(tc, "server enable failed", rv == APR_SUCCESS);
+    
+    hash = apr_memcache_hash(memcache, prefix, strlen(prefix));
+    ABTS_ASSERT(tc, "hash failed", hash > 0);
+    
+    s = apr_memcache_find_server_hash(memcache, hash);
+    ABTS_PTR_NOTNULL(tc, s);
+  }
+
+  rv = apr_memcache_server_create(pool, HOST, PORT, 0, 1, 1, 60, &server);
+  ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
+  
+  rv = apr_memcache_add_server(memcache, server);
+  ABTS_ASSERT(tc, "server add should have failed", rv != APR_SUCCESS);
+  
+}
+
+/* install our own custom hashing and server selection routines. */
+
+int create_test_hash(apr_pool_t *p, apr_hash_t *h)
+{
+  int i;
+  
+  for (i = 0; i < TDATA_SIZE; i++) {
+    char *k, *v;
+    
+    k = apr_pstrcat(p, prefix, apr_itoa(p, i), NULL);
+    v = apr_pstrndup(p, txt, randval((apr_uint32_t)strlen(txt)));
+    
+    apr_hash_set(h, k, APR_HASH_KEY_STRING, v);
+  }
+
+  return i;
+}
+
+static void test_memcache_user_funcs(abts_case * tc, void *data)
+{
+  apr_pool_t *pool = p;
+  apr_status_t rv;
+  apr_memcache_t *memcache;
+  apr_memcache_server_t *found;
+  apr_uint32_t max_servers = 10;
+  apr_uint32_t hres;
+  apr_uint32_t i;
+  my_hash_server_baton *baton = 
+    apr_pcalloc(pool, sizeof(my_hash_server_baton));
+
+  rv = apr_memcache_create(pool, max_servers, 0, &memcache);
+  ABTS_ASSERT(tc, "memcache create failed", rv == APR_SUCCESS);
+
+  /* as noted above, install our custom hash function, and call 
+   * apr_memcache_hash. the return value should be our predefined number,
+   * and our function just ignores the other args, for simplicity.
+   */
+  memcache->hash_func = my_hash_func;
+
+  hres = apr_memcache_hash(memcache, "whatever", sizeof("whatever") - 1);
+  ABTS_INT_EQUAL(tc, HASH_FUNC_RESULT, hres);
+  
+  /* add some servers */
+  for(i = 1; i <= 10; i++) {
+    apr_memcache_server_t *ms;
+
+    rv = apr_memcache_server_create(pool, HOST, i, 0, 1, 1, 60, &ms);
+    ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
+    
+    rv = apr_memcache_add_server(memcache, ms);
+    ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
+  }
+
+  /* 
+   * set 'which_server' in our server_baton to find the third server 
+   * which should have the same port.
+   */
+  baton->which_server = 3;
+  memcache->server_func = my_server_func; 
+  memcache->server_baton = baton;
+  found = apr_memcache_find_server_hash(memcache, 0);
+  ABTS_ASSERT(tc, "wrong server found", found->port == baton->which_server);
+}
+
+/* test non data related commands like stats and version */
+static void test_memcache_meta(abts_case * tc, void *data)
+{
+    apr_pool_t *pool = p;
+    apr_memcache_t *memcache;
+    apr_memcache_server_t *server;
+    apr_memcache_stats_t *stats;
+    char *result;
+    apr_status_t rv;
+
+    rv = apr_memcache_create(pool, 1, 0, &memcache);
+    ABTS_ASSERT(tc, "memcache create failed", rv == APR_SUCCESS);
+
+    rv = apr_memcache_server_create(pool, HOST, PORT, 0, 1, 1, 60, &server);
+    ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
+
+    rv = apr_memcache_add_server(memcache, server);
+    ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
+
+    rv = apr_memcache_version(server, pool, &result);
+    ABTS_PTR_NOTNULL(tc, result);
+
+    rv = apr_memcache_stats(server, p, &stats);
+    ABTS_PTR_NOTNULL(tc, stats);
+
+    ABTS_STR_NEQUAL(tc, stats->version, result, 5);
+
+    /* 
+     * no way to know exactly what will be in most of these, so
+     * just make sure there is something.
+     */
+    
+    ABTS_ASSERT(tc, "pid", stats->pid >= 0);
+    ABTS_ASSERT(tc, "time", stats->time >= 0);
+    /* ABTS_ASSERT(tc, "pointer_size", stats->pointer_size >= 0); */
+    ABTS_ASSERT(tc, "rusage_user", stats->rusage_user >= 0);
+    ABTS_ASSERT(tc, "rusage_system", stats->rusage_system >= 0);
+
+    ABTS_ASSERT(tc, "curr_items", stats->curr_items >= 0);
+    ABTS_ASSERT(tc, "total_items", stats->total_items >= 0);
+    ABTS_ASSERT(tc, "bytes", stats->bytes >= 0);
+
+    ABTS_ASSERT(tc, "curr_connections", stats->curr_connections >= 0);
+    ABTS_ASSERT(tc, "total_connections", stats->total_connections >= 0);
+    ABTS_ASSERT(tc, "connection_structures", 
+                stats->connection_structures >= 0);
+
+    ABTS_ASSERT(tc, "cmd_get", stats->cmd_get >= 0);
+    ABTS_ASSERT(tc, "cmd_set", stats->cmd_set >= 0);
+    ABTS_ASSERT(tc, "get_hits", stats->get_hits >= 0);
+    ABTS_ASSERT(tc, "get_misses", stats->get_misses >= 0);
+
+    /* ABTS_ASSERT(tc, "evictions", stats->evictions >= 0); */
+
+    ABTS_ASSERT(tc, "bytes_read", stats->bytes_read >= 0);
+    ABTS_ASSERT(tc, "bytes_written", stats->bytes_written >= 0);
+    ABTS_ASSERT(tc, "limit_maxbytes", stats->limit_maxbytes >= 0);
+
+    /* ABTS_ASSERT(tc, "threads", stats->threads >= 0); */
+}
+
+/* test add and replace calls */
+
+static void test_memcache_addreplace(abts_case * tc, void *data)
+{
+ apr_pool_t *pool = p;
+ apr_status_t rv;
+ apr_memcache_t *memcache;
+ apr_memcache_server_t *server;
+ apr_hash_t *tdata;
+ apr_hash_index_t *hi;
+ char *result;
+ apr_size_t len;
+
+  rv = apr_memcache_create(pool, 1, 0, &memcache);
+  ABTS_ASSERT(tc, "memcache create failed", rv == APR_SUCCESS);
+  
+  rv = apr_memcache_server_create(pool, HOST, PORT, 0, 1, 1, 60, &server);
+  ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
+  
+  rv = apr_memcache_add_server(memcache, server);
+  ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
+  
+  tdata = apr_hash_make(p);
+  create_test_hash(pool, tdata);
+
+  for (hi = apr_hash_first(p, tdata); hi; hi = apr_hash_next(hi)) {
+    const void *k;
+    void *v;
+    const char *key;
+
+    apr_hash_this(hi, &k, NULL, &v);
+    key = k;
+
+    /* doesn't exist yet, fail */
+    rv = apr_memcache_replace(memcache, key, v, strlen(v) - 1, 0, 27);
+    ABTS_ASSERT(tc, "replace should have failed", rv != APR_SUCCESS);
+    
+    /* doesn't exist yet, succeed */
+    rv = apr_memcache_add(memcache, key, v, strlen(v), 0, 27);
+    ABTS_ASSERT(tc, "add failed", rv == APR_SUCCESS);
+
+    /* exists now, succeed */
+    rv = apr_memcache_replace(memcache, key, "new", sizeof("new") - 1, 0, 27);
+    ABTS_ASSERT(tc, "replace failed", rv == APR_SUCCESS);
+
+    /* make sure its different */
+    rv = apr_memcache_getp(memcache, pool, key, &result, &len, NULL);
+    ABTS_ASSERT(tc, "get failed", rv == APR_SUCCESS);
+    ABTS_STR_NEQUAL(tc, result, "new", 3);
+
+    /* exists now, fail */
+    rv = apr_memcache_add(memcache, key, v, strlen(v), 0, 27);
+    ABTS_ASSERT(tc, "add should have failed", rv != APR_SUCCESS);
+
+    /* clean up */
+    rv = apr_memcache_delete(memcache, key, 0);
+    ABTS_ASSERT(tc, "delete failed", rv == APR_SUCCESS);
+  }
+}
+
+/* basic tests of the increment and decrement commands */
+static void test_memcache_incrdecr(abts_case * tc, void *data)
+{
+ apr_pool_t *pool = p;
+ apr_status_t rv;
+ apr_memcache_t *memcache;
+ apr_memcache_server_t *server;
+ apr_uint32_t new;
+ char *result;
+ apr_size_t len;
+ apr_uint32_t i;
+
+  rv = apr_memcache_create(pool, 1, 0, &memcache);
+  ABTS_ASSERT(tc, "memcache create failed", rv == APR_SUCCESS);
+  
+  rv = apr_memcache_server_create(pool, HOST, PORT, 0, 1, 1, 60, &server);
+  ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
+  
+  rv = apr_memcache_add_server(memcache, server);
+  ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
+
+  rv = apr_memcache_set(memcache, prefix, "271", sizeof("271") - 1, 0, 27);
+  ABTS_ASSERT(tc, "set failed", rv == APR_SUCCESS);
+  
+  for( i = 1; i <= TDATA_SIZE; i++) {
+    apr_uint32_t expect;
+
+    rv = apr_memcache_getp(memcache, pool, prefix, &result, &len, NULL);
+    ABTS_ASSERT(tc, "get failed", rv == APR_SUCCESS);
+
+    expect = i + atoi(result);
+
+    rv = apr_memcache_incr(memcache, prefix, i, &new);
+    ABTS_ASSERT(tc, "incr failed", rv == APR_SUCCESS);
+
+    ABTS_INT_EQUAL(tc, expect, new);
+
+    rv = apr_memcache_decr(memcache, prefix, i, &new);
+    ABTS_ASSERT(tc, "decr failed", rv == APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, atoi(result), new);
+
+  }
+
+  rv = apr_memcache_getp(memcache, pool, prefix, &result, &len, NULL);
+  ABTS_ASSERT(tc, "get failed", rv == APR_SUCCESS);
+
+  ABTS_INT_EQUAL(tc, 271, atoi(result));
+
+  rv = apr_memcache_delete(memcache, prefix, 0);
+  ABTS_ASSERT(tc, "delete failed", rv == APR_SUCCESS);
+}
+
+/* test the multiget functionality */
+static void test_memcache_multiget(abts_case * tc, void *data)
+{
+  apr_pool_t *pool = p;
+  apr_pool_t *tmppool;
+  apr_status_t rv;
+  apr_memcache_t *memcache;
+  apr_memcache_server_t *server;
+  apr_hash_t *tdata, *values;
+  apr_hash_index_t *hi;
+  apr_uint32_t i;
+
+  rv = apr_memcache_create(pool, 1, 0, &memcache);
+  ABTS_ASSERT(tc, "memcache create failed", rv == APR_SUCCESS);
+  
+  rv = apr_memcache_server_create(pool, HOST, PORT, 0, 1, 1, 60, &server);
+  ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
+  
+  rv = apr_memcache_add_server(memcache, server);
+  ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
+  
+  values = apr_hash_make(p);
+  tdata = apr_hash_make(p);
+  
+  create_test_hash(pool, tdata);
+
+  for (hi = apr_hash_first(p, tdata); hi; hi = apr_hash_next(hi)) {
+    const void *k;
+    void *v;
+    const char *key;
+
+    apr_hash_this(hi, &k, NULL, &v);
+    key = k;
+
+    rv = apr_memcache_set(memcache, key, v, strlen(v), 0, 27);
+    ABTS_ASSERT(tc, "set failed", rv == APR_SUCCESS);
+  }
+  
+  rv = apr_pool_create(&tmppool, pool);
+  for (i = 0; i < TDATA_SET; i++)
+    apr_memcache_add_multget_key(pool,
+                                 apr_pstrcat(pool, prefix,
+                                             apr_itoa(pool, i), NULL),
+                                 &values);
+    
+  rv = apr_memcache_multgetp(memcache,
+                             tmppool,
+                             pool,
+                             values);
+  
+  ABTS_ASSERT(tc, "multgetp failed", rv == APR_SUCCESS);
+  ABTS_ASSERT(tc, "multgetp returned too few results",
+              apr_hash_count(values) == TDATA_SET);
+  
+  for (hi = apr_hash_first(p, tdata); hi; hi = apr_hash_next(hi)) {
+    const void *k;
+    const char *key;
+    
+    apr_hash_this(hi, &k, NULL, NULL);
+    key = k;
+
+    rv = apr_memcache_delete(memcache, key, 0);
+    ABTS_ASSERT(tc, "delete failed", rv == APR_SUCCESS);
+  }
+  
+}
+
+/* test setting and getting */
+
+static void test_memcache_setget(abts_case * tc, void *data)
+{
+    apr_pool_t *pool = p;
+    apr_status_t rv;
+    apr_memcache_t *memcache;
+    apr_memcache_server_t *server;
+    apr_hash_t *tdata, *values;
+    apr_hash_index_t *hi;
+    char *result;
+    apr_size_t len;
+
+    rv = apr_memcache_create(pool, 1, 0, &memcache);
+    ABTS_ASSERT(tc, "memcache create failed", rv == APR_SUCCESS);
+
+    rv = apr_memcache_server_create(pool, HOST, PORT, 0, 1, 1, 60, &server);
+    ABTS_ASSERT(tc, "server create failed", rv == APR_SUCCESS);
+
+    rv = apr_memcache_add_server(memcache, server);
+    ABTS_ASSERT(tc, "server add failed", rv == APR_SUCCESS);
+
+    tdata = apr_hash_make(pool);
+    values = apr_hash_make(pool);
+
+    create_test_hash(pool, tdata);
+
+    for (hi = apr_hash_first(p, tdata); hi; hi = apr_hash_next(hi)) {
+	const void *k;
+	void *v;
+        const char *key;
+
+	apr_hash_this(hi, &k, NULL, &v);
+        key = k;
+
+	rv = apr_memcache_set(memcache, key, v, strlen(v), 0, 27);
+	ABTS_ASSERT(tc, "set failed", rv == APR_SUCCESS);
+	rv = apr_memcache_getp(memcache, pool, key, &result, &len, NULL);
+	ABTS_ASSERT(tc, "get failed", rv == APR_SUCCESS);
+    }
+
+    rv = apr_memcache_getp(memcache, pool, "nothere3423", &result, &len, NULL);
+
+    ABTS_ASSERT(tc, "get should have failed", rv != APR_SUCCESS);
+
+    for (hi = apr_hash_first(p, tdata); hi; hi = apr_hash_next(hi)) {
+	const void *k;
+	const char *key;
+
+	apr_hash_this(hi, &k, NULL, NULL);
+	key = k;
+
+	rv = apr_memcache_delete(memcache, key, 0);
+	ABTS_ASSERT(tc, "delete failed", rv == APR_SUCCESS);
+    }
+}
+
+/* use apr_socket stuff to see if there is in fact a memcached server 
+ * running on PORT. 
+ */
+apr_status_t check_mc(void)
+{
+  apr_pool_t *pool = p;
+  apr_status_t rv;
+  apr_socket_t *sock = NULL;
+  apr_sockaddr_t *sa;
+  struct iovec vec[2];
+  apr_size_t written;
+  char buf[128];
+  apr_size_t len;
+
+  rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, 0, pool);
+  if(rv != APR_SUCCESS) {
+    return rv;
+  }
+
+  rv = apr_sockaddr_info_get(&sa, HOST, APR_INET, PORT, 0, pool);
+  if(rv != APR_SUCCESS) {
+    return rv;
+  }
+
+  rv = apr_socket_timeout_set(sock, 1 * APR_USEC_PER_SEC);
+  if (rv != APR_SUCCESS) {
+    return rv;
+  }
+
+  rv = apr_socket_connect(sock, sa);
+  if (rv != APR_SUCCESS) {
+    return rv;
+  }
+
+  rv = apr_socket_timeout_set(sock, -1);
+  if (rv != APR_SUCCESS) {
+    return rv;
+  }
+
+  vec[0].iov_base = "version";
+  vec[0].iov_len  = sizeof("version") - 1;
+
+  vec[1].iov_base = "\r\n";
+  vec[1].iov_len  = sizeof("\r\n") -1;
+
+  rv = apr_socket_sendv(sock, vec, 2, &written);
+  if (rv != APR_SUCCESS) {
+    return rv;
+  }
+
+  len = sizeof(buf);
+  rv = apr_socket_recv(sock, buf, &len);
+  if(rv != APR_SUCCESS) {
+    return rv;
+  }
+
+  if(strncmp(buf, "VERSION", sizeof("VERSION")-1) != 0) {
+    rv = APR_EGENERAL;
+  }
+
+  apr_socket_close(sock);
+  return rv;
+}
+
+abts_suite *testmemcache(abts_suite * suite)
+{
+    apr_status_t rv;
+    suite = ADD_SUITE(suite);
+    /* check for a running memcached on the typical port before 
+     * trying to run the tests. succeed silently if we don't find one.
+     */
+    rv = check_mc();
+    if(rv == APR_SUCCESS) {
+      abts_run_test(suite, test_memcache_create, NULL);
+      abts_run_test(suite, test_memcache_user_funcs, NULL);
+      abts_run_test(suite, test_memcache_meta, NULL);
+      abts_run_test(suite, test_memcache_setget, NULL);
+      abts_run_test(suite, test_memcache_multiget, NULL);
+      abts_run_test(suite, test_memcache_addreplace, NULL);
+      abts_run_test(suite, test_memcache_incrdecr, NULL);
+    }
+
+    return suite;
+}
diff --git a/srclib/apr-util/test/testpass.c b/srclib/apr-util/test/testpass.c
index 66ab77d4..789f17cc 100644
--- a/srclib/apr-util/test/testpass.c
+++ b/srclib/apr-util/test/testpass.c
@@ -21,7 +21,7 @@
 #include "apr_errno.h"
 #include "apr_strings.h"
 #include "apr_file_io.h"
-#include "apr_thread_proc.h"
+#include "apr_thread_pool.h"
 #include "apr_md5.h"
 #include "apr_sha1.h"
 
@@ -83,23 +83,24 @@ static void * APR_THREAD_FUNC testing_thread(apr_thread_t *thd,
     return APR_SUCCESS;
 }
 
+#define NUM_THR 20
+
 /* test for threadsafe crypt() */
 static void test_threadsafe(abts_case *tc, void *data)
 {
-#define NUM_THR 20
-    apr_thread_t *my_threads[NUM_THR];
     int i;
     apr_status_t rv;
-    
-    for (i = 0; i < NUM_THR; i++) {
-        apr_assert_success(tc, "create test thread",
-                           apr_thread_create(&my_threads[i], NULL, 
-                                             testing_thread, tc, p));
-    }
+    apr_thread_pool_t *thrp;
+
+    rv = apr_thread_pool_create(&thrp, NUM_THR/2, NUM_THR, p);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     for (i = 0; i < NUM_THR; i++) {
-        apr_thread_join(&rv, my_threads[i]);
+        rv = apr_thread_pool_push(thrp, testing_thread, tc, 0, NULL);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     }
+
+    apr_thread_pool_destroy(thrp);
 }
 #endif
 
@@ -108,7 +109,7 @@ static void test_shapass(abts_case *tc, void *data)
     const char *pass = "hellojed";
     char hash[100];
 
-    apr_sha1_base64(pass, (int)strlen(pass), hash);
+    apr_sha1_base64(pass, strlen(pass), hash);
 
     apr_assert_success(tc, "SHA1 password validated",
                        apr_password_validate(pass, hash));
diff --git a/srclib/apr-util/test/testqueue.c b/srclib/apr-util/test/testqueue.c
index b442f902..8f71775f 100644
--- a/srclib/apr-util/test/testqueue.c
+++ b/srclib/apr-util/test/testqueue.c
@@ -16,7 +16,7 @@
 
 #include "apu.h"
 #include "apr_queue.h"
-#include "apr_thread_proc.h"
+#include "apr_thread_pool.h"
 #include "apr_time.h"
 #include "abts.h"
 #include "testutil.h"
@@ -39,7 +39,7 @@ static void * APR_THREAD_FUNC consumer(apr_thread_t *thd, void *data)
     void *v;
 
     sleeprate = 1000000/CONSUMER_ACTIVITY;
-    apr_sleep( (rand() % 4 ) * 1000000 ); /* sleep random seconds */
+    apr_sleep((rand() % 4) * 1000000); /* sleep random seconds */
 
     while (1)
     {
@@ -50,18 +50,15 @@ static void * APR_THREAD_FUNC consumer(apr_thread_t *thd, void *data)
 
         if (rv == APR_EOF)
             break;
-        
+
         ABTS_TRUE(tc, v == NULL);
         ABTS_TRUE(tc, rv == APR_SUCCESS);
 
-        apr_sleep( sleeprate ); /* sleep this long to acheive our rate */
+        apr_sleep(sleeprate); /* sleep this long to acheive our rate */
     }
 
-    apr_thread_exit(thd, rv);
-
-    /* not reached */
     return NULL;
-} 
+}
 
 static void * APR_THREAD_FUNC producer(apr_thread_t *thd, void *data)
 {
@@ -70,61 +67,58 @@ static void * APR_THREAD_FUNC producer(apr_thread_t *thd, void *data)
     apr_status_t rv;
 
     sleeprate = 1000000/PRODUCER_ACTIVITY;
-    apr_sleep( (rand() % 4 ) * 1000000 ); /* sleep random seconds */
+    apr_sleep((rand() % 4) * 1000000); /* sleep random seconds */
 
-    while (1)        
+    while (1)
     {
         rv = apr_queue_push(queue, NULL);
 
         if (rv == APR_EINTR)
             continue;
-        
+
         if (rv == APR_EOF)
             break;
 
         ABTS_TRUE(tc, rv == APR_SUCCESS);
 
-        apr_sleep( sleeprate ); /* sleep this long to acheive our rate */
+        apr_sleep(sleeprate); /* sleep this long to acheive our rate */
     }
 
-    apr_thread_exit(thd, rv);
-
-    /* not reached */
     return NULL;
-} 
+}
 
 static void test_queue_producer_consumer(abts_case *tc, void *data)
 {
     unsigned int i;
     apr_status_t rv;
-    apr_thread_t **t;
+    apr_thread_pool_t *thrp;
 
     /* XXX: non-portable */
     srand((unsigned int)apr_time_now());
-    
+
     rv = apr_queue_create(&queue, QUEUE_SIZE, p);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+
+    rv = apr_thread_pool_create(&thrp, 0, NUMBER_CONSUMERS + NUMBER_PRODUCERS, p);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
-    t = apr_palloc(p, sizeof(apr_thread_t*) * (NUMBER_CONSUMERS 
-                                             + NUMBER_PRODUCERS));
-    for (i = 0; i < NUMBER_CONSUMERS; ++i) {
-        rv = apr_thread_create(&t[i], NULL, consumer, tc, p);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    for (i = 0; i < NUMBER_CONSUMERS; i++) {
+        rv = apr_thread_pool_push(thrp, consumer, tc, 0, NULL);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     }
-    for (i = NUMBER_CONSUMERS; i < NUMBER_CONSUMERS + NUMBER_PRODUCERS; ++i) {
-        rv = apr_thread_create(&t[i], NULL, producer, tc, p);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+
+    for (i = 0; i < NUMBER_PRODUCERS; i++) {
+        rv = apr_thread_pool_push(thrp, producer, tc, 0, NULL);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     }
 
     apr_sleep(5000000); /* sleep 5 seconds */
 
     rv = apr_queue_term(queue);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
-    for (i = 0; i < NUMBER_CONSUMERS + NUMBER_PRODUCERS; ++i) {
-        apr_thread_join(&rv, t[i]);
-        ABTS_INT_EQUAL(tc, rv, APR_EOF);
-    }
+    rv = apr_thread_pool_destroy(thrp);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 }
 
 #endif /* APR_HAS_THREADS */
diff --git a/srclib/apr-util/test/testreslist.c b/srclib/apr-util/test/testreslist.c
index a91de158..aa248152 100644
--- a/srclib/apr-util/test/testreslist.c
+++ b/srclib/apr-util/test/testreslist.c
@@ -16,10 +16,12 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+
 #include "apr_general.h"
 #include "apu.h"
 #include "apr_reslist.h"
-#include "apr_thread_proc.h"
+#include "apr_thread_pool.h"
+
 #if APR_HAVE_TIME_H
 #include <time.h>
 #endif /* APR_HAVE_TIME_H */
@@ -96,7 +98,8 @@ typedef struct {
     apr_interval_time_t work_delay_sleep;
 } my_thread_info_t;
 
-#define PERCENT95th ( ( 2u^30 / 5u ) * 19u )
+/* MAX_UINT * .95 = 2**32 * .95 = 4080218931u */
+#define PERCENT95th 4080218931u
 
 static void * APR_THREAD_FUNC resource_consuming_thread(apr_thread_t *thd,
                                                         void *data)
@@ -117,7 +120,7 @@ static void * APR_THREAD_FUNC resource_consuming_thread(apr_thread_t *thd,
 
     for (i = 0; i < CONSUMER_ITERATIONS; i++) {
         rv = apr_reslist_acquire(rl, &vp);
-        ABTS_INT_EQUAL(thread_info->tc, rv, APR_SUCCESS);
+        ABTS_INT_EQUAL(thread_info->tc, APR_SUCCESS, rv);
         res = vp;
         apr_sleep(thread_info->work_delay_sleep);
 
@@ -125,11 +128,11 @@ static void * APR_THREAD_FUNC resource_consuming_thread(apr_thread_t *thd,
         chance = lgc(chance);
         if ( chance < PERCENT95th ) {
             rv = apr_reslist_release(rl, res);
-            ABTS_INT_EQUAL(thread_info->tc, rv, APR_SUCCESS);
-       } else {
+            ABTS_INT_EQUAL(thread_info->tc, APR_SUCCESS, rv);
+        } else {
             rv = apr_reslist_invalidate(rl, res);
-            ABTS_INT_EQUAL(thread_info->tc, rv, APR_SUCCESS);
-       }
+            ABTS_INT_EQUAL(thread_info->tc, APR_SUCCESS, rv);
+        }
     }
 
     return APR_SUCCESS;
@@ -145,15 +148,15 @@ static void test_timeout(abts_case *tc, apr_reslist_t *rl)
 
     apr_reslist_timeout_set(rl, 1000);
 
-    /* deplete all possible resources from the resource list 
-     * so that the next call will block until timeout is reached 
-     * (since there are no other threads to make a resource 
+    /* deplete all possible resources from the resource list
+     * so that the next call will block until timeout is reached
+     * (since there are no other threads to make a resource
      * available)
      */
 
     for (i = 0; i < RESLIST_HMAX; i++) {
         rv = apr_reslist_acquire(rl, (void**)&resources[i]);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     }
 
     /* next call will block until timeout is reached */
@@ -167,7 +170,7 @@ static void test_timeout(abts_case *tc, apr_reslist_t *rl)
      */
     for (i = 0; i < RESLIST_HMAX; i++) {
         rv = apr_reslist_release(rl, resources[i]);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     }
 }
 
@@ -183,22 +186,22 @@ static void test_shrinking(abts_case *tc, apr_reslist_t *rl)
     /* deplete all possible resources from the resource list */
     for (i = 0; i < RESLIST_HMAX; i++) {
         rv = apr_reslist_acquire(rl, (void**)&resources[i]);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     }
 
     /* Free all resources above RESLIST_SMAX - 1 */
     for (i = RESLIST_SMAX - 1; i < RESLIST_HMAX; i++) {
         rv = apr_reslist_release(rl, resources[i]);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     }
 
     for (i = 0; i < RESLIST_HMAX; i++) {
         rv = apr_reslist_acquire(rl, &vp);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
         res = vp;
         apr_sleep(sleep_time);
         rv = apr_reslist_release(rl, res);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     }
     apr_sleep(sleep_time);
 
@@ -208,22 +211,21 @@ static void test_shrinking(abts_case *tc, apr_reslist_t *rl)
      */
     for (i = 0; i < RESLIST_SMAX - 1; i++) {
         rv = apr_reslist_release(rl, resources[i]);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     }
 }
 
 static void test_reslist(abts_case *tc, void *data)
 {
     int i;
-    apr_pool_t *p;
     apr_status_t rv;
     apr_reslist_t *rl;
     my_parameters_t *params;
-    apr_thread_t *my_threads[CONSUMER_THREADS];
-    my_thread_info_t my_thread_info[CONSUMER_THREADS];
+    apr_thread_pool_t *thrp;
+    my_thread_info_t thread_info[CONSUMER_THREADS];
 
-    rv = apr_pool_create(&p, NULL);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    rv = apr_thread_pool_create(&thrp, CONSUMER_THREADS/2, CONSUMER_THREADS, p);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     /* Create some parameters that will be passed into each
      * constructor and destructor call. */
@@ -235,25 +237,20 @@ static void test_reslist(abts_case *tc, void *data)
     rv = apr_reslist_create(&rl, RESLIST_MIN, RESLIST_SMAX, RESLIST_HMAX,
                             RESLIST_TTL, my_constructor, my_destructor,
                             params, p);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     for (i = 0; i < CONSUMER_THREADS; i++) {
-        putchar('.');
-        my_thread_info[i].tid = i;
-        my_thread_info[i].tc = tc;
-        my_thread_info[i].reslist = rl;
-        my_thread_info[i].work_delay_sleep = WORK_DELAY_SLEEP_TIME;
-        rv = apr_thread_create(&my_threads[i], NULL,
-                               resource_consuming_thread, &my_thread_info[i],
-                               p);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+        thread_info[i].tid = i;
+        thread_info[i].tc = tc;
+        thread_info[i].reslist = rl;
+        thread_info[i].work_delay_sleep = WORK_DELAY_SLEEP_TIME;
+        rv = apr_thread_pool_push(thrp, resource_consuming_thread,
+                                  &thread_info[i], 0, NULL);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     }
 
-    for (i = 0; i < CONSUMER_THREADS; i++) {
-        apr_status_t thread_rv;
-        apr_thread_join(&thread_rv, my_threads[i]);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
-    }
+    rv = apr_thread_pool_destroy(thrp);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     test_timeout(tc, rl);
 
@@ -261,12 +258,9 @@ static void test_reslist(abts_case *tc, void *data)
     ABTS_INT_EQUAL(tc, RESLIST_SMAX, params->c_count - params->d_count);
 
     rv = apr_reslist_destroy(rl);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
-
-    apr_pool_destroy(p);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 }
 
-
 #endif /* APR_HAS_THREADS */
 
 abts_suite *testreslist(abts_suite *suite)
diff --git a/srclib/apr-util/test/testrmm.c b/srclib/apr-util/test/testrmm.c
index c899308b..4f8fb5ec 100644
--- a/srclib/apr-util/test/testrmm.c
+++ b/srclib/apr-util/test/testrmm.c
@@ -42,18 +42,18 @@ static void test_rmm(abts_case *tc, void *data)
     void *entity;
 
     rv = apr_pool_create(&pool, p);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     /* We're going to want 10 blocks of data from our target rmm. */
     size = SHARED_SIZE + apr_rmm_overhead_get(FRAG_COUNT + 1);
     rv = apr_shm_create(&shm, size, NULL, pool);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     if (rv != APR_SUCCESS)
         return;
 
     rv = apr_rmm_init(&rmm, NULL, apr_shm_baseaddr_get(shm), size, pool);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     if (rv != APR_SUCCESS)
         return;
@@ -93,14 +93,14 @@ static void test_rmm(abts_case *tc, void *data)
         char **c = apr_rmm_addr_get(rmm, off[i]);
         for (j = 0; j < FRAG_SIZE; j++, c++) {
             char *d = apr_itoa(pool, i + j);
-            ABTS_STR_EQUAL(tc, *c, d);
+            ABTS_STR_EQUAL(tc, d, *c);
         }
     }
 
     /* Freeing each fragment */
     for (i = 0; i < FRAG_COUNT; i++) {
         rv = apr_rmm_free(rmm, off[i]);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     }
 
     /* Creating one large segment */
@@ -114,7 +114,7 @@ static void test_rmm(abts_case *tc, void *data)
 
     /* Freeing large segment */
     rv = apr_rmm_free(rmm, off[0]);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     /* Creating each fragment of size fragsize */
     for (i = 0; i < FRAG_COUNT; i++) {
@@ -124,7 +124,7 @@ static void test_rmm(abts_case *tc, void *data)
     /* Freeing each fragment backwards */
     for (i = FRAG_COUNT - 1; i >= 0; i--) {
         rv = apr_rmm_free(rmm, off[i]);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     }
 
     /* Creating one large segment (again) */
@@ -132,7 +132,7 @@ static void test_rmm(abts_case *tc, void *data)
 
     /* Freeing large segment */
     rv = apr_rmm_free(rmm, off[0]);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     /* Checking realloc */
     off[0] = apr_rmm_calloc(rmm, SHARED_SIZE - 100);
@@ -142,7 +142,7 @@ static void test_rmm(abts_case *tc, void *data)
 
     entity = apr_rmm_addr_get(rmm, off[1]);
     rv = apr_rmm_free(rmm, off[0]);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     {
         unsigned char *c = entity;
@@ -169,10 +169,10 @@ static void test_rmm(abts_case *tc, void *data)
     }
 
     rv = apr_rmm_destroy(rmm);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     rv = apr_shm_destroy(shm);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     apr_pool_destroy(pool);
 }
diff --git a/srclib/apr-util/test/teststrmatch.c b/srclib/apr-util/test/teststrmatch.c
index 5ed70f84..b6a4a122 100644
--- a/srclib/apr-util/test/teststrmatch.c
+++ b/srclib/apr-util/test/teststrmatch.c
@@ -54,31 +54,31 @@ static void test_str(abts_case *tc, void *data)
     ABTS_PTR_NOTNULL(tc, pattern_zero);
 
     match = apr_strmatch(pattern, input1, strlen(input1));
-    ABTS_PTR_EQUAL(tc, match, NULL);
+    ABTS_PTR_EQUAL(tc, NULL, match);
 
     match = apr_strmatch(pattern, input2, strlen(input2));
-    ABTS_PTR_EQUAL(tc, match, input2 + 23);
+    ABTS_PTR_EQUAL(tc, input2 + 23, match);
 
     match = apr_strmatch(pattern_onechar, input1, strlen(input1));
-    ABTS_PTR_EQUAL(tc, match, input1 + 5);
+    ABTS_PTR_EQUAL(tc, input1 + 5, match);
 
     match = apr_strmatch(pattern_zero, input1, strlen(input1));
-    ABTS_PTR_EQUAL(tc, match, input1);
+    ABTS_PTR_EQUAL(tc, input1, match);
 
     match = apr_strmatch(pattern_nocase, input1, strlen(input1));
-    ABTS_PTR_EQUAL(tc, match, input1 + 23);
+    ABTS_PTR_EQUAL(tc, input1 + 23, match);
 
     match = apr_strmatch(pattern, input3, strlen(input3));
-    ABTS_PTR_EQUAL(tc, match, input3);
+    ABTS_PTR_EQUAL(tc, input3, match);
 
     match = apr_strmatch(pattern, input4, strlen(input4));
-    ABTS_PTR_EQUAL(tc, match, input4 + 24);
+    ABTS_PTR_EQUAL(tc, input4 + 24, match);
 
     match = apr_strmatch(pattern, input5, strlen(input5));
-    ABTS_PTR_EQUAL(tc, match, NULL);
+    ABTS_PTR_EQUAL(tc, NULL, match);
 
     match = apr_strmatch(pattern, input6, strlen(input6));
-    ABTS_PTR_EQUAL(tc, match, input6 + 35);
+    ABTS_PTR_EQUAL(tc, input6 + 35, match);
 }
 
 abts_suite *teststrmatch(abts_suite *suite)
diff --git a/srclib/apr-util/test/testuri.c b/srclib/apr-util/test/testuri.c
index b84df9a1..5ac5c5f2 100644
--- a/srclib/apr-util/test/testuri.c
+++ b/srclib/apr-util/test/testuri.c
@@ -95,6 +95,30 @@ struct aup_test aup_tests[] =
         "//www.apache.org/",
         0, NULL, "www.apache.org", NULL, NULL, "www.apache.org", NULL, "/", NULL, NULL, 0
     },
+    {
+        "file:image.jpg",
+        0, "file", NULL, NULL, NULL, NULL, NULL, "image.jpg", NULL, NULL, 0
+    },
+    {
+        "file:/image.jpg",
+        0, "file", NULL, NULL, NULL, NULL, NULL, "/image.jpg", NULL, NULL, 0
+    },
+    {
+        "file:///image.jpg",
+        0, "file", "", NULL, NULL, "", NULL, "/image.jpg", NULL, NULL, 0
+    },
+    {
+        "file:///tmp/photos/image.jpg",
+        0, "file", "", NULL, NULL, "", NULL, "/tmp/photos/image.jpg", NULL, NULL, 0
+    },
+    {
+        "file:./image.jpg",
+        0, "file", NULL, NULL, NULL, NULL, NULL, "./image.jpg", NULL, NULL, 0
+    },
+    {
+        "file:../photos/image.jpg",
+        0, "file", NULL, NULL, NULL, NULL, NULL, "../photos/image.jpg", NULL, NULL, 0
+    },
 };
 
 struct uph_test {
@@ -181,19 +205,32 @@ static void test_aup(abts_case *tc, void *data)
                      rv, t->rv);
         ABTS_ASSERT(tc, msg, rv == t->rv);
         if (t->rv == APR_SUCCESS) {
-            ABTS_STR_EQUAL(tc, info.scheme, t->scheme);
-            ABTS_STR_EQUAL(tc, info.hostinfo, t->hostinfo);
-            ABTS_STR_EQUAL(tc, info.user, t->user);
-            ABTS_STR_EQUAL(tc, info.password, t->password);
-            ABTS_STR_EQUAL(tc, info.hostname, t->hostname);
-            ABTS_STR_EQUAL(tc, info.port_str, t->port_str);
-            ABTS_STR_EQUAL(tc, info.path, t->path);
-            ABTS_STR_EQUAL(tc, info.query, t->query);
-            ABTS_STR_EQUAL(tc, info.user, t->user);
-            ABTS_INT_EQUAL(tc, info.port, t->port);
+            ABTS_STR_EQUAL(tc, t->scheme, info.scheme);
+            ABTS_STR_EQUAL(tc, t->hostinfo, info.hostinfo);
+            ABTS_STR_EQUAL(tc, t->user, info.user);
+            ABTS_STR_EQUAL(tc, t->password, info.password);
+            ABTS_STR_EQUAL(tc, t->hostname, info.hostname);
+            ABTS_STR_EQUAL(tc, t->port_str, info.port_str);
+            ABTS_STR_EQUAL(tc, t->path, info.path);
+            ABTS_STR_EQUAL(tc, t->query, info.query);
+            ABTS_STR_EQUAL(tc, t->user, info.user);
+            ABTS_INT_EQUAL(tc, t->port, info.port);
 
             s = apr_uri_unparse(p, &info, APR_URI_UNP_REVEALPASSWORD);
-            ABTS_STR_EQUAL(tc, s, t->uri);
+            ABTS_STR_EQUAL(tc, t->uri, s);
+
+            s = apr_uri_unparse(p, &info, APR_URI_UNP_OMITSITEPART);
+            rv = apr_uri_parse(p, s, &info);
+            ABTS_STR_EQUAL(tc, info.scheme, NULL);
+            ABTS_STR_EQUAL(tc, info.hostinfo, NULL);
+            ABTS_STR_EQUAL(tc, info.user, NULL);
+            ABTS_STR_EQUAL(tc, info.password, NULL);
+            ABTS_STR_EQUAL(tc, info.hostname, NULL);
+            ABTS_STR_EQUAL(tc, info.port_str, NULL);
+            ABTS_STR_EQUAL(tc, info.path, t->path);
+            ABTS_STR_EQUAL(tc, info.query, t->query);
+            ABTS_STR_EQUAL(tc, info.user, NULL);
+            ABTS_INT_EQUAL(tc, info.port, 0);
         }
     }
 }
@@ -209,11 +246,11 @@ static void test_uph(abts_case *tc, void *data)
         memset(&info, 0, sizeof(info));
         t = &uph_tests[i];
         rv = apr_uri_parse_hostinfo(p, t->hostinfo, &info);
-        ABTS_INT_EQUAL(tc, rv, t->rv);
+        ABTS_INT_EQUAL(tc, t->rv, rv);
         if (t->rv == APR_SUCCESS) {
-            ABTS_STR_EQUAL(tc, info.hostname, t->hostname);
-            ABTS_STR_EQUAL(tc, info.port_str, t->port_str);
-            ABTS_INT_EQUAL(tc, info.port, t->port);
+            ABTS_STR_EQUAL(tc, t->hostname, info.hostname);
+            ABTS_STR_EQUAL(tc, t->port_str, info.port_str);
+            ABTS_INT_EQUAL(tc, t->port, info.port);
         }
     }
 }
diff --git a/srclib/apr-util/test/testutildll.dsp b/srclib/apr-util/test/testutildll.dsp
index 474853fc..b529ddd4 100644
--- a/srclib/apr-util/test/testutildll.dsp
+++ b/srclib/apr-util/test/testutildll.dsp
@@ -211,6 +211,10 @@ SOURCE=.\testmd5.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\testmemcache.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\testpass.c
 # End Source File
 # Begin Source File
diff --git a/srclib/apr-util/test/testutillib.dsp b/srclib/apr-util/test/testutillib.dsp
index c6396dd8..efb516de 100644
--- a/srclib/apr-util/test/testutillib.dsp
+++ b/srclib/apr-util/test/testutillib.dsp
@@ -211,6 +211,10 @@ SOURCE=.\testmd5.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\testmemcache.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\testpass.c
 # End Source File
 # Begin Source File
diff --git a/srclib/apr-util/test/testxlate.c b/srclib/apr-util/test/testxlate.c
index 8dbc4c8e..89c26090 100644
--- a/srclib/apr-util/test/testxlate.c
+++ b/srclib/apr-util/test/testxlate.c
@@ -22,7 +22,7 @@
 #include "abts.h"
 #include "testutil.h"
 
-#ifdef APR_HAS_XLATE
+#if APR_HAS_XLATE
 
 static const char test_utf8[] = "Edelwei\xc3\x9f";
 static const char test_utf7[] = "Edelwei+AN8-";
@@ -38,18 +38,18 @@ static void test_conversion(abts_case *tc, apr_xlate_t *convset,
     apr_status_t rv;
 
     rv = apr_xlate_conv_buffer(convset, inbuf, &inbytes_left, buf, &outbytes_left);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     if (rv != APR_SUCCESS)
         return;
 
     rv = apr_xlate_conv_buffer(convset, NULL, NULL, buf + sizeof(buf) -
                                outbytes_left - 1, &outbytes_left);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     buf[sizeof(buf) - outbytes_left - 1] = '\0';
 
-    ABTS_STR_EQUAL(tc, buf, expected);
+    ABTS_STR_EQUAL(tc, expected, buf);
 }
 
 static void one_test(abts_case *tc, const char *cs1, const char *cs2,
@@ -60,7 +60,7 @@ static void one_test(abts_case *tc, const char *cs1, const char *cs2,
     apr_xlate_t *convset;
 
     rv = apr_xlate_open(&convset, cs2, cs1, pool);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     if (rv != APR_SUCCESS)
         return;
@@ -68,7 +68,7 @@ static void one_test(abts_case *tc, const char *cs1, const char *cs2,
     test_conversion(tc, convset, str1, str2);
 
     rv = apr_xlate_close(convset);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 }
 
 static void test_transformation(abts_case *tc, void *data)
@@ -95,7 +95,7 @@ abts_suite *testxlate(abts_suite *suite)
 {
     suite = ADD_SUITE(suite);
 
-#ifdef APR_HAS_XLATE
+#if APR_HAS_XLATE
     abts_run_test(suite, test_transformation, NULL);
 #endif
 
diff --git a/srclib/apr-util/test/testxml.c b/srclib/apr-util/test/testxml.c
index 8db40535..8f511f3f 100644
--- a/srclib/apr-util/test/testxml.c
+++ b/srclib/apr-util/test/testxml.c
@@ -30,7 +30,7 @@ static apr_status_t create_dummy_file_error(abts_case *tc, apr_pool_t *p,
 
     rv = apr_file_mktemp(fd, template, APR_CREATE | APR_TRUNCATE | APR_DELONCLOSE |
                          APR_READ | APR_WRITE | APR_EXCL, p);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     if (rv != APR_SUCCESS)
         return rv;
@@ -38,19 +38,19 @@ static apr_status_t create_dummy_file_error(abts_case *tc, apr_pool_t *p,
     rv = apr_file_puts("<?xml version=\"1.0\" ?>\n<maryx>"
                        "<had a=\"little\"/><lamb its='fleece "
                        "was white as snow' />\n", *fd);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     for (i = 0; i < 5000; i++) {
         rv = apr_file_puts("<hmm roast=\"lamb\" "
                            "for=\"dinner\">yummy</hmm>\n", *fd);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     }
 
     rv = apr_file_puts("</mary>\n", *fd);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     rv = apr_file_seek(*fd, APR_SET, &off);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     return rv;
 }
@@ -65,25 +65,25 @@ static apr_status_t create_dummy_file(abts_case *tc, apr_pool_t *p,
 
     rv = apr_file_mktemp(fd, template, APR_CREATE | APR_TRUNCATE | APR_DELONCLOSE |
                          APR_READ | APR_WRITE | APR_EXCL, p);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     if (rv != APR_SUCCESS)
         return rv;
 
     rv = apr_file_puts("<?xml version=\"1.0\" ?>\n<mary>\n", *fd);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     for (i = 0; i < 5000; i++) {
         rv = apr_file_puts("<hmm roast=\"lamb\" "
                            "for=\"dinner\">yummy</hmm>\n", *fd);
-        ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     }
 
     rv = apr_file_puts("</mary>\n", *fd);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     rv = apr_file_seek(*fd, APR_SET, &off);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     return rv;
 }
@@ -94,20 +94,20 @@ static void dump_xml(abts_case *tc, apr_xml_elem *e, int level)
     apr_xml_elem *ec;
 
     if (level == 0) {
-        ABTS_STR_EQUAL(tc, e->name, "mary");
+        ABTS_STR_EQUAL(tc, "mary", e->name);
     } else {
-        ABTS_STR_EQUAL(tc, e->name, "hmm");
+        ABTS_STR_EQUAL(tc, "hmm", e->name);
     }
 
     if (e->attr) {
         a = e->attr;
         ABTS_PTR_NOTNULL(tc, a);
-        ABTS_STR_EQUAL(tc, a->name, "for");
-        ABTS_STR_EQUAL(tc, a->value, "dinner");
+        ABTS_STR_EQUAL(tc, "for", a->name);
+        ABTS_STR_EQUAL(tc, "dinner", a->value);
         a = a->next;
         ABTS_PTR_NOTNULL(tc, a);
-        ABTS_STR_EQUAL(tc, a->name, "roast");
-        ABTS_STR_EQUAL(tc, a->value, "lamb");
+        ABTS_STR_EQUAL(tc, "roast", a->name);
+        ABTS_STR_EQUAL(tc, "lamb", a->value);
     }
     if (e->first_child) {
         ec = e->first_child;
@@ -126,21 +126,21 @@ static void test_xml_parser(abts_case *tc, void *data)
     apr_status_t rv;
 
     rv = create_dummy_file(tc, p, &fd);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     if (rv != APR_SUCCESS)
         return;
 
     rv = apr_xml_parse_file(p, &parser, &doc, fd, 2000);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     dump_xml(tc, doc->root, 0);
 
     rv = apr_file_close(fd);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     rv = create_dummy_file_error(tc, p, &fd);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     if (rv != APR_SUCCESS)
         return;
diff --git a/srclib/apr-util/uri/apr_uri.c b/srclib/apr-util/uri/apr_uri.c
index 2a5aa3cd..e5acb346 100644
--- a/srclib/apr-util/uri/apr_uri.c
+++ b/srclib/apr-util/uri/apr_uri.c
@@ -129,29 +129,16 @@ APU_DECLARE(char *) apr_uri_unparse(apr_pool_t *p,
                  uptr->port == 0 ||
                  uptr->port == apr_uri_port_of_scheme(uptr->scheme));
 
-            if (uptr->scheme) {
-                ret = apr_pstrcat(p,
-                              uptr->scheme, "://", ret,
-                              lbrk, uptr->hostname, rbrk,
-                              is_default_port ? "" : ":",
-                              is_default_port ? "" : uptr->port_str,
-                              NULL);
-            }
-            else {
-                /* A violation of RFC2396, but it is clear from section 3.2
-                 * that the : belongs above to the scheme, while // belongs
-                 * to the authority, so include the authority prefix while
-                 * omitting the "scheme:" that the user neglected to pass us.
-                 */
-                ret = apr_pstrcat(p,
-                              "//", ret, lbrk, uptr->hostname, rbrk,
-                              is_default_port ? "" : ":",
-                              is_default_port ? "" : uptr->port_str,
-                              NULL);
-            }
+            ret = apr_pstrcat(p, "//", ret, lbrk, uptr->hostname, rbrk,
+                        is_default_port ? "" : ":",
+                        is_default_port ? "" : uptr->port_str,
+                        NULL);
         }
+	if (uptr->scheme) {
+	    ret = apr_pstrcat(p, uptr->scheme, ":", ret, NULL);
+	}
     }
-
+    
     /* Should we suppress all path info? */
     if (!(flags & APR_URI_UNP_OMITPATHINFO)) {
         /* Append path, query and fragment strings: */
@@ -324,12 +311,17 @@ deal_with_path:
     while ((uri_delims[*(unsigned char *)s] & NOTEND_SCHEME) == 0) {
         ++s;
     }
-    /* scheme must be non-empty and followed by :// */
-    if (s == uri || s[0] != ':' || s[1] != '/' || s[2] != '/') {
+    /* scheme must be non-empty and followed by : */
+    if (s == uri || s[0] != ':') {
         goto deal_with_path;        /* backwards predicted taken! */
     }
 
     uptr->scheme = apr_pstrmemdup(p, uri, s - uri);
+    if (s[1] != '/' || s[2] != '/') {
+        uri = s + 1;
+        goto deal_with_path;
+    }
+
     s += 3;
 
 deal_with_authority:
diff --git a/srclib/apr-util/xml/expat/aclocal.m4 b/srclib/apr-util/xml/expat/aclocal.m4
index 7eee74dd..04fe1acd 100644
--- a/srclib/apr-util/xml/expat/aclocal.m4
+++ b/srclib/apr-util/xml/expat/aclocal.m4
@@ -1,15 +1,15 @@
 dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh
 dnl edits here will be lost
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-## Free Software Foundation, Inc.
+## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
+## 2008  Free Software Foundation, Inc.
 ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 ##
 ## This file is free software; the Free Software Foundation gives
 ## unlimited permission to copy and/or distribute it, with or without
 ## modifications, as long as this notice is preserved.
 
-# serial 48 AC_PROG_LIBTOOL
+# serial 52 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -97,7 +97,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
 AC_REQUIRE([AC_OBJEXT])dnl
 AC_REQUIRE([AC_EXEEXT])dnl
 dnl
-
 AC_LIBTOOL_SYS_MAX_CMD_LEN
 AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 AC_LIBTOOL_OBJDIR
@@ -172,7 +171,7 @@ test -z "$STRIP" && STRIP=:
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
@@ -199,6 +198,8 @@ file_magic*)
   ;;
 esac
 
+_LT_REQUIRED_DARWIN_CHECKS
+
 AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 enable_win32_dll=yes, enable_win32_dll=no)
@@ -259,8 +260,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 # Check for compiler boilerplate output or warnings with
 # the simple compiler test code.
 AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -272,13 +274,85 @@ $rm conftest*
 # Check for linker boilerplate output or warnings with
 # the simple link test code.
 AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 ])# _LT_LINKER_BOILERPLATE
 
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+   [lt_cv_ld_exported_symbols_list=yes],
+   [lt_cv_ld_exported_symbols_list=no])
+   LDFLAGS="$save_LDFLAGS"
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[0123]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[[012]]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
 
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
@@ -289,12 +363,20 @@ $rm conftest*
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
 AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi],[])
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 ])# _LT_AC_SYS_LIBPATH_AIX
 
@@ -525,13 +607,17 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
@@ -548,6 +634,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
       ;;
     *64-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
@@ -588,7 +677,11 @@ sparc*-*solaris*)
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
       esac
       ;;
     esac
@@ -619,7 +712,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
 AC_CACHE_CHECK([$1], [$2],
   [$2=no
   ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$3"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -660,11 +753,12 @@ fi
 # ------------------------------------------------------------
 # Check whether the given compiler option works
 AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
   [$2=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $3"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -680,7 +774,7 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
        $2=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 ])
 
@@ -778,24 +872,27 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     fi
     ;;
   *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
 	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 ])
@@ -948,7 +1045,7 @@ else
     AC_CHECK_FUNC([shl_load],
 	  [lt_cv_dlopen="shl_load"],
       [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
 	[AC_CHECK_FUNC([dlopen],
 	      [lt_cv_dlopen="dlopen"],
 	  [AC_CHECK_LIB([dl], [dlopen],
@@ -956,7 +1053,7 @@ else
 	    [AC_CHECK_LIB([svld], [dlopen],
 		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
 	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
 	      ])
 	    ])
 	  ])
@@ -1022,7 +1119,8 @@ fi
 # ---------------------------------
 # Check to see if options -c and -o are simultaneously supported by compiler
 AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
@@ -1030,7 +1128,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -1170,6 +1268,7 @@ else
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
          AC_MSG_RESULT([yes])
        else
   AC_MSG_RESULT([no])
@@ -1187,7 +1286,8 @@ fi
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
 AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -1201,20 +1301,58 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+fi])
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -1232,7 +1370,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[[4-9]]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1371,12 +1509,8 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+  m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -1393,18 +1527,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -1442,7 +1564,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -1505,7 +1627,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[[3-9]]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1560,7 +1682,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1576,7 +1698,7 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -1589,18 +1711,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -1682,6 +1792,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -1777,6 +1891,13 @@ esac
 AC_MSG_RESULT([$dynamic_linker])
 test "$dynamic_linker" = no && can_build_shared=no
 
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -1787,7 +1908,8 @@ fi
 # _LT_AC_TAGCONFIG
 # ----------------
 AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
     [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
         [include additional configurations @<:@automatic@:>@])],
     [tagnames="$withval"])
@@ -2048,7 +2170,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
 
 # AC_PATH_TOOL_PREFIX
 # -------------------
-# find a file program which can recognise shared library
+# find a file program which can recognize shared library
 AC_DEFUN([AC_PATH_TOOL_PREFIX],
 [AC_REQUIRE([AC_PROG_EGREP])dnl
 AC_MSG_CHECKING([for $1])
@@ -2111,7 +2233,7 @@ fi
 
 # AC_PATH_MAGIC
 # -------------
-# find a file program which can recognise a shared library
+# find a file program which can recognize a shared library
 AC_DEFUN([AC_PATH_MAGIC],
 [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -2258,7 +2380,7 @@ esac
 # how to check for library dependencies
 #  -- PORTME fill in with the dynamic library characteristics
 AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
 lt_cv_deplibs_check_method,
 [lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -2275,7 +2397,7 @@ lt_cv_deplibs_check_method='unknown'
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[[4-9]]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2297,16 +2419,22 @@ cygwin*)
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
 darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -2344,7 +2472,7 @@ hpux10.20* | hpux11*)
   esac
   ;;
 
-interix3*)
+interix[[3-9]]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
   ;;
@@ -2360,7 +2488,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2394,6 +2522,10 @@ osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -2446,7 +2578,7 @@ AC_DEFUN([AC_PROG_NM],
   lt_cv_path_NM="$NM"
 else
   lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
@@ -2662,10 +2794,10 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 _LT_AC_SYS_COMPILER
 
@@ -2705,7 +2837,7 @@ aix3*)
   fi
   ;;
 
-aix4* | aix5*)
+aix[[4-9]]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -2762,6 +2894,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
 _LT_AC_TAGVAR(predeps, $1)=
 _LT_AC_TAGVAR(postdeps, $1)=
 _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
 
 # Source file extension for C++ test sources.
 ac_ext=cpp
@@ -2771,10 +2904,10 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -2871,7 +3004,7 @@ case $host_os in
     # FIXME: insert proper C++ library support
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
-  aix4* | aix5*)
+  aix[[4-9]]*)
     if test "$host_cpu" = ia64; then
       # On IA64, the linker does run time linking by default, so we don't
       # have to do anything special.
@@ -2884,7 +3017,7 @@ case $host_os in
       # Test if we are trying to use run time linking or normal
       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
       # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	for ld_flag in $LDFLAGS; do
 	  case $ld_flag in
 	  *-brtl*)
@@ -2920,7 +3053,7 @@ case $host_os in
 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	then
 	  # We have reworked collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  :
 	else
 	  # We have old collect2
 	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -3030,59 +3163,31 @@ case $host_os in
     fi
   ;;
       darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
       output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
+      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
       fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          else
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
       else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -3116,7 +3221,7 @@ case $host_os in
   freebsd-elf*)
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
     ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
+  freebsd* | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -3165,9 +3270,7 @@ case $host_os in
       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
       case $host_cpu in
-      hppa*64*|ia64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-        ;;
+      hppa*64*|ia64*) ;;
       *)
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
         ;;
@@ -3235,7 +3338,7 @@ case $host_os in
 	;;
     esac
     ;;
-  interix3*)
+  interix[[3-9]]*)
     _LT_AC_TAGVAR(hardcode_direct, $1)=no
     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -3275,7 +3378,7 @@ case $host_os in
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
     ;;
-  linux*)
+  linux* | k*bsd*-gnu)
     case $cc_basename in
       KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -3327,7 +3430,7 @@ case $host_os in
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      pgCC*)
+      pgCC* | pgcpp*)
         # Portland Group C++ compiler
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
   	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -3355,6 +3458,29 @@ case $host_os in
 	# dependencies.
 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
     esac
     ;;
   lynxos*)
@@ -3393,16 +3519,20 @@ case $host_os in
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
   openbsd*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    if test -f /usr/libexec/ld.so; then
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
     fi
-    output_verbose_link_cmd='echo'
     ;;
   osf3*)
     case $cc_basename in
@@ -3564,15 +3694,10 @@ case $host_os in
 	case $host_os in
 	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 	    ;;
 	esac
 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
@@ -3619,6 +3744,12 @@ case $host_os in
 	  fi
 
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	  *)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
 	fi
 	;;
     esac
@@ -3738,7 +3869,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
 # compiler output when linking a shared library.
 # Parse the compiler output and extract the necessary
 # objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
 dnl we can't use the lt_simple_compile_test_code here,
 dnl because it contains code intended for an executable,
 dnl not a library.  It's possible we should let each
@@ -3863,10 +3995,15 @@ fi
 
 $rm -f confest.$objext
 
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
 # PORTME: override above test on systems where it is broken
 ifelse([$1],[CXX],
 [case $host_os in
-interix3*)
+interix[[3-9]]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   _LT_AC_TAGVAR(predep_objects,$1)=
@@ -3874,19 +4011,51 @@ interix3*)
   _LT_AC_TAGVAR(postdeps,$1)=
   ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;
 esac
 ])
-
 case " $_LT_AC_TAGVAR(postdeps, $1) " in
 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 esac
@@ -3929,10 +4098,17 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -3964,7 +4140,7 @@ aix3*)
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4* | aix5*)
+aix[[4-9]]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -4011,10 +4187,10 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -4071,7 +4247,7 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
 lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -4145,6 +4321,7 @@ if test -f "$ltmain"; then
     _LT_AC_TAGVAR(predeps, $1) \
     _LT_AC_TAGVAR(postdeps, $1) \
     _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
     _LT_AC_TAGVAR(archive_cmds, $1) \
     _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
     _LT_AC_TAGVAR(postinstall_cmds, $1) \
@@ -4160,6 +4337,7 @@ if test -f "$ltmain"; then
     _LT_AC_TAGVAR(module_cmds, $1) \
     _LT_AC_TAGVAR(module_expsym_cmds, $1) \
     _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
     _LT_AC_TAGVAR(exclude_expsyms, $1) \
     _LT_AC_TAGVAR(include_expsyms, $1); do
 
@@ -4206,7 +4384,7 @@ ifelse([$1], [],
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -4443,6 +4621,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
 # shared library.
 postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
@@ -4531,7 +4713,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
@@ -4614,6 +4796,7 @@ fi
 # ---------------------------------
 AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
 [AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
 AC_REQUIRE([AC_PROG_NM])
 AC_REQUIRE([AC_OBJEXT])
 # Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4650,7 +4833,7 @@ hpux*) # Its linker distinguishes data from code symbols
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
-linux*)
+linux* | k*bsd*-gnu)
   if test "$host_cpu" = ia64; then
     symcode='[[ABCDGIRSTW]]'
     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -4791,7 +4974,7 @@ EOF
     echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
     cat conftest.$ac_ext >&5
   fi
-  rm -f conftest* conftst*
+  rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -4840,13 +5023,16 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # like `-m68040'.
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
     darwin* | rhapsody*)
       # PIC is the default on this platform
@@ -4857,7 +5043,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # DJGPP does not support shared libraries at all
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -4883,7 +5069,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
     esac
   else
     case $host_os in
-      aix4* | aix5*)
+      aix[[4-9]]*)
 	# All AIX code is PIC.
 	if test "$host_cpu" = ia64; then
 	  # AIX 5 now supports IA64 processor
@@ -4923,7 +5109,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
+      freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -4966,7 +5152,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    ;;
 	esac
 	;;
-      linux*)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4979,7 +5165,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 	    ;;
-	  pgCC*)
+	  pgCC* | pgcpp*)
 	    # Portland Group C++ compiler.
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@ -4993,6 +5179,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    ;;
 	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
 	    ;;
 	esac
 	;;
@@ -5113,14 +5307,17 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
     darwin* | rhapsody*)
@@ -5129,7 +5326,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -5187,10 +5384,11 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -5220,7 +5418,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -5239,6 +5437,22 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
         # All Alpha code is PIC.
         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -5248,6 +5462,10 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
+    rdos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
     solaris*)
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -5307,7 +5525,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
 #
 if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
   AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
     [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
     [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
      "" | " "*) ;;
@@ -5331,7 +5549,7 @@ esac
 #
 wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
 AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
   $lt_tmp_static_flag,
   [],
   [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
@@ -5342,11 +5560,12 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
 # ------------------------------------
 # See if the linker supports building shared libraries.
 AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 ifelse([$1],[CXX],[
   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix4* | aix5*)
+  aix[[4-9]]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -5359,12 +5578,13 @@ ifelse([$1],[CXX],[
     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
   ;;
   *)
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   esac
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 ],[
   runpath_var=
   _LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -5395,12 +5615,14 @@ ifelse([$1],[CXX],[
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   _LT_CC_BASENAME([$compiler])
@@ -5450,7 +5672,7 @@ ifelse([$1],[CXX],[
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[[3-9]]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5498,7 +5720,7 @@ EOF
       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_AC_TAGVAR(always_export_symbols, $1)=no
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -5516,7 +5738,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -5531,7 +5753,7 @@ EOF
       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -5549,13 +5771,22 @@ EOF
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5595,7 +5826,7 @@ EOF
 
     sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
       case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
@@ -5660,7 +5891,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[[4-9]]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -5680,7 +5911,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -5714,7 +5945,7 @@ _LT_EOF
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+  	  :
 	  else
   	  # We have old collect2
   	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -5807,31 +6038,13 @@ _LT_EOF
       # The linker will automatically build a .lib file if we build a DLL.
       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
       # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
       _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
 
     darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
@@ -5840,19 +6053,18 @@ _LT_EOF
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -5892,7 +6104,7 @@ _LT_EOF
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -6014,24 +6226,28 @@ _LT_EOF
       ;;
 
     openbsd*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	   ;;
-	 *)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
@@ -6090,17 +6306,16 @@ _LT_EOF
       case $host_os in
       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
@@ -6157,7 +6372,7 @@ _LT_EOF
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6232,7 +6447,7 @@ x|xyes)
       # to ld, don't add -lc before -lgcc.
       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
         soname=conftest
@@ -6335,6 +6550,30 @@ AC_DEFUN([LT_AC_PROG_RC],
 [AC_CHECK_TOOL(RC, windres, no)
 ])
 
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+  as_executable_p='test -x'
+else
+  as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
 ############################################################
 # NOTE: This macro has been submitted for inclusion into   #
 #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
@@ -6357,12 +6596,13 @@ do
   test -z "$as_dir" && as_dir=.
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6395,5 +6635,6 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
 done
 ])
 SED=$lt_cv_path_SED
+AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
 ])
diff --git a/srclib/apr-util/xml/expat/buildconf.sh b/srclib/apr-util/xml/expat/buildconf.sh
index d36a292e..b17bb78e 100755
--- a/srclib/apr-util/xml/expat/buildconf.sh
+++ b/srclib/apr-util/xml/expat/buildconf.sh
@@ -19,7 +19,7 @@ fi
 # want to ensure is used.
 echo "Copying libtool helper files ..."
 
-# Remove any m4 cache and libtool files so one can switch between
+# Remove any m4 cache and libtool files so one can switch between 
 # autoconf and libtool versions by simply rerunning the buildconf script.
 #
 (cd conftools ; rm -f ltconfig ltmain.sh)
diff --git a/srclib/apr-util/xml/expat/config.h.in b/srclib/apr-util/xml/expat/config.h.in
index abfd97f9..7c4a38e9 100644
--- a/srclib/apr-util/xml/expat/config.h.in
+++ b/srclib/apr-util/xml/expat/config.h.in
@@ -74,9 +74,13 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel and VAX). */
+#if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+#elif ! defined __LITTLE_ENDIAN__
+# undef WORDS_BIGENDIAN
+#endif
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
diff --git a/srclib/apr-util/xml/expat/configure b/srclib/apr-util/xml/expat/configure
index c18cf044..60622595 100755
--- a/srclib/apr-util/xml/expat/configure
+++ b/srclib/apr-util/xml/expat/configure
@@ -1,28 +1,32 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60.
+# Generated by GNU Autoconf 2.62.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
 
 
 # PATH needs CR
@@ -33,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -59,8 +91,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -83,7 +113,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -96,17 +126,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -128,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -154,7 +177,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -215,7 +238,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; }
 else
   as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
@@ -233,19 +256,20 @@ IFS=$as_save_IFS
 	 # Try only shells that exist, to save several forks.
 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
 
 :
 _ASEOF
@@ -253,19 +277,20 @@ _ASEOF
   CONFIG_SHELL=$as_shell
 	       as_have_required=yes
 	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
 
 :
 (as_func_return () {
@@ -335,10 +360,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -407,9 +432,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -445,7 +471,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -473,7 +499,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -486,19 +511,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -512,19 +540,28 @@ else
   as_mkdir_p=false
 fi
 
-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -719,36 +756,36 @@ ac_unique_file="Makefile.in"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
-#if HAVE_STDINT_H
+#ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
@@ -808,6 +845,7 @@ CPPFLAGS
 ac_ct_CC
 EXEEXT
 OBJEXT
+SED
 GREP
 EGREP
 LN_S
@@ -815,6 +853,8 @@ ECHO
 AR
 RANLIB
 STRIP
+DSYMUTIL
+NMEDIT
 DLLTOOL
 AS
 OBJDUMP
@@ -843,12 +883,23 @@ LIBOBJS
 FILEMAP_OBJ
 LTLIBOBJS'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_shared
+enable_static
+enable_fast_install
+with_gnu_ld
+enable_libtool_lock
+with_pic
+with_tags
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
 CC
 CFLAGS
 LDFLAGS
+LIBS
 CPPFLAGS
 CPP
 CXX
@@ -862,6 +913,8 @@ FFLAGS'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -960,13 +1013,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -979,13 +1040,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1176,22 +1245,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1211,7 +1296,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1220,16 +1305,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1238,22 +1323,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1268,7 +1369,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1284,10 +1385,10 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1295,12 +1396,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1327,12 +1428,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1381,9 +1482,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1393,25 +1494,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1428,6 +1529,7 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
@@ -1449,6 +1551,7 @@ Some influential environment variables:
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
@@ -1468,15 +1571,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1512,7 +1617,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1522,10 +1627,10 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1536,7 +1641,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
 
@@ -1572,7 +1677,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1607,7 +1712,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1659,11 +1764,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1693,9 +1799,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1710,9 +1816,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1728,8 +1834,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1771,21 +1877,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1795,16 +1904,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1818,29 +1927,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1850,10 +1968,10 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1897,8 +2015,8 @@ for ac_dir in conftools "$srcdir"/conftools; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in conftools \"$srcdir\"/conftools" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in conftools \"$srcdir\"/conftools" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in conftools \"$srcdir\"/conftools" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in conftools \"$srcdir\"/conftools" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1931,34 +2049,34 @@ ac_config_headers="$ac_config_headers config.h"
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
 if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -1975,27 +2093,27 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
 if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -2012,27 +2130,27 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
 if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$target_alias" = x; then
   ac_cv_target=$ac_cv_host
 else
   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-echo "$as_me: error: invalid value of canonical target" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
+$as_echo "$as_me: error: invalid value of canonical target" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 target=$ac_cv_target
@@ -2144,10 +2262,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2158,9 +2276,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2171,11 +2289,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2184,10 +2302,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2198,9 +2316,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2211,11 +2329,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2223,10 +2341,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -2241,10 +2359,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2255,9 +2373,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2268,11 +2386,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2281,10 +2399,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2296,13 +2414,13 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2325,11 +2443,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2340,10 +2458,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2354,9 +2472,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2367,11 +2485,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2384,10 +2502,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2398,9 +2516,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2411,11 +2529,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2427,10 +2545,10 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -2442,44 +2560,48 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2498,27 +2620,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -2529,21 +2646,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
-for ac_file in $ac_files
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2567,24 +2685,28 @@ done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
 else
-  echo "$as_me: failed program was:" >&5
+  ac_file=''
+fi
+
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2593,49 +2715,51 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2644,31 +2768,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2691,40 +2815,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2750,37 +2875,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2790,15 +2899,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -2825,37 +2938,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -2880,37 +2977,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -2936,37 +3017,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2981,8 +3046,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -2998,10 +3063,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -3072,37 +3137,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3118,15 +3167,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -3136,10 +3185,10 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
 if test "${lt_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # Loop through the user's path and test for sed and gsed.
 # Then use that list of sed's as ones to test for truncation.
@@ -3150,12 +3199,13 @@ do
   test -z "$as_dir" && as_dir=.
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -3190,45 +3240,41 @@ done
 fi
 
 SED=$lt_cv_path_SED
-{ echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6; }
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
+{ $as_echo "$as_me:$LINENO: result: $SED" >&5
+$as_echo "$SED" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3243,74 +3289,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3325,33 +3357,24 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
@@ -3366,8 +3389,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -3396,14 +3419,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -3433,19 +3456,19 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -3457,20 +3480,20 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
 if test "${lt_cv_ld_reload_flag+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -3487,10 +3510,10 @@ case $host_os in
     ;;
 esac
 
-{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+$as_echo_n "checking for BSD-compatible nm... " >&6; }
 if test "${lt_cv_path_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
@@ -3536,25 +3559,25 @@ else
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
 NM="$lt_cv_path_NM"
 
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -3571,7 +3594,7 @@ lt_cv_deplibs_check_method='unknown'
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[4-9]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3593,16 +3616,22 @@ cygwin*)
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
 darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -3640,7 +3669,7 @@ hpux10.20* | hpux11*)
   esac
   ;;
 
-interix3*)
+interix[3-9]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
   ;;
@@ -3656,7 +3685,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3690,6 +3719,10 @@ osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3727,8 +3760,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 esac
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -3762,7 +3795,7 @@ ia64-*-hpux*)
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *ELF-32*)
@@ -3777,11 +3810,11 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3780 "configure"' > conftest.$ac_ext
+  echo '#line 3813 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
    if test "$lt_cv_prog_gnu_ld" = yes; then
     case `/usr/bin/file conftest.$ac_objext` in
@@ -3812,17 +3845,21 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
@@ -3839,6 +3876,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
       ;;
     *64-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
@@ -3862,10 +3902,10 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
 if test "${lt_cv_cc_needs_belf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3894,43 +3934,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   lt_cv_cc_needs_belf=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	lt_cv_cc_needs_belf=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3939,8 +3967,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -3952,13 +3980,17 @@ sparc*-*solaris*)
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
       esac
       ;;
     esac
@@ -3970,10 +4002,10 @@ sparc*-*solaris*)
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$DLLTOOL"; then
   ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
@@ -3984,9 +4016,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3997,11 +4029,11 @@ fi
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-echo "${ECHO_T}$DLLTOOL" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4010,10 +4042,10 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DLLTOOL"; then
   ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
@@ -4024,9 +4056,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4037,11 +4069,11 @@ fi
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
@@ -4049,10 +4081,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -4066,10 +4098,10 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AS"; then
   ac_cv_prog_AS="$AS" # Let the user override the test.
@@ -4080,9 +4112,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4093,11 +4125,11 @@ fi
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  { echo "$as_me:$LINENO: result: $AS" >&5
-echo "${ECHO_T}$AS" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AS" >&5
+$as_echo "$AS" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4106,10 +4138,10 @@ if test -z "$ac_cv_prog_AS"; then
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AS"; then
   ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
@@ -4120,9 +4152,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AS="as"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4133,11 +4165,11 @@ fi
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-echo "${ECHO_T}$ac_ct_AS" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AS" = x; then
@@ -4145,10 +4177,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -4162,10 +4194,10 @@ fi
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_OBJDUMP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
   ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
@@ -4176,9 +4208,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4189,11 +4221,11 @@ fi
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-echo "${ECHO_T}$OBJDUMP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4202,10 +4234,10 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
   ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
@@ -4216,9 +4248,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4229,11 +4261,11 @@ fi
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
@@ -4241,10 +4273,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -4267,15 +4299,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -4307,27 +4339,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4351,28 +4377,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4397,8 +4417,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -4426,27 +4446,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4470,28 +4484,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4507,9 +4515,9 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -4521,10 +4529,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4551,37 +4559,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -4673,37 +4665,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -4725,11 +4720,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4747,37 +4742,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -4785,12 +4764,14 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4801,20 +4782,21 @@ done
 
 for ac_header in dlfcn.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4830,49 +4812,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4886,76 +4852,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4976,10 +4938,10 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -4990,9 +4952,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5003,11 +4965,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5020,10 +4982,10 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -5034,9 +4996,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5047,11 +5009,11 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5063,10 +5025,10 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -5078,43 +5040,47 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5140,37 +5106,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -5180,15 +5130,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
@@ -5215,37 +5169,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CXXFLAGS=""
@@ -5270,37 +5208,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -5326,37 +5248,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -5371,8 +5277,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -5404,11 +5310,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
     for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -5440,27 +5346,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -5484,28 +5384,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -5530,8 +5424,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -5559,27 +5453,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -5603,28 +5491,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -5640,9 +5522,9 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -5661,14 +5543,14 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$F77"; then
   ac_cv_prog_F77="$F77" # Let the user override the test.
@@ -5679,9 +5561,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5692,11 +5574,11 @@ fi
 fi
 F77=$ac_cv_prog_F77
 if test -n "$F77"; then
-  { echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $F77" >&5
+$as_echo "$F77" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5705,14 +5587,14 @@ fi
 fi
 if test -z "$F77"; then
   ac_ct_F77=$F77
-  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_F77"; then
   ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
@@ -5723,9 +5605,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_F77="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5736,11 +5618,11 @@ fi
 fi
 ac_ct_F77=$ac_cv_prog_ac_ct_F77
 if test -n "$ac_ct_F77"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+$as_echo "$ac_ct_F77" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -5752,10 +5634,10 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -5766,37 +5648,41 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 rm -f a.out
 
@@ -5804,10 +5690,10 @@ rm -f a.out
 # input file.  (Note that this only needs to work for GNU compilers.)
 ac_save_ext=$ac_ext
 ac_ext=F
-{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
 if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
       program main
@@ -5823,37 +5709,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -5863,16 +5733,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_f77_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
 ac_ext=$ac_save_ext
 ac_test_FFLAGS=${FFLAGS+set}
 ac_save_FFLAGS=$FFLAGS
 FFLAGS=
-{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+$as_echo_n "checking whether $F77 accepts -g... " >&6; }
 if test "${ac_cv_prog_f77_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   FFLAGS=-g
 cat >conftest.$ac_ext <<_ACEOF
@@ -5886,37 +5756,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_f77_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_prog_f77_g=no
@@ -5925,8 +5779,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+$as_echo "$ac_cv_prog_f77_g" >&6; }
 if test "$ac_test_FFLAGS" = set; then
   FFLAGS=$ac_save_FFLAGS
 elif test $ac_cv_prog_f77_g = yes; then
@@ -5943,7 +5797,11 @@ else
   fi
 fi
 
-G77=`test $ac_compiler_gnu = yes && echo yes`
+if test $ac_compiler_gnu = yes; then
+  G77=yes
+else
+  G77=
+fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5953,12 +5811,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
 # find the maximum length of command line arguments
-{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
 if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
     i=0
   teststring="ABCD"
@@ -6040,45 +5897,49 @@ else
     fi
     ;;
   *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
 	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
+  { $as_echo "$as_me:$LINENO: result: none" >&5
+$as_echo "none" >&6; }
 fi
 
 
 
 
+
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 # These are sane defaults that work on at least a few old systems.
@@ -6111,7 +5972,7 @@ hpux*) # Its linker distinguishes data from code symbols
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
-linux*)
+linux* | k*bsd*-gnu)
   if test "$host_cpu" = ia64; then
     symcode='[ABCDGIRSTW]'
     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -6183,14 +6044,14 @@ EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
     if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -6245,7 +6106,7 @@ EOF
 	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
@@ -6264,7 +6125,7 @@ EOF
     echo "$progname: failed program was:" >&5
     cat conftest.$ac_ext >&5
   fi
-  rm -f conftest* conftst*
+  rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -6280,17 +6141,17 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
+  { $as_echo "$as_me:$LINENO: result: failed" >&5
+$as_echo "failed" >&6; }
 else
-  { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+  { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
 if test "${lt_cv_objdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
@@ -6302,8 +6163,8 @@ else
 fi
 rmdir .libs 2>/dev/null
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
@@ -6354,10 +6215,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -6368,9 +6229,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6381,11 +6242,11 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6394,10 +6255,10 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -6408,9 +6269,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6421,11 +6282,11 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -6433,10 +6294,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -6450,10 +6311,10 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -6464,9 +6325,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6477,11 +6338,11 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6490,10 +6351,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -6504,9 +6365,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6517,11 +6378,11 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -6529,10 +6390,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -6546,10 +6407,10 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -6560,9 +6421,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6573,11 +6434,11 @@ fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6586,10 +6447,10 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -6600,9 +6461,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6613,11 +6474,11 @@ fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -6625,10 +6486,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -6662,7 +6523,7 @@ test -z "$STRIP" && STRIP=:
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
@@ -6693,10 +6554,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -6746,19 +6607,19 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -6808,11 +6669,11 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   else
@@ -6824,6 +6685,322 @@ fi
   ;;
 esac
 
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+
+    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  lt_cv_ld_exported_symbols_list=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	lt_cv_ld_exported_symbols_list=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[0123])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[012]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+
 enable_dlopen=no
 enable_win32_dll=yes
 
@@ -6862,10 +7039,10 @@ objext=o
 objext=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 
 # If no C compiler was specified, use CC.
@@ -6880,16 +7057,16 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 ## CAVEAT EMPTOR:
@@ -6903,14 +7080,14 @@ if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -6921,11 +7098,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6924: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7101: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6928: \$? = $ac_status" >&5
+   echo "$as_me:7105: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6938,8 +7115,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -6953,8 +7130,8 @@ lt_prog_compiler_wl=
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -6976,13 +7153,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
@@ -6992,7 +7171,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -7050,7 +7229,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -7083,7 +7262,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl='-Wl,'
@@ -7102,6 +7281,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -7111,6 +7306,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
@@ -7163,22 +7362,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_pic_works=no
+  lt_cv_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -7189,27 +7388,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7192: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7391: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7196: \$? = $ac_status" >&5
+   echo "$as_me:7395: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works=yes
+       lt_cv_prog_compiler_pic_works=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
-if test x"$lt_prog_compiler_pic_works" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
      "" | " "*) ;;
      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -7234,15 +7433,15 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_static_works=no
+  lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -7252,37 +7451,37 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works=yes
+         lt_cv_prog_compiler_static_works=yes
        fi
      else
-       lt_prog_compiler_static_works=yes
+       lt_cv_prog_compiler_static_works=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
-if test x"$lt_prog_compiler_static_works" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
     :
 else
     lt_prog_compiler_static=
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -7293,11 +7492,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7296: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7495: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7300: \$? = $ac_status" >&5
+   echo "$as_me:7499: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7319,34 +7518,34 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag=
@@ -7377,12 +7576,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -7441,7 +7641,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs=no
@@ -7489,7 +7689,7 @@ EOF
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -7507,7 +7707,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
@@ -7522,7 +7722,7 @@ EOF
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -7540,13 +7740,22 @@ EOF
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	ld_shlibs=no
@@ -7651,7 +7860,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -7671,7 +7880,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -7705,7 +7914,7 @@ _LT_EOF
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct=unsupported
@@ -7766,48 +7975,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -7841,48 +8045,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -7928,31 +8127,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes=yes
       ;;
 
     darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
+      allow_undefined_flag="$_lt_dar_allow_undefined"
       archive_cmds_need_lc=no
       hardcode_direct=no
       hardcode_automatic=yes
@@ -7961,19 +8142,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -8013,7 +8193,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -8135,24 +8315,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     openbsd*)
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs=no
       fi
       ;;
 
@@ -8211,17 +8395,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs=yes
       ;;
@@ -8278,7 +8461,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag='${wl}-z,text'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
@@ -8331,8 +8514,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
 #
@@ -8352,15 +8535,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -8378,7 +8561,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc=no
@@ -8390,16 +8573,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -8413,17 +8596,55 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
+
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
@@ -8444,7 +8665,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -8583,12 +8804,8 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -8605,18 +8822,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -8654,7 +8859,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -8717,7 +8922,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -8772,7 +8977,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -8788,7 +8993,7 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -8801,18 +9006,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -8894,6 +9087,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -8986,17 +9183,32 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var" || \
@@ -9020,8 +9232,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
@@ -9034,29 +9246,30 @@ fi
 
 striplib=
 old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
-         { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+         old_striplib="$STRIP -S"
+         { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
        else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
        ;;
    *)
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
     ;;
   esac
 fi
@@ -9088,10 +9301,10 @@ else
 
   darwin*)
   # if libdl is installed we need to link against it
-    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -9123,48 +9336,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
@@ -9178,10 +9379,10 @@ fi
    ;;
 
   *)
-    { echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+$as_echo_n "checking for shl_load... " >&6; }
 if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9234,54 +9435,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_shl_load=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+$as_echo "$ac_cv_func_shl_load" >&6; }
 if test $ac_cv_func_shl_load = yes; then
   lt_cv_dlopen="shl_load"
 else
-  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -9313,55 +9502,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_shl_load=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
 if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
-  { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+$as_echo_n "checking for dlopen... " >&6; }
 if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9414,54 +9591,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+$as_echo "$ac_cv_func_dlopen" >&6; }
 if test $ac_cv_func_dlopen = yes; then
   lt_cv_dlopen="dlopen"
 else
-  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -9493,55 +9658,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
@@ -9573,55 +9726,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_svld_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_svld_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
 if test $ac_cv_lib_svld_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -9653,50 +9794,38 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_dld_link=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_dld_link=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
 if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
 
@@ -9734,10 +9863,10 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
@@ -9745,7 +9874,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9748 "configure"
+#line 9877 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9811,7 +9940,7 @@ EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -9829,15 +9958,15 @@ rm -fr conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
@@ -9845,7 +9974,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9848 "configure"
+#line 9977 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9911,7 +10040,7 @@ EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -9929,8 +10058,8 @@ rm -fr conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -9952,13 +10081,13 @@ fi
 
 
 # Report which library types will actually be built
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -9972,21 +10101,21 @@ aix3*)
   fi
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
     ;;
 esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -10028,6 +10157,7 @@ if test -f "$ltmain"; then
     predeps \
     postdeps \
     compiler_lib_search_path \
+    compiler_lib_search_dirs \
     archive_cmds \
     archive_expsym_cmds \
     postinstall_cmds \
@@ -10043,6 +10173,7 @@ if test -f "$ltmain"; then
     module_cmds \
     module_expsym_cmds \
     lt_cv_prog_compiler_c_o \
+    fix_srcfile_path \
     exclude_expsyms \
     include_expsyms; do
 
@@ -10077,8 +10208,8 @@ if test -f "$ltmain"; then
 cfgfile="${ofile}T"
   trap "$rm \"$cfgfile\"; exit 1" 1 2 15
   $rm -f "$cfgfile"
-  { echo "$as_me:$LINENO: creating $ofile" >&5
-echo "$as_me: creating $ofile" >&6;}
+  { $as_echo "$as_me:$LINENO: creating $ofile" >&5
+$as_echo "$as_me: creating $ofile" >&6;}
 
   cat <<__EOF__ >> "$cfgfile"
 #! $SHELL
@@ -10087,7 +10218,7 @@ echo "$as_me: creating $ofile" >&6;}
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -10323,6 +10454,10 @@ predeps=$lt_predeps
 # shared library.
 postdeps=$lt_postdeps
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path
@@ -10411,7 +10546,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols
@@ -10486,18 +10621,18 @@ fi
 
 if test -f "$ltmain" && test -n "$tagnames"; then
   if test ! -f "${ofile}"; then
-    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
+$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
   fi
 
   if test -z "$LTCC"; then
     eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
     if test -z "$LTCC"; then
-      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
+$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
     else
-      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
+$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
     fi
   fi
   if test -z "$LTCFLAGS"; then
@@ -10514,16 +10649,16 @@ echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
     # Check whether tagname contains only valid characters
     case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
     "") ;;
-    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-echo "$as_me: error: invalid tag name: $tagname" >&2;}
+    *)  { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
+$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}
    { (exit 1); exit 1; }; }
 	;;
     esac
 
     if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
     then
-      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
+$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
@@ -10571,6 +10706,7 @@ postdep_objects_CXX=
 predeps_CXX=
 postdeps_CXX=
 compiler_lib_search_path_CXX=
+compiler_lib_search_dirs_CXX=
 
 # Source file extension for C++ test sources.
 ac_ext=cpp
@@ -10580,10 +10716,10 @@ objext=o
 objext_CXX=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -10599,16 +10735,16 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -10665,8 +10801,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -10695,14 +10831,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -10732,19 +10868,19 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -10756,8 +10892,8 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -10807,15 +10943,15 @@ else
 fi
 
 # PORTME: fill in a description of your system's C++ link characteristics
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 ld_shlibs_CXX=yes
 case $host_os in
   aix3*)
     # FIXME: insert proper C++ library support
     ld_shlibs_CXX=no
     ;;
-  aix4* | aix5*)
+  aix[4-9]*)
     if test "$host_cpu" = ia64; then
       # On IA64, the linker does run time linking by default, so we don't
       # have to do anything special.
@@ -10828,7 +10964,7 @@ case $host_os in
       # Test if we are trying to use run time linking or normal
       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
       # need to do runtime linking.
-      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	for ld_flag in $LDFLAGS; do
 	  case $ld_flag in
 	  *-brtl*)
@@ -10864,7 +11000,7 @@ case $host_os in
 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	then
 	  # We have reworked collect2
-	  hardcode_direct_CXX=yes
+	  :
 	else
 	  # We have old collect2
 	  hardcode_direct_CXX=unsupported
@@ -10925,48 +11061,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -11001,48 +11132,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -11104,59 +11230,31 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     fi
   ;;
       darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
       archive_cmds_need_lc_CXX=no
       hardcode_direct_CXX=no
       hardcode_automatic_CXX=yes
       hardcode_shlibpath_var_CXX=unsupported
       whole_archive_flag_spec_CXX=''
       link_all_deplibs_CXX=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
+      allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
       output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
+      archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+        archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
       fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          else
-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
       else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
           module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -11190,7 +11288,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
   freebsd-elf*)
     archive_cmds_need_lc_CXX=no
     ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
+  freebsd* | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     ld_shlibs_CXX=yes
@@ -11239,9 +11337,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_libdir_separator_CXX=:
 
       case $host_cpu in
-      hppa*64*|ia64*)
-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-        ;;
+      hppa*64*|ia64*) ;;
       *)
 	export_dynamic_flag_spec_CXX='${wl}-E'
         ;;
@@ -11309,7 +11405,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	;;
     esac
     ;;
-  interix3*)
+  interix[3-9]*)
     hardcode_direct_CXX=no
     hardcode_shlibpath_var_CXX=no
     hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
@@ -11349,7 +11445,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
     hardcode_libdir_separator_CXX=:
     ;;
-  linux*)
+  linux* | k*bsd*-gnu)
     case $cc_basename in
       KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -11401,7 +11497,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      pgCC*)
+      pgCC* | pgcpp*)
         # Portland Group C++ compiler
 	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
   	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -11429,6 +11525,29 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	# dependencies.
 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  no_undefined_flag_CXX=' -zdefs'
+	  archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
     esac
     ;;
   lynxos*)
@@ -11467,16 +11586,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ld_shlibs_CXX=no
     ;;
   openbsd*)
-    hardcode_direct_CXX=yes
-    hardcode_shlibpath_var_CXX=no
-    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      export_dynamic_flag_spec_CXX='${wl}-E'
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    if test -f /usr/libexec/ld.so; then
+      hardcode_direct_CXX=yes
+      hardcode_shlibpath_var_CXX=no
+      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	export_dynamic_flag_spec_CXX='${wl}-E'
+	whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      ld_shlibs_CXX=no
     fi
-    output_verbose_link_cmd='echo'
     ;;
   osf3*)
     case $cc_basename in
@@ -11638,15 +11761,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	case $host_os in
 	  solaris2.[0-5] | solaris2.[0-5].*) ;;
 	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+	    whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
 	    ;;
 	esac
 	link_all_deplibs_CXX=yes
@@ -11693,6 +11811,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  fi
 
 	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+	  *)
+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
 	fi
 	;;
     esac
@@ -11773,8 +11897,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ld_shlibs_CXX=no
     ;;
 esac
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 GCC_CXX="$GXX"
@@ -11784,7 +11908,6 @@ LD_CXX="$LD"
 ## There is no encapsulation within the following macros, do not change
 ## the running order or otherwise move them around unless you know exactly
 ## what you are doing...
-
 cat > conftest.$ac_ext <<EOF
 class Foo
 {
@@ -11798,7 +11921,7 @@ EOF
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Parse the compiler output and extract the necessary
   # objects, libraries and library flags.
@@ -11886,9 +12009,14 @@ fi
 
 $rm -f confest.$objext
 
+compiler_lib_search_dirs_CXX=
+if test -n "$compiler_lib_search_path_CXX"; then
+  compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
 # PORTME: override above test on systems where it is broken
 case $host_os in
-interix3*)
+interix[3-9]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   predep_objects_CXX=
@@ -11896,19 +12024,51 @@ interix3*)
   postdeps_CXX=
   ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    postdeps_CXX='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;
 esac
 
-
 case " $postdeps_CXX " in
 *" -lc "*) archive_cmds_need_lc_CXX=no ;;
 esac
@@ -11917,8 +12077,8 @@ lt_prog_compiler_wl_CXX=
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -11939,12 +12099,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       # like `-m68040'.
       lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
@@ -11956,7 +12118,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -11982,7 +12144,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   else
     case $host_os in
-      aix4* | aix5*)
+      aix[4-9]*)
 	# All AIX code is PIC.
 	if test "$host_cpu" = ia64; then
 	  # AIX 5 now supports IA64 processor
@@ -12022,7 +12184,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
+      freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -12065,7 +12227,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    ;;
 	esac
 	;;
-      linux*)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -12078,7 +12240,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-static'
 	    ;;
-	  pgCC*)
+	  pgCC* | pgcpp*)
 	    # Portland Group C++ compiler.
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-fpic'
@@ -12092,6 +12254,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    ;;
 	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
 	    ;;
 	esac
 	;;
@@ -12191,22 +12361,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_pic_works_CXX=no
+  lt_cv_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -12217,27 +12387,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12220: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12390: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12224: \$? = $ac_status" >&5
+   echo "$as_me:12394: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_CXX=yes
+       lt_cv_prog_compiler_pic_works_CXX=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -12262,15 +12432,15 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_static_works_CXX=no
+  lt_cv_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -12280,37 +12450,37 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_CXX=yes
+         lt_cv_prog_compiler_static_works_CXX=yes
        fi
      else
-       lt_prog_compiler_static_works_CXX=yes
+       lt_cv_prog_compiler_static_works_CXX=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
     :
 else
     lt_prog_compiler_static_CXX=
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -12321,11 +12491,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12324: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12494: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12328: \$? = $ac_status" >&5
+   echo "$as_me:12498: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12347,38 +12517,38 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix4* | aix5*)
+  aix[4-9]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -12391,15 +12561,16 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
     export_symbols_cmds_CXX="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
   ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   esac
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 #
@@ -12419,15 +12590,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -12445,7 +12616,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_CXX=no
@@ -12457,16 +12628,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -12480,20 +12651,7 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -12511,7 +12669,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -12650,12 +12808,7 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -12672,18 +12825,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -12721,7 +12862,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -12784,7 +12925,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -12839,7 +12980,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -12855,7 +12996,7 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -12868,18 +13009,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -12961,6 +13090,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -13053,17 +13186,32 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" || \
    test -n "$runpath_var_CXX" || \
@@ -13087,8 +13235,8 @@ else
   # directories.
   hardcode_action_CXX=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
 
 if test "$hardcode_action_CXX" = relink; then
   # Fast installation is not supported
@@ -13140,6 +13288,7 @@ if test -f "$ltmain"; then
     predeps_CXX \
     postdeps_CXX \
     compiler_lib_search_path_CXX \
+    compiler_lib_search_dirs_CXX \
     archive_cmds_CXX \
     archive_expsym_cmds_CXX \
     postinstall_cmds_CXX \
@@ -13155,6 +13304,7 @@ if test -f "$ltmain"; then
     module_cmds_CXX \
     module_expsym_cmds_CXX \
     lt_cv_prog_compiler_c_o_CXX \
+    fix_srcfile_path_CXX \
     exclude_expsyms_CXX \
     include_expsyms_CXX; do
 
@@ -13387,6 +13537,10 @@ predeps=$lt_predeps_CXX
 # shared library.
 postdeps=$lt_postdeps_CXX
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
@@ -13475,7 +13629,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_CXX
@@ -13566,10 +13720,17 @@ objext=o
 objext_F77=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -13585,16 +13746,16 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -13613,13 +13774,13 @@ done
 cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -13632,21 +13793,21 @@ aix3*)
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4* | aix5*)
+aix[4-9]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
 GCC_F77="$G77"
 LD_F77="$LD"
@@ -13655,8 +13816,8 @@ lt_prog_compiler_wl_F77=
 lt_prog_compiler_pic_F77=
 lt_prog_compiler_static_F77=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl_F77='-Wl,'
@@ -13678,13 +13839,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
       ;;
 
@@ -13694,7 +13857,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_F77='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -13752,7 +13915,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
@@ -13785,7 +13948,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_F77='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_F77='-Wl,'
@@ -13804,6 +13967,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static_F77='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -13813,6 +13992,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_F77='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static_F77='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
@@ -13865,22 +14048,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+$as_echo "$lt_prog_compiler_pic_F77" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_F77"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_pic_works_F77=no
+  lt_cv_prog_compiler_pic_works_F77=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_F77"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -13891,27 +14074,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13894: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14077: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13898: \$? = $ac_status" >&5
+   echo "$as_me:14081: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_F77=yes
+       lt_cv_prog_compiler_pic_works_F77=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
     case $lt_prog_compiler_pic_F77 in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
@@ -13936,15 +14119,15 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_static_works_F77=no
+  lt_cv_prog_compiler_static_works_F77=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13954,37 +14137,37 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_F77=yes
+         lt_cv_prog_compiler_static_works_F77=yes
        fi
      else
-       lt_prog_compiler_static_works_F77=yes
+       lt_cv_prog_compiler_static_works_F77=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
 
-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
     :
 else
     lt_prog_compiler_static_F77=
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_F77=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -13995,11 +14178,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13998: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14181: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14002: \$? = $ac_status" >&5
+   echo "$as_me:14185: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14021,34 +14204,34 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag_F77=
@@ -14079,12 +14262,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -14143,7 +14327,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs_F77=no
@@ -14191,7 +14375,7 @@ EOF
       allow_undefined_flag_F77=unsupported
       always_export_symbols_F77=no
       enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -14209,7 +14393,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct_F77=no
       hardcode_shlibpath_var_F77=no
       hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
@@ -14224,7 +14408,7 @@ EOF
       archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -14242,13 +14426,22 @@ EOF
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	ld_shlibs_F77=no
@@ -14353,7 +14546,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -14373,7 +14566,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -14407,7 +14600,7 @@ _LT_EOF
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct_F77=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct_F77=unsupported
@@ -14458,48 +14651,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -14523,48 +14711,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -14610,31 +14793,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_F77='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_F77=yes
       ;;
 
     darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
+      allow_undefined_flag_F77="$_lt_dar_allow_undefined"
       archive_cmds_need_lc_F77=no
       hardcode_direct_F77=no
       hardcode_automatic_F77=yes
@@ -14643,19 +14808,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs_F77=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -14695,7 +14859,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_F77='-R$libdir'
       hardcode_direct_F77=yes
@@ -14817,24 +14981,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     openbsd*)
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_F77='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_F77=yes
+	hardcode_shlibpath_var_F77=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_F77='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_F77='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_F77='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs_F77=no
       fi
       ;;
 
@@ -14893,17 +15061,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs_F77=yes
       ;;
@@ -14960,7 +15127,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag_F77='${wl}-z,text'
       archive_cmds_need_lc_F77=no
       hardcode_shlibpath_var_F77=no
@@ -15013,8 +15180,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+$as_echo "$ld_shlibs_F77" >&6; }
 test "$ld_shlibs_F77" = no && can_build_shared=no
 
 #
@@ -15034,15 +15201,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -15060,7 +15227,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_F77=no
@@ -15072,16 +15239,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+$as_echo "$archive_cmds_need_lc_F77" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -15095,20 +15262,7 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -15126,7 +15280,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -15265,12 +15419,7 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -15287,18 +15436,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -15336,7 +15473,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -15399,7 +15536,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -15454,7 +15591,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -15470,7 +15607,7 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -15483,18 +15620,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -15576,6 +15701,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -15668,17 +15797,32 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_F77=
 if test -n "$hardcode_libdir_flag_spec_F77" || \
    test -n "$runpath_var_F77" || \
@@ -15702,8 +15846,8 @@ else
   # directories.
   hardcode_action_F77=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+$as_echo "$hardcode_action_F77" >&6; }
 
 if test "$hardcode_action_F77" = relink; then
   # Fast installation is not supported
@@ -15755,6 +15899,7 @@ if test -f "$ltmain"; then
     predeps_F77 \
     postdeps_F77 \
     compiler_lib_search_path_F77 \
+    compiler_lib_search_dirs_F77 \
     archive_cmds_F77 \
     archive_expsym_cmds_F77 \
     postinstall_cmds_F77 \
@@ -15770,6 +15915,7 @@ if test -f "$ltmain"; then
     module_cmds_F77 \
     module_expsym_cmds_F77 \
     lt_cv_prog_compiler_c_o_F77 \
+    fix_srcfile_path_F77 \
     exclude_expsyms_F77 \
     include_expsyms_F77; do
 
@@ -16002,6 +16148,10 @@ predeps=$lt_predeps_F77
 # shared library.
 postdeps=$lt_postdeps_F77
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_F77
@@ -16090,7 +16240,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_F77"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_F77
@@ -16148,10 +16298,10 @@ objext=o
 objext_GCJ=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -16167,16 +16317,16 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -16211,14 +16361,14 @@ if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -16229,11 +16379,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16232: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16382: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16236: \$? = $ac_status" >&5
+   echo "$as_me:16386: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16246,8 +16396,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
@@ -16261,8 +16411,8 @@ lt_prog_compiler_wl_GCJ=
 lt_prog_compiler_pic_GCJ=
 lt_prog_compiler_static_GCJ=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl_GCJ='-Wl,'
@@ -16284,14 +16434,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+
       ;;
 
     darwin* | rhapsody*)
@@ -16300,7 +16452,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_GCJ='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -16358,10 +16510,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -16391,7 +16543,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_GCJ='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_GCJ='-Wl,'
@@ -16410,6 +16562,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static_GCJ='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -16419,6 +16587,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_GCJ='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static_GCJ='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic_GCJ='-KPIC'
       lt_prog_compiler_static_GCJ='-Bstatic'
@@ -16471,22 +16643,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_GCJ"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_pic_works_GCJ=no
+  lt_cv_prog_compiler_pic_works_GCJ=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -16497,27 +16669,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16500: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16672: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16504: \$? = $ac_status" >&5
+   echo "$as_me:16676: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_GCJ=yes
+       lt_cv_prog_compiler_pic_works_GCJ=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
     case $lt_prog_compiler_pic_GCJ in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
@@ -16542,15 +16714,15 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_static_works_GCJ=no
+  lt_cv_prog_compiler_static_works_GCJ=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -16560,37 +16732,37 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_GCJ=yes
+         lt_cv_prog_compiler_static_works_GCJ=yes
        fi
      else
-       lt_prog_compiler_static_works_GCJ=yes
+       lt_cv_prog_compiler_static_works_GCJ=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
 
-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
     :
 else
     lt_prog_compiler_static_GCJ=
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_GCJ=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -16601,11 +16773,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16604: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16776: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16608: \$? = $ac_status" >&5
+   echo "$as_me:16780: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16627,34 +16799,34 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag_GCJ=
@@ -16685,12 +16857,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -16749,7 +16922,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs_GCJ=no
@@ -16797,7 +16970,7 @@ EOF
       allow_undefined_flag_GCJ=unsupported
       always_export_symbols_GCJ=no
       enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -16815,7 +16988,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct_GCJ=no
       hardcode_shlibpath_var_GCJ=no
       hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
@@ -16830,7 +17003,7 @@ EOF
       archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -16848,13 +17021,22 @@ EOF
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	ld_shlibs_GCJ=no
@@ -16959,7 +17141,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -16979,7 +17161,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -17013,7 +17195,7 @@ _LT_EOF
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct_GCJ=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct_GCJ=unsupported
@@ -17074,48 +17256,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -17149,48 +17326,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -17236,31 +17408,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_GCJ='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_GCJ=yes
       ;;
 
     darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
+      allow_undefined_flag_GCJ="$_lt_dar_allow_undefined"
       archive_cmds_need_lc_GCJ=no
       hardcode_direct_GCJ=no
       hardcode_automatic_GCJ=yes
@@ -17269,19 +17423,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs_GCJ=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -17321,7 +17474,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_GCJ='-R$libdir'
       hardcode_direct_GCJ=yes
@@ -17443,24 +17596,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     openbsd*)
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_GCJ='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_GCJ=yes
+	hardcode_shlibpath_var_GCJ=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_GCJ='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_GCJ='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs_GCJ=no
       fi
       ;;
 
@@ -17519,17 +17676,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs_GCJ=yes
       ;;
@@ -17586,7 +17742,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag_GCJ='${wl}-z,text'
       archive_cmds_need_lc_GCJ=no
       hardcode_shlibpath_var_GCJ=no
@@ -17639,8 +17795,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+$as_echo "$ld_shlibs_GCJ" >&6; }
 test "$ld_shlibs_GCJ" = no && can_build_shared=no
 
 #
@@ -17660,15 +17816,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -17686,7 +17842,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_GCJ=no
@@ -17698,16 +17854,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -17721,20 +17877,7 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -17752,7 +17895,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -17891,12 +18034,7 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -17913,18 +18051,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -17962,7 +18088,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -18025,7 +18151,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -18080,7 +18206,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -18096,7 +18222,7 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -18109,18 +18235,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -18202,6 +18316,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -18294,17 +18412,32 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_GCJ=
 if test -n "$hardcode_libdir_flag_spec_GCJ" || \
    test -n "$runpath_var_GCJ" || \
@@ -18328,8 +18461,8 @@ else
   # directories.
   hardcode_action_GCJ=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+$as_echo "$hardcode_action_GCJ" >&6; }
 
 if test "$hardcode_action_GCJ" = relink; then
   # Fast installation is not supported
@@ -18381,6 +18514,7 @@ if test -f "$ltmain"; then
     predeps_GCJ \
     postdeps_GCJ \
     compiler_lib_search_path_GCJ \
+    compiler_lib_search_dirs_GCJ \
     archive_cmds_GCJ \
     archive_expsym_cmds_GCJ \
     postinstall_cmds_GCJ \
@@ -18396,6 +18530,7 @@ if test -f "$ltmain"; then
     module_cmds_GCJ \
     module_expsym_cmds_GCJ \
     lt_cv_prog_compiler_c_o_GCJ \
+    fix_srcfile_path_GCJ \
     exclude_expsyms_GCJ \
     include_expsyms_GCJ; do
 
@@ -18628,6 +18763,10 @@ predeps=$lt_predeps_GCJ
 # shared library.
 postdeps=$lt_postdeps_GCJ
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
@@ -18716,7 +18855,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_GCJ
@@ -18773,7 +18912,7 @@ objext=o
 objext_RC=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
 lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -18792,16 +18931,16 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -18861,6 +19000,7 @@ if test -f "$ltmain"; then
     predeps_RC \
     postdeps_RC \
     compiler_lib_search_path_RC \
+    compiler_lib_search_dirs_RC \
     archive_cmds_RC \
     archive_expsym_cmds_RC \
     postinstall_cmds_RC \
@@ -18876,6 +19016,7 @@ if test -f "$ltmain"; then
     module_cmds_RC \
     module_expsym_cmds_RC \
     lt_cv_prog_compiler_c_o_RC \
+    fix_srcfile_path_RC \
     exclude_expsyms_RC \
     include_expsyms_RC; do
 
@@ -19108,6 +19249,10 @@ predeps=$lt_predeps_RC
 # shared library.
 postdeps=$lt_postdeps_RC
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_RC
@@ -19196,7 +19341,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_RC
@@ -19240,8 +19385,8 @@ CC="$lt_save_CC"
 	;;
 
       *)
-	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
+	{ { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
+$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
    { (exit 1); exit 1; }; }
 	;;
       esac
@@ -19260,8 +19405,8 @@ echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
     chmod +x "$ofile"
   else
     rm -f "${ofile}T"
-    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
+    { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
+$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -19319,10 +19464,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -19333,9 +19478,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -19346,11 +19491,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -19359,10 +19504,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -19373,9 +19518,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -19386,11 +19531,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -19398,10 +19543,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -19416,10 +19561,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -19430,9 +19575,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -19443,11 +19588,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -19456,10 +19601,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -19471,13 +19616,13 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -19500,11 +19645,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -19515,10 +19660,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -19529,9 +19674,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -19542,11 +19687,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -19559,10 +19704,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -19573,9 +19718,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -19586,11 +19731,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -19602,10 +19747,10 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -19617,50 +19762,54 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -19686,37 +19835,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -19726,15 +19859,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -19761,37 +19898,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -19816,37 +19937,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -19872,37 +19977,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -19917,8 +20006,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -19934,10 +20023,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -20008,37 +20097,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -20054,15 +20127,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -20085,11 +20158,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -20108,7 +20182,7 @@ case $as_dir/ in
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -20118,17 +20192,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -20141,8 +20227,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -20154,10 +20240,10 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -20184,37 +20270,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -20306,37 +20376,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -20350,20 +20423,21 @@ fi
 
 for ac_header in fcntl.h unistd.h string.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -20379,49 +20453,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -20435,76 +20493,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -20513,27 +20567,72 @@ done
 
 
 if test "$cross_compiling" = "no"; then
-  { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+
+ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_c_bigendian=unknown
+    # See if __BIG_ENDIAN__ or __LITTLE_ENDIAN__ is defined.
+       cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#if ! (defined __BIG_ENDIAN__ || defined __LITTLE_ENDIAN__)
+	       neither is defined;
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_bigendian=universal
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+	     #include <sys/param.h>
 
 int
 main ()
 {
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
 
   ;
   return 0;
@@ -20545,50 +20644,34 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+		#include <sys/param.h>
 
 int
 main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+		 not big endian
+		#endif
 
   ;
   return 0;
@@ -20600,37 +20683,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_bigendian=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_bigendian=no
@@ -20638,29 +20705,31 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
-  # try to guess the endianness by grepping values into an object file
-  ac_cv_c_bigendian=unknown
-  cat >conftest.$ac_ext <<_ACEOF
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+#include <limits.h>
+
 int
 main ()
 {
- _ascii (); _ebcdic ();
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
   ;
   return 0;
 }
@@ -20671,47 +20740,139 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_bigendian=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c_bigendian=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then
+  # Try to guess by grepping values from an object file.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-  ac_cv_c_bigendian=yes
-fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$ac_cv_c_bigendian" = unknown; then
-    ac_cv_c_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    ac_cv_c_bigendian=unknown
-  fi
-fi
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -20730,14 +20891,14 @@ int
 main ()
 {
 
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long int l;
-    char c[sizeof (long int)];
-  } u;
-  u.l = 1;
-  return u.c[sizeof (long int) - 1] == 1;
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
 
   ;
   return 0;
@@ -20749,55 +20910,57 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_c_bigendian=yes
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
+    fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
-case $ac_cv_c_bigendian in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     cat >>confdefs.h <<\_ACEOF
 #define WORDS_BIGENDIAN 1
 _ACEOF
- ;;
-  no)
-     ;;
-  *)
-    { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+;; #(
+   no)
+      ;; #(
+   universal)
+      ;; #(
+   *)
+     { { $as_echo "$as_me:$LINENO: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+$as_echo "$as_me: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
    { (exit 1); exit 1; }; } ;;
-esac
+ esac
 
 else
 
@@ -20806,10 +20969,10 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 fi
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -20825,10 +20988,10 @@ main ()
 #ifndef __cplusplus
   /* Ultrix mips cc rejects this.  */
   typedef int charset[2];
-  const charset x;
+  const charset cs;
   /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *ccp;
-  char **p;
+  char const *const *pcpcc;
+  char **ppc;
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
   static struct point const zero = {0,0};
@@ -20837,11 +21000,11 @@ main ()
      an arm of an if-expression whose if-part is not a constant
      expression */
   const char *g = "string";
-  ccp = &g + (g ? g-g : 0);
+  pcpcc = &g + (g ? g-g : 0);
   /* HPUX 7.0 cc rejects these. */
-  ++ccp;
-  p = (char**) ccp;
-  ccp = (char const *const *) p;
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
   { /* SCO 3.2v4 cc rejects this.  */
     char *t;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
@@ -20868,7 +21031,7 @@ main ()
     const int foo = 10;
     if (!foo) return 0;
   }
-  return !x[0] && !zero.x;
+  return !cs[0] && !zero.x;
 #endif
 
   ;
@@ -20881,37 +21044,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_const=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_const=no
@@ -20919,36 +21066,34 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF
-#define const
+#define const /**/
 _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
+$as_echo_n "checking for off_t... " >&6; }
 if test "${ac_cv_type_off_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_off_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef off_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+if (sizeof (off_t))
+       return 0;
   ;
   return 0;
 }
@@ -20959,46 +21104,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((off_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_off_t=yes
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_off_t=no
+	ac_cv_type_off_t=yes
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+$as_echo "$ac_cv_type_off_t" >&6; }
 if test $ac_cv_type_off_t = yes; then
   :
 else
@@ -21009,26 +21180,24 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+$as_echo_n "checking for size_t... " >&6; }
 if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_size_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef size_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+if (sizeof (size_t))
+       return 0;
   ;
   return 0;
 }
@@ -21039,46 +21208,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((size_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_size_t=yes
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_type_size_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_size_t=no
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+$as_echo "$ac_cv_type_size_t" >&6; }
 if test $ac_cv_type_size_t = yes; then
   :
 else
@@ -21091,10 +21286,10 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for working memcmp" >&5
-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5
+$as_echo_n "checking for working memcmp... " >&6; }
 if test "${ac_cv_func_memcmp_working+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_func_memcmp_working=no
@@ -21144,36 +21339,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_memcmp_working=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_func_memcmp_working=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
+$as_echo "$ac_cv_func_memcmp_working" >&6; }
 test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
   *" memcmp.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
@@ -21185,20 +21383,21 @@ esac
 
 for ac_header in stdlib.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -21214,49 +21413,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -21270,76 +21453,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -21349,11 +21528,11 @@ done
 
 for ac_func in getpagesize
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -21406,60 +21585,50 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
-{ echo "$as_me:$LINENO: checking for working mmap" >&5
-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for working mmap" >&5
+$as_echo_n "checking for working mmap... " >&6; }
 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_func_mmap_fixed_mapped=no
@@ -21499,21 +21668,21 @@ $ac_includes_default
 #include <fcntl.h>
 #include <sys/mman.h>
 
-#if !STDC_HEADERS && !HAVE_STDLIB_H
+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
 char *malloc ();
 #endif
 
 /* This mess was copied from the GNU getpagesize.h.  */
-#if !HAVE_GETPAGESIZE
+#ifndef HAVE_GETPAGESIZE
 /* Assume that all systems that can run configure have sys/param.h.  */
-# if !HAVE_SYS_PARAM_H
+# ifndef HAVE_SYS_PARAM_H
 #  define HAVE_SYS_PARAM_H 1
 # endif
 
 # ifdef _SC_PAGESIZE
 #  define getpagesize() sysconf(_SC_PAGESIZE)
 # else /* no _SC_PAGESIZE */
-#  if HAVE_SYS_PARAM_H
+#  ifdef HAVE_SYS_PARAM_H
 #   include <sys/param.h>
 #   ifdef EXEC_PAGESIZE
 #    define getpagesize() EXEC_PAGESIZE
@@ -21603,36 +21772,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_func_mmap_fixed_mapped=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
+$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -21653,11 +21825,11 @@ fi
 
 for ac_func in memmove bcopy
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -21710,51 +21882,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -21790,11 +21952,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -21827,12 +21990,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -21848,7 +22011,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -21861,11 +22024,12 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -21878,24 +22042,28 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
 
 
 # PATH needs CR
@@ -21906,17 +22074,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -21932,8 +22128,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -21956,7 +22150,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -21969,17 +22163,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -22001,7 +22188,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -22052,7 +22239,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -22080,7 +22267,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -22093,19 +22279,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -22119,19 +22308,28 @@ else
   as_mkdir_p=false
 fi
 
-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -22147,7 +22345,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -22160,14 +22358,14 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -22175,14 +22373,14 @@ current configuration.
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
+  -V, --version    print version number and configuration settings, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+                   instantiate the configuration file FILE
   --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -22193,24 +22391,24 @@ $config_headers
 Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.60,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.62,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -22232,30 +22430,36 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
+    { $as_echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -22274,30 +22478,32 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -22308,8 +22514,8 @@ do
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
     "lib/expat.h") CONFIG_FILES="$CONFIG_FILES lib/expat.h" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -22349,155 +22555,143 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
 
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-target!$target$ac_delim
-target_cpu!$target_cpu$ac_delim
-target_vendor!$target_vendor$ac_delim
-target_os!$target_os$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LN_S!$LN_S$ac_delim
-ECHO!$ECHO$ac_delim
-AR!$AR$ac_delim
-RANLIB!$RANLIB$ac_delim
-STRIP!$STRIP$ac_delim
-DLLTOOL!$DLLTOOL$ac_delim
-AS!$AS$ac_delim
-OBJDUMP!$OBJDUMP$ac_delim
-CPP!$CPP$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-F77!$F77$ac_delim
-FFLAGS!$FFLAGS$ac_delim
-ac_ct_F77!$ac_ct_F77$ac_delim
-LIBTOOL!$LIBTOOL$ac_delim
-blddir!$blddir$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-EXPAT_MAJOR_VERSION!$EXPAT_MAJOR_VERSION$ac_delim
-EXPAT_MINOR_VERSION!$EXPAT_MINOR_VERSION$ac_delim
-EXPAT_EDIT!$EXPAT_EDIT$ac_delim
-LIBCURRENT!$LIBCURRENT$ac_delim
-LIBREVISION!$LIBREVISION$ac_delim
-LIBAGE!$LIBAGE$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-FILEMAP_OBJ!$FILEMAP_OBJ$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+  print line
+}
+
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -22513,19 +22707,133 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    prefix = substr(line, 1, index(line, defundef) - 1)
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", line, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -22554,26 +22862,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -22583,7 +22903,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -22609,7 +22929,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -22618,7 +22938,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -22639,17 +22959,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -22689,12 +23009,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -22703,13 +23024,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -22723,15 +23045,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -22741,119 +23064,58 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
  ;;
 
 
@@ -22867,6 +23129,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -22888,4 +23155,8 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
diff --git a/srclib/apr-util/xml/expat/conftools/ltmain.sh b/srclib/apr-util/xml/expat/conftools/ltmain.sh
index 06823e05..27d498a0 100644
--- a/srclib/apr-util/xml/expat/conftools/ltmain.sh
+++ b/srclib/apr-util/xml/expat/conftools/ltmain.sh
@@ -1,8 +1,8 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008  Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This program is free software; you can redistribute it and/or modify
@@ -43,14 +43,22 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+VERSION=1.5.26
+TIMESTAMP=" (1.1220.2.492 2008/01/30 06:40:56)"
+
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
@@ -105,11 +113,19 @@ esac
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
+lt_env=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+	  save_$lt_var=\$$lt_var
+	  lt_env=\"$lt_var=\$$lt_var \$lt_env\"
+	  $lt_var=C
+	  export $lt_var
+	fi"
+done
+
+if test -n "$lt_env"; then
+  lt_env="env $lt_env"
 fi
 
 # Make sure IFS has a sensible default
@@ -136,6 +152,8 @@ duplicate_deps=no
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -196,7 +214,13 @@ func_win32_libid ()
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
       $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
-	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+	$SED -n -e '1,100{
+		/ I /{
+			s,.*,import,
+			p
+			q
+			}
+		}'`
       case $win32_nmres in
       import*)  win32_libid_type="x86 archive import";;
       *)        win32_libid_type="x86 archive static";;
@@ -327,7 +351,17 @@ func_extract_archives ()
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  extracted_serial=`expr $extracted_serial + 1`
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -454,11 +488,12 @@ do
     ;;
 
   --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+    echo "\
+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
+Copyright (C) 2008  Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     exit $?
     ;;
 
@@ -755,9 +790,11 @@ if test -z "$show_help"; then
     *.class) xform=class ;;
     *.cpp) xform=cpp ;;
     *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
+    *.[fF][09]?) xform=[fF][09]. ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
+    *.obj) xform=obj ;;
+    *.sx) xform=sx ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -926,7 +963,7 @@ EOF
       $run $rm "$lobj" "$output_obj"
 
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
 	test -n "$output_obj" && $run $rm $removelist
 	exit $EXIT_FAILURE
@@ -998,7 +1035,7 @@ EOF
       command="$command$suppress_output"
       $run $rm "$obj" "$output_obj"
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
 	$run $rm $removelist
 	exit $EXIT_FAILURE
@@ -1131,6 +1168,7 @@ EOF
     thread_safe=no
     vinfo=
     vinfo_number=no
+    single_module="${wl}-single_module"
 
     func_infer_tag $base_compile
 
@@ -1138,8 +1176,9 @@ EOF
     for arg
     do
       case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1147,12 +1186,20 @@ EOF
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	else
+	  ;;
+	-static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	fi
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1600,13 +1647,18 @@ EOF
 	continue
 	;;
 
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	compiler_flags="$compiler_flags $arg"
 	compile_command="$compile_command $arg"
 	finalize_command="$finalize_command $arg"
 	continue
 	;;
 
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
       -module)
 	module=yes
 	continue
@@ -1620,10 +1672,11 @@ EOF
       # -m* pass through architecture-specific compiler args for GCC
       # -m*, -t[45]*, -txscale* pass through architecture-specific
       # compiler args for GCC
-      # -pg pass through profiling flag for GCC
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
       # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-      -t[45]*|-txscale*|@*)
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
@@ -1651,9 +1704,9 @@ EOF
 
       -no-install)
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
 	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
+	  # and Darwin in order for the loader to find any dlls it needs.
 	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
 	  fast_install=no
@@ -1712,7 +1765,7 @@ EOF
 	continue
 	;;
 
-      -static)
+      -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2094,7 +2147,7 @@ EOF
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -2109,7 +2162,12 @@ EOF
 	    continue
 	  fi
 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
 	    for search_ext in .la $std_shrext .so .a; do
 	      # Search the libtool library
 	      lib="$searchdir/lib${name}${search_ext}"
@@ -2490,7 +2548,9 @@ EOF
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+	     { { test "$prefer_static_libs" = no ||
+		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -2903,12 +2963,18 @@ EOF
 		  # we do not want to link against static libs,
 		  # but need to link against shared
 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		  if test -n "$deplibrary_names" ; then
 		    for tmp in $deplibrary_names ; do
 		      depdepl=$tmp
 		    done
-		    if test -f "$path/$depdepl" ; then
+		    if test -f "$deplibdir/$depdepl" ; then
+		      depdepl="$deplibdir/$depdepl"
+	      	    elif test -f "$path/$depdepl" ; then
 		      depdepl="$path/$depdepl"
+		    else
+		      # Can't find it, oh well...
+		      depdepl=
 		    fi
 		    # do not add paths which are already there
 		    case " $newlib_search_path " in
@@ -3056,9 +3122,10 @@ EOF
 
     case $linkmode in
     oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@@ -3186,7 +3253,7 @@ EOF
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows)
+	  darwin|linux|osf|windows|none)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3197,9 +3264,10 @@ EOF
 	    age="0"
 	    ;;
 	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
+	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_minor"
+	    lt_irix_increment=no
 	    ;;
 	  esac
 	  ;;
@@ -3258,7 +3326,8 @@ EOF
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
 	  minor_current=`expr $current + 1`
-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
 	  ;;
 
 	freebsd-aout)
@@ -3272,8 +3341,11 @@ EOF
 	  ;;
 
 	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    major=`expr $current - $age`
+	  else
+	    major=`expr $current - $age + 1`
+	  fi
 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
@@ -3410,11 +3482,11 @@ EOF
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      done
+      #for path in $notinst_path; do
+      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3515,13 +3587,12 @@ EOF
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
+              if test "$name" != "" && test "$name" != "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3560,9 +3631,7 @@ EOF
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		$LTCC $LTCFLAGS -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3594,7 +3663,7 @@ EOF
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -3880,7 +3949,10 @@ EOF
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
 	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	      case $archive_cmds in
+	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
+	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
+	      esac
 	    else
 	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
 	    fi
@@ -4190,9 +4262,10 @@ EOF
       ;;
 
     obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@@ -4239,12 +4312,14 @@ EOF
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4692,16 +4767,16 @@ static const void *lt_preloaded_setup() {
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
             else
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
             ;;
           esac
 	  ;;
@@ -4716,13 +4791,13 @@ static const void *lt_preloaded_setup() {
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4884,7 @@ static const void *lt_preloaded_setup() {
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4846,7 +4921,7 @@ static const void *lt_preloaded_setup() {
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       fi
 
       # Quote $echo for shipping.
@@ -5253,6 +5328,20 @@ EOF
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5484,7 @@ else
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      \$echo \"\$0: cannot exec \$program \$*\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5581,7 +5670,7 @@ fi\
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5926,9 +6015,9 @@ relink_command=\"$relink_command\""
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
 	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6226,7 @@ relink_command=\"$relink_command\""
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6348,8 +6437,10 @@ relink_command=\"$relink_command\""
 	if test -f "$dir/$objdir/$dlname"; then
 	  dir="$dir/$objdir"
 	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
+	  if test ! -f "$dir/$dlname"; then
+	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
 	fi
 	;;
 
@@ -6413,12 +6504,12 @@ relink_command=\"$relink_command\""
       fi
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+		$lt_var=\$save_$lt_var; export $lt_var
+	      fi"
+      done
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6775,9 +6866,9 @@ The following components of LINK-COMMAND are treated specially:
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6791,9 +6882,11 @@ The following components of LINK-COMMAND are treated specially:
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 
diff --git a/srclib/apr-util/xml/expat/lib/expat.dsp b/srclib/apr-util/xml/expat/lib/expat.dsp
index 71e41dfc..71aae06b 100644
--- a/srclib/apr-util/xml/expat/lib/expat.dsp
+++ b/srclib/apr-util/xml/expat/lib/expat.dsp
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll
 # Begin Special Build Tool
 TargetPath=.\Release\expat.dll
 SOURCE="$(InputPath)"
@@ -83,8 +83,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /pdbtype:sept
 # Begin Special Build Tool
 TargetPath=.\Debug\expat.dll
 SOURCE="$(InputPath)"
@@ -111,7 +111,7 @@ SOURCE=.\xmlparse.c
 
 !ELSEIF  "$(CFG)" == "expat - Win32 Debug"
 
-# ADD CPP /GX- /Od /D VERSION=\"expat_1.95.2\"
+# ADD CPP /EHsc- /Od /D VERSION=\"expat_1.95.2\"
 
 !ENDIF 
 
diff --git a/srclib/apr-util/xml/expat/lib/xmlparse.c b/srclib/apr-util/xml/expat/lib/xmlparse.c
index 049f06f9..43eb307f 100644
--- a/srclib/apr-util/xml/expat/lib/xmlparse.c
+++ b/srclib/apr-util/xml/expat/lib/xmlparse.c
@@ -3428,7 +3428,6 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, int isCdata,
       if (!poolAppend(pool, enc, ptr, next))
 	return XML_ERROR_NO_MEMORY;
       break;
-      break;
     case XML_TOK_TRAILING_CR:
       next = ptr + enc->minBytesPerChar;
       /* fall through */
diff --git a/srclib/apr/CHANGES b/srclib/apr/CHANGES
index bb9c989b..3256dd15 100644
--- a/srclib/apr/CHANGES
+++ b/srclib/apr/CHANGES
@@ -1,39 +1,77 @@
                                                      -*- coding: utf-8 -*-
-Changes for APR 1.2.12
+Changes for APR 1.3.0
 
-  *) Numerous fixes to the test/ framework, including better handling of
-     long size_t comparisons and more consistent Makefile.(in|win) setup
-     for authoring new tests.  [William Rowe]
+  *) Fix Solaris poll failure.  PR 43000
+     [Henry Jen <henryjen ztune.net>]
 
-  *) Win32 build fixes including a Makefile.win scheme, fixes for 64P
-     model x86_64 compiles and VC8 builds.  [William Rowe]
+  *) apr_getservbyname(): Use proper method for converting port
+     to host byte order.  PR 44903.
+     [Chris Taylor <ctaylor wadeford.plus.com>]
 
-  *) Fix --disable-ipv6 build on platforms with getifaddrs().
-     PR 39199.  [Joe Orton]
+  *) Use /dev/urandom in preference to /dev/random as entropy source
+     for apr_generate_random_bytes.  PR 44881.  [Bojan Smojver]
 
-  *) Fix DSO-related crash on z/OS caused by incorrect memory
-     allocation.  [David Jones <oscaremma gmail.com>]
+  *) Implement apr_proc_wait_all_procs for windows.
+     The implementation uses tool help library present
+     on Windows 2000 and later. APR_ENOTIMPL is returned
+     on platforms missing tool help from kernel32.dll.
+     [Mladen Turk]
 
-  *) Define apr_ino_t in such a way that it doesn't change definition
-     based on the library consumer's -D'efines to the filesystem.
-     [Lucian Adrian Grijincu <lucian.grijincu gmail.com>]
+  *) Introduce apr_pool_pre_cleanup_register() for registering
+     a cleanup that is called before any subpool is destroyed
+     within apr_pool_clear or apr_pool_destroy.
+     This allows to register a cleanup that will notify subpools
+     about its inevitable destruction.
+     [Mladen Turk]
 
-  *) Implement apr_atomic_casptr() for z/OS.
-     [David Jones <oscaremma gmail.com>]
+  *) Introduce apr_pool_create_core_ex() for creation of standalone
+     pools without parent. This function should be used for short
+     living pools, usually ones that are created and destroyed
+     either in a loop or inside function call. Since the pools
+     created with this function doesn't have a parent they must
+     be explicitly destroyed when done.
+     [Mladen Turk]
 
-  *) Fill in apr_fileinfo_t member st_csize on Netware and Unix (PR 41678),
-     and refine the file times down to apr_time_t resolution if supported
-     by a st_atimensec or st_atim.tv_nsec value by the OS.  Additional
-     msec implementations are possible if exposed through autoconf.
-     [William Rowe, Nicklas Edmundsson <nikke acc.umu.se>]
+  *) Fix return value when apr_pollset_poll interrupted.
+     PR 42580 [Basant Kumar Kukreja <basant.kukreja sun.com>]
+
+  *) Add missing semi-colon in Win9x code path of apr_file_open that breaks
+     Win9X Debug builds. PR 44329. [Curt Arnold]
+
+  *) z/OS: return standard apr_status_t codes from apr_dso_load()
+     and apr_dso_sym().  [David Jones <oscaremma gmail.com>]
+
+  *) Fix the make test target in the spec file. [Graham Leggett]
+
+  *) Fix DSO-related crash on z/OS caused by incorrect memory
+     allocation.  [David Jones <oscaremma gmail.com>]
 
-  *) Fix apr_socket_recvfrom() to ensure the peer's port and address
-     is returned through the "from" parameter on Unix and Win32.  
-     [Joe Orton, William Rowe]
+  *) Implement Darwin-semantic (9.0.0 and later) sendfile support.
+     Use writev in lieu of hdtr vecs since how Darwin counts the
+     data is undocumented. [Geoff Greer <angryparsley mipsisrisc.com>,
+     William Rowe, Jim Jagielski]
+
+  *) Implemented the APR_FOPEN_SPARSE flag, permits win32 to create
+     sparse data files.  Also bestow apr_fileinfo_t csize field for
+     Windows versions 2000 and later, which helps in the detection
+     that a sparse file is truly in use (see test/testlfs.c for an
+     example, because different filesystems can vary in behavior
+     even on an OS supporting sparse files).  [William Rowe]
+
+  *) Corrected for Darwin and others to toggle APR_HAS_LARGE_FILES
+     where large off_t's are enabled without any extra defines, hints
+     or additional functions.  This is binary compatible, but apps
+     may need to be recompiled to take full advantage depending on how
+     they detect this feature.  [William Rowe]
+
+  *) Implement apr_atomic_casptr() and apr_atomic_xchgptr() for z/OS.
+     [David Jones <oscaremma gmail.com>]
 
-  *) The WIN32 cleanup routine for shared memory segments could wrongly
-     return unknown errors and leak a open handle.
-     [Joe Mudd <Joe.Mudd sas.com>]
+  *) Introduce apr_file_pipe_create_ex() to portably permit one pipe
+     end or another to be entirely blocking for non-APR applications
+     (e.g. stdio streams) and the other (or both ends) non blocking,
+     with a timeout of 0 by default.
+     [William Rowe]
 
   *) apr_procattr_io_set() on Windows: Set non-blocking pipe handles
      to a default timeout of 0, following the Unix default.  No effect
@@ -41,35 +79,15 @@ Changes for APR 1.2.12
      [Eric Covener <covener gmail.com>]
 
   *) apr_file_write() on Windows: Fix return code when writing to a non-
-     blocking pipe would have blocked.  PR 43563.
+     blocking pipe would have blocked.  PR 43563. 
      [Eric Covener <covener gmail.com>]
 
-  *) Cause apr_file_dup2() on Win32 to update the MSVCRT psuedo-stdio
-     handles for fd-based and FILE * based I/O.  [William Rowe]
-
-  *) Revert Win32 to the 1.2.8 behavior of apr_proc_create() for any 
-     of the three stdio streams which are not initialized, through either
-     apr_procattr_io_set() or apr_procattr_child_XXX_set(), when given a
-     procattr_t with one or two streams which were initialized through
-     apr_procattr_child_XXX_set().  Once again, these do not inherit the 
-     parent process stdio stream to WIN32 child processes (passing 
-     INVALID_HANDLE_VALUE instead) as on Unix.  Note APR 1.3.0 adopts 
-     the Unix behavior of inheriting any uninitialized streams as the 
-     parent's corresponding stdio stream, in such cases.  [William Rowe]
-
-Changes for APR 1.2.11
-
-  *) Fix handling of EINTR from read() in apr_generate_random_bytes()
-     on platforms with /dev/random.  PR 39790.  [Joe Orton]
-
-  *) Win32 apr_file_read: Correctly handle completion-based read-to-EOF.
-     [Steven Naim <steven.naim googlemail.com>]
-
-  *) Fixed Win32 regression of stdout inheritance in apr_proc_create.
+  *) Introduce APR_NO_FILE as an option to apr_procattr_io_set() for any 
+     of the three stdio streams to cause the corresponding streams to be 
+     closed to the child process.  This becomes effective in 1.3.0 across
+     platforms (equivilant to APR_NO_PIPE in 1.2.x except on Win32.)
      [William Rowe]
 
-Changes for APR 1.2.10
-
   *) Solve WinNT inherited pipe leaks by mutexing apr_proc_create calls,
      on WinNT (not WinCE, nor 9x) so that we toggle the inherited state 
      of the stdin/out/err pipes.  All other file handles are treated as
@@ -77,26 +95,18 @@ Changes for APR 1.2.10
      or while they are used by apr_proc_create.  [William Rowe]
 
   *) Define the Mac OS/X filesystem_encoding as utf-8 (in previous
-     releases the interpretation would vary).  [Erik Huelsmann
-     <ehuels gmail.com>]
-
-  *) Fix day of year (tm_day) calculation for July. The bug only affects
-     Windows builds.  PR 42953.  [Davi Arnaut]
-
-  *) Fix LFS detection when building over NFS. The mode must be
-     specified when O_CREAT is in the flags to open().
-     PR 42821.  [Rainer Jung <rainer.jung kippdata.de>]
+     releases the interpretation would vary).  [Branko ÄŒibej]
 
-  *) Avoid overwriting the hash_mutex table for applications that
-     incorrectly calls apr_atomic_init().  PR 42760.  [Davi Arnaut]
-
-  *) Allow IPv6 connectivity test to fail, avoiding a potentially fatal
-     error.  [Davi Arnaut]
+  *) Add table cloning (deep copy) convenience function.
+     [Davi Arnaut]
 
-  *) The MinGW Windows headers effectively redefines WINADVAPI from
-     __stdcall to empty which results in a link failure when wincrypt.h
-     is placed after an include to apr_private.h.
-     PR 42293.  [Curt Arnold]
+  *) Rework the WIN32 CV code to signal the condition only if one or
+     more threads are blocked on the condition variable. If no threads
+     are waiting on the condition variable, nothing happens. The change
+     also eliminates the thundering-herd problem of the manual-reset
+     event, which (theoretically) wakes up all threads waiting on. Now
+     the behavior of the CV's should be the same on Unix and win32
+     platforms. PR 42305.  [Davi Arnaut]
 
   *) Define SEM_FAILED if it isn't already defined, as the proc mutex
      code already does it. Also search for the sem_open function in
@@ -104,11 +114,9 @@ Changes for APR 1.2.10
      [Davi Arnaut]
 
   *) Define the _HPUX_SOURCE feature test macro to obtain maximum
-     functionality. Fixes broken sendfile with LFS support on HP-UX.
+     functionality.
      PR 42261.  [Davi Arnaut]
 
-Changes for APR 1.2.9
-
   *) Stop invoking the testshm* helpers upon 'make test' invocation.
      [Kurt Miller <kurt intricatesoftware.com>]
 
@@ -117,63 +125,131 @@ Changes for APR 1.2.9
 
   *) Numerous build fixes for non-GCC builds and GCC builds on Win32,
      as well as WinCE builds.  [Davi Arnaut <davi haxent.com.br>,
-     Curt Arnold <carnold apache.org>, John Mark Vandenberg, 
+     Curt Arnold <carnold apache.org>, John Mark Vandenberg,
      Kouhei Sutou <kou cozmixng.org>, William Rowe]
 
   *) Discard file buffers when running cleanups for exec.
      PR 41119.  [Davi Arnaut <davi haxent.com.br>, Bojan Smojver]
 
-  *) If apr_proc_create() fails to exec in the fork()ed child, call
-     _exit() not exit() to avoid running atexit()-registered functions
-     in the child.  PR 30913.  [Joe Orton]
-
   *) Improve thread safety of assorted file_io functions.
      PR 42400.  [Davi Arnaut <davi haxent.com.br>]
 
-  *) Fix file pointer position calculation in apr_file_writev() on
-     buffered file.  PR 40963.  [Davi Arnaut <davi haxent.com.br>]
-
-  *) Fix formatting of unsigned integers larger than 2^63 in the
-     vformatter/apr_*printf.  PR 42250.  
-     [Wynn Wilkes <wynn bungeelabs.com>]
+  *) Add the apr_pollcb API as an alternative more efficient method
+     of polling sockets, compared to apr_pollset. [Paul Querna]
 
-  *) Fix possible EFAULT failures in apr_socket_sendfile() on 32-bit
-     Solaris with LFS enabled.  PR 39463.  [Joe Orton, Joseph Tam
-     <tam math.ubc.ca>]
+  *) Fix possible crash in apr_pool_initialize() when built with 
+     verbose pool debugging.  PR 41063.  
+     [Peter Steiner <peter.steiner+apache hugwi.ch>]
 
-  *) Fix deadlock in apr_file_gets() for a file opened with both the
-     APR_BUFFERED and APR_XTHREAD flags.  [Bojan Smojver, Joe Orton]
-
-Changes for APR 1.2.8
+  *) Fix --disable-ipv6 build on platforms with getifaddrs().
+     PR 39199.  [Joe Orton]
 
   *) Correctly retrieve 'empty' environment values with apr_env_get
      on Win32 (e.g. "VAR="), and added validation to testall suite.  
      PR 40764.  [Issac Goldstand <margol beamartyr.net>]
 
-  *) APR_FIND_APR macro no longer checks /usr/local/apache2/.
-     PR 40842.  [Colm MacCárthaigh]
-
   *) Portably check for EEXIST in mktemp code.  PR 40818
      [Kenneth Golomb <KGolomb TradeCard.com>]
 
-  *) Fix apr_snprintf/apr_vsnprintf return value to not count the
-     NUL terminator in the overflow case.  PR 39996.
-     [Michal Luczaj <regenrecht o2.pl>]
+  *) Fix apr_socket_recvfrom() to ensure the peer's address is returned
+     through the "from" parameter.  [Joe Orton]
+
+  *) Fix error checking in kqueue, epoll and event port versions of
+     apr_pollset_create.  PR 40660, 40661, 40662
+     [Larry Cipriani <lvc lucent.com>]
+
+  *) Add some documentation on the format matched by apr_fnmatch.
+     [David Glasser <glasser mit.edu>]
+
+  *) Add apr_hash_clear.  [Daniel L. Rall <dlr apache.org>]
+
+  *) Don't try to build apr_app.c on MinGW.
+     [Matthias Miller <Blog outofhanwell.com>]
+
+  *) Fix the timeout converstion in apr_pollset with the KQueue
+     backend. [Marco Molteni <mmolteni cisco.com>]
+
+  *) Support MinGW.  [John Vandenberg, Justin Erenkrantz]
+
+  *) Implement apr_thread_yield on Unix in terms of pthread_yield or
+     sched_yield. [Keisuke Nishida <keisuke.nishida gmail.com>]
 
   *) Provide folding in autogenerated .manifest files for Win32 builders
      using VisualStudio 2005  [William Rowe]
 
-  *) Fix detection of pthread cross-process robust mutexes.
-     PR 39833.  [Tsuyoshi SASAMOTO <nazonazo miobox.jp>]
+  *) Utilise Solaris' native atomic_* functions for apr_atomics
+     where appropriate. [Colm MacCárthaigh]
+
+  *) Make apr_socket_recvfrom initialize the port field in the from
+     sockaddr.  PR 39325 [Anthony Minessale <anthmct yahoo.com>]
 
   *) NetBSD: Avoid leaving zombie process when using apr_signal() 
      to ignore SIGCHLD.  PR 36750.  [Todd Vierling <tv pobox.com>]
 
-  *) Fix apr_socket_sendv() for platforms without writev.
-     PR 38822.  [Joe Orton]
+  *) Implement support for apr_proc_mutex_trylock() on Unix platforms.
+     PR 38785.  [Chris Darroch <chrisd pearsoncmg.com>]
+
+  *) APR_FIND_APR macro now supports customisable detailed checks on
+     each installed apr. [Justin Erenkrantz, Colm MacCárthaigh]
+
+  *) APR_FIND_APR macro no longer checks /usr/local/apache2/
+     [Colm MacCárthaigh]
+
+  *) Add APR_POLLSET_NOCOPY option to apr_pollset API to eliminate
+     O(n)-time lookup in apr_pollset_remove() (currently implemented
+     only for epoll).  [Brian Pane]
+
+  *) Add apr_file_buffer_set() and apr_file_buffer_size_get() functions
+     to support variable buffer sizes with APR file handles.
+     [Colm MacCárthaigh]
+
+  *) Add apr_file_open_flags_std[err|out|in]() functions.
+     [Colm MacCárthaigh]
+
+  *) stdio: apr_file_open_std[err|out|in]() functions now set the APR_WRITE
+     or APR_READ flag as appropriate. [Colm MacCárthaigh]
+
+  *) multicast: apr_mcast_*() no longer return APR_ENOTIMPL when invoked
+     for non-UDP/RAW sockets. The caller is expected to ensure that the
+     socket-type is suitable for multicast. [Colm MacCárthaigh]
+
+  *) Add apr_sockaddr_ip_getbuf() function.  [Joe Orton]
+
+  *) Fix handling of %pI in apr_psprintf.  [Joe Orton]
+
+  *) Provide APR_VERSION_AT_LEAST() macro for applications which 
+     want to enable features based on a required level of APR.
+     [Jeff Trawick]
 
-  *) Avoid issues using >2Gb of data per call with sendfile() on
-     64-bit Linux platforms.  [Joe Orton]
+  *) jlibtool: Teach to use static libraries with -static.
+     [Justin Erenkrantz]
+
+  *) Fix checks for alloca() support in configure.  PR 13037.
+     [Noah Misch <noah cs.caltech.edu>]
+
+  *) Add %pm support to apr_snprintf() for printing the error string
+     corresponding to an apr_status_t value.  [Joe Orton]
+
+  *) Add APR_ARRAY_IDX() and APR_ARRAY_PUSH() convenience macros to
+     apr_tables.h.  [Garrett Rooney]
+
+Changes for APR 1.2.12
+
+  *) Define apr_ino_t in such a way that it doesn't change definition
+     based on the library consumer's -D'efines to the filesystem.
+     [Lucian Adrian Grijincu <lucian.grijincu gmail.com>]
+
+  *) Fill in apr_fileinfo_t member st_csize on Netware and Unix (PR 41678),
+     and refine the file times down to apr_time_t resolution if supported
+     by a st_atimensec or st_atim.tv_nsec value by the OS.  Additional
+     msec implementations are possible if exposed through autoconf.
+     [William Rowe, Nicklas Edmundsson <nikke acc.umu.se>]
+
+  *) Fix apr_socket_recvfrom() to ensure the peer's address is returned
+     through the "from" parameter on Win32.  [William Rowe]
+
+  *) Cause apr_file_dup2() on Win32 to update the MSVCRT psuedo-stdio
+     handles for fd-based and FILE * based I/O.  [William Rowe]
 
 Changes for APR 1.2.7
 
diff --git a/srclib/apr/LICENSE b/srclib/apr/LICENSE
index 6f0142f2..02418e19 100644
--- a/srclib/apr/LICENSE
+++ b/srclib/apr/LICENSE
@@ -295,3 +295,47 @@ From strings/apr_strnatcmp.c, include/apr_strings.h:
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 
+From strings/apr_snprintf.c:
+
+  *
+  * cvt - IEEE floating point formatting routines.
+  *       Derived from UNIX V7, Copyright(C) Caldera International Inc.
+  *
+
+  Copyright(C) Caldera International Inc.  2001-2002.  All rights reserved.
+  
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+  Redistributions of source code and documentation must retain the above
+  copyright notice, this list of conditions and the following disclaimer.
+
+  Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+  All advertising materials mentioning features or use of this software
+  must display the following acknowledgement:
+
+     This product includes software developed or owned by  Caldera
+     International, Inc.
+
+  Neither the name of Caldera International, Inc. nor the names of other
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+  USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
+  INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED
+  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+  NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT,
+  INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+
+
diff --git a/srclib/apr/Makefile.in b/srclib/apr/Makefile.in
index fe6ad501..b0bd80f3 100644
--- a/srclib/apr/Makefile.in
+++ b/srclib/apr/Makefile.in
@@ -18,7 +18,7 @@ APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
 INCDIR=./include
 OSDIR=$(top_srcdir)/include/arch/@OSDIR@
 DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include
+INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include
 
 #
 # Macros for target determination
@@ -36,7 +36,9 @@ INSTALL_DATA = @INSTALL_DATA@
 # Rules for building specific targets, starting with 'all' for
 # building the entire package.
 #
-TARGETS = $(TARGET_LIB) export_vars.c apr.exp
+TARGETS = $(TARGET_LIB) apr.exp apr-config.out build/apr_rules.out
+
+LT_VERSION = @LT_VERSION@
 
 # bring in rules.mk for standard functionality
 @INCLUDE_RULES@
@@ -66,7 +68,7 @@ apr-config.out: $(APR_CONFIG)
 build/apr_rules.out: build/apr_rules.mk
 	sed 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
 
-install: $(TARGET_LIB) apr-config.out build/apr_rules.out
+install: $(TARGETS)
 	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
 		     $(DESTDIR)$(libdir)/pkgconfig $(DESTDIR)$(includedir)
 	$(INSTALL_DATA) $(top_blddir)/include/apr.h $(DESTDIR)$(includedir)
@@ -115,7 +117,7 @@ gcov:
 
 test: check
 check: $(TARGET_LIB)
-	(cd test && $(MAKE) check)
+	(cd test && $(MAKE) all check)
 
 etags:
 	etags `find . -name '*.[ch]'`
diff --git a/srclib/apr/Makefile.win b/srclib/apr/Makefile.win
index 51b31652..56d2652b 100644
--- a/srclib/apr/Makefile.win
+++ b/srclib/apr/Makefile.win
@@ -45,7 +45,8 @@ USEDSW=1
 
 PREFIX=..\apr-dist
 
-!IF [$(COMSPEC) /c cl /nologo /? | find "x64" >NUL ] == 0
+!IF [$(COMSPEC) /c cl /nologo /? \
+	| $(SystemRoot)\System32\find.exe "x64" >NUL ] == 0
 ARCH=x64 Release
 !ELSE
 ARCH=Win32 Release
diff --git a/srclib/apr/NOTICE b/srclib/apr/NOTICE
index 129db55a..7df842dd 100644
--- a/srclib/apr/NOTICE
+++ b/srclib/apr/NOTICE
@@ -1,3 +1,6 @@
+Apache Portable Runtime
+Copyright 2008 The Apache Software Foundation.
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
@@ -7,3 +10,6 @@ Illinois at Urbana-Champaign.
 
 This software contains code derived from the RSA Data Security
 Inc. MD5 Message-Digest Algorithm.
+
+This software contains code derived from UNIX V7, Copyright(C)
+Caldera International Inc.
diff --git a/srclib/apr/NWGNUmakefile b/srclib/apr/NWGNUmakefile
index 87ba30a3..c4a0dcf7 100644
--- a/srclib/apr/NWGNUmakefile
+++ b/srclib/apr/NWGNUmakefile
@@ -5,7 +5,7 @@
 SUBDIRS = \
 		build \
 		$(APU_WORK) \
-		$(EOLIST) 
+		$(EOLIST)
 
 #
 # Get the 'head' of the build environment.  This includes default targets and
@@ -106,18 +106,18 @@ endif
 NLM_NAME	= aprlib
 
 #
-# This is used by the link '-desc ' directive. 
+# This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION	= Apache Portability Runtime Library $(VERSION_STR)
+NLM_DESCRIPTION	= Apache Portability Runtime Library $(VERSION_STR) $(VERSION_SKT)
 
 #
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME	= 
+NLM_THREAD_NAME	=
 #
-# If this is specified, it will override VERSION value in 
+# If this is specified, it will override VERSION value in
 # $(APR_WORK)\build\NWGNUenvironment.inc
 #
 NLM_VERSION	=
@@ -125,7 +125,7 @@ NLM_VERSION	=
 #
 # If this is specified, it will override the default of 64K
 #
-NLM_STACK_SIZE	= 
+NLM_STACK_SIZE	=
 
 #
 # If this is specified it will be used by the link '-entry' directive
@@ -146,13 +146,13 @@ NLM_CHECK_SYM	=
 # If this is specified it will be used by the link '-flags' directive
 #
 NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION
- 
+
 #
-# If this is specified it will be linked in with the XDCData option in the def 
-# file instead of the default of $(APR)/misc/netware/apache.xdc.  XDCData can 
+# If this is specified it will be linked in with the XDCData option in the def
+# file instead of the default of $(APR)/misc/netware/apache.xdc.  XDCData can
 # be disabled by setting APACHE_UNIPROC in the environment
 #
-XDCDATA		= 
+XDCDATA		=
 
 #
 # Declare all target files (you must add your files here)
@@ -218,7 +218,7 @@ endif
 # If the nlm has a msg file, put it's path here
 #
 FILE_nlm_msg =
- 
+
 #
 # If the nlm has a hlp file put it's path here
 #
@@ -253,15 +253,15 @@ FILES_nlm_Ximports += \
 	@$(LDAPSDK)/imports/lldapssl.imp \
 	$(EOLIST)
 endif
- 
-#   
+
+#
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
-	@aprlib.imp	\
+	@aprlib.imp \
 	$(EOLIST)
 
-#   
+#
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
@@ -278,6 +278,7 @@ FILES_lib_objs = \
 	$(OBJDIR)/apr_strnatcmp.o \
 	$(OBJDIR)/apr_strtok.o \
 	$(OBJDIR)/apr_tables.o \
+	$(OBJDIR)/buffer.o \
 	$(OBJDIR)/charset.o \
 	$(OBJDIR)/copy.o \
 	$(OBJDIR)/common.o \
@@ -343,7 +344,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
 nlms :: libs $(TARGET_nlm)
 
 #
-# Updated this target to create necessary directories and copy files to the 
+# Updated this target to create necessary directories and copy files to the
 # correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms $(INSTDIRS) FORCE
diff --git a/srclib/apr/README.dev b/srclib/apr/README.dev
index 03fcc0ed..1b5cbccc 100644
--- a/srclib/apr/README.dev
+++ b/srclib/apr/README.dev
@@ -1,30 +1,97 @@
 Apache Portable Runtime
 =======================
 
-If you are building APR from SVN, you need to use a slightly non-standard
-build process.  You must have autoconf and libtool installed for this to
-work.  There are three steps:
 
-1) ./buildconf
-2) ./configure
-3) make
+Using a Subversion Checkout on Unix
+===================================
 
-If you are building APR from a distribution tarball, buildconf will have
-already been run for you, and you therefore do not need to have either
-autoconf or libtool installed, and you do not need to run buildconf.  Skip
-step one above and just run configure then make.
+If you are building APR from SVN, you need to perform a prerequisite
+step.  You must have autoconf, libtool and python installed for this 
+to work.  The prerequisite is simply;
 
-Generating Test Coverage information
+  ./buildconf
+
+If you are building APR from a distribution tarball, buildconf is
+already run for you, and you do not need autoconf, libtool or python
+installed or to run buildconf unless you have patched APR's buildconf 
+inputs (such as configure.in, build.conf, virtually any file within 
+the build/ tree, or you add or remove source files).
+
+Remember when updating from svn that you must rerun ./buildconf again 
+to effect any changes made to the build schema in your fresh update.
+
+
+Configuring and Building APR on Unix
 ====================================
 
+Simply;
+
+   ./configure --prefix=/desired/path/of/apr
+   make
+   make test
+   make install
+
+Configure has additional options, ./configure --help will offer you
+those choices.  You may also add CC=compiler CFLAGS="compiler flags"
+etc. prior to the ./configure statement (on the same line).  Please
+be warned, some flags must be passed as part of the CC command,
+itself, in order for autoconf to make the right determinations. Eg.;
+
+  CC="gcc -m64" ./configure --prefix=/desired/path/of/apr
+
+will inform APR that you are compiling to a 64 bit CPU, and autoconf
+must consider that when setting up all of APR's internal and external
+type declarations.
+
+For more verbose output from testall, you may wish to invoke testall
+with the flag;
+
+   cd test
+   ./testall -v
+
+
+Configuring and Building APR on Windows
+=======================================
+
+Using Visual Studio, you can build and run the test validation of APR.
+The Makefile.win make file has a bunch of documentation about it's
+options, but a trivial build is simply;
+
+  nmake -f Makefile.win 
+  nmake -f Makefile.win PREFIX=c:\desired\path\of\apr install
+
+Note you must manually modify the include\apr.hw file before you
+build to change default options, see the #define APR_HAS_... or the
+#define APR_HAVE_... statements.  Be careful, many of these aren't
+appropriate to be modified.  The most common change is 
+
+#define APR_HAVE_IPV6           1
+
+rather than 0 if this build of APR will be used strictly on machines
+with the IPv6 adapter support installed.
+
+It's trivial to include the apr.dsp (for a static library) or the
+libapr.dsp (for a dynamic library) in your own build project, or you
+can load apr.dsw in Visual Studio 2002 (.NET) or later, which will
+convert these for you into apr.sln and associated .vcproj files.
+
+When using APR as a dynamic library, nothing special is required,
+simply link to libapr.lib.  To use it as a static library, simply 
+define APR_DECLARE_STATIC before you include any apr header files 
+in your source, and link to apr.lib instead.
+
+
+Generating Test Coverage information with gcc
+=============================================
+
 If you want to generate test coverage data, use the following steps:
 
-1) ./buildconf
-2) CFLAGS="-fprofile-arcs -ftest-coverage" ./configure
-3) make
-4) cd test
-5) make
-6) ./testall
-7) cd ..
-8) make gcov
+  ./buildconf
+  CFLAGS="-fprofile-arcs -ftest-coverage" ./configure
+  make
+  cd test
+  make
+  ./testall
+  cd ..
+  make gcov
 
diff --git a/srclib/apr/apr.dsp b/srclib/apr/apr.dsp
index c19e30d7..b8fee388 100644
--- a/srclib/apr/apr.dsp
+++ b/srclib/apr/apr.dsp
@@ -207,6 +207,10 @@ SOURCE=.\dso\win32\dso.c
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\file_io\win32\buffer.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\file_io\unix\copy.c
 # End Source File
 # Begin Source File
diff --git a/srclib/apr/apr.dsw b/srclib/apr/apr.dsw
index 6d67f340..dc0871bb 100644
--- a/srclib/apr/apr.dsw
+++ b/srclib/apr/apr.dsw
@@ -15,7 +15,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "aprapp"=".\build\aprapp.dsp" - Package Owner=<4>
+Project: "apr_app"=".\build\apr_app.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -24,7 +24,7 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name preaprapp
+    Project_Dep_Name apr
     End Project Dependency
 }}}
 
@@ -42,37 +42,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "libaprapp"=".\build\libaprapp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name prelibaprapp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "preaprapp"=".\build\preaprapp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name apr
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "prelibaprapp"=".\build\prelibaprapp.dsp" - Package Owner=<4>
+Project: "libapr_app"=".\build\libapr_app.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/srclib/apr/atomic/netware/apr_atomic.c b/srclib/apr/atomic/netware/apr_atomic.c
index 94a35497..b5d965b0 100644
--- a/srclib/apr/atomic/netware/apr_atomic.c
+++ b/srclib/apr/atomic/netware/apr_atomic.c
@@ -68,3 +68,8 @@ APR_DECLARE(void *) apr_atomic_casptr(volatile void **mem, void *with, const voi
 {
     return (void*)atomic_cmpxchg((unsigned long *)mem,(unsigned long)cmp,(unsigned long)with);
 }
+
+APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with)
+{
+    return (void*)atomic_xchg((unsigned long *)mem,(unsigned long)with);
+}
diff --git a/srclib/apr/atomic/os390/atomic.c b/srclib/apr/atomic/os390/atomic.c
index 3c57668b..1d44ca3d 100644
--- a/srclib/apr/atomic/os390/atomic.c
+++ b/srclib/apr/atomic/os390/atomic.c
@@ -118,3 +118,20 @@ apr_uint32_t apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
     return old;
 }
 
+APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem_ptr, void *new_ptr)
+{
+    void *old_ptr;
+
+    old_ptr = *(void **)mem_ptr; /* old is automatically updated on cs failure */
+#if APR_SIZEOF_VOIDP == 4
+    do {
+    } while (__cs1(&old_ptr, mem_ptr, &new_ptr)); 
+#elif APR_SIZEOF_VOIDP == 8
+    do { 
+    } while (__csg(&old_ptr, mem_ptr, &new_ptr)); 
+#else
+#error APR_SIZEOF_VOIDP value not supported
+#endif /* APR_SIZEOF_VOIDP */
+
+    return old_ptr;
+}
diff --git a/srclib/apr/atomic/unix/apr_atomic.c b/srclib/apr/atomic/unix/apr_atomic.c
deleted file mode 100644
index ed85a429..00000000
--- a/srclib/apr/atomic/unix/apr_atomic.c
+++ /dev/null
@@ -1,409 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr.h"
-#include "apr_atomic.h"
-#include "apr_thread_mutex.h"
-
-#include "apr_private.h"
-
-#include <stdlib.h>
-
-#if defined(__GNUC__) && defined(__STRICT_ANSI__) && !defined(USE_GENERIC_ATOMICS)
-/* force use of generic atomics if building e.g. with -std=c89, which
- * doesn't allow inline asm */
-#define USE_GENERIC_ATOMICS
-#endif
-
-#if (defined(__i386__) || defined(__x86_64__)) \
-    && defined(__GNUC__) && !defined(USE_GENERIC_ATOMICS)
-
-APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, 
-                                           apr_uint32_t with,
-                                           apr_uint32_t cmp)
-{
-    apr_uint32_t prev;
-
-    asm volatile ("lock; cmpxchgl %1, %2"             
-                  : "=a" (prev)               
-                  : "r" (with), "m" (*(mem)), "0"(cmp) 
-                  : "memory", "cc");
-    return prev;
-}
-#define APR_OVERRIDE_ATOMIC_CAS32
-
-static apr_uint32_t inline intel_atomic_add32(volatile apr_uint32_t *mem, 
-                                              apr_uint32_t val)
-{
-    asm volatile ("lock; xaddl %0,%1"
-                  : "=r"(val), "=m"(*mem) /* outputs */
-                  : "0"(val), "m"(*mem)   /* inputs */
-                  : "memory", "cc");
-    return val;
-}
-
-APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, 
-                                           apr_uint32_t val)
-{
-    return intel_atomic_add32(mem, val);
-}
-#define APR_OVERRIDE_ATOMIC_ADD32
-
-APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
-{
-    asm volatile ("lock; subl %1, %0"
-                  :
-                  : "m" (*(mem)), "r" (val)
-                  : "memory", "cc");
-}
-#define APR_OVERRIDE_ATOMIC_SUB32
-
-APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
-{
-    unsigned char prev;
-
-    asm volatile ("lock; decl %1;\n\t"
-                  "setnz %%al"
-                  : "=a" (prev)
-                  : "m" (*(mem))
-                  : "memory", "cc");
-    return prev;
-}
-#define APR_OVERRIDE_ATOMIC_DEC32
-
-APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)
-{
-    return intel_atomic_add32(mem, 1);
-}
-#define APR_OVERRIDE_ATOMIC_INC32
-
-APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)
-{
-    *mem = val;
-}
-#define APR_OVERRIDE_ATOMIC_SET32
-
-APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
-{
-    apr_uint32_t prev = val;
-
-    asm volatile ("lock; xchgl %0, %1"
-                  : "=r" (prev)
-                  : "m" (*(mem)), "0"(prev)
-                  : "memory");
-    return prev;
-}
-#define APR_OVERRIDE_ATOMIC_XCHG32
-
-/*#define apr_atomic_init(pool)        APR_SUCCESS*/
-
-#endif /* (__linux__ || __EMX__ || __FreeBSD__) && __i386__ */
-
-#if (defined(__PPC__) || defined(__ppc__)) && defined(__GNUC__) \
-    && !defined(USE_GENERIC_ATOMICS)
-
-APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem,
-                                           apr_uint32_t swap,
-                                           apr_uint32_t cmp)
-{
-    apr_uint32_t prev;
-                                                                                
-    asm volatile ("0:\n\t"                   /* retry local label     */
-                  "lwarx  %0,0,%1\n\t"       /* load prev and reserve */
-                  "cmpw   %0,%3\n\t"         /* does it match cmp?    */
-                  "bne-   1f\n\t"            /* ...no, bail out       */
-                  "stwcx. %2,0,%1\n\t"       /* ...yes, conditionally
-                                                store swap            */
-                  "bne-   0b\n\t"            /* start over if we lost
-                                                the reservation       */
-                  "1:"                       /* exit local label      */
-
-                  : "=&r"(prev)                        /* output      */
-                  : "b" (mem), "r" (swap), "r"(cmp)    /* inputs      */
-                  : "memory", "cc");                   /* clobbered   */
-    return prev;
-}
-#define APR_OVERRIDE_ATOMIC_CAS32
-
-APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem,
-                                           apr_uint32_t delta)
-{
-    apr_uint32_t prev, temp;
-                                                                                
-    asm volatile ("0:\n\t"                   /* retry local label     */
-                  "lwarx  %0,0,%2\n\t"       /* load prev and reserve */
-                  "add    %1,%0,%3\n\t"      /* temp = prev + delta   */
-                  "stwcx. %1,0,%2\n\t"       /* conditionally store   */
-                  "bne-   0b"                /* start over if we lost
-                                                the reservation       */
-
-                  /*XXX find a cleaner way to define the temp         
-                   *    it's not an output
-                   */
-                  : "=&r" (prev), "=&r" (temp)        /* output, temp */
-                  : "b" (mem), "r" (delta)            /* inputs       */
-                  : "memory", "cc");                  /* clobbered    */
-    return prev;
-}
-#define APR_OVERRIDE_ATOMIC_ADD32
-
-#endif /* __PPC__ && __GNUC__ */
-
-#if !defined(APR_OVERRIDE_ATOMIC_INIT)
-
-#if APR_HAS_THREADS
-#define NUM_ATOMIC_HASH 7
-/* shift by 2 to get rid of alignment issues */
-#define ATOMIC_HASH(x) (unsigned int)(((unsigned long)(x)>>2)%(unsigned int)NUM_ATOMIC_HASH)
-static apr_thread_mutex_t **hash_mutex;
-#endif /* APR_HAS_THREADS */
-
-#if APR_HAS_THREADS
-static apr_status_t atomic_cleanup(void *data)
-{
-    if (hash_mutex == data)
-        hash_mutex = NULL;
-
-    return APR_SUCCESS;
-}
-#endif
-
-apr_status_t apr_atomic_init(apr_pool_t *p)
-{
-#if APR_HAS_THREADS
-    int i;
-    apr_status_t rv;
-
-    if (hash_mutex != NULL)
-        return APR_SUCCESS;
-
-    hash_mutex = apr_palloc(p, sizeof(apr_thread_mutex_t*) * NUM_ATOMIC_HASH);
-    apr_pool_cleanup_register(p, hash_mutex, atomic_cleanup,
-                              apr_pool_cleanup_null);
-
-    for (i = 0; i < NUM_ATOMIC_HASH; i++) {
-        rv = apr_thread_mutex_create(&(hash_mutex[i]),
-                                     APR_THREAD_MUTEX_DEFAULT, p);
-        if (rv != APR_SUCCESS) {
-           return rv;
-        }
-    }
-#endif /* APR_HAS_THREADS */
-    return APR_SUCCESS;
-}
-#endif /* !defined(APR_OVERRIDE_ATOMIC_INIT) */
-
-/* abort() if 'x' does not evaluate to APR_SUCCESS. */
-#define CHECK(x) do { if ((x) != APR_SUCCESS) abort(); } while (0)
-
-#if !defined(APR_OVERRIDE_ATOMIC_ADD32)
-#if defined(APR_OVERRIDE_ATOMIC_CAS32)
-apr_uint32_t apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
-{
-    apr_uint32_t old_value, new_value;
-    
-    do {
-        old_value = *mem;
-        new_value = old_value + val;
-    } while (apr_atomic_cas32(mem, new_value, old_value) != old_value);
-    return old_value;
-}
-#else
-apr_uint32_t apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
-{
-    apr_uint32_t old_value;
-
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *lock = hash_mutex[ATOMIC_HASH(mem)];
-       
-    CHECK(apr_thread_mutex_lock(lock));
-    old_value = *mem;
-    *mem += val;
-    CHECK(apr_thread_mutex_unlock(lock));
-#else
-    old_value = *mem;
-    *mem += val;
-#endif /* APR_HAS_THREADS */
-    return old_value;
-}
-#endif /* defined(APR_OVERRIDE_ATOMIC_CAS32) */
-#endif /* !defined(APR_OVERRIDE_ATOMIC_ADD32) */
-
-#if !defined(APR_OVERRIDE_ATOMIC_SUB32)
-#if defined(APR_OVERRIDE_ATOMIC_CAS32)
-void apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
-{
-    apr_uint32_t old_value, new_value;
-    
-    do {
-        old_value = *mem;
-        new_value = old_value - val;
-    } while (apr_atomic_cas32(mem, new_value, old_value) != old_value);
-}
-#else
-void apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val) 
-{
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *lock = hash_mutex[ATOMIC_HASH(mem)];
-       
-    CHECK(apr_thread_mutex_lock(lock));
-    *mem -= val;
-    CHECK(apr_thread_mutex_unlock(lock));
-#else
-    *mem -= val;
-#endif /* APR_HAS_THREADS */
-}
-#endif /* defined(APR_OVERRIDE_ATOMIC_CAS32) */
-#endif /* !defined(APR_OVERRIDE_ATOMIC_SUB32) */
-
-#if !defined(APR_OVERRIDE_ATOMIC_SET32)
-void apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val) 
-{
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *lock = hash_mutex[ATOMIC_HASH(mem)];
-
-    CHECK(apr_thread_mutex_lock(lock));
-    *mem = val;
-    CHECK(apr_thread_mutex_unlock(lock));
-#else
-    *mem = val;
-#endif /* APR_HAS_THREADS */
-}
-#endif /* !defined(APR_OVERRIDE_ATOMIC_SET32) */
-
-#if !defined(APR_OVERRIDE_ATOMIC_INC32)
-apr_uint32_t apr_atomic_inc32(volatile apr_uint32_t *mem) 
-{
-    return apr_atomic_add32(mem, 1);
-}
-#endif /* !defined(APR_OVERRIDE_ATOMIC_INC32) */
-
-#if !defined(APR_OVERRIDE_ATOMIC_DEC32)
-#if defined(APR_OVERRIDE_ATOMIC_CAS32)
-int apr_atomic_dec32(volatile apr_uint32_t *mem)
-{
-    apr_uint32_t old_value, new_value;
-    
-    do {
-        old_value = *mem;
-        new_value = old_value - 1;
-    } while (apr_atomic_cas32(mem, new_value, old_value) != old_value);
-    return old_value != 1;
-}
-#else
-int apr_atomic_dec32(volatile apr_uint32_t *mem) 
-{
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *lock = hash_mutex[ATOMIC_HASH(mem)];
-    apr_uint32_t new;
-
-    CHECK(apr_thread_mutex_lock(lock));
-    (*mem)--;
-    new = *mem;
-    CHECK(apr_thread_mutex_unlock(lock));
-    return new;
-#else
-    (*mem)--;
-    return *mem; 
-#endif /* APR_HAS_THREADS */
-}
-#endif /* defined(APR_OVERRIDE_ATOMIC_CAS32) */
-#endif /* !defined(APR_OVERRIDE_ATOMIC_DEC32) */
-
-#if !defined(APR_OVERRIDE_ATOMIC_CAS32)
-apr_uint32_t apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t with,
-			      apr_uint32_t cmp)
-{
-    apr_uint32_t prev;
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *lock = hash_mutex[ATOMIC_HASH(mem)];
-
-    CHECK(apr_thread_mutex_lock(lock));
-    prev = *mem;
-    if (prev == cmp) {
-        *mem = with;
-    }
-    CHECK(apr_thread_mutex_unlock(lock));
-#else
-    prev = *mem;
-    if (prev == cmp) {
-        *mem = with;
-    }
-#endif /* APR_HAS_THREADS */
-    return prev;
-}
-#endif /* !defined(APR_OVERRIDE_ATOMIC_CAS32) */
-
-#if !defined(APR_OVERRIDE_ATOMIC_XCHG32)
-#if defined(APR_OVERRIDE_ATOMIC_CAS32)
-apr_uint32_t apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
-{
-    apr_uint32_t prev;
-    do {
-        prev = *mem;
-    } while (apr_atomic_cas32(mem, val, prev) != prev);
-    return prev;
-}
-#else
-apr_uint32_t apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
-{
-    apr_uint32_t prev;
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *lock = hash_mutex[ATOMIC_HASH(mem)];
-
-    CHECK(apr_thread_mutex_lock(lock));
-    prev = *mem;
-    *mem = val;
-    CHECK(apr_thread_mutex_unlock(lock));
-#else
-    prev = *mem;
-    *mem = val;
-#endif /* APR_HAS_THREADS */
-    return prev;
-}
-#endif /* defined(APR_OVERRIDE_ATOMIC_CAS32) */
-#endif /* !defined(APR_OVERRIDE_ATOMIC_XCHG32) */
-
-#if !defined(APR_OVERRIDE_ATOMIC_CASPTR)
-void *apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
-{
-    void *prev;
-#if APR_HAS_THREADS
-    apr_thread_mutex_t *lock = hash_mutex[ATOMIC_HASH(mem)];
-
-    CHECK(apr_thread_mutex_lock(lock));
-    prev = *(void **)mem;
-    if (prev == cmp) {
-        *mem = with;
-    }
-    CHECK(apr_thread_mutex_unlock(lock));
-#else
-    prev = *(void **)mem;
-    if (prev == cmp) {
-        *mem = with;
-    }
-#endif /* APR_HAS_THREADS */
-    return prev;
-}
-#endif /* !defined(APR_OVERRIDE_ATOMIC_CASPTR) */
-
-#if !defined(APR_OVERRIDE_ATOMIC_READ32)
-APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)
-{
-    return *mem;
-}
-#endif
-
diff --git a/srclib/apr/atomic/unix/builtins.c b/srclib/apr/atomic/unix/builtins.c
new file mode 100644
index 00000000..745acf15
--- /dev/null
+++ b/srclib/apr/atomic/unix/builtins.c
@@ -0,0 +1,81 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr_arch_atomic.h"
+
+#ifdef USE_ATOMICS_BUILTINS
+
+APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
+{
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)
+{
+    return *mem;
+}
+
+APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    *mem = val;
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    return __sync_fetch_and_add(mem, val);
+}
+
+APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    __sync_fetch_and_sub(mem, val);
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)
+{
+    return __sync_fetch_and_add(mem, 1);
+}
+
+APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
+{
+    return __sync_sub_and_fetch(mem, 1);
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t with,
+                                           apr_uint32_t cmp)
+{
+    return __sync_val_compare_and_swap(mem, cmp, with);
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    __sync_synchronize();
+
+    return __sync_lock_test_and_set(mem, val);
+}
+
+APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
+{
+    return (void*) __sync_val_compare_and_swap(mem, cmp, with);
+}
+
+APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with)
+{
+    __sync_synchronize();
+
+    return (void*) __sync_lock_test_and_set(mem, with);
+}
+
+#endif /* USE_ATOMICS_BUILTINS */
diff --git a/srclib/apr/atomic/unix/ia32.c b/srclib/apr/atomic/unix/ia32.c
new file mode 100644
index 00000000..3826f927
--- /dev/null
+++ b/srclib/apr/atomic/unix/ia32.c
@@ -0,0 +1,127 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr_arch_atomic.h"
+
+#ifdef USE_ATOMICS_IA32
+
+APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
+{
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)
+{
+    return *mem;
+}
+
+APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    *mem = val;
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    asm volatile ("lock; xaddl %0,%1"
+                  : "=r" (val), "=m" (*mem)
+                  : "0" (val), "m" (*mem)
+                  : "memory", "cc");
+    return val;
+}
+
+APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    asm volatile ("lock; subl %1, %0"
+                  : /* no output */
+                  : "m" (*(mem)), "r" (val)
+                  : "memory", "cc");
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)
+{
+    return apr_atomic_add32(mem, 1);
+}
+
+APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
+{
+    unsigned char prev;
+
+    asm volatile ("lock; decl %0; setnz %1"
+                  : "=m" (*mem), "=qm" (prev)
+                  : "m" (*mem)
+                  : "memory");
+
+    return prev;
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t with,
+                                           apr_uint32_t cmp)
+{
+    apr_uint32_t prev;
+
+    asm volatile ("lock; cmpxchgl %1, %2"
+                  : "=a" (prev)
+                  : "r" (with), "m" (*(mem)), "0"(cmp)
+                  : "memory", "cc");
+    return prev;
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    apr_uint32_t prev = val;
+
+    asm volatile ("xchgl %0, %1"
+                  : "=r" (prev), "+m" (*mem)
+                  : "0" (prev));
+    return prev;
+}
+
+APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
+{
+    void *prev;
+#if APR_SIZEOF_VOIDP == 4
+    asm volatile ("lock; cmpxchgl %2, %1"
+                  : "=a" (prev), "=m" (*mem)
+                  : "r" (with), "m" (*mem), "0" (cmp));
+#elif APR_SIZEOF_VOIDP == 8
+    asm volatile ("lock; cmpxchgq %q2, %1"
+                  : "=a" (prev), "=m" (*mem)
+                  : "r" ((unsigned long)with), "m" (*mem),
+                    "0" ((unsigned long)cmp));
+#else
+#error APR_SIZEOF_VOIDP value not supported
+#endif
+    return prev;
+}
+
+APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with)
+{
+    void *prev;
+#if APR_SIZEOF_VOIDP == 4
+    asm volatile ("xchgl %2, %1"
+                  : "=a" (prev), "+m" (*mem)
+                  : "0" (with));
+#elif APR_SIZEOF_VOIDP == 8
+    asm volatile ("xchgq %q2, %1"
+                  : "=a" (prev), "+m" (*mem)
+                  : "r" ((unsigned long)with));
+#else
+#error APR_SIZEOF_VOIDP value not supported
+#endif
+    return prev;
+}
+
+#endif /* USE_ATOMICS_IA32 */
diff --git a/srclib/apr/atomic/unix/mutex.c b/srclib/apr/atomic/unix/mutex.c
new file mode 100644
index 00000000..fba3be2b
--- /dev/null
+++ b/srclib/apr/atomic/unix/mutex.c
@@ -0,0 +1,205 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr_arch_atomic.h"
+
+#ifdef USE_ATOMICS_GENERIC
+
+#include <stdlib.h>
+
+#if APR_HAS_THREADS
+#   define DECLARE_MUTEX_LOCKED(name, mem)  \
+        apr_thread_mutex_t *name = mutex_hash(mem)
+#   define MUTEX_UNLOCK(name)                                   \
+        do {                                                    \
+            if (apr_thread_mutex_unlock(name) != APR_SUCCESS)   \
+                abort();                                        \
+        } while (0)
+#else
+#   define DECLARE_MUTEX_LOCKED(name, mem)
+#   define MUTEX_UNLOCK(name)
+#   warning Be warned: using stubs for all atomic operations
+#endif
+
+#if APR_HAS_THREADS
+
+static apr_thread_mutex_t **hash_mutex;
+
+#define NUM_ATOMIC_HASH 7
+/* shift by 2 to get rid of alignment issues */
+#define ATOMIC_HASH(x) (unsigned int)(((unsigned long)(x)>>2)%(unsigned int)NUM_ATOMIC_HASH)
+
+static apr_status_t atomic_cleanup(void *data)
+{
+    if (hash_mutex == data)
+        hash_mutex = NULL;
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
+{
+    int i;
+    apr_status_t rv;
+
+    if (hash_mutex != NULL)
+        return APR_SUCCESS;
+
+    hash_mutex = apr_palloc(p, sizeof(apr_thread_mutex_t*) * NUM_ATOMIC_HASH);
+    apr_pool_cleanup_register(p, hash_mutex, atomic_cleanup,
+                              apr_pool_cleanup_null);
+
+    for (i = 0; i < NUM_ATOMIC_HASH; i++) {
+        rv = apr_thread_mutex_create(&(hash_mutex[i]),
+                                     APR_THREAD_MUTEX_DEFAULT, p);
+        if (rv != APR_SUCCESS) {
+           return rv;
+        }
+    }
+
+    return APR_SUCCESS;
+}
+
+static APR_INLINE apr_thread_mutex_t *mutex_hash(volatile apr_uint32_t *mem)
+{
+    apr_thread_mutex_t *mutex = hash_mutex[ATOMIC_HASH(mem)];
+
+    if (apr_thread_mutex_lock(mutex) != APR_SUCCESS) {
+        abort();
+    }
+
+    return mutex;
+}
+
+#else
+
+APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
+{
+    return APR_SUCCESS;
+}
+
+#endif /* APR_HAS_THREADS */
+
+APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)
+{
+    return *mem;
+}
+
+APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    DECLARE_MUTEX_LOCKED(mutex, mem);
+
+    *mem = val;
+
+    MUTEX_UNLOCK(mutex);
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    apr_uint32_t old_value;
+    DECLARE_MUTEX_LOCKED(mutex, mem);
+
+    old_value = *mem;
+    *mem += val;
+
+    MUTEX_UNLOCK(mutex);
+
+    return old_value;
+}
+
+APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    DECLARE_MUTEX_LOCKED(mutex, mem);
+    *mem -= val;
+    MUTEX_UNLOCK(mutex);
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)
+{
+    return apr_atomic_add32(mem, 1);
+}
+
+APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
+{
+    apr_uint32_t new;
+    DECLARE_MUTEX_LOCKED(mutex, mem);
+
+    (*mem)--;
+    new = *mem;
+
+    MUTEX_UNLOCK(mutex);
+
+    return new;
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t with,
+                              apr_uint32_t cmp)
+{
+    apr_uint32_t prev;
+    DECLARE_MUTEX_LOCKED(mutex, mem);
+
+    prev = *mem;
+    if (prev == cmp) {
+        *mem = with;
+    }
+
+    MUTEX_UNLOCK(mutex);
+
+    return prev;
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    apr_uint32_t prev;
+    DECLARE_MUTEX_LOCKED(mutex, mem);
+
+    prev = *mem;
+    *mem = val;
+
+    MUTEX_UNLOCK(mutex);
+
+    return prev;
+}
+
+APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
+{
+    void *prev;
+    DECLARE_MUTEX_LOCKED(mutex, *mem);
+
+    prev = *(void **)mem;
+    if (prev == cmp) {
+        *mem = with;
+    }
+
+    MUTEX_UNLOCK(mutex);
+
+    return prev;
+}
+
+APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with)
+{
+    void *prev;
+    DECLARE_MUTEX_LOCKED(mutex, *mem);
+
+    prev = *(void **)mem;
+    *mem = with;
+
+    MUTEX_UNLOCK(mutex);
+
+    return prev;
+}
+
+#endif /* USE_ATOMICS_GENERIC */
diff --git a/srclib/apr/atomic/unix/ppc.c b/srclib/apr/atomic/unix/ppc.c
new file mode 100644
index 00000000..db9fca93
--- /dev/null
+++ b/srclib/apr/atomic/unix/ppc.c
@@ -0,0 +1,207 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr_arch_atomic.h"
+
+#ifdef USE_ATOMICS_PPC
+
+#ifdef PPC405_ERRATA
+#   define PPC405_ERR77_SYNC   "	sync\n"
+#else
+#   define PPC405_ERR77_SYNC
+#endif
+
+APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
+{
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)
+{
+    return *mem;
+}
+
+APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    *mem = val;
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    apr_uint32_t prev, temp;
+
+    asm volatile ("loop_%=:\n"                  /* lost reservation     */
+                  "	lwarx   %0,0,%3\n"      /* load and reserve     */
+                  "	add     %1,%0,%4\n"     /* add val and prev     */
+                  PPC405_ERR77_SYNC             /* ppc405 Erratum 77    */
+                  "	stwcx.  %1,0,%3\n"      /* store new value      */
+                  "	bne-    loop_%=\n"      /* loop if lost         */
+                  : "=&r" (prev), "=&r" (temp), "=m" (*mem)
+                  : "b" (mem), "r" (val)
+                  : "cc", "memory");
+
+    return prev;
+}
+
+APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    apr_uint32_t temp;
+
+    asm volatile ("loop_%=:\n"                  /* lost reservation     */
+                  "	lwarx   %0,0,%2\n"      /* load and reserve     */
+                  "	subf    %0,%3,%0\n"     /* subtract val         */
+                  PPC405_ERR77_SYNC             /* ppc405 Erratum 77    */
+                  "	stwcx.  %0,0,%2\n"      /* store new value      */
+                  "	bne-    loop_%=\n"      /* loop if lost         */
+                  : "=&r" (temp), "=m" (*mem)
+                  : "b" (mem), "r" (val)
+                  : "cc", "memory");
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)
+{
+    apr_uint32_t prev;
+
+    asm volatile ("loop_%=:\n"                  /* lost reservation     */
+                  "	lwarx   %0,0,%2\n"      /* load and reserve     */
+                  "	addi    %0,%0,1\n"      /* add immediate        */
+                  PPC405_ERR77_SYNC             /* ppc405 Erratum 77    */
+                  "	stwcx.  %0,0,%2\n"      /* store new value      */
+                  "	bne-    loop_%=\n"      /* loop if lost         */
+                  "	subi    %0,%0,1\n"      /* return old value     */
+                  : "=&b" (prev), "=m" (*mem)
+                  : "b" (mem), "m" (*mem)
+                  : "cc", "memory");
+
+    return prev;
+}
+
+APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
+{
+    apr_uint32_t prev;
+
+    asm volatile ("loop_%=:\n"                  /* lost reservation     */
+                  "	lwarx   %0,0,%2\n"      /* load and reserve     */
+                  "	subi    %0,%0,1\n"      /* subtract immediate   */
+                  PPC405_ERR77_SYNC             /* ppc405 Erratum 77    */
+                  "	stwcx.  %0,0,%2\n"      /* store new value      */
+                  "	bne-    loop_%=\n"      /* loop if lost         */
+                  : "=&b" (prev), "=m" (*mem)
+                  : "b" (mem), "m" (*mem)
+                  : "cc", "memory");
+
+    return prev;
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t with,
+                                           apr_uint32_t cmp)
+{
+    apr_uint32_t prev;
+
+    asm volatile ("loop_%=:\n"                  /* lost reservation     */
+                  "	lwarx   %0,0,%1\n"      /* load and reserve     */
+                  "	cmpw    %0,%3\n"        /* compare operands     */
+                  "	bne-    exit_%=\n"      /* skip if not equal    */
+                  PPC405_ERR77_SYNC             /* ppc405 Erratum 77    */
+                  "	stwcx.  %2,0,%1\n"      /* store new value      */
+                  "	bne-    loop_%=\n"      /* loop if lost         */
+                  "exit_%=:\n"                  /* not equal            */
+                  : "=&r" (prev)
+                  : "b" (mem), "r" (with), "r" (cmp)
+                  : "cc", "memory");
+
+    return prev;
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    apr_uint32_t prev;
+
+    asm volatile ("loop_%=:\n"                  /* lost reservation     */
+                  "	lwarx   %0,0,%1\n"      /* load and reserve     */
+                  PPC405_ERR77_SYNC             /* ppc405 Erratum 77    */
+                  "	stwcx.  %2,0,%1\n"      /* store new value      */
+                  "	bne-    loop_%="        /* loop if lost         */
+                  : "=&r" (prev)
+                  : "b" (mem), "r" (val)
+                  : "cc", "memory");
+
+    return prev;
+}
+
+APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
+{
+    void *prev;
+#if APR_SIZEOF_VOIDP == 4
+    asm volatile ("loop_%=:\n"                  /* lost reservation     */
+                  "	lwarx   %0,0,%1\n"      /* load and reserve     */
+                  "	cmpw    %0,%3\n"        /* compare operands     */
+                  "	bne-    exit_%=\n"      /* skip if not equal    */
+                  PPC405_ERR77_SYNC             /* ppc405 Erratum 77    */
+                  "	stwcx.  %2,0,%1\n"      /* store new value      */
+                  "	bne-    loop_%=\n"      /* loop if lost         */
+                  "exit_%=:\n"                  /* not equal            */
+                  : "=&r" (prev)
+                  : "b" (mem), "r" (with), "r" (cmp)
+                  : "cc", "memory");
+#elif APR_SIZEOF_VOIDP == 8
+    asm volatile ("loop_%=:\n"                  /* lost reservation     */
+                  "	ldarx   %0,0,%1\n"      /* load and reserve     */
+                  "	cmpd    %0,%3\n"        /* compare operands     */
+                  "	bne-    exit_%=\n"      /* skip if not equal    */
+                  PPC405_ERR77_SYNC             /* ppc405 Erratum 77    */
+                  "	stdcx.  %2,0,%1\n"      /* store new value      */
+                  "	bne-    loop_%=\n"      /* loop if lost         */
+                  "exit_%=:\n"                  /* not equal            */
+                  : "=&r" (prev)
+                  : "b" (mem), "r" (with), "r" (cmp)
+                  : "cc", "memory");
+#else
+#error APR_SIZEOF_VOIDP value not supported
+#endif
+    return prev;
+}
+
+APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with)
+{
+    void *prev;
+#if APR_SIZEOF_VOIDP == 4
+    asm volatile ("loop_%=:\n"                  /* lost reservation     */
+                  "	lwarx   %0,0,%1\n"      /* load and reserve     */
+                  PPC405_ERR77_SYNC             /* ppc405 Erratum 77    */
+                  "	stwcx.  %2,0,%1\n"      /* store new value      */
+                  "	bne-    loop_%=\n"      /* loop if lost         */
+                  "	isync\n"                /* memory barrier       */
+                  : "=&r" (prev)
+                  : "b" (mem), "r" (with)
+                  : "cc", "memory");
+#elif APR_SIZEOF_VOIDP == 8
+    asm volatile ("loop_%=:\n"                  /* lost reservation     */
+                  "	ldarx   %0,0,%1\n"      /* load and reserve     */
+                  PPC405_ERR77_SYNC             /* ppc405 Erratum 77    */
+                  "	stdcx.  %2,0,%1\n"      /* store new value      */
+                  "	bne-    loop_%=\n"      /* loop if lost         */
+                  "	isync\n"                /* memory barrier       */
+                  : "=&r" (prev)
+                  : "b" (mem), "r" (with)
+                  : "cc", "memory");
+#else
+#error APR_SIZEOF_VOIDP value not supported
+#endif
+    return prev;
+}
+
+#endif /* USE_ATOMICS_PPC */
diff --git a/srclib/apr/atomic/unix/s390.c b/srclib/apr/atomic/unix/s390.c
new file mode 100644
index 00000000..3e233207
--- /dev/null
+++ b/srclib/apr/atomic/unix/s390.c
@@ -0,0 +1,155 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr_arch_atomic.h"
+
+#ifdef USE_ATOMICS_S390
+
+APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
+{
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)
+{
+    return *mem;
+}
+
+APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    *mem = val;
+}
+
+static APR_INLINE apr_uint32_t atomic_add(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    apr_uint32_t prev = *mem, temp;
+
+    asm volatile ("loop_%=:\n"
+                  "	lr  %1,%0\n"
+                  "	alr %1,%3\n"
+                  "	cs  %0,%1,%2\n"
+                  "	jl  loop_%=\n"
+                  : "+d" (prev), "+d" (temp), "=Q" (*mem)
+                  : "d" (val), "m" (*mem)
+                  : "cc", "memory");
+
+    return prev;
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    return atomic_add(mem, val);
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)
+{
+    return atomic_add(mem, 1);
+}
+
+static APR_INLINE apr_uint32_t atomic_sub(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    apr_uint32_t prev = *mem, temp;
+
+    asm volatile ("loop_%=:\n"
+                  "	lr  %1,%0\n"
+                  "	slr %1,%3\n"
+                  "	cs  %0,%1,%2\n"
+                  "	jl  loop_%=\n"
+                  : "+d" (prev), "+d" (temp), "=Q" (*mem)
+                  : "d" (val), "m" (*mem)
+                  : "cc", "memory");
+
+    return temp;
+}
+
+APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    atomic_sub(mem, val);
+}
+
+APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
+{
+    return atomic_sub(mem, 1);
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t with,
+                                           apr_uint32_t cmp)
+{
+    asm volatile ("	cs  %0,%2,%1\n"
+                  : "+d" (cmp), "=Q" (*mem)
+                  : "d" (with), "m" (*mem)
+                  : "cc", "memory");
+
+    return cmp;
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    apr_uint32_t prev = *mem;
+
+    asm volatile ("loop_%=:\n"
+                  "	cs  %0,%2,%1\n"
+                  "	jl  loop_%=\n"
+                  : "+d" (prev), "=Q" (*mem)
+                  : "d" (val), "m" (*mem)
+                  : "cc", "memory");
+
+    return prev;
+}
+
+APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
+{
+    void *prev = (void *) cmp;
+#if APR_SIZEOF_VOIDP == 4
+    asm volatile ("	cs  %0,%2,%1\n"
+                  : "+d" (prev), "=Q" (*mem)
+                  : "d" (with), "m" (*mem)
+                  : "cc", "memory");
+#elif APR_SIZEOF_VOIDP == 8
+    asm volatile ("	csg %0,%2,%1\n"
+                  : "+d" (prev), "=Q" (*mem)
+                  : "d" (with), "m" (*mem)
+                  : "cc", "memory");
+#else
+#error APR_SIZEOF_VOIDP value not supported
+#endif
+    return prev;
+}
+
+APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with)
+{
+    void *prev = (void *) *mem;
+#if APR_SIZEOF_VOIDP == 4
+    asm volatile ("loop_%=:\n"
+                  "	cs  %0,%2,%1\n"
+                  "	jl  loop_%=\n"
+                  : "+d" (prev), "=Q" (*mem)
+                  : "d" (with), "m" (*mem)
+                  : "cc", "memory");
+#elif APR_SIZEOF_VOIDP == 8
+    asm volatile ("loop_%=:\n"
+                  "	csg %0,%2,%1\n"
+                  "	jl  loop_%=\n"
+                  : "+d" (prev), "=Q" (*mem)
+                  : "d" (with), "m" (*mem)
+                  : "cc", "memory");
+#else
+#error APR_SIZEOF_VOIDP value not supported
+#endif
+    return prev;
+}
+
+#endif /* USE_ATOMICS_S390 */
diff --git a/srclib/apr/atomic/unix/solaris.c b/srclib/apr/atomic/unix/solaris.c
new file mode 100644
index 00000000..b3852516
--- /dev/null
+++ b/srclib/apr/atomic/unix/solaris.c
@@ -0,0 +1,79 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr_arch_atomic.h"
+
+#ifdef USE_ATOMICS_SOLARIS
+
+#include <atomic.h>
+
+APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
+{
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)
+{
+    return *mem;
+}
+
+APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    *mem = val;
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    return atomic_add_32_nv(mem, val) - val;
+}
+
+APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    atomic_add_32(mem, -val);
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)
+{
+    return atomic_inc_32_nv(mem) - 1;
+}
+
+APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
+{
+    return atomic_dec_32_nv(mem);
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t with,
+                                           apr_uint32_t cmp)
+{
+    return atomic_cas_32(mem, cmp, with);
+}
+
+APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
+{
+    return atomic_swap_32(mem, val);
+}
+
+APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
+{
+    return atomic_cas_ptr(mem, cmp, (void*) with);
+}
+
+APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with)
+{
+    return atomic_swap_ptr(mem, with);
+}
+
+#endif /* USE_ATOMICS_SOLARIS */
diff --git a/srclib/apr/atomic/win32/apr_atomic.c b/srclib/apr/atomic/win32/apr_atomic.c
index 42c19876..973c679e 100644
--- a/srclib/apr/atomic/win32/apr_atomic.c
+++ b/srclib/apr/atomic/win32/apr_atomic.c
@@ -38,11 +38,16 @@ typedef WINBASEAPI apr_uint32_t (WINAPI * apr_atomic_win32_ptr_val_val_fn)
 typedef WINBASEAPI void * (WINAPI * apr_atomic_win32_ptr_ptr_ptr_fn)
     (volatile void **, 
      void *, const void *);
+typedef WINBASEAPI void * (WINAPI * apr_atomic_win32_ptr_ptr_fn)
+    (volatile void **,
+     void *);
 
 APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
 #if (defined(_M_IA64) || defined(_M_AMD64))
     return InterlockedExchangeAdd(mem, val);
+#elif defined(__MINGW32__)
+    return InterlockedExchangeAdd((long *)mem, val);
 #else
     return ((apr_atomic_win32_ptr_val_fn)InterlockedExchangeAdd)(mem, val);
 #endif
@@ -55,6 +60,8 @@ APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
 #if (defined(_M_IA64) || defined(_M_AMD64))
     InterlockedExchangeAdd(mem, -val);
+#elif defined(__MINGW32__)
+    InterlockedExchangeAdd((long *)mem, -val);
 #else
     ((apr_atomic_win32_ptr_val_fn)InterlockedExchangeAdd)(mem, -val);
 #endif
@@ -65,6 +72,8 @@ APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)
     /* we return old value, win32 returns new value :( */
 #if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED)
     return InterlockedIncrement(mem) - 1;
+#elif defined(__MINGW32__)
+    return InterlockedIncrement((long *)mem) - 1;
 #else
     return ((apr_atomic_win32_ptr_fn)InterlockedIncrement)(mem) - 1;
 #endif
@@ -74,6 +83,8 @@ APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
 {
 #if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED)
     return InterlockedDecrement(mem);
+#elif defined(__MINGW32__)
+    return InterlockedDecrement((long *)mem);
 #else
     return ((apr_atomic_win32_ptr_fn)InterlockedDecrement)(mem);
 #endif
@@ -83,6 +94,8 @@ APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)
 {
 #if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED)
     InterlockedExchange(mem, val);
+#elif defined(__MINGW32__)
+    InterlockedExchange((long*)mem, val);
 #else
     ((apr_atomic_win32_ptr_val_fn)InterlockedExchange)(mem, val);
 #endif
@@ -98,6 +111,8 @@ APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint3
 {
 #if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED)
     return InterlockedCompareExchange(mem, with, cmp);
+#elif defined(__MINGW32__)
+    return InterlockedCompareExchange((long*)mem, with, cmp);
 #else
     return ((apr_atomic_win32_ptr_val_val_fn)InterlockedCompareExchange)(mem, with, cmp);
 #endif
@@ -106,7 +121,9 @@ APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint3
 APR_DECLARE(void *) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
 {
 #if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED)
-    return InterlockedCompareExchangePointer((void* volatile*)mem, with, (void *)cmp);
+    return InterlockedCompareExchangePointer((void* volatile*)mem, with, (void*)cmp);
+#elif defined(__MINGW32__)
+    return InterlockedCompareExchangePointer((void**)mem, with, (void*)cmp);
 #else
     /* Too many VC6 users have stale win32 API files, stub this */
     return ((apr_atomic_win32_ptr_ptr_ptr_fn)InterlockedCompareExchange)(mem, with, cmp);
@@ -117,7 +134,19 @@ APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint
 {
 #if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED)
     return InterlockedExchange(mem, val);
+#elif defined(__MINGW32__)
+    return InterlockedExchange((long *)mem, val);
 #else
     return ((apr_atomic_win32_ptr_val_fn)InterlockedExchange)(mem, val);
 #endif
 }
+
+APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with)
+{
+#if (defined(_M_IA64) || defined(_M_AMD64) || defined(__MINGW32__)) && !defined(RC_INVOKED)
+    return InterlockedExchangePointer((void**)mem, with);
+#else
+    /* Too many VC6 users have stale win32 API files, stub this */
+    return ((apr_atomic_win32_ptr_ptr_fn)InterlockedExchange)(mem, with);
+#endif
+}
diff --git a/srclib/apr/build-outputs.mk b/srclib/apr/build-outputs.mk
index f8167572..c448d0a2 100644
--- a/srclib/apr/build-outputs.mk
+++ b/srclib/apr/build-outputs.mk
@@ -12,14 +12,11 @@ tables/apr_tables.lo: tables/apr_tables.c .make.dirs include/apr_allocator.h inc
 
 OBJECTS_all = passwd/apr_getpass.lo strings/apr_cpystrn.lo strings/apr_fnmatch.lo strings/apr_snprintf.lo strings/apr_strings.lo strings/apr_strnatcmp.lo strings/apr_strtok.lo tables/apr_hash.lo tables/apr_tables.lo
 
-atomic/unix/apr_atomic.lo: atomic/unix/apr_atomic.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_want.h include/apr_thread_mutex.h include/apr_atomic.h include/apr_pools.h
-
-OBJECTS_atomic_unix = atomic/unix/apr_atomic.lo
-
 dso/unix/dso.lo: dso/unix/dso.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_proc_mutex.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_want.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
 
 OBJECTS_dso_unix = dso/unix/dso.lo
 
+file_io/unix/buffer.lo: file_io/unix/buffer.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_want.h include/apr_thread_mutex.h include/apr_pools.h
 file_io/unix/copy.lo: file_io/unix/copy.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_inherit.h include/apr_file_info.h include/apr_user.h include/apr_file_io.h include/apr_want.h include/apr_thread_mutex.h include/apr_time.h include/apr_pools.h include/apr_tables.h
 file_io/unix/dir.lo: file_io/unix/dir.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_proc_mutex.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_want.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
 file_io/unix/fileacc.lo: file_io/unix/fileacc.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_thread_mutex.h include/apr_errno.h include/apr_want.h include/apr_pools.h include/apr_strings.h
@@ -36,7 +33,7 @@ file_io/unix/readwrite.lo: file_io/unix/readwrite.c .make.dirs include/apr_suppo
 file_io/unix/seek.lo: file_io/unix/seek.c .make.dirs 
 file_io/unix/tempdir.lo: file_io/unix/tempdir.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_env.h include/apr_file_info.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_want.h include/apr_thread_mutex.h include/apr_inherit.h include/apr_time.h include/apr_pools.h include/apr_tables.h
 
-OBJECTS_file_io_unix = file_io/unix/copy.lo file_io/unix/dir.lo file_io/unix/fileacc.lo file_io/unix/filedup.lo file_io/unix/filepath.lo file_io/unix/filepath_util.lo file_io/unix/filestat.lo file_io/unix/flock.lo file_io/unix/fullrw.lo file_io/unix/mktemp.lo file_io/unix/open.lo file_io/unix/pipe.lo file_io/unix/readwrite.lo file_io/unix/seek.lo file_io/unix/tempdir.lo
+OBJECTS_file_io_unix = file_io/unix/buffer.lo file_io/unix/copy.lo file_io/unix/dir.lo file_io/unix/fileacc.lo file_io/unix/filedup.lo file_io/unix/filepath.lo file_io/unix/filepath_util.lo file_io/unix/filestat.lo file_io/unix/flock.lo file_io/unix/fullrw.lo file_io/unix/mktemp.lo file_io/unix/open.lo file_io/unix/pipe.lo file_io/unix/readwrite.lo file_io/unix/seek.lo file_io/unix/tempdir.lo
 
 locks/unix/global_mutex.lo: locks/unix/global_mutex.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_proc_mutex.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_want.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
 locks/unix/proc_mutex.lo: locks/unix/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_thread_mutex.h include/apr_errno.h include/apr_want.h include/apr_pools.h include/apr_strings.h
@@ -51,7 +48,7 @@ memory/unix/apr_pools.lo: memory/unix/apr_pools.c .make.dirs include/apr_allocat
 OBJECTS_memory_unix = memory/unix/apr_pools.lo
 
 misc/unix/charset.lo: misc/unix/charset.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_proc_mutex.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_want.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
-misc/unix/env.lo: misc/unix/env.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_want.h include/apr_env.h include/apr_thread_mutex.h include/apr_pools.h
+misc/unix/env.lo: misc/unix/env.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_want.h include/apr_strings.h include/apr_env.h include/apr_thread_mutex.h include/apr_pools.h
 misc/unix/errorcodes.lo: misc/unix/errorcodes.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_want.h include/apr_strings.h include/apr_thread_mutex.h include/apr_lib.h include/apr_dso.h include/apr_pools.h
 misc/unix/getopt.lo: misc/unix/getopt.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_want.h include/apr_strings.h include/apr_thread_mutex.h include/apr_lib.h include/apr_pools.h
 misc/unix/otherchild.lo: misc/unix/otherchild.c .make.dirs 
@@ -79,14 +76,14 @@ OBJECTS_network_io_unix = network_io/unix/inet_ntop.lo network_io/unix/inet_pton
 poll/unix/epoll.lo: poll/unix/epoll.c .make.dirs 
 poll/unix/kqueue.lo: poll/unix/kqueue.c .make.dirs 
 poll/unix/poll.lo: poll/unix/poll.c .make.dirs 
-poll/unix/port.lo: poll/unix/port.c .make.dirs 
+poll/unix/port.lo: poll/unix/port.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_thread_mutex.h include/apr_errno.h include/apr_want.h include/apr_atomic.h include/apr_pools.h
 poll/unix/select.lo: poll/unix/select.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_proc_mutex.h include/apr_user.h include/apr_file_io.h include/apr_want.h include/apr_poll.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
 
 OBJECTS_poll_unix = poll/unix/epoll.lo poll/unix/kqueue.lo poll/unix/poll.lo poll/unix/port.lo poll/unix/select.lo
 
-random/unix/apr_random.lo: random/unix/apr_random.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_inherit.h include/apr_file_info.h include/apr_user.h include/apr_file_io.h include/apr_want.h include/apr_thread_mutex.h include/apr_random.h include/apr_thread_proc.h include/apr_time.h include/apr_pools.h include/apr_tables.h
+random/unix/apr_random.lo: random/unix/apr_random.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_random.h include/apr_time.h include/apr_pools.h
 random/unix/sha2.lo: random/unix/sha2.c .make.dirs 
-random/unix/sha2_glue.lo: random/unix/sha2_glue.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_want.h include/apr_thread_mutex.h include/apr_random.h include/apr_pools.h
+random/unix/sha2_glue.lo: random/unix/sha2_glue.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_inherit.h include/apr_file_info.h include/apr_user.h include/apr_file_io.h include/apr_want.h include/apr_thread_mutex.h include/apr_random.h include/apr_thread_proc.h include/apr_time.h include/apr_pools.h include/apr_tables.h
 
 OBJECTS_random_unix = random/unix/apr_random.lo random/unix/sha2.lo random/unix/sha2_glue.lo
 
@@ -116,13 +113,22 @@ user/unix/userinfo.lo: user/unix/userinfo.c .make.dirs include/apr_allocator.h i
 
 OBJECTS_user_unix = user/unix/groupinfo.lo user/unix/userinfo.lo
 
-OBJECTS_unix = $(OBJECTS_all) $(OBJECTS_atomic_unix) $(OBJECTS_dso_unix) $(OBJECTS_file_io_unix) $(OBJECTS_locks_unix) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_unix) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_unix) $(OBJECTS_support_unix) $(OBJECTS_threadproc_unix) $(OBJECTS_time_unix) $(OBJECTS_user_unix)
+atomic/unix/builtins.lo: atomic/unix/builtins.c .make.dirs 
+atomic/unix/ia32.lo: atomic/unix/ia32.c .make.dirs 
+atomic/unix/mutex.lo: atomic/unix/mutex.c .make.dirs 
+atomic/unix/ppc.lo: atomic/unix/ppc.c .make.dirs 
+atomic/unix/s390.lo: atomic/unix/s390.c .make.dirs 
+atomic/unix/solaris.lo: atomic/unix/solaris.c .make.dirs 
+
+OBJECTS_atomic_unix = atomic/unix/builtins.lo atomic/unix/ia32.lo atomic/unix/mutex.lo atomic/unix/ppc.lo atomic/unix/s390.lo atomic/unix/solaris.lo
+
+OBJECTS_unix = $(OBJECTS_all) $(OBJECTS_dso_unix) $(OBJECTS_file_io_unix) $(OBJECTS_locks_unix) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_unix) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_unix) $(OBJECTS_support_unix) $(OBJECTS_threadproc_unix) $(OBJECTS_time_unix) $(OBJECTS_user_unix) $(OBJECTS_atomic_unix)
 
 dso/aix/dso.lo: dso/aix/dso.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_proc_mutex.h include/apr_user.h include/apr_file_io.h include/apr_want.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
 
 OBJECTS_dso_aix = dso/aix/dso.lo
 
-OBJECTS_aix = $(OBJECTS_all) $(OBJECTS_atomic_unix) $(OBJECTS_dso_aix) $(OBJECTS_file_io_unix) $(OBJECTS_locks_unix) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_unix) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_unix) $(OBJECTS_support_unix) $(OBJECTS_threadproc_unix) $(OBJECTS_time_unix) $(OBJECTS_user_unix)
+OBJECTS_aix = $(OBJECTS_all) $(OBJECTS_dso_aix) $(OBJECTS_file_io_unix) $(OBJECTS_locks_unix) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_unix) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_unix) $(OBJECTS_support_unix) $(OBJECTS_threadproc_unix) $(OBJECTS_time_unix) $(OBJECTS_user_unix) $(OBJECTS_atomic_unix)
 
 dso/beos/dso.lo: dso/beos/dso.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_proc_mutex.h include/apr_user.h include/apr_file_io.h include/apr_want.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
 
@@ -152,12 +158,13 @@ threadproc/beos/threadproc_common.lo: threadproc/beos/threadproc_common.c .make.
 
 OBJECTS_threadproc_beos = threadproc/beos/apr_proc_stub.lo threadproc/beos/proc.lo threadproc/beos/thread.lo threadproc/beos/threadpriv.lo threadproc/beos/threadproc_common.lo
 
-OBJECTS_beos = $(OBJECTS_all) $(OBJECTS_atomic_unix) $(OBJECTS_dso_beos) $(OBJECTS_file_io_unix) $(OBJECTS_locks_beos) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_beos) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_beos) $(OBJECTS_support_unix) $(OBJECTS_threadproc_beos) $(OBJECTS_time_unix) $(OBJECTS_user_unix)
+OBJECTS_beos = $(OBJECTS_all) $(OBJECTS_dso_beos) $(OBJECTS_file_io_unix) $(OBJECTS_locks_beos) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_beos) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_beos) $(OBJECTS_support_unix) $(OBJECTS_threadproc_beos) $(OBJECTS_time_unix) $(OBJECTS_user_unix) $(OBJECTS_atomic_unix)
 
 dso/os2/dso.lo: dso/os2/dso.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_proc_mutex.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_want.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
 
 OBJECTS_dso_os2 = dso/os2/dso.lo
 
+file_io/os2/buffer.lo: file_io/os2/buffer.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_thread_mutex.h include/apr_errno.h include/apr_want.h include/apr_pools.h
 file_io/os2/copy.lo: file_io/os2/copy.c .make.dirs 
 file_io/os2/dir.lo: file_io/os2/dir.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_proc_mutex.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_want.h include/apr_lib.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
 file_io/os2/dir_make_recurse.lo: file_io/os2/dir_make_recurse.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_inherit.h include/apr_file_info.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_want.h include/apr_thread_mutex.h include/apr_lib.h include/apr_time.h include/apr_pools.h include/apr_tables.h
@@ -177,7 +184,7 @@ file_io/os2/readwrite.lo: file_io/os2/readwrite.c .make.dirs include/apr_allocat
 file_io/os2/seek.lo: file_io/os2/seek.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_inherit.h include/apr_file_info.h include/apr_user.h include/apr_file_io.h include/apr_want.h include/apr_thread_mutex.h include/apr_lib.h include/apr_time.h include/apr_pools.h include/apr_tables.h
 file_io/os2/tempdir.lo: file_io/os2/tempdir.c .make.dirs 
 
-OBJECTS_file_io_os2 = file_io/os2/copy.lo file_io/os2/dir.lo file_io/os2/dir_make_recurse.lo file_io/os2/fileacc.lo file_io/os2/filedup.lo file_io/os2/filepath.lo file_io/os2/filepath_util.lo file_io/os2/filestat.lo file_io/os2/filesys.lo file_io/os2/flock.lo file_io/os2/fullrw.lo file_io/os2/maperrorcode.lo file_io/os2/mktemp.lo file_io/os2/open.lo file_io/os2/pipe.lo file_io/os2/readwrite.lo file_io/os2/seek.lo file_io/os2/tempdir.lo
+OBJECTS_file_io_os2 = file_io/os2/buffer.lo file_io/os2/copy.lo file_io/os2/dir.lo file_io/os2/dir_make_recurse.lo file_io/os2/fileacc.lo file_io/os2/filedup.lo file_io/os2/filepath.lo file_io/os2/filepath_util.lo file_io/os2/filestat.lo file_io/os2/filesys.lo file_io/os2/flock.lo file_io/os2/fullrw.lo file_io/os2/maperrorcode.lo file_io/os2/mktemp.lo file_io/os2/open.lo file_io/os2/pipe.lo file_io/os2/readwrite.lo file_io/os2/seek.lo file_io/os2/tempdir.lo
 
 locks/os2/proc_mutex.lo: locks/os2/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_proc_mutex.h include/apr_lib.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
 locks/os2/thread_cond.lo: locks/os2/thread_cond.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_proc_mutex.h include/apr_lib.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
@@ -213,23 +220,96 @@ threadproc/os2/threadpriv.lo: threadproc/os2/threadpriv.c .make.dirs include/apr
 
 OBJECTS_threadproc_os2 = threadproc/os2/proc.lo threadproc/os2/signals.lo threadproc/os2/thread.lo threadproc/os2/threadpriv.lo
 
-OBJECTS_os2 = $(OBJECTS_all) $(OBJECTS_atomic_unix) $(OBJECTS_dso_os2) $(OBJECTS_file_io_os2) $(OBJECTS_locks_os2) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_os2) $(OBJECTS_poll_os2) $(OBJECTS_random_unix) $(OBJECTS_shmem_os2) $(OBJECTS_support_unix) $(OBJECTS_threadproc_os2) $(OBJECTS_time_unix) $(OBJECTS_user_unix)
+OBJECTS_os2 = $(OBJECTS_all) $(OBJECTS_dso_os2) $(OBJECTS_file_io_os2) $(OBJECTS_locks_os2) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_os2) $(OBJECTS_poll_os2) $(OBJECTS_random_unix) $(OBJECTS_shmem_os2) $(OBJECTS_support_unix) $(OBJECTS_threadproc_os2) $(OBJECTS_time_unix) $(OBJECTS_user_unix) $(OBJECTS_atomic_unix)
+
+dso/os390/dso.lo: dso/os390/dso.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_proc_mutex.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+
+OBJECTS_dso_os390 = dso/os390/dso.lo
 
 atomic/os390/atomic.lo: atomic/os390/atomic.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_thread_mutex.h include/apr_errno.h include/apr_want.h include/apr_atomic.h include/apr_pools.h
 
 OBJECTS_atomic_os390 = atomic/os390/atomic.lo
 
-dso/os390/dso.lo: dso/os390/dso.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_proc_mutex.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+OBJECTS_os390 = $(OBJECTS_all) $(OBJECTS_dso_os390) $(OBJECTS_file_io_unix) $(OBJECTS_locks_unix) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_unix) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_unix) $(OBJECTS_support_unix) $(OBJECTS_threadproc_unix) $(OBJECTS_time_unix) $(OBJECTS_user_unix) $(OBJECTS_atomic_os390)
 
-OBJECTS_dso_os390 = dso/os390/dso.lo
+dso/win32/dso.lo: dso/win32/dso.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_thread_mutex.h include/apr_errno.h include/apr_want.h include/apr_pools.h include/apr_strings.h
+
+OBJECTS_dso_win32 = dso/win32/dso.lo
+
+file_io/win32/buffer.lo: file_io/win32/buffer.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_thread_mutex.h include/apr_errno.h include/apr_want.h include/apr_pools.h
+file_io/win32/dir.lo: file_io/win32/dir.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_proc_mutex.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_want.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+file_io/win32/filedup.lo: file_io/win32/filedup.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_want.h include/apr_file_info.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_inherit.h include/apr_thread_mutex.h include/apr_time.h include/apr_pools.h include/apr_tables.h
+file_io/win32/filepath.lo: file_io/win32/filepath.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_want.h include/apr_strings.h include/apr_thread_mutex.h include/apr_lib.h include/apr_pools.h
+file_io/win32/filestat.lo: file_io/win32/filestat.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_want.h include/apr_file_info.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_inherit.h include/apr_thread_mutex.h include/apr_time.h include/apr_pools.h include/apr_tables.h
+file_io/win32/filesys.lo: file_io/win32/filesys.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_thread_mutex.h include/apr_errno.h include/apr_want.h include/apr_pools.h include/apr_strings.h
+file_io/win32/flock.lo: file_io/win32/flock.c .make.dirs 
+file_io/win32/open.lo: file_io/win32/open.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_proc_mutex.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+file_io/win32/pipe.lo: file_io/win32/pipe.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_want.h include/apr_file_info.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_inherit.h include/apr_thread_mutex.h include/apr_time.h include/apr_pools.h include/apr_tables.h
+file_io/win32/readwrite.lo: file_io/win32/readwrite.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_want.h include/apr_file_info.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_inherit.h include/apr_thread_mutex.h include/apr_lib.h include/apr_time.h include/apr_pools.h include/apr_tables.h
+file_io/win32/seek.lo: file_io/win32/seek.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_inherit.h include/apr_file_info.h include/apr_user.h include/apr_file_io.h include/apr_want.h include/apr_thread_mutex.h include/apr_time.h include/apr_pools.h include/apr_tables.h
+
+OBJECTS_file_io_win32 = file_io/win32/buffer.lo file_io/win32/dir.lo file_io/win32/filedup.lo file_io/win32/filepath.lo file_io/win32/filestat.lo file_io/win32/filesys.lo file_io/win32/flock.lo file_io/win32/open.lo file_io/win32/pipe.lo file_io/win32/readwrite.lo file_io/win32/seek.lo file_io/unix/copy.lo file_io/unix/fileacc.lo file_io/unix/filepath_util.lo file_io/unix/fullrw.lo file_io/unix/mktemp.lo file_io/unix/tempdir.lo
+
+locks/win32/proc_mutex.lo: locks/win32/proc_mutex.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_proc_mutex.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+locks/win32/thread_cond.lo: locks/win32/thread_cond.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_proc_mutex.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+locks/win32/thread_mutex.lo: locks/win32/thread_mutex.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_proc_mutex.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+locks/win32/thread_rwlock.lo: locks/win32/thread_rwlock.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_proc_mutex.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+
+OBJECTS_locks_win32 = locks/win32/proc_mutex.lo locks/win32/thread_cond.lo locks/win32/thread_mutex.lo locks/win32/thread_rwlock.lo
+
+misc/win32/charset.lo: misc/win32/charset.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_proc_mutex.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_want.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+misc/win32/env.lo: misc/win32/env.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_want.h include/apr_strings.h include/apr_env.h include/apr_thread_mutex.h include/apr_pools.h
+misc/win32/internal.lo: misc/win32/internal.c .make.dirs 
+misc/win32/misc.lo: misc/win32/misc.c .make.dirs include/apr_lib.h include/apr_errno.h
+misc/win32/rand.lo: misc/win32/rand.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_proc_mutex.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+misc/win32/start.lo: misc/win32/start.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_signal.h include/apr_want.h include/apr_thread_mutex.h include/apr_pools.h
+misc/win32/utf8.lo: misc/win32/utf8.c .make.dirs include/apr_errno.h
+
+OBJECTS_misc_win32 = misc/win32/charset.lo misc/win32/env.lo misc/win32/internal.lo misc/win32/misc.lo misc/win32/rand.lo misc/win32/start.lo misc/win32/utf8.lo misc/unix/errorcodes.lo misc/unix/getopt.lo misc/unix/otherchild.lo misc/unix/version.lo
+
+mmap/win32/mmap.lo: mmap/win32/mmap.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_proc_mutex.h include/apr_shm.h include/apr_ring.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h include/apr_mmap.h
+
+OBJECTS_mmap_win32 = mmap/win32/mmap.lo mmap/unix/common.lo
+
+network_io/win32/sendrecv.lo: network_io/win32/sendrecv.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_errno.h include/apr_want.h include/apr_file_info.h include/apr_user.h include/apr_file_io.h include/apr_inherit.h include/apr_thread_mutex.h include/apr_lib.h include/apr_time.h include/apr_pools.h include/apr_tables.h
+network_io/win32/sockets.lo: network_io/win32/sockets.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_proc_mutex.h include/apr_lib.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+network_io/win32/sockopt.lo: network_io/win32/sockopt.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_errno.h include/apr_want.h include/apr_file_info.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_inherit.h include/apr_thread_mutex.h include/apr_time.h include/apr_pools.h include/apr_tables.h
+
+OBJECTS_network_io_win32 = network_io/win32/sendrecv.lo network_io/win32/sockets.lo network_io/win32/sockopt.lo network_io/unix/inet_ntop.lo network_io/unix/inet_pton.lo network_io/unix/multicast.lo network_io/unix/sockaddr.lo
+
+shmem/win32/shm.lo: shmem/win32/shm.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_want.h include/apr_file_info.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_inherit.h include/apr_thread_mutex.h include/apr_shm.h include/apr_time.h include/apr_pools.h include/apr_tables.h
+
+OBJECTS_shmem_win32 = shmem/win32/shm.lo
+
+threadproc/win32/proc.lo: threadproc/win32/proc.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_proc_mutex.h include/apr_lib.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+threadproc/win32/signals.lo: threadproc/win32/signals.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_time.h include/apr_pools.h
+threadproc/win32/thread.lo: threadproc/win32/thread.c .make.dirs include/apr_allocator.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_shm.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_dso.h include/apr_proc_mutex.h include/apr_lib.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+threadproc/win32/threadpriv.lo: threadproc/win32/threadpriv.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_proc_mutex.h include/apr_lib.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+
+OBJECTS_threadproc_win32 = threadproc/win32/proc.lo threadproc/win32/signals.lo threadproc/win32/thread.lo threadproc/win32/threadpriv.lo
+
+time/win32/access.lo: time/win32/access.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_want.h include/apr_thread_mutex.h include/apr_lib.h include/apr_time.h include/apr_pools.h
+time/win32/time.lo: time/win32/time.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_proc_mutex.h include/apr_lib.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+time/win32/timestr.lo: time/win32/timestr.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_want.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_proc_mutex.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+
+OBJECTS_time_win32 = time/win32/access.lo time/win32/time.lo time/win32/timestr.lo
+
+user/win32/groupinfo.lo: user/win32/groupinfo.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_proc_mutex.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_want.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+user/win32/userinfo.lo: user/win32/userinfo.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_network_io.h include/apr_portable.h include/apr_inherit.h include/apr_file_info.h include/apr_thread_mutex.h include/apr_thread_proc.h include/apr_dso.h include/apr_tables.h include/apr_errno.h include/apr_proc_mutex.h include/apr_user.h include/apr_file_io.h include/apr_strings.h include/apr_want.h include/apr_shm.h include/apr_global_mutex.h include/apr_time.h include/apr_pools.h
+
+OBJECTS_user_win32 = user/win32/groupinfo.lo user/win32/userinfo.lo
+
+atomic/win32/apr_atomic.lo: atomic/win32/apr_atomic.c .make.dirs include/apr_allocator.h include/apr_general.h include/apr_errno.h include/apr_want.h include/apr_thread_mutex.h include/apr_atomic.h include/apr_pools.h
+
+OBJECTS_atomic_win32 = atomic/win32/apr_atomic.lo
 
-OBJECTS_os390 = $(OBJECTS_all) $(OBJECTS_atomic_os390) $(OBJECTS_dso_os390) $(OBJECTS_file_io_unix) $(OBJECTS_locks_unix) $(OBJECTS_memory_unix) $(OBJECTS_misc_unix) $(OBJECTS_mmap_unix) $(OBJECTS_network_io_unix) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_unix) $(OBJECTS_support_unix) $(OBJECTS_threadproc_unix) $(OBJECTS_time_unix) $(OBJECTS_user_unix)
+OBJECTS_win32 = $(OBJECTS_all) $(OBJECTS_dso_win32) $(OBJECTS_file_io_win32) $(OBJECTS_locks_win32) $(OBJECTS_memory_unix) $(OBJECTS_misc_win32) $(OBJECTS_mmap_win32) $(OBJECTS_network_io_win32) $(OBJECTS_poll_unix) $(OBJECTS_random_unix) $(OBJECTS_shmem_win32) $(OBJECTS_support_unix) $(OBJECTS_threadproc_win32) $(OBJECTS_time_win32) $(OBJECTS_user_win32) $(OBJECTS_atomic_win32)
 
 HEADERS = $(top_srcdir)/include/apr_allocator.h $(top_srcdir)/include/apr_atomic.h $(top_srcdir)/include/apr_dso.h $(top_srcdir)/include/apr_env.h $(top_srcdir)/include/apr_errno.h $(top_srcdir)/include/apr_file_info.h $(top_srcdir)/include/apr_file_io.h $(top_srcdir)/include/apr_fnmatch.h $(top_srcdir)/include/apr_general.h $(top_srcdir)/include/apr_getopt.h $(top_srcdir)/include/apr_global_mutex.h $(top_srcdir)/include/apr_hash.h $(top_srcdir)/include/apr_inherit.h $(top_srcdir)/include/apr_lib.h $(top_srcdir)/include/apr_mmap.h $(top_srcdir)/include/apr_network_io.h $(top_srcdir)/include/apr_poll.h $(top_srcdir)/include/apr_pools.h $(top_srcdir)/include/apr_portable.h $(top_srcdir)/include/apr_proc_mutex.h $(top_srcdir)/include/apr_random.h $(top_srcdir)/include/apr_ring.h $(top_srcdir)/include/apr_shm.h $(top_srcdir)/include/apr_signal.h $(top_srcdir)/include/apr_strings.h $(top_srcdir)/include/apr_support.h $(top_srcdir)/include/apr_tables.h $(top_srcdir)/include/apr_thread_cond.h $(top_srcdir)/include/apr_thread_mutex.h $(top_srcdir)/include/apr_thread_proc.h $(top_srcdir)/include/apr_thread_rwlock.h $(top_srcdir)/include/apr_time.h $(top_srcdir)/include/apr_user.h $(top_srcdir)/include/apr_version.h $(top_srcdir)/include/apr_want.h
 
-SOURCE_DIRS = random/unix dso/os2 time/unix locks/unix user/unix locks/beos tables support/unix file_io/unix mmap/unix atomic/unix poll/os2 dso/os390 atomic/os390 dso/beos poll/unix passwd network_io/beos threadproc/os2 network_io/os2 threadproc/beos shmem/unix network_io/unix file_io/os2 dso/aix threadproc/unix misc/unix shmem/beos dso/unix locks/os2 shmem/os2 memory/unix strings $(EXTRA_SOURCE_DIRS)
+SOURCE_DIRS = random/unix misc/win32 mmap/win32 dso/os2 time/unix network_io/win32 dso/win32 locks/unix user/unix time/win32 locks/beos tables support/unix file_io/unix mmap/unix atomic/unix threadproc/win32 poll/os2 atomic/win32 dso/os390 atomic/os390 dso/beos poll/unix passwd network_io/beos threadproc/os2 network_io/os2 shmem/win32 threadproc/beos shmem/unix network_io/unix file_io/os2 dso/aix file_io/win32 threadproc/unix misc/unix locks/win32 shmem/beos dso/unix locks/os2 user/win32 shmem/os2 memory/unix strings $(EXTRA_SOURCE_DIRS)
 
-BUILD_DIRS = atomic atomic/os390 atomic/unix dso dso/aix dso/beos dso/os2 dso/os390 dso/unix file_io file_io/os2 file_io/unix locks locks/beos locks/os2 locks/unix memory memory/unix misc misc/unix mmap mmap/unix network_io network_io/beos network_io/os2 network_io/unix passwd poll poll/os2 poll/unix random random/unix shmem shmem/beos shmem/os2 shmem/unix strings support support/unix tables threadproc threadproc/beos threadproc/os2 threadproc/unix time time/unix user user/unix
+BUILD_DIRS = atomic atomic/os390 atomic/unix atomic/win32 dso dso/aix dso/beos dso/os2 dso/os390 dso/unix dso/win32 file_io file_io/os2 file_io/unix file_io/win32 locks locks/beos locks/os2 locks/unix locks/win32 memory memory/unix misc misc/unix misc/win32 mmap mmap/unix mmap/win32 network_io network_io/beos network_io/os2 network_io/unix network_io/win32 passwd poll poll/os2 poll/unix random random/unix shmem shmem/beos shmem/os2 shmem/unix shmem/win32 strings support support/unix tables threadproc threadproc/beos threadproc/os2 threadproc/unix threadproc/win32 time time/unix time/win32 user user/unix user/win32
 
 .make.dirs: $(srcdir)/build-outputs.mk
 	@for d in $(BUILD_DIRS); do test -d $$d || mkdir $$d; done
diff --git a/srclib/apr/build.conf b/srclib/apr/build.conf
index 0522a1bb..c302b98b 100644
--- a/srclib/apr/build.conf
+++ b/srclib/apr/build.conf
@@ -13,8 +13,8 @@ paths =
 # directories that have platform-specific code in them. the resulting
 # pattern will be: SUBDIR/PLATFORM/*.c
 platform_dirs =
-  atomic dso file_io locks memory misc mmap network_io poll random
-  shmem support threadproc time user
+  dso file_io locks memory misc mmap network_io poll random
+  shmem support threadproc time user atomic
 
 # all the public headers
 headers = include/*.h
@@ -24,3 +24,5 @@ headers = include/*.h
 
 # we have a recursive makefile for the test files (for now)
 # test/*.c
+
+dsp = libapr.dsp
diff --git a/srclib/apr/build/MakeEtags b/srclib/apr/build/MakeEtags
index c4e957c9..cf1a4868 100755
--- a/srclib/apr/build/MakeEtags
+++ b/srclib/apr/build/MakeEtags
@@ -12,22 +12,24 @@
 # tag-table-alist with an entry to assure it finds the single ./TAGS
 # file from the many source directories.  Something along these lines:
 # (setq tag-table-alist
-#	'(("/home/me/work/httpd-2.0/" 
-#	   . "/home/me/work/httpd-2.0/")
+#	'(("/home/me/work/apr-x.y/" . "/home/me/work/apr-x.y/")
+#	  ("/home/me/work/apr-util-x.y/" . "/home/me/work/apr-util-x.y/")
+#	  ("/home/me/work/httpd-x.y/" . "/home/me/work/httpd-x.y/")
 #	 ))
 
 # This requires a special version of etags, i.e. the
 # one called "Exuberant ctags" available at:
-#    http://fly.hiwaay.net/~darren/ctags/
+#    http://ctags.sourceforge.net/
 # Once that is setup you'll need to point to the
 # executable here:
 
-etags=~/local/bin/etags
+etags=${ETAGS-etags}
 
 # Exuberant etags is necessary since it can ignore some defined symbols
 # that obscure the function signatures.
 
-ignore=AP_DECLARE,AP_DECLARE_NONSTD,__declspec
+ignore=AP_DECLARE,AP_DECLARE_NONSTD,__declspec,APR_DECLARE,APR_DECLARE_NONSTD
+ignore=$ignore,APU_DECLARE,APU_DECLARE_NONSTD
 
 # Create an etags file at the root of the source
 # tree, then create symbol links to it from each
diff --git a/srclib/apr/build/NWGNUenvironment.inc b/srclib/apr/build/NWGNUenvironment.inc
index 7f6b318f..8075309e 100644
--- a/srclib/apr/build/NWGNUenvironment.inc
+++ b/srclib/apr/build/NWGNUenvironment.inc
@@ -106,10 +106,10 @@ endif
 #
 
 # MetroWerks NLM tools
-CC		= mwccnlm
-CPP		= mwccnlm
+CC	= mwccnlm
+CPP	= mwccnlm
 LINK	= mwldnlm
-LIB		= mwldnlm -type library -w nocmdline
+LIB	= mwldnlm -type library -w nocmdline
 
 ifdef IPV6
 ifndef USE_STDSOCKETS
@@ -119,14 +119,20 @@ endif
 
 NOVI	= $(NOVELLLIBC)\imports
 
-INCDIRS 	= $(NOVELLLIBC)\include;$(NOVELLLIBC)\include\nks;$(NOVELLLIBC)\include\winsock;
+INCDIRS	= $(NOVELLLIBC)\include;$(NOVELLLIBC)\include\nks;$(NOVELLLIBC)\include\winsock;
 
-DEFINES		= -DNETWARE
+DEFINES	= -DNETWARE
 ifndef USE_STDSOCKETS
-DEFINES += -DUSE_WINSOCK
+DEFINES	+= -DUSE_WINSOCK
 endif
 ifndef DEBUG
-DEFINES += -DNDEBUG
+DEFINES	+= -DNDEBUG
+endif
+
+ifdef USE_STDSOCKETS
+VERSION_SKT = (BSDSOCK)
+else
+VERSION_SKT = (WINSOCK)
 endif
 
 #
diff --git a/srclib/apr/build/NWGNUmakefile b/srclib/apr/build/NWGNUmakefile
index 84ed7fed..1c3f4b1b 100644
--- a/srclib/apr/build/NWGNUmakefile
+++ b/srclib/apr/build/NWGNUmakefile
@@ -32,7 +32,7 @@ $(APR)/aprlib.imp : make_nw_export.awk nw_export.i
 	@echo Generating $(subst /,\,$@)
 	awk -f make_nw_export.awk nw_export.i | sort >$(APR)/aprlib.imp
     
-nw_export.i : nw_export.inc $(FILES_prebuild_headers) $(NLM_NAME)_cc.opt
+nw_export.i : nw_export.inc $(APRUTIL)/build/nw_apu_export.inc $(FILES_prebuild_headers) $(NLM_NAME)_cc.opt
 	@echo Generating $(subst /,\,$@)
 	$(CC) $< @$(NLM_NAME)_cc.opt
 
@@ -47,6 +47,7 @@ $(NLM_NAME)_cc.opt : NWGNUmakefile $(APR_WORK)\build\NWGNUenvironment.inc $(APR_
 	@echo -I$(APR)\include\arch\netware >> $@
 	@echo -I$(APR)\include\arch\unix >> $@
 	@echo -I$(APRUTIL)\include >> $@
+	@echo -I$(APRUTIL)\build >> $@
 	@echo -ir $(NOVELLLIBC) >> $@
 ifneq "$(LDAPSDK)" ""
 	@echo -ir $(LDAPSDK) >> $@
@@ -60,6 +61,10 @@ $(APRUTIL)/include/private/%.h: $(subst /,\,$(APRUTIL))\include\private\%.hnw
 	@echo Creating $(subst /,\,$@)
 	copy $< $(subst /,\,$(APRUTIL))\include\private\$(@F)
 
+$(APRUTIL)/include/private/%.h: $(subst /,\,$(APRUTIL))\include\private\%.hw
+	@echo Creating $(subst /,\,$@)
+	copy $< $(subst /,\,$(APRUTIL))\include\private\$(@F)
+
 $(APRUTIL)/include/%.h: $(subst /,\,$(APRUTIL))\include\%.hnw
 	@echo Creating $(subst /,\,$@)
 	copy $< $(subst /,\,$(APRUTIL))\include\$(@F)
@@ -77,7 +82,7 @@ $(APRUTIL)/xml/expat/lib/%.h: $(subst /,\,$(APRUTIL))\xml\expat\lib\%.h.in
 # installation area
 #
 install :: nlms FORCE
-
+	
 
 clean ::
 	$(CHK) nw_export.i                                              $(DEL) nw_export.i
diff --git a/srclib/apr/build/NWGNUtail.inc b/srclib/apr/build/NWGNUtail.inc
index 98669c1a..8d7829dd 100644
--- a/srclib/apr/build/NWGNUtail.inc
+++ b/srclib/apr/build/NWGNUtail.inc
@@ -92,8 +92,8 @@ $(APR_WORK)\build\NWGNUversion.inc : $(APR_WORK)\include\apr_version.h $(APR_WOR
 ifneq "$(strip $(VERSION_STR))" ""
 VERSION_INC = $(APR_WORK)\build\NWGNUversion.inc
 else
-VERSION		= 1,2,0
-VERSION_STR	= 1.2.0
+VERSION		= 1,0,0
+VERSION_STR	= 1.0.0
 endif
 
 ifeq "$(words $(strip $(TARGET_nlm)))" "1"
diff --git a/srclib/apr/build/apr_common.m4 b/srclib/apr/build/apr_common.m4
index caae9bfa..2afb4666 100644
--- a/srclib/apr/build/apr_common.m4
+++ b/srclib/apr/build/apr_common.m4
@@ -23,7 +23,7 @@ dnl APR_CONFIG_NICE(filename)
 dnl
 dnl Saves a snapshot of the configure command-line for later reuse
 dnl
-AC_DEFUN(APR_CONFIG_NICE,[
+AC_DEFUN([APR_CONFIG_NICE], [
   rm -f $1
   cat >$1<<EOF
 #! /bin/sh
@@ -80,7 +80,7 @@ EOF
 
 dnl APR_MKDIR_P_CHECK(fallback-mkdir-p)
 dnl checks whether mkdir -p works
-AC_DEFUN(APR_MKDIR_P_CHECK,[
+AC_DEFUN([APR_MKDIR_P_CHECK], [
   AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[
     test -d conftestdir && rm -rf conftestdir
     mkdir -p conftestdir/somedir >/dev/null 2>&1
@@ -118,7 +118,7 @@ dnl
 dnl Trying to optimize this is left as an exercise to the reader who wants
 dnl to put up with more autoconf craziness.  I give up.
 dnl
-AC_DEFUN(APR_SUBDIR_CONFIG, [
+AC_DEFUN([APR_SUBDIR_CONFIG], [
   # save our work to this point; this allows the sub-package to use it
   AC_CACHE_SAVE
 
@@ -161,8 +161,8 @@ changequote([, ])dnl
   # autoconf doesn't add --silent to ac_configure_args; explicitly pass it
   test "x$silent" = "xyes" && apr_configure_args="$apr_configure_args --silent"
 
-  dnl The eval makes quoting arguments work - specifically $2 where the
-  dnl quoting mechanisms used is "" rather than [].
+  dnl The eval makes quoting arguments work - specifically the second argument
+  dnl where the quoting mechanisms used is "" rather than [].
   dnl
   dnl We need to execute another shell because some autoconf/shell combinations
   dnl will choke after doing repeated APR_SUBDIR_CONFIG()s.  (Namely Solaris
@@ -186,7 +186,7 @@ dnl APR_SAVE_THE_ENVIRONMENT(variable_name)
 dnl
 dnl Stores the variable (usually a Makefile macro) for later restoration
 dnl
-AC_DEFUN(APR_SAVE_THE_ENVIRONMENT,[
+AC_DEFUN([APR_SAVE_THE_ENVIRONMENT], [
   apr_ste_save_$1="$$1"
 ])dnl
 
@@ -198,7 +198,7 @@ dnl has added to the variable, moving the new bits to prefix_variable_name
 dnl and restoring the original variable contents.  This makes it possible
 dnl for a user to override configure when it does something stupid.
 dnl
-AC_DEFUN(APR_RESTORE_THE_ENVIRONMENT,[
+AC_DEFUN([APR_RESTORE_THE_ENVIRONMENT], [
 if test "x$apr_ste_save_$1" = "x"; then
   $2$1="$$1"
   $1=
@@ -222,7 +222,7 @@ dnl APR_SETIFNULL(variable, value)
 dnl
 dnl  Set variable iff it's currently null
 dnl
-AC_DEFUN(APR_SETIFNULL,[
+AC_DEFUN([APR_SETIFNULL], [
   if test -z "$$1"; then
     test "x$silent" != "xyes" && echo "  setting $1 to \"$2\""
     $1="$2"
@@ -234,7 +234,7 @@ dnl APR_SETVAR(variable, value)
 dnl
 dnl  Set variable no matter what
 dnl
-AC_DEFUN(APR_SETVAR,[
+AC_DEFUN([APR_SETVAR], [
   test "x$silent" != "xyes" && echo "  forcing $1 to \"$2\""
   $1="$2"
 ])dnl
@@ -244,7 +244,7 @@ dnl APR_ADDTO(variable, value)
 dnl
 dnl  Add value to variable
 dnl
-AC_DEFUN(APR_ADDTO,[
+AC_DEFUN([APR_ADDTO], [
   if test "x$$1" = "x"; then
     test "x$silent" != "xyes" && echo "  setting $1 to \"$2\""
     $1="$2"
@@ -271,7 +271,7 @@ dnl APR_REMOVEFROM(variable, value)
 dnl
 dnl Remove a value from a variable
 dnl
-AC_DEFUN(APR_REMOVEFROM,[
+AC_DEFUN([APR_REMOVEFROM], [
   if test "x$$1" = "x$2"; then
     test "x$silent" != "xyes" && echo "  nulling $1"
     $1=""
@@ -295,7 +295,7 @@ AC_DEFUN(APR_REMOVEFROM,[
 dnl
 dnl APR_CHECK_DEFINE_FILES( symbol, header_file [header_file ...] )
 dnl
-AC_DEFUN(APR_CHECK_DEFINE_FILES,[
+AC_DEFUN([APR_CHECK_DEFINE_FILES], [
   AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
     ac_cv_define_$1=no
     for curhdr in $2
@@ -317,7 +317,7 @@ YES_IS_DEFINED
 dnl
 dnl APR_CHECK_DEFINE(symbol, header_file)
 dnl
-AC_DEFUN(APR_CHECK_DEFINE,[
+AC_DEFUN([APR_CHECK_DEFINE], [
   AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
     AC_EGREP_CPP(YES_IS_DEFINED, [
 #include <$2>
@@ -334,7 +334,7 @@ YES_IS_DEFINED
 dnl
 dnl APR_CHECK_APR_DEFINE( symbol )
 dnl
-AC_DEFUN(APR_CHECK_APR_DEFINE,[
+AC_DEFUN([APR_CHECK_APR_DEFINE], [
 apr_old_cppflags=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $INCLUDES"
 AC_EGREP_CPP(YES_IS_DEFINED, [
@@ -450,12 +450,12 @@ dnl
 dnl A variant of AC_CHECK_SIZEOF which allows the checking of
 dnl sizes of non-builtin types
 dnl
-AC_DEFUN(APR_CHECK_SIZEOF_EXTENDED,
-[changequote(<<,>>)dnl
-dnl The name to #define
+AC_DEFUN([APR_CHECK_SIZEOF_EXTENDED],
+[changequote(<<, >>)dnl
+dnl The name to #define.
 define(<<AC_TYPE_NAME>>, translit(sizeof_$2, [a-z *], [A-Z_P]))dnl
-dnl The cache variable
-define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$2, [ *],[<p>]))dnl
+dnl The cache variable name.
+define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$2, [ *], [_p]))dnl
 changequote([, ])dnl
 AC_MSG_CHECKING(size of $2)
 AC_CACHE_VAL(AC_CV_NAME,
@@ -463,7 +463,7 @@ AC_CACHE_VAL(AC_CV_NAME,
 $1
 main()
 {
-  FILE *f=fopen("conftestval","w");
+  FILE *f=fopen("conftestval", "w");
   if (!f) exit(1);
   fprintf(f, "%d\n", sizeof($2));
   exit(0);
@@ -511,7 +511,7 @@ dnl  for failure), or it returns a pointer to the error
 dnl  string.
 dnl
 dnl
-AC_DEFUN(APR_CHECK_STRERROR_R_RC,[
+AC_DEFUN([APR_CHECK_STRERROR_R_RC], [
 AC_MSG_CHECKING(for type of return code from strerror_r)
 AC_TRY_RUN([
 #include <errno.h>
@@ -546,7 +546,7 @@ dnl  Decide if d_fileno or d_ino are available in the dirent
 dnl  structure on this platform.  Single UNIX Spec says d_ino,
 dnl  BSD uses d_fileno.  Undef to find the real beast.
 dnl
-AC_DEFUN(APR_CHECK_DIRENT_INODE, [
+AC_DEFUN([APR_CHECK_DIRENT_INODE], [
 AC_CACHE_CHECK([for inode member of struct dirent], apr_cv_dirent_inode, [
 apr_cv_dirent_inode=no
 AC_TRY_COMPILE([
@@ -584,7 +584,7 @@ dnl  on this platform.  Not part of the Single UNIX Spec.
 dnl  Note that this is worthless without DT_xxx macros, so
 dnl  look for one while we are at it.
 dnl
-AC_DEFUN(APR_CHECK_DIRENT_TYPE,[
+AC_DEFUN([APR_CHECK_DIRENT_TYPE], [
 AC_CACHE_CHECK([for file type member of struct dirent], apr_cv_dirent_type,[
 apr_cv_dirent_type=no
 AC_TRY_COMPILE([
@@ -633,7 +633,7 @@ dnl  by changing all "/" to "_" in the HEADER-FILE and dropping
 dnl  all "." and "-" chars. If the 3rd parameter is "yes" then instead of
 dnl  setting to 1 or 0, we set FLAG-TO-SET to yes or no.
 dnl  
-AC_DEFUN(APR_FLAG_HEADERS,[
+AC_DEFUN([APR_FLAG_HEADERS], [
 AC_CHECK_HEADERS($1)
 for aprt_i in $1
 do
@@ -654,7 +654,7 @@ dnl  we use what's provided as FLAG-TO-SET. If the 3rd parameter
 dnl  is "yes" then instead of setting to 1 or 0, we set FLAG-TO-SET
 dnl  to yes or no.
 dnl
-AC_DEFUN(APR_FLAG_FUNCS,[
+AC_DEFUN([APR_FLAG_FUNCS], [
 AC_CHECK_FUNCS($1)
 for aprt_j in $1
 do
@@ -679,7 +679,7 @@ dnl baz='${bar}/3'
 dnl APR_EXPAND_VAR(fraz, $baz)
 dnl   $fraz is now "1/2/3"
 dnl 
-AC_DEFUN(APR_EXPAND_VAR,[
+AC_DEFUN([APR_EXPAND_VAR], [
 ap_last=
 ap_cur="$2"
 while test "x${ap_cur}" != "x${ap_last}";
@@ -698,7 +698,7 @@ dnl Example:
 dnl orig_path="${prefix}/bar"
 dnl APR_PATH_RELATIVE(final_path, $orig_path, $prefix)
 dnl    $final_path now contains "bar"
-AC_DEFUN(APR_PATH_RELATIVE,[
+AC_DEFUN([APR_PATH_RELATIVE], [
 ap_stripped=`echo $2 | sed -e "s#^$3##"`
 # check if the stripping was successful
 if test "x$2" != "x${ap_stripped}"; then
@@ -716,12 +716,12 @@ dnl AC_HELP_STRING, so let's try to call it if we can.
 dnl Note: this define must be on one line so that it can be properly returned
 dnl as the help string.  When using this macro with a multi-line RHS, ensure
 dnl that you surround the macro invocation with []s
-AC_DEFUN(APR_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[  ][$1] substr([                       ],len($1))[$2])])
+AC_DEFUN([APR_HELP_STRING], [ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[  ][$1] substr([                       ],len($1))[$2])])
 
 dnl
 dnl APR_LAYOUT(configlayout, layoutname [, extravars])
 dnl
-AC_DEFUN(APR_LAYOUT,[
+AC_DEFUN([APR_LAYOUT], [
   if test ! -f $srcdir/config.layout; then
     echo "** Error: Layout file $srcdir/config.layout not found"
     echo "** Error: Cannot use undefined layout '$LAYOUT'"
@@ -784,7 +784,7 @@ AC_DEFUN(APR_LAYOUT,[
 dnl
 dnl APR_ENABLE_LAYOUT(default layout name [, extra vars])
 dnl
-AC_DEFUN(APR_ENABLE_LAYOUT,[
+AC_DEFUN([APR_ENABLE_LAYOUT], [
 AC_ARG_ENABLE(layout,
 [  --enable-layout=LAYOUT],[
   LAYOUT=$enableval
@@ -805,7 +805,7 @@ dnl APR_PARSE_ARGUMENTS
 dnl a reimplementation of autoconf's argument parser,
 dnl used here to allow us to co-exist layouts and argument based
 dnl set ups.
-AC_DEFUN(APR_PARSE_ARGUMENTS,[
+AC_DEFUN([APR_PARSE_ARGUMENTS], [
 ac_prev=
 # Retrieve the command-line arguments.  The eval is needed because
 # the arguments are quoted to preserve accuracy.
@@ -931,7 +931,7 @@ dnl APR_CHECK_DEPEND
 dnl
 dnl Determine what program we can use to generate .deps-style dependencies
 dnl
-AC_DEFUN(APR_CHECK_DEPEND,[
+AC_DEFUN([APR_CHECK_DEPEND], [
 dnl Try to determine what depend program we can use
 dnl All GCC-variants should have -MM.
 dnl If not, then we can check on those, too.
@@ -974,4 +974,3 @@ AC_TRY_COMPILE(AC_INCLUDES_DEFAULT, [
 ], [apr_cvname=yes
 $3], [apr_cvname=no])])
 ])
-
diff --git a/srclib/apr/build/apr_hints.m4 b/srclib/apr/build/apr_hints.m4
index 101d7737..66837b63 100644
--- a/srclib/apr/build/apr_hints.m4
+++ b/srclib/apr/build/apr_hints.m4
@@ -176,6 +176,9 @@ dnl	       # Not a problem in 10.20.  Otherwise, who knows?
           APR_SETIFNULL(ac_cv_func_kqueue, no)
         fi
 	;;
+    *-k*bsd*-gnu)
+        APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_GNU_SOURCE])
+        ;;
     *-next-nextstep*)
 	APR_SETIFNULL(CFLAGS, [-O])
 	APR_ADDTO(CPPFLAGS, [-DNEXT])
@@ -188,14 +191,18 @@ dnl	       # Not a problem in 10.20.  Otherwise, who knows?
 	APR_ADDTO(CPPFLAGS, [-DRHAPSODY])
 	;;
     *-apple-darwin*)
-	APR_ADDTO(CPPFLAGS, [-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp])
-	APR_SETIFNULL(apr_posixsem_is_global, [yes])
-        APR_SETIFNULL(ac_cv_func_poll, [no]) # See issue 34332
-
-        # kqueue is broken on OS X, the poll tests work, but the socket tests
-        # hang when it's turned on.  if you decide to reenable this please be
-        # sure to test that ALL the tests continue to work with it turned on.
-        APR_SETIFNULL(ac_cv_func_kqueue, [no]) 
+        APR_ADDTO(CPPFLAGS, [-DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK -no-cpp-precomp])
+        APR_SETIFNULL(apr_posixsem_is_global, [yes])
+        # kqueue works in 10.5/Darwin 9.x. Disable on all older versions.
+        case $host in
+            *-apple-darwin[[0-8]].*)
+            # kqueue is broken on OS X, the poll tests work, but the socket tests
+            # hang when it's turned on.  if you decide to reenable this please be
+            # sure to test that ALL the tests continue to work with it turned on.
+            APR_SETIFNULL(ac_cv_func_kqueue, [no]) 
+            APR_SETIFNULL(ac_cv_func_poll, [no]) # See issue 34332
+            ;;
+        esac
 	;;
     *-dec-osf*)
 	APR_ADDTO(CPPFLAGS, [-DOSF1])
@@ -236,6 +243,9 @@ dnl	       # Not a problem in 10.20.  Otherwise, who knows?
     	PLATOSVERS=`echo $host | sed 's/^.*solaris2.//'`
 	APR_ADDTO(CPPFLAGS, [-DSOLARIS2=$PLATOSVERS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT])
         APR_SETIFNULL(apr_lock_method, [USE_FCNTL_SERIALIZE])
+        # readdir64_r error handling seems broken on Solaris (at least
+        # up till 2.8) -- it will return -1 at end-of-directory.
+        APR_SETIFNULL(ac_cv_func_readdir64_r, [no])
 	;;
     *-sunos4*)
 	APR_ADDTO(CPPFLAGS, [-DSUNOS4])
@@ -405,21 +415,40 @@ dnl	       # Not a problem in 10.20.  Otherwise, who knows?
 	APR_ADDTO(CPPFLAGS, [-D_TANDEM_SOURCE -D_XOPEN_SOURCE_EXTENDED=1])
 	;;
     *-ibm-os390)
-       APR_SETIFNULL(apr_lock_method, [USE_SYSVSEM_SERIALIZE])
-       APR_SETIFNULL(apr_sysvsem_is_global, [yes])
-       APR_SETIFNULL(apr_gethostbyname_is_thread_safe, [yes])
-       APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
-       APR_ADDTO(CPPFLAGS, [-U_NO_PROTO -DPTHREAD_ATTR_SETDETACHSTATE_ARG2_ADDR -DPTHREAD_SETS_ERRNO -DPTHREAD_DETACH_ARG1_ADDR -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1])
-       ;;
+        APR_SETIFNULL(apr_lock_method, [USE_SYSVSEM_SERIALIZE])
+        APR_SETIFNULL(apr_sysvsem_is_global, [yes])
+        APR_SETIFNULL(apr_gethostbyname_is_thread_safe, [yes])
+        APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
+        AC_DEFINE(HAVE_ZOS_PTHREADS, 1, [Define for z/OS pthread API nuances])
+        APR_ADDTO(CPPFLAGS, [-U_NO_PROTO -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1])
+        ;;
     *-ibm-as400)
-       APR_SETIFNULL(apr_lock_method, [USE_SYSVSEM_SERIALIZE])
-       APR_SETIFNULL(apr_process_lock_is_global, [yes])
-       APR_SETIFNULL(apr_gethostbyname_is_thread_safe, [yes])
-       APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
-       ;;
+        APR_SETIFNULL(apr_lock_method, [USE_SYSVSEM_SERIALIZE])
+        APR_SETIFNULL(apr_process_lock_is_global, [yes])
+        APR_SETIFNULL(apr_gethostbyname_is_thread_safe, [yes])
+        APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
+        ;;
     *cygwin*)
 	APR_ADDTO(CPPFLAGS, [-DCYGWIN])
-	APR_ADDTO(LIBS, [-lcrypt])
+	;;
+    *mingw*)
+	dnl gcc (3.4.2 at least) seems to mis-optimize at levels greater than
+	dnl -O0 producing link-time errors.  The user can override by
+	dnl explicitly passing a CFLAGS value to configure.
+	dnl 
+	dnl Example error messages:
+	dnl undefined reference to 'libmsvcrt_a_iname'
+	dnl undefined reference to '_nm___pctype'
+	if test "$ac_test_CFLAGS" != set; then
+		APR_REMOVEFROM(CFLAGS,-O2)
+		APR_ADDTO(CFLAGS,-O0)
+	fi
+	APR_ADDTO(LDFLAGS, [-Wl,--enable-auto-import,--subsystem,console])
+	APR_SETIFNULL(apr_lock_method, [win32])
+	APR_SETIFNULL(apr_process_lock_is_global, [yes])
+	APR_SETIFNULL(have_unicode_fs, [1])
+	APR_SETIFNULL(have_proc_invoked, [1])
+	APR_SETIFNULL(apr_cv_use_lfs64, [yes])
 	;;
   esac
 
diff --git a/srclib/apr/build/apr_network.m4 b/srclib/apr/build/apr_network.m4
index 2b5a2a2b..192fcd81 100644
--- a/srclib/apr/build/apr_network.m4
+++ b/srclib/apr/build/apr_network.m4
@@ -19,13 +19,36 @@ dnl apr_network.m4: APR's autoconf macros for testing network support
 dnl
 
 dnl
+dnl check for type in_addr
+dnl
+AC_DEFUN(APR_TYPE_IN_ADDR,[
+  AC_CACHE_CHECK(for type in_addr, ac_cv_type_in_addr,[
+  AC_TRY_COMPILE([
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+],[
+ struct in_addr arg;
+ arg.s_addr = htonl(INADDR_ANY);
+], [ ac_cv_type_in_addr="yes"] , [
+ac_cv_type_in_addr="no"])
+])
+])
+
+dnl
 dnl check for working getaddrinfo()
 dnl
 dnl Note that if the system doesn't have gai_strerror(), we
 dnl can't use getaddrinfo() because we can't get strings
 dnl describing the error codes.
 dnl
-AC_DEFUN(APR_CHECK_WORKING_GETADDRINFO,[
+AC_DEFUN([APR_CHECK_WORKING_GETADDRINFO], [
   AC_CACHE_CHECK(for working getaddrinfo, ac_cv_working_getaddrinfo,[
   AC_TRY_RUN( [
 #ifdef HAVE_NETDB_H
@@ -74,7 +97,7 @@ fi
 ])
 
 dnl Check whether the AI_ADDRCONFIG flag can be used with getaddrinfo
-AC_DEFUN(APR_CHECK_GETADDRINFO_ADDRCONFIG, [
+AC_DEFUN([APR_CHECK_GETADDRINFO_ADDRCONFIG], [
   AC_CACHE_CHECK(for working AI_ADDRCONFIG, apr_cv_gai_addrconfig, [
   AC_TRY_RUN([
 #ifdef HAVE_NETDB_H
@@ -110,7 +133,7 @@ fi
 dnl
 dnl check for working getnameinfo()
 dnl
-AC_DEFUN(APR_CHECK_WORKING_GETNAMEINFO,[
+AC_DEFUN([APR_CHECK_WORKING_GETNAMEINFO], [
   AC_CACHE_CHECK(for working getnameinfo, ac_cv_working_getnameinfo,[
   AC_TRY_RUN( [
 #ifdef HAVE_NETDB_H
@@ -165,7 +188,7 @@ fi
 dnl
 dnl check for negative error codes for getaddrinfo()
 dnl
-AC_DEFUN(APR_CHECK_NEGATIVE_EAI,[
+AC_DEFUN([APR_CHECK_NEGATIVE_EAI], [
   AC_CACHE_CHECK(for negative error codes for getaddrinfo, ac_cv_negative_eai,[
   AC_TRY_RUN( [
 #ifdef HAVE_NETDB_H
@@ -197,7 +220,7 @@ dnl systems
 dnl
 dnl Note that this test is executed too early to see if we have all of
 dnl the headers.
-AC_DEFUN(APR_CHECK_GETHOSTBYNAME_R_STYLE,[
+AC_DEFUN([APR_CHECK_GETHOSTBYNAME_R_STYLE], [
 
 dnl Try and compile a glibc2 gethostbyname_r piece of code, and set the
 dnl style of the routines to glibc2 on success
@@ -221,6 +244,8 @@ APR_TRY_COMPILE_NO_WARNING([
 ],[
 int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, 
                           (char *) 0, 0, (struct hostent **) 0, &tmp);
+/* use tmp to suppress the warning */
+tmp=0;
 ], ac_cv_gethostbyname_r_style=glibc2, ac_cv_gethostbyname_r_style=none))
 
 if test "$ac_cv_gethostbyname_r_style" = "glibc2"; then
@@ -246,8 +271,10 @@ APR_TRY_COMPILE_NO_WARNING([
 #endif
 ],[
 int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, 
-                          (struct hostent_data *) 0);],
-ac_cv_gethostbyname_r_arg=hostent_data, ac_cv_gethostbyname_r_arg=char))
+                          (struct hostent_data *) 0);
+/* use tmp to suppress the warning */
+tmp=0;
+], ac_cv_gethostbyname_r_arg=hostent_data, ac_cv_gethostbyname_r_arg=char))
 
 if test "$ac_cv_gethostbyname_r_arg" = "hostent_data"; then
     AC_DEFINE(GETHOSTBYNAME_R_HOSTENT_DATA, 1, [Define if gethostbyname_r has the hostent_data for the third argument])
@@ -257,7 +284,7 @@ fi
 dnl
 dnl see if TCP_NODELAY setting is inherited from listening sockets
 dnl
-AC_DEFUN(APR_CHECK_TCP_NODELAY_INHERITED,[
+AC_DEFUN([APR_CHECK_TCP_NODELAY_INHERITED], [
   AC_CACHE_CHECK(if TCP_NODELAY setting is inherited from listening sockets, ac_cv_tcp_nodelay_inherited,[
   AC_TRY_RUN( [
 #include <stdio.h>
@@ -425,7 +452,7 @@ fi
 dnl
 dnl see if O_NONBLOCK setting is inherited from listening sockets
 dnl
-AC_DEFUN(APR_CHECK_O_NONBLOCK_INHERITED,[
+AC_DEFUN([APR_CHECK_O_NONBLOCK_INHERITED], [
   AC_CACHE_CHECK(if O_NONBLOCK setting is inherited from listening sockets, ac_cv_o_nonblock_inherited,[
   AC_TRY_RUN( [
 #include <stdio.h>
@@ -538,7 +565,7 @@ fi
 dnl 
 dnl check for socklen_t, fall back to unsigned int
 dnl
-AC_DEFUN(APR_CHECK_SOCKLEN_T,[
+AC_DEFUN([APR_CHECK_SOCKLEN_T], [
 AC_CACHE_CHECK(for socklen_t, ac_cv_socklen_t,[
 AC_TRY_COMPILE([
 #ifdef HAVE_SYS_TYPES_H
@@ -562,7 +589,7 @@ fi
 ])
 
 
-AC_DEFUN(APR_CHECK_INET_ADDR,[
+AC_DEFUN([APR_CHECK_INET_ADDR], [
 AC_CACHE_CHECK(for inet_addr, ac_cv_func_inet_addr,[
 AC_TRY_COMPILE([
 #ifdef HAVE_SYS_TYPES_H
@@ -588,7 +615,7 @@ fi
 ])
 
 
-AC_DEFUN(APR_CHECK_INET_NETWORK,[
+AC_DEFUN([APR_CHECK_INET_NETWORK], [
 AC_CACHE_CHECK(for inet_network, ac_cv_func_inet_network,[
 AC_TRY_COMPILE([
 #ifdef HAVE_SYS_TYPES_H
@@ -614,7 +641,7 @@ fi
 ])
 
 dnl Check for presence of struct sockaddr_storage.
-AC_DEFUN(APR_CHECK_SOCKADDR_STORAGE,[
+AC_DEFUN([APR_CHECK_SOCKADDR_STORAGE], [
 AC_CACHE_CHECK(for sockaddr_storage, apr_cv_define_sockaddr_storage,[
 AC_TRY_COMPILE([
 #ifdef HAVE_SYS_TYPES_H
@@ -636,7 +663,7 @@ AC_SUBST(have_sa_storage)
 ])
 
 dnl Check for presence of struct sockaddr_in6.
-AC_DEFUN(APR_CHECK_SOCKADDR_IN6,[
+AC_DEFUN([APR_CHECK_SOCKADDR_IN6], [
 AC_CACHE_CHECK(for sockaddr_in6, ac_cv_define_sockaddr_in6,[
 AC_TRY_COMPILE([
 #ifdef HAVE_SYS_TYPES_H
@@ -664,7 +691,7 @@ fi
 dnl
 dnl APR_H_ERRNO_COMPILE_CHECK
 dnl
-AC_DEFUN(APR_H_ERRNO_COMPILE_CHECK,[
+AC_DEFUN([APR_H_ERRNO_COMPILE_CHECK], [
   if test x$1 != x; then
     CPPFLAGS="-D$1 $CPPFLAGS"
   fi
@@ -750,7 +777,7 @@ dnl APR_CHECK_H_ERRNO_FLAG
 dnl
 dnl checks which flags are necessary for <netdb.h> to define h_errno
 dnl
-AC_DEFUN(APR_CHECK_H_ERRNO_FLAG,[
+AC_DEFUN([APR_CHECK_H_ERRNO_FLAG], [
   AC_MSG_CHECKING([for h_errno in netdb.h])
   AC_CACHE_VAL(ac_cv_h_errno_cppflags,[
     APR_H_ERRNO_COMPILE_CHECK
@@ -778,7 +805,7 @@ AC_DEFUN(APR_CHECK_H_ERRNO_FLAG,[
 ])
 
 
-AC_DEFUN(APR_EBCDIC,[
+AC_DEFUN([APR_EBCDIC], [
   AC_CACHE_CHECK([whether system uses EBCDIC],ac_cv_ebcdic,[
   AC_TRY_RUN( [
 int main(void) { 
diff --git a/srclib/apr/build/apr_threads.m4 b/srclib/apr/build/apr_threads.m4
index 62ae0e1a..cbc677b1 100644
--- a/srclib/apr/build/apr_threads.m4
+++ b/srclib/apr/build/apr_threads.m4
@@ -122,7 +122,7 @@ dnl
 dnl Try to find a way to enable POSIX threads.  Sets the 
 dnl pthreads_working variable to "yes" on success.
 dnl
-AC_DEFUN(APR_PTHREADS_CHECK,[
+AC_DEFUN([APR_PTHREADS_CHECK], [
 
 AC_CACHE_CHECK([for CFLAGS needed for pthreads], [apr_cv_pthreads_cflags],
 [apr_ptc_cflags=$CFLAGS
@@ -195,7 +195,7 @@ AC_DEFUN(APR_PTHREADS_CHECK_RESTORE, [
 dnl
 dnl APR_CHECK_SIGWAIT_ONE_ARG
 dnl
-AC_DEFUN(APR_CHECK_SIGWAIT_ONE_ARG,[
+AC_DEFUN([APR_CHECK_SIGWAIT_ONE_ARG], [
   AC_CACHE_CHECK(whether sigwait takes one argument,ac_cv_sigwait_one_arg,[
   AC_TRY_COMPILE([
 #if defined(__NETBSD__) || defined(DARWIN)
diff --git a/srclib/apr/build/apr_win32.m4 b/srclib/apr/build/apr_win32.m4
new file mode 100644
index 00000000..f9813742
--- /dev/null
+++ b/srclib/apr/build/apr_win32.m4
@@ -0,0 +1,33 @@
+
+dnl if $2 contains '@dd', links against mingw symbols
+dnl otherwise calls AC_CHECK_LIB
+AC_DEFUN([APR_CHECK_DLL_FUNC],[
+m4_define($1_function_name,m4_substr($2,0,m4_index($2,[@])))
+m4_define($1_function_arglength,m4_substr($2,m4_incr(m4_index($2,[@]))))
+m4_define($1_[function_name]_arglength,m4_substr($2,m4_incr(m4_index($2,[@]))))
+dnl m4_define(apr_check_dll_id,$1_m4_defn($1_function_name))
+
+AC_CACHE_CHECK([for $2 in $1],[ac_cv_lib_$1_]$1_function_name,[
+
+ac_func_search_save_LIBS=$LIBS
+LIBS="$LIBS -l$1"
+
+AC_TRY_LINK([
+#pragma pack(1)
+struct x {
+]m4_for([byte_id], 1, m4_defn([$1_function_name_arglength]), 1,[[ char c]]byte_id;
+)[};
+__stdcall ]$1_function_name[(]struct x[);],[
+struct x s = {0};
+]$1_function_name[(s)],
+[ac_cv_lib_$1_]$1_function_name[=yes],[ac_cv_lib_$1_]$1_function_name[=no])
+LIBS=$ac_func_search_save_LIBS
+])dnl AC_CACHE_CHECK
+
+AS_IF([test $ac_cv_lib_$1_]$1_function_name[ = yes],
+      [m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1),,Enable if this library is available)
+  LIBS="-l$1 $LIBS"
+])],
+    [$4])dnl
+])
+
diff --git a/srclib/apr/build/find_apr.m4 b/srclib/apr/build/find_apr.m4
index 048cb7bf..88f64a7e 100644
--- a/srclib/apr/build/find_apr.m4
+++ b/srclib/apr/build/find_apr.m4
@@ -22,7 +22,8 @@ dnl library. It provides a standardized mechanism for using APR. It supports
 dnl embedding APR into the application source, or locating an installed
 dnl copy of APR.
 dnl
-dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors)
+dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors,
+dnl              detailed-check)
 dnl
 dnl   where srcdir is the location of the bundled APR source directory, or
 dnl   empty if source is not bundled.
@@ -39,6 +40,14 @@ dnl   If multiple versions are specified, and --with-apr=PREFIX or the
 dnl   implicit installed search are used, then the first (leftmost) version
 dnl   in the list that is found will be used.  Currently defaults to [0 1].
 dnl
+dnl   where detailed-check is an M4 macro which sets the apr_acceptable to
+dnl   either "yes" or "no". The macro will be invoked for each installed
+dnl   copy of APR found, with the apr_config variable set appropriately.
+dnl   Only installed copies of APR which are considered acceptable by
+dnl   this macro will be considered found. If no installed copies are
+dnl   considered acceptable by this macro, apr_found will be set to either
+dnl   either "no" or "reconfig".
+dnl
 dnl Sets the following variables on exit:
 dnl
 dnl   apr_found : "yes", "no", "reconfig"
@@ -89,8 +98,8 @@ AC_DEFUN([APR_FIND_APR], [
 
   AC_MSG_CHECKING(for APR)
   AC_ARG_WITH(apr,
-  [  --with-apr=PATH         prefix for installed APR, path to APR build tree,
-                          or the full path to apr-config],
+  [  --with-apr=PATH         prefix for installed APR or the full path to 
+                             apr-config],
   [
     if test "$withval" = "no" || test "$withval" = "yes"; then
       AC_MSG_ERROR([--with-apr requires a directory or file to be provided])
@@ -101,16 +110,28 @@ AC_DEFUN([APR_FIND_APR], [
       for lookdir in "$withval/bin" "$withval"
       do
         if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then
-          apr_found="yes"
           apr_config="$lookdir/$apr_temp_apr_config_file"
+          ifelse([$5], [], [], [
+          apr_acceptable="yes"
+          $5
+          if test "$apr_acceptable" != "yes"; then
+            AC_MSG_WARN([Found APR in $apr_config, but we think it is considered unacceptable])
+            continue
+          fi])
+          apr_found="yes"
           break 2
         fi
       done
     done
 
     if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then
-      apr_found="yes"
       apr_config="$withval"
+      ifelse([$5], [], [apr_found="yes"], [
+          apr_acceptable="yes"
+          $5
+          if test "$apr_acceptable" = "yes"; then
+                apr_found="yes"
+          fi])
     fi
 
     dnl if --with-apr is used, it is a fatal error for its argument
@@ -124,15 +145,29 @@ AC_DEFUN([APR_FIND_APR], [
       for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
       do
         if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then
-          apr_found="yes"
           apr_config="$apr_temp_apr_config_file"
+          ifelse([$5], [], [], [
+          apr_acceptable="yes"
+          $5
+          if test "$apr_acceptable" != "yes"; then
+            AC_MSG_WARN([skipped APR at $apr_config, version not acceptable])
+            continue
+          fi])
+          apr_found="yes"
           break
         else
           dnl look in some standard places
           for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
             if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
-              apr_found="yes"
               apr_config="$lookdir/bin/$apr_temp_apr_config_file"
+              ifelse([$5], [], [], [
+              apr_acceptable="yes"
+              $5
+              if test "$apr_acceptable" != "yes"; then
+                AC_MSG_WARN([skipped APR at $apr_config, version not acceptable])
+                continue
+              fi])
+              apr_found="yes"
               break 2
             fi
           done
diff --git a/srclib/apr/build/fixwin32mak.pl b/srclib/apr/build/fixwin32mak.pl
index 2c7b7d2a..b559eecc 100644
--- a/srclib/apr/build/fixwin32mak.pl
+++ b/srclib/apr/build/fixwin32mak.pl
@@ -86,6 +86,15 @@ sub fixcwd {
                 $verchg = -1;
                 undef $orig;
             }
+            # With modern LINK.EXE linkers, there is a different LINK for
+            # each platform, and it's determined by the file path.  Best
+            # that here, after we compiled the code to the default CPU,
+            # that we also link here to the default CPU.  Omitting the
+            # /machine spec from the .dsp was not enough, MSVC put it back.
+            #
+            if ($src =~ s#^(LINK32_FLAGS=.*) /machine:(x|IX|I3)86 #$1 #) {
+                $verchg = -1;
+            }
             print $dstfl $src; 
         }
         undef $srcfl;
diff --git a/srclib/apr/build/gen-build.py b/srclib/apr/build/gen-build.py
index 9c772519..d59bf1d4 100755
--- a/srclib/apr/build/gen-build.py
+++ b/srclib/apr/build/gen-build.py
@@ -20,7 +20,7 @@ import re
 
 #
 # legal platforms: aix, beos, netware, os2, os390, unix, win32
-# 'make' users: aix, beos, os2, os390, unix
+# 'make' users: aix, beos, os2, os390, unix, win32 (mingw)
 #
 PLATFORMS = [ 'aix', 'beos', 'netware', 'os2', 'os390', 'unix', 'win32' ]
 MAKE_PLATFORMS = [
@@ -29,6 +29,7 @@ MAKE_PLATFORMS = [
   ('beos', 'unix'),
   ('os2', 'unix'),
   ('os390', 'unix'),
+  ('win32', 'unix'),
   ]
 # note: MAKE_PLATFORMS is an ordered set. we want to generate unix symbols
 #       first, so that the later platforms can reference them.
@@ -38,6 +39,11 @@ def main():
   parser = ConfigParser.ConfigParser()
   parser.read('build.conf')
 
+  if parser.has_option('options', 'dsp'):
+    dsp_file = parser.get('options', 'dsp')
+  else:
+    dsp_file = None
+
   headers = get_files(parser.get('options', 'headers'))
 
   # compute the relevant headers, along with the implied includes
@@ -65,6 +71,25 @@ def main():
     # record the object symbols to build for each platform
     group = [ '$(OBJECTS_all)' ]
 
+    # If we're doing win32, we're going to look in the libapr.dsp file
+    # for those files that we have to manually add to our list.
+    inherit_parent = { }
+    if platform == 'win32' and dsp_file:
+      for line in open(dsp_file).readlines():
+        if line[:7] != 'SOURCE=':
+          continue
+        if line[7:].find('unix') != -1:
+          # skip the leading .\ and split it out
+          inherit_files = line[9:].strip().split('\\')
+          # change the .c to .lo
+          assert inherit_files[-1][-2:] == '.c'
+          inherit_files[-1] = inherit_files[-1][:-2] + '.lo'
+          # replace the \\'s with /'s
+          inherit_line = '/'.join(inherit_files)
+          if not inherit_parent.has_key(inherit_files[0]):
+            inherit_parent[inherit_files[0]] = []
+          inherit_parent[inherit_files[0]].append(inherit_line)
+
     for subdir in string.split(parser.get('options', 'platform_dirs')):
       path = '%s/%s' % (subdir, platform)
       if not os.path.exists(path):
@@ -81,6 +106,9 @@ def main():
       files = get_files(path + '/*.c')
       objects, _unused = write_objects(f, legal_deps, h_deps, files)
 
+      if inherit_parent.has_key(subdir):
+        objects = objects + inherit_parent[subdir]
+
       symname = 'OBJECTS_%s_%s' % (subdir, platform)
 
       # and write the symbol for the whole group
@@ -135,6 +163,8 @@ def write_objects(f, legal_deps, h_deps, files):
   objects = [ ]
 
   for file in files:
+    if file[-10:] == '/apr_app.c':
+      continue
     assert file[-2:] == '.c'
     obj = file[:-2] + '.lo'
     objects.append(obj)
@@ -177,11 +207,13 @@ def resolve_deps(header_deps):
       if len(deps) != start:
         altered = 1
 
+def clean_path(path):
+    return path.replace("\\", "/")
 
 def get_files(patterns):
   files = [ ]
   for pat in string.split(patterns):
-    files.extend(glob.glob(pat))
+    files.extend(map(clean_path, glob.glob(pat)))
   return files
 
 
diff --git a/srclib/apr/build/jlibtool.c b/srclib/apr/build/jlibtool.c
index 869b14a5..9bed6bd2 100644
--- a/srclib/apr/build/jlibtool.c
+++ b/srclib/apr/build/jlibtool.c
@@ -19,7 +19,9 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#if !defined(__MINGW32__)
 #include <sys/wait.h>
+#endif
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
@@ -53,7 +55,7 @@
 #if defined(__APPLE__)
 #  define SHELL_CMD  "/bin/sh"
 #  define DYNAMIC_LIB_EXT "dylib"
-#  define MODULE_LIB_EXT  "so"
+#  define MODULE_LIB_EXT  "bundle"
 #  define STATIC_LIB_EXT "a"
 #  define OBJECT_EXT     "o"
 #  define LIBRARIAN      "ar"
@@ -63,7 +65,8 @@
 #  define PIC_FLAG "-fPIC -fno-common"
 #  define SHARED_OPTS "-dynamiclib"
 #  define MODULE_OPTS "-bundle"
-#  define DYNAMIC_LINK_OPTS "-flat_namespace -undefined suppress"
+#  define DYNAMIC_LINK_OPTS "-flat_namespace"
+#  define DYNAMIC_LINK_UNDEFINED "-undefined suppress"
 #  define dynamic_link_version_func darwin_dynamic_link_function
 #  define DYNAMIC_INSTALL_NAME "-install_name"
 #  define DYNAMIC_LINK_NO_INSTALL "-dylib_file"
@@ -145,6 +148,22 @@
 #  define LD_LIBRARY_PATH "LD_LIBRARY_PATH"
 #endif
 
+#if defined(__MINGW32__)
+#  define SHELL_CMD "sh"
+#  define DYNAMIC_LIB_EXT "dll"
+#  define MODULE_LIB_EXT  "dll"
+#  define STATIC_LIB_EXT "a"
+#  define OBJECT_EXT     "o"
+#  define LIBRARIAN      "ar"
+#  define LIBRARIAN_OPTS "cr"
+#  define RANLIB "ranlib"
+#  define LINKER_FLAG_PREFIX "-Wl,"
+#  define SHARED_OPTS "-shared"
+#  define MODULE_OPTS "-shared"
+#  define MKDIR_NO_UMASK
+#  define EXE_EXT ".exe"
+#endif
+
 #ifndef SHELL_CMD
 #error Unsupported platform: Please add defines for SHELL_CMD etc. for your platform.
 #endif
@@ -188,6 +207,12 @@ enum pic_mode_e {
     pic_AVOID,
 };
 
+enum shared_mode_e {
+    share_UNSET,
+    share_STATIC,
+    share_SHARED,
+};
+
 enum lib_type {
     type_UNKNOWN,
     type_DYNAMIC_LIB,
@@ -214,7 +239,7 @@ typedef struct {
 
 typedef struct {
     int silent;
-    int shared;
+    enum shared_mode_e shared;
     int export_all;
     int dry_run;
     enum pic_mode_e pic_mode;
@@ -250,6 +275,7 @@ typedef struct {
     library_opts shared_opts;
 
     const char *version_info;
+    const char *undefined_flag;
 } command_t;
 
 #ifdef RPATH
@@ -296,7 +322,7 @@ static int snprintf( char *str, size_t n, const char *fmt, ... )
 
 void init_count_chars(count_chars *cc)
 {
-    cc->vals = (const char**)malloc(PATH_MAX);
+    cc->vals = (const char**)malloc(PATH_MAX*sizeof(char*));
     cc->num = 0;
 }
 
@@ -315,6 +341,11 @@ void push_count_chars(count_chars *cc, const char *newval)
     cc->vals[cc->num++] = newval;
 }
 
+void pop_count_chars(count_chars *cc)
+{
+    cc->num--;
+}
+
 void insert_count_chars(count_chars *cc, const char *newval, int position)
 {
     int i;
@@ -337,7 +368,7 @@ void append_count_chars(count_chars *cc, count_chars *cctoadd)
     }
 }
 
-const char *flatten_count_chars(count_chars *cc)
+const char *flatten_count_chars(count_chars *cc, int space)
 {
     int i, size;
     char *newval;
@@ -346,6 +377,9 @@ const char *flatten_count_chars(count_chars *cc)
     for (i = 0; i < cc->num; i++) {
         if (cc->vals[i]) {
             size += strlen(cc->vals[i]) + 1;
+            if (space) {
+              size++;
+            }
         }
     }
 
@@ -355,7 +389,9 @@ const char *flatten_count_chars(count_chars *cc)
     for (i = 0; i < cc->num; i++) {
         if (cc->vals[i]) {
             strcat(newval, cc->vals[i]);
-            strcat(newval, " ");
+            if (space) {
+                strcat(newval, " ");
+            }
         }
     }
 
@@ -369,10 +405,14 @@ char *shell_esc(const char *str)
     unsigned char *d;
     const unsigned char *s;
 
-    cmd = (char *)malloc(2 * strlen(str) + 1);
+    cmd = (char *)malloc(2 * strlen(str) + 3);
     d = (unsigned char *)cmd;
     s = (const unsigned char *)str;
 
+#ifdef __MINGW32__
+    *d++ = '\"';
+#endif
+
     for (; *s; ++s) {
         if (*s == '"') {
             *d++ = '\\';
@@ -384,6 +424,10 @@ char *shell_esc(const char *str)
         *d++ = *s;
     }
 
+#ifdef __MINGW32__
+    *d++ = '\"';
+#endif
+
     *d = '\0';
     return cmd;
 }
@@ -403,8 +447,8 @@ int external_spawn(command_t *cmd, const char *file, const char **argv)
     if (cmd->options.dry_run) {
         return 0;
     }
-#ifdef __EMX__
-    return spawnvp(P_WAIT, file, argv);
+#if defined(__EMX__) || defined(__MINGW32__)
+    return spawnvp(P_WAIT, argv[0], argv);
 #else
     {
         pid_t pid;
@@ -440,7 +484,7 @@ int run_command(command_t *cmd_data, count_chars *cc)
 
     append_count_chars(&tmpcc, cc);
 
-    command = shell_esc(flatten_count_chars(&tmpcc));
+    command = shell_esc(flatten_count_chars(&tmpcc, 1));
 
     spawn_args[0] = SHELL_CMD;
     spawn_args[1] = "-c";
@@ -510,7 +554,7 @@ int parse_long_opt(char *arg, command_t *cmd_data)
         if (cmd_data->mode == mLink) {
             cmd_data->output = otDynamicLibraryOnly;
         }
-        cmd_data->options.shared = 1;
+        cmd_data->options.shared = share_SHARED;
     } else if (strcmp(var, "export-all") == 0) {
         cmd_data->options.export_all = 1;
     } else if (strcmp(var, "dry-run") == 0) {
@@ -549,6 +593,14 @@ int parse_short_opt(char *arg, command_t *cmd_data)
         return 1;
     }
 
+    if (strcmp(arg, "shared") == 0) {
+        if (cmd_data->mode == mLink) {
+            cmd_data->output = otDynamicLibraryOnly;
+        }
+        cmd_data->options.shared = share_SHARED;
+        return 1;
+    }
+
     if (strcmp(arg, "Zexe") == 0) {
         return 1;
     }
@@ -568,7 +620,7 @@ int parse_short_opt(char *arg, command_t *cmd_data)
     }
 
     if (strcmp(arg, "static") == 0) {
-        /* Don't respect it for now. */
+        cmd_data->options.shared = share_STATIC;
         return 1;
     }
 
@@ -631,6 +683,20 @@ long safe_strtol(const char *nptr, const char **endptr, int base)
     return rv; 
 }
 
+void safe_mkdir(const char *path)
+{
+    mode_t old_umask;
+
+    old_umask = umask(0);
+    umask(old_umask);
+
+#ifdef MKDIR_NO_UMASK
+    mkdir(path);
+#else
+    mkdir(path, ~old_umask);
+#endif
+}
+
 /* version_info is in the form of MAJOR:MINOR:PATCH */
 const char *darwin_dynamic_link_function(const char *version_info)
 {
@@ -807,12 +873,14 @@ char *check_library_exists(command_t *cmd, const char *arg, int pathlen,
 
         switch (pass) {
         case 0:
-            if (cmd->options.pic_mode != pic_AVOID || cmd->options.shared) {
+            if (cmd->options.pic_mode != pic_AVOID &&
+                cmd->options.shared != share_STATIC) {
                 strcpy(ext, DYNAMIC_LIB_EXT);
                 *libtype = type_DYNAMIC_LIB;
                 break;
             }
             pass = 1;
+            /* Fall through */
         case 1:
             strcpy(ext, STATIC_LIB_EXT);
             *libtype = type_STATIC_LIB;
@@ -898,6 +966,41 @@ char * load_noinstall_path(const char *arg, int pathlen)
     return expanded_path;
 }
 
+void add_dynamic_link_opts(command_t *cmd_data, count_chars *args)
+{
+#ifdef DYNAMIC_LINK_OPTS
+    if (cmd_data->options.pic_mode != pic_AVOID) {
+        if (!cmd_data->options.silent) {
+           printf("Adding: %s\n", DYNAMIC_LINK_OPTS);
+        }
+        push_count_chars(args, DYNAMIC_LINK_OPTS);
+        if (cmd_data->undefined_flag) {
+            push_count_chars(args, "-undefined");
+#if defined(__APPLE__)
+            /* -undefined dynamic_lookup is used by the bundled Python in
+             * 10.4, but if we don't set MACOSX_DEPLOYMENT_TARGET to 10.3+,
+             * we'll get a linker error if we pass this flag.
+             */
+            if (strcasecmp(cmd_data->undefined_flag,
+                           "dynamic_lookup") == 0) {
+                insert_count_chars(cmd_data->program_opts,
+                                   "MACOSX_DEPLOYMENT_TARGET=10.3", 0);
+            }
+#endif
+            push_count_chars(args, cmd_data->undefined_flag);
+        }
+        else {
+#ifdef DYNAMIC_LINK_UNDEFINED
+            if (!cmd_data->options.silent) {
+                printf("Adding: %s\n", DYNAMIC_LINK_UNDEFINED);
+            }
+            push_count_chars(args, DYNAMIC_LINK_UNDEFINED);
+#endif
+        }
+    }
+#endif
+}
+
 /* Read the final install location and add it to runtime library search path. */
 #ifdef RPATH
 void add_rpath(count_chars *cc, const char *path)
@@ -1011,8 +1114,8 @@ void add_minus_l(count_chars *cc, const char *arg)
         file = name;
         file = file+4;
         push_count_chars(cc, "-L");
-	push_count_chars(cc, arg);
-	/* we need one argument like -lapr-1 */
+        push_count_chars(cc, arg);
+        /* we need one argument like -lapr-1 */
         newarg = malloc(strlen(file) + 3);
         strcpy(newarg, "-l");
         strcat(newarg, file);
@@ -1035,6 +1138,128 @@ void add_linker_flag_prefix(count_chars *cc, const char *arg)
 #endif
 }
 
+/* returns just a file's name without the path */
+const char *jlibtool_basename(const char *fullpath)
+{
+    const char *name = strrchr(fullpath, '/');
+
+    if (name == NULL) {
+        name = strrchr(fullpath, '\\');
+    }
+
+    if (name == NULL) {
+        name = fullpath;
+    } else {
+        name++;
+    }
+
+    return name;
+}
+
+/* returns just a file's name without path or extension */
+const char *nameof(const char *fullpath)
+{
+    const char *name;
+    const char *ext;
+
+    name = jlibtool_basename(fullpath);
+    ext = strrchr(name, '.');
+
+    if (ext) {
+        char *trimmed;
+        trimmed = malloc(ext - name + 1);
+        strncpy(trimmed, name, ext - name);
+        trimmed[ext-name] = 0;
+        return trimmed;
+    }
+
+    return name;
+}
+
+int explode_static_lib(command_t *cmd_data, const char *lib)
+{
+    count_chars tmpdir_cc, libname_cc;
+    const char *tmpdir, *libname;
+    char savewd[PATH_MAX];
+    const char *name;
+    DIR *dir;
+    struct dirent *entry;
+    const char *lib_args[4];
+
+    /* Bah! */
+    if (cmd_data->options.dry_run) {
+        return 0;
+    }
+
+    name = jlibtool_basename(lib);
+
+    init_count_chars(&tmpdir_cc);
+    push_count_chars(&tmpdir_cc, ".libs/");
+    push_count_chars(&tmpdir_cc, name);
+    push_count_chars(&tmpdir_cc, ".exploded/");
+    tmpdir = flatten_count_chars(&tmpdir_cc, 0);
+
+    if (!cmd_data->options.silent) {
+        printf("Making: %s\n", tmpdir);
+    }
+    safe_mkdir(tmpdir);
+
+    push_count_chars(cmd_data->tmp_dirs, tmpdir);
+
+    getcwd(savewd, sizeof(savewd));
+
+    if (chdir(tmpdir) != 0) {
+        if (!cmd_data->options.silent) {
+            printf("Warning: could not explode %s\n", lib);
+        }
+        return 1;
+    }
+
+    if (lib[0] == '/') {
+        libname = lib;
+    }
+    else {
+        init_count_chars(&libname_cc);
+        push_count_chars(&libname_cc, "../../");
+        push_count_chars(&libname_cc, lib);
+        libname = flatten_count_chars(&libname_cc, 0);
+    }
+
+    lib_args[0] = LIBRARIAN;
+    lib_args[1] = "x";
+    lib_args[2] = libname;
+    lib_args[3] = NULL;
+
+    external_spawn(cmd_data, LIBRARIAN, lib_args);
+
+    chdir(savewd);
+    dir = opendir(tmpdir);
+
+    while ((entry = readdir(dir)) != NULL) {
+#if defined(__APPLE__) && defined(RANLIB)
+        /* Apple inserts __.SYMDEF which isn't needed.
+         * Leopard (10.5+) can also add '__.SYMDEF SORTED' which isn't
+         * much fun either.  Just skip them.
+         */
+        if (strstr(entry->d_name, "__.SYMDEF") != NULL) {
+            continue;
+        }
+#endif
+        if (entry->d_name[0] != '.') {
+            push_count_chars(&tmpdir_cc, entry->d_name);
+            name = flatten_count_chars(&tmpdir_cc, 0);
+            if (!cmd_data->options.silent) {
+                printf("Adding: %s\n", name);
+            }
+            push_count_chars(cmd_data->obj_files, name);
+            pop_count_chars(&tmpdir_cc);
+        }
+    }
+
+    closedir(dir);
+    return 0;
+}
+
 int parse_input_file_name(char *arg, command_t *cmd_data)
 {
     char *ext = strrchr(arg, '.');
@@ -1099,11 +1324,19 @@ int parse_input_file_name(char *arg, command_t *cmd_data)
 #ifdef ADD_MINUS_L
             if (libtype == type_DYNAMIC_LIB) {
                  add_minus_l(cmd_data->shared_opts.dependencies, newarg);
+            } else if (cmd_data->output == otLibrary &&
+                       libtype == type_STATIC_LIB) {
+                explode_static_lib(cmd_data, newarg);
             } else {
                  push_count_chars(cmd_data->shared_opts.dependencies, newarg);
             }
 #else
-            push_count_chars(cmd_data->shared_opts.dependencies, newarg);
+            if (cmd_data->output == otLibrary && libtype == type_STATIC_LIB) {
+                explode_static_lib(cmd_data, newarg);
+            }
+            else {
+                push_count_chars(cmd_data->shared_opts.dependencies, newarg);
+            }
 #endif
             if (libtype == type_DYNAMIC_LIB) {
                 if (cmd_data->options.no_install) {
@@ -1197,7 +1430,11 @@ int parse_output_file_name(char *arg, command_t *cmd_data)
         }
     }
 
+#ifdef EXE_EXT
+    if (!ext || strcmp(ext, EXE_EXT) == 0) {
+#else
     if (!ext) {
+#endif
         cmd_data->basename = arg;
         cmd_data->output = otProgram;
 #if defined(_OSD_POSIX)
@@ -1206,7 +1443,9 @@ int parse_output_file_name(char *arg, command_t *cmd_data)
         newarg = (char *)malloc(strlen(arg) + 5);
         strcpy(newarg, arg);
 #ifdef EXE_EXT
+	if (!ext) {
         strcat(newarg, EXE_EXT);
+	}
 #endif
         cmd_data->output_name = newarg;
         return 1;
@@ -1250,34 +1489,6 @@ int parse_output_file_name(char *arg, command_t *cmd_data)
     return 0;
 }
 
-/* returns just a file's name without path or extension */
-char *nameof(char *fullpath)
-{
-    char buffer[1024];
-    char *ext;
-    char *name = strrchr(fullpath, '/');
-
-    if (name == NULL) {
-        name = strrchr(fullpath, '\\');
-    }
-
-    if (name == NULL) {
-        name = fullpath;
-    } else {
-        name++;
-    }
-
-    strcpy(buffer, name);
-    ext = strrchr(buffer, '.');
-
-    if (ext) {
-        *ext = 0;
-        return strdup(buffer);
-    }
-
-    return name;
-}
-
 void parse_args(int argc, char *argv[], command_t *cmd_data)
 {
     int a;
@@ -1304,7 +1515,7 @@ void parse_args(int argc, char *argv[], command_t *cmd_data)
                     argused = parse_output_file_name(arg, cmd_data);
                 } else if (strcmp(arg+1, "MT") == 0) {
                     if (!cmd_data->options.silent) {
-                        printf("Adding: %s", arg);
+                        printf("Adding: %s\n", arg);
                     }
                     push_count_chars(cmd_data->arglist, arg);
                     arg = argv[++a];
@@ -1325,6 +1536,9 @@ void parse_args(int argc, char *argv[], command_t *cmd_data)
                     /* Skip the argument. */
                     ++a;
                     argused = 1;
+                } else if (strcmp(arg+1, "undefined") == 0) {
+                    cmd_data->undefined_flag = argv[++a];
+                    argused = 1;
                 } else if (arg[1] == 'R' && !arg[2]) {
                     /* -R dir Add dir to runtime library search path. */
                     add_runtimedirlib(argv[++a], cmd_data);
@@ -1345,58 +1559,6 @@ void parse_args(int argc, char *argv[], command_t *cmd_data)
 
 }
 
-int explode_static_lib(const char *lib, command_t *cmd_data)
-{
-    char tmpdir[1024];
-    char savewd[1024];
-    char cmd[1024];
-    const char *name;
-    DIR *dir;
-    struct dirent *entry;
-
-    /* Bah! */
-    if (cmd_data->options.dry_run) {
-        return 0;
-    }
-
-    strcpy(tmpdir, lib);
-    strcat(tmpdir, ".exploded");
-
-    mkdir(tmpdir, 0);
-    push_count_chars(cmd_data->tmp_dirs, strdup(tmpdir));
-    getcwd(savewd, sizeof(savewd));
-
-    if (chdir(tmpdir) != 0)
-        return 1;
-
-    strcpy(cmd, LIBRARIAN " x ");
-    name = strrchr(lib, '/');
-
-    if (name) {
-        name++;
-    } else {
-        name = lib;
-    }
-
-    strcat(cmd, "../");
-    strcat(cmd, name);
-    system(cmd);
-    chdir(savewd);
-    dir = opendir(tmpdir);
-
-    while ((entry = readdir(dir)) != NULL) {
-        if (entry->d_name[0] != '.') {
-            strcpy(cmd, tmpdir);
-            strcat(cmd, "/");
-            strcat(cmd, entry->d_name);
-            push_count_chars(cmd_data->arglist, strdup(cmd));
-        }
-    }
-
-    closedir(dir);
-    return 0;
-}
-
 #ifdef GEN_EXPORTS
 void generate_def_file(command_t *cmd_data)
 {
@@ -1534,11 +1696,7 @@ void link_fixup(command_t *c)
             push_count_chars(c->arglist, c->output_name);
             append_count_chars(c->arglist, c->obj_files);
             append_count_chars(c->arglist, c->shared_opts.dependencies);
-#ifdef DYNAMIC_LINK_OPTS
-            if (c->options.pic_mode != pic_AVOID) {
-                push_count_chars(c->arglist, DYNAMIC_LINK_OPTS);
-            }
-#endif
+            add_dynamic_link_opts(c, c->arglist);
         }
     }
 }
@@ -1635,6 +1793,41 @@ int run_mode(command_t *cmd_data)
             if (rv) {
                 return rv;
             }
+#if defined(__APPLE__) && defined(RANLIB)
+            /* From the Apple libtool(1) manpage on Tiger/10.4:
+             * ----
+             * With  the way libraries used to be created, errors were possible
+             * if the library was modified with ar(1) and  the  table  of
+             * contents  was  not updated  by  rerunning ranlib(1).  Thus the
+             * link editor, ld, warns when the modification date of a library
+             * is more  recent  than  the  creation date  of its table of
+             * contents.  Unfortunately, this means that you get the warning
+             * even if you only copy the library.
+             * ----
+             *
+             * This means that when we install the static archive, we need to
+             * rerun ranlib afterwards.
+             */
+            const char *lib_args[3], *static_lib_name;
+            char *tmp;
+            size_t len1, len2;
+            len1 = strlen(cmd_data->arglist->vals[cmd_data->arglist->num - 1]);
+
+            static_lib_name = jlibtool_basename(cmd_data->static_name.install);
+            len2 = strlen(static_lib_name);
+
+            tmp = malloc(len1 + len2 + 2);
+
+            snprintf(tmp, len1 + len2 + 2, "%s/%s",
+                    cmd_data->arglist->vals[cmd_data->arglist->num - 1],
+                    static_lib_name);
+
+            lib_args[0] = RANLIB;
+            lib_args[1] = tmp;
+            lib_args[2] = NULL;
+            external_spawn(cmd_data, RANLIB, lib_args);
+            free(tmp);
+#endif
             clear_count_chars(cctemp);
         }
         if (cmd_data->shared_name.install) {
@@ -1663,12 +1856,7 @@ int run_mode(command_t *cmd_data)
     case mLink:
         if (!cmd_data->options.dry_run) {
             /* Check first to see if the dir already exists! */
-            mode_t old_umask;
-
-            old_umask = umask(0);
-            umask(old_umask);
-
-            mkdir(".libs", ~old_umask);
+            safe_mkdir(".libs");
         }
 
         if (cmd_data->output == otStaticLibraryOnly ||
@@ -1716,12 +1904,8 @@ int run_mode(command_t *cmd_data)
                 push_count_chars(cmd_data->program_opts, MODULE_OPTS);
 #endif
             }
-#ifdef DYNAMIC_LINK_OPTS
-            if (cmd_data->options.pic_mode != pic_AVOID) {
-                push_count_chars(cmd_data->program_opts,
-                                 DYNAMIC_LINK_OPTS);
-            }
-#endif
+            add_dynamic_link_opts(cmd_data, cmd_data->program_opts);
+
             rv = run_command(cmd_data, cmd_data->shared_opts.normal);
             if (rv) {
                 return rv;
@@ -1781,6 +1965,9 @@ int ensure_fake_uptodate(command_t *cmd_data)
     if (cmd_data->mode == mInstall) {
         return 0;
     }
+    if (!cmd_data->fake_output_name) {
+        return 0;
+    }
 
     touch_args[0] = "touch";
     touch_args[1] = cmd_data->fake_output_name;
diff --git a/srclib/apr/build/libtool.m4 b/srclib/apr/build/libtool.m4
index 65b90635..cc03edf2 100644
--- a/srclib/apr/build/libtool.m4
+++ b/srclib/apr/build/libtool.m4
@@ -1,13 +1,13 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-## Free Software Foundation, Inc.
+## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
+## 2008  Free Software Foundation, Inc.
 ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 ##
 ## This file is free software; the Free Software Foundation gives
 ## unlimited permission to copy and/or distribute it, with or without
 ## modifications, as long as this notice is preserved.
 
-# serial 48 AC_PROG_LIBTOOL
+# serial 52 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -95,7 +95,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
 AC_REQUIRE([AC_OBJEXT])dnl
 AC_REQUIRE([AC_EXEEXT])dnl
 dnl
-
 AC_LIBTOOL_SYS_MAX_CMD_LEN
 AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 AC_LIBTOOL_OBJDIR
@@ -170,7 +169,7 @@ test -z "$STRIP" && STRIP=:
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
@@ -197,6 +196,8 @@ file_magic*)
   ;;
 esac
 
+_LT_REQUIRED_DARWIN_CHECKS
+
 AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 enable_win32_dll=yes, enable_win32_dll=no)
@@ -257,8 +258,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 # Check for compiler boilerplate output or warnings with
 # the simple compiler test code.
 AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -270,13 +272,85 @@ $rm conftest*
 # Check for linker boilerplate output or warnings with
 # the simple link test code.
 AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 ])# _LT_LINKER_BOILERPLATE
 
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+   [lt_cv_ld_exported_symbols_list=yes],
+   [lt_cv_ld_exported_symbols_list=no])
+   LDFLAGS="$save_LDFLAGS"
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[0123]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[[012]]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
 
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
@@ -287,12 +361,20 @@ $rm conftest*
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
 AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi],[])
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 ])# _LT_AC_SYS_LIBPATH_AIX
 
@@ -523,13 +605,17 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
@@ -546,6 +632,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
       ;;
     *64-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
@@ -586,7 +675,11 @@ sparc*-*solaris*)
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
       esac
       ;;
     esac
@@ -617,7 +710,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
 AC_CACHE_CHECK([$1], [$2],
   [$2=no
   ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$3"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -658,11 +751,12 @@ fi
 # ------------------------------------------------------------
 # Check whether the given compiler option works
 AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
   [$2=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $3"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -678,7 +772,7 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
        $2=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 ])
 
@@ -776,24 +870,27 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     fi
     ;;
   *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
 	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 ])
@@ -946,7 +1043,7 @@ else
     AC_CHECK_FUNC([shl_load],
 	  [lt_cv_dlopen="shl_load"],
       [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
 	[AC_CHECK_FUNC([dlopen],
 	      [lt_cv_dlopen="dlopen"],
 	  [AC_CHECK_LIB([dl], [dlopen],
@@ -954,7 +1051,7 @@ else
 	    [AC_CHECK_LIB([svld], [dlopen],
 		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
 	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
 	      ])
 	    ])
 	  ])
@@ -1020,7 +1117,8 @@ fi
 # ---------------------------------
 # Check to see if options -c and -o are simultaneously supported by compiler
 AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
@@ -1028,7 +1126,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -1168,6 +1266,7 @@ else
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
          AC_MSG_RESULT([yes])
        else
   AC_MSG_RESULT([no])
@@ -1185,7 +1284,8 @@ fi
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
 AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -1199,20 +1299,58 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+fi])
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -1230,7 +1368,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[[4-9]]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1369,12 +1507,8 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+  m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -1391,18 +1525,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -1440,7 +1562,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -1503,7 +1625,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[[3-9]]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1558,7 +1680,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1574,7 +1696,7 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -1587,18 +1709,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -1680,6 +1790,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -1775,6 +1889,13 @@ esac
 AC_MSG_RESULT([$dynamic_linker])
 test "$dynamic_linker" = no && can_build_shared=no
 
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -1785,7 +1906,8 @@ fi
 # _LT_AC_TAGCONFIG
 # ----------------
 AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
     [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
         [include additional configurations @<:@automatic@:>@])],
     [tagnames="$withval"])
@@ -2046,7 +2168,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
 
 # AC_PATH_TOOL_PREFIX
 # -------------------
-# find a file program which can recognise shared library
+# find a file program which can recognize shared library
 AC_DEFUN([AC_PATH_TOOL_PREFIX],
 [AC_REQUIRE([AC_PROG_EGREP])dnl
 AC_MSG_CHECKING([for $1])
@@ -2109,7 +2231,7 @@ fi
 
 # AC_PATH_MAGIC
 # -------------
-# find a file program which can recognise a shared library
+# find a file program which can recognize a shared library
 AC_DEFUN([AC_PATH_MAGIC],
 [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -2256,7 +2378,7 @@ esac
 # how to check for library dependencies
 #  -- PORTME fill in with the dynamic library characteristics
 AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
 lt_cv_deplibs_check_method,
 [lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -2273,7 +2395,7 @@ lt_cv_deplibs_check_method='unknown'
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[[4-9]]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2295,16 +2417,22 @@ cygwin*)
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
 darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -2342,7 +2470,7 @@ hpux10.20* | hpux11*)
   esac
   ;;
 
-interix3*)
+interix[[3-9]]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
   ;;
@@ -2358,7 +2486,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2392,6 +2520,10 @@ osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -2444,7 +2576,7 @@ AC_DEFUN([AC_PROG_NM],
   lt_cv_path_NM="$NM"
 else
   lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
@@ -2660,10 +2792,10 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 _LT_AC_SYS_COMPILER
 
@@ -2703,7 +2835,7 @@ aix3*)
   fi
   ;;
 
-aix4* | aix5*)
+aix[[4-9]]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -2760,6 +2892,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
 _LT_AC_TAGVAR(predeps, $1)=
 _LT_AC_TAGVAR(postdeps, $1)=
 _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
 
 # Source file extension for C++ test sources.
 ac_ext=cpp
@@ -2769,10 +2902,10 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -2869,7 +3002,7 @@ case $host_os in
     # FIXME: insert proper C++ library support
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
-  aix4* | aix5*)
+  aix[[4-9]]*)
     if test "$host_cpu" = ia64; then
       # On IA64, the linker does run time linking by default, so we don't
       # have to do anything special.
@@ -2882,7 +3015,7 @@ case $host_os in
       # Test if we are trying to use run time linking or normal
       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
       # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	for ld_flag in $LDFLAGS; do
 	  case $ld_flag in
 	  *-brtl*)
@@ -2918,7 +3051,7 @@ case $host_os in
 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	then
 	  # We have reworked collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  :
 	else
 	  # We have old collect2
 	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -3028,59 +3161,31 @@ case $host_os in
     fi
   ;;
       darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
       output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
+      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
       fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          else
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
       else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -3114,7 +3219,7 @@ case $host_os in
   freebsd-elf*)
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
     ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
+  freebsd* | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -3163,9 +3268,7 @@ case $host_os in
       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
       case $host_cpu in
-      hppa*64*|ia64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-        ;;
+      hppa*64*|ia64*) ;;
       *)
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
         ;;
@@ -3233,7 +3336,7 @@ case $host_os in
 	;;
     esac
     ;;
-  interix3*)
+  interix[[3-9]]*)
     _LT_AC_TAGVAR(hardcode_direct, $1)=no
     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -3273,7 +3376,7 @@ case $host_os in
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
     ;;
-  linux*)
+  linux* | k*bsd*-gnu)
     case $cc_basename in
       KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -3325,7 +3428,7 @@ case $host_os in
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      pgCC*)
+      pgCC* | pgcpp*)
         # Portland Group C++ compiler
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
   	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -3353,6 +3456,29 @@ case $host_os in
 	# dependencies.
 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
     esac
     ;;
   lynxos*)
@@ -3391,16 +3517,20 @@ case $host_os in
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
   openbsd*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    if test -f /usr/libexec/ld.so; then
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
     fi
-    output_verbose_link_cmd='echo'
     ;;
   osf3*)
     case $cc_basename in
@@ -3562,15 +3692,10 @@ case $host_os in
 	case $host_os in
 	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 	    ;;
 	esac
 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
@@ -3617,6 +3742,12 @@ case $host_os in
 	  fi
 
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	  *)
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
 	fi
 	;;
     esac
@@ -3736,7 +3867,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
 # compiler output when linking a shared library.
 # Parse the compiler output and extract the necessary
 # objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
 dnl we can't use the lt_simple_compile_test_code here,
 dnl because it contains code intended for an executable,
 dnl not a library.  It's possible we should let each
@@ -3861,10 +3993,15 @@ fi
 
 $rm -f confest.$objext
 
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
 # PORTME: override above test on systems where it is broken
 ifelse([$1],[CXX],
 [case $host_os in
-interix3*)
+interix[[3-9]]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   _LT_AC_TAGVAR(predep_objects,$1)=
@@ -3872,19 +4009,51 @@ interix3*)
   _LT_AC_TAGVAR(postdeps,$1)=
   ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;
 esac
 ])
-
 case " $_LT_AC_TAGVAR(postdeps, $1) " in
 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 esac
@@ -3927,10 +4096,17 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -3962,7 +4138,7 @@ aix3*)
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4* | aix5*)
+aix[[4-9]]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -4009,10 +4185,10 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -4069,7 +4245,7 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
 lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -4143,6 +4319,7 @@ if test -f "$ltmain"; then
     _LT_AC_TAGVAR(predeps, $1) \
     _LT_AC_TAGVAR(postdeps, $1) \
     _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
     _LT_AC_TAGVAR(archive_cmds, $1) \
     _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
     _LT_AC_TAGVAR(postinstall_cmds, $1) \
@@ -4158,6 +4335,7 @@ if test -f "$ltmain"; then
     _LT_AC_TAGVAR(module_cmds, $1) \
     _LT_AC_TAGVAR(module_expsym_cmds, $1) \
     _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
     _LT_AC_TAGVAR(exclude_expsyms, $1) \
     _LT_AC_TAGVAR(include_expsyms, $1); do
 
@@ -4204,7 +4382,7 @@ ifelse([$1], [],
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -4441,6 +4619,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
 # shared library.
 postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
@@ -4529,7 +4711,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
@@ -4612,6 +4794,7 @@ fi
 # ---------------------------------
 AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
 [AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
 AC_REQUIRE([AC_PROG_NM])
 AC_REQUIRE([AC_OBJEXT])
 # Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4648,7 +4831,7 @@ hpux*) # Its linker distinguishes data from code symbols
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
-linux*)
+linux* | k*bsd*-gnu)
   if test "$host_cpu" = ia64; then
     symcode='[[ABCDGIRSTW]]'
     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -4789,7 +4972,7 @@ EOF
     echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
     cat conftest.$ac_ext >&5
   fi
-  rm -f conftest* conftst*
+  rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -4838,13 +5021,16 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # like `-m68040'.
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
     darwin* | rhapsody*)
       # PIC is the default on this platform
@@ -4855,7 +5041,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # DJGPP does not support shared libraries at all
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -4881,7 +5067,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
     esac
   else
     case $host_os in
-      aix4* | aix5*)
+      aix[[4-9]]*)
 	# All AIX code is PIC.
 	if test "$host_cpu" = ia64; then
 	  # AIX 5 now supports IA64 processor
@@ -4921,7 +5107,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
+      freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -4964,7 +5150,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    ;;
 	esac
 	;;
-      linux*)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4977,7 +5163,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 	    ;;
-	  pgCC*)
+	  pgCC* | pgcpp*)
 	    # Portland Group C++ compiler.
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@ -4991,6 +5177,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    ;;
 	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
 	    ;;
 	esac
 	;;
@@ -5111,14 +5305,17 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
     darwin* | rhapsody*)
@@ -5127,7 +5324,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -5185,10 +5382,11 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      m4_if([$1], [GCJ], [],
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -5218,7 +5416,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -5237,6 +5435,22 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
         # All Alpha code is PIC.
         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -5246,6 +5460,10 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
+    rdos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
     solaris*)
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -5305,7 +5523,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
 #
 if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
   AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
     [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
     [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
      "" | " "*) ;;
@@ -5329,7 +5547,7 @@ esac
 #
 wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
 AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
   $lt_tmp_static_flag,
   [],
   [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
@@ -5340,11 +5558,12 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
 # ------------------------------------
 # See if the linker supports building shared libraries.
 AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 ifelse([$1],[CXX],[
   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix4* | aix5*)
+  aix[[4-9]]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -5357,12 +5576,13 @@ ifelse([$1],[CXX],[
     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
   ;;
   *)
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   esac
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 ],[
   runpath_var=
   _LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -5393,12 +5613,14 @@ ifelse([$1],[CXX],[
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   _LT_CC_BASENAME([$compiler])
@@ -5448,7 +5670,7 @@ ifelse([$1],[CXX],[
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[[3-9]]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5496,7 +5718,7 @@ EOF
       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_AC_TAGVAR(always_export_symbols, $1)=no
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -5514,7 +5736,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -5529,7 +5751,7 @@ EOF
       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -5547,13 +5769,22 @@ EOF
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5593,7 +5824,7 @@ EOF
 
     sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
       case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
@@ -5658,7 +5889,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[[4-9]]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -5678,7 +5909,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -5712,7 +5943,7 @@ _LT_EOF
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+  	  :
 	  else
   	  # We have old collect2
   	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -5805,31 +6036,13 @@ _LT_EOF
       # The linker will automatically build a .lib file if we build a DLL.
       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
       # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
       _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
 
     darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
@@ -5838,19 +6051,18 @@ _LT_EOF
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -5890,7 +6102,7 @@ _LT_EOF
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -6012,24 +6224,28 @@ _LT_EOF
       ;;
 
     openbsd*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	   ;;
-	 *)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
@@ -6088,17 +6304,16 @@ _LT_EOF
       case $host_os in
       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
@@ -6155,7 +6370,7 @@ _LT_EOF
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6230,7 +6445,7 @@ x|xyes)
       # to ld, don't add -lc before -lgcc.
       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
         soname=conftest
@@ -6333,6 +6548,30 @@ AC_DEFUN([LT_AC_PROG_RC],
 [AC_CHECK_TOOL(RC, windres, no)
 ])
 
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+  as_executable_p='test -x'
+else
+  as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
 ############################################################
 # NOTE: This macro has been submitted for inclusion into   #
 #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
@@ -6355,12 +6594,13 @@ do
   test -z "$as_dir" && as_dir=.
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6393,5 +6633,6 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
 done
 ])
 SED=$lt_cv_path_SED
+AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
 ])
diff --git a/srclib/apr/build/ltmain.sh b/srclib/apr/build/ltmain.sh
index 06823e05..27d498a0 100644
--- a/srclib/apr/build/ltmain.sh
+++ b/srclib/apr/build/ltmain.sh
@@ -1,8 +1,8 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008  Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This program is free software; you can redistribute it and/or modify
@@ -43,14 +43,22 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+VERSION=1.5.26
+TIMESTAMP=" (1.1220.2.492 2008/01/30 06:40:56)"
+
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
@@ -105,11 +113,19 @@ esac
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
+lt_env=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+	  save_$lt_var=\$$lt_var
+	  lt_env=\"$lt_var=\$$lt_var \$lt_env\"
+	  $lt_var=C
+	  export $lt_var
+	fi"
+done
+
+if test -n "$lt_env"; then
+  lt_env="env $lt_env"
 fi
 
 # Make sure IFS has a sensible default
@@ -136,6 +152,8 @@ duplicate_deps=no
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -196,7 +214,13 @@ func_win32_libid ()
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
       $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
-	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+	$SED -n -e '1,100{
+		/ I /{
+			s,.*,import,
+			p
+			q
+			}
+		}'`
       case $win32_nmres in
       import*)  win32_libid_type="x86 archive import";;
       *)        win32_libid_type="x86 archive static";;
@@ -327,7 +351,17 @@ func_extract_archives ()
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  extracted_serial=`expr $extracted_serial + 1`
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -454,11 +488,12 @@ do
     ;;
 
   --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+    echo "\
+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
+Copyright (C) 2008  Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     exit $?
     ;;
 
@@ -755,9 +790,11 @@ if test -z "$show_help"; then
     *.class) xform=class ;;
     *.cpp) xform=cpp ;;
     *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
+    *.[fF][09]?) xform=[fF][09]. ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
+    *.obj) xform=obj ;;
+    *.sx) xform=sx ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -926,7 +963,7 @@ EOF
       $run $rm "$lobj" "$output_obj"
 
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
 	test -n "$output_obj" && $run $rm $removelist
 	exit $EXIT_FAILURE
@@ -998,7 +1035,7 @@ EOF
       command="$command$suppress_output"
       $run $rm "$obj" "$output_obj"
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
 	$run $rm $removelist
 	exit $EXIT_FAILURE
@@ -1131,6 +1168,7 @@ EOF
     thread_safe=no
     vinfo=
     vinfo_number=no
+    single_module="${wl}-single_module"
 
     func_infer_tag $base_compile
 
@@ -1138,8 +1176,9 @@ EOF
     for arg
     do
       case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1147,12 +1186,20 @@ EOF
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	else
+	  ;;
+	-static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	fi
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1600,13 +1647,18 @@ EOF
 	continue
 	;;
 
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	compiler_flags="$compiler_flags $arg"
 	compile_command="$compile_command $arg"
 	finalize_command="$finalize_command $arg"
 	continue
 	;;
 
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
       -module)
 	module=yes
 	continue
@@ -1620,10 +1672,11 @@ EOF
       # -m* pass through architecture-specific compiler args for GCC
       # -m*, -t[45]*, -txscale* pass through architecture-specific
       # compiler args for GCC
-      # -pg pass through profiling flag for GCC
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
       # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-      -t[45]*|-txscale*|@*)
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
@@ -1651,9 +1704,9 @@ EOF
 
       -no-install)
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
 	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
+	  # and Darwin in order for the loader to find any dlls it needs.
 	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
 	  fast_install=no
@@ -1712,7 +1765,7 @@ EOF
 	continue
 	;;
 
-      -static)
+      -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2094,7 +2147,7 @@ EOF
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -2109,7 +2162,12 @@ EOF
 	    continue
 	  fi
 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
 	    for search_ext in .la $std_shrext .so .a; do
 	      # Search the libtool library
 	      lib="$searchdir/lib${name}${search_ext}"
@@ -2490,7 +2548,9 @@ EOF
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+	     { { test "$prefer_static_libs" = no ||
+		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -2903,12 +2963,18 @@ EOF
 		  # we do not want to link against static libs,
 		  # but need to link against shared
 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		  if test -n "$deplibrary_names" ; then
 		    for tmp in $deplibrary_names ; do
 		      depdepl=$tmp
 		    done
-		    if test -f "$path/$depdepl" ; then
+		    if test -f "$deplibdir/$depdepl" ; then
+		      depdepl="$deplibdir/$depdepl"
+	      	    elif test -f "$path/$depdepl" ; then
 		      depdepl="$path/$depdepl"
+		    else
+		      # Can't find it, oh well...
+		      depdepl=
 		    fi
 		    # do not add paths which are already there
 		    case " $newlib_search_path " in
@@ -3056,9 +3122,10 @@ EOF
 
     case $linkmode in
     oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@@ -3186,7 +3253,7 @@ EOF
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows)
+	  darwin|linux|osf|windows|none)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3197,9 +3264,10 @@ EOF
 	    age="0"
 	    ;;
 	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
+	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_minor"
+	    lt_irix_increment=no
 	    ;;
 	  esac
 	  ;;
@@ -3258,7 +3326,8 @@ EOF
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
 	  minor_current=`expr $current + 1`
-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
 	  ;;
 
 	freebsd-aout)
@@ -3272,8 +3341,11 @@ EOF
 	  ;;
 
 	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    major=`expr $current - $age`
+	  else
+	    major=`expr $current - $age + 1`
+	  fi
 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
@@ -3410,11 +3482,11 @@ EOF
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      done
+      #for path in $notinst_path; do
+      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3515,13 +3587,12 @@ EOF
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
+              if test "$name" != "" && test "$name" != "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3560,9 +3631,7 @@ EOF
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		$LTCC $LTCFLAGS -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3594,7 +3663,7 @@ EOF
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -3880,7 +3949,10 @@ EOF
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
 	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	      case $archive_cmds in
+	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
+	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
+	      esac
 	    else
 	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
 	    fi
@@ -4190,9 +4262,10 @@ EOF
       ;;
 
     obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@@ -4239,12 +4312,14 @@ EOF
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4692,16 +4767,16 @@ static const void *lt_preloaded_setup() {
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
             else
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
             ;;
           esac
 	  ;;
@@ -4716,13 +4791,13 @@ static const void *lt_preloaded_setup() {
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4884,7 @@ static const void *lt_preloaded_setup() {
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4846,7 +4921,7 @@ static const void *lt_preloaded_setup() {
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       fi
 
       # Quote $echo for shipping.
@@ -5253,6 +5328,20 @@ EOF
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5484,7 @@ else
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      \$echo \"\$0: cannot exec \$program \$*\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5581,7 +5670,7 @@ fi\
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5926,9 +6015,9 @@ relink_command=\"$relink_command\""
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
 	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6226,7 @@ relink_command=\"$relink_command\""
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6348,8 +6437,10 @@ relink_command=\"$relink_command\""
 	if test -f "$dir/$objdir/$dlname"; then
 	  dir="$dir/$objdir"
 	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
+	  if test ! -f "$dir/$dlname"; then
+	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
 	fi
 	;;
 
@@ -6413,12 +6504,12 @@ relink_command=\"$relink_command\""
       fi
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+		$lt_var=\$save_$lt_var; export $lt_var
+	      fi"
+      done
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6775,9 +6866,9 @@ The following components of LINK-COMMAND are treated specially:
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6791,9 +6882,11 @@ The following components of LINK-COMMAND are treated specially:
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 
diff --git a/srclib/apr/build/make_nw_export.awk b/srclib/apr/build/make_nw_export.awk
index 291ecc0b..d49fcbaf 100644
--- a/srclib/apr/build/make_nw_export.awk
+++ b/srclib/apr/build/make_nw_export.awk
@@ -73,6 +73,7 @@ function add_symbol (sym_name) {
 }
 
 
-#END {
+END {
+   add_symbol("apr_wait_for_io_or_timeout");
 #	printf(" %s", line)
-#}
+}
diff --git a/srclib/apr/build/nw_export.inc b/srclib/apr/build/nw_export.inc
index 58495cd0..452b4018 100644
--- a/srclib/apr/build/nw_export.inc
+++ b/srclib/apr/build/nw_export.inc
@@ -46,40 +46,5 @@
 #include "apr_version.h"
 #include "apr_want.h"
 
-
-/* Must include apu.h first so that we can undefine
-    the standard prototypes macros after it messes with
-    them. */
-#include "apu.h"
-
-#undef APU_DECLARE
-#undef APU_DECLARE_NONSTD
-#undef APU_DECLARE_DATA
-
-/* Preprocess all of the standard APR headers. */
-#include "apr_anylock.h"
-#include "apr_base64.h"
-#include "apr_buckets.h"
-#include "apr_date.h"
-#include "apr_dbd.h"
-#include "apr_dbm.h"
-#include "apr_hooks.h"
-#include "apr_ldap.h"
-#include "apr_ldap_url.h"
-#include "apr_md4.h"
-#include "apr_md5.h"
-#include "apr_optional.h"
-#include "apr_optional_hooks.h"
-#include "apr_queue.h"
-#include "apr_reslist.h"
-#include "apr_rmm.h"
-#include "apr_sdbm.h"
-#include "apr_sha1.h"
-#include "apr_strmatch.h"
-#include "apr_uri.h"
-#include "apr_uuid.h"
-#include "apr_xlate.h"
-#include "apr_xml.h"
-#include "apu_version.h"
-#include "apu_want.h"
+#include "nw_apu_export.inc"
 
diff --git a/srclib/apr/build/rpm/apr.spec.in b/srclib/apr/build/rpm/apr.spec.in
index 7d113c35..7b1668c8 100644
--- a/srclib/apr/build/rpm/apr.spec.in
+++ b/srclib/apr/build/rpm/apr.spec.in
@@ -46,7 +46,7 @@ make %{?_smp_mflags} && make dox
 %check
 # Run non-interactive tests
 pushd test
-make %{?_smp_mflags} testall CFLAGS=-fno-strict-aliasing
+make %{?_smp_mflags} all CFLAGS=-fno-strict-aliasing
 ./testall -v || exit 1
 popd
 
diff --git a/srclib/apr/build/win32ver.awk b/srclib/apr/build/win32ver.awk
index 2cd31eba..11be0807 100644
--- a/srclib/apr/build/win32ver.awk
+++ b/srclib/apr/build/win32ver.awk
@@ -88,15 +88,18 @@ BEGIN {
   print "    BLOCK \"040904b0\"";
   print "    BEGIN";
   print "    VALUE \"Comments\", "\
-     "\"Licensed under the Apache License, Version 2.0 (the \"\"License\"\"); "\
-     "you may not use this file except in compliance with the License.  "\
-     "You may obtain a copy of the License at\\r\\n\\r\\n"\
-     "http://www.apache.org/licenses/LICENSE-2.0\\r\\n\\r\\n"\
-     "Unless required by applicable law or agreed to in writing, "\
-     "software distributed under the License is distributed on an "\
-     "\"\"AS IS\"\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, "\
-     "either express or implied.  See the License for the specific "\
-     "language governing permissions and limitations under the License.\\0\"";
+  "\"Licensed to the Apache Software Foundation (ASF) under one or more " \
+  "contributor license agreements.  See the NOTICE file distributed with " \
+  "this work for additional information regarding copyright ownership.  " \
+  "The ASF licenses this file to You under the Apache License, Version 2.0 " \
+  "(the \"\"License\"\"); you may not use this file except in compliance " \
+  "with the License.  You may obtain a copy of the License at\\r\\n\\r\\n" \
+  "http://www.apache.org/licenses/LICENSE-2.0\\r\\n\\r\\n" \
+  "Unless required by applicable law or agreed to in writing, software " \
+  "distributed under the License is distributed on an \"\"AS IS\"\" BASIS, " \
+  "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  " \
+  "See the License for the specific language governing permissions and " \
+  "limitations under the License.\\0\"";
   print "      VALUE \"CompanyName\", \"Apache Software Foundation\\0\"";
   print "      VALUE \"FileDescription\", \"" desc "\\0\"";
   print "      VALUE \"FileVersion\", \"" ver "\\0\"";
diff --git a/srclib/apr/configure b/srclib/apr/configure
index c7afc0d7..9fbd718e 100755
--- a/srclib/apr/configure
+++ b/srclib/apr/configure
@@ -1,28 +1,32 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60.
+# Generated by GNU Autoconf 2.62.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
 
 
 # PATH needs CR
@@ -33,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -59,8 +91,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -83,7 +113,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -96,17 +126,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -128,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -154,7 +177,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -215,7 +238,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; }
 else
   as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
@@ -233,19 +256,20 @@ IFS=$as_save_IFS
 	 # Try only shells that exist, to save several forks.
 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
 
 :
 _ASEOF
@@ -253,19 +277,20 @@ _ASEOF
   CONFIG_SHELL=$as_shell
 	       as_have_required=yes
 	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
 
 :
 (as_func_return () {
@@ -335,10 +360,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -407,9 +432,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -445,7 +471,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -473,7 +499,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -486,19 +511,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -512,19 +540,28 @@ else
   as_mkdir_p=false
 fi
 
-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -719,36 +756,36 @@ ac_unique_file="build/apr_common.m4"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
-#if HAVE_STDINT_H
+#ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
@@ -831,8 +868,11 @@ GREP
 EGREP
 apr_charset_ebcdic
 APR_LIBNAME
+SED
 ECHO
 STRIP
+DSYMUTIL
+NMEDIT
 CXX
 CXXFLAGS
 ac_ct_CXX
@@ -850,6 +890,7 @@ export_lib_target
 shlibpath_var
 LTFLAGS
 LT_LDFLAGS
+LT_VERSION
 MKDEP
 OBJECTS_PLATFORM
 proc_mutex_is_global
@@ -869,12 +910,15 @@ usemmapshm
 useshmget
 usebeosarea
 useos2shm
+usewin32shm
 havemmaptmp
 havemmapshm
 haveshmget
 havebeosarea
 haveos2shm
+havewin32shm
 sharedmem
+ALLOCA
 sendfile
 apr_inaddr_none
 fork
@@ -922,6 +966,8 @@ signalh
 sys_waith
 pthreadh
 semaphoreh
+windowsh
+winsock2h
 voidp_size
 short_value
 int_value
@@ -943,6 +989,7 @@ uint64_literal
 stdint
 bigendian
 aprlfs
+have_iovec
 ino_t_value
 have_strnicmp
 have_strncasecmp
@@ -953,6 +1000,7 @@ have_strstr
 have_memchr
 aprdso
 oc
+have_proc_invoked
 struct_rlimit
 have_union_semun
 hasflockser
@@ -977,6 +1025,7 @@ acceptfilter
 have_sctp
 have_sa_storage
 have_ipv6
+have_unicode_fs
 EXTRA_CPPFLAGS
 EXTRA_CFLAGS
 EXTRA_LDFLAGS
@@ -998,12 +1047,42 @@ INCLUDE_OUTPUTS
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_layout
+enable_experimental_libtool
+enable_shared
+enable_static
+enable_fast_install
+with_gnu_ld
+enable_libtool_lock
+with_pic
+with_tags
+with_installbuilddir
+with_libtool
+enable_debug
+enable_maintainer_mode
+enable_profile
+enable_pool_debug
+enable_malloc_debug
+enable_lfs
+enable_nonportable_atomics
+enable_threads
+with_efence
+with_sendfile
+enable_dso
+enable_other_child
+with_egd
+with_devrandom
+enable_ipv6
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
 CC
 CFLAGS
 LDFLAGS
+LIBS
 CPPFLAGS
 CPP
 CXX
@@ -1017,6 +1096,8 @@ FFLAGS'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -1115,13 +1196,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -1134,13 +1223,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1331,22 +1428,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1366,7 +1479,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1375,16 +1488,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1393,22 +1506,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1423,7 +1552,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1439,10 +1568,10 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1450,12 +1579,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1482,12 +1611,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1536,9 +1665,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1548,25 +1677,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1583,6 +1712,7 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-layout=LAYOUT
@@ -1623,6 +1753,7 @@ Some influential environment variables:
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
@@ -1642,15 +1773,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1686,7 +1819,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1696,10 +1829,10 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1710,7 +1843,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
 
@@ -1746,7 +1879,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1781,7 +1914,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1833,11 +1966,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1867,9 +2001,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1884,9 +2018,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1902,8 +2036,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1945,21 +2079,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1969,16 +2106,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1992,29 +2129,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -2024,10 +2170,10 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2073,8 +2219,8 @@ for ac_dir in build "$srcdir"/build; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in build \"$srcdir\"/build" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in build \"$srcdir\"/build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in build \"$srcdir\"/build" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in build \"$srcdir\"/build" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2234,16 +2380,21 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
+
+
+
+
+
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-## Free Software Foundation, Inc.
+## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
+## 2008  Free Software Foundation, Inc.
 ## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 ##
 ## This file is free software; the Free Software Foundation gives
 ## unlimited permission to copy and/or distribute it, with or without
 ## modifications, as long as this notice is preserved.
 
-# serial 48 AC_PROG_LIBTOOL
+# serial 52 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -2291,6 +2442,10 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # the simple link test code.
 # _LT_LINKER_BOILERPLATE
 
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+
 
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
@@ -2461,13 +2616,13 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 # AC_PATH_TOOL_PREFIX
 # -------------------
-# find a file program which can recognise shared library
+# find a file program which can recognize shared library
 # AC_PATH_TOOL_PREFIX
 
 
 # AC_PATH_MAGIC
 # -------------
-# find a file program which can recognise a shared library
+# find a file program which can recognize a shared library
 # AC_PATH_MAGIC
 
 
@@ -2688,6 +2843,19 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+# AS_EXECUTABLE_P
+
 ############################################################
 # NOTE: This macro has been submitted for inclusion into   #
 #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
@@ -2787,34 +2955,34 @@ arg="${ap_cur}"
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
 if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -2831,27 +2999,27 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
 if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -2868,27 +3036,27 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
 if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$target_alias" = x; then
   ac_cv_target=$ac_cv_host
 else
   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-echo "$as_me: error: invalid value of canonical target" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
+$as_echo "$as_me: error: invalid value of canonical target" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 target=$ac_cv_target
@@ -2947,10 +3115,10 @@ apr_builders=$apr_srcdir/build
 MKDIR=$apr_builders/mkdir.sh
 
 
-  { echo "$as_me:$LINENO: checking for working mkdir -p" >&5
-echo $ECHO_N "checking for working mkdir -p... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for working mkdir -p" >&5
+$as_echo_n "checking for working mkdir -p... " >&6; }
 if test "${ac_cv_mkdir_p+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     test -d conftestdir && rm -rf conftestdir
@@ -2963,8 +3131,8 @@ else
     rm -rf conftestdir
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_mkdir_p" >&5
-echo "${ECHO_T}$ac_cv_mkdir_p" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_mkdir_p" >&5
+$as_echo "$ac_cv_mkdir_p" >&6; }
   if test "$ac_cv_mkdir_p" = "yes"; then
       mkdir_p="mkdir -p"
   else
@@ -3055,10 +3223,10 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for chosen layout" >&5
-echo $ECHO_N "checking for chosen layout... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $layout_name" >&5
-echo "${ECHO_T}$layout_name" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for chosen layout" >&5
+$as_echo_n "checking for chosen layout... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $layout_name" >&5
+$as_echo "$layout_name" >&6; }
 
 
 ac_prev=
@@ -3175,8 +3343,8 @@ do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { { echo "$as_me:$LINENO: error: expected an absolute path for --$ac_var: $ac_val" >&5
-echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2;}
+    *)  { { $as_echo "$as_me:$LINENO: error: expected an absolute path for --$ac_var: $ac_val" >&5
+$as_echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -3284,10 +3452,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3298,9 +3466,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3311,11 +3479,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3324,10 +3492,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3338,9 +3506,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3351,11 +3519,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -3363,10 +3531,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -3381,10 +3549,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3395,9 +3563,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3408,11 +3576,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3421,10 +3589,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3436,13 +3604,13 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3465,11 +3633,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3480,10 +3648,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3494,9 +3662,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3507,11 +3675,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3524,10 +3692,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3538,9 +3706,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3551,11 +3719,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3567,10 +3735,10 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -3582,44 +3750,48 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -3638,27 +3810,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -3669,21 +3836,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
-for ac_file in $ac_files
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -3707,24 +3875,28 @@ done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
 else
-  echo "$as_me: failed program was:" >&5
+  ac_file=''
+fi
+
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -3733,49 +3905,51 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -3784,31 +3958,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3831,40 +4005,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3890,37 +4065,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -3930,15 +4089,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -3965,37 +4128,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -4020,37 +4167,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -4076,37 +4207,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4121,8 +4236,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -4138,10 +4253,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -4212,37 +4327,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4258,15 +4357,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -5110,6 +5209,29 @@ if test "x$apr_preload_done" != "xyes" ; then
 
         fi
 	;;
+    *-k*bsd*-gnu)
+
+  if test "x$CPPFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-D_REENTRANT -D_GNU_SOURCE\""
+    CPPFLAGS="-D_REENTRANT -D_GNU_SOURCE"
+  else
+    apr_addto_bugger="-D_REENTRANT -D_GNU_SOURCE"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $CPPFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $i"
+      fi
+    done
+  fi
+
+        ;;
     *-next-nextstep*)
 
   if test -z "$CFLAGS"; then
@@ -5219,22 +5341,26 @@ if test "x$apr_preload_done" != "xyes" ; then
     apr_posixsem_is_global="yes"
   fi
 
-
-  if test -z "$ac_cv_func_poll"; then
-    test "x$silent" != "xyes" && echo "  setting ac_cv_func_poll to \"no\""
-    ac_cv_func_poll="no"
-  fi
- # See issue 34332
-
-        # kqueue is broken on OS X, the poll tests work, but the socket tests
-        # hang when it's turned on.  if you decide to reenable this please be
-        # sure to test that ALL the tests continue to work with it turned on.
+        # kqueue works in 10.5/Darwin 9.x. Disable on all older versions.
+        case $host in
+            *-apple-darwin[0-8].*)
+            # kqueue is broken on OS X, the poll tests work, but the socket tests
+            # hang when it's turned on.  if you decide to reenable this please be
+            # sure to test that ALL the tests continue to work with it turned on.
 
   if test -z "$ac_cv_func_kqueue"; then
     test "x$silent" != "xyes" && echo "  setting ac_cv_func_kqueue to \"no\""
     ac_cv_func_kqueue="no"
   fi
 
+
+  if test -z "$ac_cv_func_poll"; then
+    test "x$silent" != "xyes" && echo "  setting ac_cv_func_poll to \"no\""
+    ac_cv_func_poll="no"
+  fi
+ # See issue 34332
+            ;;
+        esac
 	;;
     *-dec-osf*)
 
@@ -5605,6 +5731,14 @@ if test "x$apr_preload_done" != "xyes" ; then
     apr_lock_method="USE_FCNTL_SERIALIZE"
   fi
 
+        # readdir64_r error handling seems broken on Solaris (at least
+        # up till 2.8) -- it will return -1 at end-of-directory.
+
+  if test -z "$ac_cv_func_readdir64_r"; then
+    test "x$silent" != "xyes" && echo "  setting ac_cv_func_readdir64_r to \"no\""
+    ac_cv_func_readdir64_r="no"
+  fi
+
 	;;
     *-sunos4*)
 
@@ -7327,11 +7461,16 @@ if test "x$apr_preload_done" != "xyes" ; then
   fi
 
 
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ZOS_PTHREADS 1
+_ACEOF
+
+
   if test "x$CPPFLAGS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-U_NO_PROTO -DPTHREAD_ATTR_SETDETACHSTATE_ARG2_ADDR -DPTHREAD_SETS_ERRNO -DPTHREAD_DETACH_ARG1_ADDR -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1\""
-    CPPFLAGS="-U_NO_PROTO -DPTHREAD_ATTR_SETDETACHSTATE_ARG2_ADDR -DPTHREAD_SETS_ERRNO -DPTHREAD_DETACH_ARG1_ADDR -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1"
+    test "x$silent" != "xyes" && echo "  setting CPPFLAGS to \"-U_NO_PROTO -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1\""
+    CPPFLAGS="-U_NO_PROTO -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1"
   else
-    apr_addto_bugger="-U_NO_PROTO -DPTHREAD_ATTR_SETDETACHSTATE_ARG2_ADDR -DPTHREAD_SETS_ERRNO -DPTHREAD_DETACH_ARG1_ADDR -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1"
+    apr_addto_bugger="-U_NO_PROTO -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
       for j in $CPPFLAGS; do
@@ -7347,7 +7486,7 @@ if test "x$apr_preload_done" != "xyes" ; then
     done
   fi
 
-       ;;
+        ;;
     *-ibm-as400)
 
   if test -z "$apr_lock_method"; then
@@ -7373,7 +7512,7 @@ if test "x$apr_preload_done" != "xyes" ; then
     apr_gethostbyaddr_is_thread_safe="yes"
   fi
 
-       ;;
+        ;;
     *cygwin*)
 
   if test "x$CPPFLAGS" = "x"; then
@@ -7396,27 +7535,102 @@ if test "x$apr_preload_done" != "xyes" ; then
     done
   fi
 
+	;;
+    *mingw*)
+								if test "$ac_test_CFLAGS" != set; then
 
-  if test "x$LIBS" = "x"; then
-    test "x$silent" != "xyes" && echo "  setting LIBS to \"-lcrypt\""
-    LIBS="-lcrypt"
+  if test "x$CFLAGS" = "x-O2"; then
+    test "x$silent" != "xyes" && echo "  nulling CFLAGS"
+    CFLAGS=""
+  else
+    apr_new_bugger=""
+    apr_removed=0
+    for i in $CFLAGS; do
+      if test "x$i" != "x-O2"; then
+        apr_new_bugger="$apr_new_bugger $i"
+      else
+        apr_removed=1
+      fi
+    done
+    if test $apr_removed = "1"; then
+      test "x$silent" != "xyes" && echo "  removed \"-O2\" from CFLAGS"
+      CFLAGS=$apr_new_bugger
+    fi
+  fi
+
+
+  if test "x$CFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting CFLAGS to \"-O0\""
+    CFLAGS="-O0"
   else
-    apr_addto_bugger="-lcrypt"
+    apr_addto_bugger="-O0"
     for i in $apr_addto_bugger; do
       apr_addto_duplicate="0"
-      for j in $LIBS; do
+      for j in $CFLAGS; do
         if test "x$i" = "x$j"; then
           apr_addto_duplicate="1"
           break
         fi
       done
       if test $apr_addto_duplicate = "0"; then
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to LIBS"
-        LIBS="$LIBS $i"
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to CFLAGS"
+        CFLAGS="$CFLAGS $i"
       fi
     done
   fi
 
+	fi
+
+  if test "x$LDFLAGS" = "x"; then
+    test "x$silent" != "xyes" && echo "  setting LDFLAGS to \"-Wl,--enable-auto-import,--subsystem,console\""
+    LDFLAGS="-Wl,--enable-auto-import,--subsystem,console"
+  else
+    apr_addto_bugger="-Wl,--enable-auto-import,--subsystem,console"
+    for i in $apr_addto_bugger; do
+      apr_addto_duplicate="0"
+      for j in $LDFLAGS; do
+        if test "x$i" = "x$j"; then
+          apr_addto_duplicate="1"
+          break
+        fi
+      done
+      if test $apr_addto_duplicate = "0"; then
+        test "x$silent" != "xyes" && echo "  adding \"$i\" to LDFLAGS"
+        LDFLAGS="$LDFLAGS $i"
+      fi
+    done
+  fi
+
+
+  if test -z "$apr_lock_method"; then
+    test "x$silent" != "xyes" && echo "  setting apr_lock_method to \"win32\""
+    apr_lock_method="win32"
+  fi
+
+
+  if test -z "$apr_process_lock_is_global"; then
+    test "x$silent" != "xyes" && echo "  setting apr_process_lock_is_global to \"yes\""
+    apr_process_lock_is_global="yes"
+  fi
+
+
+  if test -z "$have_unicode_fs"; then
+    test "x$silent" != "xyes" && echo "  setting have_unicode_fs to \"1\""
+    have_unicode_fs="1"
+  fi
+
+
+  if test -z "$have_proc_invoked"; then
+    test "x$silent" != "xyes" && echo "  setting have_proc_invoked to \"1\""
+    have_proc_invoked="1"
+  fi
+
+
+  if test -z "$apr_cv_use_lfs64"; then
+    test "x$silent" != "xyes" && echo "  setting apr_cv_use_lfs64 to \"yes\""
+    apr_cv_use_lfs64="yes"
+  fi
+
 	;;
   esac
 
@@ -7428,11 +7642,12 @@ echo "(Default will be ${DEFAULT_OSDIR})"
 
 apr_modules="file_io network_io threadproc misc locks time mmap shmem user memory atomic poll support random"
 
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -7449,12 +7664,12 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -7463,15 +7678,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -7503,27 +7718,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -7547,28 +7756,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -7593,8 +7796,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -7622,27 +7825,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -7666,28 +7863,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -7703,9 +7894,9 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -7720,10 +7911,10 @@ for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -7734,9 +7925,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7747,35 +7938,35 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -7786,9 +7977,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7799,11 +7990,11 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7812,10 +8003,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -7826,9 +8017,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7839,11 +8030,11 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -7851,10 +8042,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -7878,11 +8069,12 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7901,7 +8093,7 @@ case $as_dir/ in
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -7911,17 +8103,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -7934,8 +8138,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -7947,10 +8151,10 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 # Extract the first word of "rm", so it can be a program name with args.
 set dummy rm; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RM"; then
   ac_cv_prog_RM="$RM" # Let the user override the test.
@@ -7961,9 +8165,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RM="rm"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7974,20 +8178,20 @@ fi
 fi
 RM=$ac_cv_prog_RM
 if test -n "$RM"; then
-  { echo "$as_me:$LINENO: result: $RM" >&5
-echo "${ECHO_T}$RM" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RM" >&5
+$as_echo "$RM" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AS"; then
   ac_cv_prog_AS="$AS" # Let the user override the test.
@@ -7998,9 +8202,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AS="as"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8011,20 +8215,20 @@ fi
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  { echo "$as_me:$LINENO: result: $AS" >&5
-echo "${ECHO_T}$AS" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AS" >&5
+$as_echo "$AS" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "cpp", so it can be a program name with args.
 set dummy cpp; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ASCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ASCPP"; then
   ac_cv_prog_ASCPP="$ASCPP" # Let the user override the test.
@@ -8035,9 +8239,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ASCPP="cpp"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8048,21 +8252,21 @@ fi
 fi
 ASCPP=$ac_cv_prog_ASCPP
 if test -n "$ASCPP"; then
-  { echo "$as_me:$LINENO: result: $ASCPP" >&5
-echo "${ECHO_T}$ASCPP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ASCPP" >&5
+$as_echo "$ASCPP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -8073,9 +8277,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8086,11 +8290,11 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8099,10 +8303,10 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -8113,9 +8317,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8126,11 +8330,11 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -8138,10 +8342,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -8155,42 +8359,37 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -8205,74 +8404,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -8287,168 +8472,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-
-{ echo "$as_me:$LINENO: checking for AIX" >&5
-echo $ECHO_N "checking for AIX... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef _AIX
-  yes
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define _ALL_SOURCE 1
-_ACEOF
-
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-rm -f conftest*
-
-
-{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' cposix; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_strerror=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext \
-      conftest$ac_exeext
-  if test "${ac_cv_search_strerror+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_strerror+set}" = set; then
-  :
-else
-  ac_cv_search_strerror=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
-ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -8475,37 +8523,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -8597,37 +8629,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -8649,11 +8684,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -8671,37 +8706,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -8709,12 +8728,14 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -8722,18 +8743,19 @@ fi
 done
 
 
+
+  if test "${ac_cv_header_minix_config_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
 if test "${ac_cv_header_minix_config_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for minix/config.h" >&5
-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_minix_config_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking minix/config.h usability" >&5
-echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
+$as_echo_n "checking minix/config.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8749,49 +8771,349 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
+$as_echo_n "checking minix/config.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <minix/config.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_minix_config_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+
+fi
+if test $ac_cv_header_minix_config_h = yes; then
+  MINIX=yes
+else
+  MINIX=
+fi
+
+
+  if test "$MINIX" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_SOURCE 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_1_SOURCE 2
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _MINIX 1
+_ACEOF
+
+  fi
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#	  define __EXTENSIONS__ 1
+	  $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_safe_to_define___extensions__=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_safe_to_define___extensions__=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    cat >>confdefs.h <<\_ACEOF
+#define __EXTENSIONS__ 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _ALL_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _POSIX_PTHREAD_SEMANTICS 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _TANDEM_SOURCE 1
+_ACEOF
+
+
+{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
+$as_echo_n "checking for library containing strerror... " >&6; }
+if test "${ac_cv_search_strerror+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strerror ();
+int
+main ()
+{
+return strerror ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' cposix; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_search_strerror=$ac_res
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_strerror+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_strerror+set}" = set; then
+  :
+else
+  ac_cv_search_strerror=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+$as_echo "$ac_cv_search_strerror" >&6; }
+ac_res=$ac_cv_search_strerror
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+
+  if test "${ac_cv_header_minix_config_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
+$as_echo_n "checking minix/config.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <minix/config.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking minix/config.h presence" >&5
-echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
+$as_echo_n "checking minix/config.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8805,70 +9127,64 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for minix/config.h" >&5
-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
 if test "${ac_cv_header_minix_config_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_minix_config_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
 
 fi
 if test $ac_cv_header_minix_config_h = yes; then
@@ -8878,7 +9194,7 @@ else
 fi
 
 
-if test "$MINIX" = yes; then
+  if test "$MINIX" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define _POSIX_SOURCE 1
@@ -8894,14 +9210,90 @@ cat >>confdefs.h <<\_ACEOF
 #define _MINIX 1
 _ACEOF
 
+  fi
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#	  define __EXTENSIONS__ 1
+	  $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_safe_to_define___extensions__=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_safe_to_define___extensions__=no
 fi
 
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    cat >>confdefs.h <<\_ACEOF
+#define __EXTENSIONS__ 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _ALL_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _POSIX_PTHREAD_SEMANTICS 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _TANDEM_SOURCE 1
+_ACEOF
 
 
-  { echo "$as_me:$LINENO: checking whether system uses EBCDIC" >&5
-echo $ECHO_N "checking whether system uses EBCDIC... $ECHO_C" >&6; }
+
+
+  { $as_echo "$as_me:$LINENO: checking whether system uses EBCDIC" >&5
+$as_echo_n "checking whether system uses EBCDIC... " >&6; }
 if test "${ac_cv_ebcdic+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   if test "$cross_compiling" = yes; then
@@ -8927,26 +9319,28 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
   ac_cv_ebcdic="yes"
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
@@ -8954,13 +9348,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
   ac_cv_ebcdic="no"
 
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_ebcdic" >&5
-echo "${ECHO_T}$ac_cv_ebcdic" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_ebcdic" >&5
+$as_echo "$ac_cv_ebcdic" >&6; }
   if test "$ac_cv_ebcdic" = "yes"; then
     apr_charset_ebcdic=1
   else
@@ -9076,10 +9471,10 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
 if test "${lt_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # Loop through the user's path and test for sed and gsed.
 # Then use that list of sed's as ones to test for truncation.
@@ -9090,12 +9485,13 @@ do
   test -z "$as_dir" && as_dir=.
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -9130,8 +9526,9 @@ done
 fi
 
 SED=$lt_cv_path_SED
-{ echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6; }
+
+{ $as_echo "$as_me:$LINENO: result: $SED" >&5
+$as_echo "$SED" >&6; }
 
 
 # Check whether --with-gnu-ld was given.
@@ -9144,8 +9541,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -9174,14 +9571,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -9211,19 +9608,19 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -9235,20 +9632,20 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
 if test "${lt_cv_ld_reload_flag+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -9265,10 +9662,10 @@ case $host_os in
     ;;
 esac
 
-{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+$as_echo_n "checking for BSD-compatible nm... " >&6; }
 if test "${lt_cv_path_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
@@ -9314,14 +9711,14 @@ else
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
 NM="$lt_cv_path_NM"
 
-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -9338,7 +9735,7 @@ lt_cv_deplibs_check_method='unknown'
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[4-9]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -9360,16 +9757,22 @@ cygwin*)
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
 darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -9407,7 +9810,7 @@ hpux10.20* | hpux11*)
   esac
   ;;
 
-interix3*)
+interix[3-9]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
   ;;
@@ -9423,7 +9826,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -9457,6 +9860,10 @@ osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -9494,8 +9901,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 esac
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -9528,7 +9935,7 @@ ia64-*-hpux*)
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *ELF-32*)
@@ -9543,11 +9950,11 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 9546 "configure"' > conftest.$ac_ext
+  echo '#line 9953 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
    if test "$lt_cv_prog_gnu_ld" = yes; then
     case `/usr/bin/file conftest.$ac_objext` in
@@ -9578,17 +9985,21 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
@@ -9605,6 +10016,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
       ;;
     *64-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
@@ -9628,10 +10042,10 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
 if test "${lt_cv_cc_needs_belf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -9660,43 +10074,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   lt_cv_cc_needs_belf=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	lt_cv_cc_needs_belf=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -9705,8 +10107,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -9718,13 +10120,17 @@ sparc*-*solaris*)
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
       esac
       ;;
     esac
@@ -9741,20 +10147,21 @@ need_locks="$enable_libtool_lock"
 
 for ac_header in dlfcn.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9770,49 +10177,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9826,76 +10217,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -9916,10 +10303,10 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -9930,9 +10317,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9943,11 +10330,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -9960,10 +10347,10 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -9974,9 +10361,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9987,11 +10374,11 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -10003,10 +10390,10 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -10018,43 +10405,47 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -10080,37 +10471,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -10120,15 +10495,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
@@ -10155,37 +10534,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CXXFLAGS=""
@@ -10210,37 +10573,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -10266,37 +10613,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -10311,8 +10642,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -10344,11 +10675,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
     for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -10380,27 +10711,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -10424,28 +10749,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -10470,8 +10789,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -10499,27 +10818,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -10543,28 +10856,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -10580,9 +10887,9 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10601,14 +10908,14 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$F77"; then
   ac_cv_prog_F77="$F77" # Let the user override the test.
@@ -10619,9 +10926,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10632,11 +10939,11 @@ fi
 fi
 F77=$ac_cv_prog_F77
 if test -n "$F77"; then
-  { echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $F77" >&5
+$as_echo "$F77" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -10645,14 +10952,14 @@ fi
 fi
 if test -z "$F77"; then
   ac_ct_F77=$F77
-  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_F77"; then
   ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
@@ -10663,9 +10970,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_F77="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -10676,11 +10983,11 @@ fi
 fi
 ac_ct_F77=$ac_cv_prog_ac_ct_F77
 if test -n "$ac_ct_F77"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+$as_echo "$ac_ct_F77" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -10692,10 +10999,10 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -10706,37 +11013,41 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 rm -f a.out
 
@@ -10744,10 +11055,10 @@ rm -f a.out
 # input file.  (Note that this only needs to work for GNU compilers.)
 ac_save_ext=$ac_ext
 ac_ext=F
-{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
 if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
       program main
@@ -10763,37 +11074,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -10803,16 +11098,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_f77_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
 ac_ext=$ac_save_ext
 ac_test_FFLAGS=${FFLAGS+set}
 ac_save_FFLAGS=$FFLAGS
 FFLAGS=
-{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+$as_echo_n "checking whether $F77 accepts -g... " >&6; }
 if test "${ac_cv_prog_f77_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   FFLAGS=-g
 cat >conftest.$ac_ext <<_ACEOF
@@ -10826,37 +11121,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_f77_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_prog_f77_g=no
@@ -10865,8 +11144,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+$as_echo "$ac_cv_prog_f77_g" >&6; }
 if test "$ac_test_FFLAGS" = set; then
   FFLAGS=$ac_save_FFLAGS
 elif test $ac_cv_prog_f77_g = yes; then
@@ -10883,7 +11162,11 @@ else
   fi
 fi
 
-G77=`test $ac_compiler_gnu = yes && echo yes`
+if test $ac_compiler_gnu = yes; then
+  G77=yes
+else
+  G77=
+fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -10893,12 +11176,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
 # find the maximum length of command line arguments
-{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
 if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
     i=0
   teststring="ABCD"
@@ -10980,45 +11262,49 @@ else
     fi
     ;;
   *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
 	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
+	      lt_cv_sys_max_cmd_len=$new_result &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
+  { $as_echo "$as_me:$LINENO: result: none" >&5
+$as_echo "none" >&6; }
 fi
 
 
 
 
+
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 # These are sane defaults that work on at least a few old systems.
@@ -11051,7 +11337,7 @@ hpux*) # Its linker distinguishes data from code symbols
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
-linux*)
+linux* | k*bsd*-gnu)
   if test "$host_cpu" = ia64; then
     symcode='[ABCDGIRSTW]'
     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -11123,14 +11409,14 @@ EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
     if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -11185,7 +11471,7 @@ EOF
 	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
@@ -11204,7 +11490,7 @@ EOF
     echo "$progname: failed program was:" >&5
     cat conftest.$ac_ext >&5
   fi
-  rm -f conftest* conftst*
+  rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -11220,17 +11506,17 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
+  { $as_echo "$as_me:$LINENO: result: failed" >&5
+$as_echo "failed" >&6; }
 else
-  { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+  { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
 if test "${lt_cv_objdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
@@ -11242,8 +11528,8 @@ else
 fi
 rmdir .libs 2>/dev/null
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
@@ -11294,10 +11580,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -11308,9 +11594,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11321,11 +11607,11 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -11334,10 +11620,10 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -11348,9 +11634,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11361,11 +11647,11 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -11373,10 +11659,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -11390,10 +11676,10 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -11404,9 +11690,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11417,11 +11703,11 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -11430,10 +11716,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -11444,9 +11730,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11457,11 +11743,11 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -11469,10 +11755,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -11486,10 +11772,10 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -11500,9 +11786,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11513,11 +11799,11 @@ fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -11526,10 +11812,10 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -11540,9 +11826,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -11553,11 +11839,11 @@ fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -11565,10 +11851,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -11602,7 +11888,7 @@ test -z "$STRIP" && STRIP=:
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
@@ -11633,10 +11919,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -11686,19 +11972,19 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -11748,11 +12034,11 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   else
@@ -11764,6 +12050,322 @@ fi
   ;;
 esac
 
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+
+    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  lt_cv_ld_exported_symbols_list=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	lt_cv_ld_exported_symbols_list=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[0123])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[012]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+
 enable_dlopen=no
 enable_win32_dll=no
 
@@ -11802,10 +12404,10 @@ objext=o
 objext=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 
 # If no C compiler was specified, use CC.
@@ -11820,16 +12422,16 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 ## CAVEAT EMPTOR:
@@ -11843,14 +12445,14 @@ if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -11861,11 +12463,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11864: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12466: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11868: \$? = $ac_status" >&5
+   echo "$as_me:12470: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11878,8 +12480,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -11893,8 +12495,8 @@ lt_prog_compiler_wl=
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -11916,13 +12518,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
@@ -11932,7 +12536,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -11990,7 +12594,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -12023,7 +12627,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl='-Wl,'
@@ -12042,6 +12646,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -12051,6 +12671,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
@@ -12103,22 +12727,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_pic_works=no
+  lt_cv_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -12129,27 +12753,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12132: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12756: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12136: \$? = $ac_status" >&5
+   echo "$as_me:12760: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works=yes
+       lt_cv_prog_compiler_pic_works=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
-if test x"$lt_prog_compiler_pic_works" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
      "" | " "*) ;;
      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -12174,15 +12798,15 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_static_works=no
+  lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -12192,37 +12816,37 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works=yes
+         lt_cv_prog_compiler_static_works=yes
        fi
      else
-       lt_prog_compiler_static_works=yes
+       lt_cv_prog_compiler_static_works=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
-if test x"$lt_prog_compiler_static_works" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
     :
 else
     lt_prog_compiler_static=
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -12233,11 +12857,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12236: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12860: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12240: \$? = $ac_status" >&5
+   echo "$as_me:12864: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12259,34 +12883,34 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag=
@@ -12317,12 +12941,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -12381,7 +13006,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs=no
@@ -12429,7 +13054,7 @@ EOF
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -12447,7 +13072,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
@@ -12462,7 +13087,7 @@ EOF
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -12480,13 +13105,22 @@ EOF
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	ld_shlibs=no
@@ -12591,7 +13225,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -12611,7 +13245,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -12645,7 +13279,7 @@ _LT_EOF
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct=unsupported
@@ -12706,48 +13340,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -12781,48 +13410,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -12868,31 +13492,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes=yes
       ;;
 
     darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
+      allow_undefined_flag="$_lt_dar_allow_undefined"
       archive_cmds_need_lc=no
       hardcode_direct=no
       hardcode_automatic=yes
@@ -12901,19 +13507,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -12953,7 +13558,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -13075,24 +13680,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     openbsd*)
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs=no
       fi
       ;;
 
@@ -13151,17 +13760,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs=yes
       ;;
@@ -13218,7 +13826,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag='${wl}-z,text'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
@@ -13271,8 +13879,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
 #
@@ -13292,15 +13900,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -13318,7 +13926,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc=no
@@ -13330,16 +13938,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -13353,17 +13961,55 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
+
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
@@ -13384,7 +14030,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -13523,12 +14169,8 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -13545,18 +14187,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -13594,7 +14224,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -13657,7 +14287,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -13712,7 +14342,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -13728,7 +14358,7 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -13741,18 +14371,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -13834,6 +14452,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -13926,17 +14548,32 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var" || \
@@ -13960,8 +14597,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
@@ -13974,29 +14611,30 @@ fi
 
 striplib=
 old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
-         { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+         old_striplib="$STRIP -S"
+         { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
        else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
        ;;
    *)
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
     ;;
   esac
 fi
@@ -14028,10 +14666,10 @@ else
 
   darwin*)
   # if libdl is installed we need to link against it
-    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -14063,48 +14701,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
@@ -14118,10 +14744,10 @@ fi
    ;;
 
   *)
-    { echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+$as_echo_n "checking for shl_load... " >&6; }
 if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -14174,54 +14800,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_shl_load=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+$as_echo "$ac_cv_func_shl_load" >&6; }
 if test $ac_cv_func_shl_load = yes; then
   lt_cv_dlopen="shl_load"
 else
-  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -14253,55 +14867,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_shl_load=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
 if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
-  { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+$as_echo_n "checking for dlopen... " >&6; }
 if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -14354,54 +14956,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+$as_echo "$ac_cv_func_dlopen" >&6; }
 if test $ac_cv_func_dlopen = yes; then
   lt_cv_dlopen="dlopen"
 else
-  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -14433,55 +15023,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
@@ -14513,55 +15091,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_svld_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_svld_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
 if test $ac_cv_lib_svld_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -14593,50 +15159,38 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_dld_link=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_dld_link=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
 if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
 
@@ -14674,10 +15228,10 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
@@ -14685,7 +15239,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 14688 "configure"
+#line 15242 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14751,7 +15305,7 @@ EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -14769,15 +15323,15 @@ rm -fr conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
@@ -14785,7 +15339,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 14788 "configure"
+#line 15342 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14851,7 +15405,7 @@ EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -14869,8 +15423,8 @@ rm -fr conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -14892,13 +15446,13 @@ fi
 
 
 # Report which library types will actually be built
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -14912,21 +15466,21 @@ aix3*)
   fi
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
     ;;
 esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -14968,6 +15522,7 @@ if test -f "$ltmain"; then
     predeps \
     postdeps \
     compiler_lib_search_path \
+    compiler_lib_search_dirs \
     archive_cmds \
     archive_expsym_cmds \
     postinstall_cmds \
@@ -14983,6 +15538,7 @@ if test -f "$ltmain"; then
     module_cmds \
     module_expsym_cmds \
     lt_cv_prog_compiler_c_o \
+    fix_srcfile_path \
     exclude_expsyms \
     include_expsyms; do
 
@@ -15017,8 +15573,8 @@ if test -f "$ltmain"; then
 cfgfile="${ofile}T"
   trap "$rm \"$cfgfile\"; exit 1" 1 2 15
   $rm -f "$cfgfile"
-  { echo "$as_me:$LINENO: creating $ofile" >&5
-echo "$as_me: creating $ofile" >&6;}
+  { $as_echo "$as_me:$LINENO: creating $ofile" >&5
+$as_echo "$as_me: creating $ofile" >&6;}
 
   cat <<__EOF__ >> "$cfgfile"
 #! $SHELL
@@ -15027,7 +15583,7 @@ echo "$as_me: creating $ofile" >&6;}
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -15263,6 +15819,10 @@ predeps=$lt_predeps
 # shared library.
 postdeps=$lt_postdeps
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path
@@ -15351,7 +15911,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols
@@ -15426,18 +15986,18 @@ fi
 
 if test -f "$ltmain" && test -n "$tagnames"; then
   if test ! -f "${ofile}"; then
-    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
+$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
   fi
 
   if test -z "$LTCC"; then
     eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
     if test -z "$LTCC"; then
-      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
+$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
     else
-      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+      { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
+$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
     fi
   fi
   if test -z "$LTCFLAGS"; then
@@ -15454,16 +16014,16 @@ echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
     # Check whether tagname contains only valid characters
     case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
     "") ;;
-    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-echo "$as_me: error: invalid tag name: $tagname" >&2;}
+    *)  { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
+$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}
    { (exit 1); exit 1; }; }
 	;;
     esac
 
     if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
     then
-      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
+$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
@@ -15511,6 +16071,7 @@ postdep_objects_CXX=
 predeps_CXX=
 postdeps_CXX=
 compiler_lib_search_path_CXX=
+compiler_lib_search_dirs_CXX=
 
 # Source file extension for C++ test sources.
 ac_ext=cpp
@@ -15520,10 +16081,10 @@ objext=o
 objext_CXX=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -15539,16 +16100,16 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -15605,8 +16166,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -15635,14 +16196,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -15672,19 +16233,19 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -15696,8 +16257,8 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -15747,15 +16308,15 @@ else
 fi
 
 # PORTME: fill in a description of your system's C++ link characteristics
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 ld_shlibs_CXX=yes
 case $host_os in
   aix3*)
     # FIXME: insert proper C++ library support
     ld_shlibs_CXX=no
     ;;
-  aix4* | aix5*)
+  aix[4-9]*)
     if test "$host_cpu" = ia64; then
       # On IA64, the linker does run time linking by default, so we don't
       # have to do anything special.
@@ -15768,7 +16329,7 @@ case $host_os in
       # Test if we are trying to use run time linking or normal
       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
       # need to do runtime linking.
-      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	for ld_flag in $LDFLAGS; do
 	  case $ld_flag in
 	  *-brtl*)
@@ -15804,7 +16365,7 @@ case $host_os in
 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	then
 	  # We have reworked collect2
-	  hardcode_direct_CXX=yes
+	  :
 	else
 	  # We have old collect2
 	  hardcode_direct_CXX=unsupported
@@ -15865,48 +16426,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -15941,48 +16497,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -16044,59 +16595,31 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     fi
   ;;
       darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
       archive_cmds_need_lc_CXX=no
       hardcode_direct_CXX=no
       hardcode_automatic_CXX=yes
       hardcode_shlibpath_var_CXX=unsupported
       whole_archive_flag_spec_CXX=''
       link_all_deplibs_CXX=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
+      allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
       output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
+      archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+        archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
       fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          else
-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
       else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
           module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -16130,7 +16653,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
   freebsd-elf*)
     archive_cmds_need_lc_CXX=no
     ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
+  freebsd* | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     ld_shlibs_CXX=yes
@@ -16179,9 +16702,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_libdir_separator_CXX=:
 
       case $host_cpu in
-      hppa*64*|ia64*)
-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-        ;;
+      hppa*64*|ia64*) ;;
       *)
 	export_dynamic_flag_spec_CXX='${wl}-E'
         ;;
@@ -16249,7 +16770,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	;;
     esac
     ;;
-  interix3*)
+  interix[3-9]*)
     hardcode_direct_CXX=no
     hardcode_shlibpath_var_CXX=no
     hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
@@ -16289,7 +16810,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
     hardcode_libdir_separator_CXX=:
     ;;
-  linux*)
+  linux* | k*bsd*-gnu)
     case $cc_basename in
       KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -16341,7 +16862,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      pgCC*)
+      pgCC* | pgcpp*)
         # Portland Group C++ compiler
 	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
   	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -16369,6 +16890,29 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	# dependencies.
 	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C++ 5.9
+	  no_undefined_flag_CXX=' -zdefs'
+	  archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+	  # Not sure whether something based on
+	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	  # would be better.
+	  output_verbose_link_cmd='echo'
+
+	  # Archives containing C++ object files must be created using
+	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	  # necessary to make sure instantiated templates are included
+	  # in the archive.
+	  old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	  ;;
+	esac
+	;;
     esac
     ;;
   lynxos*)
@@ -16407,16 +16951,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ld_shlibs_CXX=no
     ;;
   openbsd*)
-    hardcode_direct_CXX=yes
-    hardcode_shlibpath_var_CXX=no
-    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      export_dynamic_flag_spec_CXX='${wl}-E'
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    if test -f /usr/libexec/ld.so; then
+      hardcode_direct_CXX=yes
+      hardcode_shlibpath_var_CXX=no
+      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	export_dynamic_flag_spec_CXX='${wl}-E'
+	whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      ld_shlibs_CXX=no
     fi
-    output_verbose_link_cmd='echo'
     ;;
   osf3*)
     case $cc_basename in
@@ -16578,15 +17126,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	case $host_os in
 	  solaris2.[0-5] | solaris2.[0-5].*) ;;
 	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
+	    # The compiler driver will combine and reorder linker options,
+	    # but understands `-z linker_flag'.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+	    whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
 	    ;;
 	esac
 	link_all_deplibs_CXX=yes
@@ -16633,6 +17176,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  fi
 
 	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	  case $host_os in
+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+	  *)
+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    ;;
+	  esac
 	fi
 	;;
     esac
@@ -16713,8 +17262,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ld_shlibs_CXX=no
     ;;
 esac
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 GCC_CXX="$GXX"
@@ -16724,7 +17273,6 @@ LD_CXX="$LD"
 ## There is no encapsulation within the following macros, do not change
 ## the running order or otherwise move them around unless you know exactly
 ## what you are doing...
-
 cat > conftest.$ac_ext <<EOF
 class Foo
 {
@@ -16738,7 +17286,7 @@ EOF
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Parse the compiler output and extract the necessary
   # objects, libraries and library flags.
@@ -16826,9 +17374,14 @@ fi
 
 $rm -f confest.$objext
 
+compiler_lib_search_dirs_CXX=
+if test -n "$compiler_lib_search_path_CXX"; then
+  compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
 # PORTME: override above test on systems where it is broken
 case $host_os in
-interix3*)
+interix[3-9]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   predep_objects_CXX=
@@ -16836,19 +17389,51 @@ interix3*)
   postdeps_CXX=
   ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    postdeps_CXX='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;
 esac
 
-
 case " $postdeps_CXX " in
 *" -lc "*) archive_cmds_need_lc_CXX=no ;;
 esac
@@ -16857,8 +17442,8 @@ lt_prog_compiler_wl_CXX=
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -16879,12 +17464,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       # like `-m68040'.
       lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
@@ -16896,7 +17483,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -16922,7 +17509,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   else
     case $host_os in
-      aix4* | aix5*)
+      aix[4-9]*)
 	# All AIX code is PIC.
 	if test "$host_cpu" = ia64; then
 	  # AIX 5 now supports IA64 processor
@@ -16962,7 +17549,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
+      freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -17005,7 +17592,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    ;;
 	esac
 	;;
-      linux*)
+      linux* | k*bsd*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -17018,7 +17605,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-static'
 	    ;;
-	  pgCC*)
+	  pgCC* | pgcpp*)
 	    # Portland Group C++ compiler.
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-fpic'
@@ -17032,6 +17619,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    ;;
 	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
 	    ;;
 	esac
 	;;
@@ -17131,22 +17726,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_pic_works_CXX=no
+  lt_cv_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -17157,27 +17752,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17160: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17755: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17164: \$? = $ac_status" >&5
+   echo "$as_me:17759: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_CXX=yes
+       lt_cv_prog_compiler_pic_works_CXX=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -17202,15 +17797,15 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_static_works_CXX=no
+  lt_cv_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -17220,37 +17815,37 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_CXX=yes
+         lt_cv_prog_compiler_static_works_CXX=yes
        fi
      else
-       lt_prog_compiler_static_works_CXX=yes
+       lt_cv_prog_compiler_static_works_CXX=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
     :
 else
     lt_prog_compiler_static_CXX=
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -17261,11 +17856,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17264: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17859: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17268: \$? = $ac_status" >&5
+   echo "$as_me:17863: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17287,38 +17882,38 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix4* | aix5*)
+  aix[4-9]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -17331,15 +17926,16 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
     export_symbols_cmds_CXX="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
   ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   esac
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 #
@@ -17359,15 +17955,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -17385,7 +17981,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_CXX=no
@@ -17397,16 +17993,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -17420,20 +18016,7 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -17451,7 +18034,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -17590,12 +18173,7 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -17612,18 +18190,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -17661,7 +18227,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -17724,7 +18290,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -17779,7 +18345,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -17795,7 +18361,7 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -17808,18 +18374,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -17901,6 +18455,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -17993,17 +18551,32 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" || \
    test -n "$runpath_var_CXX" || \
@@ -18027,8 +18600,8 @@ else
   # directories.
   hardcode_action_CXX=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
 
 if test "$hardcode_action_CXX" = relink; then
   # Fast installation is not supported
@@ -18080,6 +18653,7 @@ if test -f "$ltmain"; then
     predeps_CXX \
     postdeps_CXX \
     compiler_lib_search_path_CXX \
+    compiler_lib_search_dirs_CXX \
     archive_cmds_CXX \
     archive_expsym_cmds_CXX \
     postinstall_cmds_CXX \
@@ -18095,6 +18669,7 @@ if test -f "$ltmain"; then
     module_cmds_CXX \
     module_expsym_cmds_CXX \
     lt_cv_prog_compiler_c_o_CXX \
+    fix_srcfile_path_CXX \
     exclude_expsyms_CXX \
     include_expsyms_CXX; do
 
@@ -18327,6 +18902,10 @@ predeps=$lt_predeps_CXX
 # shared library.
 postdeps=$lt_postdeps_CXX
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
@@ -18415,7 +18994,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_CXX
@@ -18506,10 +19085,17 @@ objext=o
 objext_F77=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -18525,16 +19111,16 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -18553,13 +19139,13 @@ done
 cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -18572,21 +19158,21 @@ aix3*)
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4* | aix5*)
+aix[4-9]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
 GCC_F77="$G77"
 LD_F77="$LD"
@@ -18595,8 +19181,8 @@ lt_prog_compiler_wl_F77=
 lt_prog_compiler_pic_F77=
 lt_prog_compiler_static_F77=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl_F77='-Wl,'
@@ -18618,13 +19204,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
       ;;
 
@@ -18634,7 +19222,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_F77='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -18692,7 +19280,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
@@ -18725,7 +19313,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_F77='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_F77='-Wl,'
@@ -18744,6 +19332,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static_F77='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_F77='-KPIC'
+	  lt_prog_compiler_static_F77='-Bstatic'
+	  lt_prog_compiler_wl_F77=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -18753,6 +19357,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_F77='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static_F77='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
@@ -18805,22 +19413,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
+$as_echo "$lt_prog_compiler_pic_F77" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_F77"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_pic_works_F77=no
+  lt_cv_prog_compiler_pic_works_F77=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_F77"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -18831,27 +19439,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18834: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19442: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18838: \$? = $ac_status" >&5
+   echo "$as_me:19446: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_F77=yes
+       lt_cv_prog_compiler_pic_works_F77=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
     case $lt_prog_compiler_pic_F77 in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
@@ -18876,15 +19484,15 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_static_works_F77=no
+  lt_cv_prog_compiler_static_works_F77=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -18894,37 +19502,37 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_F77=yes
+         lt_cv_prog_compiler_static_works_F77=yes
        fi
      else
-       lt_prog_compiler_static_works_F77=yes
+       lt_cv_prog_compiler_static_works_F77=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
 
-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
     :
 else
     lt_prog_compiler_static_F77=
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_F77=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -18935,11 +19543,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18938: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19546: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18942: \$? = $ac_status" >&5
+   echo "$as_me:19550: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18961,34 +19569,34 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag_F77=
@@ -19019,12 +19627,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -19083,7 +19692,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs_F77=no
@@ -19131,7 +19740,7 @@ EOF
       allow_undefined_flag_F77=unsupported
       always_export_symbols_F77=no
       enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -19149,7 +19758,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct_F77=no
       hardcode_shlibpath_var_F77=no
       hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
@@ -19164,7 +19773,7 @@ EOF
       archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -19182,13 +19791,22 @@ EOF
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	ld_shlibs_F77=no
@@ -19293,7 +19911,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -19313,7 +19931,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -19347,7 +19965,7 @@ _LT_EOF
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct_F77=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct_F77=unsupported
@@ -19398,48 +20016,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -19463,48 +20076,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_f77_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -19550,31 +20158,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_F77='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_F77=yes
       ;;
 
     darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
+      allow_undefined_flag_F77="$_lt_dar_allow_undefined"
       archive_cmds_need_lc_F77=no
       hardcode_direct_F77=no
       hardcode_automatic_F77=yes
@@ -19583,19 +20173,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs_F77=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -19635,7 +20224,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_F77='-R$libdir'
       hardcode_direct_F77=yes
@@ -19757,24 +20346,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     openbsd*)
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_F77='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_F77=yes
+	hardcode_shlibpath_var_F77=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_F77='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_F77='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_F77='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs_F77=no
       fi
       ;;
 
@@ -19833,17 +20426,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs_F77=yes
       ;;
@@ -19900,7 +20492,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag_F77='${wl}-z,text'
       archive_cmds_need_lc_F77=no
       hardcode_shlibpath_var_F77=no
@@ -19953,8 +20545,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+$as_echo "$ld_shlibs_F77" >&6; }
 test "$ld_shlibs_F77" = no && can_build_shared=no
 
 #
@@ -19974,15 +20566,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -20000,7 +20592,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_F77=no
@@ -20012,16 +20604,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
+$as_echo "$archive_cmds_need_lc_F77" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -20035,20 +20627,7 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -20066,7 +20645,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -20205,12 +20784,7 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -20227,18 +20801,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -20276,7 +20838,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -20339,7 +20901,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -20394,7 +20956,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -20410,7 +20972,7 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -20423,18 +20985,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -20516,6 +21066,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -20608,17 +21162,32 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_F77=
 if test -n "$hardcode_libdir_flag_spec_F77" || \
    test -n "$runpath_var_F77" || \
@@ -20642,8 +21211,8 @@ else
   # directories.
   hardcode_action_F77=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+$as_echo "$hardcode_action_F77" >&6; }
 
 if test "$hardcode_action_F77" = relink; then
   # Fast installation is not supported
@@ -20695,6 +21264,7 @@ if test -f "$ltmain"; then
     predeps_F77 \
     postdeps_F77 \
     compiler_lib_search_path_F77 \
+    compiler_lib_search_dirs_F77 \
     archive_cmds_F77 \
     archive_expsym_cmds_F77 \
     postinstall_cmds_F77 \
@@ -20710,6 +21280,7 @@ if test -f "$ltmain"; then
     module_cmds_F77 \
     module_expsym_cmds_F77 \
     lt_cv_prog_compiler_c_o_F77 \
+    fix_srcfile_path_F77 \
     exclude_expsyms_F77 \
     include_expsyms_F77; do
 
@@ -20942,6 +21513,10 @@ predeps=$lt_predeps_F77
 # shared library.
 postdeps=$lt_postdeps_F77
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_F77
@@ -21030,7 +21605,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_F77"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_F77
@@ -21088,10 +21663,10 @@ objext=o
 objext_GCJ=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -21107,16 +21682,16 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -21151,14 +21726,14 @@ if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -21169,11 +21744,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21172: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:21747: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:21176: \$? = $ac_status" >&5
+   echo "$as_me:21751: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -21186,8 +21761,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
@@ -21201,8 +21776,8 @@ lt_prog_compiler_wl_GCJ=
 lt_prog_compiler_pic_GCJ=
 lt_prog_compiler_static_GCJ=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl_GCJ='-Wl,'
@@ -21224,14 +21799,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+
       ;;
 
     darwin* | rhapsody*)
@@ -21240,7 +21817,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_GCJ='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -21298,10 +21875,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -21331,7 +21908,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_GCJ='-Bstatic'
       ;;
 
-    linux*)
+    linux* | k*bsd*-gnu)
       case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_GCJ='-Wl,'
@@ -21350,6 +21927,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static_GCJ='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic_GCJ='-KPIC'
+	  lt_prog_compiler_static_GCJ='-Bstatic'
+	  lt_prog_compiler_wl_GCJ=''
+	  ;;
+	esac
+	;;
       esac
       ;;
 
@@ -21359,6 +21952,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_GCJ='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static_GCJ='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic_GCJ='-KPIC'
       lt_prog_compiler_static_GCJ='-Bstatic'
@@ -21411,22 +22008,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
+$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_GCJ"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_pic_works_GCJ=no
+  lt_cv_prog_compiler_pic_works_GCJ=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -21437,27 +22034,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21440: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:22037: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:21444: \$? = $ac_status" >&5
+   echo "$as_me:22041: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_GCJ=yes
+       lt_cv_prog_compiler_pic_works_GCJ=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
     case $lt_prog_compiler_pic_GCJ in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
@@ -21482,15 +22079,15 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_static_works_GCJ=no
+  lt_cv_prog_compiler_static_works_GCJ=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -21500,37 +22097,37 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_GCJ=yes
+         lt_cv_prog_compiler_static_works_GCJ=yes
        fi
      else
-       lt_prog_compiler_static_works_GCJ=yes
+       lt_cv_prog_compiler_static_works_GCJ=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
 
-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
     :
 else
     lt_prog_compiler_static_GCJ=
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_GCJ=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -21541,11 +22138,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21544: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:22141: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:21548: \$? = $ac_status" >&5
+   echo "$as_me:22145: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -21567,34 +22164,34 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag_GCJ=
@@ -21625,12 +22222,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -21689,7 +22287,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs_GCJ=no
@@ -21737,7 +22335,7 @@ EOF
       allow_undefined_flag_GCJ=unsupported
       always_export_symbols_GCJ=no
       enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -21755,7 +22353,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct_GCJ=no
       hardcode_shlibpath_var_GCJ=no
       hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
@@ -21770,7 +22368,7 @@ EOF
       archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
@@ -21788,13 +22386,22 @@ EOF
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	esac
-	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	*)
+	  tmp_sharedflag='-shared' ;;
+	esac
+	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
 	if test $supports_anon_versioning = yes; then
 	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 	fi
       else
 	ld_shlibs_GCJ=no
@@ -21899,7 +22506,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
@@ -21919,7 +22526,7 @@ _LT_EOF
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
   	    aix_use_runtimelinking=yes
@@ -21953,7 +22560,7 @@ _LT_EOF
   	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 	  then
   	  # We have reworked collect2
-  	  hardcode_direct_GCJ=yes
+  	  :
 	  else
   	  # We have old collect2
   	  hardcode_direct_GCJ=unsupported
@@ -22014,48 +22621,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -22089,48 +22691,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
@@ -22176,31 +22773,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_GCJ='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_GCJ=yes
       ;;
 
     darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
+      allow_undefined_flag_GCJ="$_lt_dar_allow_undefined"
       archive_cmds_need_lc_GCJ=no
       hardcode_direct_GCJ=no
       hardcode_automatic_GCJ=yes
@@ -22209,19 +22788,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs_GCJ=yes
     if test "$GCC" = yes ; then
     	output_verbose_link_cmd='echo'
-        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -22261,7 +22839,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
+    freebsd* | dragonfly*)
       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_GCJ='-R$libdir'
       hardcode_direct_GCJ=yes
@@ -22383,24 +22961,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     openbsd*)
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_GCJ='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_GCJ=yes
+	hardcode_shlibpath_var_GCJ=no
+	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_GCJ='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec_GCJ='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+        fi
       else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	ld_shlibs_GCJ=no
       fi
       ;;
 
@@ -22459,17 +23041,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
  	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
       link_all_deplibs_GCJ=yes
       ;;
@@ -22526,7 +23107,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag_GCJ='${wl}-z,text'
       archive_cmds_need_lc_GCJ=no
       hardcode_shlibpath_var_GCJ=no
@@ -22579,8 +23160,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+$as_echo "$ld_shlibs_GCJ" >&6; }
 test "$ld_shlibs_GCJ" = no && can_build_shared=no
 
 #
@@ -22600,15 +23181,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -22626,7 +23207,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc_GCJ=no
@@ -22638,16 +23219,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
+$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -22661,20 +23242,7 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -22692,7 +23260,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -22831,12 +23399,7 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -22853,18 +23416,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -22902,7 +23453,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -22965,7 +23516,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -23020,7 +23571,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -23036,7 +23587,7 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -23049,18 +23600,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -23142,6 +23681,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -23234,17 +23777,32 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_GCJ=
 if test -n "$hardcode_libdir_flag_spec_GCJ" || \
    test -n "$runpath_var_GCJ" || \
@@ -23268,8 +23826,8 @@ else
   # directories.
   hardcode_action_GCJ=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+$as_echo "$hardcode_action_GCJ" >&6; }
 
 if test "$hardcode_action_GCJ" = relink; then
   # Fast installation is not supported
@@ -23321,6 +23879,7 @@ if test -f "$ltmain"; then
     predeps_GCJ \
     postdeps_GCJ \
     compiler_lib_search_path_GCJ \
+    compiler_lib_search_dirs_GCJ \
     archive_cmds_GCJ \
     archive_expsym_cmds_GCJ \
     postinstall_cmds_GCJ \
@@ -23336,6 +23895,7 @@ if test -f "$ltmain"; then
     module_cmds_GCJ \
     module_expsym_cmds_GCJ \
     lt_cv_prog_compiler_c_o_GCJ \
+    fix_srcfile_path_GCJ \
     exclude_expsyms_GCJ \
     include_expsyms_GCJ; do
 
@@ -23568,6 +24128,10 @@ predeps=$lt_predeps_GCJ
 # shared library.
 postdeps=$lt_postdeps_GCJ
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
@@ -23656,7 +24220,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_GCJ
@@ -23713,7 +24277,7 @@ objext=o
 objext_RC=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
 lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -23732,16 +24296,16 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -23801,6 +24365,7 @@ if test -f "$ltmain"; then
     predeps_RC \
     postdeps_RC \
     compiler_lib_search_path_RC \
+    compiler_lib_search_dirs_RC \
     archive_cmds_RC \
     archive_expsym_cmds_RC \
     postinstall_cmds_RC \
@@ -23816,6 +24381,7 @@ if test -f "$ltmain"; then
     module_cmds_RC \
     module_expsym_cmds_RC \
     lt_cv_prog_compiler_c_o_RC \
+    fix_srcfile_path_RC \
     exclude_expsyms_RC \
     include_expsyms_RC; do
 
@@ -24048,6 +24614,10 @@ predeps=$lt_predeps_RC
 # shared library.
 postdeps=$lt_postdeps_RC
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_RC
@@ -24136,7 +24706,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_RC
@@ -24180,8 +24750,8 @@ CC="$lt_save_CC"
 	;;
 
       *)
-	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
+	{ { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
+$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
    { (exit 1); exit 1; }; }
 	;;
       esac
@@ -24200,8 +24770,8 @@ echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
     chmod +x "$ofile"
   else
     rm -f "${ofile}T"
-    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
+    { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
+$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -24266,7 +24836,7 @@ fi
 if test "x$use_libtool" = "xyes"; then
       lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@'
       LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"
-      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) -o \$@"
+      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@"
       so_ext='lo'
       lib_target='-rpath $(libdir) $(OBJECTS)'
       export_lib_target='-rpath \$(libdir) \$(OBJECTS)'
@@ -24295,6 +24865,7 @@ esac
 
 
 
+
 nl='
 '
 echo "${nl}Check for compiler flags..."
@@ -24787,6 +25358,118 @@ case "$host:$CC" in
 	;;
 esac
 
+{ $as_echo "$as_me:$LINENO: checking whether the compiler provides atomic builtins" >&5
+$as_echo_n "checking whether the compiler provides atomic builtins... " >&6; }
+if test "${atomic_builtins+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  atomic_builtins=no
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int main()
+{
+    unsigned long val = 1010, tmp, *mem = &val;
+
+    if (__sync_fetch_and_add(&val, 1010) != 1010 || val != 2020)
+        return 1;
+
+    tmp = val;
+
+    if (__sync_fetch_and_sub(mem, 1010) != tmp || val != 1010)
+        return 1;
+
+    if (__sync_sub_and_fetch(&val, 1010) != 0 || val != 0)
+        return 1;
+
+    tmp = 3030;
+
+    if (__sync_val_compare_and_swap(mem, 0, tmp) != 0 || val != tmp)
+        return 1;
+
+    if (__sync_lock_test_and_set(&val, 4040) != 3030)
+        return 1;
+
+    mem = &tmp;
+
+    if (__sync_val_compare_and_swap(&mem, &tmp, &val) != &tmp)
+        return 1;
+
+    __sync_synchronize();
+
+    if (mem != &val)
+        return 1;
+
+    return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  atomic_builtins=yes
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+atomic_builtins=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $atomic_builtins" >&5
+$as_echo "$atomic_builtins" >&6; }
+
+if test "$atomic_builtins" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ATOMIC_BUILTINS 1
+_ACEOF
+
+fi
+
+case $host in
+    powerpc-405-*)
+        # The IBM ppc405cr processor has a bugged stwcx instruction.
+
+cat >>confdefs.h <<\_ACEOF
+#define PPC405_ERRATA 1
+_ACEOF
+
+        ;;
+    *)
+        ;;
+esac
+
 
 if test "$GCC" = "yes"; then
   MKDEP='$(CC) -MM'
@@ -24798,16 +25481,16 @@ else
 EOF
   MKDEP="true"
   for i in "$CC -MM" "$CC -M" "$CPP -MM" "$CPP -M" "cpp -M"; do
-    { echo "$as_me:$LINENO: checking if $i can create proper make dependencies" >&5
-echo $ECHO_N "checking if $i can create proper make dependencies... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking if $i can create proper make dependencies" >&5
+$as_echo_n "checking if $i can create proper make dependencies... " >&6; }
     if $i conftest.c 2>/dev/null | grep 'conftest.o: conftest.c' >/dev/null; then
       MKDEP=$i
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
       break;
     fi
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   done
   rm -f conftest.c
 fi
@@ -24892,10 +25575,10 @@ case $host in
   fi
 
 
-{ echo "$as_me:$LINENO: checking for random in -lbsd" >&5
-echo $ECHO_N "checking for random in -lbsd... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for random in -lbsd" >&5
+$as_echo_n "checking for random in -lbsd... " >&6; }
 if test "${ac_cv_lib_bsd_random+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
@@ -24927,48 +25610,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_bsd_random=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_bsd_random=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_random" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_random" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_random" >&5
+$as_echo "$ac_cv_lib_bsd_random" >&6; }
 if test $ac_cv_lib_bsd_random = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBBSD 1
@@ -25011,10 +25682,10 @@ fi
        enable_threads="system_threads"
        native_mmap_emul="1"
 
-  { echo "$as_me:$LINENO: checking for BONE_VERSION in sys/socket.h" >&5
-echo $ECHO_N "checking for BONE_VERSION in sys/socket.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for BONE_VERSION in sys/socket.h" >&5
+$as_echo_n "checking for BONE_VERSION in sys/socket.h... " >&6; }
 if test "${ac_cv_define_BONE_VERSION+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
@@ -25040,8 +25711,8 @@ rm -f conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_define_BONE_VERSION" >&5
-echo "${ECHO_T}$ac_cv_define_BONE_VERSION" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_BONE_VERSION" >&5
+$as_echo "$ac_cv_define_BONE_VERSION" >&6; }
   if test "$ac_cv_define_BONE_VERSION" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -25072,6 +25743,13 @@ _ACEOF
        OSDIR="as400"
        eolstr="\\n"
        ;;
+   *mingw*)
+       OSDIR="win32"
+       enable_threads="system_threads"
+       eolstr="\\n"
+       proc_mutex_is_global=1
+       OBJECTS_PLATFORM='$(OBJECTS_win32)'
+       ;;
    *cygwin*)
        OSDIR="unix"
 
@@ -25122,10 +25800,10 @@ fi
 
 if test "$apr_lfs_choice" = "yes"; then
    # Check whether the transitional LFS API is sufficient
-   { echo "$as_me:$LINENO: checking whether to enable -D_LARGEFILE64_SOURCE" >&5
-echo $ECHO_N "checking whether to enable -D_LARGEFILE64_SOURCE... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking whether to enable -D_LARGEFILE64_SOURCE" >&5
+$as_echo_n "checking whether to enable -D_LARGEFILE64_SOURCE... " >&6; }
 if test "${apr_cv_use_lfs64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
    apr_save_CPPFLAGS=$CPPFLAGS
@@ -25180,37 +25858,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apr_cv_use_lfs64=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apr_cv_use_lfs64=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
    CPPFLAGS=$apr_save_CPPFLAGS
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_use_lfs64" >&5
-echo "${ECHO_T}$apr_cv_use_lfs64" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_use_lfs64" >&5
+$as_echo "$apr_cv_use_lfs64" >&6; }
    if test "$apr_cv_use_lfs64" = "yes"; then
 
   if test "x$CPPFLAGS" = "x"; then
@@ -25256,7 +25937,7 @@ fi
 if test $force_generic_atomics = yes; then
 
 cat >>confdefs.h <<\_ACEOF
-#define USE_GENERIC_ATOMICS 1
+#define USE_ATOMICS_GENERIC 1
 _ACEOF
 
 fi
@@ -25278,8 +25959,8 @@ case $host in
     *linux*)
         os_version=`uname -r | sed -e 's/\(.\)\.\(.\)\.\(.\).*/\1\2\3/'`
         ;;
-    *darwin*)
-        os_version=`uname -r | sed -e 's/\(.\)\.\(.\).*/\1\2/'`
+    *os390)
+        os_version=`uname -r | sed -e 's/\.//g'`
         ;;
     *)
         os_version=OS_VERSION_IS_NOT_SET
@@ -25288,10 +25969,658 @@ esac
 
 echo "${nl}Checking for libraries..."
 
-{ echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
-echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6; }
+case $host in
+   *mingw*)
+
+
+{ $as_echo "$as_me:$LINENO: checking for getpid in -lmsvcrt" >&5
+$as_echo_n "checking for getpid in -lmsvcrt... " >&6; }
+if test "${ac_cv_lib_msvcrt_getpid+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmsvcrt  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char getpid ();
+int
+main ()
+{
+return getpid ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_msvcrt_getpid=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_msvcrt_getpid=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_msvcrt_getpid" >&5
+$as_echo "$ac_cv_lib_msvcrt_getpid" >&6; }
+if test $ac_cv_lib_msvcrt_getpid = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBMSVCRT 1
+_ACEOF
+
+  LIBS="-lmsvcrt $LIBS"
+
+fi
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for SetErrorMode@4 in kernel32" >&5
+$as_echo_n "checking for SetErrorMode@4 in kernel32... " >&6; }
+if test "${ac_cv_lib_kernel32_SetErrorMode+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+
+ac_func_search_save_LIBS=$LIBS
+LIBS="$LIBS -lkernel32"
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#pragma pack(1)
+struct x {
+ char c1;
+ char c2;
+ char c3;
+ char c4;
+};
+__stdcall SetErrorMode(struct x);
+int
+main ()
+{
+
+struct x s = {0};
+SetErrorMode(s)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_kernel32_SetErrorMode=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_kernel32_SetErrorMode=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kernel32_SetErrorMode" >&5
+$as_echo "$ac_cv_lib_kernel32_SetErrorMode" >&6; }
+if test $ac_cv_lib_kernel32_SetErrorMode = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBKERNEL32 /**/
+_ACEOF
+
+  LIBS="-lkernel32 $LIBS"
+
+fi
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for GetSecurityInfo@32 in advapi32" >&5
+$as_echo_n "checking for GetSecurityInfo@32 in advapi32... " >&6; }
+if test "${ac_cv_lib_advapi32_GetSecurityInfo+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+
+ac_func_search_save_LIBS=$LIBS
+LIBS="$LIBS -ladvapi32"
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#pragma pack(1)
+struct x {
+ char c1;
+ char c2;
+ char c3;
+ char c4;
+ char c5;
+ char c6;
+ char c7;
+ char c8;
+ char c9;
+ char c10;
+ char c11;
+ char c12;
+ char c13;
+ char c14;
+ char c15;
+ char c16;
+ char c17;
+ char c18;
+ char c19;
+ char c20;
+ char c21;
+ char c22;
+ char c23;
+ char c24;
+ char c25;
+ char c26;
+ char c27;
+ char c28;
+ char c29;
+ char c30;
+ char c31;
+ char c32;
+};
+__stdcall GetSecurityInfo(struct x);
+int
+main ()
+{
+
+struct x s = {0};
+GetSecurityInfo(s)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_advapi32_GetSecurityInfo=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_advapi32_GetSecurityInfo=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_advapi32_GetSecurityInfo" >&5
+$as_echo "$ac_cv_lib_advapi32_GetSecurityInfo" >&6; }
+if test $ac_cv_lib_advapi32_GetSecurityInfo = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBADVAPI32 /**/
+_ACEOF
+
+  LIBS="-ladvapi32 $LIBS"
+
+fi
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for gethostbyname@4 in ws2_32" >&5
+$as_echo_n "checking for gethostbyname@4 in ws2_32... " >&6; }
+if test "${ac_cv_lib_ws2_32_gethostbyname+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+
+ac_func_search_save_LIBS=$LIBS
+LIBS="$LIBS -lws2_32"
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#pragma pack(1)
+struct x {
+ char c1;
+ char c2;
+ char c3;
+ char c4;
+};
+__stdcall gethostbyname(struct x);
+int
+main ()
+{
+
+struct x s = {0};
+gethostbyname(s)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_ws2_32_gethostbyname=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_ws2_32_gethostbyname=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ws2_32_gethostbyname" >&5
+$as_echo "$ac_cv_lib_ws2_32_gethostbyname" >&6; }
+if test $ac_cv_lib_ws2_32_gethostbyname = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBWS2_32 /**/
+_ACEOF
+
+  LIBS="-lws2_32 $LIBS"
+
+fi
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for CommandLineToArgvW@8 in shell32" >&5
+$as_echo_n "checking for CommandLineToArgvW@8 in shell32... " >&6; }
+if test "${ac_cv_lib_shell32_CommandLineToArgvW+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+
+ac_func_search_save_LIBS=$LIBS
+LIBS="$LIBS -lshell32"
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#pragma pack(1)
+struct x {
+ char c1;
+ char c2;
+ char c3;
+ char c4;
+ char c5;
+ char c6;
+ char c7;
+ char c8;
+};
+__stdcall CommandLineToArgvW(struct x);
+int
+main ()
+{
+
+struct x s = {0};
+CommandLineToArgvW(s)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_shell32_CommandLineToArgvW=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_shell32_CommandLineToArgvW=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_shell32_CommandLineToArgvW" >&5
+$as_echo "$ac_cv_lib_shell32_CommandLineToArgvW" >&6; }
+if test $ac_cv_lib_shell32_CommandLineToArgvW = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSHELL32 /**/
+_ACEOF
+
+  LIBS="-lshell32 $LIBS"
+
+fi
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for CreateFileMappingA@24 in kernel32" >&5
+$as_echo_n "checking for CreateFileMappingA@24 in kernel32... " >&6; }
+if test "${ac_cv_lib_kernel32_CreateFileMappingA+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+
+ac_func_search_save_LIBS=$LIBS
+LIBS="$LIBS -lkernel32"
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#pragma pack(1)
+struct x {
+ char c1;
+ char c2;
+ char c3;
+ char c4;
+ char c5;
+ char c6;
+ char c7;
+ char c8;
+ char c9;
+ char c10;
+ char c11;
+ char c12;
+ char c13;
+ char c14;
+ char c15;
+ char c16;
+ char c17;
+ char c18;
+ char c19;
+ char c20;
+ char c21;
+ char c22;
+ char c23;
+ char c24;
+};
+__stdcall CreateFileMappingA(struct x);
+int
+main ()
+{
+
+struct x s = {0};
+CreateFileMappingA(s)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_kernel32_CreateFileMappingA=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_kernel32_CreateFileMappingA=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kernel32_CreateFileMappingA" >&5
+$as_echo "$ac_cv_lib_kernel32_CreateFileMappingA" >&6; }
+if test $ac_cv_lib_kernel32_CreateFileMappingA = yes; then
+  ac_cv_func_CreateFileMapping=$ac_cv_lib_kernel32_CreateFileMappingA
+fi
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for UuidCreate@4 in rpcrt4" >&5
+$as_echo_n "checking for UuidCreate@4 in rpcrt4... " >&6; }
+if test "${ac_cv_lib_rpcrt4_UuidCreate+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+
+ac_func_search_save_LIBS=$LIBS
+LIBS="$LIBS -lrpcrt4"
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#pragma pack(1)
+struct x {
+ char c1;
+ char c2;
+ char c3;
+ char c4;
+};
+__stdcall UuidCreate(struct x);
+int
+main ()
+{
+
+struct x s = {0};
+UuidCreate(s)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_lib_rpcrt4_UuidCreate=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_rpcrt4_UuidCreate=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rpcrt4_UuidCreate" >&5
+$as_echo "$ac_cv_lib_rpcrt4_UuidCreate" >&6; }
+if test $ac_cv_lib_rpcrt4_UuidCreate = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBRPCRT4 /**/
+_ACEOF
+
+  LIBS="-lrpcrt4 $LIBS"
+
+fi
+
+      ;;
+   *)
+      { $as_echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
+$as_echo_n "checking for library containing gethostbyname... " >&6; }
 if test "${ac_cv_search_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -25329,43 +26658,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_gethostbyname=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_gethostbyname+set}" = set; then
   break
@@ -25379,18 +26696,18 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
+$as_echo "$ac_cv_search_gethostbyname" >&6; }
 ac_res=$ac_cv_search_gethostbyname
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing gethostname" >&5
-echo $ECHO_N "checking for library containing gethostname... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for library containing gethostname" >&5
+$as_echo_n "checking for library containing gethostname... " >&6; }
 if test "${ac_cv_search_gethostname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -25428,43 +26745,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_gethostname=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_gethostname+set}" = set; then
   break
@@ -25478,18 +26783,18 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostname" >&5
-echo "${ECHO_T}$ac_cv_search_gethostname" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostname" >&5
+$as_echo "$ac_cv_search_gethostname" >&6; }
 ac_res=$ac_cv_search_gethostname
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing socket" >&5
-echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for library containing socket" >&5
+$as_echo_n "checking for library containing socket... " >&6; }
 if test "${ac_cv_search_socket+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -25527,43 +26832,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_socket=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_socket+set}" = set; then
   break
@@ -25577,18 +26870,18 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5
-echo "${ECHO_T}$ac_cv_search_socket" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5
+$as_echo "$ac_cv_search_socket" >&6; }
 ac_res=$ac_cv_search_socket
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing crypt" >&5
-echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for library containing crypt" >&5
+$as_echo_n "checking for library containing crypt... " >&6; }
 if test "${ac_cv_search_crypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -25626,43 +26919,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_crypt=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_crypt+set}" = set; then
   break
@@ -25676,8 +26957,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
-echo "${ECHO_T}$ac_cv_search_crypt" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
+$as_echo "$ac_cv_search_crypt" >&6; }
 ac_res=$ac_cv_search_crypt
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -25685,10 +26966,10 @@ if test "$ac_res" != no; then
 fi
 
 
-{ echo "$as_me:$LINENO: checking for main in -ltruerand" >&5
-echo $ECHO_N "checking for main in -ltruerand... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for main in -ltruerand" >&5
+$as_echo_n "checking for main in -ltruerand... " >&6; }
 if test "${ac_cv_lib_truerand_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltruerand  $LIBS"
@@ -25714,48 +26995,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_truerand_main=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_truerand_main=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_truerand_main" >&5
-echo "${ECHO_T}$ac_cv_lib_truerand_main" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_truerand_main" >&5
+$as_echo "$ac_cv_lib_truerand_main" >&6; }
 if test $ac_cv_lib_truerand_main = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBTRUERAND 1
@@ -25765,10 +27034,10 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing modf" >&5
-echo $ECHO_N "checking for library containing modf... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for library containing modf" >&5
+$as_echo_n "checking for library containing modf... " >&6; }
 if test "${ac_cv_search_modf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -25806,43 +27075,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_modf=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_modf+set}" = set; then
   break
@@ -25856,14 +27113,16 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_modf" >&5
-echo "${ECHO_T}$ac_cv_search_modf" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_modf" >&5
+$as_echo "$ac_cv_search_modf" >&6; }
 ac_res=$ac_cv_search_modf
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
+       ;;
+esac
 
 echo "${nl}Checking for Threads..."
 
@@ -25879,20 +27138,21 @@ else
 
 for ac_header in pthread.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25908,49 +27168,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25964,76 +27208,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
    enable_threads="pthread"
 else
@@ -26047,20 +27287,21 @@ done
 
 for ac_header in pthread.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26076,49 +27317,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26132,76 +27357,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
    enable_threads="pthread"
 else
@@ -26230,10 +27451,10 @@ else
 
 
 
-{ echo "$as_me:$LINENO: checking for CFLAGS needed for pthreads" >&5
-echo $ECHO_N "checking for CFLAGS needed for pthreads... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for CFLAGS needed for pthreads" >&5
+$as_echo_n "checking for CFLAGS needed for pthreads... " >&6; }
 if test "${apr_cv_pthreads_cflags+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   apr_ptc_cflags=$CFLAGS
  for flag in none -kthread -pthread -pthreads -mt -mthreads -Kthread -threads; do
@@ -26272,29 +27493,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apr_p_t_r=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apr_p_t_r=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -26312,8 +27536,8 @@ fi
  CFLAGS=$apr_ptc_cflags
 
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_pthreads_cflags" >&5
-echo "${ECHO_T}$apr_cv_pthreads_cflags" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_pthreads_cflags" >&5
+$as_echo "$apr_cv_pthreads_cflags" >&6; }
 
 if test -n "$apr_cv_pthreads_cflags"; then
    pthreads_working=yes
@@ -26348,10 +27572,10 @@ fi
 # gcc ignore -pthread when linking a shared object.  So always
 # try and add the relevant library to LIBS too.
 
-{ echo "$as_me:$LINENO: checking for LIBS needed for pthreads" >&5
-echo $ECHO_N "checking for LIBS needed for pthreads... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for LIBS needed for pthreads" >&5
+$as_echo_n "checking for LIBS needed for pthreads... " >&6; }
 if test "${apr_cv_pthreads_lib+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   apr_ptc_libs=$LIBS
@@ -26390,29 +27614,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apr_p_t_r=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apr_p_t_r=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -26430,8 +27657,8 @@ fi
   LIBS=$apr_ptc_libs
 
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_pthreads_lib" >&5
-echo "${ECHO_T}$apr_cv_pthreads_lib" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_pthreads_lib" >&5
+$as_echo "$apr_cv_pthreads_lib" >&6; }
 
 if test -n "$apr_cv_pthreads_lib"; then
    pthreads_working=yes
@@ -26471,20 +27698,21 @@ fi
 
 for ac_header in pthread.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26500,49 +27728,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26556,76 +27768,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
           threads="1"
@@ -26649,20 +27857,21 @@ done
 
 for ac_header in pthread.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26678,49 +27887,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26734,76 +27927,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
           threads="1"
@@ -26838,10 +28027,10 @@ done
 
 
 
-{ echo "$as_me:$LINENO: checking for CFLAGS needed for pthreads" >&5
-echo $ECHO_N "checking for CFLAGS needed for pthreads... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for CFLAGS needed for pthreads" >&5
+$as_echo_n "checking for CFLAGS needed for pthreads... " >&6; }
 if test "${apr_cv_pthreads_cflags+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   apr_ptc_cflags=$CFLAGS
  for flag in none -kthread -pthread -pthreads -mt -mthreads -Kthread -threads; do
@@ -26880,29 +28069,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apr_p_t_r=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apr_p_t_r=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -26920,8 +28112,8 @@ fi
  CFLAGS=$apr_ptc_cflags
 
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_pthreads_cflags" >&5
-echo "${ECHO_T}$apr_cv_pthreads_cflags" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_pthreads_cflags" >&5
+$as_echo "$apr_cv_pthreads_cflags" >&6; }
 
 if test -n "$apr_cv_pthreads_cflags"; then
    pthreads_working=yes
@@ -26956,10 +28148,10 @@ fi
 # gcc ignore -pthread when linking a shared object.  So always
 # try and add the relevant library to LIBS too.
 
-{ echo "$as_me:$LINENO: checking for LIBS needed for pthreads" >&5
-echo $ECHO_N "checking for LIBS needed for pthreads... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for LIBS needed for pthreads" >&5
+$as_echo_n "checking for LIBS needed for pthreads... " >&6; }
 if test "${apr_cv_pthreads_lib+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   apr_ptc_libs=$LIBS
@@ -26998,29 +28190,32 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apr_p_t_r=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apr_p_t_r=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -27038,8 +28233,8 @@ fi
   LIBS=$apr_ptc_libs
 
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_pthreads_lib" >&5
-echo "${ECHO_T}$apr_cv_pthreads_lib" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_pthreads_lib" >&5
+$as_echo "$apr_cv_pthreads_lib" >&6; }
 
 if test -n "$apr_cv_pthreads_lib"; then
    pthreads_working=yes
@@ -27079,20 +28274,21 @@ fi
 
 for ac_header in pthread.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27108,49 +28304,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27164,76 +28344,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
           threads="1"
@@ -27257,20 +28433,21 @@ done
 
 for ac_header in pthread.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27286,49 +28463,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27342,76 +28503,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
           threads="1"
@@ -27435,10 +28592,10 @@ done
     fi
     if test "$pthreadh" = "1"; then
 
-{ echo "$as_me:$LINENO: checking whether pthread_getspecific takes two arguments" >&5
-echo $ECHO_N "checking whether pthread_getspecific takes two arguments... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether pthread_getspecific takes two arguments" >&5
+$as_echo_n "checking whether pthread_getspecific takes two arguments... " >&6; }
 if test "${ac_cv_pthread_getspecific_two_args+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -27468,39 +28625,23 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
     ac_cv_pthread_getspecific_two_args=yes
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -27511,8 +28652,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_pthread_getspecific_two_args" >&5
-echo "${ECHO_T}$ac_cv_pthread_getspecific_two_args" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_pthread_getspecific_two_args" >&5
+$as_echo "$ac_cv_pthread_getspecific_two_args" >&6; }
 
 if test "$ac_cv_pthread_getspecific_two_args" = "yes"; then
 
@@ -27523,10 +28664,10 @@ _ACEOF
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether pthread_attr_getdetachstate takes one argument" >&5
-echo $ECHO_N "checking whether pthread_attr_getdetachstate takes one argument... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether pthread_attr_getdetachstate takes one argument" >&5
+$as_echo_n "checking whether pthread_attr_getdetachstate takes one argument... " >&6; }
 if test "${ac_cv_pthread_attr_getdetachstate_one_arg+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -27555,39 +28696,23 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
     ac_cv_pthread_attr_getdetachstate_one_arg=yes
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -27598,8 +28723,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_pthread_attr_getdetachstate_one_arg" >&5
-echo "${ECHO_T}$ac_cv_pthread_attr_getdetachstate_one_arg" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_pthread_attr_getdetachstate_one_arg" >&5
+$as_echo "$ac_cv_pthread_attr_getdetachstate_one_arg" >&6; }
 
 if test "$ac_cv_pthread_attr_getdetachstate_one_arg" = "yes"; then
 
@@ -27610,10 +28735,10 @@ _ACEOF
 fi
 
 
-  { echo "$as_me:$LINENO: checking for recursive mutex support" >&5
-echo $ECHO_N "checking for recursive mutex support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for recursive mutex support" >&5
+$as_echo_n "checking for recursive mutex support... " >&6; }
 if test "${apr_cv_mutex_recursive+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   apr_cv_mutex_recursive=no
@@ -27643,36 +28768,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apr_cv_mutex_recursive=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apr_cv_mutex_recursive=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_mutex_recursive" >&5
-echo "${ECHO_T}$apr_cv_mutex_recursive" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_mutex_recursive" >&5
+$as_echo "$apr_cv_mutex_recursive" >&6; }
 
 if test "$apr_cv_mutex_recursive" = "yes"; then
 
@@ -27685,14 +28813,15 @@ fi
 
 
 
+
 for ac_func in pthread_key_delete pthread_rwlock_init \
-                        pthread_attr_setguardsize
+                        pthread_attr_setguardsize pthread_yield
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -27745,51 +28874,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -27797,10 +28916,10 @@ done
 
 
         if test "$ac_cv_func_pthread_rwlock_init" = "yes"; then
-                        { echo "$as_me:$LINENO: checking for pthread_rwlock_t" >&5
-echo $ECHO_N "checking for pthread_rwlock_t... $ECHO_C" >&6; }
+                        { $as_echo "$as_me:$LINENO: checking for pthread_rwlock_t" >&5
+$as_echo_n "checking for pthread_rwlock_t... " >&6; }
 if test "${apr_cv_type_rwlock_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -27824,53 +28943,285 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  apr_cv_type_rwlock_t=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	apr_cv_type_rwlock_t=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_type_rwlock_t" >&5
+$as_echo "$apr_cv_type_rwlock_t" >&6; }
+            if test "$apr_cv_type_rwlock_t" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_PTHREAD_RWLOCKS 1
+_ACEOF
+
+            fi
+        fi
+
+        if test "$ac_cv_func_pthread_yield" = "no"; then
+
+for ac_header in sched.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  apr_cv_type_rwlock_t=yes
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	apr_cv_type_rwlock_t=no
+  ac_header_preproc=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_type_rwlock_t" >&5
-echo "${ECHO_T}$apr_cv_type_rwlock_t" >&6; }
-            if test "$apr_cv_type_rwlock_t" = "yes"; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTHREAD_RWLOCKS 1
+fi
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
-            fi
+fi
+
+done
+
+
+for ac_func in sched_yield
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
         fi
     fi
 fi
@@ -27880,10 +29231,10 @@ ac_cv_define_GETHOSTBYNAME_IS_THREAD_SAFE=no
 ac_cv_define_GETHOSTBYADDR_IS_THREAD_SAFE=no
 if test "$threads" = "1"; then
     echo "APR will use threads"
-    { echo "$as_me:$LINENO: checking for readdir in -lc_r" >&5
-echo $ECHO_N "checking for readdir in -lc_r... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for readdir in -lc_r" >&5
+$as_echo_n "checking for readdir in -lc_r... " >&6; }
 if test "${ac_cv_lib_c_r_readdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_r  $LIBS"
@@ -27915,48 +29266,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_c_r_readdir=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_c_r_readdir=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_readdir" >&5
-echo "${ECHO_T}$ac_cv_lib_c_r_readdir" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_readdir" >&5
+$as_echo "$ac_cv_lib_c_r_readdir" >&6; }
 if test $ac_cv_lib_c_r_readdir = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -27966,10 +29305,10 @@ _ACEOF
 fi
 
     if test "x$apr_gethostbyname_is_thread_safe" = "x"; then
-        { echo "$as_me:$LINENO: checking for gethostbyname in -lc_r" >&5
-echo $ECHO_N "checking for gethostbyname in -lc_r... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lc_r" >&5
+$as_echo_n "checking for gethostbyname in -lc_r... " >&6; }
 if test "${ac_cv_lib_c_r_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_r  $LIBS"
@@ -28001,48 +29340,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_c_r_gethostbyname=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_c_r_gethostbyname=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_c_r_gethostbyname" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_gethostbyname" >&5
+$as_echo "$ac_cv_lib_c_r_gethostbyname" >&6; }
 if test $ac_cv_lib_c_r_gethostbyname = yes; then
   apr_gethostbyname_is_thread_safe=yes
 fi
@@ -28056,10 +29383,10 @@ _ACEOF
 
     fi
     if test "x$apr_gethostbyaddr_is_thread_safe" = "x"; then
-        { echo "$as_me:$LINENO: checking for gethostbyaddr in -lc_r" >&5
-echo $ECHO_N "checking for gethostbyaddr in -lc_r... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for gethostbyaddr in -lc_r" >&5
+$as_echo_n "checking for gethostbyaddr in -lc_r... " >&6; }
 if test "${ac_cv_lib_c_r_gethostbyaddr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_r  $LIBS"
@@ -28091,48 +29418,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_c_r_gethostbyaddr=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_c_r_gethostbyaddr=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_gethostbyaddr" >&5
-echo "${ECHO_T}$ac_cv_lib_c_r_gethostbyaddr" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_gethostbyaddr" >&5
+$as_echo "$ac_cv_lib_c_r_gethostbyaddr" >&6; }
 if test $ac_cv_lib_c_r_gethostbyaddr = yes; then
   apr_gethostbyaddr_is_thread_safe=yes
 fi
@@ -28149,11 +29464,11 @@ _ACEOF
 
 for ac_func in gethostbyname_r gethostbyaddr_r
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -28206,51 +29521,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -28310,10 +29615,10 @@ if test "${with_efence+set}" = set; then
 
       fi
     fi
-    { echo "$as_me:$LINENO: checking for malloc in -lefence" >&5
-echo $ECHO_N "checking for malloc in -lefence... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for malloc in -lefence" >&5
+$as_echo_n "checking for malloc in -lefence... " >&6; }
 if test "${ac_cv_lib_efence_malloc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lefence  $LIBS"
@@ -28345,48 +29650,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_efence_malloc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_efence_malloc=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_efence_malloc" >&5
-echo "${ECHO_T}$ac_cv_lib_efence_malloc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_efence_malloc" >&5
+$as_echo "$ac_cv_lib_efence_malloc" >&6; }
 if test $ac_cv_lib_efence_malloc = yes; then
 
   if test "x$LIBS" = "x"; then
@@ -28410,8 +29703,8 @@ if test $ac_cv_lib_efence_malloc = yes; then
   fi
 
 else
-   { { echo "$as_me:$LINENO: error: Electric Fence requested but not detected" >&5
-echo "$as_me: error: Electric Fence requested but not detected" >&2;}
+   { { $as_echo "$as_me:$LINENO: error: Electric Fence requested but not detected" >&5
+$as_echo "$as_me: error: Electric Fence requested but not detected" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -28422,11 +29715,11 @@ fi
 
 for ac_func in sigsuspend
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -28479,51 +29772,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
   have_sigsuspend="1"
 else
@@ -28534,11 +29817,11 @@ done
 
 for ac_func in sigwait
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -28591,51 +29874,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
   have_sigwait="1"
 else
@@ -28658,11 +29931,11 @@ esac
 
 for ac_func in poll kqueue port_create
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -28715,51 +29988,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -28768,10 +30031,10 @@ done
 
 # Check for the Linux epoll interface; epoll* may be available in libc
 # but return ENOSYS on a pre-2.6 kernel, so do a run-time check.
-{ echo "$as_me:$LINENO: checking for epoll support" >&5
-echo $ECHO_N "checking for epoll support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for epoll support" >&5
+$as_echo_n "checking for epoll support... " >&6; }
 if test "${apr_cv_epoll+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   apr_cv_epoll=no
@@ -28797,36 +30060,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apr_cv_epoll=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apr_cv_epoll=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_epoll" >&5
-echo "${ECHO_T}$apr_cv_epoll" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_epoll" >&5
+$as_echo "$apr_cv_epoll" >&6; }
 
 if test "$apr_cv_epoll" = "yes"; then
 
@@ -28842,11 +30108,11 @@ fi
 
 for ac_func in getpwnam_r getpwuid_r getgrnam_r getgrgid_r
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -28899,51 +30165,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -28954,10 +30210,10 @@ echo "${nl}Checking for Shared Memory Support..."
 
 # The real-time POSIX extensions (e.g. shm_*, sem_*) may only
 # be available if linking against librt.
-{ echo "$as_me:$LINENO: checking for library containing shm_open" >&5
-echo $ECHO_N "checking for library containing shm_open... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing shm_open" >&5
+$as_echo_n "checking for library containing shm_open... " >&6; }
 if test "${ac_cv_search_shm_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -28995,43 +30251,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_shm_open=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_shm_open+set}" = set; then
   break
@@ -29045,8 +30289,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_shm_open" >&5
-echo "${ECHO_T}$ac_cv_search_shm_open" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_shm_open" >&5
+$as_echo "$ac_cv_search_shm_open" >&6; }
 ac_res=$ac_cv_search_shm_open
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -29070,22 +30314,24 @@ esac
 
 
 
-for ac_header in sys/types.h sys/mman.h sys/ipc.h sys/mutex.h sys/shm.h sys/file.h kernel/OS.h os2.h
+
+for ac_header in sys/types.h sys/mman.h sys/ipc.h sys/mutex.h sys/shm.h sys/file.h kernel/OS.h os2.h windows.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29101,49 +30347,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29157,76 +30387,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -29245,11 +30471,11 @@ done
 for ac_func in mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \
                 create_area
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -29302,61 +30528,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
-  { echo "$as_me:$LINENO: checking for MAP_ANON in sys/mman.h" >&5
-echo $ECHO_N "checking for MAP_ANON in sys/mman.h... $ECHO_C" >&6; }
+
+  { $as_echo "$as_me:$LINENO: checking for MAP_ANON in sys/mman.h" >&5
+$as_echo_n "checking for MAP_ANON in sys/mman.h... " >&6; }
 if test "${ac_cv_define_MAP_ANON+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
@@ -29382,8 +30599,8 @@ rm -f conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_define_MAP_ANON" >&5
-echo "${ECHO_T}$ac_cv_define_MAP_ANON" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_MAP_ANON" >&5
+$as_echo "$ac_cv_define_MAP_ANON" >&6; }
   if test "$ac_cv_define_MAP_ANON" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -29392,14 +30609,14 @@ _ACEOF
 
   fi
 
-{ echo "$as_me:$LINENO: checking for /dev/zero" >&5
-echo $ECHO_N "checking for /dev/zero... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for /dev/zero" >&5
+$as_echo_n "checking for /dev/zero... " >&6; }
 if test "${ac_cv_file__dev_zero+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 if test -r "/dev/zero"; then
   ac_cv_file__dev_zero=yes
@@ -29407,15 +30624,15 @@ else
   ac_cv_file__dev_zero=no
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_file__dev_zero" >&5
-echo "${ECHO_T}$ac_cv_file__dev_zero" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_file__dev_zero" >&5
+$as_echo "$ac_cv_file__dev_zero" >&6; }
 
 
 # Not all systems can mmap /dev/zero (such as HP-UX).  Check for that.
 if test "$ac_cv_func_mmap" = "yes" &&
    test "$ac_cv_file__dev_zero" = "yes"; then
-    { echo "$as_me:$LINENO: checking for mmap that can map /dev/zero" >&5
-echo $ECHO_N "checking for mmap that can map /dev/zero... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for mmap that can map /dev/zero" >&5
+$as_echo_n "checking for mmap that can map /dev/zero... " >&6; }
     if test "$cross_compiling" = yes; then
   ac_cv_file__dev_zero=no
 else
@@ -29456,36 +30673,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_file__dev_zero=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 
-    { echo "$as_me:$LINENO: result: $ac_cv_file__dev_zero" >&5
-echo "${ECHO_T}$ac_cv_file__dev_zero" >&6; }
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_file__dev_zero" >&5
+$as_echo "$ac_cv_file__dev_zero" >&6; }
 fi
 
 # Now we determine which one is our anonymous shmem preference.
@@ -29691,6 +30911,45 @@ else
 
 fi
 
+ac_rc=yes
+for ac_spec in header:windows.h func:CreateFileMapping; do
+    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
+    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
+    case $ac_type in
+        header )
+            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
+            ac_var="ac_cv_header_$ac_item"
+            ;;
+        file )
+            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
+            ac_var="ac_cv_file_$ac_item"
+            ;;
+        func )   ac_var="ac_cv_func_$ac_item"   ;;
+        struct ) ac_var="ac_cv_struct_$ac_item" ;;
+        define ) ac_var="ac_cv_define_$ac_item" ;;
+        custom ) ac_var="$ac_item" ;;
+    esac
+    eval "ac_val=\$$ac_var"
+    if test ".$ac_val" != .yes; then
+        ac_rc=no
+        break
+    fi
+done
+if test ".$ac_rc" = .yes; then
+    :
+    havewin32shm="1"
+
+
+ac_decision='USE_SHMEM_WIN32_ANON'
+ac_decision_msg='Windows CreateFileMapping()'
+ac_decision_USE_SHMEM_WIN32_ANON=yes
+ac_decision_USE_SHMEM_WIN32_ANON_msg='Windows CreateFileMapping()'
+
+else
+    :
+
+fi
+
 case $host in
     *linux* )
         # Linux has problems with MM_SHMT_MMANON even though it reports
@@ -29732,8 +30991,8 @@ else
 #define ${ac_decision_item} 1
 _ACEOF
 
-    { echo "$as_me:$LINENO: result: decision on $ac_decision_item... $ac_decision_msg" >&5
-echo "${ECHO_T}decision on $ac_decision_item... $ac_decision_msg" >&6; }
+    { $as_echo "$as_me:$LINENO: result: decision on $ac_decision_item... $ac_decision_msg" >&5
+$as_echo "decision on $ac_decision_item... $ac_decision_msg" >&6; }
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -29770,6 +31029,7 @@ havemmapshm="0"
 haveshmget="0"
 havebeosarea="0"
 haveos2shm="0"
+havewin32shm="0"
 ac_decision_item='namebased memory allocation method'
 ac_decision_msg='FAILED'
 ac_decision=''
@@ -29969,6 +31229,45 @@ else
 
 fi
 
+ac_rc=yes
+for ac_spec in header:windows.h; do
+    ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
+    ac_item=`echo "$ac_spec" | sed -e 's/^.*://'`
+    case $ac_type in
+        header )
+            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
+            ac_var="ac_cv_header_$ac_item"
+            ;;
+        file )
+            ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'`
+            ac_var="ac_cv_file_$ac_item"
+            ;;
+        func )   ac_var="ac_cv_func_$ac_item"   ;;
+        struct ) ac_var="ac_cv_struct_$ac_item" ;;
+        define ) ac_var="ac_cv_define_$ac_item" ;;
+        custom ) ac_var="$ac_item" ;;
+    esac
+    eval "ac_val=\$$ac_var"
+    if test ".$ac_val" != .yes; then
+        ac_rc=no
+        break
+    fi
+done
+if test ".$ac_rc" = .yes; then
+    :
+    havewin32shm="1"
+
+
+ac_decision='USE_SHMEM_WIN32'
+ac_decision_msg='Windows shared memory'
+ac_decision_USE_SHMEM_WIN32=yes
+ac_decision_USE_SHMEM_WIN32_msg='Windows shared memory'
+
+else
+    :
+
+fi
+
 case $host in
     *linux* )
         # Linux has problems with MM_SHMT_MMANON even though it reports
@@ -29999,8 +31298,8 @@ else
 #define ${ac_decision_item} 1
 _ACEOF
 
-    { echo "$as_me:$LINENO: result: decision on $ac_decision_item... $ac_decision_msg" >&5
-echo "${ECHO_T}decision on $ac_decision_item... $ac_decision_msg" >&6; }
+    { $as_echo "$as_me:$LINENO: result: decision on $ac_decision_item... $ac_decision_msg" >&5
+$as_echo "decision on $ac_decision_item... $ac_decision_msg" >&6; }
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -30013,6 +31312,7 @@ usemmapshm="0"
 useshmget="0"
 usebeosarea="0"
 useos2shm="0"
+usewin32shm="0"
 
 case $ac_decision in
     USE_SHMEM_MMAP_TMP )
@@ -30030,10 +31330,13 @@ case $ac_decision in
     USE_SHMEM_OS2 )
         useos2shm="1"
         ;;
+    USE_SHMEM_WIN32 )
+        usewin32shm="1"
+        ;;
 esac
 
 # Do we have any shared memory support?
-if test "$usemmaptmp$usemmapshm$usemmapzero$useshmget$usemmapanon$usebeosarea$useos2shm" = "0000000"; then
+if test "$usemmaptmp$usemmapshm$usemmapzero$useshmget$usemmapanon$usebeosarea$useos2shm$usewin32shm" = "00000000"; then
   sharedmem="0"
 else
   sharedmem="1"
@@ -30054,25 +31357,204 @@ fi
 
 
 
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+# for constant arguments.  Useless!
+{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if test "${ac_cv_working_alloca_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <alloca.h>
+int
+main ()
+{
+char *p = (char *) alloca (2 * sizeof (int));
+			  if (p) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_working_alloca_h=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_cv_working_alloca_h=no
+fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
+if test $ac_cv_working_alloca_h = yes; then
 
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALLOCA_H 1
+_ACEOF
 
+fi
 
+{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if test "${ac_cv_func_alloca_works+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# else
+#  ifdef HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#    endif
+#   endif
+#  endif
+# endif
+#endif
 
+int
+main ()
+{
+char *p = (char *) alloca (1);
+				    if (p) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_alloca_works=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+	ac_cv_func_alloca_works=no
+fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
 
+if test $ac_cv_func_alloca_works = yes; then
 
-for ac_func in alloca calloc setsid isinf isnan \
-                getenv putenv setenv unsetenv \
-                writev getifaddrs utime utimes
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALLOCA 1
+_ACEOF
+
+else
+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+# that cause trouble.  Some versions do not even contain alloca or
+# contain a buggy version.  If you still want to use their alloca,
+# use ar to extract alloca.o from them instead of compiling alloca.c.
+
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+
+cat >>confdefs.h <<\_ACEOF
+#define C_ALLOCA 1
+_ACEOF
+
+
+{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if test "${ac_cv_os_cray+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#if defined CRAY && ! defined CRAY2
+webecray
+#else
+wenotbecray
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "webecray" >/dev/null 2>&1; then
+  ac_cv_os_cray=yes
+else
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
+if test $ac_cv_os_cray = yes; then
+  for ac_func in _getb67 GETB67 getb67; do
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -30125,51 +31607,241 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define CRAY_STACKSEG_END $ac_func
+_ACEOF
+
+    break
+fi
+
+  done
+fi
+
+{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if test "${ac_cv_c_stack_direction+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_c_stack_direction=0
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+find_stack_direction ()
+{
+  static char *addr = 0;
+  auto char dummy;
+  if (addr == 0)
+    {
+      addr = &dummy;
+      return find_stack_direction ();
+    }
+  else
+    return (&dummy > addr) ? 1 : -1;
+}
+
+int
+main ()
+{
+  return find_stack_direction () < 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
+  ac_cv_c_stack_direction=1
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_c_stack_direction=-1
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+_ACEOF
+
+
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+for ac_func in calloc setsid isinf isnan \
+                getenv putenv setenv unsetenv \
+                writev getifaddrs utime utimes
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -30178,11 +31850,11 @@ done
 
 for ac_func in setrlimit
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -30235,51 +31907,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
   have_setrlimit="1"
 else
@@ -30290,11 +31952,11 @@ done
 
 for ac_func in getrlimit
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -30347,51 +32009,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
   have_getrlimit="1"
 else
@@ -30401,10 +32053,10 @@ done
 
 sendfile="0"
 
-{ echo "$as_me:$LINENO: checking for sendfilev in -lsendfile" >&5
-echo $ECHO_N "checking for sendfilev in -lsendfile... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for sendfilev in -lsendfile" >&5
+$as_echo_n "checking for sendfilev in -lsendfile... " >&6; }
 if test "${ac_cv_lib_sendfile_sendfilev+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsendfile  $LIBS"
@@ -30436,48 +32088,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_sendfile_sendfilev=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_sendfile_sendfilev=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sendfile_sendfilev" >&5
-echo "${ECHO_T}$ac_cv_lib_sendfile_sendfilev" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sendfile_sendfilev" >&5
+$as_echo "$ac_cv_lib_sendfile_sendfilev" >&6; }
 if test $ac_cv_lib_sendfile_sendfilev = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSENDFILE 1
@@ -30492,11 +32132,11 @@ fi
 
 for ac_func in sendfile send_file sendfilev
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -30549,51 +32189,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
   sendfile="1"
 fi
@@ -30632,87 +32262,15 @@ else
             ;;
         *aix*)
             # compiler-independent check for 64-bit build
-            { echo "$as_me:$LINENO: checking for void*" >&5
-echo $ECHO_N "checking for void*... $ECHO_C" >&6; }
-if test "${ac_cv_type_voidp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef void* ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_voidp=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_voidp=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_voidp" >&5
-echo "${ECHO_T}$ac_cv_type_voidp" >&6; }
-
-{ echo "$as_me:$LINENO: checking size of void*" >&5
-echo $ECHO_N "checking size of void*... $ECHO_C" >&6; }
+            # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of void*" >&5
+$as_echo_n "checking size of void*... " >&6; }
 if test "${ac_cv_sizeof_voidp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  if test "$ac_cv_type_voidp" = yes; then
-  # The cast to long int works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -30722,11 +32280,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef void* ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (void*))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -30739,34 +32296,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -30776,11 +32317,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef void* ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (void*))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -30793,37 +32333,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -30837,7 +32361,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -30847,11 +32371,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef void* ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (void*))) < 0)];
 test_array [0] = 0
 
   ;
@@ -30864,34 +32387,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -30901,11 +32408,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef void* ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (void*))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -30918,37 +32424,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -30962,7 +32452,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -30982,11 +32472,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef void* ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (void*))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -30999,37 +32488,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -31039,11 +32512,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_voidp=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
+'') if test "$ac_cv_type_voidp" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (void*)
+$as_echo "$as_me: error: cannot compute sizeof (void*)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; } ;;
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_voidp=0
+   fi ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -31053,9 +32530,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef void* ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (void*)); }
+static unsigned long int ulongval () { return (long int) (sizeof (void*)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -31065,20 +32541,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (void*))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (void*))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (void*))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -31091,42 +32569,49 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_voidp=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
+if test "$ac_cv_type_voidp" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (void*)
+$as_echo "$as_me: error: cannot compute sizeof (void*)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_voidp=0
+   fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_voidp=0
-fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_voidp" >&5
-echo "${ECHO_T}$ac_cv_sizeof_voidp" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_voidp" >&5
+$as_echo "$ac_cv_sizeof_voidp" >&6; }
+
+
+
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_VOIDP $ac_cv_sizeof_voidp
 _ACEOF
@@ -31137,10 +32622,6 @@ _ACEOF
                 sendfile="0"
             fi
             ;;
-        *darwin*)
-            # darwin semantics in 9.0.0 appear to be fubar
-            sendfile="0"
-            ;;
     esac
     if test "$orig_sendfile" != "$sendfile"; then
       echo "sendfile support disabled to avoid system problem"
@@ -31152,11 +32633,11 @@ fi
 
 for ac_func in sigaction
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -31209,51 +32690,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
   have_sigaction="1"
 else
@@ -31261,10 +32732,10 @@ else
 fi
 done
 
-{ echo "$as_me:$LINENO: checking whether sys_siglist is declared" >&5
-echo $ECHO_N "checking whether sys_siglist is declared... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether sys_siglist is declared" >&5
+$as_echo_n "checking whether sys_siglist is declared... " >&6; }
 if test "${ac_cv_have_decl_sys_siglist+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -31274,7 +32745,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <signal.h>
 /* NetBSD declares sys_siglist in unistd.h.  */
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
@@ -31283,8 +32754,7 @@ int
 main ()
 {
 #ifndef sys_siglist
-  char *p = (char *) sys_siglist;
-  return !p;
+  (void) sys_siglist;
 #endif
 
   ;
@@ -31297,37 +32767,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_have_decl_sys_siglist=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_have_decl_sys_siglist=no
@@ -31335,8 +32789,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5
-echo "${ECHO_T}$ac_cv_have_decl_sys_siglist" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5
+$as_echo "$ac_cv_have_decl_sys_siglist" >&6; }
 if test $ac_cv_have_decl_sys_siglist = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -31358,11 +32812,11 @@ fi
 
 for ac_func in fork
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -31415,51 +32869,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
   fork="1"
 else
@@ -31468,10 +32912,10 @@ fi
 done
 
 
-{ echo "$as_me:$LINENO: checking for inet_addr" >&5
-echo $ECHO_N "checking for inet_addr... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for inet_addr" >&5
+$as_echo_n "checking for inet_addr... " >&6; }
 if test "${ac_cv_func_inet_addr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -31504,39 +32948,23 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
     ac_cv_func_inet_addr=yes
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -31547,8 +32975,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_addr" >&5
-echo "${ECHO_T}$ac_cv_func_inet_addr" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_inet_addr" >&5
+$as_echo "$ac_cv_func_inet_addr" >&6; }
 
 if test "$ac_cv_func_inet_addr" = "yes"; then
   have_inet_addr=1
@@ -31557,10 +32985,10 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking for inet_network" >&5
-echo $ECHO_N "checking for inet_network... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for inet_network" >&5
+$as_echo_n "checking for inet_network... " >&6; }
 if test "${ac_cv_func_inet_network+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -31593,39 +33021,23 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
     ac_cv_func_inet_network=yes
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -31636,8 +33048,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_network" >&5
-echo "${ECHO_T}$ac_cv_func_inet_network" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_inet_network" >&5
+$as_echo "$ac_cv_func_inet_network" >&6; }
 
 if test "$ac_cv_func_inet_network" = "yes"; then
   have_inet_network=1
@@ -31646,10 +33058,10 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking for _getch" >&5
-echo $ECHO_N "checking for _getch... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for _getch" >&5
+$as_echo_n "checking for _getch... " >&6; }
 if test "${ac_cv_func__getch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -31702,56 +33114,44 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func__getch=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func__getch=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func__getch" >&5
-echo "${ECHO_T}$ac_cv_func__getch" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__getch" >&5
+$as_echo "$ac_cv_func__getch" >&6; }
 
 
 for ac_func in strerror_r
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -31804,51 +33204,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
   strerror_r="1"
 else
@@ -31858,8 +33248,8 @@ done
 
 if test "$strerror_r" = "1"; then
 
-{ echo "$as_me:$LINENO: checking for type of return code from strerror_r" >&5
-echo $ECHO_N "checking for type of return code from strerror_r... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for type of return code from strerror_r" >&5
+$as_echo_n "checking for type of return code from strerror_r... " >&6; }
 if test "$cross_compiling" = yes; then
 
     ac_cv_strerror_r_rc_int=no
@@ -31891,31 +33281,34 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
     ac_cv_strerror_r_rc_int=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 
     ac_cv_strerror_r_rc_int=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
@@ -31930,18 +33323,18 @@ _ACEOF
 else
   msg="pointer"
 fi
-{ echo "$as_me:$LINENO: result: $msg" >&5
-echo "${ECHO_T}$msg" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $msg" >&5
+$as_echo "$msg" >&6; }
 
 fi
 
 for ac_func in mmap
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -31994,51 +33387,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
   mmap="1"
 else
@@ -32052,11 +33435,11 @@ fi
 
 for ac_func in memmove
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -32109,51 +33492,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
   have_memmove="1"
 else
@@ -32168,11 +33541,11 @@ done
 
 for ac_func in getpass getpassphrase gmtime_r localtime_r mkstemp
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -32225,51 +33598,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -32288,10 +33651,10 @@ done
 
 
 
-  { echo "$as_me:$LINENO: checking whether sigwait takes one argument" >&5
-echo $ECHO_N "checking whether sigwait takes one argument... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether sigwait takes one argument" >&5
+$as_echo_n "checking whether sigwait takes one argument... " >&6; }
 if test "${ac_cv_sigwait_one_arg+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   cat >conftest.$ac_ext <<_ACEOF
@@ -32329,39 +33692,23 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
   ac_cv_sigwait_one_arg=yes
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -32371,8 +33718,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sigwait_one_arg" >&5
-echo "${ECHO_T}$ac_cv_sigwait_one_arg" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sigwait_one_arg" >&5
+$as_echo "$ac_cv_sigwait_one_arg" >&6; }
   if test "$ac_cv_sigwait_one_arg" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -32382,10 +33729,10 @@ _ACEOF
   fi
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -32412,37 +33759,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -32534,37 +33865,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -32639,8 +33973,8 @@ fi
 
 
 
-for ac_header in alloca.h            \
-    ByteOrder.h		\
+
+for ac_header in ByteOrder.h		\
     conio.h		\
     crypt.h		\
     ctype.h		\
@@ -32677,6 +34011,8 @@ for ac_header in alloca.h            \
     tpfio.h		\
     unistd.h		\
     unix.h		\
+    windows.h		\
+    winsock2.h		\
     arpa/inet.h		\
     kernel/OS.h		\
     net/errno.h		\
@@ -32704,20 +34040,21 @@ for ac_header in alloca.h            \
     sys/un.h		\
     sys/wait.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -32733,49 +34070,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -32789,84 +34110,79 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-for aprt_i in alloca.h            \
-    ByteOrder.h		\
+for aprt_i in ByteOrder.h		\
     conio.h		\
     crypt.h		\
     ctype.h		\
@@ -32903,6 +34219,8 @@ for aprt_i in alloca.h            \
     tpfio.h		\
     unistd.h		\
     unix.h		\
+    windows.h		\
+    winsock2.h		\
     arpa/inet.h		\
     kernel/OS.h		\
     net/errno.h		\
@@ -32943,10 +34261,10 @@ done
 # IRIX 6.5 has a problem in <netinet/tcp.h> which prevents it from
 # being included by itself.  Check for <netinet/tcp.h> manually,
 # including another header file first.
-{ echo "$as_me:$LINENO: checking for netinet/tcp.h" >&5
-echo $ECHO_N "checking for netinet/tcp.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for netinet/tcp.h" >&5
+$as_echo_n "checking for netinet/tcp.h... " >&6; }
 if test "${apr_cv_hdr_netinet_tcp_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -32965,27 +34283,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   apr_cv_hdr_netinet_tcp_h=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   apr_cv_hdr_netinet_tcp_h=no
@@ -32993,8 +34305,8 @@ fi
 
 rm -f conftest.err conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_hdr_netinet_tcp_h" >&5
-echo "${ECHO_T}$apr_cv_hdr_netinet_tcp_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_hdr_netinet_tcp_h" >&5
+$as_echo "$apr_cv_hdr_netinet_tcp_h" >&6; }
 if test "$apr_cv_hdr_netinet_tcp_h" = "yes"; then
    netinet_tcph=1
 
@@ -33042,13 +34354,15 @@ fi
 
 
 
+
+
 # Checking for h_errno in <netdb.h>
 if test "$netdbh" = "1"; then
 
-  { echo "$as_me:$LINENO: checking for h_errno in netdb.h" >&5
-echo $ECHO_N "checking for h_errno in netdb.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for h_errno in netdb.h" >&5
+$as_echo_n "checking for h_errno in netdb.h... " >&6; }
   if test "${ac_cv_h_errno_cppflags+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -33085,34 +34399,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
   if test x != x; then
     ac_cv_h_errno_cppflags=""
@@ -33121,7 +34419,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   fi
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -33167,34 +34465,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
   if test x$flag != x; then
     ac_cv_h_errno_cppflags="$flag"
@@ -33203,7 +34485,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   fi
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -33224,44 +34506,42 @@ fi
   if test "$ac_cv_h_errno_cppflags" != "no"; then
     if test "$ac_cv_h_errno_cppflags" != "yes"; then
       CPPFLAGS="-D$ac_cv_h_errno_cppflags $CPPFLAGS"
-      { echo "$as_me:$LINENO: result: yes, with -D$ac_cv_h_errno_cppflags" >&5
-echo "${ECHO_T}yes, with -D$ac_cv_h_errno_cppflags" >&6; }
+      { $as_echo "$as_me:$LINENO: result: yes, with -D$ac_cv_h_errno_cppflags" >&5
+$as_echo "yes, with -D$ac_cv_h_errno_cppflags" >&6; }
     else
-      { echo "$as_me:$LINENO: result: $ac_cv_h_errno_cppflags" >&5
-echo "${ECHO_T}$ac_cv_h_errno_cppflags" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $ac_cv_h_errno_cppflags" >&5
+$as_echo "$ac_cv_h_errno_cppflags" >&6; }
     fi
   else
-    { echo "$as_me:$LINENO: result: $ac_cv_h_errno_cppflags" >&5
-echo "${ECHO_T}$ac_cv_h_errno_cppflags" >&6; }
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_h_errno_cppflags" >&5
+$as_echo "$ac_cv_h_errno_cppflags" >&6; }
   fi
 
   if test "$ac_cv_h_errno_cflags" = "no"; then
-    { { echo "$as_me:$LINENO: error: can not find h_errno in netdb.h" >&5
-echo "$as_me: error: can not find h_errno in netdb.h" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: can not find h_errno in netdb.h" >&5
+$as_echo "$as_me: error: can not find h_errno in netdb.h" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
 
-{ echo "$as_me:$LINENO: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
+$as_echo_n "checking for off_t... " >&6; }
 if test "${ac_cv_type_off_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_off_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef off_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+if (sizeof (off_t))
+       return 0;
   ;
   return 0;
 }
@@ -33272,46 +34552,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((off_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_off_t=yes
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_off_t=no
+	ac_cv_type_off_t=yes
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+$as_echo "$ac_cv_type_off_t" >&6; }
 if test $ac_cv_type_off_t = yes; then
   :
 else
@@ -33322,26 +34628,24 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for pid_t" >&5
-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
+$as_echo_n "checking for pid_t... " >&6; }
 if test "${ac_cv_type_pid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_pid_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef pid_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+if (sizeof (pid_t))
+       return 0;
   ;
   return 0;
 }
@@ -33352,46 +34656,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((pid_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_pid_t=yes
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_pid_t=no
+	ac_cv_type_pid_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+$as_echo "$ac_cv_type_pid_t" >&6; }
 if test $ac_cv_type_pid_t = yes; then
   :
 else
@@ -33402,26 +34732,24 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+$as_echo_n "checking for size_t... " >&6; }
 if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_size_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef size_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+if (sizeof (size_t))
+       return 0;
   ;
   return 0;
 }
@@ -33432,46 +34760,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((size_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_size_t=yes
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_size_t=no
+	ac_cv_type_size_t=yes
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+$as_echo "$ac_cv_type_size_t" >&6; }
 if test $ac_cv_type_size_t = yes; then
   :
 else
@@ -33482,10 +34836,10 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
 if test "${ac_cv_type_uid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -33505,8 +34859,8 @@ fi
 rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
+$as_echo "$ac_cv_type_uid_t" >&6; }
 if test $ac_cv_type_uid_t = no; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -33520,26 +34874,24 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for ssize_t" >&5
-echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ssize_t" >&5
+$as_echo_n "checking for ssize_t... " >&6; }
 if test "${ac_cv_type_ssize_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_ssize_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef ssize_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+if (sizeof (ssize_t))
+       return 0;
   ;
   return 0;
 }
@@ -33550,46 +34902,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((ssize_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_ssize_t=yes
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_ssize_t=no
+	ac_cv_type_ssize_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
-echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
+$as_echo "$ac_cv_type_ssize_t" >&6; }
 if test $ac_cv_type_ssize_t = yes; then
   :
 else
@@ -33600,10 +34978,10 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
 if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
@@ -33626,37 +35004,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_inline=$ac_kw
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -33667,8 +35029,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
 
 
 case $ac_cv_c_inline in
@@ -33686,10 +35048,10 @@ _ACEOF
     ;;
 esac
 
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -33705,10 +35067,10 @@ main ()
 #ifndef __cplusplus
   /* Ultrix mips cc rejects this.  */
   typedef int charset[2];
-  const charset x;
+  const charset cs;
   /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *ccp;
-  char **p;
+  char const *const *pcpcc;
+  char **ppc;
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
   static struct point const zero = {0,0};
@@ -33717,11 +35079,11 @@ main ()
      an arm of an if-expression whose if-part is not a constant
      expression */
   const char *g = "string";
-  ccp = &g + (g ? g-g : 0);
+  pcpcc = &g + (g ? g-g : 0);
   /* HPUX 7.0 cc rejects these. */
-  ++ccp;
-  p = (char**) ccp;
-  ccp = (char const *const *) p;
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
   { /* SCO 3.2v4 cc rejects this.  */
     char *t;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
@@ -33748,7 +35110,7 @@ main ()
     const int foo = 10;
     if (!foo) return 0;
   }
-  return !x[0] && !zero.x;
+  return !cs[0] && !zero.x;
 #endif
 
   ;
@@ -33761,37 +35123,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_const=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_const=no
@@ -33799,24 +35145,24 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF
-#define const
+#define const /**/
 _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
-echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
+$as_echo_n "checking whether setpgrp takes no argument... " >&6; }
 if test "${ac_cv_func_setpgrp_void+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot check setpgrp when cross compiling" >&5
-echo "$as_me: error: cannot check setpgrp when cross compiling" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot check setpgrp when cross compiling" >&5
+$as_echo "$as_me: error: cannot check setpgrp when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -33843,36 +35189,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_setpgrp_void=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_func_setpgrp_void=yes
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
-echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
+$as_echo "$ac_cv_func_setpgrp_void" >&6; }
 if test $ac_cv_func_setpgrp_void = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -33883,10 +35232,10 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for socklen_t" >&5
-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for socklen_t" >&5
+$as_echo_n "checking for socklen_t... " >&6; }
 if test "${ac_cv_socklen_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -33919,39 +35268,23 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
     ac_cv_socklen_t=yes
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -33962,8 +35295,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_socklen_t" >&5
-echo "${ECHO_T}$ac_cv_socklen_t" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_socklen_t" >&5
+$as_echo "$ac_cv_socklen_t" >&6; }
 
 if test "$ac_cv_socklen_t" = "yes"; then
 
@@ -33974,87 +35307,15 @@ _ACEOF
 fi
 
 
-{ echo "$as_me:$LINENO: checking for void*" >&5
-echo $ECHO_N "checking for void*... $ECHO_C" >&6; }
-if test "${ac_cv_type_voidp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef void* ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_voidp=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_voidp=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_voidp" >&5
-echo "${ECHO_T}$ac_cv_type_voidp" >&6; }
-
-{ echo "$as_me:$LINENO: checking size of void*" >&5
-echo $ECHO_N "checking size of void*... $ECHO_C" >&6; }
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of void*" >&5
+$as_echo_n "checking size of void*... " >&6; }
 if test "${ac_cv_sizeof_voidp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  if test "$ac_cv_type_voidp" = yes; then
-  # The cast to long int works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -34064,11 +35325,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef void* ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (void*))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -34081,34 +35341,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -34118,11 +35362,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef void* ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (void*))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -34135,37 +35378,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -34179,7 +35406,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -34189,11 +35416,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef void* ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (void*))) < 0)];
 test_array [0] = 0
 
   ;
@@ -34206,34 +35432,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -34243,11 +35453,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef void* ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (void*))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -34260,37 +35469,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -34304,7 +35497,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -34324,11 +35517,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef void* ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (void*))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -34341,37 +35533,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -34381,11 +35557,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_voidp=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
+'') if test "$ac_cv_type_voidp" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (void*)
+$as_echo "$as_me: error: cannot compute sizeof (void*)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; } ;;
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_voidp=0
+   fi ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -34395,9 +35575,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef void* ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (void*)); }
+static unsigned long int ulongval () { return (long int) (sizeof (void*)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -34407,20 +35586,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (void*))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (void*))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (void*))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -34433,42 +35614,49 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_voidp=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
+if test "$ac_cv_type_voidp" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void*)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (void*)
+$as_echo "$as_me: error: cannot compute sizeof (void*)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_voidp=0
+   fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_voidp=0
-fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_voidp" >&5
-echo "${ECHO_T}$ac_cv_sizeof_voidp" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_voidp" >&5
+$as_echo "$ac_cv_sizeof_voidp" >&6; }
+
+
+
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_VOIDP $ac_cv_sizeof_voidp
 _ACEOF
@@ -34478,92 +35666,20 @@ _ACEOF
 if test "x$ac_cv_sizeof_voidp" != "x"; then
     voidp_size=$ac_cv_sizeof_voidp
 else
-    { { echo "$as_me:$LINENO: error: Cannot determine size of void*" >&5
-echo "$as_me: error: Cannot determine size of void*" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Cannot determine size of void*" >&5
+$as_echo "$as_me: error: Cannot determine size of void*" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-{ echo "$as_me:$LINENO: checking for char" >&5
-echo $ECHO_N "checking for char... $ECHO_C" >&6; }
-if test "${ac_cv_type_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef char ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_char=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_char=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
-echo "${ECHO_T}$ac_cv_type_char" >&6; }
-
-{ echo "$as_me:$LINENO: checking size of char" >&5
-echo $ECHO_N "checking size of char... $ECHO_C" >&6; }
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of char" >&5
+$as_echo_n "checking size of char... " >&6; }
 if test "${ac_cv_sizeof_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  if test "$ac_cv_type_char" = yes; then
-  # The cast to long int works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -34573,11 +35689,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef char ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -34590,34 +35705,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -34627,11 +35726,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef char ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -34644,37 +35742,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -34688,7 +35770,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -34698,11 +35780,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef char ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (char))) < 0)];
 test_array [0] = 0
 
   ;
@@ -34715,34 +35796,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -34752,11 +35817,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef char ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -34769,37 +35833,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -34813,7 +35861,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -34833,11 +35881,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef char ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -34850,37 +35897,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -34890,11 +35921,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_char=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
+'') if test "$ac_cv_type_char" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char)
+$as_echo "$as_me: error: cannot compute sizeof (char)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; } ;;
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_char=0
+   fi ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -34904,9 +35939,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef char ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (char)); }
+static unsigned long int ulongval () { return (long int) (sizeof (char)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -34916,20 +35950,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (char))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (char))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (char))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -34942,128 +35978,63 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_char=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
+if test "$ac_cv_type_char" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char)
+$as_echo "$as_me: error: cannot compute sizeof (char)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_char=0
+   fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_char=0
-fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_CHAR $ac_cv_sizeof_char
-_ACEOF
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
+$as_echo "$ac_cv_sizeof_char" >&6; }
 
 
-{ echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6; }
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_int=no
-fi
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_CHAR $ac_cv_sizeof_char
+_ACEOF
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6; }
 
-{ echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
 if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  if test "$ac_cv_type_int" = yes; then
-  # The cast to long int works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -35073,11 +36044,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -35090,34 +36060,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -35127,11 +36081,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -35144,37 +36097,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -35188,7 +36125,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -35198,11 +36135,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
 test_array [0] = 0
 
   ;
@@ -35215,34 +36151,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -35252,11 +36172,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -35269,37 +36188,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -35313,7 +36216,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -35333,11 +36236,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -35350,37 +36252,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -35390,11 +36276,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+'') if test "$ac_cv_type_int" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
+$as_echo "$as_me: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; } ;;
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_int=0
+   fi ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -35404,9 +36294,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef int ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (int)); }
+static unsigned long int ulongval () { return (long int) (sizeof (int)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -35416,20 +36305,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (int))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (int))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (int))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -35442,128 +36333,63 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+if test "$ac_cv_type_int" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
+$as_echo "$as_me: error: cannot compute sizeof (int)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_int=0
+   fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_int=0
-fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
 
 
-{ echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_long=no
-fi
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+_ACEOF
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6; }
 
-{ echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
 if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  if test "$ac_cv_type_long" = yes; then
-  # The cast to long int works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -35573,11 +36399,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -35590,34 +36415,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -35627,11 +36436,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -35644,37 +36452,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -35688,7 +36480,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -35698,11 +36490,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
 test_array [0] = 0
 
   ;
@@ -35715,34 +36506,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -35752,11 +36527,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -35769,37 +36543,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -35813,7 +36571,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -35833,11 +36591,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -35850,37 +36607,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -35890,11 +36631,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+'') if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
+$as_echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; } ;;
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_long=0
+   fi ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -35904,9 +36649,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (long)); }
+static unsigned long int ulongval () { return (long int) (sizeof (long)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -35916,20 +36660,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (long))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (long))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (long))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -35942,128 +36688,63 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
+$as_echo "$as_me: error: cannot compute sizeof (long)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_long=0
+   fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_long=0
-fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
-{ echo "$as_me:$LINENO: checking for short" >&5
-echo $ECHO_N "checking for short... $ECHO_C" >&6; }
-if test "${ac_cv_type_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef short ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_short=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_short=no
-fi
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6; }
 
-{ echo "$as_me:$LINENO: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of short" >&5
+$as_echo_n "checking size of short... " >&6; }
 if test "${ac_cv_sizeof_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  if test "$ac_cv_type_short" = yes; then
-  # The cast to long int works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -36073,11 +36754,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -36090,34 +36770,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -36127,11 +36791,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -36144,37 +36807,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -36188,7 +36835,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -36198,11 +36845,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
 test_array [0] = 0
 
   ;
@@ -36215,34 +36861,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -36252,11 +36882,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -36269,37 +36898,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -36313,7 +36926,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -36333,11 +36946,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef short ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -36350,37 +36962,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -36390,11 +36986,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_short=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+'') if test "$ac_cv_type_short" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
+$as_echo "$as_me: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; } ;;
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_short=0
+   fi ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -36404,9 +37004,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef short ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (short)); }
+static unsigned long int ulongval () { return (long int) (sizeof (short)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -36416,20 +37015,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (short))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (short))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (short))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -36442,128 +37043,63 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_short=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+if test "$ac_cv_type_short" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
+$as_echo "$as_me: error: cannot compute sizeof (short)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_short=0
+   fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_short=0
 fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-_ACEOF
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+$as_echo "$ac_cv_sizeof_short" >&6; }
 
 
-{ echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_long_long=no
-fi
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+_ACEOF
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
 
-{ echo "$as_me:$LINENO: checking size of long long" >&5
-echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:$LINENO: checking size of long long" >&5
+$as_echo_n "checking size of long long... " >&6; }
 if test "${ac_cv_sizeof_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  if test "$ac_cv_type_long_long" = yes; then
-  # The cast to long int works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
@@ -36573,11 +37109,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= 0)];
 test_array [0] = 0
 
   ;
@@ -36590,34 +37125,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -36627,11 +37146,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -36644,37 +37162,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr $ac_mid + 1`
@@ -36688,7 +37190,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -36698,11 +37200,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) < 0)];
 test_array [0] = 0
 
   ;
@@ -36715,34 +37216,18 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
@@ -36752,11 +37237,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -36769,37 +37253,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_hi=`expr '(' $ac_mid ')' - 1`
@@ -36813,7 +37281,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo= ac_hi=
@@ -36833,11 +37301,10 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long long ac__type_sizeof_;
 int
 main ()
 {
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
 test_array [0] = 0
 
   ;
@@ -36850,37 +37317,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_hi=$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_lo=`expr '(' $ac_mid ')' + 1`
@@ -36890,11 +37341,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in
 ?*) ac_cv_sizeof_long_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+'') if test "$ac_cv_type_long_long" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
+$as_echo "$as_me: error: cannot compute sizeof (long long)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; } ;;
+   { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_long_long=0
+   fi ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -36904,9 +37359,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-		   typedef long long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static long int longval () { return (long int) (sizeof (long long)); }
+static unsigned long int ulongval () { return (long int) (sizeof (long long)); }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -36916,20 +37370,22 @@ main ()
   FILE *f = fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (long long))) < 0)
     {
       long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (long long))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
+      if (i != ((long int) (sizeof (long long))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) != 0;
 
   ;
@@ -36942,42 +37398,49 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long_long=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
+if test "$ac_cv_type_long_long" = yes; then
+     { { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
+$as_echo "$as_me: error: cannot compute sizeof (long long)
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
+   else
+     ac_cv_sizeof_long_long=0
+   fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
-else
-  ac_cv_sizeof_long_long=0
-fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
+$as_echo "$ac_cv_sizeof_long_long" >&6; }
+
+
+
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 _ACEOF
@@ -37035,8 +37498,8 @@ elif test "$ac_cv_sizeof_longlong" = "8"; then
 else
     # int64_literal may be overriden if your compiler thinks you have
     # a 64-bit value but APR does not agree.
-    { { echo "$as_me:$LINENO: error: could not detect a 64-bit integer type" >&5
-echo "$as_me: error: could not detect a 64-bit integer type" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not detect a 64-bit integer type" >&5
+$as_echo "$as_me: error: could not detect a 64-bit integer type" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -37044,10 +37507,10 @@ fi
 #
 # HP-UX's ANSI C compiler provides this without any includes, so we
 # will first look for INT64_C without adding stdint.h
-{ echo "$as_me:$LINENO: checking for INT64_C" >&5
-echo $ECHO_N "checking for INT64_C... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for INT64_C" >&5
+$as_echo_n "checking for INT64_C... " >&6; }
 if test "${apr_cv_define_INT64_C+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -37089,8 +37552,8 @@ fi
 rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_define_INT64_C" >&5
-echo "${ECHO_T}$apr_cv_define_INT64_C" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_define_INT64_C" >&5
+$as_echo "$apr_cv_define_INT64_C" >&6; }
 
 if test "$apr_cv_define_INT64_C" = "yes"; then
     int64_literal='#define APR_INT64_C(val) INT64_C(val)'
@@ -37128,10 +37591,281 @@ else
     socklen_t_value="int"
 fi
 
-{ echo "$as_me:$LINENO: checking size of ssize_t" >&5
-echo $ECHO_N "checking size of ssize_t... $ECHO_C" >&6; }
+# Basically, we have tried to figure out the correct format strings
+# for APR types which vary between platforms, but we don't always get
+# it right.
+case $host in
+   s390*linux*)
+       # uniquely, the 31-bit Linux/s390 uses "unsigned long int"
+       # for size_t rather than "unsigned int":
+       size_t_fmt="lu"
+       ssize_t_fmt="ld"
+       ;;
+   *-os2*)
+       size_t_fmt="lu"
+       ;;
+   *-solaris*)
+       if test "$ac_cv_sizeof_long" = "8"; then
+         pid_t_fmt="d"
+       else
+         pid_t_fmt="ld"
+       fi
+       ;;
+   *aix4*|*aix5*)
+       ssize_t_fmt="ld"
+       size_t_fmt="lu"
+       ;;
+    *beos*)
+        ssize_t_fmt="ld"
+        size_t_fmt="ld"
+        ;;
+    *apple-darwin*)
+        osver=`uname -r`
+        case $osver in
+           [0-7].*)
+              ssize_t_fmt="d"
+              ;;
+           *)
+              ssize_t_fmt="ld"
+              ;;
+        esac
+        size_t_fmt="lu"
+        ;;
+esac
+
+
+
+{ $as_echo "$as_me:$LINENO: checking whether ssize_t and int are the same" >&5
+$as_echo_n "checking whether ssize_t and int are the same... " >&6; }
+if test "${apr_cv_typematch_ssize_t_int+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+    int foo[0 - !__builtin_types_compatible_p(ssize_t, int)];
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  apr_cv_typematch_ssize_t_int=yes
+ssize_t_fmt="d"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	apr_cv_typematch_ssize_t_int=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_typematch_ssize_t_int" >&5
+$as_echo "$apr_cv_typematch_ssize_t_int" >&6; }
+
+
+
+{ $as_echo "$as_me:$LINENO: checking whether ssize_t and long are the same" >&5
+$as_echo_n "checking whether ssize_t and long are the same... " >&6; }
+if test "${apr_cv_typematch_ssize_t_long+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+    int foo[0 - !__builtin_types_compatible_p(ssize_t, long)];
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  apr_cv_typematch_ssize_t_long=yes
+ssize_t_fmt="ld"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	apr_cv_typematch_ssize_t_long=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_typematch_ssize_t_long" >&5
+$as_echo "$apr_cv_typematch_ssize_t_long" >&6; }
+
+
+
+{ $as_echo "$as_me:$LINENO: checking whether size_t and unsigned int are the same" >&5
+$as_echo_n "checking whether size_t and unsigned int are the same... " >&6; }
+if test "${apr_cv_typematch_size_t_unsigned_int+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+    int foo[0 - !__builtin_types_compatible_p(size_t, unsigned int)];
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  apr_cv_typematch_size_t_unsigned_int=yes
+size_t_fmt="u"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	apr_cv_typematch_size_t_unsigned_int=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_typematch_size_t_unsigned_int" >&5
+$as_echo "$apr_cv_typematch_size_t_unsigned_int" >&6; }
+
+
+
+{ $as_echo "$as_me:$LINENO: checking whether size_t and unsigned long are the same" >&5
+$as_echo_n "checking whether size_t and unsigned long are the same... " >&6; }
+if test "${apr_cv_typematch_size_t_unsigned_long+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+    int foo[0 - !__builtin_types_compatible_p(size_t, unsigned long)];
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  apr_cv_typematch_size_t_unsigned_long=yes
+size_t_fmt="lu"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	apr_cv_typematch_size_t_unsigned_long=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_typematch_size_t_unsigned_long" >&5
+$as_echo "$apr_cv_typematch_size_t_unsigned_long" >&6; }
+
+
+{ $as_echo "$as_me:$LINENO: checking size of ssize_t" >&5
+$as_echo_n "checking size of ssize_t... " >&6; }
 if test "${ac_cv_sizeof_ssize_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_sizeof_ssize_t=8
@@ -37146,7 +37880,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <sys/types.h>
 main()
 {
-  FILE *f=fopen("conftestval","w");
+  FILE *f=fopen("conftestval", "w");
   if (!f) exit(1);
   fprintf(f, "%d\n", sizeof(ssize_t));
   exit(0);
@@ -37158,36 +37892,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_ssize_t=`cat conftestval`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_sizeof_ssize_t=0
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_ssize_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_ssize_t" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_ssize_t" >&5
+$as_echo "$ac_cv_sizeof_ssize_t" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_SSIZE_T $ac_cv_sizeof_ssize_t
@@ -37195,18 +37932,31 @@ _ACEOF
 
 
 
-if test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_int"; then
-    ssize_t_fmt='#define APR_SSIZE_T_FMT "d"'
+{ $as_echo "$as_me:$LINENO: checking which format to use for apr_ssize_t" >&5
+$as_echo_n "checking which format to use for apr_ssize_t... " >&6; }
+if test -n "$ssize_t_fmt"; then
+    { $as_echo "$as_me:$LINENO: result: %$ssize_t_fmt" >&5
+$as_echo "%$ssize_t_fmt" >&6; }
+elif test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_int"; then
+    ssize_t_fmt="d"
+    { $as_echo "$as_me:$LINENO: result: %d" >&5
+$as_echo "%d" >&6; }
 elif test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_long"; then
-    ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
+    ssize_t_fmt="ld"
+    { $as_echo "$as_me:$LINENO: result: %ld" >&5
+$as_echo "%ld" >&6; }
 else
-    ssize_t_fmt='#error Can not determine the proper size for ssize_t'
+    { { $as_echo "$as_me:$LINENO: error: could not determine the proper format for apr_ssize_t" >&5
+$as_echo "$as_me: error: could not determine the proper format for apr_ssize_t" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-{ echo "$as_me:$LINENO: checking size of size_t" >&5
-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
+ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
+
+{ $as_echo "$as_me:$LINENO: checking size of size_t" >&5
+$as_echo_n "checking size of size_t... " >&6; }
 if test "${ac_cv_sizeof_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_sizeof_size_t=8
@@ -37221,7 +37971,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <stddef.h>
 main()
 {
-  FILE *f=fopen("conftestval","w");
+  FILE *f=fopen("conftestval", "w");
   if (!f) exit(1);
   fprintf(f, "%d\n", sizeof(size_t));
   exit(0);
@@ -37233,36 +37983,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_size_t=`cat conftestval`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_sizeof_size_t=0
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+$as_echo "$ac_cv_sizeof_size_t" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
@@ -37270,18 +38023,31 @@ _ACEOF
 
 
 
-if test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_int"; then
-    size_t_fmt='#define APR_SIZE_T_FMT "d"'
+{ $as_echo "$as_me:$LINENO: checking which format to use for apr_size_t" >&5
+$as_echo_n "checking which format to use for apr_size_t... " >&6; }
+if test -n "$size_t_fmt"; then
+    { $as_echo "$as_me:$LINENO: result: %$size_t_fmt" >&5
+$as_echo "%$size_t_fmt" >&6; }
+elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_int"; then
+    size_t_fmt="d"
+    { $as_echo "$as_me:$LINENO: result: %d" >&5
+$as_echo "%d" >&6; }
 elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_long"; then
-    size_t_fmt='#define APR_SIZE_T_FMT "ld"'
+    size_t_fmt="ld"
+    { $as_echo "$as_me:$LINENO: result: %ld" >&5
+$as_echo "%ld" >&6; }
 else
-    size_t_fmt='#error Can not determine the proper size for size_t'
+    { { $as_echo "$as_me:$LINENO: error: could not determine the proper format for apr_size_t" >&5
+$as_echo "$as_me: error: could not determine the proper format for apr_size_t" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
-{ echo "$as_me:$LINENO: checking size of off_t" >&5
-echo $ECHO_N "checking size of off_t... $ECHO_C" >&6; }
+size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""
+
+{ $as_echo "$as_me:$LINENO: checking size of off_t" >&5
+$as_echo_n "checking size of off_t... " >&6; }
 if test "${ac_cv_sizeof_off_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_sizeof_off_t=8
@@ -37296,7 +38062,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <sys/types.h>
 main()
 {
-  FILE *f=fopen("conftestval","w");
+  FILE *f=fopen("conftestval", "w");
   if (!f) exit(1);
   fprintf(f, "%d\n", sizeof(off_t));
   exit(0);
@@ -37308,36 +38074,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftestval`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_sizeof_off_t=0
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
+$as_echo "$ac_cv_sizeof_off_t" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_OFF_T $ac_cv_sizeof_off_t
@@ -37352,13 +38121,14 @@ if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
 
 
 
-for ac_func in mmap64 sendfile64 sendfilev64 mkstemp64
+
+for ac_func in mmap64 sendfile64 sendfilev64 mkstemp64 readdir64_r
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -37411,62 +38181,56 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
+elif test "${ac_cv_sizeof_off_t}" != "${ac_cv_sizeof_size_t}"; then
+    # unsure of using -gt above is as portable, can can't forsee where
+    # off_t can legitimately be smaller than size_t
+    aprlfs=1
 else
     aprlfs=0
 fi
 
-{ echo "$as_me:$LINENO: checking which type to use for apr_off_t" >&5
-echo $ECHO_N "checking which type to use for apr_off_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking which type to use for apr_off_t" >&5
+$as_echo_n "checking which type to use for apr_off_t... " >&6; }
 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
     # LFS is go!
     off_t_fmt='#define APR_OFF_T_FMT APR_INT64_T_FMT'
@@ -37494,8 +38258,8 @@ elif test "$ac_cv_type_off_t" = "yes"; then
         off_t_fmt='#define APR_OFF_T_FMT APR_INT64_T_FMT'
         off_t_strfn='apr_strtoi64'
     else
-        { { echo "$as_me:$LINENO: error: could not determine the size of off_t" >&5
-echo "$as_me: error: could not determine the size of off_t" >&2;}
+        { { $as_echo "$as_me:$LINENO: error: could not determine the size of off_t" >&5
+$as_echo "$as_me: error: could not determine the size of off_t" >&2;}
    { (exit 1); exit 1; }; }
     fi
 else
@@ -37504,8 +38268,8 @@ else
    off_t_fmt=d
    off_t_strfn='strtoi'
 fi
-{ echo "$as_me:$LINENO: result: $off_t_value" >&5
-echo "${ECHO_T}$off_t_value" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $off_t_value" >&5
+$as_echo "$off_t_value" >&6; }
 
 # Regardless of whether _LARGEFILE64_SOURCE is used, on 32-bit
 # platforms _FILE_OFFSET_BITS will affect the size of ino_t and hence
@@ -37522,10 +38286,10 @@ ino_t_value=ino_t
 if test "$ac_cv_sizeof_long" = "4"; then
 
 
-{ echo "$as_me:$LINENO: checking whether ino_t and unsigned long are the same" >&5
-echo $ECHO_N "checking whether ino_t and unsigned long are the same... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether ino_t and unsigned long are the same" >&5
+$as_echo_n "checking whether ino_t and unsigned long are the same... " >&6; }
 if test "${apr_cv_typematch_ino_t_unsigned_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -37551,38 +38315,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   apr_cv_typematch_ino_t_unsigned_long=yes
 ino_t_value="unsigned long"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	apr_cv_typematch_ino_t_unsigned_long=no
@@ -37590,17 +38338,17 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_typematch_ino_t_unsigned_long" >&5
-echo "${ECHO_T}$apr_cv_typematch_ino_t_unsigned_long" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_typematch_ino_t_unsigned_long" >&5
+$as_echo "$apr_cv_typematch_ino_t_unsigned_long" >&6; }
 
 fi
-{ echo "$as_me:$LINENO: using $ino_t_value for ino_t" >&5
-echo "$as_me: using $ino_t_value for ino_t" >&6;}
+{ $as_echo "$as_me:$LINENO: using $ino_t_value for ino_t" >&5
+$as_echo "$as_me: using $ino_t_value for ino_t" >&6;}
 
-{ echo "$as_me:$LINENO: checking size of pid_t" >&5
-echo $ECHO_N "checking size of pid_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking size of pid_t" >&5
+$as_echo_n "checking size of pid_t... " >&6; }
 if test "${ac_cv_sizeof_pid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_sizeof_pid_t=8
@@ -37615,7 +38363,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <sys/types.h>
 main()
 {
-  FILE *f=fopen("conftestval","w");
+  FILE *f=fopen("conftestval", "w");
   if (!f) exit(1);
   fprintf(f, "%d\n", sizeof(pid_t));
   exit(0);
@@ -37627,36 +38375,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_pid_t=`cat conftestval`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_sizeof_pid_t=0
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_pid_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_pid_t" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_pid_t" >&5
+$as_echo "$ac_cv_sizeof_pid_t" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define SIZEOF_PID_T $ac_cv_sizeof_pid_t
@@ -37677,27 +38428,72 @@ else
 fi
 
 # Checks for endianness
-{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+
+ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_c_bigendian=unknown
+    # See if __BIG_ENDIAN__ or __LITTLE_ENDIAN__ is defined.
+       cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#if ! (defined __BIG_ENDIAN__ || defined __LITTLE_ENDIAN__)
+	       neither is defined;
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_bigendian=universal
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+	     #include <sys/param.h>
 
 int
 main ()
 {
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
 
   ;
   return 0;
@@ -37709,50 +38505,34 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+		#include <sys/param.h>
 
 int
 main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+		 not big endian
+		#endif
 
   ;
   return 0;
@@ -37764,37 +38544,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_bigendian=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_bigendian=no
@@ -37802,29 +38566,31 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
-  # try to guess the endianness by grepping values into an object file
-  ac_cv_c_bigendian=unknown
-  cat >conftest.$ac_ext <<_ACEOF
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+#include <limits.h>
+
 int
 main ()
 {
- _ascii (); _ebcdic ();
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
   ;
   return 0;
 }
@@ -37835,47 +38601,139 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_c_bigendian=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c_bigendian=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then
+  # Try to guess by grepping values from an object file.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-  ac_cv_c_bigendian=yes
-fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$ac_cv_c_bigendian" = unknown; then
-    ac_cv_c_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    ac_cv_c_bigendian=unknown
-  fi
-fi
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -37894,14 +38752,14 @@ int
 main ()
 {
 
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long int l;
-    char c[sizeof (long int)];
-  } u;
-  u.l = 1;
-  return u.c[sizeof (long int) - 1] == 1;
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
 
   ;
   return 0;
@@ -37913,55 +38771,57 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_c_bigendian=yes
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
+    fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
-case $ac_cv_c_bigendian in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     cat >>confdefs.h <<\_ACEOF
 #define WORDS_BIGENDIAN 1
 _ACEOF
- ;;
-  no)
-     ;;
-  *)
-    { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+;; #(
+   no)
+      ;; #(
+   universal)
+      ;; #(
+   *)
+     { { $as_echo "$as_me:$LINENO: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+$as_echo "$as_me: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
    { (exit 1); exit 1; }; } ;;
-esac
+ esac
 
 if test $ac_cv_c_bigendian = yes; then
     bigendian=1
@@ -37969,44 +38829,82 @@ else
     bigendian=0
 fi
 
-# Basically, we have tried to figure out the correct format strings
-# for APR types which vary between platforms, but we don't always get
-# it right.  If you find that we don't get it right for your platform,
-# you can override our decision below.
-case $host in
-   s390*linux*)
-       # uniquely, the 31-bit Linux/s390 uses "unsigned long int"
-       # for size_t rather than "unsigned int":
-       size_t_fmt='#define APR_SIZE_T_FMT "lu"'
-       ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-       ;;
-   *-os2*)
-       size_t_fmt='#define APR_SIZE_T_FMT "lu"'
-       ;;
-   *-solaris*)
-       pid_t_fmt='#define APR_PID_T_FMT "ld"'
-       ;;
-   *aix4*|*aix5*)
-       ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-       size_t_fmt='#define APR_SIZE_T_FMT "lu"'
-       ;;
-    *beos*)
-        ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-        size_t_fmt='#define APR_SIZE_T_FMT "ld"'
-        ;;
-    *apple-darwin*)
-        osver=`uname -r`
-        case $osver in
-           [0-7].*)
-              ssize_t_fmt='#define APR_SSIZE_T_FMT "d"'
-              ;;
-           *)
-              ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-              ;;
-        esac
-        size_t_fmt='#define APR_SIZE_T_FMT "lu"'
-        ;;
+{ $as_echo "$as_me:$LINENO: checking size of struct iovec" >&5
+$as_echo_n "checking size of struct iovec... " >&6; }
+if test "${ac_cv_sizeof_struct_iovec+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_struct_iovec=0
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(struct iovec));
+  exit(0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_struct_iovec=`cat conftestval`
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_sizeof_struct_iovec=0
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_struct_iovec" >&5
+$as_echo "$ac_cv_sizeof_struct_iovec" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_STRUCT_IOVEC $ac_cv_sizeof_struct_iovec
+_ACEOF
+
+
+if test "$ac_cv_sizeof_struct_iovec" = "0"; then
+    have_iovec=0
+else
+    have_iovec=1
+fi
+
 
 
 
@@ -38034,11 +38932,11 @@ esac
 
 for ac_func in strnicmp
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -38091,51 +38989,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
  have_strnicmp="1"
 else
@@ -38146,11 +39034,11 @@ done
 
 for ac_func in strncasecmp
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -38203,51 +39091,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
  have_strncasecmp="1"
 else
@@ -38258,11 +39136,11 @@ done
 
 for ac_func in stricmp
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -38315,51 +39193,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
  have_stricmp="1"
 else
@@ -38370,11 +39238,11 @@ done
 
 for ac_func in strcasecmp
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -38427,51 +39295,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
  have_strcasecmp="1"
 else
@@ -38482,11 +39340,11 @@ done
 
 for ac_func in strdup
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -38539,51 +39397,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
  have_strdup="1"
 else
@@ -38594,11 +39442,11 @@ done
 
 for ac_func in strstr
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -38651,51 +39499,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
  have_strstr="1"
 else
@@ -38706,11 +39544,11 @@ done
 
 for ac_func in memchr
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -38763,51 +39601,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
  have_memchr="1"
 else
@@ -38815,11 +39643,11 @@ else
 fi
 done
 
-as_ac_var=`echo "ac_cv_func_$int64_strfn" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $int64_strfn" >&5
-echo $ECHO_N "checking for $int64_strfn... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$int64_strfn" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $int64_strfn" >&5
+$as_echo_n "checking for $int64_strfn... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -38872,49 +39700,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   have_int64_strfn="1"
 else
   have_int64_strfn="0"
@@ -38923,10 +39741,10 @@ fi
 
 if test "$have_int64_strfn" = "0" && test "$int64_strfn" = "strtoll"; then
     int64_strfn="strtoq"
-    { echo "$as_me:$LINENO: checking for strtoq" >&5
-echo $ECHO_N "checking for strtoq... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for strtoq" >&5
+$as_echo_n "checking for strtoq... " >&6; }
 if test "${ac_cv_func_strtoq+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -38979,47 +39797,35 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_strtoq=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_strtoq=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_strtoq" >&5
-echo "${ECHO_T}$ac_cv_func_strtoq" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strtoq" >&5
+$as_echo "$ac_cv_func_strtoq" >&6; }
 if test $ac_cv_func_strtoq = yes; then
   have_int64_strfn=1
 else
@@ -39072,10 +39878,10 @@ if test "$dsotype" = "any"; then
       case $host in
         *darwin[0-8]\.*)
           # Original Darwin, not for 9.0!:
-          { echo "$as_me:$LINENO: checking for NSLinkModule" >&5
-echo $ECHO_N "checking for NSLinkModule... $ECHO_C" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for NSLinkModule" >&5
+$as_echo_n "checking for NSLinkModule... " >&6; }
 if test "${ac_cv_func_NSLinkModule+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -39128,47 +39934,35 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_NSLinkModule=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_NSLinkModule=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_NSLinkModule" >&5
-echo "${ECHO_T}$ac_cv_func_NSLinkModule" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_NSLinkModule" >&5
+$as_echo "$ac_cv_func_NSLinkModule" >&6; }
 if test $ac_cv_func_NSLinkModule = yes; then
   dsotype=dyld
 fi
@@ -39176,10 +39970,10 @@ fi
         *-hpux[1-9]\.*|*-hpux1[01]*)
           # shl is specific to hpux(?), and is suboptimal for 64 bit builds,
           # and most unlikely to be the choice of 12.x developers.
-          { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -39211,48 +40005,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_shl_load=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
 if test $ac_cv_lib_dld_shl_load = yes; then
   have_shl=1
 fi
@@ -39280,7 +40062,7 @@ fi
   fi
 
           fi;;
-        *-os2*)
+        *mingw*|*-os2*)
           # several 'other's below probably belong up here.  If they always
           # use a platform implementation and shouldn't test the dlopen/dlfcn
           # features, then bring them up here.
@@ -39291,10 +40073,10 @@ fi
     fi
     # Normal POSIX:
     if test "$dsotype" = "any"; then
-      { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+$as_echo_n "checking for dlopen... " >&6; }
 if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -39347,57 +40129,45 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+$as_echo "$ac_cv_func_dlopen" >&6; }
 if test $ac_cv_func_dlopen = yes; then
   dsotype=dlfcn
 fi
 
     fi
     if test "$dsotype" = "any"; then
-      { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -39429,48 +40199,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test $ac_cv_lib_dl_dlopen = yes; then
   dsotype=dlfcn;
   if test "x$LIBS" = "x"; then
@@ -39498,10 +40256,10 @@ fi
     fi
     if test "$dsotype" = "dlfcn"; then
         # ReliantUnix has dlopen() in libc but dlsym() in libdl :(
-        { echo "$as_me:$LINENO: checking for dlsym" >&5
-echo $ECHO_N "checking for dlsym... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for dlsym" >&5
+$as_echo_n "checking for dlsym... " >&6; }
 if test "${ac_cv_func_dlsym+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -39554,54 +40312,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_dlsym=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_dlsym=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlsym" >&5
-echo "${ECHO_T}$ac_cv_func_dlsym" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlsym" >&5
+$as_echo "$ac_cv_func_dlsym" >&6; }
 if test $ac_cv_func_dlsym = yes; then
   :
 else
-  { echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5
-echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5
+$as_echo_n "checking for dlsym in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlsym+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -39633,48 +40379,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlsym=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlsym=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5
+$as_echo "$ac_cv_lib_dl_dlsym" >&6; }
 if test $ac_cv_lib_dl_dlsym = yes; then
 
   if test "x$LIBS" = "x"; then
@@ -39707,10 +40441,10 @@ fi
     fi
     if test "$dsotype" = "any"; then
       # BeOS:
-      { echo "$as_me:$LINENO: checking for load_image in -lroot" >&5
-echo $ECHO_N "checking for load_image in -lroot... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for load_image in -lroot" >&5
+$as_echo_n "checking for load_image in -lroot... " >&6; }
 if test "${ac_cv_lib_root_load_image+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $LIBS"
@@ -39742,48 +40476,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_root_load_image=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_root_load_image=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_root_load_image" >&5
-echo "${ECHO_T}$ac_cv_lib_root_load_image" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_root_load_image" >&5
+$as_echo "$ac_cv_lib_root_load_image" >&6; }
 if test $ac_cv_lib_root_load_image = yes; then
   dsotype=other
 fi
@@ -39824,8 +40546,8 @@ fi
 fi
 
 if test "$dsotype" = "any"; then
-    { { echo "$as_me:$LINENO: error: Could not detect suitable DSO implementation" >&5
-echo "$as_me: error: Could not detect suitable DSO implementation" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Could not detect suitable DSO implementation" >&5
+$as_echo "$as_me: error: Could not detect suitable DSO implementation" >&2;}
    { (exit 1); exit 1; }; }
 elif test "$dsotype" = "no"; then
     aprdso="0"
@@ -39847,8 +40569,8 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 ;;
     other) ;; # Use whatever is in dso/OSDIR
-    *) { { echo "$as_me:$LINENO: error: Unknown DSO implementation \"$dsotype\"" >&5
-echo "$as_me: error: Unknown DSO implementation \"$dsotype\"" >&2;}
+    *) { { $as_echo "$as_me:$LINENO: error: Unknown DSO implementation \"$dsotype\"" >&5
+$as_echo "$as_me: error: Unknown DSO implementation \"$dsotype\"" >&2;}
    { (exit 1); exit 1; }; };;
     esac
     aprdso="1"
@@ -39862,11 +40584,11 @@ echo "${nl}Checking for Processes..."
 
 for ac_func in waitpid
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -39919,51 +40641,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -39984,8 +40696,14 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for Variable Length Arrays" >&5
-echo $ECHO_N "checking for Variable Length Arrays... $ECHO_C" >&6; }
+if test -z "$have_proc_invoked"; then
+  have_proc_invoked="0"
+fi
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for Variable Length Arrays" >&5
+$as_echo_n "checking for Variable Length Arrays... " >&6; }
 apr_save_CFLAGS=$CFLAGS
  CFLAGS="$CFLAGS $CFLAGS_WARN"
  if test "$ac_cv_c_compiler_gnu" = "yes"; then
@@ -40008,37 +40726,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   vla_msg=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	vla_msg=no
@@ -40047,8 +40749,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  CFLAGS=$apr_save_CFLAGS
 
-{ echo "$as_me:$LINENO: result: $vla_msg" >&5
-echo "${ECHO_T}$vla_msg" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $vla_msg" >&5
+$as_echo "$vla_msg" >&6; }
 if test "$vla_msg" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -40057,10 +40759,10 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking struct rlimit" >&5
-echo $ECHO_N "checking struct rlimit... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking struct rlimit" >&5
+$as_echo_n "checking struct rlimit... " >&6; }
 if test "${ac_cv_struct_rlimit+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test "$cross_compiling" = yes; then
@@ -40091,38 +40793,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
     ac_cv_struct_rlimit=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 
     ac_cv_struct_rlimit=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_rlimit" >&5
-echo "${ECHO_T}$ac_cv_struct_rlimit" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_rlimit" >&5
+$as_echo "$ac_cv_struct_rlimit" >&6; }
 struct_rlimit=0
 test "x$ac_cv_struct_rlimit" = xyes && struct_rlimit=1
 
@@ -40134,11 +40839,11 @@ echo "${nl}Checking for Locking..."
 
 for ac_func in semget semctl flock
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -40191,51 +40896,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -40245,20 +40940,21 @@ done
 
 for ac_header in semaphore.h OS.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -40274,49 +40970,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -40330,86 +41010,82 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-{ echo "$as_me:$LINENO: checking for library containing sem_open" >&5
-echo $ECHO_N "checking for library containing sem_open... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing sem_open" >&5
+$as_echo_n "checking for library containing sem_open... " >&6; }
 if test "${ac_cv_search_sem_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -40447,43 +41123,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_sem_open=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_sem_open+set}" = set; then
   break
@@ -40497,8 +41161,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_sem_open" >&5
-echo "${ECHO_T}$ac_cv_search_sem_open" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_sem_open" >&5
+$as_echo "$ac_cv_search_sem_open" >&6; }
 ac_res=$ac_cv_search_sem_open
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -40512,11 +41176,11 @@ fi
 
 for ac_func in sem_close sem_unlink sem_post sem_wait create_sem
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -40569,51 +41233,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -40621,10 +41275,10 @@ done
 
 
 # Some systems return ENOSYS from sem_open.
-{ echo "$as_me:$LINENO: checking for working sem_open" >&5
-echo $ECHO_N "checking for working sem_open... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for working sem_open" >&5
+$as_echo_n "checking for working sem_open... " >&6; }
 if test "${ac_cv_func_sem_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test "$cross_compiling" = yes; then
@@ -40669,40 +41323,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_sem_open=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_func_sem_open=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_sem_open" >&5
-echo "${ECHO_T}$ac_cv_func_sem_open" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_sem_open" >&5
+$as_echo "$ac_cv_func_sem_open" >&6; }
 
 # It's stupid, but not all platforms have union semun, even those that need it.
-{ echo "$as_me:$LINENO: checking for union semun in sys/sem.h" >&5
-echo $ECHO_N "checking for union semun in sys/sem.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for union semun in sys/sem.h" >&5
+$as_echo_n "checking for union semun in sys/sem.h... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -40731,38 +41388,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   have_union_semun="1" union_semun=yes
 msg=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -40771,15 +41412,15 @@ msg=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $msg" >&5
-echo "${ECHO_T}$msg" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $msg" >&5
+$as_echo "$msg" >&6; }
 
 
 
-  { echo "$as_me:$LINENO: checking for LOCK_EX in sys/file.h" >&5
-echo $ECHO_N "checking for LOCK_EX in sys/file.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for LOCK_EX in sys/file.h" >&5
+$as_echo_n "checking for LOCK_EX in sys/file.h... " >&6; }
 if test "${ac_cv_define_LOCK_EX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
@@ -40805,8 +41446,8 @@ rm -f conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_define_LOCK_EX" >&5
-echo "${ECHO_T}$ac_cv_define_LOCK_EX" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_LOCK_EX" >&5
+$as_echo "$ac_cv_define_LOCK_EX" >&6; }
   if test "$ac_cv_define_LOCK_EX" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -40816,10 +41457,10 @@ _ACEOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking for F_SETLK in fcntl.h" >&5
-echo $ECHO_N "checking for F_SETLK in fcntl.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for F_SETLK in fcntl.h" >&5
+$as_echo_n "checking for F_SETLK in fcntl.h... " >&6; }
 if test "${ac_cv_define_F_SETLK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
@@ -40845,8 +41486,8 @@ rm -f conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_define_F_SETLK" >&5
-echo "${ECHO_T}$ac_cv_define_F_SETLK" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_F_SETLK" >&5
+$as_echo "$ac_cv_define_F_SETLK" >&6; }
   if test "$ac_cv_define_F_SETLK" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -40856,10 +41497,10 @@ _ACEOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking for SEM_UNDO in sys/sem.h" >&5
-echo $ECHO_N "checking for SEM_UNDO in sys/sem.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for SEM_UNDO in sys/sem.h" >&5
+$as_echo_n "checking for SEM_UNDO in sys/sem.h... " >&6; }
 if test "${ac_cv_define_SEM_UNDO+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
@@ -40885,8 +41526,8 @@ rm -f conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_define_SEM_UNDO" >&5
-echo "${ECHO_T}$ac_cv_define_SEM_UNDO" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_SEM_UNDO" >&5
+$as_echo "$ac_cv_define_SEM_UNDO" >&6; }
   if test "$ac_cv_define_SEM_UNDO" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -40899,10 +41540,10 @@ _ACEOF
 # We are assuming that if the platform doesn't have POLLIN, it doesn't have
 # any POLL definitions.
 
-  { echo "$as_me:$LINENO: checking for POLLIN in poll.h sys/poll.h" >&5
-echo $ECHO_N "checking for POLLIN in poll.h sys/poll.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for POLLIN in poll.h sys/poll.h" >&5
+$as_echo_n "checking for POLLIN in poll.h sys/poll.h... " >&6; }
 if test "${ac_cv_define_POLLIN+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     ac_cv_define_POLLIN=no
@@ -40930,8 +41571,8 @@ rm -f conftest*
     done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_define_POLLIN" >&5
-echo "${ECHO_T}$ac_cv_define_POLLIN" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_POLLIN" >&5
+$as_echo "$ac_cv_define_POLLIN" >&6; }
   if test "$ac_cv_define_POLLIN" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -40943,10 +41584,10 @@ _ACEOF
 
 if test "$threads" = "1"; then
 
-  { echo "$as_me:$LINENO: checking for PTHREAD_PROCESS_SHARED in pthread.h" >&5
-echo $ECHO_N "checking for PTHREAD_PROCESS_SHARED in pthread.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for PTHREAD_PROCESS_SHARED in pthread.h" >&5
+$as_echo_n "checking for PTHREAD_PROCESS_SHARED in pthread.h... " >&6; }
 if test "${ac_cv_define_PTHREAD_PROCESS_SHARED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
@@ -40972,8 +41613,8 @@ rm -f conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_define_PTHREAD_PROCESS_SHARED" >&5
-echo "${ECHO_T}$ac_cv_define_PTHREAD_PROCESS_SHARED" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_PTHREAD_PROCESS_SHARED" >&5
+$as_echo "$ac_cv_define_PTHREAD_PROCESS_SHARED" >&6; }
   if test "$ac_cv_define_PTHREAD_PROCESS_SHARED" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -40985,11 +41626,11 @@ _ACEOF
 
 for ac_func in pthread_mutexattr_setpshared
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -41042,51 +41683,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -41123,16 +41754,16 @@ done
 if test ".$ac_rc" = .yes; then
     :
 
-      { echo "$as_me:$LINENO: checking for working PROCESS_SHARED locks" >&5
-echo $ECHO_N "checking for working PROCESS_SHARED locks... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for working PROCESS_SHARED locks" >&5
+$as_echo_n "checking for working PROCESS_SHARED locks... " >&6; }
 if test "${apr_cv_process_shared_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
       if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
+$as_echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
@@ -41168,36 +41799,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apr_cv_process_shared_works=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apr_cv_process_shared_works=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_process_shared_works" >&5
-echo "${ECHO_T}$apr_cv_process_shared_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_process_shared_works" >&5
+$as_echo "$apr_cv_process_shared_works" >&6; }
       # Override detection of pthread_mutexattr_setpshared
       ac_cv_func_pthread_mutexattr_setpshared=$apr_cv_process_shared_works
 else
@@ -41208,15 +41842,15 @@ fi
 
     if test "$ac_cv_func_pthread_mutexattr_setpshared" = "yes"; then
 
-{ echo "$as_me:$LINENO: checking for robust cross-process mutex support" >&5
-echo $ECHO_N "checking for robust cross-process mutex support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for robust cross-process mutex support" >&5
+$as_echo_n "checking for robust cross-process mutex support... " >&6; }
 if test "${apr_cv_mutex_robust_shared+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
+$as_echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
@@ -41260,36 +41894,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apr_cv_mutex_robust_shared=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apr_cv_mutex_robust_shared=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_mutex_robust_shared" >&5
-echo "${ECHO_T}$apr_cv_mutex_robust_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_mutex_robust_shared" >&5
+$as_echo "$apr_cv_mutex_robust_shared" >&6; }
 
 if test "$apr_cv_mutex_robust_shared" = "yes"; then
 
@@ -41679,8 +42316,8 @@ else
 #define ${ac_decision_item} 1
 _ACEOF
 
-    { echo "$as_me:$LINENO: result: decision on $ac_decision_item... $ac_decision_msg" >&5
-echo "${ECHO_T}decision on $ac_decision_item... $ac_decision_msg" >&6; }
+    { $as_echo "$as_me:$LINENO: result: decision on $ac_decision_item... $ac_decision_msg" >&5
+$as_echo "decision on $ac_decision_item... $ac_decision_msg" >&6; }
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -41726,82 +42363,84 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: checking if all interprocess locks affect threads" >&5
-echo $ECHO_N "checking if all interprocess locks affect threads... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if all interprocess locks affect threads" >&5
+$as_echo_n "checking if all interprocess locks affect threads... " >&6; }
 if test "x$apr_process_lock_is_global" = "xyes"; then
     proclockglobal="1"
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
     proclockglobal="0"
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
-{ echo "$as_me:$LINENO: checking if POSIX sems affect threads in the same process" >&5
-echo $ECHO_N "checking if POSIX sems affect threads in the same process... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if POSIX sems affect threads in the same process" >&5
+$as_echo_n "checking if POSIX sems affect threads in the same process... " >&6; }
 if test "x$apr_posixsem_is_global" = "xyes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define POSIXSEM_IS_GLOBAL 1
 _ACEOF
 
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking if SysV sems affect threads in the same process" >&5
-echo $ECHO_N "checking if SysV sems affect threads in the same process... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if SysV sems affect threads in the same process" >&5
+$as_echo_n "checking if SysV sems affect threads in the same process... " >&6; }
 if test "x$apr_sysvsem_is_global" = "xyes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define SYSVSEM_IS_GLOBAL 1
 _ACEOF
 
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking if fcntl locks affect threads in the same process" >&5
-echo $ECHO_N "checking if fcntl locks affect threads in the same process... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if fcntl locks affect threads in the same process" >&5
+$as_echo_n "checking if fcntl locks affect threads in the same process... " >&6; }
 if test "x$apr_fcntl_is_global" = "xyes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define FCNTL_IS_GLOBAL 1
 _ACEOF
 
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking if flock locks affect threads in the same process" >&5
-echo $ECHO_N "checking if flock locks affect threads in the same process... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if flock locks affect threads in the same process" >&5
+$as_echo_n "checking if flock locks affect threads in the same process... " >&6; }
 if test "x$apr_flock_is_global" = "xyes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define FLOCK_IS_GLOBAL 1
 _ACEOF
 
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking for entropy source" >&5
-echo $ECHO_N "checking for entropy source... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for entropy source" >&5
+$as_echo_n "checking for entropy source... " >&6; }
+
+why_no_rand=""
 
 
 # Check whether --with-egd was given.
@@ -41823,8 +42462,8 @@ _ACEOF
 _ACEOF
 
     fi
-    { echo "$as_me:$LINENO: result: EGD-compatible daemon" >&5
-echo "${ECHO_T}EGD-compatible daemon" >&6; }
+    { $as_echo "$as_me:$LINENO: result: EGD-compatible daemon" >&5
+$as_echo "EGD-compatible daemon" >&6; }
     rand="1"
 
 fi
@@ -41843,7 +42482,7 @@ fi
   if test "$apr_devrandom" = "yes"; then
     # /dev/random on OpenBSD doesn't provide random data, so
     # prefer /dev/arandom, which does; see random(4).
-    for f in /dev/arandom /dev/random /dev/urandom; do
+    for f in /dev/arandom /dev/urandom /dev/random; do
       if test -r $f; then
         apr_devrandom=$f
         rand=1
@@ -41854,20 +42493,31 @@ fi
     if test -r "$apr_devrandom"; then
       rand="1"
     else
-      { { echo "$as_me:$LINENO: error: $apr_devrandom not found or unreadable." >&5
-echo "$as_me: error: $apr_devrandom not found or unreadable." >&2;}
+      { { $as_echo "$as_me:$LINENO: error: $apr_devrandom not found or unreadable." >&5
+$as_echo "$as_me: error: $apr_devrandom not found or unreadable." >&2;}
    { (exit 1); exit 1; }; }
     fi
   fi
 
   if test "$rand" = "1"; then
+    case $host in
+      *os390)
+        if test $os_version -lt 1700; then
+          rand="0"
+          why_no_rand=" ($apr_devrandom unusable on z/OS before V1R7)"
+        fi
+        ;;
+    esac
+  fi
+
+  if test "$rand" = "1"; then
 
 cat >>confdefs.h <<_ACEOF
 #define DEV_RANDOM "$apr_devrandom"
 _ACEOF
 
-    { echo "$as_me:$LINENO: result: $apr_devrandom" >&5
-echo "${ECHO_T}$apr_devrandom" >&6; }
+    { $as_echo "$as_me:$LINENO: result: $apr_devrandom" >&5
+$as_echo "$apr_devrandom" >&6; }
   fi
 fi
 
@@ -41875,8 +42525,8 @@ if test "$rand" != "1"; then
     case $host in
         # we have built in support for OS/2
         *-os2*)
-            { echo "$as_me:$LINENO: result: Using OS/2 builtin random" >&5
-echo "${ECHO_T}Using OS/2 builtin random" >&6; }
+            { $as_echo "$as_me:$LINENO: result: Using OS/2 builtin random" >&5
+$as_echo "Using OS/2 builtin random" >&6; }
             rand="1"
             ;;
         *)
@@ -41887,12 +42537,12 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_TRUERAND 1
 _ACEOF
 
-                { echo "$as_me:$LINENO: result: truerand" >&5
-echo "${ECHO_T}truerand" >&6; }
+                { $as_echo "$as_me:$LINENO: result: truerand" >&5
+$as_echo "truerand" >&6; }
                 rand="1"
               else
-                { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+                { $as_echo "$as_me:$LINENO: result: not found$why_no_rand" >&5
+$as_echo "not found$why_no_rand" >&6; }
                 rand="0"
               fi
             fi
@@ -41903,10 +42553,10 @@ fi
 
 
 echo "${nl}Checking for File Info Support..."
-{ echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
-echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
+$as_echo_n "checking for struct stat.st_blocks... " >&6; }
 if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -41941,37 +42591,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_blocks=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -42007,37 +42641,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_blocks=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_stat_st_blocks=no
@@ -42048,8 +42666,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5
+$as_echo "$ac_cv_member_struct_stat_st_blocks" >&6; }
 if test $ac_cv_member_struct_stat_st_blocks = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -42058,10 +42676,10 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_atimensec" >&5
-echo $ECHO_N "checking for struct stat.st_atimensec... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct stat.st_atimensec" >&5
+$as_echo_n "checking for struct stat.st_atimensec... " >&6; }
 if test "${ac_cv_member_struct_stat_st_atimensec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -42096,37 +42714,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_atimensec=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -42162,37 +42764,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_atimensec=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_stat_st_atimensec=no
@@ -42203,8 +42789,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_atimensec" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_atimensec" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_atimensec" >&5
+$as_echo "$ac_cv_member_struct_stat_st_atimensec" >&6; }
 if test $ac_cv_member_struct_stat_st_atimensec = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -42213,10 +42799,10 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_ctimensec" >&5
-echo $ECHO_N "checking for struct stat.st_ctimensec... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct stat.st_ctimensec" >&5
+$as_echo_n "checking for struct stat.st_ctimensec... " >&6; }
 if test "${ac_cv_member_struct_stat_st_ctimensec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -42251,37 +42837,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_ctimensec=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -42317,37 +42887,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_ctimensec=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_stat_st_ctimensec=no
@@ -42358,8 +42912,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_ctimensec" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_ctimensec" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_ctimensec" >&5
+$as_echo "$ac_cv_member_struct_stat_st_ctimensec" >&6; }
 if test $ac_cv_member_struct_stat_st_ctimensec = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -42368,10 +42922,10 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_mtimensec" >&5
-echo $ECHO_N "checking for struct stat.st_mtimensec... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimensec" >&5
+$as_echo_n "checking for struct stat.st_mtimensec... " >&6; }
 if test "${ac_cv_member_struct_stat_st_mtimensec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -42406,37 +42960,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_mtimensec=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -42472,37 +43010,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_mtimensec=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_stat_st_mtimensec=no
@@ -42513,8 +43035,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtimensec" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtimensec" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtimensec" >&5
+$as_echo "$ac_cv_member_struct_stat_st_mtimensec" >&6; }
 if test $ac_cv_member_struct_stat_st_mtimensec = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -42523,10 +43045,10 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_atim.tv_nsec" >&5
-echo $ECHO_N "checking for struct stat.st_atim.tv_nsec... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct stat.st_atim.tv_nsec" >&5
+$as_echo_n "checking for struct stat.st_atim.tv_nsec... " >&6; }
 if test "${ac_cv_member_struct_stat_st_atim_tv_nsec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -42561,37 +43083,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_atim_tv_nsec=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -42627,37 +43133,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_atim_tv_nsec=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_stat_st_atim_tv_nsec=no
@@ -42668,8 +43158,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_atim_tv_nsec" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_atim_tv_nsec" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_atim_tv_nsec" >&5
+$as_echo "$ac_cv_member_struct_stat_st_atim_tv_nsec" >&6; }
 if test $ac_cv_member_struct_stat_st_atim_tv_nsec = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -42678,10 +43168,10 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_ctim.tv_nsec" >&5
-echo $ECHO_N "checking for struct stat.st_ctim.tv_nsec... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct stat.st_ctim.tv_nsec" >&5
+$as_echo_n "checking for struct stat.st_ctim.tv_nsec... " >&6; }
 if test "${ac_cv_member_struct_stat_st_ctim_tv_nsec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -42716,37 +43206,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_ctim_tv_nsec=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -42782,37 +43256,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_ctim_tv_nsec=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_stat_st_ctim_tv_nsec=no
@@ -42823,8 +43281,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_ctim_tv_nsec" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_ctim_tv_nsec" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_ctim_tv_nsec" >&5
+$as_echo "$ac_cv_member_struct_stat_st_ctim_tv_nsec" >&6; }
 if test $ac_cv_member_struct_stat_st_ctim_tv_nsec = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -42833,10 +43291,10 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_mtim.tv_nsec" >&5
-echo $ECHO_N "checking for struct stat.st_mtim.tv_nsec... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtim.tv_nsec" >&5
+$as_echo_n "checking for struct stat.st_mtim.tv_nsec... " >&6; }
 if test "${ac_cv_member_struct_stat_st_mtim_tv_nsec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -42871,37 +43329,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_mtim_tv_nsec=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -42937,37 +43379,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_mtim_tv_nsec=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_stat_st_mtim_tv_nsec=no
@@ -42978,8 +43404,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim_tv_nsec" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtim_tv_nsec" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim_tv_nsec" >&5
+$as_echo "$ac_cv_member_struct_stat_st_mtim_tv_nsec" >&6; }
 if test $ac_cv_member_struct_stat_st_mtim_tv_nsec = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -42988,10 +43414,10 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_atime_n" >&5
-echo $ECHO_N "checking for struct stat.st_atime_n... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct stat.st_atime_n" >&5
+$as_echo_n "checking for struct stat.st_atime_n... " >&6; }
 if test "${ac_cv_member_struct_stat_st_atime_n+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -43026,37 +43452,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_atime_n=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -43092,37 +43502,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_atime_n=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_stat_st_atime_n=no
@@ -43133,8 +43527,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_atime_n" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_atime_n" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_atime_n" >&5
+$as_echo "$ac_cv_member_struct_stat_st_atime_n" >&6; }
 if test $ac_cv_member_struct_stat_st_atime_n = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -43143,10 +43537,10 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_ctime_n" >&5
-echo $ECHO_N "checking for struct stat.st_ctime_n... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct stat.st_ctime_n" >&5
+$as_echo_n "checking for struct stat.st_ctime_n... " >&6; }
 if test "${ac_cv_member_struct_stat_st_ctime_n+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -43181,37 +43575,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_ctime_n=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -43247,37 +43625,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_ctime_n=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_stat_st_ctime_n=no
@@ -43288,8 +43650,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_ctime_n" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_ctime_n" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_ctime_n" >&5
+$as_echo "$ac_cv_member_struct_stat_st_ctime_n" >&6; }
 if test $ac_cv_member_struct_stat_st_ctime_n = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -43298,10 +43660,10 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_mtime_n" >&5
-echo $ECHO_N "checking for struct stat.st_mtime_n... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtime_n" >&5
+$as_echo_n "checking for struct stat.st_mtime_n... " >&6; }
 if test "${ac_cv_member_struct_stat_st_mtime_n+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -43336,37 +43698,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_mtime_n=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -43402,37 +43748,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_stat_st_mtime_n=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_stat_st_mtime_n=no
@@ -43443,8 +43773,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtime_n" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_mtime_n" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtime_n" >&5
+$as_echo "$ac_cv_member_struct_stat_st_mtime_n" >&6; }
 if test $ac_cv_member_struct_stat_st_mtime_n = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -43456,10 +43786,10 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for inode member of struct dirent" >&5
-echo $ECHO_N "checking for inode member of struct dirent... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for inode member of struct dirent" >&5
+$as_echo_n "checking for inode member of struct dirent... " >&6; }
 if test "${apr_cv_dirent_inode+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 apr_cv_dirent_inode=no
@@ -43492,37 +43822,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   apr_cv_dirent_inode=d_fileno
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -43559,37 +43873,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   apr_cv_dirent_inode=d_ino
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -43599,8 +43897,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_dirent_inode" >&5
-echo "${ECHO_T}$apr_cv_dirent_inode" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_dirent_inode" >&5
+$as_echo "$apr_cv_dirent_inode" >&6; }
 if test "$apr_cv_dirent_inode" != "no"; then
 
 cat >>confdefs.h <<_ACEOF
@@ -43610,10 +43908,10 @@ _ACEOF
 fi
 
 
-{ echo "$as_me:$LINENO: checking for file type member of struct dirent" >&5
-echo $ECHO_N "checking for file type member of struct dirent... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for file type member of struct dirent" >&5
+$as_echo_n "checking for file type member of struct dirent... " >&6; }
 if test "${apr_cv_dirent_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 apr_cv_dirent_type=no
@@ -43643,37 +43941,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   apr_cv_dirent_type=d_type
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -43682,8 +43964,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_dirent_type" >&5
-echo "${ECHO_T}$apr_cv_dirent_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_dirent_type" >&5
+$as_echo "$apr_cv_dirent_type" >&6; }
 if test "$apr_cv_dirent_type" != "no"; then
 
 cat >>confdefs.h <<_ACEOF
@@ -43700,20 +43982,21 @@ echo "${nl}Checking for OS UUID Support..."
 
 for ac_header in uuid.h uuid/uuid.h sys/uuid.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43729,49 +44012,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -43785,76 +44052,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  break
 fi
@@ -43865,10 +44128,10 @@ done
 apr_revert_save_LIBS=$LIBS
 
 # Prefer the flavor(s) that live in libc;
-{ echo "$as_me:$LINENO: checking for library containing uuid_create" >&5
-echo $ECHO_N "checking for library containing uuid_create... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing uuid_create" >&5
+$as_echo_n "checking for library containing uuid_create... " >&6; }
 if test "${ac_cv_search_uuid_create+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -43906,43 +44169,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_uuid_create=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_uuid_create+set}" = set; then
   break
@@ -43956,18 +44207,18 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_uuid_create" >&5
-echo "${ECHO_T}$ac_cv_search_uuid_create" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_uuid_create" >&5
+$as_echo "$ac_cv_search_uuid_create" >&6; }
 ac_res=$ac_cv_search_uuid_create
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing uuid_generate" >&5
-echo $ECHO_N "checking for library containing uuid_generate... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing uuid_generate" >&5
+$as_echo_n "checking for library containing uuid_generate... " >&6; }
 if test "${ac_cv_search_uuid_generate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -44005,43 +44256,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_uuid_generate=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_uuid_generate+set}" = set; then
   break
@@ -44055,8 +44294,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_uuid_generate" >&5
-echo "${ECHO_T}$ac_cv_search_uuid_generate" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_uuid_generate" >&5
+$as_echo "$ac_cv_search_uuid_generate" >&6; }
 ac_res=$ac_cv_search_uuid_generate
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -44072,11 +44311,11 @@ fi
 
 for ac_func in uuid_create uuid_generate
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -44129,61 +44368,51 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
-{ echo "$as_me:$LINENO: checking for os uuid usability" >&5
-echo $ECHO_N "checking for os uuid usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for os uuid usability" >&5
+$as_echo_n "checking for os uuid usability... " >&6; }
 if test "${apr_cv_osuuid+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 # Ensure this test closely mirrors misc/unix/rand.c!
@@ -44230,43 +44459,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   apr_cv_osuuid=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	apr_cv_func_uuid_create=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
  fi
  if test $ac_cv_func_uuid_generate = yes; then
@@ -44294,49 +44511,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   apr_cv_osuuid=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	apr_cv_func_uuid_generate=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
  fi
 
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_osuuid" >&5
-echo "${ECHO_T}$apr_cv_osuuid" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_osuuid" >&5
+$as_echo "$apr_cv_osuuid" >&6; }
 
 if test $apr_cv_osuuid = yes; then
   osuuid="1"
@@ -44349,10 +44554,10 @@ fi
 
 echo "${nl}Checking for Time Support..."
 
-{ echo "$as_me:$LINENO: checking for struct tm.tm_gmtoff" >&5
-echo $ECHO_N "checking for struct tm.tm_gmtoff... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct tm.tm_gmtoff" >&5
+$as_echo_n "checking for struct tm.tm_gmtoff... " >&6; }
 if test "${ac_cv_member_struct_tm_tm_gmtoff+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -44380,37 +44585,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_tm_tm_gmtoff=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -44439,37 +44628,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_tm_tm_gmtoff=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_tm_tm_gmtoff=no
@@ -44480,8 +44653,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5
-echo "${ECHO_T}$ac_cv_member_struct_tm_tm_gmtoff" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5
+$as_echo "$ac_cv_member_struct_tm_tm_gmtoff" >&6; }
 if test $ac_cv_member_struct_tm_tm_gmtoff = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -44490,10 +44663,10 @@ _ACEOF
 
 
 fi
-{ echo "$as_me:$LINENO: checking for struct tm.__tm_gmtoff" >&5
-echo $ECHO_N "checking for struct tm.__tm_gmtoff... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct tm.__tm_gmtoff" >&5
+$as_echo_n "checking for struct tm.__tm_gmtoff... " >&6; }
 if test "${ac_cv_member_struct_tm___tm_gmtoff+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -44521,37 +44694,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_tm___tm_gmtoff=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
@@ -44580,37 +44737,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_member_struct_tm___tm_gmtoff=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_member_struct_tm___tm_gmtoff=no
@@ -44621,8 +44762,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm___tm_gmtoff" >&5
-echo "${ECHO_T}$ac_cv_member_struct_tm___tm_gmtoff" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm___tm_gmtoff" >&5
+$as_echo "$ac_cv_member_struct_tm___tm_gmtoff" >&6; }
 if test $ac_cv_member_struct_tm___tm_gmtoff = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -44634,24 +44775,36 @@ fi
 
 
 echo "${nl}Checking for Networking support..."
-{ echo "$as_me:$LINENO: checking for in_addr in netinet/in.h" >&5
-echo $ECHO_N "checking for in_addr in netinet/in.h... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+
+  { $as_echo "$as_me:$LINENO: checking for type in_addr" >&5
+$as_echo_n "checking for type in_addr... " >&6; }
+if test "${ac_cv_type_in_addr+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
 
 int
 main ()
 {
 
-struct in_addr arg;
-arg.s_addr = htonl(INADDR_ANY);
+ struct in_addr arg;
+ arg.s_addr = htonl(INADDR_ANY);
 
   ;
   return 0;
@@ -44663,50 +44816,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-   have_in_addr="1"
-msg=yes
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+   ac_cv_type_in_addr="yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	 have_in_addr="0"
-msg=no
+
+ac_cv_type_in_addr="no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $msg" >&5
-echo "${ECHO_T}$msg" >&6; }
 
-{ echo "$as_me:$LINENO: checking if fd == socket on this platform" >&5
-echo $ECHO_N "checking if fd == socket on this platform... $ECHO_C" >&6; }
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_in_addr" >&5
+$as_echo "$ac_cv_type_in_addr" >&6; }
+
+if test "$ac_cv_type_in_addr" = "yes"; then
+  have_in_addr="1"
+else
+  have_in_addr="0"
+fi
+
+{ $as_echo "$as_me:$LINENO: checking if fd == socket on this platform" >&5
+$as_echo_n "checking if fd == socket on this platform... " >&6; }
 if test "x$file_as_socket" != "x0" ; then
     file_as_socket="1";
     echo "yes"
@@ -44729,10 +44873,10 @@ fi
 if test "$ac_cv_func_gethostbyname_r" = "yes"; then
 
 
-{ echo "$as_me:$LINENO: checking style of gethostbyname_r routine" >&5
-echo $ECHO_N "checking style of gethostbyname_r routine... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking style of gethostbyname_r routine" >&5
+$as_echo_n "checking style of gethostbyname_r routine... " >&6; }
 if test "${ac_cv_gethostbyname_r_style+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   apr_save_CFLAGS=$CFLAGS
  CFLAGS="$CFLAGS $CFLAGS_WARN"
@@ -44763,6 +44907,8 @@ else
 
 int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0,
                           (char *) 0, 0, (struct hostent **) 0, &tmp);
+/* use tmp to suppress the warning */
+tmp=0;
 
      return 0; }
 _ACEOF
@@ -44772,37 +44918,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_gethostbyname_r_style=glibc2
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_gethostbyname_r_style=none
@@ -44812,8 +44942,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  CFLAGS=$apr_save_CFLAGS
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_gethostbyname_r_style" >&5
-echo "${ECHO_T}$ac_cv_gethostbyname_r_style" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_gethostbyname_r_style" >&5
+$as_echo "$ac_cv_gethostbyname_r_style" >&6; }
 
 if test "$ac_cv_gethostbyname_r_style" = "glibc2"; then
 
@@ -44823,10 +44953,10 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking 3rd argument to the gethostbyname_r routines" >&5
-echo $ECHO_N "checking 3rd argument to the gethostbyname_r routines... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking 3rd argument to the gethostbyname_r routines" >&5
+$as_echo_n "checking 3rd argument to the gethostbyname_r routines... " >&6; }
 if test "${ac_cv_gethostbyname_r_arg+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   apr_save_CFLAGS=$CFLAGS
  CFLAGS="$CFLAGS $CFLAGS_WARN"
@@ -44857,6 +44987,9 @@ else
 
 int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0,
                           (struct hostent_data *) 0);
+/* use tmp to suppress the warning */
+tmp=0;
+
      return 0; }
 _ACEOF
 rm -f conftest.$ac_objext
@@ -44865,37 +44998,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_gethostbyname_r_arg=hostent_data
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_gethostbyname_r_arg=char
@@ -44905,8 +45022,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  CFLAGS=$apr_save_CFLAGS
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_gethostbyname_r_arg" >&5
-echo "${ECHO_T}$ac_cv_gethostbyname_r_arg" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_gethostbyname_r_arg" >&5
+$as_echo "$ac_cv_gethostbyname_r_arg" >&6; }
 
 if test "$ac_cv_gethostbyname_r_arg" = "hostent_data"; then
 
@@ -44919,10 +45036,10 @@ fi
 fi
 
 
-  { echo "$as_me:$LINENO: checking if TCP_NODELAY setting is inherited from listening sockets" >&5
-echo $ECHO_N "checking if TCP_NODELAY setting is inherited from listening sockets... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if TCP_NODELAY setting is inherited from listening sockets" >&5
+$as_echo_n "checking if TCP_NODELAY setting is inherited from listening sockets... " >&6; }
 if test "${ac_cv_tcp_nodelay_inherited+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   if test "$cross_compiling" = yes; then
@@ -45039,26 +45156,28 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
     ac_cv_tcp_nodelay_inherited="yes"
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
@@ -45066,13 +45185,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
     ac_cv_tcp_nodelay_inherited="no"
 
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_tcp_nodelay_inherited" >&5
-echo "${ECHO_T}$ac_cv_tcp_nodelay_inherited" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_tcp_nodelay_inherited" >&5
+$as_echo "$ac_cv_tcp_nodelay_inherited" >&6; }
 if test "$ac_cv_tcp_nodelay_inherited" = "yes"; then
     tcp_nodelay_inherited=1
 else
@@ -45080,10 +45200,10 @@ else
 fi
 
 
-  { echo "$as_me:$LINENO: checking if O_NONBLOCK setting is inherited from listening sockets" >&5
-echo $ECHO_N "checking if O_NONBLOCK setting is inherited from listening sockets... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if O_NONBLOCK setting is inherited from listening sockets" >&5
+$as_echo_n "checking if O_NONBLOCK setting is inherited from listening sockets... " >&6; }
 if test "${ac_cv_o_nonblock_inherited+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   if test "$cross_compiling" = yes; then
@@ -45199,26 +45319,28 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
     ac_cv_o_nonblock_inherited="yes"
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
@@ -45226,13 +45348,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
     ac_cv_o_nonblock_inherited="no"
 
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_o_nonblock_inherited" >&5
-echo "${ECHO_T}$ac_cv_o_nonblock_inherited" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_o_nonblock_inherited" >&5
+$as_echo "$ac_cv_o_nonblock_inherited" >&6; }
 if test "$ac_cv_o_nonblock_inherited" = "yes"; then
     o_nonblock_inherited=1
 else
@@ -45240,15 +45363,15 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether TCP_NODELAY and TCP_CORK can both be enabled" >&5
-echo $ECHO_N "checking whether TCP_NODELAY and TCP_CORK can both be enabled... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether TCP_NODELAY and TCP_CORK can both be enabled" >&5
+$as_echo_n "checking whether TCP_NODELAY and TCP_CORK can both be enabled... " >&6; }
 if test "${apr_cv_tcp_nodelay_with_cork+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+  { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
+$as_echo "$as_me: error: cannot run test program while cross compiling
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
@@ -45311,36 +45434,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apr_cv_tcp_nodelay_with_cork=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apr_cv_tcp_nodelay_with_cork=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_tcp_nodelay_with_cork" >&5
-echo "${ECHO_T}$apr_cv_tcp_nodelay_with_cork" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_tcp_nodelay_with_cork" >&5
+$as_echo "$apr_cv_tcp_nodelay_with_cork" >&6; }
 
 if test "$apr_cv_tcp_nodelay_with_cork" = "yes"; then
 
@@ -45353,10 +45479,10 @@ fi
 
 # Look for a way of corking TCP...
 
-  { echo "$as_me:$LINENO: checking for TCP_CORK in netinet/tcp.h" >&5
-echo $ECHO_N "checking for TCP_CORK in netinet/tcp.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for TCP_CORK in netinet/tcp.h" >&5
+$as_echo_n "checking for TCP_CORK in netinet/tcp.h... " >&6; }
 if test "${ac_cv_define_TCP_CORK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
@@ -45382,8 +45508,8 @@ rm -f conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_define_TCP_CORK" >&5
-echo "${ECHO_T}$ac_cv_define_TCP_CORK" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_TCP_CORK" >&5
+$as_echo "$ac_cv_define_TCP_CORK" >&6; }
   if test "$ac_cv_define_TCP_CORK" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -45393,10 +45519,10 @@ _ACEOF
   fi
 
 
-  { echo "$as_me:$LINENO: checking for TCP_NOPUSH in netinet/tcp.h" >&5
-echo $ECHO_N "checking for TCP_NOPUSH in netinet/tcp.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for TCP_NOPUSH in netinet/tcp.h" >&5
+$as_echo_n "checking for TCP_NOPUSH in netinet/tcp.h... " >&6; }
 if test "${ac_cv_define_TCP_NOPUSH+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
@@ -45422,8 +45548,8 @@ rm -f conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_define_TCP_NOPUSH" >&5
-echo "${ECHO_T}$ac_cv_define_TCP_NOPUSH" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_TCP_NOPUSH" >&5
+$as_echo "$ac_cv_define_TCP_NOPUSH" >&6; }
   if test "$ac_cv_define_TCP_NOPUSH" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -45473,10 +45599,10 @@ if test "x$ac_cv_define_TCP_NOPUSH" = "xyes"; then
 fi
 
 
-  { echo "$as_me:$LINENO: checking for SO_ACCEPTFILTER in sys/socket.h" >&5
-echo $ECHO_N "checking for SO_ACCEPTFILTER in sys/socket.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for SO_ACCEPTFILTER in sys/socket.h" >&5
+$as_echo_n "checking for SO_ACCEPTFILTER in sys/socket.h... " >&6; }
 if test "${ac_cv_define_SO_ACCEPTFILTER+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
@@ -45502,8 +45628,8 @@ rm -f conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_define_SO_ACCEPTFILTER" >&5
-echo "${ECHO_T}$ac_cv_define_SO_ACCEPTFILTER" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_SO_ACCEPTFILTER" >&5
+$as_echo "$ac_cv_define_SO_ACCEPTFILTER" >&6; }
   if test "$ac_cv_define_SO_ACCEPTFILTER" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -45519,10 +45645,10 @@ else
 fi
 
 
-  { echo "$as_me:$LINENO: checking whether SCTP is supported" >&5
-echo $ECHO_N "checking whether SCTP is supported... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether SCTP is supported" >&5
+$as_echo_n "checking whether SCTP is supported... " >&6; }
 if test "${apr_cv_sctp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   if test "$cross_compiling" = yes; then
@@ -45566,36 +45692,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apr_cv_sctp=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apr_cv_sctp=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_sctp" >&5
-echo "${ECHO_T}$apr_cv_sctp" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_sctp" >&5
+$as_echo "$apr_cv_sctp" >&6; }
 
 if test "$apr_cv_sctp" = "yes"; then
     have_sctp=1
@@ -45604,10 +45733,10 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking for struct ip_mreq" >&5
-echo $ECHO_N "checking for struct ip_mreq... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for struct ip_mreq" >&5
+$as_echo_n "checking for struct ip_mreq... " >&6; }
 if test "${apr_cv_struct_ipmreq+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -45637,37 +45766,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   apr_cv_struct_ipmreq=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	apr_cv_struct_ipmreq=no
@@ -45675,8 +45788,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_struct_ipmreq" >&5
-echo "${ECHO_T}$apr_cv_struct_ipmreq" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_struct_ipmreq" >&5
+$as_echo "$apr_cv_struct_ipmreq" >&6; }
 
 if test $apr_cv_struct_ipmreq = yes; then
 
@@ -45695,11 +45808,11 @@ fi
 
 for ac_func in set_h_errno
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -45752,51 +45865,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -45820,10 +45923,10 @@ case $host in
     broken_ipv6=0
 esac
 
-{ echo "$as_me:$LINENO: checking for library containing getaddrinfo" >&5
-echo $ECHO_N "checking for library containing getaddrinfo... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing getaddrinfo" >&5
+$as_echo_n "checking for library containing getaddrinfo... " >&6; }
 if test "${ac_cv_search_getaddrinfo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -45861,43 +45964,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_getaddrinfo=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_getaddrinfo+set}" = set; then
   break
@@ -45911,18 +46002,18 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_getaddrinfo" >&5
-echo "${ECHO_T}$ac_cv_search_getaddrinfo" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_getaddrinfo" >&5
+$as_echo "$ac_cv_search_getaddrinfo" >&6; }
 ac_res=$ac_cv_search_getaddrinfo
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing gai_strerror" >&5
-echo $ECHO_N "checking for library containing gai_strerror... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing gai_strerror" >&5
+$as_echo_n "checking for library containing gai_strerror... " >&6; }
 if test "${ac_cv_search_gai_strerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -45960,43 +46051,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_gai_strerror=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_gai_strerror+set}" = set; then
   break
@@ -46010,18 +46089,18 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_gai_strerror" >&5
-echo "${ECHO_T}$ac_cv_search_gai_strerror" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gai_strerror" >&5
+$as_echo "$ac_cv_search_gai_strerror" >&6; }
 ac_res=$ac_cv_search_gai_strerror
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ echo "$as_me:$LINENO: checking for library containing getnameinfo" >&5
-echo $ECHO_N "checking for library containing getnameinfo... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing getnameinfo" >&5
+$as_echo_n "checking for library containing getnameinfo... " >&6; }
 if test "${ac_cv_search_getnameinfo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -46059,43 +46138,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_getnameinfo=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_getnameinfo+set}" = set; then
   break
@@ -46109,8 +46176,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_getnameinfo" >&5
-echo "${ECHO_T}$ac_cv_search_getnameinfo" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_getnameinfo" >&5
+$as_echo "$ac_cv_search_getnameinfo" >&6; }
 ac_res=$ac_cv_search_getnameinfo
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -46120,11 +46187,11 @@ fi
 
 for ac_func in gai_strerror
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -46177,61 +46244,51 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
-  { echo "$as_me:$LINENO: checking for working getaddrinfo" >&5
-echo $ECHO_N "checking for working getaddrinfo... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for working getaddrinfo" >&5
+$as_echo_n "checking for working getaddrinfo... " >&6; }
 if test "${ac_cv_working_getaddrinfo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   if test "$cross_compiling" = yes; then
@@ -46283,26 +46340,28 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
   ac_cv_working_getaddrinfo="yes"
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
@@ -46310,13 +46369,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
   ac_cv_working_getaddrinfo="no"
 
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_working_getaddrinfo" >&5
-echo "${ECHO_T}$ac_cv_working_getaddrinfo" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_getaddrinfo" >&5
+$as_echo "$ac_cv_working_getaddrinfo" >&6; }
 if test "$ac_cv_working_getaddrinfo" = "yes"; then
   if test "$ac_cv_func_gai_strerror" != "yes"; then
     ac_cv_working_getaddrinfo="no"
@@ -46330,10 +46390,10 @@ _ACEOF
 fi
 
 
-  { echo "$as_me:$LINENO: checking for negative error codes for getaddrinfo" >&5
-echo $ECHO_N "checking for negative error codes for getaddrinfo... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for negative error codes for getaddrinfo" >&5
+$as_echo_n "checking for negative error codes for getaddrinfo... " >&6; }
 if test "${ac_cv_negative_eai+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   if test "$cross_compiling" = yes; then
@@ -46366,26 +46426,28 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
   ac_cv_negative_eai="yes"
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
@@ -46393,13 +46455,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
   ac_cv_negative_eai="no"
 
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_negative_eai" >&5
-echo "${ECHO_T}$ac_cv_negative_eai" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_negative_eai" >&5
+$as_echo "$ac_cv_negative_eai" >&6; }
 if test "$ac_cv_negative_eai" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -46409,10 +46472,10 @@ _ACEOF
 fi
 
 
-  { echo "$as_me:$LINENO: checking for working getnameinfo" >&5
-echo $ECHO_N "checking for working getnameinfo... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for working getnameinfo" >&5
+$as_echo_n "checking for working getnameinfo... " >&6; }
 if test "${ac_cv_working_getnameinfo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   if test "$cross_compiling" = yes; then
@@ -46472,26 +46535,28 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
   ac_cv_working_getnameinfo="yes"
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
@@ -46499,13 +46564,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
   ac_cv_working_getnameinfo="no"
 
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_working_getnameinfo" >&5
-echo "${ECHO_T}$ac_cv_working_getnameinfo" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_getnameinfo" >&5
+$as_echo "$ac_cv_working_getnameinfo" >&6; }
 if test "$ac_cv_working_getnameinfo" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -46515,10 +46581,10 @@ _ACEOF
 fi
 
 
-{ echo "$as_me:$LINENO: checking for sockaddr_in6" >&5
-echo $ECHO_N "checking for sockaddr_in6... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for sockaddr_in6" >&5
+$as_echo_n "checking for sockaddr_in6... " >&6; }
 if test "${ac_cv_define_sockaddr_in6+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -46551,39 +46617,23 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
 
     ac_cv_define_sockaddr_in6=yes
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -46594,8 +46644,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_define_sockaddr_in6" >&5
-echo "${ECHO_T}$ac_cv_define_sockaddr_in6" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_define_sockaddr_in6" >&5
+$as_echo "$ac_cv_define_sockaddr_in6" >&6; }
 
 if test "$ac_cv_define_sockaddr_in6" = "yes"; then
   have_sockaddr_in6=1
@@ -46604,10 +46654,10 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking for sockaddr_storage" >&5
-echo $ECHO_N "checking for sockaddr_storage... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for sockaddr_storage" >&5
+$as_echo_n "checking for sockaddr_storage... " >&6; }
 if test "${apr_cv_define_sockaddr_storage+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -46638,37 +46688,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   apr_cv_define_sockaddr_storage=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	apr_cv_define_sockaddr_storage=no
@@ -46676,8 +46710,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_define_sockaddr_storage" >&5
-echo "${ECHO_T}$apr_cv_define_sockaddr_storage" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_define_sockaddr_storage" >&5
+$as_echo "$apr_cv_define_sockaddr_storage" >&6; }
 
 if test "$apr_cv_define_sockaddr_storage" = "yes"; then
   have_sa_storage=1
@@ -46696,10 +46730,10 @@ else
             if test "x$ac_cv_working_getaddrinfo" = "xyes"; then
                 if test "x$ac_cv_working_getnameinfo" = "xyes"; then
 
-  { echo "$as_me:$LINENO: checking for working AI_ADDRCONFIG" >&5
-echo $ECHO_N "checking for working AI_ADDRCONFIG... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for working AI_ADDRCONFIG" >&5
+$as_echo_n "checking for working AI_ADDRCONFIG... " >&6; }
 if test "${apr_cv_gai_addrconfig+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
   if test "$cross_compiling" = yes; then
@@ -46741,36 +46775,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   apr_cv_gai_addrconfig=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 apr_cv_gai_addrconfig=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $apr_cv_gai_addrconfig" >&5
-echo "${ECHO_T}$apr_cv_gai_addrconfig" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $apr_cv_gai_addrconfig" >&5
+$as_echo "$apr_cv_gai_addrconfig" >&6; }
 
 if test $apr_cv_gai_addrconfig = yes; then
 
@@ -46796,20 +46833,20 @@ fi
     fi
 fi
 
-{ echo "$as_me:$LINENO: checking if APR supports IPv6" >&5
-echo $ECHO_N "checking if APR supports IPv6... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $ipv6_result" >&5
-echo "${ECHO_T}$ipv6_result" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if APR supports IPv6" >&5
+$as_echo_n "checking if APR supports IPv6... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ipv6_result" >&5
+$as_echo "$ipv6_result" >&6; }
 
 
 
 # hstrerror is only needed if IPv6 is not enabled,
 # so getaddrinfo/gai_strerror are not used.
 if test $have_ipv6 = 0; then
-  { echo "$as_me:$LINENO: checking for library containing hstrerror" >&5
-echo $ECHO_N "checking for library containing hstrerror... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for library containing hstrerror" >&5
+$as_echo_n "checking for library containing hstrerror... " >&6; }
 if test "${ac_cv_search_hstrerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -46847,43 +46884,31 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_hstrerror=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_hstrerror+set}" = set; then
   break
@@ -46897,8 +46922,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_hstrerror" >&5
-echo "${ECHO_T}$ac_cv_search_hstrerror" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_hstrerror" >&5
+$as_echo "$ac_cv_search_hstrerror" >&6; }
 ac_res=$ac_cv_search_hstrerror
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -46915,20 +46940,21 @@ fi
 
 for ac_header in langinfo.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -46944,49 +46970,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -47000,76 +47010,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -47079,11 +47085,11 @@ done
 
 for ac_func in nl_langinfo
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -47136,51 +47142,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -47188,6 +47184,13 @@ done
 
 
 
+if test -z "$have_unicode_fs"; then
+  have_unicode_fs="0"
+fi
+
+
+
+
 echo "${nl}Restore user-defined environment settings..."
 
 
@@ -47370,11 +47373,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -47407,12 +47411,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -47428,7 +47432,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -47441,11 +47445,12 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -47458,24 +47463,28 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
 
 
 # PATH needs CR
@@ -47486,17 +47495,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -47512,8 +47549,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -47536,7 +47571,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -47549,17 +47584,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -47581,7 +47609,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -47632,7 +47660,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -47660,7 +47688,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -47673,19 +47700,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -47699,19 +47729,28 @@ else
   as_mkdir_p=false
 fi
 
-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -47727,7 +47766,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -47740,7 +47779,7 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -47748,7 +47787,7 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -47756,14 +47795,14 @@ current configuration.
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
+  -V, --version    print version number and configuration settings, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+                   instantiate the configuration file FILE
   --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -47777,24 +47816,25 @@ $config_commands
 Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.60,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.62,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -47816,30 +47856,36 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
+    { $as_echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -47858,27 +47904,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -47887,6 +47935,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 # Commands run at the beginning of config.status:
 APR_SAVE_HEADERS="include/apr.h include/arch/unix/apr_private.h"
 APR_MAJOR_VERSION=$APR_MAJOR_VERSION
+APR_PLATFORM=$host
 
 for apri in \${APR_SAVE_HEADERS}; do
   test -r \${apri} && mv \${apri} \${apri}.save
@@ -47895,7 +47944,7 @@ done
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -47912,8 +47961,8 @@ do
     "test/internal/Makefile") CONFIG_FILES="$CONFIG_FILES test/internal/Makefile" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -47954,392 +48003,143 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-target!$target$ac_delim
-target_cpu!$target_cpu$ac_delim
-target_vendor!$target_vendor$ac_delim
-target_os!$target_os$ac_delim
-apr_srcdir!$apr_srcdir$ac_delim
-apr_builddir!$apr_builddir$ac_delim
-APR_CONFIG_LOCATION!$APR_CONFIG_LOCATION$ac_delim
-top_builddir!$top_builddir$ac_delim
-apr_builders!$apr_builders$ac_delim
-APR_DOTTED_VERSION!$APR_DOTTED_VERSION$ac_delim
-APR_MAJOR_VERSION!$APR_MAJOR_VERSION$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-CPP!$CPP$ac_delim
-AWK!$AWK$ac_delim
-LN_S!$LN_S$ac_delim
-RANLIB!$RANLIB$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-RM!$RM$ac_delim
-AS!$AS$ac_delim
-ASCPP!$ASCPP$ac_delim
-AR!$AR$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-apr_charset_ebcdic!$apr_charset_ebcdic$ac_delim
-APR_LIBNAME!$APR_LIBNAME$ac_delim
-ECHO!$ECHO$ac_delim
-STRIP!$STRIP$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-F77!$F77$ac_delim
-FFLAGS!$FFLAGS$ac_delim
-ac_ct_F77!$ac_ct_F77$ac_delim
-LIBTOOL!$LIBTOOL$ac_delim
-installbuilddir!$installbuilddir$ac_delim
-lt_compile!$lt_compile$ac_delim
-link!$link$ac_delim
-so_ext!$so_ext$ac_delim
-lib_target!$lib_target$ac_delim
-export_lib_target!$export_lib_target$ac_delim
-shlibpath_var!$shlibpath_var$ac_delim
-LTFLAGS!$LTFLAGS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
 fi
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-LT_LDFLAGS!$LT_LDFLAGS$ac_delim
-MKDEP!$MKDEP$ac_delim
-OBJECTS_PLATFORM!$OBJECTS_PLATFORM$ac_delim
-proc_mutex_is_global!$proc_mutex_is_global$ac_delim
-eolstr!$eolstr$ac_delim
-INSTALL_SUBDIRS!$INSTALL_SUBDIRS$ac_delim
-threads!$threads$ac_delim
-have_sigsuspend!$have_sigsuspend$ac_delim
-have_sigwait!$have_sigwait$ac_delim
-useshmgetanon!$useshmgetanon$ac_delim
-usemmapzero!$usemmapzero$ac_delim
-usemmapanon!$usemmapanon$ac_delim
-haveshmgetanon!$haveshmgetanon$ac_delim
-havemmapzero!$havemmapzero$ac_delim
-havemmapanon!$havemmapanon$ac_delim
-usemmaptmp!$usemmaptmp$ac_delim
-usemmapshm!$usemmapshm$ac_delim
-useshmget!$useshmget$ac_delim
-usebeosarea!$usebeosarea$ac_delim
-useos2shm!$useos2shm$ac_delim
-havemmaptmp!$havemmaptmp$ac_delim
-havemmapshm!$havemmapshm$ac_delim
-haveshmget!$haveshmget$ac_delim
-havebeosarea!$havebeosarea$ac_delim
-haveos2shm!$haveos2shm$ac_delim
-sharedmem!$sharedmem$ac_delim
-sendfile!$sendfile$ac_delim
-apr_inaddr_none!$apr_inaddr_none$ac_delim
-fork!$fork$ac_delim
-have_inet_addr!$have_inet_addr$ac_delim
-tcp_nodelay_inherited!$tcp_nodelay_inherited$ac_delim
-o_nonblock_inherited!$o_nonblock_inherited$ac_delim
-have_inet_network!$have_inet_network$ac_delim
-have_sigaction!$have_sigaction$ac_delim
-have_setrlimit!$have_setrlimit$ac_delim
-have_getrlimit!$have_getrlimit$ac_delim
-mmap!$mmap$ac_delim
-have_memmove!$have_memmove$ac_delim
-arpa_ineth!$arpa_ineth$ac_delim
-conioh!$conioh$ac_delim
-ctypeh!$ctypeh$ac_delim
-crypth!$crypth$ac_delim
-errnoh!$errnoh$ac_delim
-direnth!$direnth$ac_delim
-fcntlh!$fcntlh$ac_delim
-ioh!$ioh$ac_delim
-limitsh!$limitsh$ac_delim
-netdbh!$netdbh$ac_delim
-sys_syslimitsh!$sys_syslimitsh$ac_delim
-netinet_inh!$netinet_inh$ac_delim
-netinet_sctph!$netinet_sctph$ac_delim
-netinet_sctp_uioh!$netinet_sctp_uioh$ac_delim
-netinet_tcph!$netinet_tcph$ac_delim
-stdargh!$stdargh$ac_delim
-stdioh!$stdioh$ac_delim
-stdlibh!$stdlibh$ac_delim
-stringh!$stringh$ac_delim
-stringsh!$stringsh$ac_delim
-sys_ioctlh!$sys_ioctlh$ac_delim
-sys_sendfileh!$sys_sendfileh$ac_delim
-sys_signalh!$sys_signalh$ac_delim
-sys_socketh!$sys_socketh$ac_delim
-sys_sockioh!$sys_sockioh$ac_delim
-sys_typesh!$sys_typesh$ac_delim
-sys_timeh!$sys_timeh$ac_delim
-sys_uioh!$sys_uioh$ac_delim
-sys_unh!$sys_unh$ac_delim
-timeh!$timeh$ac_delim
-unistdh!$unistdh$ac_delim
-signalh!$signalh$ac_delim
-sys_waith!$sys_waith$ac_delim
-pthreadh!$pthreadh$ac_delim
-semaphoreh!$semaphoreh$ac_delim
-voidp_size!$voidp_size$ac_delim
-short_value!$short_value$ac_delim
-int_value!$int_value$ac_delim
-long_value!$long_value$ac_delim
-int64_value!$int64_value$ac_delim
-off_t_value!$off_t_value$ac_delim
-size_t_value!$size_t_value$ac_delim
-ssize_t_value!$ssize_t_value$ac_delim
-socklen_t_value!$socklen_t_value$ac_delim
-int64_t_fmt!$int64_t_fmt$ac_delim
-uint64_t_fmt!$uint64_t_fmt$ac_delim
-uint64_t_hex_fmt!$uint64_t_hex_fmt$ac_delim
-ssize_t_fmt!$ssize_t_fmt$ac_delim
-size_t_fmt!$size_t_fmt$ac_delim
-off_t_fmt!$off_t_fmt$ac_delim
-pid_t_fmt!$pid_t_fmt$ac_delim
-int64_literal!$int64_literal$ac_delim
-uint64_literal!$uint64_literal$ac_delim
-stdint!$stdint$ac_delim
-bigendian!$bigendian$ac_delim
-aprlfs!$aprlfs$ac_delim
-ino_t_value!$ino_t_value$ac_delim
-have_strnicmp!$have_strnicmp$ac_delim
-have_strncasecmp!$have_strncasecmp$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-have_stricmp!$have_stricmp$ac_delim
-have_strcasecmp!$have_strcasecmp$ac_delim
-have_strdup!$have_strdup$ac_delim
-have_strstr!$have_strstr$ac_delim
-have_memchr!$have_memchr$ac_delim
-aprdso!$aprdso$ac_delim
-oc!$oc$ac_delim
-struct_rlimit!$struct_rlimit$ac_delim
-have_union_semun!$have_union_semun$ac_delim
-hasflockser!$hasflockser$ac_delim
-hassysvser!$hassysvser$ac_delim
-hasposixser!$hasposixser$ac_delim
-hasfcntlser!$hasfcntlser$ac_delim
-hasprocpthreadser!$hasprocpthreadser$ac_delim
-flockser!$flockser$ac_delim
-sysvser!$sysvser$ac_delim
-posixser!$posixser$ac_delim
-fcntlser!$fcntlser$ac_delim
-procpthreadser!$procpthreadser$ac_delim
-pthreadser!$pthreadser$ac_delim
-proclockglobal!$proclockglobal$ac_delim
-rand!$rand$ac_delim
-osuuid!$osuuid$ac_delim
-have_in_addr!$have_in_addr$ac_delim
-file_as_socket!$file_as_socket$ac_delim
-apr_tcp_nopush_flag!$apr_tcp_nopush_flag$ac_delim
-have_corkable_tcp!$have_corkable_tcp$ac_delim
-acceptfilter!$acceptfilter$ac_delim
-have_sctp!$have_sctp$ac_delim
-have_sa_storage!$have_sa_storage$ac_delim
-have_ipv6!$have_ipv6$ac_delim
-EXTRA_CPPFLAGS!$EXTRA_CPPFLAGS$ac_delim
-EXTRA_CFLAGS!$EXTRA_CFLAGS$ac_delim
-EXTRA_LDFLAGS!$EXTRA_LDFLAGS$ac_delim
-EXTRA_LIBS!$EXTRA_LIBS$ac_delim
-EXTRA_INCLUDES!$EXTRA_INCLUDES$ac_delim
-NOTEST_CPPFLAGS!$NOTEST_CPPFLAGS$ac_delim
-NOTEST_CFLAGS!$NOTEST_CFLAGS$ac_delim
-NOTEST_LDFLAGS!$NOTEST_LDFLAGS$ac_delim
-NOTEST_LIBS!$NOTEST_LIBS$ac_delim
-NOTEST_INCLUDES!$NOTEST_INCLUDES$ac_delim
-LDLIBS!$LDLIBS$ac_delim
-INCLUDES!$INCLUDES$ac_delim
-OSDIR!$OSDIR$ac_delim
-DEFAULT_OSDIR!$DEFAULT_OSDIR$ac_delim
-LIBTOOL_LIBS!$LIBTOOL_LIBS$ac_delim
-LT_NO_INSTALL!$LT_NO_INSTALL$ac_delim
-INCLUDE_RULES!$INCLUDE_RULES$ac_delim
-INCLUDE_OUTPUTS!$INCLUDE_OUTPUTS$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 51; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -48355,19 +48155,133 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    prefix = substr(line, 1, index(line, defundef) - 1)
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", line, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -48396,26 +48310,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -48425,7 +48351,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -48451,7 +48377,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -48460,7 +48386,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -48481,17 +48407,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -48531,12 +48457,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -48545,13 +48472,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -48565,15 +48493,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -48583,123 +48512,62 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
  ;;
 
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -48710,12 +48578,21 @@ echo "$as_me: executing $ac_file commands" >&6;}
 for i in $APR_SAVE_HEADERS; do
   if cmp -s $i $i.save 2>/dev/null; then
     mv $i.save $i
-    { echo "$as_me:$LINENO: $i is unchanged" >&5
-echo "$as_me: $i is unchanged" >&6;}
+    { $as_echo "$as_me:$LINENO: $i is unchanged" >&5
+$as_echo "$as_me: $i is unchanged" >&6;}
   fi
   rm -f $i.save
 done
 chmod +x apr-$APR_MAJOR_VERSION-config
+# for mingw builds, we currently won't allow the unix apr_private.h to exist.
+# instead, we will rely on the manually-crafted win32 apr_private.h instead.
+case $APR_PLATFORM in
+    *-mingw*)
+        rm include/arch/unix/apr_private.h
+        ;;
+    *)
+        ;;
+esac
  ;;
 
   esac
@@ -48727,6 +48604,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -48748,4 +48630,8 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
diff --git a/srclib/apr/configure.in b/srclib/apr/configure.in
index 6b02ec8e..746a12ca 100644
--- a/srclib/apr/configure.in
+++ b/srclib/apr/configure.in
@@ -16,6 +16,7 @@ dnl
 sinclude(build/apr_common.m4)
 sinclude(build/apr_network.m4)
 sinclude(build/apr_threads.m4)
+sinclude(build/apr_win32.m4)
 sinclude(build/apr_hints.m4)
 sinclude(build/libtool.m4)
 sinclude(build/ltsugar.m4)
@@ -198,7 +199,7 @@ AC_ARG_WITH(libtool, [  --without-libtool       avoid using libtool to link the
 if test "x$use_libtool" = "xyes"; then
       lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@'
       LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"
-      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) -o \$@"
+      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@"
       so_ext='lo'
       lib_target='-rpath $(libdir) $(OBJECTS)'
       export_lib_target='-rpath \$(libdir) \$(OBJECTS)'
@@ -226,6 +227,7 @@ AC_SUBST(export_lib_target)
 AC_SUBST(shlibpath_var)
 AC_SUBST(LTFLAGS)
 AC_SUBST(LT_LDFLAGS)
+AC_SUBST(LT_VERSION)
 
 dnl ----------------------------- Checks for compiler flags
 nl='
@@ -349,6 +351,57 @@ case "$host:$CC" in
 	;;
 esac
 
+AC_CACHE_CHECK([whether the compiler provides atomic builtins], [atomic_builtins],
+[AC_TRY_RUN([
+int main()
+{
+    unsigned long val = 1010, tmp, *mem = &val;
+
+    if (__sync_fetch_and_add(&val, 1010) != 1010 || val != 2020)
+        return 1;
+
+    tmp = val;
+
+    if (__sync_fetch_and_sub(mem, 1010) != tmp || val != 1010)
+        return 1;
+
+    if (__sync_sub_and_fetch(&val, 1010) != 0 || val != 0)
+        return 1;
+
+    tmp = 3030;
+
+    if (__sync_val_compare_and_swap(mem, 0, tmp) != 0 || val != tmp)
+        return 1;
+
+    if (__sync_lock_test_and_set(&val, 4040) != 3030)
+        return 1;
+
+    mem = &tmp;
+
+    if (__sync_val_compare_and_swap(&mem, &tmp, &val) != &tmp)
+        return 1;
+
+    __sync_synchronize();
+
+    if (mem != &val)
+        return 1;
+
+    return 0;
+}], [atomic_builtins=yes], [atomic_builtins=no], [atomic_builtins=no])])
+
+if test "$atomic_builtins" = "yes"; then
+    AC_DEFINE(HAVE_ATOMIC_BUILTINS, 1, [Define if compiler provides atomic builtins])
+fi
+
+case $host in
+    powerpc-405-*)
+        # The IBM ppc405cr processor has a bugged stwcx instruction.
+        AC_DEFINE(PPC405_ERRATA, 1, [Define on PowerPC 405 where errata 77 applies])
+        ;;
+    *)
+        ;;
+esac
+
 dnl Check the depend program we can use
 APR_CHECK_DEPEND
 
@@ -404,6 +457,13 @@ case $host in
        OSDIR="as400"
        eolstr="\\n"
        ;;
+   *mingw*)
+       OSDIR="win32"
+       enable_threads="system_threads"
+       eolstr="\\n"
+       proc_mutex_is_global=1
+       OBJECTS_PLATFORM='$(OBJECTS_win32)'
+       ;;
    *cygwin*)
        OSDIR="unix"
        APR_ADDTO(CPPFLAGS,-DCYGWIN)
@@ -487,7 +547,7 @@ esac
 ])
 
 if test $force_generic_atomics = yes; then
-   AC_DEFINE([USE_GENERIC_ATOMICS], 1,
+   AC_DEFINE([USE_ATOMICS_GENERIC], 1,
              [Define if use of generic atomics is requested])
 fi
 
@@ -508,8 +568,8 @@ case $host in
     *linux*)
         os_version=`uname -r | sed -e 's/\(.\)\.\(.\)\.\(.\).*/\1\2\3/'`
         ;;
-    *darwin*)
-        os_version=`uname -r | sed -e 's/\(.\)\.\(.\).*/\1\2/'`
+    *os390)
+        os_version=`uname -r | sed -e 's/\.//g'`
         ;;
     *)
         os_version=OS_VERSION_IS_NOT_SET
@@ -523,12 +583,28 @@ dnl Note: Autoconf will always append LIBS with an extra " " in AC_CHECK_LIB.
 dnl It should check for LIBS being empty and set LIBS equal to the new value 
 dnl without the extra " " in that case, but they didn't do that.  So, we
 dnl end up LIBS="-lm -lcrypt -lnsl  -ldl" which is an annoyance.
-AC_SEARCH_LIBS(gethostbyname, nsl)
-AC_SEARCH_LIBS(gethostname, nsl)
-AC_SEARCH_LIBS(socket, socket)
-AC_SEARCH_LIBS(crypt, crypt ufc)
-AC_CHECK_LIB(truerand, main)
-AC_SEARCH_LIBS(modf, m)
+case $host in
+   *mingw*)
+      dnl APR_ADDTO(LIBS,[-lmsvcrt --lshell32 -ladvapi32 -lws2_32])
+
+      AC_CHECK_LIB(msvcrt, getpid)
+      APR_CHECK_DLL_FUNC(kernel32, SetErrorMode@4)
+      APR_CHECK_DLL_FUNC(advapi32, GetSecurityInfo@32)
+      APR_CHECK_DLL_FUNC(ws2_32, gethostbyname@4)
+      APR_CHECK_DLL_FUNC(shell32, CommandLineToArgvW@8)
+      APR_CHECK_DLL_FUNC(kernel32,[CreateFileMappingA@24],
+         [ac_cv_func_CreateFileMapping=$ac_cv_lib_kernel32_CreateFileMappingA])
+      APR_CHECK_DLL_FUNC(rpcrt4,[UuidCreate@4])
+      ;;
+   *)
+      AC_SEARCH_LIBS(gethostbyname, nsl)
+      AC_SEARCH_LIBS(gethostname, nsl)
+      AC_SEARCH_LIBS(socket, socket)
+      AC_SEARCH_LIBS(crypt, crypt ufc)
+      AC_CHECK_LIB(truerand, main)
+      AC_SEARCH_LIBS(modf, m)
+       ;;
+esac
 
 dnl ----------------------------- Checking for Threads
 echo "${nl}Checking for Threads..."
@@ -583,7 +659,7 @@ else
         APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG
         APR_CHECK_PTHREAD_RECURSIVE_MUTEX
         AC_CHECK_FUNCS([pthread_key_delete pthread_rwlock_init \
-                        pthread_attr_setguardsize])
+                        pthread_attr_setguardsize pthread_yield])
 
         if test "$ac_cv_func_pthread_rwlock_init" = "yes"; then
             dnl ----------------------------- Checking for pthread_rwlock_t
@@ -596,6 +672,12 @@ else
                AC_DEFINE(HAVE_PTHREAD_RWLOCKS, 1, [Define if pthread rwlocks are available])
             fi
         fi
+
+        if test "$ac_cv_func_pthread_yield" = "no"; then
+            dnl ----------------------------- Checking for sched_yield
+            AC_CHECK_HEADERS([sched.h])
+            AC_CHECK_FUNCS([sched_yield])
+        fi
     fi
 fi
 
@@ -695,9 +777,10 @@ case $host in
 #endif";;
 esac
 
-AC_CHECK_HEADERS([sys/types.h sys/mman.h sys/ipc.h sys/mutex.h sys/shm.h sys/file.h kernel/OS.h os2.h])
+AC_CHECK_HEADERS([sys/types.h sys/mman.h sys/ipc.h sys/mutex.h sys/shm.h sys/file.h kernel/OS.h os2.h windows.h])
 AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \
                 create_area])
+
 APR_CHECK_DEFINE(MAP_ANON, sys/mman.h)
 AC_CHECK_FILE(/dev/zero)
 
@@ -757,6 +840,10 @@ APR_IFALLYES(header:kernel/OS.h func:create_area,
              [havebeosshm="1"
               APR_DECIDE(USE_SHMEM_BEOS_ANON,
                          [BeOS areas])])
+APR_IFALLYES(header:windows.h func:CreateFileMapping,
+             [havewin32shm="1"
+              APR_DECIDE(USE_SHMEM_WIN32_ANON,
+                         [Windows CreateFileMapping()])])
 case $host in
     *linux* ) 
         # Linux has problems with MM_SHMT_MMANON even though it reports
@@ -803,6 +890,7 @@ havemmapshm="0"
 haveshmget="0"
 havebeosarea="0"
 haveos2shm="0"
+havewin32shm="0"
 APR_BEGIN_DECISION([namebased memory allocation method])
 APR_IFALLYES(header:sys/mman.h func:mmap func:munmap,
              [havemmaptmp="1"
@@ -823,6 +911,9 @@ APR_IFALLYES(header:kernel/OS.h func:create_area,
 APR_IFALLYES(header:os2.h,
              [haveos2shm="1"
               APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])])
+APR_IFALLYES(header:windows.h,
+             [havewin32shm="1"
+              APR_DECIDE(USE_SHMEM_WIN32, [Windows shared memory])])
 case $host in
     *linux* ) 
         # Linux has problems with MM_SHMT_MMANON even though it reports
@@ -843,6 +934,7 @@ usemmapshm="0"
 useshmget="0"
 usebeosarea="0"
 useos2shm="0"
+usewin32shm="0"
 
 case $ac_decision in
     USE_SHMEM_MMAP_TMP )
@@ -860,10 +952,13 @@ case $ac_decision in
     USE_SHMEM_OS2 )
         useos2shm="1"
         ;;
+    USE_SHMEM_WIN32 )
+        usewin32shm="1"
+        ;;
 esac
 
 # Do we have any shared memory support?
-if test "$usemmaptmp$usemmapshm$usemmapzero$useshmget$usemmapanon$usebeosarea$useos2shm" = "0000000"; then
+if test "$usemmaptmp$usemmapshm$usemmapzero$useshmget$usemmapanon$usebeosarea$useos2shm$usewin32shm" = "00000000"; then
   sharedmem="0"
 else
   sharedmem="1"
@@ -874,16 +969,21 @@ AC_SUBST(usemmapshm)
 AC_SUBST(useshmget)
 AC_SUBST(usebeosarea)
 AC_SUBST(useos2shm)
+AC_SUBST(usewin32shm)
 AC_SUBST(havemmaptmp)
 AC_SUBST(havemmapshm)
 AC_SUBST(haveshmget)
 AC_SUBST(havebeosarea)
 AC_SUBST(haveos2shm)
+AC_SUBST(havewin32shm)
 AC_SUBST(sharedmem)
 
 dnl ----------------------------- Checks for Any required Functions
 dnl Checks for library functions. (N.B. poll is further down)
-AC_CHECK_FUNCS([alloca calloc setsid isinf isnan \
+
+AC_FUNC_ALLOCA
+
+AC_CHECK_FUNCS([calloc setsid isinf isnan \
                 getenv putenv setenv unsetenv \
                 writev getifaddrs utime utimes])
 AC_CHECK_FUNCS(setrlimit, [ have_setrlimit="1" ], [ have_setrlimit="0" ]) 
@@ -929,10 +1029,6 @@ AC_ARG_WITH(sendfile, [  --with-sendfile         Override decision to use sendfi
                 sendfile="0"
             fi
             ;;
-        *darwin*)
-            # darwin semantics in 9.0.0 appear to be fubar
-            sendfile="0"
-            ;;
     esac       
     if test "$orig_sendfile" != "$sendfile"; then
       echo "sendfile support disabled to avoid system problem"
@@ -975,7 +1071,6 @@ dnl ----------------------------- Checks for Any required Headers
 AC_HEADER_STDC
 
 APR_FLAG_HEADERS(
-    alloca.h            \
     ByteOrder.h		\
     conio.h		\
     crypt.h		\
@@ -1013,6 +1108,8 @@ APR_FLAG_HEADERS(
     tpfio.h		\
     unistd.h		\
     unix.h		\
+    windows.h		\
+    winsock2.h		\
     arpa/inet.h		\
     kernel/OS.h		\
     net/errno.h		\
@@ -1092,6 +1189,8 @@ AC_SUBST(signalh)
 AC_SUBST(sys_waith)
 AC_SUBST(pthreadh)
 AC_SUBST(semaphoreh)
+AC_SUBST(windowsh)
+AC_SUBST(winsock2h)
 
 # Checking for h_errno in <netdb.h>
 if test "$netdbh" = "1"; then
@@ -1234,32 +1333,97 @@ else
     socklen_t_value="int"
 fi
 
+# Basically, we have tried to figure out the correct format strings
+# for APR types which vary between platforms, but we don't always get
+# it right.
+case $host in
+   s390*linux*)
+       # uniquely, the 31-bit Linux/s390 uses "unsigned long int"
+       # for size_t rather than "unsigned int":
+       size_t_fmt="lu"
+       ssize_t_fmt="ld"
+       ;;
+   *-os2*)
+       size_t_fmt="lu"
+       ;;
+   *-solaris*)
+       if test "$ac_cv_sizeof_long" = "8"; then
+         pid_t_fmt="d"
+       else
+         pid_t_fmt="ld"
+       fi
+       ;;
+   *aix4*|*aix5*)
+       ssize_t_fmt="ld"
+       size_t_fmt="lu"
+       ;;
+    *beos*)
+        ssize_t_fmt="ld"
+        size_t_fmt="ld"
+        ;;
+    *apple-darwin*)
+        osver=`uname -r`
+        case $osver in
+           [[0-7]].*)
+              ssize_t_fmt="d"
+              ;;
+           *)
+              ssize_t_fmt="ld"
+              ;;
+        esac
+        size_t_fmt="lu"
+        ;;
+esac
+
+APR_CHECK_TYPES_COMPATIBLE(ssize_t, int, [ssize_t_fmt="d"])
+APR_CHECK_TYPES_COMPATIBLE(ssize_t, long, [ssize_t_fmt="ld"])
+APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"])
+APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"])
+
 APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
 
-if test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_int"; then
-    ssize_t_fmt='#define APR_SSIZE_T_FMT "d"'
+AC_MSG_CHECKING([which format to use for apr_ssize_t])
+if test -n "$ssize_t_fmt"; then
+    AC_MSG_RESULT(%$ssize_t_fmt)
+elif test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_int"; then
+    ssize_t_fmt="d"
+    AC_MSG_RESULT(%d)
 elif test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_long"; then
-    ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
+    ssize_t_fmt="ld"
+    AC_MSG_RESULT(%ld)
 else
-    ssize_t_fmt='#error Can not determine the proper size for ssize_t'
+    AC_ERROR([could not determine the proper format for apr_ssize_t])
 fi
 
+ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
+
 APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8)
 
-if test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_int"; then
-    size_t_fmt='#define APR_SIZE_T_FMT "d"'
+AC_MSG_CHECKING([which format to use for apr_size_t])
+if test -n "$size_t_fmt"; then
+    AC_MSG_RESULT(%$size_t_fmt)
+elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_int"; then
+    size_t_fmt="d"
+    AC_MSG_RESULT(%d)
 elif test "$ac_cv_sizeof_size_t" = "$ac_cv_sizeof_long"; then
-    size_t_fmt='#define APR_SIZE_T_FMT "ld"'
+    size_t_fmt="ld"
+    AC_MSG_RESULT(%ld)
 else
-    size_t_fmt='#error Can not determine the proper size for size_t'
+    AC_ERROR([could not determine the proper format for apr_size_t])
 fi
 
+size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""
+
 APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
 
 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
     # Enable LFS
     aprlfs=1
-    AC_CHECK_FUNCS([mmap64 sendfile64 sendfilev64 mkstemp64])
+    AC_CHECK_FUNCS([mmap64 sendfile64 sendfilev64 mkstemp64 readdir64_r])
+elif test "${ac_cv_sizeof_off_t}" != "${ac_cv_sizeof_size_t}"; then
+    # unsure of using -gt above is as portable, can can't forsee where
+    # off_t can legitimately be smaller than size_t
+    aprlfs=1
 else
     aprlfs=0     
 fi
@@ -1342,44 +1506,13 @@ else
     bigendian=0
 fi
 
-# Basically, we have tried to figure out the correct format strings
-# for APR types which vary between platforms, but we don't always get 
-# it right.  If you find that we don't get it right for your platform, 
-# you can override our decision below.
-case $host in
-   s390*linux*)
-       # uniquely, the 31-bit Linux/s390 uses "unsigned long int"
-       # for size_t rather than "unsigned int":
-       size_t_fmt='#define APR_SIZE_T_FMT "lu"'
-       ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-       ;;
-   *-os2*)
-       size_t_fmt='#define APR_SIZE_T_FMT "lu"'
-       ;;
-   *-solaris*)
-       pid_t_fmt='#define APR_PID_T_FMT "ld"'
-       ;;
-   *aix4*|*aix5*)
-       ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-       size_t_fmt='#define APR_SIZE_T_FMT "lu"'
-       ;;
-    *beos*)
-        ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-        size_t_fmt='#define APR_SIZE_T_FMT "ld"'
-        ;;
-    *apple-darwin*)
-        osver=`uname -r`
-        case $osver in
-           [[0-7]].*)
-              ssize_t_fmt='#define APR_SSIZE_T_FMT "d"'
-              ;;
-           *)
-              ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-              ;;
-        esac
-        size_t_fmt='#define APR_SIZE_T_FMT "lu"'
-        ;;
-esac
+APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>
+#include <sys/uio.h>],struct iovec,0)
+if test "$ac_cv_sizeof_struct_iovec" = "0"; then
+    have_iovec=0
+else
+    have_iovec=1
+fi
 
 AC_SUBST(voidp_size)
 AC_SUBST(short_value)
@@ -1402,6 +1535,7 @@ AC_SUBST(uint64_literal)
 AC_SUBST(stdint) 
 AC_SUBST(bigendian)
 AC_SUBST(aprlfs)
+AC_SUBST(have_iovec)
 AC_SUBST(ino_t_value)
 
 dnl ----------------------------- Checking for string functions
@@ -1463,7 +1597,7 @@ if test "$dsotype" = "any"; then
           if test "$ac_cv_sizeof_voidp$have_shl" = "41"; then
             dsotype=shl; APR_ADDTO(LIBS,-ldld)
           fi;;
-        *-os2*)
+        *mingw*|*-os2*)
           # several 'other's below probably belong up here.  If they always
           # use a platform implementation and shouldn't test the dlopen/dlfcn
           # features, then bring them up here.
@@ -1539,6 +1673,12 @@ AC_ARG_ENABLE(other-child,
   
 AC_SUBST(oc) 
 
+if test -z "$have_proc_invoked"; then
+  have_proc_invoked="0"
+fi
+
+AC_SUBST(have_proc_invoked)
+
 AC_MSG_CHECKING(for Variable Length Arrays)
 APR_TRY_COMPILE_NO_WARNING([],
 [
@@ -1796,6 +1936,8 @@ fi
 dnl ----------------------------- Checking for /dev/random 
 AC_MSG_CHECKING(for entropy source)
 
+why_no_rand=""
+
 AC_ARG_WITH(egd, 
   [  --with-egd[[=DIR]]        use EGD-compatible socket],
   [ AC_DEFINE(HAVE_EGD, 1, [Define if EGD is supported])
@@ -1817,7 +1959,7 @@ if test "$rand" != "1"; then
   if test "$apr_devrandom" = "yes"; then
     # /dev/random on OpenBSD doesn't provide random data, so
     # prefer /dev/arandom, which does; see random(4).
-    for f in /dev/arandom /dev/random /dev/urandom; do
+    for f in /dev/arandom /dev/urandom /dev/random; do
       if test -r $f; then
         apr_devrandom=$f
         rand=1
@@ -1833,6 +1975,17 @@ if test "$rand" != "1"; then
   fi
 
   if test "$rand" = "1"; then
+    case $host in
+      *os390)
+        if test $os_version -lt 1700; then
+          rand="0"
+          why_no_rand=" ($apr_devrandom unusable on z/OS before V1R7)"
+        fi
+        ;;
+    esac
+  fi
+
+  if test "$rand" = "1"; then
     AC_DEFINE_UNQUOTED(DEV_RANDOM, ["$apr_devrandom"], [Define to path of random device])
     AC_MSG_RESULT([$apr_devrandom])
   fi
@@ -1852,7 +2005,7 @@ if test "$rand" != "1"; then
                 AC_MSG_RESULT(truerand)
                 rand="1"
               else
-                AC_MSG_RESULT(not found)
+                AC_MSG_RESULT(not found$why_no_rand)
                 rand="0"
               fi
             fi
@@ -1950,17 +2103,12 @@ AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,,[
 
 dnl ----------------------------- Checking for Networking Support 
 echo "${nl}Checking for Networking support..."
-AC_MSG_CHECKING(for in_addr in netinet/in.h)
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <netinet/in.h>
-],[
-struct in_addr arg;
-arg.s_addr = htonl(INADDR_ANY);
-], [ have_in_addr="1" 
-msg=yes ] , [ have_in_addr="0"
-msg=no ])
-AC_MSG_RESULT([$msg])
+APR_TYPE_IN_ADDR
+if test "$ac_cv_type_in_addr" = "yes"; then
+  have_in_addr="1"
+else
+  have_in_addr="0"
+fi
 
 AC_MSG_CHECKING([if fd == socket on this platform])
 if test "x$file_as_socket" != "x0" ; then
@@ -2101,6 +2249,14 @@ dnl Check for langinfo support
 AC_CHECK_HEADERS(langinfo.h)
 AC_CHECK_FUNCS(nl_langinfo)
 
+dnl Do we have a Win32-centric Unicode FS?
+
+if test -z "$have_unicode_fs"; then
+  have_unicode_fs="0"
+fi
+
+AC_SUBST(have_unicode_fs)
+
 dnl ----------------------------- Finalize the variables
 
 echo "${nl}Restore user-defined environment settings..."
@@ -2184,6 +2340,15 @@ for i in $APR_SAVE_HEADERS; do
   rm -f $i.save
 done
 chmod +x apr-$APR_MAJOR_VERSION-config
+# for mingw builds, we currently won't allow the unix apr_private.h to exist.
+# instead, we will rely on the manually-crafted win32 apr_private.h instead.
+case $APR_PLATFORM in
+    *-mingw*)
+        rm include/arch/unix/apr_private.h
+        ;;
+    *)
+        ;;
+esac
 ],[
 dnl This section is expanded by configure UNQUOTED so variable 
 dnl references must be backslash-escaped as necessary.
@@ -2191,6 +2356,7 @@ dnl references must be backslash-escaped as necessary.
 # Commands run at the beginning of config.status:
 APR_SAVE_HEADERS="include/apr.h include/arch/unix/apr_private.h"
 APR_MAJOR_VERSION=$APR_MAJOR_VERSION
+APR_PLATFORM=$host
 
 for apri in \${APR_SAVE_HEADERS}; do
   test -r \${apri} && mv \${apri} \${apri}.save
diff --git a/srclib/apr/dso/os390/dso.c b/srclib/apr/dso/os390/dso.c
index 034ffe84..9344c71a 100644
--- a/srclib/apr/dso/os390/dso.c
+++ b/srclib/apr/dso/os390/dso.c
@@ -72,7 +72,7 @@ APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle,
     }
 
     (*res_handle)->failing_errno = errno;
-    return errno;
+    return APR_EDSOOPEN;
 }
 
 APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
@@ -96,7 +96,7 @@ APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym,
         return APR_SUCCESS;
     }
     handle->failing_errno = errno;
-    return errno;
+    return APR_ESYMNOTFOUND;
 }
 
 APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *handle, char *buffer, 
diff --git a/srclib/apr/file_io/netware/filestat.c b/srclib/apr/file_io/netware/filestat.c
index b344e814..66279512 100644
--- a/srclib/apr/file_io/netware/filestat.c
+++ b/srclib/apr/file_io/netware/filestat.c
@@ -111,6 +111,7 @@ APR_DECLARE(apr_status_t) apr_file_info_get(apr_finfo_t *finfo,
     struct stat info;
 
     if (thefile->buffered) {
+        /* XXX: flush here is not mutex protected */
         apr_status_t rv = apr_file_flush(thefile);
         if (rv != APR_SUCCESS)
             return rv;
diff --git a/srclib/apr/file_io/netware/pipe.c b/srclib/apr/file_io/netware/pipe.c
index 4b6b8268..1abf4140 100644
--- a/srclib/apr/file_io/netware/pipe.c
+++ b/srclib/apr/file_io/netware/pipe.c
@@ -177,6 +177,33 @@ APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out
     return APR_SUCCESS;
 }
 
+APR_DECLARE(apr_status_t) apr_file_pipe_create_ex(apr_file_t **in, 
+                                                  apr_file_t **out, 
+                                                  apr_int32_t blocking,
+                                                  apr_pool_t *pool)
+{
+    apr_status_t status;
+
+    if ((status = apr_file_pipe_create(in, out, pool)) != APR_SUCCESS)
+        return status;
+
+    switch (blocking) {
+        case APR_FULL_BLOCK:
+            break;
+        case APR_READ_BLOCK:
+            apr_file_pipe_timeout_set(*out, 0);
+            break;
+        case APR_WRITE_BLOCK:
+            apr_file_pipe_timeout_set(*in, 0);
+            break;
+        default:
+            apr_file_pipe_timeout_set(*out, 0);
+            apr_file_pipe_timeout_set(*in, 0);
+    }
+
+    return APR_SUCCESS;
+}
+
 APR_DECLARE(apr_status_t) apr_file_namedpipe_create(const char *filename, 
                                                     apr_fileperms_t perm, apr_pool_t *pool)
 {
diff --git a/srclib/apr/file_io/os2/buffer.c b/srclib/apr/file_io/os2/buffer.c
new file mode 100644
index 00000000..34e4e639
--- /dev/null
+++ b/srclib/apr/file_io/os2/buffer.c
@@ -0,0 +1,59 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr_arch_file_io.h"
+#include "apr_thread_mutex.h"
+
+APR_DECLARE(apr_status_t) apr_file_buffer_set(apr_file_t *file, 
+                                              char * buffer,
+                                              apr_size_t bufsize)
+{
+    apr_status_t rv;
+
+    apr_thread_mutex_lock(file->mutex);
+ 
+    if(file->buffered) {
+        /* Flush the existing buffer */
+        rv = apr_file_flush(file);
+        if (rv != APR_SUCCESS) {
+            apr_thread_mutex_unlock(file->mutex);
+            return rv;
+        }
+    }
+        
+    file->buffer = buffer;
+    file->bufsize = bufsize;
+    file->buffered = 1;
+    file->bufpos = 0;
+    file->direction = 0;
+    file->dataRead = 0;
+ 
+    if (file->bufsize == 0) {
+            /* Setting the buffer size to zero is equivalent to turning 
+             * buffering off. 
+             */
+            file->buffered = 0;
+    }
+    
+    apr_thread_mutex_unlock(file->mutex);
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_size_t) apr_file_buffer_size_get(apr_file_t *file)
+{
+    return file->bufsize;
+}
diff --git a/srclib/apr/file_io/os2/filedup.c b/srclib/apr/file_io/os2/filedup.c
index 72b86e2f..a9d0421e 100644
--- a/srclib/apr/file_io/os2/filedup.c
+++ b/srclib/apr/file_io/os2/filedup.c
@@ -91,7 +91,8 @@ APR_DECLARE(apr_status_t) apr_file_setaside(apr_file_t **new_file,
     (*new_file)->pool = p;
 
     if (old_file->buffered) {
-        (*new_file)->buffer = apr_palloc(p, APR_FILE_BUFSIZE);
+        (*new_file)->buffer = apr_palloc(p, old_file->bufsize);
+        (*new_file)->bufsize = old_file->bufsize;
 
         if (old_file->direction == 1) {
             memcpy((*new_file)->buffer, old_file->buffer, old_file->bufpos);
diff --git a/srclib/apr/file_io/os2/filestat.c b/srclib/apr/file_io/os2/filestat.c
index f31c7c1b..cd163e41 100644
--- a/srclib/apr/file_io/os2/filestat.c
+++ b/srclib/apr/file_io/os2/filestat.c
@@ -94,6 +94,7 @@ APR_DECLARE(apr_status_t) apr_file_info_get(apr_finfo_t *finfo, apr_int32_t want
 
     if (thefile->isopen) {
         if (thefile->buffered) {
+            /* XXX: flush here is not mutex protected */
             apr_status_t rv = apr_file_flush(thefile);
 
             if (rv != APR_SUCCESS) {
diff --git a/srclib/apr/file_io/os2/open.c b/srclib/apr/file_io/os2/open.c
index 297a60b7..386bd073 100644
--- a/srclib/apr/file_io/os2/open.c
+++ b/srclib/apr/file_io/os2/open.c
@@ -33,7 +33,7 @@ apr_status_t apr_file_cleanup(void *thefile)
 APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, const char *fname, apr_int32_t flag,  apr_fileperms_t perm, apr_pool_t *pool)
 {
     int oflags = 0;
-    int mflags = OPEN_FLAGS_FAIL_ON_ERROR|OPEN_SHARE_DENYNONE;
+    int mflags = OPEN_FLAGS_FAIL_ON_ERROR|OPEN_SHARE_DENYNONE|OPEN_FLAGS_NOINHERIT;
     int rv;
     ULONG action;
     apr_file_t *dafile = (apr_file_t *)apr_palloc(pool, sizeof(apr_file_t));
@@ -59,7 +59,8 @@ APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, const char *fname, apr
     dafile->buffered = (flag & APR_BUFFERED) > 0;
 
     if (dafile->buffered) {
-        dafile->buffer = apr_palloc(pool, APR_FILE_BUFSIZE);
+        dafile->buffer = apr_palloc(pool, APR_FILE_DEFAULT_BUFSIZE);
+        dafile->bufsize = APR_FILE_DEFAULT_BUFSIZE;
         rv = apr_thread_mutex_create(&dafile->mutex, 0, pool);
 
         if (rv)
@@ -120,16 +121,19 @@ APR_DECLARE(apr_status_t) apr_file_close(apr_file_t *file)
     apr_status_t status;
     
     if (file && file->isopen) {
-        apr_file_flush(file);
+        /* XXX: flush here is not mutex protected */
+        status = apr_file_flush(file);
         rc = DosClose(file->filedes);
     
         if (rc == 0) {
             file->isopen = FALSE;
-            status = APR_SUCCESS;
 
             if (file->flags & APR_DELONCLOSE) {
                 status = APR_FROM_OS_ERROR(DosDelete(file->fname));
             }
+            /* else we return the status of the flush attempt 
+             * when all else succeeds
+             */
         } else {
             return APR_FROM_OS_ERROR(rc);
         }
@@ -193,7 +197,8 @@ APR_DECLARE(apr_status_t) apr_os_file_put(apr_file_t **file, apr_os_file_t *thef
     if ((*file)->buffered) {
         apr_status_t rv;
 
-        (*file)->buffer = apr_palloc(pool, APR_FILE_BUFSIZE);
+        (*file)->buffer = apr_palloc(pool, APR_FILE_DEFAULT_BUFSIZE);
+        (*file)->bufsize = APR_FILE_DEFAULT_BUFSIZE;
         rv = apr_thread_mutex_create(&(*file)->mutex, 0, pool);
 
         if (rv)
@@ -213,33 +218,83 @@ APR_DECLARE(apr_status_t) apr_file_eof(apr_file_t *fptr)
 }   
 
 
-APR_DECLARE(apr_status_t) apr_file_open_stderr(apr_file_t **thefile, apr_pool_t *pool)
+APR_DECLARE(apr_status_t) apr_file_open_flags_stderr(apr_file_t **thefile, 
+                                                     apr_int32_t flags,
+                                                     apr_pool_t *pool)
 {
     apr_os_file_t fd = 2;
 
-    return apr_os_file_put(thefile, &fd, 0, pool);
+    return apr_os_file_put(thefile, &fd, flags | APR_WRITE, pool);
 }
 
 
-
-APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile, apr_pool_t *pool)
+APR_DECLARE(apr_status_t) apr_file_open_flags_stdout(apr_file_t **thefile, 
+                                                     apr_int32_t flags,
+                                                     apr_pool_t *pool)
 {
     apr_os_file_t fd = 1;
 
-    return apr_os_file_put(thefile, &fd, 0, pool);
+    return apr_os_file_put(thefile, &fd, flags | APR_WRITE, pool);
 }
 
 
-APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile, apr_pool_t *pool)
+APR_DECLARE(apr_status_t) apr_file_open_flags_stdin(apr_file_t **thefile, 
+                                                    apr_int32_t flags,
+                                                    apr_pool_t *pool)
 {
     apr_os_file_t fd = 0;
 
-    return apr_os_file_put(thefile, &fd, 0, pool);
+    return apr_os_file_put(thefile, &fd, flags | APR_READ, pool);
+}
+
+
+APR_DECLARE(apr_status_t) apr_file_open_stderr(apr_file_t **thefile, apr_pool_t *pool)
+{
+    return apr_file_open_flags_stderr(thefile, 0, pool);
+}
+
+
+APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile, apr_pool_t *pool)
+{
+    return apr_file_open_flags_stdout(thefile, 0, pool);
+}
+
+
+APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile, apr_pool_t *pool)
+{
+    return apr_file_open_flags_stdin(thefile, 0, pool);
 }
 
 APR_POOL_IMPLEMENT_ACCESSOR(file);
 
-APR_IMPLEMENT_INHERIT_SET(file, flags, pool, apr_file_cleanup)
 
-APR_IMPLEMENT_INHERIT_UNSET(file, flags, pool, apr_file_cleanup)
 
+APR_DECLARE(apr_status_t) apr_file_inherit_set(apr_file_t *thefile)
+{
+    int rv;
+    ULONG state;
+
+    rv = DosQueryFHState(thefile->filedes, &state);
+
+    if (rv == 0 && (state & OPEN_FLAGS_NOINHERIT) != 0) {
+        rv = DosSetFHState(thefile->filedes, state & ~OPEN_FLAGS_NOINHERIT);
+    }
+
+    return APR_FROM_OS_ERROR(rv);
+}
+
+
+
+APR_DECLARE(apr_status_t) apr_file_inherit_unset(apr_file_t *thefile)
+{
+    int rv;
+    ULONG state;
+
+    rv = DosQueryFHState(thefile->filedes, &state);
+
+    if (rv == 0 && (state & OPEN_FLAGS_NOINHERIT) == 0) {
+        rv = DosSetFHState(thefile->filedes, state | OPEN_FLAGS_NOINHERIT);
+    }
+
+    return APR_FROM_OS_ERROR(rv);
+}
diff --git a/srclib/apr/file_io/os2/pipe.c b/srclib/apr/file_io/os2/pipe.c
index ee2b2b00..211c43cd 100644
--- a/srclib/apr/file_io/os2/pipe.c
+++ b/srclib/apr/file_io/os2/pipe.c
@@ -104,6 +104,35 @@ APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out
 
 
 
+APR_DECLARE(apr_status_t) apr_file_pipe_create_ex(apr_file_t **in, 
+                                                  apr_file_t **out, 
+                                                  apr_int32_t blocking,
+                                                  apr_pool_t *pool)
+{
+    apr_status_t status;
+
+    if ((status = apr_file_pipe_create(in, out, pool)) != APR_SUCCESS)
+        return status;
+
+    switch (blocking) {
+        case APR_FULL_BLOCK:
+            break;
+        case APR_READ_BLOCK:
+            apr_file_pipe_timeout_set(*out, 0);
+            break;
+        case APR_WRITE_BLOCK:
+            apr_file_pipe_timeout_set(*in, 0);
+            break;
+        default:
+            apr_file_pipe_timeout_set(*out, 0);
+            apr_file_pipe_timeout_set(*in, 0);
+    }
+
+    return APR_SUCCESS;
+}
+
+    
+    
 APR_DECLARE(apr_status_t) apr_file_namedpipe_create(const char *filename, apr_fileperms_t perm, apr_pool_t *pool)
 {
     /* Not yet implemented, interface not suitable */
diff --git a/srclib/apr/file_io/os2/readwrite.c b/srclib/apr/file_io/os2/readwrite.c
index f25a4210..d680dcc1 100644
--- a/srclib/apr/file_io/os2/readwrite.c
+++ b/srclib/apr/file_io/os2/readwrite.c
@@ -58,7 +58,7 @@ APR_DECLARE(apr_status_t) apr_file_read(apr_file_t *thefile, void *buf, apr_size
             if (thefile->bufpos >= thefile->dataRead) {
                 ULONG bytesread;
                 rc = DosRead(thefile->filedes, thefile->buffer,
-                             APR_FILE_BUFSIZE, &bytesread);
+                             thefile->bufsize, &bytesread);
 
                 if (bytesread == 0) {
                     if (rc == 0)
@@ -149,10 +149,11 @@ APR_DECLARE(apr_status_t) apr_file_write(apr_file_t *thefile, const void *buf, a
         }
 
         while (rc == 0 && size > 0) {
-            if (thefile->bufpos == APR_FILE_BUFSIZE)   // write buffer is full
+            if (thefile->bufpos == thefile->bufsize)   // write buffer is full
+                /* XXX bug; - rc is double-transformed os->apr below */
                 rc = apr_file_flush(thefile);
 
-            blocksize = size > APR_FILE_BUFSIZE - thefile->bufpos ? APR_FILE_BUFSIZE - thefile->bufpos : size;
+            blocksize = size > thefile->bufsize - thefile->bufpos ? thefile->bufsize - thefile->bufpos : size;
             memcpy(thefile->buffer + thefile->bufpos, pos, blocksize);
             thefile->bufpos += blocksize;
             pos += blocksize;
@@ -197,6 +198,14 @@ APR_DECLARE(apr_status_t) apr_file_write(apr_file_t *thefile, const void *buf, a
 APR_DECLARE(apr_status_t) apr_file_writev(apr_file_t *thefile, const struct iovec *vec, apr_size_t nvec, apr_size_t *nbytes)
 {
     int bytes;
+
+    if (thefile->buffered) {
+        apr_status_t rv = apr_file_flush(thefile);
+        if (rv != APR_SUCCESS) {
+            return rv;
+        }
+    }
+
     if ((bytes = writev(thefile->filedes, vec, nvec)) < 0) {
         *nbytes = 0;
         return errno;
diff --git a/srclib/apr/file_io/os2/seek.c b/srclib/apr/file_io/os2/seek.c
index 6fdfe8e8..a8d13fe2 100644
--- a/srclib/apr/file_io/os2/seek.c
+++ b/srclib/apr/file_io/os2/seek.c
@@ -27,6 +27,7 @@ static apr_status_t setptr(apr_file_t *thefile, unsigned long pos )
     ULONG rc;
 
     if (thefile->direction == 1) {
+        /* XXX: flush here is not mutex protected */
         apr_status_t rv = apr_file_flush(thefile);
 
         if (rv != APR_SUCCESS) {
diff --git a/srclib/apr/file_io/unix/buffer.c b/srclib/apr/file_io/unix/buffer.c
new file mode 100644
index 00000000..ba2a8a7c
--- /dev/null
+++ b/srclib/apr/file_io/unix/buffer.c
@@ -0,0 +1,60 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr_arch_file_io.h"
+#include "apr_pools.h"
+#include "apr_thread_mutex.h"
+
+APR_DECLARE(apr_status_t) apr_file_buffer_set(apr_file_t *file, 
+                                              char * buffer,
+                                              apr_size_t bufsize)
+{
+    apr_status_t rv;
+
+    file_lock(file);
+
+    if(file->buffered) {
+        /* Flush the existing buffer */
+        rv = apr_file_flush_locked(file);
+        if (rv != APR_SUCCESS) {
+            file_unlock(file);
+            return rv;
+        }
+    }
+        
+    file->buffer = buffer;
+    file->bufsize = bufsize;
+    file->buffered = 1;
+    file->bufpos = 0;
+    file->direction = 0;
+    file->dataRead = 0;
+ 
+    if (file->bufsize == 0) {
+            /* Setting the buffer size to zero is equivalent to turning 
+             * buffering off. 
+             */
+            file->buffered = 0;
+    }
+
+    file_unlock(file);
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_size_t) apr_file_buffer_size_get(apr_file_t *file)
+{
+    return file->bufsize;
+}
diff --git a/srclib/apr/file_io/unix/copy.c b/srclib/apr/file_io/unix/copy.c
index 113a1081..3a1c59a6 100644
--- a/srclib/apr/file_io/unix/copy.c
+++ b/srclib/apr/file_io/unix/copy.c
@@ -52,9 +52,15 @@ static apr_status_t apr_file_transfer_contents(const char *from_path,
         return status;
     }
 
+#if BUFSIZ > APR_FILE_DEFAULT_BUFSIZE
+#define COPY_BUFSIZ BUFSIZ
+#else
+#define COPY_BUFSIZ APR_FILE_DEFAULT_BUFSIZE
+#endif
+
     /* Copy bytes till the cows come home. */
     while (1) {
-        char buf[BUFSIZ];
+        char buf[COPY_BUFSIZ];
         apr_size_t bytes_this_time = sizeof(buf);
         apr_status_t read_err;
         apr_status_t write_err;
diff --git a/srclib/apr/file_io/unix/dir.c b/srclib/apr/file_io/unix/dir.c
index e05dc993..f58a4496 100644
--- a/srclib/apr/file_io/unix/dir.c
+++ b/srclib/apr/file_io/unix/dir.c
@@ -77,8 +77,8 @@ apr_status_t apr_dir_open(apr_dir_t **new, const char *dirname,
      * one-byte array.  Note: gcc evaluates this at compile time.
      */
     apr_size_t dirent_size = 
-        (sizeof((*new)->entry->d_name) > 1 ? 
-         sizeof(struct dirent) : sizeof (struct dirent) + 255);
+        sizeof(*(*new)->entry) +
+        (sizeof((*new)->entry->d_name) > 1 ? 0 : 255);
     DIR *dir = opendir(dirname);
 
     if (!dir) {
@@ -139,15 +139,34 @@ apr_status_t apr_dir_read(apr_finfo_t *finfo, apr_int32_t wanted,
 #endif
 #if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) \
                     && !defined(READDIR_IS_THREAD_SAFE)
+#ifdef APR_USE_READDIR64_R
+    struct dirent64 *retent;
+
+    /* If LFS is enabled and readdir64_r is available, readdir64_r is
+     * used in preference to readdir_r.  This allows directories to be
+     * read which contain a (64-bit) inode number which doesn't fit
+     * into the 32-bit apr_ino_t, iff the caller doesn't actually care
+     * about the inode number (i.e. wanted & APR_FINFO_INODE == 0).
+     * (such inodes may be seen in some wonky NFS environments)
+     *
+     * Similarly, if the d_off field cannot be reprented in a 32-bit
+     * offset, the libc readdir_r() would barf; using readdir64_r
+     * bypasses that case entirely since APR does not care about
+     * d_off. */
+
+    ret = readdir64_r(thedir->dirstruct, thedir->entry, &retent);
+#else
+
     struct dirent *retent;
 
     ret = readdir_r(thedir->dirstruct, thedir->entry, &retent);
+#endif
 
-    /* Avoid the Linux problem where at end-of-directory thedir->entry
-     * is set to NULL, but ret = APR_SUCCESS.
-     */
-    if(!ret && thedir->entry != retent)
+    /* POSIX treats "end of directory" as a non-error case, so ret
+     * will be zero and retent will be set to NULL in that case. */
+    if (!ret && retent == NULL) {
         ret = APR_ENOENT;
+    }
 
     /* Solaris is a bit strange, if there are no more entries in the
      * directory, it returns EINVAL.  Since this is against POSIX, we
@@ -157,7 +176,7 @@ apr_status_t apr_dir_read(apr_finfo_t *finfo, apr_int32_t wanted,
      * that problem.
      */
     if (ret == EINVAL) {
-        ret = ENOENT;
+        ret = APR_ENOENT;
     }
 #else
     /* We're about to call a non-thread-safe readdir() that may
@@ -191,21 +210,38 @@ apr_status_t apr_dir_read(apr_finfo_t *finfo, apr_int32_t wanted,
 #endif
 #ifdef DIRENT_INODE
     if (thedir->entry->DIRENT_INODE && thedir->entry->DIRENT_INODE != -1) {
+#ifdef APR_USE_READDIR64_R
+        /* If readdir64_r is used, check for the overflow case of trying
+         * to fit a 64-bit integer into a 32-bit integer. */
+        if (sizeof(apr_ino_t) >= sizeof(retent->DIRENT_INODE)
+            || (apr_ino_t)retent->DIRENT_INODE == retent->DIRENT_INODE) {
+            wanted &= ~APR_FINFO_INODE;
+        } else {
+            /* Prevent the fallback code below from filling in the
+             * inode if the stat call fails. */
+            retent->DIRENT_INODE = 0;
+        }
+#else
         wanted &= ~APR_FINFO_INODE;
+#endif /* APR_USE_READDIR64_R */
     }
-#endif
+#endif /* DIRENT_INODE */
 
     wanted &= ~APR_FINFO_NAME;
 
     if (wanted)
     {
         char fspec[APR_PATH_MAX];
-        int off;
-        apr_cpystrn(fspec, thedir->dirname, sizeof(fspec));
-        off = strlen(fspec);
-        if ((fspec[off - 1] != '/') && (off + 1 < sizeof(fspec)))
-            fspec[off++] = '/';
-        apr_cpystrn(fspec + off, thedir->entry->d_name, sizeof(fspec) - off);
+        char *end;
+
+        end = apr_cpystrn(fspec, thedir->dirname, sizeof fspec);
+
+        if (end > fspec && end[-1] != '/' && (end < fspec + APR_PATH_MAX))
+            *end++ = '/';
+
+        apr_cpystrn(end, thedir->entry->d_name, 
+                    sizeof fspec - (end - fspec));
+
         ret = apr_stat(finfo, fspec, APR_FINFO_LINK | wanted, thedir->pool);
         /* We passed a stack name that will disappear */
         finfo->fname = NULL;
diff --git a/srclib/apr/file_io/unix/filedup.c b/srclib/apr/file_io/unix/filedup.c
index 653e859b..adecbb7f 100644
--- a/srclib/apr/file_io/unix/filedup.c
+++ b/srclib/apr/file_io/unix/filedup.c
@@ -62,7 +62,8 @@ static apr_status_t file_dup(apr_file_t **new_file,
      * got one.
      */
     if ((*new_file)->buffered && !(*new_file)->buffer) {
-        (*new_file)->buffer = apr_palloc(p, APR_FILE_BUFSIZE);
+        (*new_file)->buffer = apr_palloc(p, old_file->bufsize);
+        (*new_file)->bufsize = old_file->bufsize;
     }
 
     /* this is the way dup() works */
@@ -121,7 +122,8 @@ APR_DECLARE(apr_status_t) apr_file_setaside(apr_file_t **new_file,
     memcpy(*new_file, old_file, sizeof(apr_file_t));
     (*new_file)->pool = p;
     if (old_file->buffered) {
-        (*new_file)->buffer = apr_palloc(p, APR_FILE_BUFSIZE);
+        (*new_file)->buffer = apr_palloc(p, old_file->bufsize);
+        (*new_file)->bufsize = old_file->bufsize;
         if (old_file->direction == 1) {
             memcpy((*new_file)->buffer, old_file->buffer, old_file->bufpos);
         }
diff --git a/srclib/apr/file_io/unix/filestat.c b/srclib/apr/file_io/unix/filestat.c
index 93b6a2b8..9bee6511 100644
--- a/srclib/apr/file_io/unix/filestat.c
+++ b/srclib/apr/file_io/unix/filestat.c
@@ -77,9 +77,18 @@ static void fill_out_finfo(apr_finfo_t *finfo, struct_stat *info,
     finfo->user = info->st_uid;
     finfo->group = info->st_gid;
     finfo->size = info->st_size;
-    finfo->inode = info->st_ino;
     finfo->device = info->st_dev;
     finfo->nlink = info->st_nlink;
+
+    /* Check for overflow if storing a 64-bit st_ino in a 32-bit
+     * apr_ino_t for LFS builds: */
+    if (sizeof(apr_ino_t) >= sizeof(info->st_ino)
+        || (apr_ino_t)info->st_ino == info->st_ino) {
+        finfo->inode = info->st_ino;
+    } else {
+        finfo->valid &= ~APR_FINFO_INODE;
+    }
+
     apr_time_ansi_put(&finfo->atime, info->st_atime);
 #ifdef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
     finfo->atime += info->st_atim.tv_nsec / APR_TIME_C(1000);
diff --git a/srclib/apr/file_io/unix/fullrw.c b/srclib/apr/file_io/unix/fullrw.c
index 9ad27ec9..3c67f659 100644
--- a/srclib/apr/file_io/unix/fullrw.c
+++ b/srclib/apr/file_io/unix/fullrw.c
@@ -72,10 +72,36 @@ APR_DECLARE(apr_status_t) apr_file_writev_full(apr_file_t *thefile,
     apr_size_t amt = 0;
     apr_size_t total = 0;
 
-    for (i = 0; i < nvec && rv == APR_SUCCESS; i++) {
-        rv = apr_file_write_full(thefile, vec[i].iov_base, 
+    for (i = 0; i < nvec; i++) {
+        total += vec[i].iov_len;
+    }
+
+    rv = apr_file_writev(thefile, vec, nvec, &amt);
+
+    if (bytes_written != NULL)
+        *bytes_written = amt;
+
+    if (rv != APR_SUCCESS || (amt == total)) {
+        return rv;
+    }
+
+    for (i = 0; i < nvec && amt; i++) {
+        if (amt >= vec[i].iov_len) {
+            amt -= vec[i].iov_len;
+        }
+        else {
+            break;
+        }
+    }
+
+    if (amt) {
+        rv = apr_file_write_full(thefile, (const char *)vec[i].iov_base + amt,
+                                 vec[i].iov_len - amt, NULL);
+    }
+
+    for (; i < nvec && rv == APR_SUCCESS; i++) {
+        rv = apr_file_write_full(thefile, vec[i].iov_base,
                                  vec[i].iov_len, &amt);
-        total += amt;
     }
 
     if (bytes_written != NULL)
diff --git a/srclib/apr/file_io/unix/open.c b/srclib/apr/file_io/unix/open.c
index ce53c793..e8404504 100644
--- a/srclib/apr/file_io/unix/open.c
+++ b/srclib/apr/file_io/unix/open.c
@@ -47,7 +47,7 @@ static apr_status_t file_cleanup(apr_file_t *file)
     }
 #ifndef WAITIO_USES_POLL
     if (file->pollset != NULL) {
-        int pollset_rv = apr_pollset_destroy(file->pollset);
+        apr_status_t pollset_rv = apr_pollset_destroy(file->pollset);
         /* If the file close failed, return its error value,
          * not apr_pollset_destroy()'s.
          */
@@ -165,7 +165,8 @@ APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new,
     (*new)->buffered = (flag & APR_BUFFERED) > 0;
 
     if ((*new)->buffered) {
-        (*new)->buffer = apr_palloc(pool, APR_FILE_BUFSIZE);
+        (*new)->buffer = apr_palloc(pool, APR_FILE_DEFAULT_BUFSIZE);
+        (*new)->bufsize = APR_FILE_DEFAULT_BUFSIZE;
 #if APR_HAS_THREADS
         if ((*new)->flags & APR_XTHREAD) {
             (*new)->thlock = thlock;
@@ -254,7 +255,8 @@ APR_DECLARE(apr_status_t) apr_os_file_put(apr_file_t **file,
 #endif
 
     if ((*file)->buffered) {
-        (*file)->buffer = apr_palloc(pool, APR_FILE_BUFSIZE);
+        (*file)->buffer = apr_palloc(pool, APR_FILE_DEFAULT_BUFSIZE);
+        (*file)->bufsize = APR_FILE_DEFAULT_BUFSIZE;
 #if APR_HAS_THREADS
         if ((*file)->flags & APR_XTHREAD) {
             apr_status_t rv;
@@ -277,28 +279,49 @@ APR_DECLARE(apr_status_t) apr_file_eof(apr_file_t *fptr)
     return APR_SUCCESS;
 }   
 
-APR_DECLARE(apr_status_t) apr_file_open_stderr(apr_file_t **thefile, 
-                                               apr_pool_t *pool)
+APR_DECLARE(apr_status_t) apr_file_open_flags_stderr(apr_file_t **thefile, 
+                                                     apr_int32_t flags,
+                                                     apr_pool_t *pool)
 {
     int fd = STDERR_FILENO;
 
-    return apr_os_file_put(thefile, &fd, 0, pool);
+    return apr_os_file_put(thefile, &fd, flags | APR_WRITE, pool);
 }
 
-APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile, 
-                                               apr_pool_t *pool)
+APR_DECLARE(apr_status_t) apr_file_open_flags_stdout(apr_file_t **thefile, 
+                                                     apr_int32_t flags,
+                                                     apr_pool_t *pool)
 {
     int fd = STDOUT_FILENO;
 
-    return apr_os_file_put(thefile, &fd, 0, pool);
+    return apr_os_file_put(thefile, &fd, flags | APR_WRITE, pool);
 }
 
-APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile, 
-                                              apr_pool_t *pool)
+APR_DECLARE(apr_status_t) apr_file_open_flags_stdin(apr_file_t **thefile, 
+                                                    apr_int32_t flags,
+                                                    apr_pool_t *pool)
 {
     int fd = STDIN_FILENO;
 
-    return apr_os_file_put(thefile, &fd, 0, pool);
+    return apr_os_file_put(thefile, &fd, flags | APR_READ, pool);
+}
+
+APR_DECLARE(apr_status_t) apr_file_open_stderr(apr_file_t **thefile, 
+                                               apr_pool_t *pool)
+{
+    return apr_file_open_flags_stderr(thefile, 0, pool);
+}
+
+APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile, 
+                                               apr_pool_t *pool)
+{
+    return apr_file_open_flags_stdout(thefile, 0, pool);
+}
+
+APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile, 
+                                              apr_pool_t *pool)
+{
+    return apr_file_open_flags_stdin(thefile, 0, pool);
 }
 
 APR_IMPLEMENT_INHERIT_SET(file, flags, pool, apr_unix_file_cleanup)
diff --git a/srclib/apr/file_io/unix/pipe.c b/srclib/apr/file_io/unix/pipe.c
index 5411f5d4..0411aa5f 100644
--- a/srclib/apr/file_io/unix/pipe.c
+++ b/srclib/apr/file_io/unix/pipe.c
@@ -222,6 +222,33 @@ APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out
     return APR_SUCCESS;
 }
 
+APR_DECLARE(apr_status_t) apr_file_pipe_create_ex(apr_file_t **in, 
+                                                  apr_file_t **out, 
+                                                  apr_int32_t blocking,
+                                                  apr_pool_t *pool)
+{
+    apr_status_t status;
+
+    if ((status = apr_file_pipe_create(in, out, pool)) != APR_SUCCESS)
+        return status;
+
+    switch (blocking) {
+        case APR_FULL_BLOCK:
+            break;
+        case APR_READ_BLOCK:
+            apr_file_pipe_timeout_set(*out, 0);
+            break;
+        case APR_WRITE_BLOCK:
+            apr_file_pipe_timeout_set(*in, 0);
+            break;
+        default:
+            apr_file_pipe_timeout_set(*out, 0);
+            apr_file_pipe_timeout_set(*in, 0);
+    }
+
+    return APR_SUCCESS;
+}
+
 APR_DECLARE(apr_status_t) apr_file_namedpipe_create(const char *filename, 
                                                     apr_fileperms_t perm, apr_pool_t *pool)
 {
diff --git a/srclib/apr/file_io/unix/readwrite.c b/srclib/apr/file_io/unix/readwrite.c
index 9ba6fb8f..83d84975 100644
--- a/srclib/apr/file_io/unix/readwrite.c
+++ b/srclib/apr/file_io/unix/readwrite.c
@@ -52,7 +52,8 @@ static apr_status_t file_read_buffered(apr_file_t *thefile, void *buf,
     }
     while (rv == 0 && size > 0) {
         if (thefile->bufpos >= thefile->dataRead) {
-            int bytesread = read(thefile->filedes, thefile->buffer, APR_FILE_BUFSIZE);
+            int bytesread = read(thefile->filedes, thefile->buffer, 
+                                 thefile->bufsize);
             if (bytesread == 0) {
                 thefile->eof_hit = TRUE;
                 rv = APR_EOF;
@@ -95,7 +96,6 @@ APR_DECLARE(apr_status_t) apr_file_read(apr_file_t *thefile, void *buf, apr_size
         file_lock(thefile);
         rv = file_read_buffered(thefile, buf, nbytes);
         file_unlock(thefile);
-
         return rv;
     }
     else {
@@ -168,11 +168,11 @@ APR_DECLARE(apr_status_t) apr_file_write(apr_file_t *thefile, const void *buf, a
 
         rv = 0;
         while (rv == 0 && size > 0) {
-            if (thefile->bufpos == APR_FILE_BUFSIZE)   /* write buffer is full*/
+            if (thefile->bufpos == thefile->bufsize)   /* write buffer is full*/
                 rv = apr_file_flush_locked(thefile);
 
-            blocksize = size > APR_FILE_BUFSIZE - thefile->bufpos ? 
-                        APR_FILE_BUFSIZE - thefile->bufpos : size;
+            blocksize = size > thefile->bufsize - thefile->bufpos ? 
+                        thefile->bufsize - thefile->bufpos : size;
             memcpy(thefile->buffer + thefile->bufpos, pos, blocksize);                      
             thefile->bufpos += blocksize;
             pos += blocksize;
@@ -228,7 +228,7 @@ APR_DECLARE(apr_status_t) apr_file_writev(apr_file_t *thefile, const struct iove
 {
 #ifdef HAVE_WRITEV
     apr_status_t rv;
-    int bytes;
+    apr_ssize_t bytes;
 
     if (thefile->buffered) {
         file_lock(thefile);
@@ -264,8 +264,8 @@ APR_DECLARE(apr_status_t) apr_file_writev(apr_file_t *thefile, const struct iove
 #else
     /**
      * The problem with trying to output the entire iovec is that we cannot
-     * maintain the behavoir that a real writev would have.  If we iterate
-     * over the iovec one at a time, we loose the atomic properties of 
+     * maintain the behaviour that a real writev would have.  If we iterate
+     * over the iovec one at a time, we lose the atomic properties of 
      * writev().  The other option is to combine the entire iovec into one
      * buffer that we could then send in one call to write().  This is not 
      * reasonable since we do not know how much data an iovec could contain.
@@ -339,7 +339,7 @@ APR_DECLARE(apr_status_t) apr_file_flush(apr_file_t *thefile)
     /* There isn't anything to do if we aren't buffering the output
      * so just return success.
      */
-    return rv; 
+    return rv;
 }
 
 APR_DECLARE(apr_status_t) apr_file_gets(char *str, int len, apr_file_t *thefile)
@@ -359,7 +359,6 @@ APR_DECLARE(apr_status_t) apr_file_gets(char *str, int len, apr_file_t *thefile)
      * and skip over the apr_file_read calls.
      */
     if (thefile->buffered) {
-
         file_lock(thefile);
 
         if (thefile->direction == 1) {
@@ -393,7 +392,6 @@ APR_DECLARE(apr_status_t) apr_file_gets(char *str, int len, apr_file_t *thefile)
             }
             ++str;
         }
-
         file_unlock(thefile);
     }
     else {
diff --git a/srclib/apr/file_io/win32/buffer.c b/srclib/apr/file_io/win32/buffer.c
new file mode 100644
index 00000000..34e4e639
--- /dev/null
+++ b/srclib/apr/file_io/win32/buffer.c
@@ -0,0 +1,59 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr_arch_file_io.h"
+#include "apr_thread_mutex.h"
+
+APR_DECLARE(apr_status_t) apr_file_buffer_set(apr_file_t *file, 
+                                              char * buffer,
+                                              apr_size_t bufsize)
+{
+    apr_status_t rv;
+
+    apr_thread_mutex_lock(file->mutex);
+ 
+    if(file->buffered) {
+        /* Flush the existing buffer */
+        rv = apr_file_flush(file);
+        if (rv != APR_SUCCESS) {
+            apr_thread_mutex_unlock(file->mutex);
+            return rv;
+        }
+    }
+        
+    file->buffer = buffer;
+    file->bufsize = bufsize;
+    file->buffered = 1;
+    file->bufpos = 0;
+    file->direction = 0;
+    file->dataRead = 0;
+ 
+    if (file->bufsize == 0) {
+            /* Setting the buffer size to zero is equivalent to turning 
+             * buffering off. 
+             */
+            file->buffered = 0;
+    }
+    
+    apr_thread_mutex_unlock(file->mutex);
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_size_t) apr_file_buffer_size_get(apr_file_t *file)
+{
+    return file->bufsize;
+}
diff --git a/srclib/apr/file_io/win32/filedup.c b/srclib/apr/file_io/win32/filedup.c
index 1f3b6b0f..e96ef2bc 100644
--- a/srclib/apr/file_io/win32/filedup.c
+++ b/srclib/apr/file_io/win32/filedup.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_file_io.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_general.h"
 #include "apr_strings.h"
@@ -191,7 +191,8 @@ APR_DECLARE(apr_status_t) apr_file_setaside(apr_file_t **new_file,
     memcpy(*new_file, old_file, sizeof(apr_file_t));
     (*new_file)->pool = p;
     if (old_file->buffered) {
-        (*new_file)->buffer = apr_palloc(p, APR_FILE_BUFSIZE);
+        (*new_file)->buffer = apr_palloc(p, old_file->bufsize);
+        (*new_file)->bufsize = old_file->bufsize;
         if (old_file->direction == 1) {
             memcpy((*new_file)->buffer, old_file->buffer, old_file->bufpos);
         }
diff --git a/srclib/apr/file_io/win32/filestat.c b/srclib/apr/file_io/win32/filestat.c
index af93bb93..f409fc24 100644
--- a/srclib/apr/file_io/win32/filestat.c
+++ b/srclib/apr/file_io/win32/filestat.c
@@ -188,7 +188,8 @@ static apr_status_t resolve_ident(apr_finfo_t *finfo, const char *fname,
     return rv;
 }
 
-static void guess_protection_bits(apr_finfo_t *finfo)
+static apr_status_t guess_protection_bits(apr_finfo_t *finfo,
+                                          apr_int32_t wanted)
 {
     /* Read, write execute for owner.  In the Win9x environment, any
      * readable file is executable (well, not entirely 100% true, but
@@ -205,6 +206,8 @@ static void guess_protection_bits(apr_finfo_t *finfo)
                        | (finfo->protection << prot_scope_user);
 
     finfo->valid |= APR_FINFO_UPROT | APR_FINFO_GPROT | APR_FINFO_WPROT;
+
+    return ((wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS);
 }
 
 apr_status_t more_finfo(apr_finfo_t *finfo, const void *ufile, 
@@ -215,8 +218,9 @@ apr_status_t more_finfo(apr_finfo_t *finfo, const void *ufile,
     apr_status_t rv;
 
     if (apr_os_level < APR_WIN_NT)
-        guess_protection_bits(finfo);
-    else if (wanted & (APR_FINFO_PROT | APR_FINFO_OWNER))
+        return guess_protection_bits(finfo, wanted);
+
+    if (wanted & (APR_FINFO_PROT | APR_FINFO_OWNER))
     {
         /* On NT this request is incredibly expensive, but accurate.
          * Since the WinNT-only functions below are protected by the
@@ -286,9 +290,49 @@ apr_status_t more_finfo(apr_finfo_t *finfo, const void *ufile,
             resolve_prot(finfo, wanted, dacl);
         }
         else if (wanted & APR_FINFO_PROT)
-            guess_protection_bits(finfo);
+            guess_protection_bits(finfo, wanted);
     }
 
+    if ((apr_os_level >= APR_WIN_2000) && (wanted & APR_FINFO_CSIZE)
+                                       && (finfo->filetype == APR_REG))
+    {
+        DWORD sizelo, sizehi;
+        if (whatfile == MORE_OF_HANDLE) {
+            /* Not available for development and implementation under
+             * a reasonable license; if you review the licensing
+             * terms and conditions of;
+             *   http://go.microsoft.com/fwlink/?linkid=84083
+             * you probably understand why APR chooses not to implement.
+             */
+            IOSB sb;
+            FSI fi;
+            if ((ZwQueryInformationFile((HANDLE)ufile, &sb, 
+                                       &fi, sizeof(fi), 5) == 0) 
+                    && (sb.Status == 0)) {
+                finfo->csize = fi.AllocationSize;
+                finfo->valid |= APR_FINFO_CSIZE;
+            }
+        }
+        else {
+            SetLastError(NO_ERROR);
+            if (whatfile == MORE_OF_WFSPEC)
+                sizelo = GetCompressedFileSizeW((apr_wchar_t*)ufile, &sizehi);
+            else if (whatfile == MORE_OF_FSPEC)
+                sizelo = GetCompressedFileSizeA((char*)ufile, &sizehi);
+        
+            if (sizelo != INVALID_FILE_SIZE || GetLastError() == NO_ERROR) {
+#if APR_HAS_LARGE_FILES
+                finfo->csize =  (apr_off_t)sizelo
+                             | ((apr_off_t)sizehi << 32);
+#else
+                finfo->csize = (apr_off_t)sizelo;
+                if (finfo->csize < 0 || sizehi)
+                    finfo->csize = 0x7fffffff;
+#endif
+                finfo->valid |= APR_FINFO_CSIZE;
+            }
+        }
+    }
     return ((wanted & ~finfo->valid) ? APR_INCOMPLETE : APR_SUCCESS);
 }
 
diff --git a/srclib/apr/file_io/win32/open.c b/srclib/apr/file_io/win32/open.c
index 6e8221c8..5735a447 100644
--- a/srclib/apr/file_io/win32/open.c
+++ b/srclib/apr/file_io/win32/open.c
@@ -32,6 +32,7 @@
 #include "apr_arch_misc.h"
 #include "apr_arch_inherit.h"
 #include <io.h>
+#include <WinIoCtl.h>
 
 #if APR_HAS_UNICODE_FS
 apr_status_t utf8_to_unicode_path(apr_wchar_t* retstr, apr_size_t retlen, 
@@ -54,17 +55,20 @@ apr_status_t utf8_to_unicode_path(apr_wchar_t* retstr, apr_size_t retlen,
     apr_status_t rv;
 
     /* This is correct, we don't twist the filename if it is will
-     * definately be shorter than MAX_PATH.  It merits some 
+     * definately be shorter than 248 characters.  It merits some 
      * performance testing to see if this has any effect, but there
      * seem to be applications that get confused by the resulting
      * Unicode \\?\ style file names, especially if they use argv[0]
      * or call the Win32 API functions such as GetModuleName, etc.
      * Not every application is prepared to handle such names.
+     * 
+     * Note also this is shorter than MAX_PATH, as directory paths 
+     * are actually limited to 248 characters. 
      *
      * Note that a utf-8 name can never result in more wide chars
      * than the original number of utf-8 narrow chars.
      */
-    if (srcremains > MAX_PATH) {
+    if (srcremains > 248) {
         if (srcstr[1] == ':' && (srcstr[2] == '/' || srcstr[2] == '\\')) {
             wcscpy (retstr, L"\\\\?\\");
             retlen -= 4;
@@ -220,6 +224,57 @@ void *res_name_from_filename(const char *file, int global, apr_pool_t *pool)
 #endif
 }
 
+#if APR_HAS_UNICODE_FS
+static apr_status_t make_sparse_file(apr_file_t *file)
+{
+    BY_HANDLE_FILE_INFORMATION info;
+    apr_status_t rv;
+    DWORD bytesread = 0;
+    DWORD res;
+
+    /* test */
+
+    if (GetFileInformationByHandle(file->filehand, &info)
+            && (info.dwFileAttributes & FILE_ATTRIBUTE_SPARSE_FILE))
+        return APR_SUCCESS;
+
+    if (file->pOverlapped) {
+        file->pOverlapped->Offset     = 0;
+        file->pOverlapped->OffsetHigh = 0;
+    }
+
+    if (DeviceIoControl(file->filehand, FSCTL_SET_SPARSE, NULL, 0, NULL, 0,
+                        &bytesread, file->pOverlapped)) {
+        rv = APR_SUCCESS;
+    }
+    else 
+    {
+        rv = apr_get_os_error();
+
+        if (rv == APR_FROM_OS_ERROR(ERROR_IO_PENDING))
+        {
+            do {
+                res = WaitForSingleObject(file->pOverlapped->hEvent, 
+                                          (file->timeout > 0)
+                                            ? (DWORD)(file->timeout/1000)
+                                            : ((file->timeout == -1) 
+                                                 ? INFINITE : 0));
+            } while (res == WAIT_ABANDONED);
+
+            if (res != WAIT_OBJECT_0) {
+                CancelIo(file->filehand);
+            }
+
+            if (GetOverlappedResult(file->filehand, file->pOverlapped, 
+                                    &bytesread, TRUE))
+                rv = APR_SUCCESS;
+            else
+                rv = apr_get_os_error();
+        }
+    }
+    return rv;
+}
+#endif
 
 apr_status_t file_cleanup(void *thefile)
 {
@@ -371,12 +426,8 @@ APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, const char *fname,
     ELSE_WIN_OS_IS_ANSI {
         handle = CreateFileA(fname, oflags, sharemode,
                              NULL, createflags, attributes, 0);
-        if (flag & APR_SENDFILE_ENABLED) {    
-            /* This feature is not supported on this platform.
-             */
-            flag &= ~APR_SENDFILE_ENABLED;
-        }
-
+        /* This feature is not supported on this platform. */
+        flag &= ~APR_SENDFILE_ENABLED;
     }
 #endif
     if (handle == INVALID_HANDLE_VALUE) {
@@ -397,7 +448,8 @@ APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, const char *fname,
     }
     if (flag & APR_BUFFERED) {
         (*new)->buffered = 1;
-        (*new)->buffer = apr_palloc(pool, APR_FILE_BUFSIZE);
+        (*new)->buffer = apr_palloc(pool, APR_FILE_DEFAULT_BUFSIZE);
+        (*new)->bufsize = APR_FILE_DEFAULT_BUFSIZE;
     }
     /* Need the mutex to handled buffered and O_APPEND style file i/o */
     if ((*new)->buffered || (*new)->append) {
@@ -411,6 +463,20 @@ APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, const char *fname,
         }
     }
 
+#if APR_HAS_UNICODE_FS
+    if ((apr_os_level >= APR_WIN_2000) && ((*new)->flags & APR_FOPEN_SPARSE)) {
+        if ((rv = make_sparse_file(*new)) != APR_SUCCESS)
+            /* The great mystery; do we close the file and return an error?
+             * Do we add a new APR_INCOMPLETE style error saying opened, but
+             * NOTSPARSE?  For now let's simply mark the file as not-sparse.
+             */
+            (*new)->flags &= ~APR_FOPEN_SPARSE;
+    }
+    else
+#endif
+        /* This feature is not supported on this platform. */
+        (*new)->flags &= ~APR_FOPEN_SPARSE;
+
     /* Create a pollset with room for one descriptor. */
     /* ### check return codes */
     (void) apr_pollset_create(&(*new)->pollset, 1, pool, 0);
@@ -539,7 +605,8 @@ APR_DECLARE(apr_status_t) apr_os_file_put(apr_file_t **file,
     }
     if (flags & APR_BUFFERED) {
         (*file)->buffered = 1;
-        (*file)->buffer = apr_palloc(pool, APR_FILE_BUFSIZE);
+        (*file)->buffer = apr_palloc(pool, APR_FILE_DEFAULT_BUFSIZE);
+        (*file)->bufsize = APR_FILE_DEFAULT_BUFSIZE;
     }
 
     if ((*file)->append || (*file)->buffered) {
@@ -558,8 +625,7 @@ APR_DECLARE(apr_status_t) apr_os_file_put(apr_file_t **file,
     /* ### check return codes */
     (void) apr_pollset_create(&(*file)->pollset, 1, pool, 0);
 
-    /* XXX... we pcalloc above so all others are zeroed.
-     * Should we be testing if thefile is a handle to 
+    /* Should we be testing if thefile is a handle to 
      * a PIPE and set up the mechanics appropriately?
      *
      *  (*file)->pipe;
@@ -575,7 +641,9 @@ APR_DECLARE(apr_status_t) apr_file_eof(apr_file_t *fptr)
     return APR_SUCCESS;
 }   
 
-APR_DECLARE(apr_status_t) apr_file_open_stderr(apr_file_t **thefile, apr_pool_t *pool)
+APR_DECLARE(apr_status_t) apr_file_open_flags_stderr(apr_file_t **thefile, 
+                                                     apr_int32_t flags, 
+                                                     apr_pool_t *pool)
 {
 #ifdef _WIN32_WCE
     return APR_ENOTIMPL;
@@ -588,11 +656,13 @@ APR_DECLARE(apr_status_t) apr_file_open_stderr(apr_file_t **thefile, apr_pool_t
         file_handle = INVALID_HANDLE_VALUE;
 
     return apr_os_file_put(thefile, &file_handle,
-                           APR_WRITE | APR_STDERR_FLAG, pool);
+                           flags | APR_WRITE | APR_STDERR_FLAG, pool);
 #endif
 }
 
-APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile, apr_pool_t *pool)
+APR_DECLARE(apr_status_t) apr_file_open_flags_stdout(apr_file_t **thefile, 
+                                                     apr_int32_t flags,
+                                                     apr_pool_t *pool)
 {
 #ifdef _WIN32_WCE
     return APR_ENOTIMPL;
@@ -605,11 +675,13 @@ APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile, apr_pool_t
         file_handle = INVALID_HANDLE_VALUE;
 
     return apr_os_file_put(thefile, &file_handle,
-                           APR_WRITE | APR_STDOUT_FLAG, pool);
+                           flags | APR_WRITE | APR_STDOUT_FLAG, pool);
 #endif
 }
 
-APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile, apr_pool_t *pool)
+APR_DECLARE(apr_status_t) apr_file_open_flags_stdin(apr_file_t **thefile, 
+                                                    apr_int32_t flags,
+                                                    apr_pool_t *pool)
 {
 #ifdef _WIN32_WCE
     return APR_ENOTIMPL;
@@ -622,10 +694,25 @@ APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile, apr_pool_t *
         file_handle = INVALID_HANDLE_VALUE;
 
     return apr_os_file_put(thefile, &file_handle,
-                           APR_READ | APR_STDIN_FLAG, pool);
+                           flags | APR_READ | APR_STDIN_FLAG, pool);
 #endif
 }
 
+APR_DECLARE(apr_status_t) apr_file_open_stderr(apr_file_t **thefile, apr_pool_t *pool)
+{
+    return apr_file_open_flags_stderr(thefile, 0, pool);
+}
+
+APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile, apr_pool_t *pool)
+{
+    return apr_file_open_flags_stdout(thefile, 0, pool);
+}
+
+APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile, apr_pool_t *pool)
+{
+    return apr_file_open_flags_stdin(thefile, 0, pool);
+}
+
 APR_POOL_IMPLEMENT_ACCESSOR(file);
 
 APR_IMPLEMENT_INHERIT_SET(file, flags, pool, file_cleanup)
diff --git a/srclib/apr/file_io/win32/pipe.c b/srclib/apr/file_io/win32/pipe.c
index dd00f06c..ee3a07fa 100644
--- a/srclib/apr/file_io/win32/pipe.c
+++ b/srclib/apr/file_io/win32/pipe.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_file_io.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_general.h"
 #include "apr_strings.h"
@@ -31,7 +31,8 @@
 #endif
 #include "apr_arch_misc.h"
 
-APR_DECLARE(apr_status_t) apr_file_pipe_timeout_set(apr_file_t *thepipe, apr_interval_time_t timeout)
+APR_DECLARE(apr_status_t) apr_file_pipe_timeout_set(apr_file_t *thepipe,
+                                            apr_interval_time_t timeout)
 {
     /* Always OK to unset timeouts */
     if (timeout == -1) {
@@ -50,40 +51,26 @@ APR_DECLARE(apr_status_t) apr_file_pipe_timeout_set(apr_file_t *thepipe, apr_int
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_file_pipe_timeout_get(apr_file_t *thepipe, apr_interval_time_t *timeout)
+APR_DECLARE(apr_status_t) apr_file_pipe_timeout_get(apr_file_t *thepipe,
+                                           apr_interval_time_t *timeout)
 {
     /* Always OK to get the timeout (even if it's unset ... -1) */
     *timeout = thepipe->timeout;
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, apr_file_t **out, apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in,
+                                               apr_file_t **out,
+                                               apr_pool_t *p)
 {
     /* Unix creates full blocking pipes. */
-    return apr_create_nt_pipe(in, out, APR_FULL_BLOCK, p);
+    return apr_file_pipe_create_ex(in, out, APR_FULL_BLOCK, p);
 }
 
-/* apr_create_nt_pipe()
- * An internal (for now) APR function used by apr_proc_create() 
- * when setting up pipes to communicate with the child process. 
- * apr_create_nt_pipe() allows setting the blocking mode of each end of 
- * the pipe when the pipe is created (rather than after the pipe is created). 
- * A pipe handle must be opened in full async i/o mode in order to 
- * emulate Unix non-blocking pipes with timeouts. 
- *
- * In general, we don't want to enable child side pipe handles for async i/o.
- * This prevents us from enabling both ends of the pipe for async i/o in 
- * apr_file_pipe_create.
- *
- * Why not use NamedPipes on NT which support setting pipe state to
- * non-blocking? On NT, even though you can set a pipe non-blocking, 
- * there is no clean way to set event driven non-zero timeouts (e.g select(),
- * WaitForSinglelObject, et. al. will not detect pipe i/o). On NT, you 
- * have to poll the pipe to detect i/o on a non-blocking pipe.
- */
-apr_status_t apr_create_nt_pipe(apr_file_t **in, apr_file_t **out, 
-                                apr_int32_t blocking_mode, 
-                                apr_pool_t *p)
+APR_DECLARE(apr_status_t) apr_file_pipe_create_ex(apr_file_t **in,
+                                                  apr_file_t **out,
+                                                  apr_int32_t blocking,
+                                                  apr_pool_t *p)
 {
 #ifdef _WIN32_WCE
     return APR_ENOTIMPL;
@@ -137,11 +124,12 @@ apr_status_t apr_create_nt_pipe(apr_file_t **in, apr_file_t **out,
     if (apr_os_level >= APR_WIN_NT) {
         /* Create the read end of the pipe */
         dwOpenMode = PIPE_ACCESS_INBOUND;
-        if (blocking_mode == APR_WRITE_BLOCK /* READ_NONBLOCK */
-               || blocking_mode == APR_FULL_NONBLOCK) {
+        if (blocking == APR_WRITE_BLOCK /* READ_NONBLOCK */
+               || blocking == APR_FULL_NONBLOCK) {
             dwOpenMode |= FILE_FLAG_OVERLAPPED;
             (*in)->pOverlapped = (OVERLAPPED*) apr_pcalloc(p, sizeof(OVERLAPPED));
             (*in)->pOverlapped->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+            (*in)->timeout = 0;
         }
 
         dwPipeMode = 0;
@@ -159,11 +147,12 @@ apr_status_t apr_create_nt_pipe(apr_file_t **in, apr_file_t **out,
 
         /* Create the write end of the pipe */
         dwOpenMode = FILE_ATTRIBUTE_NORMAL;
-        if (blocking_mode == APR_READ_BLOCK /* WRITE_NONBLOCK */
-                || blocking_mode == APR_FULL_NONBLOCK) {
+        if (blocking == APR_READ_BLOCK /* WRITE_NONBLOCK */
+                || blocking == APR_FULL_NONBLOCK) {
             dwOpenMode |= FILE_FLAG_OVERLAPPED;
             (*out)->pOverlapped = (OVERLAPPED*) apr_pcalloc(p, sizeof(OVERLAPPED));
             (*out)->pOverlapped->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+            (*out)->timeout = 0;
         }
         
         (*out)->filehand = CreateFile(name,
diff --git a/srclib/apr/file_io/win32/readwrite.c b/srclib/apr/file_io/win32/readwrite.c
index 65bdc5df..35d3739a 100644
--- a/srclib/apr/file_io/win32/readwrite.c
+++ b/srclib/apr/file_io/win32/readwrite.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_file_io.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include "apr_general.h"
 #include "apr_strings.h"
@@ -31,6 +31,7 @@
 static apr_status_t read_with_timeout(apr_file_t *file, void *buf, apr_size_t len_in, apr_size_t *nbytes)
 {
     apr_status_t rv;
+    DWORD res;
     DWORD len = (DWORD)len_in;
     DWORD bytesread = 0;
 
@@ -72,65 +73,70 @@ static apr_status_t read_with_timeout(apr_file_t *file, void *buf, apr_size_t le
         file->pOverlapped->OffsetHigh = (DWORD)(file->filePtr >> 32);
     }
 
-    rv = ReadFile(file->filehand, buf, len, 
-                  &bytesread, file->pOverlapped);
-    *nbytes = bytesread;
-
-    if (!rv) {
+    if (ReadFile(file->filehand, buf, len, 
+                 &bytesread, file->pOverlapped)) {
+        rv = APR_SUCCESS;
+    }
+    else {
         rv = apr_get_os_error();
         if (rv == APR_FROM_OS_ERROR(ERROR_IO_PENDING)) {
-            /* Wait for the pending i/o */
-            if (file->timeout > 0) {
-                /* timeout in milliseconds... */
-                rv = WaitForSingleObject(file->pOverlapped->hEvent, 
-                                         (DWORD)(file->timeout/1000)); 
-            }
-            else if (file->timeout == -1) {
-                rv = WaitForSingleObject(file->pOverlapped->hEvent, INFINITE);
+            /* Wait for the pending i/o, timeout converted from us to ms
+             * Note that we loop if someone gives up the event, since
+             * folks suggest that WAIT_ABANDONED isn't actually a result
+             * but an alert that ownership of the event has passed from
+             * one owner to a new proc/thread.
+             */
+            do {
+                res = WaitForSingleObject(file->pOverlapped->hEvent, 
+                                          (file->timeout > 0)
+                                            ? (DWORD)(file->timeout/1000)
+                                            : ((file->timeout == -1) 
+                                                 ? INFINITE : 0));
+            } while (res == WAIT_ABANDONED);
+
+            /* There is one case that represents entirely
+             * successful operations, otherwise we will cancel
+             * the operation in progress.
+             */
+            if (res != WAIT_OBJECT_0) {
+                CancelIo(file->filehand);
             }
-            switch (rv) {
-                case WAIT_OBJECT_0:
-                    GetOverlappedResult(file->filehand, file->pOverlapped, 
-                                        &bytesread, TRUE);
-                    *nbytes = bytesread;
-                    rv = APR_SUCCESS;
-                    break;
 
-                case WAIT_TIMEOUT:
-                    rv = APR_TIMEUP;
-                    break;
-
-                case WAIT_FAILED:
-                    rv = apr_get_os_error();
-                    break;
-
-                default:
-                    break;
+            /* Ignore any failures above.  Attempt to complete
+             * the overlapped operation and use only _its_ result.
+             * For example, CancelIo or WaitForSingleObject can
+             * fail if the handle is closed, yet the read may have
+             * completed before we attempted to CancelIo...
+             */
+            if (GetOverlappedResult(file->filehand, file->pOverlapped, 
+                                    &bytesread, TRUE)) {
+                rv = APR_SUCCESS;
             }
-
-            if (rv != APR_SUCCESS) {
-                if (apr_os_level >= APR_WIN_98) {
-                    CancelIo(file->filehand);
-                }
+            else {
+                rv = apr_get_os_error();
+                if (((rv == APR_FROM_OS_ERROR(ERROR_IO_INCOMPLETE))
+                        || (rv == APR_FROM_OS_ERROR(ERROR_OPERATION_ABORTED)))
+                    && (res == WAIT_TIMEOUT))
+                    rv = APR_TIMEUP;
             }
         }
-        else if (rv == APR_FROM_OS_ERROR(ERROR_BROKEN_PIPE)) {
+        if (rv == APR_FROM_OS_ERROR(ERROR_BROKEN_PIPE)) {
             /* Assume ERROR_BROKEN_PIPE signals an EOF reading from a pipe */
             rv = APR_EOF;
         } else if (rv == APR_FROM_OS_ERROR(ERROR_HANDLE_EOF)) {
             /* Did we hit EOF reading from the handle? */
             rv = APR_EOF;
         }
-    } else {
-        /* OK and 0 bytes read ==> end of file */
-        if (*nbytes == 0)
-            rv = APR_EOF;
-        else
-            rv = APR_SUCCESS;
     }
+    
+    /* OK and 0 bytes read ==> end of file */
+    if (rv == APR_SUCCESS && bytesread == 0)
+        rv = APR_EOF;
+    
     if (rv == APR_SUCCESS && file->pOverlapped && !file->pipe) {
-        file->filePtr += *nbytes;
+        file->filePtr += bytesread;
     }
+    *nbytes = bytesread;
     return rv;
 }
 
@@ -193,7 +199,7 @@ APR_DECLARE(apr_status_t) apr_file_read(apr_file_t *thefile, void *buf, apr_size
             if (thefile->bufpos >= thefile->dataRead) {
                 apr_size_t read;
                 rv = read_with_timeout(thefile, thefile->buffer, 
-                                       APR_FILE_BUFSIZE, &read);
+                                       thefile->bufsize, &read);
                 if (read == 0) {
                     if (rv == APR_EOF)
                         thefile->eof_hit = TRUE;
@@ -269,10 +275,11 @@ APR_DECLARE(apr_status_t) apr_file_write(apr_file_t *thefile, const void *buf, a
 
         rv = 0;
         while (rv == 0 && size > 0) {
-            if (thefile->bufpos == APR_FILE_BUFSIZE)   // write buffer is full
+            if (thefile->bufpos == thefile->bufsize)   // write buffer is full
                 rv = apr_file_flush(thefile);
 
-            blocksize = size > APR_FILE_BUFSIZE - thefile->bufpos ? APR_FILE_BUFSIZE - thefile->bufpos : size;
+            blocksize = size > thefile->bufsize - thefile->bufpos ? 
+                                     thefile->bufsize - thefile->bufpos : size;
             memcpy(thefile->buffer + thefile->bufpos, pos, blocksize);
             thefile->bufpos += blocksize;
             pos += blocksize;
@@ -325,6 +332,8 @@ APR_DECLARE(apr_status_t) apr_file_write(apr_file_t *thefile, const void *buf, a
         else {
             (*nbytes) = 0;
             rv = apr_get_os_error();
+
+            /* XXX: This must be corrected, per the apr_file_read logic!!! */
             if (rv == APR_FROM_OS_ERROR(ERROR_IO_PENDING)) {
  
                 DWORD timeout_ms;
diff --git a/srclib/apr/file_io/win32/seek.c b/srclib/apr/file_io/win32/seek.c
index 98c5ea50..53e53dd7 100644
--- a/srclib/apr/file_io/win32/seek.c
+++ b/srclib/apr/file_io/win32/seek.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_file_io.h"
+#include "apr_arch_file_io.h"
 #include "apr_file_io.h"
 #include <errno.h>
 #include <string.h>
diff --git a/srclib/apr/images/ScanDocBig.jpg b/srclib/apr/images/ScanDocBig.jpg
deleted file mode 100644
index 2c47fbc1..00000000
--- a/srclib/apr/images/ScanDocBig.jpg
+++ /dev/null
diff --git a/srclib/apr/images/ScanDocSmall.jpg b/srclib/apr/images/ScanDocSmall.jpg
deleted file mode 100644
index a10964aa..00000000
--- a/srclib/apr/images/ScanDocSmall.jpg
+++ /dev/null
diff --git a/srclib/apr/images/ball1.gif b/srclib/apr/images/ball1.gif
deleted file mode 100644
index f434b524..00000000
--- a/srclib/apr/images/ball1.gif
+++ /dev/null
diff --git a/srclib/apr/images/ball1.png b/srclib/apr/images/ball1.png
deleted file mode 100644
index 311d4b3f..00000000
--- a/srclib/apr/images/ball1.png
+++ /dev/null
diff --git a/srclib/apr/images/ball2.gif b/srclib/apr/images/ball2.gif
deleted file mode 100644
index 9adc11c6..00000000
--- a/srclib/apr/images/ball2.gif
+++ /dev/null
diff --git a/srclib/apr/images/ball2.png b/srclib/apr/images/ball2.png
deleted file mode 100644
index cac3c07a..00000000
--- a/srclib/apr/images/ball2.png
+++ /dev/null
diff --git a/srclib/apr/images/bug.gif b/srclib/apr/images/bug.gif
deleted file mode 100644
index abf4c845..00000000
--- a/srclib/apr/images/bug.gif
+++ /dev/null
diff --git a/srclib/apr/images/bug.png b/srclib/apr/images/bug.png
deleted file mode 100644
index dd787888..00000000
--- a/srclib/apr/images/bug.png
+++ /dev/null
diff --git a/srclib/apr/images/caution.gif b/srclib/apr/images/caution.gif
deleted file mode 100644
index 39bac170..00000000
--- a/srclib/apr/images/caution.gif
+++ /dev/null
diff --git a/srclib/apr/images/caution.png b/srclib/apr/images/caution.png
deleted file mode 100644
index 965fe7eb..00000000
--- a/srclib/apr/images/caution.png
+++ /dev/null
diff --git a/srclib/apr/images/master.gif b/srclib/apr/images/master.gif
deleted file mode 100644
index 5751a403..00000000
--- a/srclib/apr/images/master.gif
+++ /dev/null
diff --git a/srclib/apr/images/master.png b/srclib/apr/images/master.png
deleted file mode 100644
index a5c0508a..00000000
--- a/srclib/apr/images/master.png
+++ /dev/null
diff --git a/srclib/apr/images/tip.gif b/srclib/apr/images/tip.gif
deleted file mode 100644
index 25367912..00000000
--- a/srclib/apr/images/tip.gif
+++ /dev/null
diff --git a/srclib/apr/images/tip.png b/srclib/apr/images/tip.png
deleted file mode 100644
index 82dfaa2a..00000000
--- a/srclib/apr/images/tip.png
+++ /dev/null
diff --git a/srclib/apr/images/warning.gif b/srclib/apr/images/warning.gif
deleted file mode 100644
index 5d676d75..00000000
--- a/srclib/apr/images/warning.gif
+++ /dev/null
diff --git a/srclib/apr/images/warning.png b/srclib/apr/images/warning.png
deleted file mode 100644
index cf0d7ee4..00000000
--- a/srclib/apr/images/warning.png
+++ /dev/null
diff --git a/srclib/apr/include/apr.h.in b/srclib/apr/include/apr.h.in
index a4bb922d..9f1fb6f9 100644
--- a/srclib/apr/include/apr.h.in
+++ b/srclib/apr/include/apr.h.in
@@ -105,13 +105,24 @@
 #define APR_HAVE_SYS_WAIT_H      @sys_waith@
 #define APR_HAVE_TIME_H          @timeh@
 #define APR_HAVE_UNISTD_H        @unistdh@
+#define APR_HAVE_WINDOWS_H       @windowsh@
+#define APR_HAVE_WINSOCK2_H      @winsock2h@
 
 /** @} */
+/** @} */
 
 /* We don't include our conditional headers within the doxyblocks 
  * or the extern "C" namespace 
  */
 
+#if APR_HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
+#if APR_HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+
 #if APR_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -213,6 +224,7 @@ extern "C" {
 #define APR_HAVE_STRUCT_RLIMIT  @struct_rlimit@
 #define APR_HAVE_UNION_SEMUN    @have_union_semun@
 #define APR_HAVE_SCTP           @have_sctp@
+#define APR_HAVE_IOVEC          @have_iovec@
 
 /*  APR Feature Macros */
 #define APR_HAS_SHARED_MEMORY     @sharedmem@
@@ -224,8 +236,8 @@ extern "C" {
 #define APR_HAS_OTHER_CHILD       @oc@
 #define APR_HAS_DSO               @aprdso@
 #define APR_HAS_SO_ACCEPTFILTER   @acceptfilter@
-#define APR_HAS_UNICODE_FS        0
-#define APR_HAS_PROC_INVOKED      0
+#define APR_HAS_UNICODE_FS        @have_unicode_fs@
+#define APR_HAS_PROC_INVOKED      @have_proc_invoked@
 #define APR_HAS_USER              1
 #define APR_HAS_LARGE_FILES       @aprlfs@
 #define APR_HAS_XTHREAD_FILES     0
@@ -261,10 +273,10 @@ typedef  unsigned char           apr_byte_t;
 
 typedef  @short_value@           apr_int16_t;
 typedef  unsigned @short_value@  apr_uint16_t;
-                                               
+
 typedef  @int_value@             apr_int32_t;
 typedef  unsigned @int_value@    apr_uint32_t;
-                                               
+
 typedef  @long_value@            apr_int64_t;
 typedef  unsigned @long_value@   apr_uint64_t;
 
@@ -274,15 +286,14 @@ typedef  @off_t_value@           apr_off_t;
 typedef  @socklen_t_value@       apr_socklen_t;
 typedef  @ino_t_value@           apr_ino_t;
 
-/* As we don't want to break users who author for 1.2.x, we can't
- * present this type until they have included apr_file_info.h
- * where it was originally declared in release 1.2.0.
- * Mask it from accedental misuse here.
- */
-#define apr_ino_t apr_ino_t__requires__apr_file_info_h
-
 #define APR_SIZEOF_VOIDP @voidp_size@
 
+#if APR_SIZEOF_VOIDP == 8
+typedef  apr_uint64_t            apr_uintptr_t;
+#else
+typedef  apr_uint32_t            apr_uintptr_t;
+#endif
+
 /* Are we big endian? */
 #define APR_IS_BIGENDIAN	@bigendian@
 
@@ -290,14 +301,84 @@ typedef  @ino_t_value@           apr_ino_t;
 @int64_literal@
 @uint64_literal@
 
+#ifdef INT16_MIN
+#define APR_INT16_MIN   INT16_MIN
+#else
+#define APR_INT16_MIN   (-0x7fff - 1)
+#endif
+
+#ifdef INT16_MAX
+#define APR_INT16_MAX  INT16_MAX
+#else
+#define APR_INT16_MAX   (0x7fff)
+#endif
+
+#ifdef UINT16_MAX
+#define APR_UINT16_MAX  UINT16_MAX
+#else
+#define APR_UINT16_MAX  (0xffff)
+#endif
+
+#ifdef INT32_MIN
+#define APR_INT32_MIN   INT32_MIN
+#else
+#define APR_INT32_MIN   (-0x7fffffff - 1)
+#endif
+
+#ifdef INT32_MAX
+#define APR_INT32_MAX  INT32_MAX
+#else
+#define APR_INT32_MAX  0x7fffffff
+#endif
+
+#ifdef UINT32_MAX
+#define APR_UINT32_MAX  UINT32_MAX
+#else
+#define APR_UINT32_MAX  (0xffffffffU)
+#endif
+
+#ifdef INT64_MIN
+#define APR_INT64_MIN   INT64_MIN
+#else
+#define APR_INT64_MIN   (APR_INT64_C(-0x7fffffffffffffff) - 1)
+#endif
+
+#ifdef INT64_MAX
+#define APR_INT64_MAX   INT64_MAX
+#else
+#define APR_INT64_MAX   APR_INT64_C(0x7fffffffffffffff)
+#endif
+
+#ifdef UINT64_MAX
+#define APR_UINT64_MAX  UINT64_MAX
+#else
+#define APR_UINT64_MAX  APR_UINT64_C(0xffffffffffffffff)
+#endif
+
+#define APR_SIZE_MAX    (~((apr_size_t)0))
+
+
 /* Definitions that APR programs need to work properly. */
 
+/**
+ * APR public API wrap for C++ compilers.
+ */
+#ifdef __cplusplus
+#define APR_BEGIN_DECLS     extern "C" {
+#define APR_END_DECLS       }
+#else
+#define APR_BEGIN_DECLS
+#define APR_END_DECLS
+#endif
+
 /** 
  * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC, 
  * so that they follow the platform's calling convention.
- * @example
- */
-/** void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
+ * <PRE>
+ *
+ * void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
+ *
+ * </PRE>
  */
 #define APR_THREAD_FUNC
 
@@ -307,9 +388,10 @@ typedef  @ino_t_value@           apr_ino_t;
  * variable arguments must use APR_DECLARE_NONSTD().
  *
  * @remark Both the declaration and implementations must use the same macro.
- * @example
- */
-/** APR_DECLARE(rettype) apr_func(args)
+ *
+ * <PRE>
+ * APR_DECLARE(rettype) apr_func(args)
+ * </PRE>
  * @see APR_DECLARE_NONSTD @see APR_DECLARE_DATA
  * @remark Note that when APR compiles the library itself, it passes the 
  * symbol -DAPR_DECLARE_EXPORT to the compiler on some platforms (e.g. Win32) 
@@ -328,9 +410,11 @@ typedef  @ino_t_value@           apr_ino_t;
  * APR_DECLARE_NONSTD(), as they must follow the C language calling convention.
  * @see APR_DECLARE @see APR_DECLARE_DATA
  * @remark Both the declaration and implementations must use the same macro.
- * @example
- */
-/** APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
+ * <PRE>
+ *
+ * APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
+ *
+ * </PRE>
  */
 #define APR_DECLARE_NONSTD(type)     type
 
@@ -340,10 +424,13 @@ typedef  @ino_t_value@           apr_ino_t;
  * @see APR_DECLARE @see APR_DECLARE_NONSTD
  * @remark Note that the declaration and implementations use different forms,
  * but both must include the macro.
- * @example
- */
-/** extern APR_DECLARE_DATA type apr_variable;\n
+ * 
+ * <PRE>
+ *
+ * extern APR_DECLARE_DATA type apr_variable;\n
  * APR_DECLARE_DATA type apr_variable = value;
+ *
+ * </PRE>
  */
 #define APR_DECLARE_DATA
 
@@ -381,7 +468,6 @@ typedef  @ino_t_value@           apr_ino_t;
 /* Local machine definition for console and log output. */
 #define APR_EOL_STR              "@eolstr@"
 
-
 #if APR_HAVE_SYS_WAIT_H
 #ifdef WEXITSTATUS
 #define apr_wait_t       int
@@ -390,6 +476,8 @@ typedef  @ino_t_value@           apr_ino_t;
 #define WEXITSTATUS(status)    (int)((status).w_retcode)
 #define WTERMSIG(status)       (int)((status).w_termsig)
 #endif /* !WEXITSTATUS */
+#elif defined(__MINGW32__)
+typedef int apr_wait_t;
 #endif /* HAVE_SYS_WAIT_H */
 
 #if defined(PATH_MAX)
@@ -400,8 +488,23 @@ typedef  @ino_t_value@           apr_ino_t;
 #error no decision has been made on APR_PATH_MAX for your platform
 #endif
 
+#define APR_DSOPATH "@shlibpath_var@"
+
 /** @} */
 
+/* Definitions that only Win32 programs need to compile properly. */
+
+/* XXX These simply don't belong here, perhaps in apr_portable.h
+ * based on some APR_HAVE_PID/GID/UID?
+ */
+#ifdef __MINGW32__
+#ifndef __GNUC__
+typedef  int         pid_t;
+#endif
+typedef  int         uid_t;
+typedef  int         gid_t;
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/srclib/apr/include/apr.hnw b/srclib/apr/include/apr.hnw
index 19992125..2b2d091e 100644
--- a/srclib/apr/include/apr.hnw
+++ b/srclib/apr/include/apr.hnw
@@ -85,7 +85,6 @@ extern "C" {
 #endif
 #define ENUM_BITFIELD(e,n,w)  signed int n : w
 
-#define APR_HAVE_ARPA_INET_H    0
 #define APR_HAVE_CONIO_H        0
 #define APR_HAVE_CRYPT_H        0
 #define APR_HAVE_CTYPE_H        1
@@ -194,6 +193,7 @@ extern "C" {
 #define APR_HAVE_STRUCT_RLIMIT  0
 #define APR_HAVE_UNION_SEMUN    0
 #define APR_HAVE_SCTP           0
+#define APR_HAVE_IOVEC          1
 
 /*  APR Feature Macros */
 #define APR_HAS_SHARED_MEMORY     0
@@ -236,11 +236,11 @@ typedef  unsigned char     apr_byte_t;
 
 typedef  short             apr_int16_t;
 typedef  unsigned short    apr_uint16_t;
-                                               
+
 typedef  int               apr_int32_t;
 typedef  unsigned int      apr_uint32_t;
-                                               
-typedef  long long		   apr_int64_t;
+
+typedef  long long          apr_int64_t;
 typedef  unsigned long long apr_uint64_t;
 
 typedef  size_t            apr_size_t;
@@ -257,13 +257,6 @@ typedef  size_t            apr_socklen_t;
 #endif
 typedef  apr_uint64_t      apr_ino_t;
 
-/* As we don't want to break users who author for 1.2.x, we can't
- * present this type until they have included apr_file_info.h
- * where it was originally declared in release 1.2.0.
- * Mask it from accedental misuse here.
- */
-#define apr_ino_t apr_ino_t__requires__apr_file_info_h
-
 /* Are we big endian? */
 /* XXX: Fatal assumption on Alpha platforms */
 #define APR_IS_BIGENDIAN	0
@@ -274,15 +267,88 @@ typedef  apr_uint64_t      apr_ino_t;
 #define APR_SIZEOF_VOIDP   4
 #endif
 
+#if APR_SIZEOF_VOIDP == 8
+typedef  apr_uint64_t            apr_uintptr_t;
+#else
+typedef  apr_uint32_t            apr_uintptr_t;
+#endif
+
 /* Mechanisms to properly type numeric literals */
 #define APR_INT64_C(val) (val##LL)
 #define APR_UINT64_C(val) (val##ULL)
 
+#ifdef INT16_MIN
+#define APR_INT16_MIN   INT16_MIN
+#else
+#define APR_INT16_MIN   (-0x7fff - 1)
+#endif
+
+#ifdef INT16_MAX
+#define APR_INT16_MAX  INT16_MAX
+#else
+#define APR_INT16_MAX   (0x7fff)
+#endif
+
+#ifdef UINT16_MAX
+#define APR_UINT16_MAX  UINT16_MAX
+#else
+#define APR_UINT16_MAX  (0xffff)
+#endif
+
+#ifdef INT32_MIN
+#define APR_INT32_MIN   INT32_MIN
+#else
+#define APR_INT32_MIN   (-0x7fffffff - 1)
+#endif
+
+#ifdef INT32_MAX
+#define APR_INT32_MAX  INT32_MAX
+#else
+#define APR_INT32_MAX  0x7fffffff
+#endif
+
+#ifdef UINT32_MAX
+#define APR_UINT32_MAX  UINT32_MAX
+#else
+#define APR_UINT32_MAX  (0xffffffffU)
+#endif
+
+#ifdef INT64_MIN
+#define APR_INT64_MIN   INT64_MIN
+#else
+#define APR_INT64_MIN   (APR_INT64_C(-0x7fffffffffffffff) - 1)
+#endif
+
+#ifdef INT64_MAX
+#define APR_INT64_MAX   INT64_MAX
+#else
+#define APR_INT64_MAX   APR_INT64_C(0x7fffffffffffffff)
+#endif
+
+#ifdef UINT64_MAX
+#define APR_UINT64_MAX  UINT64_MAX
+#else
+#define APR_UINT64_MAX  APR_UINT64_C(0xffffffffffffffff)
+#endif
+
+#define APR_SIZE_MAX    (~((apr_size_t)0))
+
 /* PROC mutex is a GLOBAL mutex on Netware */
 #define APR_PROC_MUTEX_IS_GLOBAL      1
 
 /* Definitions that APR programs need to work properly. */
 
+/**
+ * APR public API wrap for C++ compilers.
+ */
+#ifdef __cplusplus
+#define APR_BEGIN_DECLS     extern "C" {
+#define APR_END_DECLS       }
+#else
+#define APR_BEGIN_DECLS
+#define APR_END_DECLS
+#endif
+
 /** 
  * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC, 
  * so that they follow the platform's calling convention.
@@ -357,6 +423,8 @@ typedef int apr_wait_t;
 
 #define APR_PATH_MAX PATH_MAX
 
+#define APR_DSOPATH "PATH"
+
 #define APR_INT64_T_FMT          "lld"
 #define APR_UINT64_T_FMT         "llu"
 #define APR_UINT64_T_HEX_FMT     "llx"
diff --git a/srclib/apr/include/apr.hw b/srclib/apr/include/apr.hw
index c382acdb..d4c15f0c 100644
--- a/srclib/apr/include/apr.hw
+++ b/srclib/apr/include/apr.hw
@@ -76,9 +76,9 @@
 #endif
 #ifndef _WIN32_WINNT
 
-/* Restrict the server to a subset of Windows NT 4.0 header files by default
+/* Restrict the server to a subset of Windows 2000 header files by default
  */
-#define _WIN32_WINNT 0x0400
+#define _WIN32_WINNT 0x0500
 #endif
 #ifndef NOUSER
 #define NOUSER
@@ -100,15 +100,22 @@
 #include <winsock2.h>
 #include <mswsock.h>
 #include <ws2tcpip.h>
+#include <tlhelp32.h>
 #else
 #include <winsock.h>
 #endif
 #endif /* !_WINDOWS_ */
 
 /**
+ * @defgroup APR Apache Portability Runtime library
+ * @{
+ */
+/**
  * @defgroup apr_platform Platform Definitions
- * @ingroup APR 
  * @{
+ * @warning
+ * <strong><em>The actual values of macros and typedefs on this page<br>
+ * are platform specific and should NOT be relied upon!</em></strong>
  */
 
 #define APR_INLINE __inline
@@ -133,6 +140,7 @@
 #define APR_HAVE_NETINET_SCTP_UIO_H 0
 #define APR_HAVE_NETINET_TCP_H  0
 #define APR_HAVE_PTHREAD_H      0
+#define APR_HAVE_SEMAPHORE_H    0
 #define APR_HAVE_SIGNAL_H       1
 #define APR_HAVE_STDARG_H       1
 #define APR_HAVE_STDINT_H       0
@@ -140,6 +148,7 @@
 #define APR_HAVE_STDLIB_H       1
 #define APR_HAVE_STRING_H       1
 #define APR_HAVE_STRINGS_H      0
+#define APR_HAVE_SYS_IOCTL_H    0
 #define APR_HAVE_SYS_SENDFILE_H 0
 #define APR_HAVE_SYS_SIGNAL_H   0
 #define APR_HAVE_SYS_SOCKET_H   0
@@ -148,11 +157,12 @@
 #define APR_HAVE_SYS_TIME_H     0
 #define APR_HAVE_SYS_TYPES_H    1
 #define APR_HAVE_SYS_UIO_H      0
+#define APR_HAVE_SYS_UN_H       0
 #define APR_HAVE_SYS_WAIT_H     0
+#define APR_HAVE_TIME_H         1
 #define APR_HAVE_UNISTD_H       0
 #define APR_HAVE_STDDEF_H       1
 #define APR_HAVE_PROCESS_H      1
-#define APR_HAVE_TIME_H         1
 #else
 #define APR_HAVE_ARPA_INET_H    0
 #define APR_HAVE_CONIO_H        0
@@ -165,8 +175,11 @@
 #define APR_HAVE_LIMITS_H       0
 #define APR_HAVE_NETDB_H        0
 #define APR_HAVE_NETINET_IN_H   0
+#define APR_HAVE_NETINET_SCTP_H 0
+#define APR_HAVE_NETINET_SCTP_UIO_H 0
 #define APR_HAVE_NETINET_TCP_H  0
 #define APR_HAVE_PTHREAD_H      0
+#define APR_HAVE_SEMAPHORE_H    0
 #define APR_HAVE_SIGNAL_H       0
 #define APR_HAVE_STDARG_H       0
 #define APR_HAVE_STDINT_H       0
@@ -174,21 +187,80 @@
 #define APR_HAVE_STDLIB_H       1
 #define APR_HAVE_STRING_H       1
 #define APR_HAVE_STRINGS_H      0
+#define APR_HAVE_SYS_IOCTL_H    0
 #define APR_HAVE_SYS_SENDFILE_H 0
 #define APR_HAVE_SYS_SIGNAL_H   0
 #define APR_HAVE_SYS_SOCKET_H   0
+#define APR_HAVE_SYS_SOCKIO_H   0
 #define APR_HAVE_SYS_SYSLIMITS_H 0
 #define APR_HAVE_SYS_TIME_H     0
 #define APR_HAVE_SYS_TYPES_H    0
 #define APR_HAVE_SYS_UIO_H      0
+#define APR_HAVE_SYS_UN_H       0
 #define APR_HAVE_SYS_WAIT_H     0
+#define APR_HAVE_TIME_H         0
 #define APR_HAVE_UNISTD_H       0
 #define APR_HAVE_STDDEF_H       0
 #define APR_HAVE_PROCESS_H      0
-#define APR_HAVE_TIME_H         0
 #endif
 
+/** @} */
+/** @} */
+
+/* We don't include our conditional headers within the doxyblocks 
+ * or the extern "C" namespace 
+ */
+
+#if APR_HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#if APR_HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#if APR_HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if APR_HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+#if APR_HAVE_TIME_H
+#include <time.h>
+#endif
+#if APR_HAVE_PROCESS_H
+#include <process.h>
+#endif
+#if APR_HAVE_IPV6
+#include <ws2tcpip.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @addtogroup apr_platform
+ * @ingroup APR 
+ * @{
+ */
+
+#define APR_HAVE_SHMEM_MMAP_TMP     0
+#define APR_HAVE_SHMEM_MMAP_SHM     0
+#define APR_HAVE_SHMEM_MMAP_ZERO    0
+#define APR_HAVE_SHMEM_SHMGET_ANON  0
+#define APR_HAVE_SHMEM_SHMGET       0
+#define APR_HAVE_SHMEM_MMAP_ANON    0
+#define APR_HAVE_SHMEM_BEOS         0
+
+#define APR_USE_SHMEM_MMAP_TMP     0
+#define APR_USE_SHMEM_MMAP_SHM     0
+#define APR_USE_SHMEM_MMAP_ZERO    0
+#define APR_USE_SHMEM_SHMGET_ANON  0
+#define APR_USE_SHMEM_SHMGET       0
+#define APR_USE_SHMEM_MMAP_ANON    0
+#define APR_USE_SHMEM_BEOS         0
+
 #define APR_USE_FLOCK_SERIALIZE           0 
+#define APR_USE_POSIXSEM_SERIALIZE        0
 #define APR_USE_SYSVSEM_SERIALIZE         0
 #define APR_USE_FCNTL_SERIALIZE           0
 #define APR_USE_PROC_PTHREAD_SERIALIZE    0 
@@ -196,28 +268,19 @@
 
 #define APR_HAS_FLOCK_SERIALIZE           0
 #define APR_HAS_SYSVSEM_SERIALIZE         0
+#define APR_HAS_POSIXSEM_SERIALIZE        0
 #define APR_HAS_FCNTL_SERIALIZE           0
 #define APR_HAS_PROC_PTHREAD_SERIALIZE    0
-#define APR_HAS_RWLOCK_SERIALIZE          0
-
-#define APR_HAS_LOCK_CREATE_NP            0
 
 #define APR_PROCESS_LOCK_IS_GLOBAL        0
 
-#define APR_USES_ANONYMOUS_SHM            0
-#define APR_USES_FILEBASED_SHM            0
-#define APR_USES_KEYBASED_SHM             0
-
-#define APR_FILE_BASED_SHM      0
-#define APR_MEM_BASED_SHM       0
-
 #define APR_HAVE_CORKABLE_TCP   0
 #define APR_HAVE_GETRLIMIT      0
 #define APR_HAVE_ICONV          0
 #define APR_HAVE_IN_ADDR        1
 #define APR_HAVE_INET_ADDR      1
 #define APR_HAVE_INET_NETWORK   0
-#define APR_HAVE_IPV6           0
+#define APR_HAVE_IPV6           1
 #define APR_HAVE_MEMMOVE        1
 #define APR_HAVE_SETRLIMIT      0
 #define APR_HAVE_SIGACTION      0
@@ -231,54 +294,15 @@
 #define APR_HAVE_STRUCT_RLIMIT  0
 #define APR_HAVE_UNION_SEMUN    0
 #define APR_HAVE_SCTP           0
+#define APR_HAVE_IOVEC          0
 
 #ifndef _WIN32_WCE
 #define APR_HAVE_STRICMP        1
 #define APR_HAVE_STRNICMP       1
-#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 1
 #else
 #define APR_HAVE_STRICMP        0
 #define APR_HAVE_STRNICMP       0
-#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0
-#endif
-
-/** @} */
-
-/* We don't include our conditional headers within the doxyblocks 
- * or the extern "C" namespace 
- */
-
-#if APR_HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#if APR_HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if APR_HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-#if APR_HAVE_TIME_H
-#include <time.h>
-#endif
-#if APR_HAVE_PROCESS_H
-#include <process.h>
 #endif
-#if APR_HAVE_IPV6
-#include <ws2tcpip.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @addtogroup apr_platform
- * @ingroup APR 
- * @{
- */
 
 /*  APR Feature Macros */
 #define APR_HAS_SHARED_MEMORY     1
@@ -291,20 +315,24 @@ extern "C" {
 #define APR_HAS_SO_ACCEPTFILTER   0
 #define APR_HAS_UNICODE_FS        1
 #define APR_HAS_PROC_INVOKED      1
+#define APR_HAS_OS_UUID           1
+
 #ifndef _WIN32_WCE
 #define APR_HAS_SENDFILE          1
 #define APR_HAS_USER              1
 #define APR_HAS_LARGE_FILES       1
 #define APR_HAS_XTHREAD_FILES     1
+#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 1
 #else
 #define APR_HAS_SENDFILE          0
 #define APR_HAS_USER              0
 #define APR_HAS_LARGE_FILES       0
 #define APR_HAS_XTHREAD_FILES     0
+#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0
 #endif
-#define APR_HAS_OS_UUID           1
 
-/* Win32 cannot poll [just yet] on files/pipes.
+/* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible
+ * to poll on files/pipes.
  */
 #define APR_FILES_AS_SOCKETS      0
 
@@ -312,6 +340,11 @@ extern "C" {
  */
 #define APR_CHARSET_EBCDIC        0
 
+/* If we have a TCP implementation that can be "corked", what flag
+ * do we use?
+ */
+#define APR_TCP_NOPUSH_FLAG       @apr_tcp_nopush_flag@
+
 /* Is the TCP_NODELAY socket option inherited from listening sockets?
  */
 #define APR_TCP_NODELAY_INHERITED 1
@@ -326,10 +359,10 @@ typedef  unsigned char     apr_byte_t;
 
 typedef  short             apr_int16_t;
 typedef  unsigned short    apr_uint16_t;
-                                               
+
 typedef  int               apr_int32_t;
 typedef  unsigned int      apr_uint32_t;
-                                               
+
 typedef  __int64           apr_int64_t;
 typedef  unsigned __int64  apr_uint64_t;
 
@@ -347,31 +380,21 @@ typedef  int         apr_off_t;
 typedef  int         apr_socklen_t;
 typedef  apr_uint64_t      apr_ino_t;
 
-/* As we don't want to break users who author for 1.2.x, we can't
- * present this type until they have included apr_file_info.h
- * where it was originally declared in release 1.2.0.
- * Mask it from accedental misuse here.
- */
-#define apr_ino_t apr_ino_t__requires__apr_file_info_h
-
-/* Are we big endian? */
-/* XXX: Fatal assumption on Alpha platforms */
-#define APR_IS_BIGENDIAN	0
-
 #ifdef WIN64
 #define APR_SIZEOF_VOIDP   8
 #else
 #define APR_SIZEOF_VOIDP   4
 #endif
 
-/* XXX These simply don't belong here, perhaps in apr_portable.h
- * based on some APR_HAVE_PID/GID/UID?
- */
-#ifndef __GNUC__
-typedef  int         pid_t;
+#if APR_SIZEOF_VOIDP == 8
+typedef  apr_uint64_t            apr_uintptr_t;
+#else
+typedef  apr_uint32_t            apr_uintptr_t;
 #endif
-typedef  int         uid_t;
-typedef  int         gid_t;
+
+/* Are we big endian? */
+/* XXX: Fatal assumption on Alpha platforms */
+#define APR_IS_BIGENDIAN	0
 
 /* Mechanisms to properly type numeric literals */
 
@@ -383,29 +406,83 @@ typedef  int         gid_t;
 #define APR_UINT64_C(val) (val##ULL)
 #endif
 
-#if APR_HAVE_IPV6
+#ifdef INT16_MIN
+#define APR_INT16_MIN   INT16_MIN
+#else
+#define APR_INT16_MIN   (-0x7fff - 1)
+#endif
 
-/* Appears in later flavors, not the originals. */
-#ifndef in_addr6
-#define  in6_addr    in_addr6
+#ifdef INT16_MAX
+#define APR_INT16_MAX  INT16_MAX
+#else
+#define APR_INT16_MAX   (0x7fff)
 #endif
 
-#ifndef WS2TCPIP_INLINE
-#define IN6_IS_ADDR_V4MAPPED(a) \
-    (   (*(const apr_uint64_t *)(const void *)(&(a)->s6_addr[0]) == 0) \
-     && (*(const apr_uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
+#ifdef UINT16_MAX
+#define APR_UINT16_MAX  UINT16_MAX
+#else
+#define APR_UINT16_MAX  (0xffff)
 #endif
 
-#endif /* APR_HAS_IPV6 */
+#ifdef INT32_MIN
+#define APR_INT32_MIN   INT32_MIN
+#else
+#define APR_INT32_MIN   (-0x7fffffff - 1)
+#endif
+
+#ifdef INT32_MAX
+#define APR_INT32_MAX  INT32_MAX
+#else
+#define APR_INT32_MAX  0x7fffffff
+#endif
+
+#ifdef UINT32_MAX
+#define APR_UINT32_MAX  UINT32_MAX
+#else
+#define APR_UINT32_MAX  (0xffffffffU)
+#endif
+
+#ifdef INT64_MIN
+#define APR_INT64_MIN   INT64_MIN
+#else
+#define APR_INT64_MIN   (APR_INT64_C(-0x7fffffffffffffff) - 1)
+#endif
+
+#ifdef INT64_MAX
+#define APR_INT64_MAX   INT64_MAX
+#else
+#define APR_INT64_MAX   APR_INT64_C(0x7fffffffffffffff)
+#endif
+
+#ifdef UINT64_MAX
+#define APR_UINT64_MAX  UINT64_MAX
+#else
+#define APR_UINT64_MAX  APR_UINT64_C(0xffffffffffffffff)
+#endif
+
+#define APR_SIZE_MAX    (~((apr_size_t)0))
 
 /* Definitions that APR programs need to work properly. */
 
+/**
+ * APR public API wrap for C++ compilers.
+ */
+#ifdef __cplusplus
+#define APR_BEGIN_DECLS     extern "C" {
+#define APR_END_DECLS       }
+#else
+#define APR_BEGIN_DECLS
+#define APR_END_DECLS
+#endif
+
 /** 
  * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC, 
  * so that they follow the platform's calling convention.
- * @example
- */
-/** void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
+ * <PRE>
+ *
+ * void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
+ *
+ * </PRE>
  */
 #define APR_THREAD_FUNC  __stdcall
 
@@ -418,9 +495,10 @@ typedef  int         gid_t;
  * variable arguments must use APR_DECLARE_NONSTD().
  *
  * @remark Both the declaration and implementations must use the same macro.
- * @example
- */
-/** APR_DECLARE(rettype) apr_func(args)
+ *
+ * <PRE>
+ * APR_DECLARE(rettype) apr_func(args)
+ * </PRE>
  * @see APR_DECLARE_NONSTD @see APR_DECLARE_DATA
  * @remark Note that when APR compiles the library itself, it passes the 
  * symbol -DAPR_DECLARE_EXPORT to the compiler on some platforms (e.g. Win32) 
@@ -439,9 +517,11 @@ typedef  int         gid_t;
  * APR_DECLARE_NONSTD(), as they must follow the C language calling convention.
  * @see APR_DECLARE @see APR_DECLARE_DATA
  * @remark Both the declaration and implementations must use the same macro.
- * @example
- */
-/** APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
+ * <PRE>
+ *
+ * APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
+ *
+ * </PRE>
  */
 #define APR_DECLARE_NONSTD(type)     type
 
@@ -451,10 +531,13 @@ typedef  int         gid_t;
  * @see APR_DECLARE @see APR_DECLARE_NONSTD
  * @remark Note that the declaration and implementations use different forms,
  * but both must include the macro.
- * @example
- */
-/** extern APR_DECLARE_DATA type apr_variable;\n
+ * 
+ * <PRE>
+ *
+ * extern APR_DECLARE_DATA type apr_variable;\n
  * APR_DECLARE_DATA type apr_variable = value;
+ *
+ * </PRE>
  */
 #define APR_DECLARE_DATA
 
@@ -474,10 +557,10 @@ typedef  int         gid_t;
 
 #ifdef WIN64
 #define APR_SSIZE_T_FMT          "I64d"
-#define APR_SIZE_T_FMT           "I64d"
+#define APR_SIZE_T_FMT           "I64u"
 #else
 #define APR_SSIZE_T_FMT          "d"
-#define APR_SIZE_T_FMT           "d"
+#define APR_SIZE_T_FMT           "u"
 #endif
 
 #if APR_HAS_LARGE_FILES
@@ -492,24 +575,13 @@ typedef  int         gid_t;
 #define APR_UINT64_T_FMT         "I64u"
 #define APR_UINT64_T_HEX_FMT     "I64x"
 
-/* Local machine definition for console and log output. */
-#define APR_EOL_STR              "\r\n"
-
 /* No difference between PROC and GLOBAL mutex */
 #define APR_PROC_MUTEX_IS_GLOBAL      1
 
-typedef int apr_wait_t;
-
-/* struct iovec is needed to emulate Unix writev */
-struct iovec {
-    char*      iov_base;
-    apr_size_t iov_len;
-};
+/* Local machine definition for console and log output. */
+#define APR_EOL_STR              "\r\n"
 
-/* Nasty Win32 .h ommissions we really need */
-#define STDIN_FILENO  0
-#define STDOUT_FILENO 1
-#define STDERR_FILENO 2
+typedef int apr_wait_t;
 
 #if APR_HAS_UNICODE_FS
 /* An arbitrary size that is digestable. True max is a bit less than 32000 */
@@ -518,8 +590,41 @@ struct iovec {
 #define APR_PATH_MAX MAX_PATH
 #endif
 
+#define APR_DSOPATH "PATH"
+
 /** @} */
 
+/* Definitions that only Win32 programs need to compile properly. */
+
+/* XXX These simply don't belong here, perhaps in apr_portable.h
+ * based on some APR_HAVE_PID/GID/UID?
+ */
+#ifndef __GNUC__
+typedef  int         pid_t;
+#endif
+typedef  int         uid_t;
+typedef  int         gid_t;
+
+/* Win32 .h ommissions we really need */
+#define STDIN_FILENO  0
+#define STDOUT_FILENO 1
+#define STDERR_FILENO 2
+
+#if APR_HAVE_IPV6
+
+/* Appears in later flavors, not the originals. */
+#ifndef in_addr6
+#define  in6_addr    in_addr6
+#endif
+
+#ifndef WS2TCPIP_INLINE
+#define IN6_IS_ADDR_V4MAPPED(a) \
+    (   (*(const apr_uint64_t *)(const void *)(&(a)->s6_addr[0]) == 0) \
+     && (*(const apr_uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
+#endif
+
+#endif /* APR_HAS_IPV6 */
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/srclib/apr/include/apr_atomic.h b/srclib/apr/include/apr_atomic.h
index b169ff3d..60e4bb54 100644
--- a/srclib/apr/include/apr_atomic.h
+++ b/srclib/apr/include/apr_atomic.h
@@ -40,6 +40,9 @@ extern "C" {
  * atomic operation's internal structures
  * @param p pool
  * @return APR_SUCCESS on successful completion
+ * @remark Programs do NOT need to call this directly. APR will call this
+ *         automatically from apr_initialize.
+ * @internal
  */
 APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p);
 
@@ -120,6 +123,14 @@ APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint
  */
 APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp);
 
+/**
+ * exchange a pair of pointer values
+ * @param mem pointer to the pointer
+ * @param with what to swap it with
+ * @return the old value of the pointer
+ */
+APR_DECLARE(void*) apr_atomic_xchgptr(volatile void **mem, void *with);
+
 /** @} */
 
 #ifdef __cplusplus
diff --git a/srclib/apr/include/apr_errno.h b/srclib/apr/include/apr_errno.h
index c74e44df..f34e8d98 100644
--- a/srclib/apr/include/apr_errno.h
+++ b/srclib/apr/include/apr_errno.h
@@ -122,15 +122,42 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  */
 #define APR_OS_ERRSPACE_SIZE 50000
 /**
+ * APR_UTIL_ERRSPACE_SIZE is the size of the space that is reserved for
+ * use within apr-util. This space is reserved above that used by APR
+ * internally.
+ * @note This number MUST be smaller than APR_OS_ERRSPACE_SIZE by a
+ *       large enough amount that APR has sufficient room for it's
+ *       codes.
+ */
+#define APR_UTIL_ERRSPACE_SIZE 20000
+/**
  * APR_OS_START_STATUS is where the APR specific status codes start.
  */
 #define APR_OS_START_STATUS    (APR_OS_START_ERROR + APR_OS_ERRSPACE_SIZE)
 /**
+ * APR_UTIL_START_STATUS is where APR-Util starts defining it's
+ * status codes.
+ */
+#define APR_UTIL_START_STATUS   (APR_OS_START_STATUS + \
+                           (APR_OS_ERRSPACE_SIZE - APR_UTIL_ERRSPACE_SIZE))
+/**
  * APR_OS_START_USERERR are reserved for applications that use APR that
  *     layer their own error codes along with APR's.  Note that the
  *     error immediately following this one is set ten times farther
  *     away than usual, so that users of apr have a lot of room in
  *     which to declare custom error codes.
+ *
+ * In general applications should try and create unique error codes. To try
+ * and assist in finding suitable ranges of numbers to use, the following
+ * ranges are known to be used by the listed applications. If your 
+ * application defines error codes please advise the range of numbers it
+ * uses to dev@apr.apache.org for inclusion in this list.
+ *
+ * Ranges shown are in relation to APR_OS_START_USERERR
+ *
+ * Subversion - Defined ranges, of less than 100, at intervals of 5000
+ *              starting at an offset of 5000, e.g.
+ *               +5000 to 5100,  +10000 to 10100
  */
 #define APR_OS_START_USERERR    (APR_OS_START_STATUS + APR_OS_ERRSPACE_SIZE)
 /**
@@ -155,6 +182,43 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  */
 #define APR_OS_START_SYSERR    (APR_OS_START_EAIERR + APR_OS_ERRSPACE_SIZE)
 
+/**
+ * @defgroup APR_ERROR_map APR Error Space
+ * <PRE>
+ * The following attempts to show the relation of the various constants
+ * used for mapping APR Status codes.
+ *
+ *       0          
+ *
+ *  20,000     APR_OS_START_ERROR
+ *
+ *         + APR_OS_ERRSPACE_SIZE (50,000)
+ *
+ *  70,000      APR_OS_START_STATUS
+ *
+ *         + APR_OS_ERRSPACE_SIZE - APR_UTIL_ERRSPACE_SIZE (30,000)
+ *
+ * 100,000      APR_UTIL_START_STATUS
+ *
+ *         + APR_UTIL_ERRSPACE_SIZE (20,000)
+ *
+ * 120,000      APR_OS_START_USERERR
+ *
+ *         + 10 x APR_OS_ERRSPACE_SIZE (50,000 * 10)
+ *
+ * 620,000      APR_OS_START_CANONERR
+ *
+ *         + APR_OS_ERRSPACE_SIZE (50,000)
+ *
+ * 670,000      APR_OS_START_EAIERR
+ *
+ *         + APR_OS_ERRSPACE_SIZE (50,000)
+ *
+ * 720,000      APR_OS_START_SYSERR
+ *
+ * </PRE>
+ */
+
 /** no error. */
 #define APR_SUCCESS 0
 
@@ -181,6 +245,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
  * APR_EBADIP       The specified IP address is invalid
  * APR_EBADMASK     The specified netmask is invalid
  * APR_ESYMNOTFOUND Could not find the requested symbol
+ * APR_ENOTENOUGHENTROPY Not enough entropy to continue
  * </PRE>
  *
  * <PRE>
@@ -358,7 +423,6 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #endif
 /** The given process was not recognized by APR. */
 #define APR_STATUS_IS_EPROC_UNKNOWN(s)  ((s) == APR_EPROC_UNKNOWN)
-
 /** APR could not gather enough entropy to continue. */
 #define APR_STATUS_IS_ENOTENOUGHENTROPY(s) ((s) == APR_ENOTENOUGHENTROPY)
 
@@ -575,7 +639,7 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define APR_EACCES         (APR_OS_START_CANONERR + 1)
 #endif
 
-/** @see APR_STATUS_IS_EXIST */
+/** @see APR_STATUS_IS_EEXIST */
 #ifdef EEXIST
 #define APR_EEXIST EEXIST
 #else
@@ -760,6 +824,13 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define APR_ENOTEMPTY     (APR_OS_START_CANONERR + 26)
 #endif
 
+/** @see APR_STATUS_IS_EAFNOSUPPORT */
+#ifdef EAFNOSUPPORT
+#define APR_EAFNOSUPPORT EAFNOSUPPORT
+#else
+#define APR_EAFNOSUPPORT  (APR_OS_START_CANONERR + 27)
+#endif
+
 /** @} */
 
 #if defined(OS2) && !defined(DOXYGEN)
@@ -902,6 +973,8 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define APR_STATUS_IS_ENOTEMPTY(s)      ((s) == APR_ENOTEMPTY \
                 || (s) == APR_OS_START_SYSERR + ERROR_DIR_NOT_EMPTY \
                 || (s) == APR_OS_START_SYSERR + ERROR_ACCESS_DENIED)
+#define APR_STATUS_IS_EAFNOSUPPORT(s)   ((s) == APR_AFNOSUPPORT \
+                || (s) == APR_OS_START_SYSERR + SOCEAFNOSUPPORT)
 
 /*
     Sorry, too tired to wrap this up for OS2... feel free to
@@ -917,7 +990,6 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
     { SOCESOCKTNOSUPPORT,       ESOCKTNOSUPPORT },
     { SOCEOPNOTSUPP,            EOPNOTSUPP      },
     { SOCEPFNOSUPPORT,          EPFNOSUPPORT    },
-    { SOCEAFNOSUPPORT,          EAFNOSUPPORT    },
     { SOCEADDRINUSE,            EADDRINUSE      },
     { SOCEADDRNOTAVAIL,         EADDRNOTAVAIL   },
     { SOCENETDOWN,              ENETDOWN        },
@@ -1045,6 +1117,8 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
                 || (s) == APR_OS_START_SYSERR + ERROR_NOT_SAME_DEVICE)
 #define APR_STATUS_IS_ENOTEMPTY(s)      ((s) == APR_ENOTEMPTY \
                 || (s) == APR_OS_START_SYSERR + ERROR_DIR_NOT_EMPTY)
+#define APR_STATUS_IS_EAFNOSUPPORT(s)   ((s) == APR_EAFNOSUPPORT \
+                || (s) == APR_OS_START_SYSERR + WSAEAFNOSUPPORT)
 
 #elif defined(NETWARE) && defined(USE_WINSOCK) && !defined(DOXYGEN) /* !defined(OS2) && !defined(WIN32) */
 
@@ -1104,6 +1178,8 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 #define APR_STATUS_IS_EPIPE(s)          ((s) == APR_EPIPE)
 #define APR_STATUS_IS_EXDEV(s)          ((s) == APR_EXDEV)
 #define APR_STATUS_IS_ENOTEMPTY(s)      ((s) == APR_ENOTEMPTY)
+#define APR_STATUS_IS_EAFNOSUPPORT(s)   ((s) == APR_EAFNOSUPPORT \
+                || (s) == APR_OS_START_SYSERR + WSAEAFNOSUPPORT)
 
 #else /* !defined(NETWARE) && !defined(OS2) && !defined(WIN32) */
 
@@ -1221,6 +1297,8 @@ APR_DECLARE(char *) apr_strerror(apr_status_t statcode, char *buf,
 /** Directory Not Empty */
 #define APR_STATUS_IS_ENOTEMPTY(s)       ((s) == APR_ENOTEMPTY || \
                                           (s) == APR_EEXIST)
+/** Address Family not supported */
+#define APR_STATUS_IS_EAFNOSUPPORT(s)    ((s) == APR_EAFNOSUPPORT)
 /** @} */
 
 #endif /* !defined(NETWARE) && !defined(OS2) && !defined(WIN32) */
diff --git a/srclib/apr/include/apr_file_info.h b/srclib/apr/include/apr_file_info.h
index 297b3815..bbcff8ac 100644
--- a/srclib/apr/include/apr_file_info.h
+++ b/srclib/apr/include/apr_file_info.h
@@ -135,14 +135,6 @@ typedef apr_uint32_t              apr_dev_t;
 typedef dev_t                     apr_dev_t;
 #endif
 
-/* See apr.h.in (.hw or .hnw) for the declaration of apr_ino_t,
- * but as we don't want to break users who author for 1.2.x, we
- * can't present this type until they have included apr_file_info.h
- * where it was originally declared in release 1.2.0.
- * Unmask it for use here.
- */
-#undef apr_ino_t
-
 /**
  * @defgroup apr_file_stat Stat Functions
  * @{
@@ -286,7 +278,11 @@ APR_DECLARE(apr_status_t) apr_dir_rewind(apr_dir_t *thedir);
  * @{
  */
 
-/** Cause apr_filepath_merge to fail if addpath is above rootpath */
+/** Cause apr_filepath_merge to fail if addpath is above rootpath 
+ * @bug in APR 0.9 and 1.x, this flag's behavior is undefined
+ * if the rootpath is NULL or empty.  In APR 2.0 this should be
+ * changed to imply NOTABSOLUTE if the rootpath is NULL or empty.
+ */
 #define APR_FILEPATH_NOTABOVEROOT   0x01
 
 /** internal: Only meaningful with APR_FILEPATH_NOTABOVEROOT */
diff --git a/srclib/apr/include/apr_file_io.h b/srclib/apr/include/apr_file_io.h
index 34d5b3a4..32a94556 100644
--- a/srclib/apr/include/apr_file_io.h
+++ b/srclib/apr/include/apr_file_io.h
@@ -75,8 +75,12 @@ extern "C" {
                                              file should support
                                              apr_socket_sendfile operation */
 #define APR_FOPEN_LARGEFILE   0x04000 /**< Platform dependent flag to enable
-                                         large file support; WARNING see
-                                         below. */
+                                       * large file support, see WARNING below
+                                       */
+#define APR_FOPEN_SPARSE      0x08000 /**< Platform dependent flag to enable
+                                       * sparse file support, see WARNING below
+                                       */
+
 /* backcompat */
 #define APR_READ             APR_FOPEN_READ       /**< @deprecated @see APR_FOPEN_READ */
 #define APR_WRITE            APR_FOPEN_WRITE      /**< @deprecated @see APR_FOPEN_WRITE */   
@@ -93,16 +97,27 @@ extern "C" {
 #define APR_SENDFILE_ENABLED APR_FOPEN_SENDFILE_ENABLED /**< @deprecated @see APR_FOPEN_SENDFILE_ENABLED */   
 #define APR_LARGEFILE        APR_FOPEN_LARGEFILE  /**< @deprecated @see APR_FOPEN_LARGEFILE */   
 
-/** @warning The APR_LARGEFILE flag only has effect on some platforms
- * where sizeof(apr_off_t) == 4.  Where implemented, it allows opening
- * and writing to a file which exceeds the size which can be
- * represented by apr_off_t (2 gigabytes).  When a file's size does
- * exceed 2Gb, apr_file_info_get() will fail with an error on the
+/** @warning APR_FOPEN_LARGEFILE flag only has effect on some
+ * platforms where sizeof(apr_off_t) == 4.  Where implemented, it
+ * allows opening and writing to a file which exceeds the size which
+ * can be represented by apr_off_t (2 gigabytes).  When a file's size
+ * does exceed 2Gb, apr_file_info_get() will fail with an error on the
  * descriptor, likewise apr_stat()/apr_lstat() will fail on the
  * filename.  apr_dir_read() will fail with APR_INCOMPLETE on a
  * directory entry for a large file depending on the particular
  * APR_FINFO_* flags.  Generally, it is not recommended to use this
- * flag. */
+ * flag.
+ *
+ * @warning APR_FOPEN_SPARSE may, depending on platform, convert a
+ * normal file to a sparse file.  Some applications may be unable
+ * to decipher a sparse file, so it's critical that the sparse file
+ * flag should only be used for files accessed only by APR or other
+ * applications known to be able to decipher them.  APR does not
+ * guarentee that it will compress the file into sparse segments
+ * if it was previously created and written without the sparse flag.
+ * On platforms which do not understand, or on file systems which
+ * cannot handle sparse files, the flag is ignored by apr_file_open().
+ */
 
 /** @} */
 
@@ -312,7 +327,7 @@ APR_DECLARE(apr_status_t) apr_file_open_stderr(apr_file_t **thefile,
  * @param thefile The apr file to use as stdout.
  * @param pool The pool to allocate the file out of.
  * 
- * @remark See remarks for apr_file_open_stdout.
+ * @remark See remarks for apr_file_open_stderr.
  */
 APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile,
                                                apr_pool_t *pool);
@@ -322,12 +337,57 @@ APR_DECLARE(apr_status_t) apr_file_open_stdout(apr_file_t **thefile,
  * @param thefile The apr file to use as stdin.
  * @param pool The pool to allocate the file out of.
  * 
- * @remark See remarks for apr_file_open_stdout.
+ * @remark See remarks for apr_file_open_stderr.
  */
 APR_DECLARE(apr_status_t) apr_file_open_stdin(apr_file_t **thefile,
                                               apr_pool_t *pool);
 
 /**
+ * open standard error as an apr file pointer, with flags.
+ * @param thefile The apr file to use as stderr.
+ * @param flags The flags to open the file with. Only the APR_EXCL,
+ *              APR_BUFFERED, APR_XTHREAD, APR_SHARELOCK, 
+ *              APR_SENDFILE_ENABLED and APR_LARGEFILE flags should
+ *              be used. The APR_WRITE flag will be set unconditionally.
+ * @param pool The pool to allocate the file out of.
+ * 
+ * @remark See remarks for apr_file_open_stderr.
+ */
+APR_DECLARE(apr_status_t) apr_file_open_flags_stderr(apr_file_t **thefile,
+                                                     apr_int32_t flags,
+                                                     apr_pool_t *pool);
+
+/**
+ * open standard output as an apr file pointer, with flags.
+ * @param thefile The apr file to use as stdout.
+ * @param flags The flags to open the file with. Only the APR_EXCL,
+ *              APR_BUFFERED, APR_XTHREAD, APR_SHARELOCK, 
+ *              APR_SENDFILE_ENABLED and APR_LARGEFILE flags should
+ *              be used. The APR_WRITE flag will be set unconditionally.
+ * @param pool The pool to allocate the file out of.
+ * 
+ * @remark See remarks for apr_file_open_stderr.
+ */
+APR_DECLARE(apr_status_t) apr_file_open_flags_stdout(apr_file_t **thefile,
+                                                     apr_int32_t flags,
+                                                     apr_pool_t *pool);
+
+/**
+ * open standard input as an apr file pointer, with flags.
+ * @param thefile The apr file to use as stdin.
+ * @param flags The flags to open the file with. Only the APR_EXCL,
+ *              APR_BUFFERED, APR_XTHREAD, APR_SHARELOCK, 
+ *              APR_SENDFILE_ENABLED and APR_LARGEFILE flags should
+ *              be used. The APR_READ flag will be set unconditionally.
+ * @param pool The pool to allocate the file out of.
+ * 
+ * @remark See remarks for apr_file_open_stderr.
+ */
+APR_DECLARE(apr_status_t) apr_file_open_flags_stdin(apr_file_t **thefile,
+                                                     apr_int32_t flags,
+                                                     apr_pool_t *pool);
+
+/**
  * Read data from the specified file.
  * @param thefile The file descriptor to read from.
  * @param buf The buffer to store the data to.
@@ -534,6 +594,27 @@ APR_DECLARE(apr_status_t) apr_file_setaside(apr_file_t **new_file,
                                             apr_pool_t *p);
 
 /**
+ * Give the specified apr file handle a new buffer 
+ * @param thefile  The file handle that is to be modified
+ * @param buffer   The buffer
+ * @param bufsize  The size of the buffer
+ * @remark It is possible to add a buffer to previously unbuffered
+ *         file handles, the APR_BUFFERED flag will be added to
+ *         the file handle's flags. Likewise, with buffer=NULL and
+ *         bufsize=0 arguments it is possible to make a previously
+ *         buffered file handle unbuffered.
+ */
+APR_DECLARE(apr_status_t) apr_file_buffer_set(apr_file_t *thefile,
+                                              char * buffer,
+                                              apr_size_t bufsize);
+
+/**
+ * Get the size of any buffer for the specified apr file handle 
+ * @param thefile  The file handle 
+ */
+APR_DECLARE(apr_size_t) apr_file_buffer_size_get(apr_file_t *thefile);
+
+/**
  * Move the read/write file offset to a specified byte within a file.
  * @param thefile The file descriptor
  * @param where How to move the pointer, one of:
@@ -552,18 +633,47 @@ APR_DECLARE(apr_status_t) apr_file_seek(apr_file_t *thefile,
 
 /**
  * Create an anonymous pipe.
- * @param in The file descriptor to use as input to the pipe.
- * @param out The file descriptor to use as output from the pipe.
+ * @param in The newly created pipe's file for reading.
+ * @param out The newly created pipe's file for writing.
  * @param pool The pool to operate on.
  * @remark By default, the returned file descriptors will be inherited
  * by child processes created using apr_proc_create().  This can be
  * changed using apr_file_inherit_unset().
+ * @bug  Some platforms cannot toggle between blocking and nonblocking,
+ * and when passing a pipe as a standard handle to an application which
+ * does not expect it, a non-blocking stream will fluxor the client app.
+ * @deprecated @see apr_file_pipe_create_ex
  */
 APR_DECLARE(apr_status_t) apr_file_pipe_create(apr_file_t **in, 
                                                apr_file_t **out,
                                                apr_pool_t *pool);
 
 /**
+ * Create an anonymous pipe which portably supports async timeout options.
+ * @param in The newly created pipe's file for reading.
+ * @param out The newly created pipe's file for writing.
+ * @param blocking one of these values defined in apr_thread_proc.h;
+ * <pre>
+ *       APR_FULL_BLOCK
+ *       APR_READ_BLOCK
+ *       APR_WRITE_BLOCK
+ *       APR_FULL_NONBLOCK
+ * </pre>
+ * @remark By default, the returned file descriptors will be inherited
+ * by child processes created using apr_proc_create().  This can be
+ * changed using apr_file_inherit_unset().
+ * @remark Some platforms cannot toggle between blocking and nonblocking,
+ * and when passing a pipe as a standard handle to an application which
+ * does not expect it, a non-blocking stream will fluxor the client app.
+ * Use this function rather than apr_file_pipe_create to create pipes 
+ * where one or both ends require non-blocking semantics.
+ */
+APR_DECLARE(apr_status_t) apr_file_pipe_create_ex(apr_file_t **in, 
+                                                  apr_file_t **out, 
+                                                  apr_int32_t blocking, 
+                                                  apr_pool_t *p);
+
+/**
  * Create a named pipe.
  * @param filename The filename of the named pipe
  * @param perm The permissions for the newly created pipe.
diff --git a/srclib/apr/include/apr_fnmatch.h b/srclib/apr/include/apr_fnmatch.h
index 7a2811aa..ef6d0b25 100644
--- a/srclib/apr/include/apr_fnmatch.h
+++ b/srclib/apr/include/apr_fnmatch.h
@@ -66,16 +66,57 @@ extern "C" {
 
 /**
  * Try to match the string to the given pattern, return APR_SUCCESS if
- *    match, else return APR_FNM_NOMATCH.
+ *    match, else return APR_FNM_NOMATCH.  Note that there is no such thing as
+ *    an illegal pattern.
+ *
+ * With all flags unset, a pattern is interpreted as such:
+ *
+ * PATTERN: Backslash followed by any character, including another
+ *          backslash.<br/>
+ * MATCHES: That character exactly.
+ * 
+ * <p>
+ * PATTERN: ?<br/>
+ * MATCHES: Any single character.
+ * </p>
+ * 
+ * <p>
+ * PATTERN: *<br/>
+ * MATCHES: Any sequence of zero or more characters. (Note that multiple
+ *          *s in a row are equivalent to one.)
+ * 
+ * PATTERN: Any character other than \?*[ or a \ at the end of the pattern<br/>
+ * MATCHES: That character exactly. (Case sensitive.)
+ * 
+ * PATTERN: [ followed by a class description followed by ]<br/>
+ * MATCHES: A single character described by the class description.
+ *          (Never matches, if the class description reaches until the
+ *          end of the string without a ].) If the first character of
+ *          the class description is ^ or !, the sense of the description
+ *          is reversed.  The rest of the class description is a list of
+ *          single characters or pairs of characters separated by -. Any
+ *          of those characters can have a backslash in front of them,
+ *          which is ignored; this lets you use the characters ] and -
+ *          in the character class, as well as ^ and ! at the
+ *          beginning.  The pattern matches a single character if it
+ *          is one of the listed characters or falls into one of the
+ *          listed ranges (inclusive, case sensitive).  Ranges with
+ *          the first character larger than the second are legal but
+ *          never match. Edge cases: [] never matches, and [^] and [!]
+ *          always match without consuming a character.
+ * 
+ * Note that these patterns attempt to match the entire string, not
+ * just find a substring matching the pattern.
+ *
  * @param pattern The pattern to match to
  * @param strings The string we are trying to match
  * @param flags flags to use in the match.  Bitwise OR of:
- * <PRE>
+ * <pre>
  *              APR_FNM_NOESCAPE       Disable backslash escaping
  *              APR_FNM_PATHNAME       Slash must be matched by slash
  *              APR_FNM_PERIOD         Period must be matched by period
  *              APR_FNM_CASE_BLIND     Compare characters case-insensitively.
- * </PRE>
+ * </pre>
  */
 
 APR_DECLARE(apr_status_t) apr_fnmatch(const char *pattern, 
diff --git a/srclib/apr/include/apr_getopt.h b/srclib/apr/include/apr_getopt.h
index 131aa4b3..75ad5663 100644
--- a/srclib/apr/include/apr_getopt.h
+++ b/srclib/apr/include/apr_getopt.h
@@ -35,7 +35,9 @@ extern "C" {
  */
 
 /** 
- * defintion of a error function 
+ * An @c apr_getopt_t error callback function.
+ *
+ * @a arg is this @c apr_getopt_t's @c errarg member.
  */
 typedef void (apr_getopt_err_fn_t)(void *arg, const char *err, ...);
 
@@ -95,8 +97,8 @@ struct apr_getopt_option_t {
  * @param cont The pool to operate on
  * @param argc The number of arguments to parse
  * @param argv The array of arguments to parse
- * @remark Arguments 2 and 3 are most commonly argc and argv from main(argc, argv)
- * The errfn is initialized to fprintf(stderr... but may be overridden.
+ * @remark Arguments 3 and 4 are most commonly argc and argv from main(argc, argv)
+ * The (*os)->errfn is initialized to fprintf(stderr... but may be overridden.
  */
 APR_DECLARE(apr_status_t) apr_getopt_init(apr_getopt_t **os, apr_pool_t *cont,
                                       int argc, const char * const *argv);
diff --git a/srclib/apr/include/apr_hash.h b/srclib/apr/include/apr_hash.h
index 454a4e9c..c033ed15 100644
--- a/srclib/apr/include/apr_hash.h
+++ b/srclib/apr/include/apr_hash.h
@@ -126,10 +126,10 @@ APR_DECLARE(void *) apr_hash_get(apr_hash_t *ht, const void *key,
  * an iteration (although the results may be unpredictable unless all you do
  * is delete the current entry) and multiple iterations can be in
  * progress at the same time.
-
- * @example
  */
 /**
+ * @example
+ *
  * <PRE>
  * 
  * int sum_values(apr_pool_t *p, apr_hash_t *ht)
@@ -175,6 +175,12 @@ APR_DECLARE(void) apr_hash_this(apr_hash_index_t *hi, const void **key,
 APR_DECLARE(unsigned int) apr_hash_count(apr_hash_t *ht);
 
 /**
+ * Clear any key/value pairs in the hash table.
+ * @param ht The hash table
+ */
+APR_DECLARE(void) apr_hash_clear(apr_hash_t *ht);
+
+/**
  * Merge two hash tables into one new hash table. The values of the overlay
  * hash override the values of the base if both have the same key.  Both
  * hash tables must use the same hash function.
diff --git a/srclib/apr/include/apr_lib.h b/srclib/apr/include/apr_lib.h
index ed25d869..e09122e7 100644
--- a/srclib/apr/include/apr_lib.h
+++ b/srclib/apr/include/apr_lib.h
@@ -118,8 +118,16 @@ APR_DECLARE(const char *) apr_filepath_name_get(const char *pathname);
  *      ('0' is printed if !APR_HAS_THREADS)
  * %%pt takes an apr_os_thread_t * and prints it in hexadecimal
  *      ('0' is printed if !APR_HAS_THREADS)
+ * %%pm takes an apr_status_t * and prints the appropriate error
+ *      string (from apr_strerror) corresponding to that error code.
  * %%pp takes a void * and outputs it in hex
+ * %%pB takes a apr_uint32_t * as bytes and outputs it's apr_strfsize
+ * %%pF same as above, but takes a apr_off_t *
+ * %%pS same as above, but takes a apr_size_t *
  *
+ * %%pt is only available from APR 1.2.0 onwards.
+ * %%pm, %%pB, %%pF and %%pS are only available from APR 1.3.0 onwards.
+ * 
  * The %%p hacks are to force gcc's printf warning code to skip
  * over a pointer argument without complaining.  This does
  * mean that the ANSI-style %%p (output a void * in hex format) won't
diff --git a/srclib/apr/include/apr_network_io.h b/srclib/apr/include/apr_network_io.h
index 2d50329d..4e3789d2 100644
--- a/srclib/apr/include/apr_network_io.h
+++ b/srclib/apr/include/apr_network_io.h
@@ -164,11 +164,12 @@ struct in_addr {
 /** @} */
 
 /**
- * Enum to tell us if we're interested in remote or local socket
+ * Enum used to denote either the local and remote endpoint of a
+ * connection.
  */
 typedef enum {
-    APR_LOCAL,
-    APR_REMOTE
+    APR_LOCAL,   /**< Socket information for local end of connection */
+    APR_REMOTE   /**< Socket information for remote end of connection */
 } apr_interface_e;
 
 /**
@@ -276,7 +277,7 @@ struct apr_hdtr_t {
  * @param family The address family of the socket (e.g., APR_INET).
  * @param type The type of the socket (e.g., SOCK_STREAM).
  * @param protocol The protocol of the socket (e.g., APR_PROTO_TCP).
- * @param cont The pool to use
+ * @param cont The pool for the apr_socket_t and associated storage.
  */
 APR_DECLARE(apr_status_t) apr_socket_create(apr_socket_t **new_sock, 
                                             int family, int type,
@@ -653,9 +654,11 @@ APR_DECLARE(apr_status_t) apr_socket_atmark(apr_socket_t *sock,
                                             int *atmark);
 
 /**
- * Return an apr_sockaddr_t from an apr_socket_t
+ * Return an address associated with a socket; either the address to
+ * which the socket is bound locally or the the address of the peer
+ * to which the socket is connected.
  * @param sa The returned apr_sockaddr_t.
- * @param which Which interface do we want the apr_sockaddr_t for?
+ * @param which Whether to retrieve the local or remote address
  * @param sock The socket to use
  */
 APR_DECLARE(apr_status_t) apr_socket_addr_get(apr_sockaddr_t **sa,
@@ -673,6 +676,14 @@ APR_DECLARE(apr_status_t) apr_sockaddr_ip_get(char **addr,
                                               apr_sockaddr_t *sockaddr);
 
 /**
+ * Write the IP address (in numeric address string format) of the APR
+ * socket address @a sockaddr into the buffer @a buf (of size @a buflen).
+ * @param sockaddr The socket address to reference.
+ */
+APR_DECLARE(apr_status_t) apr_sockaddr_ip_getbuf(char *buf, apr_size_t buflen,
+                                                 apr_sockaddr_t *sockaddr);
+
+/**
  * See if the IP addresses in two APR socket addresses are
  * equivalent.  Appropriate logic is present for comparing
  * IPv4-mapped IPv6 addresses with IPv4 addresses.
diff --git a/srclib/apr/include/apr_poll.h b/srclib/apr/include/apr_poll.h
index c5266495..92a540a9 100644
--- a/srclib/apr/include/apr_poll.h
+++ b/srclib/apr/include/apr_poll.h
@@ -55,13 +55,14 @@ extern "C" {
  * Pollset Flags
  */
 #define APR_POLLSET_THREADSAFE 0x001 /**< Adding or Removing a Descriptor is thread safe */
+#define APR_POLLSET_NOCOPY     0x002 /**< Descriptors passed to apr_pollset_create() are not copied */
 
 /** Used in apr_pollfd_t to determine what the apr_descriptor is */
 typedef enum { 
     APR_NO_DESC,                /**< nothing here */
     APR_POLL_SOCKET,            /**< descriptor refers to a socket */
     APR_POLL_FILE,              /**< descriptor refers to a file */
-    APR_POLL_LASTDESC           /**< descriptor is the last one in the list */
+    APR_POLL_LASTDESC           /**< @deprecated descriptor is the last one in the list */
 } apr_datatype_e ;
 
 /** Union of either an APR file or socket. */
@@ -170,7 +171,7 @@ APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
  * Poll the descriptors in the poll structure
  * @param aprset The poll structure we will be using. 
  * @param numsock The number of descriptors we are polling
- * @param nsds The number of descriptors signalled.
+ * @param nsds The number of descriptors signalled (output parameter)
  * @param timeout The amount of time in microseconds to wait.  This is 
  *                a maximum, not a minimum.  If a descriptor is signalled, we 
  *                will wake up before this time.  A negative number means 
@@ -185,8 +186,66 @@ APR_DECLARE(apr_status_t) apr_poll(apr_pollfd_t *aprset, apr_int32_t numsock,
                                    apr_int32_t *nsds, 
                                    apr_interval_time_t timeout);
 
-/** @} */
+/** Opaque structure used for pollset API */
+typedef struct apr_pollcb_t apr_pollcb_t;
+
+/**
+ * Setup a pollcb object
+ * @param pollcb  The pointer in which to return the newly created object 
+ * @param size The maximum number of descriptors that a single _poll can return.
+ * @param p The pool from which to allocate the pollcb
+ * @param flags Optional flags to modify the operation of the pollcb.
+ *
+ * @remark Pollcb is only supported on some platforms; the apr_pollcb_create()
+ * call will fail with APR_ENOTIMPL on platforms where it is not supported.
+ */
+APR_DECLARE(apr_status_t) apr_pollcb_create(apr_pollcb_t **pollcb,
+                                            apr_uint32_t size,
+                                            apr_pool_t *pool,
+                                            apr_uint32_t flags);
 
+/**
+ * Add a socket or file descriptor to a pollcb
+ * @param pollcb The pollcb to which to add the descriptor
+ * @param descriptor The descriptor to add
+ * @remark If you set client_data in the descriptor, that value
+ *         will be returned in the client_data field whenever this
+ *         descriptor is signalled in apr_pollcb_poll().
+ * @remark Unlike the apr_pollset API, the descriptor is not copied, and users 
+ *         must retain the memory used by descriptor, as the same pointer will be 
+ *         returned to them from apr_pollcb_poll.
+ */
+APR_DECLARE(apr_status_t) apr_pollcb_add(apr_pollcb_t *pollcb,
+                                         apr_pollfd_t *descriptor);
+/**
+ * Remove a descriptor from a pollcb
+ * @param pollcb The pollcb from which to remove the descriptor
+ * @param descriptor The descriptor to remove
+ */
+APR_DECLARE(apr_status_t) apr_pollcb_remove(apr_pollcb_t *pollcb,
+                                            apr_pollfd_t *descriptor);
+
+/** Function prototype for pollcb handlers 
+ * @param baton Opaque baton passed into apr_pollcb_poll
+ * @param descriptor Contains the notification for an active descriptor, 
+ *                   the rtnevents member contains what events were triggered
+ *                   for this descriptor.
+ */
+typedef apr_status_t (*apr_pollcb_cb_t)(void *baton, apr_pollfd_t *descriptor);
+
+/**
+ * Block for activity on the descriptor(s) in a pollcb
+ * @param pollcb The pollcb to use
+ * @param timeout Timeout in microseconds
+ * @param func Callback function to call for each active socket
+ * @param baton Opaque baton passed to the callback function.
+ */
+APR_DECLARE(apr_status_t) apr_pollcb_poll(apr_pollcb_t *pollcb,
+                                          apr_interval_time_t timeout,
+                                          apr_pollcb_cb_t func,
+                                          void *baton); 
+
+/** @} */
 
 #ifdef __cplusplus
 }
diff --git a/srclib/apr/include/apr_pools.h b/srclib/apr/include/apr_pools.h
index 12b843e1..eb7c6e5b 100644
--- a/srclib/apr/include/apr_pools.h
+++ b/srclib/apr/include/apr_pools.h
@@ -189,6 +189,17 @@ APR_DECLARE(apr_status_t) apr_pool_create_ex(apr_pool_t **newpool,
                                              apr_allocator_t *allocator);
 
 /**
+ * Create a new pool.
+ * @param newpool The pool we have just created.
+ * @param abort_fn A function to use if the pool cannot allocate more memory.
+ * @param allocator The allocator to use with the new pool.  If NULL the
+ *        new allocator will be crated with newpool as owner.
+ */
+APR_DECLARE(apr_status_t) apr_pool_create_core_ex(apr_pool_t **newpool,
+                                                  apr_abortfunc_t abort_fn,
+                                                  apr_allocator_t *allocator);
+
+/**
  * Debug version of apr_pool_create_ex.
  * @param newpool @see apr_pool_create.
  * @param parent @see apr_pool_create.
@@ -217,6 +228,32 @@ APR_DECLARE(apr_status_t) apr_pool_create_ex_debug(apr_pool_t **newpool,
 #endif
 
 /**
+ * Debug version of apr_pool_create_core_ex.
+ * @param newpool @see apr_pool_create.
+ * @param abort_fn @see apr_pool_create.
+ * @param allocator @see apr_pool_create.
+ * @param file_line Where the function is called from.
+ *        This is usually APR_POOL__FILE_LINE__.
+ * @remark Only available when APR_POOL_DEBUG is defined.
+ *         Call this directly if you have you apr_pool_create_core_ex
+ *         calls in a wrapper function and wish to override
+ *         the file_line argument to reflect the caller of
+ *         your wrapper function.  If you do not have
+ *         apr_pool_create_core_ex in a wrapper, trust the macro
+ *         and don't call apr_pool_create_core_ex_debug directly.
+ */
+APR_DECLARE(apr_status_t) apr_pool_create_core_ex_debug(apr_pool_t **newpool,
+                                                   apr_abortfunc_t abort_fn,
+                                                   apr_allocator_t *allocator,
+                                                   const char *file_line);
+
+#if APR_POOL_DEBUG
+#define apr_pool_create_core_ex(newpool, abort_fn, allocator)  \
+    apr_pool_create_core_ex_debug(newpool, abort_fn, allocator, \
+                                  APR_POOL__FILE_LINE__)
+#endif
+
+/**
  * Create a new pool.
  * @param newpool The pool we have just created.
  * @param parent The parent pool.  If this is NULL, the new pool is a root
@@ -239,6 +276,23 @@ APR_DECLARE(apr_status_t) apr_pool_create(apr_pool_t **newpool,
 #endif
 
 /**
+ * Create a new pool.
+ * @param newpool The pool we have just created.
+ */
+#if defined(DOXYGEN)
+APR_DECLARE(apr_status_t) apr_pool_create_core(apr_pool_t **newpool);
+#else
+#if APR_POOL_DEBUG
+#define apr_pool_create_core(newpool) \
+    apr_pool_create_core_ex_debug(newpool, NULL, NULL, \
+                                  APR_POOL__FILE_LINE__)
+#else
+#define apr_pool_create_core(newpool) \
+    apr_pool_create_core_ex(newpool, NULL, NULL)
+#endif
+#endif
+
+/**
  * Find the pools allocator
  * @param pool The pool to get the allocator from.
  */
@@ -506,6 +560,23 @@ APR_DECLARE(void) apr_pool_cleanup_register(
     apr_status_t (*child_cleanup)(void *));
 
 /**
+ * Register a function to be called when a pool is cleared or destroyed.
+ *
+ * Unlike apr_pool_cleanup_register which register a cleanup
+ * that is called AFTER all subpools are destroyed this function register
+ * a function that will be called before any of the subpool is destoryed.
+ *
+ * @param p The pool register the cleanup with
+ * @param data The data to pass to the cleanup function.
+ * @param plain_cleanup The function to call when the pool is cleared
+ *                      or destroyed
+ */
+APR_DECLARE(void) apr_pool_pre_cleanup_register(
+    apr_pool_t *p,
+    const void *data,
+    apr_status_t (*plain_cleanup)(void *));
+
+/**
  * Remove a previously registered cleanup function.
  * 
  * The cleanup most recently registered with @a p having the same values of
diff --git a/srclib/apr/include/apr_random.h b/srclib/apr/include/apr_random.h
index 9c0eac23..29154358 100644
--- a/srclib/apr/include/apr_random.h
+++ b/srclib/apr/include/apr_random.h
@@ -17,16 +17,33 @@
 #ifndef APR_RANDOM_H
 #define APR_RANDOM_H
 
-#include <apr_pools.h>
+/**
+ * @file apr_random.h
+ * @brief APR PRNG routines
+ */
+
+#include "apr_pools.h"
+#include "apr_thread_proc.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * @defgroup apr_random PRNG Routines
+ * @ingroup APR
+ * @{
+ */
 
 typedef struct apr_crypto_hash_t apr_crypto_hash_t;
 
 typedef void apr_crypto_hash_init_t(apr_crypto_hash_t *hash);
-typedef void apr_crypto_hash_add_t(apr_crypto_hash_t *hash,const void *data,
+typedef void apr_crypto_hash_add_t(apr_crypto_hash_t *hash, const void *data,
                                    apr_size_t bytes);
 typedef void apr_crypto_hash_finish_t(apr_crypto_hash_t *hash,
                                       unsigned char *result);
 
+
 /* FIXME: make this opaque */
 struct apr_crypto_hash_t {
     apr_crypto_hash_init_t *init;
@@ -36,39 +53,101 @@ struct apr_crypto_hash_t {
     void *data;
 };
 
+/**
+ * Allocate and initialize the SHA-256 context
+ * @param p The pool to allocate from
+ */
 APR_DECLARE(apr_crypto_hash_t *) apr_crypto_sha256_new(apr_pool_t *p);
 
+/** Opaque PRNG structure. */
 typedef struct apr_random_t apr_random_t;
 
-APR_DECLARE(void) apr_random_init(apr_random_t *g,apr_pool_t *p,
+/**
+ * Initialize a PRNG state
+ * @param g The PRNG state
+ * @param p The pool to allocate from
+ * @param pool_hash Pool hash functions
+ * @param key_hash Key hash functions
+ * @param prng_hash PRNG hash functions
+ */
+APR_DECLARE(void) apr_random_init(apr_random_t *g, apr_pool_t *p,
                                   apr_crypto_hash_t *pool_hash,
                                   apr_crypto_hash_t *key_hash,
                                   apr_crypto_hash_t *prng_hash);
+/**
+ * Allocate and initialize (apr_crypto_sha256_new) a new PRNG state.
+ * @param p The pool to allocate from
+ */
 APR_DECLARE(apr_random_t *) apr_random_standard_new(apr_pool_t *p);
+
+/**
+ * Mix the randomness pools.
+ * @param g The PRNG state
+ * @param entropy_ Entropy buffer
+ * @param bytes Length of entropy_ in bytes
+ */
 APR_DECLARE(void) apr_random_add_entropy(apr_random_t *g,
                                          const void *entropy_,
                                          apr_size_t bytes);
+/**
+ * Generate cryptographically insecure random bytes.
+ * @param g The RNG state
+ * @param random Buffer to fill with random bytes
+ * @param bytes Length of buffer in bytes
+ */
 APR_DECLARE(apr_status_t) apr_random_insecure_bytes(apr_random_t *g,
                                                     void *random,
                                                     apr_size_t bytes);
+
+/**
+ * Generate cryptographically secure random bytes.
+ * @param g The RNG state
+ * @param random Buffer to fill with random bytes
+ * @param bytes Length of buffer in bytes
+ */
 APR_DECLARE(apr_status_t) apr_random_secure_bytes(apr_random_t *g,
                                                   void *random,
                                                   apr_size_t bytes);
+/**
+ * Ensures that E bits of conditional entropy are mixed into the PRNG
+ * before any further randomness is extracted.
+ * @param g The RNG state
+ */
 APR_DECLARE(void) apr_random_barrier(apr_random_t *g);
+
+/**
+ * Return APR_SUCCESS if the cryptographic PRNG has been seeded with
+ * enough data, APR_ENOTENOUGHENTROPY otherwise.
+ * @param r The RNG state
+ */
 APR_DECLARE(apr_status_t) apr_random_secure_ready(apr_random_t *r);
+
+/**
+ * Return APR_SUCCESS if the PRNG has been seeded with enough data,
+ * APR_ENOTENOUGHENTROPY otherwise.
+ * @param r The PRNG state
+ */
 APR_DECLARE(apr_status_t) apr_random_insecure_ready(apr_random_t *r);
 
-/* Call this in the child after forking to mix the randomness
-   pools. Note that its generally a bad idea to fork a process with a
-   real PRNG in it - better to have the PRNG externally and get the
-   randomness from there. However, if you really must do it, then you
-   should supply all your entropy to all the PRNGs - don't worry, they
-   won't produce the same output.
+/**
+ * Mix the randomness pools after forking.
+ * @param proc The resulting process handle from apr_proc_fork()
+ * @remark Call this in the child after forking to mix the randomness
+ * pools. Note that its generally a bad idea to fork a process with a
+ * real PRNG in it - better to have the PRNG externally and get the
+ * randomness from there. However, if you really must do it, then you
+ * should supply all your entropy to all the PRNGs - don't worry, they
+ * won't produce the same output.
+ * @remark Note that apr_proc_fork() calls this for you, so only weird
+ * applications need ever call it themselves.
+ * @internal
+ */
+APR_DECLARE(void) apr_random_after_fork(apr_proc_t *proc);
+
+/** @} */
 
-   Note that apr_proc_fork() calls this for you, so only weird
-   applications need ever call it themselves.
-*/
-struct apr_proc_t;
-APR_DECLARE(void) apr_random_after_fork(struct apr_proc_t *proc);
+#ifdef __cplusplus
+}
+#endif
 
-#endif /* ndef APR_RANDOM_H */
+#endif /* !APR_RANDOM_H */
diff --git a/srclib/apr/include/apr_ring.h b/srclib/apr/include/apr_ring.h
index f2f5d691..867f47a5 100644
--- a/srclib/apr/include/apr_ring.h
+++ b/srclib/apr/include/apr_ring.h
@@ -69,8 +69,8 @@
  */
 #define APR_RING_ENTRY(elem)						\
     struct {								\
-	struct elem *next;						\
-	struct elem *prev;						\
+	struct elem * volatile next;					\
+	struct elem * volatile prev;					\
     }
 
 /**
@@ -90,8 +90,8 @@
  */
 #define APR_RING_HEAD(head, elem)					\
     struct head {							\
-	struct elem * volatile next;					\
-	struct elem * volatile prev;					\
+	struct elem *next;						\
+	struct elem *prev;						\
     }
 
 /**
@@ -377,6 +377,30 @@
 #define APR_RING_REMOVE(ep, link)					\
     APR_RING_UNSPLICE((ep), (ep), link)
 
+/**
+ * Iterate over a ring
+ * @param ep The current element
+ * @param head The head of the ring
+ * @param elem The name of the element struct
+ * @param link The name of the APR_RING_ENTRY in the element struct
+ */
+#define APR_RING_FOREACH(ep, head, elem, link)                          \
+    for (ep = APR_RING_FIRST(head);                                     \
+         ep != APR_RING_SENTINEL(head, elem, link);                     \
+         ep = APR_RING_NEXT(ep, link))
+
+/**
+ * Iterate over a ring safe against removal of the current element
+ * @param ep1 The current element
+ * @param ep2 Iteration cursor
+ * @param head The head of the ring
+ * @param elem The name of the element struct
+ * @param link The name of the APR_RING_ENTRY in the element struct
+ */
+#define APR_RING_FOREACH_SAFE(ep1, ep2, head, elem, link)               \
+    for (ep1 = APR_RING_FIRST(head), ep2 = APR_RING_NEXT(ep1, link);    \
+         ep1 != APR_RING_SENTINEL(head, elem, link);                    \
+         ep1 = ep2, ep2 = APR_RING_NEXT(ep1, link))
 
 /* Debugging tools: */
 
diff --git a/srclib/apr/include/apr_signal.h b/srclib/apr/include/apr_signal.h
index 991cbadb..20631333 100644
--- a/srclib/apr/include/apr_signal.h
+++ b/srclib/apr/include/apr_signal.h
@@ -18,7 +18,7 @@
 #define APR_SIGNAL_H
 
 /**
- * @file apr_signal.h 
+ * @file apr_signal.h
  * @brief APR Signal Handling
  */
 
@@ -34,8 +34,8 @@ extern "C" {
 #endif /* __cplusplus */
 
 /**
- * @defgroup apr_signal Handling
- * @ingroup APR 
+ * @defgroup apr_signal Signal Handling
+ * @ingroup APR
  * @{
  */
 
diff --git a/srclib/apr/include/apr_strings.h b/srclib/apr/include/apr_strings.h
index fcfb7777..996f8ceb 100644
--- a/srclib/apr/include/apr_strings.h
+++ b/srclib/apr/include/apr_strings.h
@@ -311,6 +311,8 @@ APR_DECLARE(char *) apr_off_t_toa(apr_pool_t *p, apr_off_t n);
  *   or 0.  If base is zero, buf will be treated as base ten unless its
  *   digits are prefixed with '0x', in which case it will be treated as
  *   base 16.
+ * @bug *end breaks type safety; where *buf is const, *end needs to be
+ * declared as const in APR 2.0
  */
 APR_DECLARE(apr_status_t) apr_strtoff(apr_off_t *offset, const char *buf, 
                                       char **end, int base);
diff --git a/srclib/apr/include/apr_support.h b/srclib/apr/include/apr_support.h
index a6115172..79c8cb47 100644
--- a/srclib/apr/include/apr_support.h
+++ b/srclib/apr/include/apr_support.h
@@ -39,7 +39,11 @@ extern "C" {
 /**
  * Wait for IO to occur or timeout.
  *
- * Uses POOL for temporary allocations.
+ * @param f The file to wait on.
+ * @param s The socket to wait on if @a f is @c NULL.
+ * @param for_read If non-zero wait for data to be available to read,
+ *        otherwise wait for data to be able to be written. 
+ * @return APR_TIMEUP if we run out of time.
  */
 apr_status_t apr_wait_for_io_or_timeout(apr_file_t *f, apr_socket_t *s,
                                         int for_read);
diff --git a/srclib/apr/include/apr_tables.h b/srclib/apr/include/apr_tables.h
index 6e9bb585..c2cd7413 100644
--- a/srclib/apr/include/apr_tables.h
+++ b/srclib/apr/include/apr_tables.h
@@ -88,14 +88,14 @@ struct apr_table_entry_t {
 APR_DECLARE(const apr_array_header_t *) apr_table_elts(const apr_table_t *t);
 
 /**
- * Determine if the table is empty
+ * Determine if the table is empty (either NULL or having no elements)
  * @param t The table to check
  * @return True if empty, False otherwise
  */
 APR_DECLARE(int) apr_is_empty_table(const apr_table_t *t);
 
 /**
- * Determine if the array is empty
+ * Determine if the array is empty (either NULL or having no elements)
  * @param a The array to check
  * @return True if empty, False otherwise
  */
@@ -120,6 +120,25 @@ APR_DECLARE(apr_array_header_t *) apr_array_make(apr_pool_t *p,
  */
 APR_DECLARE(void *) apr_array_push(apr_array_header_t *arr);
 
+/** A helper macro for accessing a member of an APR array.
+ *
+ * @param ary the array
+ * @param i the index into the array to return
+ * @param type the type of the objects stored in the array
+ *
+ * @return the item at index i
+ */
+#define APR_ARRAY_IDX(ary,i,type) (((type *)(ary)->elts)[i])
+
+/** A helper macro for pushing elements into an APR array.
+ *
+ * @param ary the array
+ * @param type the type of the objects stored in the array
+ *
+ * @return the location where the new object should be placed
+ */
+#define APR_ARRAY_PUSH(ary,type) (*((type *)apr_array_push(ary)))
+
 /**
  * Remove an element from an array (as a first-in, last-out stack)
  * @param arr The array to remove an element from.
@@ -129,6 +148,14 @@ APR_DECLARE(void *) apr_array_push(apr_array_header_t *arr);
 APR_DECLARE(void *) apr_array_pop(apr_array_header_t *arr);
 
 /**
+ * Remove all elements from an array.
+ * @param arr The array to remove all elements from.
+ * @remark As the underlying storage is allocated from a pool, no
+ * memory is freed by this operation, but is available for reuse.
+ */
+APR_DECLARE(void) apr_array_clear(apr_array_header_t *arr);
+
+/**
  * Concatenate two arrays together
  * @param dst The destination array, and the one to go first in the combined 
  *            array
@@ -199,11 +226,23 @@ APR_DECLARE(apr_table_t *) apr_table_make(apr_pool_t *p, int nelts);
  * @param p The pool to allocate the new table out of
  * @param t The table to copy
  * @return A copy of the table passed in
+ * @warning The table keys and respective values are not copied
  */
 APR_DECLARE(apr_table_t *) apr_table_copy(apr_pool_t *p,
                                           const apr_table_t *t);
 
 /**
+ * Create a new table whose contents are deep copied from the given
+ * table. A deep copy operation copies all fields, and makes copies
+ * of dynamically allocated memory pointed to by the fields.
+ * @param p The pool to allocate the new table out of
+ * @param t The table to clone
+ * @return A deep copy of the table passed in
+ */
+APR_DECLARE(apr_table_t *) apr_table_clone(apr_pool_t *p,
+                                           const apr_table_t *t);
+
+/**
  * Delete all of the elements from a table
  * @param t The table to clear
  */
@@ -323,16 +362,19 @@ typedef int (apr_table_do_callback_fn_t)(void *rec, const char *key,
 
 /** 
  * Iterate over a table running the provided function once for every
- * element in the table.  If there is data passed in as a vararg, then the 
- * function is only run on those elements whose key matches something in 
- * the vararg.  If the vararg is NULL, then every element is run through the
- * function.  Iteration continues while the function returns non-zero.
+ * element in the table.  The varargs array must be a list of zero or
+ * more (char *) keys followed by a NULL pointer.  If zero keys are
+ * given, the @param comp function will be invoked for every element
+ * in the table.  Otherwise, the function is invoked only for those
+ * elements matching the keys specified.
+ *
+ * If an invocation of the @param comp function returns zero,
+ * iteration will continue using the next specified key, if any.
+ *
  * @param comp The function to run
  * @param rec The data to pass as the first argument to the function
  * @param t The table to iterate over
- * @param ... The vararg.  If this is NULL, then all elements in the table are
- *            run through the function, otherwise only those whose key matches
- *            are run.
+ * @param ... A varargs array of zero or more (char *) keys followed by NULL
  * @return FALSE if one of the comp() iterations returned zero; TRUE if all
  *            iterations returned non-zero
  * @see apr_table_do_callback_fn_t
@@ -342,16 +384,19 @@ APR_DECLARE_NONSTD(int) apr_table_do(apr_table_do_callback_fn_t *comp,
 
 /** 
  * Iterate over a table running the provided function once for every
- * element in the table.  If there is data passed in as a vararg, then the 
- * function is only run on those element's whose key matches something in 
- * the vararg.  If the vararg is NULL, then every element is run through the
- * function.  Iteration continues while the function returns non-zero.
+ * element in the table.  The @param vp varargs paramater must be a
+ * list of zero or more (char *) keys followed by a NULL pointer.  If
+ * zero keys are given, the @param comp function will be invoked for
+ * every element in the table.  Otherwise, the function is invoked
+ * only for those elements matching the keys specified.
+ *
+ * If an invocation of the @param comp function returns zero,
+ * iteration will continue using the next specified key, if any.
+ *
  * @param comp The function to run
  * @param rec The data to pass as the first argument to the function
  * @param t The table to iterate over
- * @param vp The vararg table.  If this is NULL, then all elements in the 
- *                table are run through the function, otherwise only those 
- *                whose key matches are run.
+ * @param vp List of zero or more (char *) keys followed by NULL
  * @return FALSE if one of the comp() iterations returned zero; TRUE if all
  *            iterations returned non-zero
  * @see apr_table_do_callback_fn_t
@@ -375,9 +420,9 @@ APR_DECLARE(int) apr_table_vdo(apr_table_do_callback_fn_t *comp,
  *          than a function that just loops through table b calling other functions.
  */
 /**
- *<PRE>
  * Conceptually, apr_table_overlap does this:
  *
+ * <pre>
  *  apr_array_header_t *barr = apr_table_elts(b);
  *  apr_table_entry_t *belt = (apr_table_entry_t *)barr->elts;
  *  int i;
@@ -390,6 +435,7 @@ APR_DECLARE(int) apr_table_vdo(apr_table_do_callback_fn_t *comp,
  *          apr_table_setn(a, belt[i].key, belt[i].val);
  *      }
  *  }
+ * </pre>
  *
  *  Except that it is more efficient (less space and cpu-time) especially
  *  when b has many elements.
@@ -397,7 +443,6 @@ APR_DECLARE(int) apr_table_vdo(apr_table_do_callback_fn_t *comp,
  *  Notice the assumptions on the keys and values in b -- they must be
  *  in an ancestor of a's pool.  In practice b and a are usually from
  *  the same pool.
- * </PRE>
  */
 
 APR_DECLARE(void) apr_table_overlap(apr_table_t *a, const apr_table_t *b,
diff --git a/srclib/apr/include/apr_thread_cond.h b/srclib/apr/include/apr_thread_cond.h
index 3744b090..199f1ded 100644
--- a/srclib/apr/include/apr_thread_cond.h
+++ b/srclib/apr/include/apr_thread_cond.h
@@ -54,7 +54,7 @@ typedef struct apr_thread_cond_t apr_thread_cond_t;
  * and schedule threads in a single process.
  * @param cond the memory address where the newly created condition variable
  *        will be stored.
- * @param pool the pool from which to allocate the mutex.
+ * @param pool the pool from which to allocate the condition.
  */
 APR_DECLARE(apr_status_t) apr_thread_cond_create(apr_thread_cond_t **cond,
                                                  apr_pool_t *pool);
@@ -70,6 +70,9 @@ APR_DECLARE(apr_status_t) apr_thread_cond_create(apr_thread_cond_t **cond,
  * @param mutex the mutex that must be locked upon entering this function,
  *        is released while the thread is asleep, and is again acquired before
  *        returning from this function.
+ * @remark Spurious wakeups may occur. Before and after every call to wait on
+ * a condition variable, the caller should test whether the condition is already
+ * met.
  */
 APR_DECLARE(apr_status_t) apr_thread_cond_wait(apr_thread_cond_t *cond,
                                                apr_thread_mutex_t *mutex);
@@ -100,6 +103,7 @@ APR_DECLARE(apr_status_t) apr_thread_cond_timedwait(apr_thread_cond_t *cond,
  * the associated mutex. Although it is not required, if predictable scheduling
  * is desired, that mutex must be locked while calling this function.
  * @param cond the condition variable on which to produce the signal.
+ * @remark If no threads are waiting on the condition variable, nothing happens.
  */
 APR_DECLARE(apr_status_t) apr_thread_cond_signal(apr_thread_cond_t *cond);
 
@@ -108,6 +112,7 @@ APR_DECLARE(apr_status_t) apr_thread_cond_signal(apr_thread_cond_t *cond);
  * Each thread that was signaled is then scheduled to wake up and acquire
  * the associated mutex. This will happen in a serialized manner.
  * @param cond the condition variable on which to produce the broadcast.
+ * @remark If no threads are waiting on the condition variable, nothing happens.
  */
 APR_DECLARE(apr_status_t) apr_thread_cond_broadcast(apr_thread_cond_t *cond);
 
diff --git a/srclib/apr/include/apr_thread_proc.h b/srclib/apr/include/apr_thread_proc.h
index c7930901..4bcc4eeb 100644
--- a/srclib/apr/include/apr_thread_proc.h
+++ b/srclib/apr/include/apr_thread_proc.h
@@ -77,15 +77,26 @@ typedef enum {
 
 /** @see apr_procattr_io_set */
 #define APR_NO_PIPE          0
-
-/** @see apr_procattr_io_set */
+/** @see apr_procattr_io_set and apr_file_pipe_create_ex */
 #define APR_FULL_BLOCK       1
-/** @see apr_procattr_io_set */
+/** @see apr_procattr_io_set and apr_file_pipe_create_ex */
 #define APR_FULL_NONBLOCK    2
 /** @see apr_procattr_io_set */
 #define APR_PARENT_BLOCK     3
 /** @see apr_procattr_io_set */
 #define APR_CHILD_BLOCK      4
+/** @see apr_procattr_io_set */
+#define APR_NO_FILE          8
+
+/** @see apr_file_pipe_create_ex */
+#define APR_READ_BLOCK       3
+/** @see apr_file_pipe_create_ex */
+#define APR_WRITE_BLOCK      4
+
+/** @see apr_procattr_io_set 
+ * @note Win32 only effective with version 1.2.12, portably introduced in 1.3.0
+ */
+#define APR_NO_FILE          8
 
 /** @see apr_procattr_limit_set */
 #define APR_LIMIT_CPU        0
@@ -392,6 +403,12 @@ APR_DECLARE(apr_status_t) apr_procattr_create(apr_procattr_t **new_attr,
  * @param in Should stdin be a pipe back to the parent?
  * @param out Should stdout be a pipe back to the parent?
  * @param err Should stderr be a pipe back to the parent?
+ * @note If APR_NO_PIPE, there will be no special channel, the child
+ * inherits the parent's corresponding stdio stream.  If APR_NO_FILE is 
+ * specified, that corresponding stream is closed in the child (and will
+ * be INVALID_HANDLE_VALUE when inspected on Win32). This can have ugly 
+ * side effects, as the next file opened in the child on Unix will fall
+ * into the stdio stream fd slot!
  */
 APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr, 
                                              apr_int32_t in, apr_int32_t out,
@@ -408,6 +425,9 @@ APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr,
  *          process invocations - such as a log file. You can save some 
  *          extra function calls by not creating your own pipe since this
  *          creates one in the process space for you.
+ * @bug Note that calling this function with two NULL files on some platforms
+ * creates an APR_FULL_BLOCK pipe, but this behavior is neither portable nor
+ * is it supported.  @see apr_procattr_io_set instead for simple pipes.
  */
 APR_DECLARE(apr_status_t) apr_procattr_child_in_set(struct apr_procattr_t *attr,
                                                   apr_file_t *child_in,
@@ -422,6 +442,9 @@ APR_DECLARE(apr_status_t) apr_procattr_child_in_set(struct apr_procattr_t *attr,
  *         useful if you have already opened a pipe (or multiple files)
  *         that you wish to use, perhaps persistently across multiple
  *         process invocations - such as a log file. 
+ * @bug Note that calling this function with two NULL files on some platforms
+ * creates an APR_FULL_BLOCK pipe, but this behavior is neither portable nor
+ * is it supported.  @see apr_procattr_io_set instead for simple pipes.
  */
 APR_DECLARE(apr_status_t) apr_procattr_child_out_set(struct apr_procattr_t *attr,
                                                    apr_file_t *child_out,
@@ -436,6 +459,9 @@ APR_DECLARE(apr_status_t) apr_procattr_child_out_set(struct apr_procattr_t *attr
  *         useful if you have already opened a pipe (or multiple files)
  *         that you wish to use, perhaps persistently across multiple
  *         process invocations - such as a log file. 
+ * @bug Note that calling this function with two NULL files on some platforms
+ * creates an APR_FULL_BLOCK pipe, but this behavior is neither portable nor
+ * is it supported.  @see apr_procattr_io_set instead for simple pipes.
  */
 APR_DECLARE(apr_status_t) apr_procattr_child_err_set(struct apr_procattr_t *attr,
                                                    apr_file_t *child_err,
diff --git a/srclib/apr/include/apr_version.h b/srclib/apr/include/apr_version.h
index 71859fd6..2be1e5d6 100644
--- a/srclib/apr/include/apr_version.h
+++ b/srclib/apr/include/apr_version.h
@@ -53,13 +53,13 @@
  * Minor API changes that do not cause binary compatibility problems.
  * Reset to 0 when upgrading APR_MAJOR_VERSION
  */
-#define APR_MINOR_VERSION       2
+#define APR_MINOR_VERSION       3
 
 /** patch level 
  * The Patch Level never includes API changes, simply bug fixes.
  * Reset to 0 when upgrading APR_MINOR_VERSION
  */
-#define APR_PATCH_VERSION      12
+#define APR_PATCH_VERSION       0
 
 /** 
  * The symbol APR_IS_DEV_VERSION is only defined for internal,
@@ -68,6 +68,22 @@
  */
 /* #undef APR_IS_DEV_VERSION */
 
+/**
+ * Check at compile time if the APR version is at least a certain
+ * level.
+ * @param major The major version component of the version checked
+ * for (e.g., the "1" of "1.3.0").
+ * @param minor The minor version component of the version checked
+ * for (e.g., the "3" of "1.3.0").
+ * @param patch The patch level component of the version checked
+ * for (e.g., the "0" of "1.3.0").
+ * @remark This macro is available with APR versions starting with
+ * 1.3.0.
+ */
+#define APR_VERSION_AT_LEAST(major,minor,patch)                    \
+(((major) < APR_MAJOR_VERSION)                                     \
+ || ((major) == APR_MAJOR_VERSION && (minor) < APR_MINOR_VERSION) \
+ || ((major) == APR_MAJOR_VERSION && (minor) == APR_MINOR_VERSION && (patch) <= APR_PATCH_VERSION))
 
 #if defined(APR_IS_DEV_VERSION) || defined(DOXYGEN)
 /** Internal: string form of the "is dev" flag */
diff --git a/srclib/apr/include/apr_want.h b/srclib/apr/include/apr_want.h
index 39cc4fcb..1afed360 100644
--- a/srclib/apr/include/apr_want.h
+++ b/srclib/apr/include/apr_want.h
@@ -81,10 +81,28 @@
 
 #ifdef APR_WANT_IOVEC
 
+#if APR_HAVE_IOVEC
+
 #if APR_HAVE_SYS_UIO_H
 #include <sys/uio.h>
 #endif
 
+#else
+
+struct iovec
+{
+    char *iov_base;
+    size_t iov_len;
+};
+
+#endif
+
+/* apr_want is included at several layers; redefining APR_HAVE_IOVEC
+ * now to ensure that our struct is not introduced several times.
+ */
+#undef APR_HAVE_IOVEC
+#define APR_HAVE_IOVEC 1
+
 #undef APR_WANT_IOVEC
 #endif
 
diff --git a/srclib/apr/include/arch/apr_private_common.h b/srclib/apr/include/arch/apr_private_common.h
index 9cd52ecf..ec850c65 100644
--- a/srclib/apr/include/arch/apr_private_common.h
+++ b/srclib/apr/include/arch/apr_private_common.h
@@ -37,6 +37,5 @@ apr_status_t apr_filepath_list_merge_impl(char **liststr,
 /* temporary defines to handle 64bit compile mismatches */
 #define APR_INT_TRUNC_CAST    int
 #define APR_UINT32_TRUNC_CAST apr_uint32_t
-#define APR_UINT32_MAX        0xFFFFFFFFUL
 
 #endif  /*APR_PRIVATE_COMMON_H*/
diff --git a/srclib/apr/include/arch/netware/apr_arch_file_io.h b/srclib/apr/include/arch/netware/apr_arch_file_io.h
index dd1c42f2..0676eb27 100644
--- a/srclib/apr/include/arch/netware/apr_arch_file_io.h
+++ b/srclib/apr/include/arch/netware/apr_arch_file_io.h
@@ -69,7 +69,9 @@
 
 /* End System headers */
 
-#define APR_FILE_BUFSIZE 4096
+#define APR_FILE_DEFAULT_BUFSIZE 4096
+/* For backwards compat */
+#define APR_FILE_BUFSIZE APR_FILE_DEFAULT_BUFSIZE
 
 #if APR_HAS_THREADS
 #define file_lock(f)   do { \
@@ -109,7 +111,8 @@ struct apr_file_t {
 
     /* Stuff for buffered mode */
     char *buffer;
-    int bufpos;               /* Read/Write position in buffer */
+    apr_size_t bufpos;    /* Read/Write position in buffer */
+    apr_size_t bufsize;   /* The buffer size */
     apr_off_t dataRead;   /* amount of valid data read into buffer */
     int direction;            /* buffer being used for 0 = read, 1 = write */
     apr_off_t filePtr;    /* position in file of handle */
diff --git a/srclib/apr/include/arch/netware/apr_private.h b/srclib/apr/include/arch/netware/apr_private.h
index ad659b59..034271b1 100644
--- a/srclib/apr/include/arch/netware/apr_private.h
+++ b/srclib/apr/include/arch/netware/apr_private.h
@@ -160,6 +160,8 @@ typedef struct app_data {
     rtag_t  gs_lookup_rtag;
     rtag_t  gs_event_rtag;
     rtag_t  gs_pcp_rtag;
+    void*   gs_ldap_xref_lock;
+    void*   gs_xref_head;
 } APP_DATA;
 
 int setGlobalPool(void *data);
diff --git a/srclib/apr/include/arch/os2/apr_arch_file_io.h b/srclib/apr/include/arch/os2/apr_arch_file_io.h
index a8884c34..39937123 100644
--- a/srclib/apr/include/arch/os2/apr_arch_file_io.h
+++ b/srclib/apr/include/arch/os2/apr_arch_file_io.h
@@ -31,7 +31,8 @@
  */
 #undef HAVE_MKSTEMP
 
-#define APR_FILE_BUFSIZE 4096
+#define APR_FILE_DEFAULT_BUFSIZE 4096
+#define APR_FILE_BUFSIZE APR_FILE_DEFAULT_BUFSIZE
 
 struct apr_file_t {
     apr_pool_t *pool;
@@ -48,7 +49,8 @@ struct apr_file_t {
 
     /* Stuff for buffered mode */
     char *buffer;
-    int bufpos;               // Read/Write position in buffer
+    apr_size_t bufsize;       // Read/Write position in buffer
+    apr_size_t bufpos;        // Read/Write position in buffer
     unsigned long dataRead;   // amount of valid data read into buffer
     int direction;            // buffer being used for 0 = read, 1 = write
     unsigned long filePtr;    // position in file of handle
diff --git a/srclib/apr/include/arch/os2/apr_arch_inherit.h b/srclib/apr/include/arch/os2/apr_arch_inherit.h
new file mode 100644
index 00000000..494772ac
--- /dev/null
+++ b/srclib/apr/include/arch/os2/apr_arch_inherit.h
@@ -0,0 +1,50 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef INHERIT_H
+#define INHERIT_H
+
+#include "apr_inherit.h"
+
+#define APR_INHERIT (1 << 24)    /* Must not conflict with other bits */
+
+#define APR_IMPLEMENT_INHERIT_SET(name, flag, pool, cleanup)        \
+APR_DECLARE(apr_status_t) apr_##name##_inherit_set(apr_##name##_t *the##name) \
+{                                                                   \
+    int rv;                                                         \
+    ULONG state;                                                    \
+    if (((rv = DosQueryFHState(attr->parent_err->filedes, &state))  \
+            != 0) ||                                                \
+        ((rv = DosSetFHState(attr->parent_err->filedes,             \
+                            state & ~OPEN_FLAGS_NOINHERIT)) != 0))  \
+        return APR_FROM_OS_ERROR(rv);                               \
+    return APR_SUCCESS;                                             \
+}
+
+#define APR_IMPLEMENT_INHERIT_UNSET(name, flag, pool, cleanup)      \
+APR_DECLARE(apr_status_t) apr_##name##_inherit_unset(apr_##name##_t *the##name)\
+{                                                                   \
+    int rv;                                                         \
+    ULONG state;                                                    \
+    if (((rv = DosQueryFHState(attr->parent_err->filedes, &state))  \
+            != 0) ||                                                \
+        ((rv = DosSetFHState(attr->parent_err->filedes,             \
+                            state | OPEN_FLAGS_NOINHERIT)) != 0))   \
+        return APR_FROM_OS_ERROR(rv);                               \
+    return APR_SUCCESS;                                             \
+}
+
+#endif	/* ! INHERIT_H */
diff --git a/srclib/apr/include/arch/unix/apr_arch_atomic.h b/srclib/apr/include/arch/unix/apr_arch_atomic.h
new file mode 100644
index 00000000..f8019060
--- /dev/null
+++ b/srclib/apr/include/arch/unix/apr_arch_atomic.h
@@ -0,0 +1,45 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ATOMIC_H
+#define ATOMIC_H
+
+#include "apr.h"
+#include "apr_private.h"
+#include "apr_atomic.h"
+#include "apr_thread_mutex.h"
+
+#if defined(USE_ATOMICS_GENERIC)
+/* noop */
+#elif defined(__GNUC__) && defined(__STRICT_ANSI__)
+/* force use of generic atomics if building e.g. with -std=c89, which
+ * doesn't allow inline asm */
+#   define USE_ATOMICS_GENERIC
+#elif HAVE_ATOMIC_BUILTINS
+#   define USE_ATOMICS_BUILTINS
+#elif defined(SOLARIS2) && SOLARIS2 >= 10
+#   define USE_ATOMICS_SOLARIS
+#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+#   define USE_ATOMICS_IA32
+#elif defined(__GNUC__) && (defined(__PPC__) || defined(__ppc__))
+#   define USE_ATOMICS_PPC
+#elif defined(__GNUC__) && (defined(__s390__) || defined(__s390x__))
+#   define USE_ATOMICS_S390
+#else
+#   define USE_ATOMICS_GENERIC
+#endif
+
+#endif /* ATOMIC_H */
diff --git a/srclib/apr/include/arch/unix/apr_arch_file_io.h b/srclib/apr/include/arch/unix/apr_arch_file_io.h
index 4216e131..77a90917 100644
--- a/srclib/apr/include/arch/unix/apr_arch_file_io.h
+++ b/srclib/apr/include/arch/unix/apr_arch_file_io.h
@@ -86,7 +86,9 @@
 #endif
 /* End System headers */
 
-#define APR_FILE_BUFSIZE 4096
+#define APR_FILE_DEFAULT_BUFSIZE 4096
+/* For backwards-compat */
+#define APR_FILE_BUFSIZE  APR_FILE_DEFAULT_BUFSIZE
 
 struct apr_file_t {
     apr_pool_t *pool;
@@ -105,7 +107,8 @@ struct apr_file_t {
 #endif
     /* Stuff for buffered mode */
     char *buffer;
-    int bufpos;               /* Read/Write position in buffer */
+    apr_size_t bufpos;        /* Read/Write position in buffer */
+    apr_size_t bufsize;       /* The size of the buffer */
     unsigned long dataRead;   /* amount of valid data read into buffer */
     int direction;            /* buffer being used for 0 = read, 1 = write */
     apr_off_t filePtr;        /* position in file of handle */
@@ -139,11 +142,21 @@ typedef struct stat64 struct_stat;
 typedef struct stat struct_stat;
 #endif
 
+/* readdir64_r is only used in specific cases: */
+#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) \
+    && !defined(READDIR_IS_THREAD_SAFE) && defined(HAVE_READDIR64_R)
+#define APR_USE_READDIR64_R
+#endif
+
 struct apr_dir_t {
     apr_pool_t *pool;
     char *dirname;
     DIR *dirstruct;
+#ifdef APR_USE_READDIR64_R
+    struct dirent64 *entry;
+#else
     struct dirent *entry;
+#endif
 };
 
 apr_status_t apr_unix_file_cleanup(void *);
diff --git a/srclib/apr/include/arch/unix/apr_arch_threadproc.h b/srclib/apr/include/arch/unix/apr_arch_threadproc.h
index 6b018023..b76dc9be 100644
--- a/srclib/apr/include/arch/unix/apr_arch_threadproc.h
+++ b/srclib/apr/include/arch/unix/apr_arch_threadproc.h
@@ -39,6 +39,9 @@
 #if APR_HAVE_STRING_H
 #include <string.h>
 #endif
+#if HAVE_SCHED_H
+#include <sched.h>
+#endif
 /* End System Headers */
 
 
diff --git a/srclib/apr/include/arch/unix/apr_private.h.in b/srclib/apr/include/arch/unix/apr_private.h.in
index 94689637..1e1d0961 100644
--- a/srclib/apr/include/arch/unix/apr_private.h.in
+++ b/srclib/apr/include/arch/unix/apr_private.h.in
@@ -7,6 +7,14 @@
 /* Define as function used for conversion of strings to apr_off_t */
 #undef APR_OFF_T_STRFN
 
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+#undef CRAY_STACKSEG_END
+
+/* Define to 1 if using `alloca.c'. */
+#undef C_ALLOCA
+
 /* Define to path of random device */
 #undef DEV_RANDOM
 
@@ -46,15 +54,19 @@
 /* Define if gethostbyname_r has the hostent_data for the third argument */
 #undef GETHOSTBYNAME_R_HOSTENT_DATA
 
-/* Define to 1 if you have the `alloca' function. */
+/* Define to 1 if you have `alloca', as a function or macro. */
 #undef HAVE_ALLOCA
 
-/* Define to 1 if you have the <alloca.h> header file. */
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
 #undef HAVE_ALLOCA_H
 
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #undef HAVE_ARPA_INET_H
 
+/* Define if compiler provides atomic builtins */
+#undef HAVE_ATOMIC_BUILTINS
+
 /* Define if BONE_VERSION is defined in sys/socket.h */
 #undef HAVE_BONE_VERSION
 
@@ -191,15 +203,33 @@
 /* Define to 1 if you have the <langinfo.h> header file. */
 #undef HAVE_LANGINFO_H
 
+/* Enable if this library is available */
+#undef HAVE_LIBADVAPI32
+
 /* Define to 1 if you have the `bsd' library (-lbsd). */
 #undef HAVE_LIBBSD
 
+/* Enable if this library is available */
+#undef HAVE_LIBKERNEL32
+
+/* Define to 1 if you have the `msvcrt' library (-lmsvcrt). */
+#undef HAVE_LIBMSVCRT
+
+/* Enable if this library is available */
+#undef HAVE_LIBRPCRT4
+
 /* Define to 1 if you have the `sendfile' library (-lsendfile). */
 #undef HAVE_LIBSENDFILE
 
+/* Enable if this library is available */
+#undef HAVE_LIBSHELL32
+
 /* Define to 1 if you have the `truerand' library (-ltruerand). */
 #undef HAVE_LIBTRUERAND
 
+/* Enable if this library is available */
+#undef HAVE_LIBWS2_32
+
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
@@ -314,12 +344,24 @@
 /* Define to 1 if you have the `pthread_rwlock_init' function. */
 #undef HAVE_PTHREAD_RWLOCK_INIT
 
+/* Define to 1 if you have the `pthread_yield' function. */
+#undef HAVE_PTHREAD_YIELD
+
 /* Define to 1 if you have the `putenv' function. */
 #undef HAVE_PUTENV
 
 /* Define to 1 if you have the <pwd.h> header file. */
 #undef HAVE_PWD_H
 
+/* Define to 1 if you have the `readdir64_r' function. */
+#undef HAVE_READDIR64_R
+
+/* Define to 1 if you have the <sched.h> header file. */
+#undef HAVE_SCHED_H
+
+/* Define to 1 if you have the `sched_yield' function. */
+#undef HAVE_SCHED_YIELD
+
 /* Define to 1 if you have the <semaphore.h> header file. */
 #undef HAVE_SEMAPHORE_H
 
@@ -623,9 +665,18 @@
 /* Define to 1 if you have the `waitpid' function. */
 #undef HAVE_WAITPID
 
+/* Define to 1 if you have the <windows.h> header file. */
+#undef HAVE_WINDOWS_H
+
+/* Define to 1 if you have the <winsock2.h> header file. */
+#undef HAVE_WINSOCK2_H
+
 /* Define to 1 if you have the `writev' function. */
 #undef HAVE_WRITEV
 
+/* Define for z/OS pthread API nuances */
+#undef HAVE_ZOS_PTHREADS
+
 /* Define if EAI_ error codes from getaddrinfo are negative */
 #undef NEGATIVE_EAI
 
@@ -647,6 +698,9 @@
 /* Define if POSIX semaphores affect threads within the process */
 #undef POSIXSEM_IS_GLOBAL
 
+/* Define on PowerPC 405 where errata 77 applies */
+#undef PPC405_ERRATA
+
 /* Define if pthread_attr_getdetachstate() has one arg */
 #undef PTHREAD_ATTR_GETDETACHSTATE_TAKES_ONE_ARG
 
@@ -689,9 +743,20 @@
 /* The size of ssize_t */
 #undef SIZEOF_SSIZE_T
 
+/* The size of struct iovec */
+#undef SIZEOF_STRUCT_IOVEC
+
 /* The size of `void*', as computed by sizeof. */
 #undef SIZEOF_VOIDP
 
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at runtime.
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
+#undef STACK_DIRECTION
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
@@ -701,6 +766,9 @@
 /* Define if SysV semaphores affect threads within the process */
 #undef SYSVSEM_IS_GLOBAL
 
+/* Define if use of generic atomics is requested */
+#undef USE_ATOMICS_GENERIC
+
 /* Define if BeOS Semaphores will be used */
 #undef USE_BEOSSEM
 
@@ -710,9 +778,6 @@
 /* Define if 4.2BSD-style flock() will be used */
 #undef USE_FLOCK_SERIALIZE
 
-/* Define if use of generic atomics is requested */
-#undef USE_GENERIC_ATOMICS
-
 /* Define if BeOS areas will be used */
 #undef USE_SHMEM_BEOS
 
@@ -743,21 +808,24 @@
 /* Define if SysV IPC shmget() will be used */
 #undef USE_SHMEM_SHMGET_ANON
 
+/* Define if Windows shared memory will be used */
+#undef USE_SHMEM_WIN32
+
+/* Define if Windows CreateFileMapping() will be used */
+#undef USE_SHMEM_WIN32_ANON
+
 /* Define if SysV IPC semget() will be used */
 #undef USE_SYSVSEM_SERIALIZE
 
 /* Define if apr_wait_for_io_or_timeout() uses poll(2) */
 #undef WAITIO_USES_POLL
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel and VAX). */
+#if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+#elif ! defined __LITTLE_ENDIAN__
+# undef WORDS_BIGENDIAN
 #endif
 
 /* Define to 1 if on MINIX. */
@@ -770,6 +838,28 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
diff --git a/srclib/apr/include/arch/win32/apr_arch_atime.h b/srclib/apr/include/arch/win32/apr_arch_atime.h
index 47b75a95..35f2041a 100644
--- a/srclib/apr/include/arch/win32/apr_arch_atime.h
+++ b/srclib/apr/include/arch/win32/apr_arch_atime.h
@@ -36,7 +36,7 @@ struct atime_t {
 #define APR_DELTA_EPOCH_IN_USEC   APR_TIME_C(11644473600000000);
 
 
-__inline void FileTimeToAprTime(apr_time_t *result, FILETIME *input)
+static APR_INLINE void FileTimeToAprTime(apr_time_t *result, FILETIME *input)
 {
     /* Convert FILETIME one 64 bit number so we can work with it. */
     *result = input->dwHighDateTime;
@@ -48,7 +48,7 @@ __inline void FileTimeToAprTime(apr_time_t *result, FILETIME *input)
 }
 
 
-__inline void AprTimeToFileTime(LPFILETIME pft, apr_time_t t)
+static APR_INLINE void AprTimeToFileTime(LPFILETIME pft, apr_time_t t)
 {
     LONGLONG ll;
     t += APR_DELTA_EPOCH_IN_USEC;
diff --git a/srclib/apr/include/arch/win32/apr_arch_file_io.h b/srclib/apr/include/arch/win32/apr_arch_file_io.h
index 776dc169..c8c7bdee 100644
--- a/srclib/apr/include/arch/win32/apr_arch_file_io.h
+++ b/srclib/apr/include/arch/win32/apr_arch_file_io.h
@@ -82,7 +82,9 @@ void *res_name_from_filename(const char *file, int global, apr_pool_t *pool);
 
 #define APR_FILE_MAX MAX_PATH
 
-#define APR_FILE_BUFSIZE 4096
+#define APR_FILE_DEFAULT_BUFSIZE 4096
+/* For backwards-compat */
+#define APR_FILE_BUFSIZE APR_FILE_DEFAULT_BUFSIZE
 
 /* obscure ommissions from msvc's sys/stat.h */
 #ifdef _MSC_VER
@@ -176,6 +178,7 @@ struct apr_file_t {
     /* Stuff for buffered mode */
     char *buffer;
     apr_size_t bufpos;         // Read/Write position in buffer
+    apr_size_t bufsize;        // The size of the buffer
     apr_size_t dataRead;       // amount of valid data read into buffer
     int direction;             // buffer being used for 0 = read, 1 = write
     apr_off_t filePtr;         // position in file of handle
@@ -249,33 +252,4 @@ apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p);
 
 apr_status_t file_cleanup(void *);
 
-/**
- * Internal function to create a Win32/NT pipe that respects some async
- * timeout options.
- * @param in new read end of the created pipe
- * @param out new write end of the created pipe
- * @param blocking_mode one of
- * <pre>
- *       APR_FULL_BLOCK
- *       APR_READ_BLOCK
- *       APR_WRITE_BLOCK
- *       APR_FULL_NONBLOCK
- * </pre>
- * @remark It so happens that APR_FULL_BLOCK and APR_FULL_NONBLOCK
- * are common to apr_procattr_io_set() in, out and err modes.
- * Because APR_CHILD_BLOCK and APR_WRITE_BLOCK share the same value,
- * as do APR_PARENT_BLOCK and APR_READ_BLOCK, it's possible to use
- * that value directly for creating the stdout/stderr pipes.  When
- * creating the stdin pipe, the values must be transposed.
- * @see apr_procattr_io_set
- */
-apr_status_t apr_create_nt_pipe(apr_file_t **in, apr_file_t **out, 
-                                apr_int32_t blocking_mode, 
-                                apr_pool_t *p);
-
-/** @see apr_create_nt_pipe */
-#define APR_READ_BLOCK     3
-/** @see apr_create_nt_pipe */
-#define APR_WRITE_BLOCK      4
-
 #endif  /* ! FILE_IO_H */
diff --git a/srclib/apr/include/arch/win32/apr_arch_misc.h b/srclib/apr/include/arch/win32/apr_arch_misc.h
index 5113e955..9ead7b04 100644
--- a/srclib/apr/include/arch/win32/apr_arch_misc.h
+++ b/srclib/apr/include/arch/win32/apr_arch_misc.h
@@ -103,7 +103,8 @@ typedef enum {
         APR_WIN_XP =       60,
         APR_WIN_XP_SP1 =   61,
         APR_WIN_XP_SP2 =   62,
-        APR_WIN_2003 =     70
+        APR_WIN_2003 =     70,
+        APR_WIN_VISTA =    80
 } apr_oslevel_e;
 
 extern APR_DECLARE_DATA apr_oslevel_e apr_os_level;
@@ -138,6 +139,37 @@ apr_status_t apr_get_oslevel(apr_oslevel_e *);
 #define ELSE_WIN_OS_IS_ANSI
 #endif /* WINNT */
 
+#if defined(_MSC_VER) && !defined(_WIN32_WCE)
+#include "crtdbg.h"
+
+static APR_INLINE void* apr_malloc_dbg(size_t size, const char* filename,
+                                       int linenumber)
+{
+    return _malloc_dbg(size, _CRT_BLOCK, filename, linenumber);
+}
+
+static APR_INLINE void* apr_realloc_dbg(void* userData, size_t newSize,
+                                        const char* filename, int linenumber)
+{
+    return _realloc_dbg(userData, newSize, _CRT_BLOCK, filename, linenumber);
+}
+
+#else
+
+static APR_INLINE void* apr_malloc_dbg(size_t size, const char* filename,
+                                       int linenumber)
+{
+    return malloc(size);
+}
+
+static APR_INLINE void* apr_realloc_dbg(void* userData, size_t newSize,
+                                        const char* filename, int linenumber)
+{
+    return realloc(userData, newSize);
+}
+
+#endif  /* ! _MSC_VER */
+
 typedef enum {
     DLL_WINBASEAPI = 0,    // kernel32 From WinBase.h
     DLL_WINADVAPI = 1,     // advapi32 From WinBase.h
@@ -150,16 +182,20 @@ typedef enum {
 
 FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char *fnName, int ordinal);
 
-/* The apr_load_dll_func call WILL fault if the function cannot be loaded */
+/* The apr_load_dll_func call WILL return 0 set error to
+ * ERROR_INVALID_FUNCTION if the function cannot be loaded
+ */
 
 #define APR_DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \
     typedef rettype (calltype *apr_winapi_fpt_##fn) args; \
     static apr_winapi_fpt_##fn apr_winapi_pfn_##fn = NULL; \
-    __inline rettype apr_winapi_##fn args \
+    static APR_INLINE rettype apr_winapi_##fn args \
     {   if (!apr_winapi_pfn_##fn) \
             apr_winapi_pfn_##fn = (apr_winapi_fpt_##fn) \
                                       apr_load_dll_func(lib, #fn, ord); \
-        return (*(apr_winapi_pfn_##fn)) names; }; \
+        if (apr_winapi_pfn_##fn) \
+            return (*(apr_winapi_pfn_##fn)) names; \
+        else { SetLastError(ERROR_INVALID_FUNCTION); return 0;} }; \
 
 /* Provide late bound declarations of every API function missing from
  * one or more supported releases of the Win32 API
@@ -181,6 +217,7 @@ FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char *fnName, int ordinal);
  */
 
 #if !defined(_WIN32_WCE) && !defined(WINNT)
+/* This group is available to all versions of WINNT 4.0 SP6 and later */
 
 #ifdef GetFileAttributesExA
 #undef GetFileAttributesExA
@@ -276,15 +313,39 @@ APR_DECLARE_LATE_DLL_FUNC(DLL_SHSTDAPI, LPWSTR *, WINAPI, CommandLineToArgvW, 0,
 #endif /* !defined(_WIN32_WCE) && !defined(WINNT) */
 
 #if !defined(_WIN32_WCE)
+/* This group is NOT available to all versions of WinNT,
+ * these we must always look up
+ */
 
-APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, DWORD, WINAPI, NtQueryTimerResolution, 0, (
+#ifdef GetCompressedFileSizeA
+#undef GetCompressedFileSizeA
+#endif
+APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, DWORD, WINAPI, GetCompressedFileSizeA, 0, (
+    IN LPCSTR lpFileName,
+    OUT LPDWORD lpFileSizeHigh),
+    (lpFileName, lpFileSizeHigh));
+#define GetCompressedFileSizeA apr_winapi_GetCompressedFileSizeA
+#undef GetCompressedFileSize
+#define GetCompressedFileSize apr_winapi_GetCompressedFileSizeA
+
+#ifdef GetCompressedFileSizeW
+#undef GetCompressedFileSizeW
+#endif
+APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, DWORD, WINAPI, GetCompressedFileSizeW, 0, (
+    IN LPCWSTR lpFileName,
+    OUT LPDWORD lpFileSizeHigh),
+    (lpFileName, lpFileSizeHigh));
+#define GetCompressedFileSizeW apr_winapi_GetCompressedFileSizeW
+
+
+APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, LONG, WINAPI, NtQueryTimerResolution, 0, (
     ULONG *pMaxRes,  /* Minimum NS Resolution */
     ULONG *pMinRes,  /* Maximum NS Resolution */
     ULONG *pCurRes), /* Current NS Resolution */
     (pMaxRes, pMinRes, pCurRes));
 #define QueryTimerResolution apr_winapi_NtQueryTimerResolution
 
-APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, DWORD, WINAPI, NtSetTimerResolution, 0, (
+APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, LONG, WINAPI, NtSetTimerResolution, 0, (
     ULONG ReqRes,    /* Requested NS Clock Resolution */
     BOOL  Acquire,   /* Aquire (1) or Release (0) our interest */
     ULONG *pNewRes), /* The NS Clock Resolution granted */
@@ -294,13 +355,13 @@ APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, DWORD, WINAPI, NtSetTimerResolution, 0, (
 typedef struct PBI {
     LONG      ExitStatus;
     PVOID     PebBaseAddress;
-    ULONG_PTR AffinityMask;
+    apr_uintptr_t AffinityMask;
     LONG      BasePriority;
-    ULONG_PTR UniqueProcessId;
-    ULONG_PTR InheritedFromUniqueProcessId;
+    apr_uintptr_t UniqueProcessId;
+    apr_uintptr_t InheritedFromUniqueProcessId;
 } PBI, *PPBI;
 
-APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, DWORD, WINAPI, NtQueryInformationProcess, 0, (
+APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, LONG, WINAPI, NtQueryInformationProcess, 0, (
     HANDLE hProcess,  /* Obvious */
     INT   info,       /* Use 0 for PBI documented above */
     PVOID pPI,        /* The PIB buffer */
@@ -309,7 +370,7 @@ APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, DWORD, WINAPI, NtQueryInformationProcess, 0
     (hProcess, info, pPI, LenPI, pSizePI));
 #define QueryInformationProcess apr_winapi_NtQueryInformationProcess
 
-APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, DWORD, WINAPI, NtQueryObject, 0, (
+APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, LONG, WINAPI, NtQueryObject, 0, (
     HANDLE hObject,   /* Obvious */
     INT   info,       /* Use 0 for PBI documented above */
     PVOID pOI,        /* The PIB buffer */
@@ -318,7 +379,58 @@ APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, DWORD, WINAPI, NtQueryObject, 0, (
     (hObject, info, pOI, LenOI, pSizeOI));
 #define QueryObject apr_winapi_NtQueryObject
 
+typedef struct IOSB {
+    union {
+    UINT Status;
+    PVOID reserved;
+    };
+    apr_uintptr_t Information; /* Varies by op, consumed buffer size for FSI below */
+} IOSB, *PIOSB;
+
+typedef struct FSI {
+    LONGLONG AllocationSize;
+    LONGLONG EndOfFile;
+    ULONG    NumberOfLinks;
+    BOOL     DeletePending;
+    BOOL     Directory;
+} FSI, *PFSI;
+
+APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, LONG, WINAPI, ZwQueryInformationFile, 0, (
+    HANDLE hObject,    /* Obvious */
+    PVOID  pIOSB,      /* Point to the IOSB buffer for detailed return results */
+    PVOID  pFI,        /* The buffer, using FIB above */
+    ULONG  LenFI,      /* Use sizeof(FI) */
+    ULONG  info),      /* Use 5 for FSI documented above*/
+    (hObject, pIOSB, pFI, LenFI, info));
+#define ZwQueryInformationFile apr_winapi_ZwQueryInformationFile
+
+#ifdef CreateToolhelp32Snapshot
+#undef CreateToolhelp32Snapshot
+#endif
+APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, HANDLE, WINAPI, CreateToolhelp32Snapshot, 0, (
+    DWORD dwFlags,
+    DWORD th32ProcessID),
+    (dwFlags, th32ProcessID));
+#define CreateToolhelp32Snapshot apr_winapi_CreateToolhelp32Snapshot
+
+#ifdef Process32FirstW
+#undef Process32FirstW
+#endif
+APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, Process32FirstW, 0, (
+    HANDLE hSnapshot,
+    LPPROCESSENTRY32W lppe),
+    (hSnapshot, lppe));
+#define Process32FirstW apr_winapi_Process32FirstW
+
+#ifdef Process32NextW
+#undef Process32NextW
+#endif
+APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, Process32NextW, 0, (
+    HANDLE hSnapshot,
+    LPPROCESSENTRY32W lppe),
+    (hSnapshot, lppe));
+#define Process32NextW apr_winapi_Process32NextW
+
 #endif /* !defined(_WIN32_WCE) */
 
 #endif  /* ! MISC_H */
-
diff --git a/srclib/apr/include/arch/win32/apr_arch_networkio.h b/srclib/apr/include/arch/win32/apr_arch_networkio.h
index d4e434d0..04be5559 100644
--- a/srclib/apr/include/arch/win32/apr_arch_networkio.h
+++ b/srclib/apr/include/arch/win32/apr_arch_networkio.h
@@ -64,9 +64,10 @@ typedef struct _WSABUF {
 } WSABUF, FAR * LPWSABUF;
 #endif
 #else
-/* Not sure if this is the right place to define this */
+#ifdef _MSC_VER
 #define HAVE_STRUCT_IPMREQ
 #endif
+#endif
 
 apr_status_t status_from_res_error(int);
 
diff --git a/srclib/apr/include/arch/win32/apr_arch_thread_cond.h b/srclib/apr/include/arch/win32/apr_arch_thread_cond.h
index 840949c2..c7f69f80 100644
--- a/srclib/apr/include/arch/win32/apr_arch_thread_cond.h
+++ b/srclib/apr/include/arch/win32/apr_arch_thread_cond.h
@@ -21,10 +21,11 @@
 
 struct apr_thread_cond_t {
     apr_pool_t *pool;
-    HANDLE event;
-    int signal_all;
-    int num_waiting;
-    int signalled;
+    HANDLE semaphore;
+    CRITICAL_SECTION csection;
+    unsigned long num_waiting;
+    unsigned long num_wake;
+    unsigned long generation;
 };
 
 #endif  /* THREAD_COND_H */
diff --git a/srclib/apr/libapr.dsp b/srclib/apr/libapr.dsp
index a92cf2b5..963868be 100644
--- a/srclib/apr/libapr.dsp
+++ b/srclib/apr/libapr.dsp
@@ -259,6 +259,10 @@ SOURCE=.\dso\win32\dso.c
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\file_io\win32\buffer.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\file_io\unix\copy.c
 # End Source File
 # Begin Source File
diff --git a/srclib/apr/libapr.rc b/srclib/apr/libapr.rc
index 925868d1..cd249b97 100644
--- a/srclib/apr/libapr.rc
+++ b/srclib/apr/libapr.rc
@@ -1,20 +1,21 @@
 #include "apr_version.h"
 
-#define APR_COPYRIGHT "Copyright 2000-2005 The Apache Software " \
+#define APR_COPYRIGHT "Copyright (c) 2008 The Apache Software " \
                       "Foundation or its licensors, as applicable."
 
-#define APR_LICENSE "Licensed under the Apache License, Version 2.0 " \
-                    "(the ""License""); you may not use this file except " \
-                    "in compliance with the License.  You may obtain a " \
-                    "copy of the License at\r\n\r\n" \
-                    "http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n" \
-                    "Unless required by applicable law or agreed to in " \
-                    "writing, software distributed under the License is " \
-                    "distributed on an ""AS IS"" BASIS, WITHOUT " \
-                    "WARRANTIES OR CONDITIONS OF ANY KIND, either " \
-                    "express or implied.  See the License for the " \
-                    "specific language governing permissions and " \
-                    "limitations under the License."
+#define APR_LICENSE \
+  "Licensed to the Apache Software Foundation (ASF) under one or more " \
+  "contributor license agreements.  See the NOTICE file distributed with " \
+  "this work for additional information regarding copyright ownership.  " \
+  "The ASF licenses this file to You under the Apache License, Version 2.0 " \
+  "(the ""License""); you may not use this file except in compliance with " \
+  "the License.  You may obtain a copy of the License at\r\n\r\n" \
+  "http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n" \
+  "Unless required by applicable law or agreed to in writing, software " \
+  "distributed under the License is distributed on an ""AS IS"" BASIS, " \
+  "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  " \
+  "See the License for the specific language governing permissions and " \
+  "limitations under the License."
 
 #define APR_DLL_BASENAME "libapr-" APR_STRINGIFY(APR_MAJOR_VERSION)
 
diff --git a/srclib/apr/locks/unix/proc_mutex.c b/srclib/apr/locks/unix/proc_mutex.c
index 26b2f902..9358e68e 100644
--- a/srclib/apr/locks/unix/proc_mutex.c
+++ b/srclib/apr/locks/unix/proc_mutex.c
@@ -24,11 +24,6 @@ APR_DECLARE(apr_status_t) apr_proc_mutex_destroy(apr_proc_mutex_t *mutex)
     return apr_pool_cleanup_run(mutex->pool, mutex, apr_proc_mutex_cleanup);
 }
 
-static apr_status_t proc_mutex_no_tryacquire(apr_proc_mutex_t *new_mutex)
-{
-    return APR_ENOTIMPL;
-}
-
 #if APR_HAS_POSIXSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || \
     APR_HAS_PROC_PTHREAD_SERIALIZE || APR_HAS_SYSVSEM_SERIALIZE
 static apr_status_t proc_mutex_no_child_init(apr_proc_mutex_t **mutex,
@@ -84,23 +79,22 @@ static apr_status_t proc_mutex_posix_create(apr_proc_mutex_t *new_mutex,
      * implementation. Versions previous to Darwin 6.2 had the 14
      * char limit, but later rev's allow up to 31 characters.
      *
-     * FIXME: There is a small window of opportunity where
-     * instead of getting a new semaphore descriptor, we get
-     * a previously obtained one. This can happen if the requests
-     * are made at the "same time" and in the small span of time between
-     * the sem_open and the sem_unlink. Use of O_EXCL does not
-     * help here however...
-     *
      */
     now = apr_time_now();
     sec = apr_time_sec(now);
     usec = apr_time_usec(now);
     apr_snprintf(semname, sizeof(semname), "/ApR.%lxZ%lx", sec, usec);
-    psem = sem_open(semname, O_CREAT, 0644, 1);
-    if ((psem == (sem_t *)SEM_FAILED) && (errno == ENAMETOOLONG)) {
-        /* Oh well, good try */
-        semname[13] = '\0';
-        psem = sem_open(semname, O_CREAT, 0644, 1);
+    psem = sem_open(semname, O_CREAT | O_EXCL, 0644, 1);
+    if (psem == (sem_t *)SEM_FAILED) {
+        if (errno == ENAMETOOLONG) {
+            /* Oh well, good try */
+            semname[13] = '\0';
+        } else if (errno == EEXIST) {
+            apr_snprintf(semname, sizeof(semname), "/ApR.%lxZ%lx", usec, sec);
+        } else {
+            return errno;
+        }
+        psem = sem_open(semname, O_CREAT | O_EXCL, 0644, 1);
     }
 
     if (psem == (sem_t *)SEM_FAILED) {
@@ -125,6 +119,18 @@ static apr_status_t proc_mutex_posix_acquire(apr_proc_mutex_t *mutex)
     return APR_SUCCESS;
 }
 
+static apr_status_t proc_mutex_posix_tryacquire(apr_proc_mutex_t *mutex)
+{
+    if (sem_trywait(mutex->psem_interproc) < 0) {
+        if (errno == EAGAIN) {
+            return APR_EBUSY;
+        }
+        return errno;
+    }
+    mutex->curr_locked = 1;
+    return APR_SUCCESS;
+}
+
 static apr_status_t proc_mutex_posix_release(apr_proc_mutex_t *mutex)
 {
     mutex->curr_locked = 0;
@@ -145,7 +151,7 @@ static const apr_proc_mutex_unix_lock_methods_t mutex_posixsem_methods =
 #endif
     proc_mutex_posix_create,
     proc_mutex_posix_acquire,
-    proc_mutex_no_tryacquire,
+    proc_mutex_posix_tryacquire,
     proc_mutex_posix_release,
     proc_mutex_posix_cleanup,
     proc_mutex_no_child_init,
@@ -157,6 +163,7 @@ static const apr_proc_mutex_unix_lock_methods_t mutex_posixsem_methods =
 #if APR_HAS_SYSVSEM_SERIALIZE
 
 static struct sembuf proc_mutex_op_on;
+static struct sembuf proc_mutex_op_try;
 static struct sembuf proc_mutex_op_off;
 
 static void proc_mutex_sysv_setup(void)
@@ -164,6 +171,9 @@ static void proc_mutex_sysv_setup(void)
     proc_mutex_op_on.sem_num = 0;
     proc_mutex_op_on.sem_op = -1;
     proc_mutex_op_on.sem_flg = SEM_UNDO;
+    proc_mutex_op_try.sem_num = 0;
+    proc_mutex_op_try.sem_op = -1;
+    proc_mutex_op_try.sem_flg = SEM_UNDO | IPC_NOWAIT;
     proc_mutex_op_off.sem_num = 0;
     proc_mutex_op_off.sem_op = 1;
     proc_mutex_op_off.sem_flg = SEM_UNDO;
@@ -222,6 +232,23 @@ static apr_status_t proc_mutex_sysv_acquire(apr_proc_mutex_t *mutex)
     return APR_SUCCESS;
 }
 
+static apr_status_t proc_mutex_sysv_tryacquire(apr_proc_mutex_t *mutex)
+{
+    int rc;
+
+    do {
+        rc = semop(mutex->interproc->filedes, &proc_mutex_op_try, 1);
+    } while (rc < 0 && errno == EINTR);
+    if (rc < 0) {
+        if (errno == EAGAIN) {
+            return APR_EBUSY;
+        }
+        return errno;
+    }
+    mutex->curr_locked = 1;
+    return APR_SUCCESS;
+}
+
 static apr_status_t proc_mutex_sysv_release(apr_proc_mutex_t *mutex)
 {
     int rc;
@@ -245,7 +272,7 @@ static const apr_proc_mutex_unix_lock_methods_t mutex_sysv_methods =
 #endif
     proc_mutex_sysv_create,
     proc_mutex_sysv_acquire,
-    proc_mutex_no_tryacquire,
+    proc_mutex_sysv_tryacquire,
     proc_mutex_sysv_release,
     proc_mutex_sysv_cleanup,
     proc_mutex_no_child_init,
@@ -263,7 +290,7 @@ static apr_status_t proc_mutex_proc_pthread_cleanup(void *mutex_)
 
     if (mutex->curr_locked == 1) {
         if ((rv = pthread_mutex_unlock(mutex->pthread_interproc))) {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
             rv = errno;
 #endif
             return rv;
@@ -272,7 +299,7 @@ static apr_status_t proc_mutex_proc_pthread_cleanup(void *mutex_)
     /* curr_locked is set to -1 until the mutex has been created */
     if (mutex->curr_locked != -1) {
         if ((rv = pthread_mutex_destroy(mutex->pthread_interproc))) {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
             rv = errno;
 #endif
             return rv;
@@ -310,14 +337,14 @@ static apr_status_t proc_mutex_proc_pthread_create(apr_proc_mutex_t *new_mutex,
     new_mutex->curr_locked = -1; /* until the mutex has been created */
 
     if ((rv = pthread_mutexattr_init(&mattr))) {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
         proc_mutex_proc_pthread_cleanup(new_mutex);
         return rv;
     }
     if ((rv = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED))) {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
         proc_mutex_proc_pthread_cleanup(new_mutex);
@@ -328,7 +355,7 @@ static apr_status_t proc_mutex_proc_pthread_create(apr_proc_mutex_t *new_mutex,
 #ifdef HAVE_PTHREAD_MUTEX_ROBUST
     if ((rv = pthread_mutexattr_setrobust_np(&mattr, 
                                                PTHREAD_MUTEX_ROBUST_NP))) {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
         proc_mutex_proc_pthread_cleanup(new_mutex);
@@ -336,7 +363,7 @@ static apr_status_t proc_mutex_proc_pthread_create(apr_proc_mutex_t *new_mutex,
         return rv;
     }
     if ((rv = pthread_mutexattr_setprotocol(&mattr, PTHREAD_PRIO_INHERIT))) {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
         proc_mutex_proc_pthread_cleanup(new_mutex);
@@ -346,7 +373,7 @@ static apr_status_t proc_mutex_proc_pthread_create(apr_proc_mutex_t *new_mutex,
 #endif /* HAVE_PTHREAD_MUTEX_ROBUST */
 
     if ((rv = pthread_mutex_init(new_mutex->pthread_interproc, &mattr))) {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
         proc_mutex_proc_pthread_cleanup(new_mutex);
@@ -357,7 +384,7 @@ static apr_status_t proc_mutex_proc_pthread_create(apr_proc_mutex_t *new_mutex,
     new_mutex->curr_locked = 0; /* mutex created now */
 
     if ((rv = pthread_mutexattr_destroy(&mattr))) {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
         proc_mutex_proc_pthread_cleanup(new_mutex);
@@ -376,10 +403,10 @@ static apr_status_t proc_mutex_proc_pthread_acquire(apr_proc_mutex_t *mutex)
     apr_status_t rv;
 
     if ((rv = pthread_mutex_lock(mutex->pthread_interproc))) {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
-#ifdef HAVE_PTHREAD_MUTEXATTR_SETROBUST_NP
+#ifdef HAVE_PTHREAD_MUTEX_ROBUST
         /* Okay, our owner died.  Let's try to make it consistent again. */
         if (rv == EOWNERDEAD) {
             pthread_mutex_consistent_np(mutex->pthread_interproc);
@@ -394,7 +421,32 @@ static apr_status_t proc_mutex_proc_pthread_acquire(apr_proc_mutex_t *mutex)
     return APR_SUCCESS;
 }
 
-/* TODO: Add proc_mutex_proc_pthread_tryacquire(apr_proc_mutex_t *mutex) */
+static apr_status_t proc_mutex_proc_pthread_tryacquire(apr_proc_mutex_t *mutex)
+{
+    apr_status_t rv;
+ 
+    if ((rv = pthread_mutex_trylock(mutex->pthread_interproc))) {
+#ifdef HAVE_ZOS_PTHREADS 
+        rv = errno;
+#endif
+        if (rv == EBUSY) {
+            return APR_EBUSY;
+        }
+#ifdef HAVE_PTHREAD_MUTEX_ROBUST
+        /* Okay, our owner died.  Let's try to make it consistent again. */
+        if (rv == EOWNERDEAD) {
+            pthread_mutex_consistent_np(mutex->pthread_interproc);
+            rv = APR_SUCCESS;
+        }
+        else
+            return rv;
+#else
+        return rv;
+#endif
+    }
+    mutex->curr_locked = 1;
+    return rv;
+}
 
 static apr_status_t proc_mutex_proc_pthread_release(apr_proc_mutex_t *mutex)
 {
@@ -402,7 +454,7 @@ static apr_status_t proc_mutex_proc_pthread_release(apr_proc_mutex_t *mutex)
 
     mutex->curr_locked = 0;
     if ((rv = pthread_mutex_unlock(mutex->pthread_interproc))) {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
         return rv;
@@ -415,7 +467,7 @@ static const apr_proc_mutex_unix_lock_methods_t mutex_proc_pthread_methods =
     APR_PROCESS_LOCK_MECH_IS_GLOBAL,
     proc_mutex_proc_pthread_create,
     proc_mutex_proc_pthread_acquire,
-    proc_mutex_no_tryacquire,
+    proc_mutex_proc_pthread_tryacquire,
     proc_mutex_proc_pthread_release,
     proc_mutex_proc_pthread_cleanup,
     proc_mutex_no_child_init,
@@ -505,6 +557,23 @@ static apr_status_t proc_mutex_fcntl_acquire(apr_proc_mutex_t *mutex)
     return APR_SUCCESS;
 }
 
+static apr_status_t proc_mutex_fcntl_tryacquire(apr_proc_mutex_t *mutex)
+{
+    int rc;
+
+    do {
+        rc = fcntl(mutex->interproc->filedes, F_SETLK, &proc_mutex_lock_it);
+    } while (rc < 0 && errno == EINTR);
+    if (rc < 0) {
+        if (errno == EAGAIN) {
+            return APR_EBUSY;
+        }
+        return errno;
+    }
+    mutex->curr_locked = 1;
+    return APR_SUCCESS;
+}
+
 static apr_status_t proc_mutex_fcntl_release(apr_proc_mutex_t *mutex)
 {
     int rc;
@@ -528,7 +597,7 @@ static const apr_proc_mutex_unix_lock_methods_t mutex_fcntl_methods =
 #endif
     proc_mutex_fcntl_create,
     proc_mutex_fcntl_acquire,
-    proc_mutex_no_tryacquire,
+    proc_mutex_fcntl_tryacquire,
     proc_mutex_fcntl_release,
     proc_mutex_fcntl_cleanup,
     proc_mutex_no_child_init,
@@ -602,6 +671,23 @@ static apr_status_t proc_mutex_flock_acquire(apr_proc_mutex_t *mutex)
     return APR_SUCCESS;
 }
 
+static apr_status_t proc_mutex_flock_tryacquire(apr_proc_mutex_t *mutex)
+{
+    int rc;
+
+    do {
+        rc = flock(mutex->interproc->filedes, LOCK_EX | LOCK_NB);
+    } while (rc < 0 && errno == EINTR);
+    if (rc < 0) {
+        if (errno == EWOULDBLOCK) {
+            return APR_EBUSY;
+        }
+        return errno;
+    }
+    mutex->curr_locked = 1;
+    return APR_SUCCESS;
+}
+
 static apr_status_t proc_mutex_flock_release(apr_proc_mutex_t *mutex)
 {
     int rc;
@@ -649,7 +735,7 @@ static const apr_proc_mutex_unix_lock_methods_t mutex_flock_methods =
 #endif
     proc_mutex_flock_create,
     proc_mutex_flock_acquire,
-    proc_mutex_no_tryacquire,
+    proc_mutex_flock_tryacquire,
     proc_mutex_flock_release,
     proc_mutex_flock_cleanup,
     proc_mutex_flock_child_init,
diff --git a/srclib/apr/locks/unix/thread_cond.c b/srclib/apr/locks/unix/thread_cond.c
index 227c1d7f..db7dd4f0 100644
--- a/srclib/apr/locks/unix/thread_cond.c
+++ b/srclib/apr/locks/unix/thread_cond.c
@@ -27,7 +27,7 @@ static apr_status_t thread_cond_cleanup(void *data)
     apr_status_t rv;
 
     rv = pthread_cond_destroy(&cond->cond);
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     if (rv) {
         rv = errno;
     }
@@ -46,7 +46,7 @@ APR_DECLARE(apr_status_t) apr_thread_cond_create(apr_thread_cond_t **cond,
     new_cond->pool = pool;
 
     if ((rv = pthread_cond_init(&new_cond->cond, NULL))) {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
         return rv;
@@ -66,7 +66,7 @@ APR_DECLARE(apr_status_t) apr_thread_cond_wait(apr_thread_cond_t *cond,
     apr_status_t rv;
 
     rv = pthread_cond_wait(&cond->cond, &mutex->mutex);
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     if (rv) {
         rv = errno;
     }
@@ -87,7 +87,7 @@ APR_DECLARE(apr_status_t) apr_thread_cond_timedwait(apr_thread_cond_t *cond,
     abstime.tv_nsec = apr_time_usec(then) * 1000; /* nanoseconds */
 
     rv = pthread_cond_timedwait(&cond->cond, &mutex->mutex, &abstime);
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     if (rv) {
         rv = errno;
     }
@@ -104,7 +104,7 @@ APR_DECLARE(apr_status_t) apr_thread_cond_signal(apr_thread_cond_t *cond)
     apr_status_t rv;
 
     rv = pthread_cond_signal(&cond->cond);
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     if (rv) {
         rv = errno;
     }
@@ -117,7 +117,7 @@ APR_DECLARE(apr_status_t) apr_thread_cond_broadcast(apr_thread_cond_t *cond)
     apr_status_t rv;
 
     rv = pthread_cond_broadcast(&cond->cond);
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     if (rv) {
         rv = errno;
     }
diff --git a/srclib/apr/locks/unix/thread_mutex.c b/srclib/apr/locks/unix/thread_mutex.c
index e146a28f..73fd1e14 100644
--- a/srclib/apr/locks/unix/thread_mutex.c
+++ b/srclib/apr/locks/unix/thread_mutex.c
@@ -26,7 +26,7 @@ static apr_status_t thread_mutex_cleanup(void *data)
     apr_status_t rv;
 
     rv = pthread_mutex_destroy(&mutex->mutex);
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     if (rv) {
         rv = errno;
     }
@@ -71,7 +71,7 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_create(apr_thread_mutex_t **mutex,
         rv = pthread_mutex_init(&new_mutex->mutex, NULL);
 
     if (rv) {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
         return rv;
@@ -90,7 +90,7 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_lock(apr_thread_mutex_t *mutex)
     apr_status_t rv;
 
     rv = pthread_mutex_lock(&mutex->mutex);
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     if (rv) {
         rv = errno;
     }
@@ -105,7 +105,7 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_trylock(apr_thread_mutex_t *mutex)
 
     rv = pthread_mutex_trylock(&mutex->mutex);
     if (rv) {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
         return (rv == EBUSY) ? APR_EBUSY : rv;
@@ -119,7 +119,7 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_unlock(apr_thread_mutex_t *mutex)
     apr_status_t status;
 
     status = pthread_mutex_unlock(&mutex->mutex);
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     if (status) {
         status = errno;
     }
diff --git a/srclib/apr/locks/unix/thread_rwlock.c b/srclib/apr/locks/unix/thread_rwlock.c
index 4b28bb61..0f8b7a79 100644
--- a/srclib/apr/locks/unix/thread_rwlock.c
+++ b/srclib/apr/locks/unix/thread_rwlock.c
@@ -29,7 +29,7 @@ static apr_status_t thread_rwlock_cleanup(void *data)
     apr_status_t stat;
 
     stat = pthread_rwlock_destroy(&rwlock->rwlock);
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     if (stat) {
         stat = errno;
     }
@@ -47,7 +47,7 @@ APR_DECLARE(apr_status_t) apr_thread_rwlock_create(apr_thread_rwlock_t **rwlock,
     new_rwlock->pool = pool;
 
     if ((stat = pthread_rwlock_init(&new_rwlock->rwlock, NULL))) {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         stat = errno;
 #endif
         return stat;
@@ -66,7 +66,7 @@ APR_DECLARE(apr_status_t) apr_thread_rwlock_rdlock(apr_thread_rwlock_t *rwlock)
     apr_status_t stat;
 
     stat = pthread_rwlock_rdlock(&rwlock->rwlock);
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     if (stat) {
         stat = errno;
     }
@@ -79,7 +79,7 @@ APR_DECLARE(apr_status_t) apr_thread_rwlock_tryrdlock(apr_thread_rwlock_t *rwloc
     apr_status_t stat;
 
     stat = pthread_rwlock_tryrdlock(&rwlock->rwlock);
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     if (stat) {
         stat = errno;
     }
@@ -95,7 +95,7 @@ APR_DECLARE(apr_status_t) apr_thread_rwlock_wrlock(apr_thread_rwlock_t *rwlock)
     apr_status_t stat;
 
     stat = pthread_rwlock_wrlock(&rwlock->rwlock);
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     if (stat) {
         stat = errno;
     }
@@ -108,7 +108,7 @@ APR_DECLARE(apr_status_t) apr_thread_rwlock_trywrlock(apr_thread_rwlock_t *rwloc
     apr_status_t stat;
 
     stat = pthread_rwlock_trywrlock(&rwlock->rwlock);
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     if (stat) {
         stat = errno;
     }
@@ -124,7 +124,7 @@ APR_DECLARE(apr_status_t) apr_thread_rwlock_unlock(apr_thread_rwlock_t *rwlock)
     apr_status_t stat;
 
     stat = pthread_rwlock_unlock(&rwlock->rwlock);
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     if (stat) {
         stat = errno;
     }
diff --git a/srclib/apr/locks/win32/proc_mutex.c b/srclib/apr/locks/win32/proc_mutex.c
index e60d5609..ecb6f14d 100644
--- a/srclib/apr/locks/win32/proc_mutex.c
+++ b/srclib/apr/locks/win32/proc_mutex.c
@@ -141,9 +141,6 @@ APR_DECLARE(apr_status_t) apr_proc_mutex_lock(apr_proc_mutex_t *mutex)
 
     if (rv == WAIT_OBJECT_0 || rv == WAIT_ABANDONED) {
         return APR_SUCCESS;
-    } 
-    else if (rv == WAIT_TIMEOUT) {
-        return APR_EBUSY;
     }
     return apr_get_os_error();
 }
diff --git a/srclib/apr/locks/win32/thread_cond.c b/srclib/apr/locks/win32/thread_cond.c
index ac71a419..60286e54 100644
--- a/srclib/apr/locks/win32/thread_cond.c
+++ b/srclib/apr/locks/win32/thread_cond.c
@@ -18,63 +18,98 @@
 #include "apr_private.h"
 #include "apr_general.h"
 #include "apr_strings.h"
-#include "win32/apr_arch_thread_mutex.h"
-#include "win32/apr_arch_thread_cond.h"
+#include "apr_arch_thread_mutex.h"
+#include "apr_arch_thread_cond.h"
 #include "apr_portable.h"
 
+#include <limits.h>
+
 static apr_status_t thread_cond_cleanup(void *data)
 {
     apr_thread_cond_t *cond = data;
-    CloseHandle(cond->event);
+    CloseHandle(cond->semaphore);
+    DeleteCriticalSection(&cond->csection);
     return APR_SUCCESS;
 }
 
 APR_DECLARE(apr_status_t) apr_thread_cond_create(apr_thread_cond_t **cond,
                                                  apr_pool_t *pool)
 {
-    *cond = apr_palloc(pool, sizeof(**cond));
-    (*cond)->pool = pool;
-    (*cond)->event = CreateEvent(NULL, TRUE, FALSE, NULL);
-    (*cond)->signal_all = 0;
-    (*cond)->num_waiting = 0;
+    apr_thread_cond_t *cv;
+
+    cv = apr_pcalloc(pool, sizeof(**cond));
+    if (cv == NULL) {
+        return APR_ENOMEM;
+    }
+
+    cv->semaphore = CreateSemaphore(NULL, 0, LONG_MAX, NULL);
+    if (cv->semaphore == NULL) {
+        return apr_get_os_error();
+    }
+
+    *cond = cv;
+    cv->pool = pool;
+    InitializeCriticalSection(&cv->csection);
+    apr_pool_cleanup_register(cv->pool, cv, thread_cond_cleanup,
+                              apr_pool_cleanup_null);
+
     return APR_SUCCESS;
 }
 
+APR_DECLARE(apr_status_t) apr_thread_cond_destroy(apr_thread_cond_t *cond)
+{
+    return apr_pool_cleanup_run(cond->pool, cond, thread_cond_cleanup);
+}
+
 static APR_INLINE apr_status_t _thread_cond_timedwait(apr_thread_cond_t *cond,
                                                       apr_thread_mutex_t *mutex,
                                                       DWORD timeout_ms )
 {
     DWORD res;
-
-    while (1) {
-        cond->num_waiting++;
-
-        apr_thread_mutex_unlock(mutex);
-        res = WaitForSingleObject(cond->event, timeout_ms);
-        apr_thread_mutex_lock(mutex);
-        cond->num_waiting--;
-        if (res != WAIT_OBJECT_0) {
-            apr_status_t rv = apr_get_os_error();
-            if (res == WAIT_TIMEOUT) {
-                return APR_TIMEUP;
+    apr_status_t rv;
+    unsigned int wake = 0;
+    unsigned long generation;
+
+    EnterCriticalSection(&cond->csection);
+    cond->num_waiting++;
+    generation = cond->generation;
+    LeaveCriticalSection(&cond->csection);
+
+    apr_thread_mutex_unlock(mutex);
+
+    do {
+        res = WaitForSingleObject(cond->semaphore, timeout_ms);
+
+        EnterCriticalSection(&cond->csection);
+
+        if (cond->num_wake) {
+            if (cond->generation != generation) {
+                cond->num_wake--;
+                cond->num_waiting--;
+                rv = APR_SUCCESS;
+                break;
+            } else {
+                wake = 1;
             }
-            return apr_get_os_error();
         }
-        if (cond->signal_all) {
-            if (cond->num_waiting == 0) {
-                cond->signal_all = 0;
-                cond->signalled = 0;
-                ResetEvent(cond->event);
-            }
+        else if (res != WAIT_OBJECT_0) {
+            cond->num_waiting--;
+            rv = APR_TIMEUP;
             break;
         }
-        else if (cond->signalled) {
-            cond->signalled = 0;
-            ResetEvent(cond->event);
-            break;
+
+        LeaveCriticalSection(&cond->csection);
+
+        if (wake) {
+            wake = 0;
+            ReleaseSemaphore(cond->semaphore, 1, NULL);
         }
-    }
-    return APR_SUCCESS;
+    } while (1);
+
+    LeaveCriticalSection(&cond->csection);
+    apr_thread_mutex_lock(mutex);
+
+    return rv;
 }
 
 APR_DECLARE(apr_status_t) apr_thread_cond_wait(apr_thread_cond_t *cond,
@@ -94,35 +129,40 @@ APR_DECLARE(apr_status_t) apr_thread_cond_timedwait(apr_thread_cond_t *cond,
 
 APR_DECLARE(apr_status_t) apr_thread_cond_signal(apr_thread_cond_t *cond)
 {
-    apr_status_t rv = APR_SUCCESS;
-    DWORD res;
+    unsigned int wake = 0;
 
-    cond->signalled = 1;
-    res = SetEvent(cond->event);
-    if (res == 0) {
-        rv = apr_get_os_error();
+    EnterCriticalSection(&cond->csection);
+    if (cond->num_waiting > cond->num_wake) {
+        wake = 1;
+        cond->num_wake++;
+        cond->generation++;
     }
-    return rv;
+    LeaveCriticalSection(&cond->csection);
+
+    if (wake) {
+        ReleaseSemaphore(cond->semaphore, 1, NULL);
+    }
+
+    return APR_SUCCESS;
 }
 
 APR_DECLARE(apr_status_t) apr_thread_cond_broadcast(apr_thread_cond_t *cond)
 {
-    apr_status_t rv = APR_SUCCESS;
-    DWORD res;
+    unsigned long num_wake = 0;
 
-    cond->signalled = 1;
-    cond->signal_all = 1;
-    res = SetEvent(cond->event);
-    if (res == 0) {
-        rv = apr_get_os_error();
+    EnterCriticalSection(&cond->csection);
+    if (cond->num_waiting > cond->num_wake) {
+        num_wake = cond->num_waiting - cond->num_wake;
+        cond->num_wake = cond->num_waiting;
+        cond->generation++;
     }
-    return rv;
-}
+    LeaveCriticalSection(&cond->csection);
 
-APR_DECLARE(apr_status_t) apr_thread_cond_destroy(apr_thread_cond_t *cond)
-{
-    return apr_pool_cleanup_run(cond->pool, cond, thread_cond_cleanup);
+    if (num_wake) {
+        ReleaseSemaphore(cond->semaphore, num_wake, NULL);
+    }
+
+    return APR_SUCCESS;
 }
 
 APR_POOL_IMPLEMENT_ACCESSOR(thread_cond)
-
diff --git a/srclib/apr/locks/win32/thread_rwlock.c b/srclib/apr/locks/win32/thread_rwlock.c
index 7099509f..fd9d579f 100644
--- a/srclib/apr/locks/win32/thread_rwlock.c
+++ b/srclib/apr/locks/win32/thread_rwlock.c
@@ -18,7 +18,7 @@
 #include "apr_private.h"
 #include "apr_general.h"
 #include "apr_strings.h"
-#include "win32/apr_arch_thread_rwlock.h"
+#include "apr_arch_thread_rwlock.h"
 #include "apr_portable.h"
 
 static apr_status_t thread_rwlock_cleanup(void *data)
diff --git a/srclib/apr/memory/unix/apr_pools.c b/srclib/apr/memory/unix/apr_pools.c
index 2e3d5378..c080232e 100644
--- a/srclib/apr/memory/unix/apr_pools.c
+++ b/srclib/apr/memory/unix/apr_pools.c
@@ -501,6 +501,8 @@ struct apr_pool_t {
 #ifdef NETWARE
     apr_os_proc_t         owner_proc;
 #endif /* defined(NETWARE) */
+    cleanup_t            *pre_cleanups;
+    cleanup_t            *free_pre_cleanups;
 };
 
 #define SIZEOF_POOL_T       APR_ALIGN_DEFAULT(sizeof(apr_pool_t))
@@ -562,6 +564,9 @@ APR_DECLARE(apr_status_t) apr_pool_initialize(void)
 
     /* This has to happen here because mutexes might be backed by
      * atomics.  It used to be snug and safe in apr_initialize().
+     *
+     * Warning: apr_atomic_init() must always be called, by any
+     * means possible, from apr_initialize().
      */
     if ((rv = apr_atomic_init(global_pool)) != APR_SUCCESS) {
         return rv;
@@ -616,6 +621,9 @@ APR_DECLARE(void) apr_pool_terminate(void)
     node->next->ref = node->ref;                \
 } while (0)
 
+/* Returns the amount of free space in the given node. */
+#define node_free_space(node_) ((apr_size_t)(node_->endp - node_->first_avail))
+
 /*
  * Memory allocation
  */
@@ -630,7 +638,7 @@ APR_DECLARE(void *) apr_palloc(apr_pool_t *pool, apr_size_t size)
     active = pool->active;
 
     /* If the active node has enough bytes left, use it. */
-    if (size < (apr_size_t)(active->endp - active->first_avail)) {
+    if (size <= node_free_space(active)) {
         mem = active->first_avail;
         active->first_avail += size;
 
@@ -638,7 +646,7 @@ APR_DECLARE(void *) apr_palloc(apr_pool_t *pool, apr_size_t size)
     }
 
     node = active->next;
-    if (size < (apr_size_t)(node->endp - node->first_avail)) {
+    if (size <= node_free_space(node)) {
         list_remove(node);
     }
     else {
@@ -708,6 +716,11 @@ APR_DECLARE(void) apr_pool_clear(apr_pool_t *pool)
 {
     apr_memnode_t *active;
 
+    /* Run pre destroy cleanups */
+    run_cleanups(&pool->pre_cleanups);
+    pool->pre_cleanups = NULL;
+    pool->free_pre_cleanups = NULL;
+
     /* Destroy the subpools.  The subpools will detach themselves from
      * this pool thus this loop is safe and easy.
      */
@@ -746,6 +759,11 @@ APR_DECLARE(void) apr_pool_destroy(apr_pool_t *pool)
     apr_memnode_t *active;
     apr_allocator_t *allocator;
 
+    /* Run pre destroy cleanups */
+    run_cleanups(&pool->pre_cleanups);
+    pool->pre_cleanups = NULL;
+    pool->free_pre_cleanups = NULL;
+
     /* Destroy the subpools.  The subpools will detach themselve from
      * this pool thus this loop is safe and easy.
      */
@@ -820,6 +838,10 @@ APR_DECLARE(apr_status_t) apr_pool_create_ex(apr_pool_t **newpool,
     if (!parent)
         parent = global_pool;
 
+    /* parent will always be non-NULL here except the first time a
+     * pool is created, in which case allocator is guaranteed to be
+     * non-NULL. */
+
     if (!abort_fn && parent)
         abort_fn = parent->abort_fn;
 
@@ -846,6 +868,8 @@ APR_DECLARE(apr_status_t) apr_pool_create_ex(apr_pool_t **newpool,
     pool->child = NULL;
     pool->cleanups = NULL;
     pool->free_cleanups = NULL;
+    pool->pre_cleanups = NULL;
+    pool->free_pre_cleanups = NULL;
     pool->subprocesses = NULL;
     pool->user_data = NULL;
     pool->tag = NULL;
@@ -883,6 +907,66 @@ APR_DECLARE(apr_status_t) apr_pool_create_ex(apr_pool_t **newpool,
     return APR_SUCCESS;
 }
 
+APR_DECLARE(apr_status_t) apr_pool_create_core_ex(apr_pool_t **newpool,
+                                                  apr_abortfunc_t abort_fn,
+                                                  apr_allocator_t *allocator)
+{
+    apr_pool_t *pool;
+    apr_memnode_t *node;
+    apr_allocator_t *pool_allocator;
+
+    *newpool = NULL;
+
+    if (!apr_pools_initialized)
+        return APR_ENOPOOL;
+    if ((pool_allocator = allocator) == NULL) {
+        if ((pool_allocator = malloc(SIZEOF_ALLOCATOR_T)) == NULL) {
+            if (abort_fn)
+                abort_fn(APR_ENOMEM);
+
+            return APR_ENOMEM;
+        }
+        memset(pool_allocator, 0, SIZEOF_ALLOCATOR_T);
+        pool_allocator->max_free_index = APR_ALLOCATOR_MAX_FREE_UNLIMITED;
+    }
+    if ((node = allocator_alloc(pool_allocator,
+                                MIN_ALLOC - APR_MEMNODE_T_SIZE)) == NULL) {
+        if (abort_fn)
+            abort_fn(APR_ENOMEM);
+
+        return APR_ENOMEM;
+    }
+
+    node->next = node;
+    node->ref = &node->next;
+
+    pool = (apr_pool_t *)node->first_avail;
+    node->first_avail = pool->self_first_avail = (char *)pool + SIZEOF_POOL_T;
+
+    pool->allocator = pool_allocator;
+    pool->active = pool->self = node;
+    pool->abort_fn = abort_fn;
+    pool->child = NULL;
+    pool->cleanups = NULL;
+    pool->free_cleanups = NULL;
+    pool->pre_cleanups = NULL;
+    pool->free_pre_cleanups = NULL;
+    pool->subprocesses = NULL;
+    pool->user_data = NULL;
+    pool->tag = NULL;
+    pool->parent = NULL;
+    pool->sibling = NULL;
+    pool->ref = NULL;
+
+#ifdef NETWARE
+    pool->owner_proc = (apr_os_proc_t)getnlmhandle();
+#endif /* defined(NETWARE) */
+    if (!allocator)
+        pool_allocator->owner = pool;
+    *newpool = pool;
+
+    return APR_SUCCESS;
+}
 
 /*
  * "Print" functions
@@ -936,8 +1020,7 @@ static int psprintf_flush(apr_vformatter_buff_t *vbuff)
         size = APR_PSPRINTF_MIN_STRINGSIZE;
 
     node = active->next;
-    if (!ps->got_a_new_node
-        && size < (apr_size_t)(node->endp - node->first_avail)) {
+    if (!ps->got_a_new_node && size <= node_free_space(node)) {
 
         list_remove(node);
         list_insert(node, active);
@@ -1129,7 +1212,7 @@ static void apr_pool_log_event(apr_pool_t *pool, const char *event,
                 "] "
                 "%7s "
                 "(%10lu/%10lu/%10lu) "
-                "0x%08X \"%s\" "
+                "0x%pp \"%s\" "
                 "<%s> "
                 "(%u/%u/%u) "
                 "\n",
@@ -1141,7 +1224,7 @@ static void apr_pool_log_event(apr_pool_t *pool, const char *event,
                 (unsigned long)apr_pool_num_bytes(pool, 0),
                 (unsigned long)apr_pool_num_bytes(pool, 1),
                 (unsigned long)apr_pool_num_bytes(global_pool, 1),
-                (unsigned int)pool, pool->tag,
+                pool, pool->tag,
                 file_line,
                 pool->stat_alloc, pool->stat_total_alloc, pool->stat_clear);
         }
@@ -1155,7 +1238,7 @@ static void apr_pool_log_event(apr_pool_t *pool, const char *event,
                 "] "
                 "%7s "
                 "                                   "
-                "0x%08X "
+                "0x%pp "
                 "<%s> "
                 "\n",
                 (unsigned long)getpid(),
@@ -1163,7 +1246,7 @@ static void apr_pool_log_event(apr_pool_t *pool, const char *event,
                 (unsigned long)apr_os_thread_current(),
 #endif /* APR_HAS_THREADS */
                 event,
-                (unsigned int)pool,
+                pool,
                 file_line);
         }
     }
@@ -1235,6 +1318,7 @@ APR_DECLARE(apr_status_t) apr_pool_initialize(void)
     apr_status_t rv;
 #if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL)
     char *logpath;
+    apr_file_t *debug_log = NULL;
 #endif
 
     if (apr_pools_initialized++)
@@ -1264,14 +1348,21 @@ APR_DECLARE(apr_status_t) apr_pool_initialize(void)
 #if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE_ALL)
     rv = apr_env_get(&logpath, "APR_POOL_DEBUG_LOG", global_pool);
 
+    /* Don't pass file_stderr directly to apr_file_open() here, since
+     * apr_file_open() can call back to apr_pool_log_event() and that
+     * may attempt to use then then non-NULL but partially set up file
+     * object. */
     if (rv == APR_SUCCESS) {
-        apr_file_open(&file_stderr, logpath, APR_APPEND|APR_WRITE|APR_CREATE,
+        apr_file_open(&debug_log, logpath, APR_APPEND|APR_WRITE|APR_CREATE,
                       APR_OS_DEFAULT, global_pool);
     }
     else {
-        apr_file_open_stderr(&file_stderr, global_pool);
+        apr_file_open_stderr(&debug_log, global_pool);
     }
 
+    /* debug_log is now a file handle. */
+    file_stderr = debug_log;
+
     if (file_stderr) {
         apr_file_printf(file_stderr,
             "POOL DEBUG: [PID"
@@ -1293,7 +1384,8 @@ APR_DECLARE(void) apr_pool_terminate(void)
     if (!apr_pools_initialized)
         return;
 
-    apr_pools_initialized = 0;
+    if (--apr_pools_initialized)
+        return;
 
     apr_pool_destroy(global_pool); /* This will also destroy the mutex */
     global_pool = NULL;
@@ -1391,6 +1483,11 @@ static void pool_clear_debug(apr_pool_t *pool, const char *file_line)
     debug_node_t *node;
     apr_uint32_t index;
 
+    /* Run pre destroy cleanups */
+    run_cleanups(&pool->pre_cleanups);
+    pool->pre_cleanups = NULL;
+    pool->free_pre_cleanups = NULL;
+
     /* Destroy the subpools.  The subpools will detach themselves from
      * this pool thus this loop is safe and easy.
      */
@@ -1420,7 +1517,7 @@ static void pool_clear_debug(apr_pool_t *pool, const char *file_line)
 
         for (index = 0; index < node->index; index++) {
             memset(node->beginp[index], POOL_POISON_BYTE,
-                   node->endp[index] - node->beginp[index]);
+                   (char *)node->endp[index] - (char *)node->beginp[index]);
             free(node->beginp[index]);
         }
 
@@ -1629,6 +1726,75 @@ APR_DECLARE(apr_status_t) apr_pool_create_ex_debug(apr_pool_t **newpool,
     return APR_SUCCESS;
 }
 
+APR_DECLARE(apr_status_t) apr_pool_create_core_ex_debug(apr_pool_t **newpool,
+                                                   apr_abortfunc_t abort_fn,
+                                                   apr_allocator_t *allocator,
+                                                   const char *file_line)
+{
+    apr_pool_t *pool;
+    apr_allocator_t *pool_allocator;
+
+    *newpool = NULL;
+
+    if ((pool = malloc(SIZEOF_POOL_T)) == NULL) {
+        if (abort_fn)
+            abort_fn(APR_ENOMEM);
+
+         return APR_ENOMEM;
+    }
+
+    memset(pool, 0, SIZEOF_POOL_T);
+
+    pool->abort_fn = abort_fn;
+    pool->tag = file_line;
+    pool->file_line = file_line;
+
+#if APR_HAS_THREADS
+    pool->owner = apr_os_thread_current();
+#endif /* APR_HAS_THREADS */
+#ifdef NETWARE
+    pool->owner_proc = (apr_os_proc_t)getnlmhandle();
+#endif /* defined(NETWARE) */
+
+    if ((pool_allocator = allocator) == NULL) {
+        apr_status_t rv;
+        if ((rv = apr_allocator_create(&pool_allocator)) != APR_SUCCESS) {
+            if (abort_fn)
+                abort_fn(rv);
+            return rv;
+        }
+        pool_allocator->owner = pool;
+    }
+    pool->allocator = pool_allocator;
+
+    if (pool->allocator != allocator) {
+#if APR_HAS_THREADS
+        apr_status_t rv;
+
+        /* No matter what the creation flags say, always create
+         * a lock.  Without it integrity_check and apr_pool_num_bytes
+         * blow up (because they traverse pools child lists that
+         * possibly belong to another thread, in combination with
+         * the pool having no lock).  However, this might actually
+         * hide problems like creating a child pool of a pool
+         * belonging to another thread.
+         */
+        if ((rv = apr_thread_mutex_create(&pool->mutex,
+                APR_THREAD_MUTEX_NESTED, pool)) != APR_SUCCESS) {
+            free(pool);
+            return rv;
+        }
+#endif /* APR_HAS_THREADS */
+    }
+
+    *newpool = pool;
+
+#if (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE)
+    apr_pool_log_event(pool, "CREATE", file_line, 1);
+#endif /* (APR_POOL_DEBUG & APR_POOL_DEBUG_VERBOSE) */
+
+    return APR_SUCCESS;
+}
 
 /*
  * "Print" functions (debug)
@@ -1848,7 +2014,7 @@ APR_DECLARE(apr_pool_t *) apr_pool_parent_get(apr_pool_t *pool)
     /* On NetWare, don't return the global_pool, return the application pool 
        as the top most pool */
     if (pool->parent == global_pool)
-        return NULL;
+        return pool;
     else
 #endif
     return pool->parent;
@@ -1995,6 +2161,30 @@ APR_DECLARE(void) apr_pool_cleanup_register(apr_pool_t *p, const void *data,
     }
 }
 
+APR_DECLARE(void) apr_pool_pre_cleanup_register(apr_pool_t *p, const void *data,
+                      apr_status_t (*plain_cleanup_fn)(void *data))
+{
+    cleanup_t *c;
+
+#if APR_POOL_DEBUG
+    apr_pool_check_integrity(p);
+#endif /* APR_POOL_DEBUG */
+
+    if (p != NULL) {
+        if (p->free_pre_cleanups) {
+            /* reuse a cleanup structure */
+            c = p->free_pre_cleanups;
+            p->free_pre_cleanups = c->next;
+        } else {
+            c = apr_palloc(p, sizeof(cleanup_t));
+        }
+        c->data = data;
+        c->plain_cleanup_fn = plain_cleanup_fn;
+        c->next = p->cleanups;
+        p->cleanups = c;
+    }
+}
+
 APR_DECLARE(void) apr_pool_cleanup_kill(apr_pool_t *p, const void *data,
                       apr_status_t (*cleanup_fn)(void *))
 {
@@ -2010,6 +2200,15 @@ APR_DECLARE(void) apr_pool_cleanup_kill(apr_pool_t *p, const void *data,
     c = p->cleanups;
     lastp = &p->cleanups;
     while (c) {
+#if APR_POOL_DEBUG
+        /* Some cheap loop detection to catch a corrupt list: */
+        if (c == c->next
+            || (c->next && c == c->next->next)
+            || (c->next && c->next->next && c == c->next->next->next)) {
+            abort();
+        }
+#endif
+
         if (c->data == data && c->plain_cleanup_fn == cleanup_fn) {
             *lastp = c->next;
             /* move to freelist */
@@ -2021,6 +2220,32 @@ APR_DECLARE(void) apr_pool_cleanup_kill(apr_pool_t *p, const void *data,
         lastp = &c->next;
         c = c->next;
     }
+
+    /* Remove any pre-cleanup as well */
+    c = p->pre_cleanups;
+    lastp = &p->pre_cleanups;
+    while (c) {
+#if APR_POOL_DEBUG
+        /* Some cheap loop detection to catch a corrupt list: */
+        if (c == c->next
+            || (c->next && c == c->next->next)
+            || (c->next && c->next->next && c == c->next->next->next)) {
+            abort();
+        }
+#endif
+
+        if (c->data == data && c->plain_cleanup_fn == cleanup_fn) {
+            *lastp = c->next;
+            /* move to freelist */
+            c->next = p->free_pre_cleanups;
+            p->free_pre_cleanups = c;
+            break;
+        }
+
+        lastp = &c->next;
+        c = c->next;
+    }
+
 }
 
 APR_DECLARE(void) apr_pool_child_cleanup_set(apr_pool_t *p, const void *data,
@@ -2261,6 +2486,14 @@ APR_DECLARE(apr_status_t) apr_pool_create_ex_debug(apr_pool_t **newpool,
     return apr_pool_create_ex(newpool, parent, abort_fn, allocator);
 }
 
+APR_DECLARE(apr_status_t) apr_pool_create_core_ex_debug(apr_pool_t **newpool,
+                                                   apr_abortfunc_t abort_fn,
+                                                   apr_allocator_t *allocator,
+                                                   const char *file_line)
+{
+    return apr_pool_create_core_ex(newpool, abort_fn, allocator);
+}
+
 #else /* APR_POOL_DEBUG */
 
 #undef apr_palloc
@@ -2311,4 +2544,17 @@ APR_DECLARE(apr_status_t) apr_pool_create_ex(apr_pool_t **newpool,
                                     "undefined");
 }
 
+#undef apr_pool_create_core_ex
+APR_DECLARE(apr_status_t) apr_pool_create_core_ex(apr_pool_t **newpool,
+                                                  apr_abortfunc_t abort_fn,
+                                                  apr_allocator_t *allocator);
+
+APR_DECLARE(apr_status_t) apr_pool_create_core_ex(apr_pool_t **newpool,
+                                                  apr_abortfunc_t abort_fn,
+                                                  apr_allocator_t *allocator)
+{
+    return apr_pool_create_core_ex_debug(newpool, abort_fn,
+                                         allocator, "undefined");
+}
+
 #endif /* APR_POOL_DEBUG */
diff --git a/srclib/apr/misc/netware/start.c b/srclib/apr/misc/netware/start.c
index c8ccc1c1..1e5708d1 100644
--- a/srclib/apr/misc/netware/start.c
+++ b/srclib/apr/misc/netware/start.c
@@ -38,6 +38,7 @@
 
 int (*WSAStartupWithNLMHandle)( WORD version, LPWSADATA data, void *handle ) = NULL;
 int (*WSACleanupWithNLMHandle)( void *handle ) = NULL;
+apr_status_t apr_ldap_rebind_init(apr_pool_t *pool);
 
 static int wsa_startup_with_handle (WORD wVersionRequested, LPWSADATA data, void *handle)
 {
@@ -151,6 +152,7 @@ APR_DECLARE(apr_status_t) apr_initialize(void)
 #endif
 
     apr_signal_init(pool);
+    apr_ldap_rebind_init(pool);
 
     return APR_SUCCESS;
 }
diff --git a/srclib/apr/misc/unix/env.c b/srclib/apr/misc/unix/env.c
index 9ba6b61e..b41f8f17 100644
--- a/srclib/apr/misc/unix/env.c
+++ b/srclib/apr/misc/unix/env.c
@@ -19,6 +19,7 @@
 #include "apr.h"
 #include "apr_private.h"
 #include "apr_env.h"
+#include "apr_strings.h"
 
 #if APR_HAVE_UNISTD_H
 #include <unistd.h>
@@ -57,17 +58,7 @@ APR_DECLARE(apr_status_t) apr_env_set(const char *envvar,
 
 #elif defined(HAVE_PUTENV)
 
-    apr_size_t elen = strlen(envvar);
-    apr_size_t vlen = strlen(value);
-    char *env = apr_palloc(pool, elen + vlen + 2);
-    char *p = env + elen;
-
-    memcpy(env, envvar, elen);
-    *p++ = '=';
-    memcpy(p, value, vlen);
-    p[vlen] = '\0';
-
-    if (0 > putenv(env))
+    if (0 > putenv(apr_pstrcat(pool, envvar, "=", value, NULL)))
         return APR_ENOMEM;
     return APR_SUCCESS;
 
diff --git a/srclib/apr/misc/unix/errorcodes.c b/srclib/apr/misc/unix/errorcodes.c
index e953d109..99a81351 100644
--- a/srclib/apr/misc/unix/errorcodes.c
+++ b/srclib/apr/misc/unix/errorcodes.c
@@ -125,7 +125,7 @@ static char *apr_error_string(apr_status_t statcode)
     case APR_EABOVEROOT:
         return "The given path was above the root path";
     case APR_EBADPATH:
-        return "The given path misformatted or contained invalid characters";
+        return "The given path is misformatted or contained invalid characters";
     case APR_EPATHWILD:
         return "The given path contained wildcard characters";
     case APR_EPROC_UNKNOWN:
@@ -247,14 +247,34 @@ static char *apr_os_strerror(char *buf, apr_size_t bufsize, apr_status_t errcode
     apr_size_t len=0, i;
 
 #ifndef NETWARE
-    len = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM 
+#ifndef _WIN32_WCE
+    len = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM 
                       | FORMAT_MESSAGE_IGNORE_INSERTS,
                         NULL,
                         errcode,
                         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */
-                        (LPTSTR) buf,
+                        buf,
                         (DWORD)bufsize,
                         NULL);
+#else /* _WIN32_WCE speaks unicode */
+     LPTSTR msg = (LPTSTR) buf;
+     len = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM 
+                       | FORMAT_MESSAGE_IGNORE_INSERTS,
+                         NULL,
+                         errcode,
+                         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */
+                         msg,
+                         (DWORD) (bufsize/sizeof(TCHAR)),
+                         NULL);
+     /* in-place convert to US-ASCII, substituting '?' for non ASCII   */
+     for(i = 0; i <= len; i++) {
+        if (msg[i] < 0x80 && msg[i] >= 0) {
+            buf[i] = (char) msg[i];
+        } else {
+            buf[i] = '?';
+        }
+    }
+#endif
 #endif
 
     if (!len) {
diff --git a/srclib/apr/misc/win32/apr_app.c b/srclib/apr/misc/win32/apr_app.c
index baac96e8..4e08e33d 100644
--- a/srclib/apr/misc/win32/apr_app.c
+++ b/srclib/apr/misc/win32/apr_app.c
@@ -16,18 +16,20 @@
 
 /* Usage Notes:
  *
- *   this module, and the misc/win32/utf8.c modules must be 
+ *   this module, and the misc/win32/utf8.c modules must be
  *   compiled APR_EXPORT_STATIC and linked to an application with
- *   the /entry:wmainCRTStartup flag.  This module becomes the true
- *   wmain entry point, and passes utf-8 reformatted argv and env
- *   arrays to the application's main function.
+ *   the /entry:wmainCRTStartup flag (which this module kindly
+ *   provides to the developer who links to libaprapp-1.lib).
+ *   This module becomes the true wmain entry point, and passes
+ *   utf-8 reformatted argv and env arrays to the application's
+ *   main() function as if nothing happened.
  *
- *   This module is only compatible with Unicode-only executables.
+ *   This module is only compatible with Unicode operating systems.
  *   Mixed (Win9x backwards compatible) binaries should refer instead
  *   to the apr_startup.c module.
  *
  *   _dbg_malloc/realloc is used in place of the usual API, in order
- *   to convince the MSVCRT that they created these entities.  If we
+ *   to convince the MSVCRT that it created these entities.  If we
  *   do not create them as _CRT_BLOCK entities, the crt will fault
  *   on an assert.  We are not worrying about the crt's locks here, 
  *   since we are single threaded [so far].
@@ -35,15 +37,13 @@
 
 #include "apr_general.h"
 #include "ShellAPI.h"
-#include "crtdbg.h"
 #include "wchar.h"
 #include "apr_arch_file_io.h"
 #include "assert.h"
 #include "apr_private.h"
 #include "apr_arch_misc.h"
 
-/* This symbol is _private_, although it must be exported.
- */
+#pragma comment(linker,"/ENTRY:wmainCRTStartup")
 
 extern int main(int argc, const char **argv, const char **env);
 
@@ -57,8 +57,8 @@ int wmain(int argc, const wchar_t **wargv, const wchar_t **wenv)
 
     dupenv = apr_wastrtoastr(&env, wenv, -1);
 
-    _environ = _malloc_dbg((dupenv + 1) * sizeof (char *), 
-                           _CRT_BLOCK, __FILE__, __LINE__ );
+    _environ = apr_malloc_dbg((dupenv + 1) * sizeof (char *),
+                              __FILE__, __LINE__ );
     memcpy(_environ, env, (dupenv + 1) * sizeof (char *));
 
     /* MSVCRT will attempt to maintain the wide environment calls
diff --git a/srclib/apr/misc/win32/internal.c b/srclib/apr/misc/win32/internal.c
index b045bd42..edd7f0a0 100644
--- a/srclib/apr/misc/win32/internal.c
+++ b/srclib/apr/misc/win32/internal.c
@@ -18,7 +18,6 @@
 
 #include "apr_arch_misc.h"
 #include "apr_arch_file_io.h"
-#include <crtdbg.h>
 #include <assert.h>
 
 /* This module is the source of -static- helper functions that are
@@ -52,8 +51,8 @@ int apr_wastrtoastr(char const * const * *retarr,
             ;
     }
 
-    newarr = _malloc_dbg((args + 1) * sizeof(char *),
-                         _CRT_BLOCK, __FILE__, __LINE__);
+    newarr = apr_malloc_dbg((args + 1) * sizeof(char *),
+                            __FILE__, __LINE__);
 
     for (arg = 0; arg < args; ++arg) {
         newarr[arg] = (void*)(wcslen(arr[arg]) + 1);
@@ -66,8 +65,8 @@ int apr_wastrtoastr(char const * const * *retarr,
      * 4 ucs bytes will hold a wchar_t pair value (20 bits)
      */
     elesize = elesize * 3 + 1;
-    ele = elements = _malloc_dbg(elesize * sizeof(char), 
-                                 _CRT_BLOCK, __FILE__, __LINE__);
+    ele = elements = apr_malloc_dbg(elesize * sizeof(char),
+                                    __FILE__, __LINE__);
 
     for (arg = 0; arg < args; ++arg) {
         apr_size_t len = (apr_size_t)newarr[arg];
@@ -87,8 +86,8 @@ int apr_wastrtoastr(char const * const * *retarr,
 
     /* Return to the free store if the heap realloc is the least bit optimized
      */
-    ele = _realloc_dbg(elements, ele - elements, 
-                       _CRT_BLOCK, __FILE__, __LINE__);
+    ele = apr_realloc_dbg(elements, ele - elements,
+                          __FILE__, __LINE__);
 
     if (ele != elements) {
         apr_size_t diff = ele - elements;
diff --git a/srclib/apr/misc/win32/misc.c b/srclib/apr/misc/win32/misc.c
index 9975eef6..a95a2219 100644
--- a/srclib/apr/misc/win32/misc.c
+++ b/srclib/apr/misc/win32/misc.c
@@ -16,10 +16,10 @@
 
 #include "apr_private.h"
 #include "apr_arch_misc.h"
-#include "crtdbg.h"
 #include "apr_arch_file_io.h"
 #include "assert.h"
 #include "apr_lib.h"
+#include "tchar.h"
 
 APR_DECLARE_DATA apr_oslevel_e apr_os_level = APR_WIN_UNK;
 
@@ -34,13 +34,17 @@ apr_status_t apr_get_oslevel(apr_oslevel_e *level)
         if (oslev.dwPlatformId == VER_PLATFORM_WIN32_NT) 
         {
             static unsigned int servpack = 0;
-            char *pservpack;
+            TCHAR *pservpack;
             if (pservpack = oslev.szCSDVersion) {
                 while (*pservpack && !apr_isdigit(*pservpack)) {
                     pservpack++;
                 }
                 if (*pservpack)
+#ifdef _UNICODE
+                    servpack = _wtoi(pservpack);
+#else
                     servpack = atoi(pservpack);
+#endif
             }
 
             if (oslev.dwMajorVersion < 3) {
@@ -81,7 +85,7 @@ apr_status_t apr_get_oslevel(apr_oslevel_e *level)
                         apr_os_level = APR_WIN_2000_SP2;
                 }
                 else if (oslev.dwMinorVersion == 2) {
-                    apr_os_level = APR_WIN_2003;                    
+                    apr_os_level = APR_WIN_2003;
                 }
                 else {
                     if (servpack < 1)
@@ -92,28 +96,31 @@ apr_status_t apr_get_oslevel(apr_oslevel_e *level)
                         apr_os_level = APR_WIN_XP_SP2;
                 }
             }
+            else if (oslev.dwMajorVersion == 6) {
+                apr_os_level = APR_WIN_VISTA;
+            }
             else {
                 apr_os_level = APR_WIN_XP;
             }
         }
 #ifndef WINNT
         else if (oslev.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
-            char *prevision;
+            TCHAR *prevision;
             if (prevision = oslev.szCSDVersion) {
                 while (*prevision && !apr_isupper(*prevision)) {
                      prevision++;
                 }
             }
-            else prevision = "";
+            else prevision = _T("");
 
             if (oslev.dwMinorVersion < 10) {
-                if (*prevision < 'C')
+                if (*prevision < _T('C'))
                     apr_os_level = APR_WIN_95;
                 else
                     apr_os_level = APR_WIN_95_OSR2;
             }
             else if (oslev.dwMinorVersion < 90) {
-                if (*prevision < 'A')
+                if (*prevision < _T('A'))
                     apr_os_level = APR_WIN_98;
                 else
                     apr_os_level = APR_WIN_98_SE;
@@ -161,14 +168,23 @@ static HMODULE lateDllHandle[DLL_defined] = {
 FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char* fnName, int ordinal)
 {
     if (!lateDllHandle[fnLib]) { 
-        lateDllHandle[fnLib] = LoadLibrary(lateDllName[fnLib]);
+        lateDllHandle[fnLib] = LoadLibraryA(lateDllName[fnLib]);
         if (!lateDllHandle[fnLib])
             return NULL;
     }
+#if defined(_WIN32_WCE)
     if (ordinal)
-        return GetProcAddress(lateDllHandle[fnLib], (char *) ordinal);
+        return GetProcAddressA(lateDllHandle[fnLib], (const char *)
+                                                     (apr_ssize_t)ordinal);
+    else
+        return GetProcAddressA(lateDllHandle[fnLib], fnName);
+#else
+    if (ordinal)
+        return GetProcAddress(lateDllHandle[fnLib], (const char *)
+                                                    (apr_ssize_t)ordinal);
     else
         return GetProcAddress(lateDllHandle[fnLib], fnName);
+#endif
 }
 
 /* Declared in include/arch/win32/apr_dbg_win32_handles.h
@@ -196,18 +212,18 @@ APR_DECLARE_NONSTD(HANDLE) apr_dbg_log(char* fn, HANDLE ha, char* fl, int ln,
         (TlsSetValue)(tlsid, sbuf);
         sbuf[1023] = '\0';
         if (!fh) {
-            (GetModuleFileName)(NULL, sbuf, 250);
+            (GetModuleFileNameA)(NULL, sbuf, 250);
             sprintf(strchr(sbuf, '\0'), ".%d",
                     (GetCurrentProcessId)());
-            fh = (CreateFile)(sbuf, GENERIC_WRITE, 0, NULL, 
+            fh = (CreateFileA)(sbuf, GENERIC_WRITE, 0, NULL, 
                             CREATE_ALWAYS, 0, NULL);
             (InitializeCriticalSection)(&cs);
         }
     }
 
     if (!nh) {
-        (sprintf)(sbuf, "%08x %08x %08x %s() %s:%d\n",
-                  (DWORD)ha, seq, GetCurrentThreadId(), fn, fl, ln);
+        (sprintf)(sbuf, "%p %08x %08x %s() %s:%d\n",
+                  ha, seq, GetCurrentThreadId(), fn, fl, ln);
         (EnterCriticalSection)(&cs);
         (WriteFile)(fh, sbuf, (DWORD)strlen(sbuf), &wrote, NULL);
         (LeaveCriticalSection)(&cs);
@@ -220,21 +236,21 @@ APR_DECLARE_NONSTD(HANDLE) apr_dbg_log(char* fn, HANDLE ha, char* fl, int ln,
             HANDLE *hv = va_arg(a, HANDLE*);
             char *dsc = va_arg(a, char*);
             if (strcmp(dsc, "Signaled") == 0) {
-                if ((DWORD)ha >= STATUS_WAIT_0 
-                       && (DWORD)ha < STATUS_ABANDONED_WAIT_0) {
-                    hv += (DWORD)ha;
+                if ((apr_ssize_t)ha >= STATUS_WAIT_0 
+                       && (apr_ssize_t)ha < STATUS_ABANDONED_WAIT_0) {
+                    hv += (apr_ssize_t)ha;
                 }
-                else if ((DWORD)ha >= STATUS_ABANDONED_WAIT_0
-                            && (DWORD)ha < STATUS_USER_APC) {
-                    hv += (DWORD)ha - STATUS_ABANDONED_WAIT_0;
+                else if ((apr_ssize_t)ha >= STATUS_ABANDONED_WAIT_0
+                            && (apr_ssize_t)ha < STATUS_USER_APC) {
+                    hv += (apr_ssize_t)ha - STATUS_ABANDONED_WAIT_0;
                     dsc = "Abandoned";
                 }
-                else if ((DWORD)ha == WAIT_TIMEOUT) {
+                else if ((apr_ssize_t)ha == WAIT_TIMEOUT) {
                     dsc = "Timed Out";
                 }
             }
-            (sprintf)(sbuf, "%08x %08x %08x %s(%s) %s:%d\n",
-                      (DWORD*)*hv, seq, GetCurrentThreadId(), 
+            (sprintf)(sbuf, "%p %08x %08x %s(%s) %s:%d\n",
+                      *hv, seq, GetCurrentThreadId(), 
                       fn, dsc, fl, ln);
             (WriteFile)(fh, sbuf, (DWORD)strlen(sbuf), &wrote, NULL);
         } while (--nh);
diff --git a/srclib/apr/misc/win32/start.c b/srclib/apr/misc/win32/start.c
index 98b5ddca..22820e8e 100644
--- a/srclib/apr/misc/win32/start.c
+++ b/srclib/apr/misc/win32/start.c
@@ -24,7 +24,6 @@
 #include "wchar.h"
 #include "apr_arch_file_io.h"    /* bring in unicode-ness */
 #include "apr_arch_threadproc.h" /* bring in apr_threadproc_init */
-#include "crtdbg.h"
 #include "assert.h"
 
 /* This symbol is _private_, although it must be exported.
@@ -56,8 +55,8 @@ static int warrsztoastr(const char * const * *retarr,
     }
     wsize = 1 + wch - arrsz;
 
-    newarr = _malloc_dbg((args + 1) * sizeof(char *),
-                         _CRT_BLOCK, __FILE__, __LINE__);
+    newarr = apr_malloc_dbg((args + 1) * sizeof(char *),
+                            __FILE__, __LINE__);
 
     /* This is a safe max allocation, we will realloc after
      * processing and return the excess to the free store.
@@ -65,8 +64,8 @@ static int warrsztoastr(const char * const * *retarr,
      * 4 ucs bytes will hold a wchar_t pair value (20 bits)
      */
     newlen = totlen = wsize * 3 + 1;
-    newarr[0] = _malloc_dbg(newlen * sizeof(char),
-                            _CRT_BLOCK, __FILE__, __LINE__);
+    newarr[0] = apr_malloc_dbg(newlen * sizeof(char),
+                               __FILE__, __LINE__);
 
     (void)apr_conv_ucs2_to_utf8(arrsz, &wsize,
                                 newarr[0], &newlen);
@@ -74,8 +73,8 @@ static int warrsztoastr(const char * const * *retarr,
     assert(newlen && !wsize);
     /* Return to the free store if the heap realloc is the least bit optimized
      */
-    newarr[0] = _realloc_dbg(newarr[0], totlen - newlen,
-                             _CRT_BLOCK, __FILE__, __LINE__);
+    newarr[0] = apr_realloc_dbg(newarr[0], totlen - newlen,
+                                __FILE__, __LINE__);
 
     for (arg = 1; arg < args; ++arg) {
         newarr[arg] = newarr[arg - 1] + 2;
@@ -133,8 +132,8 @@ APR_DECLARE(apr_status_t) apr_app_initialize(int *argc,
         dupenv = warrsztoastr(&_environ, sysstr, -1);
 
         if (env) {
-            *env = _malloc_dbg((dupenv + 1) * sizeof (char *),
-                               _CRT_BLOCK, __FILE__, __LINE__ );
+            *env = apr_malloc_dbg((dupenv + 1) * sizeof (char *),
+                                  __FILE__, __LINE__ );
             memcpy((void*)*env, _environ, (dupenv + 1) * sizeof (char *));
         }
         else {
diff --git a/srclib/apr/network_io/beos/sendrecv.c b/srclib/apr/network_io/beos/sendrecv.c
index 1aeb426e..201abf89 100644
--- a/srclib/apr/network_io/beos/sendrecv.c
+++ b/srclib/apr/network_io/beos/sendrecv.c
@@ -203,7 +203,9 @@ APR_DECLARE(apr_status_t) apr_socket_recvfrom(apr_sockaddr_t *from,
         (*len) = 0;
         return errno;
     }
-
+	
+    from->port = ntohs(from->sa.sin.sin_port);
+	
     (*len) = rv;
     if (rv == 0)
         return APR_EOF;
diff --git a/srclib/apr/network_io/unix/inet_ntop.c b/srclib/apr/network_io/unix/inet_ntop.c
index a96eb18f..78dd3baa 100644
--- a/srclib/apr/network_io/unix/inet_ntop.c
+++ b/srclib/apr/network_io/unix/inet_ntop.c
@@ -147,7 +147,7 @@ inet_ntop6(const unsigned char *src, char *dst, apr_size_t size)
      * to use pointer overlays.  All the world's not a VAX.
      */
     char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
-    struct { int base, len; } best, cur;
+    struct { int base, len; } best = {-1, 0}, cur = {-1, 0};
     unsigned int words[IN6ADDRSZ / INT16SZ];
     int i;
     const unsigned char *next_src, *src_end;
@@ -161,9 +161,6 @@ inet_ntop6(const unsigned char *src, char *dst, apr_size_t size)
     next_src = src;
     src_end = src + IN6ADDRSZ;
     next_dest = words;
-    best.base = -1;
-    cur.base = -1;
-    cur.len = best.len = 0; /* silence gcc4 warning */
     i = 0;
     do {
         unsigned int next_word = (unsigned int)*next_src++;
diff --git a/srclib/apr/network_io/unix/multicast.c b/srclib/apr/network_io/unix/multicast.c
index 8e8ac5ce..67ab2457 100644
--- a/srclib/apr/network_io/unix/multicast.c
+++ b/srclib/apr/network_io/unix/multicast.c
@@ -26,25 +26,6 @@
 #endif
 
 #ifdef HAVE_STRUCT_IPMREQ
-/* Only UDP and Raw Sockets can be used for Multicast */
-static apr_status_t mcast_check_type(apr_socket_t *sock)
-{
-    int type;
-    apr_status_t rv;
-
-    rv = apr_socket_type_get(sock, &type);
-
-    if (rv != APR_SUCCESS) {
-        return rv;
-    }
-    else if (type == SOCK_DGRAM || type == SOCK_RAW) {
-        return APR_SUCCESS;
-    }
-    else {
-        return APR_ENOTIMPL;
-    }
-}
-
 static void fill_mip_v4(struct ip_mreq *mip, apr_sockaddr_t *mcast,
                         apr_sockaddr_t *iface)
 {
@@ -136,19 +117,13 @@ static apr_status_t do_mcast(int type, apr_socket_t *sock,
 #if APR_HAVE_IPV6
     struct ipv6_mreq mip6;
 #endif
-#if MCAST_JOIN_SOURCE_GROUP
+#ifdef GROUP_FILTER_SIZE
     struct group_source_req mip;
     int ip_proto;
 #endif
 
-    rv = mcast_check_type(sock);
-
-    if (rv != APR_SUCCESS) {
-        return rv;
-    }
-
     if (source != NULL) {
-#if MCAST_JOIN_SOURCE_GROUP
+#ifdef GROUP_FILTER_SIZE
         if (sock_is_ipv4(sock)) {
             ip_proto = IPPROTO_IP;
         } 
@@ -223,12 +198,6 @@ static apr_status_t do_mcast_opt(int type, apr_socket_t *sock,
 {
     apr_status_t rv = APR_SUCCESS;
 
-    rv = mcast_check_type(sock);
-
-    if (rv != APR_SUCCESS) {
-        return rv;
-    }
-
     if (sock_is_ipv4(sock)) {
         if (setsockopt(sock->socketdes, IPPROTO_IP, type,
                        (const void *) &value, sizeof(value)) == -1) {
diff --git a/srclib/apr/network_io/unix/sendrecv.c b/srclib/apr/network_io/unix/sendrecv.c
index beb281db..ce6d0127 100644
--- a/srclib/apr/network_io/unix/sendrecv.c
+++ b/srclib/apr/network_io/unix/sendrecv.c
@@ -174,8 +174,7 @@ apr_status_t apr_socket_recvfrom(apr_sockaddr_t *from, apr_socket_t *sock,
         return errno;
     }
 
-    apr_sockaddr_vars_set(from, from->sa.sin.sin_family, 
-                          ntohs(from->sa.sin.sin_port));
+    apr_sockaddr_vars_set(from, from->sa.sin.sin_family, ntohs(from->sa.sin.sin_port));
 
     (*len) = rv;
     if (rv == 0 && sock->type == SOCK_STREAM) {
@@ -404,6 +403,124 @@ do_select:
     return rv < 0 ? errno : APR_SUCCESS;
 }
 
+#elif defined(DARWIN)
+
+/* OS/X Release 10.5 or greater */
+apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file,
+                                 apr_hdtr_t *hdtr, apr_off_t *offset,
+                                 apr_size_t *len, apr_int32_t flags)
+{
+    apr_off_t nbytes = 0;
+    apr_off_t bytes_to_send = *len;
+    apr_off_t bytes_sent = 0;
+    apr_status_t arv;
+    int rv = 0;
+
+    /* Ignore flags for now. */
+    flags = 0;
+
+    if (!hdtr) {
+        hdtr = &no_hdtr;
+    }
+
+    /* OS X can send the headers/footers as part of the system call, 
+     * but how it counts bytes isn't documented properly. We use 
+     * apr_socket_sendv() instead.
+     */
+     if (hdtr->numheaders > 0) {
+        apr_size_t hbytes;
+        int i;
+
+        /* Now write the headers */
+        arv = apr_socket_sendv(sock, hdtr->headers, hdtr->numheaders,
+                               &hbytes);
+        if (arv != APR_SUCCESS) {
+            *len = 0;
+            return errno;
+        }
+        bytes_sent = hbytes;
+
+        hbytes = 0;
+        for (i = 0; i < hdtr->numheaders; i++) {
+            hbytes += hdtr->headers[i].iov_len;
+        }
+        if (bytes_sent < hbytes) {
+            *len = bytes_sent;
+            return APR_SUCCESS;
+        }
+    }
+
+    do {
+        if (!bytes_to_send) {
+            break;
+        }
+        if (sock->options & APR_INCOMPLETE_WRITE) {
+            apr_status_t arv;
+            sock->options &= ~APR_INCOMPLETE_WRITE;
+            arv = apr_wait_for_io_or_timeout(NULL, sock, 0);
+            if (arv != APR_SUCCESS) {
+                *len = 0;
+                return arv;
+            }
+        }
+
+        nbytes = bytes_to_send;
+        rv = sendfile(file->filedes, /* file to be sent */
+                      sock->socketdes, /* socket */
+                      *offset,       /* where in the file to start */
+                      &nbytes,       /* number of bytes to write/written */
+                      NULL,          /* Headers/footers */
+                      flags);        /* undefined, set to 0 */
+
+        if (rv == -1) {
+            if (errno == EAGAIN) {
+                if (sock->timeout > 0) {
+                    sock->options |= APR_INCOMPLETE_WRITE;
+                }
+                /* BSD's sendfile can return -1/EAGAIN even if it
+                 * sent bytes.  Sanitize the result so we get normal EAGAIN
+                 * semantics w.r.t. bytes sent.
+                 */
+                if (nbytes) {
+                    bytes_sent += nbytes;
+                    /* normal exit for a big file & non-blocking io */
+                    (*len) = bytes_sent;
+                    return APR_SUCCESS;
+                }
+            }
+        }
+        else {       /* rv == 0 (or the kernel is broken) */
+            bytes_sent += nbytes;
+            if (nbytes == 0) {
+                /* Most likely the file got smaller after the stat.
+                 * Return an error so the caller can do the Right Thing.
+                 */
+                (*len) = bytes_sent;
+                return APR_EOF;
+            }
+        }
+    } while (rv == -1 && (errno == EINTR || errno == EAGAIN));
+
+    /* Now write the footers */
+    if (hdtr->numtrailers > 0) {
+        apr_size_t tbytes;
+        arv = apr_socket_sendv(sock, hdtr->trailers, hdtr->numtrailers, 
+                               &tbytes);
+        bytes_sent += tbytes;
+        if (arv != APR_SUCCESS) {
+            *len = bytes_sent;
+            rv = errno;
+            return rv;
+        }
+    }
+
+    (*len) = bytes_sent;
+    if (rv == -1) {
+        return errno;
+    }
+    return APR_SUCCESS;
+}
+
 #elif defined(__FreeBSD__) || defined(__DragonFly__)
 
 /* Release 3.1 or greater */
@@ -412,7 +529,10 @@ apr_status_t apr_socket_sendfile(apr_socket_t * sock, apr_file_t * file,
                                  apr_size_t * len, apr_int32_t flags)
 {
     off_t nbytes = 0;
-    int rv, i;
+    int rv;
+#if defined(__FreeBSD_version) && __FreeBSD_version < 460001
+    int i;
+#endif
     struct sf_hdtr headerstruct;
     apr_size_t bytes_to_send = *len;
 
diff --git a/srclib/apr/network_io/unix/sockaddr.c b/srclib/apr/network_io/unix/sockaddr.c
index 33d2400a..31a0eb5b 100644
--- a/srclib/apr/network_io/unix/sockaddr.c
+++ b/srclib/apr/network_io/unix/sockaddr.c
@@ -98,27 +98,37 @@ static apr_status_t get_remote_addr(apr_socket_t *sock)
     }
 }
 
-APR_DECLARE(apr_status_t) apr_sockaddr_ip_get(char **addr,
-                                         apr_sockaddr_t *sockaddr)
+APR_DECLARE(apr_status_t) apr_sockaddr_ip_getbuf(char *buf, apr_size_t buflen,
+                                                 apr_sockaddr_t *sockaddr)
 {
-    *addr = apr_palloc(sockaddr->pool, sockaddr->addr_str_len);
-    apr_inet_ntop(sockaddr->family,
-                  sockaddr->ipaddr_ptr,
-                  *addr,
-                  sockaddr->addr_str_len);
+    if (!apr_inet_ntop(sockaddr->family, sockaddr->ipaddr_ptr, buf, buflen)) {
+        return APR_ENOSPC;
+    }
+
 #if APR_HAVE_IPV6
-    if (sockaddr->family == AF_INET6 &&
-        IN6_IS_ADDR_V4MAPPED((struct in6_addr *)sockaddr->ipaddr_ptr)) {
+    if (sockaddr->family == AF_INET6 
+        && IN6_IS_ADDR_V4MAPPED((struct in6_addr *)sockaddr->ipaddr_ptr)
+        && buflen > strlen("::ffff:")) {
         /* This is an IPv4-mapped IPv6 address; drop the leading
          * part of the address string so we're left with the familiar
          * IPv4 format.
          */
-        *addr += strlen("::ffff:");
+        memmove(buf, buf + strlen("::ffff:"),
+                strlen(buf + strlen("::ffff:"))+1);
     }
 #endif
+    /* ensure NUL termination if the buffer is too short */
+    buf[buflen-1] = '\0';
     return APR_SUCCESS;
 }
 
+APR_DECLARE(apr_status_t) apr_sockaddr_ip_get(char **addr,
+                                              apr_sockaddr_t *sockaddr)
+{
+    *addr = apr_palloc(sockaddr->pool, sockaddr->addr_str_len);
+    return apr_sockaddr_ip_getbuf(*addr, sockaddr->addr_str_len, sockaddr);
+}
+
 void apr_sockaddr_vars_set(apr_sockaddr_t *addr, int family, apr_port_t port)
 {
     addr->family = family;
@@ -701,12 +711,12 @@ APR_DECLARE(apr_status_t) apr_getservbyname(apr_sockaddr_t *sockaddr,
         return APR_EINVAL;
 
     if ((se = getservbyname(servname, NULL)) != NULL){
-        sockaddr->port = htons(se->s_port);
+        sockaddr->port = ntohs(se->s_port);
         sockaddr->servname = apr_pstrdup(sockaddr->pool, servname);
         sockaddr->sa.sin.sin_port = se->s_port;
         return APR_SUCCESS;
     }
-    return errno;
+    return APR_ENOENT;
 }
 
 #define V4MAPPED_EQUAL(a,b)                                   \
diff --git a/srclib/apr/network_io/unix/sockets.c b/srclib/apr/network_io/unix/sockets.c
index 6d24cdcf..94b26687 100644
--- a/srclib/apr/network_io/unix/sockets.c
+++ b/srclib/apr/network_io/unix/sockets.c
@@ -176,30 +176,38 @@ apr_status_t apr_socket_listen(apr_socket_t *sock, apr_int32_t backlog)
 apr_status_t apr_socket_accept(apr_socket_t **new, apr_socket_t *sock,
                                apr_pool_t *connection_context)
 {
-    alloc_socket(new, connection_context);
-    set_socket_vars(*new, sock->local_addr->sa.sin.sin_family, SOCK_STREAM, sock->protocol);
+    int s;
+    apr_sockaddr_t sa;
 
-#ifndef HAVE_POLL
-    (*new)->connected = 1;
-#endif
-    (*new)->timeout = -1;
-    
-    (*new)->socketdes = accept(sock->socketdes, 
-                               (struct sockaddr *)&(*new)->remote_addr->sa,
-                               &(*new)->remote_addr->salen);
+    sa.salen = sizeof(sa.sa);
 
-    if ((*new)->socketdes < 0) {
+    s = accept(sock->socketdes, (struct sockaddr *)&sa.sa, &sa.salen);
+
+    if (s < 0) {
         return errno;
     }
 #ifdef TPF
-    if ((*new)->socketdes == 0) { 
+    if (s == 0) { 
         /* 0 is an invalid socket for TPF */
         return APR_EINTR;
     }
 #endif
+    alloc_socket(new, connection_context);
+    set_socket_vars(*new, sock->local_addr->sa.sin.sin_family, SOCK_STREAM, sock->protocol);
+
+#ifndef HAVE_POLL
+    (*new)->connected = 1;
+#endif
+    (*new)->timeout = -1;
 
     (*new)->remote_addr_unknown = 0;
 
+    (*new)->socketdes = s;
+
+    /* Copy in peer's address. */
+    (*new)->remote_addr->sa = sa.sa;
+    (*new)->remote_addr->salen = sa.salen;
+
     *(*new)->local_addr = *sock->local_addr;
 
     /* The above assignment just overwrote the pool entry. Setting the local_addr 
diff --git a/srclib/apr/network_io/win32/sockets.c b/srclib/apr/network_io/win32/sockets.c
index 408e9d05..88a362f7 100644
--- a/srclib/apr/network_io/win32/sockets.c
+++ b/srclib/apr/network_io/win32/sockets.c
@@ -128,9 +128,13 @@ APR_DECLARE(apr_status_t) apr_socket_create(apr_socket_t **new, int family,
         SetHandleInformation((HANDLE) (*new)->socketdes, 
                              HANDLE_FLAG_INHERIT, 0);
     }
+#if APR_HAS_ANSI_FS
+    /* only if APR_HAS_ANSI_FS && APR_HAS_UNICODE_FS */
+    ELSE_WIN_OS_IS_ANSI
+#endif
 #endif
 #if APR_HAS_ANSI_FS || defined(_WIN32_WCE)
-    ELSE_WIN_OS_IS_ANSI {
+    {
         HANDLE hProcess = GetCurrentProcess();
         HANDLE dup;
         if (DuplicateHandle(hProcess, (HANDLE) (*new)->socketdes, hProcess, 
diff --git a/srclib/apr/passwd/apr_getpass.c b/srclib/apr/passwd/apr_getpass.c
index 7e897749..369c6e60 100644
--- a/srclib/apr/passwd/apr_getpass.c
+++ b/srclib/apr/passwd/apr_getpass.c
@@ -48,6 +48,12 @@
 #include <strings.h>
 #endif
 
+/* Disable getpass() support when PASS_MAX is defined and is "small",
+ * for an arbitrary definition of "small". */
+#if defined(HAVE_GETPASS) && defined(PASS_MAX) && PASS_MAX < 32
+#undef HAVE_GETPASS
+#endif
+
 #if defined(HAVE_TERMIOS_H) && !defined(HAVE_GETPASS)
 #include <termios.h>
 #endif
@@ -74,7 +80,7 @@
  * issue the prompt and read the results with echo.  (Ugh).
  */
 
-static char *getpass(const char *prompt)
+static char *get_password(const char *prompt)
 {
     static char password[MAX_STRING_LEN];
 
@@ -87,7 +93,7 @@ static char *getpass(const char *prompt)
 #elif defined (HAVE_TERMIOS_H)
 #include <stdio.h>
 
-static char *getpass(const char *prompt)
+static char *get_password(const char *prompt)
 {
     struct termios attr;
     static char password[MAX_STRING_LEN];
@@ -129,7 +135,7 @@ static char *getpass(const char *prompt)
  * Windows lacks getpass().  So we'll re-implement it here.
  */
 
-static char *getpass(const char *prompt)
+static char *get_password(const char *prompt)
 {
 /* WCE lacks console. So the getpass is unsuported
  * The only way is to use the GUI so the getpass should be implemented
@@ -215,10 +221,12 @@ static char *getpass(const char *prompt)
 
 APR_DECLARE(apr_status_t) apr_password_get(const char *prompt, char *pwbuf, apr_size_t *bufsiz)
 {
-#ifdef HAVE_GETPASSPHRASE
+#if defined(HAVE_GETPASSPHRASE)
     char *pw_got = getpassphrase(prompt);
-#else
+#elif defined(HAVE_GETPASS)
     char *pw_got = getpass(prompt);
+#else /* use the replacement implementation above */
+    char *pw_got = get_password(prompt);
 #endif
     apr_status_t rv = APR_SUCCESS;
 
diff --git a/srclib/apr/poll/unix/epoll.c b/srclib/apr/poll/unix/epoll.c
index 388c67c0..7a3831be 100644
--- a/srclib/apr/poll/unix/epoll.c
+++ b/srclib/apr/poll/unix/epoll.c
@@ -101,10 +101,11 @@ APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
 
     *pollset = apr_palloc(p, sizeof(**pollset));
 #if APR_HAS_THREADS
-    if (flags & APR_POLLSET_THREADSAFE &&
+    if ((flags & APR_POLLSET_THREADSAFE) &&
+        !(flags & APR_POLLSET_NOCOPY) &&
         ((rv = apr_thread_mutex_create(&(*pollset)->ring_lock,
                                        APR_THREAD_MUTEX_DEFAULT,
-                                       p) != APR_SUCCESS))) {
+                                       p)) != APR_SUCCESS)) {
         *pollset = NULL;
         return rv;
     }
@@ -123,10 +124,11 @@ APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
     apr_pool_cleanup_register(p, *pollset, backend_cleanup, backend_cleanup);
     (*pollset)->result_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
 
-    APR_RING_INIT(&(*pollset)->query_ring, pfd_elem_t, link);
-    APR_RING_INIT(&(*pollset)->free_ring, pfd_elem_t, link);
-    APR_RING_INIT(&(*pollset)->dead_ring, pfd_elem_t, link);
-
+    if (!(flags & APR_POLLSET_NOCOPY)) {
+        APR_RING_INIT(&(*pollset)->query_ring, pfd_elem_t, link);
+        APR_RING_INIT(&(*pollset)->free_ring, pfd_elem_t, link);
+        APR_RING_INIT(&(*pollset)->dead_ring, pfd_elem_t, link);
+    }
     return APR_SUCCESS;
 }
 
@@ -138,25 +140,30 @@ APR_DECLARE(apr_status_t) apr_pollset_destroy(apr_pollset_t *pollset)
 APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset,
                                           const apr_pollfd_t *descriptor)
 {
-    struct epoll_event ev;
+    struct epoll_event ev = {0};
     int ret = -1;
-    pfd_elem_t *elem;
+    pfd_elem_t *elem = NULL;
     apr_status_t rv = APR_SUCCESS;
 
-    pollset_lock_rings();
+    ev.events = get_epoll_event(descriptor->reqevents);
 
-    if (!APR_RING_EMPTY(&(pollset->free_ring), pfd_elem_t, link)) {
-        elem = APR_RING_FIRST(&(pollset->free_ring));
-        APR_RING_REMOVE(elem, link);
+    if (pollset->flags & APR_POLLSET_NOCOPY) {
+        ev.data.ptr = (void *)descriptor;
     }
     else {
-        elem = (pfd_elem_t *) apr_palloc(pollset->pool, sizeof(pfd_elem_t));
-        APR_RING_ELEM_INIT(elem, link);
-    }
-    elem->pfd = *descriptor;
+        pollset_lock_rings();
 
-    ev.events = get_epoll_event(descriptor->reqevents);
-    ev.data.ptr = elem;
+        if (!APR_RING_EMPTY(&(pollset->free_ring), pfd_elem_t, link)) {
+            elem = APR_RING_FIRST(&(pollset->free_ring));
+            APR_RING_REMOVE(elem, link);
+        }
+        else {
+            elem = (pfd_elem_t *) apr_palloc(pollset->pool, sizeof(pfd_elem_t));
+            APR_RING_ELEM_INIT(elem, link);
+        }
+        elem->pfd = *descriptor;
+        ev.data.ptr = elem;
+    }
     if (descriptor->desc_type == APR_POLL_SOCKET) {
         ret = epoll_ctl(pollset->epoll_fd, EPOLL_CTL_ADD,
                         descriptor->desc.s->socketdes, &ev);
@@ -166,17 +173,23 @@ APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset,
                         descriptor->desc.f->filedes, &ev);
     }
 
-    if (0 != ret) {
-        rv = APR_EBADF;
-        APR_RING_INSERT_TAIL(&(pollset->free_ring), elem, pfd_elem_t, link);
+    if (pollset->flags & APR_POLLSET_NOCOPY) {
+        if (0 != ret) {
+            rv = APR_EBADF;
+        }
     }
     else {
-        pollset->nelts++;
-        APR_RING_INSERT_TAIL(&(pollset->query_ring), elem, pfd_elem_t, link);
+        if (0 != ret) {
+            rv = APR_EBADF;
+            APR_RING_INSERT_TAIL(&(pollset->free_ring), elem, pfd_elem_t, link);
+        }
+        else {
+            pollset->nelts++;
+            APR_RING_INSERT_TAIL(&(pollset->query_ring), elem, pfd_elem_t, link);
+        }
+        pollset_unlock_rings();
     }
 
-    pollset_unlock_rings();
-
     return rv;
 }
 
@@ -188,8 +201,6 @@ APR_DECLARE(apr_status_t) apr_pollset_remove(apr_pollset_t *pollset,
     struct epoll_event ev;
     int ret = -1;
 
-    pollset_lock_rings();
-
     ev.events = get_epoll_event(descriptor->reqevents);
 
     if (descriptor->desc_type == APR_POLL_SOCKET) {
@@ -204,22 +215,26 @@ APR_DECLARE(apr_status_t) apr_pollset_remove(apr_pollset_t *pollset,
         rv = APR_NOTFOUND;
     }
 
-    if (!APR_RING_EMPTY(&(pollset->query_ring), pfd_elem_t, link)) {
-        for (ep = APR_RING_FIRST(&(pollset->query_ring));
-             ep != APR_RING_SENTINEL(&(pollset->query_ring),
-                                     pfd_elem_t, link);
-             ep = APR_RING_NEXT(ep, link)) {
-
-            if (descriptor->desc.s == ep->pfd.desc.s) {
-                APR_RING_REMOVE(ep, link);
-                APR_RING_INSERT_TAIL(&(pollset->dead_ring),
-                                     ep, pfd_elem_t, link);
-                break;
+    if (!(pollset->flags & APR_POLLSET_NOCOPY)) {
+        pollset_lock_rings();
+
+        if (!APR_RING_EMPTY(&(pollset->query_ring), pfd_elem_t, link)) {
+            for (ep = APR_RING_FIRST(&(pollset->query_ring));
+                 ep != APR_RING_SENTINEL(&(pollset->query_ring),
+                                         pfd_elem_t, link);
+                 ep = APR_RING_NEXT(ep, link)) {
+                
+                if (descriptor->desc.s == ep->pfd.desc.s) {
+                    APR_RING_REMOVE(ep, link);
+                    APR_RING_INSERT_TAIL(&(pollset->dead_ring),
+                                         ep, pfd_elem_t, link);
+                    break;
+                }
             }
         }
-    }
 
-    pollset_unlock_rings();
+        pollset_unlock_rings();
+    }
 
     return rv;
 }
@@ -247,11 +262,21 @@ APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
         rv = APR_TIMEUP;
     }
     else {
-        for (i = 0; i < ret; i++) {
-            pollset->result_set[i] =
-                (((pfd_elem_t *) (pollset->pollset[i].data.ptr))->pfd);
-            pollset->result_set[i].rtnevents =
-                get_epoll_revent(pollset->pollset[i].events);
+        if (pollset->flags & APR_POLLSET_NOCOPY) {
+            for (i = 0; i < ret; i++) {
+                pollset->result_set[i] =
+                    *((apr_pollfd_t *) (pollset->pollset[i].data.ptr));
+                pollset->result_set[i].rtnevents =
+                    get_epoll_revent(pollset->pollset[i].events);
+            }
+        }
+        else {
+            for (i = 0; i < ret; i++) {
+                pollset->result_set[i] =
+                    (((pfd_elem_t *) (pollset->pollset[i].data.ptr))->pfd);
+                pollset->result_set[i].rtnevents =
+                    get_epoll_revent(pollset->pollset[i].events);
+            }
         }
 
         if (descriptors) {
@@ -259,13 +284,139 @@ APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
         }
     }
 
-    pollset_lock_rings();
+    if (!(pollset->flags & APR_POLLSET_NOCOPY)) {
+        pollset_lock_rings();
+
+        /* Shift all PFDs in the Dead Ring to be Free Ring */
+        APR_RING_CONCAT(&(pollset->free_ring), &(pollset->dead_ring), pfd_elem_t, link);
+
+        pollset_unlock_rings();
+    }
+
+    return rv;
+}
+
+struct apr_pollcb_t {
+    apr_pool_t *pool;
+    apr_uint32_t nalloc;
+    struct epoll_event *pollset;
+    int epoll_fd;
+};
+
+static apr_status_t cb_cleanup(void *p_)
+{
+    apr_pollcb_t *pollcb = (apr_pollcb_t *) p_;
+    close(pollcb->epoll_fd);
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_pollcb_create(apr_pollcb_t **pollcb,
+                                            apr_uint32_t size,
+                                            apr_pool_t *p,
+                                            apr_uint32_t flags)
+{
+    int fd;
+    
+    fd = epoll_create(size);
+    
+    if (fd < 0) {
+        *pollcb = NULL;
+        return apr_get_netos_error();
+    }
+    
+    *pollcb = apr_palloc(p, sizeof(**pollcb));
+    (*pollcb)->nalloc = size;
+    (*pollcb)->pool = p;
+    (*pollcb)->epoll_fd = fd;
+    (*pollcb)->pollset = apr_palloc(p, size * sizeof(struct epoll_event));
+    apr_pool_cleanup_register(p, *pollcb, cb_cleanup, cb_cleanup);
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_pollcb_add(apr_pollcb_t *pollcb,
+                                         apr_pollfd_t *descriptor)
+{
+    struct epoll_event ev;
+    int ret;
+    
+    ev.events = get_epoll_event(descriptor->reqevents);
+    ev.data.ptr = (void *)descriptor;
+
+    if (descriptor->desc_type == APR_POLL_SOCKET) {
+        ret = epoll_ctl(pollcb->epoll_fd, EPOLL_CTL_ADD,
+                        descriptor->desc.s->socketdes, &ev);
+    }
+    else {
+        ret = epoll_ctl(pollcb->epoll_fd, EPOLL_CTL_ADD,
+                        descriptor->desc.f->filedes, &ev);
+    }
+    
+    if (ret == -1) {
+        return apr_get_netos_error();
+    }
+    
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_pollcb_remove(apr_pollcb_t *pollcb,
+                                            apr_pollfd_t *descriptor)
+{
+    apr_status_t rv = APR_SUCCESS;
+    struct epoll_event ev;
+    int ret = -1;
+    
+    ev.events = get_epoll_event(descriptor->reqevents);
+    
+    if (descriptor->desc_type == APR_POLL_SOCKET) {
+        ret = epoll_ctl(pollcb->epoll_fd, EPOLL_CTL_DEL,
+                        descriptor->desc.s->socketdes, &ev);
+    }
+    else {
+        ret = epoll_ctl(pollcb->epoll_fd, EPOLL_CTL_DEL,
+                        descriptor->desc.f->filedes, &ev);
+    }
+    
+    if (ret < 0) {
+        rv = APR_NOTFOUND;
+    }
+    
+    return rv;
+}
 
-    /* Shift all PFDs in the Dead Ring to be Free Ring */
-    APR_RING_CONCAT(&(pollset->free_ring), &(pollset->dead_ring), pfd_elem_t, link);
 
-    pollset_unlock_rings();
+APR_DECLARE(apr_status_t) apr_pollcb_poll(apr_pollcb_t *pollcb,
+                                          apr_interval_time_t timeout,
+                                          apr_pollcb_cb_t func,
+                                          void *baton)
+{
+    int ret, i;
+    apr_status_t rv = APR_SUCCESS;
+    
+    if (timeout > 0) {
+        timeout /= 1000;
+    }
+    
+    ret = epoll_wait(pollcb->epoll_fd, pollcb->pollset, pollcb->nalloc,
+                     timeout);
+    if (ret < 0) {
+        rv = apr_get_netos_error();
+    }
+    else if (ret == 0) {
+        rv = APR_TIMEUP;
+    }
+    else {
+        for (i = 0; i < ret; i++) {
+            apr_pollfd_t *pollfd = (apr_pollfd_t *)(pollcb->pollset[i].data.ptr);
+            pollfd->rtnevents = get_epoll_revent(pollcb->pollset[i].events);
 
+            rv = func(baton, pollfd);
+            if (rv) {
+                return rv;
+            }
+        }
+    }
+    
     return rv;
 }
 
diff --git a/srclib/apr/poll/unix/kqueue.c b/srclib/apr/poll/unix/kqueue.c
index fdabd487..501953dc 100644
--- a/srclib/apr/poll/unix/kqueue.c
+++ b/srclib/apr/poll/unix/kqueue.c
@@ -75,7 +75,7 @@ APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
     if (flags & APR_POLLSET_THREADSAFE &&
         ((rv = apr_thread_mutex_create(&(*pollset)->ring_lock,
                                        APR_THREAD_MUTEX_DEFAULT,
-                                       p) != APR_SUCCESS))) {
+                                       p)) != APR_SUCCESS)) {
         *pollset = NULL;
         return rv;
     }
@@ -98,7 +98,7 @@ APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
     (*pollset)->kqueue_fd = kqueue();
 
     if ((*pollset)->kqueue_fd == -1) {
-        return APR_ENOMEM;
+        return apr_get_netos_error();
     }
 
     apr_pool_cleanup_register(p, (void *) (*pollset), backend_cleanup,
@@ -149,7 +149,7 @@ APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset,
 
         if (kevent(pollset->kqueue_fd, &pollset->kevent, 1, NULL, 0,
                    NULL) == -1) {
-            rv = APR_ENOMEM;
+            rv = apr_get_netos_error();
         }
     }
 
@@ -158,7 +158,7 @@ APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset,
 
         if (kevent(pollset->kqueue_fd, &pollset->kevent, 1, NULL, 0,
                    NULL) == -1) {
-            rv = APR_ENOMEM;
+            rv = apr_get_netos_error();
         }
     }
 
@@ -281,4 +281,158 @@ APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
     return rv;
 }
 
+
+struct apr_pollcb_t {
+    apr_pool_t *pool;
+    apr_uint32_t nalloc;
+    struct kevent *pollset;
+    int kqfd;
+};
+
+static apr_status_t cb_cleanup(void *b_)
+{
+    apr_pollcb_t *pollcb = (apr_pollcb_t *) b_;
+    close(pollcb->kqfd);
+    return APR_SUCCESS;
+}
+
+
+APR_DECLARE(apr_status_t) apr_pollcb_create(apr_pollcb_t **pollcb,
+                                            apr_uint32_t size,
+                                            apr_pool_t *p,
+                                            apr_uint32_t flags)
+{
+    int fd;
+    
+    fd = kqueue();
+    if (fd < 0) {
+        *pollcb = NULL;
+        return apr_get_netos_error();
+    }
+    
+    *pollcb = apr_palloc(p, sizeof(**pollcb));
+    (*pollcb)->nalloc = size;
+    (*pollcb)->pool = p;
+    (*pollcb)->kqfd = fd;
+    (*pollcb)->pollset = (struct kevent *)apr_pcalloc(p, size * sizeof(struct kevent));
+    apr_pool_cleanup_register(p, *pollcb, cb_cleanup, cb_cleanup);
+    
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_pollcb_add(apr_pollcb_t *pollcb,
+                                         apr_pollfd_t *descriptor)
+{
+    apr_os_sock_t fd;
+    struct kevent ev;
+    apr_status_t rv = APR_SUCCESS;
+    
+    if (descriptor->desc_type == APR_POLL_SOCKET) {
+        fd = descriptor->desc.s->socketdes;
+    }
+    else {
+        fd = descriptor->desc.f->filedes;
+    }
+    
+    if (descriptor->reqevents & APR_POLLIN) {
+        EV_SET(&ev, fd, EVFILT_READ, EV_ADD, 0, 0, descriptor);
+        
+        if (kevent(pollcb->kqfd, &ev, 1, NULL, 0, NULL) == -1) {
+            rv = apr_get_netos_error();
+        }
+    }
+    
+    if (descriptor->reqevents & APR_POLLOUT && rv == APR_SUCCESS) {
+        EV_SET(&ev, fd, EVFILT_WRITE, EV_ADD, 0, 0, descriptor);
+        
+        if (kevent(pollcb->kqfd, &ev, 1, NULL, 0, NULL) == -1) {
+            rv = apr_get_netos_error();
+        }
+    }
+    
+    return rv;
+}
+
+APR_DECLARE(apr_status_t) apr_pollcb_remove(apr_pollcb_t *pollcb,
+                                            apr_pollfd_t *descriptor)
+{
+    apr_status_t rv = APR_SUCCESS;
+    struct kevent ev;
+    apr_os_sock_t fd;
+    
+    if (descriptor->desc_type == APR_POLL_SOCKET) {
+        fd = descriptor->desc.s->socketdes;
+    }
+    else {
+        fd = descriptor->desc.f->filedes;
+    }
+    
+    if (descriptor->reqevents & APR_POLLIN) {
+        EV_SET(&ev, fd, EVFILT_READ, EV_DELETE, 0, 0, NULL);
+        
+        if (kevent(pollcb->kqfd, &ev, 1, NULL, 0, NULL) == -1) {
+            rv = APR_NOTFOUND;
+        }
+    }
+    
+    if (descriptor->reqevents & APR_POLLOUT && rv == APR_SUCCESS) {
+        /* XXXX: this is less than optimal, shouldn't we still try to 
+         *        remove the FD even if it wasn't in the readset?
+         */
+        EV_SET(&ev, fd, EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
+        
+        if (kevent(pollcb->kqfd, &ev, 1, NULL, 0, NULL) == -1) {
+            rv = APR_NOTFOUND;
+        }
+    }
+    
+    return rv;
+}
+
+
+APR_DECLARE(apr_status_t) apr_pollcb_poll(apr_pollcb_t *pollcb,
+                                          apr_interval_time_t timeout,
+                                          apr_pollcb_cb_t func,
+                                          void *baton)
+{
+    int ret, i;
+    struct timespec tv, *tvptr;
+    apr_status_t rv = APR_SUCCESS;
+    
+    if (timeout < 0) {
+        tvptr = NULL;
+    }
+    else {
+        tv.tv_sec = (long) apr_time_sec(timeout);
+        tv.tv_nsec = (long) apr_time_usec(timeout) * 1000;
+        tvptr = &tv;
+    }
+    
+    ret = kevent(pollcb->kqfd, NULL, 0, pollcb->pollset, pollcb->nalloc,
+                 tvptr);
+
+    if (ret < 0) {
+        rv = apr_get_netos_error();
+    }
+    else if (ret == 0) {
+        rv = APR_TIMEUP;
+    }
+    else {
+        for (i = 0; i < ret; i++) {
+            apr_pollfd_t *pollfd = (apr_pollfd_t *)(pollcb->pollset[i].udata);
+            
+            pollfd->rtnevents = get_kqueue_revent(pollcb->pollset[i].filter,
+                                                  pollcb->pollset[i].flags);
+            
+            rv = func(baton, pollfd);
+            
+            if (rv) {
+                return rv;
+            }
+        }
+    }
+
+    return rv;
+}
+
 #endif /* POLLSET_USES_KQUEUE */
diff --git a/srclib/apr/poll/unix/poll.c b/srclib/apr/poll/unix/poll.c
index d27a9998..cca8bfe8 100644
--- a/srclib/apr/poll/unix/poll.c
+++ b/srclib/apr/poll/unix/poll.c
@@ -18,6 +18,10 @@
 
 #if defined(POLL_USES_POLL) || defined(POLLSET_USES_POLL)
 
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+
 static apr_int16_t get_event(apr_int16_t event)
 {
     apr_int16_t rv = 0;
@@ -266,4 +270,33 @@ APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
     return APR_SUCCESS;
 }
 
+APR_DECLARE(apr_status_t) apr_pollcb_create(apr_pollcb_t **pollcb,
+                                            apr_uint32_t size,
+                                            apr_pool_t *p,
+                                            apr_uint32_t flags)
+{
+    return APR_ENOTIMPL;
+}
+
+APR_DECLARE(apr_status_t) apr_pollcb_add(apr_pollcb_t *pollcb,
+                                         apr_pollfd_t *descriptor)
+{
+    return APR_ENOTIMPL;
+}
+
+APR_DECLARE(apr_status_t) apr_pollcb_remove(apr_pollcb_t *pollcb,
+                                            apr_pollfd_t *descriptor)
+{
+    return APR_ENOTIMPL;
+}
+
+
+APR_DECLARE(apr_status_t) apr_pollcb_poll(apr_pollcb_t *pollcb,
+                                          apr_interval_time_t timeout,
+                                          apr_pollcb_cb_t func,
+                                          void *baton)
+{
+    return APR_ENOTIMPL;
+}
+
 #endif /* POLLSET_USES_POLL */
diff --git a/srclib/apr/poll/unix/port.c b/srclib/apr/poll/unix/port.c
index 31f48cee..6f0ce755 100644
--- a/srclib/apr/poll/unix/port.c
+++ b/srclib/apr/poll/unix/port.c
@@ -15,6 +15,7 @@
  */
 
 #include "apr_arch_poll_private.h"
+#include "apr_atomic.h"
 
 #ifdef POLLSET_USES_PORT
 
@@ -80,6 +81,8 @@ struct apr_pollset_t
     /* A ring of pollfd_t where rings that have been _remove'd but
        might still be inside a _poll */
     APR_RING_HEAD(pfd_dead_ring_t, pfd_elem_t) dead_ring;
+    /* number of threads in poll */
+    volatile apr_uint32_t waiting;
 };
 
 static apr_status_t backend_cleanup(void *p_)
@@ -100,7 +103,7 @@ APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
     if (flags & APR_POLLSET_THREADSAFE &&
         ((rv = apr_thread_mutex_create(&(*pollset)->ring_lock,
                                        APR_THREAD_MUTEX_DEFAULT,
-                                       p) != APR_SUCCESS))) {
+                                       p)) != APR_SUCCESS)) {
         *pollset = NULL;
         return rv;
     }
@@ -110,6 +113,7 @@ APR_DECLARE(apr_status_t) apr_pollset_create(apr_pollset_t **pollset,
         return APR_ENOTIMPL;
     }
 #endif
+    (*pollset)->waiting = 0;
     (*pollset)->nelts = 0;
     (*pollset)->nalloc = size;
     (*pollset)->flags = flags;
@@ -168,16 +172,22 @@ APR_DECLARE(apr_status_t) apr_pollset_add(apr_pollset_t *pollset,
         fd = descriptor->desc.f->filedes;
     }
 
-    res = port_associate(pollset->port_fd, PORT_SOURCE_FD, fd, 
-                         get_event(descriptor->reqevents), (void *)elem);
+    if (apr_atomic_read32(&pollset->waiting)) {
+        res = port_associate(pollset->port_fd, PORT_SOURCE_FD, fd, 
+                             get_event(descriptor->reqevents), (void *)elem);
 
-    if (res < 0) {
-        rv = APR_ENOMEM;
-        APR_RING_INSERT_TAIL(&(pollset->free_ring), elem, pfd_elem_t, link);
-    }
+        if (res < 0) {
+            rv = APR_ENOMEM;
+            APR_RING_INSERT_TAIL(&(pollset->free_ring), elem, pfd_elem_t, link);
+        }
+        else {
+            pollset->nelts++;
+            APR_RING_INSERT_TAIL(&(pollset->query_ring), elem, pfd_elem_t, link);
+        }
+    } 
     else {
         pollset->nelts++;
-        APR_RING_INSERT_TAIL(&(pollset->query_ring), elem, pfd_elem_t, link);
+        APR_RING_INSERT_TAIL(&(pollset->add_ring), elem, pfd_elem_t, link);
     }
 
     pollset_unlock_rings();
@@ -192,6 +202,7 @@ APR_DECLARE(apr_status_t) apr_pollset_remove(apr_pollset_t *pollset,
     pfd_elem_t *ep;
     apr_status_t rv = APR_SUCCESS;
     int res;
+    int err;
 
     pollset_lock_rings();
 
@@ -205,6 +216,7 @@ APR_DECLARE(apr_status_t) apr_pollset_remove(apr_pollset_t *pollset,
     res = port_dissociate(pollset->port_fd, PORT_SOURCE_FD, fd);
 
     if (res < 0) {
+        err = errno;
         rv = APR_NOTFOUND;
     }
 
@@ -233,6 +245,9 @@ APR_DECLARE(apr_status_t) apr_pollset_remove(apr_pollset_t *pollset,
                 APR_RING_REMOVE(ep, link);
                 APR_RING_INSERT_TAIL(&(pollset->dead_ring),
                                      ep, pfd_elem_t, link);
+                if (ENOENT == err) {
+                    rv = APR_SUCCESS;
+                }
                 break;
             }
         }
@@ -268,6 +283,8 @@ APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
 
     pollset_lock_rings();
 
+    apr_atomic_inc32(&pollset->waiting);
+
     while (!APR_RING_EMPTY(&(pollset->add_ring), pfd_elem_t, link)) {
         ep = APR_RING_FIRST(&(pollset->add_ring));
         APR_RING_REMOVE(ep, link);
@@ -291,16 +308,14 @@ APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
     ret = port_getn(pollset->port_fd, pollset->port_set, pollset->nalloc,
                     &nget, tvptr);
 
+    /* decrease the waiting ASAP to reduce the window for calling 
+       port_associate within apr_pollset_add() */
+    apr_atomic_dec32(&pollset->waiting);
     (*num) = nget;
 
     if (ret == -1) {
         (*num) = 0;
-        if (errno == ETIME || errno == EINTR) {
-            rv = APR_TIMEUP;
-        }
-        else {
-            rv = APR_EGENERAL;
-        }
+        rv = apr_get_netos_error();
     }
     else if (nget == 0) {
         rv = APR_TIMEUP;
@@ -340,4 +355,135 @@ APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
     return rv;
 }
 
+struct apr_pollcb_t {
+    apr_pool_t *pool;
+    apr_uint32_t nalloc;
+    port_event_t *port_set;
+    int port_fd;
+};
+
+static apr_status_t cb_cleanup(void *p_)
+{
+    apr_pollcb_t *pollcb = (apr_pollcb_t *) p_;
+    close(pollcb->port_fd);
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_pollcb_create(apr_pollcb_t **pollcb,
+                                            apr_uint32_t size,
+                                            apr_pool_t *p,
+                                            apr_uint32_t flags)
+{
+    int fd;
+
+    fd = port_create();
+
+    if (fd < 0) {
+        *pollcb = NULL;
+        return apr_get_netos_error();
+    }
+
+    *pollcb = apr_palloc(p, sizeof(**pollcb));
+    (*pollcb)->nalloc = size;
+    (*pollcb)->pool = p;
+    (*pollcb)->port_fd = fd;
+    (*pollcb)->port_set = apr_palloc(p, size * sizeof(port_event_t));
+    apr_pool_cleanup_register(p, *pollcb, cb_cleanup, cb_cleanup);
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_pollcb_add(apr_pollcb_t *pollcb,
+                                         apr_pollfd_t *descriptor)
+{
+    int ret, fd;
+
+    if (descriptor->desc_type == APR_POLL_SOCKET) {
+        fd = descriptor->desc.s->socketdes;
+    }
+    else {
+        fd = descriptor->desc.f->filedes;
+    }
+
+    ret = port_associate(pollcb->port_fd, PORT_SOURCE_FD, fd,
+                         get_event(descriptor->reqevents), descriptor);
+
+    if (ret == -1) {
+        return apr_get_netos_error();
+    }
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_pollcb_remove(apr_pollcb_t *pollcb,
+                                            apr_pollfd_t *descriptor)
+{
+    int fd, ret;
+
+    if (descriptor->desc_type == APR_POLL_SOCKET) {
+        fd = descriptor->desc.s->socketdes;
+    }
+    else {
+        fd = descriptor->desc.f->filedes;
+    }
+
+    ret = port_dissociate(pollcb->port_fd, PORT_SOURCE_FD, fd);
+
+    if (ret < 0) {
+        return APR_NOTFOUND;
+    }
+
+    return APR_SUCCESS;
+}
+
+APR_DECLARE(apr_status_t) apr_pollcb_poll(apr_pollcb_t *pollcb,
+                                          apr_interval_time_t timeout,
+                                          apr_pollcb_cb_t func,
+                                          void *baton)
+{
+    int ret;
+    apr_pollfd_t *pollfd;
+    struct timespec tv, *tvptr;
+    apr_status_t rv = APR_SUCCESS;
+    unsigned int i, nget = pollcb->nalloc;
+
+    if (timeout < 0) {
+        tvptr = NULL;
+    }
+    else {
+        tv.tv_sec = (long) apr_time_sec(timeout);
+        tv.tv_nsec = (long) apr_time_usec(timeout) * 1000;
+        tvptr = &tv;
+    }
+
+    ret = port_getn(pollcb->port_fd, pollcb->port_set, pollcb->nalloc,
+                    &nget, tvptr);
+
+    if (ret == -1) {
+        if (errno == ETIME || errno == EINTR) {
+            rv = APR_TIMEUP;
+        }
+        else {
+            rv = APR_EGENERAL;
+        }
+    }
+    else if (nget == 0) {
+        rv = APR_TIMEUP;
+    }
+    else {
+        for (i = 0; i < nget; i++) {
+            pollfd = (apr_pollfd_t *)(pollcb->port_set[i].portev_user);
+            pollfd->rtnevents = get_revent(pollcb->port_set[i].portev_events);
+
+            rv = func(baton, pollfd);
+            if (rv) {
+                return rv;
+            }
+            rv = apr_pollcb_add(pollcb, pollfd);
+        }
+    }
+
+    return rv;
+}
+
 #endif /* POLLSET_USES_PORT */
diff --git a/srclib/apr/poll/unix/select.c b/srclib/apr/poll/unix/select.c
index ca35b77d..42e7a3f6 100644
--- a/srclib/apr/poll/unix/select.c
+++ b/srclib/apr/poll/unix/select.c
@@ -406,4 +406,33 @@ APR_DECLARE(apr_status_t) apr_pollset_poll(apr_pollset_t *pollset,
     return APR_SUCCESS;
 }
 
+APR_DECLARE(apr_status_t) apr_pollcb_create(apr_pollcb_t **pollcb,
+                                            apr_uint32_t size,
+                                            apr_pool_t *p,
+                                            apr_uint32_t flags)
+{
+    return APR_ENOTIMPL;
+}
+
+APR_DECLARE(apr_status_t) apr_pollcb_add(apr_pollcb_t *pollcb,
+                                         apr_pollfd_t *descriptor)
+{
+    return APR_ENOTIMPL;
+}
+
+APR_DECLARE(apr_status_t) apr_pollcb_remove(apr_pollcb_t *pollcb,
+                                            apr_pollfd_t *descriptor)
+{
+    return APR_ENOTIMPL;
+}
+
+
+APR_DECLARE(apr_status_t) apr_pollcb_poll(apr_pollcb_t *pollcb,
+                                          apr_interval_time_t timeout,
+                                          apr_pollcb_cb_t func,
+                                          void *baton)
+{
+    return APR_ENOTIMPL;
+}
+
 #endif /* POLLSET_USES_SELECT */
diff --git a/srclib/apr/random/unix/apr_random.c b/srclib/apr/random/unix/apr_random.c
index 41887d4b..c6d671c6 100644
--- a/srclib/apr/random/unix/apr_random.c
+++ b/srclib/apr/random/unix/apr_random.c
@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 /*
- * See the paper "???" by Ben Laurie for an explanation of this PRNG.
+ * See the paper "On Randomness" by Ben Laurie for an explanation of this PRNG.
+ * http://www.apache-ssl.org/randomness.pdf
+ * XXX: Is there a formal proof of this PRNG? Couldn't we use the more popular
+ * Mersenne Twister PRNG (and BSD licensed)?
  */
 
 #include "apr.h"
diff --git a/srclib/apr/random/unix/sha2.c b/srclib/apr/random/unix/sha2.c
index 7f55dac9..070526d9 100644
--- a/srclib/apr/random/unix/sha2.c
+++ b/srclib/apr/random/unix/sha2.c
@@ -157,7 +157,7 @@ void apr__SHA512_Transform(SHA512_CTX*, const sha2_word64*);
 
 /*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/
 /* Hash constant words K for SHA-256: */
-const static sha2_word32 K256[64] = {
+static const sha2_word32 K256[64] = {
         0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL,
         0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL,
         0xd807aa98UL, 0x12835b01UL, 0x243185beUL, 0x550c7dc3UL,
@@ -177,7 +177,7 @@ const static sha2_word32 K256[64] = {
 };
 
 /* Initial hash value H for SHA-256: */
-const static sha2_word32 sha256_initial_hash_value[8] = {
+static const sha2_word32 sha256_initial_hash_value[8] = {
         0x6a09e667UL,
         0xbb67ae85UL,
         0x3c6ef372UL,
@@ -189,7 +189,7 @@ const static sha2_word32 sha256_initial_hash_value[8] = {
 };
 
 /* Hash constant words K for SHA-384 and SHA-512: */
-const static sha2_word64 K512[80] = {
+static const sha2_word64 K512[80] = {
     APR_UINT64_C(0x428a2f98d728ae22), APR_UINT64_C(0x7137449123ef65cd),
     APR_UINT64_C(0xb5c0fbcfec4d3b2f), APR_UINT64_C(0xe9b5dba58189dbbc),
     APR_UINT64_C(0x3956c25bf348b538), APR_UINT64_C(0x59f111f1b605d019),
@@ -233,7 +233,7 @@ const static sha2_word64 K512[80] = {
 };
 
 /* Initial hash value H for SHA-384 */
-const static sha2_word64 sha384_initial_hash_value[8] = {
+static const sha2_word64 sha384_initial_hash_value[8] = {
     APR_UINT64_C(0xcbbb9d5dc1059ed8),
     APR_UINT64_C(0x629a292a367cd507),
     APR_UINT64_C(0x9159015a3070dd17),
@@ -245,7 +245,7 @@ const static sha2_word64 sha384_initial_hash_value[8] = {
 };
 
 /* Initial hash value H for SHA-512 */
-const static sha2_word64 sha512_initial_hash_value[8] = {
+static const sha2_word64 sha512_initial_hash_value[8] = {
     APR_UINT64_C(0x6a09e667f3bcc908),
     APR_UINT64_C(0xbb67ae8584caa73b),
     APR_UINT64_C(0x3c6ef372fe94f82b),
diff --git a/srclib/apr/shmem/win32/shm.c b/srclib/apr/shmem/win32/shm.c
index 7bce1331..da736aa6 100644
--- a/srclib/apr/shmem/win32/shm.c
+++ b/srclib/apr/shmem/win32/shm.c
@@ -18,6 +18,7 @@
 #include "apr_errno.h"
 #include "apr_file_io.h"
 #include "apr_shm.h"
+#include "apr_strings.h"
 #include "apr_arch_file_io.h"
 #include "limits.h"
 
@@ -33,6 +34,7 @@ struct apr_shm_t {
     apr_size_t  size;
     apr_size_t  length;
     HANDLE      hMap;
+    const char *filename;
 };
 
 static apr_status_t shm_cleanup(void* shm)
@@ -44,11 +46,13 @@ static apr_status_t shm_cleanup(void* shm)
         rv = apr_get_os_error();
     }
     if (!CloseHandle(m->hMap)) {
-        return (rv != APR_SUCCESS) ? rv : apr_get_os_error();
+        rv = rv != APR_SUCCESS ? rv : apr_get_os_error();
+    }
+    if (m->filename) {
+        /* Remove file if file backed */
+        apr_status_t rc = apr_file_remove(m->filename, m->pool);
+        rv = rv != APR_SUCCESS ? rv : rc;
     }
-    /* ### Do we want to make a point of unlinking m->file here? 
-     * Need to add the fname to the apr_shm_t, in that case.
-     */
     return rv;
 }
 
@@ -159,6 +163,7 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
     
     (*m)->memblk->length = (*m)->length;
     (*m)->memblk->size = (*m)->size;
+    (*m)->filename = file ? apr_pstrdup(pool, file) : NULL;
 
     apr_pool_cleanup_register((*m)->pool, *m, 
                               shm_cleanup, apr_pool_cleanup_null);
@@ -175,7 +180,7 @@ APR_DECLARE(apr_status_t) apr_shm_destroy(apr_shm_t *m)
 APR_DECLARE(apr_status_t) apr_shm_remove(const char *filename,
                                          apr_pool_t *pool)
 {
-    return APR_ENOTIMPL;
+    return apr_file_remove(filename, pool);
 }
 
 APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
@@ -252,6 +257,8 @@ APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
     (*m)->hMap = hMap;
     (*m)->length = (*m)->memblk->length;
     (*m)->usrmem = (char*)base + sizeof(memblock_t);
+    (*m)->filename = NULL;
+
     apr_pool_cleanup_register((*m)->pool, *m, 
                               shm_cleanup, apr_pool_cleanup_null);
     return APR_SUCCESS;
@@ -301,6 +308,7 @@ APR_DECLARE(apr_status_t) apr_os_shm_put(apr_shm_t **m,
     /* Real (*m)->mem->size could be recovered with VirtualQuery */
     (*m)->size = (*m)->memblk->size;
     (*m)->length = (*m)->memblk->length;
+    (*m)->filename = NULL;
 
     apr_pool_cleanup_register((*m)->pool, *m, 
                               shm_cleanup, apr_pool_cleanup_null);
diff --git a/srclib/apr/strings/apr_fnmatch.c b/srclib/apr/strings/apr_fnmatch.c
index 7c41ea65..aa250ecd 100644
--- a/srclib/apr/strings/apr_fnmatch.c
+++ b/srclib/apr/strings/apr_fnmatch.c
@@ -225,7 +225,7 @@ APR_DECLARE(int) apr_fnmatch_test(const char *pattern)
 	    return 1;
 
 	case '\\':
-	    if (*pattern++ == '\0') {
+	    if (*++pattern == '\0') {
 		return 0;
 	    }
 	    break;
diff --git a/srclib/apr/strings/apr_snprintf.c b/srclib/apr/strings/apr_snprintf.c
index 46673080..01310079 100644
--- a/srclib/apr/strings/apr_snprintf.c
+++ b/srclib/apr/strings/apr_snprintf.c
@@ -21,6 +21,7 @@
 #include "apr_strings.h"
 #include "apr_network_io.h"
 #include "apr_portable.h"
+#include "apr_errno.h"
 #include <math.h>
 #if APR_HAVE_CTYPE_H
 #include <ctype.h>
@@ -51,21 +52,10 @@ typedef enum {
 #ifndef TRUE
 #define TRUE 1
 #endif
-
-/* For APR 1.2.x only (solved globally in 1.3.0) to be portable
- * to non-2's compliment architectures, fall through to the 64
- * bit code path for the signed or unsigned value 0x...80000000
- */
-#ifndef INT32_MIN
-#define INT32_MIN -(0x7fffffff)
-#endif
-#ifndef INT32_MAX 
-#define INT32_MAX 0x7fffffff
-#endif
-
 #define NUL '\0'
 
-#define S_NULL "(null)"
+static const char null_string[] = "(null)";
+#define S_NULL ((char *)null_string)
 #define S_NULL_LEN 6
 
 #define FLOAT_DIGITS 6
@@ -79,8 +69,8 @@ typedef enum {
 #define NUM_BUF_SIZE 512
 
 /*
- * cvt.c - IEEE floating point formatting routines for FreeBSD
- * from GNU libc-4.6.27.  Modified to be thread safe.
+ * cvt - IEEE floating point formatting routines.
+ *       Derived from UNIX V7, Copyright(C) Caldera International Inc.
  */
 
 /*
@@ -393,7 +383,7 @@ static char *conv_10_quad(apr_int64_t num, register int is_unsigned,
      * punt to the quicker version.
      */
     if ((magnitude <= APR_UINT32_MAX && is_unsigned)
-        || (num <= INT32_MAX && num >= INT32_MIN && !is_unsigned))
+        || (num <= APR_INT32_MAX && num >= APR_INT32_MIN && !is_unsigned))
             return(conv_10((apr_int32_t)num, is_unsigned, is_negative, buf_end, len));
 
     if (is_unsigned) {
@@ -463,7 +453,14 @@ static char *conv_apr_sockaddr(apr_sockaddr_t *sa, char *buf_end, apr_size_t *le
 
     p = conv_10(sa->port, TRUE, &is_negative, p, &sub_len);
     *--p = ':';
-    apr_sockaddr_ip_get(&ipaddr_str, sa);
+    ipaddr_str = buf_end - NUM_BUF_SIZE;
+    if (apr_sockaddr_ip_getbuf(ipaddr_str, sa->addr_str_len, sa)) {
+        /* Should only fail if the buffer is too small, which it
+         * should not be; but fail safe anyway: */
+        *--p = '?';
+        *len = buf_end - p;
+        return p;
+    }
     sub_len = strlen(ipaddr_str);
 #if APR_HAVE_IPV6
     if (sa->family == APR_INET6 &&
@@ -693,7 +690,7 @@ APR_DECLARE(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *),
 
     register char *s = NULL;
     char *q;
-    apr_size_t s_len;
+    apr_size_t s_len = 0;
 
     register apr_size_t min_width = 0;
     apr_size_t precision = 0;
@@ -1160,6 +1157,24 @@ APR_DECLARE(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *),
                 }
                 break;
 
+                /* print the error for an apr_status_t */
+                case 'm':
+                {
+                    apr_status_t *mrv;
+
+                    mrv = va_arg(ap, apr_status_t *);
+                    if (mrv != NULL) {
+                        s = apr_strerror(*mrv, num_buf, NUM_BUF_SIZE-1);
+                        s_len = strlen(s);
+                    }
+                    else {
+                        s = S_NULL;
+                        s_len = S_NULL_LEN;
+                    }
+                    pad_char = ' ';
+                }
+                break;
+
                 case 'T':
 #if APR_HAS_THREADS
                 {
@@ -1210,6 +1225,32 @@ APR_DECLARE(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *),
 #endif
                     break;
 
+                case 'B':
+                case 'F':
+                case 'S':
+                {
+                    char buf[5];
+                    apr_off_t size = 0;
+
+                    if (*fmt == 'B') {
+                        apr_uint32_t *arg = va_arg(ap, apr_uint32_t *);
+                        size = (arg) ? *arg : 0;
+                    }
+                    else if (*fmt == 'F') {
+                        apr_off_t *arg = va_arg(ap, apr_off_t *);
+                        size = (arg) ? *arg : 0;
+                    }
+                    else {
+                        apr_size_t *arg = va_arg(ap, apr_size_t *);
+                        size = (arg) ? *arg : 0;
+                    }
+
+                    s = apr_strfsize(size, buf);
+                    s_len = strlen(s);
+                    pad_char = ' ';
+                }
+                break;
+
                 case NUL:
                     /* if %p ends the string, oh well ignore it */
                     continue;
diff --git a/srclib/apr/tables/apr_hash.c b/srclib/apr/tables/apr_hash.c
index 6f58d98b..4e3723e1 100644
--- a/srclib/apr/tables/apr_hash.c
+++ b/srclib/apr/tables/apr_hash.c
@@ -367,6 +367,13 @@ APR_DECLARE(unsigned int) apr_hash_count(apr_hash_t *ht)
     return ht->count;
 }
 
+APR_DECLARE(void) apr_hash_clear(apr_hash_t *ht)
+{
+    apr_hash_index_t *hi;
+    for (hi = apr_hash_first(NULL, ht); hi; hi = apr_hash_next(hi))
+        apr_hash_set(ht, hi->this->key, hi->this->klen, NULL);
+}
+
 APR_DECLARE(apr_hash_t*) apr_hash_overlay(apr_pool_t *p,
                                           const apr_hash_t *overlay,
                                           const apr_hash_t *base)
diff --git a/srclib/apr/tables/apr_tables.c b/srclib/apr/tables/apr_tables.c
index c64838fe..51b23407 100644
--- a/srclib/apr/tables/apr_tables.c
+++ b/srclib/apr/tables/apr_tables.c
@@ -38,7 +38,7 @@
 #include <strings.h>
 #endif
 
-#if APR_POOL_DEBUG && APR_HAVE_STDIO_H
+#if (APR_POOL_DEBUG || defined(MAKE_TABLE_PROFILE)) && APR_HAVE_STDIO_H
 #include <stdio.h>
 #endif
 
@@ -90,6 +90,11 @@ APR_DECLARE(apr_array_header_t *) apr_array_make(apr_pool_t *p,
     return res;
 }
 
+APR_DECLARE(void) apr_array_clear(apr_array_header_t *arr)
+{
+    arr->nelts = 0;
+}
+
 APR_DECLARE(void *) apr_array_pop(apr_array_header_t *arr)
 {
     if (apr_is_empty_array(arr)) {
@@ -357,13 +362,19 @@ struct apr_table_t {
  * and table_elts() in alloc.h
  */
 #ifdef MAKE_TABLE_PROFILE
-static apr_table_entry_t *table_push(apr_table_t *t)
+static apr_table_entry_t *do_table_push(const char *func, apr_table_t *t)
 {
     if (t->a.nelts == t->a.nalloc) {
-        return NULL;
+        fprintf(stderr, "%s: table created by %p hit limit of %u\n",
+                func ? func : "table_push", t->creator, t->a.nalloc);
     }
     return (apr_table_entry_t *) apr_array_push_noclear(&t->a);
 }
+#if defined(__GNUC__) && __GNUC__ >= 2
+#define table_push(t) do_table_push(__FUNCTION__, t)
+#else
+#define table_push(t) do_table_push(NULL, t)
+#endif
 #else /* MAKE_TABLE_PROFILE */
 #define table_push(t)	((apr_table_entry_t *) apr_array_push_noclear(&(t)->a))
 #endif /* MAKE_TABLE_PROFILE */
@@ -412,6 +423,20 @@ APR_DECLARE(apr_table_t *) apr_table_copy(apr_pool_t *p, const apr_table_t *t)
     return new;
 }
 
+APR_DECLARE(apr_table_t *) apr_table_clone(apr_pool_t *p, const apr_table_t *t)
+{
+    const apr_array_header_t *array = apr_table_elts(t);
+    apr_table_entry_t *elts = (apr_table_entry_t *) array->elts;
+    apr_table_t *new = apr_table_make(p, array->nelts);
+    int i;
+
+    for (i = 0; i < array->nelts; i++) {
+        apr_table_add(new, elts[i].key, elts[i].val);
+    }
+
+    return new;
+}
+
 static void table_reindex(apr_table_t *t)
 {
     int i;
diff --git a/srclib/apr/test/Makefile.in b/srclib/apr/test/Makefile.in
index a54117b5..b3710742 100644
--- a/srclib/apr/test/Makefile.in
+++ b/srclib/apr/test/Makefile.in
@@ -20,18 +20,20 @@ STDTEST_PORTABLE = \
 	testmutexscope@EXEEXT@ \
 	testall@EXEEXT@
 
-TESTS = testtime.lo teststr.lo testvsn.lo testipsub.lo \
+TESTS = testtime.lo teststr.lo testvsn.lo testipsub.lo testshm.lo \
 	testmmap.lo testud.lo testtable.lo testsleep.lo testpools.lo \
 	testfmt.lo testfile.lo testdir.lo testfileinfo.lo testrand.lo \
 	testdso.lo testoc.lo testdup.lo testsockets.lo testproc.lo \
 	testpoll.lo testlock.lo testsockopt.lo testpipe.lo testthread.lo \
 	testhash.lo testargs.lo testnames.lo testuser.lo testpath.lo \
-	testenv.lo testprocmutex.lo testrand2.lo testfnmatch.lo \
-	testatomic.lo testflock.lo testshm.lo testsock.lo testglobalmutex.lo \
-	teststrnatcmp.lo testfilecopy.lo testtemp.lo testlfs.lo
+	testenv.lo testprocmutex.lo testfnmatch.lo testatomic.lo testflock.lo \
+	testsock.lo testglobalmutex.lo teststrnatcmp.lo testfilecopy.lo \
+	testtemp.lo testlfs.lo testcond.lo
 
 OTHER_PROGRAMS = \
-	sendfile@EXEEXT@
+	sendfile@EXEEXT@ \
+	echod@EXEEXT@ \
+	sockperf@EXEEXT@
 
 TESTALL_COMPONENTS = \
 	globalmutexchild@EXEEXT@ \
@@ -55,8 +57,8 @@ TARGETS = $(PROGRAMS)
 
 LOCAL_LIBS=../lib@APR_LIBNAME@.la
 
-CLEAN_TARGETS = testfile.tmp lfstests/large.bin \
-	data/test*.txt data/test*.dat
+CLEAN_TARGETS = testfile.tmp lfstests/*.bin \
+	data/test*.txt data/test*.dat data/apr.testshm.shm
 
 CLEAN_SUBDIRS = internal
 
@@ -93,17 +95,25 @@ testmutexscope@EXEEXT@: $(OBJECTS_testmutexscope)
 
 # OTHER_PROGRAMS;
 
+OBJECTS_echod = echod.lo $(LOCAL_LIBS)
+echod@EXEEXT@: $(OBJECTS_echod)
+	$(LINK_PROG) $(OBJECTS_echod) $(ALL_LIBS)
+
 OBJECTS_sendfile = sendfile.lo $(LOCAL_LIBS)
 sendfile@EXEEXT@: $(OBJECTS_sendfile)
 	$(LINK_PROG) $(OBJECTS_sendfile) $(ALL_LIBS)
 
+OBJECTS_sockperf = sockperf.lo $(LOCAL_LIBS)
+sockperf@EXEEXT@: $(OBJECTS_sockperf)
+	$(LINK_PROG) $(OBJECTS_sockperf) $(ALL_LIBS)
+
 # TESTALL_COMPONENTS;
 
 OBJECTS_globalmutexchild = globalmutexchild.lo $(LOCAL_LIBS)
 globalmutexchild@EXEEXT@: $(OBJECTS_globalmutexchild)
 	$(LINK_PROG) $(OBJECTS_globalmutexchild) $(ALL_LIBS)
 
-# Note: -prefer-pic is only supported with libtool-1.4+
+# Note -prefer-pic is only supported with libtool-1.4+
 mod_test.lo: $(srcdir)/mod_test.c
 	$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -prefer-pic -o $@ \
 	  -c $(srcdir)/mod_test.c
@@ -149,12 +159,19 @@ tryread@EXEEXT@: $(OBJECTS_tryread)
 	$(LINK_PROG) $(OBJECTS_tryread) $(ALL_LIBS)
 
 check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
+	teststatus=0; \
+	progfailed=""; \
 	for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \
 		./$$prog; \
-		if test $$? = 255; then \
-			echo "$$prog failed"; \
-			break; \
+		status=$$?; \
+		if test $$status != 0; then \
+			teststatus=$$status; \
+			progfailed="$$progfailed $$prog"; \
 		fi; \
-	done
+	done; \
+	if test $$teststatus != 0; then \
+		echo "Programs failed:$$progfailed"; \
+	fi; \
+	exit $$teststatus
 
 # DO NOT REMOVE
diff --git a/srclib/apr/test/Makefile.win b/srclib/apr/test/Makefile.win
index 019124fb..9274dcd1 100644
--- a/srclib/apr/test/Makefile.win
+++ b/srclib/apr/test/Makefile.win
@@ -33,7 +33,8 @@ OUTDIR=LibR
 OUTDIR=Release
 !ENDIF
 
-!IF [$(COMSPEC) /c cl /nologo /? | find "x64" >NUL ] == 0
+!IF [$(COMSPEC) /c cl /nologo /? \
+	| $(SystemRoot)\System32\find.exe "x64" >NUL ] == 0
 OUTDIR=x64\$(OUTDIR)
 !ENDIF
 !ENDIF
@@ -61,7 +62,9 @@ STDTEST_PORTABLE = \
 	$(OUTDIR)\testmutexscope.exe
 
 OTHER_PROGRAMS = \
-	$(OUTDIR)\sendfile.exe
+	$(OUTDIR)\echod.exe \
+	$(OUTDIR)\sendfile.exe \
+	$(OUTDIR)\sockperf.exe
 
 TESTALL_COMPONENTS = \
 	$(OUTDIR)\mod_test.dll \
@@ -95,7 +98,7 @@ ALL_TESTS = $(INTDIR)\testutil.obj $(INTDIR)\testtime.obj \
 	$(INTDIR)\testsock.obj $(INTDIR)\testglobalmutex.obj \
 	$(INTDIR)\teststrnatcmp.obj $(INTDIR)\testfilecopy.obj \
 	$(INTDIR)\testtemp.obj $(INTDIR)\testlfs.obj \
-	$(INTDIR)\testrand2.obj
+	$(INTDIR)\testcond.obj
 
 CLEAN_DATA = testfile.tmp lfstests\large.bin \
 	data\testputs.txt data\testbigfprintf.dat \
@@ -107,7 +110,8 @@ CLEAN_BUILDDIRS = Debug Release LibD LibR 9x x64
 
 TEST_SUBDIRS = internal
 
-PROGRAMS = $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) $(OTHER_PROGRAMS)
+PROGRAMS = $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) \
+	$(OTHER_PROGRAMS)
 
 TARGETS = $(PROGRAMS)
 
@@ -172,11 +176,21 @@ $(OUTDIR)\testmutexscope.exe: $(INTDIR)\testmutexscope.obj $(LOCAL_LIB)
 
 # OTHER_PROGRAMS;
 
+$(OUTDIR)\echod.exe: $(INTDIR)\echod.obj $(LOCAL_LIB)
+	$(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS)
+	@if exist "$@.manifest" \
+	    mt.exe -manifest "$@.manifest" -outputresource:$@;1
+
 $(OUTDIR)\sendfile.exe: $(INTDIR)\sendfile.obj $(LOCAL_LIB)
 	$(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS)
 	@if exist "$@.manifest" \
 	    mt.exe -manifest "$@.manifest" -outputresource:$@;1
 
+$(OUTDIR)\sockperf.exe: $(INTDIR)\sockperf.obj $(LOCAL_LIB)
+	$(LD) $(LDFLAGS) /out:"$@" $** $(LD_LIBS)
+	@if exist "$@.manifest" \
+	    mt.exe -manifest "$@.manifest" -outputresource:$@;1
+
 # TESTALL_COMPONENTS;
 
 $(OUTDIR)\globalmutexchild.exe: $(INTDIR)\globalmutexchild.obj $(LOCAL_LIB)
@@ -242,7 +256,9 @@ cleanall:
 	    %COMSPEC% /c "cd %%d & $(MAKE) -f Makefile.win cleanall" \
 
 
+!IF "$(MODEL)" != "static"
 PATH=$(OUTDIR);..\$(OUTDIR);$(PATH)
+!ENDIF
 
 check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
 	@for %p in ($(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)) do @( \
diff --git a/srclib/apr/test/README b/srclib/apr/test/README
index f3871572..d1c4feab 100644
--- a/srclib/apr/test/README
+++ b/srclib/apr/test/README
@@ -60,7 +60,7 @@ To run it, run:
     ./testall
 
 Running individual tests
----------------------------------
+------------------------
 
 It is not possible to build individual tests, however it is possible to
 run individual tests.  When running the test suite, specify the name of the
@@ -146,8 +146,107 @@ To add a new Suite to the full driver, you must make a couple of modifications.
 Once those four things are done, your tests will automatically be added
 to the suite.
 
-Writing tests
--------------
+Writting an ABTS unit test
+--------------------------
+
+The aim of this quick and dirty Howto is to give a short introduction
+to APR (Apache Portable Runtime) unit tests, and how to write
+one. During my Google's Summer of Code 2005 project, I discovered a
+small bug in the APR-Util's date parsing routines, and I needed to
+write a unit test for the fixed code. I decided to write this
+documentation because I did not find any. Thanks to Garrett Rooney for
+his help on writing the unit test !
+
+The APR and APR-Util libraries provide a platform independent API for
+software developers. They contain a lot of modules, including network
+programming, threads, string and memory management, etc. All these
+functions need to be heavily tested so that developers can be sure the
+library is reliable.
+
+The ABTS give APR developers the ability to build a complete test
+suite for the bunch of tests they wrote, which can then be ran under
+various platforms. In this Howto, I will try teach you how to write an
+ABTS unit test.
+
+As you may probably know, a unit test is a simple routine which tests
+a very specific feature of the tested software or library. To build a
+unit test, you need three different things :
+
+ * the to-be-tested function,
+ * the input data that will be given to the function,
+ * the expected output data.
+
+The principle of a unit test is very simple : for each entry in your
+set of input data, we pass it to our function, fetch what the function
+returned and compare it to the corresponding expected output data. Of
+course, the more edge cases you can test, the better your input data
+set is.
+
+The ABTS aims to quicken the write of unit test, and make them
+available to the whole test suite by providing a set of preprocessor
+macros. Adding a unit test to a test suite can be easily done by the
+following piece of code :
+
+abts_suite *testdaterfc(abts_suite *suite)
+{
+    suite = ADD_SUITE(suite);
+    abts_run_test(suite, test_date_rfc, NULL);
+
+    return suite;
+}
+
+Where test_date_rfc is the name of the function performing the
+test. Writing such a function is, in the light of the explanation I
+just gave, pretty much easy too. As I said, we need to check every
+entry of our input data set. That gives us a loop. For each loop
+iteration, we call our to-be-tested function, grab its result and
+compare the returned value with the expected one.
+
+Test functions must have the following prototype :
+
+static void my_test_function(abts_case *tc, void *data);
+
+The comparison step is performed by the ABTS, thus giving the
+whole test suite the correct behavior if your unit test fails. Here
+comes a list of the available test methods :
+
+ABTS_INT_EQUAL(tc, a, b)
+ABTS_INT_NEQUAL(tc, a, b)
+ABTS_STR_EQUAL(tc, a, b)
+ABTS_STR_NEQUAL(tc, a, b, c)
+ABTS_PTR_NOTNULL(tc, b)
+ABTS_PTR_EQUAL(tc, a, b)
+ABTS_TRUE(tc, b)
+ABTS_FAIL(tc, b)
+ABTS_NOT_IMPL(tc, b)
+ABTS_ASSERT(tc, a, b)
+
+The first argument, tc is a reference to the unit test currently
+processed by the test suite (passed to your test function). The other
+parameters are the data to be tested. For example, the following line
+will never make your unit test fail :
+
+ABTS_INT_EQUAL(tc, 1, 1);
+
+See, it's easy ! Let's take a look at the complete example :
+testdaterfc. We want to test our date string parser. For this, we will
+use some chosen date strings (from mail headers for example) written
+in various formats but that should all be handled by our function, and
+their equivalents in correct RFC822 format.
+
+The function we want to test returns an apr_time_t}, which will be
+directly given as input to the apr_rfc822_date() function, thus
+producing the corresponding RFC822 date string. All we need to do
+after this is to call the correct test method from the ABTS macros !
+
+You can take a look at the apr-util/test/testdaterfc.c file for the
+complete source code of this unit test.
+
+Although this Howto is very small and mostly dedicated to the
+testdaterfc unit test, I hope you'll find it useful. Good luck !
+
+Writing tests for CuTest (no longer used)
+-----------------------------------------
 
 There are a couple of rules for writing good tests for the test suite.
 
diff --git a/srclib/apr/test/abts.c b/srclib/apr/test/abts.c
index d8cb2c9d..d23eefa9 100644
--- a/srclib/apr/test/abts.c
+++ b/srclib/apr/test/abts.c
@@ -1,8 +1,9 @@
-/* Copyright 2000-2004 Ryan Bloom
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -11,9 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
- * Portions of this file were taken from testall.c in the APR test suite,
- * written by members of the Apache Software Foundation.
  */
 
 #include "abts.h"
diff --git a/srclib/apr/test/abts.h b/srclib/apr/test/abts.h
index 4d6470ae..7385ca95 100644
--- a/srclib/apr/test/abts.h
+++ b/srclib/apr/test/abts.h
@@ -1,8 +1,9 @@
-/* Copyright 2000-2004 Ryan Bloom
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
diff --git a/srclib/apr/test/abts_tests.h b/srclib/apr/test/abts_tests.h
index 83e84717..13d8b4ee 100644
--- a/srclib/apr/test/abts_tests.h
+++ b/srclib/apr/test/abts_tests.h
@@ -41,6 +41,7 @@ const struct testlist {
     {testhash},
     {testipsub},
     {testlock},
+    {testcond},
     {testlfs},
     {testmmap},
     {testnames},
@@ -52,7 +53,6 @@ const struct testlist {
     {testproc},
     {testprocmutex},
     {testrand},
-    {testrand2},
     {testsleep},
     {testshm},
     {testsock},
diff --git a/srclib/apr/test/echod.c b/srclib/apr/test/echod.c
new file mode 100644
index 00000000..c78e90fd
--- /dev/null
+++ b/srclib/apr/test/echod.c
@@ -0,0 +1,135 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Simple echo daemon, designed to be used for network throughput
+ * benchmarks. The aim is to allow us to monitor changes in performance
+ * of APR networking code, nothing more.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>  /* for atexit() */
+
+#include "apr.h"
+#include "apr_network_io.h"
+#include "apr_strings.h"
+
+#define BUF_SIZE 4096
+
+static void reportError(const char *msg, apr_status_t rv, 
+                        apr_pool_t *pool)
+{
+    fprintf(stderr, "%s\nError: %d\n'%s'\n", msg, rv,
+            apr_psprintf(pool, "%pm", &rv));
+}
+
+static apr_status_t talkTalk(apr_socket_t *socket, apr_pool_t *parent)
+{
+    apr_pool_t *pool;
+    apr_size_t len;
+    char *buf;
+    apr_status_t rv;
+
+    if (apr_pool_create(&pool, parent) != APR_SUCCESS)
+        return APR_ENOPOOL;
+
+
+    buf = apr_palloc(pool, BUF_SIZE);
+    if (!buf)
+        return ENOMEM;
+
+    do {
+        len = BUF_SIZE;
+        rv = apr_socket_recv(socket, buf, &len);
+        if (APR_STATUS_IS_EOF(rv) || len == 0 || rv != APR_SUCCESS)
+            break;
+        rv = apr_socket_send(socket, buf, &len);
+        if (len == 0 || rv != APR_SUCCESS)
+            break;
+    } while (rv == APR_SUCCESS);
+
+    apr_pool_clear(pool);
+    return APR_SUCCESS;
+}
+
+static apr_status_t glassToWall(apr_int16_t port, apr_pool_t *parent)
+{
+    apr_sockaddr_t *sockAddr;
+    apr_socket_t *listener, *accepted;
+    apr_status_t rv;
+
+    rv = apr_socket_create(&listener, APR_INET, SOCK_STREAM, APR_PROTO_TCP,
+                           parent);
+    if (rv != APR_SUCCESS) {
+        reportError("Unable to create socket", rv, parent);
+        return rv;
+    }
+
+    rv = apr_sockaddr_info_get(&sockAddr, "127.0.0.1", APR_UNSPEC,
+                               port, 0, parent);
+    if (rv != APR_SUCCESS) {
+        reportError("Unable to get socket info", rv, parent);
+        apr_socket_close(listener);
+        return rv;
+    }
+
+    if ((rv = apr_socket_bind(listener, sockAddr)) != APR_SUCCESS ||
+        (rv = apr_socket_listen(listener, 5)) != APR_SUCCESS) {
+        reportError("Unable to bind or listen to socket", rv, parent);
+        apr_socket_close(listener);
+        return rv;
+    }
+
+    for (;;) {
+        rv = apr_socket_accept(&accepted, listener, parent);
+        if (rv != APR_SUCCESS) {
+            reportError("Error accepting on socket", rv, parent);
+            break;
+        }
+        printf("\tAnswering connection\n");
+        rv = talkTalk(accepted, parent);
+        apr_socket_close(accepted);
+        printf("\tConnection closed\n");
+        if (rv != APR_SUCCESS)
+            break;
+    }
+
+    apr_socket_close(listener);
+    return APR_SUCCESS;
+}
+
+int main(int argc, char **argv)
+{
+    apr_pool_t *pool;
+    apr_status_t rv;
+    apr_int16_t theport = 4747;
+
+    printf("APR Test Application: echod\n");
+
+    apr_initialize();
+    atexit(apr_terminate);
+
+    apr_pool_create(&pool, NULL);
+
+    if (argc >= 2) {
+        printf("argc = %d, port = '%s'\n", argc, argv[1]);
+        theport = atoi(argv[1]);
+    }
+
+    fprintf(stdout, "Starting to listen on port %d\n", theport);
+    rv = glassToWall(theport, pool);
+
+    return 0;
+}
diff --git a/srclib/apr/test/nwgnuaprtest b/srclib/apr/test/nwgnuaprtest
index 22b24b08..0c7f8c75 100644
--- a/srclib/apr/test/nwgnuaprtest
+++ b/srclib/apr/test/nwgnuaprtest
@@ -187,6 +187,7 @@ FILES_nlm_objs = \
 	$(OBJDIR)/testipsub.o \
 	$(OBJDIR)/testlfs.o \
 	$(OBJDIR)/testlock.o \
+        $(OBJDIR)/testcond.o \
 	$(OBJDIR)/testmmap.o \
 	$(OBJDIR)/testnames.o \
 	$(OBJDIR)/testoc.o \
@@ -197,7 +198,6 @@ FILES_nlm_objs = \
 	$(OBJDIR)/testproc.o \
 	$(OBJDIR)/testprocmutex.o \
 	$(OBJDIR)/testrand.o \
-	$(OBJDIR)/testrand2.o \
 	$(OBJDIR)/testshm.o \
 	$(OBJDIR)/testsleep.o \
 	$(OBJDIR)/testsock.o \
@@ -297,3 +297,4 @@ install :: nlms FORCE
 
 include $(APR_WORK)\build\NWGNUtail.inc
 
+
diff --git a/srclib/apr/test/sendfile.c b/srclib/apr/test/sendfile.c
index cfa1fb8a..488d2648 100644
--- a/srclib/apr/test/sendfile.c
+++ b/srclib/apr/test/sendfile.c
@@ -147,7 +147,7 @@ static void create_testfile(apr_pool_t *p, const char *fname)
     }
 
     rv = apr_stat(&finfo, fname, APR_FINFO_NORM, p);
-    if (rv != APR_SUCCESS && rv != APR_INCOMPLETE) {
+    if (rv != APR_SUCCESS && ! APR_STATUS_IS_INCOMPLETE(rv)) {
         fprintf(stderr, "apr_stat()->%d/%s\n",
                 rv, apr_strerror(rv, buf, sizeof buf));
         exit(1);
diff --git a/srclib/apr/test/sockperf.c b/srclib/apr/test/sockperf.c
new file mode 100644
index 00000000..9726e568
--- /dev/null
+++ b/srclib/apr/test/sockperf.c
@@ -0,0 +1,242 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* sockperf.c
+ * This simple network client tries to connect to an echo daemon (echod)
+ * listening on a port it supplies, then time how long it takes to
+ * reply with packets of varying sizes.
+ * It prints results once completed.
+ *
+ * To run,
+ *
+ *   ./echod &
+ *   ./sockperf
+ */
+
+#include <stdio.h>
+#include <stdlib.h>  /* for atexit() */
+
+#include "apr.h"
+#include "apr_network_io.h"
+#include "apr_strings.h"
+
+#define MAX_ITERS    10
+#define TEST_SIZE  1024
+
+struct testSet {
+    char c;
+    apr_size_t size;
+    int iters;
+} testRuns[] = {
+    { 'a', 1, 3 },
+    { 'b', 4, 3 },
+    { 'c', 16, 5 },
+    { 'd', 64, 5 },
+    { 'e', 256, 10 },
+};
+
+struct testResult {
+    int size;
+    int iters;
+    apr_time_t msecs[MAX_ITERS];
+    apr_time_t avg;
+};
+
+static apr_int16_t testPort = 4747;
+static apr_sockaddr_t *sockAddr = NULL;
+
+static void reportError(const char *msg, apr_status_t rv, 
+                        apr_pool_t *pool)
+{
+    fprintf(stderr, "%s\n", msg);
+    if (rv != APR_SUCCESS)
+        fprintf(stderr, "Error: %d\n'%s'\n", rv,
+                apr_psprintf(pool, "%pm", &rv));
+    
+}
+
+static void closeConnection(apr_socket_t *sock)
+{
+    apr_size_t len = 0;
+    apr_socket_send(sock, NULL, &len);
+}
+
+static apr_status_t sendRecvBuffer(apr_time_t *t, const char *buf, 
+                                   apr_size_t size, apr_pool_t *pool)
+{
+    apr_socket_t *sock;
+    apr_status_t rv;
+    apr_size_t len = size, thistime = size;
+    char *recvBuf;
+    apr_time_t testStart = apr_time_now(), testEnd;
+    int i;
+
+    if (! sockAddr) {
+        rv = apr_sockaddr_info_get(&sockAddr, "127.0.0.1", APR_UNSPEC,
+                                   testPort, 0, pool);
+        if (rv != APR_SUCCESS) {
+            reportError("Unable to get socket info", rv, pool);
+            return rv;
+        }
+
+        /* make sure we can connect to daemon before we try tests */
+
+        rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, APR_PROTO_TCP,
+                           pool);
+        if (rv != APR_SUCCESS)
+            return rv;
+
+        rv = apr_socket_connect(sock, sockAddr);
+        if (rv != APR_SUCCESS) {
+            reportError("Unable to connect to echod!", rv, pool);
+            apr_socket_close(sock);
+            return rv;
+        }
+        apr_socket_close(sock);
+
+    }
+
+    recvBuf = apr_palloc(pool, size);
+    if (! recvBuf)
+        return ENOMEM;
+    *t = 0;
+
+    /* START! */
+    testStart = apr_time_now();
+    rv = apr_socket_create(&sock, APR_INET, SOCK_STREAM, APR_PROTO_TCP,
+                           pool);
+    if (rv != APR_SUCCESS)
+        return rv;
+
+    rv = apr_socket_connect(sock, sockAddr);
+    if (rv != APR_SUCCESS) {
+        reportError("Unable to connect to echod!", rv, pool);
+        apr_socket_close(sock);
+        return rv;
+    }
+
+    for (i = 0; i < 3; i++) {
+
+        len = size;
+        thistime = size;
+
+        rv = apr_socket_send(sock, buf, &len);
+        if (rv != APR_SUCCESS || len != size) {
+            reportError(apr_psprintf(pool, 
+                         "Unable to send data correctly (iteration %d of 3)",
+                         i) , rv, pool);
+            closeConnection(sock);
+            apr_socket_close(sock);
+            return rv;
+        }
+    
+        do {
+            len = thistime;
+            rv = apr_socket_recv(sock, &recvBuf[size - thistime], &len);
+            if (rv != APR_SUCCESS)
+                break;
+            thistime -= len;
+        } while (thistime);
+    }
+
+    closeConnection(sock);
+    apr_socket_close(sock);
+    testEnd = apr_time_now();
+    /* STOP! */
+
+    if (thistime) {
+        reportError("Received less than we sent :-(", rv, pool);
+        return rv;
+    }        
+    if (strncmp(recvBuf, buf, size) != 0) {
+        reportError("Received corrupt data :-(", 0, pool);
+        printf("We sent:\n%s\nWe received:\n%s\n", buf, recvBuf);
+        return EINVAL;
+    }
+    *t = testEnd - testStart;
+    return APR_SUCCESS;
+}
+
+static apr_status_t runTest(struct testSet *ts, struct testResult *res,
+                            apr_pool_t *pool)
+{
+    char *buffer;
+    apr_status_t rv;
+    int i;
+    apr_size_t sz = ts->size * TEST_SIZE;
+    
+    buffer = apr_palloc(pool, sz);
+    if (!buffer) {
+        reportError("Unable to allocate buffer", ENOMEM, pool);
+        return ENOMEM;
+    }
+    memset(buffer, ts->c, sz);
+
+    res->iters = ts->iters > MAX_ITERS ? MAX_ITERS : ts->iters;
+
+    for (i = 0; i < res->iters; i++) {
+        apr_time_t iterTime;
+        rv = sendRecvBuffer(&iterTime, buffer, sz, pool);
+        if (rv != APR_SUCCESS) {
+            res->iters = i;
+            break;
+        }
+        res->msecs[i] = iterTime;
+    }
+
+    return rv;
+}
+
+int main(int argc, char **argv)
+{
+    apr_pool_t *pool;
+    apr_status_t rv;
+    int i;
+    int nTests = sizeof(testRuns) / sizeof(testRuns[0]);
+    struct testResult *results;
+
+    printf("APR Test Application: sockperf\n");
+
+    apr_initialize();
+    atexit(apr_terminate);
+
+    apr_pool_create(&pool, NULL);
+
+    results = (struct testResult *)apr_pcalloc(pool, 
+                                        sizeof(*results) * nTests);
+
+    for(i = 0; i < nTests; i++) {
+        printf("Test -> %c\n", testRuns[i].c);
+        results[i].size = testRuns[i].size * (apr_size_t)TEST_SIZE;
+        rv = runTest(&testRuns[i], &results[i], pool);
+    }
+
+    printf("Tests Complete!\n");
+    for(i = 0; i < nTests; i++) {
+        int j;
+        apr_time_t totTime = 0;
+        printf("%10d byte block:\n", results[i].size);
+        printf("\t%2d iterations : ", results[i].iters);
+        for (j = 0; j < results[i].iters; j++) {
+            printf("%6Ld ", results[i].msecs[j]);
+            totTime += results[i].msecs[j];
+        }
+        printf("<\n");
+        printf("\t  Average: %6Ld\n", totTime / results[i].iters);
+    }
+
+    return 0;
+}
diff --git a/srclib/apr/test/testatomic.c b/srclib/apr/test/testatomic.c
index b733db39..cfea2a62 100644
--- a/srclib/apr/test/testatomic.c
+++ b/srclib/apr/test/testatomic.c
@@ -25,7 +25,7 @@
 /* Use pthread_setconcurrency where it is available and not a nullop,
  * i.e. platforms using M:N or M:1 thread models: */
 #if APR_HAS_THREADS && \
-   ((defined(SOLARIS2) && SOLARIS2 > 26) || defined(_AIX))
+   ((defined(SOLARIS2) && SOLARIS2 > 6) || defined(_AIX))
 /* also HP-UX, IRIX? ... */
 #define HAVE_PTHREAD_SETCONCURRENCY
 #endif
@@ -81,6 +81,17 @@ static void test_xchg32(abts_case *tc, void *data)
     ABTS_INT_EQUAL(tc, 50, y32);
 }
 
+static void test_xchgptr(abts_case *tc, void *data)
+{
+    int a;
+    volatile void *target_ptr = NULL;
+    void *old_ptr;
+
+    old_ptr = apr_atomic_xchgptr(&target_ptr, &a);
+    ABTS_PTR_EQUAL(tc, NULL, old_ptr);
+    ABTS_PTR_EQUAL(tc, &a, (void *) target_ptr);
+}
+
 static void test_cas_equal(abts_case *tc, void *data)
 {
     apr_uint32_t casval = 0;
@@ -202,7 +213,7 @@ static void test_inc_neg1(abts_case *tc, void *data)
 
     rv = apr_atomic_inc32(&y32);
 
-    ABTS_ASSERT(tc, "apr_atomic_inc32 on zero returned zero.", rv == minus1);
+    ABTS_ASSERT(tc, "apr_atomic_inc32 didn't return the old value.", rv == minus1);
     str = apr_psprintf(p, "zero wrap failed: -1 + 1 = %d", y32);
     ABTS_ASSERT(tc, str, y32 == 0);
 }
@@ -210,51 +221,39 @@ static void test_inc_neg1(abts_case *tc, void *data)
 
 #if APR_HAS_THREADS
 
-void * APR_THREAD_FUNC thread_func_mutex(apr_thread_t *thd, void *data);
-void * APR_THREAD_FUNC thread_func_atomic(apr_thread_t *thd, void *data);
-void * APR_THREAD_FUNC thread_func_none(apr_thread_t *thd, void *data);
+void *APR_THREAD_FUNC thread_func_mutex(apr_thread_t *thd, void *data);
+void *APR_THREAD_FUNC thread_func_atomic(apr_thread_t *thd, void *data);
 
 apr_thread_mutex_t *thread_lock;
-volatile apr_uint32_t x = 0; /* mutex locks */
-volatile apr_uint32_t y = 0; /* atomic operations */
-volatile apr_uint32_t z = 0; /* no locks */
+volatile apr_uint32_t mutex_locks = 0;
+volatile apr_uint32_t atomic_ops = 0;
 apr_status_t exit_ret_val = 123; /* just some made up number to check on later */
 
 #define NUM_THREADS 40
 #define NUM_ITERATIONS 20000
-void * APR_THREAD_FUNC thread_func_mutex(apr_thread_t *thd, void *data)
+
+void *APR_THREAD_FUNC thread_func_mutex(apr_thread_t *thd, void *data)
 {
     int i;
 
     for (i = 0; i < NUM_ITERATIONS; i++) {
         apr_thread_mutex_lock(thread_lock);
-        x++;
+        mutex_locks++;
         apr_thread_mutex_unlock(thread_lock);
     }
     apr_thread_exit(thd, exit_ret_val);
     return NULL;
-} 
-
-void * APR_THREAD_FUNC thread_func_atomic(apr_thread_t *thd, void *data)
-{
-    int i;
-
-    for (i = 0; i < NUM_ITERATIONS ; i++) {
-        apr_atomic_inc32(&y);
-        apr_atomic_add32(&y, 2);
-        apr_atomic_dec32(&y);
-        apr_atomic_dec32(&y);
-    }
-    apr_thread_exit(thd, exit_ret_val);
-    return NULL;
 }
 
-void * APR_THREAD_FUNC thread_func_none(apr_thread_t *thd, void *data)
+void *APR_THREAD_FUNC thread_func_atomic(apr_thread_t *thd, void *data)
 {
     int i;
 
     for (i = 0; i < NUM_ITERATIONS ; i++) {
-        z++;
+        apr_atomic_inc32(&atomic_ops);
+        apr_atomic_add32(&atomic_ops, 2);
+        apr_atomic_dec32(&atomic_ops);
+        apr_atomic_dec32(&atomic_ops);
     }
     apr_thread_exit(thd, exit_ret_val);
     return NULL;
@@ -264,10 +263,6 @@ static void test_atomics_threaded(abts_case *tc, void *data)
 {
     apr_thread_t *t1[NUM_THREADS];
     apr_thread_t *t2[NUM_THREADS];
-    apr_thread_t *t3[NUM_THREADS];
-    apr_status_t s1[NUM_THREADS]; 
-    apr_status_t s2[NUM_THREADS];
-    apr_status_t s3[NUM_THREADS];
     apr_status_t rv;
     int i;
 
@@ -279,34 +274,219 @@ static void test_atomics_threaded(abts_case *tc, void *data)
     APR_ASSERT_SUCCESS(tc, "Could not create lock", rv);
 
     for (i = 0; i < NUM_THREADS; i++) {
-        apr_status_t r1, r2, r3;
+        apr_status_t r1, r2;
         r1 = apr_thread_create(&t1[i], NULL, thread_func_mutex, NULL, p);
         r2 = apr_thread_create(&t2[i], NULL, thread_func_atomic, NULL, p);
-        r3 = apr_thread_create(&t3[i], NULL, thread_func_none, NULL, p);
-        ABTS_ASSERT(tc, "Failed creating threads",
-                 r1 == APR_SUCCESS && r2 == APR_SUCCESS && 
-                 r3 == APR_SUCCESS);
+        ABTS_ASSERT(tc, "Failed creating threads", !r1 && !r2);
     }
 
     for (i = 0; i < NUM_THREADS; i++) {
-        apr_thread_join(&s1[i], t1[i]);
-        apr_thread_join(&s2[i], t2[i]);
-        apr_thread_join(&s3[i], t3[i]);
-                     
+        apr_status_t s1, s2;
+        apr_thread_join(&s1, t1[i]);
+        apr_thread_join(&s2, t2[i]);
+
         ABTS_ASSERT(tc, "Invalid return value from thread_join",
-                 s1[i] == exit_ret_val && s2[i] == exit_ret_val && 
-                 s3[i] == exit_ret_val);
+                    s1 == exit_ret_val && s2 == exit_ret_val);
+    }
+
+    ABTS_INT_EQUAL(tc, NUM_THREADS * NUM_ITERATIONS, mutex_locks);
+    ABTS_INT_EQUAL(tc, NUM_THREADS * NUM_ITERATIONS,
+                   apr_atomic_read32(&atomic_ops));
+
+    rv = apr_thread_mutex_destroy(thread_lock);
+    ABTS_ASSERT(tc, "Failed creating threads", rv == APR_SUCCESS);
+}
+
+#undef NUM_THREADS
+#define NUM_THREADS 7
+
+typedef struct tbox_t tbox_t;
+
+struct tbox_t {
+    abts_case *tc;
+    apr_uint32_t *mem;
+    apr_uint32_t preval;
+    apr_uint32_t postval;
+    apr_uint32_t loop;
+    void (*func)(tbox_t *box);
+};
+
+static APR_INLINE void busyloop_read32(tbox_t *tbox)
+{
+    apr_uint32_t val;
+
+    do {
+        val = apr_atomic_read32(tbox->mem);
+
+        if (val != tbox->preval)
+            apr_thread_yield();
+        else
+            break;
+    } while (1);
+}
+
+static void busyloop_set32(tbox_t *tbox)
+{
+    do {
+        busyloop_read32(tbox);
+        apr_atomic_set32(tbox->mem, tbox->postval);
+    } while (--tbox->loop);
+}
+
+static void busyloop_add32(tbox_t *tbox)
+{
+    apr_uint32_t val;
+
+    do {
+        busyloop_read32(tbox);
+        val = apr_atomic_add32(tbox->mem, tbox->postval);
+        apr_thread_mutex_lock(thread_lock);
+        ABTS_INT_EQUAL(tbox->tc, val, tbox->preval);
+        apr_thread_mutex_unlock(thread_lock);
+    } while (--tbox->loop);
+}
+
+static void busyloop_sub32(tbox_t *tbox)
+{
+    do {
+        busyloop_read32(tbox);
+        apr_atomic_sub32(tbox->mem, tbox->postval);
+    } while (--tbox->loop);
+}
+
+static void busyloop_inc32(tbox_t *tbox)
+{
+    apr_uint32_t val;
+
+    do {
+        busyloop_read32(tbox);
+        val = apr_atomic_inc32(tbox->mem);
+        apr_thread_mutex_lock(thread_lock);
+        ABTS_INT_EQUAL(tbox->tc, val, tbox->preval);
+        apr_thread_mutex_unlock(thread_lock);
+    } while (--tbox->loop);
+}
+
+static void busyloop_dec32(tbox_t *tbox)
+{
+    apr_uint32_t val;
+
+    do {
+        busyloop_read32(tbox);
+        val = apr_atomic_dec32(tbox->mem);
+        apr_thread_mutex_lock(thread_lock);
+        ABTS_INT_NEQUAL(tbox->tc, 0, val);
+        apr_thread_mutex_unlock(thread_lock);
+    } while (--tbox->loop);
+}
+
+static void busyloop_cas32(tbox_t *tbox)
+{
+    apr_uint32_t val;
+
+    do {
+        do {
+            val = apr_atomic_cas32(tbox->mem, tbox->postval, tbox->preval);
+
+            if (val != tbox->preval)
+                apr_thread_yield();
+            else
+                break;
+        } while (1);
+    } while (--tbox->loop);
+}
+
+static void busyloop_xchg32(tbox_t *tbox)
+{
+    apr_uint32_t val;
+
+    do {
+        busyloop_read32(tbox);
+        val = apr_atomic_xchg32(tbox->mem, tbox->postval);
+        apr_thread_mutex_lock(thread_lock);
+        ABTS_INT_EQUAL(tbox->tc, val, tbox->preval);
+        apr_thread_mutex_unlock(thread_lock);
+    } while (--tbox->loop);
+}
+
+static void *APR_THREAD_FUNC thread_func_busyloop(apr_thread_t *thd, void *data)
+{
+    tbox_t *tbox = data;
+
+    tbox->func(tbox);
+
+    apr_thread_exit(thd, 0);
+
+    return NULL;
+}
+
+static void test_atomics_busyloop_threaded(abts_case *tc, void *data)
+{
+    unsigned int i;
+    apr_status_t rv;
+    apr_uint32_t count = 0;
+    tbox_t tbox[NUM_THREADS];
+    apr_thread_t *thread[NUM_THREADS];
+
+    rv = apr_thread_mutex_create(&thread_lock, APR_THREAD_MUTEX_DEFAULT, p);
+    APR_ASSERT_SUCCESS(tc, "Could not create lock", rv);
+
+    /* get ready */
+    for (i = 0; i < NUM_THREADS; i++) {
+        tbox[i].tc = tc;
+        tbox[i].mem = &count;
+        tbox[i].loop = 50;
     }
 
-    ABTS_INT_EQUAL(tc, x, NUM_THREADS * NUM_ITERATIONS);
-    ABTS_INT_EQUAL(tc, apr_atomic_read32(&y), NUM_THREADS * NUM_ITERATIONS);
-    /* Comment out this test, because I have no clue what this test is
-     * actually telling us.  We are checking something that may or may not
-     * be true, and it isn't really testing APR at all.
-    ABTS_ASSERT(tc, "We expect this to fail, because we tried to update "
-                 "an integer in a non-thread-safe manner.",
-             z != NUM_THREADS * NUM_ITERATIONS);
-     */
+    tbox[0].preval = 98;
+    tbox[0].postval = 3891;
+    tbox[0].func = busyloop_add32;
+
+    tbox[1].preval = 3989;
+    tbox[1].postval = 1010;
+    tbox[1].func = busyloop_sub32;
+
+    tbox[2].preval = 2979;
+    tbox[2].postval = 0; /* not used */
+    tbox[2].func = busyloop_inc32;
+
+    tbox[3].preval = 2980;
+    tbox[3].postval = 16384;
+    tbox[3].func = busyloop_set32;
+
+    tbox[4].preval = 16384;
+    tbox[4].postval = 0; /* not used */
+    tbox[4].func = busyloop_dec32;
+
+    tbox[5].preval = 16383;
+    tbox[5].postval = 1048576;
+    tbox[5].func = busyloop_cas32;
+
+    tbox[6].preval = 1048576;
+    tbox[6].postval = 98; /* goto tbox[0] */
+    tbox[6].func = busyloop_xchg32;
+
+    /* get set */
+    for (i = 0; i < NUM_THREADS; i++) {
+        rv = apr_thread_create(&thread[i], NULL, thread_func_busyloop,
+                               &tbox[i], p);
+        ABTS_ASSERT(tc, "Failed creating thread", rv == APR_SUCCESS);
+    }
+
+    /* go! */
+    apr_atomic_set32(tbox->mem, 98);
+
+    for (i = 0; i < NUM_THREADS; i++) {
+        apr_status_t retval;
+        rv = apr_thread_join(&retval, thread[i]);
+        ABTS_ASSERT(tc, "Thread join failed", rv == APR_SUCCESS);
+        ABTS_ASSERT(tc, "Invalid return value from thread_join", retval == 0);
+    }
+
+    ABTS_INT_EQUAL(tbox->tc, 98, count);
+
+    rv = apr_thread_mutex_destroy(thread_lock);
+    ABTS_ASSERT(tc, "Failed creating threads", rv == APR_SUCCESS);
 }
 
 #endif /* !APR_HAS_THREADS */
@@ -320,6 +500,7 @@ abts_suite *testatomic(abts_suite *suite)
     abts_run_test(suite, test_read32, NULL);
     abts_run_test(suite, test_dec32, NULL);
     abts_run_test(suite, test_xchg32, NULL);
+    abts_run_test(suite, test_xchgptr, NULL);
     abts_run_test(suite, test_cas_equal, NULL);
     abts_run_test(suite, test_cas_equal_nonnull, NULL);
     abts_run_test(suite, test_cas_notequal, NULL);
@@ -334,6 +515,7 @@ abts_suite *testatomic(abts_suite *suite)
 
 #if APR_HAS_THREADS
     abts_run_test(suite, test_atomics_threaded, NULL);
+    abts_run_test(suite, test_atomics_busyloop_threaded, NULL);
 #endif
 
     return suite;
diff --git a/srclib/apr/test/testcond.c b/srclib/apr/test/testcond.c
new file mode 100644
index 00000000..b5a20bc4
--- /dev/null
+++ b/srclib/apr/test/testcond.c
@@ -0,0 +1,670 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "apr_file_io.h"
+#include "apr_thread_proc.h"
+#include "apr_thread_mutex.h"
+#include "apr_thread_cond.h"
+#include "apr_errno.h"
+#include "apr_general.h"
+#include "apr_atomic.h"
+#include "testutil.h"
+
+#define NTHREADS 10
+
+#define ABTS_SUCCESS(rv)    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv)
+
+#if APR_HAS_THREADS
+
+typedef struct toolbox_t toolbox_t;
+
+struct toolbox_t {
+    void *data;
+    abts_case *tc;
+    apr_thread_mutex_t *mutex;
+    apr_thread_cond_t *cond;
+    void (*func)(toolbox_t *box);
+};
+
+typedef struct toolbox_fnptr_t toolbox_fnptr_t;
+
+struct toolbox_fnptr_t {
+    void (*func)(toolbox_t *box);
+};
+
+static void lost_signal(abts_case *tc, void *data)
+{
+    apr_status_t rv;
+    apr_thread_cond_t *cond = NULL;
+    apr_thread_mutex_t *mutex = NULL;
+
+    rv = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, p);
+    ABTS_SUCCESS(rv);
+    ABTS_PTR_NOTNULL(tc, mutex);
+
+    rv = apr_thread_cond_create(&cond, p);
+    ABTS_SUCCESS(rv);
+    ABTS_PTR_NOTNULL(tc, cond);
+
+    rv = apr_thread_cond_signal(cond);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_lock(mutex);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_cond_timedwait(cond, mutex, 10000);
+    ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
+
+    rv = apr_thread_mutex_unlock(mutex);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_cond_broadcast(cond);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_lock(mutex);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_cond_timedwait(cond, mutex, 10000);
+    ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
+
+    rv = apr_thread_mutex_unlock(mutex);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_cond_destroy(cond);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_destroy(mutex);
+    ABTS_SUCCESS(rv);
+}
+
+static void *APR_THREAD_FUNC thread_routine(apr_thread_t *thd, void *data)
+{
+    toolbox_t *box = data;
+
+    box->func(box);
+
+    apr_thread_exit(thd, 0);
+
+    return NULL;
+}
+
+static void lock_and_signal(toolbox_t *box)
+{
+    apr_status_t rv;
+    abts_case *tc = box->tc;
+
+    rv = apr_thread_mutex_lock(box->mutex);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_cond_signal(box->cond);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_unlock(box->mutex);
+    ABTS_SUCCESS(rv);
+}
+
+static void dynamic_binding(abts_case *tc, void *data)
+{
+    unsigned int i;
+    apr_status_t rv;
+    toolbox_t box[NTHREADS];
+    apr_thread_t *thread[NTHREADS];
+    apr_thread_mutex_t *mutex[NTHREADS];
+    apr_thread_cond_t *cond = NULL;
+
+    rv = apr_thread_cond_create(&cond, p);
+    ABTS_SUCCESS(rv);
+    ABTS_PTR_NOTNULL(tc, cond);
+
+    for (i = 0; i < NTHREADS; i++) {
+        rv = apr_thread_mutex_create(&mutex[i], APR_THREAD_MUTEX_DEFAULT, p);
+        ABTS_SUCCESS(rv);
+
+        rv = apr_thread_mutex_lock(mutex[i]);
+        ABTS_SUCCESS(rv);
+
+        box[i].tc = tc;
+        box[i].cond = cond;
+        box[i].mutex = mutex[i];
+        box[i].func = lock_and_signal;
+
+        rv = apr_thread_create(&thread[i], NULL, thread_routine, &box[i], p);
+        ABTS_SUCCESS(rv);
+    }
+
+    /*
+     * The dynamic binding should be preserved because we use only one waiter
+     */
+
+    for (i = 0; i < NTHREADS; i++) {
+        rv = apr_thread_cond_wait(cond, mutex[i]);
+        ABTS_SUCCESS(rv);
+    }
+
+    for (i = 0; i < NTHREADS; i++) {
+        rv = apr_thread_cond_timedwait(cond, mutex[i], 10000);
+        ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
+
+        rv = apr_thread_mutex_unlock(mutex[i]);
+        ABTS_SUCCESS(rv);
+    }
+
+    for (i = 0; i < NTHREADS; i++) {
+        apr_status_t retval;
+        rv = apr_thread_join(&retval, thread[i]);
+        ABTS_SUCCESS(rv);
+    }
+
+    rv = apr_thread_cond_destroy(cond);
+    ABTS_SUCCESS(rv);
+
+    for (i = 0; i < NTHREADS; i++) {
+        rv = apr_thread_mutex_destroy(mutex[i]);
+        ABTS_SUCCESS(rv);
+    }
+}
+
+static void lock_and_wait(toolbox_t *box)
+{
+    apr_status_t rv;
+    abts_case *tc = box->tc;
+    apr_uint32_t *count = box->data;
+
+    rv = apr_thread_mutex_lock(box->mutex);
+    ABTS_SUCCESS(rv);
+
+    apr_atomic_inc32(count);
+
+    rv = apr_thread_cond_wait(box->cond, box->mutex);
+    ABTS_SUCCESS(rv);
+
+    apr_atomic_dec32(count);
+
+    rv = apr_thread_mutex_unlock(box->mutex);
+    ABTS_SUCCESS(rv);
+}
+
+static void broadcast_threads(abts_case *tc, void *data)
+{
+    toolbox_t box;
+    unsigned int i;
+    apr_status_t rv;
+    apr_uint32_t count = 0;
+    apr_thread_cond_t *cond = NULL;
+    apr_thread_mutex_t *mutex = NULL;
+    apr_thread_t *thread[NTHREADS];
+
+    rv = apr_thread_cond_create(&cond, p);
+    ABTS_SUCCESS(rv);
+    ABTS_PTR_NOTNULL(tc, cond);
+
+    rv = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, p);
+    ABTS_SUCCESS(rv);
+    ABTS_PTR_NOTNULL(tc, mutex);
+
+    rv = apr_thread_mutex_lock(mutex);
+    ABTS_SUCCESS(rv);
+
+    box.tc = tc;
+    box.data = &count;
+    box.mutex = mutex;
+    box.cond = cond;
+    box.func = lock_and_wait;
+
+    for (i = 0; i < NTHREADS; i++) {
+        rv = apr_thread_create(&thread[i], NULL, thread_routine, &box, p);
+        ABTS_SUCCESS(rv);
+    }
+
+    do {
+        rv = apr_thread_mutex_unlock(mutex);
+        ABTS_SUCCESS(rv);
+        apr_sleep(100000);
+        rv = apr_thread_mutex_lock(mutex);
+        ABTS_SUCCESS(rv);
+    } while (apr_atomic_read32(&count) != NTHREADS);
+
+    rv = apr_thread_cond_broadcast(cond);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_unlock(mutex);
+    ABTS_SUCCESS(rv);
+
+    for (i = 0; i < NTHREADS; i++) {
+        apr_status_t retval;
+        rv = apr_thread_join(&retval, thread[i]);
+        ABTS_SUCCESS(rv);
+    }
+
+    ABTS_INT_EQUAL(tc, 0, count);
+
+    rv = apr_thread_cond_destroy(cond);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_destroy(mutex);
+    ABTS_SUCCESS(rv);
+}
+
+static void nested_lock_and_wait(toolbox_t *box)
+{
+    apr_status_t rv;
+    abts_case *tc = box->tc;
+
+    rv = apr_thread_mutex_lock(box->mutex);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_lock(box->mutex);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_lock(box->mutex);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_cond_wait(box->cond, box->mutex);
+    ABTS_SUCCESS(rv);
+}
+
+static void nested_lock_and_unlock(toolbox_t *box)
+{
+    apr_status_t rv;
+    abts_case *tc = box->tc;
+
+    rv = apr_thread_mutex_lock(box->mutex);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_lock(box->mutex);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_lock(box->mutex);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_cond_timedwait(box->cond, box->mutex, 2000000);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_unlock(box->mutex);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_unlock(box->mutex);
+    ABTS_SUCCESS(rv);
+}
+
+static void nested_wait(abts_case *tc, void *data)
+{
+    toolbox_fnptr_t *fnptr = data;
+    toolbox_t box;
+    apr_status_t rv, retval;
+    apr_thread_cond_t *cond = NULL;
+    apr_thread_t *thread = NULL;
+    apr_thread_mutex_t *mutex = NULL;
+
+    rv = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_NESTED, p);
+    ABTS_SUCCESS(rv);
+    ABTS_PTR_NOTNULL(tc, mutex);
+
+    rv = apr_thread_cond_create(&cond, p);
+    ABTS_SUCCESS(rv);
+    ABTS_PTR_NOTNULL(tc, cond);
+
+    rv = apr_thread_mutex_lock(mutex);
+    ABTS_SUCCESS(rv);
+
+    box.tc = tc;
+    box.cond = cond;
+    box.mutex = mutex;
+    box.func = fnptr->func;
+
+    rv = apr_thread_create(&thread, NULL, thread_routine, &box, p);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_unlock(mutex);
+    ABTS_SUCCESS(rv);
+
+    /* yield the processor */
+    apr_sleep(500000);
+
+    rv = apr_thread_cond_signal(cond);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_join(&retval, thread);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_trylock(mutex);
+    ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_EBUSY(rv));
+
+    rv = apr_thread_mutex_trylock(mutex);
+    ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_EBUSY(rv));
+}
+
+static volatile apr_uint64_t pipe_count;
+static volatile apr_uint32_t exiting;
+
+static void pipe_consumer(toolbox_t *box)
+{
+    char ch;
+    apr_status_t rv;
+    apr_size_t nbytes;
+    abts_case *tc = box->tc;
+    apr_file_t *out = box->data;
+    apr_uint32_t consumed = 0;
+
+    do {
+        rv = apr_thread_mutex_lock(box->mutex);
+        ABTS_SUCCESS(rv);
+
+        while (!pipe_count && !exiting) {
+            rv = apr_thread_cond_wait(box->cond, box->mutex);
+            ABTS_SUCCESS(rv);
+        }
+
+        if (!pipe_count && exiting) {
+            rv = apr_thread_mutex_unlock(box->mutex);
+            ABTS_SUCCESS(rv);
+            break;
+        }
+
+        pipe_count--;
+        consumed++;
+
+        rv = apr_thread_mutex_unlock(box->mutex);
+        ABTS_SUCCESS(rv);
+
+        rv = apr_file_read_full(out, &ch, 1, &nbytes);
+        ABTS_SUCCESS(rv);
+        ABTS_SIZE_EQUAL(tc, 1, nbytes);
+        ABTS_TRUE(tc, ch == '.');
+    } while (1);
+
+    /* naive fairness test - it would be good to introduce or solidify
+     * a solid test to ensure one thread is not starved.  
+     * ABTS_INT_EQUAL(tc, 1, !!consumed);
+     */
+}
+
+static void pipe_write(toolbox_t *box, char ch)
+{
+    apr_status_t rv;
+    apr_size_t nbytes;
+    abts_case *tc = box->tc;
+    apr_file_t *in = box->data;
+
+    rv = apr_file_write_full(in, &ch, 1, &nbytes);
+    ABTS_SUCCESS(rv);
+    ABTS_SIZE_EQUAL(tc, 1, nbytes);
+
+    rv = apr_thread_mutex_lock(box->mutex);
+    ABTS_SUCCESS(rv);
+
+    if (!pipe_count) {
+        rv = apr_thread_cond_signal(box->cond);
+        ABTS_SUCCESS(rv);
+    }
+
+    pipe_count++;
+
+    rv = apr_thread_mutex_unlock(box->mutex);
+    ABTS_SUCCESS(rv);
+}
+
+static void pipe_producer(toolbox_t *box)
+{
+    apr_uint32_t loop = 500;
+
+    do {
+        pipe_write(box, '.');
+    } while (loop--);
+}
+
+static void pipe_producer_consumer(abts_case *tc, void *data)
+{
+    apr_status_t rv;
+    toolbox_t boxcons, boxprod;
+    apr_thread_t *thread[NTHREADS];
+    apr_thread_cond_t *cond = NULL;
+    apr_thread_mutex_t *mutex = NULL;
+    apr_file_t *in = NULL, *out = NULL;
+    apr_uint32_t i, ncons = (apr_uint32_t)(NTHREADS * 0.70);
+
+    rv = apr_file_pipe_create(&in, &out, p);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, p);
+    ABTS_SUCCESS(rv);
+    ABTS_PTR_NOTNULL(tc, mutex);
+
+    rv = apr_thread_cond_create(&cond, p);
+    ABTS_SUCCESS(rv);
+    ABTS_PTR_NOTNULL(tc, cond);
+
+    boxcons.tc = tc;
+    boxcons.data = in;
+    boxcons.mutex = mutex;
+    boxcons.cond = cond;
+    boxcons.func = pipe_consumer;
+
+    for (i = 0; i < ncons; i++) {
+        rv = apr_thread_create(&thread[i], NULL, thread_routine, &boxcons, p);
+        ABTS_SUCCESS(rv);
+    }
+
+    boxprod.tc = tc;
+    boxprod.data = out;
+    boxprod.mutex = mutex;
+    boxprod.cond = cond;
+    boxprod.func = pipe_producer;
+
+    for (; i < NTHREADS; i++) {
+        rv = apr_thread_create(&thread[i], NULL, thread_routine, &boxprod, p);
+        ABTS_SUCCESS(rv);
+    }
+
+    for (i = ncons; i < NTHREADS; i++) {
+        apr_status_t retval;
+        rv = apr_thread_join(&retval, thread[i]);
+        ABTS_SUCCESS(rv);
+    }
+
+    rv = apr_thread_mutex_lock(mutex);
+    ABTS_SUCCESS(rv);
+
+    exiting = 1;
+
+    rv = apr_thread_cond_broadcast(cond);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_unlock(mutex);
+    ABTS_SUCCESS(rv);
+
+    for (i = 0; i < ncons; i++) {
+        apr_status_t retval;
+        rv = apr_thread_join(&retval, thread[i]);
+        ABTS_SUCCESS(rv);
+    }
+
+    rv = apr_thread_cond_destroy(cond);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_destroy(mutex);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_file_close(in);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_file_close(out);
+    ABTS_SUCCESS(rv);
+}
+
+volatile enum {
+    TOSS,
+    PING,
+    PONG,
+    OVER
+} state;
+
+static void ping(toolbox_t *box)
+{
+    apr_status_t rv;
+    abts_case *tc = box->tc;
+
+    rv = apr_thread_mutex_lock(box->mutex);
+    ABTS_SUCCESS(rv);
+
+    if (state == TOSS)
+        state = PING;
+
+    do {
+        rv = apr_thread_cond_signal(box->cond);
+        ABTS_SUCCESS(rv);
+
+        state = PONG;
+
+        rv = apr_thread_cond_wait(box->cond, box->mutex);
+        ABTS_SUCCESS(rv);
+
+        ABTS_TRUE(tc, state == PING || state == OVER);
+    } while (state != OVER);
+
+    rv = apr_thread_mutex_unlock(box->mutex);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_cond_broadcast(box->cond);
+    ABTS_SUCCESS(rv);
+}
+
+static void pong(toolbox_t *box)
+{
+    apr_status_t rv;
+    abts_case *tc = box->tc;
+
+    rv = apr_thread_mutex_lock(box->mutex);
+    ABTS_SUCCESS(rv);
+
+    if (state == TOSS)
+        state = PONG;
+
+    do {
+        rv = apr_thread_cond_signal(box->cond);
+        ABTS_SUCCESS(rv);
+
+        state = PING;
+
+        rv = apr_thread_cond_wait(box->cond, box->mutex);
+        ABTS_SUCCESS(rv);
+
+        ABTS_TRUE(tc, state == PONG || state == OVER);
+    } while (state != OVER);
+
+    rv = apr_thread_mutex_unlock(box->mutex);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_cond_broadcast(box->cond);
+    ABTS_SUCCESS(rv);
+}
+
+static void ping_pong(abts_case *tc, void *data)
+{
+    apr_status_t rv, retval;
+    toolbox_t box_ping, box_pong;
+    apr_thread_cond_t *cond = NULL;
+    apr_thread_mutex_t *mutex = NULL;
+    apr_thread_t *thr_ping = NULL, *thr_pong = NULL;
+
+    rv = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, p);
+    ABTS_SUCCESS(rv);
+    ABTS_PTR_NOTNULL(tc, mutex);
+
+    rv = apr_thread_cond_create(&cond, p);
+    ABTS_SUCCESS(rv);
+    ABTS_PTR_NOTNULL(tc, cond);
+
+    rv = apr_thread_mutex_lock(mutex);
+    ABTS_SUCCESS(rv);
+
+    box_ping.tc = tc;
+    box_ping.data = NULL;
+    box_ping.mutex = mutex;
+    box_ping.cond = cond;
+    box_ping.func = ping;
+
+    rv = apr_thread_create(&thr_ping, NULL, thread_routine, &box_ping, p);
+    ABTS_SUCCESS(rv);
+
+    box_pong.tc = tc;
+    box_pong.data = NULL;
+    box_pong.mutex = mutex;
+    box_pong.cond = cond;
+    box_pong.func = pong;
+
+    rv = apr_thread_create(&thr_pong, NULL, thread_routine, &box_pong, p);
+    ABTS_SUCCESS(rv);
+
+    state = TOSS;
+
+    rv = apr_thread_mutex_unlock(mutex);
+    ABTS_SUCCESS(rv);
+
+    apr_sleep(3000000);
+
+    rv = apr_thread_mutex_lock(mutex);
+    ABTS_SUCCESS(rv);
+
+    state = OVER;
+
+    rv = apr_thread_mutex_unlock(mutex);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_join(&retval, thr_ping);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_join(&retval, thr_pong);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_cond_destroy(cond);
+    ABTS_SUCCESS(rv);
+
+    rv = apr_thread_mutex_destroy(mutex);
+    ABTS_SUCCESS(rv);
+}
+#endif /* !APR_HAS_THREADS */
+
+#if !APR_HAS_THREADS
+static void threads_not_impl(abts_case *tc, void *data)
+{
+    ABTS_NOT_IMPL(tc, "Threads not implemented on this platform");
+}
+#endif
+
+abts_suite *testcond(abts_suite *suite)
+{
+#if APR_HAS_THREADS
+    toolbox_fnptr_t fnptr;
+#endif
+    suite = ADD_SUITE(suite)
+
+#if !APR_HAS_THREADS
+    abts_run_test(suite, threads_not_impl, NULL);
+#else
+    abts_run_test(suite, lost_signal, NULL);
+    abts_run_test(suite, dynamic_binding, NULL);
+    abts_run_test(suite, broadcast_threads, NULL);
+    fnptr.func = nested_lock_and_wait;
+    abts_run_test(suite, nested_wait, &fnptr);
+    fnptr.func = nested_lock_and_unlock;
+    abts_run_test(suite, nested_wait, &fnptr);
+    abts_run_test(suite, pipe_producer_consumer, NULL);
+    abts_run_test(suite, ping_pong, NULL);
+#endif
+
+    return suite;
+}
diff --git a/srclib/apr/test/testdir.c b/srclib/apr/test/testdir.c
index 82f145d6..63a2f172 100644
--- a/srclib/apr/test/testdir.c
+++ b/srclib/apr/test/testdir.c
@@ -222,7 +222,6 @@ static void test_uncleared_errno(abts_case *tc, void *data)
 static void test_rmkdir_nocwd(abts_case *tc, void *data)
 {
     char *cwd, *path;
-    apr_status_t rv;
 
     APR_ASSERT_SUCCESS(tc, "make temp dir",
                        apr_dir_make("dir3", APR_OS_DEFAULT, p));
@@ -234,20 +233,9 @@ static void test_rmkdir_nocwd(abts_case *tc, void *data)
 
     APR_ASSERT_SUCCESS(tc, "change to temp dir", apr_filepath_set(path, p));
 
-    rv = apr_dir_remove(path, p);
-    /* Some platforms cannot remove a directory which is in use. */
-    if (rv == APR_SUCCESS) {
-        ABTS_ASSERT(tc, "fail to create dir",
-                    apr_dir_make_recursive("foobar", APR_OS_DEFAULT, 
-                                           p) != APR_SUCCESS);
-    }
-
     APR_ASSERT_SUCCESS(tc, "restore cwd", apr_filepath_set(cwd, p));
 
-    if (rv) {
-        apr_dir_remove(path, p);
-        ABTS_NOT_IMPL(tc, "cannot remove in-use directory");
-    }
+    APR_ASSERT_SUCCESS(tc, "remove cwd", apr_dir_remove(path, p));
 }
 
 
diff --git a/srclib/apr/test/testdll.dsp b/srclib/apr/test/testdll.dsp
index dbeee8f9..6c2c945e 100644
--- a/srclib/apr/test/testdll.dsp
+++ b/srclib/apr/test/testdll.dsp
@@ -195,6 +195,10 @@ SOURCE=.\testatomic.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\testcond.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\testdir.c
 # End Source File
 # Begin Source File
@@ -299,10 +303,6 @@ SOURCE=.\testrand.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\testrand2.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\testshm.c
 # End Source File
 # Begin Source File
diff --git a/srclib/apr/test/testenv.c b/srclib/apr/test/testenv.c
index d292c26e..f5a74c38 100644
--- a/srclib/apr/test/testenv.c
+++ b/srclib/apr/test/testenv.c
@@ -103,7 +103,7 @@ static void test_emptyenv(abts_case *tc, void *data)
     ABTS_STR_EQUAL(tc, "", value);
 
     if (!have_env_del) {
-        ABTS_NOT_IMPL(tc, "apr_env_del (skip recycle test_emptyenv)");
+        ABTS_NOT_IMPL(tc, "apr_env (skip recycle test_emptyenv)");
         return;
     }
     /** Delete and retest */
diff --git a/srclib/apr/test/testfile.c b/srclib/apr/test/testfile.c
index dbbc35da..dd1d277b 100644
--- a/srclib/apr/test/testfile.c
+++ b/srclib/apr/test/testfile.c
@@ -326,6 +326,36 @@ static void test_userdata_getnokey(abts_case *tc, void *data)
     apr_file_close(filetest);
 }
 
+static void test_buffer_set_get(abts_case *tc, void *data)
+{
+    apr_status_t rv;
+    apr_size_t bufsize;
+    apr_file_t *filetest = NULL;
+    char   * buffer;
+
+    rv = apr_file_open(&filetest, FILENAME, 
+                       APR_WRITE | APR_BUFFERED, 
+                       APR_UREAD | APR_UWRITE | APR_GREAD, p);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+
+    bufsize = apr_file_buffer_size_get(filetest);
+    ABTS_SIZE_EQUAL(tc, APR_BUFFERSIZE, bufsize);
+ 
+    buffer = apr_pcalloc(p, 10240);
+    rv = apr_file_buffer_set(filetest, buffer, 10240);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+    
+    bufsize = apr_file_buffer_size_get(filetest);
+    ABTS_SIZE_EQUAL(tc, 10240, bufsize);
+    
+    rv = apr_file_buffer_set(filetest, buffer, 12);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+    
+    bufsize = apr_file_buffer_size_get(filetest);
+    ABTS_SIZE_EQUAL(tc, 12, bufsize);
+    
+    apr_file_close(filetest);
+}
 static void test_getc(abts_case *tc, void *data)
 {
     apr_file_t *f = NULL;
@@ -957,6 +987,7 @@ abts_suite *testfile(abts_suite *suite)
     abts_run_test(suite, test_bigfprintf, NULL);
     abts_run_test(suite, test_fail_write_flush, NULL);
     abts_run_test(suite, test_fail_read_flush, NULL);
+    abts_run_test(suite, test_buffer_set_get, NULL);
     abts_run_test(suite, test_xthread, NULL);
 
     return suite;
diff --git a/srclib/apr/test/testfilecopy.c b/srclib/apr/test/testfilecopy.c
index 730b1f01..5b64bc05 100644
--- a/srclib/apr/test/testfilecopy.c
+++ b/srclib/apr/test/testfilecopy.c
@@ -50,8 +50,8 @@ static void copy_helper(abts_case *tc, const char *from, const char * to,
     }
     else {
         ABTS_ASSERT(tc, "File size differs", 
-                                   ((dest_rv == APR_SUCCESS) 
-                                     ? dest.size : 0) + orig.size == copy.size);
+			            ((dest_rv == APR_SUCCESS) 
+			              ? dest.size : 0) + orig.size == copy.size);
     }
 }
 
diff --git a/srclib/apr/test/testfileinfo.c b/srclib/apr/test/testfileinfo.c
index f437d7dd..ea58e12c 100644
--- a/srclib/apr/test/testfileinfo.c
+++ b/srclib/apr/test/testfileinfo.c
@@ -113,7 +113,7 @@ static void test_info_get(abts_case *tc, void *data)
     ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     rv = apr_file_info_get(&finfo, APR_FINFO_NORM, thefile);
-    if (rv  == APR_INCOMPLETE) {
+    if (APR_STATUS_IS_INCOMPLETE(rv)) {
         char *str;
 	int i;
         str = apr_pstrdup(p, "APR_INCOMPLETE:  Missing ");
@@ -134,7 +134,7 @@ static void test_stat(abts_case *tc, void *data)
     apr_status_t rv;
 
     rv = apr_stat(&finfo, FILENAME, APR_FINFO_NORM, p);
-    if (rv  == APR_INCOMPLETE) {
+    if (APR_STATUS_IS_INCOMPLETE(rv)) {
         char *str;
 	int i;
         str = apr_pstrdup(p, "APR_INCOMPLETE:  Missing ");
@@ -220,7 +220,7 @@ static void test_mtime_set(abts_case *tc, void *data)
 
     /* Check that the current mtime is not the epoch */
     rv = apr_stat(&finfo, NEWFILENAME, APR_FINFO_MTIME, p);
-    if (rv  == APR_INCOMPLETE) {
+    if (APR_STATUS_IS_INCOMPLETE(rv)) {
         char *str;
 	int i;
         str = apr_pstrdup(p, "APR_INCOMPLETE:  Missing ");
diff --git a/srclib/apr/test/testfmt.c b/srclib/apr/test/testfmt.c
index fa3437a0..97dc9634 100644
--- a/srclib/apr/test/testfmt.c
+++ b/srclib/apr/test/testfmt.c
@@ -105,16 +105,34 @@ static void more_int64_fmts(abts_case *tc, void *data)
     apr_uint64_t big = APR_UINT64_C(10267677267010969076);
 
     apr_snprintf(buf, sizeof buf, "%" APR_INT64_T_FMT, i);
-    ABTS_STR_EQUAL(tc, buf, "-42");
+    ABTS_STR_EQUAL(tc, "-42", buf);
 
     apr_snprintf(buf, sizeof buf, "%" APR_UINT64_T_FMT, ui);
-    ABTS_STR_EQUAL(tc, buf, "42");
+    ABTS_STR_EQUAL(tc, "42", buf);
 
     apr_snprintf(buf, sizeof buf, "%" APR_UINT64_T_FMT, big);
     ABTS_STR_EQUAL(tc, "10267677267010969076", buf);
 
     apr_snprintf(buf, sizeof buf, "%" APR_INT64_T_FMT, ibig);
-    ABTS_STR_EQUAL(tc, buf, "-314159265358979323");
+    ABTS_STR_EQUAL(tc, "-314159265358979323", buf);
+}
+
+static void error_fmt(abts_case *tc, void *data)
+{
+    char ebuf[150], sbuf[150], *s;
+    apr_status_t rv;
+
+    rv = APR_SUCCESS;
+    apr_strerror(rv, ebuf, sizeof ebuf);
+    apr_snprintf(sbuf, sizeof sbuf, "%pm", &rv);
+    ABTS_STR_EQUAL(tc, sbuf, ebuf);
+
+    rv = APR_ENOTIMPL;
+    s = apr_pstrcat(p, "foo-",
+                    apr_strerror(rv, ebuf, sizeof ebuf),
+                    "-bar", NULL);
+    apr_snprintf(sbuf, sizeof sbuf, "foo-%pm-bar", &rv);
+    ABTS_STR_EQUAL(tc, sbuf, s);
 }
 
 abts_suite *testfmt(abts_suite *suite)
@@ -129,6 +147,7 @@ abts_suite *testfmt(abts_suite *suite)
     abts_run_test(suite, uint64_t_fmt, NULL);
     abts_run_test(suite, uint64_t_hex_fmt, NULL);
     abts_run_test(suite, more_int64_fmts, NULL);
+    abts_run_test(suite, error_fmt, NULL);
 
     return suite;
 }
diff --git a/srclib/apr/test/testfnmatch.c b/srclib/apr/test/testfnmatch.c
index b54502fd..37961988 100644
--- a/srclib/apr/test/testfnmatch.c
+++ b/srclib/apr/test/testfnmatch.c
@@ -39,7 +39,7 @@ static void test_glob(abts_case *tc, void *data)
     list = (char **)result->elts;
     for (i = 0; i < result->nelts; i++) {
         char *dot = strrchr(list[i], '.');
-        ABTS_STR_EQUAL(tc, dot, ".txt");
+        ABTS_STR_EQUAL(tc, ".txt", dot);
     }
 }
 
@@ -59,7 +59,7 @@ static void test_glob_currdir(abts_case *tc, void *data)
     list = (char **)result->elts;
     for (i = 0; i < result->nelts; i++) {
         char *dot = strrchr(list[i], '.');
-        ABTS_STR_EQUAL(tc, dot, ".txt");
+        ABTS_STR_EQUAL(tc, ".txt", dot);
     }
     apr_filepath_set("..", p);
 }
diff --git a/srclib/apr/test/testhash.c b/srclib/apr/test/testhash.c
index f844f906..6e7e518d 100644
--- a/srclib/apr/test/testhash.c
+++ b/srclib/apr/test/testhash.c
@@ -170,6 +170,24 @@ static void key_space(abts_case *tc, void *data)
     ABTS_STR_EQUAL(tc, "value", result);
 }
 
+static void hash_clear(abts_case *tc, void *data)
+{
+    apr_hash_t *h;
+    int i, *e;
+
+    h = apr_hash_make(p);
+    ABTS_PTR_NOTNULL(tc, h);
+
+    for (i = 1; i <= 10; i++) {
+        e = apr_palloc(p, sizeof(int));
+        *e = i;
+        apr_hash_set(h, e, sizeof(*e), e);
+    }
+    apr_hash_clear(h);
+    i = apr_hash_count(h);
+    ABTS_INT_EQUAL(tc, 0, i);
+}
+
 /* This is kind of a hack, but I am just keeping an existing test.  This is
  * really testing apr_hash_first, apr_hash_next, and apr_hash_this which 
  * should be tested in three separate tests, but this will do for now.
@@ -435,6 +453,7 @@ abts_suite *testhash(abts_suite *suite)
     abts_run_test(suite, hash_count_1, NULL);
     abts_run_test(suite, hash_count_5, NULL);
 
+    abts_run_test(suite, hash_clear, NULL);
     abts_run_test(suite, hash_traverse, NULL);
     abts_run_test(suite, summation_test, NULL);
 
diff --git a/srclib/apr/test/testipsub.c b/srclib/apr/test/testipsub.c
index ea29487e..8fd36721 100644
--- a/srclib/apr/test/testipsub.c
+++ b/srclib/apr/test/testipsub.c
@@ -68,7 +68,7 @@ static void test_bad_input(abts_case *tc, void *data)
 
     for (i = 0; i < (sizeof testcases / sizeof testcases[0]); i++) {
         rv = apr_ipsubnet_create(&ipsub, testcases[i].ipstr, testcases[i].mask, p);
-        ABTS_INT_EQUAL(tc, rv, testcases[i].expected_rv);
+        ABTS_INT_EQUAL(tc, testcases[i].expected_rv, rv);
     }
 }
 
diff --git a/srclib/apr/test/testlfs.c b/srclib/apr/test/testlfs.c
index c502400e..13bff9bc 100644
--- a/srclib/apr/test/testlfs.c
+++ b/srclib/apr/test/testlfs.c
@@ -24,20 +24,17 @@
 #include "apr_mmap.h"
 #include "testutil.h"
 
-/* Only enable these tests by default on platforms which support sparse
- * files... just Unixes? */
-#if defined(WIN32) || defined(OS2) || defined(NETWARE)
-static void test_nolfs(abts_case *tc, void *data)
-{
-    ABTS_NOT_IMPL(tc, "Large Files tests require Sparse file support");
-}
-#elif APR_HAS_LARGE_FILES
-#define USE_LFS_TESTS
+/* TODO: in 1.3.0 this becomes APR_HAS_SPARSE_FILES, HOWEVER we will
+ * still need to test csize before proceeding, because having sparse
+ * file support in the OS/APR does not mean this volume supports it!
+ */
+#if APR_HAS_LARGE_FILES
 
-/* Tests which create an 8Gb sparse file and then check it can be used
+/* Tests which create an 8GB sparse file and then check it can be used
  * as normal. */
 
-static apr_off_t eightGb = APR_INT64_C(2) << 32;
+static apr_off_t oneMB = APR_INT64_C(2) << 19;
+static apr_off_t eightGB = APR_INT64_C(2) << 32;
 
 static int madefile = 0;
 
@@ -50,6 +47,7 @@ static int madefile = 0;
 static void test_open(abts_case *tc, void *data)
 {
     apr_file_t *f;
+    apr_finfo_t testsize;
     apr_status_t rv;
 
     rv = apr_dir_make(TESTDIR, APR_OS_DEFAULT, p);
@@ -57,46 +55,73 @@ static void test_open(abts_case *tc, void *data)
         APR_ASSERT_SUCCESS(tc, "make test directory", rv);
     }
 
-    APR_ASSERT_SUCCESS(tc, "open file",
-                       apr_file_open(&f, TESTFN, 
-                                     APR_CREATE | APR_WRITE | APR_TRUNCATE,
-                                     APR_OS_DEFAULT, p));
+    /* First attempt a 1MB sparse file so we don't tax the poor test box */
+    rv = apr_file_open(&f, TESTFN, APR_FOPEN_CREATE | APR_FOPEN_WRITE
+                                 | APR_FOPEN_TRUNCATE | APR_FOPEN_SPARSE,
+                       APR_OS_DEFAULT, p);
 
-    rv = apr_file_trunc(f, eightGb);
+    APR_ASSERT_SUCCESS(tc, "open file", rv);
 
-    APR_ASSERT_SUCCESS(tc, "close large file", apr_file_close(f));
+    APR_ASSERT_SUCCESS(tc, "Truncate to 1MB", rv = apr_file_trunc(f, oneMB+1));
 
-    /* 8Gb may pass rlimits or filesystem limits */
+    if (rv == APR_SUCCESS) {
+        rv = apr_file_info_get(&testsize, APR_FINFO_CSIZE, f);
+    }
 
-    if (APR_STATUS_IS_EINVAL(rv)
-#ifdef EFBIG
-        || rv == EFBIG
-#endif
-        ) {
-        ABTS_NOT_IMPL(tc, "Creation of large file (limited by rlimit or fs?)");
+    /* give up if we can't determine the allocation size of the file,
+     * or if it's not an obviously small allocation but the allocation
+     * unit doesn't appear insanely large - on most platforms, it's just
+     * zero physical bytes at this point.
+     */
+    if (rv != APR_SUCCESS || (testsize.csize > oneMB
+                              && testsize.csize < oneMB * 2)) {
+        ABTS_NOT_IMPL(tc, "Creation of large file (apparently not sparse)");
+
+        madefile = 0;
     } 
     else {
-        APR_ASSERT_SUCCESS(tc, "truncate file to 8gb", rv);
+        /* Proceed with our 8GB sparse file now */
+        rv = apr_file_trunc(f, eightGB);
+
+        /* 8GB may pass rlimits or filesystem limits */
+
+        if (APR_STATUS_IS_EINVAL(rv)
+#ifdef EFBIG
+            || rv == EFBIG
+#endif
+            ) {
+            ABTS_NOT_IMPL(tc, "Creation of large file (rlimit, quota or fs)");
+        } 
+        else {
+            APR_ASSERT_SUCCESS(tc, "truncate file to 8gb", rv);
+        }
+        madefile = rv == APR_SUCCESS;
     }
 
-    madefile = rv == APR_SUCCESS;
+    APR_ASSERT_SUCCESS(tc, "close large file", apr_file_close(f));
+
+    if (!madefile) {
+        APR_ASSERT_SUCCESS(tc, "remove large file", apr_file_remove(TESTFN, p));
+    }
 }
 
 static void test_reopen(abts_case *tc, void *data)
 {
     apr_file_t *fh;
     apr_finfo_t finfo;
+    apr_status_t rv;
 
     PRECOND;
     
-    APR_ASSERT_SUCCESS(tc, "re-open 8Gb file",
-                       apr_file_open(&fh, TESTFN, APR_READ, APR_OS_DEFAULT, p));
+    rv = apr_file_open(&fh, TESTFN, APR_FOPEN_SPARSE | APR_FOPEN_READ,
+                       APR_OS_DEFAULT, p);
+    APR_ASSERT_SUCCESS(tc, "re-open 8GB file", rv);
 
     APR_ASSERT_SUCCESS(tc, "file_info_get failed",
                        apr_file_info_get(&finfo, APR_FINFO_NORM, fh));
     
     ABTS_ASSERT(tc, "file_info_get gave incorrect size",
-             finfo.size == eightGb);
+             finfo.size == eightGB);
 
     APR_ASSERT_SUCCESS(tc, "re-close large file", apr_file_close(fh));
 }
@@ -110,7 +135,7 @@ static void test_stat(abts_case *tc, void *data)
     APR_ASSERT_SUCCESS(tc, "stat large file", 
                        apr_stat(&finfo, TESTFN, APR_FINFO_NORM, p));
     
-    ABTS_ASSERT(tc, "stat gave incorrect size", finfo.size == eightGb);
+    ABTS_ASSERT(tc, "stat gave incorrect size", finfo.size == eightGB);
 }
 
 static void test_readdir(abts_case *tc, void *data)
@@ -126,11 +151,11 @@ static void test_readdir(abts_case *tc, void *data)
     do {
         apr_finfo_t finfo;
         
-        rv = apr_dir_read(&finfo, APR_FINFO_NORM, dh);
+        rv = apr_dir_read(&finfo, APR_FINFO_MIN, dh);
         
         if (rv == APR_SUCCESS && strcmp(finfo.name, TESTFILE) == 0) {
             ABTS_ASSERT(tc, "apr_dir_read gave incorrect size for large file", 
-                     finfo.size == eightGb);
+                     finfo.size == eightGB);
         }
 
     } while (rv == APR_SUCCESS);
@@ -149,48 +174,51 @@ static void test_append(abts_case *tc, void *data)
 {
     apr_file_t *fh;
     apr_finfo_t finfo;
+    apr_status_t rv;
     
     PRECOND;
 
-    APR_ASSERT_SUCCESS(tc, "open 8Gb file for append",
-                       apr_file_open(&fh, TESTFN, APR_WRITE | APR_APPEND, 
-                                     APR_OS_DEFAULT, p));
+    rv = apr_file_open(&fh, TESTFN, APR_FOPEN_SPARSE | APR_FOPEN_WRITE 
+                                  | APR_FOPEN_APPEND, 
+                       APR_OS_DEFAULT, p);
+    APR_ASSERT_SUCCESS(tc, "open 8GB file for append", rv);
 
-    APR_ASSERT_SUCCESS(tc, "append to 8Gb file",
+    APR_ASSERT_SUCCESS(tc, "append to 8GB file",
                        apr_file_write_full(fh, TESTSTR, strlen(TESTSTR), NULL));
 
     APR_ASSERT_SUCCESS(tc, "file_info_get failed",
                        apr_file_info_get(&finfo, APR_FINFO_NORM, fh));
     
     ABTS_ASSERT(tc, "file_info_get gave incorrect size",
-             finfo.size == eightGb + strlen(TESTSTR));
+             finfo.size == eightGB + strlen(TESTSTR));
 
-    APR_ASSERT_SUCCESS(tc, "close 8Gb file", apr_file_close(fh));
+    APR_ASSERT_SUCCESS(tc, "close 8GB file", apr_file_close(fh));
 }
 
 static void test_seek(abts_case *tc, void *data)
 {
     apr_file_t *fh;
     apr_off_t pos;
+    apr_status_t rv;
 
     PRECOND;
     
-    APR_ASSERT_SUCCESS(tc, "open 8Gb file for writing",
-                       apr_file_open(&fh, TESTFN, APR_WRITE, 
-                                     APR_OS_DEFAULT, p));
+    rv = apr_file_open(&fh, TESTFN, APR_FOPEN_SPARSE | APR_FOPEN_WRITE,
+                       APR_OS_DEFAULT, p);
+    APR_ASSERT_SUCCESS(tc, "open 8GB file for writing", rv);
 
     pos = 0;
     APR_ASSERT_SUCCESS(tc, "relative seek to end", 
                        apr_file_seek(fh, APR_END, &pos));
-    ABTS_ASSERT(tc, "seek to END gave 8Gb", pos == eightGb);
+    ABTS_ASSERT(tc, "seek to END gave 8GB", pos == eightGB);
     
-    pos = eightGb;
-    APR_ASSERT_SUCCESS(tc, "seek to 8Gb", apr_file_seek(fh, APR_SET, &pos));
-    ABTS_ASSERT(tc, "seek gave 8Gb offset", pos == eightGb);
+    pos = eightGB;
+    APR_ASSERT_SUCCESS(tc, "seek to 8GB", apr_file_seek(fh, APR_SET, &pos));
+    ABTS_ASSERT(tc, "seek gave 8GB offset", pos == eightGB);
 
     pos = 0;
     APR_ASSERT_SUCCESS(tc, "relative seek to 0", apr_file_seek(fh, APR_CUR, &pos));
-    ABTS_ASSERT(tc, "relative seek gave 8Gb offset", pos == eightGb);
+    ABTS_ASSERT(tc, "relative seek gave 8GB offset", pos == eightGB);
 
     apr_file_close(fh);
 }
@@ -198,21 +226,23 @@ static void test_seek(abts_case *tc, void *data)
 static void test_write(abts_case *tc, void *data)
 {
     apr_file_t *fh;
-    apr_off_t pos = eightGb - 4;
+    apr_off_t pos = eightGB - 4;
+    apr_status_t rv;
 
     PRECOND;
 
-    APR_ASSERT_SUCCESS(tc, "re-open 8Gb file",
-                       apr_file_open(&fh, TESTFN, APR_WRITE, APR_OS_DEFAULT, p));
+    rv = apr_file_open(&fh, TESTFN, APR_FOPEN_SPARSE | APR_FOPEN_WRITE,
+                       APR_OS_DEFAULT, p);
+    APR_ASSERT_SUCCESS(tc, "re-open 8GB file", rv);
 
-    APR_ASSERT_SUCCESS(tc, "seek to 8Gb - 4", 
+    APR_ASSERT_SUCCESS(tc, "seek to 8GB - 4", 
                        apr_file_seek(fh, APR_SET, &pos));
-    ABTS_ASSERT(tc, "seek gave 8Gb-4 offset", pos == eightGb - 4);
+    ABTS_ASSERT(tc, "seek gave 8GB-4 offset", pos == eightGB - 4);
 
-    APR_ASSERT_SUCCESS(tc, "write magic string to 8Gb-4",
+    APR_ASSERT_SUCCESS(tc, "write magic string to 8GB-4",
                        apr_file_write_full(fh, "FISH", 4, NULL));
 
-    APR_ASSERT_SUCCESS(tc, "close 8Gb file", apr_file_close(fh));
+    APR_ASSERT_SUCCESS(tc, "close 8GB file", apr_file_close(fh));
 }
 
 
@@ -222,15 +252,17 @@ static void test_mmap(abts_case *tc, void *data)
     apr_mmap_t *map;
     apr_file_t *fh;
     apr_size_t len = 16384; /* hopefully a multiple of the page size */
-    apr_off_t off = eightGb - len; 
+    apr_off_t off = eightGB - len; 
+    apr_status_t rv;
     void *ptr;
 
     PRECOND;
 
-    APR_ASSERT_SUCCESS(tc, "open 8gb file for mmap",
-                       apr_file_open(&fh, TESTFN, APR_READ, APR_OS_DEFAULT, p));
+    rv = apr_file_open(&fh, TESTFN, APR_FOPEN_SPARSE | APR_FOPEN_READ,
+                       APR_OS_DEFAULT, p);
+    APR_ASSERT_SUCCESS(tc, "open 8gb file for mmap", rv);
     
-    APR_ASSERT_SUCCESS(tc, "mmap 8Gb file",
+    APR_ASSERT_SUCCESS(tc, "mmap 8GB file",
                        apr_mmap_create(&map, fh, off, len, APR_MMAP_READ, p));
 
     APR_ASSERT_SUCCESS(tc, "close file", apr_file_close(fh));
@@ -253,24 +285,73 @@ static void test_format(abts_case *tc, void *data)
 
     PRECOND;
 
-    off = apr_atoi64(apr_off_t_toa(p, eightGb));
+    off = apr_atoi64(apr_off_t_toa(p, eightGB));
 
     ABTS_ASSERT(tc, "apr_atoi64 parsed apr_off_t_toa result incorrectly",
-             off == eightGb);
+             off == eightGB);
 }
 
-#else
+#define TESTBUFFN TESTDIR "/buffer.bin"
+
+static void test_buffered(abts_case *tc, void *data)
+{
+    apr_off_t off;
+    apr_file_t *f;
+    apr_status_t rv;
+
+    PRECOND;
+
+    rv = apr_file_open(&f, TESTBUFFN, APR_FOPEN_CREATE | APR_FOPEN_WRITE
+                                    | APR_FOPEN_TRUNCATE | APR_FOPEN_BUFFERED
+                                    | APR_FOPEN_SPARSE,
+                       APR_OS_DEFAULT, p);
+    APR_ASSERT_SUCCESS(tc, "open buffered file", rv);
+
+    APR_ASSERT_SUCCESS(tc, "truncate to 8GB",
+                       apr_file_trunc(f, eightGB));
+
+    off = eightGB;
+    APR_ASSERT_SUCCESS(tc, "seek to 8GB",
+                       apr_file_seek(f, APR_SET, &off));
+    ABTS_ASSERT(tc, "returned seek position still 8GB",
+                off == eightGB);
+
+    off = 0;
+    APR_ASSERT_SUCCESS(tc, "relative seek",
+                       apr_file_seek(f, APR_CUR, &off));
+    ABTS_ASSERT(tc, "relative seek still at 8GB",
+                off == eightGB);
+
+    off = 0;
+    APR_ASSERT_SUCCESS(tc, "end-relative seek",
+                       apr_file_seek(f, APR_END, &off));
+    ABTS_ASSERT(tc, "end-relative seek still at 8GB",
+                off == eightGB);
+
+    off = -eightGB;
+    APR_ASSERT_SUCCESS(tc, "relative seek to beginning",
+                       apr_file_seek(f, APR_CUR, &off));
+    ABTS_ASSERT(tc, "seek to beginning got zero",
+                off == 0);
+
+    APR_ASSERT_SUCCESS(tc, "close buffered file",
+                       apr_file_close(f));
+}
+
+#else /* !APR_HAS_LARGE_FILES */
+
 static void test_nolfs(abts_case *tc, void *data)
 {
     ABTS_NOT_IMPL(tc, "Large Files not supported");
 }
+
 #endif
 
 abts_suite *testlfs(abts_suite *suite)
 {
     suite = ADD_SUITE(suite)
 
-#ifdef USE_LFS_TESTS
+#if APR_HAS_LARGE_FILES
     abts_run_test(suite, test_open, NULL);
     abts_run_test(suite, test_reopen, NULL);
     abts_run_test(suite, test_stat, NULL);
@@ -282,6 +363,7 @@ abts_suite *testlfs(abts_suite *suite)
     abts_run_test(suite, test_mmap, NULL);
 #endif
     abts_run_test(suite, test_format, NULL);
+    abts_run_test(suite, test_buffered, NULL);
 #else
     abts_run_test(suite, test_nolfs, NULL);
 #endif
diff --git a/srclib/apr/test/testlib.dsp b/srclib/apr/test/testlib.dsp
index faf2528b..5ad91ba8 100644
--- a/srclib/apr/test/testlib.dsp
+++ b/srclib/apr/test/testlib.dsp
@@ -195,6 +195,10 @@ SOURCE=.\testatomic.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\testcond.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\testdir.c
 # End Source File
 # Begin Source File
@@ -299,10 +303,6 @@ SOURCE=.\testrand.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\testrand2.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\testshm.c
 # End Source File
 # Begin Source File
diff --git a/srclib/apr/test/testmmap.c b/srclib/apr/test/testmmap.c
index 6e901380..ee87b3bf 100644
--- a/srclib/apr/test/testmmap.c
+++ b/srclib/apr/test/testmmap.c
@@ -66,7 +66,7 @@ static void test_file_close(abts_case *tc, void *data)
     apr_status_t rv;
 
     rv = apr_file_close(thefile);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 }
    
 static void test_file_open(abts_case *tc, void *data)
@@ -74,7 +74,7 @@ static void test_file_open(abts_case *tc, void *data)
     apr_status_t rv;
 
     rv = apr_file_open(&thefile, file1, APR_READ, APR_UREAD | APR_GREAD, p);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     ABTS_PTR_NOTNULL(tc, thefile);
 }
    
@@ -83,7 +83,7 @@ static void test_get_filesize(abts_case *tc, void *data)
     apr_status_t rv;
 
     rv = apr_file_info_get(&thisfinfo, APR_FINFO_NORM, thefile);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     ABTS_ASSERT(tc, "File size mismatch", thisfsize == thisfinfo.size);
 }
 
@@ -92,9 +92,9 @@ static void test_mmap_create(abts_case *tc, void *data)
     apr_status_t rv;
 
     rv = apr_mmap_create(&themmap, thefile, 0, (apr_size_t) thisfinfo.size, 
-                                APR_MMAP_READ, p);
+		                 APR_MMAP_READ, p);
     ABTS_PTR_NOTNULL(tc, themmap);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 }
 
 static void test_mmap_contents(abts_case *tc, void *data)
@@ -114,7 +114,7 @@ static void test_mmap_delete(abts_case *tc, void *data)
 
     ABTS_PTR_NOTNULL(tc, themmap);
     rv = apr_mmap_delete(themmap);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 }
 
 static void test_mmap_offset(abts_case *tc, void *data)
diff --git a/srclib/apr/test/testnames.c b/srclib/apr/test/testnames.c
index a96a9b2f..ae650b19 100644
--- a/srclib/apr/test/testnames.c
+++ b/srclib/apr/test/testnames.c
@@ -22,7 +22,7 @@
 #include "apr_pools.h"
 #include "apr_lib.h"
 
-#if WIN32
+#if defined(WIN32) || defined(OS2)
 #define ABS_ROOT "C:/"
 #elif defined(NETWARE)
 #define ABS_ROOT "SYS:/"
@@ -78,7 +78,7 @@ static void merge_dotdot(abts_case *tc, void *data)
     ABTS_STR_EQUAL(tc, ABS_ROOT"foo/baz", dstpath);
 
     rv = apr_filepath_merge(&dstpath, "", "../test", 0, p);
-    ABTS_INT_EQUAL(tc, 0, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     ABTS_STR_EQUAL(tc, "../test", dstpath);
 
     /* Very dangerous assumptions here about what the cwd is.  However, let's assume
@@ -87,7 +87,7 @@ static void merge_dotdot(abts_case *tc, void *data)
      * the case of the test directory:
      */
     rv = apr_filepath_merge(&dstpath, "", "../test", APR_FILEPATH_TRUENAME, p);
-    ABTS_INT_EQUAL(tc, 0, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     ABTS_STR_EQUAL(tc, "../test", dstpath);
 }
 
diff --git a/srclib/apr/test/testpipe.c b/srclib/apr/test/testpipe.c
index d60707a3..819c8aa2 100644
--- a/srclib/apr/test/testpipe.c
+++ b/srclib/apr/test/testpipe.c
@@ -56,12 +56,12 @@ static void set_timeout(abts_case *tc, void *data)
     apr_status_t rv;
     apr_interval_time_t timeout;
 
-    rv = apr_file_pipe_create(&readp, &writep, p);
+    rv = apr_file_pipe_create_ex(&readp, &writep, APR_WRITE_BLOCK, p);
     ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     ABTS_PTR_NOTNULL(tc, readp);
     ABTS_PTR_NOTNULL(tc, writep);
 
-    rv = apr_file_pipe_timeout_get(readp, &timeout);
+    rv = apr_file_pipe_timeout_get(writep, &timeout);
     ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     ABTS_ASSERT(tc, "Timeout mismatch, expected -1", timeout == -1);
 
@@ -71,7 +71,7 @@ static void set_timeout(abts_case *tc, void *data)
     rv = apr_file_pipe_timeout_get(readp, &timeout);
     ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     ABTS_ASSERT(tc, "Timeout mismatch, expected 1 second", 
-                       timeout == apr_time_from_sec(1));
+		        timeout == apr_time_from_sec(1));
 }
 
 static void read_write(abts_case *tc, void *data)
@@ -83,7 +83,7 @@ static void read_write(abts_case *tc, void *data)
     nbytes = strlen("this is a test");
     buf = (char *)apr_palloc(p, nbytes + 1);
 
-    rv = apr_file_pipe_create(&readp, &writep, p);
+    rv = apr_file_pipe_create_ex(&readp, &writep, APR_WRITE_BLOCK, p);
     ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     ABTS_PTR_NOTNULL(tc, readp);
     ABTS_PTR_NOTNULL(tc, writep);
diff --git a/srclib/apr/test/testpoll.c b/srclib/apr/test/testpoll.c
index f4ca8258..e7792c2f 100644
--- a/srclib/apr/test/testpoll.c
+++ b/srclib/apr/test/testpoll.c
@@ -32,6 +32,7 @@
 static apr_socket_t *s[LARGE_NUM_SOCKETS];
 static apr_sockaddr_t *sa[LARGE_NUM_SOCKETS];
 static apr_pollset_t *pollset;
+static apr_pollcb_t *pollcb;
 
 /* ###: tests surrounded by ifdef OLD_POLL_INTERFACE either need to be
  * converted to use the pollset interface or removed. */
@@ -552,6 +553,112 @@ static void pollset_remove(abts_case *tc, void *data)
              (hot_files[1].client_data == (void *)1)));
 }
 
+#define POLLCB_PREREQ \
+    do { \
+        if (pollcb == NULL) { \
+            ABTS_NOT_IMPL(tc, "pollcb interface not supported"); \
+            return; \
+        } \
+    } while (0)
+
+static void setup_pollcb(abts_case *tc, void *data)
+{
+    apr_status_t rv;
+    rv = apr_pollcb_create(&pollcb, LARGE_NUM_SOCKETS, p, 0);
+    if (rv == APR_ENOTIMPL) {
+        pollcb = NULL;
+        ABTS_NOT_IMPL(tc, "pollcb interface not supported");
+    }
+    else {
+        ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+    }
+}
+
+typedef struct pollcb_baton_t {
+    abts_case *tc;
+    int count;
+} pollcb_baton_t;
+
+static apr_status_t trigger_pollcb_cb(void* baton, apr_pollfd_t *descriptor)
+{
+    pollcb_baton_t* pcb = (pollcb_baton_t*) baton;
+    ABTS_PTR_EQUAL(pcb->tc, s[0], descriptor->desc.s);
+    ABTS_PTR_EQUAL(pcb->tc, s[0], descriptor->client_data);
+    pcb->count++;
+    return APR_SUCCESS;
+}
+
+static void trigger_pollcb(abts_case *tc, void *data)
+{
+    apr_status_t rv;
+    apr_pollfd_t socket_pollfd;
+    pollcb_baton_t pcb;
+    
+    POLLCB_PREREQ;
+
+    ABTS_PTR_NOTNULL(tc, s[0]);
+    socket_pollfd.desc_type = APR_POLL_SOCKET;
+    socket_pollfd.reqevents = APR_POLLIN;
+    socket_pollfd.desc.s = s[0];
+    socket_pollfd.client_data = s[0];
+    rv = apr_pollcb_add(pollcb, &socket_pollfd);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+    
+    send_msg(s, sa, 0, tc);
+    pcb.tc = tc;
+    pcb.count = 0;
+    rv = apr_pollcb_poll(pollcb, 0, trigger_pollcb_cb, &pcb);    
+    ABTS_INT_EQUAL(tc, 0, APR_STATUS_IS_TIMEUP(rv));
+    ABTS_INT_EQUAL(tc, 1, pcb.count);
+
+    rv = apr_pollcb_remove(pollcb, &socket_pollfd);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+}
+
+static void timeout_pollcb(abts_case *tc, void *data)
+{
+    apr_status_t rv;
+    pollcb_baton_t pcb;
+
+    POLLCB_PREREQ;
+
+    pcb.count = 0;
+    pcb.tc = tc;
+
+    rv = apr_pollcb_poll(pollcb, 1, trigger_pollcb_cb, &pcb);    
+    ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
+    ABTS_INT_EQUAL(tc, 0, pcb.count);
+}
+
+static void timeout_pollin_pollcb(abts_case *tc, void *data)
+{
+    apr_status_t rv;
+    pollcb_baton_t pcb;
+    apr_pollfd_t socket_pollfd;
+
+    POLLCB_PREREQ;
+
+    recv_msg(s, 0, p, tc);
+    
+    ABTS_PTR_NOTNULL(tc, s[0]);
+    socket_pollfd.desc_type = APR_POLL_SOCKET;
+    socket_pollfd.reqevents = APR_POLLIN;
+    socket_pollfd.desc.s = s[0];
+    socket_pollfd.client_data = s[0];
+    rv = apr_pollcb_add(pollcb, &socket_pollfd);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+    
+    pcb.count = 0;
+    pcb.tc = tc;
+    
+    rv = apr_pollcb_poll(pollcb, 1, trigger_pollcb_cb, &pcb);    
+    ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
+    ABTS_INT_EQUAL(tc, 0, pcb.count);
+
+    rv = apr_pollcb_remove(pollcb, &socket_pollfd);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+}
+
 abts_suite *testpoll(abts_suite *suite)
 {
     suite = ADD_SUITE(suite)
@@ -586,6 +693,13 @@ abts_suite *testpoll(abts_suite *suite)
     
     abts_run_test(suite, close_all_sockets, NULL);
 
+    abts_run_test(suite, create_all_sockets, NULL);
+    abts_run_test(suite, setup_pollcb, NULL);
+    abts_run_test(suite, trigger_pollcb, NULL);
+    abts_run_test(suite, timeout_pollcb, NULL);
+    abts_run_test(suite, timeout_pollin_pollcb, NULL);
+    abts_run_test(suite, close_all_sockets, NULL);
+
     return suite;
 }
 
diff --git a/srclib/apr/test/testpools.c b/srclib/apr/test/testpools.c
index cb45552e..dd0919d0 100644
--- a/srclib/apr/test/testpools.c
+++ b/srclib/apr/test/testpools.c
@@ -69,7 +69,7 @@ static void parent_pool(abts_case *tc, void *data)
     apr_status_t rv;
 
     rv = apr_pool_create(&pmain, NULL);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     ABTS_PTR_NOTNULL(tc, pmain);
 }
 
@@ -78,7 +78,7 @@ static void child_pool(abts_case *tc, void *data)
     apr_status_t rv;
 
     rv = apr_pool_create(&pchild, pmain);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
     ABTS_PTR_NOTNULL(tc, pchild);
 }
 
diff --git a/srclib/apr/test/testprocmutex.c b/srclib/apr/test/testprocmutex.c
index 013e49f1..78b2efc4 100644
--- a/srclib/apr/test/testprocmutex.c
+++ b/srclib/apr/test/testprocmutex.c
@@ -21,7 +21,6 @@
 #include "apr_errno.h"
 #include "apr_general.h"
 #include "apr_getopt.h"
-#include "errno.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "testutil.h"
@@ -31,6 +30,7 @@
 #define MAX_ITER 200
 #define CHILDREN 6
 #define MAX_COUNTER (MAX_ITER * CHILDREN)
+#define MAX_WAIT_USEC (1000*1000)
 
 static apr_proc_mutex_t *proc_lock;
 static volatile int *x;
@@ -42,7 +42,7 @@ static int increment(int n)
     return n+1;
 }
 
-static void make_child(abts_case *tc, apr_proc_t **proc, apr_pool_t *p)
+static void make_child(abts_case *tc, int trylock, apr_proc_t **proc, apr_pool_t *p)
 {
     apr_status_t rv;
 
@@ -68,8 +68,22 @@ static void make_child(abts_case *tc, apr_proc_t **proc, apr_pool_t *p)
             exit(1);
 
         do {
-            if (apr_proc_mutex_lock(proc_lock))
-                exit(1);
+            if (trylock) {
+                int wait_usec = 0;
+
+                while ((rv = apr_proc_mutex_trylock(proc_lock))) {
+                    if (!APR_STATUS_IS_EBUSY(rv))
+                        exit(1);
+                    if (++wait_usec >= MAX_WAIT_USEC)
+                        exit(1);
+                    apr_sleep(1);
+                }
+            }
+            else {
+                if (apr_proc_mutex_lock(proc_lock))
+                    exit(1);
+            }
+
             i++;
             *x = increment(*x);
             if (apr_proc_mutex_unlock(proc_lock))
@@ -106,12 +120,33 @@ static void test_exclusive(abts_case *tc, const char *lockname,
         return;
  
     for (n = 0; n < CHILDREN; n++)
-        make_child(tc, &child[n], p);
+        make_child(tc, 0, &child[n], p);
 
     for (n = 0; n < CHILDREN; n++)
         await_child(tc, child[n]);
     
     ABTS_ASSERT(tc, "Locks don't appear to work", *x == MAX_COUNTER);
+
+    rv = apr_proc_mutex_trylock(proc_lock);
+    if (rv == APR_ENOTIMPL) {
+        ABTS_NOT_IMPL(tc, "apr_proc_mutex_trylock not implemented");
+        return;
+    }
+    APR_ASSERT_SUCCESS(tc, "check for trylock", rv);
+
+    rv = apr_proc_mutex_unlock(proc_lock);
+    APR_ASSERT_SUCCESS(tc, "unlock after trylock check", rv);
+
+    *x = 0;
+
+    for (n = 0; n < CHILDREN; n++)
+        make_child(tc, 1, &child[n], p);
+
+    for (n = 0; n < CHILDREN; n++)
+        await_child(tc, child[n]);
+    
+    ABTS_ASSERT(tc, "Locks don't appear to work with trylock",
+                *x == MAX_COUNTER);
 }
 #endif
 
diff --git a/srclib/apr/test/testrand.c b/srclib/apr/test/testrand.c
index befed087..6ced4a34 100644
--- a/srclib/apr/test/testrand.c
+++ b/srclib/apr/test/testrand.c
@@ -15,11 +15,257 @@
  */
 
 #include "apr_general.h"
-#include <errno.h>
+#include "apr_random.h"
+#include "apr_thread_proc.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "testutil.h"
 
+static void hexdump(const unsigned char *b, int n)
+{
+    int i;
+
+    for (i = 0; i < n; ++i) {
+#if 0
+        if ((i & 0xf) == 0)
+            printf("%04x", i);
+        printf(" %02x", b[i]);
+        if ((i & 0xf) == 0xf)
+            printf("\n");
+#else
+        printf("0x%02x,", b[i]);
+        if ((i & 7) == 7)
+            printf("\n");
+#endif
+    }
+    printf("\n");
+}
+
+static apr_random_t *r;
+
+typedef apr_status_t APR_THREAD_FUNC rnd_fn(apr_random_t * r, void *b,
+                                            apr_size_t n);
+
+static void rand_run_kat(abts_case *tc, rnd_fn *f, apr_random_t *r,
+                         const unsigned char expected[128])
+{
+    unsigned char c[128];
+    apr_status_t rv;
+
+    rv = f(r, c, 128);
+    ABTS_INT_EQUAL(tc, 0, rv);
+    if (rv)
+        return;
+    if (memcmp(c, expected, 128)) {
+        hexdump(c, 128);
+        hexdump(expected, 128);
+        ABTS_FAIL(tc, "Randomness mismatch");
+    }
+}
+
+static int rand_check_kat(rnd_fn *f, apr_random_t *r,
+                          const unsigned char expected[128])
+{
+    unsigned char c[128];
+    apr_status_t rv;
+
+    rv = f(r, c, 128);
+    if (rv)
+        return 2;
+    if (memcmp(c, expected, 128))
+        return 1;
+    return 0;
+}
+
+static void rand_add_zeroes(apr_random_t *r)
+{
+    static unsigned char c[2048];
+
+    apr_random_add_entropy(r, c, sizeof c);
+}
+
+static void rand_run_seed_short(abts_case *tc, rnd_fn *f, apr_random_t *r,
+                                int count)
+{
+    int i;
+    apr_status_t rv;
+    char c[1];
+
+    for (i = 0; i < count; ++i)
+        rand_add_zeroes(r);
+    rv = f(r, c, 1);
+    ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_ENOTENOUGHENTROPY(rv));
+}
+
+static void rand_seed_short(abts_case *tc, void *data)
+{
+    r = apr_random_standard_new(p);
+    rand_run_seed_short(tc, apr_random_insecure_bytes, r, 32);
+}
+
+static void rand_kat(abts_case *tc, void *data)
+{
+    unsigned char expected[128] = {
+        0x82, 0x04, 0xad, 0xd2, 0x0b, 0xd5, 0xac, 0xda,
+        0x3d, 0x85, 0x58, 0x38, 0x54, 0x6b, 0x69, 0x45,
+        0x37, 0x4c, 0xc7, 0xd7, 0x87, 0xeb, 0xbf, 0xd9,
+        0xb1, 0xb8, 0xb8, 0x2d, 0x9b, 0x33, 0x6e, 0x97,
+        0x04, 0x1d, 0x4c, 0xb0, 0xd1, 0xdf, 0x3d, 0xac,
+        0xd2, 0xaa, 0xfa, 0xcd, 0x96, 0xb7, 0xcf, 0xb1,
+        0x8e, 0x3d, 0xb3, 0xe5, 0x37, 0xa9, 0x95, 0xb4,
+        0xaa, 0x3d, 0x11, 0x1a, 0x08, 0x20, 0x21, 0x9f,
+        0xdb, 0x08, 0x3a, 0xb9, 0x57, 0x9f, 0xf2, 0x1f,
+        0x27, 0xdc, 0xb6, 0xc0, 0x85, 0x08, 0x05, 0xbb,
+        0x13, 0xbe, 0xb1, 0xe9, 0x63, 0x2a, 0xe2, 0xa4,
+        0x23, 0x15, 0x2a, 0x10, 0xbf, 0xdf, 0x09, 0xb3,
+        0xc7, 0xfb, 0x2d, 0x87, 0x48, 0x19, 0xfb, 0xc0,
+        0x15, 0x8c, 0xcb, 0xc6, 0xbd, 0x89, 0x38, 0x69,
+        0xa3, 0xae, 0xa3, 0x21, 0x58, 0x50, 0xe7, 0xc4,
+        0x87, 0xec, 0x2e, 0xb1, 0x2d, 0x6a, 0xbd, 0x46
+    };
+
+    rand_add_zeroes(r);
+    rand_run_kat(tc, apr_random_insecure_bytes, r, expected);
+}
+
+static void rand_seed_short2(abts_case *tc, void *data)
+{
+    rand_run_seed_short(tc, apr_random_secure_bytes, r, 320);
+}
+
+static void rand_kat2(abts_case *tc, void *data)
+{
+    unsigned char expected[128] = {
+        0x38, 0x8f, 0x01, 0x29, 0x5a, 0x5c, 0x1f, 0xa8,
+        0x00, 0xde, 0x16, 0x4c, 0xe5, 0xf7, 0x1f, 0x58,
+        0xc0, 0x67, 0xe2, 0x98, 0x3d, 0xde, 0x4a, 0x75,
+        0x61, 0x3f, 0x23, 0xd8, 0x45, 0x7a, 0x10, 0x60,
+        0x59, 0x9b, 0xd6, 0xaf, 0xcb, 0x0a, 0x2e, 0x34,
+        0x9c, 0x39, 0x5b, 0xd0, 0xbc, 0x9a, 0xf0, 0x7b,
+        0x7f, 0x40, 0x8b, 0x33, 0xc0, 0x0e, 0x2a, 0x56,
+        0xfc, 0xe5, 0xab, 0xde, 0x7b, 0x13, 0xf5, 0xec,
+        0x15, 0x68, 0xb8, 0x09, 0xbc, 0x2c, 0x15, 0xf0,
+        0x7b, 0xef, 0x2a, 0x97, 0x19, 0xa8, 0x69, 0x51,
+        0xdf, 0xb0, 0x5f, 0x1a, 0x4e, 0xdf, 0x42, 0x02,
+        0x71, 0x36, 0xa7, 0x25, 0x64, 0x85, 0xe2, 0x72,
+        0xc7, 0x87, 0x4d, 0x7d, 0x15, 0xbb, 0x15, 0xd1,
+        0xb1, 0x62, 0x0b, 0x25, 0xd9, 0xd3, 0xd9, 0x5a,
+        0xe3, 0x47, 0x1e, 0xae, 0x67, 0xb4, 0x19, 0x9e,
+        0xed, 0xd2, 0xde, 0xce, 0x18, 0x70, 0x57, 0x12
+    };
+
+    rand_add_zeroes(r);
+    rand_run_kat(tc, apr_random_secure_bytes, r, expected);
+}
+
+static void rand_barrier(abts_case *tc, void *data)
+{
+    apr_random_barrier(r);
+    rand_run_seed_short(tc, apr_random_secure_bytes, r, 320);
+}
+
+static void rand_kat3(abts_case *tc, void *data)
+{
+    unsigned char expected[128] = {
+        0xe8, 0xe7, 0xc9, 0x45, 0xe2, 0x2a, 0x54, 0xb2,
+        0xdd, 0xe0, 0xf9, 0xbc, 0x3d, 0xf9, 0xce, 0x3c,
+        0x4c, 0xbd, 0xc9, 0xe2, 0x20, 0x4a, 0x35, 0x1c,
+        0x04, 0x52, 0x7f, 0xb8, 0x0f, 0x60, 0x89, 0x63,
+        0x8a, 0xbe, 0x0a, 0x44, 0xac, 0x5d, 0xd8, 0xeb,
+        0x24, 0x7d, 0xd1, 0xda, 0x4d, 0x86, 0x9b, 0x94,
+        0x26, 0x56, 0x4a, 0x5e, 0x30, 0xea, 0xd4, 0xa9,
+        0x9a, 0xdf, 0xdd, 0xb6, 0xb1, 0x15, 0xe0, 0xfa,
+        0x28, 0xa4, 0xd6, 0x95, 0xa4, 0xf1, 0xd8, 0x6e,
+        0xeb, 0x8c, 0xa4, 0xac, 0x34, 0xfe, 0x06, 0x92,
+        0xc5, 0x09, 0x99, 0x86, 0xdc, 0x5a, 0x3c, 0x92,
+        0xc8, 0x3e, 0x52, 0x00, 0x4d, 0x01, 0x43, 0x6f,
+        0x69, 0xcf, 0xe2, 0x60, 0x9c, 0x23, 0xb3, 0xa5,
+        0x5f, 0x51, 0x47, 0x8c, 0x07, 0xde, 0x60, 0xc6,
+        0x04, 0xbf, 0x32, 0xd6, 0xdc, 0xb7, 0x31, 0x01,
+        0x29, 0x51, 0x51, 0xb3, 0x19, 0x6e, 0xe4, 0xf8
+    };
+
+    rand_run_kat(tc, apr_random_insecure_bytes, r, expected);
+}
+
+static void rand_kat4(abts_case *tc, void *data)
+{
+    unsigned char expected[128] = {
+        0x7d, 0x0e, 0xc4, 0x4e, 0x3e, 0xac, 0x86, 0x50,
+        0x37, 0x95, 0x7a, 0x98, 0x23, 0x26, 0xa7, 0xbf,
+        0x60, 0xfb, 0xa3, 0x70, 0x90, 0xc3, 0x58, 0xc6,
+        0xbd, 0xd9, 0x5e, 0xa6, 0x77, 0x62, 0x7a, 0x5c,
+        0x96, 0x83, 0x7f, 0x80, 0x3d, 0xf4, 0x9c, 0xcc,
+        0x9b, 0x0c, 0x8c, 0xe1, 0x72, 0xa8, 0xfb, 0xc9,
+        0xc5, 0x43, 0x91, 0xdc, 0x9d, 0x92, 0xc2, 0xce,
+        0x1c, 0x5e, 0x36, 0xc7, 0x87, 0xb1, 0xb4, 0xa3,
+        0xc8, 0x69, 0x76, 0xfc, 0x35, 0x75, 0xcb, 0x08,
+        0x2f, 0xe3, 0x98, 0x76, 0x37, 0x80, 0x04, 0x5c,
+        0xb8, 0xb0, 0x7f, 0xb2, 0xda, 0xe3, 0xa3, 0xba,
+        0xed, 0xff, 0xf5, 0x9d, 0x3b, 0x7b, 0xf3, 0x32,
+        0x6c, 0x50, 0xa5, 0x3e, 0xcc, 0xe1, 0x84, 0x9c,
+        0x17, 0x9e, 0x80, 0x64, 0x09, 0xbb, 0x62, 0xf1,
+        0x95, 0xf5, 0x2c, 0xc6, 0x9f, 0x6a, 0xee, 0x6d,
+        0x17, 0x35, 0x5f, 0x35, 0x8d, 0x55, 0x0c, 0x07
+    };
+
+    rand_add_zeroes(r);
+    rand_run_kat(tc, apr_random_secure_bytes, r, expected);
+}
+
+#if APR_HAS_FORK
+static void rand_fork(abts_case *tc, void *data)
+{
+    apr_proc_t proc;
+    apr_status_t rv;
+    unsigned char expected[128] = {
+        0xac, 0x93, 0xd2, 0x5c, 0xc7, 0xf5, 0x8d, 0xc2,
+        0xd8, 0x8d, 0xb6, 0x7a, 0x94, 0xe1, 0x83, 0x4c,
+        0x26, 0xe2, 0x38, 0x6d, 0xf5, 0xbd, 0x9d, 0x6e,
+        0x91, 0x77, 0x3a, 0x4b, 0x9b, 0xef, 0x9b, 0xa3,
+        0x9f, 0xf6, 0x6d, 0x0c, 0xdc, 0x4b, 0x02, 0xe9,
+        0x5d, 0x3d, 0xfc, 0x92, 0x6b, 0xdf, 0xc9, 0xef,
+        0xb9, 0xa8, 0x74, 0x09, 0xa3, 0xff, 0x64, 0x8d,
+        0x19, 0xc1, 0x31, 0x31, 0x17, 0xe1, 0xb7, 0x7a,
+        0xe7, 0x55, 0x14, 0x92, 0x05, 0xe3, 0x1e, 0xb8,
+        0x9b, 0x1b, 0xdc, 0xac, 0x0e, 0x15, 0x08, 0xa2,
+        0x93, 0x13, 0xf6, 0x04, 0xc6, 0x9d, 0xf8, 0x7f,
+        0x26, 0x32, 0x68, 0x43, 0x2e, 0x5a, 0x4f, 0x47,
+        0xe8, 0xf8, 0x59, 0xb7, 0xfb, 0xbe, 0x30, 0x04,
+        0xb6, 0x63, 0x6f, 0x19, 0xf3, 0x2c, 0xd4, 0xeb,
+        0x32, 0x8a, 0x54, 0x01, 0xd0, 0xaf, 0x3f, 0x13,
+        0xc1, 0x7f, 0x10, 0x2e, 0x08, 0x1c, 0x28, 0x4b,
+    };
+
+    rv = apr_proc_fork(&proc, p);
+    if (rv == APR_INCHILD) {
+        int n = rand_check_kat(apr_random_secure_bytes, r, expected);
+        exit(n);
+    }
+    else if (rv == APR_INPARENT) {
+        int exitcode;
+        apr_exit_why_e why;
+
+        rand_run_kat(tc, apr_random_secure_bytes, r, expected);
+        apr_proc_wait(&proc, &exitcode, &why, APR_WAIT);
+        if (why != APR_PROC_EXIT) {
+            ABTS_FAIL(tc, "Child terminated abnormally");
+        }
+        else if (exitcode == 0) {
+            ABTS_FAIL(tc, "Child produced our randomness");
+        }
+        else if (exitcode == 2) {
+            ABTS_FAIL(tc, "Child randomness failed");
+        }
+        else if (exitcode != 1) {
+            ABTS_FAIL(tc, "Uknown child error");
+        }
+    } else {
+        ABTS_FAIL(tc, "Fork failed");
+    }
+}
+#endif
+
 static void rand_exists(abts_case *tc, void *data)
 {
 #if !APR_HAS_RANDOM
@@ -33,14 +279,23 @@ static void rand_exists(abts_case *tc, void *data)
     APR_ASSERT_SUCCESS(tc, "apr_generate_random_bytes failed",
                        apr_generate_random_bytes(c, sizeof c));
 #endif
-}    
+}
 
 abts_suite *testrand(abts_suite *suite)
 {
     suite = ADD_SUITE(suite)
 
     abts_run_test(suite, rand_exists, NULL);
+    abts_run_test(suite, rand_seed_short, NULL);
+    abts_run_test(suite, rand_kat, NULL);
+    abts_run_test(suite, rand_seed_short2, NULL);
+    abts_run_test(suite, rand_kat2, NULL);
+    abts_run_test(suite, rand_barrier, NULL);
+    abts_run_test(suite, rand_kat3, NULL);
+    abts_run_test(suite, rand_kat4, NULL);
+#if APR_HAS_FORK
+    abts_run_test(suite, rand_fork, NULL);
+#endif
 
     return suite;
 }
-
diff --git a/srclib/apr/test/testrand2.c b/srclib/apr/test/testrand2.c
deleted file mode 100644
index f9f82864..00000000
--- a/srclib/apr/test/testrand2.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "apr_general.h"
-#include "apr_random.h"
-#include "apr_thread_proc.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "testutil.h"
-
-static void hexdump(const unsigned char *b,int n)
-    {
-    int i;
-
-    for(i=0 ; i < n ; ++i)
-        {
-#if 0
-        if((i&0xf) == 0)
-            printf("%04x",i);
-        printf(" %02x",b[i]);
-        if((i&0xf) == 0xf)
-            printf("\n");
-#else
-        printf("0x%02x,",b[i]);
-        if((i&7) == 7)
-            printf("\n");
-#endif
-        }
-    printf("\n");
-    }
-
-static apr_random_t *r;
-
-typedef apr_status_t APR_THREAD_FUNC rnd_fn(apr_random_t *r,void *b,apr_size_t n);
-
-static void rand_run_kat(abts_case *tc,rnd_fn *f,apr_random_t *r,
-                         const unsigned char expected[128])
-    {
-    unsigned char c[128];
-    apr_status_t rv;
-
-    rv=f(r,c,128);
-    ABTS_INT_EQUAL(tc,0,rv);
-    if(rv)
-        return;
-    if(memcmp(c,expected,128))
-        {
-        hexdump(c,128);
-        hexdump(expected,128);
-        ABTS_FAIL(tc,"Randomness mismatch");
-        }
-    }
-
-static int rand_check_kat(rnd_fn *f,apr_random_t *r,
-                          const unsigned char expected[128])
-    {
-    unsigned char c[128];
-    apr_status_t rv;
-
-    rv=f(r,c,128);
-    if(rv)
-        return 2;
-    if(memcmp(c,expected,128))
-        return 1;
-    return 0;
-    }
-
-static void rand_add_zeroes(apr_random_t *r)
-    {
-    static unsigned char c[2048];
-
-    apr_random_add_entropy(r,c,sizeof c);
-    }
-
-static void rand_run_seed_short(abts_case *tc,rnd_fn *f,apr_random_t *r,
-                                int count)
-    {
-    int i;
-    apr_status_t rv;
-    char c[1];
-
-    for(i=0 ; i < count ; ++i)
-        rand_add_zeroes(r);
-    rv=f(r,c,1);
-    ABTS_INT_EQUAL(tc,1,APR_STATUS_IS_ENOTENOUGHENTROPY(rv));
-    }
-
-static void rand_seed_short(abts_case *tc, void *data)
-    {
-    r=apr_random_standard_new(p);
-    rand_run_seed_short(tc,apr_random_insecure_bytes,r,32);
-    }
-
-static void rand_kat(abts_case *tc, void *data)
-    {
-    unsigned char expected[128]=
-        { 0x82,0x04,0xad,0xd2,0x0b,0xd5,0xac,0xda,
-          0x3d,0x85,0x58,0x38,0x54,0x6b,0x69,0x45,
-          0x37,0x4c,0xc7,0xd7,0x87,0xeb,0xbf,0xd9,
-          0xb1,0xb8,0xb8,0x2d,0x9b,0x33,0x6e,0x97,
-          0x04,0x1d,0x4c,0xb0,0xd1,0xdf,0x3d,0xac,
-          0xd2,0xaa,0xfa,0xcd,0x96,0xb7,0xcf,0xb1,
-          0x8e,0x3d,0xb3,0xe5,0x37,0xa9,0x95,0xb4,
-          0xaa,0x3d,0x11,0x1a,0x08,0x20,0x21,0x9f,
-          0xdb,0x08,0x3a,0xb9,0x57,0x9f,0xf2,0x1f,
-          0x27,0xdc,0xb6,0xc0,0x85,0x08,0x05,0xbb,
-          0x13,0xbe,0xb1,0xe9,0x63,0x2a,0xe2,0xa4,
-          0x23,0x15,0x2a,0x10,0xbf,0xdf,0x09,0xb3,
-          0xc7,0xfb,0x2d,0x87,0x48,0x19,0xfb,0xc0,
-          0x15,0x8c,0xcb,0xc6,0xbd,0x89,0x38,0x69,
-          0xa3,0xae,0xa3,0x21,0x58,0x50,0xe7,0xc4,
-          0x87,0xec,0x2e,0xb1,0x2d,0x6a,0xbd,0x46 };
-
-    rand_add_zeroes(r);
-    rand_run_kat(tc,apr_random_insecure_bytes,r,expected);
-    }    
-
-static void rand_seed_short2(abts_case *tc, void *data)
-    {
-    rand_run_seed_short(tc,apr_random_secure_bytes,r,320);
-    }
-
-static void rand_kat2(abts_case *tc, void *data)
-    {
-    unsigned char expected[128]=
-        { 0x38,0x8f,0x01,0x29,0x5a,0x5c,0x1f,0xa8,
-          0x00,0xde,0x16,0x4c,0xe5,0xf7,0x1f,0x58,
-          0xc0,0x67,0xe2,0x98,0x3d,0xde,0x4a,0x75,
-          0x61,0x3f,0x23,0xd8,0x45,0x7a,0x10,0x60,
-          0x59,0x9b,0xd6,0xaf,0xcb,0x0a,0x2e,0x34,
-          0x9c,0x39,0x5b,0xd0,0xbc,0x9a,0xf0,0x7b,
-          0x7f,0x40,0x8b,0x33,0xc0,0x0e,0x2a,0x56,
-          0xfc,0xe5,0xab,0xde,0x7b,0x13,0xf5,0xec,
-          0x15,0x68,0xb8,0x09,0xbc,0x2c,0x15,0xf0,
-          0x7b,0xef,0x2a,0x97,0x19,0xa8,0x69,0x51,
-          0xdf,0xb0,0x5f,0x1a,0x4e,0xdf,0x42,0x02,
-          0x71,0x36,0xa7,0x25,0x64,0x85,0xe2,0x72,
-          0xc7,0x87,0x4d,0x7d,0x15,0xbb,0x15,0xd1,
-          0xb1,0x62,0x0b,0x25,0xd9,0xd3,0xd9,0x5a,
-          0xe3,0x47,0x1e,0xae,0x67,0xb4,0x19,0x9e,
-          0xed,0xd2,0xde,0xce,0x18,0x70,0x57,0x12 };
-
-    rand_add_zeroes(r);
-    rand_run_kat(tc,apr_random_secure_bytes,r,expected);
-    }    
-
-static void rand_barrier(abts_case *tc, void *data)
-    {
-    apr_random_barrier(r);
-    rand_run_seed_short(tc,apr_random_secure_bytes,r,320);
-    }
-
-static void rand_kat3(abts_case *tc, void *data)
-    {
-    unsigned char expected[128]=
-        { 0xe8,0xe7,0xc9,0x45,0xe2,0x2a,0x54,0xb2,
-          0xdd,0xe0,0xf9,0xbc,0x3d,0xf9,0xce,0x3c,
-          0x4c,0xbd,0xc9,0xe2,0x20,0x4a,0x35,0x1c,
-          0x04,0x52,0x7f,0xb8,0x0f,0x60,0x89,0x63,
-          0x8a,0xbe,0x0a,0x44,0xac,0x5d,0xd8,0xeb,
-          0x24,0x7d,0xd1,0xda,0x4d,0x86,0x9b,0x94,
-          0x26,0x56,0x4a,0x5e,0x30,0xea,0xd4,0xa9,
-          0x9a,0xdf,0xdd,0xb6,0xb1,0x15,0xe0,0xfa,
-          0x28,0xa4,0xd6,0x95,0xa4,0xf1,0xd8,0x6e,
-          0xeb,0x8c,0xa4,0xac,0x34,0xfe,0x06,0x92,
-          0xc5,0x09,0x99,0x86,0xdc,0x5a,0x3c,0x92,
-          0xc8,0x3e,0x52,0x00,0x4d,0x01,0x43,0x6f,
-          0x69,0xcf,0xe2,0x60,0x9c,0x23,0xb3,0xa5,
-          0x5f,0x51,0x47,0x8c,0x07,0xde,0x60,0xc6,
-          0x04,0xbf,0x32,0xd6,0xdc,0xb7,0x31,0x01,
-          0x29,0x51,0x51,0xb3,0x19,0x6e,0xe4,0xf8 };
-
-    rand_run_kat(tc,apr_random_insecure_bytes,r,expected);
-    }    
-
-static void rand_kat4(abts_case *tc, void *data)
-    {
-    unsigned char expected[128]=
-        { 0x7d,0x0e,0xc4,0x4e,0x3e,0xac,0x86,0x50,
-          0x37,0x95,0x7a,0x98,0x23,0x26,0xa7,0xbf,
-          0x60,0xfb,0xa3,0x70,0x90,0xc3,0x58,0xc6,
-          0xbd,0xd9,0x5e,0xa6,0x77,0x62,0x7a,0x5c,
-          0x96,0x83,0x7f,0x80,0x3d,0xf4,0x9c,0xcc,
-          0x9b,0x0c,0x8c,0xe1,0x72,0xa8,0xfb,0xc9,
-          0xc5,0x43,0x91,0xdc,0x9d,0x92,0xc2,0xce,
-          0x1c,0x5e,0x36,0xc7,0x87,0xb1,0xb4,0xa3,
-          0xc8,0x69,0x76,0xfc,0x35,0x75,0xcb,0x08,
-          0x2f,0xe3,0x98,0x76,0x37,0x80,0x04,0x5c,
-          0xb8,0xb0,0x7f,0xb2,0xda,0xe3,0xa3,0xba,
-          0xed,0xff,0xf5,0x9d,0x3b,0x7b,0xf3,0x32,
-          0x6c,0x50,0xa5,0x3e,0xcc,0xe1,0x84,0x9c,
-          0x17,0x9e,0x80,0x64,0x09,0xbb,0x62,0xf1,
-          0x95,0xf5,0x2c,0xc6,0x9f,0x6a,0xee,0x6d,
-          0x17,0x35,0x5f,0x35,0x8d,0x55,0x0c,0x07 };
-
-    rand_add_zeroes(r);
-    rand_run_kat(tc,apr_random_secure_bytes,r,expected);
-    }    
-
-#if APR_HAS_FORK
-static void rand_fork(abts_case *tc, void *data)
-    {
-    apr_proc_t proc;
-    apr_status_t rv;
-    unsigned char expected[128]=
-        {  0xac,0x93,0xd2,0x5c,0xc7,0xf5,0x8d,0xc2,
-           0xd8,0x8d,0xb6,0x7a,0x94,0xe1,0x83,0x4c,
-           0x26,0xe2,0x38,0x6d,0xf5,0xbd,0x9d,0x6e,
-           0x91,0x77,0x3a,0x4b,0x9b,0xef,0x9b,0xa3,
-           0x9f,0xf6,0x6d,0x0c,0xdc,0x4b,0x02,0xe9,
-           0x5d,0x3d,0xfc,0x92,0x6b,0xdf,0xc9,0xef,
-           0xb9,0xa8,0x74,0x09,0xa3,0xff,0x64,0x8d,
-           0x19,0xc1,0x31,0x31,0x17,0xe1,0xb7,0x7a,
-           0xe7,0x55,0x14,0x92,0x05,0xe3,0x1e,0xb8,
-           0x9b,0x1b,0xdc,0xac,0x0e,0x15,0x08,0xa2,
-           0x93,0x13,0xf6,0x04,0xc6,0x9d,0xf8,0x7f,
-           0x26,0x32,0x68,0x43,0x2e,0x5a,0x4f,0x47,
-           0xe8,0xf8,0x59,0xb7,0xfb,0xbe,0x30,0x04,
-           0xb6,0x63,0x6f,0x19,0xf3,0x2c,0xd4,0xeb,
-           0x32,0x8a,0x54,0x01,0xd0,0xaf,0x3f,0x13,
-           0xc1,0x7f,0x10,0x2e,0x08,0x1c,0x28,0x4b, };
-
-    rv=apr_proc_fork(&proc,p);
-    if(rv == APR_INCHILD)
-        {
-        int n;
-
-        n=rand_check_kat(apr_random_secure_bytes,r,expected);
-
-        exit(n);
-        }
-    else if(rv == APR_INPARENT)
-        {
-        int exitcode;
-        apr_exit_why_e why;
-
-        rand_run_kat(tc,apr_random_secure_bytes,r,expected);
-        apr_proc_wait(&proc,&exitcode,&why,APR_WAIT);
-        if(why != APR_PROC_EXIT)
-            {
-            ABTS_FAIL(tc,"Child terminated abnormally");
-            return;
-            }
-        if(exitcode == 0)
-            {
-            ABTS_FAIL(tc,"Child produced our randomness");
-            return;
-            }
-        else if(exitcode == 2)
-            {
-            ABTS_FAIL(tc,"Child randomness failed");
-            return;
-            }
-        else if(exitcode != 1)
-            {
-            ABTS_FAIL(tc,"Uknown child error");
-            return;
-            }
-        }
-    else
-        {
-        ABTS_FAIL(tc,"Fork failed");
-        return;
-        }
-    }
-#endif    
-        
-abts_suite *testrand2(abts_suite *suite)
-    {
-    suite = ADD_SUITE(suite)
-
-    abts_run_test(suite, rand_seed_short, NULL);
-    abts_run_test(suite, rand_kat, NULL);
-    abts_run_test(suite, rand_seed_short2, NULL);
-    abts_run_test(suite, rand_kat2, NULL);
-    abts_run_test(suite, rand_barrier, NULL);
-    abts_run_test(suite, rand_kat3, NULL);
-    abts_run_test(suite, rand_kat4, NULL);
-#if APR_HAS_FORK
-    abts_run_test(suite, rand_fork, NULL);
-#endif
-
-    return suite;
-    }
diff --git a/srclib/apr/test/testsleep.c b/srclib/apr/test/testsleep.c
index d50cc1b4..eff24ddf 100644
--- a/srclib/apr/test/testsleep.c
+++ b/srclib/apr/test/testsleep.c
@@ -19,7 +19,6 @@
 #include "apr_errno.h"
 #include "apr_general.h"
 #include "apr_lib.h"
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "testutil.h"
diff --git a/srclib/apr/test/testsock.c b/srclib/apr/test/testsock.c
index 2ca31137..0d1bd578 100644
--- a/srclib/apr/test/testsock.c
+++ b/srclib/apr/test/testsock.c
@@ -207,12 +207,44 @@ static void test_timeout(abts_case *tc, void *data)
     APR_ASSERT_SUCCESS(tc, "Problem closing socket", rv);
 }
 
+static void test_print_addr(abts_case *tc, void *data)
+{
+    apr_sockaddr_t *sa;
+    apr_status_t rv;
+    char *s;
+
+    rv = apr_sockaddr_info_get(&sa, "0.0.0.0", APR_INET, 80, 0, p);
+    APR_ASSERT_SUCCESS(tc, "Problem generating sockaddr", rv);
+
+    s = apr_psprintf(p, "foo %pI bar", sa);
+
+    ABTS_STR_EQUAL(tc, "foo 0.0.0.0:80 bar", s);
+
+#if APR_HAVE_IPV6
+    rv = apr_sockaddr_info_get(&sa, "::ffff:0.0.0.0", APR_INET6, 80, 0, p);
+    APR_ASSERT_SUCCESS(tc, "Problem generating sockaddr", rv);
+    if (rv == APR_SUCCESS)
+        ABTS_TRUE(tc, sa != NULL);
+    if (rv == APR_SUCCESS && sa) {
+        /* sa should now be a v4-mapped IPv6 address. */
+        char buf[128];
+
+        memset(buf, 'z', sizeof buf);
+        
+        APR_ASSERT_SUCCESS(tc, "could not get IP address",
+                           apr_sockaddr_ip_getbuf(buf, 22, sa));
+        
+        ABTS_STR_EQUAL(tc, "0.0.0.0", buf);
+    }
+#endif
+}
+
 static void test_get_addr(abts_case *tc, void *data)
 {
     apr_status_t rv;
     apr_socket_t *ld, *sd, *cd;
     apr_sockaddr_t *sa, *ca;
-    char a[128], b[128];
+    char *a, *b;
 
     ld = setup_socket(tc);
 
@@ -271,8 +303,8 @@ static void test_get_addr(abts_case *tc, void *data)
     APR_ASSERT_SUCCESS(tc, "get remote address of client socket",
                        apr_socket_addr_get(&ca, APR_REMOTE, cd));
     
-    apr_snprintf(a, sizeof(a), "%pI", sa);
-    apr_snprintf(b, sizeof(b), "%pI", ca);
+    a = apr_psprintf(p, "%pI", sa);
+    b = apr_psprintf(p, "%pI", ca);
 
     ABTS_STR_EQUAL(tc, a, b);
                        
@@ -290,6 +322,7 @@ abts_suite *testsock(abts_suite *suite)
     abts_run_test(suite, test_send, NULL);
     abts_run_test(suite, test_recv, NULL);
     abts_run_test(suite, test_timeout, NULL);
+    abts_run_test(suite, test_print_addr, NULL);
     abts_run_test(suite, test_get_addr, NULL);
 
     return suite;
diff --git a/srclib/apr/test/testsockets.c b/srclib/apr/test/testsockets.c
index b5741a85..2c0bb576 100644
--- a/srclib/apr/test/testsockets.c
+++ b/srclib/apr/test/testsockets.c
@@ -56,21 +56,6 @@ static void udp_socket(abts_case *tc, void *data)
     apr_socket_close(sock);
 }
 
-/* On recent Linux systems, whilst IPv6 is always supported by glibc,
- * socket(AF_INET6, ...) calls will fail with EAFNOSUPPORT if the
- * "ipv6" kernel module is not loaded.  */
-#if defined(WSAEAFNOSUPPORT)
-#define V6_NOT_ENABLED(e) ((e) == APR_OS_START_SYSERR + WSAEAFNOSUPPORT)
-#elif defined(SOCEAFNOSUPPORT)
-#define V6_NOT_ENABLED(e) ((e) == APR_OS_START_SYSERR + SOCEAFNOSUPPORT)
-#elif defined(EAFNOSUPPORT)
-#define V6_NOT_ENABLED(e) ((e) == EAFNOSUPPORT)
-#elif !APR_HAVE_IPV6
-#define V6_NOT_ENABLED(e) (1)
-#else
-#error MUST have an EAFNOSUPPORT class of error code to enable IPv6!
-#endif
-
 #if APR_HAVE_IPV6
 static void tcp6_socket(abts_case *tc, void *data)
 {
@@ -78,7 +63,7 @@ static void tcp6_socket(abts_case *tc, void *data)
     apr_socket_t *sock = NULL;
 
     rv = apr_socket_create(&sock, APR_INET6, SOCK_STREAM, 0, p);
-    if (V6_NOT_ENABLED(rv)) {
+    if (APR_STATUS_IS_EAFNOSUPPORT(rv)) {
         ABTS_NOT_IMPL(tc, "IPv6 not enabled");
         return;
     }
@@ -93,7 +78,7 @@ static void udp6_socket(abts_case *tc, void *data)
     apr_socket_t *sock = NULL;
 
     rv = apr_socket_create(&sock, APR_INET6, SOCK_DGRAM, 0, p);
-    if (V6_NOT_ENABLED(rv)) {
+    if (APR_STATUS_IS_EAFNOSUPPORT(rv)) {
         ABTS_NOT_IMPL(tc, "IPv6 not enabled");
         return;
     }
@@ -119,7 +104,7 @@ static void sendto_receivefrom_helper(abts_case *tc, const char *addr,
 
     rv = apr_socket_create(&sock, family, SOCK_DGRAM, 0, p);
 #if APR_HAVE_IPV6
-    if ((family == APR_INET6) && V6_NOT_ENABLED(rv)) {
+    if ((family == APR_INET6) && APR_STATUS_IS_EAFNOSUPPORT(rv)) {
         ABTS_NOT_IMPL(tc, "IPv6 not enabled");
         return;
     }
@@ -164,9 +149,8 @@ static void sendto_receivefrom_helper(abts_case *tc, const char *addr,
         rv = apr_sockaddr_info_get(&from, "3ffE:816e:abcd:1234::1",
                                    APR_INET6, 4242, 0, p);
     else
-#else
-        rv = apr_sockaddr_info_get(&from, "127.1.2.3", APR_INET, 4242, 0, p);
 #endif
+        rv = apr_sockaddr_info_get(&from, "127.1.2.3", APR_INET, 4242, 0, p);
     ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 
     len = 80;
diff --git a/srclib/apr/test/teststr.c b/srclib/apr/test/teststr.c
index ec382c34..b682841d 100644
--- a/srclib/apr/test/teststr.c
+++ b/srclib/apr/test/teststr.c
@@ -349,6 +349,20 @@ static void string_strfsize(abts_case *tc, void *data)
     }
 }
 
+static void string_cpystrn(abts_case *tc, void *data)
+{
+    char buf[6], *ret;
+    
+    buf[5] = 'Z';
+
+    ret = apr_cpystrn(buf, "123456", 5);
+
+    ABTS_STR_EQUAL(tc, "1234", buf);
+    ABTS_PTR_EQUAL(tc, buf + 4, ret);
+    ABTS_TRUE(tc, *ret == '\0');
+    ABTS_TRUE(tc, ret[1] == 'Z');
+}
+
 static void snprintf_overflow(abts_case *tc, void *data)
 {
     char buf[4];
@@ -363,7 +377,7 @@ static void snprintf_overflow(abts_case *tc, void *data)
     rv = apr_snprintf(buf, 2, "%s", "abcd");
     ABTS_INT_EQUAL(tc, 1, rv);
 
-    ABTS_STR_EQUAL(tc, buf, "a");
+    ABTS_STR_EQUAL(tc, "a", buf);
 
     /* Check the buffer really hasn't been overflowed. */
     ABTS_TRUE(tc, buf[2] == '4' && buf[3] == '2');
@@ -384,6 +398,7 @@ abts_suite *teststr(abts_suite *suite)
     abts_run_test(suite, string_strtoff, NULL);
     abts_run_test(suite, overflow_strfsize, NULL);
     abts_run_test(suite, string_strfsize, NULL);
+    abts_run_test(suite, string_cpystrn, NULL);
     abts_run_test(suite, snprintf_overflow, NULL);
 
     return suite;
diff --git a/srclib/apr/test/testtable.c b/srclib/apr/test/testtable.c
index d377eaf5..0f217787 100644
--- a/srclib/apr/test/testtable.c
+++ b/srclib/apr/test/testtable.c
@@ -30,8 +30,18 @@
 #include <string.h>
 #endif
 
+static apr_array_header_t *a1 = NULL;
 static apr_table_t *t1 = NULL;
 
+static void array_clear(abts_case *tc, void *data)
+{
+    a1 = apr_array_make(p, 2, sizeof(const char *));
+    APR_ARRAY_PUSH(a1, const char *) = "foo";
+    APR_ARRAY_PUSH(a1, const char *) = "bar";
+    apr_array_clear(a1);
+    ABTS_INT_EQUAL(tc, 0, a1->nelts);
+}
+
 static void table_make(abts_case *tc, void *data)
 {
     t1 = apr_table_make(p, 5);
@@ -44,7 +54,7 @@ static void table_get(abts_case *tc, void *data)
 
     apr_table_set(t1, "foo", "bar");
     val = apr_table_get(t1, "foo");
-    ABTS_STR_EQUAL(tc, val, "bar");
+    ABTS_STR_EQUAL(tc, "bar", val);
 }
 
 static void table_set(abts_case *tc, void *data)
@@ -54,7 +64,7 @@ static void table_set(abts_case *tc, void *data)
     apr_table_set(t1, "setkey", "bar");
     apr_table_set(t1, "setkey", "2ndtry");
     val = apr_table_get(t1, "setkey");
-    ABTS_STR_EQUAL(tc, val, "2ndtry");
+    ABTS_STR_EQUAL(tc, "2ndtry", val);
 }
 
 static void table_getnotthere(abts_case *tc, void *data)
@@ -72,7 +82,7 @@ static void table_add(abts_case *tc, void *data)
     apr_table_add(t1, "addkey", "bar");
     apr_table_add(t1, "addkey", "foo");
     val = apr_table_get(t1, "addkey");
-    ABTS_STR_EQUAL(tc, val, "bar");
+    ABTS_STR_EQUAL(tc, "bar", val);
 
 }
 
@@ -85,11 +95,11 @@ static void table_nelts(abts_case *tc, void *data)
     apr_table_set(t, "def", "abc");
     apr_table_set(t, "foo", "zzz");
     val = apr_table_get(t, "foo");
-    ABTS_STR_EQUAL(tc, val, "zzz");
+    ABTS_STR_EQUAL(tc, "zzz", val);
     val = apr_table_get(t, "abc");
-    ABTS_STR_EQUAL(tc, val, "def");
+    ABTS_STR_EQUAL(tc, "def", val);
     val = apr_table_get(t, "def");
-    ABTS_STR_EQUAL(tc, val, "abc");
+    ABTS_STR_EQUAL(tc, "abc", val);
     ABTS_INT_EQUAL(tc, 3, apr_table_elts(t)->nelts);
 }
 
@@ -109,9 +119,9 @@ static void table_unset(abts_case *tc, void *data)
     apr_table_unset(t, "b");
     ABTS_INT_EQUAL(tc, 1, apr_table_elts(t)->nelts);
     val = apr_table_get(t, "a");
-    ABTS_STR_EQUAL(tc, val, "1");
+    ABTS_STR_EQUAL(tc, "1", val);
     val = apr_table_get(t, "b");
-    ABTS_PTR_EQUAL(tc, (void *)val, (void *)NULL);
+    ABTS_PTR_EQUAL(tc, (void *)NULL, (void *)val);
 }
 
 static void table_overlap(abts_case *tc, void *data)
@@ -132,21 +142,21 @@ static void table_overlap(abts_case *tc, void *data)
     apr_table_addn(t2, "f", "6");
     apr_table_overlap(t1, t2, APR_OVERLAP_TABLES_SET);
     
-    ABTS_INT_EQUAL(tc, apr_table_elts(t1)->nelts, 7);
+    ABTS_INT_EQUAL(tc, 7, apr_table_elts(t1)->nelts);
     val = apr_table_get(t1, "a");
-    ABTS_STR_EQUAL(tc, val, "1");
+    ABTS_STR_EQUAL(tc, "1", val);
     val = apr_table_get(t1, "b");
-    ABTS_STR_EQUAL(tc, val, "2.");
+    ABTS_STR_EQUAL(tc, "2.", val);
     val = apr_table_get(t1, "c");
-    ABTS_STR_EQUAL(tc, val, "3");
+    ABTS_STR_EQUAL(tc, "3", val);
     val = apr_table_get(t1, "d");
-    ABTS_STR_EQUAL(tc, val, "4");
+    ABTS_STR_EQUAL(tc, "4", val);
     val = apr_table_get(t1, "e");
-    ABTS_STR_EQUAL(tc, val, "5");
+    ABTS_STR_EQUAL(tc, "5", val);
     val = apr_table_get(t1, "f");
-    ABTS_STR_EQUAL(tc, val, "6");
+    ABTS_STR_EQUAL(tc, "6", val);
     val = apr_table_get(t1, "g");
-    ABTS_STR_EQUAL(tc, val, "7");
+    ABTS_STR_EQUAL(tc, "7", val);
 }
 
 static void table_overlap2(abts_case *tc, void *data)
@@ -165,8 +175,8 @@ static void table_overlap2(abts_case *tc, void *data)
     
     ABTS_INT_EQUAL(tc, 2, apr_table_elts(t1)->nelts);
     
-    ABTS_STR_EQUAL(tc, apr_table_get(t1, "t1"), "one");
-    ABTS_STR_EQUAL(tc, apr_table_get(t1, "t2"), "two");
+    ABTS_STR_EQUAL(tc, "one", apr_table_get(t1, "t1"));
+    ABTS_STR_EQUAL(tc, "two", apr_table_get(t1, "t2"));
 
 }
 
@@ -174,6 +184,7 @@ abts_suite *testtable(abts_suite *suite)
 {
     suite = ADD_SUITE(suite)
 
+    abts_run_test(suite, array_clear, NULL);
     abts_run_test(suite, table_make, NULL);
     abts_run_test(suite, table_get, NULL);
     abts_run_test(suite, table_set, NULL);
diff --git a/srclib/apr/test/testthread.c b/srclib/apr/test/testthread.c
index 35ef293b..f3df3678 100644
--- a/srclib/apr/test/testthread.c
+++ b/srclib/apr/test/testthread.c
@@ -17,7 +17,6 @@
 #include "apr_thread_proc.h"
 #include "apr_errno.h"
 #include "apr_general.h"
-#include "errno.h"
 #include "apr_time.h"
 #include "testutil.h"
 
diff --git a/srclib/apr/test/testud.c b/srclib/apr/test/testud.c
index 77cd28fa..7132d6cf 100644
--- a/srclib/apr/test/testud.c
+++ b/srclib/apr/test/testud.c
@@ -38,7 +38,7 @@ static void set_userdata(abts_case *tc, void *data)
     apr_status_t rv;
 
     rv = apr_pool_userdata_set(testdata, "TEST", string_cleanup, pool);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
 }
 
 static void get_userdata(abts_case *tc, void *data)
@@ -47,8 +47,8 @@ static void get_userdata(abts_case *tc, void *data)
     void *retdata;
 
     rv = apr_pool_userdata_get(&retdata, "TEST", pool);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
-    ABTS_STR_EQUAL(tc, retdata, testdata);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+    ABTS_STR_EQUAL(tc, testdata, retdata);
 }
 
 static void get_nonexistkey(abts_case *tc, void *data)
@@ -57,8 +57,8 @@ static void get_nonexistkey(abts_case *tc, void *data)
     void *retdata;
 
     rv = apr_pool_userdata_get(&retdata, "DOESNTEXIST", pool);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
-    ABTS_PTR_EQUAL(tc, retdata, NULL);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+    ABTS_PTR_EQUAL(tc, NULL, retdata);
 }
 
 static void post_pool_clear(abts_case *tc, void *data)
@@ -67,8 +67,8 @@ static void post_pool_clear(abts_case *tc, void *data)
     void *retdata;
 
     rv = apr_pool_userdata_get(&retdata, "DOESNTEXIST", pool);
-    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
-    ABTS_PTR_EQUAL(tc, retdata, NULL);
+    ABTS_INT_EQUAL(tc, APR_SUCCESS, rv);
+    ABTS_PTR_EQUAL(tc, NULL, retdata);
 }
 
 abts_suite *testud(abts_suite *suite)
diff --git a/srclib/apr/test/testuser.c b/srclib/apr/test/testuser.c
index 8c225d7f..e75782e9 100644
--- a/srclib/apr/test/testuser.c
+++ b/srclib/apr/test/testuser.c
@@ -100,7 +100,7 @@ static void groupname(abts_case *tc, void *data)
                        apr_gid_compare(gid, retreived_gid));
 }
 
-#ifndef WIN32
+#ifdef APR_UID_GID_NUMERIC
 
 static void fail_userinfo(abts_case *tc, void *data)
 {
@@ -146,11 +146,6 @@ static void fail_userinfo(abts_case *tc, void *data)
                 rv != APR_SUCCESS || tmp != NULL);
 }
 
-#else
-static void fail_userinfo(abts_case *tc, void *data)
-{
-    ABTS_NOT_IMPL(tc, "Users are not opaque integers on this platform");
-}
 #endif
 
 #else
@@ -170,8 +165,10 @@ abts_suite *testuser(abts_suite *suite)
     abts_run_test(suite, uid_current, NULL);
     abts_run_test(suite, username, NULL);
     abts_run_test(suite, groupname, NULL);
+#ifdef APR_UID_GID_NUMERIC
     abts_run_test(suite, fail_userinfo, NULL);
 #endif
+#endif
 
     return suite;
 }
diff --git a/srclib/apr/test/testutil.h b/srclib/apr/test/testutil.h
index 6d7639bc..ee68dfb0 100644
--- a/srclib/apr/test/testutil.h
+++ b/srclib/apr/test/testutil.h
@@ -21,6 +21,10 @@
 #ifndef APR_TEST_UTIL
 #define APR_TEST_UTIL
 
+/* XXX: FIXME - these all should become much more utilitarian 
+ * and part of apr, itself
+ */
+
 #ifdef WIN32
 #ifdef BINPATH
 #define TESTBINPATH APR_STRINGIFY(BINPATH) "/"
@@ -72,6 +76,7 @@ abts_suite *testglobalmutex(abts_suite *suite);
 abts_suite *testhash(abts_suite *suite);
 abts_suite *testipsub(abts_suite *suite);
 abts_suite *testlock(abts_suite *suite);
+abts_suite *testcond(abts_suite *suite);
 abts_suite *testlfs(abts_suite *suite);
 abts_suite *testmmap(abts_suite *suite);
 abts_suite *testnames(abts_suite *suite);
@@ -83,7 +88,6 @@ abts_suite *testpool(abts_suite *suite);
 abts_suite *testproc(abts_suite *suite);
 abts_suite *testprocmutex(abts_suite *suite);
 abts_suite *testrand(abts_suite *suite);
-abts_suite *testrand2(abts_suite *suite);
 abts_suite *testsleep(abts_suite *suite);
 abts_suite *testshm(abts_suite *suite);
 abts_suite *testsock(abts_suite *suite);
diff --git a/srclib/apr/threadproc/beos/proc.c b/srclib/apr/threadproc/beos/proc.c
index 7af73036..2623b70d 100644
--- a/srclib/apr/threadproc/beos/proc.c
+++ b/srclib/apr/threadproc/beos/proc.c
@@ -17,6 +17,11 @@
 #include "apr_arch_threadproc.h"
 #include "apr_strings.h"
 
+/* Heavy on no'ops, here's what we want to pass if there is APR_NO_FILE
+ * requested for a specific child handle;
+ */
+static apr_file_t no_file = { NULL, -1, };
+
 struct send_pipe {
 	int in;
 	int out;
@@ -44,70 +49,53 @@ APR_DECLARE(apr_status_t) apr_procattr_create(apr_procattr_t **new, apr_pool_t *
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr, apr_int32_t in, 
-                                              apr_int32_t out, apr_int32_t err)
+APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr,
+                                              apr_int32_t in,
+                                              apr_int32_t out,
+                                              apr_int32_t err)
 {
-    apr_status_t status;
-    if (in != 0) {
-        if ((status = apr_file_pipe_create(&attr->child_in, &attr->parent_in, 
-                                   attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
-        switch (in) {
-        case APR_FULL_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_in, -1);
-            apr_file_pipe_timeout_set(attr->parent_in, -1);
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_in, -1);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_in, -1);
-            break;
-        default:
-            break;
-        }
-    } 
-    if (out) {
-        if ((status = apr_file_pipe_create(&attr->parent_out, &attr->child_out, 
-                                   attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
-        switch (out) {
-        case APR_FULL_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_out, -1);
-            apr_file_pipe_timeout_set(attr->parent_out, -1);       
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_out, -1);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_out, -1);
-            break;
-        default:
-            break;
-        }
-    } 
-    if (err) {
-        if ((status = apr_file_pipe_create(&attr->parent_err, &attr->child_err, 
-                                   attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
-        switch (err) {
-        case APR_FULL_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_err, -1);
-            apr_file_pipe_timeout_set(attr->parent_err, -1);
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_err, -1);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_err, -1);
-            break;
-        default:
-            break;
-        }
-    } 
+    apr_status_t rv;
+
+    if ((in != APR_NO_PIPE) && (in != APR_NO_FILE)) {
+        /* APR_CHILD_BLOCK maps to APR_WRITE_BLOCK, while
+         * APR_PARENT_BLOCK maps to APR_READ_BLOCK, so transpose 
+         * the CHILD/PARENT blocking flags for the stdin pipe.
+         * stdout/stderr map to the correct mode by default.
+         */
+        if (in == APR_CHILD_BLOCK)
+            in = APR_READ_BLOCK;
+        else if (in == APR_PARENT_BLOCK)
+            in = APR_WRITE_BLOCK;
+
+        if ((rv = apr_file_pipe_create_ex(&attr->child_in, &attr->parent_in,
+                                          in, attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_in);
+        if (rv != APR_SUCCESS)
+            return rv;
+    }
+    else if (in == APR_NO_FILE)
+        attr->child_in = &no_file;
+
+    if ((out != APR_NO_PIPE) && (out != APR_NO_FILE)) {
+        if ((rv = apr_file_pipe_create_ex(&attr->parent_out, &attr->child_out,
+                                          out, attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_out);
+        if (rv != APR_SUCCESS)
+            return rv;
+    }
+    else if (out == APR_NO_FILE)
+        attr->child_out = &no_file;
+
+    if ((err != APR_NO_PIPE) && (err != APR_NO_FILE)) {
+        if ((rv = apr_file_pipe_create_ex(&attr->parent_err, &attr->child_err,
+                                          err, attr->pool)) != APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_err);
+        if (rv != APR_SUCCESS)
+            return rv;
+    }
+    else if (err == APR_NO_FILE)
+        attr->child_err = &no_file;
+
     return APR_SUCCESS;
 }
 
@@ -233,9 +221,9 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new, const char *progname,
     new->in = attr->parent_in;
     new->err = attr->parent_err;
     new->out = attr->parent_out;
-	sp->in  = attr->child_in  ? attr->child_in->filedes  : -1;
-	sp->out = attr->child_out ? attr->child_out->filedes : -1;
-	sp->err = attr->child_err ? attr->child_err->filedes : -1;
+    sp->in  = attr->child_in  ? attr->child_in->filedes  : FILENO_STDIN;
+    sp->out = attr->child_out ? attr->child_out->filedes : FILENO_STDOUT;
+    sp->err = attr->child_err ? attr->child_err->filedes : FILENO_STDERR;
 
     i = 0;
     while (args && args[i]) {
@@ -277,13 +265,13 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new, const char *progname,
 
     resume_thread(newproc);
 
-    if (attr->child_in) {
+    if (attr->child_in && (attr->child_in->filedes != -1)) {
         apr_file_close(attr->child_in);
     }
-    if (attr->child_out) {
+    if (attr->child_out && (attr->child_in->filedes != -1)) {
         apr_file_close(attr->child_out);
     }
-    if (attr->child_err) {
+    if (attr->child_err && (attr->child_in->filedes != -1)) {
         apr_file_close(attr->child_err);
     }
 
@@ -357,46 +345,84 @@ APR_DECLARE(apr_status_t) apr_proc_wait(apr_proc_t *proc,
 APR_DECLARE(apr_status_t) apr_procattr_child_in_set(apr_procattr_t *attr, apr_file_t *child_in,
                                    apr_file_t *parent_in)
 {
-    if (attr->child_in == NULL && attr->parent_in == NULL)
-        apr_file_pipe_create(&attr->child_in, &attr->parent_in, attr->pool);
+    apr_status_t rv;
 
-    if (child_in != NULL)
-        apr_file_dup(&attr->child_in, child_in, attr->pool);
+    if (attr->child_in == NULL && attr->parent_in == NULL
+            && child_in == NULL && parent_in == NULL)
+        if ((rv = apr_file_pipe_create(&attr->child_in, &attr->parent_in,
+                                       attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_in);
 
-    if (parent_in != NULL)
-        apr_file_dup(&attr->parent_in, parent_in, attr->pool);
+    if (child_in != NULL && rv == APR_SUCCESS) {
+        if (attr->child_in && (attr->child_in->filedes != -1))
+            rv = apr_file_dup2(attr->child_in, child_in, attr->pool);
+        else {
+            attr->child_in = NULL;
+            if ((rv = apr_file_dup(&attr->child_in, child_in, attr->pool))
+                    == APR_SUCCESS)
+                rv = apr_file_inherit_set(attr->child_in);
+        }
 
-    return APR_SUCCESS;
+    if (parent_in != NULL && rv == APR_SUCCESS) {
+        rv = apr_file_dup(&attr->parent_in, parent_in, attr->pool);
+
+    return rv;
 }
 
 APR_DECLARE(apr_status_t) apr_procattr_child_out_set(apr_procattr_t *attr, apr_file_t *child_out,
                                                      apr_file_t *parent_out)
 {
-    if (attr->child_out == NULL && attr->parent_out == NULL)
-        apr_file_pipe_create(&attr->child_out, &attr->parent_out, attr->pool);
+    apr_status_t rv;
 
-    if (child_out != NULL)
-        apr_file_dup(&attr->child_out, child_out, attr->pool);
+    if (attr->child_out == NULL && attr->parent_out == NULL
+           && child_out == NULL && parent_out == NULL)
+        if ((rv = apr_file_pipe_create(&attr->parent_out, &attr->child_out,
+                                       attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_out);
 
-    if (parent_out != NULL)
-        apr_file_dup(&attr->parent_out, parent_out, attr->pool);
+    if (child_out != NULL && rv == APR_SUCCESS) {
+        if (attr->child_out && (attr->child_out->filedes != -1))
+            rv = apr_file_dup2(attr->child_out, child_out, attr->pool);
+        else {
+            attr->child_out = NULL;
+            if ((rv = apr_file_dup(&attr->child_out, child_out, attr->pool))
+                    == APR_SUCCESS)
+                rv = apr_file_inherit_set(attr->child_out);
+        }
+    }
+  
+    if (parent_out != NULL && rv == APR_SUCCESS) {
+        rv = apr_file_dup(&attr->parent_out, parent_out, attr->pool);
 
-    return APR_SUCCESS;
+    return rv;
 }
 
 APR_DECLARE(apr_status_t) apr_procattr_child_err_set(apr_procattr_t *attr, apr_file_t *child_err,
                                                      apr_file_t *parent_err)
 {
-    if (attr->child_err == NULL && attr->parent_err == NULL)
-        apr_file_pipe_create(&attr->child_err, &attr->parent_err, attr->pool);
+    apr_status_t rv;
 
-    if (child_err != NULL)
-        apr_file_dup(&attr->child_err, child_err, attr->pool);
+    if (attr->child_err == NULL && attr->parent_err == NULL
+           && child_err == NULL && parent_err == NULL)
+        if ((rv = apr_file_pipe_create(&attr->parent_err, &attr->child_err,
+                                       attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_err);
 
-    if (parent_err != NULL)
-        apr_file_dup(&attr->parent_err, parent_err, attr->pool);
+    if (child_err != NULL && rv == APR_SUCCESS) {
+        if (attr->child_err && (attr->child_err->filedes != -1))
+            rv = apr_file_dup2(attr->child_err, child_err, attr->pool);
+        else {
+            attr->child_err = NULL;
+            if ((rv = apr_file_dup(&attr->child_err, child_err, attr->pool))
+                    == APR_SUCCESS)
+                rv = apr_file_inherit_set(attr->child_err);
+        }
+    }
+  
+    if (parent_err != NULL && rv == APR_SUCCESS) {
+        rv = apr_file_dup(&attr->parent_err, parent_err, attr->pool);
 
-    return APR_SUCCESS;
+    return rv;
 }
 
 APR_DECLARE(apr_status_t) apr_procattr_limit_set(apr_procattr_t *attr, apr_int32_t what, 
diff --git a/srclib/apr/threadproc/beos/thread.c b/srclib/apr/threadproc/beos/thread.c
index 629c86de..8d838394 100644
--- a/srclib/apr/threadproc/beos/thread.c
+++ b/srclib/apr/threadproc/beos/thread.c
@@ -80,7 +80,6 @@ APR_DECLARE(apr_status_t) apr_thread_create(apr_thread_t **new, apr_threadattr_t
         return APR_ENOMEM;
     }
 
-    (*new)->pool = pool;
     (*new)->data = data;
     (*new)->func = func;
     (*new)->exitval = -1;
diff --git a/srclib/apr/threadproc/netware/proc.c b/srclib/apr/threadproc/netware/proc.c
index 0f707769..5fb26913 100644
--- a/srclib/apr/threadproc/netware/proc.c
+++ b/srclib/apr/threadproc/netware/proc.c
@@ -21,6 +21,11 @@
 
 #include <proc.h>
 
+/* Heavy on no'ops, here's what we want to pass if there is APR_NO_FILE
+ * requested for a specific child handle;
+ */
+static apr_file_t no_file = { NULL, -1, };
+
 apr_status_t apr_netware_proc_cleanup(void *theproc)
 {
     apr_proc_t *proc = theproc;
@@ -51,67 +56,53 @@ APR_DECLARE(apr_status_t) apr_procattr_create(apr_procattr_t **new,apr_pool_t *p
 
 }
 
-APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr, apr_int32_t in, 
-                                 apr_int32_t out, apr_int32_t err)
+APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr,
+                                              apr_int32_t in,
+                                              apr_int32_t out,
+                                              apr_int32_t err)
 {
-    apr_status_t status;
-    if (in != 0) {
-        if ((status = apr_file_pipe_create(&attr->child_in, &attr->parent_in, 
-                                   attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
-        switch (in) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_in, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_in, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_in, 0);
-            apr_file_pipe_timeout_set(attr->parent_in, 0);
-        }
-    } 
-    if (out) {
-        if ((status = apr_file_pipe_create(&attr->parent_out, &attr->child_out, 
-                                   attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
-        switch (out) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_out, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_out, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_out, 0);
-            apr_file_pipe_timeout_set(attr->parent_out, 0);
-        }
-    } 
-    if (err) {
-        if ((status = apr_file_pipe_create(&attr->parent_err, &attr->child_err, 
-                                   attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
-        switch (err) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_err, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_err, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_err, 0);
-            apr_file_pipe_timeout_set(attr->parent_err, 0);
-        }
-    } 
+    apr_status_t rv;
+
+    if ((in != APR_NO_PIPE) && (in != APR_NO_FILE)) {
+        /* APR_CHILD_BLOCK maps to APR_WRITE_BLOCK, while
+         * APR_PARENT_BLOCK maps to APR_READ_BLOCK, so transpose 
+         * the CHILD/PARENT blocking flags for the stdin pipe.
+         * stdout/stderr map to the correct mode by default.
+         */
+        if (in == APR_CHILD_BLOCK)
+            in = APR_READ_BLOCK;
+        else if (in == APR_PARENT_BLOCK)
+            in = APR_WRITE_BLOCK;
+
+        if ((rv = apr_file_pipe_create_ex(&attr->child_in, &attr->parent_in,
+                                          in, attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_in);
+        if (rv != APR_SUCCESS)
+            return rv;
+    }
+    else if (in == APR_NO_FILE)
+        attr->child_in = &no_file;
+
+    if ((out != APR_NO_PIPE) && (out != APR_NO_FILE)) {
+        if ((rv = apr_file_pipe_create_ex(&attr->parent_out, &attr->child_out,
+                                          out, attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_out);
+        if (rv != APR_SUCCESS)
+            return rv;
+    }
+    else if (out == APR_NO_FILE)
+        attr->child_out = &no_file;
+
+    if ((err != APR_NO_PIPE) && (err != APR_NO_FILE)) {
+        if ((rv = apr_file_pipe_create_ex(&attr->parent_err, &attr->child_err,
+                                          err, attr->pool)) != APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_err);
+        if (rv != APR_SUCCESS)
+            return rv;
+    }
+    else if (err == APR_NO_FILE)
+        attr->child_err = &no_file;
+
     return APR_SUCCESS;
 }
 
@@ -119,48 +110,90 @@ APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr, apr_int32_t
 APR_DECLARE(apr_status_t) apr_procattr_child_in_set(apr_procattr_t *attr, apr_file_t *child_in,
                                    apr_file_t *parent_in)
 {
-    if (attr->child_in == NULL && attr->parent_in == NULL)
-        apr_file_pipe_create(&attr->child_in, &attr->parent_in, attr->pool);
+    apr_status_t rv = APR_SUCCESS;
 
-    if (child_in != NULL)
-        apr_file_dup2(attr->child_in, child_in, attr->pool);
+    if (attr->child_in == NULL && attr->parent_in == NULL
+            && child_in == NULL && parent_in == NULL)
+        if ((rv = apr_file_pipe_create(&attr->child_in, &attr->parent_in,
+                                       attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_in);
 
-    if (parent_in != NULL)
-        apr_file_dup2(attr->parent_in, parent_in, attr->pool);
+    if (child_in != NULL && rv == APR_SUCCESS) {
+        if (attr->child_in && (attr->child_in->filedes != -1))
+            rv = apr_file_dup2(attr->child_in, child_in, attr->pool);
+        else {
+            attr->child_in = NULL;
+            if ((rv = apr_file_dup(&attr->child_in, child_in, attr->pool))
+                    == APR_SUCCESS)
+                rv = apr_file_inherit_set(attr->child_in);
+        }
+    }
 
-    return APR_SUCCESS;
+    if (parent_in != NULL && rv == APR_SUCCESS) {
+        rv = apr_file_dup(&attr->parent_in, parent_in, attr->pool);
+    }
+
+    return rv;
 }
 
 
 APR_DECLARE(apr_status_t) apr_procattr_child_out_set(apr_procattr_t *attr, apr_file_t *child_out,
-                                    apr_file_t *parent_out)
+                                                     apr_file_t *parent_out)
 {
-    if (attr->child_out == NULL && attr->parent_out == NULL)
-        apr_file_pipe_create(&attr->child_out, &attr->parent_out, attr->pool);
+    apr_status_t rv = APR_SUCCESS;
 
-    if (child_out != NULL)
-        apr_file_dup2(attr->child_out, child_out, attr->pool);
+    if (attr->child_out == NULL && attr->parent_out == NULL
+           && child_out == NULL && parent_out == NULL)
+        if ((rv = apr_file_pipe_create(&attr->parent_out, &attr->child_out,
+                                       attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_out);
 
-    if (parent_out != NULL)
-        apr_file_dup2(attr->parent_out, parent_out, attr->pool);
+    if (child_out != NULL && rv == APR_SUCCESS) {
+        if (attr->child_out && (attr->child_out->filedes != -1))
+            rv = apr_file_dup2(attr->child_out, child_out, attr->pool);
+        else {
+            attr->child_out = NULL;
+            if ((rv = apr_file_dup(&attr->child_out, child_out, attr->pool))
+                    == APR_SUCCESS)
+                rv = apr_file_inherit_set(attr->child_out);
+        }
+    }
+  
+    if (parent_out != NULL && rv == APR_SUCCESS) {
+        rv = apr_file_dup(&attr->parent_out, parent_out, attr->pool);
+    }
 
-    return APR_SUCCESS;
+    return rv;
 }
 
 
 APR_DECLARE(apr_status_t) apr_procattr_child_err_set(apr_procattr_t *attr, apr_file_t *child_err,
-                                   apr_file_t *parent_err)
+                                                     apr_file_t *parent_err)
 {
-    if (attr->child_err == NULL && attr->parent_err == NULL)
-        apr_file_pipe_create(&attr->child_err, &attr->parent_err, attr->pool);
+    apr_status_t rv = APR_SUCCESS;
 
-    if (child_err != NULL)
-        apr_file_dup2(attr->child_err, child_err, attr->pool);
+    if (attr->child_err == NULL && attr->parent_err == NULL
+           && child_err == NULL && parent_err == NULL)
+        if ((rv = apr_file_pipe_create(&attr->parent_err, &attr->child_err,
+                                       attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_err);
 
-    if (parent_err != NULL)
-        apr_file_dup2(attr->parent_err, parent_err, attr->pool);
+    if (child_err != NULL && rv == APR_SUCCESS) {
+        if (attr->child_err && (attr->child_err->filedes != -1))
+            rv = apr_file_dup2(attr->child_err, child_err, attr->pool);
+        else {
+            attr->child_err = NULL;
+            if ((rv = apr_file_dup(&attr->child_err, child_err, attr->pool))
+                    == APR_SUCCESS)
+                rv = apr_file_inherit_set(attr->child_err);
+        }
+    }
+  
+    if (parent_err != NULL && rv == APR_SUCCESS) {
+        rv = apr_file_dup(&attr->parent_err, parent_err, attr->pool);
+    }
 
-    return APR_SUCCESS;
+    return rv;
 }
 
 
@@ -280,12 +313,21 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *newproc,
                               		apr_procattr_t *attr, 
                               		apr_pool_t *pool)
 {
-	wiring_t		wire;
-    int             addr_space;
-
-    wire.infd  = attr->child_in ? attr->child_in->filedes : FD_UNUSED;
-    wire.outfd = attr->child_out ? attr->child_out->filedes : FD_UNUSED;
-    wire.errfd = attr->child_err ? attr->child_err->filedes : FD_UNUSED;
+    wiring_t wire;
+    int      addr_space;
+
+    wire.infd  = attr->child_in  
+               ? (attr->child_in->filedes != -1 ? attr->child_in->filedes 
+                                                : FD_UNUSED)
+               : fileno(stdin);
+    wire.outfd  = attr->child_out
+                ? (attr->child_out->filedes != -1 ? attr->child_out->filedes 
+                                                  : FD_UNUSED)
+                : fileno(stdout);
+    wire.errfd  = attr->child_err
+                ? (attr->child_err->filedes != -1 ? attr->child_err->filedes 
+                                                  : FD_UNUSED)
+                : fileno(stderr);
 
     newproc->in = attr->parent_in;
     newproc->out = attr->parent_out;
@@ -313,23 +355,22 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *newproc,
         return errno;
     }
 
-    if (attr->child_in) {
+    if (attr->child_in && (attr->child_in->filedes != -1)) {
         apr_pool_cleanup_kill(apr_file_pool_get(attr->child_in), 
                               attr->child_in, apr_unix_file_cleanup);
         apr_file_close(attr->child_in);
     }
-    if (attr->child_out) {
+    if (attr->child_out && (attr->child_out->filedes != -1)) {
         apr_pool_cleanup_kill(apr_file_pool_get(attr->child_out), 
                               attr->child_out, apr_unix_file_cleanup);
         apr_file_close(attr->child_out);
     }
-    if (attr->child_err) {
+    if (attr->child_err && (attr->child_err->filedes != -1)) {
         apr_pool_cleanup_kill(apr_file_pool_get(attr->child_err), 
                               attr->child_err, apr_unix_file_cleanup);
         apr_file_close(attr->child_err);
     }
 
-
     apr_pool_cleanup_register(pool, (void *)newproc, apr_netware_proc_cleanup,
         apr_pool_cleanup_null);
 
diff --git a/srclib/apr/threadproc/netware/thread.c b/srclib/apr/threadproc/netware/thread.c
index dcf4993d..4b5d930a 100644
--- a/srclib/apr/threadproc/netware/thread.c
+++ b/srclib/apr/threadproc/netware/thread.c
@@ -103,7 +103,6 @@ apr_status_t apr_thread_create(apr_thread_t **new,
         return APR_ENOMEM;
     }
     
-    (*new)->pool = pool;
     (*new)->data = data;
     (*new)->func = func;
     (*new)->thread_name = (char*)apr_pstrdup(pool, threadName);
diff --git a/srclib/apr/threadproc/os2/proc.c b/srclib/apr/threadproc/os2/proc.c
index 20dfffb8..8e4a4a3b 100644
--- a/srclib/apr/threadproc/os2/proc.c
+++ b/srclib/apr/threadproc/os2/proc.c
@@ -34,6 +34,11 @@
 #include <process.h>
 #include <stdlib.h>
 
+/* Heavy on no'ops, here's what we want to pass if there is APR_NO_FILE
+ * requested for a specific child handle;
+ */
+static apr_file_t no_file = { NULL, -1, };
+
 APR_DECLARE(apr_status_t) apr_procattr_create(apr_procattr_t **new, apr_pool_t *pool)
 {
     (*new) = (apr_procattr_t *)apr_palloc(pool, 
@@ -55,118 +60,143 @@ APR_DECLARE(apr_status_t) apr_procattr_create(apr_procattr_t **new, apr_pool_t *
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr, apr_int32_t in, 
-                                              apr_int32_t out, apr_int32_t err)
+APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr,
+                                              apr_int32_t in,
+                                              apr_int32_t out,
+                                              apr_int32_t err)
 {
-    apr_status_t stat;
-    if (in) {
-        if ((stat = apr_file_pipe_create(&attr->child_in, &attr->parent_in,
-                                   attr->pool)) != APR_SUCCESS) {
-            return stat;
-        }
-        switch (in) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_in, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_in, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_in, 0);
-            apr_file_pipe_timeout_set(attr->parent_in, 0);
-        }
-    } 
-    if (out) {
-        if ((stat = apr_file_pipe_create(&attr->parent_out, &attr->child_out,
-                                   attr->pool)) != APR_SUCCESS) {
-            return stat;
-        }
-        switch (out) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_out, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_out, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_out, 0);
-            apr_file_pipe_timeout_set(attr->parent_out, 0);
-        }
-    } 
-    if (err) {
-        if ((stat = apr_file_pipe_create(&attr->parent_err, &attr->child_err,
-                                   attr->pool)) != APR_SUCCESS) {
-            return stat;
-        }
-        switch (err) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_err, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_err, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_err, 0);
-            apr_file_pipe_timeout_set(attr->parent_err, 0);
-        }
-    } 
+    apr_status_t rv;
+
+    if ((in != APR_NO_PIPE) && (in != APR_NO_FILE)) {
+        /* APR_CHILD_BLOCK maps to APR_WRITE_BLOCK, while
+         * APR_PARENT_BLOCK maps to APR_READ_BLOCK, so transpose 
+         * the CHILD/PARENT blocking flags for the stdin pipe.
+         * stdout/stderr map to the correct mode by default.
+         */
+        if (in == APR_CHILD_BLOCK)
+            in = APR_READ_BLOCK;
+        else if (in == APR_PARENT_BLOCK)
+            in = APR_WRITE_BLOCK;
+
+        if ((rv = apr_file_pipe_create_ex(&attr->child_in, &attr->parent_in,
+                                          in, attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_in);
+        if (rv != APR_SUCCESS)
+            return rv;
+    }
+    else if (in == APR_NO_FILE)
+        attr->child_in = &no_file;
+
+    if ((out != APR_NO_PIPE) && (out != APR_NO_FILE)) {
+        if ((rv = apr_file_pipe_create_ex(&attr->parent_out, &attr->child_out,
+                                          out, attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_out);
+        if (rv != APR_SUCCESS)
+            return rv;
+    }
+    else if (out == APR_NO_FILE)
+        attr->child_out = &no_file;
+
+    if ((err != APR_NO_PIPE) && (err != APR_NO_FILE)) {
+        if ((rv = apr_file_pipe_create_ex(&attr->parent_err, &attr->child_err,
+                                          err, attr->pool)) != APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_err);
+        if (rv != APR_SUCCESS)
+            return rv;
+    }
+    else if (err == APR_NO_FILE)
+        attr->child_err = &no_file;
+
     return APR_SUCCESS;
 }
 
 APR_DECLARE(apr_status_t) apr_procattr_child_in_set(apr_procattr_t *attr, apr_file_t *child_in,
-                                                    apr_file_t *parent_in)
+                                   apr_file_t *parent_in)
 {
-    if (attr->child_in == NULL && attr->parent_in == NULL)
-        apr_file_pipe_create(&attr->child_in, &attr->parent_in, attr->pool);
-
-    if (child_in != NULL)
-        apr_file_dup(&attr->child_in, child_in, attr->pool);
+    apr_status_t rv;
+
+    if (attr->child_in == NULL && attr->parent_in == NULL
+            && child_in == NULL && parent_in == NULL)
+        if ((rv = apr_file_pipe_create(&attr->child_in, &attr->parent_in,
+                                       attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_in);
+
+    if (child_in != NULL && rv == APR_SUCCESS) {
+        if (attr->child_in && (attr->child_in->filedes != -1))
+            rv = apr_file_dup2(attr->child_in, child_in, attr->pool);
+        else {
+            attr->child_in = NULL;
+            if ((rv = apr_file_dup(&attr->child_in, child_in, attr->pool))
+                    == APR_SUCCESS)
+                rv = apr_file_inherit_set(attr->child_in);
+        }
+    }
 
-    if (parent_in != NULL)
-        apr_file_dup(&attr->parent_in, parent_in, attr->pool);
+    if (parent_in != NULL && rv == APR_SUCCESS) {
+        rv = apr_file_dup(&attr->parent_in, parent_in, attr->pool);
+    }
 
-    return APR_SUCCESS;
+    return rv;
 }
 
-
 APR_DECLARE(apr_status_t) apr_procattr_child_out_set(apr_procattr_t *attr, apr_file_t *child_out,
                                                      apr_file_t *parent_out)
 {
-    if (attr->child_out == NULL && attr->parent_out == NULL)
-        apr_file_pipe_create(&attr->child_out, &attr->parent_out, attr->pool);
-
-    if (child_out != NULL)
-        apr_file_dup(&attr->child_out, child_out, attr->pool);
-
-    if (parent_out != NULL)
-        apr_file_dup(&attr->parent_out, parent_out, attr->pool);
+    apr_status_t rv;
+
+    if (attr->child_out == NULL && attr->parent_out == NULL
+           && child_out == NULL && parent_out == NULL)
+        if ((rv = apr_file_pipe_create(&attr->parent_out, &attr->child_out,
+                                       attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_out);
+
+    if (child_out != NULL && rv == APR_SUCCESS) {
+        if (attr->child_out && (attr->child_out->filedes != -1))
+            rv = apr_file_dup2(attr->child_out, child_out, attr->pool);
+        else {
+            attr->child_out = NULL;
+            if ((rv = apr_file_dup(&attr->child_out, child_out, attr->pool))
+                    == APR_SUCCESS)
+                rv = apr_file_inherit_set(attr->child_out);
+        }
+    }
+  
+    if (parent_out != NULL && rv == APR_SUCCESS) {
+        rv = apr_file_dup(&attr->parent_out, parent_out, attr->pool);
+    }
 
-    return APR_SUCCESS;
+    return rv;
 }
 
-
 APR_DECLARE(apr_status_t) apr_procattr_child_err_set(apr_procattr_t *attr, apr_file_t *child_err,
                                                      apr_file_t *parent_err)
 {
-    if (attr->child_err == NULL && attr->parent_err == NULL)
-        apr_file_pipe_create(&attr->child_err, &attr->parent_err, attr->pool);
-
-    if (child_err != NULL)
-        apr_file_dup(&attr->child_err, child_err, attr->pool);
-
-    if (parent_err != NULL)
-        apr_file_dup(&attr->parent_err, parent_err, attr->pool);
+    apr_status_t rv;
+
+    if (attr->child_err == NULL && attr->parent_err == NULL
+           && child_err == NULL && parent_err == NULL)
+        if ((rv = apr_file_pipe_create(&attr->parent_err, &attr->child_err,
+                                       attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_err);
+
+    if (child_err != NULL && rv == APR_SUCCESS) {
+        if (attr->child_err && (attr->child_err->filedes != -1))
+            rv = apr_file_dup2(attr->child_err, child_err, attr->pool);
+        else {
+            attr->child_err = NULL;
+            if ((rv = apr_file_dup(&attr->child_err, child_err, attr->pool))
+                    == APR_SUCCESS)
+                rv = apr_file_inherit_set(attr->child_err);
+        }
+    }
+  
+    if (parent_err != NULL && rv == APR_SUCCESS) {
+        rv = apr_file_dup(&attr->parent_err, parent_err, attr->pool);
+    }
 
-    return APR_SUCCESS;
+    return rv;
 }
 
-
 APR_DECLARE(apr_status_t) apr_procattr_dir_set(apr_procattr_t *attr, const char *dir)
 {
     attr->currdir = apr_pstrdup(attr->pool, dir);
@@ -284,6 +314,10 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *proc, const char *progname
     char *env_block, *env_block_pos;
     RESULTCODES rescodes;
 
+    proc->in = attr->parent_in;
+    proc->err = attr->parent_err;
+    proc->out = attr->parent_out;
+
     /* Prevent other threads from running while these process-wide resources are modified */
     if (attr->child_in || attr->child_out || attr->child_err || attr->currdir) {
         criticalsection = TRUE;
@@ -294,24 +328,30 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *proc, const char *progname
         save_in = -1;
         DosDupHandle(STDIN_FILENO, &save_in);
         dup = STDIN_FILENO;
-        DosDupHandle(attr->child_in->filedes, &dup);
-        DosSetFHState(attr->parent_in->filedes, OPEN_FLAGS_NOINHERIT);
+        if (attr->child_in->filedes == -1)
+            DosClose(dup);
+        else
+            DosDupHandle(attr->child_in->filedes, &dup);
     }
     
     if (attr->child_out) {
         save_out = -1;
         DosDupHandle(STDOUT_FILENO, &save_out);
         dup = STDOUT_FILENO;
-        DosDupHandle(attr->child_out->filedes, &dup);
-        DosSetFHState(attr->parent_out->filedes, OPEN_FLAGS_NOINHERIT);
+        if (attr->child_out->filedes == -1)
+            DosClose(dup);
+        else
+            DosDupHandle(attr->child_out->filedes, &dup);
     }
     
     if (attr->child_err) {
         save_err = -1;
         DosDupHandle(STDERR_FILENO, &save_err);
         dup = STDERR_FILENO;
-        DosDupHandle(attr->child_err->filedes, &dup);
-        DosSetFHState(attr->parent_err->filedes, OPEN_FLAGS_NOINHERIT);
+        if (attr->child_err->filedes == -1)
+            DosClose(dup);
+        else
+            DosDupHandle(attr->child_err->filedes, &dup);
     }
 
     apr_signal(SIGCHLD, SIG_DFL); /*not sure if this is needed or not */
@@ -464,21 +504,30 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *proc, const char *progname
     }
 
     if (attr->child_in) {
-        apr_file_close(attr->child_in);
+        if (attr->child_in->filedes != -1) {
+            apr_file_close(attr->child_in);
+        }
+
         dup = STDIN_FILENO;
         DosDupHandle(save_in, &dup);
         DosClose(save_in);
     }
     
     if (attr->child_out) {
-        apr_file_close(attr->child_out);
+        if  (attr->child_out->filedes != -1) {
+            apr_file_close(attr->child_out);
+        }
+
         dup = STDOUT_FILENO;
         DosDupHandle(save_out, &dup);
         DosClose(save_out);
     }
     
     if (attr->child_err) {
-        apr_file_close(attr->child_err);
+        if (attr->child_err->filedes != -1) {
+            apr_file_close(attr->child_err);
+        }
+
         dup = STDERR_FILENO;
         DosDupHandle(save_err, &dup);
         DosClose(save_err);
@@ -487,9 +536,6 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *proc, const char *progname
     if (criticalsection)
         DosExitCritSec();
 
-    proc->in = attr->parent_in;
-    proc->err = attr->parent_err;
-    proc->out = attr->parent_out;
     return status;
 }
 
diff --git a/srclib/apr/threadproc/os2/thread.c b/srclib/apr/threadproc/os2/thread.c
index c1c35219..00ec4eb5 100644
--- a/srclib/apr/threadproc/os2/thread.c
+++ b/srclib/apr/threadproc/os2/thread.c
@@ -88,7 +88,6 @@ APR_DECLARE(apr_status_t) apr_thread_create(apr_thread_t **new, apr_threadattr_t
         return APR_ENOMEM;
     }
 
-    thread->pool = pool;
     thread->attr = attr;
     thread->func = func;
     thread->data = data;
diff --git a/srclib/apr/threadproc/unix/proc.c b/srclib/apr/threadproc/unix/proc.c
index bf743527..d0754013 100644
--- a/srclib/apr/threadproc/unix/proc.c
+++ b/srclib/apr/threadproc/unix/proc.c
@@ -20,6 +20,11 @@
 #include "apr_signal.h"
 #include "apr_random.h"
 
+/* Heavy on no'ops, here's what we want to pass if there is APR_NO_FILE
+ * requested for a specific child handle;
+ */
+static apr_file_t no_file = { NULL, -1, };
+
 APR_DECLARE(apr_status_t) apr_procattr_create(apr_procattr_t **new,
                                               apr_pool_t *pool)
 {
@@ -39,69 +44,47 @@ APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr,
                                               apr_int32_t out,
                                               apr_int32_t err)
 {
-    apr_status_t status;
-    if (in != 0) {
-        if ((status = apr_file_pipe_create(&attr->child_in, &attr->parent_in,
-                                           attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
+    apr_status_t rv;
 
-        switch (in) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_in, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_in, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_in, 0);
-            apr_file_pipe_timeout_set(attr->parent_in, 0);
-        }
+    if ((in != APR_NO_PIPE) && (in != APR_NO_FILE)) {
+        /* APR_CHILD_BLOCK maps to APR_WRITE_BLOCK, while
+         * APR_PARENT_BLOCK maps to APR_READ_BLOCK, so transpose 
+         * the CHILD/PARENT blocking flags for the stdin pipe.
+         * stdout/stderr map to the correct mode by default.
+         */
+        if (in == APR_CHILD_BLOCK)
+            in = APR_READ_BLOCK;
+        else if (in == APR_PARENT_BLOCK)
+            in = APR_WRITE_BLOCK;
+
+        if ((rv = apr_file_pipe_create_ex(&attr->child_in, &attr->parent_in,
+                                          in, attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_in);
+        if (rv != APR_SUCCESS)
+            return rv;
     }
-
-    if (out) {
-        if ((status = apr_file_pipe_create(&attr->parent_out, &attr->child_out,
-                                           attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
-
-        switch (out) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_out, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_out, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_out, 0);
-            apr_file_pipe_timeout_set(attr->parent_out, 0);
-        }
+    else if (in == APR_NO_FILE)
+        attr->child_in = &no_file;
+
+    if ((out != APR_NO_PIPE) && (out != APR_NO_FILE)) {
+        if ((rv = apr_file_pipe_create_ex(&attr->parent_out, &attr->child_out,
+                                          out, attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_out);
+        if (rv != APR_SUCCESS)
+            return rv;
     }
-
-    if (err) {
-        if ((status = apr_file_pipe_create(&attr->parent_err, &attr->child_err,
-                                           attr->pool)) != APR_SUCCESS) {
-            return status;
-        }
-
-        switch (err) {
-        case APR_FULL_BLOCK:
-            break;
-        case APR_PARENT_BLOCK:
-            apr_file_pipe_timeout_set(attr->child_err, 0);
-            break;
-        case APR_CHILD_BLOCK:
-            apr_file_pipe_timeout_set(attr->parent_err, 0);
-            break;
-        default:
-            apr_file_pipe_timeout_set(attr->child_err, 0);
-            apr_file_pipe_timeout_set(attr->parent_err, 0);
-        }
+    else if (out == APR_NO_FILE)
+        attr->child_out = &no_file;
+
+    if ((err != APR_NO_PIPE) && (err != APR_NO_FILE)) {
+        if ((rv = apr_file_pipe_create_ex(&attr->parent_err, &attr->child_err,
+                                          err, attr->pool)) != APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_err);
+        if (rv != APR_SUCCESS)
+            return rv;
     }
+    else if (err == APR_NO_FILE)
+        attr->child_err = &no_file;
 
     return APR_SUCCESS;
 }
@@ -113,14 +96,29 @@ APR_DECLARE(apr_status_t) apr_procattr_child_in_set(apr_procattr_t *attr,
 {
     apr_status_t rv = APR_SUCCESS;
 
-    if (attr->child_in == NULL && attr->parent_in == NULL)
-        rv = apr_file_pipe_create(&attr->child_in, &attr->parent_in, attr->pool);
-    
-    if (child_in != NULL && rv == APR_SUCCESS)
-        rv = apr_file_dup2(attr->child_in, child_in, attr->pool);
+    if (attr->child_in == NULL && attr->parent_in == NULL
+           && child_in == NULL && parent_in == NULL)
+        if ((rv = apr_file_pipe_create(&attr->child_in, &attr->parent_in,
+                                       attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_in);
 
-    if (parent_in != NULL && rv == APR_SUCCESS)
-        rv = apr_file_dup2(attr->parent_in, parent_in, attr->pool);
+    if (child_in != NULL && rv == APR_SUCCESS) {
+        if (attr->child_in && (attr->child_in->filedes != -1))
+            rv = apr_file_dup2(attr->child_in, child_in, attr->pool);
+        else {
+            attr->child_in = NULL;
+            if ((rv = apr_file_dup(&attr->child_in, child_in, attr->pool))
+                    == APR_SUCCESS)
+                rv = apr_file_inherit_set(attr->child_in);
+        }
+    }
+
+    if (parent_in != NULL && rv == APR_SUCCESS) {
+        if (attr->parent_in)
+            rv = apr_file_dup2(attr->parent_in, parent_in, attr->pool);
+        else
+            rv = apr_file_dup(&attr->parent_in, parent_in, attr->pool);
+    }
 
     return rv;
 }
@@ -132,14 +130,29 @@ APR_DECLARE(apr_status_t) apr_procattr_child_out_set(apr_procattr_t *attr,
 {
     apr_status_t rv = APR_SUCCESS;
 
-    if (attr->child_out == NULL && attr->parent_out == NULL)
-        rv = apr_file_pipe_create(&attr->child_out, &attr->parent_out, attr->pool);
+    if (attr->child_out == NULL && attr->parent_out == NULL
+           && child_out == NULL && parent_out == NULL)
+        if ((rv = apr_file_pipe_create(&attr->parent_out, &attr->child_out,
+                                       attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_out);
 
-    if (child_out != NULL && rv == APR_SUCCESS)
-        rv = apr_file_dup2(attr->child_out, child_out, attr->pool);
+    if (child_out != NULL && rv == APR_SUCCESS) {
+        if (attr->child_out && (attr->child_out->filedes != -1))
+            rv = apr_file_dup2(attr->child_out, child_out, attr->pool);
+        else {
+            attr->child_out = NULL;
+            if ((rv = apr_file_dup(&attr->child_out, child_out, attr->pool))
+                    == APR_SUCCESS)
+                rv = apr_file_inherit_set(attr->child_out);
+        }
+    }
 
-    if (parent_out != NULL && rv == APR_SUCCESS)
-        rv = apr_file_dup2(attr->parent_out, parent_out, attr->pool);
+    if (parent_out != NULL && rv == APR_SUCCESS) {
+        if (attr->parent_out)
+            rv = apr_file_dup2(attr->parent_out, parent_out, attr->pool);
+        else
+            rv = apr_file_dup(&attr->parent_out, parent_out, attr->pool);
+    }
 
     return rv;
 }
@@ -151,14 +164,28 @@ APR_DECLARE(apr_status_t) apr_procattr_child_err_set(apr_procattr_t *attr,
 {
     apr_status_t rv = APR_SUCCESS;
 
-    if (attr->child_err == NULL && attr->parent_err == NULL)
-        rv = apr_file_pipe_create(&attr->child_err, &attr->parent_err, attr->pool);
+    if (attr->child_err == NULL && attr->parent_err == NULL
+           && child_err == NULL && parent_err == NULL)
+        if ((rv = apr_file_pipe_create(&attr->parent_err, &attr->child_err,
+                                      attr->pool)) == APR_SUCCESS)
+            rv = apr_file_inherit_unset(attr->parent_err);
 
-    if (child_err != NULL && rv == APR_SUCCESS)
-        rv = apr_file_dup2(attr->child_err, child_err, attr->pool);
-
-    if (parent_err != NULL && rv == APR_SUCCESS)
-        rv = apr_file_dup2(attr->parent_err, parent_err, attr->pool);
+    if (child_err != NULL && rv == APR_SUCCESS) {
+        if (attr->child_err && (attr->child_err->filedes != -1))
+            rv = apr_file_dup2(attr->child_err, child_err, attr->pool);
+        else {
+            attr->child_err = NULL;
+            if ((rv = apr_file_dup(&attr->child_err, child_err, attr->pool))
+                    == APR_SUCCESS)
+                rv = apr_file_inherit_set(attr->child_err);
+        }
+    }
+    if (parent_err != NULL && rv == APR_SUCCESS) {
+        if (attr->parent_err)
+            rv = apr_file_dup2(attr->parent_err, parent_err, attr->pool);
+        else
+            rv = apr_file_dup(&attr->parent_err, parent_err, attr->pool);
+    }
 
     return rv;
 }
@@ -355,7 +382,7 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
              * caller can choose to pass full path for other
              * values of cmdtype
              */
-            if (access(progname, R_OK|X_OK) == -1) {
+            if (access(progname, X_OK) == -1) {
                 /* exec*() in child wouldn't have worked */
                 return errno;
             }
@@ -402,20 +429,26 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
 
         apr_pool_cleanup_for_exec();
 
-        if (attr->child_in) {
-            apr_file_close(attr->parent_in);
+        if ((attr->child_in) && (attr->child_in->filedes == -1)) {
+            close(STDIN_FILENO);
+        }
+        else if (attr->child_in) {
             dup2(attr->child_in->filedes, STDIN_FILENO);
             apr_file_close(attr->child_in);
         }
 
-        if (attr->child_out) {
-            apr_file_close(attr->parent_out);
+        if ((attr->child_out) && (attr->child_out->filedes == -1)) {
+            close(STDOUT_FILENO);
+        }
+        else if (attr->child_out) {
             dup2(attr->child_out->filedes, STDOUT_FILENO);
             apr_file_close(attr->child_out);
         }
 
-        if (attr->child_err) {
-            apr_file_close(attr->parent_err);
+        if ((attr->child_err) && (attr->child_err->filedes == -1)) {
+            close(STDERR_FILENO);
+        }
+        else if (attr->child_err) {
             dup2(attr->child_err->filedes, STDERR_FILENO);
             apr_file_close(attr->child_err);
         }
@@ -551,15 +584,15 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
     }
 
     /* Parent process */
-    if (attr->child_in) {
+    if (attr->child_in && (attr->child_in->filedes != -1)) {
         apr_file_close(attr->child_in);
     }
 
-    if (attr->child_out) {
+    if (attr->child_out && (attr->child_out->filedes != -1)) {
         apr_file_close(attr->child_out);
     }
 
-    if (attr->child_err) {
+    if (attr->child_err && (attr->child_err->filedes != -1)) {
         apr_file_close(attr->child_err);
     }
 
diff --git a/srclib/apr/threadproc/unix/procsup.c b/srclib/apr/threadproc/unix/procsup.c
index caf13bfa..376baf21 100644
--- a/srclib/apr/threadproc/unix/procsup.c
+++ b/srclib/apr/threadproc/unix/procsup.c
@@ -28,15 +28,15 @@ APR_DECLARE(apr_status_t) apr_proc_detach(int daemonize)
     /* Don't detach for MPE because child processes can't survive the death of
      * the parent. */
     if (daemonize) {
-	    if ((x = fork()) > 0) {
-	        exit(0);
+        if ((x = fork()) > 0) {
+            exit(0);
         }
-	    else if (x == -1) {
-	        perror("fork");
-	        fprintf(stderr, "unable to fork new process\n");
-	        exit(1);  /* we can't do anything here, so just exit. */
-	    }
-	    /* RAISE_SIGSTOP(DETACH); */
+        else if (x == -1) {
+            perror("fork");
+            fprintf(stderr, "unable to fork new process\n");
+            exit(1);  /* we can't do anything here, so just exit. */
+        }
+        /* RAISE_SIGSTOP(DETACH); */
     }
 #endif
 
diff --git a/srclib/apr/threadproc/unix/signals.c b/srclib/apr/threadproc/unix/signals.c
index f44c3d78..57a31af9 100644
--- a/srclib/apr/threadproc/unix/signals.c
+++ b/srclib/apr/threadproc/unix/signals.c
@@ -116,7 +116,7 @@ void apr_signal_init(apr_pool_t *pglobal)
 }
 const char *apr_signal_description_get(int signum)
 {
-    return sys_siglist[signum];
+    return (signum >= 0) ? sys_siglist[signum] : "unknown signal (number)";
 }
 
 #else /* !(SYS_SIGLIST_DECLARED || HAVE_DECL_SYS_SIGLIST) */
@@ -262,7 +262,7 @@ void apr_signal_init(apr_pool_t *pglobal)
 const char *apr_signal_description_get(int signum)
 {
     return
-        signum < APR_NUMSIG
+        (signum >= 0 && signum < APR_NUMSIG)
         ? signal_description[signum]
         : "unknown signal (number)";
 }
@@ -422,7 +422,7 @@ APR_DECLARE(apr_status_t) apr_setup_signal_thread(void)
     }
 #else
     if ((rv = pthread_sigmask(SIG_SETMASK, &sig_mask, NULL)) != 0) {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
     }
@@ -448,7 +448,7 @@ APR_DECLARE(apr_status_t) apr_signal_block(int signum)
     }
 #else
     if ((rv = pthread_sigmask(SIG_BLOCK, &sig_mask, NULL)) != 0) {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
     }
@@ -475,7 +475,7 @@ APR_DECLARE(apr_status_t) apr_signal_unblock(int signum)
     }
 #else
     if ((rv = pthread_sigmask(SIG_UNBLOCK, &sig_mask, NULL)) != 0) {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         rv = errno;
 #endif
     }
diff --git a/srclib/apr/threadproc/unix/thread.c b/srclib/apr/threadproc/unix/thread.c
index 7e02572c..5639ac70 100644
--- a/srclib/apr/threadproc/unix/thread.c
+++ b/srclib/apr/threadproc/unix/thread.c
@@ -29,7 +29,7 @@ static apr_status_t threadattr_cleanup(void *data)
     apr_status_t rv;
 
     rv = pthread_attr_destroy(&attr->attr);
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     if (rv) {
         rv = errno;
     }
@@ -51,7 +51,7 @@ APR_DECLARE(apr_status_t) apr_threadattr_create(apr_threadattr_t **new,
                                   apr_pool_cleanup_null);
         return APR_SUCCESS;
     }
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     stat = errno;
 #endif
 
@@ -68,7 +68,7 @@ APR_DECLARE(apr_status_t) apr_threadattr_detach_set(apr_threadattr_t *attr,
                                                     apr_int32_t on)
 {
     apr_status_t stat;
-#ifdef PTHREAD_ATTR_SETDETACHSTATE_ARG2_ADDR
+#ifdef HAVE_ZOS_PTHREADS
     int arg = DETACH_ARG(on);
 
     if ((stat = pthread_attr_setdetachstate(&attr->attr, &arg)) == 0) {
@@ -79,7 +79,7 @@ APR_DECLARE(apr_status_t) apr_threadattr_detach_set(apr_threadattr_t *attr,
         return APR_SUCCESS;
     }
     else {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         stat = errno;
 #endif
 
@@ -110,7 +110,7 @@ APR_DECLARE(apr_status_t) apr_threadattr_stacksize_set(apr_threadattr_t *attr,
     if (stat == 0) {
         return APR_SUCCESS;
     }
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     stat = errno;
 #endif
 
@@ -127,7 +127,7 @@ APR_DECLARE(apr_status_t) apr_threadattr_guardsize_set(apr_threadattr_t *attr,
     if (rv == 0) {
         return APR_SUCCESS;
     }
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
     rv = errno;
 #endif
     return rv;
@@ -163,7 +163,6 @@ APR_DECLARE(apr_status_t) apr_thread_create(apr_thread_t **new,
         return APR_ENOMEM;
     }
 
-    (*new)->pool = pool;
     (*new)->data = data;
     (*new)->func = func;
 
@@ -181,7 +180,7 @@ APR_DECLARE(apr_status_t) apr_thread_create(apr_thread_t **new,
         return APR_SUCCESS;
     }
     else {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         stat = errno;
 #endif
 
@@ -220,7 +219,7 @@ APR_DECLARE(apr_status_t) apr_thread_join(apr_status_t *retval,
         return APR_SUCCESS;
     }
     else {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         stat = errno;
 #endif
 
@@ -232,7 +231,7 @@ APR_DECLARE(apr_status_t) apr_thread_detach(apr_thread_t *thd)
 {
     apr_status_t stat;
 
-#ifdef PTHREAD_DETACH_ARG1_ADDR
+#ifdef HAVE_ZOS_PTHREADS
     if ((stat = pthread_detach(thd->td)) == 0) {
 #else
     if ((stat = pthread_detach(*thd->td)) == 0) {
@@ -241,7 +240,7 @@ APR_DECLARE(apr_status_t) apr_thread_detach(apr_thread_t *thd)
         return APR_SUCCESS;
     }
     else {
-#ifdef PTHREAD_SETS_ERRNO
+#ifdef HAVE_ZOS_PTHREADS
         stat = errno;
 #endif
 
@@ -249,8 +248,19 @@ APR_DECLARE(apr_status_t) apr_thread_detach(apr_thread_t *thd)
     }
 }
 
-void apr_thread_yield()
+APR_DECLARE(void) apr_thread_yield(void)
 {
+#ifdef HAVE_PTHREAD_YIELD
+#ifdef HAVE_ZOS_PTHREADS
+    pthread_yield(NULL);
+#else
+    pthread_yield();
+#endif /* HAVE_ZOS_PTHREADS */
+#else
+#ifdef HAVE_SCHED_YIELD
+    sched_yield();
+#endif
+#endif
 }
 
 APR_DECLARE(apr_status_t) apr_thread_data_get(void **data, const char *key,
diff --git a/srclib/apr/threadproc/win32/proc.c b/srclib/apr/threadproc/win32/proc.c
index aa85fe4d..79a2fd16 100644
--- a/srclib/apr/threadproc/win32/proc.c
+++ b/srclib/apr/threadproc/win32/proc.c
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_threadproc.h"
-#include "win32/apr_arch_file_io.h"
+#include "apr_arch_threadproc.h"
+#include "apr_arch_file_io.h"
 
 #include "apr_thread_proc.h"
 #include "apr_file_io.h"
@@ -32,6 +32,11 @@
 #include <process.h>
 #endif
 
+/* Heavy on no'ops, here's what we want to pass if there is APR_NO_FILE
+ * requested for a specific child handle;
+ */
+static apr_file_t no_file = { NULL, INVALID_HANDLE_VALUE, };
+
 /* We have very carefully excluded volumes of definitions from the
  * Microsoft Platform SDK, which kill the build time performance.
  * These the sole constants we borrow from WinBase.h and WinUser.h
@@ -54,12 +59,12 @@
 #define SW_HIDE 0
 #endif
 #endif
+
 /* 
  * some of the ideas expressed herein are based off of Microsoft
  * Knowledge Base article: Q190351
  *
  */
-
 APR_DECLARE(apr_status_t) apr_procattr_create(apr_procattr_t **new,
                                                   apr_pool_t *pool)
 {
@@ -78,74 +83,40 @@ APR_DECLARE(apr_status_t) apr_procattr_io_set(apr_procattr_t *attr,
 
     if (in) {
         /* APR_CHILD_BLOCK maps to APR_WRITE_BLOCK, while
-         * APR_PARENT_BLOCK maps to APR_READ_BLOCK, so we
-         * must transpose the CHILD/PARENT blocking flags
-         * only for the stdin pipe.  stdout/stderr naturally
-         * map to the correct mode.
+         * APR_PARENT_BLOCK maps to APR_READ_BLOCK, so transpose 
+         * the CHILD/PARENT blocking flags for the stdin pipe.
+         * stdout/stderr map to the correct mode by default.
          */
         if (in == APR_CHILD_BLOCK)
             in = APR_READ_BLOCK;
         else if (in == APR_PARENT_BLOCK)
             in = APR_WRITE_BLOCK;
 
-        stat = apr_create_nt_pipe(&attr->child_in, &attr->parent_in,
-                                  in, attr->pool);
-        if (stat == APR_SUCCESS) { 
-            switch (in) { 
-                case APR_FULL_BLOCK:
-                    break;
-                case APR_READ_BLOCK:
-                    apr_file_pipe_timeout_set(attr->parent_in, 0);
-                    break;
-                case APR_WRITE_BLOCK:
-                    apr_file_pipe_timeout_set(attr->child_in, 0);
-                    break;
-                default:
-                    apr_file_pipe_timeout_set(attr->child_in, 0);
-                    apr_file_pipe_timeout_set(attr->parent_in, 0);
-            }
+        if (in == APR_NO_FILE)
+            attr->child_in = &no_file;
+        else { 
+            stat = apr_file_pipe_create_ex(&attr->child_in, &attr->parent_in,
+                                           in, attr->pool);
         }
         if (stat == APR_SUCCESS)
             stat = apr_file_inherit_unset(attr->parent_in);
     }
     if (out && stat == APR_SUCCESS) {
-        stat = apr_create_nt_pipe(&attr->parent_out, &attr->child_out,
-                                  out, attr->pool);
-        if (stat == APR_SUCCESS) { 
-            switch (out) {
-                case APR_FULL_BLOCK:
-                    break;
-                case APR_PARENT_BLOCK:
-                    apr_file_pipe_timeout_set(attr->child_out, 0);
-                    break;
-                case APR_CHILD_BLOCK:
-                    apr_file_pipe_timeout_set(attr->parent_out, 0);
-                    break;
-                default:
-                    apr_file_pipe_timeout_set(attr->child_out, 0);
-                    apr_file_pipe_timeout_set(attr->parent_out, 0);
-            }
+        if (out == APR_NO_FILE)
+            attr->child_out = &no_file;
+        else { 
+            stat = apr_file_pipe_create_ex(&attr->parent_out, &attr->child_out,
+                                           out, attr->pool);
         }
         if (stat == APR_SUCCESS)
             stat = apr_file_inherit_unset(attr->parent_out);
     }
     if (err && stat == APR_SUCCESS) {
-        stat = apr_create_nt_pipe(&attr->parent_err, &attr->child_err,
-                                  err, attr->pool);
-        if (stat == APR_SUCCESS) { 
-            switch (err) {
-                case APR_FULL_BLOCK:
-                    break;
-                case APR_PARENT_BLOCK:
-                    apr_file_pipe_timeout_set(attr->child_err, 0);
-                    break;
-                case APR_CHILD_BLOCK:
-                    apr_file_pipe_timeout_set(attr->parent_err, 0);
-                    break;
-                default:
-                    apr_file_pipe_timeout_set(attr->child_err, 0);
-                    apr_file_pipe_timeout_set(attr->parent_err, 0);
-            }
+        if (err == APR_NO_FILE)
+            attr->child_err = &no_file;
+        else { 
+            stat = apr_file_pipe_create_ex(&attr->parent_err, &attr->child_err,
+                                           err, attr->pool);
         }
         if (stat == APR_SUCCESS)
             stat = apr_file_inherit_unset(attr->parent_err);
@@ -160,7 +131,7 @@ APR_DECLARE(apr_status_t) apr_procattr_child_in_set(apr_procattr_t *attr,
     apr_status_t rv = APR_SUCCESS;
 
     if (child_in) {
-        if (attr->child_in == NULL)
+        if ((attr->child_in == NULL) || (attr->child_in == &no_file))
             rv = apr_file_dup(&attr->child_in, child_in, attr->pool);
         else
             rv = apr_file_dup2(attr->child_in, child_in, attr->pool);
@@ -186,7 +157,7 @@ APR_DECLARE(apr_status_t) apr_procattr_child_out_set(apr_procattr_t *attr,
     apr_status_t rv = APR_SUCCESS;
 
     if (child_out) {
-        if (attr->child_out == NULL)
+        if ((attr->child_out == NULL) || (attr->child_out == &no_file))
             rv = apr_file_dup(&attr->child_out, child_out, attr->pool);
         else
             rv = apr_file_dup2(attr->child_out, child_out, attr->pool);
@@ -212,7 +183,7 @@ APR_DECLARE(apr_status_t) apr_procattr_child_err_set(apr_procattr_t *attr,
     apr_status_t rv = APR_SUCCESS;
 
     if (child_err) {
-        if (attr->child_err == NULL)
+        if ((attr->child_err == NULL) || (attr->child_err == &no_file))
             rv = apr_file_dup(&attr->child_err, child_err, attr->pool);
         else
             rv = apr_file_dup2(attr->child_err, child_err, attr->pool);
@@ -826,49 +797,49 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
             si.dwFlags |= STARTF_USESTDHANDLES;
 
             si.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
-            if (GetHandleInformation(si.hStdInput, &stdin_reset)
-                    && (stdin_reset &= HANDLE_FLAG_INHERIT))
-                SetHandleInformation(si.hStdInput,
-                                     HANDLE_FLAG_INHERIT, 0);
-
             if (attr->child_in && attr->child_in->filehand)
             {
-                si.hStdInput = attr->child_in->filehand;
-                SetHandleInformation(si.hStdInput, HANDLE_FLAG_INHERIT,
-                                                   HANDLE_FLAG_INHERIT);
+                if (GetHandleInformation(si.hStdInput,
+                                         &stdin_reset)
+                        && (stdin_reset &= HANDLE_FLAG_INHERIT))
+                    SetHandleInformation(si.hStdInput,
+                                         HANDLE_FLAG_INHERIT, 0);
+
+                if ( (si.hStdInput = attr->child_in->filehand) 
+                                   != INVALID_HANDLE_VALUE )
+                    SetHandleInformation(si.hStdInput, HANDLE_FLAG_INHERIT,
+                                                       HANDLE_FLAG_INHERIT);
             }
-            else
-                si.hStdInput = INVALID_HANDLE_VALUE;
             
             si.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
-            if (GetHandleInformation(si.hStdOutput, &stdout_reset)
-                    && (stdout_reset &= HANDLE_FLAG_INHERIT))
-                SetHandleInformation(si.hStdOutput,
-                                     HANDLE_FLAG_INHERIT, 0);
-
             if (attr->child_out && attr->child_out->filehand)
             {
-                si.hStdOutput = attr->child_out->filehand;
-                SetHandleInformation(si.hStdOutput, HANDLE_FLAG_INHERIT,
-                                                    HANDLE_FLAG_INHERIT);
+                if (GetHandleInformation(si.hStdOutput,
+                                         &stdout_reset)
+                        && (stdout_reset &= HANDLE_FLAG_INHERIT))
+                    SetHandleInformation(si.hStdOutput,
+                                         HANDLE_FLAG_INHERIT, 0);
+
+                if ( (si.hStdOutput = attr->child_out->filehand) 
+                                   != INVALID_HANDLE_VALUE )
+                    SetHandleInformation(si.hStdOutput, HANDLE_FLAG_INHERIT,
+                                                        HANDLE_FLAG_INHERIT);
             }
-            else
-                si.hStdOutput = INVALID_HANDLE_VALUE;
 
             si.hStdError = GetStdHandle(STD_ERROR_HANDLE);
-            if (GetHandleInformation(si.hStdError, &stderr_reset)
-                    && (stderr_reset &= HANDLE_FLAG_INHERIT))
-                SetHandleInformation(si.hStdError,
-                                     HANDLE_FLAG_INHERIT, 0);
-
             if (attr->child_err && attr->child_err->filehand)
             {
-                si.hStdError = attr->child_err->filehand;
-                SetHandleInformation(si.hStdError, HANDLE_FLAG_INHERIT,
+                if (GetHandleInformation(si.hStdError,
+                                         &stderr_reset)
+                        && (stderr_reset &= HANDLE_FLAG_INHERIT))
+                    SetHandleInformation(si.hStdError,
+                                         HANDLE_FLAG_INHERIT, 0);
+
+                if ( (si.hStdError = attr->child_err->filehand) 
+                                   != INVALID_HANDLE_VALUE )
+                    SetHandleInformation(si.hStdError, HANDLE_FLAG_INHERIT,
                                                        HANDLE_FLAG_INHERIT);
             }
-            else
-                si.hStdError = INVALID_HANDLE_VALUE;
         }
         if (attr->user_token) {
             /* XXX: for terminal services, handles can't be cannot be
@@ -990,13 +961,13 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
     new->hproc = pi.hProcess;
     new->pid = pi.dwProcessId;
 
-    if (attr->child_in) {
+    if ((attr->child_in) && (attr->child_in != &no_file)) {
         apr_file_close(attr->child_in);
     }
-    if (attr->child_out) {
+    if ((attr->child_out) && (attr->child_out != &no_file)) {
         apr_file_close(attr->child_out);
     }
-    if (attr->child_err) {
+    if ((attr->child_err) && (attr->child_err != &no_file)) {
         apr_file_close(attr->child_err);
     }
     CloseHandle(pi.hThread);
@@ -1004,21 +975,6 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_proc_wait_all_procs(apr_proc_t *proc,
-                                                  int *exitcode,
-                                                  apr_exit_why_e *exitwhy,
-                                                  apr_wait_how_e waithow,
-                                                  apr_pool_t *p)
-{
-    /* Unix does apr_proc_wait(proc(-1), exitcode, exitwhy, waithow)
-     * but Win32's apr_proc_wait won't work that way.  We can either
-     * register all APR created processes in some sort of AsyncWait
-     * thread, or simply walk from the global process pool for all 
-     * apr_pool_note_subprocess()es registered with APR.
-     */
-    return APR_ENOTIMPL;
-}
-
 static apr_exit_why_e why_from_exit_code(DWORD exit) {
     /* See WinNT.h STATUS_ACCESS_VIOLATION and family for how
      * this class of failures was determined
@@ -1032,6 +988,132 @@ static apr_exit_why_e why_from_exit_code(DWORD exit) {
     /* ### No way to tell if Dr Watson grabbed a core, AFAICT. */
 }
 
+APR_DECLARE(apr_status_t) apr_proc_wait_all_procs(apr_proc_t *proc,
+                                                  int *exitcode,
+                                                  apr_exit_why_e *exitwhy,
+                                                  apr_wait_how_e waithow,
+                                                  apr_pool_t *p)
+{
+#if APR_HAS_UNICODE_FS
+#ifndef _WIN32_WCE
+    IF_WIN_OS_IS_UNICODE
+    {
+        DWORD  dwId    = GetCurrentProcessId();
+        DWORD  i;
+        DWORD  nChilds = 0;
+        DWORD  nActive = 0;
+        HANDLE ps32;
+        PROCESSENTRY32W pe32;
+        BOOL   bHasMore = FALSE;
+        DWORD  dwFlags  = PROCESS_QUERY_INFORMATION;
+        apr_status_t rv = APR_EGENERAL;
+
+        if (waithow == APR_WAIT)
+            dwFlags |= SYNCHRONIZE;
+        if (!(ps32 = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0))) {
+            return apr_get_os_error();
+        }
+        pe32.dwSize = sizeof(PROCESSENTRY32W);
+        if (!Process32FirstW(ps32, &pe32)) {
+            if (GetLastError() == ERROR_NO_MORE_FILES)
+                return APR_EOF;
+            else
+                return apr_get_os_error();
+        }
+        do {
+            DWORD  dwRetval = 0;
+            DWORD  nHandles = 0;
+            HANDLE hProcess = NULL;
+            HANDLE pHandles[MAXIMUM_WAIT_OBJECTS];
+            do {
+                if (pe32.th32ParentProcessID == dwId) {
+                    nChilds++;
+                    if ((hProcess = OpenProcess(dwFlags, FALSE,
+                                                pe32.th32ProcessID)) != NULL) {
+                        if (GetExitCodeProcess(hProcess, &dwRetval)) {
+                            if (dwRetval == STILL_ACTIVE) {
+                                nActive++;
+                                if (waithow == APR_WAIT)
+                                    pHandles[nHandles++] = hProcess;
+                                else
+                                    CloseHandle(hProcess);
+                            }
+                            else {                                
+                                /* Process has exited.
+                                 * No need to wait for its termination.
+                                 */
+                                CloseHandle(hProcess);
+                                if (exitcode)
+                                    *exitcode = dwRetval;
+                                if (exitwhy)
+                                    *exitwhy  = why_from_exit_code(dwRetval);
+                                proc->pid = pe32.th32ProcessID;
+                            }
+                        }
+                        else {
+                            /* Unexpected error code.
+                             * Cleanup and return;
+                             */
+                            rv = apr_get_os_error();
+                            CloseHandle(hProcess);
+                            for (i = 0; i < nHandles; i++)
+                                CloseHandle(pHandles[i]);
+                            return rv;
+                        }
+                    }
+                    else {
+                        /* This is our child, so it shouldn't happen
+                         * that we cannot open our child's process handle.
+                         * However if the child process increased the
+                         * security token it might fail.
+                         */
+                    }
+                }
+            } while ((bHasMore = Process32NextW(ps32, &pe32)) &&
+                     nHandles < MAXIMUM_WAIT_OBJECTS);
+            if (nHandles) {
+                /* Wait for all collected processes to finish */
+                DWORD waitStatus = WaitForMultipleObjects(nHandles, pHandles,
+                                                          TRUE, INFINITE);
+                for (i = 0; i < nHandles; i++)
+                    CloseHandle(pHandles[i]);
+                if (waitStatus == WAIT_OBJECT_0) {
+                    /* Decrease active count by the number of awaited
+                     * processes.
+                     */
+                    nActive -= nHandles;
+                }
+                else {
+                    /* Broken from the infinite loop */
+                    break;
+                }
+            }
+        } while (bHasMore);
+        CloseHandle(ps32);
+        if (waithow != APR_WAIT) {
+            if (nChilds && nChilds == nActive) {
+                /* All child processes are running */
+                rv = APR_CHILD_NOTDONE;
+                proc->pid = -1;
+            }
+            else {
+                /* proc->pid contains the pid of the
+                 * exited processes
+                 */
+                rv = APR_CHILD_DONE;
+            }
+        }
+        if (nActive == 0) {
+            rv = APR_CHILD_DONE;
+            proc->pid = -1;
+        }
+        return rv;
+    }
+#endif /* _WIN32_WCE */
+#endif /* APR_HAS_UNICODE_FS */
+    return APR_ENOTIMPL;
+}
+
 APR_DECLARE(apr_status_t) apr_proc_wait(apr_proc_t *proc,
                                         int *exitcode, apr_exit_why_e *exitwhy,
                                         apr_wait_how_e waithow)
diff --git a/srclib/apr/threadproc/win32/signals.c b/srclib/apr/threadproc/win32/signals.c
index 5e714931..b9702309 100644
--- a/srclib/apr/threadproc/win32/signals.c
+++ b/srclib/apr/threadproc/win32/signals.c
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_threadproc.h"
-#include "win32/apr_arch_file_io.h"
+#include "apr_arch_threadproc.h"
+#include "apr_arch_file_io.h"
 #include "apr_thread_proc.h"
 #include "apr_file_io.h"
 #include "apr_general.h"
diff --git a/srclib/apr/threadproc/win32/thread.c b/srclib/apr/threadproc/win32/thread.c
index dd7c09a8..e963e9aa 100644
--- a/srclib/apr/threadproc/win32/thread.c
+++ b/srclib/apr/threadproc/win32/thread.c
@@ -15,7 +15,7 @@
  */
 
 #include "apr_private.h"
-#include "win32/apr_arch_threadproc.h"
+#include "apr_arch_threadproc.h"
 #include "apr_thread_proc.h"
 #include "apr_general.h"
 #include "apr_lib.h"
@@ -94,7 +94,6 @@ APR_DECLARE(apr_status_t) apr_thread_create(apr_thread_t **new,
         return APR_ENOMEM;
     }
 
-    (*new)->pool = pool;
     (*new)->data = data;
     (*new)->func = func;
     (*new)->td   = NULL;
diff --git a/srclib/apr/threadproc/win32/threadpriv.c b/srclib/apr/threadproc/win32/threadpriv.c
index 9ddc24fb..0cbfe620 100644
--- a/srclib/apr/threadproc/win32/threadpriv.c
+++ b/srclib/apr/threadproc/win32/threadpriv.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_threadproc.h"
+#include "apr_arch_threadproc.h"
 #include "apr_thread_proc.h"
 #include "apr_general.h"
 #include "apr_lib.h"
diff --git a/srclib/apr/time/win32/access.c b/srclib/apr/time/win32/access.c
index cd25e2f0..c3ccad6b 100644
--- a/srclib/apr/time/win32/access.c
+++ b/srclib/apr/time/win32/access.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_atime.h"
+#include "apr_arch_atime.h"
 #include "apr_time.h"
 #include "apr_general.h"
 #include "apr_lib.h"
diff --git a/srclib/apr/time/win32/time.c b/srclib/apr/time/win32/time.c
index 1c6f8a73..ecf02285 100644
--- a/srclib/apr/time/win32/time.c
+++ b/srclib/apr/time/win32/time.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_atime.h"
+#include "apr_arch_atime.h"
 #include "apr_time.h"
 #include "apr_general.h"
 #include "apr_lib.h"
@@ -314,7 +314,7 @@ APR_DECLARE(void) apr_time_clock_hires(apr_pool_t *p)
 static apr_status_t clock_restore(void *unsetres)
 {
     ULONG newRes;
-    SetTimerResolution((ULONG)unsetres, FALSE, &newRes);
+    SetTimerResolution((ULONG)(apr_ssize_t)unsetres, FALSE, &newRes);
     return APR_SUCCESS;
 }
 
diff --git a/srclib/apr/time/win32/timestr.c b/srclib/apr/time/win32/timestr.c
index af152649..11692499 100644
--- a/srclib/apr/time/win32/timestr.c
+++ b/srclib/apr/time/win32/timestr.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "win32/apr_arch_atime.h"
+#include "apr_arch_atime.h"
 #include "apr_portable.h"
 #include "apr_strings.h"
 
diff --git a/srclib/apr/user/win32/userinfo.c b/srclib/apr/user/win32/userinfo.c
index aae3f9be..3d45df4f 100644
--- a/srclib/apr/user/win32/userinfo.c
+++ b/srclib/apr/user/win32/userinfo.c
@@ -121,7 +121,8 @@ APR_DECLARE(apr_status_t) apr_uid_homepath_get(char **dirname,
         else if (type == REG_EXPAND_SZ) {
             apr_wchar_t path[MAX_PATH];
             char retdir[MAX_PATH];
-            ExpandEnvironmentStringsW((apr_wchar_t*)regkey, path, sizeof(path));
+            ExpandEnvironmentStringsW((apr_wchar_t*)regkey, path, 
+                                      sizeof(path) / 2);
             if ((rv = unicode_to_utf8_path(retdir, sizeof(retdir), path))
                     != APR_SUCCESS)
                 return rv;
diff --git a/srclib/pcre/configure b/srclib/pcre/configure
index 30bec931..0f88c98d 100755
--- a/srclib/pcre/configure
+++ b/srclib/pcre/configure
@@ -1,28 +1,32 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60.
+# Generated by GNU Autoconf 2.62.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
 
 
 # PATH needs CR
@@ -33,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -59,8 +91,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -83,7 +113,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -96,17 +126,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -128,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -154,7 +177,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -215,7 +238,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; }
 else
   as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
@@ -233,19 +256,20 @@ IFS=$as_save_IFS
 	 # Try only shells that exist, to save several forks.
 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
 
 :
 _ASEOF
@@ -253,19 +277,20 @@ _ASEOF
   CONFIG_SHELL=$as_shell
 	       as_have_required=yes
 	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
 
 :
 (as_func_return () {
@@ -335,10 +360,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -407,9 +432,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -445,7 +471,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -473,7 +499,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -486,19 +511,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -512,19 +540,28 @@ else
   as_mkdir_p=false
 fi
 
-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -565,36 +602,36 @@ ac_unique_file="dftables.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
-#if HAVE_STDINT_H
+#ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
@@ -670,12 +707,26 @@ UTF8
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_shared
+enable_utf8
+enable_unicode_properties
+enable_newline_is_cr
+enable_newline_is_lf
+enable_ebcdic
+enable_stack_for_recursion
+with_posix_malloc_threshold
+with_link_size
+with_match_limit
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
 CC
 CFLAGS
 LDFLAGS
+LIBS
 CPPFLAGS
 CPP'
 
@@ -683,6 +734,8 @@ CPP'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -781,13 +834,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -800,13 +861,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -997,22 +1066,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1032,7 +1117,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1041,16 +1126,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1059,22 +1144,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1089,7 +1190,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1105,10 +1206,10 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1116,12 +1217,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1148,12 +1249,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1202,9 +1303,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1214,25 +1315,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1244,6 +1345,7 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-shared        build PCRE as a static library
@@ -1266,6 +1368,7 @@ Some influential environment variables:
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
@@ -1280,15 +1383,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1324,7 +1429,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1334,10 +1439,10 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1348,7 +1453,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
 
@@ -1384,7 +1489,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1419,7 +1524,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1471,11 +1576,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1505,9 +1611,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1522,9 +1628,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1540,8 +1646,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1583,21 +1689,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1607,16 +1716,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1630,29 +1739,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1662,10 +1780,10 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1721,10 +1839,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1735,9 +1853,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1748,11 +1866,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1761,10 +1879,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -1775,9 +1893,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1788,11 +1906,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -1800,10 +1918,10 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -1818,10 +1936,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1832,9 +1950,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1845,11 +1963,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1858,10 +1976,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1873,13 +1991,13 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1902,11 +2020,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1917,10 +2035,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1931,9 +2049,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1944,11 +2062,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1961,10 +2079,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -1975,9 +2093,9 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1988,11 +2106,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2004,10 +2122,10 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 whose name does not start with the host triplet.  If you think this
 configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 ac_tool_warned=yes ;;
@@ -2019,44 +2137,48 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2075,27 +2197,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -2106,21 +2223,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
-for ac_file in $ac_files
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2144,24 +2262,28 @@ done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
 else
-  echo "$as_me: failed program was:" >&5
+  ac_file=''
+fi
+
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2170,49 +2292,51 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2221,31 +2345,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2268,40 +2392,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2327,37 +2452,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2367,15 +2476,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -2402,37 +2515,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -2457,37 +2554,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -2513,37 +2594,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2558,8 +2623,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -2575,10 +2640,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -2649,37 +2714,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2695,15 +2744,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -2721,15 +2770,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -2761,27 +2810,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -2805,28 +2848,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -2851,8 +2888,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -2880,27 +2917,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -2924,28 +2955,22 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -2961,9 +2986,9 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2975,42 +3000,37 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3025,74 +3045,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3107,40 +3113,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3167,37 +3164,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -3289,37 +3270,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -3341,11 +3325,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3363,37 +3347,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -3401,12 +3369,14 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -3417,20 +3387,21 @@ done
 
 for ac_header in limits.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3446,49 +3417,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3502,76 +3457,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
 
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -3580,10 +3531,10 @@ done
 
 
 
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3599,10 +3550,10 @@ main ()
 #ifndef __cplusplus
   /* Ultrix mips cc rejects this.  */
   typedef int charset[2];
-  const charset x;
+  const charset cs;
   /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *ccp;
-  char **p;
+  char const *const *pcpcc;
+  char **ppc;
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
   static struct point const zero = {0,0};
@@ -3611,11 +3562,11 @@ main ()
      an arm of an if-expression whose if-part is not a constant
      expression */
   const char *g = "string";
-  ccp = &g + (g ? g-g : 0);
+  pcpcc = &g + (g ? g-g : 0);
   /* HPUX 7.0 cc rejects these. */
-  ++ccp;
-  p = (char**) ccp;
-  ccp = (char const *const *) p;
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
   { /* SCO 3.2v4 cc rejects this.  */
     char *t;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
@@ -3642,7 +3593,7 @@ main ()
     const int foo = 10;
     if (!foo) return 0;
   }
-  return !x[0] && !zero.x;
+  return !cs[0] && !zero.x;
 #endif
 
   ;
@@ -3655,37 +3606,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
   ac_cv_c_const=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_const=no
@@ -3693,36 +3628,34 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF
-#define const
+#define const /**/
 _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+$as_echo_n "checking for size_t... " >&6; }
 if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_size_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef size_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+if (sizeof (size_t))
+       return 0;
   ;
   return 0;
 }
@@ -3733,46 +3666,72 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (case "(($ac_try" in
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((size_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_size_t=yes
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_size_t=no
+	ac_cv_type_size_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+$as_echo "$ac_cv_type_size_t" >&6; }
 if test $ac_cv_type_size_t = yes; then
   :
 else
@@ -3790,11 +3749,11 @@ fi
 
 for ac_func in bcopy memmove strerror
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3847,51 +3806,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
-rm -f core conftest.err conftest.$ac_objext \
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4068,11 +4017,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -4105,12 +4055,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -4126,7 +4076,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -4139,11 +4089,12 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -4156,24 +4107,28 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
 
 
 # PATH needs CR
@@ -4184,17 +4139,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -4210,8 +4193,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -4234,7 +4215,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -4247,17 +4228,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -4279,7 +4253,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -4330,7 +4304,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -4358,7 +4332,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -4371,19 +4344,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -4397,19 +4373,28 @@ else
   as_mkdir_p=false
 fi
 
-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -4425,7 +4410,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -4438,7 +4423,7 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -4446,7 +4431,7 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
@@ -4454,14 +4439,14 @@ current configuration.
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
+  -V, --version    print version number and configuration settings, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+                   instantiate the configuration file FILE
   --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -4475,23 +4460,23 @@ $config_commands
 Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.60,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.62,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -4513,30 +4498,36 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
+    { $as_echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -4555,30 +4546,32 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -4590,8 +4583,8 @@ do
     "pcre-config") CONFIG_FILES="$CONFIG_FILES pcre-config" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -4632,136 +4625,143 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
 
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-BUILD_EXEEXT!$BUILD_EXEEXT$ac_delim
-BUILD_OBJEXT!$BUILD_OBJEXT$ac_delim
-CC_FOR_BUILD!$CC_FOR_BUILD$ac_delim
-CFLAGS_FOR_BUILD!$CFLAGS_FOR_BUILD$ac_delim
-EBCDIC!$EBCDIC$ac_delim
-HAVE_MEMMOVE!$HAVE_MEMMOVE$ac_delim
-HAVE_STRERROR!$HAVE_STRERROR$ac_delim
-LIBTOOL!$LIBTOOL$ac_delim
-LIBSUFFIX!$LIBSUFFIX$ac_delim
-LINK_SIZE!$LINK_SIZE$ac_delim
-MATCH_LIMIT!$MATCH_LIMIT$ac_delim
-NEWLINE!$NEWLINE$ac_delim
-NO_RECURSE!$NO_RECURSE$ac_delim
-PCRE_MAJOR!$PCRE_MAJOR$ac_delim
-PCRE_MINOR!$PCRE_MINOR$ac_delim
-PCRE_DATE!$PCRE_DATE$ac_delim
-PCRE_VERSION!$PCRE_VERSION$ac_delim
-PCRE_LIB_VERSION!$PCRE_LIB_VERSION$ac_delim
-PCRE_POSIXLIB_VERSION!$PCRE_POSIXLIB_VERSION$ac_delim
-POSIX_MALLOC_THRESHOLD!$POSIX_MALLOC_THRESHOLD$ac_delim
-UCP!$UCP$ac_delim
-UTF8!$UTF8$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 71; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+  print line
+}
+
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -4777,19 +4777,133 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    prefix = substr(line, 1, index(line, defundef) - 1)
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", line, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -4818,26 +4932,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -4847,7 +4973,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -4873,7 +4999,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -4882,7 +5008,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -4903,17 +5029,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -4949,12 +5075,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -4963,13 +5090,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -4983,15 +5111,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -5000,123 +5129,62 @@ s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
  ;;
 
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -5133,6 +5201,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -5154,5 +5227,9 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
 
diff --git a/support/ab.c b/support/ab.c
index 5adf5a5b..e39536d1 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -80,6 +80,10 @@
    **     Switched to the new abstract pollset API, allowing ab to
    **     take advantage of future apr_pollset_t scalability improvements.
    **     Contributed by Brian Pane, August 31, 2002
+   **
+   ** Version 2.3
+   **     SIGINT now triggers output_results().
+   **     Contributed by colm, March 30, 2006
    **/
 
 /* Note: this version string should start with \d+[\d\.]* and be a valid
@@ -91,7 +95,7 @@
  * ab - or to due to a change in the distribution it is compiled with
  * (such as an APR change in for example blocking).
  */
-#define AP_AB_BASEREVISION "2.0.40-dev"
+#define AP_AB_BASEREVISION "2.3"
 
 /*
  * BUGS:
@@ -189,6 +193,9 @@ typedef STACK_OF(X509) X509_STACK_TYPE;
 #if APR_HAVE_CTYPE_H
 #include <ctype.h>
 #endif
+#if APR_HAVE_LIMITS_H
+#include <limits.h>
+#endif
 
 /* ------------------- DEFINITIONS -------------------------- */
 
@@ -199,7 +206,7 @@ typedef STACK_OF(X509) X509_STACK_TYPE;
 #endif
 
 /* maximum number of requests on a time limited test */
-#define MAX_REQUESTS 50000
+#define MAX_REQUESTS (INT_MAX > 50000 ? 50000 : INT_MAX)
 
 /* good old state hostname */
 #define STATE_UNCONNECTED 0
@@ -238,22 +245,22 @@ struct connection {
 };
 
 struct data {
-    int read;              /* number of bytes read */
-    apr_time_t starttime;  /* start time of connection in seconds since
-                            * Jan. 1, 1970 */
-    apr_interval_time_t waittime;   /* Between writing request and reading
-                                     * response */
-    apr_interval_time_t ctime;      /* time in ms to connect */
-    apr_interval_time_t time;       /* time in ms for connection */
+    apr_time_t starttime;         /* start time of connection */
+    apr_interval_time_t waittime; /* between request and reading response */
+    apr_interval_time_t ctime;    /* time to connect */
+    apr_interval_time_t time;     /* time for connection */
 };
 
 #define ap_min(a,b) ((a)<(b))?(a):(b)
 #define ap_max(a,b) ((a)>(b))?(a):(b)
+#define ap_round_ms(a) ((apr_time_t)((a) + 500)/1000)
+#define ap_double_ms(a) ((double)(a)/1000.0)
 #define MAX_CONCURRENCY 20000
 
 /* --------------------- GLOBALS ---------------------------- */
 
 int verbosity = 0;      /* no verbosity by default */
+int recverrok = 0;      /* ok to proceed after socket receive errors */
 int posting = 0;        /* GET by default */
 int requests = 1;       /* Number of requests to make */
 int heartbeatres = 100; /* How often do we say we're alive */
@@ -262,6 +269,7 @@ int percentile = 1;     /* Show percentile served */
 int confidence = 1;     /* Show confidence estimator and warnings */
 int tlimit = 0;         /* time limit in secs */
 int keepalive = 0;      /* try and do keepalive connections */
+int windowsize = 0;     /* we use the OS default window size */
 char servername[1024];  /* name that server reports */
 char *hostname;         /* host name from URL */
 char *host_field;       /* value of "Host:" header field */
@@ -298,15 +306,20 @@ const char *tablestring;
 const char *trstring;
 const char *tdstring;
 
-apr_size_t doclen = 0;      /* the length the document should be */
-long started = 0;           /* number of requests started, so no excess */
-long totalread = 0;         /* total number of bytes read */
-long totalbread = 0;        /* totoal amount of entity body read */
-long totalposted = 0;       /* total number of bytes posted, inc. headers */
-long done = 0;              /* number of requests we have done */
-long doneka = 0;            /* number of keep alive connections done */
-long good = 0, bad = 0;     /* number of good and bad requests */
-long epipe = 0;             /* number of broken pipe writes */
+apr_size_t doclen = 0;     /* the length the document should be */
+apr_int64_t totalread = 0;    /* total number of bytes read */
+apr_int64_t totalbread = 0;   /* totoal amount of entity body read */
+apr_int64_t totalposted = 0;  /* total number of bytes posted, inc. headers */
+int started = 0;           /* number of requests started, so no excess */
+int done = 0;              /* number of requests we have done */
+int doneka = 0;            /* number of keep alive connections done */
+int good = 0, bad = 0;     /* number of good and bad requests */
+int epipe = 0;             /* number of broken pipe writes */
+int err_length = 0;        /* requests failed due to response length */
+int err_conn = 0;          /* requests failed due to connection drop */
+int err_recv = 0;          /* requests failed due to broken read */
+int err_except = 0;        /* requests failed due to exception */
+int err_response = 0;      /* requests with invalid or non-200 response */
 
 #ifdef USE_SSL
 int is_ssl;
@@ -316,11 +329,7 @@ char *ssl_info = NULL;
 BIO *bio_out,*bio_err;
 #endif
 
-/* store error cases */
-int err_length = 0, err_conn = 0, err_except = 0;
-int err_response = 0;
-
-apr_time_t start, endtime;
+apr_time_t start, lasttime, stoptime;
 
 /* global request (and its length) */
 char _request[2048];
@@ -334,7 +343,7 @@ char buffer[8192];
 int percs[] = {50, 66, 75, 80, 90, 95, 98, 99, 100};
 
 struct connection *con;     /* connection array */
-struct data *stats;         /* date for each request */
+struct data *stats;         /* data for each request */
 apr_pool_t *cntxt;
 
 apr_pollset_t *readbits;
@@ -356,7 +365,7 @@ static void err(char *s)
 {
     fprintf(stderr, "%s\n", s);
     if (done)
-        printf("Total of %ld requests completed\n" , done);
+        printf("Total of %d requests completed\n" , done);
     exit(1);
 }
 
@@ -370,7 +379,7 @@ static void apr_err(char *s, apr_status_t rv)
         "%s: %s (%d)\n",
         s, apr_strerror(rv, buf, sizeof buf), rv);
     if (done)
-        printf("Total of %ld requests completed\n" , done);
+        printf("Total of %d requests completed\n" , done);
     exit(rv);
 }
 
@@ -420,7 +429,6 @@ static void ssl_state_cb(const SSL *s, int w, int r)
 }
 
 #ifndef RAND_MAX
-#include <limits.h>
 #define RAND_MAX INT_MAX
 #endif
 
@@ -609,18 +617,20 @@ static void ssl_proceed_handshake(struct connection *c)
 static void write_request(struct connection * c)
 {
     do {
-        apr_time_t tnow = apr_time_now();
+        apr_time_t tnow;
         apr_size_t l = c->rwrite;
         apr_status_t e = APR_SUCCESS; /* prevent gcc warning */
 
+        tnow = lasttime = apr_time_now();
+
         /*
          * First time round ?
          */
         if (c->rwrite == 0) {
             apr_socket_timeout_set(c->aprsock, 0);
             c->connect = tnow;
-            c->rwrite = reqlen;
             c->rwrote = 0;
+            c->rwrite = reqlen;
             if (posting)
                 c->rwrite += postlen;
         }
@@ -647,30 +657,19 @@ static void write_request(struct connection * c)
 #endif
             e = apr_socket_send(c->aprsock, request + c->rwrote, &l);
 
-        /*
-         * Bail early on the most common case
-         */
-        if (l == c->rwrite)
-            break;
-
-        if (e != APR_SUCCESS) {
-            /*
-             * Let's hope this traps EWOULDBLOCK too !
-             */
-            if (!APR_STATUS_IS_EAGAIN(e)) {
-                epipe++;
-                printf("Send request failed!\n");
-                close_connection(c);
-            }
+        if (e != APR_SUCCESS && !APR_STATUS_IS_EAGAIN(e)) {
+            epipe++;
+            printf("Send request failed!\n");
+            close_connection(c);
             return;
         }
+        totalposted += l;
         c->rwrote += l;
         c->rwrite -= l;
-    } while (1);
+    } while (c->rwrite);
 
-    totalposted += c->rwrite;
     c->state = STATE_READ;
-    c->endwrite = apr_time_now();
+    c->endwrite = lasttime = apr_time_now();
     {
         apr_pollfd_t new_pollfd;
         new_pollfd.desc_type = APR_POLL_SOCKET;
@@ -723,15 +722,14 @@ static int compwait(struct data * a, struct data * b)
     return 0;
 }
 
-static void output_results(void)
+static void output_results(int sig)
 {
-    apr_interval_time_t timetakenusec;
-    float timetaken;
+    double timetaken;
 
-    endtime = apr_time_now();
-    timetakenusec = endtime - start;
-    timetaken = ((float)apr_time_sec(timetakenusec)) +
-        ((float)apr_time_usec(timetakenusec)) / 1000000.0F;
+    if (sig) {
+        lasttime = apr_time_now();  /* record final time if interrupted */
+    }
+    timetaken = (double) (lasttime - start) / APR_USEC_PER_SEC;
 
     printf("\n\n");
     printf("Server Software:        %s\n", servername);
@@ -747,45 +745,43 @@ static void output_results(void)
     printf("Document Length:        %" APR_SIZE_T_FMT " bytes\n", doclen);
     printf("\n");
     printf("Concurrency Level:      %d\n", concurrency);
-    printf("Time taken for tests:   %ld.%03ld seconds\n",
-           (long) apr_time_sec(timetakenusec),
-           (long) apr_time_usec(timetakenusec));
-    printf("Complete requests:      %ld\n", done);
-    printf("Failed requests:        %ld\n", bad);
+    printf("Time taken for tests:   %.3f seconds\n", timetaken);
+    printf("Complete requests:      %d\n", done);
+    printf("Failed requests:        %d\n", bad);
     if (bad)
-        printf("   (Connect: %d, Length: %d, Exceptions: %d)\n",
-            err_conn, err_length, err_except);
-    printf("Write errors:           %ld\n", epipe);
+        printf("   (Connect: %d, Receive: %d, Length: %d, Exceptions: %d)\n",
+            err_conn, err_recv, err_length, err_except);
+    printf("Write errors:           %d\n", epipe);
     if (err_response)
         printf("Non-2xx responses:      %d\n", err_response);
     if (keepalive)
-        printf("Keep-Alive requests:    %ld\n", doneka);
-    printf("Total transferred:      %ld bytes\n", totalread);
+        printf("Keep-Alive requests:    %d\n", doneka);
+    printf("Total transferred:      %" APR_INT64_T_FMT " bytes\n", totalread);
     if (posting > 0)
-        printf("Total POSTed:           %ld\n", totalposted);
-    printf("HTML transferred:       %ld bytes\n", totalbread);
+        printf("Total POSTed:           %" APR_INT64_T_FMT "\n", totalposted);
+    printf("HTML transferred:       %" APR_INT64_T_FMT " bytes\n", totalbread);
 
     /* avoid divide by zero */
-    if (timetaken) {
+    if (timetaken && done) {
         printf("Requests per second:    %.2f [#/sec] (mean)\n",
-               (float) (done / timetaken));
+               (double) done / timetaken);
         printf("Time per request:       %.3f [ms] (mean)\n",
-               (float) (1000 * concurrency * timetaken / done));
+               (double) concurrency * timetaken * 1000 / done);
         printf("Time per request:       %.3f [ms] (mean, across all concurrent requests)\n",
-           (float) (1000 * timetaken / done));
+               (double) timetaken * 1000 / done);
         printf("Transfer rate:          %.2f [Kbytes/sec] received\n",
-           (float) (totalread / 1024 / timetaken));
+               (double) totalread / 1024 / timetaken);
         if (posting > 0) {
             printf("                        %.2f kb/s sent\n",
-               (float) (totalposted / timetaken / 1024));
+               (double) totalposted / timetaken / 1024);
             printf("                        %.2f kb/s total\n",
-               (float) ((totalread + totalposted) / timetaken / 1024));
+               (double) (totalread + totalposted) / timetaken / 1024);
         }
     }
 
-    if (requests) {
+    if (done > 0) {
         /* work out connection times */
-        long i;
+        int i;
         apr_time_t totalcon = 0, total = 0, totald = 0, totalwait = 0;
         apr_time_t meancon, meantot, meand, meanwait;
         apr_interval_time_t mincon = AB_MAX, mintot = AB_MAX, mind = AB_MAX,
@@ -794,119 +790,117 @@ static void output_results(void)
         apr_interval_time_t mediancon = 0, mediantot = 0, mediand = 0, medianwait = 0;
         double sdtot = 0, sdcon = 0, sdd = 0, sdwait = 0;
 
-        for (i = 0; i < requests; i++) {
-            struct data s = stats[i];
-            mincon = ap_min(mincon, s.ctime);
-            mintot = ap_min(mintot, s.time);
-            mind = ap_min(mind, s.time - s.ctime);
-            minwait = ap_min(minwait, s.waittime);
-
-            maxcon = ap_max(maxcon, s.ctime);
-            maxtot = ap_max(maxtot, s.time);
-            maxd = ap_max(maxd, s.time - s.ctime);
-            maxwait = ap_max(maxwait, s.waittime);
-
-            totalcon += s.ctime;
-            total += s.time;
-            totald += s.time - s.ctime;
-            totalwait += s.waittime;
+        for (i = 0; i < done; i++) {
+            struct data *s = &stats[i];
+            mincon = ap_min(mincon, s->ctime);
+            mintot = ap_min(mintot, s->time);
+            mind = ap_min(mind, s->time - s->ctime);
+            minwait = ap_min(minwait, s->waittime);
+
+            maxcon = ap_max(maxcon, s->ctime);
+            maxtot = ap_max(maxtot, s->time);
+            maxd = ap_max(maxd, s->time - s->ctime);
+            maxwait = ap_max(maxwait, s->waittime);
+
+            totalcon += s->ctime;
+            total += s->time;
+            totald += s->time - s->ctime;
+            totalwait += s->waittime;
         }
-        meancon = totalcon / requests;
-        meantot = total / requests;
-        meand = totald / requests;
-        meanwait = totalwait / requests;
+        meancon = totalcon / done;
+        meantot = total / done;
+        meand = totald / done;
+        meanwait = totalwait / done;
 
         /* calculating the sample variance: the sum of the squared deviations, divided by n-1 */
-        for (i = 0; i < requests; i++) {
-            struct data s = stats[i];
+        for (i = 0; i < done; i++) {
+            struct data *s = &stats[i];
             double a;
-            a = ((double)s.time - meantot);
+            a = ((double)s->time - meantot);
             sdtot += a * a;
-            a = ((double)s.ctime - meancon);
+            a = ((double)s->ctime - meancon);
             sdcon += a * a;
-            a = ((double)s.time - (double)s.ctime - meand);
+            a = ((double)s->time - (double)s->ctime - meand);
             sdd += a * a;
-            a = ((double)s.waittime - meanwait);
+            a = ((double)s->waittime - meanwait);
             sdwait += a * a;
         }
 
-        sdtot = (requests > 1) ? sqrt(sdtot / (requests - 1)) : 0;
-        sdcon = (requests > 1) ? sqrt(sdcon / (requests - 1)) : 0;
-        sdd = (requests > 1) ? sqrt(sdd / (requests - 1)) : 0;
-        sdwait = (requests > 1) ? sqrt(sdwait / (requests - 1)) : 0;
+        sdtot = (done > 1) ? sqrt(sdtot / (done - 1)) : 0;
+        sdcon = (done > 1) ? sqrt(sdcon / (done - 1)) : 0;
+        sdd = (done > 1) ? sqrt(sdd / (done - 1)) : 0;
+        sdwait = (done > 1) ? sqrt(sdwait / (done - 1)) : 0;
 
-        if (gnuplot) {
-            FILE *out = fopen(gnuplot, "w");
-            long i;
-            apr_time_t sttime;
-            char tmstring[1024];/* XXXX */
-            if (!out) {
-                perror("Cannot open gnuplot output file");
-                exit(1);
-            }
-            fprintf(out, "starttime\tseconds\tctime\tdtime\tttime\twait\n");
-            for (i = 0; i < requests; i++) {
-                apr_time_t diff = stats[i].time - stats[i].ctime;
-
-                sttime = stats[i].starttime;
-                (void) apr_ctime(tmstring, sttime);
-                fprintf(out, "%s\t%" APR_TIME_T_FMT "\t%" APR_TIME_T_FMT "\t%" APR_TIME_T_FMT "\t%" APR_TIME_T_FMT "\t%" APR_TIME_T_FMT "\n",
-                tmstring,
-                sttime,
-                stats[i].ctime,
-                diff,
-                stats[i].time,
-                stats[i].waittime);
-            }
-            fclose(out);
-        }
         /*
          * XXX: what is better; this hideous cast of the compradre function; or
          * the four warnings during compile ? dirkx just does not know and
          * hates both/
          */
-        qsort(stats, requests, sizeof(struct data),
+        qsort(stats, done, sizeof(struct data),
               (int (*) (const void *, const void *)) compradre);
-        if ((requests > 1) && (requests % 2))
-            mediancon = (stats[requests / 2].ctime + stats[requests / 2 + 1].ctime) / 2;
+        if ((done > 1) && (done % 2))
+            mediancon = (stats[done / 2].ctime + stats[done / 2 + 1].ctime) / 2;
         else
-            mediancon = stats[requests / 2].ctime;
+            mediancon = stats[done / 2].ctime;
 
-        qsort(stats, requests, sizeof(struct data),
+        qsort(stats, done, sizeof(struct data),
               (int (*) (const void *, const void *)) compri);
-        if ((requests > 1) && (requests % 2))
-            mediand = (stats[requests / 2].time + stats[requests / 2 + 1].time \
-            -stats[requests / 2].ctime - stats[requests / 2 + 1].ctime) / 2;
+        if ((done > 1) && (done % 2))
+            mediand = (stats[done / 2].time + stats[done / 2 + 1].time \
+            -stats[done / 2].ctime - stats[done / 2 + 1].ctime) / 2;
         else
-            mediand = stats[requests / 2].time - stats[requests / 2].ctime;
+            mediand = stats[done / 2].time - stats[done / 2].ctime;
 
-        qsort(stats, requests, sizeof(struct data),
+        qsort(stats, done, sizeof(struct data),
               (int (*) (const void *, const void *)) compwait);
-        if ((requests > 1) && (requests % 2))
-            medianwait = (stats[requests / 2].waittime + stats[requests / 2 + 1].waittime) / 2;
+        if ((done > 1) && (done % 2))
+            medianwait = (stats[done / 2].waittime + stats[done / 2 + 1].waittime) / 2;
         else
-            medianwait = stats[requests / 2].waittime;
+            medianwait = stats[done / 2].waittime;
 
-        qsort(stats, requests, sizeof(struct data),
+        qsort(stats, done, sizeof(struct data),
               (int (*) (const void *, const void *)) comprando);
-        if ((requests > 1) && (requests % 2))
-            mediantot = (stats[requests / 2].time + stats[requests / 2 + 1].time) / 2;
+        if ((done > 1) && (done % 2))
+            mediantot = (stats[done / 2].time + stats[done / 2 + 1].time) / 2;
         else
-            mediantot = stats[requests / 2].time;
+            mediantot = stats[done / 2].time;
 
         printf("\nConnection Times (ms)\n");
+        /*
+         * Reduce stats from apr time to milliseconds
+         */
+        mincon     = ap_round_ms(mincon);
+        mind       = ap_round_ms(mind);
+        minwait    = ap_round_ms(minwait);
+        mintot     = ap_round_ms(mintot);
+        meancon    = ap_round_ms(meancon);
+        meand      = ap_round_ms(meand);
+        meanwait   = ap_round_ms(meanwait);
+        meantot    = ap_round_ms(meantot);
+        mediancon  = ap_round_ms(mediancon);
+        mediand    = ap_round_ms(mediand);
+        medianwait = ap_round_ms(medianwait);
+        mediantot  = ap_round_ms(mediantot);
+        maxcon     = ap_round_ms(maxcon);
+        maxd       = ap_round_ms(maxd);
+        maxwait    = ap_round_ms(maxwait);
+        maxtot     = ap_round_ms(maxtot);
+        sdcon      = ap_double_ms(sdcon);
+        sdd        = ap_double_ms(sdd);
+        sdwait     = ap_double_ms(sdwait);
+        sdtot      = ap_double_ms(sdtot);
 
         if (confidence) {
-#define CONF_FMT_STRING "%5" APR_TIME_T_FMT " %4d %5.1f %6" APR_TIME_T_FMT " %7" APR_TIME_T_FMT "\n"
+#define CONF_FMT_STRING "%5" APR_TIME_T_FMT " %4" APR_TIME_T_FMT " %5.1f %6" APR_TIME_T_FMT " %7" APR_TIME_T_FMT "\n"
             printf("              min  mean[+/-sd] median   max\n");
             printf("Connect:    " CONF_FMT_STRING,
-                       mincon, (int) (meancon + 0.5), sdcon, mediancon, maxcon);
+                   mincon, meancon, sdcon, mediancon, maxcon);
             printf("Processing: " CONF_FMT_STRING,
-               mind, (int) (meand + 0.5), sdd, mediand, maxd);
+                   mind, meand, sdd, mediand, maxd);
             printf("Waiting:    " CONF_FMT_STRING,
-                   minwait, (int) (meanwait + 0.5), sdwait, medianwait, maxwait);
+                   minwait, meanwait, sdwait, medianwait, maxwait);
             printf("Total:      " CONF_FMT_STRING,
-               mintot, (int) (meantot + 0.5), sdtot, mediantot, maxtot);
+                   mintot, meantot, sdtot, mediantot, maxtot);
 #undef CONF_FMT_STRING
 
 #define     SANE(what,mean,median,sd) \
@@ -928,51 +922,73 @@ static void output_results(void)
         else {
             printf("              min   avg   max\n");
 #define CONF_FMT_STRING "%5" APR_TIME_T_FMT " %5" APR_TIME_T_FMT "%5" APR_TIME_T_FMT "\n"
-            printf("Connect:    " CONF_FMT_STRING,
-                mincon, meancon, maxcon);
-            printf("Processing: " CONF_FMT_STRING,
-                mintot - mincon, meantot - meancon,  maxtot - maxcon);
-            printf("Total:      " CONF_FMT_STRING,
-                mintot, meantot, maxtot);
+            printf("Connect:    " CONF_FMT_STRING, mincon, meancon, maxcon);
+            printf("Processing: " CONF_FMT_STRING, mintot - mincon,
+                                                   meantot - meancon,
+                                                   maxtot - maxcon);
+            printf("Total:      " CONF_FMT_STRING, mintot, meantot, maxtot);
 #undef CONF_FMT_STRING
         }
 
 
         /* Sorted on total connect times */
-        if (percentile && (requests > 1)) {
+        if (percentile && (done > 1)) {
             printf("\nPercentage of the requests served within a certain time (ms)\n");
             for (i = 0; i < sizeof(percs) / sizeof(int); i++) {
                 if (percs[i] <= 0)
                     printf(" 0%%  <0> (never)\n");
                 else if (percs[i] >= 100)
                     printf(" 100%%  %5" APR_TIME_T_FMT " (longest request)\n",
-                           stats[requests - 1].time);
+                           ap_round_ms(stats[done - 1].time));
                 else
                     printf("  %d%%  %5" APR_TIME_T_FMT "\n", percs[i],
-                           stats[(int) (requests * percs[i] / 100)].time);
+                           ap_round_ms(stats[(int) (done * percs[i] / 100)].time));
             }
         }
         if (csvperc) {
             FILE *out = fopen(csvperc, "w");
-            int i;
             if (!out) {
                 perror("Cannot open CSV output file");
                 exit(1);
             }
             fprintf(out, "" "Percentage served" "," "Time in ms" "\n");
             for (i = 0; i < 100; i++) {
-                apr_time_t t;
+                double t;
                 if (i == 0)
-                    t = stats[0].time;
+                    t = ap_double_ms(stats[0].time);
                 else if (i == 100)
-                    t = stats[requests - 1].time;
+                    t = ap_double_ms(stats[done - 1].time);
                 else
-                    t = stats[(int) (0.5 + requests * i / 100.0)].time;
-                fprintf(out, "%d,%e\n", i, (double)t);
+                    t = ap_double_ms(stats[(int) (0.5 + done * i / 100.0)].time);
+                fprintf(out, "%d,%.3f\n", i, t);
+            }
+            fclose(out);
+        }
+        if (gnuplot) {
+            FILE *out = fopen(gnuplot, "w");
+            char tmstring[APR_CTIME_LEN];
+            if (!out) {
+                perror("Cannot open gnuplot output file");
+                exit(1);
+            }
+            fprintf(out, "starttime\tseconds\tctime\tdtime\tttime\twait\n");
+            for (i = 0; i < done; i++) {
+                (void) apr_ctime(tmstring, stats[i].starttime);
+                fprintf(out, "%s\t%" APR_TIME_T_FMT "\t%" APR_TIME_T_FMT
+                               "\t%" APR_TIME_T_FMT "\t%" APR_TIME_T_FMT
+                               "\t%" APR_TIME_T_FMT "\n", tmstring,
+                        apr_time_sec(stats[i].starttime),
+                        ap_round_ms(stats[i].ctime),
+                        ap_round_ms(stats[i].time - stats[i].ctime),
+                        ap_round_ms(stats[i].time),
+                        ap_round_ms(stats[i].waittime));
             }
             fclose(out);
         }
+    }
 
+    if (sig) {
+        exit(1);
     }
 }
 
@@ -982,10 +998,7 @@ static void output_results(void)
 
 static void output_html_results(void)
 {
-    long timetaken;
-
-    endtime = apr_time_now();
-    timetaken = (long)((endtime - start) / 1000);
+    double timetaken = (double) (lasttime - start) / APR_USEC_PER_SEC;
 
     printf("\n\n<table %s>\n", tablestring);
     printf("<tr %s><th colspan=2 %s>Server Software:</th>"
@@ -1007,14 +1020,13 @@ static void output_html_results(void)
        "<td colspan=2 %s>%d</td></tr>\n",
        trstring, tdstring, tdstring, concurrency);
     printf("<tr %s><th colspan=2 %s>Time taken for tests:</th>"
-       "<td colspan=2 %s>%" APR_INT64_T_FMT ".%03ld seconds</td></tr>\n",
-       trstring, tdstring, tdstring, apr_time_sec(timetaken),
-           (long)apr_time_usec(timetaken));
+       "<td colspan=2 %s>%.3f seconds</td></tr>\n",
+       trstring, tdstring, tdstring, timetaken);
     printf("<tr %s><th colspan=2 %s>Complete requests:</th>"
-       "<td colspan=2 %s>%ld</td></tr>\n",
+       "<td colspan=2 %s>%d</td></tr>\n",
        trstring, tdstring, tdstring, done);
     printf("<tr %s><th colspan=2 %s>Failed requests:</th>"
-       "<td colspan=2 %s>%ld</td></tr>\n",
+       "<td colspan=2 %s>%d</td></tr>\n",
        trstring, tdstring, tdstring, bad);
     if (bad)
         printf("<tr %s><td colspan=4 %s >   (Connect: %d, Length: %d, Exceptions: %d)</td></tr>\n",
@@ -1025,56 +1037,65 @@ static void output_html_results(void)
            trstring, tdstring, tdstring, err_response);
     if (keepalive)
         printf("<tr %s><th colspan=2 %s>Keep-Alive requests:</th>"
-           "<td colspan=2 %s>%ld</td></tr>\n",
+           "<td colspan=2 %s>%d</td></tr>\n",
            trstring, tdstring, tdstring, doneka);
     printf("<tr %s><th colspan=2 %s>Total transferred:</th>"
-       "<td colspan=2 %s>%ld bytes</td></tr>\n",
+       "<td colspan=2 %s>%" APR_INT64_T_FMT " bytes</td></tr>\n",
        trstring, tdstring, tdstring, totalread);
     if (posting > 0)
         printf("<tr %s><th colspan=2 %s>Total POSTed:</th>"
-           "<td colspan=2 %s>%ld</td></tr>\n",
+           "<td colspan=2 %s>%" APR_INT64_T_FMT "</td></tr>\n",
            trstring, tdstring, tdstring, totalposted);
     printf("<tr %s><th colspan=2 %s>HTML transferred:</th>"
-       "<td colspan=2 %s>%ld bytes</td></tr>\n",
+       "<td colspan=2 %s>%" APR_INT64_T_FMT " bytes</td></tr>\n",
        trstring, tdstring, tdstring, totalbread);
 
     /* avoid divide by zero */
     if (timetaken) {
         printf("<tr %s><th colspan=2 %s>Requests per second:</th>"
            "<td colspan=2 %s>%.2f</td></tr>\n",
-           trstring, tdstring, tdstring, 1000 * (float) (done) / timetaken);
+           trstring, tdstring, tdstring, (double) done * 1000 / timetaken);
         printf("<tr %s><th colspan=2 %s>Transfer rate:</th>"
            "<td colspan=2 %s>%.2f kb/s received</td></tr>\n",
-           trstring, tdstring, tdstring, (float) (totalread) / timetaken);
+           trstring, tdstring, tdstring, (double) totalread / timetaken);
         if (posting > 0) {
             printf("<tr %s><td colspan=2 %s>&nbsp;</td>"
                "<td colspan=2 %s>%.2f kb/s sent</td></tr>\n",
                trstring, tdstring, tdstring,
-               (float) (totalposted) / timetaken);
+               (double) totalposted / timetaken);
             printf("<tr %s><td colspan=2 %s>&nbsp;</td>"
                "<td colspan=2 %s>%.2f kb/s total</td></tr>\n",
                trstring, tdstring, tdstring,
-               (float) (totalread + totalposted) / timetaken);
+               (double) (totalread + totalposted) / timetaken);
         }
     }
     {
         /* work out connection times */
-        long i;
+        int i;
         apr_interval_time_t totalcon = 0, total = 0;
         apr_interval_time_t mincon = AB_MAX, mintot = AB_MAX;
         apr_interval_time_t maxcon = 0, maxtot = 0;
 
-        for (i = 0; i < requests; i++) {
-            struct data s = stats[i];
-            mincon = ap_min(mincon, s.ctime);
-            mintot = ap_min(mintot, s.time);
-            maxcon = ap_max(maxcon, s.ctime);
-            maxtot = ap_max(maxtot, s.time);
-            totalcon += s.ctime;
-            total += s.time;
+        for (i = 0; i < done; i++) {
+            struct data *s = &stats[i];
+            mincon = ap_min(mincon, s->ctime);
+            mintot = ap_min(mintot, s->time);
+            maxcon = ap_max(maxcon, s->ctime);
+            maxtot = ap_max(maxtot, s->time);
+            totalcon += s->ctime;
+            total    += s->time;
         }
-
-        if (requests > 0) { /* avoid division by zero (if 0 requests) */
+        /*
+         * Reduce stats from apr time to milliseconds
+         */
+        mincon   = ap_round_ms(mincon);
+        mintot   = ap_round_ms(mintot);
+        maxcon   = ap_round_ms(maxcon);
+        maxtot   = ap_round_ms(maxtot);
+        totalcon = ap_round_ms(totalcon);
+        total    = ap_round_ms(total);
+
+        if (done > 0) { /* avoid division by zero (if 0 done) */
             printf("<tr %s><th %s colspan=4>Connnection Times (ms)</th></tr>\n",
                trstring, tdstring);
             printf("<tr %s><th %s>&nbsp;</th> <th %s>min</th>   <th %s>avg</th>   <th %s>max</th></tr>\n",
@@ -1083,18 +1104,18 @@ static void output_html_results(void)
                "<td %s>%5" APR_TIME_T_FMT "</td>"
                "<td %s>%5" APR_TIME_T_FMT "</td>"
                "<td %s>%5" APR_TIME_T_FMT "</td></tr>\n",
-               trstring, tdstring, tdstring, mincon, tdstring, totalcon / requests, tdstring, maxcon);
+               trstring, tdstring, tdstring, mincon, tdstring, totalcon / done, tdstring, maxcon);
             printf("<tr %s><th %s>Processing:</th>"
                "<td %s>%5" APR_TIME_T_FMT "</td>"
                "<td %s>%5" APR_TIME_T_FMT "</td>"
                "<td %s>%5" APR_TIME_T_FMT "</td></tr>\n",
                trstring, tdstring, tdstring, mintot - mincon, tdstring,
-               (total / requests) - (totalcon / requests), tdstring, maxtot - maxcon);
+               (total / done) - (totalcon / done), tdstring, maxtot - maxcon);
             printf("<tr %s><th %s>Total:</th>"
                "<td %s>%5" APR_TIME_T_FMT "</td>"
                "<td %s>%5" APR_TIME_T_FMT "</td>"
                "<td %s>%5" APR_TIME_T_FMT "</td></tr>\n",
-               trstring, tdstring, tdstring, mintot, tdstring, total / requests, tdstring, maxtot);
+               trstring, tdstring, tdstring, mintot, tdstring, total / done, tdstring, maxtot);
         }
         printf("</table>\n");
     }
@@ -1118,8 +1139,9 @@ static void start_connect(struct connection * c)
     c->gotheader = 0;
     c->rwrite = 0;
     if (c->ctx)
-        apr_pool_destroy(c->ctx);
-    apr_pool_create(&c->ctx, cntxt);
+        apr_pool_clear(c->ctx);
+    else
+        apr_pool_create(&c->ctx, cntxt);
 
     if ((rv = apr_socket_create(&c->aprsock, destsa->family,
                 SOCK_STREAM, 0, c->ctx)) != APR_SUCCESS) {
@@ -1129,7 +1151,21 @@ static void start_connect(struct connection * c)
          != APR_SUCCESS) {
         apr_err("socket nonblock", rv);
     }
-    c->start = apr_time_now();
+
+    if (windowsize != 0) {
+        rv = apr_socket_opt_set(c->aprsock, APR_SO_SNDBUF, 
+                                windowsize);
+        if (rv != APR_SUCCESS && rv != APR_ENOTIMPL) {
+            apr_err("socket send buffer", rv);
+        }
+        rv = apr_socket_opt_set(c->aprsock, APR_SO_RCVBUF, 
+                                windowsize);
+        if (rv != APR_SUCCESS && rv != APR_ENOTIMPL) {
+            apr_err("socket receive buffer", rv);
+        }
+    }
+
+    c->start = lasttime = apr_time_now();
 #ifdef USE_SSL
     if (is_ssl) {
         BIO *bio;
@@ -1220,18 +1256,16 @@ static void close_connection(struct connection * c)
         }
         /* save out time */
         if (done < requests) {
-            struct data s;
-            if ((done) && heartbeatres && !(done % heartbeatres)) {
-                fprintf(stderr, "Completed %ld requests\n", done);
+            struct data *s = &stats[done++];
+            c->done      = lasttime = apr_time_now();
+            s->starttime = c->start;
+            s->ctime     = ap_max(0, c->connect - c->start);
+            s->time      = ap_max(0, c->done - c->start);
+            s->waittime  = ap_max(0, c->beginread - c->endwrite);
+            if (heartbeatres && !(done % heartbeatres)) {
+                fprintf(stderr, "Completed %d requests\n", done);
                 fflush(stderr);
             }
-            c->done = apr_time_now();
-            s.read = c->read;
-            s.starttime = c->start;
-            s.ctime = ap_max(0, (c->connect - c->start) / 1000);
-            s.time = ap_max(0, (c->done - c->start) / 1000);
-            s.waittime = ap_max(0, (c->beginread - c->endwrite) / 1000);
-            stats[done++] = s;
         }
     }
 
@@ -1304,10 +1338,18 @@ static void read_connection(struct connection * c)
         }
         /* catch legitimate fatal apr_socket_recv errors */
         else if (status != APR_SUCCESS) {
-            err_except++; /* XXX: is this the right error counter? */
-            /* XXX: Should errors here be fatal, or should we allow a
-             * certain number of them before completely failing? -aaron */
-            apr_err("apr_socket_recv", status);
+            err_recv++;
+            if (recverrok) {
+                bad++;
+                close_connection(c);
+                if (verbosity >= 1) {
+                    char buf[120];
+                    fprintf(stderr,"%s: %s (%d)\n", "apr_socket_recv", apr_strerror(status, buf, sizeof buf), status);
+                }
+                return;
+            } else {
+                apr_err("apr_socket_recv", status);
+            }
         }
     }
 
@@ -1329,8 +1371,8 @@ static void read_connection(struct connection * c)
         status = apr_xlate_conv_buffer(from_ascii, buffer, &inbytes_left,
                            c->cbuff + c->cbx, &outbytes_left);
         if (status || inbytes_left || outbytes_left) {
-            fprintf(stderr, "only simple translation is supported (%d/%u/%u)\n",
-                status, inbytes_left, outbytes_left);
+            fprintf(stderr, "only simple translation is supported (%d/%" APR_SIZE_T_FMT
+                            "/%" APR_SIZE_T_FMT ")\n", status, inbytes_left, outbytes_left);
             exit(1);
         }
 #else
@@ -1424,8 +1466,14 @@ static void read_connection(struct connection * c)
                     cl = strstr(c->cbuff, "Content-length:");
                 if (cl) {
                     c->keepalive = 1;
-                    c->length = atoi(cl + 16);
+                    /* response to HEAD doesn't have entity body */
+                    c->length = posting >= 0 ? atoi(cl + 16) : 0;
                 }
+                /* The response may not have a Content-Length header */
+                if (!cl) {
+                    c->keepalive = 1;
+                    c->length = 0; 
+                }	
             }
             c->bread += c->cbx - (s + l - c->cbuff) + r - tocopy;
             totalbread += c->bread;
@@ -1450,26 +1498,25 @@ static void read_connection(struct connection * c)
             err_length++;
         }
         if (done < requests) {
-            struct data s;
+            struct data *s = &stats[done++];
             doneka++;
-            if (done && heartbeatres && !(done % heartbeatres)) {
-                fprintf(stderr, "Completed %ld requests\n", done);
+            c->done      = apr_time_now();
+            s->starttime = c->start;
+            s->ctime     = ap_max(0, c->connect - c->start);
+            s->time      = ap_max(0, c->done - c->start);
+            s->waittime  = ap_max(0, c->beginread - c->endwrite);
+            if (heartbeatres && !(done % heartbeatres)) {
+                fprintf(stderr, "Completed %d requests\n", done);
                 fflush(stderr);
             }
-            c->done = apr_time_now();
-            s.read = c->read;
-            s.starttime = c->start;
-            s.ctime = ap_max(0, (c->connect - c->start) / 1000);
-            s.waittime = ap_max(0, (c->beginread - c->endwrite) / 1000);
-            s.time = ap_max(0, (c->done - c->start) / 1000);
-            stats[done++] = s;
         }
         c->keepalive = 0;
         c->length = 0;
         c->gotheader = 0;
         c->cbx = 0;
         c->read = c->bread = 0;
-        c->start = c->connect = apr_time_now(); /* zero connect time with keep-alive */
+        /* zero connect time with keep-alive */
+        c->start = c->connect = lasttime = apr_time_now();
         write_request(c);
     }
 }
@@ -1480,9 +1527,9 @@ static void read_connection(struct connection * c)
 
 static void test(void)
 {
-    apr_time_t now;
+    apr_time_t stoptime;
     apr_int16_t rv;
-    long i;
+    int i;
     apr_status_t status;
     int snprintf_res = 0;
 #ifdef NOT_ASCII
@@ -1507,8 +1554,6 @@ static void test(void)
     fflush(stdout);
     }
 
-    now = apr_time_now();
-
     con = calloc(concurrency, sizeof(struct connection));
 
     stats = calloc(requests, sizeof(struct data));
@@ -1595,8 +1640,9 @@ static void test(void)
     status = apr_xlate_conv_buffer(to_ascii, request, &inbytes_left,
                    request, &outbytes_left);
     if (status || inbytes_left || outbytes_left) {
-        fprintf(stderr, "only simple translation is supported (%d/%u/%u)\n",
-           status, inbytes_left, outbytes_left);
+        fprintf(stderr, "only simple translation is supported (%d/%"
+                        APR_SIZE_T_FMT "/%" APR_SIZE_T_FMT ")\n",
+                        status, inbytes_left, outbytes_left);
         exit(1);
     }
 #endif              /* NOT_ASCII */
@@ -1611,7 +1657,13 @@ static void test(void)
     }
 
     /* ok - lets start */
-    start = apr_time_now();
+    start = lasttime = apr_time_now();
+    stoptime = tlimit ? (start + apr_time_from_sec(tlimit)) : AB_MAX;
+
+#ifdef SIGINT 
+    /* Output the results if the user terminates the run early. */
+    apr_signal(SIGINT, output_results);
+#endif
 
     /* initialise lots of requests */
     for (i = 0; i < concurrency; i++) {
@@ -1619,18 +1671,9 @@ static void test(void)
         start_connect(&con[i]);
     }
 
-    while (done < requests) {
+    do {
         apr_int32_t n;
-        apr_int32_t timed;
-            const apr_pollfd_t *pollresults;
-
-        /* check for time limit expiry */
-        now = apr_time_now();
-        timed = (apr_int32_t)apr_time_sec(now - start);
-        if (tlimit && timed >= tlimit) {
-            requests = done;    /* so stats are correct */
-            break;      /* no need to do another round */
-        }
+        const apr_pollfd_t *pollresults;
 
         n = concurrency;
         status = apr_pollset_poll(readbits, aprtimeout, &n, &pollresults);
@@ -1645,7 +1688,7 @@ static void test(void)
             const apr_pollfd_t *next_fd = &(pollresults[i]);
             struct connection *c;
 
-                c = next_fd->client_data;
+            c = next_fd->client_data;
 
             /*
              * If the connection isn't connected how can we check it?
@@ -1733,17 +1776,17 @@ static void test(void)
                     apr_pollset_add(readbits, &new_pollfd);
                 }
         }
-    }
-
+    } while (lasttime < stoptime && done < requests);
+    
     if (heartbeatres)
-        fprintf(stderr, "Finished %ld requests\n", done);
+        fprintf(stderr, "Finished %d requests\n", done);
     else
         printf("..done\n");
 
     if (use_html)
         output_html_results();
     else
-        output_results();
+        output_results(0);
 }
 
 /* ------------------------------------------------------- */
@@ -1752,16 +1795,16 @@ static void test(void)
 static void copyright(void)
 {
     if (!use_html) {
-        printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.146 $> apache-2.0");
+        printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 655654 $>");
         printf("Copyright 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
-        printf("Copyright 2006 The Apache Software Foundation, http://www.apache.org/\n");
+        printf("Licensed to The Apache Software Foundation, http://www.apache.org/\n");
         printf("\n");
     }
     else {
         printf("<p>\n");
-        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AP_AB_BASEREVISION, "$Revision: 1.146 $");
+        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i><br>\n", AP_AB_BASEREVISION, "$Revision: 655654 $");
         printf(" Copyright 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
-        printf(" Copyright 2006 The Apache Software Foundation, http://www.apache.org/<br>\n");
+        printf(" Licensed to The Apache Software Foundation, http://www.apache.org/<br>\n");
         printf("</p>\n<p>\n");
     }
 }
@@ -1774,12 +1817,17 @@ static void usage(const char *progname)
         "[s]"
 #endif
         "://]hostname[:port]/path\n", progname);
+/* 80 column ruler:  ********************************************************************************
+ */
     fprintf(stderr, "Options are:\n");
     fprintf(stderr, "    -n requests     Number of requests to perform\n");
     fprintf(stderr, "    -c concurrency  Number of multiple requests to make\n");
     fprintf(stderr, "    -t timelimit    Seconds to max. wait for responses\n");
-    fprintf(stderr, "    -p postfile     File containing data to POST\n");
-    fprintf(stderr, "    -T content-type Content-type header for POSTing\n");
+    fprintf(stderr, "    -b windowsize   Size of TCP send/receive buffer, in bytes\n");
+    fprintf(stderr, "    -p postfile     File containing data to POST. Remember also to set -T\n");
+    fprintf(stderr, "    -T content-type Content-type header for POSTing, eg.\n");
+    fprintf(stderr, "                    'application/x-www-form-urlencoded'\n");
+    fprintf(stderr, "                    Default is 'text/plain'\n");
     fprintf(stderr, "    -v verbosity    How much troubleshooting info to print\n");
     fprintf(stderr, "    -w              Print out results in HTML tables\n");
     fprintf(stderr, "    -i              Use HEAD instead of GET\n");
@@ -1800,6 +1848,7 @@ static void usage(const char *progname)
     fprintf(stderr, "    -S              Do not show confidence estimators and warnings.\n");
     fprintf(stderr, "    -g filename     Output collected data to gnuplot format file.\n");
     fprintf(stderr, "    -e filename     Output CSV file with percentages served\n");
+    fprintf(stderr, "    -r              Don't exit on socket receive errors.\n");
     fprintf(stderr, "    -h              Display usage information (this message)\n");
 #ifdef USE_SSL
     fprintf(stderr, "    -Z ciphersuite  Specify SSL/TLS cipher suite (See openssl ciphers)\n");
@@ -1898,7 +1947,12 @@ static int open_postfile(const char *pfile)
         return rv;
     }
 
-    apr_file_info_get(&finfo, APR_FINFO_NORM, postfd);
+    rv = apr_file_info_get(&finfo, APR_FINFO_NORM, postfd);
+    if (rv != APR_SUCCESS) {
+        fprintf(stderr, "ab: Could not stat POST data file (%s): %s\n", pfile,
+                apr_strerror(rv, errmsg, sizeof errmsg));
+        return rv;
+    }
     postlen = (apr_size_t)finfo.size;
     postdata = malloc(postlen);
     if (!postdata) {
@@ -1962,7 +2016,7 @@ int main(int argc, const char * const argv[])
 #endif
 
     apr_getopt_init(&opt, cntxt, argc, argv);
-    while ((status = apr_getopt(opt, "n:c:t:T:p:v:kVhwix:y:z:C:H:P:A:g:X:de:Sq"
+    while ((status = apr_getopt(opt, "n:c:t:b:T:p:v:rkVhwix:y:z:C:H:P:A:g:X:de:Sq"
 #ifdef USE_SSL
             "Z:f:"
 #endif
@@ -1970,7 +2024,7 @@ int main(int argc, const char * const argv[])
         switch (c) {
             case 'n':
                 requests = atoi(optarg);
-                if (!requests) {
+                if (requests <= 0) {
                     err("Invalid number of requests\n");
                 }
                 break;
@@ -1983,6 +2037,9 @@ int main(int argc, const char * const argv[])
             case 'c':
                 concurrency = atoi(optarg);
                 break;
+            case 'b':
+                windowsize = atoi(optarg);
+                break;
             case 'i':
                 if (posting == 1)
                 err("Cannot mix POST and HEAD\n");
@@ -2010,6 +2067,9 @@ int main(int argc, const char * const argv[])
                     exit(r);
                 }
                 break;
+            case 'r':
+                recverrok = 1;
+                break;
             case 'v':
                 verbosity = atoi(optarg);
                 break;
diff --git a/support/htpasswd.c b/support/htpasswd.c
index 6bce702d..2eadc78e 100644
--- a/support/htpasswd.c
+++ b/support/htpasswd.c
@@ -115,6 +115,30 @@ static void to64(char *s, unsigned long v, int n)
     }
 }
 
+static void generate_salt(char *s, size_t size)
+{
+    static unsigned char tbl[] = 
+        "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+    size_t i;
+    for (i = 0; i < size; ++i) {
+        int idx = (int) (64.0 * rand() / (RAND_MAX + 1.0));
+        s[i] = tbl[idx];
+    }
+}
+
+static apr_status_t seed_rand(void)
+{
+    int seed = 0;
+    apr_status_t rv;
+    rv = apr_generate_random_bytes((unsigned char*) &seed, sizeof(seed));
+    if (rv) {
+        apr_file_printf(errfile, "Unable to generate random bytes: %pm" NL, &rv);
+        return rv;
+    }
+    srand(seed);
+    return rv;
+}
+
 static void putline(apr_file_t *f, const char *l)
 {
     apr_file_puts(l, f);
@@ -162,8 +186,10 @@ static int mkrecord(char *user, char *record, apr_size_t rlen, char *passwd,
         break;
 
     case ALG_APMD5:
-        (void) srand((int) time((time_t *) NULL));
-        to64(&salt[0], rand(), 8);
+        if (seed_rand()) {
+            break;
+        }
+        generate_salt(&salt[0], 8);
         salt[8] = '\0';
 
         apr_md5_encode((const char *)pw, (const char *)salt,
@@ -178,7 +204,9 @@ static int mkrecord(char *user, char *record, apr_size_t rlen, char *passwd,
 #if !(defined(WIN32) || defined(NETWARE))
     case ALG_CRYPT:
     default:
-        (void) srand((int) time((time_t *) NULL));
+        if (seed_rand()) {
+            break;
+        }
         to64(&salt[0], rand(), 8);
         salt[8] = '\0';
 
diff --git a/support/htpasswd.dsp b/support/htpasswd.dsp
index 871316f6..4bd9b536 100644
--- a/support/htpasswd.dsp
+++ b/support/htpasswd.dsp
@@ -49,8 +49,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /debug /opt:ref
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib rpcrt4.lib /nologo /subsystem:console
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib rpcrt4.lib /nologo /subsystem:console /debug /opt:ref
 # Begin Special Build Tool
 TargetPath=.\Release\htpasswd.exe
 SOURCE="$(InputPath)"
@@ -79,8 +79,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib /nologo /subsystem:console /incremental:no /debug
+# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib rpcrt4.lib /nologo /subsystem:console /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib shell32.lib rpcrt4.lib /nologo /subsystem:console /incremental:no /debug
 # Begin Special Build Tool
 TargetPath=.\Debug\htpasswd.exe
 SOURCE="$(InputPath)"
diff --git a/support/rotatelogs.c b/support/rotatelogs.c
index a408540a..8fd99dc7 100644
--- a/support/rotatelogs.c
+++ b/support/rotatelogs.c
@@ -31,6 +31,9 @@
  * interval.  NB: Using -l in an environment which changes the GMT offset
  * (such as for BST or DST) can lead to unpredictable results!
  *
+ * -f option added Feb, 2008. This causes rotatelog to open/create
+ *    the logfile as soon as it's started, not as soon as it sees
+ *    data.
  */
 
 
@@ -55,7 +58,7 @@
 #endif
 
 #define BUFSIZE         65536
-#define ERRMSGSZ        128
+#define ERRMSGSZ        256
 
 #ifndef MAX_PATH
 #define MAX_PATH        1024
@@ -67,7 +70,7 @@ static void usage(const char *argv0, const char *reason)
         fprintf(stderr, "%s\n", reason);
     }
     fprintf(stderr,
-            "Usage: %s [-l] <logfile> "
+            "Usage: %s [-l] [-f] <logfile> "
             "{<rotation time in seconds>|<rotation size in megabytes>} "
             "[offset minutes from UTC]\n\n",
             argv0);
@@ -92,6 +95,21 @@ static void usage(const char *argv0, const char *reason)
     exit(1);
 }
 
+static int get_now(int use_localtime, int utc_offset)
+{
+    apr_time_t tNow = apr_time_now();
+    if (use_localtime) {
+        /* Check for our UTC offset before using it, since it might
+         * change if there's a switch between standard and daylight
+         * savings time.
+         */
+        apr_time_exp_t lt;
+        apr_time_exp_lt(&lt, tNow);
+        utc_offset = lt.tm_gmtoff;
+    }
+    return (int)apr_time_sec(tNow) + utc_offset;
+}
+
 int main (int argc, const char * const argv[])
 {
     char buf[BUFSIZE], buf2[MAX_PATH], errbuf[ERRMSGSZ];
@@ -101,10 +119,13 @@ int main (int argc, const char * const argv[])
     apr_size_t nRead, nWrite;
     int use_strftime = 0;
     int use_localtime = 0;
+    int bypass_io = 0;
     int now = 0;
     const char *szLogRoot;
     apr_file_t *f_stdin, *nLogFD = NULL, *nLogFDprev = NULL;
     apr_pool_t *pool;
+    apr_pool_t *pfile = NULL;
+    apr_pool_t *pfile_prev = NULL;
     apr_getopt_t *opt;
     apr_status_t rv;
     char c;
@@ -116,11 +137,14 @@ int main (int argc, const char * const argv[])
 
     apr_pool_create(&pool, NULL);
     apr_getopt_init(&opt, pool, argc, argv);
-    while ((rv = apr_getopt(opt, "l", &c, &optarg)) == APR_SUCCESS) {
+    while ((rv = apr_getopt(opt, "lf", &c, &optarg)) == APR_SUCCESS) {
         switch (c) {
         case 'l':
             use_localtime = 1;
             break;
+        case 'f':
+            bypass_io = 1;
+            break;
         }
     }
 
@@ -166,21 +190,20 @@ int main (int argc, const char * const argv[])
 
     for (;;) {
         nRead = sizeof(buf);
-        if (apr_file_read(f_stdin, buf, &nRead) != APR_SUCCESS) {
-            exit(3);
+        /*
+         * Bypass reading stdin if we are forcing the logfile
+         * to be opened as soon as we start. Since we won't be
+         * writing anything, we just want to open the file.
+         * First time through is the only time we do this
+         * since we reset bypass_io after the 1st loop
+         */
+        if (!bypass_io) {
+            if (apr_file_read(f_stdin, buf, &nRead) != APR_SUCCESS) {
+                exit(3);
+            }
         }
         if (tRotation) {
-            /*
-             * Check for our UTC offset every time through the loop, since
-             * it might change if there's a switch between standard and
-             * daylight savings time.
-             */
-            if (use_localtime) {
-                apr_time_exp_t lt;
-                apr_time_exp_lt(&lt, apr_time_now());
-                utc_offset = lt.tm_gmtoff;
-            }
-            now = (int)(apr_time_now() / APR_USEC_PER_SEC) + utc_offset;
+            now = get_now(use_localtime, utc_offset);
             if (nLogFD != NULL && now >= tLogEnd) {
                 nLogFDprev = nLogFD;
                 nLogFD = NULL;
@@ -213,16 +236,7 @@ int main (int argc, const char * const argv[])
                 tLogStart = (now / tRotation) * tRotation;
             }
             else {
-                if (use_localtime) {
-                    /* Check for our UTC offset before using it, since it might
-                     * change if there's a switch between standard and daylight
-                     * savings time.
-                     */
-                    apr_time_exp_t lt;
-                    apr_time_exp_lt(&lt, apr_time_now());
-                    utc_offset = lt.tm_gmtoff;
-                }
-                tLogStart = (int)apr_time_sec(apr_time_now()) + utc_offset;
+                tLogStart = get_now(use_localtime, utc_offset);
             }
 
             if (use_strftime) {
@@ -237,8 +251,10 @@ int main (int argc, const char * const argv[])
                 sprintf(buf2, "%s.%010d", szLogRoot, tLogStart);
             }
             tLogEnd = tLogStart + tRotation;
+            pfile_prev = pfile;
+            apr_pool_create(&pfile, pool);
             rv = apr_file_open(&nLogFD, buf2, APR_WRITE | APR_CREATE | APR_APPEND,
-                               APR_OS_DEFAULT, pool);
+                               APR_OS_DEFAULT, pfile);
             if (rv != APR_SUCCESS) {
                 char error[120];
 
@@ -253,6 +269,8 @@ int main (int argc, const char * const argv[])
                 }
                 else {
                     nLogFD = nLogFDprev;
+                    apr_pool_destroy(pfile);
+                    pfile = pfile_prev;
                     /* Try to keep this error message constant length
                      * in case it occurs several times. */
                     apr_snprintf(errbuf, sizeof errbuf,
@@ -269,26 +287,58 @@ int main (int argc, const char * const argv[])
             }
             else if (nLogFDprev) {
                 apr_file_close(nLogFDprev);
+                if (pfile_prev) {
+                    apr_pool_destroy(pfile_prev);
+                }
             }
             nMessCount = 0;
         }
-        nWrite = nRead;
-        apr_file_write(nLogFD, buf, &nWrite);
-        if (nWrite != nRead) {
-            nMessCount++;
-            sprintf(errbuf,
-                    "Error writing to log file. "
-                    "%10d messages lost.\n",
-                    nMessCount);
-            nWrite = strlen(errbuf);
-            apr_file_trunc(nLogFD, 0);
-            if (apr_file_write(nLogFD, errbuf, &nWrite) != APR_SUCCESS) {
-                fprintf(stderr, "Error writing to the file %s\n", buf2);
+        /*
+         * If we just bypassed reading stdin, due to bypass_io,
+         * then we have nothing to write, so skip this.
+         */
+        if (!bypass_io) {
+            nWrite = nRead;
+            rv = apr_file_write(nLogFD, buf, &nWrite);
+            if (rv == APR_SUCCESS && nWrite != nRead) {
+                /* buffer partially written, which for rotatelogs means we encountered
+                 * an error such as out of space or quota or some other limit reached;
+                 * try to write the rest so we get the real error code
+                 */
+                apr_size_t nWritten = nWrite;
+
+                nRead  = nRead - nWritten;
+                nWrite = nRead;
+                rv = apr_file_write(nLogFD, buf + nWritten, &nWrite);
+            }
+            if (nWrite != nRead) {
+                char strerrbuf[120];
+                apr_off_t cur_offset;
+                
+                cur_offset = 0;
+                if (apr_file_seek(nLogFD, APR_CUR, &cur_offset) != APR_SUCCESS) {
+                    cur_offset = -1;
+                }
+                apr_strerror(rv, strerrbuf, sizeof strerrbuf);
+                nMessCount++;
+                apr_snprintf(errbuf, sizeof errbuf,
+                             "Error %d writing to log file at offset %" APR_OFF_T_FMT ". "
+                             "%10d messages lost (%s)\n",
+                             rv, cur_offset, nMessCount, strerrbuf);
+                nWrite = strlen(errbuf);
+                apr_file_trunc(nLogFD, 0);
+                if (apr_file_write(nLogFD, errbuf, &nWrite) != APR_SUCCESS) {
+                    fprintf(stderr, "Error writing to the file %s\n", buf2);
                 exit(2);
+                }
+            }
+            else {
+                nMessCount++;
             }
         }
         else {
-            nMessCount++;
+           /* now worry about reading 'n writing all the time */
+           bypass_io = 0;
         }
     }
     /* Of course we never, but prevent compiler warnings */
diff --git a/support/suexec.c b/support/suexec.c
index 1037a06c..59371be0 100644
--- a/support/suexec.c
+++ b/support/suexec.c
@@ -395,13 +395,15 @@ int main(int argc, char *argv[])
             log_err("invalid target group name: (%s)\n", target_gname);
             exit(106);
         }
-        gid = gr->gr_gid;
-        actual_gname = strdup(gr->gr_name);
     }
     else {
-        gid = atoi(target_gname);
-        actual_gname = strdup(target_gname);
+        if ((gr = getgrgid(atoi(target_gname))) == NULL) {
+            log_err("invalid target group id: (%s)\n", target_gname);
+            exit(106);
+        }
     }
+    gid = gr->gr_gid;
+    actual_gname = strdup(gr->gr_name);
 
 #ifdef _OSD_POSIX
     /*
diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c
index fa5a3f89..6d97fb7b 100644
--- a/support/win32/ApacheMonitor.c
+++ b/support/win32/ApacheMonitor.c
@@ -23,7 +23,7 @@
  * ====================================================================
  */
 
-#define _WIN32_WINNT 0x0400
+#define _WIN32_WINNT 0x0500
 #ifndef STRICT
 #define STRICT
 #endif
@@ -33,7 +33,6 @@
 
 #if defined(_MSC_VER) && _MSC_VER >= 1400
 #define _CRT_SECURE_NO_DEPRECATE
-#pragma warning(disable: 4996)
 #endif
 
 #include <windows.h>
@@ -43,8 +42,16 @@
 #include <shlobj.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <WtsApi32.h>
+#include <tchar.h>
 #include "ApacheMonitor.h"
 
+#ifndef AM_STRINGIFY
+/** Properly quote a value as a string in the C preprocessor */
+#define AM_STRINGIFY(n) AM_STRINGIFY_HELPER(n)
+/** Helper macro for AM_STRINGIFY */
+#define AM_STRINGIFY_HELPER(n) #n
+#endif
 
 #define OS_VERSION_WIN9X    1
 #define OS_VERSION_WINNT    2
@@ -68,24 +75,24 @@
 
 typedef struct _st_APACHE_SERVICE
 {
-    LPSTR    szServiceName;
-    LPSTR    szDisplayName;
-    LPSTR    szDescription;
-    LPSTR    szImagePath;
-    LPSTR    szComputerName;
+    LPTSTR   szServiceName;
+    LPTSTR   szDisplayName;
+    LPTSTR   szDescription;
+    LPTSTR   szImagePath;
+    LPTSTR   szComputerName;
     DWORD    dwPid;
 } ST_APACHE_SERVICE;
 
 typedef struct _st_MONITORED_COMPUTERS
 {
-    LPSTR   szComputerName;
+    LPTSTR  szComputerName;
     HKEY    hRegistry;
 } ST_MONITORED_COMP;
 
 /* Global variables */
 HINSTANCE         g_hInstance = NULL;
-CHAR             *g_szTitle;          /* The title bar text */
-CHAR             *g_szWindowClass;    /* Window Class Name  */
+TCHAR            *g_szTitle;          /* The title bar text */
+TCHAR            *g_szWindowClass;    /* Window Class Name  */
 HICON             g_icoStop;
 HICON             g_icoRun;
 UINT              g_bUiTaskbarCreated;
@@ -113,10 +120,10 @@ HANDLE            g_hpipeStdError;
 LANGID            g_LangID;
 PROCESS_INFORMATION g_lpRedirectProc;
 CRITICAL_SECTION  g_stcSection;
-LPSTR             g_szLocalHost;
+LPTSTR            g_szLocalHost;
 
 /* locale language support */
-static CHAR *g_lpMsg[IDS_MSG_LAST - IDS_MSG_FIRST + 1];
+static TCHAR *g_lpMsg[IDS_MSG_LAST - IDS_MSG_FIRST + 1];
 
 
 void am_ClearServicesSt()
@@ -160,11 +167,11 @@ void am_ClearComputersSt()
 }
 
 
-BOOL am_IsComputerConnected(LPSTR szComputerName)
+BOOL am_IsComputerConnected(LPTSTR szComputerName)
 {
     int i = 0;
     while (g_stComputers[i].szComputerName != NULL) {
-        if (strcmp(g_stComputers[i].szComputerName, szComputerName) == 0) {
+        if (_tcscmp(g_stComputers[i].szComputerName, szComputerName) == 0) {
             return TRUE;
         }
         ++i;
@@ -173,11 +180,11 @@ BOOL am_IsComputerConnected(LPSTR szComputerName)
 }
 
 
-void am_DisconnectComputer(LPSTR szComputerName)
+void am_DisconnectComputer(LPTSTR szComputerName)
 {
     int i = 0, j;
     while (g_stComputers[i].szComputerName != NULL) {
-        if (strcmp(g_stComputers[i].szComputerName, szComputerName) == 0) {
+        if (_tcscmp(g_stComputers[i].szComputerName, szComputerName) == 0) {
             break;
         }
         ++i;
@@ -195,7 +202,7 @@ void am_DisconnectComputer(LPSTR szComputerName)
 }
 
 
-void ErrorMessage(LPCSTR szError, BOOL bFatal)
+void ErrorMessage(LPCTSTR szError, BOOL bFatal)
 {
     LPVOID lpMsgBuf = NULL;
     if (szError) {
@@ -207,8 +214,8 @@ void ErrorMessage(LPCSTR szError, BOOL bFatal)
                       FORMAT_MESSAGE_FROM_SYSTEM |
                       FORMAT_MESSAGE_IGNORE_INSERTS,
                       NULL, GetLastError(), g_LangID,
-                      (LPSTR) &lpMsgBuf, 0, NULL);
-        MessageBox(NULL, (LPCSTR)lpMsgBuf,
+                      (LPTSTR) &lpMsgBuf, 0, NULL);
+        MessageBox(NULL, (LPCTSTR)lpMsgBuf,
                    g_lpMsg[IDS_MSG_ERROR - IDS_MSG_FIRST],
                    MB_OK | (bFatal ? MB_ICONERROR : MB_ICONEXCLAMATION));
         LocalFree(lpMsgBuf);
@@ -219,14 +226,37 @@ void ErrorMessage(LPCSTR szError, BOOL bFatal)
 }
 
 
-BOOL am_ConnectComputer(LPSTR szComputerName)
+int am_RespawnAsUserAdmin(HWND hwnd, DWORD op, LPCTSTR szService, 
+                          LPCTSTR szComputerName)
+{
+    TCHAR args[MAX_PATH + MAX_COMPUTERNAME_LENGTH + 12];
+
+    if (g_dwOSVersion < OS_VERSION_WIN2K) {
+        ErrorMessage(g_lpMsg[IDS_MSG_SRVFAILED - IDS_MSG_FIRST], FALSE);
+        return 0;
+    }
+
+    _sntprintf(args, sizeof(args) / sizeof(TCHAR), 
+               _T("%d \"%s\" \"%s\""), op, szService,
+               szComputerName ? szComputerName : _T(""));
+    if (!ShellExecute(hwnd, _T("runas"), __targv[0], args, NULL, SW_NORMAL)) {
+        ErrorMessage(g_lpMsg[IDS_MSG_SRVFAILED - IDS_MSG_FIRST],
+                     FALSE);
+        return 0;
+    }
+
+    return 1;
+}
+
+
+BOOL am_ConnectComputer(LPTSTR szComputerName)
 {
     int i = 0;
     HKEY hKeyRemote;
-    char szTmp[MAX_PATH];
+    TCHAR szTmp[MAX_PATH];
 
     while (g_stComputers[i].szComputerName != NULL) {
-        if (strcmp(g_stComputers[i].szComputerName, szComputerName) == 0) {
+        if (_tcscmp(g_stComputers[i].szComputerName, szComputerName) == 0) {
             return FALSE;
         }
         ++i;
@@ -236,22 +266,23 @@ BOOL am_ConnectComputer(LPSTR szComputerName)
     }
     if (RegConnectRegistry(szComputerName, HKEY_LOCAL_MACHINE, &hKeyRemote)
             != ERROR_SUCCESS) {
-        sprintf(szTmp, g_lpMsg[IDS_MSG_ECONNECT - IDS_MSG_FIRST],
-                szComputerName);
+        _sntprintf(szTmp, sizeof(szTmp) / sizeof(TCHAR), 
+                   g_lpMsg[IDS_MSG_ECONNECT - IDS_MSG_FIRST],
+                   szComputerName);
         ErrorMessage(szTmp, FALSE);
         return FALSE;
     }
     else {
-        g_stComputers[i].szComputerName = strdup(szComputerName);
+        g_stComputers[i].szComputerName = _tcsdup(szComputerName);
         g_stComputers[i].hRegistry = hKeyRemote;
         return TRUE;
     }
 }
 
 
-LPSTR GetStringRes(int id)
+LPTSTR GetStringRes(int id)
 {
-    static CHAR buffer[MAX_PATH];
+    static TCHAR buffer[MAX_PATH];
 
     buffer[0] = 0;
     LoadString(GetModuleHandle(NULL), id, buffer, MAX_PATH);
@@ -327,22 +358,24 @@ static VOID ShowNotifyIcon(HWND hWnd, DWORD dwMessage)
         nid.hIcon = NULL;
     }
     if (n == i && n > 0) {
-        lstrcpy(nid.szTip, g_lpMsg[IDS_MSG_RUNNINGALL - IDS_MSG_FIRST]);
+        _tcscpy(nid.szTip, g_lpMsg[IDS_MSG_RUNNINGALL - IDS_MSG_FIRST]);
     }
     else if (n) {
-        sprintf(nid.szTip, g_lpMsg[IDS_MSG_RUNNING - IDS_MSG_FIRST], n, i);
+        _sntprintf(nid.szTip, sizeof(nid.szTip) / sizeof(TCHAR), 
+                  g_lpMsg[IDS_MSG_RUNNING - IDS_MSG_FIRST], n, i);
     }
     else if (i) {
-        sprintf(nid.szTip, g_lpMsg[IDS_MSG_RUNNINGNONE - IDS_MSG_FIRST], i);
+        _sntprintf(nid.szTip, sizeof(nid.szTip) / sizeof(TCHAR), 
+                  g_lpMsg[IDS_MSG_RUNNINGNONE - IDS_MSG_FIRST], i);
     }
     else {
-        lstrcpy(nid.szTip, g_lpMsg[IDS_MSG_NOSERVICES - IDS_MSG_FIRST]);
+        _tcscpy(nid.szTip, g_lpMsg[IDS_MSG_NOSERVICES - IDS_MSG_FIRST]);
     }
     Shell_NotifyIcon(dwMessage, &nid);
 }
 
 
-void appendMenuItem(HMENU hMenu, UINT uMenuId, LPSTR szName,
+void appendMenuItem(HMENU hMenu, UINT uMenuId, LPTSTR szName,
                     BOOL fDefault, BOOL fEnabled)
 {
     MENUITEMINFO mii;
@@ -350,7 +383,7 @@ void appendMenuItem(HMENU hMenu, UINT uMenuId, LPSTR szName,
     memset(&mii, 0, sizeof(MENUITEMINFO));
     mii.cbSize = sizeof(MENUITEMINFO);
     mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE;
-    if (lstrlen(szName))
+    if (_tcslen(szName))
     {
         mii.fType = MFT_STRING;
         mii.wID = uMenuId;
@@ -370,7 +403,7 @@ void appendMenuItem(HMENU hMenu, UINT uMenuId, LPSTR szName,
 
 
 void appendServiceMenu(HMENU hMenu, UINT uMenuId,
-                       LPSTR szServiceName, BOOL fRunning)
+                       LPTSTR szServiceName, BOOL fRunning)
 {
     MENUITEMINFO mii;
     HMENU smh;
@@ -415,7 +448,7 @@ void ShowTryPopupMenu(HWND hWnd)
                            g_lpMsg[IDS_MSG_MNUSERVICES - IDS_MSG_FIRST],
                            FALSE, TRUE);
         }
-        appendMenuItem(hMenu, 0, "", FALSE, TRUE);
+        appendMenuItem(hMenu, 0, _T(""), FALSE, TRUE);
         appendMenuItem(hMenu, IDM_EXIT,
                        g_lpMsg[IDS_MSG_MNUEXIT - IDS_MSG_FIRST],
                        FALSE, TRUE);
@@ -489,7 +522,7 @@ BOOL CenterWindow(HWND hwndChild)
 }
 
 
-static void addListBoxItem(HWND hDlg, LPSTR lpStr, HBITMAP hBmp)
+static void addListBoxItem(HWND hDlg, LPTSTR lpStr, HBITMAP hBmp)
 {
     LRESULT nItem;
 
@@ -498,7 +531,7 @@ static void addListBoxItem(HWND hDlg, LPSTR lpStr, HBITMAP hBmp)
 }
 
 
-static void addListBoxString(HWND hListBox, LPSTR lpStr)
+static void addListBoxString(HWND hListBox, LPTSTR lpStr)
 {
     static int nItems = 0;
     if (!g_bDlgServiceOn) {
@@ -516,6 +549,32 @@ static void addListBoxString(HWND hListBox, LPSTR lpStr)
 }
 
 
+#ifndef UNICODE
+#define addListBoxStringA addListBoxString
+#else
+static void addListBoxStringA(HWND hListBox, LPSTR lpStr)
+{
+    static int nItems = 0;
+    TCHAR WStr[16384];
+
+    if (!g_bDlgServiceOn) {
+        return;
+    }
+    if (!MultiByteToWideChar(CP_ACP, 0, lpStr, (int)strlen(lpStr) + 1,
+                             WStr, (int) (sizeof(WStr) / sizeof(TCHAR))))
+        return;
+    ++nItems;
+    if (nItems > MAX_LOADSTRING)
+    {
+        SendMessage(hListBox, LB_RESETCONTENT, 0, 0);
+        nItems = 1;
+    }
+    ListBox_SetCurSel(hListBox,
+                      ListBox_AddString(hListBox, WStr));
+}
+#endif
+
+
 static DWORD WINAPI ConsoleOutputThread(LPVOID lpThreadParameter)
 {
     static BYTE lpBuffer[MAX_PATH+1];
@@ -530,7 +589,7 @@ static DWORD WINAPI ConsoleOutputThread(LPVOID lpThreadParameter)
             if (ch == '\n' || nPtr >= MAX_PATH)
             {
                 lpBuffer[nPtr] = '\0';
-                addListBoxString(g_hwndStdoutList, lpBuffer);
+                addListBoxStringA(g_hwndStdoutList, lpBuffer);
                 nPtr = 0;
             }
             else if (ch == '\t' && nPtr < (MAX_PATH - 4))
@@ -563,7 +622,7 @@ DWORD WINAPI ConsoleWaitingThread(LPVOID lpThreadParameter)
 }
 
 
-BOOL RunRedirectedConsole(LPSTR szCmdLine)
+BOOL RunRedirectedConsole(LPTSTR szCmdLine)
 {
     DWORD dwThreadId;
     HANDLE hProc;
@@ -630,7 +689,7 @@ BOOL RunRedirectedConsole(LPSTR szCmdLine)
 }
 
 
-BOOL RunAndForgetConsole(LPSTR szCmdLine, BOOL bRedirectConsole)
+BOOL RunAndForgetConsole(LPTSTR szCmdLine, BOOL bRedirectConsole)
 {
     STARTUPINFO stInfo;
     PROCESS_INFORMATION prInfo;
@@ -669,12 +728,12 @@ BOOL RunAndForgetConsole(LPSTR szCmdLine, BOOL bRedirectConsole)
 }
 
 
-BOOL ApacheManageService(LPCSTR szServiceName, LPCSTR szImagePath,
-                         LPSTR szComputerName, DWORD dwCommand)
+BOOL ApacheManageService(LPCTSTR szServiceName, LPCTSTR szImagePath,
+                         LPTSTR szComputerName, DWORD dwCommand)
 {
-    CHAR szBuf[MAX_PATH];
-    CHAR szMsg[MAX_PATH];
-    LPSTR sPos;
+    TCHAR szBuf[MAX_PATH];
+    TCHAR szMsg[MAX_PATH];
+    LPTSTR sPos;
     BOOL retValue;
     BOOL serviceFlag = TRUE;
     SC_HANDLE schService;
@@ -684,32 +743,33 @@ BOOL ApacheManageService(LPCSTR szServiceName, LPCSTR szImagePath,
 
     if (g_dwOSVersion == OS_VERSION_WIN9X)
     {
-        sPos = strstr(szImagePath, "-k start");
+        sPos = _tcsstr(szImagePath, _T("-k start"));
         if (sPos)
         {
-            lstrcpyn(szBuf, szImagePath, (int)(sPos - szImagePath));
+            _tcsncpy(szBuf, szImagePath, (int)(sPos - szImagePath));
             switch (dwCommand)
             {
             case SERVICE_CONTROL_STOP:
-                lstrcat(szBuf, " -k shutdown -n ");
+                _tcscat(szBuf, _T(" -k shutdown -n "));
                 break;
 
             case SERVICE_CONTROL_CONTINUE:
-                sprintf(szMsg, g_lpMsg[IDS_MSG_SRVSTART - IDS_MSG_FIRST],
-                        szServiceName);
+                _sntprintf(szMsg, sizeof(szMsg) / sizeof(TCHAR),
+                          g_lpMsg[IDS_MSG_SRVSTART - IDS_MSG_FIRST],
+                          szServiceName);
                 addListBoxString(g_hwndStdoutList, szMsg);
-                lstrcat(szBuf, " -k start -n ");
+                _tcscat(szBuf, _T(" -k start -n "));
                 serviceFlag = FALSE;
                 break;
 
             case SERVICE_APACHE_RESTART:
-                lstrcat(szBuf, " -k restart -n ");
+                _tcscat(szBuf, _T(" -k restart -n "));
                 break;
 
             default:
                 return FALSE;
             }
-            lstrcat(szBuf, szServiceName);
+            _tcscat(szBuf, szServiceName);
         }
         else {
             return FALSE;
@@ -725,8 +785,9 @@ BOOL ApacheManageService(LPCSTR szServiceName, LPCSTR szImagePath,
         }
         else if (!serviceFlag)
         {
-            sprintf(szMsg, g_lpMsg[IDS_MSG_SRVSTARTED - IDS_MSG_FIRST],
-                    szServiceName);
+            _sntprintf(szMsg, sizeof(szMsg) / sizeof(TCHAR), 
+                      g_lpMsg[IDS_MSG_SRVSTARTED - IDS_MSG_FIRST],
+                      szServiceName);
             addListBoxString(g_hwndStdoutList, szMsg);
             g_bConsoleRun = FALSE;
             SetCursor(g_hCursorArrow);
@@ -738,13 +799,29 @@ BOOL ApacheManageService(LPCSTR szServiceName, LPCSTR szImagePath,
         schSCManager = OpenSCManager(szComputerName, NULL,
                                      SC_MANAGER_CONNECT);
         if (!schSCManager) {
+            ErrorMessage(g_lpMsg[IDS_MSG_SRVFAILED - IDS_MSG_FIRST],
+                         FALSE);
             return FALSE;
         }
 
         schService = OpenService(schSCManager, szServiceName,
                                  SERVICE_QUERY_STATUS | SERVICE_START |
                                  SERVICE_STOP | SERVICE_USER_DEFINED_CONTROL);
-        if (schService != NULL)
+        if (schService == NULL)
+        {
+            /* Avoid recursion of ImagePath NULL (from this Respawn) */
+            if (szImagePath) {
+                am_RespawnAsUserAdmin(g_hwndMain, dwCommand, 
+                                      szServiceName, szComputerName);
+            }
+            else {
+                ErrorMessage(g_lpMsg[IDS_MSG_SRVFAILED - IDS_MSG_FIRST],
+                             FALSE);
+            }
+            CloseServiceHandle(schSCManager);
+            return FALSE;
+        }
+        else
         {
             retValue = FALSE;
             g_bConsoleRun = TRUE;
@@ -752,8 +829,9 @@ BOOL ApacheManageService(LPCSTR szServiceName, LPCSTR szImagePath,
             switch (dwCommand)
             {
             case SERVICE_CONTROL_STOP:
-                sprintf(szMsg, g_lpMsg[IDS_MSG_SRVSTOP - IDS_MSG_FIRST],
-                        szServiceName);
+                _sntprintf(szMsg, sizeof(szMsg) / sizeof(TCHAR), 
+                          g_lpMsg[IDS_MSG_SRVSTOP - IDS_MSG_FIRST],
+                          szServiceName);
                 addListBoxString(g_hwndStdoutList, szMsg);
                 if (ControlService(schService, SERVICE_CONTROL_STOP,
                                    &schSStatus)) {
@@ -774,17 +852,18 @@ BOOL ApacheManageService(LPCSTR szServiceName, LPCSTR szImagePath,
                     if (schSStatus.dwCurrentState == SERVICE_STOPPED)
                     {
                         retValue = TRUE;
-                        sprintf(szMsg,
-                                g_lpMsg[IDS_MSG_SRVSTOPPED - IDS_MSG_FIRST],
-                                szServiceName);
+                        _sntprintf(szMsg, sizeof(szMsg) / sizeof(TCHAR), 
+                                  g_lpMsg[IDS_MSG_SRVSTOPPED - IDS_MSG_FIRST],
+                                  szServiceName);
                         addListBoxString(g_hwndStdoutList, szMsg);
                     }
                 }
                 break;
 
             case SERVICE_CONTROL_CONTINUE:
-                sprintf(szMsg, g_lpMsg[IDS_MSG_SRVSTART - IDS_MSG_FIRST],
-                        szServiceName);
+                _sntprintf(szMsg, sizeof(szMsg) / sizeof(TCHAR),
+                          g_lpMsg[IDS_MSG_SRVSTART - IDS_MSG_FIRST],
+                          szServiceName);
                 addListBoxString(g_hwndStdoutList, szMsg);
 
                 if (StartService(schService, 0, NULL))
@@ -806,17 +885,18 @@ BOOL ApacheManageService(LPCSTR szServiceName, LPCSTR szImagePath,
                     if (schSStatus.dwCurrentState == SERVICE_RUNNING)
                     {
                         retValue = TRUE;
-                        sprintf(szMsg,
-                                g_lpMsg[IDS_MSG_SRVSTARTED - IDS_MSG_FIRST],
-                                szServiceName);
+                        _sntprintf(szMsg, sizeof(szMsg) / sizeof(TCHAR), 
+                                  g_lpMsg[IDS_MSG_SRVSTARTED - IDS_MSG_FIRST],
+                                  szServiceName);
                         addListBoxString(g_hwndStdoutList, szMsg);
                     }
                 }
                 break;
 
             case SERVICE_APACHE_RESTART:
-                sprintf(szMsg, g_lpMsg[IDS_MSG_SRVRESTART - IDS_MSG_FIRST],
-                        szServiceName);
+                _sntprintf(szMsg, sizeof(szMsg) / sizeof(TCHAR), 
+                          g_lpMsg[IDS_MSG_SRVRESTART - IDS_MSG_FIRST],
+                          szServiceName);
                 addListBoxString(g_hwndStdoutList, szMsg);
                 if (ControlService(schService, SERVICE_APACHE_RESTART,
                                    &schSStatus))
@@ -841,9 +921,9 @@ BOOL ApacheManageService(LPCSTR szServiceName, LPCSTR szImagePath,
                 if (schSStatus.dwCurrentState == SERVICE_RUNNING)
                 {
                     retValue = TRUE;
-                    sprintf(szMsg,
-                            g_lpMsg[IDS_MSG_SRVRESTARTED - IDS_MSG_FIRST],
-                            szServiceName);
+                    _sntprintf(szMsg, sizeof(szMsg) / sizeof(TCHAR), 
+                              g_lpMsg[IDS_MSG_SRVRESTARTED - IDS_MSG_FIRST],
+                              szServiceName);
                     addListBoxString(g_hwndStdoutList, szMsg);
                 }
                 break;
@@ -858,10 +938,6 @@ BOOL ApacheManageService(LPCSTR szServiceName, LPCSTR szImagePath,
             SetCursor(g_hCursorArrow);
             return retValue;
         }
-        else {
-            g_bRescanServices = TRUE;
-        }
-        CloseServiceHandle(schSCManager);
         return FALSE;
     }
 
@@ -869,7 +945,7 @@ BOOL ApacheManageService(LPCSTR szServiceName, LPCSTR szImagePath,
 }
 
 
-BOOL IsServiceRunning(LPCSTR szServiceName, LPCSTR szComputerName,
+BOOL IsServiceRunning(LPCTSTR szServiceName, LPCTSTR szComputerName,
                       LPDWORD lpdwPid)
 {
     DWORD dwPid;
@@ -880,7 +956,7 @@ BOOL IsServiceRunning(LPCSTR szServiceName, LPCSTR szComputerName,
 
     if (g_dwOSVersion == OS_VERSION_WIN9X)
     {
-        hWnd = FindWindow("ApacheWin95ServiceMonitor", szServiceName);
+        hWnd = FindWindow(_T("ApacheWin95ServiceMonitor"), szServiceName);
         if (hWnd && GetWindowThreadProcessId(hWnd, &dwPid))
         {
             *lpdwPid = 1;
@@ -949,11 +1025,11 @@ BOOL FindRunningServices(void)
 
 BOOL GetApacheServicesStatus()
 {
-    CHAR szKey[MAX_PATH];
-    CHAR achKey[MAX_PATH];
-    CHAR szImagePath[MAX_PATH];
-    CHAR szBuf[MAX_PATH];
-    CHAR szTmp[MAX_PATH];
+    TCHAR szKey[MAX_PATH];
+    TCHAR achKey[MAX_PATH];
+    TCHAR szImagePath[MAX_PATH];
+    TCHAR szBuf[MAX_PATH];
+    TCHAR szTmp[MAX_PATH];
     HKEY hKey, hSubKey, hKeyRemote;
     DWORD retCode, rv, dwKeyType;
     DWORD dwBufLen = MAX_PATH;
@@ -966,7 +1042,7 @@ BOOL GetApacheServicesStatus()
     while (g_stComputers[computers].szComputerName != NULL) {
         hKeyRemote = g_stComputers[computers].hRegistry;
         retCode = RegOpenKeyEx(hKeyRemote,
-                               "System\\CurrentControlSet\\Services\\",
+                               _T("System\\CurrentControlSet\\Services\\"),
                                0, KEY_READ, &hKey);
         if (retCode != ERROR_SUCCESS)
         {
@@ -978,60 +1054,57 @@ BOOL GetApacheServicesStatus()
             retCode = RegEnumKey(hKey, i, achKey, MAX_PATH);
             if (retCode == ERROR_SUCCESS)
             {
-                lstrcpy(szKey, "System\\CurrentControlSet\\Services\\");
-                lstrcat(szKey, achKey);
+                _tcscpy(szKey, _T("System\\CurrentControlSet\\Services\\"));
+                _tcscat(szKey, achKey);
 
                 if (RegOpenKeyEx(hKeyRemote, szKey, 0,
                                  KEY_QUERY_VALUE, &hSubKey) == ERROR_SUCCESS)
                 {
                     dwBufLen = MAX_PATH;
-                    rv = RegQueryValueEx(hSubKey, "ImagePath", NULL,
-                                         &dwKeyType, szImagePath, &dwBufLen);
+                    rv = RegQueryValueEx(hSubKey, _T("ImagePath"), NULL,
+                                         &dwKeyType, (LPBYTE)szImagePath, &dwBufLen);
 
                     if (rv == ERROR_SUCCESS
                             && (dwKeyType == REG_SZ
                              || dwKeyType == REG_EXPAND_SZ)
                             && dwBufLen)
                     {
-                        lstrcpy(szBuf, szImagePath);
+                        _tcscpy(szBuf, szImagePath);
                         CharLower(szBuf);
                         /* the service name could be httpd*.exe or Apache*.exe */
-                        if (((strstr(szBuf, "\\apache") != NULL)
-                             || (strstr(szBuf, "\\httpd") != NULL))
-                                && strstr(szBuf, ".exe")
-                                && (strstr(szBuf, "--ntservice") != NULL
-                                       || strstr(szBuf, "-k ") != NULL))
+                        if (((_tcsstr(szBuf, _T("\\apache")) != NULL)
+                             || (_tcsstr(szBuf, _T("\\httpd")) != NULL))
+                                && _tcsstr(szBuf, _T(".exe"))
+                                && (_tcsstr(szBuf, _T("--ntservice")) != NULL
+                                       || _tcsstr(szBuf, _T("-k ")) != NULL))
                         {
-                            g_stServices[stPos].szServiceName = strdup(achKey);
-                            g_stServices[stPos].szImagePath =
-                                                           strdup(szImagePath);
+                            g_stServices[stPos].szServiceName = _tcsdup(achKey);
+                            g_stServices[stPos].szImagePath = _tcsdup(szImagePath);
                             g_stServices[stPos].szComputerName =
-                               strdup(g_stComputers[computers].szComputerName);
+                                _tcsdup(g_stComputers[computers].szComputerName);
                             dwBufLen = MAX_PATH;
-                            if (RegQueryValueEx(hSubKey, "Description", NULL,
-                                                &dwKeyType, szBuf, &dwBufLen)
+                            if (RegQueryValueEx(hSubKey, _T("Description"), NULL,
+                                                &dwKeyType, (LPBYTE)szBuf, &dwBufLen)
                                     == ERROR_SUCCESS) {
-                                g_stServices[stPos].szDescription =
-                                                                 strdup(szBuf);
+                                g_stServices[stPos].szDescription = _tcsdup(szBuf);
                             }
                             dwBufLen = MAX_PATH;
-                            if (RegQueryValueEx(hSubKey, "DisplayName", NULL,
-                                                &dwKeyType, szBuf, &dwBufLen)
+                            if (RegQueryValueEx(hSubKey, _T("DisplayName"), NULL,
+                                                &dwKeyType, (LPBYTE)szBuf, &dwBufLen)
                                     == ERROR_SUCCESS)
                             {
-                                if (strcmp(g_stComputers[computers]
+                                if (_tcscmp(g_stComputers[computers]
                                         .szComputerName, g_szLocalHost) != 0)
                                 {
-                                    strcpy(szTmp, g_stComputers[computers]
+                                    _tcscpy(szTmp, g_stComputers[computers]
                                                       .szComputerName + 2);
-                                    strcat(szTmp, "@");
-                                    strcat(szTmp, szBuf);
+                                    _tcscat(szTmp, _T("@"));
+                                    _tcscat(szTmp, szBuf);
                                 }
                                 else {
-                                    strcpy(szTmp, szBuf);
+                                    _tcscpy(szTmp, szBuf);
                                 }
-                                g_stServices[stPos].szDisplayName
-                                                        = strdup(szTmp);
+                                g_stServices[stPos].szDisplayName = _tcsdup(szTmp);
 
                             }
                             ++stPos;
@@ -1055,7 +1128,7 @@ BOOL GetApacheServicesStatus()
 LRESULT CALLBACK ConnectDlgProc(HWND hDlg, UINT message,
                                 WPARAM wParam, LPARAM lParam)
 {
-    CHAR szCmp[MAX_COMPUTERNAME_LENGTH+4];
+    TCHAR szCmp[MAX_COMPUTERNAME_LENGTH+4];
     switch (message)
     {
     case WM_INITDIALOG:
@@ -1070,14 +1143,14 @@ LRESULT CALLBACK ConnectDlgProc(HWND hDlg, UINT message,
         switch (LOWORD(wParam))
         {
         case IDOK:
-            memset(szCmp, 0, MAX_COMPUTERNAME_LENGTH+4);
-            strcpy(szCmp, "\\\\");
+            memset(szCmp, 0, sizeof(szCmp));
+            _tcscpy(szCmp, _T("\\\\"));
             SendMessage(GetDlgItem(hDlg, IDC_COMPUTER), WM_GETTEXT,
                         (WPARAM) MAX_COMPUTERNAME_LENGTH,
                         (LPARAM) szCmp+2);
 
-            strupr(szCmp);
-            if (strlen(szCmp) < 3) {
+            _tcsupr(szCmp);
+            if (_tcslen(szCmp) < 3) {
                 EndDialog(hDlg, TRUE);
                 return TRUE;
             }
@@ -1096,7 +1169,7 @@ LRESULT CALLBACK ConnectDlgProc(HWND hDlg, UINT message,
             memset(&bi, 0, sizeof(BROWSEINFO));
             SHGetSpecialFolderLocation(hDlg, CSIDL_NETWORK, &il);
 
-            bi.lpszTitle      = "ApacheMonitor :\nSelect Network Computer!";
+            bi.lpszTitle      = _T("ApacheMonitor :\nSelect Network Computer!");
             bi.pszDisplayName = szCmp;
             bi.hwndOwner =      hDlg;
             bi.ulFlags =        BIF_BROWSEFORCOMPUTER;
@@ -1135,7 +1208,7 @@ LRESULT CALLBACK ConnectDlgProc(HWND hDlg, UINT message,
 LRESULT CALLBACK ServiceDlgProc(HWND hDlg, UINT message,
                                 WPARAM wParam, LPARAM lParam)
 {
-    CHAR szBuf[MAX_PATH];
+    TCHAR szBuf[MAX_PATH];
     HWND hListBox;
     static HWND hStatusBar;
     TEXTMETRIC tm;
@@ -1146,7 +1219,7 @@ LRESULT CALLBACK ServiceDlgProc(HWND hDlg, UINT message,
     LPMEASUREITEMSTRUCT lpmis;
     LPDRAWITEMSTRUCT lpdis;
 
-    memset(szBuf, 0, MAX_PATH);
+    memset(szBuf, 0, sizeof(szBuf));
     switch (message)
     {
     case WM_INITDIALOG:
@@ -1179,7 +1252,7 @@ LRESULT CALLBACK ServiceDlgProc(HWND hDlg, UINT message,
         g_hwndStdoutList = GetDlgItem(hDlg, IDL_STDOUT);
         hStatusBar = CreateStatusWindow(0x0800 /* SBT_TOOLTIPS */
                                       | WS_CHILD | WS_VISIBLE,
-                                        "", hDlg, IDC_STATBAR);
+                                        _T(""), hDlg, IDC_STATBAR);
         if (GetApacheServicesStatus())
         {
             i = 0;
@@ -1210,7 +1283,7 @@ LRESULT CALLBACK ServiceDlgProc(HWND hDlg, UINT message,
     case WM_UPDATEMESSAGE:
         hListBox = GetDlgItem(hDlg, IDL_SERVICES);
         SendMessage(hListBox, LB_RESETCONTENT, 0, 0);
-        SendMessage(hStatusBar, SB_SETTEXT, 0, (LPARAM)"");
+        SendMessage(hStatusBar, SB_SETTEXT, 0, (LPARAM)_T(""));
         Button_Enable(GetDlgItem(hDlg, IDC_SSTART), FALSE);
         Button_Enable(GetDlgItem(hDlg, IDC_SSTOP), FALSE);
         Button_Enable(GetDlgItem(hDlg, IDC_SRESTART), FALSE);
@@ -1299,7 +1372,7 @@ LRESULT CALLBACK ServiceDlgProc(HWND hDlg, UINT message,
                     Button_Enable(GetDlgItem(hDlg, IDC_SSTOP), FALSE);
                     Button_Enable(GetDlgItem(hDlg, IDC_SRESTART), FALSE);
                 }
-                if (strcmp(g_stServices[lpdis->itemID].szComputerName,
+                if (_tcscmp(g_stServices[lpdis->itemID].szComputerName,
                            g_szLocalHost) == 0) {
                     Button_Enable(GetDlgItem(hDlg, IDC_SDISCONN), FALSE);
                 }
@@ -1312,7 +1385,7 @@ LRESULT CALLBACK ServiceDlgProc(HWND hDlg, UINT message,
                             (LPARAM)g_stServices[lpdis->itemID].szDescription);
                 }
                 else {
-                    SendMessage(hStatusBar, SB_SETTEXT, 0, (LPARAM)"");
+                    SendMessage(hStatusBar, SB_SETTEXT, 0, (LPARAM)_T(""));
                 }
                 SetTextColor(lpdis->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
                 SetBkColor(lpdis->hDC, GetSysColor(COLOR_HIGHLIGHT));
@@ -1324,7 +1397,7 @@ LRESULT CALLBACK ServiceDlgProc(HWND hDlg, UINT message,
                SetBkColor(lpdis->hDC, GetSysColor(COLOR_WINDOW));
                FillRect(lpdis->hDC, &rcBitmap, (HBRUSH)(COLOR_WINDOW+1));
             }
-            TextOut(lpdis->hDC, XBITMAP + 6, y, szBuf, (int)strlen(szBuf));
+            TextOut(lpdis->hDC, XBITMAP + 6, y, szBuf, (int)_tcslen(szBuf));
             break;
 
         case ODA_FOCUS:
@@ -1399,7 +1472,7 @@ LRESULT CALLBACK ServiceDlgProc(HWND hDlg, UINT message,
 
         case IDC_SMANAGER:
             if (g_dwOSVersion >= OS_VERSION_WIN2K) {
-                ShellExecute(hDlg, "open", "services.msc", "/s",
+                ShellExecute(hDlg, _T("open"), _T("services.msc"), _T("/s"),
                              NULL, SW_NORMAL);
             }
             else {
@@ -1612,7 +1685,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message,
 
         case IDC_SMANAGER:
             if (g_dwOSVersion >= OS_VERSION_WIN2K) {
-                ShellExecute(NULL, "open", "services.msc", "/s",
+                ShellExecute(NULL, _T("open"), _T("services.msc"), _T("/s"),
                              NULL, SW_NORMAL);
             }
             else {
@@ -1634,18 +1707,86 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message,
 }
 
 
+static int KillAWindow(HWND appwindow)
+{
+    HANDLE appproc;
+    DWORD procid;
+    BOOL postres;
+
+    SetLastError(0);
+    GetWindowThreadProcessId(appwindow, &procid);
+    if (GetLastError())
+        return(2);
+
+    appproc = OpenProcess(SYNCHRONIZE, 0, procid);
+    postres = PostMessage(appwindow, WM_COMMAND, IDM_EXIT, 0);
+    if (appproc && postres) {
+        if (WaitForSingleObject(appproc, 10 /* seconds */ * 1000)
+                == WAIT_OBJECT_0) {
+            CloseHandle(appproc);
+            return (0);
+        }
+    }
+    if (appproc)
+        CloseHandle(appproc);
+
+    if ((appproc = OpenProcess(PROCESS_TERMINATE, 0, procid)) != NULL) {
+        if (TerminateProcess(appproc, 0)) {
+            CloseHandle(appproc);
+            return (0);
+        }
+        CloseHandle(appproc);
+    }
+
+    /* Perhaps we were short of permissions? */
+    return (2);
+}
+
+
+static int KillAllMonitors(void)
+{
+    HWND appwindow;
+    int exitcode = 0;
+    PWTS_PROCESS_INFO tsProcs;
+    DWORD tsProcCount, i;
+    DWORD thisProcId; 
+
+    /* This is graceful, close our own Window, clearing the icon */
+    if ((appwindow = FindWindow(g_szWindowClass, g_szTitle)) != NULL)
+        exitcode = KillAWindow(appwindow);
+
+    if (g_dwOSVersion < OS_VERSION_WIN2K)
+        return exitcode;
+
+    thisProcId = GetCurrentProcessId();
+
+    if (!WTSEnumerateProcesses(WTS_CURRENT_SERVER_HANDLE, 0, 1,
+                               &tsProcs, &tsProcCount))
+        return exitcode;
+
+    /* This is ungraceful; close other Windows, with a lingering icon.
+     * Since on terminal server it's not possible to post the message
+     * to exit across sessions, we have to suffer this side effect
+     * of a taskbar 'icon' which will evaporate the next time that
+     * the user hovers over it or when the taskbar area is updated.
+     */
+    for (i = 0; i < tsProcCount; ++i) {
+        if (_tcscmp(tsProcs[i].pProcessName, _T(AM_STRINGIFY(BIN_NAME))) == 0
+                && tsProcs[i].ProcessId != thisProcId)
+            WTSTerminateProcess(WTS_CURRENT_SERVER_HANDLE, 
+                                tsProcs[i].ProcessId, 1);
+    }
+    WTSFreeMemory(tsProcs);
+    return exitcode;
+}
+
+
 /* Create main invisible window */
 HWND CreateMainWindow(HINSTANCE hInstance)
 {
     HWND hWnd = NULL;
     WNDCLASSEX wcex;
 
-    if (!GetSystemOSVersion(&g_dwOSVersion))
-    {
-        ErrorMessage(NULL, TRUE);
-        return hWnd;
-    }
-
     wcex.cbSize = sizeof(WNDCLASSEX);
 
     wcex.style          = CS_HREDRAW | CS_VREDRAW;
@@ -1668,42 +1809,89 @@ HWND CreateMainWindow(HINSTANCE hInstance)
                             NULL, NULL, hInstance, NULL);
     }
     return hWnd;
-
 }
 
 
+#ifndef UNICODE
+/* Borrowed from CRT internal.h for _MBCS argc/argv parsing in this GUI app */
+int  __cdecl _setargv(void);
+#endif
+
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
                    LPSTR lpCmdLine, int nCmdShow)
 {
-    CHAR szTmp[MAX_LOADSTRING];
-    CHAR szCmp[MAX_COMPUTERNAME_LENGTH+4];
+    TCHAR szTmp[MAX_LOADSTRING];
+    TCHAR szCmp[MAX_COMPUTERNAME_LENGTH+4];
     MSG msg;
-    /* single instance mutex */
-    HANDLE hMutex;
+    /* existing window */
+    HWND appwindow;
+    DWORD dwControl;
     int i;
     DWORD d;
 
+    if (!GetSystemOSVersion(&g_dwOSVersion))
+    {
+        ErrorMessage(NULL, TRUE);
+        return 1;
+    }
+
     g_LangID = GetUserDefaultLangID();
     if ((g_LangID & 0xFF) != LANG_ENGLISH) {
         g_LangID = MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL);
     }
     for (i = IDS_MSG_FIRST; i <= IDS_MSG_LAST; ++i) {
         LoadString(hInstance, i, szTmp, MAX_LOADSTRING);
-        g_lpMsg[i - IDS_MSG_FIRST] = strdup(szTmp);
+        g_lpMsg[i - IDS_MSG_FIRST] = _tcsdup(szTmp);
     }
     LoadString(hInstance, IDS_APMONITORTITLE, szTmp, MAX_LOADSTRING);
     d = MAX_COMPUTERNAME_LENGTH+1;
-    strcpy(szCmp, "\\\\");
+    _tcscpy(szCmp, _T("\\\\"));
     GetComputerName(szCmp + 2, &d);
-    strupr(szCmp);
-    g_szLocalHost = strdup(szCmp);
+    _tcsupr(szCmp);
+    g_szLocalHost = _tcsdup(szCmp);
 
     memset(g_stComputers, 0, sizeof(ST_MONITORED_COMP) * MAX_APACHE_COMPUTERS);
-    g_stComputers[0].szComputerName = strdup(szCmp);
+    g_stComputers[0].szComputerName = _tcsdup(szCmp);
     g_stComputers[0].hRegistry = HKEY_LOCAL_MACHINE;
-    g_szTitle = strdup(szTmp);
+    g_szTitle = _tcsdup(szTmp);
     LoadString(hInstance, IDS_APMONITORCLASS, szTmp, MAX_LOADSTRING);
-    g_szWindowClass = strdup(szTmp);
+    g_szWindowClass = _tcsdup(szTmp);
+
+    appwindow = FindWindow(g_szWindowClass, g_szTitle);
+
+#ifdef UNICODE
+    __wargv = CommandLineToArgvW(GetCommandLineW(), &__argc);
+#else
+    _setargv();
+#endif
+
+    if ((__argc == 2) && (_tcscmp(__targv[1], _T("--kill")) == 0))
+    {
+        /* Off to chase and close up every ApacheMonitor taskbar window */
+        return KillAllMonitors();
+    }
+    else if ((__argc == 4) && (g_dwOSVersion >= OS_VERSION_WIN2K))
+    {
+        dwControl = _ttoi(__targv[1]);
+        if ((dwControl != SERVICE_CONTROL_CONTINUE) &&
+            (dwControl != SERVICE_APACHE_RESTART) &&
+            (dwControl != SERVICE_CONTROL_STOP))
+        {
+            return 1;
+        }
+
+        /* Chase down and close up our session's previous window */
+        if ((appwindow) != NULL)
+            KillAWindow(appwindow);
+    }
+    else if (__argc != 1) {
+        return 1;
+    }
+    else if (appwindow)
+    {
+        ErrorMessage(g_lpMsg[IDS_MSG_APPRUNNING - IDS_MSG_FIRST], FALSE);
+        return 0;
+    }
 
     g_icoStop          = LoadImage(hInstance, MAKEINTRESOURCE(IDI_ICOSTOP),
                                    IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
@@ -1722,26 +1910,20 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
                                    IMAGE_BITMAP, XBITMAP, YBITMAP,
                                    LR_DEFAULTCOLOR);
 
-    hMutex = CreateMutex(NULL, FALSE, "APSRVMON_MUTEX");
-    if ((hMutex == NULL) || (GetLastError() == ERROR_ALREADY_EXISTS))
-    {
-        ErrorMessage(g_lpMsg[IDS_MSG_APPRUNNING - IDS_MSG_FIRST], FALSE);
-        if (hMutex) {
-            CloseHandle(hMutex);
-        }
-        return 0;
-    }
-
     memset(g_stServices, 0, sizeof(ST_APACHE_SERVICE) * MAX_APACHE_SERVICES);
     CoInitialize(NULL);
     InitCommonControls();
     g_hInstance = hInstance;
     g_hwndMain = CreateMainWindow(hInstance);
-    g_bUiTaskbarCreated = RegisterWindowMessage("TaskbarCreated");
+    g_bUiTaskbarCreated = RegisterWindowMessage(_T("TaskbarCreated"));
     InitializeCriticalSection(&g_stcSection);
     g_hwndServiceDlg = NULL;
     if (g_hwndMain != NULL)
     {
+        /* To avoid recursion, pass ImagePath NULL (a noop on NT and later) */
+        if ((__argc == 4) && (g_dwOSVersion >= OS_VERSION_WIN2K))
+            ApacheManageService(__targv[2], NULL, __targv[3], dwControl);
+
         while (GetMessage(&msg, NULL, 0, 0) == TRUE)
         {
             TranslateMessage(&msg);
@@ -1751,7 +1933,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
     }
     am_ClearComputersSt();
     DeleteCriticalSection(&g_stcSection);
-    CloseHandle(hMutex);
     DestroyIcon(g_icoStop);
     DestroyIcon(g_icoRun);
     DestroyCursor(g_hCursorHourglass);
@@ -1761,3 +1942,4 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
     CoUninitialize();
     return 0;
 }
+
diff --git a/support/win32/ApacheMonitor.dsp b/support/win32/ApacheMonitor.dsp
index 853ddbc6..84369aaa 100644
--- a/support/win32/ApacheMonitor.dsp
+++ b/support/win32/ApacheMonitor.dsp
@@ -52,8 +52,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows /debug /opt:ref
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib wtsapi32.lib /nologo /subsystem:windows
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib wtsapi32.lib /nologo /subsystem:windows /debug /opt:ref
 # Begin Special Build Tool
 TargetPath=.\Release\ApacheMonitor.exe
 SOURCE="$(InputPath)"
@@ -84,8 +84,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows /debug
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib /nologo /subsystem:windows /incremental:no /debug
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib wtsapi32.lib /nologo /subsystem:windows /debug
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib comctl32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib wtsapi32.lib /nologo /subsystem:windows /incremental:no /debug
 # Begin Special Build Tool
 TargetPath=.\Debug\ApacheMonitor.exe
 SOURCE="$(InputPath)"
diff --git a/support/win32/ApacheMonitor.h b/support/win32/ApacheMonitor.h
index 8a64b870..085c45f8 100644
--- a/support/win32/ApacheMonitor.h
+++ b/support/win32/ApacheMonitor.h
@@ -18,6 +18,7 @@
  * @file  ApacheMonitor.h
  * @brief Resource definitions for ApacheMonitor.rc and ApacheMonitor.c
  */
+#define BIN_NAME  ApacheMonitor.exe
 
 #define IDD_DLGSERVICES                 101
 #define IDS_APMONITORTITLE              102